3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
39 use Text::Glob qw(match_glob);
40 use Fcntl qw(:DEFAULT :flock);
45 our $our_version = 'UNRELEASED'; ###substituted###
46 our $absurdity = undef; ###substituted###
48 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
51 our $isuite = 'unstable';
57 our $dryrun_level = 0;
59 our $buildproductsdir = '..';
65 our $existing_package = 'dpkg';
67 our $changes_since_version;
69 our $overwrite_version; # undef: not specified; '': check changelog
71 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
72 our $split_brain_save;
73 our $we_are_responder;
74 our $initiator_tempdir;
75 our $patches_applied_dirtily = 00;
80 our %forceopts = map { $_=>0 }
81 qw(unrepresentable unsupported-source-format
82 dsc-changes-mismatch changes-origs-exactly
83 import-gitapply-absurd
84 import-gitapply-no-absurd
85 import-dsc-with-dgit-field);
87 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
89 our $suite_re = '[-+.0-9a-z]+';
90 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
91 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
92 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
93 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
95 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
96 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our (@dget) = qw(dget);
100 our (@curl) = qw(curl);
101 our (@dput) = qw(dput);
102 our (@debsign) = qw(debsign);
103 our (@gpg) = qw(gpg);
104 our (@sbuild) = qw(sbuild);
106 our (@dgit) = qw(dgit);
107 our (@aptget) = qw(apt-get);
108 our (@aptcache) = qw(apt-cache);
109 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
110 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
111 our (@dpkggenchanges) = qw(dpkg-genchanges);
112 our (@mergechanges) = qw(mergechanges -f);
113 our (@gbp_build) = ('');
114 our (@gbp_pq) = ('gbp pq');
115 our (@changesopts) = ('');
117 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
120 'debsign' => \@debsign,
122 'sbuild' => \@sbuild,
126 'apt-get' => \@aptget,
127 'apt-cache' => \@aptcache,
128 'dpkg-source' => \@dpkgsource,
129 'dpkg-buildpackage' => \@dpkgbuildpackage,
130 'dpkg-genchanges' => \@dpkggenchanges,
131 'gbp-build' => \@gbp_build,
132 'gbp-pq' => \@gbp_pq,
133 'ch' => \@changesopts,
134 'mergechanges' => \@mergechanges);
136 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
137 our %opts_cfg_insertpos = map {
139 scalar @{ $opts_opt_map{$_} }
140 } keys %opts_opt_map;
142 sub finalise_opts_opts();
148 our $supplementary_message = '';
149 our $need_split_build_invocation = 0;
150 our $split_brain = 0;
154 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
157 our $remotename = 'dgit';
158 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
162 if (!defined $absurdity) {
164 $absurdity =~ s{/[^/]+$}{/absurd} or die;
168 my ($v,$distro) = @_;
169 return $tagformatfn->($v, $distro);
172 sub debiantag_maintview ($$) {
173 my ($v,$distro) = @_;
178 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
180 sub lbranch () { return "$branchprefix/$csuite"; }
181 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
182 sub lref () { return "refs/heads/".lbranch(); }
183 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
184 sub rrref () { return server_ref($csuite); }
186 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
187 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
189 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
190 # locally fetched refs because they have unhelpful names and clutter
191 # up gitk etc. So we track whether we have "used up" head ref (ie,
192 # whether we have made another local ref which refers to this object).
194 # (If we deleted them unconditionally, then we might end up
195 # re-fetching the same git objects each time dgit fetch was run.)
197 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
198 # in git_fetch_us to fetch the refs in question, and possibly a call
199 # to lrfetchref_used.
201 our (%lrfetchrefs_f, %lrfetchrefs_d);
202 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
204 sub lrfetchref_used ($) {
205 my ($fullrefname) = @_;
206 my $objid = $lrfetchrefs_f{$fullrefname};
207 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
218 return "${package}_".(stripepoch $vsn).$sfx
223 return srcfn($vsn,".dsc");
226 sub changespat ($;$) {
227 my ($vsn, $arch) = @_;
228 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
231 sub upstreamversion ($) {
243 foreach my $f (@end) {
245 print STDERR "$us: cleanup: $@" if length $@;
249 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
251 sub forceable_fail ($$) {
252 my ($forceoptsl, $msg) = @_;
253 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
254 print STDERR "warning: overriding problem due to --force:\n". $msg;
258 my ($forceoptsl) = @_;
259 my @got = grep { $forceopts{$_} } @$forceoptsl;
260 return 0 unless @got;
262 "warning: skipping checks or functionality due to --force-$got[0]\n";
265 sub no_such_package () {
266 print STDERR "$us: package $package does not exist in suite $isuite\n";
272 printdebug "CD $newdir\n";
273 chdir $newdir or confess "chdir: $newdir: $!";
276 sub deliberately ($) {
278 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
281 sub deliberately_not_fast_forward () {
282 foreach (qw(not-fast-forward fresh-repo)) {
283 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
287 sub quiltmode_splitbrain () {
288 $quilt_mode =~ m/gbp|dpm|unapplied/;
291 sub opts_opt_multi_cmd {
293 push @cmd, split /\s+/, shift @_;
299 return opts_opt_multi_cmd @gbp_pq;
302 #---------- remote protocol support, common ----------
304 # remote push initiator/responder protocol:
305 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
306 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
307 # < dgit-remote-push-ready <actual-proto-vsn>
314 # > supplementary-message NBYTES # $protovsn >= 3
319 # > file parsed-changelog
320 # [indicates that output of dpkg-parsechangelog follows]
321 # > data-block NBYTES
322 # > [NBYTES bytes of data (no newline)]
323 # [maybe some more blocks]
332 # > param head DGIT-VIEW-HEAD
333 # > param csuite SUITE
334 # > param tagformat old|new
335 # > param maint-view MAINT-VIEW-HEAD
337 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
338 # # goes into tag, for replay prevention
341 # [indicates that signed tag is wanted]
342 # < data-block NBYTES
343 # < [NBYTES bytes of data (no newline)]
344 # [maybe some more blocks]
348 # > want signed-dsc-changes
349 # < data-block NBYTES [transfer of signed dsc]
351 # < data-block NBYTES [transfer of signed changes]
359 sub i_child_report () {
360 # Sees if our child has died, and reap it if so. Returns a string
361 # describing how it died if it failed, or undef otherwise.
362 return undef unless $i_child_pid;
363 my $got = waitpid $i_child_pid, WNOHANG;
364 return undef if $got <= 0;
365 die unless $got == $i_child_pid;
366 $i_child_pid = undef;
367 return undef unless $?;
368 return "build host child ".waitstatusmsg();
373 fail "connection lost: $!" if $fh->error;
374 fail "protocol violation; $m not expected";
377 sub badproto_badread ($$) {
379 fail "connection lost: $!" if $!;
380 my $report = i_child_report();
381 fail $report if defined $report;
382 badproto $fh, "eof (reading $wh)";
385 sub protocol_expect (&$) {
386 my ($match, $fh) = @_;
389 defined && chomp or badproto_badread $fh, "protocol message";
397 badproto $fh, "\`$_'";
400 sub protocol_send_file ($$) {
401 my ($fh, $ourfn) = @_;
402 open PF, "<", $ourfn or die "$ourfn: $!";
405 my $got = read PF, $d, 65536;
406 die "$ourfn: $!" unless defined $got;
408 print $fh "data-block ".length($d)."\n" or die $!;
409 print $fh $d or die $!;
411 PF->error and die "$ourfn $!";
412 print $fh "data-end\n" or die $!;
416 sub protocol_read_bytes ($$) {
417 my ($fh, $nbytes) = @_;
418 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
420 my $got = read $fh, $d, $nbytes;
421 $got==$nbytes or badproto_badread $fh, "data block";
425 sub protocol_receive_file ($$) {
426 my ($fh, $ourfn) = @_;
427 printdebug "() $ourfn\n";
428 open PF, ">", $ourfn or die "$ourfn: $!";
430 my ($y,$l) = protocol_expect {
431 m/^data-block (.*)$/ ? (1,$1) :
432 m/^data-end$/ ? (0,) :
436 my $d = protocol_read_bytes $fh, $l;
437 print PF $d or die $!;
442 #---------- remote protocol support, responder ----------
444 sub responder_send_command ($) {
446 return unless $we_are_responder;
447 # called even without $we_are_responder
448 printdebug ">> $command\n";
449 print PO $command, "\n" or die $!;
452 sub responder_send_file ($$) {
453 my ($keyword, $ourfn) = @_;
454 return unless $we_are_responder;
455 printdebug "]] $keyword $ourfn\n";
456 responder_send_command "file $keyword";
457 protocol_send_file \*PO, $ourfn;
460 sub responder_receive_files ($@) {
461 my ($keyword, @ourfns) = @_;
462 die unless $we_are_responder;
463 printdebug "[[ $keyword @ourfns\n";
464 responder_send_command "want $keyword";
465 foreach my $fn (@ourfns) {
466 protocol_receive_file \*PI, $fn;
469 protocol_expect { m/^files-end$/ } \*PI;
472 #---------- remote protocol support, initiator ----------
474 sub initiator_expect (&) {
476 protocol_expect { &$match } \*RO;
479 #---------- end remote code ----------
482 if ($we_are_responder) {
484 responder_send_command "progress ".length($m) or die $!;
485 print PO $m or die $!;
495 $ua = LWP::UserAgent->new();
499 progress "downloading $what...";
500 my $r = $ua->get(@_) or die $!;
501 return undef if $r->code == 404;
502 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
503 return $r->decoded_content(charset => 'none');
506 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
511 failedcmd @_ if system @_;
514 sub act_local () { return $dryrun_level <= 1; }
515 sub act_scary () { return !$dryrun_level; }
518 if (!$dryrun_level) {
519 progress "$us ok: @_";
521 progress "would be ok: @_ (but dry run only)";
526 printcmd(\*STDERR,$debugprefix."#",@_);
529 sub runcmd_ordryrun {
537 sub runcmd_ordryrun_local {
546 my ($first_shell, @cmd) = @_;
547 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
550 our $helpmsg = <<END;
552 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
553 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
554 dgit [dgit-opts] build [dpkg-buildpackage-opts]
555 dgit [dgit-opts] sbuild [sbuild-opts]
556 dgit [dgit-opts] push [dgit-opts] [suite]
557 dgit [dgit-opts] rpush build-host:build-dir ...
558 important dgit options:
559 -k<keyid> sign tag and package with <keyid> instead of default
560 --dry-run -n do not change anything, but go through the motions
561 --damp-run -L like --dry-run but make local changes, without signing
562 --new -N allow introducing a new package
563 --debug -D increase debug level
564 -c<name>=<value> set git config option (used directly by dgit too)
567 our $later_warning_msg = <<END;
568 Perhaps the upload is stuck in incoming. Using the version from git.
572 print STDERR "$us: @_\n", $helpmsg or die $!;
577 @ARGV or badusage "too few arguments";
578 return scalar shift @ARGV;
582 print $helpmsg or die $!;
586 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
588 our %defcfg = ('dgit.default.distro' => 'debian',
589 'dgit-suite.*-security.distro' => 'debian-security',
590 'dgit.default.username' => '',
591 'dgit.default.archive-query-default-component' => 'main',
592 'dgit.default.ssh' => 'ssh',
593 'dgit.default.archive-query' => 'madison:',
594 'dgit.default.sshpsql-dbname' => 'service=projectb',
595 'dgit.default.aptget-components' => 'main',
596 'dgit.default.dgit-tag-format' => 'new,old,maint',
597 # old means "repo server accepts pushes with old dgit tags"
598 # new means "repo server accepts pushes with new dgit tags"
599 # maint means "repo server accepts split brain pushes"
600 # hist means "repo server may have old pushes without new tag"
601 # ("hist" is implied by "old")
602 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
603 'dgit-distro.debian.git-check' => 'url',
604 'dgit-distro.debian.git-check-suffix' => '/info/refs',
605 'dgit-distro.debian.new-private-pushers' => 't',
606 'dgit-distro.debian/push.git-url' => '',
607 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
608 'dgit-distro.debian/push.git-user-force' => 'dgit',
609 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
610 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
611 'dgit-distro.debian/push.git-create' => 'true',
612 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
613 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
614 # 'dgit-distro.debian.archive-query-tls-key',
615 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
616 # ^ this does not work because curl is broken nowadays
617 # Fixing #790093 properly will involve providing providing the key
618 # in some pacagke and maybe updating these paths.
620 # 'dgit-distro.debian.archive-query-tls-curl-args',
621 # '--ca-path=/etc/ssl/ca-debian',
622 # ^ this is a workaround but works (only) on DSA-administered machines
623 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
624 'dgit-distro.debian.git-url-suffix' => '',
625 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
626 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
627 'dgit-distro.debian-security.archive-query' => 'aptget:',
628 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
629 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
630 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
631 'dgit-distro.debian-security.nominal-distro' => 'debian',
632 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
633 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
634 'dgit-distro.ubuntu.git-check' => 'false',
635 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
636 'dgit-distro.test-dummy.ssh' => "$td/ssh",
637 'dgit-distro.test-dummy.username' => "alice",
638 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
639 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
640 'dgit-distro.test-dummy.git-url' => "$td/git",
641 'dgit-distro.test-dummy.git-host' => "git",
642 'dgit-distro.test-dummy.git-path' => "$td/git",
643 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
644 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
645 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
646 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
650 our @gitcfgsources = qw(cmdline local global system);
652 sub git_slurp_config () {
653 local ($debuglevel) = $debuglevel-2;
656 # This algoritm is a bit subtle, but this is needed so that for
657 # options which we want to be single-valued, we allow the
658 # different config sources to override properly. See #835858.
659 foreach my $src (@gitcfgsources) {
660 next if $src eq 'cmdline';
661 # we do this ourselves since git doesn't handle it
663 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
666 open GITS, "-|", @cmd or die $!;
669 printdebug "=> ", (messagequote $_), "\n";
671 push @{ $gitcfgs{$src}{$`} }, $'; #';
675 or ($!==0 && $?==256)
680 sub git_get_config ($) {
682 foreach my $src (@gitcfgsources) {
683 my $l = $gitcfgs{$src}{$c};
684 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
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 my $v = git_get_config($c);
698 return $v if defined $v;
699 my $dv = $defcfg{$c};
700 return $dv if defined $dv;
702 badcfg "need value for one of: @_\n".
703 "$us: distro or suite appears not to be (properly) supported";
706 sub access_basedistro () {
707 if (defined $idistro) {
710 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
711 return $def if defined $def;
712 foreach my $src (@gitcfgsources, 'internal') {
713 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
715 foreach my $k (keys %$kl) {
716 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
718 next unless match_glob $dpat, $isuite;
722 return cfg("dgit.default.distro");
726 sub access_nomdistro () {
727 my $base = access_basedistro();
728 return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
731 sub access_quirk () {
732 # returns (quirk name, distro to use instead or undef, quirk-specific info)
733 my $basedistro = access_basedistro();
734 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
736 if (defined $backports_quirk) {
737 my $re = $backports_quirk;
738 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
740 $re =~ s/\%/([-0-9a-z_]+)/
741 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
742 if ($isuite =~ m/^$re$/) {
743 return ('backports',"$basedistro-backports",$1);
746 return ('none',undef);
751 sub parse_cfg_bool ($$$) {
752 my ($what,$def,$v) = @_;
755 $v =~ m/^[ty1]/ ? 1 :
756 $v =~ m/^[fn0]/ ? 0 :
757 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
760 sub access_forpush_config () {
761 my $d = access_basedistro();
765 parse_cfg_bool('new-private-pushers', 0,
766 cfg("dgit-distro.$d.new-private-pushers",
769 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
772 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
773 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
774 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
775 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
778 sub access_forpush () {
779 $access_forpush //= access_forpush_config();
780 return $access_forpush;
784 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
785 badcfg "pushing but distro is configured readonly"
786 if access_forpush_config() eq '0';
788 $supplementary_message = <<'END' unless $we_are_responder;
789 Push failed, before we got started.
790 You can retry the push, after fixing the problem, if you like.
792 finalise_opts_opts();
796 finalise_opts_opts();
799 sub supplementary_message ($) {
801 if (!$we_are_responder) {
802 $supplementary_message = $msg;
804 } elsif ($protovsn >= 3) {
805 responder_send_command "supplementary-message ".length($msg)
807 print PO $msg or die $!;
811 sub access_distros () {
812 # Returns list of distros to try, in order
815 # 0. `instead of' distro name(s) we have been pointed to
816 # 1. the access_quirk distro, if any
817 # 2a. the user's specified distro, or failing that } basedistro
818 # 2b. the distro calculated from the suite }
819 my @l = access_basedistro();
821 my (undef,$quirkdistro) = access_quirk();
822 unshift @l, $quirkdistro;
823 unshift @l, $instead_distro;
824 @l = grep { defined } @l;
826 push @l, access_nomdistro();
828 if (access_forpush()) {
829 @l = map { ("$_/push", $_) } @l;
834 sub access_cfg_cfgs (@) {
837 # The nesting of these loops determines the search order. We put
838 # the key loop on the outside so that we search all the distros
839 # for each key, before going on to the next key. That means that
840 # if access_cfg is called with a more specific, and then a less
841 # specific, key, an earlier distro can override the less specific
842 # without necessarily overriding any more specific keys. (If the
843 # distro wants to override the more specific keys it can simply do
844 # so; whereas if we did the loop the other way around, it would be
845 # impossible to for an earlier distro to override a less specific
846 # key but not the more specific ones without restating the unknown
847 # values of the more specific keys.
850 # We have to deal with RETURN-UNDEF specially, so that we don't
851 # terminate the search prematurely.
853 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
856 foreach my $d (access_distros()) {
857 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
859 push @cfgs, map { "dgit.default.$_" } @realkeys;
866 my (@cfgs) = access_cfg_cfgs(@keys);
867 my $value = cfg(@cfgs);
871 sub access_cfg_bool ($$) {
872 my ($def, @keys) = @_;
873 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
876 sub string_to_ssh ($) {
878 if ($spec =~ m/\s/) {
879 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
885 sub access_cfg_ssh () {
886 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
887 if (!defined $gitssh) {
890 return string_to_ssh $gitssh;
894 sub access_runeinfo ($) {
896 return ": dgit ".access_basedistro()." $info ;";
899 sub access_someuserhost ($) {
901 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
902 defined($user) && length($user) or
903 $user = access_cfg("$some-user",'username');
904 my $host = access_cfg("$some-host");
905 return length($user) ? "$user\@$host" : $host;
908 sub access_gituserhost () {
909 return access_someuserhost('git');
912 sub access_giturl (;$) {
914 my $url = access_cfg('git-url','RETURN-UNDEF');
917 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
918 return undef unless defined $proto;
921 access_gituserhost().
922 access_cfg('git-path');
924 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
927 return "$url/$package$suffix";
930 sub parsecontrolfh ($$;$) {
931 my ($fh, $desc, $allowsigned) = @_;
932 our $dpkgcontrolhash_noissigned;
935 my %opts = ('name' => $desc);
936 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
937 $c = Dpkg::Control::Hash->new(%opts);
938 $c->parse($fh,$desc) or die "parsing of $desc failed";
939 last if $allowsigned;
940 last if $dpkgcontrolhash_noissigned;
941 my $issigned= $c->get_option('is_pgp_signed');
942 if (!defined $issigned) {
943 $dpkgcontrolhash_noissigned= 1;
944 seek $fh, 0,0 or die "seek $desc: $!";
945 } elsif ($issigned) {
946 fail "control file $desc is (already) PGP-signed. ".
947 " Note that dgit push needs to modify the .dsc and then".
948 " do the signature itself";
957 my ($file, $desc, $allowsigned) = @_;
958 my $fh = new IO::Handle;
959 open $fh, '<', $file or die "$file: $!";
960 my $c = parsecontrolfh($fh,$desc,$allowsigned);
961 $fh->error and die $!;
967 my ($dctrl,$field) = @_;
968 my $v = $dctrl->{$field};
969 return $v if defined $v;
970 fail "missing field $field in ".$dctrl->get_option('name');
974 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
975 my $p = new IO::Handle;
976 my @cmd = (qw(dpkg-parsechangelog), @_);
977 open $p, '-|', @cmd or die $!;
979 $?=0; $!=0; close $p or failedcmd @cmd;
983 sub commit_getclogp ($) {
984 # Returns the parsed changelog hashref for a particular commit
986 our %commit_getclogp_memo;
987 my $memo = $commit_getclogp_memo{$objid};
988 return $memo if $memo;
990 my $mclog = ".git/dgit/clog-$objid";
991 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
992 "$objid:debian/changelog";
993 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
998 defined $d or fail "getcwd failed: $!";
1002 sub parse_dscdata () {
1003 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1004 printdebug Dumper($dscdata) if $debuglevel>1;
1005 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1006 printdebug Dumper($dsc) if $debuglevel>1;
1011 sub archive_query ($;@) {
1012 my ($method) = shift @_;
1013 my $query = access_cfg('archive-query','RETURN-UNDEF');
1014 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1017 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1020 sub archive_query_prepend_mirror {
1021 my $m = access_cfg('mirror');
1022 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1025 sub pool_dsc_subpath ($$) {
1026 my ($vsn,$component) = @_; # $package is implict arg
1027 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1028 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1031 sub cfg_apply_map ($$$) {
1032 my ($varref, $what, $mapspec) = @_;
1033 return unless $mapspec;
1035 printdebug "config $what EVAL{ $mapspec; }\n";
1037 eval "package Dgit::Config; $mapspec;";
1042 #---------- `ftpmasterapi' archive query method (nascent) ----------
1044 sub archive_api_query_cmd ($) {
1046 my @cmd = (@curl, qw(-sS));
1047 my $url = access_cfg('archive-query-url');
1048 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1050 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1051 foreach my $key (split /\:/, $keys) {
1052 $key =~ s/\%HOST\%/$host/g;
1054 fail "for $url: stat $key: $!" unless $!==ENOENT;
1057 fail "config requested specific TLS key but do not know".
1058 " how to get curl to use exactly that EE key ($key)";
1059 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1060 # # Sadly the above line does not work because of changes
1061 # # to gnutls. The real fix for #790093 may involve
1062 # # new curl options.
1065 # Fixing #790093 properly will involve providing a value
1066 # for this on clients.
1067 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1068 push @cmd, split / /, $kargs if defined $kargs;
1070 push @cmd, $url.$subpath;
1074 sub api_query ($$;$) {
1076 my ($data, $subpath, $ok404) = @_;
1077 badcfg "ftpmasterapi archive query method takes no data part"
1079 my @cmd = archive_api_query_cmd($subpath);
1080 my $url = $cmd[$#cmd];
1081 push @cmd, qw(-w %{http_code});
1082 my $json = cmdoutput @cmd;
1083 unless ($json =~ s/\d+\d+\d$//) {
1084 failedcmd_report_cmd undef, @cmd;
1085 fail "curl failed to print 3-digit HTTP code";
1088 return undef if $code eq '404' && $ok404;
1089 fail "fetch of $url gave HTTP code $code"
1090 unless $url =~ m#^file://# or $code =~ m/^2/;
1091 return decode_json($json);
1094 sub canonicalise_suite_ftpmasterapi {
1095 my ($proto,$data) = @_;
1096 my $suites = api_query($data, 'suites');
1098 foreach my $entry (@$suites) {
1100 my $v = $entry->{$_};
1101 defined $v && $v eq $isuite;
1102 } qw(codename name);
1103 push @matched, $entry;
1105 fail "unknown suite $isuite" unless @matched;
1108 @matched==1 or die "multiple matches for suite $isuite\n";
1109 $cn = "$matched[0]{codename}";
1110 defined $cn or die "suite $isuite info has no codename\n";
1111 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1113 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1118 sub archive_query_ftpmasterapi {
1119 my ($proto,$data) = @_;
1120 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1122 my $digester = Digest::SHA->new(256);
1123 foreach my $entry (@$info) {
1125 my $vsn = "$entry->{version}";
1126 my ($ok,$msg) = version_check $vsn;
1127 die "bad version: $msg\n" unless $ok;
1128 my $component = "$entry->{component}";
1129 $component =~ m/^$component_re$/ or die "bad component";
1130 my $filename = "$entry->{filename}";
1131 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1132 or die "bad filename";
1133 my $sha256sum = "$entry->{sha256sum}";
1134 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1135 push @rows, [ $vsn, "/pool/$component/$filename",
1136 $digester, $sha256sum ];
1138 die "bad ftpmaster api response: $@\n".Dumper($entry)
1141 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1142 return archive_query_prepend_mirror @rows;
1145 sub file_in_archive_ftpmasterapi {
1146 my ($proto,$data,$filename) = @_;
1147 my $pat = $filename;
1150 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1151 my $info = api_query($data, "file_in_archive/$pat", 1);
1154 #---------- `aptget' archive query method ----------
1157 our $aptget_releasefile;
1158 our $aptget_configpath;
1160 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1161 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1163 sub aptget_cache_clean {
1164 runcmd_ordryrun_local qw(sh -ec),
1165 'cd "$1"; pwd; find -atime +30 -type f -print0 | xargs -0r echo rm --',
1169 sub aptget_lock_acquire () {
1170 my $lockfile = "$aptget_base/lock";
1171 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1172 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1175 sub aptget_prep ($) {
1177 return if defined $aptget_base;
1179 badcfg "aptget archive query method takes no data part"
1182 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1185 ensuredir "$cache/dgit";
1187 access_cfg('aptget-cachekey','RETURN-UNDEF')
1188 // access_nomdistro();
1190 $aptget_base = "$cache/dgit/aptget";
1191 ensuredir $aptget_base;
1193 my $quoted_base = $aptget_base;
1194 die "$quoted_base contains bad chars, cannot continue"
1195 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1197 ensuredir $aptget_base;
1199 aptget_lock_acquire();
1201 aptget_cache_clean();
1203 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1204 my $sourceslist = "source.list#$cachekey";
1206 my $aptsuites = $isuite;
1207 cfg_apply_map(\$aptsuites, 'suite map',
1208 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1210 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1211 printf SRCS "deb-src %s %s %s\n",
1212 access_cfg('mirror'),
1214 access_cfg('aptget-components')
1217 ensuredir "$aptget_base/cache";
1218 ensuredir "$aptget_base/lists";
1220 open CONF, ">", $aptget_configpath or die $!;
1222 Debug::NoLocking "true";
1223 APT::Get::List-Cleanup "false";
1224 #clear APT::Update::Post-Invoke-Success;
1225 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1226 Dir::State::Lists "$quoted_base/lists";
1227 Dir::Etc::preferences "$quoted_base/preferences";
1228 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1229 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1232 foreach my $key (qw(
1235 Dir::Cache::Archives
1236 Dir::Etc::SourceParts
1237 Dir::Etc::preferencesparts
1239 ensuredir "$aptget_base/$key";
1240 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1243 my $oldatime = (time // die $!) - 1;
1244 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1245 next unless stat_exists $oldlist;
1246 my ($mtime) = (stat _)[9];
1247 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1250 runcmd_ordryrun_local aptget_aptget(), qw(update);
1253 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1254 next unless stat_exists $oldlist;
1255 my ($atime) = (stat _)[8];
1256 next if $atime == $oldatime;
1257 push @releasefiles, $oldlist;
1259 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1260 @releasefiles = @inreleasefiles if @inreleasefiles;
1261 die "apt updated wrong number of Release files (@releasefiles), erk"
1262 unless @releasefiles == 1;
1264 ($aptget_releasefile) = @releasefiles;
1267 sub canonicalise_suite_aptget {
1268 my ($proto,$data) = @_;
1271 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1273 foreach my $name (qw(Codename Suite)) {
1274 my $val = $release->{$name};
1276 printdebug "release file $name: $val\n";
1277 $val =~ m/^$suite_re$/o or fail
1278 "Release file ($aptget_releasefile) specifies intolerable $name";
1279 cfg_apply_map(\$val, 'suite rmap',
1280 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1287 sub archive_query_aptget {
1288 my ($proto,$data) = @_;
1291 ensuredir "$aptget_base/source";
1292 foreach my $old (<$aptget_base/source/*.dsc>) {
1293 unlink $old or die "$old: $!";
1296 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1297 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1298 # avoids apt-get source failing with ambiguous error code
1300 runcmd_ordryrun_local
1301 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1302 aptget_aptget(), qw(--download-only --only-source source), $package;
1304 my @dscs = <$aptget_base/source/*.dsc>;
1305 fail "apt-get source did not produce a .dsc" unless @dscs;
1306 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1308 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1311 my $uri = "file://". uri_escape $dscs[0];
1312 $uri =~ s{\%2f}{/}gi;
1313 return [ (getfield $pre_dsc, 'Version'), $uri ];
1316 #---------- `dummyapicat' archive query method ----------
1318 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1319 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1321 sub file_in_archive_dummycatapi ($$$) {
1322 my ($proto,$data,$filename) = @_;
1323 my $mirror = access_cfg('mirror');
1324 $mirror =~ s#^file://#/# or die "$mirror ?";
1326 my @cmd = (qw(sh -ec), '
1328 find -name "$2" -print0 |
1330 ', qw(x), $mirror, $filename);
1331 debugcmd "-|", @cmd;
1332 open FIA, "-|", @cmd or die $!;
1335 printdebug "| $_\n";
1336 m/^(\w+) (\S+)$/ or die "$_ ?";
1337 push @out, { sha256sum => $1, filename => $2 };
1339 close FIA or die failedcmd @cmd;
1343 #---------- `madison' archive query method ----------
1345 sub archive_query_madison {
1346 return archive_query_prepend_mirror
1347 map { [ @$_[0..1] ] } madison_get_parse(@_);
1350 sub madison_get_parse {
1351 my ($proto,$data) = @_;
1352 die unless $proto eq 'madison';
1353 if (!length $data) {
1354 $data= access_cfg('madison-distro','RETURN-UNDEF');
1355 $data //= access_basedistro();
1357 $rmad{$proto,$data,$package} ||= cmdoutput
1358 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1359 my $rmad = $rmad{$proto,$data,$package};
1362 foreach my $l (split /\n/, $rmad) {
1363 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1364 \s*( [^ \t|]+ )\s* \|
1365 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1366 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1367 $1 eq $package or die "$rmad $package ?";
1374 $component = access_cfg('archive-query-default-component');
1376 $5 eq 'source' or die "$rmad ?";
1377 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1379 return sort { -version_compare($a->[0],$b->[0]); } @out;
1382 sub canonicalise_suite_madison {
1383 # madison canonicalises for us
1384 my @r = madison_get_parse(@_);
1386 "unable to canonicalise suite using package $package".
1387 " which does not appear to exist in suite $isuite;".
1388 " --existing-package may help";
1392 sub file_in_archive_madison { return undef; }
1394 #---------- `sshpsql' archive query method ----------
1397 my ($data,$runeinfo,$sql) = @_;
1398 if (!length $data) {
1399 $data= access_someuserhost('sshpsql').':'.
1400 access_cfg('sshpsql-dbname');
1402 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1403 my ($userhost,$dbname) = ($`,$'); #';
1405 my @cmd = (access_cfg_ssh, $userhost,
1406 access_runeinfo("ssh-psql $runeinfo").
1407 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1408 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1410 open P, "-|", @cmd or die $!;
1413 printdebug(">|$_|\n");
1416 $!=0; $?=0; close P or failedcmd @cmd;
1418 my $nrows = pop @rows;
1419 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1420 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1421 @rows = map { [ split /\|/, $_ ] } @rows;
1422 my $ncols = scalar @{ shift @rows };
1423 die if grep { scalar @$_ != $ncols } @rows;
1427 sub sql_injection_check {
1428 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1431 sub archive_query_sshpsql ($$) {
1432 my ($proto,$data) = @_;
1433 sql_injection_check $isuite, $package;
1434 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1435 SELECT source.version, component.name, files.filename, files.sha256sum
1437 JOIN src_associations ON source.id = src_associations.source
1438 JOIN suite ON suite.id = src_associations.suite
1439 JOIN dsc_files ON dsc_files.source = source.id
1440 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1441 JOIN component ON component.id = files_archive_map.component_id
1442 JOIN files ON files.id = dsc_files.file
1443 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1444 AND source.source='$package'
1445 AND files.filename LIKE '%.dsc';
1447 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1448 my $digester = Digest::SHA->new(256);
1450 my ($vsn,$component,$filename,$sha256sum) = @$_;
1451 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1453 return archive_query_prepend_mirror @rows;
1456 sub canonicalise_suite_sshpsql ($$) {
1457 my ($proto,$data) = @_;
1458 sql_injection_check $isuite;
1459 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1460 SELECT suite.codename
1461 FROM suite where suite_name='$isuite' or codename='$isuite';
1463 @rows = map { $_->[0] } @rows;
1464 fail "unknown suite $isuite" unless @rows;
1465 die "ambiguous $isuite: @rows ?" if @rows>1;
1469 sub file_in_archive_sshpsql ($$$) { return undef; }
1471 #---------- `dummycat' archive query method ----------
1473 sub canonicalise_suite_dummycat ($$) {
1474 my ($proto,$data) = @_;
1475 my $dpath = "$data/suite.$isuite";
1476 if (!open C, "<", $dpath) {
1477 $!==ENOENT or die "$dpath: $!";
1478 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1482 chomp or die "$dpath: $!";
1484 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1488 sub archive_query_dummycat ($$) {
1489 my ($proto,$data) = @_;
1490 canonicalise_suite();
1491 my $dpath = "$data/package.$csuite.$package";
1492 if (!open C, "<", $dpath) {
1493 $!==ENOENT or die "$dpath: $!";
1494 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1502 printdebug "dummycat query $csuite $package $dpath | $_\n";
1503 my @row = split /\s+/, $_;
1504 @row==2 or die "$dpath: $_ ?";
1507 C->error and die "$dpath: $!";
1509 return archive_query_prepend_mirror
1510 sort { -version_compare($a->[0],$b->[0]); } @rows;
1513 sub file_in_archive_dummycat () { return undef; }
1515 #---------- tag format handling ----------
1517 sub access_cfg_tagformats () {
1518 split /\,/, access_cfg('dgit-tag-format');
1521 sub need_tagformat ($$) {
1522 my ($fmt, $why) = @_;
1523 fail "need to use tag format $fmt ($why) but also need".
1524 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1525 " - no way to proceed"
1526 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1527 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1530 sub select_tagformat () {
1532 return if $tagformatfn && !$tagformat_want;
1533 die 'bug' if $tagformatfn && $tagformat_want;
1534 # ... $tagformat_want assigned after previous select_tagformat
1536 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1537 printdebug "select_tagformat supported @supported\n";
1539 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1540 printdebug "select_tagformat specified @$tagformat_want\n";
1542 my ($fmt,$why,$override) = @$tagformat_want;
1544 fail "target distro supports tag formats @supported".
1545 " but have to use $fmt ($why)"
1547 or grep { $_ eq $fmt } @supported;
1549 $tagformat_want = undef;
1551 $tagformatfn = ${*::}{"debiantag_$fmt"};
1553 fail "trying to use unknown tag format \`$fmt' ($why) !"
1554 unless $tagformatfn;
1557 #---------- archive query entrypoints and rest of program ----------
1559 sub canonicalise_suite () {
1560 return if defined $csuite;
1561 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1562 $csuite = archive_query('canonicalise_suite');
1563 if ($isuite ne $csuite) {
1564 progress "canonical suite name for $isuite is $csuite";
1568 sub get_archive_dsc () {
1569 canonicalise_suite();
1570 my @vsns = archive_query('archive_query');
1571 foreach my $vinfo (@vsns) {
1572 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1573 $dscurl = $vsn_dscurl;
1574 $dscdata = url_get($dscurl);
1576 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1581 $digester->add($dscdata);
1582 my $got = $digester->hexdigest();
1584 fail "$dscurl has hash $got but".
1585 " archive told us to expect $digest";
1588 my $fmt = getfield $dsc, 'Format';
1589 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1590 "unsupported source format $fmt, sorry";
1592 $dsc_checked = !!$digester;
1593 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1597 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1600 sub check_for_git ();
1601 sub check_for_git () {
1603 my $how = access_cfg('git-check');
1604 if ($how eq 'ssh-cmd') {
1606 (access_cfg_ssh, access_gituserhost(),
1607 access_runeinfo("git-check $package").
1608 " set -e; cd ".access_cfg('git-path').";".
1609 " if test -d $package.git; then echo 1; else echo 0; fi");
1610 my $r= cmdoutput @cmd;
1611 if (defined $r and $r =~ m/^divert (\w+)$/) {
1613 my ($usedistro,) = access_distros();
1614 # NB that if we are pushing, $usedistro will be $distro/push
1615 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1616 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1617 progress "diverting to $divert (using config for $instead_distro)";
1618 return check_for_git();
1620 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1622 } elsif ($how eq 'url') {
1623 my $prefix = access_cfg('git-check-url','git-url');
1624 my $suffix = access_cfg('git-check-suffix','git-suffix',
1625 'RETURN-UNDEF') // '.git';
1626 my $url = "$prefix/$package$suffix";
1627 my @cmd = (@curl, qw(-sS -I), $url);
1628 my $result = cmdoutput @cmd;
1629 $result =~ s/^\S+ 200 .*\n\r?\n//;
1630 # curl -sS -I with https_proxy prints
1631 # HTTP/1.0 200 Connection established
1632 $result =~ m/^\S+ (404|200) /s or
1633 fail "unexpected results from git check query - ".
1634 Dumper($prefix, $result);
1636 if ($code eq '404') {
1638 } elsif ($code eq '200') {
1643 } elsif ($how eq 'true') {
1645 } elsif ($how eq 'false') {
1648 badcfg "unknown git-check \`$how'";
1652 sub create_remote_git_repo () {
1653 my $how = access_cfg('git-create');
1654 if ($how eq 'ssh-cmd') {
1656 (access_cfg_ssh, access_gituserhost(),
1657 access_runeinfo("git-create $package").
1658 "set -e; cd ".access_cfg('git-path').";".
1659 " cp -a _template $package.git");
1660 } elsif ($how eq 'true') {
1663 badcfg "unknown git-create \`$how'";
1667 our ($dsc_hash,$lastpush_mergeinput);
1669 our $ud = '.git/dgit/unpack';
1679 sub mktree_in_ud_here () {
1680 runcmd qw(git init -q);
1681 runcmd qw(git config gc.auto 0);
1682 rmtree('.git/objects');
1683 symlink '../../../../objects','.git/objects' or die $!;
1686 sub git_write_tree () {
1687 my $tree = cmdoutput @git, qw(write-tree);
1688 $tree =~ m/^\w+$/ or die "$tree ?";
1692 sub remove_stray_gits () {
1693 my @gitscmd = qw(find -name .git -prune -print0);
1694 debugcmd "|",@gitscmd;
1695 open GITS, "-|", @gitscmd or die $!;
1700 print STDERR "$us: warning: removing from source package: ",
1701 (messagequote $_), "\n";
1705 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1708 sub mktree_in_ud_from_only_subdir (;$) {
1711 # changes into the subdir
1713 die "expected one subdir but found @dirs ?" unless @dirs==1;
1714 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1718 remove_stray_gits();
1719 mktree_in_ud_here();
1721 my ($format, $fopts) = get_source_format();
1722 if (madformat($format)) {
1727 runcmd @git, qw(add -Af);
1728 my $tree=git_write_tree();
1729 return ($tree,$dir);
1732 our @files_csum_info_fields =
1733 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1734 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1735 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1737 sub dsc_files_info () {
1738 foreach my $csumi (@files_csum_info_fields) {
1739 my ($fname, $module, $method) = @$csumi;
1740 my $field = $dsc->{$fname};
1741 next unless defined $field;
1742 eval "use $module; 1;" or die $@;
1744 foreach (split /\n/, $field) {
1746 m/^(\w+) (\d+) (\S+)$/ or
1747 fail "could not parse .dsc $fname line \`$_'";
1748 my $digester = eval "$module"."->$method;" or die $@;
1753 Digester => $digester,
1758 fail "missing any supported Checksums-* or Files field in ".
1759 $dsc->get_option('name');
1763 map { $_->{Filename} } dsc_files_info();
1766 sub files_compare_inputs (@) {
1771 my $showinputs = sub {
1772 return join "; ", map { $_->get_option('name') } @$inputs;
1775 foreach my $in (@$inputs) {
1777 my $in_name = $in->get_option('name');
1779 printdebug "files_compare_inputs $in_name\n";
1781 foreach my $csumi (@files_csum_info_fields) {
1782 my ($fname) = @$csumi;
1783 printdebug "files_compare_inputs $in_name $fname\n";
1785 my $field = $in->{$fname};
1786 next unless defined $field;
1789 foreach (split /\n/, $field) {
1792 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1793 fail "could not parse $in_name $fname line \`$_'";
1795 printdebug "files_compare_inputs $in_name $fname $f\n";
1799 my $re = \ $record{$f}{$fname};
1801 $fchecked{$f}{$in_name} = 1;
1803 fail "hash or size of $f varies in $fname fields".
1804 " (between: ".$showinputs->().")";
1809 @files = sort @files;
1810 $expected_files //= \@files;
1811 "@$expected_files" eq "@files" or
1812 fail "file list in $in_name varies between hash fields!";
1815 fail "$in_name has no files list field(s)";
1817 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1820 grep { keys %$_ == @$inputs-1 } values %fchecked
1821 or fail "no file appears in all file lists".
1822 " (looked in: ".$showinputs->().")";
1825 sub is_orig_file_in_dsc ($$) {
1826 my ($f, $dsc_files_info) = @_;
1827 return 0 if @$dsc_files_info <= 1;
1828 # One file means no origs, and the filename doesn't have a "what
1829 # part of dsc" component. (Consider versions ending `.orig'.)
1830 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1834 sub is_orig_file_of_vsn ($$) {
1835 my ($f, $upstreamvsn) = @_;
1836 my $base = srcfn $upstreamvsn, '';
1837 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1841 sub changes_update_origs_from_dsc ($$$$) {
1842 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1844 printdebug "checking origs needed ($upstreamvsn)...\n";
1845 $_ = getfield $changes, 'Files';
1846 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1847 fail "cannot find section/priority from .changes Files field";
1848 my $placementinfo = $1;
1850 printdebug "checking origs needed placement '$placementinfo'...\n";
1851 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1852 $l =~ m/\S+$/ or next;
1854 printdebug "origs $file | $l\n";
1855 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1856 printdebug "origs $file is_orig\n";
1857 my $have = archive_query('file_in_archive', $file);
1858 if (!defined $have) {
1860 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1866 printdebug "origs $file \$#\$have=$#$have\n";
1867 foreach my $h (@$have) {
1870 foreach my $csumi (@files_csum_info_fields) {
1871 my ($fname, $module, $method, $archivefield) = @$csumi;
1872 next unless defined $h->{$archivefield};
1873 $_ = $dsc->{$fname};
1874 next unless defined;
1875 m/^(\w+) .* \Q$file\E$/m or
1876 fail ".dsc $fname missing entry for $file";
1877 if ($h->{$archivefield} eq $1) {
1881 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1884 die "$file ".Dumper($h)." ?!" if $same && @differ;
1887 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1890 print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
1891 if (@found_differ && !$found_same) {
1893 "archive contains $file with different checksum",
1896 # Now we edit the changes file to add or remove it
1897 foreach my $csumi (@files_csum_info_fields) {
1898 my ($fname, $module, $method, $archivefield) = @$csumi;
1899 next unless defined $changes->{$fname};
1901 # in archive, delete from .changes if it's there
1902 $changed{$file} = "removed" if
1903 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1904 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1905 # not in archive, but it's here in the .changes
1907 my $dsc_data = getfield $dsc, $fname;
1908 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1910 $extra =~ s/ \d+ /$&$placementinfo /
1911 or die "$fname $extra >$dsc_data< ?"
1912 if $fname eq 'Files';
1913 $changes->{$fname} .= "\n". $extra;
1914 $changed{$file} = "added";
1919 foreach my $file (keys %changed) {
1921 "edited .changes for archive .orig contents: %s %s",
1922 $changed{$file}, $file;
1924 my $chtmp = "$changesfile.tmp";
1925 $changes->save($chtmp);
1927 rename $chtmp,$changesfile or die "$changesfile $!";
1929 progress "[new .changes left in $changesfile]";
1932 progress "$changesfile already has appropriate .orig(s) (if any)";
1936 sub make_commit ($) {
1938 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1941 sub make_commit_text ($) {
1944 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1946 print Dumper($text) if $debuglevel > 1;
1947 my $child = open2($out, $in, @cmd) or die $!;
1950 print $in $text or die $!;
1951 close $in or die $!;
1953 $h =~ m/^\w+$/ or die;
1955 printdebug "=> $h\n";
1958 waitpid $child, 0 == $child or die "$child $!";
1959 $? and failedcmd @cmd;
1963 sub clogp_authline ($) {
1965 my $author = getfield $clogp, 'Maintainer';
1966 $author =~ s#,.*##ms;
1967 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1968 my $authline = "$author $date";
1969 $authline =~ m/$git_authline_re/o or
1970 fail "unexpected commit author line format \`$authline'".
1971 " (was generated from changelog Maintainer field)";
1972 return ($1,$2,$3) if wantarray;
1976 sub vendor_patches_distro ($$) {
1977 my ($checkdistro, $what) = @_;
1978 return unless defined $checkdistro;
1980 my $series = "debian/patches/\L$checkdistro\E.series";
1981 printdebug "checking for vendor-specific $series ($what)\n";
1983 if (!open SERIES, "<", $series) {
1984 die "$series $!" unless $!==ENOENT;
1993 Unfortunately, this source package uses a feature of dpkg-source where
1994 the same source package unpacks to different source code on different
1995 distros. dgit cannot safely operate on such packages on affected
1996 distros, because the meaning of source packages is not stable.
1998 Please ask the distro/maintainer to remove the distro-specific series
1999 files and use a different technique (if necessary, uploading actually
2000 different packages, if different distros are supposed to have
2004 fail "Found active distro-specific series file for".
2005 " $checkdistro ($what): $series, cannot continue";
2007 die "$series $!" if SERIES->error;
2011 sub check_for_vendor_patches () {
2012 # This dpkg-source feature doesn't seem to be documented anywhere!
2013 # But it can be found in the changelog (reformatted):
2015 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2016 # Author: Raphael Hertzog <hertzog@debian.org>
2017 # Date: Sun Oct 3 09:36:48 2010 +0200
2019 # dpkg-source: correctly create .pc/.quilt_series with alternate
2022 # If you have debian/patches/ubuntu.series and you were
2023 # unpacking the source package on ubuntu, quilt was still
2024 # directed to debian/patches/series instead of
2025 # debian/patches/ubuntu.series.
2027 # debian/changelog | 3 +++
2028 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2029 # 2 files changed, 6 insertions(+), 1 deletion(-)
2032 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2033 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2034 "Dpkg::Vendor \`current vendor'");
2035 vendor_patches_distro(access_basedistro(),
2036 "(base) distro being accessed");
2037 vendor_patches_distro(access_nomdistro(),
2038 "(nominal) distro being accessed");
2041 sub generate_commits_from_dsc () {
2042 # See big comment in fetch_from_archive, below.
2043 # See also README.dsc-import.
2047 my @dfi = dsc_files_info();
2048 foreach my $fi (@dfi) {
2049 my $f = $fi->{Filename};
2050 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2052 printdebug "considering linking $f: ";
2054 link_ltarget "../../../../$f", $f
2055 or ((printdebug "($!) "), 0)
2059 printdebug "linked.\n";
2061 complete_file_from_dsc('.', $fi)
2064 if (is_orig_file_in_dsc($f, \@dfi)) {
2065 link $f, "../../../../$f"
2071 # We unpack and record the orig tarballs first, so that we only
2072 # need disk space for one private copy of the unpacked source.
2073 # But we can't make them into commits until we have the metadata
2074 # from the debian/changelog, so we record the tree objects now and
2075 # make them into commits later.
2077 my $upstreamv = upstreamversion $dsc->{version};
2078 my $orig_f_base = srcfn $upstreamv, '';
2080 foreach my $fi (@dfi) {
2081 # We actually import, and record as a commit, every tarball
2082 # (unless there is only one file, in which case there seems
2085 my $f = $fi->{Filename};
2086 printdebug "import considering $f ";
2087 (printdebug "only one dfi\n"), next if @dfi == 1;
2088 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2089 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2093 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2095 printdebug "Y ", (join ' ', map { $_//"(none)" }
2096 $compr_ext, $orig_f_part
2099 my $input = new IO::File $f, '<' or die "$f $!";
2103 if (defined $compr_ext) {
2105 Dpkg::Compression::compression_guess_from_filename $f;
2106 fail "Dpkg::Compression cannot handle file $f in source package"
2107 if defined $compr_ext && !defined $cname;
2109 new Dpkg::Compression::Process compression => $cname;
2110 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2111 my $compr_fh = new IO::Handle;
2112 my $compr_pid = open $compr_fh, "-|" // die $!;
2114 open STDIN, "<&", $input or die $!;
2116 die "dgit (child): exec $compr_cmd[0]: $!\n";
2121 rmtree "../unpack-tar";
2122 mkdir "../unpack-tar" or die $!;
2123 my @tarcmd = qw(tar -x -f -
2124 --no-same-owner --no-same-permissions
2125 --no-acls --no-xattrs --no-selinux);
2126 my $tar_pid = fork // die $!;
2128 chdir "../unpack-tar" or die $!;
2129 open STDIN, "<&", $input or die $!;
2131 die "dgit (child): exec $tarcmd[0]: $!";
2133 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2134 !$? or failedcmd @tarcmd;
2137 (@compr_cmd ? failedcmd @compr_cmd
2139 # finally, we have the results in "tarball", but maybe
2140 # with the wrong permissions
2142 runcmd qw(chmod -R +rwX ../unpack-tar);
2143 changedir "../unpack-tar";
2144 my ($tree) = mktree_in_ud_from_only_subdir(1);
2145 changedir "../../unpack";
2146 rmtree "../unpack-tar";
2148 my $ent = [ $f, $tree ];
2150 Orig => !!$orig_f_part,
2151 Sort => (!$orig_f_part ? 2 :
2152 $orig_f_part =~ m/-/g ? 1 :
2160 # put any without "_" first (spec is not clear whether files
2161 # are always in the usual order). Tarballs without "_" are
2162 # the main orig or the debian tarball.
2163 $a->{Sort} <=> $b->{Sort} or
2167 my $any_orig = grep { $_->{Orig} } @tartrees;
2169 my $dscfn = "$package.dsc";
2171 my $treeimporthow = 'package';
2173 open D, ">", $dscfn or die "$dscfn: $!";
2174 print D $dscdata or die "$dscfn: $!";
2175 close D or die "$dscfn: $!";
2176 my @cmd = qw(dpkg-source);
2177 push @cmd, '--no-check' if $dsc_checked;
2178 if (madformat $dsc->{format}) {
2179 push @cmd, '--skip-patches';
2180 $treeimporthow = 'unpatched';
2182 push @cmd, qw(-x --), $dscfn;
2185 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2186 if (madformat $dsc->{format}) {
2187 check_for_vendor_patches();
2191 if (madformat $dsc->{format}) {
2192 my @pcmd = qw(dpkg-source --before-build .);
2193 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2195 runcmd @git, qw(add -Af);
2196 $dappliedtree = git_write_tree();
2199 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2200 debugcmd "|",@clogcmd;
2201 open CLOGS, "-|", @clogcmd or die $!;
2206 printdebug "import clog search...\n";
2209 my $stanzatext = do { local $/=""; <CLOGS>; };
2210 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2211 last if !defined $stanzatext;
2213 my $desc = "package changelog, entry no.$.";
2214 open my $stanzafh, "<", \$stanzatext or die;
2215 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2216 $clogp //= $thisstanza;
2218 printdebug "import clog $thisstanza->{version} $desc...\n";
2220 last if !$any_orig; # we don't need $r1clogp
2222 # We look for the first (most recent) changelog entry whose
2223 # version number is lower than the upstream version of this
2224 # package. Then the last (least recent) previous changelog
2225 # entry is treated as the one which introduced this upstream
2226 # version and used for the synthetic commits for the upstream
2229 # One might think that a more sophisticated algorithm would be
2230 # necessary. But: we do not want to scan the whole changelog
2231 # file. Stopping when we see an earlier version, which
2232 # necessarily then is an earlier upstream version, is the only
2233 # realistic way to do that. Then, either the earliest
2234 # changelog entry we have seen so far is indeed the earliest
2235 # upload of this upstream version; or there are only changelog
2236 # entries relating to later upstream versions (which is not
2237 # possible unless the changelog and .dsc disagree about the
2238 # version). Then it remains to choose between the physically
2239 # last entry in the file, and the one with the lowest version
2240 # number. If these are not the same, we guess that the
2241 # versions were created in a non-monotic order rather than
2242 # that the changelog entries have been misordered.
2244 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2246 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2247 $r1clogp = $thisstanza;
2249 printdebug "import clog $r1clogp->{version} becomes r1\n";
2251 die $! if CLOGS->error;
2252 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2254 $clogp or fail "package changelog has no entries!";
2256 my $authline = clogp_authline $clogp;
2257 my $changes = getfield $clogp, 'Changes';
2258 my $cversion = getfield $clogp, 'Version';
2261 $r1clogp //= $clogp; # maybe there's only one entry;
2262 my $r1authline = clogp_authline $r1clogp;
2263 # Strictly, r1authline might now be wrong if it's going to be
2264 # unused because !$any_orig. Whatever.
2266 printdebug "import tartrees authline $authline\n";
2267 printdebug "import tartrees r1authline $r1authline\n";
2269 foreach my $tt (@tartrees) {
2270 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2272 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2275 committer $r1authline
2279 [dgit import orig $tt->{F}]
2287 [dgit import tarball $package $cversion $tt->{F}]
2292 printdebug "import main commit\n";
2294 open C, ">../commit.tmp" or die $!;
2295 print C <<END or die $!;
2298 print C <<END or die $! foreach @tartrees;
2301 print C <<END or die $!;
2307 [dgit import $treeimporthow $package $cversion]
2311 my $rawimport_hash = make_commit qw(../commit.tmp);
2313 if (madformat $dsc->{format}) {
2314 printdebug "import apply patches...\n";
2316 # regularise the state of the working tree so that
2317 # the checkout of $rawimport_hash works nicely.
2318 my $dappliedcommit = make_commit_text(<<END);
2325 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2327 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2329 # We need the answers to be reproducible
2330 my @authline = clogp_authline($clogp);
2331 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2332 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2333 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2334 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2335 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2336 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2338 my $path = $ENV{PATH} or die;
2340 foreach my $use_absurd (qw(0 1)) {
2341 local $ENV{PATH} = $path;
2344 progress "warning: $@";
2345 $path = "$absurdity:$path";
2346 progress "$us: trying slow absurd-git-apply...";
2347 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2352 die "forbid absurd git-apply\n" if $use_absurd
2353 && forceing [qw(import-gitapply-no-absurd)];
2354 die "only absurd git-apply!\n" if !$use_absurd
2355 && forceing [qw(import-gitapply-absurd)];
2357 local $ENV{PATH} = $path if $use_absurd;
2359 my @showcmd = (gbp_pq, qw(import));
2360 my @realcmd = shell_cmd
2361 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2362 debugcmd "+",@realcmd;
2363 if (system @realcmd) {
2364 die +(shellquote @showcmd).
2366 failedcmd_waitstatus()."\n";
2369 my $gapplied = git_rev_parse('HEAD');
2370 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2371 $gappliedtree eq $dappliedtree or
2373 gbp-pq import and dpkg-source disagree!
2374 gbp-pq import gave commit $gapplied
2375 gbp-pq import gave tree $gappliedtree
2376 dpkg-source --before-build gave tree $dappliedtree
2378 $rawimport_hash = $gapplied;
2383 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2388 progress "synthesised git commit from .dsc $cversion";
2390 my $rawimport_mergeinput = {
2391 Commit => $rawimport_hash,
2392 Info => "Import of source package",
2394 my @output = ($rawimport_mergeinput);
2396 if ($lastpush_mergeinput) {
2397 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2398 my $oversion = getfield $oldclogp, 'Version';
2400 version_compare($oversion, $cversion);
2402 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2403 { Message => <<END, ReverseParents => 1 });
2404 Record $package ($cversion) in archive suite $csuite
2406 } elsif ($vcmp > 0) {
2407 print STDERR <<END or die $!;
2409 Version actually in archive: $cversion (older)
2410 Last version pushed with dgit: $oversion (newer or same)
2413 @output = $lastpush_mergeinput;
2415 # Same version. Use what's in the server git branch,
2416 # discarding our own import. (This could happen if the
2417 # server automatically imports all packages into git.)
2418 @output = $lastpush_mergeinput;
2421 changedir '../../../..';
2426 sub complete_file_from_dsc ($$) {
2427 our ($dstdir, $fi) = @_;
2428 # Ensures that we have, in $dir, the file $fi, with the correct
2429 # contents. (Downloading it from alongside $dscurl if necessary.)
2431 my $f = $fi->{Filename};
2432 my $tf = "$dstdir/$f";
2435 if (stat_exists $tf) {
2436 progress "using existing $f";
2438 printdebug "$tf does not exist, need to fetch\n";
2440 $furl =~ s{/[^/]+$}{};
2442 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2443 die "$f ?" if $f =~ m#/#;
2444 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2445 return 0 if !act_local();
2449 open F, "<", "$tf" or die "$tf: $!";
2450 $fi->{Digester}->reset();
2451 $fi->{Digester}->addfile(*F);
2452 F->error and die $!;
2453 my $got = $fi->{Digester}->hexdigest();
2454 $got eq $fi->{Hash} or
2455 fail "file $f has hash $got but .dsc".
2456 " demands hash $fi->{Hash} ".
2457 ($downloaded ? "(got wrong file from archive!)"
2458 : "(perhaps you should delete this file?)");
2463 sub ensure_we_have_orig () {
2464 my @dfi = dsc_files_info();
2465 foreach my $fi (@dfi) {
2466 my $f = $fi->{Filename};
2467 next unless is_orig_file_in_dsc($f, \@dfi);
2468 complete_file_from_dsc('..', $fi)
2473 sub git_fetch_us () {
2474 # Want to fetch only what we are going to use, unless
2475 # deliberately-not-ff, in which case we must fetch everything.
2477 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2479 (quiltmode_splitbrain
2480 ? (map { $_->('*',access_nomdistro) }
2481 \&debiantag_new, \&debiantag_maintview)
2482 : debiantags('*',access_nomdistro));
2483 push @specs, server_branch($csuite);
2484 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2486 # This is rather miserable:
2487 # When git fetch --prune is passed a fetchspec ending with a *,
2488 # it does a plausible thing. If there is no * then:
2489 # - it matches subpaths too, even if the supplied refspec
2490 # starts refs, and behaves completely madly if the source
2491 # has refs/refs/something. (See, for example, Debian #NNNN.)
2492 # - if there is no matching remote ref, it bombs out the whole
2494 # We want to fetch a fixed ref, and we don't know in advance
2495 # if it exists, so this is not suitable.
2497 # Our workaround is to use git ls-remote. git ls-remote has its
2498 # own qairks. Notably, it has the absurd multi-tail-matching
2499 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2500 # refs/refs/foo etc.
2502 # Also, we want an idempotent snapshot, but we have to make two
2503 # calls to the remote: one to git ls-remote and to git fetch. The
2504 # solution is use git ls-remote to obtain a target state, and
2505 # git fetch to try to generate it. If we don't manage to generate
2506 # the target state, we try again.
2508 printdebug "git_fetch_us specs @specs\n";
2510 my $specre = join '|', map {
2516 printdebug "git_fetch_us specre=$specre\n";
2517 my $wanted_rref = sub {
2519 return m/^(?:$specre)$/o;
2522 my $fetch_iteration = 0;
2525 printdebug "git_fetch_us iteration $fetch_iteration\n";
2526 if (++$fetch_iteration > 10) {
2527 fail "too many iterations trying to get sane fetch!";
2530 my @look = map { "refs/$_" } @specs;
2531 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2535 open GITLS, "-|", @lcmd or die $!;
2537 printdebug "=> ", $_;
2538 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2539 my ($objid,$rrefname) = ($1,$2);
2540 if (!$wanted_rref->($rrefname)) {
2542 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2546 $wantr{$rrefname} = $objid;
2549 close GITLS or failedcmd @lcmd;
2551 # OK, now %want is exactly what we want for refs in @specs
2553 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2554 "+refs/$_:".lrfetchrefs."/$_";
2557 printdebug "git_fetch_us fspecs @fspecs\n";
2559 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2560 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2563 %lrfetchrefs_f = ();
2566 git_for_each_ref(lrfetchrefs, sub {
2567 my ($objid,$objtype,$lrefname,$reftail) = @_;
2568 $lrfetchrefs_f{$lrefname} = $objid;
2569 $objgot{$objid} = 1;
2572 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2573 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2574 if (!exists $wantr{$rrefname}) {
2575 if ($wanted_rref->($rrefname)) {
2577 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2581 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2584 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2585 delete $lrfetchrefs_f{$lrefname};
2589 foreach my $rrefname (sort keys %wantr) {
2590 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2591 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2592 my $want = $wantr{$rrefname};
2593 next if $got eq $want;
2594 if (!defined $objgot{$want}) {
2596 warning: git ls-remote suggests we want $lrefname
2597 warning: and it should refer to $want
2598 warning: but git fetch didn't fetch that object to any relevant ref.
2599 warning: This may be due to a race with someone updating the server.
2600 warning: Will try again...
2602 next FETCH_ITERATION;
2605 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2607 runcmd_ordryrun_local @git, qw(update-ref -m),
2608 "dgit fetch git fetch fixup", $lrefname, $want;
2609 $lrfetchrefs_f{$lrefname} = $want;
2613 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2614 Dumper(\%lrfetchrefs_f);
2617 my @tagpats = debiantags('*',access_nomdistro);
2619 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2620 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2621 printdebug "currently $fullrefname=$objid\n";
2622 $here{$fullrefname} = $objid;
2624 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2625 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2626 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2627 printdebug "offered $lref=$objid\n";
2628 if (!defined $here{$lref}) {
2629 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2630 runcmd_ordryrun_local @upd;
2631 lrfetchref_used $fullrefname;
2632 } elsif ($here{$lref} eq $objid) {
2633 lrfetchref_used $fullrefname;
2636 "Not updateting $lref from $here{$lref} to $objid.\n";
2641 sub mergeinfo_getclogp ($) {
2642 # Ensures thit $mi->{Clogp} exists and returns it
2644 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2647 sub mergeinfo_version ($) {
2648 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2651 sub fetch_from_archive () {
2652 ensure_setup_existing_tree();
2654 # Ensures that lrref() is what is actually in the archive, one way
2655 # or another, according to us - ie this client's
2656 # appropritaely-updated archive view. Also returns the commit id.
2657 # If there is nothing in the archive, leaves lrref alone and
2658 # returns undef. git_fetch_us must have already been called.
2662 foreach my $field (@ourdscfield) {
2663 $dsc_hash = $dsc->{$field};
2664 last if defined $dsc_hash;
2666 if (defined $dsc_hash) {
2667 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2669 progress "last upload to archive specified git hash";
2671 progress "last upload to archive has NO git hash";
2674 progress "no version available from the archive";
2677 # If the archive's .dsc has a Dgit field, there are three
2678 # relevant git commitids we need to choose between and/or merge
2680 # 1. $dsc_hash: the Dgit field from the archive
2681 # 2. $lastpush_hash: the suite branch on the dgit git server
2682 # 3. $lastfetch_hash: our local tracking brach for the suite
2684 # These may all be distinct and need not be in any fast forward
2687 # If the dsc was pushed to this suite, then the server suite
2688 # branch will have been updated; but it might have been pushed to
2689 # a different suite and copied by the archive. Conversely a more
2690 # recent version may have been pushed with dgit but not appeared
2691 # in the archive (yet).
2693 # $lastfetch_hash may be awkward because archive imports
2694 # (particularly, imports of Dgit-less .dscs) are performed only as
2695 # needed on individual clients, so different clients may perform a
2696 # different subset of them - and these imports are only made
2697 # public during push. So $lastfetch_hash may represent a set of
2698 # imports different to a subsequent upload by a different dgit
2701 # Our approach is as follows:
2703 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2704 # descendant of $dsc_hash, then it was pushed by a dgit user who
2705 # had based their work on $dsc_hash, so we should prefer it.
2706 # Otherwise, $dsc_hash was installed into this suite in the
2707 # archive other than by a dgit push, and (necessarily) after the
2708 # last dgit push into that suite (since a dgit push would have
2709 # been descended from the dgit server git branch); thus, in that
2710 # case, we prefer the archive's version (and produce a
2711 # pseudo-merge to overwrite the dgit server git branch).
2713 # (If there is no Dgit field in the archive's .dsc then
2714 # generate_commit_from_dsc uses the version numbers to decide
2715 # whether the suite branch or the archive is newer. If the suite
2716 # branch is newer it ignores the archive's .dsc; otherwise it
2717 # generates an import of the .dsc, and produces a pseudo-merge to
2718 # overwrite the suite branch with the archive contents.)
2720 # The outcome of that part of the algorithm is the `public view',
2721 # and is same for all dgit clients: it does not depend on any
2722 # unpublished history in the local tracking branch.
2724 # As between the public view and the local tracking branch: The
2725 # local tracking branch is only updated by dgit fetch, and
2726 # whenever dgit fetch runs it includes the public view in the
2727 # local tracking branch. Therefore if the public view is not
2728 # descended from the local tracking branch, the local tracking
2729 # branch must contain history which was imported from the archive
2730 # but never pushed; and, its tip is now out of date. So, we make
2731 # a pseudo-merge to overwrite the old imports and stitch the old
2734 # Finally: we do not necessarily reify the public view (as
2735 # described above). This is so that we do not end up stacking two
2736 # pseudo-merges. So what we actually do is figure out the inputs
2737 # to any public view pseudo-merge and put them in @mergeinputs.
2740 # $mergeinputs[]{Commit}
2741 # $mergeinputs[]{Info}
2742 # $mergeinputs[0] is the one whose tree we use
2743 # @mergeinputs is in the order we use in the actual commit)
2746 # $mergeinputs[]{Message} is a commit message to use
2747 # $mergeinputs[]{ReverseParents} if def specifies that parent
2748 # list should be in opposite order
2749 # Such an entry has no Commit or Info. It applies only when found
2750 # in the last entry. (This ugliness is to support making
2751 # identical imports to previous dgit versions.)
2753 my $lastpush_hash = git_get_ref(lrfetchref());
2754 printdebug "previous reference hash=$lastpush_hash\n";
2755 $lastpush_mergeinput = $lastpush_hash && {
2756 Commit => $lastpush_hash,
2757 Info => "dgit suite branch on dgit git server",
2760 my $lastfetch_hash = git_get_ref(lrref());
2761 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2762 my $lastfetch_mergeinput = $lastfetch_hash && {
2763 Commit => $lastfetch_hash,
2764 Info => "dgit client's archive history view",
2767 my $dsc_mergeinput = $dsc_hash && {
2768 Commit => $dsc_hash,
2769 Info => "Dgit field in .dsc from archive",
2773 my $del_lrfetchrefs = sub {
2776 printdebug "del_lrfetchrefs...\n";
2777 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2778 my $objid = $lrfetchrefs_d{$fullrefname};
2779 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2781 $gur ||= new IO::Handle;
2782 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2784 printf $gur "delete %s %s\n", $fullrefname, $objid;
2787 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2791 if (defined $dsc_hash) {
2792 ensure_we_have_orig();
2793 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2794 @mergeinputs = $dsc_mergeinput
2795 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2796 print STDERR <<END or die $!;
2798 Git commit in archive is behind the last version allegedly pushed/uploaded.
2799 Commit referred to by archive: $dsc_hash
2800 Last version pushed with dgit: $lastpush_hash
2803 @mergeinputs = ($lastpush_mergeinput);
2805 # Archive has .dsc which is not a descendant of the last dgit
2806 # push. This can happen if the archive moves .dscs about.
2807 # Just follow its lead.
2808 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2809 progress "archive .dsc names newer git commit";
2810 @mergeinputs = ($dsc_mergeinput);
2812 progress "archive .dsc names other git commit, fixing up";
2813 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2817 @mergeinputs = generate_commits_from_dsc();
2818 # We have just done an import. Now, our import algorithm might
2819 # have been improved. But even so we do not want to generate
2820 # a new different import of the same package. So if the
2821 # version numbers are the same, just use our existing version.
2822 # If the version numbers are different, the archive has changed
2823 # (perhaps, rewound).
2824 if ($lastfetch_mergeinput &&
2825 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2826 (mergeinfo_version $mergeinputs[0]) )) {
2827 @mergeinputs = ($lastfetch_mergeinput);
2829 } elsif ($lastpush_hash) {
2830 # only in git, not in the archive yet
2831 @mergeinputs = ($lastpush_mergeinput);
2832 print STDERR <<END or die $!;
2834 Package not found in the archive, but has allegedly been pushed using dgit.
2838 printdebug "nothing found!\n";
2839 if (defined $skew_warning_vsn) {
2840 print STDERR <<END or die $!;
2842 Warning: relevant archive skew detected.
2843 Archive allegedly contains $skew_warning_vsn
2844 But we were not able to obtain any version from the archive or git.
2848 unshift @end, $del_lrfetchrefs;
2852 if ($lastfetch_hash &&
2854 my $h = $_->{Commit};
2855 $h and is_fast_fwd($lastfetch_hash, $h);
2856 # If true, one of the existing parents of this commit
2857 # is a descendant of the $lastfetch_hash, so we'll
2858 # be ff from that automatically.
2862 push @mergeinputs, $lastfetch_mergeinput;
2865 printdebug "fetch mergeinfos:\n";
2866 foreach my $mi (@mergeinputs) {
2868 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2870 printdebug sprintf " ReverseParents=%d Message=%s",
2871 $mi->{ReverseParents}, $mi->{Message};
2875 my $compat_info= pop @mergeinputs
2876 if $mergeinputs[$#mergeinputs]{Message};
2878 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2881 if (@mergeinputs > 1) {
2883 my $tree_commit = $mergeinputs[0]{Commit};
2885 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2886 $tree =~ m/\n\n/; $tree = $`;
2887 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2890 # We use the changelog author of the package in question the
2891 # author of this pseudo-merge. This is (roughly) correct if
2892 # this commit is simply representing aa non-dgit upload.
2893 # (Roughly because it does not record sponsorship - but we
2894 # don't have sponsorship info because that's in the .changes,
2895 # which isn't in the archivw.)
2897 # But, it might be that we are representing archive history
2898 # updates (including in-archive copies). These are not really
2899 # the responsibility of the person who created the .dsc, but
2900 # there is no-one whose name we should better use. (The
2901 # author of the .dsc-named commit is clearly worse.)
2903 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2904 my $author = clogp_authline $useclogp;
2905 my $cversion = getfield $useclogp, 'Version';
2907 my $mcf = ".git/dgit/mergecommit";
2908 open MC, ">", $mcf or die "$mcf $!";
2909 print MC <<END or die $!;
2913 my @parents = grep { $_->{Commit} } @mergeinputs;
2914 @parents = reverse @parents if $compat_info->{ReverseParents};
2915 print MC <<END or die $! foreach @parents;
2919 print MC <<END or die $!;
2925 if (defined $compat_info->{Message}) {
2926 print MC $compat_info->{Message} or die $!;
2928 print MC <<END or die $!;
2929 Record $package ($cversion) in archive suite $csuite
2933 my $message_add_info = sub {
2935 my $mversion = mergeinfo_version $mi;
2936 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2940 $message_add_info->($mergeinputs[0]);
2941 print MC <<END or die $!;
2942 should be treated as descended from
2944 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2948 $hash = make_commit $mcf;
2950 $hash = $mergeinputs[0]{Commit};
2952 printdebug "fetch hash=$hash\n";
2955 my ($lasth, $what) = @_;
2956 return unless $lasth;
2957 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2960 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2962 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2964 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2965 'DGIT_ARCHIVE', $hash;
2966 cmdoutput @git, qw(log -n2), $hash;
2967 # ... gives git a chance to complain if our commit is malformed
2969 if (defined $skew_warning_vsn) {
2971 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2972 my $gotclogp = commit_getclogp($hash);
2973 my $got_vsn = getfield $gotclogp, 'Version';
2974 printdebug "SKEW CHECK GOT $got_vsn\n";
2975 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2976 print STDERR <<END or die $!;
2978 Warning: archive skew detected. Using the available version:
2979 Archive allegedly contains $skew_warning_vsn
2980 We were able to obtain only $got_vsn
2986 if ($lastfetch_hash ne $hash) {
2987 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2991 dryrun_report @upd_cmd;
2995 lrfetchref_used lrfetchref();
2997 unshift @end, $del_lrfetchrefs;
3001 sub set_local_git_config ($$) {
3003 runcmd @git, qw(config), $k, $v;
3006 sub setup_mergechangelogs (;$) {
3008 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3010 my $driver = 'dpkg-mergechangelogs';
3011 my $cb = "merge.$driver";
3012 my $attrs = '.git/info/attributes';
3013 ensuredir '.git/info';
3015 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3016 if (!open ATTRS, "<", $attrs) {
3017 $!==ENOENT or die "$attrs: $!";
3021 next if m{^debian/changelog\s};
3022 print NATTRS $_, "\n" or die $!;
3024 ATTRS->error and die $!;
3027 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3030 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3031 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3033 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3036 sub setup_useremail (;$) {
3038 return unless $always || access_cfg_bool(1, 'setup-useremail');
3041 my ($k, $envvar) = @_;
3042 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3043 return unless defined $v;
3044 set_local_git_config "user.$k", $v;
3047 $setup->('email', 'DEBEMAIL');
3048 $setup->('name', 'DEBFULLNAME');
3051 sub ensure_setup_existing_tree () {
3052 my $k = "remote.$remotename.skipdefaultupdate";
3053 my $c = git_get_config $k;
3054 return if defined $c;
3055 set_local_git_config $k, 'true';
3058 sub setup_new_tree () {
3059 setup_mergechangelogs();
3065 canonicalise_suite();
3066 badusage "dry run makes no sense with clone" unless act_local();
3067 my $hasgit = check_for_git();
3068 mkdir $dstdir or fail "create \`$dstdir': $!";
3070 runcmd @git, qw(init -q);
3071 my $giturl = access_giturl(1);
3072 if (defined $giturl) {
3073 open H, "> .git/HEAD" or die $!;
3074 print H "ref: ".lref()."\n" or die $!;
3076 runcmd @git, qw(remote add), 'origin', $giturl;
3079 progress "fetching existing git history";
3081 runcmd_ordryrun_local @git, qw(fetch origin);
3083 progress "starting new git history";
3085 fetch_from_archive() or no_such_package;
3086 my $vcsgiturl = $dsc->{'Vcs-Git'};
3087 if (length $vcsgiturl) {
3088 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3089 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3092 runcmd @git, qw(reset --hard), lrref();
3093 runcmd qw(bash -ec), <<'END';
3095 git ls-tree -r --name-only -z HEAD | \
3096 xargs -0r touch -r . --
3098 printdone "ready for work in $dstdir";
3102 if (check_for_git()) {
3105 fetch_from_archive() or no_such_package();
3106 printdone "fetched into ".lrref();
3111 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3113 printdone "fetched to ".lrref()." and merged into HEAD";
3116 sub check_not_dirty () {
3117 foreach my $f (qw(local-options local-patch-header)) {
3118 if (stat_exists "debian/source/$f") {
3119 fail "git tree contains debian/source/$f";
3123 return if $ignoredirty;
3125 my @cmd = (@git, qw(diff --quiet HEAD));
3127 $!=0; $?=-1; system @cmd;
3130 fail "working tree is dirty (does not match HEAD)";
3136 sub commit_admin ($) {
3139 runcmd_ordryrun_local @git, qw(commit -m), $m;
3142 sub commit_quilty_patch () {
3143 my $output = cmdoutput @git, qw(status --porcelain);
3145 foreach my $l (split /\n/, $output) {
3146 next unless $l =~ m/\S/;
3147 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3151 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3153 progress "nothing quilty to commit, ok.";
3156 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3157 runcmd_ordryrun_local @git, qw(add -f), @adds;
3159 Commit Debian 3.0 (quilt) metadata
3161 [dgit ($our_version) quilt-fixup]
3165 sub get_source_format () {
3167 if (open F, "debian/source/options") {
3171 s/\s+$//; # ignore missing final newline
3173 my ($k, $v) = ($`, $'); #');
3174 $v =~ s/^"(.*)"$/$1/;
3180 F->error and die $!;
3183 die $! unless $!==&ENOENT;
3186 if (!open F, "debian/source/format") {
3187 die $! unless $!==&ENOENT;
3191 F->error and die $!;
3193 return ($_, \%options);
3196 sub madformat_wantfixup ($) {
3198 return 0 unless $format eq '3.0 (quilt)';
3199 our $quilt_mode_warned;
3200 if ($quilt_mode eq 'nocheck') {
3201 progress "Not doing any fixup of \`$format' due to".
3202 " ----no-quilt-fixup or --quilt=nocheck"
3203 unless $quilt_mode_warned++;
3206 progress "Format \`$format', need to check/update patch stack"
3207 unless $quilt_mode_warned++;
3211 sub maybe_split_brain_save ($$$) {
3212 my ($headref, $dgitview, $msg) = @_;
3213 # => message fragment "$saved" describing disposition of $dgitview
3214 return "commit id $dgitview" unless defined $split_brain_save;
3215 my @cmd = (shell_cmd "cd ../../../..",
3216 @git, qw(update-ref -m),
3217 "dgit --dgit-view-save $msg HEAD=$headref",
3218 $split_brain_save, $dgitview);
3220 return "and left in $split_brain_save";
3223 # An "infopair" is a tuple [ $thing, $what ]
3224 # (often $thing is a commit hash; $what is a description)
3226 sub infopair_cond_equal ($$) {
3228 $x->[0] eq $y->[0] or fail <<END;
3229 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3233 sub infopair_lrf_tag_lookup ($$) {
3234 my ($tagnames, $what) = @_;
3235 # $tagname may be an array ref
3236 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3237 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3238 foreach my $tagname (@tagnames) {
3239 my $lrefname = lrfetchrefs."/tags/$tagname";
3240 my $tagobj = $lrfetchrefs_f{$lrefname};
3241 next unless defined $tagobj;
3242 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3243 return [ git_rev_parse($tagobj), $what ];
3245 fail @tagnames==1 ? <<END : <<END;
3246 Wanted tag $what (@tagnames) on dgit server, but not found
3248 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3252 sub infopair_cond_ff ($$) {
3253 my ($anc,$desc) = @_;
3254 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3255 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3259 sub pseudomerge_version_check ($$) {
3260 my ($clogp, $archive_hash) = @_;
3262 my $arch_clogp = commit_getclogp $archive_hash;
3263 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3264 'version currently in archive' ];
3265 if (defined $overwrite_version) {
3266 if (length $overwrite_version) {
3267 infopair_cond_equal([ $overwrite_version,
3268 '--overwrite= version' ],
3271 my $v = $i_arch_v->[0];
3272 progress "Checking package changelog for archive version $v ...";
3274 my @xa = ("-f$v", "-t$v");
3275 my $vclogp = parsechangelog @xa;
3276 my $cv = [ (getfield $vclogp, 'Version'),
3277 "Version field from dpkg-parsechangelog @xa" ];
3278 infopair_cond_equal($i_arch_v, $cv);
3281 $@ =~ s/^dgit: //gm;
3283 "Perhaps debian/changelog does not mention $v ?";
3288 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3292 sub pseudomerge_make_commit ($$$$ $$) {
3293 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3294 $msg_cmd, $msg_msg) = @_;
3295 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3297 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3298 my $authline = clogp_authline $clogp;
3302 !defined $overwrite_version ? ""
3303 : !length $overwrite_version ? " --overwrite"
3304 : " --overwrite=".$overwrite_version;
3307 my $pmf = ".git/dgit/pseudomerge";
3308 open MC, ">", $pmf or die "$pmf $!";
3309 print MC <<END or die $!;
3312 parent $archive_hash
3322 return make_commit($pmf);
3325 sub splitbrain_pseudomerge ($$$$) {
3326 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3327 # => $merged_dgitview
3328 printdebug "splitbrain_pseudomerge...\n";
3330 # We: debian/PREVIOUS HEAD($maintview)
3331 # expect: o ----------------- o
3334 # a/d/PREVIOUS $dgitview
3337 # we do: `------------------ o
3341 return $dgitview unless defined $archive_hash;
3343 printdebug "splitbrain_pseudomerge...\n";
3345 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3347 if (!defined $overwrite_version) {
3348 progress "Checking that HEAD inciudes all changes in archive...";
3351 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3353 if (defined $overwrite_version) {
3355 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3356 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3357 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3358 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3359 my $i_archive = [ $archive_hash, "current archive contents" ];
3361 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3363 infopair_cond_equal($i_dgit, $i_archive);
3364 infopair_cond_ff($i_dep14, $i_dgit);
3365 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3369 $us: check failed (maybe --overwrite is needed, consult documentation)
3374 my $r = pseudomerge_make_commit
3375 $clogp, $dgitview, $archive_hash, $i_arch_v,
3376 "dgit --quilt=$quilt_mode",
3377 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3378 Declare fast forward from $i_arch_v->[0]
3380 Make fast forward from $i_arch_v->[0]
3383 maybe_split_brain_save $maintview, $r, "pseudomerge";
3385 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3389 sub plain_overwrite_pseudomerge ($$$) {
3390 my ($clogp, $head, $archive_hash) = @_;
3392 printdebug "plain_overwrite_pseudomerge...";
3394 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3396 return $head if is_fast_fwd $archive_hash, $head;
3398 my $m = "Declare fast forward from $i_arch_v->[0]";
3400 my $r = pseudomerge_make_commit
3401 $clogp, $head, $archive_hash, $i_arch_v,
3404 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3406 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3410 sub push_parse_changelog ($) {
3413 my $clogp = Dpkg::Control::Hash->new();
3414 $clogp->load($clogpfn) or die;
3416 my $clogpackage = getfield $clogp, 'Source';
3417 $package //= $clogpackage;
3418 fail "-p specified $package but changelog specified $clogpackage"
3419 unless $package eq $clogpackage;
3420 my $cversion = getfield $clogp, 'Version';
3421 my $tag = debiantag($cversion, access_nomdistro);
3422 runcmd @git, qw(check-ref-format), $tag;
3424 my $dscfn = dscfn($cversion);
3426 return ($clogp, $cversion, $dscfn);
3429 sub push_parse_dsc ($$$) {
3430 my ($dscfn,$dscfnwhat, $cversion) = @_;
3431 $dsc = parsecontrol($dscfn,$dscfnwhat);
3432 my $dversion = getfield $dsc, 'Version';
3433 my $dscpackage = getfield $dsc, 'Source';
3434 ($dscpackage eq $package && $dversion eq $cversion) or
3435 fail "$dscfn is for $dscpackage $dversion".
3436 " but debian/changelog is for $package $cversion";
3439 sub push_tagwants ($$$$) {
3440 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3443 TagFn => \&debiantag,
3448 if (defined $maintviewhead) {
3450 TagFn => \&debiantag_maintview,
3451 Objid => $maintviewhead,
3452 TfSuffix => '-maintview',
3456 foreach my $tw (@tagwants) {
3457 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3458 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3460 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3464 sub push_mktags ($$ $$ $) {
3466 $changesfile,$changesfilewhat,
3469 die unless $tagwants->[0]{View} eq 'dgit';
3471 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3472 $dsc->save("$dscfn.tmp") or die $!;
3474 my $changes = parsecontrol($changesfile,$changesfilewhat);
3475 foreach my $field (qw(Source Distribution Version)) {
3476 $changes->{$field} eq $clogp->{$field} or
3477 fail "changes field $field \`$changes->{$field}'".
3478 " does not match changelog \`$clogp->{$field}'";
3481 my $cversion = getfield $clogp, 'Version';
3482 my $clogsuite = getfield $clogp, 'Distribution';
3484 # We make the git tag by hand because (a) that makes it easier
3485 # to control the "tagger" (b) we can do remote signing
3486 my $authline = clogp_authline $clogp;
3487 my $delibs = join(" ", "",@deliberatelies);
3488 my $declaredistro = access_nomdistro();
3492 my $tfn = $tw->{Tfn};
3493 my $head = $tw->{Objid};
3494 my $tag = $tw->{Tag};
3496 open TO, '>', $tfn->('.tmp') or die $!;
3497 print TO <<END or die $!;
3504 if ($tw->{View} eq 'dgit') {
3505 print TO <<END or die $!;
3506 $package release $cversion for $clogsuite ($csuite) [dgit]
3507 [dgit distro=$declaredistro$delibs]
3509 foreach my $ref (sort keys %previously) {
3510 print TO <<END or die $!;
3511 [dgit previously:$ref=$previously{$ref}]
3514 } elsif ($tw->{View} eq 'maint') {
3515 print TO <<END or die $!;
3516 $package release $cversion for $clogsuite ($csuite)
3517 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3520 die Dumper($tw)."?";
3525 my $tagobjfn = $tfn->('.tmp');
3527 if (!defined $keyid) {
3528 $keyid = access_cfg('keyid','RETURN-UNDEF');
3530 if (!defined $keyid) {
3531 $keyid = getfield $clogp, 'Maintainer';
3533 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3534 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3535 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3536 push @sign_cmd, $tfn->('.tmp');
3537 runcmd_ordryrun @sign_cmd;
3539 $tagobjfn = $tfn->('.signed.tmp');
3540 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3541 $tfn->('.tmp'), $tfn->('.tmp.asc');
3547 my @r = map { $mktag->($_); } @$tagwants;
3551 sub sign_changes ($) {
3552 my ($changesfile) = @_;
3554 my @debsign_cmd = @debsign;
3555 push @debsign_cmd, "-k$keyid" if defined $keyid;
3556 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3557 push @debsign_cmd, $changesfile;
3558 runcmd_ordryrun @debsign_cmd;
3563 printdebug "actually entering push\n";
3565 supplementary_message(<<'END');
3566 Push failed, while checking state of the archive.
3567 You can retry the push, after fixing the problem, if you like.
3569 if (check_for_git()) {
3572 my $archive_hash = fetch_from_archive();
3573 if (!$archive_hash) {
3575 fail "package appears to be new in this suite;".
3576 " if this is intentional, use --new";
3579 supplementary_message(<<'END');
3580 Push failed, while preparing your push.
3581 You can retry the push, after fixing the problem, if you like.
3584 need_tagformat 'new', "quilt mode $quilt_mode"
3585 if quiltmode_splitbrain;
3589 access_giturl(); # check that success is vaguely likely
3592 my $clogpfn = ".git/dgit/changelog.822.tmp";
3593 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3595 responder_send_file('parsed-changelog', $clogpfn);
3597 my ($clogp, $cversion, $dscfn) =
3598 push_parse_changelog("$clogpfn");
3600 my $dscpath = "$buildproductsdir/$dscfn";
3601 stat_exists $dscpath or
3602 fail "looked for .dsc $dscfn, but $!;".
3603 " maybe you forgot to build";
3605 responder_send_file('dsc', $dscpath);
3607 push_parse_dsc($dscpath, $dscfn, $cversion);
3609 my $format = getfield $dsc, 'Format';
3610 printdebug "format $format\n";
3612 my $actualhead = git_rev_parse('HEAD');
3613 my $dgithead = $actualhead;
3614 my $maintviewhead = undef;
3616 my $upstreamversion = upstreamversion $clogp->{Version};
3618 if (madformat_wantfixup($format)) {
3619 # user might have not used dgit build, so maybe do this now:
3620 if (quiltmode_splitbrain()) {
3622 quilt_make_fake_dsc($upstreamversion);
3624 ($dgithead, $cachekey) =
3625 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3627 "--quilt=$quilt_mode but no cached dgit view:
3628 perhaps tree changed since dgit build[-source] ?";
3630 $dgithead = splitbrain_pseudomerge($clogp,
3631 $actualhead, $dgithead,
3633 $maintviewhead = $actualhead;
3634 changedir '../../../..';
3635 prep_ud(); # so _only_subdir() works, below
3637 commit_quilty_patch();
3641 if (defined $overwrite_version && !defined $maintviewhead) {
3642 $dgithead = plain_overwrite_pseudomerge($clogp,
3650 if ($archive_hash) {
3651 if (is_fast_fwd($archive_hash, $dgithead)) {
3653 } elsif (deliberately_not_fast_forward) {
3656 fail "dgit push: HEAD is not a descendant".
3657 " of the archive's version.\n".
3658 "To overwrite the archive's contents,".
3659 " pass --overwrite[=VERSION].\n".
3660 "To rewind history, if permitted by the archive,".
3661 " use --deliberately-not-fast-forward.";
3666 progress "checking that $dscfn corresponds to HEAD";
3667 runcmd qw(dpkg-source -x --),
3668 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3669 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3670 check_for_vendor_patches() if madformat($dsc->{format});
3671 changedir '../../../..';
3672 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3673 debugcmd "+",@diffcmd;
3675 my $r = system @diffcmd;
3678 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3680 HEAD specifies a different tree to $dscfn:
3682 Perhaps you forgot to build. Or perhaps there is a problem with your
3683 source tree (see dgit(7) for some hints). To see a full diff, run
3690 if (!$changesfile) {
3691 my $pat = changespat $cversion;
3692 my @cs = glob "$buildproductsdir/$pat";
3693 fail "failed to find unique changes file".
3694 " (looked for $pat in $buildproductsdir);".
3695 " perhaps you need to use dgit -C"
3697 ($changesfile) = @cs;
3699 $changesfile = "$buildproductsdir/$changesfile";
3702 # Check that changes and .dsc agree enough
3703 $changesfile =~ m{[^/]*$};
3704 my $changes = parsecontrol($changesfile,$&);
3705 files_compare_inputs($dsc, $changes)
3706 unless forceing [qw(dsc-changes-mismatch)];
3708 # Perhaps adjust .dsc to contain right set of origs
3709 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3711 unless forceing [qw(changes-origs-exactly)];
3713 # Checks complete, we're going to try and go ahead:
3715 responder_send_file('changes',$changesfile);
3716 responder_send_command("param head $dgithead");
3717 responder_send_command("param csuite $csuite");
3718 responder_send_command("param tagformat $tagformat");
3719 if (defined $maintviewhead) {
3720 die unless ($protovsn//4) >= 4;
3721 responder_send_command("param maint-view $maintviewhead");
3724 if (deliberately_not_fast_forward) {
3725 git_for_each_ref(lrfetchrefs, sub {
3726 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3727 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3728 responder_send_command("previously $rrefname=$objid");
3729 $previously{$rrefname} = $objid;
3733 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3737 supplementary_message(<<'END');
3738 Push failed, while signing the tag.
3739 You can retry the push, after fixing the problem, if you like.
3741 # If we manage to sign but fail to record it anywhere, it's fine.
3742 if ($we_are_responder) {
3743 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3744 responder_receive_files('signed-tag', @tagobjfns);
3746 @tagobjfns = push_mktags($clogp,$dscpath,
3747 $changesfile,$changesfile,
3750 supplementary_message(<<'END');
3751 Push failed, *after* signing the tag.
3752 If you want to try again, you should use a new version number.
3755 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3757 foreach my $tw (@tagwants) {
3758 my $tag = $tw->{Tag};
3759 my $tagobjfn = $tw->{TagObjFn};
3761 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3762 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3763 runcmd_ordryrun_local
3764 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3767 supplementary_message(<<'END');
3768 Push failed, while updating the remote git repository - see messages above.
3769 If you want to try again, you should use a new version number.
3771 if (!check_for_git()) {
3772 create_remote_git_repo();
3775 my @pushrefs = $forceflag.$dgithead.":".rrref();
3776 foreach my $tw (@tagwants) {
3777 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3780 runcmd_ordryrun @git,
3781 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3782 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3784 supplementary_message(<<'END');
3785 Push failed, after updating the remote git repository.
3786 If you want to try again, you must use a new version number.
3788 if ($we_are_responder) {
3789 my $dryrunsuffix = act_local() ? "" : ".tmp";
3790 responder_receive_files('signed-dsc-changes',
3791 "$dscpath$dryrunsuffix",
3792 "$changesfile$dryrunsuffix");
3795 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3797 progress "[new .dsc left in $dscpath.tmp]";
3799 sign_changes $changesfile;
3802 supplementary_message(<<END);
3803 Push failed, while uploading package(s) to the archive server.
3804 You can retry the upload of exactly these same files with dput of:
3806 If that .changes file is broken, you will need to use a new version
3807 number for your next attempt at the upload.
3809 my $host = access_cfg('upload-host','RETURN-UNDEF');
3810 my @hostarg = defined($host) ? ($host,) : ();
3811 runcmd_ordryrun @dput, @hostarg, $changesfile;
3812 printdone "pushed and uploaded $cversion";
3814 supplementary_message('');
3815 responder_send_command("complete");
3822 badusage "-p is not allowed with clone; specify as argument instead"
3823 if defined $package;
3826 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3827 ($package,$isuite) = @ARGV;
3828 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3829 ($package,$dstdir) = @ARGV;
3830 } elsif (@ARGV==3) {
3831 ($package,$isuite,$dstdir) = @ARGV;
3833 badusage "incorrect arguments to dgit clone";
3835 $dstdir ||= "$package";
3837 if (stat_exists $dstdir) {
3838 fail "$dstdir already exists";
3842 if ($rmonerror && !$dryrun_level) {
3843 $cwd_remove= getcwd();
3845 return unless defined $cwd_remove;
3846 if (!chdir "$cwd_remove") {
3847 return if $!==&ENOENT;
3848 die "chdir $cwd_remove: $!";
3851 rmtree($dstdir) or die "remove $dstdir: $!\n";
3852 } elsif (grep { $! == $_ }
3853 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3855 print STDERR "check whether to remove $dstdir: $!\n";
3861 $cwd_remove = undef;
3864 sub branchsuite () {
3865 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3866 if ($branch =~ m#$lbranch_re#o) {
3873 sub fetchpullargs () {
3875 if (!defined $package) {
3876 my $sourcep = parsecontrol('debian/control','debian/control');
3877 $package = getfield $sourcep, 'Source';
3880 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3882 my $clogp = parsechangelog();
3883 $isuite = getfield $clogp, 'Distribution';
3885 canonicalise_suite();
3886 progress "fetching from suite $csuite";
3887 } elsif (@ARGV==1) {
3889 canonicalise_suite();
3891 badusage "incorrect arguments to dgit fetch or dgit pull";
3904 if (quiltmode_splitbrain()) {
3905 my ($format, $fopts) = get_source_format();
3906 madformat($format) and fail <<END
3907 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
3916 badusage "-p is not allowed with dgit push" if defined $package;
3918 my $clogp = parsechangelog();
3919 $package = getfield $clogp, 'Source';
3922 } elsif (@ARGV==1) {
3923 ($specsuite) = (@ARGV);
3925 badusage "incorrect arguments to dgit push";
3927 $isuite = getfield $clogp, 'Distribution';
3929 local ($package) = $existing_package; # this is a hack
3930 canonicalise_suite();
3932 canonicalise_suite();
3934 if (defined $specsuite &&
3935 $specsuite ne $isuite &&
3936 $specsuite ne $csuite) {
3937 fail "dgit push: changelog specifies $isuite ($csuite)".
3938 " but command line specifies $specsuite";
3943 #---------- remote commands' implementation ----------
3945 sub cmd_remote_push_build_host {
3946 my ($nrargs) = shift @ARGV;
3947 my (@rargs) = @ARGV[0..$nrargs-1];
3948 @ARGV = @ARGV[$nrargs..$#ARGV];
3950 my ($dir,$vsnwant) = @rargs;
3951 # vsnwant is a comma-separated list; we report which we have
3952 # chosen in our ready response (so other end can tell if they
3955 $we_are_responder = 1;
3956 $us .= " (build host)";
3960 open PI, "<&STDIN" or die $!;
3961 open STDIN, "/dev/null" or die $!;
3962 open PO, ">&STDOUT" or die $!;
3964 open STDOUT, ">&STDERR" or die $!;
3968 ($protovsn) = grep {
3969 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3970 } @rpushprotovsn_support;
3972 fail "build host has dgit rpush protocol versions ".
3973 (join ",", @rpushprotovsn_support).
3974 " but invocation host has $vsnwant"
3975 unless defined $protovsn;
3977 responder_send_command("dgit-remote-push-ready $protovsn");
3978 rpush_handle_protovsn_bothends();
3983 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3984 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3985 # a good error message)
3987 sub rpush_handle_protovsn_bothends () {
3988 if ($protovsn < 4) {
3989 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3998 my $report = i_child_report();
3999 if (defined $report) {
4000 printdebug "($report)\n";
4001 } elsif ($i_child_pid) {
4002 printdebug "(killing build host child $i_child_pid)\n";
4003 kill 15, $i_child_pid;
4005 if (defined $i_tmp && !defined $initiator_tempdir) {
4007 eval { rmtree $i_tmp; };
4011 END { i_cleanup(); }
4014 my ($base,$selector,@args) = @_;
4015 $selector =~ s/\-/_/g;
4016 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4023 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4031 push @rargs, join ",", @rpushprotovsn_support;
4034 push @rdgit, @ropts;
4035 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4037 my @cmd = (@ssh, $host, shellquote @rdgit);
4040 if (defined $initiator_tempdir) {
4041 rmtree $initiator_tempdir;
4042 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4043 $i_tmp = $initiator_tempdir;
4047 $i_child_pid = open2(\*RO, \*RI, @cmd);
4049 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4050 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4051 $supplementary_message = '' unless $protovsn >= 3;
4053 fail "rpush negotiated protocol version $protovsn".
4054 " which does not support quilt mode $quilt_mode"
4055 if quiltmode_splitbrain;
4057 rpush_handle_protovsn_bothends();
4059 my ($icmd,$iargs) = initiator_expect {
4060 m/^(\S+)(?: (.*))?$/;
4063 i_method "i_resp", $icmd, $iargs;
4067 sub i_resp_progress ($) {
4069 my $msg = protocol_read_bytes \*RO, $rhs;
4073 sub i_resp_supplementary_message ($) {
4075 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4078 sub i_resp_complete {
4079 my $pid = $i_child_pid;
4080 $i_child_pid = undef; # prevents killing some other process with same pid
4081 printdebug "waiting for build host child $pid...\n";
4082 my $got = waitpid $pid, 0;
4083 die $! unless $got == $pid;
4084 die "build host child failed $?" if $?;
4087 printdebug "all done\n";
4091 sub i_resp_file ($) {
4093 my $localname = i_method "i_localname", $keyword;
4094 my $localpath = "$i_tmp/$localname";
4095 stat_exists $localpath and
4096 badproto \*RO, "file $keyword ($localpath) twice";
4097 protocol_receive_file \*RO, $localpath;
4098 i_method "i_file", $keyword;
4103 sub i_resp_param ($) {
4104 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4108 sub i_resp_previously ($) {
4109 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4110 or badproto \*RO, "bad previously spec";
4111 my $r = system qw(git check-ref-format), $1;
4112 die "bad previously ref spec ($r)" if $r;
4113 $previously{$1} = $2;
4118 sub i_resp_want ($) {
4120 die "$keyword ?" if $i_wanted{$keyword}++;
4121 my @localpaths = i_method "i_want", $keyword;
4122 printdebug "[[ $keyword @localpaths\n";
4123 foreach my $localpath (@localpaths) {
4124 protocol_send_file \*RI, $localpath;
4126 print RI "files-end\n" or die $!;
4129 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4131 sub i_localname_parsed_changelog {
4132 return "remote-changelog.822";
4134 sub i_file_parsed_changelog {
4135 ($i_clogp, $i_version, $i_dscfn) =
4136 push_parse_changelog "$i_tmp/remote-changelog.822";
4137 die if $i_dscfn =~ m#/|^\W#;
4140 sub i_localname_dsc {
4141 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4146 sub i_localname_changes {
4147 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4148 $i_changesfn = $i_dscfn;
4149 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4150 return $i_changesfn;
4152 sub i_file_changes { }
4154 sub i_want_signed_tag {
4155 printdebug Dumper(\%i_param, $i_dscfn);
4156 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4157 && defined $i_param{'csuite'}
4158 or badproto \*RO, "premature desire for signed-tag";
4159 my $head = $i_param{'head'};
4160 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4162 my $maintview = $i_param{'maint-view'};
4163 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4166 if ($protovsn >= 4) {
4167 my $p = $i_param{'tagformat'} // '<undef>';
4169 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4172 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4174 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4176 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4179 push_mktags $i_clogp, $i_dscfn,
4180 $i_changesfn, 'remote changes',
4184 sub i_want_signed_dsc_changes {
4185 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4186 sign_changes $i_changesfn;
4187 return ($i_dscfn, $i_changesfn);
4190 #---------- building etc. ----------
4196 #----- `3.0 (quilt)' handling -----
4198 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4200 sub quiltify_dpkg_commit ($$$;$) {
4201 my ($patchname,$author,$msg, $xinfo) = @_;
4205 my $descfn = ".git/dgit/quilt-description.tmp";
4206 open O, '>', $descfn or die "$descfn: $!";
4207 $msg =~ s/\n+/\n\n/;
4208 print O <<END or die $!;
4210 ${xinfo}Subject: $msg
4217 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4218 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4219 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4220 runcmd @dpkgsource, qw(--commit .), $patchname;
4224 sub quiltify_trees_differ ($$;$$$) {
4225 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4226 # returns true iff the two tree objects differ other than in debian/
4227 # with $finegrained,
4228 # returns bitmask 01 - differ in upstream files except .gitignore
4229 # 02 - differ in .gitignore
4230 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4231 # is set for each modified .gitignore filename $fn
4232 # if $unrepres is defined, array ref to which is appeneded
4233 # a list of unrepresentable changes (removals of upstream files
4236 my @cmd = (@git, qw(diff-tree -z));
4237 push @cmd, qw(--name-only) unless $unrepres;
4238 push @cmd, qw(-r) if $finegrained || $unrepres;
4240 my $diffs= cmdoutput @cmd;
4243 foreach my $f (split /\0/, $diffs) {
4244 if ($unrepres && !@lmodes) {
4245 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4248 my ($oldmode,$newmode) = @lmodes;
4251 next if $f =~ m#^debian(?:/.*)?$#s;
4255 die "deleted\n" unless $newmode =~ m/[^0]/;
4256 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4257 if ($oldmode =~ m/[^0]/) {
4258 die "mode changed\n" if $oldmode ne $newmode;
4260 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4264 local $/="\n"; chomp $@;
4265 push @$unrepres, [ $f, $@ ];
4269 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4270 $r |= $isignore ? 02 : 01;
4271 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4273 printdebug "quiltify_trees_differ $x $y => $r\n";
4277 sub quiltify_tree_sentinelfiles ($) {
4278 # lists the `sentinel' files present in the tree
4280 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4281 qw(-- debian/rules debian/control);
4286 sub quiltify_splitbrain_needed () {
4287 if (!$split_brain) {
4288 progress "dgit view: changes are required...";
4289 runcmd @git, qw(checkout -q -b dgit-view);
4294 sub quiltify_splitbrain ($$$$$$) {
4295 my ($clogp, $unapplied, $headref, $diffbits,
4296 $editedignores, $cachekey) = @_;
4297 if ($quilt_mode !~ m/gbp|dpm/) {
4298 # treat .gitignore just like any other upstream file
4299 $diffbits = { %$diffbits };
4300 $_ = !!$_ foreach values %$diffbits;
4302 # We would like any commits we generate to be reproducible
4303 my @authline = clogp_authline($clogp);
4304 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4305 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4306 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4307 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4308 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4309 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4311 if ($quilt_mode =~ m/gbp|unapplied/ &&
4312 ($diffbits->{O2H} & 01)) {
4314 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4315 " but git tree differs from orig in upstream files.";
4316 if (!stat_exists "debian/patches") {
4318 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4322 if ($quilt_mode =~ m/dpm/ &&
4323 ($diffbits->{H2A} & 01)) {
4325 --quilt=$quilt_mode specified, implying patches-applied git tree
4326 but git tree differs from result of applying debian/patches to upstream
4329 if ($quilt_mode =~ m/gbp|unapplied/ &&
4330 ($diffbits->{O2A} & 01)) { # some patches
4331 quiltify_splitbrain_needed();
4332 progress "dgit view: creating patches-applied version using gbp pq";
4333 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4334 # gbp pq import creates a fresh branch; push back to dgit-view
4335 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4336 runcmd @git, qw(checkout -q dgit-view);
4338 if ($quilt_mode =~ m/gbp|dpm/ &&
4339 ($diffbits->{O2A} & 02)) {
4341 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4342 tool which does not create patches for changes to upstream
4343 .gitignores: but, such patches exist in debian/patches.
4346 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4347 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4348 quiltify_splitbrain_needed();
4349 progress "dgit view: creating patch to represent .gitignore changes";
4350 ensuredir "debian/patches";
4351 my $gipatch = "debian/patches/auto-gitignore";
4352 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4353 stat GIPATCH or die "$gipatch: $!";
4354 fail "$gipatch already exists; but want to create it".
4355 " to record .gitignore changes" if (stat _)[7];
4356 print GIPATCH <<END or die "$gipatch: $!";
4357 Subject: Update .gitignore from Debian packaging branch
4359 The Debian packaging git branch contains these updates to the upstream
4360 .gitignore file(s). This patch is autogenerated, to provide these
4361 updates to users of the official Debian archive view of the package.
4363 [dgit ($our_version) update-gitignore]
4366 close GIPATCH or die "$gipatch: $!";
4367 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4368 $unapplied, $headref, "--", sort keys %$editedignores;
4369 open SERIES, "+>>", "debian/patches/series" or die $!;
4370 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4372 defined read SERIES, $newline, 1 or die $!;
4373 print SERIES "\n" or die $! unless $newline eq "\n";
4374 print SERIES "auto-gitignore\n" or die $!;
4375 close SERIES or die $!;
4376 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4378 Commit patch to update .gitignore
4380 [dgit ($our_version) update-gitignore-quilt-fixup]
4384 my $dgitview = git_rev_parse 'HEAD';
4386 changedir '../../../..';
4387 # When we no longer need to support squeeze, use --create-reflog
4389 ensuredir ".git/logs/refs/dgit-intern";
4390 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4393 my $oldcache = git_get_ref "refs/$splitbraincache";
4394 if ($oldcache eq $dgitview) {
4395 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4396 # git update-ref doesn't always update, in this case. *sigh*
4397 my $dummy = make_commit_text <<END;
4400 author Dgit <dgit\@example.com> 1000000000 +0000
4401 committer Dgit <dgit\@example.com> 1000000000 +0000
4403 Dummy commit - do not use
4405 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4406 "refs/$splitbraincache", $dummy;
4408 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4411 changedir '.git/dgit/unpack/work';
4413 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4414 progress "dgit view: created ($saved)";
4417 sub quiltify ($$$$) {
4418 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4420 # Quilt patchification algorithm
4422 # We search backwards through the history of the main tree's HEAD
4423 # (T) looking for a start commit S whose tree object is identical
4424 # to to the patch tip tree (ie the tree corresponding to the
4425 # current dpkg-committed patch series). For these purposes
4426 # `identical' disregards anything in debian/ - this wrinkle is
4427 # necessary because dpkg-source treates debian/ specially.
4429 # We can only traverse edges where at most one of the ancestors'
4430 # trees differs (in changes outside in debian/). And we cannot
4431 # handle edges which change .pc/ or debian/patches. To avoid
4432 # going down a rathole we avoid traversing edges which introduce
4433 # debian/rules or debian/control. And we set a limit on the
4434 # number of edges we are willing to look at.
4436 # If we succeed, we walk forwards again. For each traversed edge
4437 # PC (with P parent, C child) (starting with P=S and ending with
4438 # C=T) to we do this:
4440 # - dpkg-source --commit with a patch name and message derived from C
4441 # After traversing PT, we git commit the changes which
4442 # should be contained within debian/patches.
4444 # The search for the path S..T is breadth-first. We maintain a
4445 # todo list containing search nodes. A search node identifies a
4446 # commit, and looks something like this:
4448 # Commit => $git_commit_id,
4449 # Child => $c, # or undef if P=T
4450 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4451 # Nontrivial => true iff $p..$c has relevant changes
4458 my %considered; # saves being exponential on some weird graphs
4460 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4463 my ($search,$whynot) = @_;
4464 printdebug " search NOT $search->{Commit} $whynot\n";
4465 $search->{Whynot} = $whynot;
4466 push @nots, $search;
4467 no warnings qw(exiting);
4476 my $c = shift @todo;
4477 next if $considered{$c->{Commit}}++;
4479 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4481 printdebug "quiltify investigate $c->{Commit}\n";
4484 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4485 printdebug " search finished hooray!\n";
4490 if ($quilt_mode eq 'nofix') {
4491 fail "quilt fixup required but quilt mode is \`nofix'\n".
4492 "HEAD commit $c->{Commit} differs from tree implied by ".
4493 " debian/patches (tree object $oldtiptree)";
4495 if ($quilt_mode eq 'smash') {
4496 printdebug " search quitting smash\n";
4500 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4501 $not->($c, "has $c_sentinels not $t_sentinels")
4502 if $c_sentinels ne $t_sentinels;
4504 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4505 $commitdata =~ m/\n\n/;
4507 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4508 @parents = map { { Commit => $_, Child => $c } } @parents;
4510 $not->($c, "root commit") if !@parents;
4512 foreach my $p (@parents) {
4513 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4515 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4516 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4518 foreach my $p (@parents) {
4519 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4521 my @cmd= (@git, qw(diff-tree -r --name-only),
4522 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4523 my $patchstackchange = cmdoutput @cmd;
4524 if (length $patchstackchange) {
4525 $patchstackchange =~ s/\n/,/g;
4526 $not->($p, "changed $patchstackchange");
4529 printdebug " search queue P=$p->{Commit} ",
4530 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4536 printdebug "quiltify want to smash\n";
4539 my $x = $_[0]{Commit};
4540 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4543 my $reportnot = sub {
4545 my $s = $abbrev->($notp);
4546 my $c = $notp->{Child};
4547 $s .= "..".$abbrev->($c) if $c;
4548 $s .= ": ".$notp->{Whynot};
4551 if ($quilt_mode eq 'linear') {
4552 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4553 foreach my $notp (@nots) {
4554 print STDERR "$us: ", $reportnot->($notp), "\n";
4556 print STDERR "$us: $_\n" foreach @$failsuggestion;
4557 fail "quilt fixup naive history linearisation failed.\n".
4558 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4559 } elsif ($quilt_mode eq 'smash') {
4560 } elsif ($quilt_mode eq 'auto') {
4561 progress "quilt fixup cannot be linear, smashing...";
4563 die "$quilt_mode ?";
4566 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4567 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4569 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4571 quiltify_dpkg_commit "auto-$version-$target-$time",
4572 (getfield $clogp, 'Maintainer'),
4573 "Automatically generated patch ($clogp->{Version})\n".
4574 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4578 progress "quiltify linearisation planning successful, executing...";
4580 for (my $p = $sref_S;
4581 my $c = $p->{Child};
4583 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4584 next unless $p->{Nontrivial};
4586 my $cc = $c->{Commit};
4588 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4589 $commitdata =~ m/\n\n/ or die "$c ?";
4592 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4595 my $commitdate = cmdoutput
4596 @git, qw(log -n1 --pretty=format:%aD), $cc;
4598 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4600 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4607 my $gbp_check_suitable = sub {
4612 die "contains unexpected slashes\n" if m{//} || m{/$};
4613 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4614 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4615 die "too long" if length > 200;
4617 return $_ unless $@;
4618 print STDERR "quiltifying commit $cc:".
4619 " ignoring/dropping Gbp-Pq $what: $@";
4623 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4625 (\S+) \s* \n //ixm) {
4626 $patchname = $gbp_check_suitable->($1, 'Name');
4628 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4630 (\S+) \s* \n //ixm) {
4631 $patchdir = $gbp_check_suitable->($1, 'Topic');
4636 if (!defined $patchname) {
4637 $patchname = $title;
4638 $patchname =~ s/[.:]$//;
4641 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4642 my $translitname = $converter->convert($patchname);
4643 die unless defined $translitname;
4644 $patchname = $translitname;
4647 "dgit: patch title transliteration error: $@"
4649 $patchname =~ y/ A-Z/-a-z/;
4650 $patchname =~ y/-a-z0-9_.+=~//cd;
4651 $patchname =~ s/^\W/x-$&/;
4652 $patchname = substr($patchname,0,40);
4654 if (!defined $patchdir) {
4657 if (length $patchdir) {
4658 $patchname = "$patchdir/$patchname";
4660 if ($patchname =~ m{^(.*)/}) {
4661 mkpath "debian/patches/$1";
4666 stat "debian/patches/$patchname$index";
4668 $!==ENOENT or die "$patchname$index $!";
4670 runcmd @git, qw(checkout -q), $cc;
4672 # We use the tip's changelog so that dpkg-source doesn't
4673 # produce complaining messages from dpkg-parsechangelog. None
4674 # of the information dpkg-source gets from the changelog is
4675 # actually relevant - it gets put into the original message
4676 # which dpkg-source provides our stunt editor, and then
4678 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4680 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4681 "Date: $commitdate\n".
4682 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4684 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4687 runcmd @git, qw(checkout -q master);
4690 sub build_maybe_quilt_fixup () {
4691 my ($format,$fopts) = get_source_format;
4692 return unless madformat_wantfixup $format;
4695 check_for_vendor_patches();
4697 if (quiltmode_splitbrain) {
4698 foreach my $needtf (qw(new maint)) {
4699 next if grep { $_ eq $needtf } access_cfg_tagformats;
4701 quilt mode $quilt_mode requires split view so server needs to support
4702 both "new" and "maint" tag formats, but config says it doesn't.
4707 my $clogp = parsechangelog();
4708 my $headref = git_rev_parse('HEAD');
4713 my $upstreamversion = upstreamversion $version;
4715 if ($fopts->{'single-debian-patch'}) {
4716 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4718 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4721 die 'bug' if $split_brain && !$need_split_build_invocation;
4723 changedir '../../../..';
4724 runcmd_ordryrun_local
4725 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4728 sub quilt_fixup_mkwork ($) {
4731 mkdir "work" or die $!;
4733 mktree_in_ud_here();
4734 runcmd @git, qw(reset -q --hard), $headref;
4737 sub quilt_fixup_linkorigs ($$) {
4738 my ($upstreamversion, $fn) = @_;
4739 # calls $fn->($leafname);
4741 foreach my $f (<../../../../*>) { #/){
4742 my $b=$f; $b =~ s{.*/}{};
4744 local ($debuglevel) = $debuglevel-1;
4745 printdebug "QF linkorigs $b, $f ?\n";
4747 next unless is_orig_file_of_vsn $b, $upstreamversion;
4748 printdebug "QF linkorigs $b, $f Y\n";
4749 link_ltarget $f, $b or die "$b $!";
4754 sub quilt_fixup_delete_pc () {
4755 runcmd @git, qw(rm -rqf .pc);
4757 Commit removal of .pc (quilt series tracking data)
4759 [dgit ($our_version) upgrade quilt-remove-pc]
4763 sub quilt_fixup_singlepatch ($$$) {
4764 my ($clogp, $headref, $upstreamversion) = @_;
4766 progress "starting quiltify (single-debian-patch)";
4768 # dpkg-source --commit generates new patches even if
4769 # single-debian-patch is in debian/source/options. In order to
4770 # get it to generate debian/patches/debian-changes, it is
4771 # necessary to build the source package.
4773 quilt_fixup_linkorigs($upstreamversion, sub { });
4774 quilt_fixup_mkwork($headref);
4776 rmtree("debian/patches");
4778 runcmd @dpkgsource, qw(-b .);
4780 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4781 rename srcfn("$upstreamversion", "/debian/patches"),
4782 "work/debian/patches";
4785 commit_quilty_patch();
4788 sub quilt_make_fake_dsc ($) {
4789 my ($upstreamversion) = @_;
4791 my $fakeversion="$upstreamversion-~~DGITFAKE";
4793 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4794 print $fakedsc <<END or die $!;
4797 Version: $fakeversion
4801 my $dscaddfile=sub {
4804 my $md = new Digest::MD5;
4806 my $fh = new IO::File $b, '<' or die "$b $!";
4811 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4814 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4816 my @files=qw(debian/source/format debian/rules
4817 debian/control debian/changelog);
4818 foreach my $maybe (qw(debian/patches debian/source/options
4819 debian/tests/control)) {
4820 next unless stat_exists "../../../$maybe";
4821 push @files, $maybe;
4824 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4825 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4827 $dscaddfile->($debtar);
4828 close $fakedsc or die $!;
4831 sub quilt_check_splitbrain_cache ($$) {
4832 my ($headref, $upstreamversion) = @_;
4833 # Called only if we are in (potentially) split brain mode.
4835 # Computes the cache key and looks in the cache.
4836 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4838 my $splitbrain_cachekey;
4841 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4842 # we look in the reflog of dgit-intern/quilt-cache
4843 # we look for an entry whose message is the key for the cache lookup
4844 my @cachekey = (qw(dgit), $our_version);
4845 push @cachekey, $upstreamversion;
4846 push @cachekey, $quilt_mode;
4847 push @cachekey, $headref;
4849 push @cachekey, hashfile('fake.dsc');
4851 my $srcshash = Digest::SHA->new(256);
4852 my %sfs = ( %INC, '$0(dgit)' => $0 );
4853 foreach my $sfk (sort keys %sfs) {
4854 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4855 $srcshash->add($sfk," ");
4856 $srcshash->add(hashfile($sfs{$sfk}));
4857 $srcshash->add("\n");
4859 push @cachekey, $srcshash->hexdigest();
4860 $splitbrain_cachekey = "@cachekey";
4862 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4864 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4865 debugcmd "|(probably)",@cmd;
4866 my $child = open GC, "-|"; defined $child or die $!;
4868 chdir '../../..' or die $!;
4869 if (!stat ".git/logs/refs/$splitbraincache") {
4870 $! == ENOENT or die $!;
4871 printdebug ">(no reflog)\n";
4878 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4879 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4882 quilt_fixup_mkwork($headref);
4883 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
4884 if ($cachehit ne $headref) {
4885 progress "dgit view: found cached ($saved)";
4886 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4888 return ($cachehit, $splitbrain_cachekey);
4890 progress "dgit view: found cached, no changes required";
4891 return ($headref, $splitbrain_cachekey);
4893 die $! if GC->error;
4894 failedcmd unless close GC;
4896 printdebug "splitbrain cache miss\n";
4897 return (undef, $splitbrain_cachekey);
4900 sub quilt_fixup_multipatch ($$$) {
4901 my ($clogp, $headref, $upstreamversion) = @_;
4903 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4906 # - honour any existing .pc in case it has any strangeness
4907 # - determine the git commit corresponding to the tip of
4908 # the patch stack (if there is one)
4909 # - if there is such a git commit, convert each subsequent
4910 # git commit into a quilt patch with dpkg-source --commit
4911 # - otherwise convert all the differences in the tree into
4912 # a single git commit
4916 # Our git tree doesn't necessarily contain .pc. (Some versions of
4917 # dgit would include the .pc in the git tree.) If there isn't
4918 # one, we need to generate one by unpacking the patches that we
4921 # We first look for a .pc in the git tree. If there is one, we
4922 # will use it. (This is not the normal case.)
4924 # Otherwise need to regenerate .pc so that dpkg-source --commit
4925 # can work. We do this as follows:
4926 # 1. Collect all relevant .orig from parent directory
4927 # 2. Generate a debian.tar.gz out of
4928 # debian/{patches,rules,source/format,source/options}
4929 # 3. Generate a fake .dsc containing just these fields:
4930 # Format Source Version Files
4931 # 4. Extract the fake .dsc
4932 # Now the fake .dsc has a .pc directory.
4933 # (In fact we do this in every case, because in future we will
4934 # want to search for a good base commit for generating patches.)
4936 # Then we can actually do the dpkg-source --commit
4937 # 1. Make a new working tree with the same object
4938 # store as our main tree and check out the main
4940 # 2. Copy .pc from the fake's extraction, if necessary
4941 # 3. Run dpkg-source --commit
4942 # 4. If the result has changes to debian/, then
4943 # - git add them them
4944 # - git add .pc if we had a .pc in-tree
4946 # 5. If we had a .pc in-tree, delete it, and git commit
4947 # 6. Back in the main tree, fast forward to the new HEAD
4949 # Another situation we may have to cope with is gbp-style
4950 # patches-unapplied trees.
4952 # We would want to detect these, so we know to escape into
4953 # quilt_fixup_gbp. However, this is in general not possible.
4954 # Consider a package with a one patch which the dgit user reverts
4955 # (with git revert or the moral equivalent).
4957 # That is indistinguishable in contents from a patches-unapplied
4958 # tree. And looking at the history to distinguish them is not
4959 # useful because the user might have made a confusing-looking git
4960 # history structure (which ought to produce an error if dgit can't
4961 # cope, not a silent reintroduction of an unwanted patch).
4963 # So gbp users will have to pass an option. But we can usually
4964 # detect their failure to do so: if the tree is not a clean
4965 # patches-applied tree, quilt linearisation fails, but the tree
4966 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4967 # they want --quilt=unapplied.
4969 # To help detect this, when we are extracting the fake dsc, we
4970 # first extract it with --skip-patches, and then apply the patches
4971 # afterwards with dpkg-source --before-build. That lets us save a
4972 # tree object corresponding to .origs.
4974 my $splitbrain_cachekey;
4976 quilt_make_fake_dsc($upstreamversion);
4978 if (quiltmode_splitbrain()) {
4980 ($cachehit, $splitbrain_cachekey) =
4981 quilt_check_splitbrain_cache($headref, $upstreamversion);
4982 return if $cachehit;
4986 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4988 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4989 rename $fakexdir, "fake" or die "$fakexdir $!";
4993 remove_stray_gits();
4994 mktree_in_ud_here();
4998 runcmd @git, qw(add -Af .);
4999 my $unapplied=git_write_tree();
5000 printdebug "fake orig tree object $unapplied\n";
5004 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5006 if (system @bbcmd) {
5007 failedcmd @bbcmd if $? < 0;
5009 failed to apply your git tree's patch stack (from debian/patches/) to
5010 the corresponding upstream tarball(s). Your source tree and .orig
5011 are probably too inconsistent. dgit can only fix up certain kinds of
5012 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5018 quilt_fixup_mkwork($headref);
5021 if (stat_exists ".pc") {
5023 progress "Tree already contains .pc - will use it then delete it.";
5026 rename '../fake/.pc','.pc' or die $!;
5029 changedir '../fake';
5031 runcmd @git, qw(add -Af .);
5032 my $oldtiptree=git_write_tree();
5033 printdebug "fake o+d/p tree object $unapplied\n";
5034 changedir '../work';
5037 # We calculate some guesswork now about what kind of tree this might
5038 # be. This is mostly for error reporting.
5044 # O = orig, without patches applied
5045 # A = "applied", ie orig with H's debian/patches applied
5046 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5047 \%editedignores, \@unrepres),
5048 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5049 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5053 foreach my $b (qw(01 02)) {
5054 foreach my $v (qw(O2H O2A H2A)) {
5055 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5058 printdebug "differences \@dl @dl.\n";
5061 "$us: base trees orig=%.20s o+d/p=%.20s",
5062 $unapplied, $oldtiptree;
5064 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5065 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5066 $dl[0], $dl[1], $dl[3], $dl[4],
5070 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5072 forceable_fail [qw(unrepresentable)], <<END;
5073 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5078 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5079 push @failsuggestion, "This might be a patches-unapplied branch.";
5080 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5081 push @failsuggestion, "This might be a patches-applied branch.";
5083 push @failsuggestion, "Maybe you need to specify one of".
5084 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5086 if (quiltmode_splitbrain()) {
5087 quiltify_splitbrain($clogp, $unapplied, $headref,
5088 $diffbits, \%editedignores,
5089 $splitbrain_cachekey);
5093 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5094 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5096 if (!open P, '>>', ".pc/applied-patches") {
5097 $!==&ENOENT or die $!;
5102 commit_quilty_patch();
5104 if ($mustdeletepc) {
5105 quilt_fixup_delete_pc();
5109 sub quilt_fixup_editor () {
5110 my $descfn = $ENV{$fakeeditorenv};
5111 my $editing = $ARGV[$#ARGV];
5112 open I1, '<', $descfn or die "$descfn: $!";
5113 open I2, '<', $editing or die "$editing: $!";
5114 unlink $editing or die "$editing: $!";
5115 open O, '>', $editing or die "$editing: $!";
5116 while (<I1>) { print O or die $!; } I1->error and die $!;
5119 $copying ||= m/^\-\-\- /;
5120 next unless $copying;
5123 I2->error and die $!;
5128 sub maybe_apply_patches_dirtily () {
5129 return unless $quilt_mode =~ m/gbp|unapplied/;
5130 print STDERR <<END or die $!;
5132 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5133 dgit: Have to apply the patches - making the tree dirty.
5134 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5137 $patches_applied_dirtily = 01;
5138 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5139 runcmd qw(dpkg-source --before-build .);
5142 sub maybe_unapply_patches_again () {
5143 progress "dgit: Unapplying patches again to tidy up the tree."
5144 if $patches_applied_dirtily;
5145 runcmd qw(dpkg-source --after-build .)
5146 if $patches_applied_dirtily & 01;
5148 if $patches_applied_dirtily & 02;
5149 $patches_applied_dirtily = 0;
5152 #----- other building -----
5154 our $clean_using_builder;
5155 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5156 # clean the tree before building (perhaps invoked indirectly by
5157 # whatever we are using to run the build), rather than separately
5158 # and explicitly by us.
5161 return if $clean_using_builder;
5162 if ($cleanmode eq 'dpkg-source') {
5163 maybe_apply_patches_dirtily();
5164 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5165 } elsif ($cleanmode eq 'dpkg-source-d') {
5166 maybe_apply_patches_dirtily();
5167 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5168 } elsif ($cleanmode eq 'git') {
5169 runcmd_ordryrun_local @git, qw(clean -xdf);
5170 } elsif ($cleanmode eq 'git-ff') {
5171 runcmd_ordryrun_local @git, qw(clean -xdff);
5172 } elsif ($cleanmode eq 'check') {
5173 my $leftovers = cmdoutput @git, qw(clean -xdn);
5174 if (length $leftovers) {
5175 print STDERR $leftovers, "\n" or die $!;
5176 fail "tree contains uncommitted files and --clean=check specified";
5178 } elsif ($cleanmode eq 'none') {
5185 badusage "clean takes no additional arguments" if @ARGV;
5188 maybe_unapply_patches_again();
5191 sub build_prep_early () {
5192 our $build_prep_early_done //= 0;
5193 return if $build_prep_early_done++;
5195 badusage "-p is not allowed when building" if defined $package;
5196 my $clogp = parsechangelog();
5197 $isuite = getfield $clogp, 'Distribution';
5198 $package = getfield $clogp, 'Source';
5199 $version = getfield $clogp, 'Version';
5206 build_maybe_quilt_fixup();
5208 my $pat = changespat $version;
5209 foreach my $f (glob "$buildproductsdir/$pat") {
5211 unlink $f or fail "remove old changes file $f: $!";
5213 progress "would remove $f";
5219 sub changesopts_initial () {
5220 my @opts =@changesopts[1..$#changesopts];
5223 sub changesopts_version () {
5224 if (!defined $changes_since_version) {
5225 my @vsns = archive_query('archive_query');
5226 my @quirk = access_quirk();
5227 if ($quirk[0] eq 'backports') {
5228 local $isuite = $quirk[2];
5230 canonicalise_suite();
5231 push @vsns, archive_query('archive_query');
5234 @vsns = map { $_->[0] } @vsns;
5235 @vsns = sort { -version_compare($a, $b) } @vsns;
5236 $changes_since_version = $vsns[0];
5237 progress "changelog will contain changes since $vsns[0]";
5239 $changes_since_version = '_';
5240 progress "package seems new, not specifying -v<version>";
5243 if ($changes_since_version ne '_') {
5244 return ("-v$changes_since_version");
5250 sub changesopts () {
5251 return (changesopts_initial(), changesopts_version());
5254 sub massage_dbp_args ($;$) {
5255 my ($cmd,$xargs) = @_;
5258 # - if we're going to split the source build out so we can
5259 # do strange things to it, massage the arguments to dpkg-buildpackage
5260 # so that the main build doessn't build source (or add an argument
5261 # to stop it building source by default).
5263 # - add -nc to stop dpkg-source cleaning the source tree,
5264 # unless we're not doing a split build and want dpkg-source
5265 # as cleanmode, in which case we can do nothing
5268 # 0 - source will NOT need to be built separately by caller
5269 # +1 - source will need to be built separately by caller
5270 # +2 - source will need to be built separately by caller AND
5271 # dpkg-buildpackage should not in fact be run at all!
5272 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5273 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5274 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5275 $clean_using_builder = 1;
5278 # -nc has the side effect of specifying -b if nothing else specified
5279 # and some combinations of -S, -b, et al, are errors, rather than
5280 # later simply overriding earlie. So we need to:
5281 # - search the command line for these options
5282 # - pick the last one
5283 # - perhaps add our own as a default
5284 # - perhaps adjust it to the corresponding non-source-building version
5286 foreach my $l ($cmd, $xargs) {
5288 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5291 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5293 if ($need_split_build_invocation) {
5294 printdebug "massage split $dmode.\n";
5295 $r = $dmode =~ m/[S]/ ? +2 :
5296 $dmode =~ y/gGF/ABb/ ? +1 :
5297 $dmode =~ m/[ABb]/ ? 0 :
5300 printdebug "massage done $r $dmode.\n";
5302 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5308 my $wasdir = must_getcwd();
5314 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5315 my ($msg_if_onlyone) = @_;
5316 # If there is only one .changes file, fail with $msg_if_onlyone,
5317 # or if that is undef, be a no-op.
5318 # Returns the changes file to report to the user.
5319 my $pat = changespat $version;
5320 my @changesfiles = glob $pat;
5321 @changesfiles = sort {
5322 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5326 if (@changesfiles==1) {
5327 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5328 only one changes file from build (@changesfiles)
5330 $result = $changesfiles[0];
5331 } elsif (@changesfiles==2) {
5332 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5333 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5334 fail "$l found in binaries changes file $binchanges"
5337 runcmd_ordryrun_local @mergechanges, @changesfiles;
5338 my $multichanges = changespat $version,'multi';
5340 stat_exists $multichanges or fail "$multichanges: $!";
5341 foreach my $cf (glob $pat) {
5342 next if $cf eq $multichanges;
5343 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5346 $result = $multichanges;
5348 fail "wrong number of different changes files (@changesfiles)";
5350 printdone "build successful, results in $result\n" or die $!;
5353 sub midbuild_checkchanges () {
5354 my $pat = changespat $version;
5355 return if $rmchanges;
5356 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5357 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5359 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5360 Suggest you delete @unwanted.
5365 sub midbuild_checkchanges_vanilla ($) {
5367 midbuild_checkchanges() if $wantsrc == 1;
5370 sub postbuild_mergechanges_vanilla ($) {
5372 if ($wantsrc == 1) {
5374 postbuild_mergechanges(undef);
5377 printdone "build successful\n";
5382 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5383 my $wantsrc = massage_dbp_args \@dbp;
5386 midbuild_checkchanges_vanilla $wantsrc;
5391 push @dbp, changesopts_version();
5392 maybe_apply_patches_dirtily();
5393 runcmd_ordryrun_local @dbp;
5395 maybe_unapply_patches_again();
5396 postbuild_mergechanges_vanilla $wantsrc;
5400 $quilt_mode //= 'gbp';
5406 # gbp can make .origs out of thin air. In my tests it does this
5407 # even for a 1.0 format package, with no origs present. So I
5408 # guess it keys off just the version number. We don't know
5409 # exactly what .origs ought to exist, but let's assume that we
5410 # should run gbp if: the version has an upstream part and the main
5412 my $upstreamversion = upstreamversion $version;
5413 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5414 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5416 if ($gbp_make_orig) {
5418 $cleanmode = 'none'; # don't do it again
5419 $need_split_build_invocation = 1;
5422 my @dbp = @dpkgbuildpackage;
5424 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5426 if (!length $gbp_build[0]) {
5427 if (length executable_on_path('git-buildpackage')) {
5428 $gbp_build[0] = qw(git-buildpackage);
5430 $gbp_build[0] = 'gbp buildpackage';
5433 my @cmd = opts_opt_multi_cmd @gbp_build;
5435 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5437 if ($gbp_make_orig) {
5438 ensuredir '.git/dgit';
5439 my $ok = '.git/dgit/origs-gen-ok';
5440 unlink $ok or $!==&ENOENT or die $!;
5441 my @origs_cmd = @cmd;
5442 push @origs_cmd, qw(--git-cleaner=true);
5443 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5444 push @origs_cmd, @ARGV;
5446 debugcmd @origs_cmd;
5448 do { local $!; stat_exists $ok; }
5449 or failedcmd @origs_cmd;
5451 dryrun_report @origs_cmd;
5457 midbuild_checkchanges_vanilla $wantsrc;
5459 if (!$clean_using_builder) {
5460 push @cmd, '--git-cleaner=true';
5464 maybe_unapply_patches_again();
5466 push @cmd, changesopts();
5467 runcmd_ordryrun_local @cmd, @ARGV;
5469 postbuild_mergechanges_vanilla $wantsrc;
5471 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5474 my $our_cleanmode = $cleanmode;
5475 if ($need_split_build_invocation) {
5476 # Pretend that clean is being done some other way. This
5477 # forces us not to try to use dpkg-buildpackage to clean and
5478 # build source all in one go; and instead we run dpkg-source
5479 # (and build_prep() will do the clean since $clean_using_builder
5481 $our_cleanmode = 'ELSEWHERE';
5483 if ($our_cleanmode =~ m/^dpkg-source/) {
5484 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5485 $clean_using_builder = 1;
5488 $sourcechanges = changespat $version,'source';
5490 unlink "../$sourcechanges" or $!==ENOENT
5491 or fail "remove $sourcechanges: $!";
5493 $dscfn = dscfn($version);
5494 if ($our_cleanmode eq 'dpkg-source') {
5495 maybe_apply_patches_dirtily();
5496 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5498 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5499 maybe_apply_patches_dirtily();
5500 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5503 my @cmd = (@dpkgsource, qw(-b --));
5506 runcmd_ordryrun_local @cmd, "work";
5507 my @udfiles = <${package}_*>;
5508 changedir "../../..";
5509 foreach my $f (@udfiles) {
5510 printdebug "source copy, found $f\n";
5513 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5514 $f eq srcfn($version, $&));
5515 printdebug "source copy, found $f - renaming\n";
5516 rename "$ud/$f", "../$f" or $!==ENOENT
5517 or fail "put in place new source file ($f): $!";
5520 my $pwd = must_getcwd();
5521 my $leafdir = basename $pwd;
5523 runcmd_ordryrun_local @cmd, $leafdir;
5526 runcmd_ordryrun_local qw(sh -ec),
5527 'exec >$1; shift; exec "$@"','x',
5528 "../$sourcechanges",
5529 @dpkggenchanges, qw(-S), changesopts();
5533 sub cmd_build_source {
5534 badusage "build-source takes no additional arguments" if @ARGV;
5536 maybe_unapply_patches_again();
5537 printdone "source built, results in $dscfn and $sourcechanges";
5542 midbuild_checkchanges();
5545 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5546 stat_exists $sourcechanges
5547 or fail "$sourcechanges (in parent directory): $!";
5549 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5551 maybe_unapply_patches_again();
5553 postbuild_mergechanges(<<END);
5554 perhaps you need to pass -A ? (sbuild's default is to build only
5555 arch-specific binaries; dgit 1.4 used to override that.)
5560 sub cmd_quilt_fixup {
5561 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5562 my $clogp = parsechangelog();
5563 $version = getfield $clogp, 'Version';
5564 $package = getfield $clogp, 'Source';
5567 build_maybe_quilt_fixup();
5570 sub cmd_import_dsc {
5574 last unless $ARGV[0] =~ m/^-/;
5577 if (m/^--require-valid-signature$/) {
5580 badusage "unknown dgit import-dsc sub-option \`$_'";
5584 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5585 my ($dscfn, $dstbranch) = @ARGV;
5587 badusage "dry run makes no sense with import-dsc" unless act_local();
5589 my $force = $dstbranch =~ s/^\+// ? +1 :
5590 $dstbranch =~ s/^\.\.// ? -1 :
5592 my $info = $force ? " $&" : '';
5593 $info = "$dscfn$info";
5595 my $specbranch = $dstbranch;
5596 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5597 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5599 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5600 my $chead = cmdoutput_errok @symcmd;
5601 defined $chead or $?==256 or failedcmd @symcmd;
5603 fail "$dstbranch is checked out - will not update it"
5604 if defined $chead and $chead eq $dstbranch;
5606 my $oldhash = git_get_ref $dstbranch;
5608 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5609 $dscdata = do { local $/ = undef; <D>; };
5610 D->error and fail "read $dscfn: $!";
5613 # we don't normally need this so import it here
5614 use Dpkg::Source::Package;
5615 my $dp = new Dpkg::Source::Package filename => $dscfn,
5616 require_valid_signature => $needsig;
5618 local $SIG{__WARN__} = sub {
5620 return unless $needsig;
5621 fail "import-dsc signature check failed";
5623 if (!$dp->is_signed()) {
5624 warn "$us: warning: importing unsigned .dsc\n";
5626 my $r = $dp->check_signature();
5627 die "->check_signature => $r" if $needsig && $r;
5633 my $dgit_commit = $dsc->{$ourdscfield[0]};
5634 if (defined $dgit_commit &&
5635 !forceing [qw(import-dsc-with-dgit-field)]) {
5636 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5637 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5638 my @cmd = (qw(sh -ec),
5639 "echo $dgit_commit | git cat-file --batch-check");
5640 my $objgot = cmdoutput @cmd;
5641 if ($objgot =~ m#^\w+ missing\b#) {
5643 .dsc contains Dgit field referring to object $dgit_commit
5644 Your git tree does not have that object. Try `git fetch' from a
5645 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5648 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5650 progress "Not fast forward, forced update.";
5652 fail "Not fast forward to $dgit_commit";
5655 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5656 $dstbranch, $dgit_commit);
5658 progress "dgit: import-dsc updated git ref $dstbranch";
5663 Branch $dstbranch already exists
5664 Specify ..$specbranch for a pseudo-merge, binding in existing history
5665 Specify +$specbranch to overwrite, discarding existing history
5667 if $oldhash && !$force;
5669 $package = getfield $dsc, 'Source';
5670 my @dfi = dsc_files_info();
5671 foreach my $fi (@dfi) {
5672 my $f = $fi->{Filename};
5674 next if lstat $here;
5675 fail "stat $here: $!" unless $! == ENOENT;
5677 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5679 } elsif ($dscfn =~ m#^/#) {
5682 fail "cannot import $dscfn which seems to be inside working tree!";
5684 $there =~ s#/+[^/]+$## or
5685 fail "cannot import $dscfn which seems to not have a basename";
5687 symlink $there, $here or fail "symlink $there to $here: $!";
5688 progress "made symlink $here -> $there";
5689 print STDERR Dumper($fi);
5691 my @mergeinputs = generate_commits_from_dsc();
5692 die unless @mergeinputs == 1;
5694 my $newhash = $mergeinputs[0]{Commit};
5698 progress "Import, forced update - synthetic orphan git history.";
5699 } elsif ($force < 0) {
5700 progress "Import, merging.";
5701 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5702 my $version = getfield $dsc, 'Version';
5703 $newhash = make_commit_text <<END;
5708 Merge $package ($version) import into $dstbranch
5711 die; # caught earlier
5715 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5716 $dstbranch, $newhash);
5718 progress "dgit: import-dsc results are in in git ref $dstbranch";
5721 sub cmd_archive_api_query {
5722 badusage "need only 1 subpath argument" unless @ARGV==1;
5723 my ($subpath) = @ARGV;
5724 my @cmd = archive_api_query_cmd($subpath);
5727 exec @cmd or fail "exec curl: $!\n";
5730 sub cmd_clone_dgit_repos_server {
5731 badusage "need destination argument" unless @ARGV==1;
5732 my ($destdir) = @ARGV;
5733 $package = '_dgit-repos-server';
5734 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5736 exec @cmd or fail "exec git clone: $!\n";
5739 sub cmd_setup_mergechangelogs {
5740 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5741 setup_mergechangelogs(1);
5744 sub cmd_setup_useremail {
5745 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5749 sub cmd_setup_new_tree {
5750 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5754 #---------- argument parsing and main program ----------
5757 print "dgit version $our_version\n" or die $!;
5761 our (%valopts_long, %valopts_short);
5764 sub defvalopt ($$$$) {
5765 my ($long,$short,$val_re,$how) = @_;
5766 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5767 $valopts_long{$long} = $oi;
5768 $valopts_short{$short} = $oi;
5769 # $how subref should:
5770 # do whatever assignemnt or thing it likes with $_[0]
5771 # if the option should not be passed on to remote, @rvalopts=()
5772 # or $how can be a scalar ref, meaning simply assign the value
5775 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5776 defvalopt '--distro', '-d', '.+', \$idistro;
5777 defvalopt '', '-k', '.+', \$keyid;
5778 defvalopt '--existing-package','', '.*', \$existing_package;
5779 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5780 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5781 defvalopt '--package', '-p', $package_re, \$package;
5782 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5784 defvalopt '', '-C', '.+', sub {
5785 ($changesfile) = (@_);
5786 if ($changesfile =~ s#^(.*)/##) {
5787 $buildproductsdir = $1;
5791 defvalopt '--initiator-tempdir','','.*', sub {
5792 ($initiator_tempdir) = (@_);
5793 $initiator_tempdir =~ m#^/# or
5794 badusage "--initiator-tempdir must be used specify an".
5795 " absolute, not relative, directory."
5801 if (defined $ENV{'DGIT_SSH'}) {
5802 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5803 } elsif (defined $ENV{'GIT_SSH'}) {
5804 @ssh = ($ENV{'GIT_SSH'});
5812 if (!defined $val) {
5813 badusage "$what needs a value" unless @ARGV;
5815 push @rvalopts, $val;
5817 badusage "bad value \`$val' for $what" unless
5818 $val =~ m/^$oi->{Re}$(?!\n)/s;
5819 my $how = $oi->{How};
5820 if (ref($how) eq 'SCALAR') {
5825 push @ropts, @rvalopts;
5829 last unless $ARGV[0] =~ m/^-/;
5833 if (m/^--dry-run$/) {
5836 } elsif (m/^--damp-run$/) {
5839 } elsif (m/^--no-sign$/) {
5842 } elsif (m/^--help$/) {
5844 } elsif (m/^--version$/) {
5846 } elsif (m/^--new$/) {
5849 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5850 ($om = $opts_opt_map{$1}) &&
5854 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5855 !$opts_opt_cmdonly{$1} &&
5856 ($om = $opts_opt_map{$1})) {
5859 } elsif (m/^--(gbp|dpm)$/s) {
5860 push @ropts, "--quilt=$1";
5862 } elsif (m/^--ignore-dirty$/s) {
5865 } elsif (m/^--no-quilt-fixup$/s) {
5867 $quilt_mode = 'nocheck';
5868 } elsif (m/^--no-rm-on-error$/s) {
5871 } elsif (m/^--overwrite$/s) {
5873 $overwrite_version = '';
5874 } elsif (m/^--overwrite=(.+)$/s) {
5876 $overwrite_version = $1;
5877 } elsif (m/^--delayed=(\d+)$/s) {
5880 } elsif (m/^--dgit-view-save=(.+)$/s) {
5882 $split_brain_save = $1;
5883 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
5884 } elsif (m/^--(no-)?rm-old-changes$/s) {
5887 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5889 push @deliberatelies, $&;
5890 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5894 } elsif (m/^--force-/) {
5896 "$us: warning: ignoring unknown force option $_\n";
5898 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5899 # undocumented, for testing
5901 $tagformat_want = [ $1, 'command line', 1 ];
5902 # 1 menas overrides distro configuration
5903 } elsif (m/^--always-split-source-build$/s) {
5904 # undocumented, for testing
5906 $need_split_build_invocation = 1;
5907 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5908 $val = $2 ? $' : undef; #';
5909 $valopt->($oi->{Long});
5911 badusage "unknown long option \`$_'";
5918 } elsif (s/^-L/-/) {
5921 } elsif (s/^-h/-/) {
5923 } elsif (s/^-D/-/) {
5927 } elsif (s/^-N/-/) {
5932 push @changesopts, $_;
5934 } elsif (s/^-wn$//s) {
5936 $cleanmode = 'none';
5937 } elsif (s/^-wg$//s) {
5940 } elsif (s/^-wgf$//s) {
5942 $cleanmode = 'git-ff';
5943 } elsif (s/^-wd$//s) {
5945 $cleanmode = 'dpkg-source';
5946 } elsif (s/^-wdd$//s) {
5948 $cleanmode = 'dpkg-source-d';
5949 } elsif (s/^-wc$//s) {
5951 $cleanmode = 'check';
5952 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5953 push @git, '-c', $&;
5954 $gitcfgs{cmdline}{$1} = [ $2 ];
5955 } elsif (s/^-c([^=]+)$//s) {
5956 push @git, '-c', $&;
5957 $gitcfgs{cmdline}{$1} = [ 'true' ];
5958 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5960 $val = undef unless length $val;
5961 $valopt->($oi->{Short});
5964 badusage "unknown short option \`$_'";
5971 sub check_env_sanity () {
5972 my $blocked = new POSIX::SigSet;
5973 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5976 foreach my $name (qw(PIPE CHLD)) {
5977 my $signame = "SIG$name";
5978 my $signum = eval "POSIX::$signame" // die;
5979 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5980 die "$signame is set to something other than SIG_DFL\n";
5981 $blocked->ismember($signum) and
5982 die "$signame is blocked\n";
5988 On entry to dgit, $@
5989 This is a bug produced by something in in your execution environment.
5995 sub finalise_opts_opts () {
5996 foreach my $k (keys %opts_opt_map) {
5997 my $om = $opts_opt_map{$k};
5999 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6001 badcfg "cannot set command for $k"
6002 unless length $om->[0];
6006 foreach my $c (access_cfg_cfgs("opts-$k")) {
6008 map { $_ ? @$_ : () }
6009 map { $gitcfgs{$_}{$c} }
6010 reverse @gitcfgsources;
6011 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6012 "\n" if $debuglevel >= 4;
6014 badcfg "cannot configure options for $k"
6015 if $opts_opt_cmdonly{$k};
6016 my $insertpos = $opts_cfg_insertpos{$k};
6017 @$om = ( @$om[0..$insertpos-1],
6019 @$om[$insertpos..$#$om] );
6024 if ($ENV{$fakeeditorenv}) {
6026 quilt_fixup_editor();
6033 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6034 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6035 if $dryrun_level == 1;
6037 print STDERR $helpmsg or die $!;
6040 my $cmd = shift @ARGV;
6043 my $pre_fn = ${*::}{"pre_$cmd"};
6044 $pre_fn->() if $pre_fn;
6046 if (!defined $rmchanges) {
6047 local $access_forpush;
6048 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6051 if (!defined $quilt_mode) {
6052 local $access_forpush;
6053 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6054 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6056 $quilt_mode =~ m/^($quilt_modes_re)$/
6057 or badcfg "unknown quilt-mode \`$quilt_mode'";
6061 $need_split_build_invocation ||= quiltmode_splitbrain();
6063 if (!defined $cleanmode) {
6064 local $access_forpush;
6065 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6066 $cleanmode //= 'dpkg-source';
6068 badcfg "unknown clean-mode \`$cleanmode'" unless
6069 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6072 my $fn = ${*::}{"cmd_$cmd"};
6073 $fn or badusage "unknown operation $cmd";