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 "dgit 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.default.username' => '',
590 'dgit.default.archive-query-default-component' => 'main',
591 'dgit.default.ssh' => 'ssh',
592 'dgit.default.archive-query' => 'madison:',
593 'dgit.default.sshpsql-dbname' => 'service=projectb',
594 'dgit.default.dgit-tag-format' => 'new,old,maint',
595 # old means "repo server accepts pushes with old dgit tags"
596 # new means "repo server accepts pushes with new dgit tags"
597 # maint means "repo server accepts split brain pushes"
598 # hist means "repo server may have old pushes without new tag"
599 # ("hist" is implied by "old")
600 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
601 'dgit-distro.debian.git-check' => 'url',
602 'dgit-distro.debian.git-check-suffix' => '/info/refs',
603 'dgit-distro.debian.new-private-pushers' => 't',
604 'dgit-distro.debian/push.git-url' => '',
605 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
606 'dgit-distro.debian/push.git-user-force' => 'dgit',
607 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
608 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
609 'dgit-distro.debian/push.git-create' => 'true',
610 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
611 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
612 # 'dgit-distro.debian.archive-query-tls-key',
613 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
614 # ^ this does not work because curl is broken nowadays
615 # Fixing #790093 properly will involve providing providing the key
616 # in some pacagke and maybe updating these paths.
618 # 'dgit-distro.debian.archive-query-tls-curl-args',
619 # '--ca-path=/etc/ssl/ca-debian',
620 # ^ this is a workaround but works (only) on DSA-administered machines
621 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
622 'dgit-distro.debian.git-url-suffix' => '',
623 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
624 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
625 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
626 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
627 'dgit-distro.ubuntu.git-check' => 'false',
628 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
629 'dgit-distro.test-dummy.ssh' => "$td/ssh",
630 'dgit-distro.test-dummy.username' => "alice",
631 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
632 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
633 'dgit-distro.test-dummy.git-url' => "$td/git",
634 'dgit-distro.test-dummy.git-host' => "git",
635 'dgit-distro.test-dummy.git-path' => "$td/git",
636 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
637 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
638 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
639 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
643 our @gitcfgsources = qw(cmdline local global system);
645 sub git_slurp_config () {
646 local ($debuglevel) = $debuglevel-2;
649 # This algoritm is a bit subtle, but this is needed so that for
650 # options which we want to be single-valued, we allow the
651 # different config sources to override properly. See #835858.
652 foreach my $src (@gitcfgsources) {
653 next if $src eq 'cmdline';
654 # we do this ourselves since git doesn't handle it
656 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
659 open GITS, "-|", @cmd or die $!;
662 printdebug "=> ", (messagequote $_), "\n";
664 push @{ $gitcfgs{$src}{$`} }, $'; #';
668 or ($!==0 && $?==256)
673 sub git_get_config ($) {
675 foreach my $src (@gitcfgsources) {
676 my $l = $gitcfgs{$src}{$c};
677 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
680 @$l==1 or badcfg "multiple values for $c".
681 " (in $src git config)" if @$l > 1;
689 return undef if $c =~ /RETURN-UNDEF/;
690 my $v = git_get_config($c);
691 return $v if defined $v;
692 my $dv = $defcfg{$c};
693 return $dv if defined $dv;
695 badcfg "need value for one of: @_\n".
696 "$us: distro or suite appears not to be (properly) supported";
699 sub access_basedistro () {
700 if (defined $idistro) {
703 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
704 return $def if defined $def;
705 foreach my $src (@gitcfgsources, 'internal') {
706 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
708 foreach my $k (keys %$kl) {
709 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
711 next unless match_glob $dpat, $isuite;
715 return cfg("dgit.default.distro");
719 sub access_nomdistro () {
720 my $base = access_basedistro();
721 return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
724 sub access_quirk () {
725 # returns (quirk name, distro to use instead or undef, quirk-specific info)
726 my $basedistro = access_basedistro();
727 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
729 if (defined $backports_quirk) {
730 my $re = $backports_quirk;
731 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
733 $re =~ s/\%/([-0-9a-z_]+)/
734 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
735 if ($isuite =~ m/^$re$/) {
736 return ('backports',"$basedistro-backports",$1);
739 return ('none',undef);
744 sub parse_cfg_bool ($$$) {
745 my ($what,$def,$v) = @_;
748 $v =~ m/^[ty1]/ ? 1 :
749 $v =~ m/^[fn0]/ ? 0 :
750 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
753 sub access_forpush_config () {
754 my $d = access_basedistro();
758 parse_cfg_bool('new-private-pushers', 0,
759 cfg("dgit-distro.$d.new-private-pushers",
762 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
765 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
766 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
767 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
768 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
771 sub access_forpush () {
772 $access_forpush //= access_forpush_config();
773 return $access_forpush;
777 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
778 badcfg "pushing but distro is configured readonly"
779 if access_forpush_config() eq '0';
781 $supplementary_message = <<'END' unless $we_are_responder;
782 Push failed, before we got started.
783 You can retry the push, after fixing the problem, if you like.
785 finalise_opts_opts();
789 finalise_opts_opts();
792 sub supplementary_message ($) {
794 if (!$we_are_responder) {
795 $supplementary_message = $msg;
797 } elsif ($protovsn >= 3) {
798 responder_send_command "supplementary-message ".length($msg)
800 print PO $msg or die $!;
804 sub access_distros () {
805 # Returns list of distros to try, in order
808 # 0. `instead of' distro name(s) we have been pointed to
809 # 1. the access_quirk distro, if any
810 # 2a. the user's specified distro, or failing that } basedistro
811 # 2b. the distro calculated from the suite }
812 my @l = access_basedistro();
814 my (undef,$quirkdistro) = access_quirk();
815 unshift @l, $quirkdistro;
816 unshift @l, $instead_distro;
817 @l = grep { defined } @l;
819 push @l, access_nomdistro();
821 if (access_forpush()) {
822 @l = map { ("$_/push", $_) } @l;
827 sub access_cfg_cfgs (@) {
830 # The nesting of these loops determines the search order. We put
831 # the key loop on the outside so that we search all the distros
832 # for each key, before going on to the next key. That means that
833 # if access_cfg is called with a more specific, and then a less
834 # specific, key, an earlier distro can override the less specific
835 # without necessarily overriding any more specific keys. (If the
836 # distro wants to override the more specific keys it can simply do
837 # so; whereas if we did the loop the other way around, it would be
838 # impossible to for an earlier distro to override a less specific
839 # key but not the more specific ones without restating the unknown
840 # values of the more specific keys.
843 # We have to deal with RETURN-UNDEF specially, so that we don't
844 # terminate the search prematurely.
846 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
849 foreach my $d (access_distros()) {
850 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
852 push @cfgs, map { "dgit.default.$_" } @realkeys;
859 my (@cfgs) = access_cfg_cfgs(@keys);
860 my $value = cfg(@cfgs);
864 sub access_cfg_bool ($$) {
865 my ($def, @keys) = @_;
866 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
869 sub string_to_ssh ($) {
871 if ($spec =~ m/\s/) {
872 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
878 sub access_cfg_ssh () {
879 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
880 if (!defined $gitssh) {
883 return string_to_ssh $gitssh;
887 sub access_runeinfo ($) {
889 return ": dgit ".access_basedistro()." $info ;";
892 sub access_someuserhost ($) {
894 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
895 defined($user) && length($user) or
896 $user = access_cfg("$some-user",'username');
897 my $host = access_cfg("$some-host");
898 return length($user) ? "$user\@$host" : $host;
901 sub access_gituserhost () {
902 return access_someuserhost('git');
905 sub access_giturl (;$) {
907 my $url = access_cfg('git-url','RETURN-UNDEF');
910 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
911 return undef unless defined $proto;
914 access_gituserhost().
915 access_cfg('git-path');
917 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
920 return "$url/$package$suffix";
923 sub parsecontrolfh ($$;$) {
924 my ($fh, $desc, $allowsigned) = @_;
925 our $dpkgcontrolhash_noissigned;
928 my %opts = ('name' => $desc);
929 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
930 $c = Dpkg::Control::Hash->new(%opts);
931 $c->parse($fh,$desc) or die "parsing of $desc failed";
932 last if $allowsigned;
933 last if $dpkgcontrolhash_noissigned;
934 my $issigned= $c->get_option('is_pgp_signed');
935 if (!defined $issigned) {
936 $dpkgcontrolhash_noissigned= 1;
937 seek $fh, 0,0 or die "seek $desc: $!";
938 } elsif ($issigned) {
939 fail "control file $desc is (already) PGP-signed. ".
940 " Note that dgit push needs to modify the .dsc and then".
941 " do the signature itself";
950 my ($file, $desc, $allowsigned) = @_;
951 my $fh = new IO::Handle;
952 open $fh, '<', $file or die "$file: $!";
953 my $c = parsecontrolfh($fh,$desc,$allowsigned);
954 $fh->error and die $!;
960 my ($dctrl,$field) = @_;
961 my $v = $dctrl->{$field};
962 return $v if defined $v;
963 fail "missing field $field in ".$dctrl->get_option('name');
967 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
968 my $p = new IO::Handle;
969 my @cmd = (qw(dpkg-parsechangelog), @_);
970 open $p, '-|', @cmd or die $!;
972 $?=0; $!=0; close $p or failedcmd @cmd;
976 sub commit_getclogp ($) {
977 # Returns the parsed changelog hashref for a particular commit
979 our %commit_getclogp_memo;
980 my $memo = $commit_getclogp_memo{$objid};
981 return $memo if $memo;
983 my $mclog = ".git/dgit/clog-$objid";
984 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
985 "$objid:debian/changelog";
986 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
991 defined $d or fail "getcwd failed: $!";
995 sub parse_dscdata () {
996 my $dscfh = new IO::File \$dscdata, '<' or die $!;
997 printdebug Dumper($dscdata) if $debuglevel>1;
998 $dsc = parsecontrolfh($dscfh,$dscurl,1);
999 printdebug Dumper($dsc) if $debuglevel>1;
1004 sub archive_query ($;@) {
1005 my ($method) = shift @_;
1006 my $query = access_cfg('archive-query','RETURN-UNDEF');
1007 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1010 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1013 sub archive_query_prepend_mirror {
1014 my $m = access_cfg('mirror');
1015 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1018 sub pool_dsc_subpath ($$) {
1019 my ($vsn,$component) = @_; # $package is implict arg
1020 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1021 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1024 sub cfg_apply_map ($$$) {
1025 my ($varref, $what, $mapspec) = @_;
1026 return unless $mapspec;
1028 printdebug "config $what EVAL{ $mapspec; }\n";
1030 eval "package Dgit::Config; $mapspec;";
1035 #---------- `ftpmasterapi' archive query method (nascent) ----------
1037 sub archive_api_query_cmd ($) {
1039 my @cmd = (@curl, qw(-sS));
1040 my $url = access_cfg('archive-query-url');
1041 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1043 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1044 foreach my $key (split /\:/, $keys) {
1045 $key =~ s/\%HOST\%/$host/g;
1047 fail "for $url: stat $key: $!" unless $!==ENOENT;
1050 fail "config requested specific TLS key but do not know".
1051 " how to get curl to use exactly that EE key ($key)";
1052 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1053 # # Sadly the above line does not work because of changes
1054 # # to gnutls. The real fix for #790093 may involve
1055 # # new curl options.
1058 # Fixing #790093 properly will involve providing a value
1059 # for this on clients.
1060 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1061 push @cmd, split / /, $kargs if defined $kargs;
1063 push @cmd, $url.$subpath;
1067 sub api_query ($$;$) {
1069 my ($data, $subpath, $ok404) = @_;
1070 badcfg "ftpmasterapi archive query method takes no data part"
1072 my @cmd = archive_api_query_cmd($subpath);
1073 my $url = $cmd[$#cmd];
1074 push @cmd, qw(-w %{http_code});
1075 my $json = cmdoutput @cmd;
1076 unless ($json =~ s/\d+\d+\d$//) {
1077 failedcmd_report_cmd undef, @cmd;
1078 fail "curl failed to print 3-digit HTTP code";
1081 return undef if $code eq '404' && $ok404;
1082 fail "fetch of $url gave HTTP code $code"
1083 unless $url =~ m#^file://# or $code =~ m/^2/;
1084 return decode_json($json);
1087 sub canonicalise_suite_ftpmasterapi {
1088 my ($proto,$data) = @_;
1089 my $suites = api_query($data, 'suites');
1091 foreach my $entry (@$suites) {
1093 my $v = $entry->{$_};
1094 defined $v && $v eq $isuite;
1095 } qw(codename name);
1096 push @matched, $entry;
1098 fail "unknown suite $isuite" unless @matched;
1101 @matched==1 or die "multiple matches for suite $isuite\n";
1102 $cn = "$matched[0]{codename}";
1103 defined $cn or die "suite $isuite info has no codename\n";
1104 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1106 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1111 sub archive_query_ftpmasterapi {
1112 my ($proto,$data) = @_;
1113 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1115 my $digester = Digest::SHA->new(256);
1116 foreach my $entry (@$info) {
1118 my $vsn = "$entry->{version}";
1119 my ($ok,$msg) = version_check $vsn;
1120 die "bad version: $msg\n" unless $ok;
1121 my $component = "$entry->{component}";
1122 $component =~ m/^$component_re$/ or die "bad component";
1123 my $filename = "$entry->{filename}";
1124 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1125 or die "bad filename";
1126 my $sha256sum = "$entry->{sha256sum}";
1127 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1128 push @rows, [ $vsn, "/pool/$component/$filename",
1129 $digester, $sha256sum ];
1131 die "bad ftpmaster api response: $@\n".Dumper($entry)
1134 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1135 return archive_query_prepend_mirror @rows;
1138 sub file_in_archive_ftpmasterapi {
1139 my ($proto,$data,$filename) = @_;
1140 my $pat = $filename;
1143 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1144 my $info = api_query($data, "file_in_archive/$pat", 1);
1147 #---------- `aptget' archive query method ----------
1150 our $aptget_releasefile;
1151 our $aptget_configpath;
1153 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1154 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1156 sub aptget_cache_clean {
1157 runcmd_ordryrun_local qw(sh -ec),
1158 'cd "$1"; pwd; find -atime +30 -type f -print0 | xargs -0r echo rm --',
1162 sub aptget_lock_acquire () {
1163 my $lockfile = "$aptget_base/lock";
1164 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1165 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1168 sub aptget_prep ($) {
1170 return if defined $aptget_base;
1172 badcfg "aptget archive query method takes no data part"
1175 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1178 ensuredir "$cache/dgit";
1180 access_cfg('aptget-cachekey','RETURN-UNDEF')
1181 // access_nomdistro();
1183 $aptget_base = "$cache/dgit/aptget";
1184 ensuredir $aptget_base;
1186 my $quoted_base = $aptget_base;
1187 die "$quoted_base contains bad chars, cannot continue"
1188 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1190 ensuredir $aptget_base;
1192 aptget_lock_acquire();
1194 aptget_cache_clean();
1196 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1197 my $sourceslist = "source.list#$cachekey";
1199 my $aptsuites = $isuite;
1200 cfg_apply_map(\$aptsuites, 'suite map',
1201 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1203 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1204 printf SRCS "deb-src %s %s %s\n",
1205 access_cfg('mirror'),
1207 access_cfg('aptget-components')
1210 ensuredir "$aptget_base/cache";
1211 ensuredir "$aptget_base/lists";
1213 open CONF, ">", $aptget_configpath or die $!;
1215 Debug::NoLocking "true";
1216 APT::Get::List-Cleanup "false";
1217 #clear APT::Update::Post-Invoke-Success;
1218 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1219 Dir::State::Lists "$quoted_base/lists";
1220 Dir::Etc::preferences "$quoted_base/preferences";
1221 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1222 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1225 foreach my $key (qw(
1228 Dir::Cache::Archives
1229 Dir::Etc::SourceParts
1230 Dir::Etc::preferencesparts
1232 ensuredir "$aptget_base/$key";
1233 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1236 my $oldatime = (time // die $!) - 1;
1237 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1238 next unless stat_exists $oldlist;
1239 my ($mtime) = (stat _)[9];
1240 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1243 runcmd_ordryrun_local aptget_aptget(), qw(update);
1246 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1247 next unless stat_exists $oldlist;
1248 my ($atime) = (stat _)[8];
1249 next if $atime == $oldatime;
1250 push @releasefiles, $oldlist;
1252 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1253 @releasefiles = @inreleasefiles if @inreleasefiles;
1254 die "apt updated wrong number of Release files (@releasefiles), erk"
1255 unless @releasefiles == 1;
1257 ($aptget_releasefile) = @releasefiles;
1260 sub canonicalise_suite_aptget {
1261 my ($proto,$data) = @_;
1264 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1266 foreach my $name (qw(Codename Suite)) {
1267 my $val = $release->{$name};
1269 $val =~ m/^$suite_re$/o or fail
1270 "Release file ($aptget_releasefile) specifies intolerable $name";
1271 cfg_apply_map(\$val, 'suite rmap',
1272 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1279 sub archive_query_aptget {
1280 my ($proto,$data) = @_;
1283 ensuredir "$aptget_base/source";
1284 foreach my $old (<$aptget_base/source/*.dsc>) {
1285 unlink $old or die "$old: $!";
1288 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1289 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1290 # avoids apt-get source failing with ambiguous error code
1292 runcmd_ordryrun_local
1293 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1294 aptget_aptget(), qw(--download-only --only-source source), $package;
1296 my @dscs = <$aptget_base/source/*.dsc>;
1297 fail "apt-get source did not produce a .dsc" unless @dscs;
1298 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1300 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1303 my $uri = "file://". uri_escape $dscs[0];
1304 $uri =~ s{\%2f}{/}gi;
1305 return [ (getfield $pre_dsc, 'Version'), $uri ];
1308 #---------- `dummyapicat' archive query method ----------
1310 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1311 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1313 sub file_in_archive_dummycatapi ($$$) {
1314 my ($proto,$data,$filename) = @_;
1315 my $mirror = access_cfg('mirror');
1316 $mirror =~ s#^file://#/# or die "$mirror ?";
1318 my @cmd = (qw(sh -ec), '
1320 find -name "$2" -print0 |
1322 ', qw(x), $mirror, $filename);
1323 debugcmd "-|", @cmd;
1324 open FIA, "-|", @cmd or die $!;
1327 printdebug "| $_\n";
1328 m/^(\w+) (\S+)$/ or die "$_ ?";
1329 push @out, { sha256sum => $1, filename => $2 };
1331 close FIA or die failedcmd @cmd;
1335 #---------- `madison' archive query method ----------
1337 sub archive_query_madison {
1338 return archive_query_prepend_mirror
1339 map { [ @$_[0..1] ] } madison_get_parse(@_);
1342 sub madison_get_parse {
1343 my ($proto,$data) = @_;
1344 die unless $proto eq 'madison';
1345 if (!length $data) {
1346 $data= access_cfg('madison-distro','RETURN-UNDEF');
1347 $data //= access_basedistro();
1349 $rmad{$proto,$data,$package} ||= cmdoutput
1350 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1351 my $rmad = $rmad{$proto,$data,$package};
1354 foreach my $l (split /\n/, $rmad) {
1355 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1356 \s*( [^ \t|]+ )\s* \|
1357 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1358 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1359 $1 eq $package or die "$rmad $package ?";
1366 $component = access_cfg('archive-query-default-component');
1368 $5 eq 'source' or die "$rmad ?";
1369 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1371 return sort { -version_compare($a->[0],$b->[0]); } @out;
1374 sub canonicalise_suite_madison {
1375 # madison canonicalises for us
1376 my @r = madison_get_parse(@_);
1378 "unable to canonicalise suite using package $package".
1379 " which does not appear to exist in suite $isuite;".
1380 " --existing-package may help";
1384 sub file_in_archive_madison { return undef; }
1386 #---------- `sshpsql' archive query method ----------
1389 my ($data,$runeinfo,$sql) = @_;
1390 if (!length $data) {
1391 $data= access_someuserhost('sshpsql').':'.
1392 access_cfg('sshpsql-dbname');
1394 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1395 my ($userhost,$dbname) = ($`,$'); #';
1397 my @cmd = (access_cfg_ssh, $userhost,
1398 access_runeinfo("ssh-psql $runeinfo").
1399 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1400 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1402 open P, "-|", @cmd or die $!;
1405 printdebug(">|$_|\n");
1408 $!=0; $?=0; close P or failedcmd @cmd;
1410 my $nrows = pop @rows;
1411 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1412 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1413 @rows = map { [ split /\|/, $_ ] } @rows;
1414 my $ncols = scalar @{ shift @rows };
1415 die if grep { scalar @$_ != $ncols } @rows;
1419 sub sql_injection_check {
1420 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1423 sub archive_query_sshpsql ($$) {
1424 my ($proto,$data) = @_;
1425 sql_injection_check $isuite, $package;
1426 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1427 SELECT source.version, component.name, files.filename, files.sha256sum
1429 JOIN src_associations ON source.id = src_associations.source
1430 JOIN suite ON suite.id = src_associations.suite
1431 JOIN dsc_files ON dsc_files.source = source.id
1432 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1433 JOIN component ON component.id = files_archive_map.component_id
1434 JOIN files ON files.id = dsc_files.file
1435 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1436 AND source.source='$package'
1437 AND files.filename LIKE '%.dsc';
1439 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1440 my $digester = Digest::SHA->new(256);
1442 my ($vsn,$component,$filename,$sha256sum) = @$_;
1443 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1445 return archive_query_prepend_mirror @rows;
1448 sub canonicalise_suite_sshpsql ($$) {
1449 my ($proto,$data) = @_;
1450 sql_injection_check $isuite;
1451 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1452 SELECT suite.codename
1453 FROM suite where suite_name='$isuite' or codename='$isuite';
1455 @rows = map { $_->[0] } @rows;
1456 fail "unknown suite $isuite" unless @rows;
1457 die "ambiguous $isuite: @rows ?" if @rows>1;
1461 sub file_in_archive_sshpsql ($$$) { return undef; }
1463 #---------- `dummycat' archive query method ----------
1465 sub canonicalise_suite_dummycat ($$) {
1466 my ($proto,$data) = @_;
1467 my $dpath = "$data/suite.$isuite";
1468 if (!open C, "<", $dpath) {
1469 $!==ENOENT or die "$dpath: $!";
1470 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1474 chomp or die "$dpath: $!";
1476 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1480 sub archive_query_dummycat ($$) {
1481 my ($proto,$data) = @_;
1482 canonicalise_suite();
1483 my $dpath = "$data/package.$csuite.$package";
1484 if (!open C, "<", $dpath) {
1485 $!==ENOENT or die "$dpath: $!";
1486 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1494 printdebug "dummycat query $csuite $package $dpath | $_\n";
1495 my @row = split /\s+/, $_;
1496 @row==2 or die "$dpath: $_ ?";
1499 C->error and die "$dpath: $!";
1501 return archive_query_prepend_mirror
1502 sort { -version_compare($a->[0],$b->[0]); } @rows;
1505 sub file_in_archive_dummycat () { return undef; }
1507 #---------- tag format handling ----------
1509 sub access_cfg_tagformats () {
1510 split /\,/, access_cfg('dgit-tag-format');
1513 sub need_tagformat ($$) {
1514 my ($fmt, $why) = @_;
1515 fail "need to use tag format $fmt ($why) but also need".
1516 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1517 " - no way to proceed"
1518 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1519 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1522 sub select_tagformat () {
1524 return if $tagformatfn && !$tagformat_want;
1525 die 'bug' if $tagformatfn && $tagformat_want;
1526 # ... $tagformat_want assigned after previous select_tagformat
1528 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1529 printdebug "select_tagformat supported @supported\n";
1531 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1532 printdebug "select_tagformat specified @$tagformat_want\n";
1534 my ($fmt,$why,$override) = @$tagformat_want;
1536 fail "target distro supports tag formats @supported".
1537 " but have to use $fmt ($why)"
1539 or grep { $_ eq $fmt } @supported;
1541 $tagformat_want = undef;
1543 $tagformatfn = ${*::}{"debiantag_$fmt"};
1545 fail "trying to use unknown tag format \`$fmt' ($why) !"
1546 unless $tagformatfn;
1549 #---------- archive query entrypoints and rest of program ----------
1551 sub canonicalise_suite () {
1552 return if defined $csuite;
1553 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1554 $csuite = archive_query('canonicalise_suite');
1555 if ($isuite ne $csuite) {
1556 progress "canonical suite name for $isuite is $csuite";
1560 sub get_archive_dsc () {
1561 canonicalise_suite();
1562 my @vsns = archive_query('archive_query');
1563 foreach my $vinfo (@vsns) {
1564 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1565 $dscurl = $vsn_dscurl;
1566 $dscdata = url_get($dscurl);
1568 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1573 $digester->add($dscdata);
1574 my $got = $digester->hexdigest();
1576 fail "$dscurl has hash $got but".
1577 " archive told us to expect $digest";
1580 my $fmt = getfield $dsc, 'Format';
1581 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1582 "unsupported source format $fmt, sorry";
1584 $dsc_checked = !!$digester;
1585 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1589 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1592 sub check_for_git ();
1593 sub check_for_git () {
1595 my $how = access_cfg('git-check');
1596 if ($how eq 'ssh-cmd') {
1598 (access_cfg_ssh, access_gituserhost(),
1599 access_runeinfo("git-check $package").
1600 " set -e; cd ".access_cfg('git-path').";".
1601 " if test -d $package.git; then echo 1; else echo 0; fi");
1602 my $r= cmdoutput @cmd;
1603 if (defined $r and $r =~ m/^divert (\w+)$/) {
1605 my ($usedistro,) = access_distros();
1606 # NB that if we are pushing, $usedistro will be $distro/push
1607 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1608 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1609 progress "diverting to $divert (using config for $instead_distro)";
1610 return check_for_git();
1612 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1614 } elsif ($how eq 'url') {
1615 my $prefix = access_cfg('git-check-url','git-url');
1616 my $suffix = access_cfg('git-check-suffix','git-suffix',
1617 'RETURN-UNDEF') // '.git';
1618 my $url = "$prefix/$package$suffix";
1619 my @cmd = (@curl, qw(-sS -I), $url);
1620 my $result = cmdoutput @cmd;
1621 $result =~ s/^\S+ 200 .*\n\r?\n//;
1622 # curl -sS -I with https_proxy prints
1623 # HTTP/1.0 200 Connection established
1624 $result =~ m/^\S+ (404|200) /s or
1625 fail "unexpected results from git check query - ".
1626 Dumper($prefix, $result);
1628 if ($code eq '404') {
1630 } elsif ($code eq '200') {
1635 } elsif ($how eq 'true') {
1637 } elsif ($how eq 'false') {
1640 badcfg "unknown git-check \`$how'";
1644 sub create_remote_git_repo () {
1645 my $how = access_cfg('git-create');
1646 if ($how eq 'ssh-cmd') {
1648 (access_cfg_ssh, access_gituserhost(),
1649 access_runeinfo("git-create $package").
1650 "set -e; cd ".access_cfg('git-path').";".
1651 " cp -a _template $package.git");
1652 } elsif ($how eq 'true') {
1655 badcfg "unknown git-create \`$how'";
1659 our ($dsc_hash,$lastpush_mergeinput);
1661 our $ud = '.git/dgit/unpack';
1671 sub mktree_in_ud_here () {
1672 runcmd qw(git init -q);
1673 runcmd qw(git config gc.auto 0);
1674 rmtree('.git/objects');
1675 symlink '../../../../objects','.git/objects' or die $!;
1678 sub git_write_tree () {
1679 my $tree = cmdoutput @git, qw(write-tree);
1680 $tree =~ m/^\w+$/ or die "$tree ?";
1684 sub remove_stray_gits () {
1685 my @gitscmd = qw(find -name .git -prune -print0);
1686 debugcmd "|",@gitscmd;
1687 open GITS, "-|", @gitscmd or die $!;
1692 print STDERR "$us: warning: removing from source package: ",
1693 (messagequote $_), "\n";
1697 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1700 sub mktree_in_ud_from_only_subdir (;$) {
1703 # changes into the subdir
1705 die "expected one subdir but found @dirs ?" unless @dirs==1;
1706 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1710 remove_stray_gits();
1711 mktree_in_ud_here();
1713 my ($format, $fopts) = get_source_format();
1714 if (madformat($format)) {
1719 runcmd @git, qw(add -Af);
1720 my $tree=git_write_tree();
1721 return ($tree,$dir);
1724 our @files_csum_info_fields =
1725 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1726 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1727 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1729 sub dsc_files_info () {
1730 foreach my $csumi (@files_csum_info_fields) {
1731 my ($fname, $module, $method) = @$csumi;
1732 my $field = $dsc->{$fname};
1733 next unless defined $field;
1734 eval "use $module; 1;" or die $@;
1736 foreach (split /\n/, $field) {
1738 m/^(\w+) (\d+) (\S+)$/ or
1739 fail "could not parse .dsc $fname line \`$_'";
1740 my $digester = eval "$module"."->$method;" or die $@;
1745 Digester => $digester,
1750 fail "missing any supported Checksums-* or Files field in ".
1751 $dsc->get_option('name');
1755 map { $_->{Filename} } dsc_files_info();
1758 sub files_compare_inputs (@) {
1763 my $showinputs = sub {
1764 return join "; ", map { $_->get_option('name') } @$inputs;
1767 foreach my $in (@$inputs) {
1769 my $in_name = $in->get_option('name');
1771 printdebug "files_compare_inputs $in_name\n";
1773 foreach my $csumi (@files_csum_info_fields) {
1774 my ($fname) = @$csumi;
1775 printdebug "files_compare_inputs $in_name $fname\n";
1777 my $field = $in->{$fname};
1778 next unless defined $field;
1781 foreach (split /\n/, $field) {
1784 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1785 fail "could not parse $in_name $fname line \`$_'";
1787 printdebug "files_compare_inputs $in_name $fname $f\n";
1791 my $re = \ $record{$f}{$fname};
1793 $fchecked{$f}{$in_name} = 1;
1795 fail "hash or size of $f varies in $fname fields".
1796 " (between: ".$showinputs->().")";
1801 @files = sort @files;
1802 $expected_files //= \@files;
1803 "@$expected_files" eq "@files" or
1804 fail "file list in $in_name varies between hash fields!";
1807 fail "$in_name has no files list field(s)";
1809 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1812 grep { keys %$_ == @$inputs-1 } values %fchecked
1813 or fail "no file appears in all file lists".
1814 " (looked in: ".$showinputs->().")";
1817 sub is_orig_file_in_dsc ($$) {
1818 my ($f, $dsc_files_info) = @_;
1819 return 0 if @$dsc_files_info <= 1;
1820 # One file means no origs, and the filename doesn't have a "what
1821 # part of dsc" component. (Consider versions ending `.orig'.)
1822 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1826 sub is_orig_file_of_vsn ($$) {
1827 my ($f, $upstreamvsn) = @_;
1828 my $base = srcfn $upstreamvsn, '';
1829 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1833 sub changes_update_origs_from_dsc ($$$$) {
1834 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1836 printdebug "checking origs needed ($upstreamvsn)...\n";
1837 $_ = getfield $changes, 'Files';
1838 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1839 fail "cannot find section/priority from .changes Files field";
1840 my $placementinfo = $1;
1842 printdebug "checking origs needed placement '$placementinfo'...\n";
1843 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1844 $l =~ m/\S+$/ or next;
1846 printdebug "origs $file | $l\n";
1847 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1848 printdebug "origs $file is_orig\n";
1849 my $have = archive_query('file_in_archive', $file);
1850 if (!defined $have) {
1852 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1858 printdebug "origs $file \$#\$have=$#$have\n";
1859 foreach my $h (@$have) {
1862 foreach my $csumi (@files_csum_info_fields) {
1863 my ($fname, $module, $method, $archivefield) = @$csumi;
1864 next unless defined $h->{$archivefield};
1865 $_ = $dsc->{$fname};
1866 next unless defined;
1867 m/^(\w+) .* \Q$file\E$/m or
1868 fail ".dsc $fname missing entry for $file";
1869 if ($h->{$archivefield} eq $1) {
1873 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1876 die "$file ".Dumper($h)." ?!" if $same && @differ;
1879 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1882 print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
1883 if (@found_differ && !$found_same) {
1885 "archive contains $file with different checksum",
1888 # Now we edit the changes file to add or remove it
1889 foreach my $csumi (@files_csum_info_fields) {
1890 my ($fname, $module, $method, $archivefield) = @$csumi;
1891 next unless defined $changes->{$fname};
1893 # in archive, delete from .changes if it's there
1894 $changed{$file} = "removed" if
1895 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1896 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1897 # not in archive, but it's here in the .changes
1899 my $dsc_data = getfield $dsc, $fname;
1900 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1902 $extra =~ s/ \d+ /$&$placementinfo /
1903 or die "$fname $extra >$dsc_data< ?"
1904 if $fname eq 'Files';
1905 $changes->{$fname} .= "\n". $extra;
1906 $changed{$file} = "added";
1911 foreach my $file (keys %changed) {
1913 "edited .changes for archive .orig contents: %s %s",
1914 $changed{$file}, $file;
1916 my $chtmp = "$changesfile.tmp";
1917 $changes->save($chtmp);
1919 rename $chtmp,$changesfile or die "$changesfile $!";
1921 progress "[new .changes left in $changesfile]";
1924 progress "$changesfile already has appropriate .orig(s) (if any)";
1928 sub make_commit ($) {
1930 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1933 sub make_commit_text ($) {
1936 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1938 print Dumper($text) if $debuglevel > 1;
1939 my $child = open2($out, $in, @cmd) or die $!;
1942 print $in $text or die $!;
1943 close $in or die $!;
1945 $h =~ m/^\w+$/ or die;
1947 printdebug "=> $h\n";
1950 waitpid $child, 0 == $child or die "$child $!";
1951 $? and failedcmd @cmd;
1955 sub clogp_authline ($) {
1957 my $author = getfield $clogp, 'Maintainer';
1958 $author =~ s#,.*##ms;
1959 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1960 my $authline = "$author $date";
1961 $authline =~ m/$git_authline_re/o or
1962 fail "unexpected commit author line format \`$authline'".
1963 " (was generated from changelog Maintainer field)";
1964 return ($1,$2,$3) if wantarray;
1968 sub vendor_patches_distro ($$) {
1969 my ($checkdistro, $what) = @_;
1970 return unless defined $checkdistro;
1972 my $series = "debian/patches/\L$checkdistro\E.series";
1973 printdebug "checking for vendor-specific $series ($what)\n";
1975 if (!open SERIES, "<", $series) {
1976 die "$series $!" unless $!==ENOENT;
1985 Unfortunately, this source package uses a feature of dpkg-source where
1986 the same source package unpacks to different source code on different
1987 distros. dgit cannot safely operate on such packages on affected
1988 distros, because the meaning of source packages is not stable.
1990 Please ask the distro/maintainer to remove the distro-specific series
1991 files and use a different technique (if necessary, uploading actually
1992 different packages, if different distros are supposed to have
1996 fail "Found active distro-specific series file for".
1997 " $checkdistro ($what): $series, cannot continue";
1999 die "$series $!" if SERIES->error;
2003 sub check_for_vendor_patches () {
2004 # This dpkg-source feature doesn't seem to be documented anywhere!
2005 # But it can be found in the changelog (reformatted):
2007 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2008 # Author: Raphael Hertzog <hertzog@debian.org>
2009 # Date: Sun Oct 3 09:36:48 2010 +0200
2011 # dpkg-source: correctly create .pc/.quilt_series with alternate
2014 # If you have debian/patches/ubuntu.series and you were
2015 # unpacking the source package on ubuntu, quilt was still
2016 # directed to debian/patches/series instead of
2017 # debian/patches/ubuntu.series.
2019 # debian/changelog | 3 +++
2020 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2021 # 2 files changed, 6 insertions(+), 1 deletion(-)
2024 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2025 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2026 "Dpkg::Vendor \`current vendor'");
2027 vendor_patches_distro(access_basedistro(),
2028 "(base) distro being accessed");
2029 vendor_patches_distro(access_nomdistro(),
2030 "(nominal) distro being accessed");
2033 sub generate_commits_from_dsc () {
2034 # See big comment in fetch_from_archive, below.
2035 # See also README.dsc-import.
2039 my @dfi = dsc_files_info();
2040 foreach my $fi (@dfi) {
2041 my $f = $fi->{Filename};
2042 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2044 printdebug "considering linking $f: ";
2046 link_ltarget "../../../../$f", $f
2047 or ((printdebug "($!) "), 0)
2051 printdebug "linked.\n";
2053 complete_file_from_dsc('.', $fi)
2056 if (is_orig_file_in_dsc($f, \@dfi)) {
2057 link $f, "../../../../$f"
2063 # We unpack and record the orig tarballs first, so that we only
2064 # need disk space for one private copy of the unpacked source.
2065 # But we can't make them into commits until we have the metadata
2066 # from the debian/changelog, so we record the tree objects now and
2067 # make them into commits later.
2069 my $upstreamv = upstreamversion $dsc->{version};
2070 my $orig_f_base = srcfn $upstreamv, '';
2072 foreach my $fi (@dfi) {
2073 # We actually import, and record as a commit, every tarball
2074 # (unless there is only one file, in which case there seems
2077 my $f = $fi->{Filename};
2078 printdebug "import considering $f ";
2079 (printdebug "only one dfi\n"), next if @dfi == 1;
2080 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2081 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2085 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2087 printdebug "Y ", (join ' ', map { $_//"(none)" }
2088 $compr_ext, $orig_f_part
2091 my $input = new IO::File $f, '<' or die "$f $!";
2095 if (defined $compr_ext) {
2097 Dpkg::Compression::compression_guess_from_filename $f;
2098 fail "Dpkg::Compression cannot handle file $f in source package"
2099 if defined $compr_ext && !defined $cname;
2101 new Dpkg::Compression::Process compression => $cname;
2102 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2103 my $compr_fh = new IO::Handle;
2104 my $compr_pid = open $compr_fh, "-|" // die $!;
2106 open STDIN, "<&", $input or die $!;
2108 die "dgit (child): exec $compr_cmd[0]: $!\n";
2113 rmtree "../unpack-tar";
2114 mkdir "../unpack-tar" or die $!;
2115 my @tarcmd = qw(tar -x -f -
2116 --no-same-owner --no-same-permissions
2117 --no-acls --no-xattrs --no-selinux);
2118 my $tar_pid = fork // die $!;
2120 chdir "../unpack-tar" or die $!;
2121 open STDIN, "<&", $input or die $!;
2123 die "dgit (child): exec $tarcmd[0]: $!";
2125 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2126 !$? or failedcmd @tarcmd;
2129 (@compr_cmd ? failedcmd @compr_cmd
2131 # finally, we have the results in "tarball", but maybe
2132 # with the wrong permissions
2134 runcmd qw(chmod -R +rwX ../unpack-tar);
2135 changedir "../unpack-tar";
2136 my ($tree) = mktree_in_ud_from_only_subdir(1);
2137 changedir "../../unpack";
2138 rmtree "../unpack-tar";
2140 my $ent = [ $f, $tree ];
2142 Orig => !!$orig_f_part,
2143 Sort => (!$orig_f_part ? 2 :
2144 $orig_f_part =~ m/-/g ? 1 :
2152 # put any without "_" first (spec is not clear whether files
2153 # are always in the usual order). Tarballs without "_" are
2154 # the main orig or the debian tarball.
2155 $a->{Sort} <=> $b->{Sort} or
2159 my $any_orig = grep { $_->{Orig} } @tartrees;
2161 my $dscfn = "$package.dsc";
2163 my $treeimporthow = 'package';
2165 open D, ">", $dscfn or die "$dscfn: $!";
2166 print D $dscdata or die "$dscfn: $!";
2167 close D or die "$dscfn: $!";
2168 my @cmd = qw(dpkg-source);
2169 push @cmd, '--no-check' if $dsc_checked;
2170 if (madformat $dsc->{format}) {
2171 push @cmd, '--skip-patches';
2172 $treeimporthow = 'unpatched';
2174 push @cmd, qw(-x --), $dscfn;
2177 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2178 if (madformat $dsc->{format}) {
2179 check_for_vendor_patches();
2183 if (madformat $dsc->{format}) {
2184 my @pcmd = qw(dpkg-source --before-build .);
2185 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2187 runcmd @git, qw(add -Af);
2188 $dappliedtree = git_write_tree();
2191 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2192 debugcmd "|",@clogcmd;
2193 open CLOGS, "-|", @clogcmd or die $!;
2198 printdebug "import clog search...\n";
2201 my $stanzatext = do { local $/=""; <CLOGS>; };
2202 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2203 last if !defined $stanzatext;
2205 my $desc = "package changelog, entry no.$.";
2206 open my $stanzafh, "<", \$stanzatext or die;
2207 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2208 $clogp //= $thisstanza;
2210 printdebug "import clog $thisstanza->{version} $desc...\n";
2212 last if !$any_orig; # we don't need $r1clogp
2214 # We look for the first (most recent) changelog entry whose
2215 # version number is lower than the upstream version of this
2216 # package. Then the last (least recent) previous changelog
2217 # entry is treated as the one which introduced this upstream
2218 # version and used for the synthetic commits for the upstream
2221 # One might think that a more sophisticated algorithm would be
2222 # necessary. But: we do not want to scan the whole changelog
2223 # file. Stopping when we see an earlier version, which
2224 # necessarily then is an earlier upstream version, is the only
2225 # realistic way to do that. Then, either the earliest
2226 # changelog entry we have seen so far is indeed the earliest
2227 # upload of this upstream version; or there are only changelog
2228 # entries relating to later upstream versions (which is not
2229 # possible unless the changelog and .dsc disagree about the
2230 # version). Then it remains to choose between the physically
2231 # last entry in the file, and the one with the lowest version
2232 # number. If these are not the same, we guess that the
2233 # versions were created in a non-monotic order rather than
2234 # that the changelog entries have been misordered.
2236 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2238 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2239 $r1clogp = $thisstanza;
2241 printdebug "import clog $r1clogp->{version} becomes r1\n";
2243 die $! if CLOGS->error;
2244 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2246 $clogp or fail "package changelog has no entries!";
2248 my $authline = clogp_authline $clogp;
2249 my $changes = getfield $clogp, 'Changes';
2250 my $cversion = getfield $clogp, 'Version';
2253 $r1clogp //= $clogp; # maybe there's only one entry;
2254 my $r1authline = clogp_authline $r1clogp;
2255 # Strictly, r1authline might now be wrong if it's going to be
2256 # unused because !$any_orig. Whatever.
2258 printdebug "import tartrees authline $authline\n";
2259 printdebug "import tartrees r1authline $r1authline\n";
2261 foreach my $tt (@tartrees) {
2262 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2264 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2267 committer $r1authline
2271 [dgit import orig $tt->{F}]
2279 [dgit import tarball $package $cversion $tt->{F}]
2284 printdebug "import main commit\n";
2286 open C, ">../commit.tmp" or die $!;
2287 print C <<END or die $!;
2290 print C <<END or die $! foreach @tartrees;
2293 print C <<END or die $!;
2299 [dgit import $treeimporthow $package $cversion]
2303 my $rawimport_hash = make_commit qw(../commit.tmp);
2305 if (madformat $dsc->{format}) {
2306 printdebug "import apply patches...\n";
2308 # regularise the state of the working tree so that
2309 # the checkout of $rawimport_hash works nicely.
2310 my $dappliedcommit = make_commit_text(<<END);
2317 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2319 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2321 # We need the answers to be reproducible
2322 my @authline = clogp_authline($clogp);
2323 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2324 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2325 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2326 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2327 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2328 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2330 my $path = $ENV{PATH} or die;
2332 foreach my $use_absurd (qw(0 1)) {
2333 local $ENV{PATH} = $path;
2336 progress "warning: $@";
2337 $path = "$absurdity:$path";
2338 progress "$us: trying slow absurd-git-apply...";
2339 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2344 die "forbid absurd git-apply\n" if $use_absurd
2345 && forceing [qw(import-gitapply-no-absurd)];
2346 die "only absurd git-apply!\n" if !$use_absurd
2347 && forceing [qw(import-gitapply-absurd)];
2349 local $ENV{PATH} = $path if $use_absurd;
2351 my @showcmd = (gbp_pq, qw(import));
2352 my @realcmd = shell_cmd
2353 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2354 debugcmd "+",@realcmd;
2355 if (system @realcmd) {
2356 die +(shellquote @showcmd).
2358 failedcmd_waitstatus()."\n";
2361 my $gapplied = git_rev_parse('HEAD');
2362 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2363 $gappliedtree eq $dappliedtree or
2365 gbp-pq import and dpkg-source disagree!
2366 gbp-pq import gave commit $gapplied
2367 gbp-pq import gave tree $gappliedtree
2368 dpkg-source --before-build gave tree $dappliedtree
2370 $rawimport_hash = $gapplied;
2375 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2380 progress "synthesised git commit from .dsc $cversion";
2382 my $rawimport_mergeinput = {
2383 Commit => $rawimport_hash,
2384 Info => "Import of source package",
2386 my @output = ($rawimport_mergeinput);
2388 if ($lastpush_mergeinput) {
2389 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2390 my $oversion = getfield $oldclogp, 'Version';
2392 version_compare($oversion, $cversion);
2394 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2395 { Message => <<END, ReverseParents => 1 });
2396 Record $package ($cversion) in archive suite $csuite
2398 } elsif ($vcmp > 0) {
2399 print STDERR <<END or die $!;
2401 Version actually in archive: $cversion (older)
2402 Last version pushed with dgit: $oversion (newer or same)
2405 @output = $lastpush_mergeinput;
2407 # Same version. Use what's in the server git branch,
2408 # discarding our own import. (This could happen if the
2409 # server automatically imports all packages into git.)
2410 @output = $lastpush_mergeinput;
2413 changedir '../../../..';
2418 sub complete_file_from_dsc ($$) {
2419 our ($dstdir, $fi) = @_;
2420 # Ensures that we have, in $dir, the file $fi, with the correct
2421 # contents. (Downloading it from alongside $dscurl if necessary.)
2423 my $f = $fi->{Filename};
2424 my $tf = "$dstdir/$f";
2427 if (stat_exists $tf) {
2428 progress "using existing $f";
2430 printdebug "$tf does not exist, need to fetch\n";
2432 $furl =~ s{/[^/]+$}{};
2434 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2435 die "$f ?" if $f =~ m#/#;
2436 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2437 return 0 if !act_local();
2441 open F, "<", "$tf" or die "$tf: $!";
2442 $fi->{Digester}->reset();
2443 $fi->{Digester}->addfile(*F);
2444 F->error and die $!;
2445 my $got = $fi->{Digester}->hexdigest();
2446 $got eq $fi->{Hash} or
2447 fail "file $f has hash $got but .dsc".
2448 " demands hash $fi->{Hash} ".
2449 ($downloaded ? "(got wrong file from archive!)"
2450 : "(perhaps you should delete this file?)");
2455 sub ensure_we_have_orig () {
2456 my @dfi = dsc_files_info();
2457 foreach my $fi (@dfi) {
2458 my $f = $fi->{Filename};
2459 next unless is_orig_file_in_dsc($f, \@dfi);
2460 complete_file_from_dsc('..', $fi)
2465 sub git_fetch_us () {
2466 # Want to fetch only what we are going to use, unless
2467 # deliberately-not-ff, in which case we must fetch everything.
2469 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2471 (quiltmode_splitbrain
2472 ? (map { $_->('*',access_nomdistro) }
2473 \&debiantag_new, \&debiantag_maintview)
2474 : debiantags('*',access_nomdistro));
2475 push @specs, server_branch($csuite);
2476 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2478 # This is rather miserable:
2479 # When git fetch --prune is passed a fetchspec ending with a *,
2480 # it does a plausible thing. If there is no * then:
2481 # - it matches subpaths too, even if the supplied refspec
2482 # starts refs, and behaves completely madly if the source
2483 # has refs/refs/something. (See, for example, Debian #NNNN.)
2484 # - if there is no matching remote ref, it bombs out the whole
2486 # We want to fetch a fixed ref, and we don't know in advance
2487 # if it exists, so this is not suitable.
2489 # Our workaround is to use git ls-remote. git ls-remote has its
2490 # own qairks. Notably, it has the absurd multi-tail-matching
2491 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2492 # refs/refs/foo etc.
2494 # Also, we want an idempotent snapshot, but we have to make two
2495 # calls to the remote: one to git ls-remote and to git fetch. The
2496 # solution is use git ls-remote to obtain a target state, and
2497 # git fetch to try to generate it. If we don't manage to generate
2498 # the target state, we try again.
2500 printdebug "git_fetch_us specs @specs\n";
2502 my $specre = join '|', map {
2508 printdebug "git_fetch_us specre=$specre\n";
2509 my $wanted_rref = sub {
2511 return m/^(?:$specre)$/o;
2514 my $fetch_iteration = 0;
2517 printdebug "git_fetch_us iteration $fetch_iteration\n";
2518 if (++$fetch_iteration > 10) {
2519 fail "too many iterations trying to get sane fetch!";
2522 my @look = map { "refs/$_" } @specs;
2523 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2527 open GITLS, "-|", @lcmd or die $!;
2529 printdebug "=> ", $_;
2530 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2531 my ($objid,$rrefname) = ($1,$2);
2532 if (!$wanted_rref->($rrefname)) {
2534 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2538 $wantr{$rrefname} = $objid;
2541 close GITLS or failedcmd @lcmd;
2543 # OK, now %want is exactly what we want for refs in @specs
2545 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2546 "+refs/$_:".lrfetchrefs."/$_";
2549 printdebug "git_fetch_us fspecs @fspecs\n";
2551 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2552 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2555 %lrfetchrefs_f = ();
2558 git_for_each_ref(lrfetchrefs, sub {
2559 my ($objid,$objtype,$lrefname,$reftail) = @_;
2560 $lrfetchrefs_f{$lrefname} = $objid;
2561 $objgot{$objid} = 1;
2564 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2565 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2566 if (!exists $wantr{$rrefname}) {
2567 if ($wanted_rref->($rrefname)) {
2569 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2573 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2576 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2577 delete $lrfetchrefs_f{$lrefname};
2581 foreach my $rrefname (sort keys %wantr) {
2582 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2583 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2584 my $want = $wantr{$rrefname};
2585 next if $got eq $want;
2586 if (!defined $objgot{$want}) {
2588 warning: git ls-remote suggests we want $lrefname
2589 warning: and it should refer to $want
2590 warning: but git fetch didn't fetch that object to any relevant ref.
2591 warning: This may be due to a race with someone updating the server.
2592 warning: Will try again...
2594 next FETCH_ITERATION;
2597 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2599 runcmd_ordryrun_local @git, qw(update-ref -m),
2600 "dgit fetch git fetch fixup", $lrefname, $want;
2601 $lrfetchrefs_f{$lrefname} = $want;
2605 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2606 Dumper(\%lrfetchrefs_f);
2609 my @tagpats = debiantags('*',access_nomdistro);
2611 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2612 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2613 printdebug "currently $fullrefname=$objid\n";
2614 $here{$fullrefname} = $objid;
2616 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2617 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2618 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2619 printdebug "offered $lref=$objid\n";
2620 if (!defined $here{$lref}) {
2621 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2622 runcmd_ordryrun_local @upd;
2623 lrfetchref_used $fullrefname;
2624 } elsif ($here{$lref} eq $objid) {
2625 lrfetchref_used $fullrefname;
2628 "Not updateting $lref from $here{$lref} to $objid.\n";
2633 sub mergeinfo_getclogp ($) {
2634 # Ensures thit $mi->{Clogp} exists and returns it
2636 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2639 sub mergeinfo_version ($) {
2640 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2643 sub fetch_from_archive () {
2644 ensure_setup_existing_tree();
2646 # Ensures that lrref() is what is actually in the archive, one way
2647 # or another, according to us - ie this client's
2648 # appropritaely-updated archive view. Also returns the commit id.
2649 # If there is nothing in the archive, leaves lrref alone and
2650 # returns undef. git_fetch_us must have already been called.
2654 foreach my $field (@ourdscfield) {
2655 $dsc_hash = $dsc->{$field};
2656 last if defined $dsc_hash;
2658 if (defined $dsc_hash) {
2659 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2661 progress "last upload to archive specified git hash";
2663 progress "last upload to archive has NO git hash";
2666 progress "no version available from the archive";
2669 # If the archive's .dsc has a Dgit field, there are three
2670 # relevant git commitids we need to choose between and/or merge
2672 # 1. $dsc_hash: the Dgit field from the archive
2673 # 2. $lastpush_hash: the suite branch on the dgit git server
2674 # 3. $lastfetch_hash: our local tracking brach for the suite
2676 # These may all be distinct and need not be in any fast forward
2679 # If the dsc was pushed to this suite, then the server suite
2680 # branch will have been updated; but it might have been pushed to
2681 # a different suite and copied by the archive. Conversely a more
2682 # recent version may have been pushed with dgit but not appeared
2683 # in the archive (yet).
2685 # $lastfetch_hash may be awkward because archive imports
2686 # (particularly, imports of Dgit-less .dscs) are performed only as
2687 # needed on individual clients, so different clients may perform a
2688 # different subset of them - and these imports are only made
2689 # public during push. So $lastfetch_hash may represent a set of
2690 # imports different to a subsequent upload by a different dgit
2693 # Our approach is as follows:
2695 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2696 # descendant of $dsc_hash, then it was pushed by a dgit user who
2697 # had based their work on $dsc_hash, so we should prefer it.
2698 # Otherwise, $dsc_hash was installed into this suite in the
2699 # archive other than by a dgit push, and (necessarily) after the
2700 # last dgit push into that suite (since a dgit push would have
2701 # been descended from the dgit server git branch); thus, in that
2702 # case, we prefer the archive's version (and produce a
2703 # pseudo-merge to overwrite the dgit server git branch).
2705 # (If there is no Dgit field in the archive's .dsc then
2706 # generate_commit_from_dsc uses the version numbers to decide
2707 # whether the suite branch or the archive is newer. If the suite
2708 # branch is newer it ignores the archive's .dsc; otherwise it
2709 # generates an import of the .dsc, and produces a pseudo-merge to
2710 # overwrite the suite branch with the archive contents.)
2712 # The outcome of that part of the algorithm is the `public view',
2713 # and is same for all dgit clients: it does not depend on any
2714 # unpublished history in the local tracking branch.
2716 # As between the public view and the local tracking branch: The
2717 # local tracking branch is only updated by dgit fetch, and
2718 # whenever dgit fetch runs it includes the public view in the
2719 # local tracking branch. Therefore if the public view is not
2720 # descended from the local tracking branch, the local tracking
2721 # branch must contain history which was imported from the archive
2722 # but never pushed; and, its tip is now out of date. So, we make
2723 # a pseudo-merge to overwrite the old imports and stitch the old
2726 # Finally: we do not necessarily reify the public view (as
2727 # described above). This is so that we do not end up stacking two
2728 # pseudo-merges. So what we actually do is figure out the inputs
2729 # to any public view pseudo-merge and put them in @mergeinputs.
2732 # $mergeinputs[]{Commit}
2733 # $mergeinputs[]{Info}
2734 # $mergeinputs[0] is the one whose tree we use
2735 # @mergeinputs is in the order we use in the actual commit)
2738 # $mergeinputs[]{Message} is a commit message to use
2739 # $mergeinputs[]{ReverseParents} if def specifies that parent
2740 # list should be in opposite order
2741 # Such an entry has no Commit or Info. It applies only when found
2742 # in the last entry. (This ugliness is to support making
2743 # identical imports to previous dgit versions.)
2745 my $lastpush_hash = git_get_ref(lrfetchref());
2746 printdebug "previous reference hash=$lastpush_hash\n";
2747 $lastpush_mergeinput = $lastpush_hash && {
2748 Commit => $lastpush_hash,
2749 Info => "dgit suite branch on dgit git server",
2752 my $lastfetch_hash = git_get_ref(lrref());
2753 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2754 my $lastfetch_mergeinput = $lastfetch_hash && {
2755 Commit => $lastfetch_hash,
2756 Info => "dgit client's archive history view",
2759 my $dsc_mergeinput = $dsc_hash && {
2760 Commit => $dsc_hash,
2761 Info => "Dgit field in .dsc from archive",
2765 my $del_lrfetchrefs = sub {
2768 printdebug "del_lrfetchrefs...\n";
2769 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2770 my $objid = $lrfetchrefs_d{$fullrefname};
2771 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2773 $gur ||= new IO::Handle;
2774 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2776 printf $gur "delete %s %s\n", $fullrefname, $objid;
2779 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2783 if (defined $dsc_hash) {
2784 ensure_we_have_orig();
2785 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2786 @mergeinputs = $dsc_mergeinput
2787 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2788 print STDERR <<END or die $!;
2790 Git commit in archive is behind the last version allegedly pushed/uploaded.
2791 Commit referred to by archive: $dsc_hash
2792 Last version pushed with dgit: $lastpush_hash
2795 @mergeinputs = ($lastpush_mergeinput);
2797 # Archive has .dsc which is not a descendant of the last dgit
2798 # push. This can happen if the archive moves .dscs about.
2799 # Just follow its lead.
2800 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2801 progress "archive .dsc names newer git commit";
2802 @mergeinputs = ($dsc_mergeinput);
2804 progress "archive .dsc names other git commit, fixing up";
2805 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2809 @mergeinputs = generate_commits_from_dsc();
2810 # We have just done an import. Now, our import algorithm might
2811 # have been improved. But even so we do not want to generate
2812 # a new different import of the same package. So if the
2813 # version numbers are the same, just use our existing version.
2814 # If the version numbers are different, the archive has changed
2815 # (perhaps, rewound).
2816 if ($lastfetch_mergeinput &&
2817 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2818 (mergeinfo_version $mergeinputs[0]) )) {
2819 @mergeinputs = ($lastfetch_mergeinput);
2821 } elsif ($lastpush_hash) {
2822 # only in git, not in the archive yet
2823 @mergeinputs = ($lastpush_mergeinput);
2824 print STDERR <<END or die $!;
2826 Package not found in the archive, but has allegedly been pushed using dgit.
2830 printdebug "nothing found!\n";
2831 if (defined $skew_warning_vsn) {
2832 print STDERR <<END or die $!;
2834 Warning: relevant archive skew detected.
2835 Archive allegedly contains $skew_warning_vsn
2836 But we were not able to obtain any version from the archive or git.
2840 unshift @end, $del_lrfetchrefs;
2844 if ($lastfetch_hash &&
2846 my $h = $_->{Commit};
2847 $h and is_fast_fwd($lastfetch_hash, $h);
2848 # If true, one of the existing parents of this commit
2849 # is a descendant of the $lastfetch_hash, so we'll
2850 # be ff from that automatically.
2854 push @mergeinputs, $lastfetch_mergeinput;
2857 printdebug "fetch mergeinfos:\n";
2858 foreach my $mi (@mergeinputs) {
2860 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2862 printdebug sprintf " ReverseParents=%d Message=%s",
2863 $mi->{ReverseParents}, $mi->{Message};
2867 my $compat_info= pop @mergeinputs
2868 if $mergeinputs[$#mergeinputs]{Message};
2870 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2873 if (@mergeinputs > 1) {
2875 my $tree_commit = $mergeinputs[0]{Commit};
2877 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2878 $tree =~ m/\n\n/; $tree = $`;
2879 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2882 # We use the changelog author of the package in question the
2883 # author of this pseudo-merge. This is (roughly) correct if
2884 # this commit is simply representing aa non-dgit upload.
2885 # (Roughly because it does not record sponsorship - but we
2886 # don't have sponsorship info because that's in the .changes,
2887 # which isn't in the archivw.)
2889 # But, it might be that we are representing archive history
2890 # updates (including in-archive copies). These are not really
2891 # the responsibility of the person who created the .dsc, but
2892 # there is no-one whose name we should better use. (The
2893 # author of the .dsc-named commit is clearly worse.)
2895 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2896 my $author = clogp_authline $useclogp;
2897 my $cversion = getfield $useclogp, 'Version';
2899 my $mcf = ".git/dgit/mergecommit";
2900 open MC, ">", $mcf or die "$mcf $!";
2901 print MC <<END or die $!;
2905 my @parents = grep { $_->{Commit} } @mergeinputs;
2906 @parents = reverse @parents if $compat_info->{ReverseParents};
2907 print MC <<END or die $! foreach @parents;
2911 print MC <<END or die $!;
2917 if (defined $compat_info->{Message}) {
2918 print MC $compat_info->{Message} or die $!;
2920 print MC <<END or die $!;
2921 Record $package ($cversion) in archive suite $csuite
2925 my $message_add_info = sub {
2927 my $mversion = mergeinfo_version $mi;
2928 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2932 $message_add_info->($mergeinputs[0]);
2933 print MC <<END or die $!;
2934 should be treated as descended from
2936 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2940 $hash = make_commit $mcf;
2942 $hash = $mergeinputs[0]{Commit};
2944 printdebug "fetch hash=$hash\n";
2947 my ($lasth, $what) = @_;
2948 return unless $lasth;
2949 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2952 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2954 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2956 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2957 'DGIT_ARCHIVE', $hash;
2958 cmdoutput @git, qw(log -n2), $hash;
2959 # ... gives git a chance to complain if our commit is malformed
2961 if (defined $skew_warning_vsn) {
2963 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2964 my $gotclogp = commit_getclogp($hash);
2965 my $got_vsn = getfield $gotclogp, 'Version';
2966 printdebug "SKEW CHECK GOT $got_vsn\n";
2967 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2968 print STDERR <<END or die $!;
2970 Warning: archive skew detected. Using the available version:
2971 Archive allegedly contains $skew_warning_vsn
2972 We were able to obtain only $got_vsn
2978 if ($lastfetch_hash ne $hash) {
2979 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2983 dryrun_report @upd_cmd;
2987 lrfetchref_used lrfetchref();
2989 unshift @end, $del_lrfetchrefs;
2993 sub set_local_git_config ($$) {
2995 runcmd @git, qw(config), $k, $v;
2998 sub setup_mergechangelogs (;$) {
3000 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3002 my $driver = 'dpkg-mergechangelogs';
3003 my $cb = "merge.$driver";
3004 my $attrs = '.git/info/attributes';
3005 ensuredir '.git/info';
3007 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3008 if (!open ATTRS, "<", $attrs) {
3009 $!==ENOENT or die "$attrs: $!";
3013 next if m{^debian/changelog\s};
3014 print NATTRS $_, "\n" or die $!;
3016 ATTRS->error and die $!;
3019 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3022 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3023 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3025 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3028 sub setup_useremail (;$) {
3030 return unless $always || access_cfg_bool(1, 'setup-useremail');
3033 my ($k, $envvar) = @_;
3034 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3035 return unless defined $v;
3036 set_local_git_config "user.$k", $v;
3039 $setup->('email', 'DEBEMAIL');
3040 $setup->('name', 'DEBFULLNAME');
3043 sub ensure_setup_existing_tree () {
3044 my $k = "remote.$remotename.skipdefaultupdate";
3045 my $c = git_get_config $k;
3046 return if defined $c;
3047 set_local_git_config $k, 'true';
3050 sub setup_new_tree () {
3051 setup_mergechangelogs();
3057 canonicalise_suite();
3058 badusage "dry run makes no sense with clone" unless act_local();
3059 my $hasgit = check_for_git();
3060 mkdir $dstdir or fail "create \`$dstdir': $!";
3062 runcmd @git, qw(init -q);
3063 my $giturl = access_giturl(1);
3064 if (defined $giturl) {
3065 open H, "> .git/HEAD" or die $!;
3066 print H "ref: ".lref()."\n" or die $!;
3068 runcmd @git, qw(remote add), 'origin', $giturl;
3071 progress "fetching existing git history";
3073 runcmd_ordryrun_local @git, qw(fetch origin);
3075 progress "starting new git history";
3077 fetch_from_archive() or no_such_package;
3078 my $vcsgiturl = $dsc->{'Vcs-Git'};
3079 if (length $vcsgiturl) {
3080 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3081 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3084 runcmd @git, qw(reset --hard), lrref();
3085 runcmd qw(bash -ec), <<'END';
3087 git ls-tree -r --name-only -z HEAD | \
3088 xargs -0r touch -r . --
3090 printdone "ready for work in $dstdir";
3094 if (check_for_git()) {
3097 fetch_from_archive() or no_such_package();
3098 printdone "fetched into ".lrref();
3103 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3105 printdone "fetched to ".lrref()." and merged into HEAD";
3108 sub check_not_dirty () {
3109 foreach my $f (qw(local-options local-patch-header)) {
3110 if (stat_exists "debian/source/$f") {
3111 fail "git tree contains debian/source/$f";
3115 return if $ignoredirty;
3117 my @cmd = (@git, qw(diff --quiet HEAD));
3119 $!=0; $?=-1; system @cmd;
3122 fail "working tree is dirty (does not match HEAD)";
3128 sub commit_admin ($) {
3131 runcmd_ordryrun_local @git, qw(commit -m), $m;
3134 sub commit_quilty_patch () {
3135 my $output = cmdoutput @git, qw(status --porcelain);
3137 foreach my $l (split /\n/, $output) {
3138 next unless $l =~ m/\S/;
3139 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3143 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3145 progress "nothing quilty to commit, ok.";
3148 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3149 runcmd_ordryrun_local @git, qw(add -f), @adds;
3151 Commit Debian 3.0 (quilt) metadata
3153 [dgit ($our_version) quilt-fixup]
3157 sub get_source_format () {
3159 if (open F, "debian/source/options") {
3163 s/\s+$//; # ignore missing final newline
3165 my ($k, $v) = ($`, $'); #');
3166 $v =~ s/^"(.*)"$/$1/;
3172 F->error and die $!;
3175 die $! unless $!==&ENOENT;
3178 if (!open F, "debian/source/format") {
3179 die $! unless $!==&ENOENT;
3183 F->error and die $!;
3185 return ($_, \%options);
3188 sub madformat_wantfixup ($) {
3190 return 0 unless $format eq '3.0 (quilt)';
3191 our $quilt_mode_warned;
3192 if ($quilt_mode eq 'nocheck') {
3193 progress "Not doing any fixup of \`$format' due to".
3194 " ----no-quilt-fixup or --quilt=nocheck"
3195 unless $quilt_mode_warned++;
3198 progress "Format \`$format', need to check/update patch stack"
3199 unless $quilt_mode_warned++;
3203 sub maybe_split_brain_save ($$$) {
3204 my ($headref, $dgitview, $msg) = @_;
3205 # => message fragment "$saved" describing disposition of $dgitview
3206 return "commit id $dgitview" unless defined $split_brain_save;
3207 my @cmd = (shell_cmd "cd ../../../..",
3208 @git, qw(update-ref -m),
3209 "dgit --dgit-view-save $msg HEAD=$headref",
3210 $split_brain_save, $dgitview);
3212 return "and left in $split_brain_save";
3215 # An "infopair" is a tuple [ $thing, $what ]
3216 # (often $thing is a commit hash; $what is a description)
3218 sub infopair_cond_equal ($$) {
3220 $x->[0] eq $y->[0] or fail <<END;
3221 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3225 sub infopair_lrf_tag_lookup ($$) {
3226 my ($tagnames, $what) = @_;
3227 # $tagname may be an array ref
3228 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3229 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3230 foreach my $tagname (@tagnames) {
3231 my $lrefname = lrfetchrefs."/tags/$tagname";
3232 my $tagobj = $lrfetchrefs_f{$lrefname};
3233 next unless defined $tagobj;
3234 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3235 return [ git_rev_parse($tagobj), $what ];
3237 fail @tagnames==1 ? <<END : <<END;
3238 Wanted tag $what (@tagnames) on dgit server, but not found
3240 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3244 sub infopair_cond_ff ($$) {
3245 my ($anc,$desc) = @_;
3246 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3247 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3251 sub pseudomerge_version_check ($$) {
3252 my ($clogp, $archive_hash) = @_;
3254 my $arch_clogp = commit_getclogp $archive_hash;
3255 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3256 'version currently in archive' ];
3257 if (defined $overwrite_version) {
3258 if (length $overwrite_version) {
3259 infopair_cond_equal([ $overwrite_version,
3260 '--overwrite= version' ],
3263 my $v = $i_arch_v->[0];
3264 progress "Checking package changelog for archive version $v ...";
3266 my @xa = ("-f$v", "-t$v");
3267 my $vclogp = parsechangelog @xa;
3268 my $cv = [ (getfield $vclogp, 'Version'),
3269 "Version field from dpkg-parsechangelog @xa" ];
3270 infopair_cond_equal($i_arch_v, $cv);
3273 $@ =~ s/^dgit: //gm;
3275 "Perhaps debian/changelog does not mention $v ?";
3280 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3284 sub pseudomerge_make_commit ($$$$ $$) {
3285 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3286 $msg_cmd, $msg_msg) = @_;
3287 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3289 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3290 my $authline = clogp_authline $clogp;
3294 !defined $overwrite_version ? ""
3295 : !length $overwrite_version ? " --overwrite"
3296 : " --overwrite=".$overwrite_version;
3299 my $pmf = ".git/dgit/pseudomerge";
3300 open MC, ">", $pmf or die "$pmf $!";
3301 print MC <<END or die $!;
3304 parent $archive_hash
3314 return make_commit($pmf);
3317 sub splitbrain_pseudomerge ($$$$) {
3318 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3319 # => $merged_dgitview
3320 printdebug "splitbrain_pseudomerge...\n";
3322 # We: debian/PREVIOUS HEAD($maintview)
3323 # expect: o ----------------- o
3326 # a/d/PREVIOUS $dgitview
3329 # we do: `------------------ o
3333 return $dgitview unless defined $archive_hash;
3335 printdebug "splitbrain_pseudomerge...\n";
3337 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3339 if (!defined $overwrite_version) {
3340 progress "Checking that HEAD inciudes all changes in archive...";
3343 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3345 if (defined $overwrite_version) {
3347 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3348 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3349 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3350 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3351 my $i_archive = [ $archive_hash, "current archive contents" ];
3353 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3355 infopair_cond_equal($i_dgit, $i_archive);
3356 infopair_cond_ff($i_dep14, $i_dgit);
3357 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3361 $us: check failed (maybe --overwrite is needed, consult documentation)
3366 my $r = pseudomerge_make_commit
3367 $clogp, $dgitview, $archive_hash, $i_arch_v,
3368 "dgit --quilt=$quilt_mode",
3369 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3370 Declare fast forward from $i_arch_v->[0]
3372 Make fast forward from $i_arch_v->[0]
3375 maybe_split_brain_save $maintview, $r, "pseudomerge";
3377 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3381 sub plain_overwrite_pseudomerge ($$$) {
3382 my ($clogp, $head, $archive_hash) = @_;
3384 printdebug "plain_overwrite_pseudomerge...";
3386 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3388 return $head if is_fast_fwd $archive_hash, $head;
3390 my $m = "Declare fast forward from $i_arch_v->[0]";
3392 my $r = pseudomerge_make_commit
3393 $clogp, $head, $archive_hash, $i_arch_v,
3396 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3398 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3402 sub push_parse_changelog ($) {
3405 my $clogp = Dpkg::Control::Hash->new();
3406 $clogp->load($clogpfn) or die;
3408 my $clogpackage = getfield $clogp, 'Source';
3409 $package //= $clogpackage;
3410 fail "-p specified $package but changelog specified $clogpackage"
3411 unless $package eq $clogpackage;
3412 my $cversion = getfield $clogp, 'Version';
3413 my $tag = debiantag($cversion, access_nomdistro);
3414 runcmd @git, qw(check-ref-format), $tag;
3416 my $dscfn = dscfn($cversion);
3418 return ($clogp, $cversion, $dscfn);
3421 sub push_parse_dsc ($$$) {
3422 my ($dscfn,$dscfnwhat, $cversion) = @_;
3423 $dsc = parsecontrol($dscfn,$dscfnwhat);
3424 my $dversion = getfield $dsc, 'Version';
3425 my $dscpackage = getfield $dsc, 'Source';
3426 ($dscpackage eq $package && $dversion eq $cversion) or
3427 fail "$dscfn is for $dscpackage $dversion".
3428 " but debian/changelog is for $package $cversion";
3431 sub push_tagwants ($$$$) {
3432 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3435 TagFn => \&debiantag,
3440 if (defined $maintviewhead) {
3442 TagFn => \&debiantag_maintview,
3443 Objid => $maintviewhead,
3444 TfSuffix => '-maintview',
3448 foreach my $tw (@tagwants) {
3449 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3450 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3452 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3456 sub push_mktags ($$ $$ $) {
3458 $changesfile,$changesfilewhat,
3461 die unless $tagwants->[0]{View} eq 'dgit';
3463 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3464 $dsc->save("$dscfn.tmp") or die $!;
3466 my $changes = parsecontrol($changesfile,$changesfilewhat);
3467 foreach my $field (qw(Source Distribution Version)) {
3468 $changes->{$field} eq $clogp->{$field} or
3469 fail "changes field $field \`$changes->{$field}'".
3470 " does not match changelog \`$clogp->{$field}'";
3473 my $cversion = getfield $clogp, 'Version';
3474 my $clogsuite = getfield $clogp, 'Distribution';
3476 # We make the git tag by hand because (a) that makes it easier
3477 # to control the "tagger" (b) we can do remote signing
3478 my $authline = clogp_authline $clogp;
3479 my $delibs = join(" ", "",@deliberatelies);
3480 my $declaredistro = access_nomdistro();
3484 my $tfn = $tw->{Tfn};
3485 my $head = $tw->{Objid};
3486 my $tag = $tw->{Tag};
3488 open TO, '>', $tfn->('.tmp') or die $!;
3489 print TO <<END or die $!;
3496 if ($tw->{View} eq 'dgit') {
3497 print TO <<END or die $!;
3498 $package release $cversion for $clogsuite ($csuite) [dgit]
3499 [dgit distro=$declaredistro$delibs]
3501 foreach my $ref (sort keys %previously) {
3502 print TO <<END or die $!;
3503 [dgit previously:$ref=$previously{$ref}]
3506 } elsif ($tw->{View} eq 'maint') {
3507 print TO <<END or die $!;
3508 $package release $cversion for $clogsuite ($csuite)
3509 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3512 die Dumper($tw)."?";
3517 my $tagobjfn = $tfn->('.tmp');
3519 if (!defined $keyid) {
3520 $keyid = access_cfg('keyid','RETURN-UNDEF');
3522 if (!defined $keyid) {
3523 $keyid = getfield $clogp, 'Maintainer';
3525 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3526 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3527 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3528 push @sign_cmd, $tfn->('.tmp');
3529 runcmd_ordryrun @sign_cmd;
3531 $tagobjfn = $tfn->('.signed.tmp');
3532 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3533 $tfn->('.tmp'), $tfn->('.tmp.asc');
3539 my @r = map { $mktag->($_); } @$tagwants;
3543 sub sign_changes ($) {
3544 my ($changesfile) = @_;
3546 my @debsign_cmd = @debsign;
3547 push @debsign_cmd, "-k$keyid" if defined $keyid;
3548 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3549 push @debsign_cmd, $changesfile;
3550 runcmd_ordryrun @debsign_cmd;
3555 printdebug "actually entering push\n";
3557 supplementary_message(<<'END');
3558 Push failed, while checking state of the archive.
3559 You can retry the push, after fixing the problem, if you like.
3561 if (check_for_git()) {
3564 my $archive_hash = fetch_from_archive();
3565 if (!$archive_hash) {
3567 fail "package appears to be new in this suite;".
3568 " if this is intentional, use --new";
3571 supplementary_message(<<'END');
3572 Push failed, while preparing your push.
3573 You can retry the push, after fixing the problem, if you like.
3576 need_tagformat 'new', "quilt mode $quilt_mode"
3577 if quiltmode_splitbrain;
3581 access_giturl(); # check that success is vaguely likely
3584 my $clogpfn = ".git/dgit/changelog.822.tmp";
3585 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3587 responder_send_file('parsed-changelog', $clogpfn);
3589 my ($clogp, $cversion, $dscfn) =
3590 push_parse_changelog("$clogpfn");
3592 my $dscpath = "$buildproductsdir/$dscfn";
3593 stat_exists $dscpath or
3594 fail "looked for .dsc $dscfn, but $!;".
3595 " maybe you forgot to build";
3597 responder_send_file('dsc', $dscpath);
3599 push_parse_dsc($dscpath, $dscfn, $cversion);
3601 my $format = getfield $dsc, 'Format';
3602 printdebug "format $format\n";
3604 my $actualhead = git_rev_parse('HEAD');
3605 my $dgithead = $actualhead;
3606 my $maintviewhead = undef;
3608 my $upstreamversion = upstreamversion $clogp->{Version};
3610 if (madformat_wantfixup($format)) {
3611 # user might have not used dgit build, so maybe do this now:
3612 if (quiltmode_splitbrain()) {
3614 quilt_make_fake_dsc($upstreamversion);
3616 ($dgithead, $cachekey) =
3617 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3619 "--quilt=$quilt_mode but no cached dgit view:
3620 perhaps tree changed since dgit build[-source] ?";
3622 $dgithead = splitbrain_pseudomerge($clogp,
3623 $actualhead, $dgithead,
3625 $maintviewhead = $actualhead;
3626 changedir '../../../..';
3627 prep_ud(); # so _only_subdir() works, below
3629 commit_quilty_patch();
3633 if (defined $overwrite_version && !defined $maintviewhead) {
3634 $dgithead = plain_overwrite_pseudomerge($clogp,
3642 if ($archive_hash) {
3643 if (is_fast_fwd($archive_hash, $dgithead)) {
3645 } elsif (deliberately_not_fast_forward) {
3648 fail "dgit push: HEAD is not a descendant".
3649 " of the archive's version.\n".
3650 "To overwrite the archive's contents,".
3651 " pass --overwrite[=VERSION].\n".
3652 "To rewind history, if permitted by the archive,".
3653 " use --deliberately-not-fast-forward.";
3658 progress "checking that $dscfn corresponds to HEAD";
3659 runcmd qw(dpkg-source -x --),
3660 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3661 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3662 check_for_vendor_patches() if madformat($dsc->{format});
3663 changedir '../../../..';
3664 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3665 debugcmd "+",@diffcmd;
3667 my $r = system @diffcmd;
3670 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3672 HEAD specifies a different tree to $dscfn:
3674 Perhaps you forgot to build. Or perhaps there is a problem with your
3675 source tree (see dgit(7) for some hints). To see a full diff, run
3682 if (!$changesfile) {
3683 my $pat = changespat $cversion;
3684 my @cs = glob "$buildproductsdir/$pat";
3685 fail "failed to find unique changes file".
3686 " (looked for $pat in $buildproductsdir);".
3687 " perhaps you need to use dgit -C"
3689 ($changesfile) = @cs;
3691 $changesfile = "$buildproductsdir/$changesfile";
3694 # Check that changes and .dsc agree enough
3695 $changesfile =~ m{[^/]*$};
3696 my $changes = parsecontrol($changesfile,$&);
3697 files_compare_inputs($dsc, $changes)
3698 unless forceing [qw(dsc-changes-mismatch)];
3700 # Perhaps adjust .dsc to contain right set of origs
3701 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3703 unless forceing [qw(changes-origs-exactly)];
3705 # Checks complete, we're going to try and go ahead:
3707 responder_send_file('changes',$changesfile);
3708 responder_send_command("param head $dgithead");
3709 responder_send_command("param csuite $csuite");
3710 responder_send_command("param tagformat $tagformat");
3711 if (defined $maintviewhead) {
3712 die unless ($protovsn//4) >= 4;
3713 responder_send_command("param maint-view $maintviewhead");
3716 if (deliberately_not_fast_forward) {
3717 git_for_each_ref(lrfetchrefs, sub {
3718 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3719 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3720 responder_send_command("previously $rrefname=$objid");
3721 $previously{$rrefname} = $objid;
3725 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3729 supplementary_message(<<'END');
3730 Push failed, while signing the tag.
3731 You can retry the push, after fixing the problem, if you like.
3733 # If we manage to sign but fail to record it anywhere, it's fine.
3734 if ($we_are_responder) {
3735 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3736 responder_receive_files('signed-tag', @tagobjfns);
3738 @tagobjfns = push_mktags($clogp,$dscpath,
3739 $changesfile,$changesfile,
3742 supplementary_message(<<'END');
3743 Push failed, *after* signing the tag.
3744 If you want to try again, you should use a new version number.
3747 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3749 foreach my $tw (@tagwants) {
3750 my $tag = $tw->{Tag};
3751 my $tagobjfn = $tw->{TagObjFn};
3753 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3754 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3755 runcmd_ordryrun_local
3756 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3759 supplementary_message(<<'END');
3760 Push failed, while updating the remote git repository - see messages above.
3761 If you want to try again, you should use a new version number.
3763 if (!check_for_git()) {
3764 create_remote_git_repo();
3767 my @pushrefs = $forceflag.$dgithead.":".rrref();
3768 foreach my $tw (@tagwants) {
3769 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3772 runcmd_ordryrun @git,
3773 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3774 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3776 supplementary_message(<<'END');
3777 Push failed, after updating the remote git repository.
3778 If you want to try again, you must use a new version number.
3780 if ($we_are_responder) {
3781 my $dryrunsuffix = act_local() ? "" : ".tmp";
3782 responder_receive_files('signed-dsc-changes',
3783 "$dscpath$dryrunsuffix",
3784 "$changesfile$dryrunsuffix");
3787 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3789 progress "[new .dsc left in $dscpath.tmp]";
3791 sign_changes $changesfile;
3794 supplementary_message(<<END);
3795 Push failed, while uploading package(s) to the archive server.
3796 You can retry the upload of exactly these same files with dput of:
3798 If that .changes file is broken, you will need to use a new version
3799 number for your next attempt at the upload.
3801 my $host = access_cfg('upload-host','RETURN-UNDEF');
3802 my @hostarg = defined($host) ? ($host,) : ();
3803 runcmd_ordryrun @dput, @hostarg, $changesfile;
3804 printdone "pushed and uploaded $cversion";
3806 supplementary_message('');
3807 responder_send_command("complete");
3814 badusage "-p is not allowed with clone; specify as argument instead"
3815 if defined $package;
3818 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3819 ($package,$isuite) = @ARGV;
3820 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3821 ($package,$dstdir) = @ARGV;
3822 } elsif (@ARGV==3) {
3823 ($package,$isuite,$dstdir) = @ARGV;
3825 badusage "incorrect arguments to dgit clone";
3827 $dstdir ||= "$package";
3829 if (stat_exists $dstdir) {
3830 fail "$dstdir already exists";
3834 if ($rmonerror && !$dryrun_level) {
3835 $cwd_remove= getcwd();
3837 return unless defined $cwd_remove;
3838 if (!chdir "$cwd_remove") {
3839 return if $!==&ENOENT;
3840 die "chdir $cwd_remove: $!";
3843 rmtree($dstdir) or die "remove $dstdir: $!\n";
3844 } elsif (grep { $! == $_ }
3845 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3847 print STDERR "check whether to remove $dstdir: $!\n";
3853 $cwd_remove = undef;
3856 sub branchsuite () {
3857 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3858 if ($branch =~ m#$lbranch_re#o) {
3865 sub fetchpullargs () {
3867 if (!defined $package) {
3868 my $sourcep = parsecontrol('debian/control','debian/control');
3869 $package = getfield $sourcep, 'Source';
3872 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3874 my $clogp = parsechangelog();
3875 $isuite = getfield $clogp, 'Distribution';
3877 canonicalise_suite();
3878 progress "fetching from suite $csuite";
3879 } elsif (@ARGV==1) {
3881 canonicalise_suite();
3883 badusage "incorrect arguments to dgit fetch or dgit pull";
3896 if (quiltmode_splitbrain()) {
3897 my ($format, $fopts) = get_source_format();
3898 madformat($format) and fail <<END
3899 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
3908 badusage "-p is not allowed with dgit push" if defined $package;
3910 my $clogp = parsechangelog();
3911 $package = getfield $clogp, 'Source';
3914 } elsif (@ARGV==1) {
3915 ($specsuite) = (@ARGV);
3917 badusage "incorrect arguments to dgit push";
3919 $isuite = getfield $clogp, 'Distribution';
3921 local ($package) = $existing_package; # this is a hack
3922 canonicalise_suite();
3924 canonicalise_suite();
3926 if (defined $specsuite &&
3927 $specsuite ne $isuite &&
3928 $specsuite ne $csuite) {
3929 fail "dgit push: changelog specifies $isuite ($csuite)".
3930 " but command line specifies $specsuite";
3935 #---------- remote commands' implementation ----------
3937 sub cmd_remote_push_build_host {
3938 my ($nrargs) = shift @ARGV;
3939 my (@rargs) = @ARGV[0..$nrargs-1];
3940 @ARGV = @ARGV[$nrargs..$#ARGV];
3942 my ($dir,$vsnwant) = @rargs;
3943 # vsnwant is a comma-separated list; we report which we have
3944 # chosen in our ready response (so other end can tell if they
3947 $we_are_responder = 1;
3948 $us .= " (build host)";
3952 open PI, "<&STDIN" or die $!;
3953 open STDIN, "/dev/null" or die $!;
3954 open PO, ">&STDOUT" or die $!;
3956 open STDOUT, ">&STDERR" or die $!;
3960 ($protovsn) = grep {
3961 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3962 } @rpushprotovsn_support;
3964 fail "build host has dgit rpush protocol versions ".
3965 (join ",", @rpushprotovsn_support).
3966 " but invocation host has $vsnwant"
3967 unless defined $protovsn;
3969 responder_send_command("dgit-remote-push-ready $protovsn");
3970 rpush_handle_protovsn_bothends();
3975 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3976 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3977 # a good error message)
3979 sub rpush_handle_protovsn_bothends () {
3980 if ($protovsn < 4) {
3981 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3990 my $report = i_child_report();
3991 if (defined $report) {
3992 printdebug "($report)\n";
3993 } elsif ($i_child_pid) {
3994 printdebug "(killing build host child $i_child_pid)\n";
3995 kill 15, $i_child_pid;
3997 if (defined $i_tmp && !defined $initiator_tempdir) {
3999 eval { rmtree $i_tmp; };
4003 END { i_cleanup(); }
4006 my ($base,$selector,@args) = @_;
4007 $selector =~ s/\-/_/g;
4008 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4015 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4023 push @rargs, join ",", @rpushprotovsn_support;
4026 push @rdgit, @ropts;
4027 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4029 my @cmd = (@ssh, $host, shellquote @rdgit);
4032 if (defined $initiator_tempdir) {
4033 rmtree $initiator_tempdir;
4034 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4035 $i_tmp = $initiator_tempdir;
4039 $i_child_pid = open2(\*RO, \*RI, @cmd);
4041 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4042 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4043 $supplementary_message = '' unless $protovsn >= 3;
4045 fail "rpush negotiated protocol version $protovsn".
4046 " which does not support quilt mode $quilt_mode"
4047 if quiltmode_splitbrain;
4049 rpush_handle_protovsn_bothends();
4051 my ($icmd,$iargs) = initiator_expect {
4052 m/^(\S+)(?: (.*))?$/;
4055 i_method "i_resp", $icmd, $iargs;
4059 sub i_resp_progress ($) {
4061 my $msg = protocol_read_bytes \*RO, $rhs;
4065 sub i_resp_supplementary_message ($) {
4067 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4070 sub i_resp_complete {
4071 my $pid = $i_child_pid;
4072 $i_child_pid = undef; # prevents killing some other process with same pid
4073 printdebug "waiting for build host child $pid...\n";
4074 my $got = waitpid $pid, 0;
4075 die $! unless $got == $pid;
4076 die "build host child failed $?" if $?;
4079 printdebug "all done\n";
4083 sub i_resp_file ($) {
4085 my $localname = i_method "i_localname", $keyword;
4086 my $localpath = "$i_tmp/$localname";
4087 stat_exists $localpath and
4088 badproto \*RO, "file $keyword ($localpath) twice";
4089 protocol_receive_file \*RO, $localpath;
4090 i_method "i_file", $keyword;
4095 sub i_resp_param ($) {
4096 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4100 sub i_resp_previously ($) {
4101 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4102 or badproto \*RO, "bad previously spec";
4103 my $r = system qw(git check-ref-format), $1;
4104 die "bad previously ref spec ($r)" if $r;
4105 $previously{$1} = $2;
4110 sub i_resp_want ($) {
4112 die "$keyword ?" if $i_wanted{$keyword}++;
4113 my @localpaths = i_method "i_want", $keyword;
4114 printdebug "[[ $keyword @localpaths\n";
4115 foreach my $localpath (@localpaths) {
4116 protocol_send_file \*RI, $localpath;
4118 print RI "files-end\n" or die $!;
4121 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4123 sub i_localname_parsed_changelog {
4124 return "remote-changelog.822";
4126 sub i_file_parsed_changelog {
4127 ($i_clogp, $i_version, $i_dscfn) =
4128 push_parse_changelog "$i_tmp/remote-changelog.822";
4129 die if $i_dscfn =~ m#/|^\W#;
4132 sub i_localname_dsc {
4133 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4138 sub i_localname_changes {
4139 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4140 $i_changesfn = $i_dscfn;
4141 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4142 return $i_changesfn;
4144 sub i_file_changes { }
4146 sub i_want_signed_tag {
4147 printdebug Dumper(\%i_param, $i_dscfn);
4148 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4149 && defined $i_param{'csuite'}
4150 or badproto \*RO, "premature desire for signed-tag";
4151 my $head = $i_param{'head'};
4152 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4154 my $maintview = $i_param{'maint-view'};
4155 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4158 if ($protovsn >= 4) {
4159 my $p = $i_param{'tagformat'} // '<undef>';
4161 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4164 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4166 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4168 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4171 push_mktags $i_clogp, $i_dscfn,
4172 $i_changesfn, 'remote changes',
4176 sub i_want_signed_dsc_changes {
4177 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4178 sign_changes $i_changesfn;
4179 return ($i_dscfn, $i_changesfn);
4182 #---------- building etc. ----------
4188 #----- `3.0 (quilt)' handling -----
4190 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4192 sub quiltify_dpkg_commit ($$$;$) {
4193 my ($patchname,$author,$msg, $xinfo) = @_;
4197 my $descfn = ".git/dgit/quilt-description.tmp";
4198 open O, '>', $descfn or die "$descfn: $!";
4199 $msg =~ s/\n+/\n\n/;
4200 print O <<END or die $!;
4202 ${xinfo}Subject: $msg
4209 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4210 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4211 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4212 runcmd @dpkgsource, qw(--commit .), $patchname;
4216 sub quiltify_trees_differ ($$;$$$) {
4217 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4218 # returns true iff the two tree objects differ other than in debian/
4219 # with $finegrained,
4220 # returns bitmask 01 - differ in upstream files except .gitignore
4221 # 02 - differ in .gitignore
4222 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4223 # is set for each modified .gitignore filename $fn
4224 # if $unrepres is defined, array ref to which is appeneded
4225 # a list of unrepresentable changes (removals of upstream files
4228 my @cmd = (@git, qw(diff-tree -z));
4229 push @cmd, qw(--name-only) unless $unrepres;
4230 push @cmd, qw(-r) if $finegrained || $unrepres;
4232 my $diffs= cmdoutput @cmd;
4235 foreach my $f (split /\0/, $diffs) {
4236 if ($unrepres && !@lmodes) {
4237 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4240 my ($oldmode,$newmode) = @lmodes;
4243 next if $f =~ m#^debian(?:/.*)?$#s;
4247 die "deleted\n" unless $newmode =~ m/[^0]/;
4248 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4249 if ($oldmode =~ m/[^0]/) {
4250 die "mode changed\n" if $oldmode ne $newmode;
4252 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4256 local $/="\n"; chomp $@;
4257 push @$unrepres, [ $f, $@ ];
4261 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4262 $r |= $isignore ? 02 : 01;
4263 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4265 printdebug "quiltify_trees_differ $x $y => $r\n";
4269 sub quiltify_tree_sentinelfiles ($) {
4270 # lists the `sentinel' files present in the tree
4272 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4273 qw(-- debian/rules debian/control);
4278 sub quiltify_splitbrain_needed () {
4279 if (!$split_brain) {
4280 progress "dgit view: changes are required...";
4281 runcmd @git, qw(checkout -q -b dgit-view);
4286 sub quiltify_splitbrain ($$$$$$) {
4287 my ($clogp, $unapplied, $headref, $diffbits,
4288 $editedignores, $cachekey) = @_;
4289 if ($quilt_mode !~ m/gbp|dpm/) {
4290 # treat .gitignore just like any other upstream file
4291 $diffbits = { %$diffbits };
4292 $_ = !!$_ foreach values %$diffbits;
4294 # We would like any commits we generate to be reproducible
4295 my @authline = clogp_authline($clogp);
4296 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4297 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4298 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4299 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4300 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4301 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4303 if ($quilt_mode =~ m/gbp|unapplied/ &&
4304 ($diffbits->{O2H} & 01)) {
4306 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4307 " but git tree differs from orig in upstream files.";
4308 if (!stat_exists "debian/patches") {
4310 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4314 if ($quilt_mode =~ m/dpm/ &&
4315 ($diffbits->{H2A} & 01)) {
4317 --quilt=$quilt_mode specified, implying patches-applied git tree
4318 but git tree differs from result of applying debian/patches to upstream
4321 if ($quilt_mode =~ m/gbp|unapplied/ &&
4322 ($diffbits->{O2A} & 01)) { # some patches
4323 quiltify_splitbrain_needed();
4324 progress "dgit view: creating patches-applied version using gbp pq";
4325 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4326 # gbp pq import creates a fresh branch; push back to dgit-view
4327 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4328 runcmd @git, qw(checkout -q dgit-view);
4330 if ($quilt_mode =~ m/gbp|dpm/ &&
4331 ($diffbits->{O2A} & 02)) {
4333 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4334 tool which does not create patches for changes to upstream
4335 .gitignores: but, such patches exist in debian/patches.
4338 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4339 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4340 quiltify_splitbrain_needed();
4341 progress "dgit view: creating patch to represent .gitignore changes";
4342 ensuredir "debian/patches";
4343 my $gipatch = "debian/patches/auto-gitignore";
4344 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4345 stat GIPATCH or die "$gipatch: $!";
4346 fail "$gipatch already exists; but want to create it".
4347 " to record .gitignore changes" if (stat _)[7];
4348 print GIPATCH <<END or die "$gipatch: $!";
4349 Subject: Update .gitignore from Debian packaging branch
4351 The Debian packaging git branch contains these updates to the upstream
4352 .gitignore file(s). This patch is autogenerated, to provide these
4353 updates to users of the official Debian archive view of the package.
4355 [dgit ($our_version) update-gitignore]
4358 close GIPATCH or die "$gipatch: $!";
4359 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4360 $unapplied, $headref, "--", sort keys %$editedignores;
4361 open SERIES, "+>>", "debian/patches/series" or die $!;
4362 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4364 defined read SERIES, $newline, 1 or die $!;
4365 print SERIES "\n" or die $! unless $newline eq "\n";
4366 print SERIES "auto-gitignore\n" or die $!;
4367 close SERIES or die $!;
4368 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4370 Commit patch to update .gitignore
4372 [dgit ($our_version) update-gitignore-quilt-fixup]
4376 my $dgitview = git_rev_parse 'HEAD';
4378 changedir '../../../..';
4379 # When we no longer need to support squeeze, use --create-reflog
4381 ensuredir ".git/logs/refs/dgit-intern";
4382 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4385 my $oldcache = git_get_ref "refs/$splitbraincache";
4386 if ($oldcache eq $dgitview) {
4387 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4388 # git update-ref doesn't always update, in this case. *sigh*
4389 my $dummy = make_commit_text <<END;
4392 author Dgit <dgit\@example.com> 1000000000 +0000
4393 committer Dgit <dgit\@example.com> 1000000000 +0000
4395 Dummy commit - do not use
4397 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4398 "refs/$splitbraincache", $dummy;
4400 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4403 changedir '.git/dgit/unpack/work';
4405 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4406 progress "dgit view: created ($saved)";
4409 sub quiltify ($$$$) {
4410 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4412 # Quilt patchification algorithm
4414 # We search backwards through the history of the main tree's HEAD
4415 # (T) looking for a start commit S whose tree object is identical
4416 # to to the patch tip tree (ie the tree corresponding to the
4417 # current dpkg-committed patch series). For these purposes
4418 # `identical' disregards anything in debian/ - this wrinkle is
4419 # necessary because dpkg-source treates debian/ specially.
4421 # We can only traverse edges where at most one of the ancestors'
4422 # trees differs (in changes outside in debian/). And we cannot
4423 # handle edges which change .pc/ or debian/patches. To avoid
4424 # going down a rathole we avoid traversing edges which introduce
4425 # debian/rules or debian/control. And we set a limit on the
4426 # number of edges we are willing to look at.
4428 # If we succeed, we walk forwards again. For each traversed edge
4429 # PC (with P parent, C child) (starting with P=S and ending with
4430 # C=T) to we do this:
4432 # - dpkg-source --commit with a patch name and message derived from C
4433 # After traversing PT, we git commit the changes which
4434 # should be contained within debian/patches.
4436 # The search for the path S..T is breadth-first. We maintain a
4437 # todo list containing search nodes. A search node identifies a
4438 # commit, and looks something like this:
4440 # Commit => $git_commit_id,
4441 # Child => $c, # or undef if P=T
4442 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4443 # Nontrivial => true iff $p..$c has relevant changes
4450 my %considered; # saves being exponential on some weird graphs
4452 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4455 my ($search,$whynot) = @_;
4456 printdebug " search NOT $search->{Commit} $whynot\n";
4457 $search->{Whynot} = $whynot;
4458 push @nots, $search;
4459 no warnings qw(exiting);
4468 my $c = shift @todo;
4469 next if $considered{$c->{Commit}}++;
4471 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4473 printdebug "quiltify investigate $c->{Commit}\n";
4476 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4477 printdebug " search finished hooray!\n";
4482 if ($quilt_mode eq 'nofix') {
4483 fail "quilt fixup required but quilt mode is \`nofix'\n".
4484 "HEAD commit $c->{Commit} differs from tree implied by ".
4485 " debian/patches (tree object $oldtiptree)";
4487 if ($quilt_mode eq 'smash') {
4488 printdebug " search quitting smash\n";
4492 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4493 $not->($c, "has $c_sentinels not $t_sentinels")
4494 if $c_sentinels ne $t_sentinels;
4496 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4497 $commitdata =~ m/\n\n/;
4499 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4500 @parents = map { { Commit => $_, Child => $c } } @parents;
4502 $not->($c, "root commit") if !@parents;
4504 foreach my $p (@parents) {
4505 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4507 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4508 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4510 foreach my $p (@parents) {
4511 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4513 my @cmd= (@git, qw(diff-tree -r --name-only),
4514 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4515 my $patchstackchange = cmdoutput @cmd;
4516 if (length $patchstackchange) {
4517 $patchstackchange =~ s/\n/,/g;
4518 $not->($p, "changed $patchstackchange");
4521 printdebug " search queue P=$p->{Commit} ",
4522 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4528 printdebug "quiltify want to smash\n";
4531 my $x = $_[0]{Commit};
4532 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4535 my $reportnot = sub {
4537 my $s = $abbrev->($notp);
4538 my $c = $notp->{Child};
4539 $s .= "..".$abbrev->($c) if $c;
4540 $s .= ": ".$notp->{Whynot};
4543 if ($quilt_mode eq 'linear') {
4544 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4545 foreach my $notp (@nots) {
4546 print STDERR "$us: ", $reportnot->($notp), "\n";
4548 print STDERR "$us: $_\n" foreach @$failsuggestion;
4549 fail "quilt fixup naive history linearisation failed.\n".
4550 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4551 } elsif ($quilt_mode eq 'smash') {
4552 } elsif ($quilt_mode eq 'auto') {
4553 progress "quilt fixup cannot be linear, smashing...";
4555 die "$quilt_mode ?";
4558 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4559 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4561 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4563 quiltify_dpkg_commit "auto-$version-$target-$time",
4564 (getfield $clogp, 'Maintainer'),
4565 "Automatically generated patch ($clogp->{Version})\n".
4566 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4570 progress "quiltify linearisation planning successful, executing...";
4572 for (my $p = $sref_S;
4573 my $c = $p->{Child};
4575 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4576 next unless $p->{Nontrivial};
4578 my $cc = $c->{Commit};
4580 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4581 $commitdata =~ m/\n\n/ or die "$c ?";
4584 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4587 my $commitdate = cmdoutput
4588 @git, qw(log -n1 --pretty=format:%aD), $cc;
4590 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4592 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4599 my $gbp_check_suitable = sub {
4604 die "contains unexpected slashes\n" if m{//} || m{/$};
4605 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4606 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4607 die "too long" if length > 200;
4609 return $_ unless $@;
4610 print STDERR "quiltifying commit $cc:".
4611 " ignoring/dropping Gbp-Pq $what: $@";
4615 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4617 (\S+) \s* \n //ixm) {
4618 $patchname = $gbp_check_suitable->($1, 'Name');
4620 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4622 (\S+) \s* \n //ixm) {
4623 $patchdir = $gbp_check_suitable->($1, 'Topic');
4628 if (!defined $patchname) {
4629 $patchname = $title;
4630 $patchname =~ s/[.:]$//;
4633 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4634 my $translitname = $converter->convert($patchname);
4635 die unless defined $translitname;
4636 $patchname = $translitname;
4639 "dgit: patch title transliteration error: $@"
4641 $patchname =~ y/ A-Z/-a-z/;
4642 $patchname =~ y/-a-z0-9_.+=~//cd;
4643 $patchname =~ s/^\W/x-$&/;
4644 $patchname = substr($patchname,0,40);
4646 if (!defined $patchdir) {
4649 if (length $patchdir) {
4650 $patchname = "$patchdir/$patchname";
4652 if ($patchname =~ m{^(.*)/}) {
4653 mkpath "debian/patches/$1";
4658 stat "debian/patches/$patchname$index";
4660 $!==ENOENT or die "$patchname$index $!";
4662 runcmd @git, qw(checkout -q), $cc;
4664 # We use the tip's changelog so that dpkg-source doesn't
4665 # produce complaining messages from dpkg-parsechangelog. None
4666 # of the information dpkg-source gets from the changelog is
4667 # actually relevant - it gets put into the original message
4668 # which dpkg-source provides our stunt editor, and then
4670 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4672 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4673 "Date: $commitdate\n".
4674 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4676 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4679 runcmd @git, qw(checkout -q master);
4682 sub build_maybe_quilt_fixup () {
4683 my ($format,$fopts) = get_source_format;
4684 return unless madformat_wantfixup $format;
4687 check_for_vendor_patches();
4689 if (quiltmode_splitbrain) {
4690 foreach my $needtf (qw(new maint)) {
4691 next if grep { $_ eq $needtf } access_cfg_tagformats;
4693 quilt mode $quilt_mode requires split view so server needs to support
4694 both "new" and "maint" tag formats, but config says it doesn't.
4699 my $clogp = parsechangelog();
4700 my $headref = git_rev_parse('HEAD');
4705 my $upstreamversion = upstreamversion $version;
4707 if ($fopts->{'single-debian-patch'}) {
4708 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4710 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4713 die 'bug' if $split_brain && !$need_split_build_invocation;
4715 changedir '../../../..';
4716 runcmd_ordryrun_local
4717 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4720 sub quilt_fixup_mkwork ($) {
4723 mkdir "work" or die $!;
4725 mktree_in_ud_here();
4726 runcmd @git, qw(reset -q --hard), $headref;
4729 sub quilt_fixup_linkorigs ($$) {
4730 my ($upstreamversion, $fn) = @_;
4731 # calls $fn->($leafname);
4733 foreach my $f (<../../../../*>) { #/){
4734 my $b=$f; $b =~ s{.*/}{};
4736 local ($debuglevel) = $debuglevel-1;
4737 printdebug "QF linkorigs $b, $f ?\n";
4739 next unless is_orig_file_of_vsn $b, $upstreamversion;
4740 printdebug "QF linkorigs $b, $f Y\n";
4741 link_ltarget $f, $b or die "$b $!";
4746 sub quilt_fixup_delete_pc () {
4747 runcmd @git, qw(rm -rqf .pc);
4749 Commit removal of .pc (quilt series tracking data)
4751 [dgit ($our_version) upgrade quilt-remove-pc]
4755 sub quilt_fixup_singlepatch ($$$) {
4756 my ($clogp, $headref, $upstreamversion) = @_;
4758 progress "starting quiltify (single-debian-patch)";
4760 # dpkg-source --commit generates new patches even if
4761 # single-debian-patch is in debian/source/options. In order to
4762 # get it to generate debian/patches/debian-changes, it is
4763 # necessary to build the source package.
4765 quilt_fixup_linkorigs($upstreamversion, sub { });
4766 quilt_fixup_mkwork($headref);
4768 rmtree("debian/patches");
4770 runcmd @dpkgsource, qw(-b .);
4772 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4773 rename srcfn("$upstreamversion", "/debian/patches"),
4774 "work/debian/patches";
4777 commit_quilty_patch();
4780 sub quilt_make_fake_dsc ($) {
4781 my ($upstreamversion) = @_;
4783 my $fakeversion="$upstreamversion-~~DGITFAKE";
4785 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4786 print $fakedsc <<END or die $!;
4789 Version: $fakeversion
4793 my $dscaddfile=sub {
4796 my $md = new Digest::MD5;
4798 my $fh = new IO::File $b, '<' or die "$b $!";
4803 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4806 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4808 my @files=qw(debian/source/format debian/rules
4809 debian/control debian/changelog);
4810 foreach my $maybe (qw(debian/patches debian/source/options
4811 debian/tests/control)) {
4812 next unless stat_exists "../../../$maybe";
4813 push @files, $maybe;
4816 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4817 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4819 $dscaddfile->($debtar);
4820 close $fakedsc or die $!;
4823 sub quilt_check_splitbrain_cache ($$) {
4824 my ($headref, $upstreamversion) = @_;
4825 # Called only if we are in (potentially) split brain mode.
4827 # Computes the cache key and looks in the cache.
4828 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4830 my $splitbrain_cachekey;
4833 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4834 # we look in the reflog of dgit-intern/quilt-cache
4835 # we look for an entry whose message is the key for the cache lookup
4836 my @cachekey = (qw(dgit), $our_version);
4837 push @cachekey, $upstreamversion;
4838 push @cachekey, $quilt_mode;
4839 push @cachekey, $headref;
4841 push @cachekey, hashfile('fake.dsc');
4843 my $srcshash = Digest::SHA->new(256);
4844 my %sfs = ( %INC, '$0(dgit)' => $0 );
4845 foreach my $sfk (sort keys %sfs) {
4846 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4847 $srcshash->add($sfk," ");
4848 $srcshash->add(hashfile($sfs{$sfk}));
4849 $srcshash->add("\n");
4851 push @cachekey, $srcshash->hexdigest();
4852 $splitbrain_cachekey = "@cachekey";
4854 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4856 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4857 debugcmd "|(probably)",@cmd;
4858 my $child = open GC, "-|"; defined $child or die $!;
4860 chdir '../../..' or die $!;
4861 if (!stat ".git/logs/refs/$splitbraincache") {
4862 $! == ENOENT or die $!;
4863 printdebug ">(no reflog)\n";
4870 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4871 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4874 quilt_fixup_mkwork($headref);
4875 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
4876 if ($cachehit ne $headref) {
4877 progress "dgit view: found cached ($saved)";
4878 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4880 return ($cachehit, $splitbrain_cachekey);
4882 progress "dgit view: found cached, no changes required";
4883 return ($headref, $splitbrain_cachekey);
4885 die $! if GC->error;
4886 failedcmd unless close GC;
4888 printdebug "splitbrain cache miss\n";
4889 return (undef, $splitbrain_cachekey);
4892 sub quilt_fixup_multipatch ($$$) {
4893 my ($clogp, $headref, $upstreamversion) = @_;
4895 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4898 # - honour any existing .pc in case it has any strangeness
4899 # - determine the git commit corresponding to the tip of
4900 # the patch stack (if there is one)
4901 # - if there is such a git commit, convert each subsequent
4902 # git commit into a quilt patch with dpkg-source --commit
4903 # - otherwise convert all the differences in the tree into
4904 # a single git commit
4908 # Our git tree doesn't necessarily contain .pc. (Some versions of
4909 # dgit would include the .pc in the git tree.) If there isn't
4910 # one, we need to generate one by unpacking the patches that we
4913 # We first look for a .pc in the git tree. If there is one, we
4914 # will use it. (This is not the normal case.)
4916 # Otherwise need to regenerate .pc so that dpkg-source --commit
4917 # can work. We do this as follows:
4918 # 1. Collect all relevant .orig from parent directory
4919 # 2. Generate a debian.tar.gz out of
4920 # debian/{patches,rules,source/format,source/options}
4921 # 3. Generate a fake .dsc containing just these fields:
4922 # Format Source Version Files
4923 # 4. Extract the fake .dsc
4924 # Now the fake .dsc has a .pc directory.
4925 # (In fact we do this in every case, because in future we will
4926 # want to search for a good base commit for generating patches.)
4928 # Then we can actually do the dpkg-source --commit
4929 # 1. Make a new working tree with the same object
4930 # store as our main tree and check out the main
4932 # 2. Copy .pc from the fake's extraction, if necessary
4933 # 3. Run dpkg-source --commit
4934 # 4. If the result has changes to debian/, then
4935 # - git add them them
4936 # - git add .pc if we had a .pc in-tree
4938 # 5. If we had a .pc in-tree, delete it, and git commit
4939 # 6. Back in the main tree, fast forward to the new HEAD
4941 # Another situation we may have to cope with is gbp-style
4942 # patches-unapplied trees.
4944 # We would want to detect these, so we know to escape into
4945 # quilt_fixup_gbp. However, this is in general not possible.
4946 # Consider a package with a one patch which the dgit user reverts
4947 # (with git revert or the moral equivalent).
4949 # That is indistinguishable in contents from a patches-unapplied
4950 # tree. And looking at the history to distinguish them is not
4951 # useful because the user might have made a confusing-looking git
4952 # history structure (which ought to produce an error if dgit can't
4953 # cope, not a silent reintroduction of an unwanted patch).
4955 # So gbp users will have to pass an option. But we can usually
4956 # detect their failure to do so: if the tree is not a clean
4957 # patches-applied tree, quilt linearisation fails, but the tree
4958 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4959 # they want --quilt=unapplied.
4961 # To help detect this, when we are extracting the fake dsc, we
4962 # first extract it with --skip-patches, and then apply the patches
4963 # afterwards with dpkg-source --before-build. That lets us save a
4964 # tree object corresponding to .origs.
4966 my $splitbrain_cachekey;
4968 quilt_make_fake_dsc($upstreamversion);
4970 if (quiltmode_splitbrain()) {
4972 ($cachehit, $splitbrain_cachekey) =
4973 quilt_check_splitbrain_cache($headref, $upstreamversion);
4974 return if $cachehit;
4978 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4980 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4981 rename $fakexdir, "fake" or die "$fakexdir $!";
4985 remove_stray_gits();
4986 mktree_in_ud_here();
4990 runcmd @git, qw(add -Af .);
4991 my $unapplied=git_write_tree();
4992 printdebug "fake orig tree object $unapplied\n";
4996 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4998 if (system @bbcmd) {
4999 failedcmd @bbcmd if $? < 0;
5001 failed to apply your git tree's patch stack (from debian/patches/) to
5002 the corresponding upstream tarball(s). Your source tree and .orig
5003 are probably too inconsistent. dgit can only fix up certain kinds of
5004 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5010 quilt_fixup_mkwork($headref);
5013 if (stat_exists ".pc") {
5015 progress "Tree already contains .pc - will use it then delete it.";
5018 rename '../fake/.pc','.pc' or die $!;
5021 changedir '../fake';
5023 runcmd @git, qw(add -Af .);
5024 my $oldtiptree=git_write_tree();
5025 printdebug "fake o+d/p tree object $unapplied\n";
5026 changedir '../work';
5029 # We calculate some guesswork now about what kind of tree this might
5030 # be. This is mostly for error reporting.
5036 # O = orig, without patches applied
5037 # A = "applied", ie orig with H's debian/patches applied
5038 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5039 \%editedignores, \@unrepres),
5040 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5041 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5045 foreach my $b (qw(01 02)) {
5046 foreach my $v (qw(O2H O2A H2A)) {
5047 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5050 printdebug "differences \@dl @dl.\n";
5053 "$us: base trees orig=%.20s o+d/p=%.20s",
5054 $unapplied, $oldtiptree;
5056 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5057 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5058 $dl[0], $dl[1], $dl[3], $dl[4],
5062 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5064 forceable_fail [qw(unrepresentable)], <<END;
5065 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5070 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5071 push @failsuggestion, "This might be a patches-unapplied branch.";
5072 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5073 push @failsuggestion, "This might be a patches-applied branch.";
5075 push @failsuggestion, "Maybe you need to specify one of".
5076 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5078 if (quiltmode_splitbrain()) {
5079 quiltify_splitbrain($clogp, $unapplied, $headref,
5080 $diffbits, \%editedignores,
5081 $splitbrain_cachekey);
5085 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5086 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5088 if (!open P, '>>', ".pc/applied-patches") {
5089 $!==&ENOENT or die $!;
5094 commit_quilty_patch();
5096 if ($mustdeletepc) {
5097 quilt_fixup_delete_pc();
5101 sub quilt_fixup_editor () {
5102 my $descfn = $ENV{$fakeeditorenv};
5103 my $editing = $ARGV[$#ARGV];
5104 open I1, '<', $descfn or die "$descfn: $!";
5105 open I2, '<', $editing or die "$editing: $!";
5106 unlink $editing or die "$editing: $!";
5107 open O, '>', $editing or die "$editing: $!";
5108 while (<I1>) { print O or die $!; } I1->error and die $!;
5111 $copying ||= m/^\-\-\- /;
5112 next unless $copying;
5115 I2->error and die $!;
5120 sub maybe_apply_patches_dirtily () {
5121 return unless $quilt_mode =~ m/gbp|unapplied/;
5122 print STDERR <<END or die $!;
5124 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5125 dgit: Have to apply the patches - making the tree dirty.
5126 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5129 $patches_applied_dirtily = 01;
5130 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5131 runcmd qw(dpkg-source --before-build .);
5134 sub maybe_unapply_patches_again () {
5135 progress "dgit: Unapplying patches again to tidy up the tree."
5136 if $patches_applied_dirtily;
5137 runcmd qw(dpkg-source --after-build .)
5138 if $patches_applied_dirtily & 01;
5140 if $patches_applied_dirtily & 02;
5141 $patches_applied_dirtily = 0;
5144 #----- other building -----
5146 our $clean_using_builder;
5147 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5148 # clean the tree before building (perhaps invoked indirectly by
5149 # whatever we are using to run the build), rather than separately
5150 # and explicitly by us.
5153 return if $clean_using_builder;
5154 if ($cleanmode eq 'dpkg-source') {
5155 maybe_apply_patches_dirtily();
5156 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5157 } elsif ($cleanmode eq 'dpkg-source-d') {
5158 maybe_apply_patches_dirtily();
5159 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5160 } elsif ($cleanmode eq 'git') {
5161 runcmd_ordryrun_local @git, qw(clean -xdf);
5162 } elsif ($cleanmode eq 'git-ff') {
5163 runcmd_ordryrun_local @git, qw(clean -xdff);
5164 } elsif ($cleanmode eq 'check') {
5165 my $leftovers = cmdoutput @git, qw(clean -xdn);
5166 if (length $leftovers) {
5167 print STDERR $leftovers, "\n" or die $!;
5168 fail "tree contains uncommitted files and --clean=check specified";
5170 } elsif ($cleanmode eq 'none') {
5177 badusage "clean takes no additional arguments" if @ARGV;
5180 maybe_unapply_patches_again();
5183 sub build_prep_early () {
5184 our $build_prep_early_done //= 0;
5185 return if $build_prep_early_done++;
5187 badusage "-p is not allowed when building" if defined $package;
5188 my $clogp = parsechangelog();
5189 $isuite = getfield $clogp, 'Distribution';
5190 $package = getfield $clogp, 'Source';
5191 $version = getfield $clogp, 'Version';
5198 build_maybe_quilt_fixup();
5200 my $pat = changespat $version;
5201 foreach my $f (glob "$buildproductsdir/$pat") {
5203 unlink $f or fail "remove old changes file $f: $!";
5205 progress "would remove $f";
5211 sub changesopts_initial () {
5212 my @opts =@changesopts[1..$#changesopts];
5215 sub changesopts_version () {
5216 if (!defined $changes_since_version) {
5217 my @vsns = archive_query('archive_query');
5218 my @quirk = access_quirk();
5219 if ($quirk[0] eq 'backports') {
5220 local $isuite = $quirk[2];
5222 canonicalise_suite();
5223 push @vsns, archive_query('archive_query');
5226 @vsns = map { $_->[0] } @vsns;
5227 @vsns = sort { -version_compare($a, $b) } @vsns;
5228 $changes_since_version = $vsns[0];
5229 progress "changelog will contain changes since $vsns[0]";
5231 $changes_since_version = '_';
5232 progress "package seems new, not specifying -v<version>";
5235 if ($changes_since_version ne '_') {
5236 return ("-v$changes_since_version");
5242 sub changesopts () {
5243 return (changesopts_initial(), changesopts_version());
5246 sub massage_dbp_args ($;$) {
5247 my ($cmd,$xargs) = @_;
5250 # - if we're going to split the source build out so we can
5251 # do strange things to it, massage the arguments to dpkg-buildpackage
5252 # so that the main build doessn't build source (or add an argument
5253 # to stop it building source by default).
5255 # - add -nc to stop dpkg-source cleaning the source tree,
5256 # unless we're not doing a split build and want dpkg-source
5257 # as cleanmode, in which case we can do nothing
5260 # 0 - source will NOT need to be built separately by caller
5261 # +1 - source will need to be built separately by caller
5262 # +2 - source will need to be built separately by caller AND
5263 # dpkg-buildpackage should not in fact be run at all!
5264 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5265 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5266 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5267 $clean_using_builder = 1;
5270 # -nc has the side effect of specifying -b if nothing else specified
5271 # and some combinations of -S, -b, et al, are errors, rather than
5272 # later simply overriding earlie. So we need to:
5273 # - search the command line for these options
5274 # - pick the last one
5275 # - perhaps add our own as a default
5276 # - perhaps adjust it to the corresponding non-source-building version
5278 foreach my $l ($cmd, $xargs) {
5280 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5283 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5285 if ($need_split_build_invocation) {
5286 printdebug "massage split $dmode.\n";
5287 $r = $dmode =~ m/[S]/ ? +2 :
5288 $dmode =~ y/gGF/ABb/ ? +1 :
5289 $dmode =~ m/[ABb]/ ? 0 :
5292 printdebug "massage done $r $dmode.\n";
5294 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5300 my $wasdir = must_getcwd();
5306 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5307 my ($msg_if_onlyone) = @_;
5308 # If there is only one .changes file, fail with $msg_if_onlyone,
5309 # or if that is undef, be a no-op.
5310 # Returns the changes file to report to the user.
5311 my $pat = changespat $version;
5312 my @changesfiles = glob $pat;
5313 @changesfiles = sort {
5314 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5318 if (@changesfiles==1) {
5319 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5320 only one changes file from build (@changesfiles)
5322 $result = $changesfiles[0];
5323 } elsif (@changesfiles==2) {
5324 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5325 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5326 fail "$l found in binaries changes file $binchanges"
5329 runcmd_ordryrun_local @mergechanges, @changesfiles;
5330 my $multichanges = changespat $version,'multi';
5332 stat_exists $multichanges or fail "$multichanges: $!";
5333 foreach my $cf (glob $pat) {
5334 next if $cf eq $multichanges;
5335 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5338 $result = $multichanges;
5340 fail "wrong number of different changes files (@changesfiles)";
5342 printdone "build successful, results in $result\n" or die $!;
5345 sub midbuild_checkchanges () {
5346 my $pat = changespat $version;
5347 return if $rmchanges;
5348 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5349 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5351 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5352 Suggest you delete @unwanted.
5357 sub midbuild_checkchanges_vanilla ($) {
5359 midbuild_checkchanges() if $wantsrc == 1;
5362 sub postbuild_mergechanges_vanilla ($) {
5364 if ($wantsrc == 1) {
5366 postbuild_mergechanges(undef);
5369 printdone "build successful\n";
5374 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5375 my $wantsrc = massage_dbp_args \@dbp;
5378 midbuild_checkchanges_vanilla $wantsrc;
5383 push @dbp, changesopts_version();
5384 maybe_apply_patches_dirtily();
5385 runcmd_ordryrun_local @dbp;
5387 maybe_unapply_patches_again();
5388 postbuild_mergechanges_vanilla $wantsrc;
5392 $quilt_mode //= 'gbp';
5398 # gbp can make .origs out of thin air. In my tests it does this
5399 # even for a 1.0 format package, with no origs present. So I
5400 # guess it keys off just the version number. We don't know
5401 # exactly what .origs ought to exist, but let's assume that we
5402 # should run gbp if: the version has an upstream part and the main
5404 my $upstreamversion = upstreamversion $version;
5405 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5406 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5408 if ($gbp_make_orig) {
5410 $cleanmode = 'none'; # don't do it again
5411 $need_split_build_invocation = 1;
5414 my @dbp = @dpkgbuildpackage;
5416 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5418 if (!length $gbp_build[0]) {
5419 if (length executable_on_path('git-buildpackage')) {
5420 $gbp_build[0] = qw(git-buildpackage);
5422 $gbp_build[0] = 'gbp buildpackage';
5425 my @cmd = opts_opt_multi_cmd @gbp_build;
5427 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5429 if ($gbp_make_orig) {
5430 ensuredir '.git/dgit';
5431 my $ok = '.git/dgit/origs-gen-ok';
5432 unlink $ok or $!==&ENOENT or die $!;
5433 my @origs_cmd = @cmd;
5434 push @origs_cmd, qw(--git-cleaner=true);
5435 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5436 push @origs_cmd, @ARGV;
5438 debugcmd @origs_cmd;
5440 do { local $!; stat_exists $ok; }
5441 or failedcmd @origs_cmd;
5443 dryrun_report @origs_cmd;
5449 midbuild_checkchanges_vanilla $wantsrc;
5451 if (!$clean_using_builder) {
5452 push @cmd, '--git-cleaner=true';
5456 maybe_unapply_patches_again();
5458 push @cmd, changesopts();
5459 runcmd_ordryrun_local @cmd, @ARGV;
5461 postbuild_mergechanges_vanilla $wantsrc;
5463 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5466 my $our_cleanmode = $cleanmode;
5467 if ($need_split_build_invocation) {
5468 # Pretend that clean is being done some other way. This
5469 # forces us not to try to use dpkg-buildpackage to clean and
5470 # build source all in one go; and instead we run dpkg-source
5471 # (and build_prep() will do the clean since $clean_using_builder
5473 $our_cleanmode = 'ELSEWHERE';
5475 if ($our_cleanmode =~ m/^dpkg-source/) {
5476 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5477 $clean_using_builder = 1;
5480 $sourcechanges = changespat $version,'source';
5482 unlink "../$sourcechanges" or $!==ENOENT
5483 or fail "remove $sourcechanges: $!";
5485 $dscfn = dscfn($version);
5486 if ($our_cleanmode eq 'dpkg-source') {
5487 maybe_apply_patches_dirtily();
5488 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5490 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5491 maybe_apply_patches_dirtily();
5492 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5495 my @cmd = (@dpkgsource, qw(-b --));
5498 runcmd_ordryrun_local @cmd, "work";
5499 my @udfiles = <${package}_*>;
5500 changedir "../../..";
5501 foreach my $f (@udfiles) {
5502 printdebug "source copy, found $f\n";
5505 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5506 $f eq srcfn($version, $&));
5507 printdebug "source copy, found $f - renaming\n";
5508 rename "$ud/$f", "../$f" or $!==ENOENT
5509 or fail "put in place new source file ($f): $!";
5512 my $pwd = must_getcwd();
5513 my $leafdir = basename $pwd;
5515 runcmd_ordryrun_local @cmd, $leafdir;
5518 runcmd_ordryrun_local qw(sh -ec),
5519 'exec >$1; shift; exec "$@"','x',
5520 "../$sourcechanges",
5521 @dpkggenchanges, qw(-S), changesopts();
5525 sub cmd_build_source {
5526 badusage "build-source takes no additional arguments" if @ARGV;
5528 maybe_unapply_patches_again();
5529 printdone "source built, results in $dscfn and $sourcechanges";
5534 midbuild_checkchanges();
5537 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5538 stat_exists $sourcechanges
5539 or fail "$sourcechanges (in parent directory): $!";
5541 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5543 maybe_unapply_patches_again();
5545 postbuild_mergechanges(<<END);
5546 perhaps you need to pass -A ? (sbuild's default is to build only
5547 arch-specific binaries; dgit 1.4 used to override that.)
5552 sub cmd_quilt_fixup {
5553 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5554 my $clogp = parsechangelog();
5555 $version = getfield $clogp, 'Version';
5556 $package = getfield $clogp, 'Source';
5559 build_maybe_quilt_fixup();
5562 sub cmd_import_dsc {
5566 last unless $ARGV[0] =~ m/^-/;
5569 if (m/^--require-valid-signature$/) {
5572 badusage "unknown dgit import-dsc sub-option \`$_'";
5576 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5577 my ($dscfn, $dstbranch) = @ARGV;
5579 badusage "dry run makes no sense with import-dsc" unless act_local();
5581 my $force = $dstbranch =~ s/^\+// ? +1 :
5582 $dstbranch =~ s/^\.\.// ? -1 :
5584 my $info = $force ? " $&" : '';
5585 $info = "$dscfn$info";
5587 my $specbranch = $dstbranch;
5588 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5589 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5591 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5592 my $chead = cmdoutput_errok @symcmd;
5593 defined $chead or $?==256 or failedcmd @symcmd;
5595 fail "$dstbranch is checked out - will not update it"
5596 if defined $chead and $chead eq $dstbranch;
5598 my $oldhash = git_get_ref $dstbranch;
5600 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5601 $dscdata = do { local $/ = undef; <D>; };
5602 D->error and fail "read $dscfn: $!";
5605 # we don't normally need this so import it here
5606 use Dpkg::Source::Package;
5607 my $dp = new Dpkg::Source::Package filename => $dscfn,
5608 require_valid_signature => $needsig;
5610 local $SIG{__WARN__} = sub {
5612 return unless $needsig;
5613 fail "import-dsc signature check failed";
5615 if (!$dp->is_signed()) {
5616 warn "$us: warning: importing unsigned .dsc\n";
5618 my $r = $dp->check_signature();
5619 die "->check_signature => $r" if $needsig && $r;
5625 my $dgit_commit = $dsc->{$ourdscfield[0]};
5626 if (defined $dgit_commit &&
5627 !forceing [qw(import-dsc-with-dgit-field)]) {
5628 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5629 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5630 my @cmd = (qw(sh -ec),
5631 "echo $dgit_commit | git cat-file --batch-check");
5632 my $objgot = cmdoutput @cmd;
5633 if ($objgot =~ m#^\w+ missing\b#) {
5635 .dsc contains Dgit field referring to object $dgit_commit
5636 Your git tree does not have that object. Try `git fetch' from a
5637 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5640 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5642 progress "Not fast forward, forced update.";
5644 fail "Not fast forward to $dgit_commit";
5647 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5648 $dstbranch, $dgit_commit);
5650 progress "dgit: import-dsc updated git ref $dstbranch";
5655 Branch $dstbranch already exists
5656 Specify ..$specbranch for a pseudo-merge, binding in existing history
5657 Specify +$specbranch to overwrite, discarding existing history
5659 if $oldhash && !$force;
5661 $package = getfield $dsc, 'Source';
5662 my @dfi = dsc_files_info();
5663 foreach my $fi (@dfi) {
5664 my $f = $fi->{Filename};
5666 next if lstat $here;
5667 fail "stat $here: $!" unless $! == ENOENT;
5669 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5671 } elsif ($dscfn =~ m#^/#) {
5674 fail "cannot import $dscfn which seems to be inside working tree!";
5676 $there =~ s#/+[^/]+$## or
5677 fail "cannot import $dscfn which seems to not have a basename";
5679 symlink $there, $here or fail "symlink $there to $here: $!";
5680 progress "made symlink $here -> $there";
5681 print STDERR Dumper($fi);
5683 my @mergeinputs = generate_commits_from_dsc();
5684 die unless @mergeinputs == 1;
5686 my $newhash = $mergeinputs[0]{Commit};
5690 progress "Import, forced update - synthetic orphan git history.";
5691 } elsif ($force < 0) {
5692 progress "Import, merging.";
5693 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5694 my $version = getfield $dsc, 'Version';
5695 $newhash = make_commit_text <<END;
5700 Merge $package ($version) import into $dstbranch
5703 die; # caught earlier
5707 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5708 $dstbranch, $newhash);
5710 progress "dgit: import-dsc results are in in git ref $dstbranch";
5713 sub cmd_archive_api_query {
5714 badusage "need only 1 subpath argument" unless @ARGV==1;
5715 my ($subpath) = @ARGV;
5716 my @cmd = archive_api_query_cmd($subpath);
5719 exec @cmd or fail "exec curl: $!\n";
5722 sub cmd_clone_dgit_repos_server {
5723 badusage "need destination argument" unless @ARGV==1;
5724 my ($destdir) = @ARGV;
5725 $package = '_dgit-repos-server';
5726 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5728 exec @cmd or fail "exec git clone: $!\n";
5731 sub cmd_setup_mergechangelogs {
5732 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5733 setup_mergechangelogs(1);
5736 sub cmd_setup_useremail {
5737 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5741 sub cmd_setup_new_tree {
5742 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5746 #---------- argument parsing and main program ----------
5749 print "dgit version $our_version\n" or die $!;
5753 our (%valopts_long, %valopts_short);
5756 sub defvalopt ($$$$) {
5757 my ($long,$short,$val_re,$how) = @_;
5758 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5759 $valopts_long{$long} = $oi;
5760 $valopts_short{$short} = $oi;
5761 # $how subref should:
5762 # do whatever assignemnt or thing it likes with $_[0]
5763 # if the option should not be passed on to remote, @rvalopts=()
5764 # or $how can be a scalar ref, meaning simply assign the value
5767 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5768 defvalopt '--distro', '-d', '.+', \$idistro;
5769 defvalopt '', '-k', '.+', \$keyid;
5770 defvalopt '--existing-package','', '.*', \$existing_package;
5771 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5772 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5773 defvalopt '--package', '-p', $package_re, \$package;
5774 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5776 defvalopt '', '-C', '.+', sub {
5777 ($changesfile) = (@_);
5778 if ($changesfile =~ s#^(.*)/##) {
5779 $buildproductsdir = $1;
5783 defvalopt '--initiator-tempdir','','.*', sub {
5784 ($initiator_tempdir) = (@_);
5785 $initiator_tempdir =~ m#^/# or
5786 badusage "--initiator-tempdir must be used specify an".
5787 " absolute, not relative, directory."
5793 if (defined $ENV{'DGIT_SSH'}) {
5794 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5795 } elsif (defined $ENV{'GIT_SSH'}) {
5796 @ssh = ($ENV{'GIT_SSH'});
5804 if (!defined $val) {
5805 badusage "$what needs a value" unless @ARGV;
5807 push @rvalopts, $val;
5809 badusage "bad value \`$val' for $what" unless
5810 $val =~ m/^$oi->{Re}$(?!\n)/s;
5811 my $how = $oi->{How};
5812 if (ref($how) eq 'SCALAR') {
5817 push @ropts, @rvalopts;
5821 last unless $ARGV[0] =~ m/^-/;
5825 if (m/^--dry-run$/) {
5828 } elsif (m/^--damp-run$/) {
5831 } elsif (m/^--no-sign$/) {
5834 } elsif (m/^--help$/) {
5836 } elsif (m/^--version$/) {
5838 } elsif (m/^--new$/) {
5841 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5842 ($om = $opts_opt_map{$1}) &&
5846 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5847 !$opts_opt_cmdonly{$1} &&
5848 ($om = $opts_opt_map{$1})) {
5851 } elsif (m/^--(gbp|dpm)$/s) {
5852 push @ropts, "--quilt=$1";
5854 } elsif (m/^--ignore-dirty$/s) {
5857 } elsif (m/^--no-quilt-fixup$/s) {
5859 $quilt_mode = 'nocheck';
5860 } elsif (m/^--no-rm-on-error$/s) {
5863 } elsif (m/^--overwrite$/s) {
5865 $overwrite_version = '';
5866 } elsif (m/^--overwrite=(.+)$/s) {
5868 $overwrite_version = $1;
5869 } elsif (m/^--delayed=(\d+)$/s) {
5872 } elsif (m/^--dgit-view-save=(.+)$/s) {
5874 $split_brain_save = $1;
5875 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
5876 } elsif (m/^--(no-)?rm-old-changes$/s) {
5879 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5881 push @deliberatelies, $&;
5882 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5886 } elsif (m/^--force-/) {
5888 "$us: warning: ignoring unknown force option $_\n";
5890 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5891 # undocumented, for testing
5893 $tagformat_want = [ $1, 'command line', 1 ];
5894 # 1 menas overrides distro configuration
5895 } elsif (m/^--always-split-source-build$/s) {
5896 # undocumented, for testing
5898 $need_split_build_invocation = 1;
5899 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5900 $val = $2 ? $' : undef; #';
5901 $valopt->($oi->{Long});
5903 badusage "unknown long option \`$_'";
5910 } elsif (s/^-L/-/) {
5913 } elsif (s/^-h/-/) {
5915 } elsif (s/^-D/-/) {
5919 } elsif (s/^-N/-/) {
5924 push @changesopts, $_;
5926 } elsif (s/^-wn$//s) {
5928 $cleanmode = 'none';
5929 } elsif (s/^-wg$//s) {
5932 } elsif (s/^-wgf$//s) {
5934 $cleanmode = 'git-ff';
5935 } elsif (s/^-wd$//s) {
5937 $cleanmode = 'dpkg-source';
5938 } elsif (s/^-wdd$//s) {
5940 $cleanmode = 'dpkg-source-d';
5941 } elsif (s/^-wc$//s) {
5943 $cleanmode = 'check';
5944 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5945 push @git, '-c', $&;
5946 $gitcfgs{cmdline}{$1} = [ $2 ];
5947 } elsif (s/^-c([^=]+)$//s) {
5948 push @git, '-c', $&;
5949 $gitcfgs{cmdline}{$1} = [ 'true' ];
5950 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5952 $val = undef unless length $val;
5953 $valopt->($oi->{Short});
5956 badusage "unknown short option \`$_'";
5963 sub check_env_sanity () {
5964 my $blocked = new POSIX::SigSet;
5965 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5968 foreach my $name (qw(PIPE CHLD)) {
5969 my $signame = "SIG$name";
5970 my $signum = eval "POSIX::$signame" // die;
5971 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5972 die "$signame is set to something other than SIG_DFL\n";
5973 $blocked->ismember($signum) and
5974 die "$signame is blocked\n";
5980 On entry to dgit, $@
5981 This is a bug produced by something in in your execution environment.
5987 sub finalise_opts_opts () {
5988 foreach my $k (keys %opts_opt_map) {
5989 my $om = $opts_opt_map{$k};
5991 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5993 badcfg "cannot set command for $k"
5994 unless length $om->[0];
5998 foreach my $c (access_cfg_cfgs("opts-$k")) {
6000 map { $_ ? @$_ : () }
6001 map { $gitcfgs{$_}{$c} }
6002 reverse @gitcfgsources;
6003 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6004 "\n" if $debuglevel >= 4;
6006 badcfg "cannot configure options for $k"
6007 if $opts_opt_cmdonly{$k};
6008 my $insertpos = $opts_cfg_insertpos{$k};
6009 @$om = ( @$om[0..$insertpos-1],
6011 @$om[$insertpos..$#$om] );
6016 if ($ENV{$fakeeditorenv}) {
6018 quilt_fixup_editor();
6025 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6026 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6027 if $dryrun_level == 1;
6029 print STDERR $helpmsg or die $!;
6032 my $cmd = shift @ARGV;
6035 my $pre_fn = ${*::}{"pre_$cmd"};
6036 $pre_fn->() if $pre_fn;
6038 if (!defined $rmchanges) {
6039 local $access_forpush;
6040 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6043 if (!defined $quilt_mode) {
6044 local $access_forpush;
6045 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6046 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6048 $quilt_mode =~ m/^($quilt_modes_re)$/
6049 or badcfg "unknown quilt-mode \`$quilt_mode'";
6053 $need_split_build_invocation ||= quiltmode_splitbrain();
6055 if (!defined $cleanmode) {
6056 local $access_forpush;
6057 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6058 $cleanmode //= 'dpkg-source';
6060 badcfg "unknown clean-mode \`$cleanmode'" unless
6061 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6064 my $fn = ${*::}{"cmd_$cmd"};
6065 $fn or badusage "unknown operation $cmd";