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";
1566 progress "canonical suite name is $csuite";
1570 sub get_archive_dsc () {
1571 canonicalise_suite();
1572 my @vsns = archive_query('archive_query');
1573 foreach my $vinfo (@vsns) {
1574 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1575 $dscurl = $vsn_dscurl;
1576 $dscdata = url_get($dscurl);
1578 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1583 $digester->add($dscdata);
1584 my $got = $digester->hexdigest();
1586 fail "$dscurl has hash $got but".
1587 " archive told us to expect $digest";
1590 my $fmt = getfield $dsc, 'Format';
1591 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1592 "unsupported source format $fmt, sorry";
1594 $dsc_checked = !!$digester;
1595 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1599 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1602 sub check_for_git ();
1603 sub check_for_git () {
1605 my $how = access_cfg('git-check');
1606 if ($how eq 'ssh-cmd') {
1608 (access_cfg_ssh, access_gituserhost(),
1609 access_runeinfo("git-check $package").
1610 " set -e; cd ".access_cfg('git-path').";".
1611 " if test -d $package.git; then echo 1; else echo 0; fi");
1612 my $r= cmdoutput @cmd;
1613 if (defined $r and $r =~ m/^divert (\w+)$/) {
1615 my ($usedistro,) = access_distros();
1616 # NB that if we are pushing, $usedistro will be $distro/push
1617 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1618 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1619 progress "diverting to $divert (using config for $instead_distro)";
1620 return check_for_git();
1622 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1624 } elsif ($how eq 'url') {
1625 my $prefix = access_cfg('git-check-url','git-url');
1626 my $suffix = access_cfg('git-check-suffix','git-suffix',
1627 'RETURN-UNDEF') // '.git';
1628 my $url = "$prefix/$package$suffix";
1629 my @cmd = (@curl, qw(-sS -I), $url);
1630 my $result = cmdoutput @cmd;
1631 $result =~ s/^\S+ 200 .*\n\r?\n//;
1632 # curl -sS -I with https_proxy prints
1633 # HTTP/1.0 200 Connection established
1634 $result =~ m/^\S+ (404|200) /s or
1635 fail "unexpected results from git check query - ".
1636 Dumper($prefix, $result);
1638 if ($code eq '404') {
1640 } elsif ($code eq '200') {
1645 } elsif ($how eq 'true') {
1647 } elsif ($how eq 'false') {
1650 badcfg "unknown git-check \`$how'";
1654 sub create_remote_git_repo () {
1655 my $how = access_cfg('git-create');
1656 if ($how eq 'ssh-cmd') {
1658 (access_cfg_ssh, access_gituserhost(),
1659 access_runeinfo("git-create $package").
1660 "set -e; cd ".access_cfg('git-path').";".
1661 " cp -a _template $package.git");
1662 } elsif ($how eq 'true') {
1665 badcfg "unknown git-create \`$how'";
1669 our ($dsc_hash,$lastpush_mergeinput);
1671 our $ud = '.git/dgit/unpack';
1681 sub mktree_in_ud_here () {
1682 runcmd qw(git init -q);
1683 runcmd qw(git config gc.auto 0);
1684 rmtree('.git/objects');
1685 symlink '../../../../objects','.git/objects' or die $!;
1688 sub git_write_tree () {
1689 my $tree = cmdoutput @git, qw(write-tree);
1690 $tree =~ m/^\w+$/ or die "$tree ?";
1694 sub remove_stray_gits () {
1695 my @gitscmd = qw(find -name .git -prune -print0);
1696 debugcmd "|",@gitscmd;
1697 open GITS, "-|", @gitscmd or die $!;
1702 print STDERR "$us: warning: removing from source package: ",
1703 (messagequote $_), "\n";
1707 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1710 sub mktree_in_ud_from_only_subdir (;$) {
1713 # changes into the subdir
1715 die "expected one subdir but found @dirs ?" unless @dirs==1;
1716 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1720 remove_stray_gits();
1721 mktree_in_ud_here();
1723 my ($format, $fopts) = get_source_format();
1724 if (madformat($format)) {
1729 runcmd @git, qw(add -Af);
1730 my $tree=git_write_tree();
1731 return ($tree,$dir);
1734 our @files_csum_info_fields =
1735 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1736 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1737 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1739 sub dsc_files_info () {
1740 foreach my $csumi (@files_csum_info_fields) {
1741 my ($fname, $module, $method) = @$csumi;
1742 my $field = $dsc->{$fname};
1743 next unless defined $field;
1744 eval "use $module; 1;" or die $@;
1746 foreach (split /\n/, $field) {
1748 m/^(\w+) (\d+) (\S+)$/ or
1749 fail "could not parse .dsc $fname line \`$_'";
1750 my $digester = eval "$module"."->$method;" or die $@;
1755 Digester => $digester,
1760 fail "missing any supported Checksums-* or Files field in ".
1761 $dsc->get_option('name');
1765 map { $_->{Filename} } dsc_files_info();
1768 sub files_compare_inputs (@) {
1773 my $showinputs = sub {
1774 return join "; ", map { $_->get_option('name') } @$inputs;
1777 foreach my $in (@$inputs) {
1779 my $in_name = $in->get_option('name');
1781 printdebug "files_compare_inputs $in_name\n";
1783 foreach my $csumi (@files_csum_info_fields) {
1784 my ($fname) = @$csumi;
1785 printdebug "files_compare_inputs $in_name $fname\n";
1787 my $field = $in->{$fname};
1788 next unless defined $field;
1791 foreach (split /\n/, $field) {
1794 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1795 fail "could not parse $in_name $fname line \`$_'";
1797 printdebug "files_compare_inputs $in_name $fname $f\n";
1801 my $re = \ $record{$f}{$fname};
1803 $fchecked{$f}{$in_name} = 1;
1805 fail "hash or size of $f varies in $fname fields".
1806 " (between: ".$showinputs->().")";
1811 @files = sort @files;
1812 $expected_files //= \@files;
1813 "@$expected_files" eq "@files" or
1814 fail "file list in $in_name varies between hash fields!";
1817 fail "$in_name has no files list field(s)";
1819 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1822 grep { keys %$_ == @$inputs-1 } values %fchecked
1823 or fail "no file appears in all file lists".
1824 " (looked in: ".$showinputs->().")";
1827 sub is_orig_file_in_dsc ($$) {
1828 my ($f, $dsc_files_info) = @_;
1829 return 0 if @$dsc_files_info <= 1;
1830 # One file means no origs, and the filename doesn't have a "what
1831 # part of dsc" component. (Consider versions ending `.orig'.)
1832 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1836 sub is_orig_file_of_vsn ($$) {
1837 my ($f, $upstreamvsn) = @_;
1838 my $base = srcfn $upstreamvsn, '';
1839 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1843 sub changes_update_origs_from_dsc ($$$$) {
1844 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1846 printdebug "checking origs needed ($upstreamvsn)...\n";
1847 $_ = getfield $changes, 'Files';
1848 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1849 fail "cannot find section/priority from .changes Files field";
1850 my $placementinfo = $1;
1852 printdebug "checking origs needed placement '$placementinfo'...\n";
1853 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1854 $l =~ m/\S+$/ or next;
1856 printdebug "origs $file | $l\n";
1857 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1858 printdebug "origs $file is_orig\n";
1859 my $have = archive_query('file_in_archive', $file);
1860 if (!defined $have) {
1862 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1868 printdebug "origs $file \$#\$have=$#$have\n";
1869 foreach my $h (@$have) {
1872 foreach my $csumi (@files_csum_info_fields) {
1873 my ($fname, $module, $method, $archivefield) = @$csumi;
1874 next unless defined $h->{$archivefield};
1875 $_ = $dsc->{$fname};
1876 next unless defined;
1877 m/^(\w+) .* \Q$file\E$/m or
1878 fail ".dsc $fname missing entry for $file";
1879 if ($h->{$archivefield} eq $1) {
1883 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1886 die "$file ".Dumper($h)." ?!" if $same && @differ;
1889 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1892 print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
1893 if (@found_differ && !$found_same) {
1895 "archive contains $file with different checksum",
1898 # Now we edit the changes file to add or remove it
1899 foreach my $csumi (@files_csum_info_fields) {
1900 my ($fname, $module, $method, $archivefield) = @$csumi;
1901 next unless defined $changes->{$fname};
1903 # in archive, delete from .changes if it's there
1904 $changed{$file} = "removed" if
1905 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1906 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1907 # not in archive, but it's here in the .changes
1909 my $dsc_data = getfield $dsc, $fname;
1910 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1912 $extra =~ s/ \d+ /$&$placementinfo /
1913 or die "$fname $extra >$dsc_data< ?"
1914 if $fname eq 'Files';
1915 $changes->{$fname} .= "\n". $extra;
1916 $changed{$file} = "added";
1921 foreach my $file (keys %changed) {
1923 "edited .changes for archive .orig contents: %s %s",
1924 $changed{$file}, $file;
1926 my $chtmp = "$changesfile.tmp";
1927 $changes->save($chtmp);
1929 rename $chtmp,$changesfile or die "$changesfile $!";
1931 progress "[new .changes left in $changesfile]";
1934 progress "$changesfile already has appropriate .orig(s) (if any)";
1938 sub make_commit ($) {
1940 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1943 sub make_commit_text ($) {
1946 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1948 print Dumper($text) if $debuglevel > 1;
1949 my $child = open2($out, $in, @cmd) or die $!;
1952 print $in $text or die $!;
1953 close $in or die $!;
1955 $h =~ m/^\w+$/ or die;
1957 printdebug "=> $h\n";
1960 waitpid $child, 0 == $child or die "$child $!";
1961 $? and failedcmd @cmd;
1965 sub clogp_authline ($) {
1967 my $author = getfield $clogp, 'Maintainer';
1968 $author =~ s#,.*##ms;
1969 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1970 my $authline = "$author $date";
1971 $authline =~ m/$git_authline_re/o or
1972 fail "unexpected commit author line format \`$authline'".
1973 " (was generated from changelog Maintainer field)";
1974 return ($1,$2,$3) if wantarray;
1978 sub vendor_patches_distro ($$) {
1979 my ($checkdistro, $what) = @_;
1980 return unless defined $checkdistro;
1982 my $series = "debian/patches/\L$checkdistro\E.series";
1983 printdebug "checking for vendor-specific $series ($what)\n";
1985 if (!open SERIES, "<", $series) {
1986 die "$series $!" unless $!==ENOENT;
1995 Unfortunately, this source package uses a feature of dpkg-source where
1996 the same source package unpacks to different source code on different
1997 distros. dgit cannot safely operate on such packages on affected
1998 distros, because the meaning of source packages is not stable.
2000 Please ask the distro/maintainer to remove the distro-specific series
2001 files and use a different technique (if necessary, uploading actually
2002 different packages, if different distros are supposed to have
2006 fail "Found active distro-specific series file for".
2007 " $checkdistro ($what): $series, cannot continue";
2009 die "$series $!" if SERIES->error;
2013 sub check_for_vendor_patches () {
2014 # This dpkg-source feature doesn't seem to be documented anywhere!
2015 # But it can be found in the changelog (reformatted):
2017 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2018 # Author: Raphael Hertzog <hertzog@debian.org>
2019 # Date: Sun Oct 3 09:36:48 2010 +0200
2021 # dpkg-source: correctly create .pc/.quilt_series with alternate
2024 # If you have debian/patches/ubuntu.series and you were
2025 # unpacking the source package on ubuntu, quilt was still
2026 # directed to debian/patches/series instead of
2027 # debian/patches/ubuntu.series.
2029 # debian/changelog | 3 +++
2030 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2031 # 2 files changed, 6 insertions(+), 1 deletion(-)
2034 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2035 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2036 "Dpkg::Vendor \`current vendor'");
2037 vendor_patches_distro(access_basedistro(),
2038 "(base) distro being accessed");
2039 vendor_patches_distro(access_nomdistro(),
2040 "(nominal) distro being accessed");
2043 sub generate_commits_from_dsc () {
2044 # See big comment in fetch_from_archive, below.
2045 # See also README.dsc-import.
2049 my @dfi = dsc_files_info();
2050 foreach my $fi (@dfi) {
2051 my $f = $fi->{Filename};
2052 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2054 printdebug "considering linking $f: ";
2056 link_ltarget "../../../../$f", $f
2057 or ((printdebug "($!) "), 0)
2061 printdebug "linked.\n";
2063 complete_file_from_dsc('.', $fi)
2066 if (is_orig_file_in_dsc($f, \@dfi)) {
2067 link $f, "../../../../$f"
2073 # We unpack and record the orig tarballs first, so that we only
2074 # need disk space for one private copy of the unpacked source.
2075 # But we can't make them into commits until we have the metadata
2076 # from the debian/changelog, so we record the tree objects now and
2077 # make them into commits later.
2079 my $upstreamv = upstreamversion $dsc->{version};
2080 my $orig_f_base = srcfn $upstreamv, '';
2082 foreach my $fi (@dfi) {
2083 # We actually import, and record as a commit, every tarball
2084 # (unless there is only one file, in which case there seems
2087 my $f = $fi->{Filename};
2088 printdebug "import considering $f ";
2089 (printdebug "only one dfi\n"), next if @dfi == 1;
2090 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2091 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2095 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2097 printdebug "Y ", (join ' ', map { $_//"(none)" }
2098 $compr_ext, $orig_f_part
2101 my $input = new IO::File $f, '<' or die "$f $!";
2105 if (defined $compr_ext) {
2107 Dpkg::Compression::compression_guess_from_filename $f;
2108 fail "Dpkg::Compression cannot handle file $f in source package"
2109 if defined $compr_ext && !defined $cname;
2111 new Dpkg::Compression::Process compression => $cname;
2112 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2113 my $compr_fh = new IO::Handle;
2114 my $compr_pid = open $compr_fh, "-|" // die $!;
2116 open STDIN, "<&", $input or die $!;
2118 die "dgit (child): exec $compr_cmd[0]: $!\n";
2123 rmtree "../unpack-tar";
2124 mkdir "../unpack-tar" or die $!;
2125 my @tarcmd = qw(tar -x -f -
2126 --no-same-owner --no-same-permissions
2127 --no-acls --no-xattrs --no-selinux);
2128 my $tar_pid = fork // die $!;
2130 chdir "../unpack-tar" or die $!;
2131 open STDIN, "<&", $input or die $!;
2133 die "dgit (child): exec $tarcmd[0]: $!";
2135 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2136 !$? or failedcmd @tarcmd;
2139 (@compr_cmd ? failedcmd @compr_cmd
2141 # finally, we have the results in "tarball", but maybe
2142 # with the wrong permissions
2144 runcmd qw(chmod -R +rwX ../unpack-tar);
2145 changedir "../unpack-tar";
2146 my ($tree) = mktree_in_ud_from_only_subdir(1);
2147 changedir "../../unpack";
2148 rmtree "../unpack-tar";
2150 my $ent = [ $f, $tree ];
2152 Orig => !!$orig_f_part,
2153 Sort => (!$orig_f_part ? 2 :
2154 $orig_f_part =~ m/-/g ? 1 :
2162 # put any without "_" first (spec is not clear whether files
2163 # are always in the usual order). Tarballs without "_" are
2164 # the main orig or the debian tarball.
2165 $a->{Sort} <=> $b->{Sort} or
2169 my $any_orig = grep { $_->{Orig} } @tartrees;
2171 my $dscfn = "$package.dsc";
2173 my $treeimporthow = 'package';
2175 open D, ">", $dscfn or die "$dscfn: $!";
2176 print D $dscdata or die "$dscfn: $!";
2177 close D or die "$dscfn: $!";
2178 my @cmd = qw(dpkg-source);
2179 push @cmd, '--no-check' if $dsc_checked;
2180 if (madformat $dsc->{format}) {
2181 push @cmd, '--skip-patches';
2182 $treeimporthow = 'unpatched';
2184 push @cmd, qw(-x --), $dscfn;
2187 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2188 if (madformat $dsc->{format}) {
2189 check_for_vendor_patches();
2193 if (madformat $dsc->{format}) {
2194 my @pcmd = qw(dpkg-source --before-build .);
2195 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2197 runcmd @git, qw(add -Af);
2198 $dappliedtree = git_write_tree();
2201 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2202 debugcmd "|",@clogcmd;
2203 open CLOGS, "-|", @clogcmd or die $!;
2208 printdebug "import clog search...\n";
2211 my $stanzatext = do { local $/=""; <CLOGS>; };
2212 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2213 last if !defined $stanzatext;
2215 my $desc = "package changelog, entry no.$.";
2216 open my $stanzafh, "<", \$stanzatext or die;
2217 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2218 $clogp //= $thisstanza;
2220 printdebug "import clog $thisstanza->{version} $desc...\n";
2222 last if !$any_orig; # we don't need $r1clogp
2224 # We look for the first (most recent) changelog entry whose
2225 # version number is lower than the upstream version of this
2226 # package. Then the last (least recent) previous changelog
2227 # entry is treated as the one which introduced this upstream
2228 # version and used for the synthetic commits for the upstream
2231 # One might think that a more sophisticated algorithm would be
2232 # necessary. But: we do not want to scan the whole changelog
2233 # file. Stopping when we see an earlier version, which
2234 # necessarily then is an earlier upstream version, is the only
2235 # realistic way to do that. Then, either the earliest
2236 # changelog entry we have seen so far is indeed the earliest
2237 # upload of this upstream version; or there are only changelog
2238 # entries relating to later upstream versions (which is not
2239 # possible unless the changelog and .dsc disagree about the
2240 # version). Then it remains to choose between the physically
2241 # last entry in the file, and the one with the lowest version
2242 # number. If these are not the same, we guess that the
2243 # versions were created in a non-monotic order rather than
2244 # that the changelog entries have been misordered.
2246 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2248 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2249 $r1clogp = $thisstanza;
2251 printdebug "import clog $r1clogp->{version} becomes r1\n";
2253 die $! if CLOGS->error;
2254 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2256 $clogp or fail "package changelog has no entries!";
2258 my $authline = clogp_authline $clogp;
2259 my $changes = getfield $clogp, 'Changes';
2260 my $cversion = getfield $clogp, 'Version';
2263 $r1clogp //= $clogp; # maybe there's only one entry;
2264 my $r1authline = clogp_authline $r1clogp;
2265 # Strictly, r1authline might now be wrong if it's going to be
2266 # unused because !$any_orig. Whatever.
2268 printdebug "import tartrees authline $authline\n";
2269 printdebug "import tartrees r1authline $r1authline\n";
2271 foreach my $tt (@tartrees) {
2272 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2274 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2277 committer $r1authline
2281 [dgit import orig $tt->{F}]
2289 [dgit import tarball $package $cversion $tt->{F}]
2294 printdebug "import main commit\n";
2296 open C, ">../commit.tmp" or die $!;
2297 print C <<END or die $!;
2300 print C <<END or die $! foreach @tartrees;
2303 print C <<END or die $!;
2309 [dgit import $treeimporthow $package $cversion]
2313 my $rawimport_hash = make_commit qw(../commit.tmp);
2315 if (madformat $dsc->{format}) {
2316 printdebug "import apply patches...\n";
2318 # regularise the state of the working tree so that
2319 # the checkout of $rawimport_hash works nicely.
2320 my $dappliedcommit = make_commit_text(<<END);
2327 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2329 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2331 # We need the answers to be reproducible
2332 my @authline = clogp_authline($clogp);
2333 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2334 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2335 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2336 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2337 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2338 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2340 my $path = $ENV{PATH} or die;
2342 foreach my $use_absurd (qw(0 1)) {
2343 local $ENV{PATH} = $path;
2346 progress "warning: $@";
2347 $path = "$absurdity:$path";
2348 progress "$us: trying slow absurd-git-apply...";
2349 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2354 die "forbid absurd git-apply\n" if $use_absurd
2355 && forceing [qw(import-gitapply-no-absurd)];
2356 die "only absurd git-apply!\n" if !$use_absurd
2357 && forceing [qw(import-gitapply-absurd)];
2359 local $ENV{PATH} = $path if $use_absurd;
2361 my @showcmd = (gbp_pq, qw(import));
2362 my @realcmd = shell_cmd
2363 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2364 debugcmd "+",@realcmd;
2365 if (system @realcmd) {
2366 die +(shellquote @showcmd).
2368 failedcmd_waitstatus()."\n";
2371 my $gapplied = git_rev_parse('HEAD');
2372 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2373 $gappliedtree eq $dappliedtree or
2375 gbp-pq import and dpkg-source disagree!
2376 gbp-pq import gave commit $gapplied
2377 gbp-pq import gave tree $gappliedtree
2378 dpkg-source --before-build gave tree $dappliedtree
2380 $rawimport_hash = $gapplied;
2385 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2390 progress "synthesised git commit from .dsc $cversion";
2392 my $rawimport_mergeinput = {
2393 Commit => $rawimport_hash,
2394 Info => "Import of source package",
2396 my @output = ($rawimport_mergeinput);
2398 if ($lastpush_mergeinput) {
2399 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2400 my $oversion = getfield $oldclogp, 'Version';
2402 version_compare($oversion, $cversion);
2404 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2405 { Message => <<END, ReverseParents => 1 });
2406 Record $package ($cversion) in archive suite $csuite
2408 } elsif ($vcmp > 0) {
2409 print STDERR <<END or die $!;
2411 Version actually in archive: $cversion (older)
2412 Last version pushed with dgit: $oversion (newer or same)
2415 @output = $lastpush_mergeinput;
2417 # Same version. Use what's in the server git branch,
2418 # discarding our own import. (This could happen if the
2419 # server automatically imports all packages into git.)
2420 @output = $lastpush_mergeinput;
2423 changedir '../../../..';
2428 sub complete_file_from_dsc ($$) {
2429 our ($dstdir, $fi) = @_;
2430 # Ensures that we have, in $dir, the file $fi, with the correct
2431 # contents. (Downloading it from alongside $dscurl if necessary.)
2433 my $f = $fi->{Filename};
2434 my $tf = "$dstdir/$f";
2437 if (stat_exists $tf) {
2438 progress "using existing $f";
2440 printdebug "$tf does not exist, need to fetch\n";
2442 $furl =~ s{/[^/]+$}{};
2444 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2445 die "$f ?" if $f =~ m#/#;
2446 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2447 return 0 if !act_local();
2451 open F, "<", "$tf" or die "$tf: $!";
2452 $fi->{Digester}->reset();
2453 $fi->{Digester}->addfile(*F);
2454 F->error and die $!;
2455 my $got = $fi->{Digester}->hexdigest();
2456 $got eq $fi->{Hash} or
2457 fail "file $f has hash $got but .dsc".
2458 " demands hash $fi->{Hash} ".
2459 ($downloaded ? "(got wrong file from archive!)"
2460 : "(perhaps you should delete this file?)");
2465 sub ensure_we_have_orig () {
2466 my @dfi = dsc_files_info();
2467 foreach my $fi (@dfi) {
2468 my $f = $fi->{Filename};
2469 next unless is_orig_file_in_dsc($f, \@dfi);
2470 complete_file_from_dsc('..', $fi)
2475 sub git_fetch_us () {
2476 # Want to fetch only what we are going to use, unless
2477 # deliberately-not-ff, in which case we must fetch everything.
2479 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2481 (quiltmode_splitbrain
2482 ? (map { $_->('*',access_nomdistro) }
2483 \&debiantag_new, \&debiantag_maintview)
2484 : debiantags('*',access_nomdistro));
2485 push @specs, server_branch($csuite);
2486 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2488 # This is rather miserable:
2489 # When git fetch --prune is passed a fetchspec ending with a *,
2490 # it does a plausible thing. If there is no * then:
2491 # - it matches subpaths too, even if the supplied refspec
2492 # starts refs, and behaves completely madly if the source
2493 # has refs/refs/something. (See, for example, Debian #NNNN.)
2494 # - if there is no matching remote ref, it bombs out the whole
2496 # We want to fetch a fixed ref, and we don't know in advance
2497 # if it exists, so this is not suitable.
2499 # Our workaround is to use git ls-remote. git ls-remote has its
2500 # own qairks. Notably, it has the absurd multi-tail-matching
2501 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2502 # refs/refs/foo etc.
2504 # Also, we want an idempotent snapshot, but we have to make two
2505 # calls to the remote: one to git ls-remote and to git fetch. The
2506 # solution is use git ls-remote to obtain a target state, and
2507 # git fetch to try to generate it. If we don't manage to generate
2508 # the target state, we try again.
2510 printdebug "git_fetch_us specs @specs\n";
2512 my $specre = join '|', map {
2518 printdebug "git_fetch_us specre=$specre\n";
2519 my $wanted_rref = sub {
2521 return m/^(?:$specre)$/o;
2524 my $fetch_iteration = 0;
2527 printdebug "git_fetch_us iteration $fetch_iteration\n";
2528 if (++$fetch_iteration > 10) {
2529 fail "too many iterations trying to get sane fetch!";
2532 my @look = map { "refs/$_" } @specs;
2533 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2537 open GITLS, "-|", @lcmd or die $!;
2539 printdebug "=> ", $_;
2540 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2541 my ($objid,$rrefname) = ($1,$2);
2542 if (!$wanted_rref->($rrefname)) {
2544 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2548 $wantr{$rrefname} = $objid;
2551 close GITLS or failedcmd @lcmd;
2553 # OK, now %want is exactly what we want for refs in @specs
2555 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2556 "+refs/$_:".lrfetchrefs."/$_";
2559 printdebug "git_fetch_us fspecs @fspecs\n";
2561 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2562 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2565 %lrfetchrefs_f = ();
2568 git_for_each_ref(lrfetchrefs, sub {
2569 my ($objid,$objtype,$lrefname,$reftail) = @_;
2570 $lrfetchrefs_f{$lrefname} = $objid;
2571 $objgot{$objid} = 1;
2574 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2575 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2576 if (!exists $wantr{$rrefname}) {
2577 if ($wanted_rref->($rrefname)) {
2579 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2583 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2586 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2587 delete $lrfetchrefs_f{$lrefname};
2591 foreach my $rrefname (sort keys %wantr) {
2592 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2593 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2594 my $want = $wantr{$rrefname};
2595 next if $got eq $want;
2596 if (!defined $objgot{$want}) {
2598 warning: git ls-remote suggests we want $lrefname
2599 warning: and it should refer to $want
2600 warning: but git fetch didn't fetch that object to any relevant ref.
2601 warning: This may be due to a race with someone updating the server.
2602 warning: Will try again...
2604 next FETCH_ITERATION;
2607 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2609 runcmd_ordryrun_local @git, qw(update-ref -m),
2610 "dgit fetch git fetch fixup", $lrefname, $want;
2611 $lrfetchrefs_f{$lrefname} = $want;
2615 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2616 Dumper(\%lrfetchrefs_f);
2619 my @tagpats = debiantags('*',access_nomdistro);
2621 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2622 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2623 printdebug "currently $fullrefname=$objid\n";
2624 $here{$fullrefname} = $objid;
2626 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2627 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2628 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2629 printdebug "offered $lref=$objid\n";
2630 if (!defined $here{$lref}) {
2631 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2632 runcmd_ordryrun_local @upd;
2633 lrfetchref_used $fullrefname;
2634 } elsif ($here{$lref} eq $objid) {
2635 lrfetchref_used $fullrefname;
2638 "Not updateting $lref from $here{$lref} to $objid.\n";
2643 sub mergeinfo_getclogp ($) {
2644 # Ensures thit $mi->{Clogp} exists and returns it
2646 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2649 sub mergeinfo_version ($) {
2650 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2653 sub fetch_from_archive_record_1 ($) {
2655 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2656 'DGIT_ARCHIVE', $hash;
2657 cmdoutput @git, qw(log -n2), $hash;
2658 # ... gives git a chance to complain if our commit is malformed
2661 sub fetch_from_archive_record_2 ($) {
2663 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2667 dryrun_report @upd_cmd;
2671 sub fetch_from_archive () {
2672 ensure_setup_existing_tree();
2674 # Ensures that lrref() is what is actually in the archive, one way
2675 # or another, according to us - ie this client's
2676 # appropritaely-updated archive view. Also returns the commit id.
2677 # If there is nothing in the archive, leaves lrref alone and
2678 # returns undef. git_fetch_us must have already been called.
2682 foreach my $field (@ourdscfield) {
2683 $dsc_hash = $dsc->{$field};
2684 last if defined $dsc_hash;
2686 if (defined $dsc_hash) {
2687 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2689 progress "last upload to archive specified git hash";
2691 progress "last upload to archive has NO git hash";
2694 progress "no version available from the archive";
2697 # If the archive's .dsc has a Dgit field, there are three
2698 # relevant git commitids we need to choose between and/or merge
2700 # 1. $dsc_hash: the Dgit field from the archive
2701 # 2. $lastpush_hash: the suite branch on the dgit git server
2702 # 3. $lastfetch_hash: our local tracking brach for the suite
2704 # These may all be distinct and need not be in any fast forward
2707 # If the dsc was pushed to this suite, then the server suite
2708 # branch will have been updated; but it might have been pushed to
2709 # a different suite and copied by the archive. Conversely a more
2710 # recent version may have been pushed with dgit but not appeared
2711 # in the archive (yet).
2713 # $lastfetch_hash may be awkward because archive imports
2714 # (particularly, imports of Dgit-less .dscs) are performed only as
2715 # needed on individual clients, so different clients may perform a
2716 # different subset of them - and these imports are only made
2717 # public during push. So $lastfetch_hash may represent a set of
2718 # imports different to a subsequent upload by a different dgit
2721 # Our approach is as follows:
2723 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2724 # descendant of $dsc_hash, then it was pushed by a dgit user who
2725 # had based their work on $dsc_hash, so we should prefer it.
2726 # Otherwise, $dsc_hash was installed into this suite in the
2727 # archive other than by a dgit push, and (necessarily) after the
2728 # last dgit push into that suite (since a dgit push would have
2729 # been descended from the dgit server git branch); thus, in that
2730 # case, we prefer the archive's version (and produce a
2731 # pseudo-merge to overwrite the dgit server git branch).
2733 # (If there is no Dgit field in the archive's .dsc then
2734 # generate_commit_from_dsc uses the version numbers to decide
2735 # whether the suite branch or the archive is newer. If the suite
2736 # branch is newer it ignores the archive's .dsc; otherwise it
2737 # generates an import of the .dsc, and produces a pseudo-merge to
2738 # overwrite the suite branch with the archive contents.)
2740 # The outcome of that part of the algorithm is the `public view',
2741 # and is same for all dgit clients: it does not depend on any
2742 # unpublished history in the local tracking branch.
2744 # As between the public view and the local tracking branch: The
2745 # local tracking branch is only updated by dgit fetch, and
2746 # whenever dgit fetch runs it includes the public view in the
2747 # local tracking branch. Therefore if the public view is not
2748 # descended from the local tracking branch, the local tracking
2749 # branch must contain history which was imported from the archive
2750 # but never pushed; and, its tip is now out of date. So, we make
2751 # a pseudo-merge to overwrite the old imports and stitch the old
2754 # Finally: we do not necessarily reify the public view (as
2755 # described above). This is so that we do not end up stacking two
2756 # pseudo-merges. So what we actually do is figure out the inputs
2757 # to any public view pseudo-merge and put them in @mergeinputs.
2760 # $mergeinputs[]{Commit}
2761 # $mergeinputs[]{Info}
2762 # $mergeinputs[0] is the one whose tree we use
2763 # @mergeinputs is in the order we use in the actual commit)
2766 # $mergeinputs[]{Message} is a commit message to use
2767 # $mergeinputs[]{ReverseParents} if def specifies that parent
2768 # list should be in opposite order
2769 # Such an entry has no Commit or Info. It applies only when found
2770 # in the last entry. (This ugliness is to support making
2771 # identical imports to previous dgit versions.)
2773 my $lastpush_hash = git_get_ref(lrfetchref());
2774 printdebug "previous reference hash=$lastpush_hash\n";
2775 $lastpush_mergeinput = $lastpush_hash && {
2776 Commit => $lastpush_hash,
2777 Info => "dgit suite branch on dgit git server",
2780 my $lastfetch_hash = git_get_ref(lrref());
2781 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2782 my $lastfetch_mergeinput = $lastfetch_hash && {
2783 Commit => $lastfetch_hash,
2784 Info => "dgit client's archive history view",
2787 my $dsc_mergeinput = $dsc_hash && {
2788 Commit => $dsc_hash,
2789 Info => "Dgit field in .dsc from archive",
2793 my $del_lrfetchrefs = sub {
2796 printdebug "del_lrfetchrefs...\n";
2797 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2798 my $objid = $lrfetchrefs_d{$fullrefname};
2799 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2801 $gur ||= new IO::Handle;
2802 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2804 printf $gur "delete %s %s\n", $fullrefname, $objid;
2807 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2811 if (defined $dsc_hash) {
2812 ensure_we_have_orig();
2813 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2814 @mergeinputs = $dsc_mergeinput
2815 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2816 print STDERR <<END or die $!;
2818 Git commit in archive is behind the last version allegedly pushed/uploaded.
2819 Commit referred to by archive: $dsc_hash
2820 Last version pushed with dgit: $lastpush_hash
2823 @mergeinputs = ($lastpush_mergeinput);
2825 # Archive has .dsc which is not a descendant of the last dgit
2826 # push. This can happen if the archive moves .dscs about.
2827 # Just follow its lead.
2828 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2829 progress "archive .dsc names newer git commit";
2830 @mergeinputs = ($dsc_mergeinput);
2832 progress "archive .dsc names other git commit, fixing up";
2833 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2837 @mergeinputs = generate_commits_from_dsc();
2838 # We have just done an import. Now, our import algorithm might
2839 # have been improved. But even so we do not want to generate
2840 # a new different import of the same package. So if the
2841 # version numbers are the same, just use our existing version.
2842 # If the version numbers are different, the archive has changed
2843 # (perhaps, rewound).
2844 if ($lastfetch_mergeinput &&
2845 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2846 (mergeinfo_version $mergeinputs[0]) )) {
2847 @mergeinputs = ($lastfetch_mergeinput);
2849 } elsif ($lastpush_hash) {
2850 # only in git, not in the archive yet
2851 @mergeinputs = ($lastpush_mergeinput);
2852 print STDERR <<END or die $!;
2854 Package not found in the archive, but has allegedly been pushed using dgit.
2858 printdebug "nothing found!\n";
2859 if (defined $skew_warning_vsn) {
2860 print STDERR <<END or die $!;
2862 Warning: relevant archive skew detected.
2863 Archive allegedly contains $skew_warning_vsn
2864 But we were not able to obtain any version from the archive or git.
2868 unshift @end, $del_lrfetchrefs;
2872 if ($lastfetch_hash &&
2874 my $h = $_->{Commit};
2875 $h and is_fast_fwd($lastfetch_hash, $h);
2876 # If true, one of the existing parents of this commit
2877 # is a descendant of the $lastfetch_hash, so we'll
2878 # be ff from that automatically.
2882 push @mergeinputs, $lastfetch_mergeinput;
2885 printdebug "fetch mergeinfos:\n";
2886 foreach my $mi (@mergeinputs) {
2888 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2890 printdebug sprintf " ReverseParents=%d Message=%s",
2891 $mi->{ReverseParents}, $mi->{Message};
2895 my $compat_info= pop @mergeinputs
2896 if $mergeinputs[$#mergeinputs]{Message};
2898 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2901 if (@mergeinputs > 1) {
2903 my $tree_commit = $mergeinputs[0]{Commit};
2905 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2906 $tree =~ m/\n\n/; $tree = $`;
2907 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2910 # We use the changelog author of the package in question the
2911 # author of this pseudo-merge. This is (roughly) correct if
2912 # this commit is simply representing aa non-dgit upload.
2913 # (Roughly because it does not record sponsorship - but we
2914 # don't have sponsorship info because that's in the .changes,
2915 # which isn't in the archivw.)
2917 # But, it might be that we are representing archive history
2918 # updates (including in-archive copies). These are not really
2919 # the responsibility of the person who created the .dsc, but
2920 # there is no-one whose name we should better use. (The
2921 # author of the .dsc-named commit is clearly worse.)
2923 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2924 my $author = clogp_authline $useclogp;
2925 my $cversion = getfield $useclogp, 'Version';
2927 my $mcf = ".git/dgit/mergecommit";
2928 open MC, ">", $mcf or die "$mcf $!";
2929 print MC <<END or die $!;
2933 my @parents = grep { $_->{Commit} } @mergeinputs;
2934 @parents = reverse @parents if $compat_info->{ReverseParents};
2935 print MC <<END or die $! foreach @parents;
2939 print MC <<END or die $!;
2945 if (defined $compat_info->{Message}) {
2946 print MC $compat_info->{Message} or die $!;
2948 print MC <<END or die $!;
2949 Record $package ($cversion) in archive suite $csuite
2953 my $message_add_info = sub {
2955 my $mversion = mergeinfo_version $mi;
2956 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2960 $message_add_info->($mergeinputs[0]);
2961 print MC <<END or die $!;
2962 should be treated as descended from
2964 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2968 $hash = make_commit $mcf;
2970 $hash = $mergeinputs[0]{Commit};
2972 printdebug "fetch hash=$hash\n";
2975 my ($lasth, $what) = @_;
2976 return unless $lasth;
2977 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2980 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2982 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2984 fetch_from_archive_record_1($hash);
2986 if (defined $skew_warning_vsn) {
2988 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2989 my $gotclogp = commit_getclogp($hash);
2990 my $got_vsn = getfield $gotclogp, 'Version';
2991 printdebug "SKEW CHECK GOT $got_vsn\n";
2992 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2993 print STDERR <<END or die $!;
2995 Warning: archive skew detected. Using the available version:
2996 Archive allegedly contains $skew_warning_vsn
2997 We were able to obtain only $got_vsn
3003 if ($lastfetch_hash ne $hash) {
3004 fetch_from_archive_record_2($hash);
3007 lrfetchref_used lrfetchref();
3009 unshift @end, $del_lrfetchrefs;
3013 sub set_local_git_config ($$) {
3015 runcmd @git, qw(config), $k, $v;
3018 sub setup_mergechangelogs (;$) {
3020 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3022 my $driver = 'dpkg-mergechangelogs';
3023 my $cb = "merge.$driver";
3024 my $attrs = '.git/info/attributes';
3025 ensuredir '.git/info';
3027 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3028 if (!open ATTRS, "<", $attrs) {
3029 $!==ENOENT or die "$attrs: $!";
3033 next if m{^debian/changelog\s};
3034 print NATTRS $_, "\n" or die $!;
3036 ATTRS->error and die $!;
3039 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3042 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3043 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3045 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3048 sub setup_useremail (;$) {
3050 return unless $always || access_cfg_bool(1, 'setup-useremail');
3053 my ($k, $envvar) = @_;
3054 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3055 return unless defined $v;
3056 set_local_git_config "user.$k", $v;
3059 $setup->('email', 'DEBEMAIL');
3060 $setup->('name', 'DEBFULLNAME');
3063 sub ensure_setup_existing_tree () {
3064 my $k = "remote.$remotename.skipdefaultupdate";
3065 my $c = git_get_config $k;
3066 return if defined $c;
3067 set_local_git_config $k, 'true';
3070 sub setup_new_tree () {
3071 setup_mergechangelogs();
3075 sub clone_set_head () {
3076 open H, "> .git/HEAD" or die $!;
3077 print H "ref: ".lref()."\n" or die $!;
3080 sub clone_finish ($) {
3082 runcmd @git, qw(reset --hard), lrref();
3083 runcmd qw(bash -ec), <<'END';
3085 git ls-tree -r --name-only -z HEAD | \
3086 xargs -0r touch -r . --
3088 printdone "ready for work in $dstdir";
3093 badusage "dry run makes no sense with clone" unless act_local();
3094 canonicalise_suite();
3095 my $hasgit = check_for_git();
3096 mkdir $dstdir or fail "create \`$dstdir': $!";
3098 runcmd @git, qw(init -q);
3100 my $giturl = access_giturl(1);
3101 if (defined $giturl) {
3102 runcmd @git, qw(remote add), 'origin', $giturl;
3105 progress "fetching existing git history";
3107 runcmd_ordryrun_local @git, qw(fetch origin);
3109 progress "starting new git history";
3111 fetch_from_archive() or no_such_package;
3112 my $vcsgiturl = $dsc->{'Vcs-Git'};
3113 if (length $vcsgiturl) {
3114 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3115 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3118 clone_finish($dstdir);
3122 canonicalise_suite();
3123 if (check_for_git()) {
3126 fetch_from_archive() or no_such_package();
3127 printdone "fetched into ".lrref();
3132 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3134 printdone "fetched to ".lrref()." and merged into HEAD";
3137 sub check_not_dirty () {
3138 foreach my $f (qw(local-options local-patch-header)) {
3139 if (stat_exists "debian/source/$f") {
3140 fail "git tree contains debian/source/$f";
3144 return if $ignoredirty;
3146 my @cmd = (@git, qw(diff --quiet HEAD));
3148 $!=0; $?=-1; system @cmd;
3151 fail "working tree is dirty (does not match HEAD)";
3157 sub commit_admin ($) {
3160 runcmd_ordryrun_local @git, qw(commit -m), $m;
3163 sub commit_quilty_patch () {
3164 my $output = cmdoutput @git, qw(status --porcelain);
3166 foreach my $l (split /\n/, $output) {
3167 next unless $l =~ m/\S/;
3168 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3172 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3174 progress "nothing quilty to commit, ok.";
3177 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3178 runcmd_ordryrun_local @git, qw(add -f), @adds;
3180 Commit Debian 3.0 (quilt) metadata
3182 [dgit ($our_version) quilt-fixup]
3186 sub get_source_format () {
3188 if (open F, "debian/source/options") {
3192 s/\s+$//; # ignore missing final newline
3194 my ($k, $v) = ($`, $'); #');
3195 $v =~ s/^"(.*)"$/$1/;
3201 F->error and die $!;
3204 die $! unless $!==&ENOENT;
3207 if (!open F, "debian/source/format") {
3208 die $! unless $!==&ENOENT;
3212 F->error and die $!;
3214 return ($_, \%options);
3217 sub madformat_wantfixup ($) {
3219 return 0 unless $format eq '3.0 (quilt)';
3220 our $quilt_mode_warned;
3221 if ($quilt_mode eq 'nocheck') {
3222 progress "Not doing any fixup of \`$format' due to".
3223 " ----no-quilt-fixup or --quilt=nocheck"
3224 unless $quilt_mode_warned++;
3227 progress "Format \`$format', need to check/update patch stack"
3228 unless $quilt_mode_warned++;
3232 sub maybe_split_brain_save ($$$) {
3233 my ($headref, $dgitview, $msg) = @_;
3234 # => message fragment "$saved" describing disposition of $dgitview
3235 return "commit id $dgitview" unless defined $split_brain_save;
3236 my @cmd = (shell_cmd "cd ../../../..",
3237 @git, qw(update-ref -m),
3238 "dgit --dgit-view-save $msg HEAD=$headref",
3239 $split_brain_save, $dgitview);
3241 return "and left in $split_brain_save";
3244 # An "infopair" is a tuple [ $thing, $what ]
3245 # (often $thing is a commit hash; $what is a description)
3247 sub infopair_cond_equal ($$) {
3249 $x->[0] eq $y->[0] or fail <<END;
3250 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3254 sub infopair_lrf_tag_lookup ($$) {
3255 my ($tagnames, $what) = @_;
3256 # $tagname may be an array ref
3257 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3258 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3259 foreach my $tagname (@tagnames) {
3260 my $lrefname = lrfetchrefs."/tags/$tagname";
3261 my $tagobj = $lrfetchrefs_f{$lrefname};
3262 next unless defined $tagobj;
3263 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3264 return [ git_rev_parse($tagobj), $what ];
3266 fail @tagnames==1 ? <<END : <<END;
3267 Wanted tag $what (@tagnames) on dgit server, but not found
3269 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3273 sub infopair_cond_ff ($$) {
3274 my ($anc,$desc) = @_;
3275 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3276 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3280 sub pseudomerge_version_check ($$) {
3281 my ($clogp, $archive_hash) = @_;
3283 my $arch_clogp = commit_getclogp $archive_hash;
3284 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3285 'version currently in archive' ];
3286 if (defined $overwrite_version) {
3287 if (length $overwrite_version) {
3288 infopair_cond_equal([ $overwrite_version,
3289 '--overwrite= version' ],
3292 my $v = $i_arch_v->[0];
3293 progress "Checking package changelog for archive version $v ...";
3295 my @xa = ("-f$v", "-t$v");
3296 my $vclogp = parsechangelog @xa;
3297 my $cv = [ (getfield $vclogp, 'Version'),
3298 "Version field from dpkg-parsechangelog @xa" ];
3299 infopair_cond_equal($i_arch_v, $cv);
3302 $@ =~ s/^dgit: //gm;
3304 "Perhaps debian/changelog does not mention $v ?";
3309 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3313 sub pseudomerge_make_commit ($$$$ $$) {
3314 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3315 $msg_cmd, $msg_msg) = @_;
3316 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3318 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3319 my $authline = clogp_authline $clogp;
3323 !defined $overwrite_version ? ""
3324 : !length $overwrite_version ? " --overwrite"
3325 : " --overwrite=".$overwrite_version;
3328 my $pmf = ".git/dgit/pseudomerge";
3329 open MC, ">", $pmf or die "$pmf $!";
3330 print MC <<END or die $!;
3333 parent $archive_hash
3343 return make_commit($pmf);
3346 sub splitbrain_pseudomerge ($$$$) {
3347 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3348 # => $merged_dgitview
3349 printdebug "splitbrain_pseudomerge...\n";
3351 # We: debian/PREVIOUS HEAD($maintview)
3352 # expect: o ----------------- o
3355 # a/d/PREVIOUS $dgitview
3358 # we do: `------------------ o
3362 return $dgitview unless defined $archive_hash;
3364 printdebug "splitbrain_pseudomerge...\n";
3366 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3368 if (!defined $overwrite_version) {
3369 progress "Checking that HEAD inciudes all changes in archive...";
3372 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3374 if (defined $overwrite_version) {
3376 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3377 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3378 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3379 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3380 my $i_archive = [ $archive_hash, "current archive contents" ];
3382 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3384 infopair_cond_equal($i_dgit, $i_archive);
3385 infopair_cond_ff($i_dep14, $i_dgit);
3386 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3390 $us: check failed (maybe --overwrite is needed, consult documentation)
3395 my $r = pseudomerge_make_commit
3396 $clogp, $dgitview, $archive_hash, $i_arch_v,
3397 "dgit --quilt=$quilt_mode",
3398 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3399 Declare fast forward from $i_arch_v->[0]
3401 Make fast forward from $i_arch_v->[0]
3404 maybe_split_brain_save $maintview, $r, "pseudomerge";
3406 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3410 sub plain_overwrite_pseudomerge ($$$) {
3411 my ($clogp, $head, $archive_hash) = @_;
3413 printdebug "plain_overwrite_pseudomerge...";
3415 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3417 return $head if is_fast_fwd $archive_hash, $head;
3419 my $m = "Declare fast forward from $i_arch_v->[0]";
3421 my $r = pseudomerge_make_commit
3422 $clogp, $head, $archive_hash, $i_arch_v,
3425 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3427 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3431 sub push_parse_changelog ($) {
3434 my $clogp = Dpkg::Control::Hash->new();
3435 $clogp->load($clogpfn) or die;
3437 my $clogpackage = getfield $clogp, 'Source';
3438 $package //= $clogpackage;
3439 fail "-p specified $package but changelog specified $clogpackage"
3440 unless $package eq $clogpackage;
3441 my $cversion = getfield $clogp, 'Version';
3442 my $tag = debiantag($cversion, access_nomdistro);
3443 runcmd @git, qw(check-ref-format), $tag;
3445 my $dscfn = dscfn($cversion);
3447 return ($clogp, $cversion, $dscfn);
3450 sub push_parse_dsc ($$$) {
3451 my ($dscfn,$dscfnwhat, $cversion) = @_;
3452 $dsc = parsecontrol($dscfn,$dscfnwhat);
3453 my $dversion = getfield $dsc, 'Version';
3454 my $dscpackage = getfield $dsc, 'Source';
3455 ($dscpackage eq $package && $dversion eq $cversion) or
3456 fail "$dscfn is for $dscpackage $dversion".
3457 " but debian/changelog is for $package $cversion";
3460 sub push_tagwants ($$$$) {
3461 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3464 TagFn => \&debiantag,
3469 if (defined $maintviewhead) {
3471 TagFn => \&debiantag_maintview,
3472 Objid => $maintviewhead,
3473 TfSuffix => '-maintview',
3477 foreach my $tw (@tagwants) {
3478 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3479 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3481 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3485 sub push_mktags ($$ $$ $) {
3487 $changesfile,$changesfilewhat,
3490 die unless $tagwants->[0]{View} eq 'dgit';
3492 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3493 $dsc->save("$dscfn.tmp") or die $!;
3495 my $changes = parsecontrol($changesfile,$changesfilewhat);
3496 foreach my $field (qw(Source Distribution Version)) {
3497 $changes->{$field} eq $clogp->{$field} or
3498 fail "changes field $field \`$changes->{$field}'".
3499 " does not match changelog \`$clogp->{$field}'";
3502 my $cversion = getfield $clogp, 'Version';
3503 my $clogsuite = getfield $clogp, 'Distribution';
3505 # We make the git tag by hand because (a) that makes it easier
3506 # to control the "tagger" (b) we can do remote signing
3507 my $authline = clogp_authline $clogp;
3508 my $delibs = join(" ", "",@deliberatelies);
3509 my $declaredistro = access_nomdistro();
3513 my $tfn = $tw->{Tfn};
3514 my $head = $tw->{Objid};
3515 my $tag = $tw->{Tag};
3517 open TO, '>', $tfn->('.tmp') or die $!;
3518 print TO <<END or die $!;
3525 if ($tw->{View} eq 'dgit') {
3526 print TO <<END or die $!;
3527 $package release $cversion for $clogsuite ($csuite) [dgit]
3528 [dgit distro=$declaredistro$delibs]
3530 foreach my $ref (sort keys %previously) {
3531 print TO <<END or die $!;
3532 [dgit previously:$ref=$previously{$ref}]
3535 } elsif ($tw->{View} eq 'maint') {
3536 print TO <<END or die $!;
3537 $package release $cversion for $clogsuite ($csuite)
3538 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3541 die Dumper($tw)."?";
3546 my $tagobjfn = $tfn->('.tmp');
3548 if (!defined $keyid) {
3549 $keyid = access_cfg('keyid','RETURN-UNDEF');
3551 if (!defined $keyid) {
3552 $keyid = getfield $clogp, 'Maintainer';
3554 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3555 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3556 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3557 push @sign_cmd, $tfn->('.tmp');
3558 runcmd_ordryrun @sign_cmd;
3560 $tagobjfn = $tfn->('.signed.tmp');
3561 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3562 $tfn->('.tmp'), $tfn->('.tmp.asc');
3568 my @r = map { $mktag->($_); } @$tagwants;
3572 sub sign_changes ($) {
3573 my ($changesfile) = @_;
3575 my @debsign_cmd = @debsign;
3576 push @debsign_cmd, "-k$keyid" if defined $keyid;
3577 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3578 push @debsign_cmd, $changesfile;
3579 runcmd_ordryrun @debsign_cmd;
3584 printdebug "actually entering push\n";
3586 supplementary_message(<<'END');
3587 Push failed, while checking state of the archive.
3588 You can retry the push, after fixing the problem, if you like.
3590 if (check_for_git()) {
3593 my $archive_hash = fetch_from_archive();
3594 if (!$archive_hash) {
3596 fail "package appears to be new in this suite;".
3597 " if this is intentional, use --new";
3600 supplementary_message(<<'END');
3601 Push failed, while preparing your push.
3602 You can retry the push, after fixing the problem, if you like.
3605 need_tagformat 'new', "quilt mode $quilt_mode"
3606 if quiltmode_splitbrain;
3610 access_giturl(); # check that success is vaguely likely
3613 my $clogpfn = ".git/dgit/changelog.822.tmp";
3614 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3616 responder_send_file('parsed-changelog', $clogpfn);
3618 my ($clogp, $cversion, $dscfn) =
3619 push_parse_changelog("$clogpfn");
3621 my $dscpath = "$buildproductsdir/$dscfn";
3622 stat_exists $dscpath or
3623 fail "looked for .dsc $dscfn, but $!;".
3624 " maybe you forgot to build";
3626 responder_send_file('dsc', $dscpath);
3628 push_parse_dsc($dscpath, $dscfn, $cversion);
3630 my $format = getfield $dsc, 'Format';
3631 printdebug "format $format\n";
3633 my $actualhead = git_rev_parse('HEAD');
3634 my $dgithead = $actualhead;
3635 my $maintviewhead = undef;
3637 my $upstreamversion = upstreamversion $clogp->{Version};
3639 if (madformat_wantfixup($format)) {
3640 # user might have not used dgit build, so maybe do this now:
3641 if (quiltmode_splitbrain()) {
3643 quilt_make_fake_dsc($upstreamversion);
3645 ($dgithead, $cachekey) =
3646 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3648 "--quilt=$quilt_mode but no cached dgit view:
3649 perhaps tree changed since dgit build[-source] ?";
3651 $dgithead = splitbrain_pseudomerge($clogp,
3652 $actualhead, $dgithead,
3654 $maintviewhead = $actualhead;
3655 changedir '../../../..';
3656 prep_ud(); # so _only_subdir() works, below
3658 commit_quilty_patch();
3662 if (defined $overwrite_version && !defined $maintviewhead) {
3663 $dgithead = plain_overwrite_pseudomerge($clogp,
3671 if ($archive_hash) {
3672 if (is_fast_fwd($archive_hash, $dgithead)) {
3674 } elsif (deliberately_not_fast_forward) {
3677 fail "dgit push: HEAD is not a descendant".
3678 " of the archive's version.\n".
3679 "To overwrite the archive's contents,".
3680 " pass --overwrite[=VERSION].\n".
3681 "To rewind history, if permitted by the archive,".
3682 " use --deliberately-not-fast-forward.";
3687 progress "checking that $dscfn corresponds to HEAD";
3688 runcmd qw(dpkg-source -x --),
3689 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3690 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3691 check_for_vendor_patches() if madformat($dsc->{format});
3692 changedir '../../../..';
3693 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3694 debugcmd "+",@diffcmd;
3696 my $r = system @diffcmd;
3699 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3701 HEAD specifies a different tree to $dscfn:
3703 Perhaps you forgot to build. Or perhaps there is a problem with your
3704 source tree (see dgit(7) for some hints). To see a full diff, run
3711 if (!$changesfile) {
3712 my $pat = changespat $cversion;
3713 my @cs = glob "$buildproductsdir/$pat";
3714 fail "failed to find unique changes file".
3715 " (looked for $pat in $buildproductsdir);".
3716 " perhaps you need to use dgit -C"
3718 ($changesfile) = @cs;
3720 $changesfile = "$buildproductsdir/$changesfile";
3723 # Check that changes and .dsc agree enough
3724 $changesfile =~ m{[^/]*$};
3725 my $changes = parsecontrol($changesfile,$&);
3726 files_compare_inputs($dsc, $changes)
3727 unless forceing [qw(dsc-changes-mismatch)];
3729 # Perhaps adjust .dsc to contain right set of origs
3730 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3732 unless forceing [qw(changes-origs-exactly)];
3734 # Checks complete, we're going to try and go ahead:
3736 responder_send_file('changes',$changesfile);
3737 responder_send_command("param head $dgithead");
3738 responder_send_command("param csuite $csuite");
3739 responder_send_command("param tagformat $tagformat");
3740 if (defined $maintviewhead) {
3741 die unless ($protovsn//4) >= 4;
3742 responder_send_command("param maint-view $maintviewhead");
3745 if (deliberately_not_fast_forward) {
3746 git_for_each_ref(lrfetchrefs, sub {
3747 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3748 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3749 responder_send_command("previously $rrefname=$objid");
3750 $previously{$rrefname} = $objid;
3754 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3758 supplementary_message(<<'END');
3759 Push failed, while signing the tag.
3760 You can retry the push, after fixing the problem, if you like.
3762 # If we manage to sign but fail to record it anywhere, it's fine.
3763 if ($we_are_responder) {
3764 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3765 responder_receive_files('signed-tag', @tagobjfns);
3767 @tagobjfns = push_mktags($clogp,$dscpath,
3768 $changesfile,$changesfile,
3771 supplementary_message(<<'END');
3772 Push failed, *after* signing the tag.
3773 If you want to try again, you should use a new version number.
3776 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3778 foreach my $tw (@tagwants) {
3779 my $tag = $tw->{Tag};
3780 my $tagobjfn = $tw->{TagObjFn};
3782 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3783 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3784 runcmd_ordryrun_local
3785 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3788 supplementary_message(<<'END');
3789 Push failed, while updating the remote git repository - see messages above.
3790 If you want to try again, you should use a new version number.
3792 if (!check_for_git()) {
3793 create_remote_git_repo();
3796 my @pushrefs = $forceflag.$dgithead.":".rrref();
3797 foreach my $tw (@tagwants) {
3798 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3801 runcmd_ordryrun @git,
3802 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3803 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3805 supplementary_message(<<'END');
3806 Push failed, after updating the remote git repository.
3807 If you want to try again, you must use a new version number.
3809 if ($we_are_responder) {
3810 my $dryrunsuffix = act_local() ? "" : ".tmp";
3811 responder_receive_files('signed-dsc-changes',
3812 "$dscpath$dryrunsuffix",
3813 "$changesfile$dryrunsuffix");
3816 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3818 progress "[new .dsc left in $dscpath.tmp]";
3820 sign_changes $changesfile;
3823 supplementary_message(<<END);
3824 Push failed, while uploading package(s) to the archive server.
3825 You can retry the upload of exactly these same files with dput of:
3827 If that .changes file is broken, you will need to use a new version
3828 number for your next attempt at the upload.
3830 my $host = access_cfg('upload-host','RETURN-UNDEF');
3831 my @hostarg = defined($host) ? ($host,) : ();
3832 runcmd_ordryrun @dput, @hostarg, $changesfile;
3833 printdone "pushed and uploaded $cversion";
3835 supplementary_message('');
3836 responder_send_command("complete");
3843 badusage "-p is not allowed with clone; specify as argument instead"
3844 if defined $package;
3847 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3848 ($package,$isuite) = @ARGV;
3849 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3850 ($package,$dstdir) = @ARGV;
3851 } elsif (@ARGV==3) {
3852 ($package,$isuite,$dstdir) = @ARGV;
3854 badusage "incorrect arguments to dgit clone";
3856 $dstdir ||= "$package";
3858 if (stat_exists $dstdir) {
3859 fail "$dstdir already exists";
3863 if ($rmonerror && !$dryrun_level) {
3864 $cwd_remove= getcwd();
3866 return unless defined $cwd_remove;
3867 if (!chdir "$cwd_remove") {
3868 return if $!==&ENOENT;
3869 die "chdir $cwd_remove: $!";
3872 rmtree($dstdir) or die "remove $dstdir: $!\n";
3873 } elsif (grep { $! == $_ }
3874 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3876 print STDERR "check whether to remove $dstdir: $!\n";
3882 $cwd_remove = undef;
3885 sub branchsuite () {
3886 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3887 if ($branch =~ m#$lbranch_re#o) {
3894 sub fetchpullargs () {
3896 if (!defined $package) {
3897 my $sourcep = parsecontrol('debian/control','debian/control');
3898 $package = getfield $sourcep, 'Source';
3901 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3903 my $clogp = parsechangelog();
3904 $isuite = getfield $clogp, 'Distribution';
3906 } elsif (@ARGV==1) {
3909 badusage "incorrect arguments to dgit fetch or dgit pull";
3922 if (quiltmode_splitbrain()) {
3923 my ($format, $fopts) = get_source_format();
3924 madformat($format) and fail <<END
3925 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
3934 badusage "-p is not allowed with dgit push" if defined $package;
3936 my $clogp = parsechangelog();
3937 $package = getfield $clogp, 'Source';
3940 } elsif (@ARGV==1) {
3941 ($specsuite) = (@ARGV);
3943 badusage "incorrect arguments to dgit push";
3945 $isuite = getfield $clogp, 'Distribution';
3947 local ($package) = $existing_package; # this is a hack
3948 canonicalise_suite();
3950 canonicalise_suite();
3952 if (defined $specsuite &&
3953 $specsuite ne $isuite &&
3954 $specsuite ne $csuite) {
3955 fail "dgit push: changelog specifies $isuite ($csuite)".
3956 " but command line specifies $specsuite";
3961 #---------- remote commands' implementation ----------
3963 sub cmd_remote_push_build_host {
3964 my ($nrargs) = shift @ARGV;
3965 my (@rargs) = @ARGV[0..$nrargs-1];
3966 @ARGV = @ARGV[$nrargs..$#ARGV];
3968 my ($dir,$vsnwant) = @rargs;
3969 # vsnwant is a comma-separated list; we report which we have
3970 # chosen in our ready response (so other end can tell if they
3973 $we_are_responder = 1;
3974 $us .= " (build host)";
3978 open PI, "<&STDIN" or die $!;
3979 open STDIN, "/dev/null" or die $!;
3980 open PO, ">&STDOUT" or die $!;
3982 open STDOUT, ">&STDERR" or die $!;
3986 ($protovsn) = grep {
3987 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3988 } @rpushprotovsn_support;
3990 fail "build host has dgit rpush protocol versions ".
3991 (join ",", @rpushprotovsn_support).
3992 " but invocation host has $vsnwant"
3993 unless defined $protovsn;
3995 responder_send_command("dgit-remote-push-ready $protovsn");
3996 rpush_handle_protovsn_bothends();
4001 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4002 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4003 # a good error message)
4005 sub rpush_handle_protovsn_bothends () {
4006 if ($protovsn < 4) {
4007 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4016 my $report = i_child_report();
4017 if (defined $report) {
4018 printdebug "($report)\n";
4019 } elsif ($i_child_pid) {
4020 printdebug "(killing build host child $i_child_pid)\n";
4021 kill 15, $i_child_pid;
4023 if (defined $i_tmp && !defined $initiator_tempdir) {
4025 eval { rmtree $i_tmp; };
4029 END { i_cleanup(); }
4032 my ($base,$selector,@args) = @_;
4033 $selector =~ s/\-/_/g;
4034 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4041 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4049 push @rargs, join ",", @rpushprotovsn_support;
4052 push @rdgit, @ropts;
4053 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4055 my @cmd = (@ssh, $host, shellquote @rdgit);
4058 if (defined $initiator_tempdir) {
4059 rmtree $initiator_tempdir;
4060 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4061 $i_tmp = $initiator_tempdir;
4065 $i_child_pid = open2(\*RO, \*RI, @cmd);
4067 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4068 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4069 $supplementary_message = '' unless $protovsn >= 3;
4071 fail "rpush negotiated protocol version $protovsn".
4072 " which does not support quilt mode $quilt_mode"
4073 if quiltmode_splitbrain;
4075 rpush_handle_protovsn_bothends();
4077 my ($icmd,$iargs) = initiator_expect {
4078 m/^(\S+)(?: (.*))?$/;
4081 i_method "i_resp", $icmd, $iargs;
4085 sub i_resp_progress ($) {
4087 my $msg = protocol_read_bytes \*RO, $rhs;
4091 sub i_resp_supplementary_message ($) {
4093 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4096 sub i_resp_complete {
4097 my $pid = $i_child_pid;
4098 $i_child_pid = undef; # prevents killing some other process with same pid
4099 printdebug "waiting for build host child $pid...\n";
4100 my $got = waitpid $pid, 0;
4101 die $! unless $got == $pid;
4102 die "build host child failed $?" if $?;
4105 printdebug "all done\n";
4109 sub i_resp_file ($) {
4111 my $localname = i_method "i_localname", $keyword;
4112 my $localpath = "$i_tmp/$localname";
4113 stat_exists $localpath and
4114 badproto \*RO, "file $keyword ($localpath) twice";
4115 protocol_receive_file \*RO, $localpath;
4116 i_method "i_file", $keyword;
4121 sub i_resp_param ($) {
4122 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4126 sub i_resp_previously ($) {
4127 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4128 or badproto \*RO, "bad previously spec";
4129 my $r = system qw(git check-ref-format), $1;
4130 die "bad previously ref spec ($r)" if $r;
4131 $previously{$1} = $2;
4136 sub i_resp_want ($) {
4138 die "$keyword ?" if $i_wanted{$keyword}++;
4139 my @localpaths = i_method "i_want", $keyword;
4140 printdebug "[[ $keyword @localpaths\n";
4141 foreach my $localpath (@localpaths) {
4142 protocol_send_file \*RI, $localpath;
4144 print RI "files-end\n" or die $!;
4147 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4149 sub i_localname_parsed_changelog {
4150 return "remote-changelog.822";
4152 sub i_file_parsed_changelog {
4153 ($i_clogp, $i_version, $i_dscfn) =
4154 push_parse_changelog "$i_tmp/remote-changelog.822";
4155 die if $i_dscfn =~ m#/|^\W#;
4158 sub i_localname_dsc {
4159 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4164 sub i_localname_changes {
4165 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4166 $i_changesfn = $i_dscfn;
4167 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4168 return $i_changesfn;
4170 sub i_file_changes { }
4172 sub i_want_signed_tag {
4173 printdebug Dumper(\%i_param, $i_dscfn);
4174 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4175 && defined $i_param{'csuite'}
4176 or badproto \*RO, "premature desire for signed-tag";
4177 my $head = $i_param{'head'};
4178 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4180 my $maintview = $i_param{'maint-view'};
4181 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4184 if ($protovsn >= 4) {
4185 my $p = $i_param{'tagformat'} // '<undef>';
4187 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4190 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4192 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4194 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4197 push_mktags $i_clogp, $i_dscfn,
4198 $i_changesfn, 'remote changes',
4202 sub i_want_signed_dsc_changes {
4203 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4204 sign_changes $i_changesfn;
4205 return ($i_dscfn, $i_changesfn);
4208 #---------- building etc. ----------
4214 #----- `3.0 (quilt)' handling -----
4216 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4218 sub quiltify_dpkg_commit ($$$;$) {
4219 my ($patchname,$author,$msg, $xinfo) = @_;
4223 my $descfn = ".git/dgit/quilt-description.tmp";
4224 open O, '>', $descfn or die "$descfn: $!";
4225 $msg =~ s/\n+/\n\n/;
4226 print O <<END or die $!;
4228 ${xinfo}Subject: $msg
4235 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4236 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4237 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4238 runcmd @dpkgsource, qw(--commit .), $patchname;
4242 sub quiltify_trees_differ ($$;$$$) {
4243 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4244 # returns true iff the two tree objects differ other than in debian/
4245 # with $finegrained,
4246 # returns bitmask 01 - differ in upstream files except .gitignore
4247 # 02 - differ in .gitignore
4248 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4249 # is set for each modified .gitignore filename $fn
4250 # if $unrepres is defined, array ref to which is appeneded
4251 # a list of unrepresentable changes (removals of upstream files
4254 my @cmd = (@git, qw(diff-tree -z));
4255 push @cmd, qw(--name-only) unless $unrepres;
4256 push @cmd, qw(-r) if $finegrained || $unrepres;
4258 my $diffs= cmdoutput @cmd;
4261 foreach my $f (split /\0/, $diffs) {
4262 if ($unrepres && !@lmodes) {
4263 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4266 my ($oldmode,$newmode) = @lmodes;
4269 next if $f =~ m#^debian(?:/.*)?$#s;
4273 die "deleted\n" unless $newmode =~ m/[^0]/;
4274 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4275 if ($oldmode =~ m/[^0]/) {
4276 die "mode changed\n" if $oldmode ne $newmode;
4278 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4282 local $/="\n"; chomp $@;
4283 push @$unrepres, [ $f, $@ ];
4287 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4288 $r |= $isignore ? 02 : 01;
4289 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4291 printdebug "quiltify_trees_differ $x $y => $r\n";
4295 sub quiltify_tree_sentinelfiles ($) {
4296 # lists the `sentinel' files present in the tree
4298 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4299 qw(-- debian/rules debian/control);
4304 sub quiltify_splitbrain_needed () {
4305 if (!$split_brain) {
4306 progress "dgit view: changes are required...";
4307 runcmd @git, qw(checkout -q -b dgit-view);
4312 sub quiltify_splitbrain ($$$$$$) {
4313 my ($clogp, $unapplied, $headref, $diffbits,
4314 $editedignores, $cachekey) = @_;
4315 if ($quilt_mode !~ m/gbp|dpm/) {
4316 # treat .gitignore just like any other upstream file
4317 $diffbits = { %$diffbits };
4318 $_ = !!$_ foreach values %$diffbits;
4320 # We would like any commits we generate to be reproducible
4321 my @authline = clogp_authline($clogp);
4322 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4323 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4324 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4325 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4326 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4327 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4329 if ($quilt_mode =~ m/gbp|unapplied/ &&
4330 ($diffbits->{O2H} & 01)) {
4332 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4333 " but git tree differs from orig in upstream files.";
4334 if (!stat_exists "debian/patches") {
4336 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4340 if ($quilt_mode =~ m/dpm/ &&
4341 ($diffbits->{H2A} & 01)) {
4343 --quilt=$quilt_mode specified, implying patches-applied git tree
4344 but git tree differs from result of applying debian/patches to upstream
4347 if ($quilt_mode =~ m/gbp|unapplied/ &&
4348 ($diffbits->{O2A} & 01)) { # some patches
4349 quiltify_splitbrain_needed();
4350 progress "dgit view: creating patches-applied version using gbp pq";
4351 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4352 # gbp pq import creates a fresh branch; push back to dgit-view
4353 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4354 runcmd @git, qw(checkout -q dgit-view);
4356 if ($quilt_mode =~ m/gbp|dpm/ &&
4357 ($diffbits->{O2A} & 02)) {
4359 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4360 tool which does not create patches for changes to upstream
4361 .gitignores: but, such patches exist in debian/patches.
4364 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4365 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4366 quiltify_splitbrain_needed();
4367 progress "dgit view: creating patch to represent .gitignore changes";
4368 ensuredir "debian/patches";
4369 my $gipatch = "debian/patches/auto-gitignore";
4370 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4371 stat GIPATCH or die "$gipatch: $!";
4372 fail "$gipatch already exists; but want to create it".
4373 " to record .gitignore changes" if (stat _)[7];
4374 print GIPATCH <<END or die "$gipatch: $!";
4375 Subject: Update .gitignore from Debian packaging branch
4377 The Debian packaging git branch contains these updates to the upstream
4378 .gitignore file(s). This patch is autogenerated, to provide these
4379 updates to users of the official Debian archive view of the package.
4381 [dgit ($our_version) update-gitignore]
4384 close GIPATCH or die "$gipatch: $!";
4385 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4386 $unapplied, $headref, "--", sort keys %$editedignores;
4387 open SERIES, "+>>", "debian/patches/series" or die $!;
4388 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4390 defined read SERIES, $newline, 1 or die $!;
4391 print SERIES "\n" or die $! unless $newline eq "\n";
4392 print SERIES "auto-gitignore\n" or die $!;
4393 close SERIES or die $!;
4394 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4396 Commit patch to update .gitignore
4398 [dgit ($our_version) update-gitignore-quilt-fixup]
4402 my $dgitview = git_rev_parse 'HEAD';
4404 changedir '../../../..';
4405 # When we no longer need to support squeeze, use --create-reflog
4407 ensuredir ".git/logs/refs/dgit-intern";
4408 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4411 my $oldcache = git_get_ref "refs/$splitbraincache";
4412 if ($oldcache eq $dgitview) {
4413 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4414 # git update-ref doesn't always update, in this case. *sigh*
4415 my $dummy = make_commit_text <<END;
4418 author Dgit <dgit\@example.com> 1000000000 +0000
4419 committer Dgit <dgit\@example.com> 1000000000 +0000
4421 Dummy commit - do not use
4423 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4424 "refs/$splitbraincache", $dummy;
4426 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4429 changedir '.git/dgit/unpack/work';
4431 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4432 progress "dgit view: created ($saved)";
4435 sub quiltify ($$$$) {
4436 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4438 # Quilt patchification algorithm
4440 # We search backwards through the history of the main tree's HEAD
4441 # (T) looking for a start commit S whose tree object is identical
4442 # to to the patch tip tree (ie the tree corresponding to the
4443 # current dpkg-committed patch series). For these purposes
4444 # `identical' disregards anything in debian/ - this wrinkle is
4445 # necessary because dpkg-source treates debian/ specially.
4447 # We can only traverse edges where at most one of the ancestors'
4448 # trees differs (in changes outside in debian/). And we cannot
4449 # handle edges which change .pc/ or debian/patches. To avoid
4450 # going down a rathole we avoid traversing edges which introduce
4451 # debian/rules or debian/control. And we set a limit on the
4452 # number of edges we are willing to look at.
4454 # If we succeed, we walk forwards again. For each traversed edge
4455 # PC (with P parent, C child) (starting with P=S and ending with
4456 # C=T) to we do this:
4458 # - dpkg-source --commit with a patch name and message derived from C
4459 # After traversing PT, we git commit the changes which
4460 # should be contained within debian/patches.
4462 # The search for the path S..T is breadth-first. We maintain a
4463 # todo list containing search nodes. A search node identifies a
4464 # commit, and looks something like this:
4466 # Commit => $git_commit_id,
4467 # Child => $c, # or undef if P=T
4468 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4469 # Nontrivial => true iff $p..$c has relevant changes
4476 my %considered; # saves being exponential on some weird graphs
4478 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4481 my ($search,$whynot) = @_;
4482 printdebug " search NOT $search->{Commit} $whynot\n";
4483 $search->{Whynot} = $whynot;
4484 push @nots, $search;
4485 no warnings qw(exiting);
4494 my $c = shift @todo;
4495 next if $considered{$c->{Commit}}++;
4497 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4499 printdebug "quiltify investigate $c->{Commit}\n";
4502 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4503 printdebug " search finished hooray!\n";
4508 if ($quilt_mode eq 'nofix') {
4509 fail "quilt fixup required but quilt mode is \`nofix'\n".
4510 "HEAD commit $c->{Commit} differs from tree implied by ".
4511 " debian/patches (tree object $oldtiptree)";
4513 if ($quilt_mode eq 'smash') {
4514 printdebug " search quitting smash\n";
4518 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4519 $not->($c, "has $c_sentinels not $t_sentinels")
4520 if $c_sentinels ne $t_sentinels;
4522 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4523 $commitdata =~ m/\n\n/;
4525 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4526 @parents = map { { Commit => $_, Child => $c } } @parents;
4528 $not->($c, "root commit") if !@parents;
4530 foreach my $p (@parents) {
4531 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4533 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4534 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4536 foreach my $p (@parents) {
4537 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4539 my @cmd= (@git, qw(diff-tree -r --name-only),
4540 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4541 my $patchstackchange = cmdoutput @cmd;
4542 if (length $patchstackchange) {
4543 $patchstackchange =~ s/\n/,/g;
4544 $not->($p, "changed $patchstackchange");
4547 printdebug " search queue P=$p->{Commit} ",
4548 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4554 printdebug "quiltify want to smash\n";
4557 my $x = $_[0]{Commit};
4558 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4561 my $reportnot = sub {
4563 my $s = $abbrev->($notp);
4564 my $c = $notp->{Child};
4565 $s .= "..".$abbrev->($c) if $c;
4566 $s .= ": ".$notp->{Whynot};
4569 if ($quilt_mode eq 'linear') {
4570 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4571 foreach my $notp (@nots) {
4572 print STDERR "$us: ", $reportnot->($notp), "\n";
4574 print STDERR "$us: $_\n" foreach @$failsuggestion;
4575 fail "quilt fixup naive history linearisation failed.\n".
4576 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4577 } elsif ($quilt_mode eq 'smash') {
4578 } elsif ($quilt_mode eq 'auto') {
4579 progress "quilt fixup cannot be linear, smashing...";
4581 die "$quilt_mode ?";
4584 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4585 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4587 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4589 quiltify_dpkg_commit "auto-$version-$target-$time",
4590 (getfield $clogp, 'Maintainer'),
4591 "Automatically generated patch ($clogp->{Version})\n".
4592 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4596 progress "quiltify linearisation planning successful, executing...";
4598 for (my $p = $sref_S;
4599 my $c = $p->{Child};
4601 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4602 next unless $p->{Nontrivial};
4604 my $cc = $c->{Commit};
4606 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4607 $commitdata =~ m/\n\n/ or die "$c ?";
4610 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4613 my $commitdate = cmdoutput
4614 @git, qw(log -n1 --pretty=format:%aD), $cc;
4616 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4618 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4625 my $gbp_check_suitable = sub {
4630 die "contains unexpected slashes\n" if m{//} || m{/$};
4631 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4632 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4633 die "too long" if length > 200;
4635 return $_ unless $@;
4636 print STDERR "quiltifying commit $cc:".
4637 " ignoring/dropping Gbp-Pq $what: $@";
4641 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4643 (\S+) \s* \n //ixm) {
4644 $patchname = $gbp_check_suitable->($1, 'Name');
4646 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4648 (\S+) \s* \n //ixm) {
4649 $patchdir = $gbp_check_suitable->($1, 'Topic');
4654 if (!defined $patchname) {
4655 $patchname = $title;
4656 $patchname =~ s/[.:]$//;
4659 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4660 my $translitname = $converter->convert($patchname);
4661 die unless defined $translitname;
4662 $patchname = $translitname;
4665 "dgit: patch title transliteration error: $@"
4667 $patchname =~ y/ A-Z/-a-z/;
4668 $patchname =~ y/-a-z0-9_.+=~//cd;
4669 $patchname =~ s/^\W/x-$&/;
4670 $patchname = substr($patchname,0,40);
4672 if (!defined $patchdir) {
4675 if (length $patchdir) {
4676 $patchname = "$patchdir/$patchname";
4678 if ($patchname =~ m{^(.*)/}) {
4679 mkpath "debian/patches/$1";
4684 stat "debian/patches/$patchname$index";
4686 $!==ENOENT or die "$patchname$index $!";
4688 runcmd @git, qw(checkout -q), $cc;
4690 # We use the tip's changelog so that dpkg-source doesn't
4691 # produce complaining messages from dpkg-parsechangelog. None
4692 # of the information dpkg-source gets from the changelog is
4693 # actually relevant - it gets put into the original message
4694 # which dpkg-source provides our stunt editor, and then
4696 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4698 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4699 "Date: $commitdate\n".
4700 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4702 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4705 runcmd @git, qw(checkout -q master);
4708 sub build_maybe_quilt_fixup () {
4709 my ($format,$fopts) = get_source_format;
4710 return unless madformat_wantfixup $format;
4713 check_for_vendor_patches();
4715 if (quiltmode_splitbrain) {
4716 foreach my $needtf (qw(new maint)) {
4717 next if grep { $_ eq $needtf } access_cfg_tagformats;
4719 quilt mode $quilt_mode requires split view so server needs to support
4720 both "new" and "maint" tag formats, but config says it doesn't.
4725 my $clogp = parsechangelog();
4726 my $headref = git_rev_parse('HEAD');
4731 my $upstreamversion = upstreamversion $version;
4733 if ($fopts->{'single-debian-patch'}) {
4734 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4736 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4739 die 'bug' if $split_brain && !$need_split_build_invocation;
4741 changedir '../../../..';
4742 runcmd_ordryrun_local
4743 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4746 sub quilt_fixup_mkwork ($) {
4749 mkdir "work" or die $!;
4751 mktree_in_ud_here();
4752 runcmd @git, qw(reset -q --hard), $headref;
4755 sub quilt_fixup_linkorigs ($$) {
4756 my ($upstreamversion, $fn) = @_;
4757 # calls $fn->($leafname);
4759 foreach my $f (<../../../../*>) { #/){
4760 my $b=$f; $b =~ s{.*/}{};
4762 local ($debuglevel) = $debuglevel-1;
4763 printdebug "QF linkorigs $b, $f ?\n";
4765 next unless is_orig_file_of_vsn $b, $upstreamversion;
4766 printdebug "QF linkorigs $b, $f Y\n";
4767 link_ltarget $f, $b or die "$b $!";
4772 sub quilt_fixup_delete_pc () {
4773 runcmd @git, qw(rm -rqf .pc);
4775 Commit removal of .pc (quilt series tracking data)
4777 [dgit ($our_version) upgrade quilt-remove-pc]
4781 sub quilt_fixup_singlepatch ($$$) {
4782 my ($clogp, $headref, $upstreamversion) = @_;
4784 progress "starting quiltify (single-debian-patch)";
4786 # dpkg-source --commit generates new patches even if
4787 # single-debian-patch is in debian/source/options. In order to
4788 # get it to generate debian/patches/debian-changes, it is
4789 # necessary to build the source package.
4791 quilt_fixup_linkorigs($upstreamversion, sub { });
4792 quilt_fixup_mkwork($headref);
4794 rmtree("debian/patches");
4796 runcmd @dpkgsource, qw(-b .);
4798 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4799 rename srcfn("$upstreamversion", "/debian/patches"),
4800 "work/debian/patches";
4803 commit_quilty_patch();
4806 sub quilt_make_fake_dsc ($) {
4807 my ($upstreamversion) = @_;
4809 my $fakeversion="$upstreamversion-~~DGITFAKE";
4811 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4812 print $fakedsc <<END or die $!;
4815 Version: $fakeversion
4819 my $dscaddfile=sub {
4822 my $md = new Digest::MD5;
4824 my $fh = new IO::File $b, '<' or die "$b $!";
4829 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4832 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4834 my @files=qw(debian/source/format debian/rules
4835 debian/control debian/changelog);
4836 foreach my $maybe (qw(debian/patches debian/source/options
4837 debian/tests/control)) {
4838 next unless stat_exists "../../../$maybe";
4839 push @files, $maybe;
4842 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4843 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4845 $dscaddfile->($debtar);
4846 close $fakedsc or die $!;
4849 sub quilt_check_splitbrain_cache ($$) {
4850 my ($headref, $upstreamversion) = @_;
4851 # Called only if we are in (potentially) split brain mode.
4853 # Computes the cache key and looks in the cache.
4854 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4856 my $splitbrain_cachekey;
4859 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4860 # we look in the reflog of dgit-intern/quilt-cache
4861 # we look for an entry whose message is the key for the cache lookup
4862 my @cachekey = (qw(dgit), $our_version);
4863 push @cachekey, $upstreamversion;
4864 push @cachekey, $quilt_mode;
4865 push @cachekey, $headref;
4867 push @cachekey, hashfile('fake.dsc');
4869 my $srcshash = Digest::SHA->new(256);
4870 my %sfs = ( %INC, '$0(dgit)' => $0 );
4871 foreach my $sfk (sort keys %sfs) {
4872 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4873 $srcshash->add($sfk," ");
4874 $srcshash->add(hashfile($sfs{$sfk}));
4875 $srcshash->add("\n");
4877 push @cachekey, $srcshash->hexdigest();
4878 $splitbrain_cachekey = "@cachekey";
4880 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4882 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4883 debugcmd "|(probably)",@cmd;
4884 my $child = open GC, "-|"; defined $child or die $!;
4886 chdir '../../..' or die $!;
4887 if (!stat ".git/logs/refs/$splitbraincache") {
4888 $! == ENOENT or die $!;
4889 printdebug ">(no reflog)\n";
4896 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4897 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4900 quilt_fixup_mkwork($headref);
4901 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
4902 if ($cachehit ne $headref) {
4903 progress "dgit view: found cached ($saved)";
4904 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4906 return ($cachehit, $splitbrain_cachekey);
4908 progress "dgit view: found cached, no changes required";
4909 return ($headref, $splitbrain_cachekey);
4911 die $! if GC->error;
4912 failedcmd unless close GC;
4914 printdebug "splitbrain cache miss\n";
4915 return (undef, $splitbrain_cachekey);
4918 sub quilt_fixup_multipatch ($$$) {
4919 my ($clogp, $headref, $upstreamversion) = @_;
4921 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4924 # - honour any existing .pc in case it has any strangeness
4925 # - determine the git commit corresponding to the tip of
4926 # the patch stack (if there is one)
4927 # - if there is such a git commit, convert each subsequent
4928 # git commit into a quilt patch with dpkg-source --commit
4929 # - otherwise convert all the differences in the tree into
4930 # a single git commit
4934 # Our git tree doesn't necessarily contain .pc. (Some versions of
4935 # dgit would include the .pc in the git tree.) If there isn't
4936 # one, we need to generate one by unpacking the patches that we
4939 # We first look for a .pc in the git tree. If there is one, we
4940 # will use it. (This is not the normal case.)
4942 # Otherwise need to regenerate .pc so that dpkg-source --commit
4943 # can work. We do this as follows:
4944 # 1. Collect all relevant .orig from parent directory
4945 # 2. Generate a debian.tar.gz out of
4946 # debian/{patches,rules,source/format,source/options}
4947 # 3. Generate a fake .dsc containing just these fields:
4948 # Format Source Version Files
4949 # 4. Extract the fake .dsc
4950 # Now the fake .dsc has a .pc directory.
4951 # (In fact we do this in every case, because in future we will
4952 # want to search for a good base commit for generating patches.)
4954 # Then we can actually do the dpkg-source --commit
4955 # 1. Make a new working tree with the same object
4956 # store as our main tree and check out the main
4958 # 2. Copy .pc from the fake's extraction, if necessary
4959 # 3. Run dpkg-source --commit
4960 # 4. If the result has changes to debian/, then
4961 # - git add them them
4962 # - git add .pc if we had a .pc in-tree
4964 # 5. If we had a .pc in-tree, delete it, and git commit
4965 # 6. Back in the main tree, fast forward to the new HEAD
4967 # Another situation we may have to cope with is gbp-style
4968 # patches-unapplied trees.
4970 # We would want to detect these, so we know to escape into
4971 # quilt_fixup_gbp. However, this is in general not possible.
4972 # Consider a package with a one patch which the dgit user reverts
4973 # (with git revert or the moral equivalent).
4975 # That is indistinguishable in contents from a patches-unapplied
4976 # tree. And looking at the history to distinguish them is not
4977 # useful because the user might have made a confusing-looking git
4978 # history structure (which ought to produce an error if dgit can't
4979 # cope, not a silent reintroduction of an unwanted patch).
4981 # So gbp users will have to pass an option. But we can usually
4982 # detect their failure to do so: if the tree is not a clean
4983 # patches-applied tree, quilt linearisation fails, but the tree
4984 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4985 # they want --quilt=unapplied.
4987 # To help detect this, when we are extracting the fake dsc, we
4988 # first extract it with --skip-patches, and then apply the patches
4989 # afterwards with dpkg-source --before-build. That lets us save a
4990 # tree object corresponding to .origs.
4992 my $splitbrain_cachekey;
4994 quilt_make_fake_dsc($upstreamversion);
4996 if (quiltmode_splitbrain()) {
4998 ($cachehit, $splitbrain_cachekey) =
4999 quilt_check_splitbrain_cache($headref, $upstreamversion);
5000 return if $cachehit;
5004 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5006 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5007 rename $fakexdir, "fake" or die "$fakexdir $!";
5011 remove_stray_gits();
5012 mktree_in_ud_here();
5016 runcmd @git, qw(add -Af .);
5017 my $unapplied=git_write_tree();
5018 printdebug "fake orig tree object $unapplied\n";
5022 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5024 if (system @bbcmd) {
5025 failedcmd @bbcmd if $? < 0;
5027 failed to apply your git tree's patch stack (from debian/patches/) to
5028 the corresponding upstream tarball(s). Your source tree and .orig
5029 are probably too inconsistent. dgit can only fix up certain kinds of
5030 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5036 quilt_fixup_mkwork($headref);
5039 if (stat_exists ".pc") {
5041 progress "Tree already contains .pc - will use it then delete it.";
5044 rename '../fake/.pc','.pc' or die $!;
5047 changedir '../fake';
5049 runcmd @git, qw(add -Af .);
5050 my $oldtiptree=git_write_tree();
5051 printdebug "fake o+d/p tree object $unapplied\n";
5052 changedir '../work';
5055 # We calculate some guesswork now about what kind of tree this might
5056 # be. This is mostly for error reporting.
5062 # O = orig, without patches applied
5063 # A = "applied", ie orig with H's debian/patches applied
5064 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5065 \%editedignores, \@unrepres),
5066 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5067 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5071 foreach my $b (qw(01 02)) {
5072 foreach my $v (qw(O2H O2A H2A)) {
5073 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5076 printdebug "differences \@dl @dl.\n";
5079 "$us: base trees orig=%.20s o+d/p=%.20s",
5080 $unapplied, $oldtiptree;
5082 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5083 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5084 $dl[0], $dl[1], $dl[3], $dl[4],
5088 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5090 forceable_fail [qw(unrepresentable)], <<END;
5091 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5096 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5097 push @failsuggestion, "This might be a patches-unapplied branch.";
5098 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5099 push @failsuggestion, "This might be a patches-applied branch.";
5101 push @failsuggestion, "Maybe you need to specify one of".
5102 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5104 if (quiltmode_splitbrain()) {
5105 quiltify_splitbrain($clogp, $unapplied, $headref,
5106 $diffbits, \%editedignores,
5107 $splitbrain_cachekey);
5111 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5112 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5114 if (!open P, '>>', ".pc/applied-patches") {
5115 $!==&ENOENT or die $!;
5120 commit_quilty_patch();
5122 if ($mustdeletepc) {
5123 quilt_fixup_delete_pc();
5127 sub quilt_fixup_editor () {
5128 my $descfn = $ENV{$fakeeditorenv};
5129 my $editing = $ARGV[$#ARGV];
5130 open I1, '<', $descfn or die "$descfn: $!";
5131 open I2, '<', $editing or die "$editing: $!";
5132 unlink $editing or die "$editing: $!";
5133 open O, '>', $editing or die "$editing: $!";
5134 while (<I1>) { print O or die $!; } I1->error and die $!;
5137 $copying ||= m/^\-\-\- /;
5138 next unless $copying;
5141 I2->error and die $!;
5146 sub maybe_apply_patches_dirtily () {
5147 return unless $quilt_mode =~ m/gbp|unapplied/;
5148 print STDERR <<END or die $!;
5150 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5151 dgit: Have to apply the patches - making the tree dirty.
5152 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5155 $patches_applied_dirtily = 01;
5156 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5157 runcmd qw(dpkg-source --before-build .);
5160 sub maybe_unapply_patches_again () {
5161 progress "dgit: Unapplying patches again to tidy up the tree."
5162 if $patches_applied_dirtily;
5163 runcmd qw(dpkg-source --after-build .)
5164 if $patches_applied_dirtily & 01;
5166 if $patches_applied_dirtily & 02;
5167 $patches_applied_dirtily = 0;
5170 #----- other building -----
5172 our $clean_using_builder;
5173 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5174 # clean the tree before building (perhaps invoked indirectly by
5175 # whatever we are using to run the build), rather than separately
5176 # and explicitly by us.
5179 return if $clean_using_builder;
5180 if ($cleanmode eq 'dpkg-source') {
5181 maybe_apply_patches_dirtily();
5182 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5183 } elsif ($cleanmode eq 'dpkg-source-d') {
5184 maybe_apply_patches_dirtily();
5185 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5186 } elsif ($cleanmode eq 'git') {
5187 runcmd_ordryrun_local @git, qw(clean -xdf);
5188 } elsif ($cleanmode eq 'git-ff') {
5189 runcmd_ordryrun_local @git, qw(clean -xdff);
5190 } elsif ($cleanmode eq 'check') {
5191 my $leftovers = cmdoutput @git, qw(clean -xdn);
5192 if (length $leftovers) {
5193 print STDERR $leftovers, "\n" or die $!;
5194 fail "tree contains uncommitted files and --clean=check specified";
5196 } elsif ($cleanmode eq 'none') {
5203 badusage "clean takes no additional arguments" if @ARGV;
5206 maybe_unapply_patches_again();
5209 sub build_prep_early () {
5210 our $build_prep_early_done //= 0;
5211 return if $build_prep_early_done++;
5213 badusage "-p is not allowed when building" if defined $package;
5214 my $clogp = parsechangelog();
5215 $isuite = getfield $clogp, 'Distribution';
5216 $package = getfield $clogp, 'Source';
5217 $version = getfield $clogp, 'Version';
5224 build_maybe_quilt_fixup();
5226 my $pat = changespat $version;
5227 foreach my $f (glob "$buildproductsdir/$pat") {
5229 unlink $f or fail "remove old changes file $f: $!";
5231 progress "would remove $f";
5237 sub changesopts_initial () {
5238 my @opts =@changesopts[1..$#changesopts];
5241 sub changesopts_version () {
5242 if (!defined $changes_since_version) {
5243 my @vsns = archive_query('archive_query');
5244 my @quirk = access_quirk();
5245 if ($quirk[0] eq 'backports') {
5246 local $isuite = $quirk[2];
5248 canonicalise_suite();
5249 push @vsns, archive_query('archive_query');
5252 @vsns = map { $_->[0] } @vsns;
5253 @vsns = sort { -version_compare($a, $b) } @vsns;
5254 $changes_since_version = $vsns[0];
5255 progress "changelog will contain changes since $vsns[0]";
5257 $changes_since_version = '_';
5258 progress "package seems new, not specifying -v<version>";
5261 if ($changes_since_version ne '_') {
5262 return ("-v$changes_since_version");
5268 sub changesopts () {
5269 return (changesopts_initial(), changesopts_version());
5272 sub massage_dbp_args ($;$) {
5273 my ($cmd,$xargs) = @_;
5276 # - if we're going to split the source build out so we can
5277 # do strange things to it, massage the arguments to dpkg-buildpackage
5278 # so that the main build doessn't build source (or add an argument
5279 # to stop it building source by default).
5281 # - add -nc to stop dpkg-source cleaning the source tree,
5282 # unless we're not doing a split build and want dpkg-source
5283 # as cleanmode, in which case we can do nothing
5286 # 0 - source will NOT need to be built separately by caller
5287 # +1 - source will need to be built separately by caller
5288 # +2 - source will need to be built separately by caller AND
5289 # dpkg-buildpackage should not in fact be run at all!
5290 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5291 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5292 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5293 $clean_using_builder = 1;
5296 # -nc has the side effect of specifying -b if nothing else specified
5297 # and some combinations of -S, -b, et al, are errors, rather than
5298 # later simply overriding earlie. So we need to:
5299 # - search the command line for these options
5300 # - pick the last one
5301 # - perhaps add our own as a default
5302 # - perhaps adjust it to the corresponding non-source-building version
5304 foreach my $l ($cmd, $xargs) {
5306 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5309 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5311 if ($need_split_build_invocation) {
5312 printdebug "massage split $dmode.\n";
5313 $r = $dmode =~ m/[S]/ ? +2 :
5314 $dmode =~ y/gGF/ABb/ ? +1 :
5315 $dmode =~ m/[ABb]/ ? 0 :
5318 printdebug "massage done $r $dmode.\n";
5320 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5326 my $wasdir = must_getcwd();
5332 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5333 my ($msg_if_onlyone) = @_;
5334 # If there is only one .changes file, fail with $msg_if_onlyone,
5335 # or if that is undef, be a no-op.
5336 # Returns the changes file to report to the user.
5337 my $pat = changespat $version;
5338 my @changesfiles = glob $pat;
5339 @changesfiles = sort {
5340 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5344 if (@changesfiles==1) {
5345 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5346 only one changes file from build (@changesfiles)
5348 $result = $changesfiles[0];
5349 } elsif (@changesfiles==2) {
5350 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5351 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5352 fail "$l found in binaries changes file $binchanges"
5355 runcmd_ordryrun_local @mergechanges, @changesfiles;
5356 my $multichanges = changespat $version,'multi';
5358 stat_exists $multichanges or fail "$multichanges: $!";
5359 foreach my $cf (glob $pat) {
5360 next if $cf eq $multichanges;
5361 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5364 $result = $multichanges;
5366 fail "wrong number of different changes files (@changesfiles)";
5368 printdone "build successful, results in $result\n" or die $!;
5371 sub midbuild_checkchanges () {
5372 my $pat = changespat $version;
5373 return if $rmchanges;
5374 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5375 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5377 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5378 Suggest you delete @unwanted.
5383 sub midbuild_checkchanges_vanilla ($) {
5385 midbuild_checkchanges() if $wantsrc == 1;
5388 sub postbuild_mergechanges_vanilla ($) {
5390 if ($wantsrc == 1) {
5392 postbuild_mergechanges(undef);
5395 printdone "build successful\n";
5400 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5401 my $wantsrc = massage_dbp_args \@dbp;
5404 midbuild_checkchanges_vanilla $wantsrc;
5409 push @dbp, changesopts_version();
5410 maybe_apply_patches_dirtily();
5411 runcmd_ordryrun_local @dbp;
5413 maybe_unapply_patches_again();
5414 postbuild_mergechanges_vanilla $wantsrc;
5418 $quilt_mode //= 'gbp';
5424 # gbp can make .origs out of thin air. In my tests it does this
5425 # even for a 1.0 format package, with no origs present. So I
5426 # guess it keys off just the version number. We don't know
5427 # exactly what .origs ought to exist, but let's assume that we
5428 # should run gbp if: the version has an upstream part and the main
5430 my $upstreamversion = upstreamversion $version;
5431 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5432 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5434 if ($gbp_make_orig) {
5436 $cleanmode = 'none'; # don't do it again
5437 $need_split_build_invocation = 1;
5440 my @dbp = @dpkgbuildpackage;
5442 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5444 if (!length $gbp_build[0]) {
5445 if (length executable_on_path('git-buildpackage')) {
5446 $gbp_build[0] = qw(git-buildpackage);
5448 $gbp_build[0] = 'gbp buildpackage';
5451 my @cmd = opts_opt_multi_cmd @gbp_build;
5453 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5455 if ($gbp_make_orig) {
5456 ensuredir '.git/dgit';
5457 my $ok = '.git/dgit/origs-gen-ok';
5458 unlink $ok or $!==&ENOENT or die $!;
5459 my @origs_cmd = @cmd;
5460 push @origs_cmd, qw(--git-cleaner=true);
5461 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5462 push @origs_cmd, @ARGV;
5464 debugcmd @origs_cmd;
5466 do { local $!; stat_exists $ok; }
5467 or failedcmd @origs_cmd;
5469 dryrun_report @origs_cmd;
5475 midbuild_checkchanges_vanilla $wantsrc;
5477 if (!$clean_using_builder) {
5478 push @cmd, '--git-cleaner=true';
5482 maybe_unapply_patches_again();
5484 push @cmd, changesopts();
5485 runcmd_ordryrun_local @cmd, @ARGV;
5487 postbuild_mergechanges_vanilla $wantsrc;
5489 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5492 my $our_cleanmode = $cleanmode;
5493 if ($need_split_build_invocation) {
5494 # Pretend that clean is being done some other way. This
5495 # forces us not to try to use dpkg-buildpackage to clean and
5496 # build source all in one go; and instead we run dpkg-source
5497 # (and build_prep() will do the clean since $clean_using_builder
5499 $our_cleanmode = 'ELSEWHERE';
5501 if ($our_cleanmode =~ m/^dpkg-source/) {
5502 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5503 $clean_using_builder = 1;
5506 $sourcechanges = changespat $version,'source';
5508 unlink "../$sourcechanges" or $!==ENOENT
5509 or fail "remove $sourcechanges: $!";
5511 $dscfn = dscfn($version);
5512 if ($our_cleanmode eq 'dpkg-source') {
5513 maybe_apply_patches_dirtily();
5514 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5516 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5517 maybe_apply_patches_dirtily();
5518 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5521 my @cmd = (@dpkgsource, qw(-b --));
5524 runcmd_ordryrun_local @cmd, "work";
5525 my @udfiles = <${package}_*>;
5526 changedir "../../..";
5527 foreach my $f (@udfiles) {
5528 printdebug "source copy, found $f\n";
5531 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5532 $f eq srcfn($version, $&));
5533 printdebug "source copy, found $f - renaming\n";
5534 rename "$ud/$f", "../$f" or $!==ENOENT
5535 or fail "put in place new source file ($f): $!";
5538 my $pwd = must_getcwd();
5539 my $leafdir = basename $pwd;
5541 runcmd_ordryrun_local @cmd, $leafdir;
5544 runcmd_ordryrun_local qw(sh -ec),
5545 'exec >$1; shift; exec "$@"','x',
5546 "../$sourcechanges",
5547 @dpkggenchanges, qw(-S), changesopts();
5551 sub cmd_build_source {
5552 badusage "build-source takes no additional arguments" if @ARGV;
5554 maybe_unapply_patches_again();
5555 printdone "source built, results in $dscfn and $sourcechanges";
5560 midbuild_checkchanges();
5563 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5564 stat_exists $sourcechanges
5565 or fail "$sourcechanges (in parent directory): $!";
5567 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5569 maybe_unapply_patches_again();
5571 postbuild_mergechanges(<<END);
5572 perhaps you need to pass -A ? (sbuild's default is to build only
5573 arch-specific binaries; dgit 1.4 used to override that.)
5578 sub cmd_quilt_fixup {
5579 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5580 my $clogp = parsechangelog();
5581 $version = getfield $clogp, 'Version';
5582 $package = getfield $clogp, 'Source';
5585 build_maybe_quilt_fixup();
5588 sub cmd_import_dsc {
5592 last unless $ARGV[0] =~ m/^-/;
5595 if (m/^--require-valid-signature$/) {
5598 badusage "unknown dgit import-dsc sub-option \`$_'";
5602 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5603 my ($dscfn, $dstbranch) = @ARGV;
5605 badusage "dry run makes no sense with import-dsc" unless act_local();
5607 my $force = $dstbranch =~ s/^\+// ? +1 :
5608 $dstbranch =~ s/^\.\.// ? -1 :
5610 my $info = $force ? " $&" : '';
5611 $info = "$dscfn$info";
5613 my $specbranch = $dstbranch;
5614 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5615 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5617 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5618 my $chead = cmdoutput_errok @symcmd;
5619 defined $chead or $?==256 or failedcmd @symcmd;
5621 fail "$dstbranch is checked out - will not update it"
5622 if defined $chead and $chead eq $dstbranch;
5624 my $oldhash = git_get_ref $dstbranch;
5626 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5627 $dscdata = do { local $/ = undef; <D>; };
5628 D->error and fail "read $dscfn: $!";
5631 # we don't normally need this so import it here
5632 use Dpkg::Source::Package;
5633 my $dp = new Dpkg::Source::Package filename => $dscfn,
5634 require_valid_signature => $needsig;
5636 local $SIG{__WARN__} = sub {
5638 return unless $needsig;
5639 fail "import-dsc signature check failed";
5641 if (!$dp->is_signed()) {
5642 warn "$us: warning: importing unsigned .dsc\n";
5644 my $r = $dp->check_signature();
5645 die "->check_signature => $r" if $needsig && $r;
5651 my $dgit_commit = $dsc->{$ourdscfield[0]};
5652 if (defined $dgit_commit &&
5653 !forceing [qw(import-dsc-with-dgit-field)]) {
5654 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5655 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5656 my @cmd = (qw(sh -ec),
5657 "echo $dgit_commit | git cat-file --batch-check");
5658 my $objgot = cmdoutput @cmd;
5659 if ($objgot =~ m#^\w+ missing\b#) {
5661 .dsc contains Dgit field referring to object $dgit_commit
5662 Your git tree does not have that object. Try `git fetch' from a
5663 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5666 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5668 progress "Not fast forward, forced update.";
5670 fail "Not fast forward to $dgit_commit";
5673 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5674 $dstbranch, $dgit_commit);
5676 progress "dgit: import-dsc updated git ref $dstbranch";
5681 Branch $dstbranch already exists
5682 Specify ..$specbranch for a pseudo-merge, binding in existing history
5683 Specify +$specbranch to overwrite, discarding existing history
5685 if $oldhash && !$force;
5687 $package = getfield $dsc, 'Source';
5688 my @dfi = dsc_files_info();
5689 foreach my $fi (@dfi) {
5690 my $f = $fi->{Filename};
5692 next if lstat $here;
5693 fail "stat $here: $!" unless $! == ENOENT;
5695 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5697 } elsif ($dscfn =~ m#^/#) {
5700 fail "cannot import $dscfn which seems to be inside working tree!";
5702 $there =~ s#/+[^/]+$## or
5703 fail "cannot import $dscfn which seems to not have a basename";
5705 symlink $there, $here or fail "symlink $there to $here: $!";
5706 progress "made symlink $here -> $there";
5707 print STDERR Dumper($fi);
5709 my @mergeinputs = generate_commits_from_dsc();
5710 die unless @mergeinputs == 1;
5712 my $newhash = $mergeinputs[0]{Commit};
5716 progress "Import, forced update - synthetic orphan git history.";
5717 } elsif ($force < 0) {
5718 progress "Import, merging.";
5719 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5720 my $version = getfield $dsc, 'Version';
5721 $newhash = make_commit_text <<END;
5726 Merge $package ($version) import into $dstbranch
5729 die; # caught earlier
5733 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5734 $dstbranch, $newhash);
5736 progress "dgit: import-dsc results are in in git ref $dstbranch";
5739 sub cmd_archive_api_query {
5740 badusage "need only 1 subpath argument" unless @ARGV==1;
5741 my ($subpath) = @ARGV;
5742 my @cmd = archive_api_query_cmd($subpath);
5745 exec @cmd or fail "exec curl: $!\n";
5748 sub cmd_clone_dgit_repos_server {
5749 badusage "need destination argument" unless @ARGV==1;
5750 my ($destdir) = @ARGV;
5751 $package = '_dgit-repos-server';
5752 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5754 exec @cmd or fail "exec git clone: $!\n";
5757 sub cmd_setup_mergechangelogs {
5758 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5759 setup_mergechangelogs(1);
5762 sub cmd_setup_useremail {
5763 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5767 sub cmd_setup_new_tree {
5768 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5772 #---------- argument parsing and main program ----------
5775 print "dgit version $our_version\n" or die $!;
5779 our (%valopts_long, %valopts_short);
5782 sub defvalopt ($$$$) {
5783 my ($long,$short,$val_re,$how) = @_;
5784 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5785 $valopts_long{$long} = $oi;
5786 $valopts_short{$short} = $oi;
5787 # $how subref should:
5788 # do whatever assignemnt or thing it likes with $_[0]
5789 # if the option should not be passed on to remote, @rvalopts=()
5790 # or $how can be a scalar ref, meaning simply assign the value
5793 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5794 defvalopt '--distro', '-d', '.+', \$idistro;
5795 defvalopt '', '-k', '.+', \$keyid;
5796 defvalopt '--existing-package','', '.*', \$existing_package;
5797 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5798 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5799 defvalopt '--package', '-p', $package_re, \$package;
5800 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5802 defvalopt '', '-C', '.+', sub {
5803 ($changesfile) = (@_);
5804 if ($changesfile =~ s#^(.*)/##) {
5805 $buildproductsdir = $1;
5809 defvalopt '--initiator-tempdir','','.*', sub {
5810 ($initiator_tempdir) = (@_);
5811 $initiator_tempdir =~ m#^/# or
5812 badusage "--initiator-tempdir must be used specify an".
5813 " absolute, not relative, directory."
5819 if (defined $ENV{'DGIT_SSH'}) {
5820 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5821 } elsif (defined $ENV{'GIT_SSH'}) {
5822 @ssh = ($ENV{'GIT_SSH'});
5830 if (!defined $val) {
5831 badusage "$what needs a value" unless @ARGV;
5833 push @rvalopts, $val;
5835 badusage "bad value \`$val' for $what" unless
5836 $val =~ m/^$oi->{Re}$(?!\n)/s;
5837 my $how = $oi->{How};
5838 if (ref($how) eq 'SCALAR') {
5843 push @ropts, @rvalopts;
5847 last unless $ARGV[0] =~ m/^-/;
5851 if (m/^--dry-run$/) {
5854 } elsif (m/^--damp-run$/) {
5857 } elsif (m/^--no-sign$/) {
5860 } elsif (m/^--help$/) {
5862 } elsif (m/^--version$/) {
5864 } elsif (m/^--new$/) {
5867 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5868 ($om = $opts_opt_map{$1}) &&
5872 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5873 !$opts_opt_cmdonly{$1} &&
5874 ($om = $opts_opt_map{$1})) {
5877 } elsif (m/^--(gbp|dpm)$/s) {
5878 push @ropts, "--quilt=$1";
5880 } elsif (m/^--ignore-dirty$/s) {
5883 } elsif (m/^--no-quilt-fixup$/s) {
5885 $quilt_mode = 'nocheck';
5886 } elsif (m/^--no-rm-on-error$/s) {
5889 } elsif (m/^--overwrite$/s) {
5891 $overwrite_version = '';
5892 } elsif (m/^--overwrite=(.+)$/s) {
5894 $overwrite_version = $1;
5895 } elsif (m/^--delayed=(\d+)$/s) {
5898 } elsif (m/^--dgit-view-save=(.+)$/s) {
5900 $split_brain_save = $1;
5901 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
5902 } elsif (m/^--(no-)?rm-old-changes$/s) {
5905 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5907 push @deliberatelies, $&;
5908 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5912 } elsif (m/^--force-/) {
5914 "$us: warning: ignoring unknown force option $_\n";
5916 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5917 # undocumented, for testing
5919 $tagformat_want = [ $1, 'command line', 1 ];
5920 # 1 menas overrides distro configuration
5921 } elsif (m/^--always-split-source-build$/s) {
5922 # undocumented, for testing
5924 $need_split_build_invocation = 1;
5925 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5926 $val = $2 ? $' : undef; #';
5927 $valopt->($oi->{Long});
5929 badusage "unknown long option \`$_'";
5936 } elsif (s/^-L/-/) {
5939 } elsif (s/^-h/-/) {
5941 } elsif (s/^-D/-/) {
5945 } elsif (s/^-N/-/) {
5950 push @changesopts, $_;
5952 } elsif (s/^-wn$//s) {
5954 $cleanmode = 'none';
5955 } elsif (s/^-wg$//s) {
5958 } elsif (s/^-wgf$//s) {
5960 $cleanmode = 'git-ff';
5961 } elsif (s/^-wd$//s) {
5963 $cleanmode = 'dpkg-source';
5964 } elsif (s/^-wdd$//s) {
5966 $cleanmode = 'dpkg-source-d';
5967 } elsif (s/^-wc$//s) {
5969 $cleanmode = 'check';
5970 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5971 push @git, '-c', $&;
5972 $gitcfgs{cmdline}{$1} = [ $2 ];
5973 } elsif (s/^-c([^=]+)$//s) {
5974 push @git, '-c', $&;
5975 $gitcfgs{cmdline}{$1} = [ 'true' ];
5976 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5978 $val = undef unless length $val;
5979 $valopt->($oi->{Short});
5982 badusage "unknown short option \`$_'";
5989 sub check_env_sanity () {
5990 my $blocked = new POSIX::SigSet;
5991 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5994 foreach my $name (qw(PIPE CHLD)) {
5995 my $signame = "SIG$name";
5996 my $signum = eval "POSIX::$signame" // die;
5997 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5998 die "$signame is set to something other than SIG_DFL\n";
5999 $blocked->ismember($signum) and
6000 die "$signame is blocked\n";
6006 On entry to dgit, $@
6007 This is a bug produced by something in in your execution environment.
6013 sub finalise_opts_opts () {
6014 foreach my $k (keys %opts_opt_map) {
6015 my $om = $opts_opt_map{$k};
6017 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6019 badcfg "cannot set command for $k"
6020 unless length $om->[0];
6024 foreach my $c (access_cfg_cfgs("opts-$k")) {
6026 map { $_ ? @$_ : () }
6027 map { $gitcfgs{$_}{$c} }
6028 reverse @gitcfgsources;
6029 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6030 "\n" if $debuglevel >= 4;
6032 badcfg "cannot configure options for $k"
6033 if $opts_opt_cmdonly{$k};
6034 my $insertpos = $opts_cfg_insertpos{$k};
6035 @$om = ( @$om[0..$insertpos-1],
6037 @$om[$insertpos..$#$om] );
6042 if ($ENV{$fakeeditorenv}) {
6044 quilt_fixup_editor();
6051 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6052 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6053 if $dryrun_level == 1;
6055 print STDERR $helpmsg or die $!;
6058 my $cmd = shift @ARGV;
6061 my $pre_fn = ${*::}{"pre_$cmd"};
6062 $pre_fn->() if $pre_fn;
6064 if (!defined $rmchanges) {
6065 local $access_forpush;
6066 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6069 if (!defined $quilt_mode) {
6070 local $access_forpush;
6071 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6072 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6074 $quilt_mode =~ m/^($quilt_modes_re)$/
6075 or badcfg "unknown quilt-mode \`$quilt_mode'";
6079 $need_split_build_invocation ||= quiltmode_splitbrain();
6081 if (!defined $cleanmode) {
6082 local $access_forpush;
6083 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6084 $cleanmode //= 'dpkg-source';
6086 badcfg "unknown clean-mode \`$cleanmode'" unless
6087 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6090 my $fn = ${*::}{"cmd_$cmd"};
6091 $fn or badusage "unknown operation $cmd";