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 () {
2654 ensure_setup_existing_tree();
2656 # Ensures that lrref() is what is actually in the archive, one way
2657 # or another, according to us - ie this client's
2658 # appropritaely-updated archive view. Also returns the commit id.
2659 # If there is nothing in the archive, leaves lrref alone and
2660 # returns undef. git_fetch_us must have already been called.
2664 foreach my $field (@ourdscfield) {
2665 $dsc_hash = $dsc->{$field};
2666 last if defined $dsc_hash;
2668 if (defined $dsc_hash) {
2669 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2671 progress "last upload to archive specified git hash";
2673 progress "last upload to archive has NO git hash";
2676 progress "no version available from the archive";
2679 # If the archive's .dsc has a Dgit field, there are three
2680 # relevant git commitids we need to choose between and/or merge
2682 # 1. $dsc_hash: the Dgit field from the archive
2683 # 2. $lastpush_hash: the suite branch on the dgit git server
2684 # 3. $lastfetch_hash: our local tracking brach for the suite
2686 # These may all be distinct and need not be in any fast forward
2689 # If the dsc was pushed to this suite, then the server suite
2690 # branch will have been updated; but it might have been pushed to
2691 # a different suite and copied by the archive. Conversely a more
2692 # recent version may have been pushed with dgit but not appeared
2693 # in the archive (yet).
2695 # $lastfetch_hash may be awkward because archive imports
2696 # (particularly, imports of Dgit-less .dscs) are performed only as
2697 # needed on individual clients, so different clients may perform a
2698 # different subset of them - and these imports are only made
2699 # public during push. So $lastfetch_hash may represent a set of
2700 # imports different to a subsequent upload by a different dgit
2703 # Our approach is as follows:
2705 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2706 # descendant of $dsc_hash, then it was pushed by a dgit user who
2707 # had based their work on $dsc_hash, so we should prefer it.
2708 # Otherwise, $dsc_hash was installed into this suite in the
2709 # archive other than by a dgit push, and (necessarily) after the
2710 # last dgit push into that suite (since a dgit push would have
2711 # been descended from the dgit server git branch); thus, in that
2712 # case, we prefer the archive's version (and produce a
2713 # pseudo-merge to overwrite the dgit server git branch).
2715 # (If there is no Dgit field in the archive's .dsc then
2716 # generate_commit_from_dsc uses the version numbers to decide
2717 # whether the suite branch or the archive is newer. If the suite
2718 # branch is newer it ignores the archive's .dsc; otherwise it
2719 # generates an import of the .dsc, and produces a pseudo-merge to
2720 # overwrite the suite branch with the archive contents.)
2722 # The outcome of that part of the algorithm is the `public view',
2723 # and is same for all dgit clients: it does not depend on any
2724 # unpublished history in the local tracking branch.
2726 # As between the public view and the local tracking branch: The
2727 # local tracking branch is only updated by dgit fetch, and
2728 # whenever dgit fetch runs it includes the public view in the
2729 # local tracking branch. Therefore if the public view is not
2730 # descended from the local tracking branch, the local tracking
2731 # branch must contain history which was imported from the archive
2732 # but never pushed; and, its tip is now out of date. So, we make
2733 # a pseudo-merge to overwrite the old imports and stitch the old
2736 # Finally: we do not necessarily reify the public view (as
2737 # described above). This is so that we do not end up stacking two
2738 # pseudo-merges. So what we actually do is figure out the inputs
2739 # to any public view pseudo-merge and put them in @mergeinputs.
2742 # $mergeinputs[]{Commit}
2743 # $mergeinputs[]{Info}
2744 # $mergeinputs[0] is the one whose tree we use
2745 # @mergeinputs is in the order we use in the actual commit)
2748 # $mergeinputs[]{Message} is a commit message to use
2749 # $mergeinputs[]{ReverseParents} if def specifies that parent
2750 # list should be in opposite order
2751 # Such an entry has no Commit or Info. It applies only when found
2752 # in the last entry. (This ugliness is to support making
2753 # identical imports to previous dgit versions.)
2755 my $lastpush_hash = git_get_ref(lrfetchref());
2756 printdebug "previous reference hash=$lastpush_hash\n";
2757 $lastpush_mergeinput = $lastpush_hash && {
2758 Commit => $lastpush_hash,
2759 Info => "dgit suite branch on dgit git server",
2762 my $lastfetch_hash = git_get_ref(lrref());
2763 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2764 my $lastfetch_mergeinput = $lastfetch_hash && {
2765 Commit => $lastfetch_hash,
2766 Info => "dgit client's archive history view",
2769 my $dsc_mergeinput = $dsc_hash && {
2770 Commit => $dsc_hash,
2771 Info => "Dgit field in .dsc from archive",
2775 my $del_lrfetchrefs = sub {
2778 printdebug "del_lrfetchrefs...\n";
2779 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2780 my $objid = $lrfetchrefs_d{$fullrefname};
2781 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2783 $gur ||= new IO::Handle;
2784 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2786 printf $gur "delete %s %s\n", $fullrefname, $objid;
2789 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2793 if (defined $dsc_hash) {
2794 ensure_we_have_orig();
2795 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2796 @mergeinputs = $dsc_mergeinput
2797 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2798 print STDERR <<END or die $!;
2800 Git commit in archive is behind the last version allegedly pushed/uploaded.
2801 Commit referred to by archive: $dsc_hash
2802 Last version pushed with dgit: $lastpush_hash
2805 @mergeinputs = ($lastpush_mergeinput);
2807 # Archive has .dsc which is not a descendant of the last dgit
2808 # push. This can happen if the archive moves .dscs about.
2809 # Just follow its lead.
2810 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2811 progress "archive .dsc names newer git commit";
2812 @mergeinputs = ($dsc_mergeinput);
2814 progress "archive .dsc names other git commit, fixing up";
2815 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2819 @mergeinputs = generate_commits_from_dsc();
2820 # We have just done an import. Now, our import algorithm might
2821 # have been improved. But even so we do not want to generate
2822 # a new different import of the same package. So if the
2823 # version numbers are the same, just use our existing version.
2824 # If the version numbers are different, the archive has changed
2825 # (perhaps, rewound).
2826 if ($lastfetch_mergeinput &&
2827 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2828 (mergeinfo_version $mergeinputs[0]) )) {
2829 @mergeinputs = ($lastfetch_mergeinput);
2831 } elsif ($lastpush_hash) {
2832 # only in git, not in the archive yet
2833 @mergeinputs = ($lastpush_mergeinput);
2834 print STDERR <<END or die $!;
2836 Package not found in the archive, but has allegedly been pushed using dgit.
2840 printdebug "nothing found!\n";
2841 if (defined $skew_warning_vsn) {
2842 print STDERR <<END or die $!;
2844 Warning: relevant archive skew detected.
2845 Archive allegedly contains $skew_warning_vsn
2846 But we were not able to obtain any version from the archive or git.
2850 unshift @end, $del_lrfetchrefs;
2854 if ($lastfetch_hash &&
2856 my $h = $_->{Commit};
2857 $h and is_fast_fwd($lastfetch_hash, $h);
2858 # If true, one of the existing parents of this commit
2859 # is a descendant of the $lastfetch_hash, so we'll
2860 # be ff from that automatically.
2864 push @mergeinputs, $lastfetch_mergeinput;
2867 printdebug "fetch mergeinfos:\n";
2868 foreach my $mi (@mergeinputs) {
2870 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2872 printdebug sprintf " ReverseParents=%d Message=%s",
2873 $mi->{ReverseParents}, $mi->{Message};
2877 my $compat_info= pop @mergeinputs
2878 if $mergeinputs[$#mergeinputs]{Message};
2880 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2883 if (@mergeinputs > 1) {
2885 my $tree_commit = $mergeinputs[0]{Commit};
2887 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2888 $tree =~ m/\n\n/; $tree = $`;
2889 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2892 # We use the changelog author of the package in question the
2893 # author of this pseudo-merge. This is (roughly) correct if
2894 # this commit is simply representing aa non-dgit upload.
2895 # (Roughly because it does not record sponsorship - but we
2896 # don't have sponsorship info because that's in the .changes,
2897 # which isn't in the archivw.)
2899 # But, it might be that we are representing archive history
2900 # updates (including in-archive copies). These are not really
2901 # the responsibility of the person who created the .dsc, but
2902 # there is no-one whose name we should better use. (The
2903 # author of the .dsc-named commit is clearly worse.)
2905 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2906 my $author = clogp_authline $useclogp;
2907 my $cversion = getfield $useclogp, 'Version';
2909 my $mcf = ".git/dgit/mergecommit";
2910 open MC, ">", $mcf or die "$mcf $!";
2911 print MC <<END or die $!;
2915 my @parents = grep { $_->{Commit} } @mergeinputs;
2916 @parents = reverse @parents if $compat_info->{ReverseParents};
2917 print MC <<END or die $! foreach @parents;
2921 print MC <<END or die $!;
2927 if (defined $compat_info->{Message}) {
2928 print MC $compat_info->{Message} or die $!;
2930 print MC <<END or die $!;
2931 Record $package ($cversion) in archive suite $csuite
2935 my $message_add_info = sub {
2937 my $mversion = mergeinfo_version $mi;
2938 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2942 $message_add_info->($mergeinputs[0]);
2943 print MC <<END or die $!;
2944 should be treated as descended from
2946 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2950 $hash = make_commit $mcf;
2952 $hash = $mergeinputs[0]{Commit};
2954 printdebug "fetch hash=$hash\n";
2957 my ($lasth, $what) = @_;
2958 return unless $lasth;
2959 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2962 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2964 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2966 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2967 'DGIT_ARCHIVE', $hash;
2968 cmdoutput @git, qw(log -n2), $hash;
2969 # ... gives git a chance to complain if our commit is malformed
2971 if (defined $skew_warning_vsn) {
2973 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2974 my $gotclogp = commit_getclogp($hash);
2975 my $got_vsn = getfield $gotclogp, 'Version';
2976 printdebug "SKEW CHECK GOT $got_vsn\n";
2977 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2978 print STDERR <<END or die $!;
2980 Warning: archive skew detected. Using the available version:
2981 Archive allegedly contains $skew_warning_vsn
2982 We were able to obtain only $got_vsn
2988 if ($lastfetch_hash ne $hash) {
2989 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2993 dryrun_report @upd_cmd;
2997 lrfetchref_used lrfetchref();
2999 unshift @end, $del_lrfetchrefs;
3003 sub set_local_git_config ($$) {
3005 runcmd @git, qw(config), $k, $v;
3008 sub setup_mergechangelogs (;$) {
3010 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3012 my $driver = 'dpkg-mergechangelogs';
3013 my $cb = "merge.$driver";
3014 my $attrs = '.git/info/attributes';
3015 ensuredir '.git/info';
3017 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3018 if (!open ATTRS, "<", $attrs) {
3019 $!==ENOENT or die "$attrs: $!";
3023 next if m{^debian/changelog\s};
3024 print NATTRS $_, "\n" or die $!;
3026 ATTRS->error and die $!;
3029 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3032 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3033 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3035 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3038 sub setup_useremail (;$) {
3040 return unless $always || access_cfg_bool(1, 'setup-useremail');
3043 my ($k, $envvar) = @_;
3044 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3045 return unless defined $v;
3046 set_local_git_config "user.$k", $v;
3049 $setup->('email', 'DEBEMAIL');
3050 $setup->('name', 'DEBFULLNAME');
3053 sub ensure_setup_existing_tree () {
3054 my $k = "remote.$remotename.skipdefaultupdate";
3055 my $c = git_get_config $k;
3056 return if defined $c;
3057 set_local_git_config $k, 'true';
3060 sub setup_new_tree () {
3061 setup_mergechangelogs();
3067 canonicalise_suite();
3068 badusage "dry run makes no sense with clone" unless act_local();
3069 my $hasgit = check_for_git();
3070 mkdir $dstdir or fail "create \`$dstdir': $!";
3072 runcmd @git, qw(init -q);
3073 my $giturl = access_giturl(1);
3074 if (defined $giturl) {
3075 open H, "> .git/HEAD" or die $!;
3076 print H "ref: ".lref()."\n" or die $!;
3078 runcmd @git, qw(remote add), 'origin', $giturl;
3081 progress "fetching existing git history";
3083 runcmd_ordryrun_local @git, qw(fetch origin);
3085 progress "starting new git history";
3087 fetch_from_archive() or no_such_package;
3088 my $vcsgiturl = $dsc->{'Vcs-Git'};
3089 if (length $vcsgiturl) {
3090 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3091 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3094 runcmd @git, qw(reset --hard), lrref();
3095 runcmd qw(bash -ec), <<'END';
3097 git ls-tree -r --name-only -z HEAD | \
3098 xargs -0r touch -r . --
3100 printdone "ready for work in $dstdir";
3104 if (check_for_git()) {
3107 fetch_from_archive() or no_such_package();
3108 printdone "fetched into ".lrref();
3113 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3115 printdone "fetched to ".lrref()." and merged into HEAD";
3118 sub check_not_dirty () {
3119 foreach my $f (qw(local-options local-patch-header)) {
3120 if (stat_exists "debian/source/$f") {
3121 fail "git tree contains debian/source/$f";
3125 return if $ignoredirty;
3127 my @cmd = (@git, qw(diff --quiet HEAD));
3129 $!=0; $?=-1; system @cmd;
3132 fail "working tree is dirty (does not match HEAD)";
3138 sub commit_admin ($) {
3141 runcmd_ordryrun_local @git, qw(commit -m), $m;
3144 sub commit_quilty_patch () {
3145 my $output = cmdoutput @git, qw(status --porcelain);
3147 foreach my $l (split /\n/, $output) {
3148 next unless $l =~ m/\S/;
3149 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3153 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3155 progress "nothing quilty to commit, ok.";
3158 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3159 runcmd_ordryrun_local @git, qw(add -f), @adds;
3161 Commit Debian 3.0 (quilt) metadata
3163 [dgit ($our_version) quilt-fixup]
3167 sub get_source_format () {
3169 if (open F, "debian/source/options") {
3173 s/\s+$//; # ignore missing final newline
3175 my ($k, $v) = ($`, $'); #');
3176 $v =~ s/^"(.*)"$/$1/;
3182 F->error and die $!;
3185 die $! unless $!==&ENOENT;
3188 if (!open F, "debian/source/format") {
3189 die $! unless $!==&ENOENT;
3193 F->error and die $!;
3195 return ($_, \%options);
3198 sub madformat_wantfixup ($) {
3200 return 0 unless $format eq '3.0 (quilt)';
3201 our $quilt_mode_warned;
3202 if ($quilt_mode eq 'nocheck') {
3203 progress "Not doing any fixup of \`$format' due to".
3204 " ----no-quilt-fixup or --quilt=nocheck"
3205 unless $quilt_mode_warned++;
3208 progress "Format \`$format', need to check/update patch stack"
3209 unless $quilt_mode_warned++;
3213 sub maybe_split_brain_save ($$$) {
3214 my ($headref, $dgitview, $msg) = @_;
3215 # => message fragment "$saved" describing disposition of $dgitview
3216 return "commit id $dgitview" unless defined $split_brain_save;
3217 my @cmd = (shell_cmd "cd ../../../..",
3218 @git, qw(update-ref -m),
3219 "dgit --dgit-view-save $msg HEAD=$headref",
3220 $split_brain_save, $dgitview);
3222 return "and left in $split_brain_save";
3225 # An "infopair" is a tuple [ $thing, $what ]
3226 # (often $thing is a commit hash; $what is a description)
3228 sub infopair_cond_equal ($$) {
3230 $x->[0] eq $y->[0] or fail <<END;
3231 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3235 sub infopair_lrf_tag_lookup ($$) {
3236 my ($tagnames, $what) = @_;
3237 # $tagname may be an array ref
3238 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3239 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3240 foreach my $tagname (@tagnames) {
3241 my $lrefname = lrfetchrefs."/tags/$tagname";
3242 my $tagobj = $lrfetchrefs_f{$lrefname};
3243 next unless defined $tagobj;
3244 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3245 return [ git_rev_parse($tagobj), $what ];
3247 fail @tagnames==1 ? <<END : <<END;
3248 Wanted tag $what (@tagnames) on dgit server, but not found
3250 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3254 sub infopair_cond_ff ($$) {
3255 my ($anc,$desc) = @_;
3256 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3257 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3261 sub pseudomerge_version_check ($$) {
3262 my ($clogp, $archive_hash) = @_;
3264 my $arch_clogp = commit_getclogp $archive_hash;
3265 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3266 'version currently in archive' ];
3267 if (defined $overwrite_version) {
3268 if (length $overwrite_version) {
3269 infopair_cond_equal([ $overwrite_version,
3270 '--overwrite= version' ],
3273 my $v = $i_arch_v->[0];
3274 progress "Checking package changelog for archive version $v ...";
3276 my @xa = ("-f$v", "-t$v");
3277 my $vclogp = parsechangelog @xa;
3278 my $cv = [ (getfield $vclogp, 'Version'),
3279 "Version field from dpkg-parsechangelog @xa" ];
3280 infopair_cond_equal($i_arch_v, $cv);
3283 $@ =~ s/^dgit: //gm;
3285 "Perhaps debian/changelog does not mention $v ?";
3290 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3294 sub pseudomerge_make_commit ($$$$ $$) {
3295 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3296 $msg_cmd, $msg_msg) = @_;
3297 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3299 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3300 my $authline = clogp_authline $clogp;
3304 !defined $overwrite_version ? ""
3305 : !length $overwrite_version ? " --overwrite"
3306 : " --overwrite=".$overwrite_version;
3309 my $pmf = ".git/dgit/pseudomerge";
3310 open MC, ">", $pmf or die "$pmf $!";
3311 print MC <<END or die $!;
3314 parent $archive_hash
3324 return make_commit($pmf);
3327 sub splitbrain_pseudomerge ($$$$) {
3328 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3329 # => $merged_dgitview
3330 printdebug "splitbrain_pseudomerge...\n";
3332 # We: debian/PREVIOUS HEAD($maintview)
3333 # expect: o ----------------- o
3336 # a/d/PREVIOUS $dgitview
3339 # we do: `------------------ o
3343 return $dgitview unless defined $archive_hash;
3345 printdebug "splitbrain_pseudomerge...\n";
3347 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3349 if (!defined $overwrite_version) {
3350 progress "Checking that HEAD inciudes all changes in archive...";
3353 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3355 if (defined $overwrite_version) {
3357 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3358 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3359 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3360 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3361 my $i_archive = [ $archive_hash, "current archive contents" ];
3363 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3365 infopair_cond_equal($i_dgit, $i_archive);
3366 infopair_cond_ff($i_dep14, $i_dgit);
3367 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3371 $us: check failed (maybe --overwrite is needed, consult documentation)
3376 my $r = pseudomerge_make_commit
3377 $clogp, $dgitview, $archive_hash, $i_arch_v,
3378 "dgit --quilt=$quilt_mode",
3379 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3380 Declare fast forward from $i_arch_v->[0]
3382 Make fast forward from $i_arch_v->[0]
3385 maybe_split_brain_save $maintview, $r, "pseudomerge";
3387 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3391 sub plain_overwrite_pseudomerge ($$$) {
3392 my ($clogp, $head, $archive_hash) = @_;
3394 printdebug "plain_overwrite_pseudomerge...";
3396 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3398 return $head if is_fast_fwd $archive_hash, $head;
3400 my $m = "Declare fast forward from $i_arch_v->[0]";
3402 my $r = pseudomerge_make_commit
3403 $clogp, $head, $archive_hash, $i_arch_v,
3406 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3408 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3412 sub push_parse_changelog ($) {
3415 my $clogp = Dpkg::Control::Hash->new();
3416 $clogp->load($clogpfn) or die;
3418 my $clogpackage = getfield $clogp, 'Source';
3419 $package //= $clogpackage;
3420 fail "-p specified $package but changelog specified $clogpackage"
3421 unless $package eq $clogpackage;
3422 my $cversion = getfield $clogp, 'Version';
3423 my $tag = debiantag($cversion, access_nomdistro);
3424 runcmd @git, qw(check-ref-format), $tag;
3426 my $dscfn = dscfn($cversion);
3428 return ($clogp, $cversion, $dscfn);
3431 sub push_parse_dsc ($$$) {
3432 my ($dscfn,$dscfnwhat, $cversion) = @_;
3433 $dsc = parsecontrol($dscfn,$dscfnwhat);
3434 my $dversion = getfield $dsc, 'Version';
3435 my $dscpackage = getfield $dsc, 'Source';
3436 ($dscpackage eq $package && $dversion eq $cversion) or
3437 fail "$dscfn is for $dscpackage $dversion".
3438 " but debian/changelog is for $package $cversion";
3441 sub push_tagwants ($$$$) {
3442 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3445 TagFn => \&debiantag,
3450 if (defined $maintviewhead) {
3452 TagFn => \&debiantag_maintview,
3453 Objid => $maintviewhead,
3454 TfSuffix => '-maintview',
3458 foreach my $tw (@tagwants) {
3459 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3460 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3462 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3466 sub push_mktags ($$ $$ $) {
3468 $changesfile,$changesfilewhat,
3471 die unless $tagwants->[0]{View} eq 'dgit';
3473 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3474 $dsc->save("$dscfn.tmp") or die $!;
3476 my $changes = parsecontrol($changesfile,$changesfilewhat);
3477 foreach my $field (qw(Source Distribution Version)) {
3478 $changes->{$field} eq $clogp->{$field} or
3479 fail "changes field $field \`$changes->{$field}'".
3480 " does not match changelog \`$clogp->{$field}'";
3483 my $cversion = getfield $clogp, 'Version';
3484 my $clogsuite = getfield $clogp, 'Distribution';
3486 # We make the git tag by hand because (a) that makes it easier
3487 # to control the "tagger" (b) we can do remote signing
3488 my $authline = clogp_authline $clogp;
3489 my $delibs = join(" ", "",@deliberatelies);
3490 my $declaredistro = access_nomdistro();
3494 my $tfn = $tw->{Tfn};
3495 my $head = $tw->{Objid};
3496 my $tag = $tw->{Tag};
3498 open TO, '>', $tfn->('.tmp') or die $!;
3499 print TO <<END or die $!;
3506 if ($tw->{View} eq 'dgit') {
3507 print TO <<END or die $!;
3508 $package release $cversion for $clogsuite ($csuite) [dgit]
3509 [dgit distro=$declaredistro$delibs]
3511 foreach my $ref (sort keys %previously) {
3512 print TO <<END or die $!;
3513 [dgit previously:$ref=$previously{$ref}]
3516 } elsif ($tw->{View} eq 'maint') {
3517 print TO <<END or die $!;
3518 $package release $cversion for $clogsuite ($csuite)
3519 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3522 die Dumper($tw)."?";
3527 my $tagobjfn = $tfn->('.tmp');
3529 if (!defined $keyid) {
3530 $keyid = access_cfg('keyid','RETURN-UNDEF');
3532 if (!defined $keyid) {
3533 $keyid = getfield $clogp, 'Maintainer';
3535 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3536 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3537 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3538 push @sign_cmd, $tfn->('.tmp');
3539 runcmd_ordryrun @sign_cmd;
3541 $tagobjfn = $tfn->('.signed.tmp');
3542 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3543 $tfn->('.tmp'), $tfn->('.tmp.asc');
3549 my @r = map { $mktag->($_); } @$tagwants;
3553 sub sign_changes ($) {
3554 my ($changesfile) = @_;
3556 my @debsign_cmd = @debsign;
3557 push @debsign_cmd, "-k$keyid" if defined $keyid;
3558 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3559 push @debsign_cmd, $changesfile;
3560 runcmd_ordryrun @debsign_cmd;
3565 printdebug "actually entering push\n";
3567 supplementary_message(<<'END');
3568 Push failed, while checking state of the archive.
3569 You can retry the push, after fixing the problem, if you like.
3571 if (check_for_git()) {
3574 my $archive_hash = fetch_from_archive();
3575 if (!$archive_hash) {
3577 fail "package appears to be new in this suite;".
3578 " if this is intentional, use --new";
3581 supplementary_message(<<'END');
3582 Push failed, while preparing your push.
3583 You can retry the push, after fixing the problem, if you like.
3586 need_tagformat 'new', "quilt mode $quilt_mode"
3587 if quiltmode_splitbrain;
3591 access_giturl(); # check that success is vaguely likely
3594 my $clogpfn = ".git/dgit/changelog.822.tmp";
3595 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3597 responder_send_file('parsed-changelog', $clogpfn);
3599 my ($clogp, $cversion, $dscfn) =
3600 push_parse_changelog("$clogpfn");
3602 my $dscpath = "$buildproductsdir/$dscfn";
3603 stat_exists $dscpath or
3604 fail "looked for .dsc $dscfn, but $!;".
3605 " maybe you forgot to build";
3607 responder_send_file('dsc', $dscpath);
3609 push_parse_dsc($dscpath, $dscfn, $cversion);
3611 my $format = getfield $dsc, 'Format';
3612 printdebug "format $format\n";
3614 my $actualhead = git_rev_parse('HEAD');
3615 my $dgithead = $actualhead;
3616 my $maintviewhead = undef;
3618 my $upstreamversion = upstreamversion $clogp->{Version};
3620 if (madformat_wantfixup($format)) {
3621 # user might have not used dgit build, so maybe do this now:
3622 if (quiltmode_splitbrain()) {
3624 quilt_make_fake_dsc($upstreamversion);
3626 ($dgithead, $cachekey) =
3627 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3629 "--quilt=$quilt_mode but no cached dgit view:
3630 perhaps tree changed since dgit build[-source] ?";
3632 $dgithead = splitbrain_pseudomerge($clogp,
3633 $actualhead, $dgithead,
3635 $maintviewhead = $actualhead;
3636 changedir '../../../..';
3637 prep_ud(); # so _only_subdir() works, below
3639 commit_quilty_patch();
3643 if (defined $overwrite_version && !defined $maintviewhead) {
3644 $dgithead = plain_overwrite_pseudomerge($clogp,
3652 if ($archive_hash) {
3653 if (is_fast_fwd($archive_hash, $dgithead)) {
3655 } elsif (deliberately_not_fast_forward) {
3658 fail "dgit push: HEAD is not a descendant".
3659 " of the archive's version.\n".
3660 "To overwrite the archive's contents,".
3661 " pass --overwrite[=VERSION].\n".
3662 "To rewind history, if permitted by the archive,".
3663 " use --deliberately-not-fast-forward.";
3668 progress "checking that $dscfn corresponds to HEAD";
3669 runcmd qw(dpkg-source -x --),
3670 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3671 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3672 check_for_vendor_patches() if madformat($dsc->{format});
3673 changedir '../../../..';
3674 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3675 debugcmd "+",@diffcmd;
3677 my $r = system @diffcmd;
3680 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3682 HEAD specifies a different tree to $dscfn:
3684 Perhaps you forgot to build. Or perhaps there is a problem with your
3685 source tree (see dgit(7) for some hints). To see a full diff, run
3692 if (!$changesfile) {
3693 my $pat = changespat $cversion;
3694 my @cs = glob "$buildproductsdir/$pat";
3695 fail "failed to find unique changes file".
3696 " (looked for $pat in $buildproductsdir);".
3697 " perhaps you need to use dgit -C"
3699 ($changesfile) = @cs;
3701 $changesfile = "$buildproductsdir/$changesfile";
3704 # Check that changes and .dsc agree enough
3705 $changesfile =~ m{[^/]*$};
3706 my $changes = parsecontrol($changesfile,$&);
3707 files_compare_inputs($dsc, $changes)
3708 unless forceing [qw(dsc-changes-mismatch)];
3710 # Perhaps adjust .dsc to contain right set of origs
3711 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3713 unless forceing [qw(changes-origs-exactly)];
3715 # Checks complete, we're going to try and go ahead:
3717 responder_send_file('changes',$changesfile);
3718 responder_send_command("param head $dgithead");
3719 responder_send_command("param csuite $csuite");
3720 responder_send_command("param tagformat $tagformat");
3721 if (defined $maintviewhead) {
3722 die unless ($protovsn//4) >= 4;
3723 responder_send_command("param maint-view $maintviewhead");
3726 if (deliberately_not_fast_forward) {
3727 git_for_each_ref(lrfetchrefs, sub {
3728 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3729 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3730 responder_send_command("previously $rrefname=$objid");
3731 $previously{$rrefname} = $objid;
3735 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3739 supplementary_message(<<'END');
3740 Push failed, while signing the tag.
3741 You can retry the push, after fixing the problem, if you like.
3743 # If we manage to sign but fail to record it anywhere, it's fine.
3744 if ($we_are_responder) {
3745 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3746 responder_receive_files('signed-tag', @tagobjfns);
3748 @tagobjfns = push_mktags($clogp,$dscpath,
3749 $changesfile,$changesfile,
3752 supplementary_message(<<'END');
3753 Push failed, *after* signing the tag.
3754 If you want to try again, you should use a new version number.
3757 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3759 foreach my $tw (@tagwants) {
3760 my $tag = $tw->{Tag};
3761 my $tagobjfn = $tw->{TagObjFn};
3763 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3764 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3765 runcmd_ordryrun_local
3766 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3769 supplementary_message(<<'END');
3770 Push failed, while updating the remote git repository - see messages above.
3771 If you want to try again, you should use a new version number.
3773 if (!check_for_git()) {
3774 create_remote_git_repo();
3777 my @pushrefs = $forceflag.$dgithead.":".rrref();
3778 foreach my $tw (@tagwants) {
3779 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3782 runcmd_ordryrun @git,
3783 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3784 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3786 supplementary_message(<<'END');
3787 Push failed, after updating the remote git repository.
3788 If you want to try again, you must use a new version number.
3790 if ($we_are_responder) {
3791 my $dryrunsuffix = act_local() ? "" : ".tmp";
3792 responder_receive_files('signed-dsc-changes',
3793 "$dscpath$dryrunsuffix",
3794 "$changesfile$dryrunsuffix");
3797 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3799 progress "[new .dsc left in $dscpath.tmp]";
3801 sign_changes $changesfile;
3804 supplementary_message(<<END);
3805 Push failed, while uploading package(s) to the archive server.
3806 You can retry the upload of exactly these same files with dput of:
3808 If that .changes file is broken, you will need to use a new version
3809 number for your next attempt at the upload.
3811 my $host = access_cfg('upload-host','RETURN-UNDEF');
3812 my @hostarg = defined($host) ? ($host,) : ();
3813 runcmd_ordryrun @dput, @hostarg, $changesfile;
3814 printdone "pushed and uploaded $cversion";
3816 supplementary_message('');
3817 responder_send_command("complete");
3824 badusage "-p is not allowed with clone; specify as argument instead"
3825 if defined $package;
3828 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3829 ($package,$isuite) = @ARGV;
3830 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3831 ($package,$dstdir) = @ARGV;
3832 } elsif (@ARGV==3) {
3833 ($package,$isuite,$dstdir) = @ARGV;
3835 badusage "incorrect arguments to dgit clone";
3837 $dstdir ||= "$package";
3839 if (stat_exists $dstdir) {
3840 fail "$dstdir already exists";
3844 if ($rmonerror && !$dryrun_level) {
3845 $cwd_remove= getcwd();
3847 return unless defined $cwd_remove;
3848 if (!chdir "$cwd_remove") {
3849 return if $!==&ENOENT;
3850 die "chdir $cwd_remove: $!";
3853 rmtree($dstdir) or die "remove $dstdir: $!\n";
3854 } elsif (grep { $! == $_ }
3855 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3857 print STDERR "check whether to remove $dstdir: $!\n";
3863 $cwd_remove = undef;
3866 sub branchsuite () {
3867 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3868 if ($branch =~ m#$lbranch_re#o) {
3875 sub fetchpullargs () {
3877 if (!defined $package) {
3878 my $sourcep = parsecontrol('debian/control','debian/control');
3879 $package = getfield $sourcep, 'Source';
3882 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3884 my $clogp = parsechangelog();
3885 $isuite = getfield $clogp, 'Distribution';
3887 canonicalise_suite();
3888 progress "fetching from suite $csuite";
3889 } elsif (@ARGV==1) {
3891 canonicalise_suite();
3893 badusage "incorrect arguments to dgit fetch or dgit pull";
3906 if (quiltmode_splitbrain()) {
3907 my ($format, $fopts) = get_source_format();
3908 madformat($format) and fail <<END
3909 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
3918 badusage "-p is not allowed with dgit push" if defined $package;
3920 my $clogp = parsechangelog();
3921 $package = getfield $clogp, 'Source';
3924 } elsif (@ARGV==1) {
3925 ($specsuite) = (@ARGV);
3927 badusage "incorrect arguments to dgit push";
3929 $isuite = getfield $clogp, 'Distribution';
3931 local ($package) = $existing_package; # this is a hack
3932 canonicalise_suite();
3934 canonicalise_suite();
3936 if (defined $specsuite &&
3937 $specsuite ne $isuite &&
3938 $specsuite ne $csuite) {
3939 fail "dgit push: changelog specifies $isuite ($csuite)".
3940 " but command line specifies $specsuite";
3945 #---------- remote commands' implementation ----------
3947 sub cmd_remote_push_build_host {
3948 my ($nrargs) = shift @ARGV;
3949 my (@rargs) = @ARGV[0..$nrargs-1];
3950 @ARGV = @ARGV[$nrargs..$#ARGV];
3952 my ($dir,$vsnwant) = @rargs;
3953 # vsnwant is a comma-separated list; we report which we have
3954 # chosen in our ready response (so other end can tell if they
3957 $we_are_responder = 1;
3958 $us .= " (build host)";
3962 open PI, "<&STDIN" or die $!;
3963 open STDIN, "/dev/null" or die $!;
3964 open PO, ">&STDOUT" or die $!;
3966 open STDOUT, ">&STDERR" or die $!;
3970 ($protovsn) = grep {
3971 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3972 } @rpushprotovsn_support;
3974 fail "build host has dgit rpush protocol versions ".
3975 (join ",", @rpushprotovsn_support).
3976 " but invocation host has $vsnwant"
3977 unless defined $protovsn;
3979 responder_send_command("dgit-remote-push-ready $protovsn");
3980 rpush_handle_protovsn_bothends();
3985 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3986 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3987 # a good error message)
3989 sub rpush_handle_protovsn_bothends () {
3990 if ($protovsn < 4) {
3991 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4000 my $report = i_child_report();
4001 if (defined $report) {
4002 printdebug "($report)\n";
4003 } elsif ($i_child_pid) {
4004 printdebug "(killing build host child $i_child_pid)\n";
4005 kill 15, $i_child_pid;
4007 if (defined $i_tmp && !defined $initiator_tempdir) {
4009 eval { rmtree $i_tmp; };
4013 END { i_cleanup(); }
4016 my ($base,$selector,@args) = @_;
4017 $selector =~ s/\-/_/g;
4018 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4025 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4033 push @rargs, join ",", @rpushprotovsn_support;
4036 push @rdgit, @ropts;
4037 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4039 my @cmd = (@ssh, $host, shellquote @rdgit);
4042 if (defined $initiator_tempdir) {
4043 rmtree $initiator_tempdir;
4044 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4045 $i_tmp = $initiator_tempdir;
4049 $i_child_pid = open2(\*RO, \*RI, @cmd);
4051 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4052 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4053 $supplementary_message = '' unless $protovsn >= 3;
4055 fail "rpush negotiated protocol version $protovsn".
4056 " which does not support quilt mode $quilt_mode"
4057 if quiltmode_splitbrain;
4059 rpush_handle_protovsn_bothends();
4061 my ($icmd,$iargs) = initiator_expect {
4062 m/^(\S+)(?: (.*))?$/;
4065 i_method "i_resp", $icmd, $iargs;
4069 sub i_resp_progress ($) {
4071 my $msg = protocol_read_bytes \*RO, $rhs;
4075 sub i_resp_supplementary_message ($) {
4077 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4080 sub i_resp_complete {
4081 my $pid = $i_child_pid;
4082 $i_child_pid = undef; # prevents killing some other process with same pid
4083 printdebug "waiting for build host child $pid...\n";
4084 my $got = waitpid $pid, 0;
4085 die $! unless $got == $pid;
4086 die "build host child failed $?" if $?;
4089 printdebug "all done\n";
4093 sub i_resp_file ($) {
4095 my $localname = i_method "i_localname", $keyword;
4096 my $localpath = "$i_tmp/$localname";
4097 stat_exists $localpath and
4098 badproto \*RO, "file $keyword ($localpath) twice";
4099 protocol_receive_file \*RO, $localpath;
4100 i_method "i_file", $keyword;
4105 sub i_resp_param ($) {
4106 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4110 sub i_resp_previously ($) {
4111 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4112 or badproto \*RO, "bad previously spec";
4113 my $r = system qw(git check-ref-format), $1;
4114 die "bad previously ref spec ($r)" if $r;
4115 $previously{$1} = $2;
4120 sub i_resp_want ($) {
4122 die "$keyword ?" if $i_wanted{$keyword}++;
4123 my @localpaths = i_method "i_want", $keyword;
4124 printdebug "[[ $keyword @localpaths\n";
4125 foreach my $localpath (@localpaths) {
4126 protocol_send_file \*RI, $localpath;
4128 print RI "files-end\n" or die $!;
4131 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4133 sub i_localname_parsed_changelog {
4134 return "remote-changelog.822";
4136 sub i_file_parsed_changelog {
4137 ($i_clogp, $i_version, $i_dscfn) =
4138 push_parse_changelog "$i_tmp/remote-changelog.822";
4139 die if $i_dscfn =~ m#/|^\W#;
4142 sub i_localname_dsc {
4143 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4148 sub i_localname_changes {
4149 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4150 $i_changesfn = $i_dscfn;
4151 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4152 return $i_changesfn;
4154 sub i_file_changes { }
4156 sub i_want_signed_tag {
4157 printdebug Dumper(\%i_param, $i_dscfn);
4158 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4159 && defined $i_param{'csuite'}
4160 or badproto \*RO, "premature desire for signed-tag";
4161 my $head = $i_param{'head'};
4162 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4164 my $maintview = $i_param{'maint-view'};
4165 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4168 if ($protovsn >= 4) {
4169 my $p = $i_param{'tagformat'} // '<undef>';
4171 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4174 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4176 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4178 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4181 push_mktags $i_clogp, $i_dscfn,
4182 $i_changesfn, 'remote changes',
4186 sub i_want_signed_dsc_changes {
4187 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4188 sign_changes $i_changesfn;
4189 return ($i_dscfn, $i_changesfn);
4192 #---------- building etc. ----------
4198 #----- `3.0 (quilt)' handling -----
4200 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4202 sub quiltify_dpkg_commit ($$$;$) {
4203 my ($patchname,$author,$msg, $xinfo) = @_;
4207 my $descfn = ".git/dgit/quilt-description.tmp";
4208 open O, '>', $descfn or die "$descfn: $!";
4209 $msg =~ s/\n+/\n\n/;
4210 print O <<END or die $!;
4212 ${xinfo}Subject: $msg
4219 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4220 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4221 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4222 runcmd @dpkgsource, qw(--commit .), $patchname;
4226 sub quiltify_trees_differ ($$;$$$) {
4227 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4228 # returns true iff the two tree objects differ other than in debian/
4229 # with $finegrained,
4230 # returns bitmask 01 - differ in upstream files except .gitignore
4231 # 02 - differ in .gitignore
4232 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4233 # is set for each modified .gitignore filename $fn
4234 # if $unrepres is defined, array ref to which is appeneded
4235 # a list of unrepresentable changes (removals of upstream files
4238 my @cmd = (@git, qw(diff-tree -z));
4239 push @cmd, qw(--name-only) unless $unrepres;
4240 push @cmd, qw(-r) if $finegrained || $unrepres;
4242 my $diffs= cmdoutput @cmd;
4245 foreach my $f (split /\0/, $diffs) {
4246 if ($unrepres && !@lmodes) {
4247 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4250 my ($oldmode,$newmode) = @lmodes;
4253 next if $f =~ m#^debian(?:/.*)?$#s;
4257 die "deleted\n" unless $newmode =~ m/[^0]/;
4258 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4259 if ($oldmode =~ m/[^0]/) {
4260 die "mode changed\n" if $oldmode ne $newmode;
4262 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4266 local $/="\n"; chomp $@;
4267 push @$unrepres, [ $f, $@ ];
4271 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4272 $r |= $isignore ? 02 : 01;
4273 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4275 printdebug "quiltify_trees_differ $x $y => $r\n";
4279 sub quiltify_tree_sentinelfiles ($) {
4280 # lists the `sentinel' files present in the tree
4282 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4283 qw(-- debian/rules debian/control);
4288 sub quiltify_splitbrain_needed () {
4289 if (!$split_brain) {
4290 progress "dgit view: changes are required...";
4291 runcmd @git, qw(checkout -q -b dgit-view);
4296 sub quiltify_splitbrain ($$$$$$) {
4297 my ($clogp, $unapplied, $headref, $diffbits,
4298 $editedignores, $cachekey) = @_;
4299 if ($quilt_mode !~ m/gbp|dpm/) {
4300 # treat .gitignore just like any other upstream file
4301 $diffbits = { %$diffbits };
4302 $_ = !!$_ foreach values %$diffbits;
4304 # We would like any commits we generate to be reproducible
4305 my @authline = clogp_authline($clogp);
4306 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4307 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4308 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4309 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4310 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4311 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4313 if ($quilt_mode =~ m/gbp|unapplied/ &&
4314 ($diffbits->{O2H} & 01)) {
4316 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4317 " but git tree differs from orig in upstream files.";
4318 if (!stat_exists "debian/patches") {
4320 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4324 if ($quilt_mode =~ m/dpm/ &&
4325 ($diffbits->{H2A} & 01)) {
4327 --quilt=$quilt_mode specified, implying patches-applied git tree
4328 but git tree differs from result of applying debian/patches to upstream
4331 if ($quilt_mode =~ m/gbp|unapplied/ &&
4332 ($diffbits->{O2A} & 01)) { # some patches
4333 quiltify_splitbrain_needed();
4334 progress "dgit view: creating patches-applied version using gbp pq";
4335 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4336 # gbp pq import creates a fresh branch; push back to dgit-view
4337 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4338 runcmd @git, qw(checkout -q dgit-view);
4340 if ($quilt_mode =~ m/gbp|dpm/ &&
4341 ($diffbits->{O2A} & 02)) {
4343 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4344 tool which does not create patches for changes to upstream
4345 .gitignores: but, such patches exist in debian/patches.
4348 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4349 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4350 quiltify_splitbrain_needed();
4351 progress "dgit view: creating patch to represent .gitignore changes";
4352 ensuredir "debian/patches";
4353 my $gipatch = "debian/patches/auto-gitignore";
4354 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4355 stat GIPATCH or die "$gipatch: $!";
4356 fail "$gipatch already exists; but want to create it".
4357 " to record .gitignore changes" if (stat _)[7];
4358 print GIPATCH <<END or die "$gipatch: $!";
4359 Subject: Update .gitignore from Debian packaging branch
4361 The Debian packaging git branch contains these updates to the upstream
4362 .gitignore file(s). This patch is autogenerated, to provide these
4363 updates to users of the official Debian archive view of the package.
4365 [dgit ($our_version) update-gitignore]
4368 close GIPATCH or die "$gipatch: $!";
4369 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4370 $unapplied, $headref, "--", sort keys %$editedignores;
4371 open SERIES, "+>>", "debian/patches/series" or die $!;
4372 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4374 defined read SERIES, $newline, 1 or die $!;
4375 print SERIES "\n" or die $! unless $newline eq "\n";
4376 print SERIES "auto-gitignore\n" or die $!;
4377 close SERIES or die $!;
4378 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4380 Commit patch to update .gitignore
4382 [dgit ($our_version) update-gitignore-quilt-fixup]
4386 my $dgitview = git_rev_parse 'HEAD';
4388 changedir '../../../..';
4389 # When we no longer need to support squeeze, use --create-reflog
4391 ensuredir ".git/logs/refs/dgit-intern";
4392 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4395 my $oldcache = git_get_ref "refs/$splitbraincache";
4396 if ($oldcache eq $dgitview) {
4397 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4398 # git update-ref doesn't always update, in this case. *sigh*
4399 my $dummy = make_commit_text <<END;
4402 author Dgit <dgit\@example.com> 1000000000 +0000
4403 committer Dgit <dgit\@example.com> 1000000000 +0000
4405 Dummy commit - do not use
4407 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4408 "refs/$splitbraincache", $dummy;
4410 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4413 changedir '.git/dgit/unpack/work';
4415 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4416 progress "dgit view: created ($saved)";
4419 sub quiltify ($$$$) {
4420 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4422 # Quilt patchification algorithm
4424 # We search backwards through the history of the main tree's HEAD
4425 # (T) looking for a start commit S whose tree object is identical
4426 # to to the patch tip tree (ie the tree corresponding to the
4427 # current dpkg-committed patch series). For these purposes
4428 # `identical' disregards anything in debian/ - this wrinkle is
4429 # necessary because dpkg-source treates debian/ specially.
4431 # We can only traverse edges where at most one of the ancestors'
4432 # trees differs (in changes outside in debian/). And we cannot
4433 # handle edges which change .pc/ or debian/patches. To avoid
4434 # going down a rathole we avoid traversing edges which introduce
4435 # debian/rules or debian/control. And we set a limit on the
4436 # number of edges we are willing to look at.
4438 # If we succeed, we walk forwards again. For each traversed edge
4439 # PC (with P parent, C child) (starting with P=S and ending with
4440 # C=T) to we do this:
4442 # - dpkg-source --commit with a patch name and message derived from C
4443 # After traversing PT, we git commit the changes which
4444 # should be contained within debian/patches.
4446 # The search for the path S..T is breadth-first. We maintain a
4447 # todo list containing search nodes. A search node identifies a
4448 # commit, and looks something like this:
4450 # Commit => $git_commit_id,
4451 # Child => $c, # or undef if P=T
4452 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4453 # Nontrivial => true iff $p..$c has relevant changes
4460 my %considered; # saves being exponential on some weird graphs
4462 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4465 my ($search,$whynot) = @_;
4466 printdebug " search NOT $search->{Commit} $whynot\n";
4467 $search->{Whynot} = $whynot;
4468 push @nots, $search;
4469 no warnings qw(exiting);
4478 my $c = shift @todo;
4479 next if $considered{$c->{Commit}}++;
4481 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4483 printdebug "quiltify investigate $c->{Commit}\n";
4486 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4487 printdebug " search finished hooray!\n";
4492 if ($quilt_mode eq 'nofix') {
4493 fail "quilt fixup required but quilt mode is \`nofix'\n".
4494 "HEAD commit $c->{Commit} differs from tree implied by ".
4495 " debian/patches (tree object $oldtiptree)";
4497 if ($quilt_mode eq 'smash') {
4498 printdebug " search quitting smash\n";
4502 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4503 $not->($c, "has $c_sentinels not $t_sentinels")
4504 if $c_sentinels ne $t_sentinels;
4506 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4507 $commitdata =~ m/\n\n/;
4509 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4510 @parents = map { { Commit => $_, Child => $c } } @parents;
4512 $not->($c, "root commit") if !@parents;
4514 foreach my $p (@parents) {
4515 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4517 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4518 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4520 foreach my $p (@parents) {
4521 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4523 my @cmd= (@git, qw(diff-tree -r --name-only),
4524 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4525 my $patchstackchange = cmdoutput @cmd;
4526 if (length $patchstackchange) {
4527 $patchstackchange =~ s/\n/,/g;
4528 $not->($p, "changed $patchstackchange");
4531 printdebug " search queue P=$p->{Commit} ",
4532 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4538 printdebug "quiltify want to smash\n";
4541 my $x = $_[0]{Commit};
4542 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4545 my $reportnot = sub {
4547 my $s = $abbrev->($notp);
4548 my $c = $notp->{Child};
4549 $s .= "..".$abbrev->($c) if $c;
4550 $s .= ": ".$notp->{Whynot};
4553 if ($quilt_mode eq 'linear') {
4554 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4555 foreach my $notp (@nots) {
4556 print STDERR "$us: ", $reportnot->($notp), "\n";
4558 print STDERR "$us: $_\n" foreach @$failsuggestion;
4559 fail "quilt fixup naive history linearisation failed.\n".
4560 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4561 } elsif ($quilt_mode eq 'smash') {
4562 } elsif ($quilt_mode eq 'auto') {
4563 progress "quilt fixup cannot be linear, smashing...";
4565 die "$quilt_mode ?";
4568 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4569 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4571 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4573 quiltify_dpkg_commit "auto-$version-$target-$time",
4574 (getfield $clogp, 'Maintainer'),
4575 "Automatically generated patch ($clogp->{Version})\n".
4576 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4580 progress "quiltify linearisation planning successful, executing...";
4582 for (my $p = $sref_S;
4583 my $c = $p->{Child};
4585 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4586 next unless $p->{Nontrivial};
4588 my $cc = $c->{Commit};
4590 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4591 $commitdata =~ m/\n\n/ or die "$c ?";
4594 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4597 my $commitdate = cmdoutput
4598 @git, qw(log -n1 --pretty=format:%aD), $cc;
4600 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4602 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4609 my $gbp_check_suitable = sub {
4614 die "contains unexpected slashes\n" if m{//} || m{/$};
4615 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4616 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4617 die "too long" if length > 200;
4619 return $_ unless $@;
4620 print STDERR "quiltifying commit $cc:".
4621 " ignoring/dropping Gbp-Pq $what: $@";
4625 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4627 (\S+) \s* \n //ixm) {
4628 $patchname = $gbp_check_suitable->($1, 'Name');
4630 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4632 (\S+) \s* \n //ixm) {
4633 $patchdir = $gbp_check_suitable->($1, 'Topic');
4638 if (!defined $patchname) {
4639 $patchname = $title;
4640 $patchname =~ s/[.:]$//;
4643 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4644 my $translitname = $converter->convert($patchname);
4645 die unless defined $translitname;
4646 $patchname = $translitname;
4649 "dgit: patch title transliteration error: $@"
4651 $patchname =~ y/ A-Z/-a-z/;
4652 $patchname =~ y/-a-z0-9_.+=~//cd;
4653 $patchname =~ s/^\W/x-$&/;
4654 $patchname = substr($patchname,0,40);
4656 if (!defined $patchdir) {
4659 if (length $patchdir) {
4660 $patchname = "$patchdir/$patchname";
4662 if ($patchname =~ m{^(.*)/}) {
4663 mkpath "debian/patches/$1";
4668 stat "debian/patches/$patchname$index";
4670 $!==ENOENT or die "$patchname$index $!";
4672 runcmd @git, qw(checkout -q), $cc;
4674 # We use the tip's changelog so that dpkg-source doesn't
4675 # produce complaining messages from dpkg-parsechangelog. None
4676 # of the information dpkg-source gets from the changelog is
4677 # actually relevant - it gets put into the original message
4678 # which dpkg-source provides our stunt editor, and then
4680 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4682 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4683 "Date: $commitdate\n".
4684 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4686 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4689 runcmd @git, qw(checkout -q master);
4692 sub build_maybe_quilt_fixup () {
4693 my ($format,$fopts) = get_source_format;
4694 return unless madformat_wantfixup $format;
4697 check_for_vendor_patches();
4699 if (quiltmode_splitbrain) {
4700 foreach my $needtf (qw(new maint)) {
4701 next if grep { $_ eq $needtf } access_cfg_tagformats;
4703 quilt mode $quilt_mode requires split view so server needs to support
4704 both "new" and "maint" tag formats, but config says it doesn't.
4709 my $clogp = parsechangelog();
4710 my $headref = git_rev_parse('HEAD');
4715 my $upstreamversion = upstreamversion $version;
4717 if ($fopts->{'single-debian-patch'}) {
4718 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4720 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4723 die 'bug' if $split_brain && !$need_split_build_invocation;
4725 changedir '../../../..';
4726 runcmd_ordryrun_local
4727 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4730 sub quilt_fixup_mkwork ($) {
4733 mkdir "work" or die $!;
4735 mktree_in_ud_here();
4736 runcmd @git, qw(reset -q --hard), $headref;
4739 sub quilt_fixup_linkorigs ($$) {
4740 my ($upstreamversion, $fn) = @_;
4741 # calls $fn->($leafname);
4743 foreach my $f (<../../../../*>) { #/){
4744 my $b=$f; $b =~ s{.*/}{};
4746 local ($debuglevel) = $debuglevel-1;
4747 printdebug "QF linkorigs $b, $f ?\n";
4749 next unless is_orig_file_of_vsn $b, $upstreamversion;
4750 printdebug "QF linkorigs $b, $f Y\n";
4751 link_ltarget $f, $b or die "$b $!";
4756 sub quilt_fixup_delete_pc () {
4757 runcmd @git, qw(rm -rqf .pc);
4759 Commit removal of .pc (quilt series tracking data)
4761 [dgit ($our_version) upgrade quilt-remove-pc]
4765 sub quilt_fixup_singlepatch ($$$) {
4766 my ($clogp, $headref, $upstreamversion) = @_;
4768 progress "starting quiltify (single-debian-patch)";
4770 # dpkg-source --commit generates new patches even if
4771 # single-debian-patch is in debian/source/options. In order to
4772 # get it to generate debian/patches/debian-changes, it is
4773 # necessary to build the source package.
4775 quilt_fixup_linkorigs($upstreamversion, sub { });
4776 quilt_fixup_mkwork($headref);
4778 rmtree("debian/patches");
4780 runcmd @dpkgsource, qw(-b .);
4782 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4783 rename srcfn("$upstreamversion", "/debian/patches"),
4784 "work/debian/patches";
4787 commit_quilty_patch();
4790 sub quilt_make_fake_dsc ($) {
4791 my ($upstreamversion) = @_;
4793 my $fakeversion="$upstreamversion-~~DGITFAKE";
4795 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4796 print $fakedsc <<END or die $!;
4799 Version: $fakeversion
4803 my $dscaddfile=sub {
4806 my $md = new Digest::MD5;
4808 my $fh = new IO::File $b, '<' or die "$b $!";
4813 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4816 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4818 my @files=qw(debian/source/format debian/rules
4819 debian/control debian/changelog);
4820 foreach my $maybe (qw(debian/patches debian/source/options
4821 debian/tests/control)) {
4822 next unless stat_exists "../../../$maybe";
4823 push @files, $maybe;
4826 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4827 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4829 $dscaddfile->($debtar);
4830 close $fakedsc or die $!;
4833 sub quilt_check_splitbrain_cache ($$) {
4834 my ($headref, $upstreamversion) = @_;
4835 # Called only if we are in (potentially) split brain mode.
4837 # Computes the cache key and looks in the cache.
4838 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4840 my $splitbrain_cachekey;
4843 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4844 # we look in the reflog of dgit-intern/quilt-cache
4845 # we look for an entry whose message is the key for the cache lookup
4846 my @cachekey = (qw(dgit), $our_version);
4847 push @cachekey, $upstreamversion;
4848 push @cachekey, $quilt_mode;
4849 push @cachekey, $headref;
4851 push @cachekey, hashfile('fake.dsc');
4853 my $srcshash = Digest::SHA->new(256);
4854 my %sfs = ( %INC, '$0(dgit)' => $0 );
4855 foreach my $sfk (sort keys %sfs) {
4856 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4857 $srcshash->add($sfk," ");
4858 $srcshash->add(hashfile($sfs{$sfk}));
4859 $srcshash->add("\n");
4861 push @cachekey, $srcshash->hexdigest();
4862 $splitbrain_cachekey = "@cachekey";
4864 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4866 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4867 debugcmd "|(probably)",@cmd;
4868 my $child = open GC, "-|"; defined $child or die $!;
4870 chdir '../../..' or die $!;
4871 if (!stat ".git/logs/refs/$splitbraincache") {
4872 $! == ENOENT or die $!;
4873 printdebug ">(no reflog)\n";
4880 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4881 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4884 quilt_fixup_mkwork($headref);
4885 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
4886 if ($cachehit ne $headref) {
4887 progress "dgit view: found cached ($saved)";
4888 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4890 return ($cachehit, $splitbrain_cachekey);
4892 progress "dgit view: found cached, no changes required";
4893 return ($headref, $splitbrain_cachekey);
4895 die $! if GC->error;
4896 failedcmd unless close GC;
4898 printdebug "splitbrain cache miss\n";
4899 return (undef, $splitbrain_cachekey);
4902 sub quilt_fixup_multipatch ($$$) {
4903 my ($clogp, $headref, $upstreamversion) = @_;
4905 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4908 # - honour any existing .pc in case it has any strangeness
4909 # - determine the git commit corresponding to the tip of
4910 # the patch stack (if there is one)
4911 # - if there is such a git commit, convert each subsequent
4912 # git commit into a quilt patch with dpkg-source --commit
4913 # - otherwise convert all the differences in the tree into
4914 # a single git commit
4918 # Our git tree doesn't necessarily contain .pc. (Some versions of
4919 # dgit would include the .pc in the git tree.) If there isn't
4920 # one, we need to generate one by unpacking the patches that we
4923 # We first look for a .pc in the git tree. If there is one, we
4924 # will use it. (This is not the normal case.)
4926 # Otherwise need to regenerate .pc so that dpkg-source --commit
4927 # can work. We do this as follows:
4928 # 1. Collect all relevant .orig from parent directory
4929 # 2. Generate a debian.tar.gz out of
4930 # debian/{patches,rules,source/format,source/options}
4931 # 3. Generate a fake .dsc containing just these fields:
4932 # Format Source Version Files
4933 # 4. Extract the fake .dsc
4934 # Now the fake .dsc has a .pc directory.
4935 # (In fact we do this in every case, because in future we will
4936 # want to search for a good base commit for generating patches.)
4938 # Then we can actually do the dpkg-source --commit
4939 # 1. Make a new working tree with the same object
4940 # store as our main tree and check out the main
4942 # 2. Copy .pc from the fake's extraction, if necessary
4943 # 3. Run dpkg-source --commit
4944 # 4. If the result has changes to debian/, then
4945 # - git add them them
4946 # - git add .pc if we had a .pc in-tree
4948 # 5. If we had a .pc in-tree, delete it, and git commit
4949 # 6. Back in the main tree, fast forward to the new HEAD
4951 # Another situation we may have to cope with is gbp-style
4952 # patches-unapplied trees.
4954 # We would want to detect these, so we know to escape into
4955 # quilt_fixup_gbp. However, this is in general not possible.
4956 # Consider a package with a one patch which the dgit user reverts
4957 # (with git revert or the moral equivalent).
4959 # That is indistinguishable in contents from a patches-unapplied
4960 # tree. And looking at the history to distinguish them is not
4961 # useful because the user might have made a confusing-looking git
4962 # history structure (which ought to produce an error if dgit can't
4963 # cope, not a silent reintroduction of an unwanted patch).
4965 # So gbp users will have to pass an option. But we can usually
4966 # detect their failure to do so: if the tree is not a clean
4967 # patches-applied tree, quilt linearisation fails, but the tree
4968 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4969 # they want --quilt=unapplied.
4971 # To help detect this, when we are extracting the fake dsc, we
4972 # first extract it with --skip-patches, and then apply the patches
4973 # afterwards with dpkg-source --before-build. That lets us save a
4974 # tree object corresponding to .origs.
4976 my $splitbrain_cachekey;
4978 quilt_make_fake_dsc($upstreamversion);
4980 if (quiltmode_splitbrain()) {
4982 ($cachehit, $splitbrain_cachekey) =
4983 quilt_check_splitbrain_cache($headref, $upstreamversion);
4984 return if $cachehit;
4988 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4990 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4991 rename $fakexdir, "fake" or die "$fakexdir $!";
4995 remove_stray_gits();
4996 mktree_in_ud_here();
5000 runcmd @git, qw(add -Af .);
5001 my $unapplied=git_write_tree();
5002 printdebug "fake orig tree object $unapplied\n";
5006 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5008 if (system @bbcmd) {
5009 failedcmd @bbcmd if $? < 0;
5011 failed to apply your git tree's patch stack (from debian/patches/) to
5012 the corresponding upstream tarball(s). Your source tree and .orig
5013 are probably too inconsistent. dgit can only fix up certain kinds of
5014 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5020 quilt_fixup_mkwork($headref);
5023 if (stat_exists ".pc") {
5025 progress "Tree already contains .pc - will use it then delete it.";
5028 rename '../fake/.pc','.pc' or die $!;
5031 changedir '../fake';
5033 runcmd @git, qw(add -Af .);
5034 my $oldtiptree=git_write_tree();
5035 printdebug "fake o+d/p tree object $unapplied\n";
5036 changedir '../work';
5039 # We calculate some guesswork now about what kind of tree this might
5040 # be. This is mostly for error reporting.
5046 # O = orig, without patches applied
5047 # A = "applied", ie orig with H's debian/patches applied
5048 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5049 \%editedignores, \@unrepres),
5050 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5051 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5055 foreach my $b (qw(01 02)) {
5056 foreach my $v (qw(O2H O2A H2A)) {
5057 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5060 printdebug "differences \@dl @dl.\n";
5063 "$us: base trees orig=%.20s o+d/p=%.20s",
5064 $unapplied, $oldtiptree;
5066 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5067 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5068 $dl[0], $dl[1], $dl[3], $dl[4],
5072 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5074 forceable_fail [qw(unrepresentable)], <<END;
5075 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5080 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5081 push @failsuggestion, "This might be a patches-unapplied branch.";
5082 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5083 push @failsuggestion, "This might be a patches-applied branch.";
5085 push @failsuggestion, "Maybe you need to specify one of".
5086 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5088 if (quiltmode_splitbrain()) {
5089 quiltify_splitbrain($clogp, $unapplied, $headref,
5090 $diffbits, \%editedignores,
5091 $splitbrain_cachekey);
5095 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5096 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5098 if (!open P, '>>', ".pc/applied-patches") {
5099 $!==&ENOENT or die $!;
5104 commit_quilty_patch();
5106 if ($mustdeletepc) {
5107 quilt_fixup_delete_pc();
5111 sub quilt_fixup_editor () {
5112 my $descfn = $ENV{$fakeeditorenv};
5113 my $editing = $ARGV[$#ARGV];
5114 open I1, '<', $descfn or die "$descfn: $!";
5115 open I2, '<', $editing or die "$editing: $!";
5116 unlink $editing or die "$editing: $!";
5117 open O, '>', $editing or die "$editing: $!";
5118 while (<I1>) { print O or die $!; } I1->error and die $!;
5121 $copying ||= m/^\-\-\- /;
5122 next unless $copying;
5125 I2->error and die $!;
5130 sub maybe_apply_patches_dirtily () {
5131 return unless $quilt_mode =~ m/gbp|unapplied/;
5132 print STDERR <<END or die $!;
5134 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5135 dgit: Have to apply the patches - making the tree dirty.
5136 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5139 $patches_applied_dirtily = 01;
5140 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5141 runcmd qw(dpkg-source --before-build .);
5144 sub maybe_unapply_patches_again () {
5145 progress "dgit: Unapplying patches again to tidy up the tree."
5146 if $patches_applied_dirtily;
5147 runcmd qw(dpkg-source --after-build .)
5148 if $patches_applied_dirtily & 01;
5150 if $patches_applied_dirtily & 02;
5151 $patches_applied_dirtily = 0;
5154 #----- other building -----
5156 our $clean_using_builder;
5157 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5158 # clean the tree before building (perhaps invoked indirectly by
5159 # whatever we are using to run the build), rather than separately
5160 # and explicitly by us.
5163 return if $clean_using_builder;
5164 if ($cleanmode eq 'dpkg-source') {
5165 maybe_apply_patches_dirtily();
5166 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5167 } elsif ($cleanmode eq 'dpkg-source-d') {
5168 maybe_apply_patches_dirtily();
5169 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5170 } elsif ($cleanmode eq 'git') {
5171 runcmd_ordryrun_local @git, qw(clean -xdf);
5172 } elsif ($cleanmode eq 'git-ff') {
5173 runcmd_ordryrun_local @git, qw(clean -xdff);
5174 } elsif ($cleanmode eq 'check') {
5175 my $leftovers = cmdoutput @git, qw(clean -xdn);
5176 if (length $leftovers) {
5177 print STDERR $leftovers, "\n" or die $!;
5178 fail "tree contains uncommitted files and --clean=check specified";
5180 } elsif ($cleanmode eq 'none') {
5187 badusage "clean takes no additional arguments" if @ARGV;
5190 maybe_unapply_patches_again();
5193 sub build_prep_early () {
5194 our $build_prep_early_done //= 0;
5195 return if $build_prep_early_done++;
5197 badusage "-p is not allowed when building" if defined $package;
5198 my $clogp = parsechangelog();
5199 $isuite = getfield $clogp, 'Distribution';
5200 $package = getfield $clogp, 'Source';
5201 $version = getfield $clogp, 'Version';
5208 build_maybe_quilt_fixup();
5210 my $pat = changespat $version;
5211 foreach my $f (glob "$buildproductsdir/$pat") {
5213 unlink $f or fail "remove old changes file $f: $!";
5215 progress "would remove $f";
5221 sub changesopts_initial () {
5222 my @opts =@changesopts[1..$#changesopts];
5225 sub changesopts_version () {
5226 if (!defined $changes_since_version) {
5227 my @vsns = archive_query('archive_query');
5228 my @quirk = access_quirk();
5229 if ($quirk[0] eq 'backports') {
5230 local $isuite = $quirk[2];
5232 canonicalise_suite();
5233 push @vsns, archive_query('archive_query');
5236 @vsns = map { $_->[0] } @vsns;
5237 @vsns = sort { -version_compare($a, $b) } @vsns;
5238 $changes_since_version = $vsns[0];
5239 progress "changelog will contain changes since $vsns[0]";
5241 $changes_since_version = '_';
5242 progress "package seems new, not specifying -v<version>";
5245 if ($changes_since_version ne '_') {
5246 return ("-v$changes_since_version");
5252 sub changesopts () {
5253 return (changesopts_initial(), changesopts_version());
5256 sub massage_dbp_args ($;$) {
5257 my ($cmd,$xargs) = @_;
5260 # - if we're going to split the source build out so we can
5261 # do strange things to it, massage the arguments to dpkg-buildpackage
5262 # so that the main build doessn't build source (or add an argument
5263 # to stop it building source by default).
5265 # - add -nc to stop dpkg-source cleaning the source tree,
5266 # unless we're not doing a split build and want dpkg-source
5267 # as cleanmode, in which case we can do nothing
5270 # 0 - source will NOT need to be built separately by caller
5271 # +1 - source will need to be built separately by caller
5272 # +2 - source will need to be built separately by caller AND
5273 # dpkg-buildpackage should not in fact be run at all!
5274 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5275 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5276 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5277 $clean_using_builder = 1;
5280 # -nc has the side effect of specifying -b if nothing else specified
5281 # and some combinations of -S, -b, et al, are errors, rather than
5282 # later simply overriding earlie. So we need to:
5283 # - search the command line for these options
5284 # - pick the last one
5285 # - perhaps add our own as a default
5286 # - perhaps adjust it to the corresponding non-source-building version
5288 foreach my $l ($cmd, $xargs) {
5290 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5293 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5295 if ($need_split_build_invocation) {
5296 printdebug "massage split $dmode.\n";
5297 $r = $dmode =~ m/[S]/ ? +2 :
5298 $dmode =~ y/gGF/ABb/ ? +1 :
5299 $dmode =~ m/[ABb]/ ? 0 :
5302 printdebug "massage done $r $dmode.\n";
5304 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5310 my $wasdir = must_getcwd();
5316 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5317 my ($msg_if_onlyone) = @_;
5318 # If there is only one .changes file, fail with $msg_if_onlyone,
5319 # or if that is undef, be a no-op.
5320 # Returns the changes file to report to the user.
5321 my $pat = changespat $version;
5322 my @changesfiles = glob $pat;
5323 @changesfiles = sort {
5324 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5328 if (@changesfiles==1) {
5329 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5330 only one changes file from build (@changesfiles)
5332 $result = $changesfiles[0];
5333 } elsif (@changesfiles==2) {
5334 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5335 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5336 fail "$l found in binaries changes file $binchanges"
5339 runcmd_ordryrun_local @mergechanges, @changesfiles;
5340 my $multichanges = changespat $version,'multi';
5342 stat_exists $multichanges or fail "$multichanges: $!";
5343 foreach my $cf (glob $pat) {
5344 next if $cf eq $multichanges;
5345 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5348 $result = $multichanges;
5350 fail "wrong number of different changes files (@changesfiles)";
5352 printdone "build successful, results in $result\n" or die $!;
5355 sub midbuild_checkchanges () {
5356 my $pat = changespat $version;
5357 return if $rmchanges;
5358 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5359 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5361 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5362 Suggest you delete @unwanted.
5367 sub midbuild_checkchanges_vanilla ($) {
5369 midbuild_checkchanges() if $wantsrc == 1;
5372 sub postbuild_mergechanges_vanilla ($) {
5374 if ($wantsrc == 1) {
5376 postbuild_mergechanges(undef);
5379 printdone "build successful\n";
5384 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5385 my $wantsrc = massage_dbp_args \@dbp;
5388 midbuild_checkchanges_vanilla $wantsrc;
5393 push @dbp, changesopts_version();
5394 maybe_apply_patches_dirtily();
5395 runcmd_ordryrun_local @dbp;
5397 maybe_unapply_patches_again();
5398 postbuild_mergechanges_vanilla $wantsrc;
5402 $quilt_mode //= 'gbp';
5408 # gbp can make .origs out of thin air. In my tests it does this
5409 # even for a 1.0 format package, with no origs present. So I
5410 # guess it keys off just the version number. We don't know
5411 # exactly what .origs ought to exist, but let's assume that we
5412 # should run gbp if: the version has an upstream part and the main
5414 my $upstreamversion = upstreamversion $version;
5415 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5416 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5418 if ($gbp_make_orig) {
5420 $cleanmode = 'none'; # don't do it again
5421 $need_split_build_invocation = 1;
5424 my @dbp = @dpkgbuildpackage;
5426 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5428 if (!length $gbp_build[0]) {
5429 if (length executable_on_path('git-buildpackage')) {
5430 $gbp_build[0] = qw(git-buildpackage);
5432 $gbp_build[0] = 'gbp buildpackage';
5435 my @cmd = opts_opt_multi_cmd @gbp_build;
5437 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5439 if ($gbp_make_orig) {
5440 ensuredir '.git/dgit';
5441 my $ok = '.git/dgit/origs-gen-ok';
5442 unlink $ok or $!==&ENOENT or die $!;
5443 my @origs_cmd = @cmd;
5444 push @origs_cmd, qw(--git-cleaner=true);
5445 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5446 push @origs_cmd, @ARGV;
5448 debugcmd @origs_cmd;
5450 do { local $!; stat_exists $ok; }
5451 or failedcmd @origs_cmd;
5453 dryrun_report @origs_cmd;
5459 midbuild_checkchanges_vanilla $wantsrc;
5461 if (!$clean_using_builder) {
5462 push @cmd, '--git-cleaner=true';
5466 maybe_unapply_patches_again();
5468 push @cmd, changesopts();
5469 runcmd_ordryrun_local @cmd, @ARGV;
5471 postbuild_mergechanges_vanilla $wantsrc;
5473 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5476 my $our_cleanmode = $cleanmode;
5477 if ($need_split_build_invocation) {
5478 # Pretend that clean is being done some other way. This
5479 # forces us not to try to use dpkg-buildpackage to clean and
5480 # build source all in one go; and instead we run dpkg-source
5481 # (and build_prep() will do the clean since $clean_using_builder
5483 $our_cleanmode = 'ELSEWHERE';
5485 if ($our_cleanmode =~ m/^dpkg-source/) {
5486 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5487 $clean_using_builder = 1;
5490 $sourcechanges = changespat $version,'source';
5492 unlink "../$sourcechanges" or $!==ENOENT
5493 or fail "remove $sourcechanges: $!";
5495 $dscfn = dscfn($version);
5496 if ($our_cleanmode eq 'dpkg-source') {
5497 maybe_apply_patches_dirtily();
5498 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5500 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5501 maybe_apply_patches_dirtily();
5502 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5505 my @cmd = (@dpkgsource, qw(-b --));
5508 runcmd_ordryrun_local @cmd, "work";
5509 my @udfiles = <${package}_*>;
5510 changedir "../../..";
5511 foreach my $f (@udfiles) {
5512 printdebug "source copy, found $f\n";
5515 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5516 $f eq srcfn($version, $&));
5517 printdebug "source copy, found $f - renaming\n";
5518 rename "$ud/$f", "../$f" or $!==ENOENT
5519 or fail "put in place new source file ($f): $!";
5522 my $pwd = must_getcwd();
5523 my $leafdir = basename $pwd;
5525 runcmd_ordryrun_local @cmd, $leafdir;
5528 runcmd_ordryrun_local qw(sh -ec),
5529 'exec >$1; shift; exec "$@"','x',
5530 "../$sourcechanges",
5531 @dpkggenchanges, qw(-S), changesopts();
5535 sub cmd_build_source {
5536 badusage "build-source takes no additional arguments" if @ARGV;
5538 maybe_unapply_patches_again();
5539 printdone "source built, results in $dscfn and $sourcechanges";
5544 midbuild_checkchanges();
5547 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5548 stat_exists $sourcechanges
5549 or fail "$sourcechanges (in parent directory): $!";
5551 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5553 maybe_unapply_patches_again();
5555 postbuild_mergechanges(<<END);
5556 perhaps you need to pass -A ? (sbuild's default is to build only
5557 arch-specific binaries; dgit 1.4 used to override that.)
5562 sub cmd_quilt_fixup {
5563 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5564 my $clogp = parsechangelog();
5565 $version = getfield $clogp, 'Version';
5566 $package = getfield $clogp, 'Source';
5569 build_maybe_quilt_fixup();
5572 sub cmd_import_dsc {
5576 last unless $ARGV[0] =~ m/^-/;
5579 if (m/^--require-valid-signature$/) {
5582 badusage "unknown dgit import-dsc sub-option \`$_'";
5586 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5587 my ($dscfn, $dstbranch) = @ARGV;
5589 badusage "dry run makes no sense with import-dsc" unless act_local();
5591 my $force = $dstbranch =~ s/^\+// ? +1 :
5592 $dstbranch =~ s/^\.\.// ? -1 :
5594 my $info = $force ? " $&" : '';
5595 $info = "$dscfn$info";
5597 my $specbranch = $dstbranch;
5598 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5599 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5601 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5602 my $chead = cmdoutput_errok @symcmd;
5603 defined $chead or $?==256 or failedcmd @symcmd;
5605 fail "$dstbranch is checked out - will not update it"
5606 if defined $chead and $chead eq $dstbranch;
5608 my $oldhash = git_get_ref $dstbranch;
5610 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5611 $dscdata = do { local $/ = undef; <D>; };
5612 D->error and fail "read $dscfn: $!";
5615 # we don't normally need this so import it here
5616 use Dpkg::Source::Package;
5617 my $dp = new Dpkg::Source::Package filename => $dscfn,
5618 require_valid_signature => $needsig;
5620 local $SIG{__WARN__} = sub {
5622 return unless $needsig;
5623 fail "import-dsc signature check failed";
5625 if (!$dp->is_signed()) {
5626 warn "$us: warning: importing unsigned .dsc\n";
5628 my $r = $dp->check_signature();
5629 die "->check_signature => $r" if $needsig && $r;
5635 my $dgit_commit = $dsc->{$ourdscfield[0]};
5636 if (defined $dgit_commit &&
5637 !forceing [qw(import-dsc-with-dgit-field)]) {
5638 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5639 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5640 my @cmd = (qw(sh -ec),
5641 "echo $dgit_commit | git cat-file --batch-check");
5642 my $objgot = cmdoutput @cmd;
5643 if ($objgot =~ m#^\w+ missing\b#) {
5645 .dsc contains Dgit field referring to object $dgit_commit
5646 Your git tree does not have that object. Try `git fetch' from a
5647 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5650 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5652 progress "Not fast forward, forced update.";
5654 fail "Not fast forward to $dgit_commit";
5657 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5658 $dstbranch, $dgit_commit);
5660 progress "dgit: import-dsc updated git ref $dstbranch";
5665 Branch $dstbranch already exists
5666 Specify ..$specbranch for a pseudo-merge, binding in existing history
5667 Specify +$specbranch to overwrite, discarding existing history
5669 if $oldhash && !$force;
5671 $package = getfield $dsc, 'Source';
5672 my @dfi = dsc_files_info();
5673 foreach my $fi (@dfi) {
5674 my $f = $fi->{Filename};
5676 next if lstat $here;
5677 fail "stat $here: $!" unless $! == ENOENT;
5679 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5681 } elsif ($dscfn =~ m#^/#) {
5684 fail "cannot import $dscfn which seems to be inside working tree!";
5686 $there =~ s#/+[^/]+$## or
5687 fail "cannot import $dscfn which seems to not have a basename";
5689 symlink $there, $here or fail "symlink $there to $here: $!";
5690 progress "made symlink $here -> $there";
5691 print STDERR Dumper($fi);
5693 my @mergeinputs = generate_commits_from_dsc();
5694 die unless @mergeinputs == 1;
5696 my $newhash = $mergeinputs[0]{Commit};
5700 progress "Import, forced update - synthetic orphan git history.";
5701 } elsif ($force < 0) {
5702 progress "Import, merging.";
5703 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5704 my $version = getfield $dsc, 'Version';
5705 $newhash = make_commit_text <<END;
5710 Merge $package ($version) import into $dstbranch
5713 die; # caught earlier
5717 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5718 $dstbranch, $newhash);
5720 progress "dgit: import-dsc results are in in git ref $dstbranch";
5723 sub cmd_archive_api_query {
5724 badusage "need only 1 subpath argument" unless @ARGV==1;
5725 my ($subpath) = @ARGV;
5726 my @cmd = archive_api_query_cmd($subpath);
5729 exec @cmd or fail "exec curl: $!\n";
5732 sub cmd_clone_dgit_repos_server {
5733 badusage "need destination argument" unless @ARGV==1;
5734 my ($destdir) = @ARGV;
5735 $package = '_dgit-repos-server';
5736 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5738 exec @cmd or fail "exec git clone: $!\n";
5741 sub cmd_setup_mergechangelogs {
5742 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5743 setup_mergechangelogs(1);
5746 sub cmd_setup_useremail {
5747 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5751 sub cmd_setup_new_tree {
5752 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5756 #---------- argument parsing and main program ----------
5759 print "dgit version $our_version\n" or die $!;
5763 our (%valopts_long, %valopts_short);
5766 sub defvalopt ($$$$) {
5767 my ($long,$short,$val_re,$how) = @_;
5768 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5769 $valopts_long{$long} = $oi;
5770 $valopts_short{$short} = $oi;
5771 # $how subref should:
5772 # do whatever assignemnt or thing it likes with $_[0]
5773 # if the option should not be passed on to remote, @rvalopts=()
5774 # or $how can be a scalar ref, meaning simply assign the value
5777 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5778 defvalopt '--distro', '-d', '.+', \$idistro;
5779 defvalopt '', '-k', '.+', \$keyid;
5780 defvalopt '--existing-package','', '.*', \$existing_package;
5781 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5782 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5783 defvalopt '--package', '-p', $package_re, \$package;
5784 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5786 defvalopt '', '-C', '.+', sub {
5787 ($changesfile) = (@_);
5788 if ($changesfile =~ s#^(.*)/##) {
5789 $buildproductsdir = $1;
5793 defvalopt '--initiator-tempdir','','.*', sub {
5794 ($initiator_tempdir) = (@_);
5795 $initiator_tempdir =~ m#^/# or
5796 badusage "--initiator-tempdir must be used specify an".
5797 " absolute, not relative, directory."
5803 if (defined $ENV{'DGIT_SSH'}) {
5804 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5805 } elsif (defined $ENV{'GIT_SSH'}) {
5806 @ssh = ($ENV{'GIT_SSH'});
5814 if (!defined $val) {
5815 badusage "$what needs a value" unless @ARGV;
5817 push @rvalopts, $val;
5819 badusage "bad value \`$val' for $what" unless
5820 $val =~ m/^$oi->{Re}$(?!\n)/s;
5821 my $how = $oi->{How};
5822 if (ref($how) eq 'SCALAR') {
5827 push @ropts, @rvalopts;
5831 last unless $ARGV[0] =~ m/^-/;
5835 if (m/^--dry-run$/) {
5838 } elsif (m/^--damp-run$/) {
5841 } elsif (m/^--no-sign$/) {
5844 } elsif (m/^--help$/) {
5846 } elsif (m/^--version$/) {
5848 } elsif (m/^--new$/) {
5851 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5852 ($om = $opts_opt_map{$1}) &&
5856 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5857 !$opts_opt_cmdonly{$1} &&
5858 ($om = $opts_opt_map{$1})) {
5861 } elsif (m/^--(gbp|dpm)$/s) {
5862 push @ropts, "--quilt=$1";
5864 } elsif (m/^--ignore-dirty$/s) {
5867 } elsif (m/^--no-quilt-fixup$/s) {
5869 $quilt_mode = 'nocheck';
5870 } elsif (m/^--no-rm-on-error$/s) {
5873 } elsif (m/^--overwrite$/s) {
5875 $overwrite_version = '';
5876 } elsif (m/^--overwrite=(.+)$/s) {
5878 $overwrite_version = $1;
5879 } elsif (m/^--delayed=(\d+)$/s) {
5882 } elsif (m/^--dgit-view-save=(.+)$/s) {
5884 $split_brain_save = $1;
5885 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
5886 } elsif (m/^--(no-)?rm-old-changes$/s) {
5889 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5891 push @deliberatelies, $&;
5892 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5896 } elsif (m/^--force-/) {
5898 "$us: warning: ignoring unknown force option $_\n";
5900 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5901 # undocumented, for testing
5903 $tagformat_want = [ $1, 'command line', 1 ];
5904 # 1 menas overrides distro configuration
5905 } elsif (m/^--always-split-source-build$/s) {
5906 # undocumented, for testing
5908 $need_split_build_invocation = 1;
5909 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5910 $val = $2 ? $' : undef; #';
5911 $valopt->($oi->{Long});
5913 badusage "unknown long option \`$_'";
5920 } elsif (s/^-L/-/) {
5923 } elsif (s/^-h/-/) {
5925 } elsif (s/^-D/-/) {
5929 } elsif (s/^-N/-/) {
5934 push @changesopts, $_;
5936 } elsif (s/^-wn$//s) {
5938 $cleanmode = 'none';
5939 } elsif (s/^-wg$//s) {
5942 } elsif (s/^-wgf$//s) {
5944 $cleanmode = 'git-ff';
5945 } elsif (s/^-wd$//s) {
5947 $cleanmode = 'dpkg-source';
5948 } elsif (s/^-wdd$//s) {
5950 $cleanmode = 'dpkg-source-d';
5951 } elsif (s/^-wc$//s) {
5953 $cleanmode = 'check';
5954 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5955 push @git, '-c', $&;
5956 $gitcfgs{cmdline}{$1} = [ $2 ];
5957 } elsif (s/^-c([^=]+)$//s) {
5958 push @git, '-c', $&;
5959 $gitcfgs{cmdline}{$1} = [ 'true' ];
5960 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5962 $val = undef unless length $val;
5963 $valopt->($oi->{Short});
5966 badusage "unknown short option \`$_'";
5973 sub check_env_sanity () {
5974 my $blocked = new POSIX::SigSet;
5975 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5978 foreach my $name (qw(PIPE CHLD)) {
5979 my $signame = "SIG$name";
5980 my $signum = eval "POSIX::$signame" // die;
5981 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5982 die "$signame is set to something other than SIG_DFL\n";
5983 $blocked->ismember($signum) and
5984 die "$signame is blocked\n";
5990 On entry to dgit, $@
5991 This is a bug produced by something in in your execution environment.
5997 sub finalise_opts_opts () {
5998 foreach my $k (keys %opts_opt_map) {
5999 my $om = $opts_opt_map{$k};
6001 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6003 badcfg "cannot set command for $k"
6004 unless length $om->[0];
6008 foreach my $c (access_cfg_cfgs("opts-$k")) {
6010 map { $_ ? @$_ : () }
6011 map { $gitcfgs{$_}{$c} }
6012 reverse @gitcfgsources;
6013 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6014 "\n" if $debuglevel >= 4;
6016 badcfg "cannot configure options for $k"
6017 if $opts_opt_cmdonly{$k};
6018 my $insertpos = $opts_cfg_insertpos{$k};
6019 @$om = ( @$om[0..$insertpos-1],
6021 @$om[$insertpos..$#$om] );
6026 if ($ENV{$fakeeditorenv}) {
6028 quilt_fixup_editor();
6035 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6036 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6037 if $dryrun_level == 1;
6039 print STDERR $helpmsg or die $!;
6042 my $cmd = shift @ARGV;
6045 my $pre_fn = ${*::}{"pre_$cmd"};
6046 $pre_fn->() if $pre_fn;
6048 if (!defined $rmchanges) {
6049 local $access_forpush;
6050 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6053 if (!defined $quilt_mode) {
6054 local $access_forpush;
6055 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6056 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6058 $quilt_mode =~ m/^($quilt_modes_re)$/
6059 or badcfg "unknown quilt-mode \`$quilt_mode'";
6063 $need_split_build_invocation ||= quiltmode_splitbrain();
6065 if (!defined $cleanmode) {
6066 local $access_forpush;
6067 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6068 $cleanmode //= 'dpkg-source';
6070 badcfg "unknown clean-mode \`$cleanmode'" unless
6071 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6074 my $fn = ${*::}{"cmd_$cmd"};
6075 $fn or badusage "unknown operation $cmd";