3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2018 Ian Jackson
6 # Copyright (C)2017-2018 Sean Whitton
8 # This program is free software: you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License as published by
10 # the Free Software Foundation, either version 3 of the License, or
11 # (at your option) any later version.
13 # This program is distributed in the hope that it will be useful,
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 # GNU General Public License for more details.
18 # You should have received a copy of the GNU General Public License
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
21 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
22 use Debian::Dgit::ExitStatus;
26 use Debian::Dgit qw(:DEFAULT :playground);
32 use Dpkg::Control::Hash;
34 use File::Temp qw(tempdir);
37 use Dpkg::Compression;
38 use Dpkg::Compression::Process;
43 use List::MoreUtils qw(pairwise);
44 use Text::Glob qw(match_glob);
45 use Fcntl qw(:DEFAULT :flock);
50 our $our_version = 'UNRELEASED'; ###substituted###
51 our $absurdity = undef; ###substituted###
53 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
64 our $dryrun_level = 0;
66 our $buildproductsdir;
69 our $includedirty = 0;
73 our $existing_package = 'dpkg';
75 our $changes_since_version;
77 our $overwrite_version; # undef: not specified; '': check changelog
79 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
81 our %internal_object_save;
82 our $we_are_responder;
83 our $we_are_initiator;
84 our $initiator_tempdir;
85 our $patches_applied_dirtily = 00;
89 our $chase_dsc_distro=1;
91 our %forceopts = map { $_=>0 }
92 qw(unrepresentable unsupported-source-format
93 dsc-changes-mismatch changes-origs-exactly
94 uploading-binaries uploading-source-only
95 import-gitapply-absurd
96 import-gitapply-no-absurd
97 import-dsc-with-dgit-field);
99 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
101 our $suite_re = '[-+.0-9a-z]+';
102 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
104 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
105 our $splitbraincache = 'dgit-intern/quilt-cache';
106 our $rewritemap = 'dgit-rewrite/map';
108 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
110 our (@git) = qw(git);
111 our (@dget) = qw(dget);
112 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
113 our (@dput) = qw(dput);
114 our (@debsign) = qw(debsign);
115 our (@gpg) = qw(gpg);
116 our (@sbuild) = qw(sbuild);
118 our (@dgit) = qw(dgit);
119 our (@git_debrebase) = qw(git-debrebase);
120 our (@aptget) = qw(apt-get);
121 our (@aptcache) = qw(apt-cache);
122 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
123 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
124 our (@dpkggenchanges) = qw(dpkg-genchanges);
125 our (@mergechanges) = qw(mergechanges -f);
126 our (@gbp_build) = ('');
127 our (@gbp_pq) = ('gbp pq');
128 our (@changesopts) = ('');
129 our (@pbuilder) = ("sudo -E pbuilder");
130 our (@cowbuilder) = ("sudo -E cowbuilder");
132 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
135 'debsign' => \@debsign,
137 'sbuild' => \@sbuild,
141 'git-debrebase' => \@git_debrebase,
142 'apt-get' => \@aptget,
143 'apt-cache' => \@aptcache,
144 'dpkg-source' => \@dpkgsource,
145 'dpkg-buildpackage' => \@dpkgbuildpackage,
146 'dpkg-genchanges' => \@dpkggenchanges,
147 'gbp-build' => \@gbp_build,
148 'gbp-pq' => \@gbp_pq,
149 'ch' => \@changesopts,
150 'mergechanges' => \@mergechanges,
151 'pbuilder' => \@pbuilder,
152 'cowbuilder' => \@cowbuilder);
154 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
155 our %opts_cfg_insertpos = map {
157 scalar @{ $opts_opt_map{$_} }
158 } keys %opts_opt_map;
160 sub parseopts_late_defaults();
161 sub setup_gitattrs(;$);
162 sub check_gitattrs($$);
169 our $supplementary_message = '';
170 our $split_brain = 0;
174 return unless forkcheck_mainprocess();
175 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
178 our $remotename = 'dgit';
179 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
183 if (!defined $absurdity) {
185 $absurdity =~ s{/[^/]+$}{/absurd} or die;
189 my ($v,$distro) = @_;
190 return $tagformatfn->($v, $distro);
193 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
195 sub lbranch () { return "$branchprefix/$csuite"; }
196 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
197 sub lref () { return "refs/heads/".lbranch(); }
198 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
199 sub rrref () { return server_ref($csuite); }
202 my ($vsn, $sfx) = @_;
203 return &source_file_leafname($package, $vsn, $sfx);
205 sub is_orig_file_of_vsn ($$) {
206 my ($f, $upstreamvsn) = @_;
207 return is_orig_file_of_p_v($f, $package, $upstreamvsn);
212 return srcfn($vsn,".dsc");
215 sub changespat ($;$) {
216 my ($vsn, $arch) = @_;
217 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
226 return unless forkcheck_mainprocess();
227 foreach my $f (@end) {
229 print STDERR "$us: cleanup: $@" if length $@;
233 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; finish 12; }
235 sub forceable_fail ($$) {
236 my ($forceoptsl, $msg) = @_;
237 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
238 print STDERR "warning: overriding problem due to --force:\n". $msg;
242 my ($forceoptsl) = @_;
243 my @got = grep { $forceopts{$_} } @$forceoptsl;
244 return 0 unless @got;
246 "warning: skipping checks or functionality due to --force-$got[0]\n";
249 sub no_such_package () {
250 print STDERR "$us: package $package does not exist in suite $isuite\n";
254 sub deliberately ($) {
256 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
259 sub deliberately_not_fast_forward () {
260 foreach (qw(not-fast-forward fresh-repo)) {
261 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
265 sub quiltmode_splitbrain () {
266 $quilt_mode =~ m/gbp|dpm|unapplied/;
269 sub opts_opt_multi_cmd {
272 push @cmd, split /\s+/, shift @_;
279 return opts_opt_multi_cmd [], @gbp_pq;
282 sub dgit_privdir () {
283 our $dgit_privdir_made //= ensure_a_playground 'dgit';
287 my $r = $buildproductsdir;
288 $r = "$maindir/$r" unless $r =~ m{^/};
292 sub branch_gdr_info ($$) {
293 my ($symref, $head) = @_;
294 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
295 gdr_ffq_prev_branchinfo($symref);
296 return () unless $status eq 'branch';
297 $ffq_prev = git_get_ref $ffq_prev;
298 $gdrlast = git_get_ref $gdrlast;
299 $gdrlast &&= is_fast_fwd $gdrlast, $head;
300 return ($ffq_prev, $gdrlast);
303 sub branch_is_gdr ($$) {
304 my ($symref, $head) = @_;
305 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
306 return 0 unless $ffq_prev || $gdrlast;
310 sub branch_is_gdr_unstitched_ff ($$$) {
311 my ($symref, $head, $ancestor) = @_;
312 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
313 return 0 unless $ffq_prev;
314 return 0 unless is_fast_fwd $ancestor, $ffq_prev;
318 #---------- remote protocol support, common ----------
320 # remote push initiator/responder protocol:
321 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
322 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
323 # < dgit-remote-push-ready <actual-proto-vsn>
330 # > supplementary-message NBYTES # $protovsn >= 3
335 # > file parsed-changelog
336 # [indicates that output of dpkg-parsechangelog follows]
337 # > data-block NBYTES
338 # > [NBYTES bytes of data (no newline)]
339 # [maybe some more blocks]
348 # > param head DGIT-VIEW-HEAD
349 # > param csuite SUITE
350 # > param tagformat old|new
351 # > param maint-view MAINT-VIEW-HEAD
353 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
354 # > file buildinfo # for buildinfos to sign
356 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
357 # # goes into tag, for replay prevention
360 # [indicates that signed tag is wanted]
361 # < data-block NBYTES
362 # < [NBYTES bytes of data (no newline)]
363 # [maybe some more blocks]
367 # > want signed-dsc-changes
368 # < data-block NBYTES [transfer of signed dsc]
370 # < data-block NBYTES [transfer of signed changes]
372 # < data-block NBYTES [transfer of each signed buildinfo
373 # [etc] same number and order as "file buildinfo"]
381 sub i_child_report () {
382 # Sees if our child has died, and reap it if so. Returns a string
383 # describing how it died if it failed, or undef otherwise.
384 return undef unless $i_child_pid;
385 my $got = waitpid $i_child_pid, WNOHANG;
386 return undef if $got <= 0;
387 die unless $got == $i_child_pid;
388 $i_child_pid = undef;
389 return undef unless $?;
390 return "build host child ".waitstatusmsg();
395 fail "connection lost: $!" if $fh->error;
396 fail "protocol violation; $m not expected";
399 sub badproto_badread ($$) {
401 fail "connection lost: $!" if $!;
402 my $report = i_child_report();
403 fail $report if defined $report;
404 badproto $fh, "eof (reading $wh)";
407 sub protocol_expect (&$) {
408 my ($match, $fh) = @_;
411 defined && chomp or badproto_badread $fh, "protocol message";
419 badproto $fh, "\`$_'";
422 sub protocol_send_file ($$) {
423 my ($fh, $ourfn) = @_;
424 open PF, "<", $ourfn or die "$ourfn: $!";
427 my $got = read PF, $d, 65536;
428 die "$ourfn: $!" unless defined $got;
430 print $fh "data-block ".length($d)."\n" or die $!;
431 print $fh $d or die $!;
433 PF->error and die "$ourfn $!";
434 print $fh "data-end\n" or die $!;
438 sub protocol_read_bytes ($$) {
439 my ($fh, $nbytes) = @_;
440 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
442 my $got = read $fh, $d, $nbytes;
443 $got==$nbytes or badproto_badread $fh, "data block";
447 sub protocol_receive_file ($$) {
448 my ($fh, $ourfn) = @_;
449 printdebug "() $ourfn\n";
450 open PF, ">", $ourfn or die "$ourfn: $!";
452 my ($y,$l) = protocol_expect {
453 m/^data-block (.*)$/ ? (1,$1) :
454 m/^data-end$/ ? (0,) :
458 my $d = protocol_read_bytes $fh, $l;
459 print PF $d or die $!;
464 #---------- remote protocol support, responder ----------
466 sub responder_send_command ($) {
468 return unless $we_are_responder;
469 # called even without $we_are_responder
470 printdebug ">> $command\n";
471 print PO $command, "\n" or die $!;
474 sub responder_send_file ($$) {
475 my ($keyword, $ourfn) = @_;
476 return unless $we_are_responder;
477 printdebug "]] $keyword $ourfn\n";
478 responder_send_command "file $keyword";
479 protocol_send_file \*PO, $ourfn;
482 sub responder_receive_files ($@) {
483 my ($keyword, @ourfns) = @_;
484 die unless $we_are_responder;
485 printdebug "[[ $keyword @ourfns\n";
486 responder_send_command "want $keyword";
487 foreach my $fn (@ourfns) {
488 protocol_receive_file \*PI, $fn;
491 protocol_expect { m/^files-end$/ } \*PI;
494 #---------- remote protocol support, initiator ----------
496 sub initiator_expect (&) {
498 protocol_expect { &$match } \*RO;
501 #---------- end remote code ----------
504 if ($we_are_responder) {
506 responder_send_command "progress ".length($m) or die $!;
507 print PO $m or die $!;
517 $ua = LWP::UserAgent->new();
521 progress "downloading $what...";
522 my $r = $ua->get(@_) or die $!;
523 return undef if $r->code == 404;
524 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
525 return $r->decoded_content(charset => 'none');
528 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
530 sub act_local () { return $dryrun_level <= 1; }
531 sub act_scary () { return !$dryrun_level; }
534 if (!$dryrun_level) {
535 progress "$us ok: @_";
537 progress "would be ok: @_ (but dry run only)";
542 printcmd(\*STDERR,$debugprefix."#",@_);
545 sub runcmd_ordryrun {
553 sub runcmd_ordryrun_local {
561 our $helpmsg = <<END;
563 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
564 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
565 dgit [dgit-opts] build [dpkg-buildpackage-opts]
566 dgit [dgit-opts] sbuild [sbuild-opts]
567 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
568 dgit [dgit-opts] push [dgit-opts] [suite]
569 dgit [dgit-opts] push-source [dgit-opts] [suite]
570 dgit [dgit-opts] rpush build-host:build-dir ...
571 important dgit options:
572 -k<keyid> sign tag and package with <keyid> instead of default
573 --dry-run -n do not change anything, but go through the motions
574 --damp-run -L like --dry-run but make local changes, without signing
575 --new -N allow introducing a new package
576 --debug -D increase debug level
577 -c<name>=<value> set git config option (used directly by dgit too)
580 our $later_warning_msg = <<END;
581 Perhaps the upload is stuck in incoming. Using the version from git.
585 print STDERR "$us: @_\n", $helpmsg or die $!;
590 @ARGV or badusage "too few arguments";
591 return scalar shift @ARGV;
595 not_necessarily_a_tree();
598 print $helpmsg or die $!;
602 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
604 our %defcfg = ('dgit.default.distro' => 'debian',
605 'dgit.default.default-suite' => 'unstable',
606 'dgit.default.old-dsc-distro' => 'debian',
607 'dgit-suite.*-security.distro' => 'debian-security',
608 'dgit.default.username' => '',
609 'dgit.default.archive-query-default-component' => 'main',
610 'dgit.default.ssh' => 'ssh',
611 'dgit.default.archive-query' => 'madison:',
612 'dgit.default.sshpsql-dbname' => 'service=projectb',
613 'dgit.default.aptget-components' => 'main',
614 'dgit.default.dgit-tag-format' => 'new,old,maint',
615 'dgit.default.source-only-uploads' => 'ok',
616 'dgit.dsc-url-proto-ok.http' => 'true',
617 'dgit.dsc-url-proto-ok.https' => 'true',
618 'dgit.dsc-url-proto-ok.git' => 'true',
619 'dgit.vcs-git.suites', => 'sid', # ;-separated
620 'dgit.default.dsc-url-proto-ok' => 'false',
621 # old means "repo server accepts pushes with old dgit tags"
622 # new means "repo server accepts pushes with new dgit tags"
623 # maint means "repo server accepts split brain pushes"
624 # hist means "repo server may have old pushes without new tag"
625 # ("hist" is implied by "old")
626 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
627 'dgit-distro.debian.git-check' => 'url',
628 'dgit-distro.debian.git-check-suffix' => '/info/refs',
629 'dgit-distro.debian.new-private-pushers' => 't',
630 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
631 'dgit-distro.debian/push.git-url' => '',
632 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
633 'dgit-distro.debian/push.git-user-force' => 'dgit',
634 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
635 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
636 'dgit-distro.debian/push.git-create' => 'true',
637 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
638 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
639 # 'dgit-distro.debian.archive-query-tls-key',
640 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
641 # ^ this does not work because curl is broken nowadays
642 # Fixing #790093 properly will involve providing providing the key
643 # in some pacagke and maybe updating these paths.
645 # 'dgit-distro.debian.archive-query-tls-curl-args',
646 # '--ca-path=/etc/ssl/ca-debian',
647 # ^ this is a workaround but works (only) on DSA-administered machines
648 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
649 'dgit-distro.debian.git-url-suffix' => '',
650 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
651 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
652 'dgit-distro.debian-security.archive-query' => 'aptget:',
653 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
654 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
655 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
656 'dgit-distro.debian-security.nominal-distro' => 'debian',
657 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
658 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
659 'dgit-distro.ubuntu.git-check' => 'false',
660 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
661 'dgit-distro.test-dummy.ssh' => "$td/ssh",
662 'dgit-distro.test-dummy.username' => "alice",
663 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
664 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
665 'dgit-distro.test-dummy.git-url' => "$td/git",
666 'dgit-distro.test-dummy.git-host' => "git",
667 'dgit-distro.test-dummy.git-path' => "$td/git",
668 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
669 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
670 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
671 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
675 our @gitcfgsources = qw(cmdline local global system);
676 our $invoked_in_git_tree = 1;
678 sub git_slurp_config () {
679 # This algoritm is a bit subtle, but this is needed so that for
680 # options which we want to be single-valued, we allow the
681 # different config sources to override properly. See #835858.
682 foreach my $src (@gitcfgsources) {
683 next if $src eq 'cmdline';
684 # we do this ourselves since git doesn't handle it
686 $gitcfgs{$src} = git_slurp_config_src $src;
690 sub git_get_config ($) {
692 foreach my $src (@gitcfgsources) {
693 my $l = $gitcfgs{$src}{$c};
694 confess "internal error ($l $c)" if $l && !ref $l;
695 printdebug"C $c ".(defined $l ?
696 join " ", map { messagequote "'$_'" } @$l :
700 @$l==1 or badcfg "multiple values for $c".
701 " (in $src git config)" if @$l > 1;
709 return undef if $c =~ /RETURN-UNDEF/;
710 printdebug "C? $c\n" if $debuglevel >= 5;
711 my $v = git_get_config($c);
712 return $v if defined $v;
713 my $dv = $defcfg{$c};
715 printdebug "CD $c $dv\n" if $debuglevel >= 4;
719 badcfg "need value for one of: @_\n".
720 "$us: distro or suite appears not to be (properly) supported";
723 sub not_necessarily_a_tree () {
724 # needs to be called from pre_*
725 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
726 $invoked_in_git_tree = 0;
729 sub access_basedistro__noalias () {
730 if (defined $idistro) {
733 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
734 return $def if defined $def;
735 foreach my $src (@gitcfgsources, 'internal') {
736 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
738 foreach my $k (keys %$kl) {
739 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
741 next unless match_glob $dpat, $isuite;
745 return cfg("dgit.default.distro");
749 sub access_basedistro () {
750 my $noalias = access_basedistro__noalias();
751 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
752 return $canon // $noalias;
755 sub access_nomdistro () {
756 my $base = access_basedistro();
757 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
758 $r =~ m/^$distro_re$/ or badcfg
759 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
763 sub access_quirk () {
764 # returns (quirk name, distro to use instead or undef, quirk-specific info)
765 my $basedistro = access_basedistro();
766 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
768 if (defined $backports_quirk) {
769 my $re = $backports_quirk;
770 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
772 $re =~ s/\%/([-0-9a-z_]+)/
773 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
774 if ($isuite =~ m/^$re$/) {
775 return ('backports',"$basedistro-backports",$1);
778 return ('none',undef);
783 sub parse_cfg_bool ($$$) {
784 my ($what,$def,$v) = @_;
787 $v =~ m/^[ty1]/ ? 1 :
788 $v =~ m/^[fn0]/ ? 0 :
789 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
792 sub access_forpush_config () {
793 my $d = access_basedistro();
797 parse_cfg_bool('new-private-pushers', 0,
798 cfg("dgit-distro.$d.new-private-pushers",
801 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
804 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
805 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
806 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
807 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
810 sub access_forpush () {
811 $access_forpush //= access_forpush_config();
812 return $access_forpush;
816 confess 'internal error '.Dumper($access_forpush)," ?" if
817 defined $access_forpush and !$access_forpush;
818 badcfg "pushing but distro is configured readonly"
819 if access_forpush_config() eq '0';
821 $supplementary_message = <<'END' unless $we_are_responder;
822 Push failed, before we got started.
823 You can retry the push, after fixing the problem, if you like.
825 parseopts_late_defaults();
829 parseopts_late_defaults();
832 sub supplementary_message ($) {
834 if (!$we_are_responder) {
835 $supplementary_message = $msg;
837 } elsif ($protovsn >= 3) {
838 responder_send_command "supplementary-message ".length($msg)
840 print PO $msg or die $!;
844 sub access_distros () {
845 # Returns list of distros to try, in order
848 # 0. `instead of' distro name(s) we have been pointed to
849 # 1. the access_quirk distro, if any
850 # 2a. the user's specified distro, or failing that } basedistro
851 # 2b. the distro calculated from the suite }
852 my @l = access_basedistro();
854 my (undef,$quirkdistro) = access_quirk();
855 unshift @l, $quirkdistro;
856 unshift @l, $instead_distro;
857 @l = grep { defined } @l;
859 push @l, access_nomdistro();
861 if (access_forpush()) {
862 @l = map { ("$_/push", $_) } @l;
867 sub access_cfg_cfgs (@) {
870 # The nesting of these loops determines the search order. We put
871 # the key loop on the outside so that we search all the distros
872 # for each key, before going on to the next key. That means that
873 # if access_cfg is called with a more specific, and then a less
874 # specific, key, an earlier distro can override the less specific
875 # without necessarily overriding any more specific keys. (If the
876 # distro wants to override the more specific keys it can simply do
877 # so; whereas if we did the loop the other way around, it would be
878 # impossible to for an earlier distro to override a less specific
879 # key but not the more specific ones without restating the unknown
880 # values of the more specific keys.
883 # We have to deal with RETURN-UNDEF specially, so that we don't
884 # terminate the search prematurely.
886 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
889 foreach my $d (access_distros()) {
890 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
892 push @cfgs, map { "dgit.default.$_" } @realkeys;
899 my (@cfgs) = access_cfg_cfgs(@keys);
900 my $value = cfg(@cfgs);
904 sub access_cfg_bool ($$) {
905 my ($def, @keys) = @_;
906 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
909 sub string_to_ssh ($) {
911 if ($spec =~ m/\s/) {
912 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
918 sub access_cfg_ssh () {
919 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
920 if (!defined $gitssh) {
923 return string_to_ssh $gitssh;
927 sub access_runeinfo ($) {
929 return ": dgit ".access_basedistro()." $info ;";
932 sub access_someuserhost ($) {
934 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
935 defined($user) && length($user) or
936 $user = access_cfg("$some-user",'username');
937 my $host = access_cfg("$some-host");
938 return length($user) ? "$user\@$host" : $host;
941 sub access_gituserhost () {
942 return access_someuserhost('git');
945 sub access_giturl (;$) {
947 my $url = access_cfg('git-url','RETURN-UNDEF');
950 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
951 return undef unless defined $proto;
954 access_gituserhost().
955 access_cfg('git-path');
957 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
960 return "$url/$package$suffix";
963 sub commit_getclogp ($) {
964 # Returns the parsed changelog hashref for a particular commit
966 our %commit_getclogp_memo;
967 my $memo = $commit_getclogp_memo{$objid};
968 return $memo if $memo;
970 my $mclog = dgit_privdir()."clog";
971 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
972 "$objid:debian/changelog";
973 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
976 sub parse_dscdata () {
977 my $dscfh = new IO::File \$dscdata, '<' or die $!;
978 printdebug Dumper($dscdata) if $debuglevel>1;
979 $dsc = parsecontrolfh($dscfh,$dscurl,1);
980 printdebug Dumper($dsc) if $debuglevel>1;
985 sub archive_query ($;@) {
986 my ($method) = shift @_;
987 fail "this operation does not support multiple comma-separated suites"
989 my $query = access_cfg('archive-query','RETURN-UNDEF');
990 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
993 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
996 sub archive_query_prepend_mirror {
997 my $m = access_cfg('mirror');
998 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1001 sub pool_dsc_subpath ($$) {
1002 my ($vsn,$component) = @_; # $package is implict arg
1003 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1004 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1007 sub cfg_apply_map ($$$) {
1008 my ($varref, $what, $mapspec) = @_;
1009 return unless $mapspec;
1011 printdebug "config $what EVAL{ $mapspec; }\n";
1013 eval "package Dgit::Config; $mapspec;";
1018 #---------- `ftpmasterapi' archive query method (nascent) ----------
1020 sub archive_api_query_cmd ($) {
1022 my @cmd = (@curl, qw(-sS));
1023 my $url = access_cfg('archive-query-url');
1024 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1026 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1027 foreach my $key (split /\:/, $keys) {
1028 $key =~ s/\%HOST\%/$host/g;
1030 fail "for $url: stat $key: $!" unless $!==ENOENT;
1033 fail "config requested specific TLS key but do not know".
1034 " how to get curl to use exactly that EE key ($key)";
1035 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1036 # # Sadly the above line does not work because of changes
1037 # # to gnutls. The real fix for #790093 may involve
1038 # # new curl options.
1041 # Fixing #790093 properly will involve providing a value
1042 # for this on clients.
1043 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1044 push @cmd, split / /, $kargs if defined $kargs;
1046 push @cmd, $url.$subpath;
1050 sub api_query ($$;$) {
1052 my ($data, $subpath, $ok404) = @_;
1053 badcfg "ftpmasterapi archive query method takes no data part"
1055 my @cmd = archive_api_query_cmd($subpath);
1056 my $url = $cmd[$#cmd];
1057 push @cmd, qw(-w %{http_code});
1058 my $json = cmdoutput @cmd;
1059 unless ($json =~ s/\d+\d+\d$//) {
1060 failedcmd_report_cmd undef, @cmd;
1061 fail "curl failed to print 3-digit HTTP code";
1064 return undef if $code eq '404' && $ok404;
1065 fail "fetch of $url gave HTTP code $code"
1066 unless $url =~ m#^file://# or $code =~ m/^2/;
1067 return decode_json($json);
1070 sub canonicalise_suite_ftpmasterapi {
1071 my ($proto,$data) = @_;
1072 my $suites = api_query($data, 'suites');
1074 foreach my $entry (@$suites) {
1076 my $v = $entry->{$_};
1077 defined $v && $v eq $isuite;
1078 } qw(codename name);
1079 push @matched, $entry;
1081 fail "unknown suite $isuite, maybe -d would help" unless @matched;
1084 @matched==1 or die "multiple matches for suite $isuite\n";
1085 $cn = "$matched[0]{codename}";
1086 defined $cn or die "suite $isuite info has no codename\n";
1087 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1089 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1094 sub archive_query_ftpmasterapi {
1095 my ($proto,$data) = @_;
1096 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1098 my $digester = Digest::SHA->new(256);
1099 foreach my $entry (@$info) {
1101 my $vsn = "$entry->{version}";
1102 my ($ok,$msg) = version_check $vsn;
1103 die "bad version: $msg\n" unless $ok;
1104 my $component = "$entry->{component}";
1105 $component =~ m/^$component_re$/ or die "bad component";
1106 my $filename = "$entry->{filename}";
1107 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1108 or die "bad filename";
1109 my $sha256sum = "$entry->{sha256sum}";
1110 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1111 push @rows, [ $vsn, "/pool/$component/$filename",
1112 $digester, $sha256sum ];
1114 die "bad ftpmaster api response: $@\n".Dumper($entry)
1117 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1118 return archive_query_prepend_mirror @rows;
1121 sub file_in_archive_ftpmasterapi {
1122 my ($proto,$data,$filename) = @_;
1123 my $pat = $filename;
1126 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1127 my $info = api_query($data, "file_in_archive/$pat", 1);
1130 sub package_not_wholly_new_ftpmasterapi {
1131 my ($proto,$data,$pkg) = @_;
1132 my $info = api_query($data,"madison?package=${pkg}&f=json");
1136 #---------- `aptget' archive query method ----------
1139 our $aptget_releasefile;
1140 our $aptget_configpath;
1142 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1143 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1145 sub aptget_cache_clean {
1146 runcmd_ordryrun_local qw(sh -ec),
1147 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1151 sub aptget_lock_acquire () {
1152 my $lockfile = "$aptget_base/lock";
1153 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1154 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1157 sub aptget_prep ($) {
1159 return if defined $aptget_base;
1161 badcfg "aptget archive query method takes no data part"
1164 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1167 ensuredir "$cache/dgit";
1169 access_cfg('aptget-cachekey','RETURN-UNDEF')
1170 // access_nomdistro();
1172 $aptget_base = "$cache/dgit/aptget";
1173 ensuredir $aptget_base;
1175 my $quoted_base = $aptget_base;
1176 die "$quoted_base contains bad chars, cannot continue"
1177 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1179 ensuredir $aptget_base;
1181 aptget_lock_acquire();
1183 aptget_cache_clean();
1185 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1186 my $sourceslist = "source.list#$cachekey";
1188 my $aptsuites = $isuite;
1189 cfg_apply_map(\$aptsuites, 'suite map',
1190 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1192 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1193 printf SRCS "deb-src %s %s %s\n",
1194 access_cfg('mirror'),
1196 access_cfg('aptget-components')
1199 ensuredir "$aptget_base/cache";
1200 ensuredir "$aptget_base/lists";
1202 open CONF, ">", $aptget_configpath or die $!;
1204 Debug::NoLocking "true";
1205 APT::Get::List-Cleanup "false";
1206 #clear APT::Update::Post-Invoke-Success;
1207 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1208 Dir::State::Lists "$quoted_base/lists";
1209 Dir::Etc::preferences "$quoted_base/preferences";
1210 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1211 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1214 foreach my $key (qw(
1217 Dir::Cache::Archives
1218 Dir::Etc::SourceParts
1219 Dir::Etc::preferencesparts
1221 ensuredir "$aptget_base/$key";
1222 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1225 my $oldatime = (time // die $!) - 1;
1226 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1227 next unless stat_exists $oldlist;
1228 my ($mtime) = (stat _)[9];
1229 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1232 runcmd_ordryrun_local aptget_aptget(), qw(update);
1235 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1236 next unless stat_exists $oldlist;
1237 my ($atime) = (stat _)[8];
1238 next if $atime == $oldatime;
1239 push @releasefiles, $oldlist;
1241 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1242 @releasefiles = @inreleasefiles if @inreleasefiles;
1243 if (!@releasefiles) {
1245 apt seemed to not to update dgit's cached Release files for $isuite.
1247 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1250 die "apt updated too many Release files (@releasefiles), erk"
1251 unless @releasefiles == 1;
1253 ($aptget_releasefile) = @releasefiles;
1256 sub canonicalise_suite_aptget {
1257 my ($proto,$data) = @_;
1260 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1262 foreach my $name (qw(Codename Suite)) {
1263 my $val = $release->{$name};
1265 printdebug "release file $name: $val\n";
1266 $val =~ m/^$suite_re$/o or fail
1267 "Release file ($aptget_releasefile) specifies intolerable $name";
1268 cfg_apply_map(\$val, 'suite rmap',
1269 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1276 sub archive_query_aptget {
1277 my ($proto,$data) = @_;
1280 ensuredir "$aptget_base/source";
1281 foreach my $old (<$aptget_base/source/*.dsc>) {
1282 unlink $old or die "$old: $!";
1285 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1286 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1287 # avoids apt-get source failing with ambiguous error code
1289 runcmd_ordryrun_local
1290 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1291 aptget_aptget(), qw(--download-only --only-source source), $package;
1293 my @dscs = <$aptget_base/source/*.dsc>;
1294 fail "apt-get source did not produce a .dsc" unless @dscs;
1295 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1297 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1300 my $uri = "file://". uri_escape $dscs[0];
1301 $uri =~ s{\%2f}{/}gi;
1302 return [ (getfield $pre_dsc, 'Version'), $uri ];
1305 sub file_in_archive_aptget () { return undef; }
1306 sub package_not_wholly_new_aptget () { return undef; }
1308 #---------- `dummyapicat' archive query method ----------
1310 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1311 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1313 sub dummycatapi_run_in_mirror ($@) {
1314 # runs $fn with FIA open onto rune
1315 my ($rune, $argl, $fn) = @_;
1317 my $mirror = access_cfg('mirror');
1318 $mirror =~ s#^file://#/# or die "$mirror ?";
1319 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1320 qw(x), $mirror, @$argl);
1321 debugcmd "-|", @cmd;
1322 open FIA, "-|", @cmd or die $!;
1324 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1328 sub file_in_archive_dummycatapi ($$$) {
1329 my ($proto,$data,$filename) = @_;
1331 dummycatapi_run_in_mirror '
1332 find -name "$1" -print0 |
1334 ', [$filename], sub {
1337 printdebug "| $_\n";
1338 m/^(\w+) (\S+)$/ or die "$_ ?";
1339 push @out, { sha256sum => $1, filename => $2 };
1345 sub package_not_wholly_new_dummycatapi {
1346 my ($proto,$data,$pkg) = @_;
1347 dummycatapi_run_in_mirror "
1348 find -name ${pkg}_*.dsc
1355 #---------- `madison' archive query method ----------
1357 sub archive_query_madison {
1358 return archive_query_prepend_mirror
1359 map { [ @$_[0..1] ] } madison_get_parse(@_);
1362 sub madison_get_parse {
1363 my ($proto,$data) = @_;
1364 die unless $proto eq 'madison';
1365 if (!length $data) {
1366 $data= access_cfg('madison-distro','RETURN-UNDEF');
1367 $data //= access_basedistro();
1369 $rmad{$proto,$data,$package} ||= cmdoutput
1370 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1371 my $rmad = $rmad{$proto,$data,$package};
1374 foreach my $l (split /\n/, $rmad) {
1375 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1376 \s*( [^ \t|]+ )\s* \|
1377 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1378 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1379 $1 eq $package or die "$rmad $package ?";
1386 $component = access_cfg('archive-query-default-component');
1388 $5 eq 'source' or die "$rmad ?";
1389 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1391 return sort { -version_compare($a->[0],$b->[0]); } @out;
1394 sub canonicalise_suite_madison {
1395 # madison canonicalises for us
1396 my @r = madison_get_parse(@_);
1398 "unable to canonicalise suite using package $package".
1399 " which does not appear to exist in suite $isuite;".
1400 " --existing-package may help";
1404 sub file_in_archive_madison { return undef; }
1405 sub package_not_wholly_new_madison { return undef; }
1407 #---------- `sshpsql' archive query method ----------
1410 my ($data,$runeinfo,$sql) = @_;
1411 if (!length $data) {
1412 $data= access_someuserhost('sshpsql').':'.
1413 access_cfg('sshpsql-dbname');
1415 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1416 my ($userhost,$dbname) = ($`,$'); #';
1418 my @cmd = (access_cfg_ssh, $userhost,
1419 access_runeinfo("ssh-psql $runeinfo").
1420 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1421 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1423 open P, "-|", @cmd or die $!;
1426 printdebug(">|$_|\n");
1429 $!=0; $?=0; close P or failedcmd @cmd;
1431 my $nrows = pop @rows;
1432 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1433 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1434 @rows = map { [ split /\|/, $_ ] } @rows;
1435 my $ncols = scalar @{ shift @rows };
1436 die if grep { scalar @$_ != $ncols } @rows;
1440 sub sql_injection_check {
1441 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1444 sub archive_query_sshpsql ($$) {
1445 my ($proto,$data) = @_;
1446 sql_injection_check $isuite, $package;
1447 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1448 SELECT source.version, component.name, files.filename, files.sha256sum
1450 JOIN src_associations ON source.id = src_associations.source
1451 JOIN suite ON suite.id = src_associations.suite
1452 JOIN dsc_files ON dsc_files.source = source.id
1453 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1454 JOIN component ON component.id = files_archive_map.component_id
1455 JOIN files ON files.id = dsc_files.file
1456 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1457 AND source.source='$package'
1458 AND files.filename LIKE '%.dsc';
1460 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1461 my $digester = Digest::SHA->new(256);
1463 my ($vsn,$component,$filename,$sha256sum) = @$_;
1464 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1466 return archive_query_prepend_mirror @rows;
1469 sub canonicalise_suite_sshpsql ($$) {
1470 my ($proto,$data) = @_;
1471 sql_injection_check $isuite;
1472 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1473 SELECT suite.codename
1474 FROM suite where suite_name='$isuite' or codename='$isuite';
1476 @rows = map { $_->[0] } @rows;
1477 fail "unknown suite $isuite" unless @rows;
1478 die "ambiguous $isuite: @rows ?" if @rows>1;
1482 sub file_in_archive_sshpsql ($$$) { return undef; }
1483 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1485 #---------- `dummycat' archive query method ----------
1487 sub canonicalise_suite_dummycat ($$) {
1488 my ($proto,$data) = @_;
1489 my $dpath = "$data/suite.$isuite";
1490 if (!open C, "<", $dpath) {
1491 $!==ENOENT or die "$dpath: $!";
1492 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1496 chomp or die "$dpath: $!";
1498 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1502 sub archive_query_dummycat ($$) {
1503 my ($proto,$data) = @_;
1504 canonicalise_suite();
1505 my $dpath = "$data/package.$csuite.$package";
1506 if (!open C, "<", $dpath) {
1507 $!==ENOENT or die "$dpath: $!";
1508 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1516 printdebug "dummycat query $csuite $package $dpath | $_\n";
1517 my @row = split /\s+/, $_;
1518 @row==2 or die "$dpath: $_ ?";
1521 C->error and die "$dpath: $!";
1523 return archive_query_prepend_mirror
1524 sort { -version_compare($a->[0],$b->[0]); } @rows;
1527 sub file_in_archive_dummycat () { return undef; }
1528 sub package_not_wholly_new_dummycat () { return undef; }
1530 #---------- tag format handling ----------
1532 sub access_cfg_tagformats () {
1533 split /\,/, access_cfg('dgit-tag-format');
1536 sub access_cfg_tagformats_can_splitbrain () {
1537 my %y = map { $_ => 1 } access_cfg_tagformats;
1538 foreach my $needtf (qw(new maint)) {
1539 next if $y{$needtf};
1545 sub need_tagformat ($$) {
1546 my ($fmt, $why) = @_;
1547 fail "need to use tag format $fmt ($why) but also need".
1548 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1549 " - no way to proceed"
1550 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1551 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1554 sub select_tagformat () {
1556 return if $tagformatfn && !$tagformat_want;
1557 die 'bug' if $tagformatfn && $tagformat_want;
1558 # ... $tagformat_want assigned after previous select_tagformat
1560 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1561 printdebug "select_tagformat supported @supported\n";
1563 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1564 printdebug "select_tagformat specified @$tagformat_want\n";
1566 my ($fmt,$why,$override) = @$tagformat_want;
1568 fail "target distro supports tag formats @supported".
1569 " but have to use $fmt ($why)"
1571 or grep { $_ eq $fmt } @supported;
1573 $tagformat_want = undef;
1575 $tagformatfn = ${*::}{"debiantag_$fmt"};
1577 fail "trying to use unknown tag format \`$fmt' ($why) !"
1578 unless $tagformatfn;
1581 #---------- archive query entrypoints and rest of program ----------
1583 sub canonicalise_suite () {
1584 return if defined $csuite;
1585 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1586 $csuite = archive_query('canonicalise_suite');
1587 if ($isuite ne $csuite) {
1588 progress "canonical suite name for $isuite is $csuite";
1590 progress "canonical suite name is $csuite";
1594 sub get_archive_dsc () {
1595 canonicalise_suite();
1596 my @vsns = archive_query('archive_query');
1597 foreach my $vinfo (@vsns) {
1598 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1599 $dscurl = $vsn_dscurl;
1600 $dscdata = url_get($dscurl);
1602 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1607 $digester->add($dscdata);
1608 my $got = $digester->hexdigest();
1610 fail "$dscurl has hash $got but".
1611 " archive told us to expect $digest";
1614 my $fmt = getfield $dsc, 'Format';
1615 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1616 "unsupported source format $fmt, sorry";
1618 $dsc_checked = !!$digester;
1619 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1623 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1626 sub check_for_git ();
1627 sub check_for_git () {
1629 my $how = access_cfg('git-check');
1630 if ($how eq 'ssh-cmd') {
1632 (access_cfg_ssh, access_gituserhost(),
1633 access_runeinfo("git-check $package").
1634 " set -e; cd ".access_cfg('git-path').";".
1635 " if test -d $package.git; then echo 1; else echo 0; fi");
1636 my $r= cmdoutput @cmd;
1637 if (defined $r and $r =~ m/^divert (\w+)$/) {
1639 my ($usedistro,) = access_distros();
1640 # NB that if we are pushing, $usedistro will be $distro/push
1641 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1642 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1643 progress "diverting to $divert (using config for $instead_distro)";
1644 return check_for_git();
1646 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1648 } elsif ($how eq 'url') {
1649 my $prefix = access_cfg('git-check-url','git-url');
1650 my $suffix = access_cfg('git-check-suffix','git-suffix',
1651 'RETURN-UNDEF') // '.git';
1652 my $url = "$prefix/$package$suffix";
1653 my @cmd = (@curl, qw(-sS -I), $url);
1654 my $result = cmdoutput @cmd;
1655 $result =~ s/^\S+ 200 .*\n\r?\n//;
1656 # curl -sS -I with https_proxy prints
1657 # HTTP/1.0 200 Connection established
1658 $result =~ m/^\S+ (404|200) /s or
1659 fail "unexpected results from git check query - ".
1660 Dumper($prefix, $result);
1662 if ($code eq '404') {
1664 } elsif ($code eq '200') {
1669 } elsif ($how eq 'true') {
1671 } elsif ($how eq 'false') {
1674 badcfg "unknown git-check \`$how'";
1678 sub create_remote_git_repo () {
1679 my $how = access_cfg('git-create');
1680 if ($how eq 'ssh-cmd') {
1682 (access_cfg_ssh, access_gituserhost(),
1683 access_runeinfo("git-create $package").
1684 "set -e; cd ".access_cfg('git-path').";".
1685 " cp -a _template $package.git");
1686 } elsif ($how eq 'true') {
1689 badcfg "unknown git-create \`$how'";
1693 our ($dsc_hash,$lastpush_mergeinput);
1694 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1698 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1699 $playground = fresh_playground 'dgit/unpack';
1702 sub mktree_in_ud_here () {
1703 playtree_setup $gitcfgs{local};
1706 sub git_write_tree () {
1707 my $tree = cmdoutput @git, qw(write-tree);
1708 $tree =~ m/^\w+$/ or die "$tree ?";
1712 sub git_add_write_tree () {
1713 runcmd @git, qw(add -Af .);
1714 return git_write_tree();
1717 sub remove_stray_gits ($) {
1719 my @gitscmd = qw(find -name .git -prune -print0);
1720 debugcmd "|",@gitscmd;
1721 open GITS, "-|", @gitscmd or die $!;
1726 print STDERR "$us: warning: removing from $what: ",
1727 (messagequote $_), "\n";
1731 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1734 sub mktree_in_ud_from_only_subdir ($;$) {
1735 my ($what,$raw) = @_;
1736 # changes into the subdir
1739 die "expected one subdir but found @dirs ?" unless @dirs==1;
1740 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1744 remove_stray_gits($what);
1745 mktree_in_ud_here();
1747 my ($format, $fopts) = get_source_format();
1748 if (madformat($format)) {
1753 my $tree=git_add_write_tree();
1754 return ($tree,$dir);
1757 our @files_csum_info_fields =
1758 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1759 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1760 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1762 sub dsc_files_info () {
1763 foreach my $csumi (@files_csum_info_fields) {
1764 my ($fname, $module, $method) = @$csumi;
1765 my $field = $dsc->{$fname};
1766 next unless defined $field;
1767 eval "use $module; 1;" or die $@;
1769 foreach (split /\n/, $field) {
1771 m/^(\w+) (\d+) (\S+)$/ or
1772 fail "could not parse .dsc $fname line \`$_'";
1773 my $digester = eval "$module"."->$method;" or die $@;
1778 Digester => $digester,
1783 fail "missing any supported Checksums-* or Files field in ".
1784 $dsc->get_option('name');
1788 map { $_->{Filename} } dsc_files_info();
1791 sub files_compare_inputs (@) {
1796 my $showinputs = sub {
1797 return join "; ", map { $_->get_option('name') } @$inputs;
1800 foreach my $in (@$inputs) {
1802 my $in_name = $in->get_option('name');
1804 printdebug "files_compare_inputs $in_name\n";
1806 foreach my $csumi (@files_csum_info_fields) {
1807 my ($fname) = @$csumi;
1808 printdebug "files_compare_inputs $in_name $fname\n";
1810 my $field = $in->{$fname};
1811 next unless defined $field;
1814 foreach (split /\n/, $field) {
1817 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1818 fail "could not parse $in_name $fname line \`$_'";
1820 printdebug "files_compare_inputs $in_name $fname $f\n";
1824 my $re = \ $record{$f}{$fname};
1826 $fchecked{$f}{$in_name} = 1;
1828 fail "hash or size of $f varies in $fname fields".
1829 " (between: ".$showinputs->().")";
1834 @files = sort @files;
1835 $expected_files //= \@files;
1836 "@$expected_files" eq "@files" or
1837 fail "file list in $in_name varies between hash fields!";
1840 fail "$in_name has no files list field(s)";
1842 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1845 grep { keys %$_ == @$inputs-1 } values %fchecked
1846 or fail "no file appears in all file lists".
1847 " (looked in: ".$showinputs->().")";
1850 sub is_orig_file_in_dsc ($$) {
1851 my ($f, $dsc_files_info) = @_;
1852 return 0 if @$dsc_files_info <= 1;
1853 # One file means no origs, and the filename doesn't have a "what
1854 # part of dsc" component. (Consider versions ending `.orig'.)
1855 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1859 # This function determines whether a .changes file is source-only from
1860 # the point of view of dak. Thus, it permits *_source.buildinfo
1863 # It does not, however, permit any other buildinfo files. After a
1864 # source-only upload, the buildds will try to upload files like
1865 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1866 # named like this in their (otherwise) source-only upload, the uploads
1867 # of the buildd can be rejected by dak. Fixing the resultant
1868 # situation can require manual intervention. So we block such
1869 # .buildinfo files when the user tells us to perform a source-only
1870 # upload (such as when using the push-source subcommand with the -C
1871 # option, which calls this function).
1873 # Note, though, that when dgit is told to prepare a source-only
1874 # upload, such as when subcommands like build-source and push-source
1875 # without -C are used, dgit has a more restrictive notion of
1876 # source-only .changes than dak: such uploads will never include
1877 # *_source.buildinfo files. This is because there is no use for such
1878 # files when using a tool like dgit to produce the source package, as
1879 # dgit ensures the source is identical to git HEAD.
1880 sub test_source_only_changes ($) {
1882 foreach my $l (split /\n/, getfield $changes, 'Files') {
1883 $l =~ m/\S+$/ or next;
1884 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1885 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1886 print "purportedly source-only changes polluted by $&\n";
1893 sub changes_update_origs_from_dsc ($$$$) {
1894 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1896 printdebug "checking origs needed ($upstreamvsn)...\n";
1897 $_ = getfield $changes, 'Files';
1898 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1899 fail "cannot find section/priority from .changes Files field";
1900 my $placementinfo = $1;
1902 printdebug "checking origs needed placement '$placementinfo'...\n";
1903 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1904 $l =~ m/\S+$/ or next;
1906 printdebug "origs $file | $l\n";
1907 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1908 printdebug "origs $file is_orig\n";
1909 my $have = archive_query('file_in_archive', $file);
1910 if (!defined $have) {
1912 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1918 printdebug "origs $file \$#\$have=$#$have\n";
1919 foreach my $h (@$have) {
1922 foreach my $csumi (@files_csum_info_fields) {
1923 my ($fname, $module, $method, $archivefield) = @$csumi;
1924 next unless defined $h->{$archivefield};
1925 $_ = $dsc->{$fname};
1926 next unless defined;
1927 m/^(\w+) .* \Q$file\E$/m or
1928 fail ".dsc $fname missing entry for $file";
1929 if ($h->{$archivefield} eq $1) {
1933 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1936 die "$file ".Dumper($h)." ?!" if $same && @differ;
1939 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1942 printdebug "origs $file f.same=$found_same".
1943 " #f._differ=$#found_differ\n";
1944 if (@found_differ && !$found_same) {
1946 "archive contains $file with different checksum",
1949 # Now we edit the changes file to add or remove it
1950 foreach my $csumi (@files_csum_info_fields) {
1951 my ($fname, $module, $method, $archivefield) = @$csumi;
1952 next unless defined $changes->{$fname};
1954 # in archive, delete from .changes if it's there
1955 $changed{$file} = "removed" if
1956 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
1957 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
1958 # not in archive, but it's here in the .changes
1960 my $dsc_data = getfield $dsc, $fname;
1961 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
1963 $extra =~ s/ \d+ /$&$placementinfo /
1964 or die "$fname $extra >$dsc_data< ?"
1965 if $fname eq 'Files';
1966 $changes->{$fname} .= "\n". $extra;
1967 $changed{$file} = "added";
1972 foreach my $file (keys %changed) {
1974 "edited .changes for archive .orig contents: %s %s",
1975 $changed{$file}, $file;
1977 my $chtmp = "$changesfile.tmp";
1978 $changes->save($chtmp);
1980 rename $chtmp,$changesfile or die "$changesfile $!";
1982 progress "[new .changes left in $changesfile]";
1985 progress "$changesfile already has appropriate .orig(s) (if any)";
1989 sub make_commit ($) {
1991 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1994 sub make_commit_text ($) {
1997 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1999 print Dumper($text) if $debuglevel > 1;
2000 my $child = open2($out, $in, @cmd) or die $!;
2003 print $in $text or die $!;
2004 close $in or die $!;
2006 $h =~ m/^\w+$/ or die;
2008 printdebug "=> $h\n";
2011 waitpid $child, 0 == $child or die "$child $!";
2012 $? and failedcmd @cmd;
2016 sub clogp_authline ($) {
2018 my $author = getfield $clogp, 'Maintainer';
2019 if ($author =~ m/^[^"\@]+\,/) {
2020 # single entry Maintainer field with unquoted comma
2021 $author = ($& =~ y/,//rd).$'; # strip the comma
2023 # git wants a single author; any remaining commas in $author
2024 # are by now preceded by @ (or "). It seems safer to punt on
2025 # "..." for now rather than attempting to dequote or something.
2026 $author =~ s#,.*##ms unless $author =~ m/"/;
2027 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2028 my $authline = "$author $date";
2029 $authline =~ m/$git_authline_re/o or
2030 fail "unexpected commit author line format \`$authline'".
2031 " (was generated from changelog Maintainer field)";
2032 return ($1,$2,$3) if wantarray;
2036 sub vendor_patches_distro ($$) {
2037 my ($checkdistro, $what) = @_;
2038 return unless defined $checkdistro;
2040 my $series = "debian/patches/\L$checkdistro\E.series";
2041 printdebug "checking for vendor-specific $series ($what)\n";
2043 if (!open SERIES, "<", $series) {
2044 die "$series $!" unless $!==ENOENT;
2053 Unfortunately, this source package uses a feature of dpkg-source where
2054 the same source package unpacks to different source code on different
2055 distros. dgit cannot safely operate on such packages on affected
2056 distros, because the meaning of source packages is not stable.
2058 Please ask the distro/maintainer to remove the distro-specific series
2059 files and use a different technique (if necessary, uploading actually
2060 different packages, if different distros are supposed to have
2064 fail "Found active distro-specific series file for".
2065 " $checkdistro ($what): $series, cannot continue";
2067 die "$series $!" if SERIES->error;
2071 sub check_for_vendor_patches () {
2072 # This dpkg-source feature doesn't seem to be documented anywhere!
2073 # But it can be found in the changelog (reformatted):
2075 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2076 # Author: Raphael Hertzog <hertzog@debian.org>
2077 # Date: Sun Oct 3 09:36:48 2010 +0200
2079 # dpkg-source: correctly create .pc/.quilt_series with alternate
2082 # If you have debian/patches/ubuntu.series and you were
2083 # unpacking the source package on ubuntu, quilt was still
2084 # directed to debian/patches/series instead of
2085 # debian/patches/ubuntu.series.
2087 # debian/changelog | 3 +++
2088 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2089 # 2 files changed, 6 insertions(+), 1 deletion(-)
2092 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2093 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2094 "Dpkg::Vendor \`current vendor'");
2095 vendor_patches_distro(access_basedistro(),
2096 "(base) distro being accessed");
2097 vendor_patches_distro(access_nomdistro(),
2098 "(nominal) distro being accessed");
2101 sub generate_commits_from_dsc () {
2102 # See big comment in fetch_from_archive, below.
2103 # See also README.dsc-import.
2105 changedir $playground;
2107 my @dfi = dsc_files_info();
2108 foreach my $fi (@dfi) {
2109 my $f = $fi->{Filename};
2110 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2111 my $upper_f = (bpd_abs()."/$f");
2113 printdebug "considering reusing $f: ";
2115 if (link_ltarget "$upper_f,fetch", $f) {
2116 printdebug "linked (using ...,fetch).\n";
2117 } elsif ((printdebug "($!) "),
2119 fail "accessing $buildproductsdir/$f,fetch: $!";
2120 } elsif (link_ltarget $upper_f, $f) {
2121 printdebug "linked.\n";
2122 } elsif ((printdebug "($!) "),
2124 fail "accessing $buildproductsdir/$f: $!";
2126 printdebug "absent.\n";
2130 complete_file_from_dsc('.', $fi, \$refetched)
2133 printdebug "considering saving $f: ";
2135 if (link $f, $upper_f) {
2136 printdebug "linked.\n";
2137 } elsif ((printdebug "($!) "),
2139 fail "saving $buildproductsdir/$f: $!";
2140 } elsif (!$refetched) {
2141 printdebug "no need.\n";
2142 } elsif (link $f, "$upper_f,fetch") {
2143 printdebug "linked (using ...,fetch).\n";
2144 } elsif ((printdebug "($!) "),
2146 fail "saving $buildproductsdir/$f,fetch: $!";
2148 printdebug "cannot.\n";
2152 # We unpack and record the orig tarballs first, so that we only
2153 # need disk space for one private copy of the unpacked source.
2154 # But we can't make them into commits until we have the metadata
2155 # from the debian/changelog, so we record the tree objects now and
2156 # make them into commits later.
2158 my $upstreamv = upstreamversion $dsc->{version};
2159 my $orig_f_base = srcfn $upstreamv, '';
2161 foreach my $fi (@dfi) {
2162 # We actually import, and record as a commit, every tarball
2163 # (unless there is only one file, in which case there seems
2166 my $f = $fi->{Filename};
2167 printdebug "import considering $f ";
2168 (printdebug "only one dfi\n"), next if @dfi == 1;
2169 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2170 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2174 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2176 printdebug "Y ", (join ' ', map { $_//"(none)" }
2177 $compr_ext, $orig_f_part
2180 my $input = new IO::File $f, '<' or die "$f $!";
2184 if (defined $compr_ext) {
2186 Dpkg::Compression::compression_guess_from_filename $f;
2187 fail "Dpkg::Compression cannot handle file $f in source package"
2188 if defined $compr_ext && !defined $cname;
2190 new Dpkg::Compression::Process compression => $cname;
2191 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2192 my $compr_fh = new IO::Handle;
2193 my $compr_pid = open $compr_fh, "-|" // die $!;
2195 open STDIN, "<&", $input or die $!;
2197 die "dgit (child): exec $compr_cmd[0]: $!\n";
2202 rmtree "_unpack-tar";
2203 mkdir "_unpack-tar" or die $!;
2204 my @tarcmd = qw(tar -x -f -
2205 --no-same-owner --no-same-permissions
2206 --no-acls --no-xattrs --no-selinux);
2207 my $tar_pid = fork // die $!;
2209 chdir "_unpack-tar" or die $!;
2210 open STDIN, "<&", $input or die $!;
2212 die "dgit (child): exec $tarcmd[0]: $!";
2214 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2215 !$? or failedcmd @tarcmd;
2218 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2220 # finally, we have the results in "tarball", but maybe
2221 # with the wrong permissions
2223 runcmd qw(chmod -R +rwX _unpack-tar);
2224 changedir "_unpack-tar";
2225 remove_stray_gits($f);
2226 mktree_in_ud_here();
2228 my ($tree) = git_add_write_tree();
2229 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2230 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2232 printdebug "one subtree $1\n";
2234 printdebug "multiple subtrees\n";
2237 rmtree "_unpack-tar";
2239 my $ent = [ $f, $tree ];
2241 Orig => !!$orig_f_part,
2242 Sort => (!$orig_f_part ? 2 :
2243 $orig_f_part =~ m/-/g ? 1 :
2251 # put any without "_" first (spec is not clear whether files
2252 # are always in the usual order). Tarballs without "_" are
2253 # the main orig or the debian tarball.
2254 $a->{Sort} <=> $b->{Sort} or
2258 my $any_orig = grep { $_->{Orig} } @tartrees;
2260 my $dscfn = "$package.dsc";
2262 my $treeimporthow = 'package';
2264 open D, ">", $dscfn or die "$dscfn: $!";
2265 print D $dscdata or die "$dscfn: $!";
2266 close D or die "$dscfn: $!";
2267 my @cmd = qw(dpkg-source);
2268 push @cmd, '--no-check' if $dsc_checked;
2269 if (madformat $dsc->{format}) {
2270 push @cmd, '--skip-patches';
2271 $treeimporthow = 'unpatched';
2273 push @cmd, qw(-x --), $dscfn;
2276 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2277 if (madformat $dsc->{format}) {
2278 check_for_vendor_patches();
2282 if (madformat $dsc->{format}) {
2283 my @pcmd = qw(dpkg-source --before-build .);
2284 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2286 $dappliedtree = git_add_write_tree();
2289 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2293 printdebug "import clog search...\n";
2294 parsechangelog_loop \@clogcmd, "package changelog", sub {
2295 my ($thisstanza, $desc) = @_;
2296 no warnings qw(exiting);
2298 $clogp //= $thisstanza;
2300 printdebug "import clog $thisstanza->{version} $desc...\n";
2302 last if !$any_orig; # we don't need $r1clogp
2304 # We look for the first (most recent) changelog entry whose
2305 # version number is lower than the upstream version of this
2306 # package. Then the last (least recent) previous changelog
2307 # entry is treated as the one which introduced this upstream
2308 # version and used for the synthetic commits for the upstream
2311 # One might think that a more sophisticated algorithm would be
2312 # necessary. But: we do not want to scan the whole changelog
2313 # file. Stopping when we see an earlier version, which
2314 # necessarily then is an earlier upstream version, is the only
2315 # realistic way to do that. Then, either the earliest
2316 # changelog entry we have seen so far is indeed the earliest
2317 # upload of this upstream version; or there are only changelog
2318 # entries relating to later upstream versions (which is not
2319 # possible unless the changelog and .dsc disagree about the
2320 # version). Then it remains to choose between the physically
2321 # last entry in the file, and the one with the lowest version
2322 # number. If these are not the same, we guess that the
2323 # versions were created in a non-monotonic order rather than
2324 # that the changelog entries have been misordered.
2326 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2328 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2329 $r1clogp = $thisstanza;
2331 printdebug "import clog $r1clogp->{version} becomes r1\n";
2334 $clogp or fail "package changelog has no entries!";
2336 my $authline = clogp_authline $clogp;
2337 my $changes = getfield $clogp, 'Changes';
2338 $changes =~ s/^\n//; # Changes: \n
2339 my $cversion = getfield $clogp, 'Version';
2342 $r1clogp //= $clogp; # maybe there's only one entry;
2343 my $r1authline = clogp_authline $r1clogp;
2344 # Strictly, r1authline might now be wrong if it's going to be
2345 # unused because !$any_orig. Whatever.
2347 printdebug "import tartrees authline $authline\n";
2348 printdebug "import tartrees r1authline $r1authline\n";
2350 foreach my $tt (@tartrees) {
2351 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2353 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2356 committer $r1authline
2360 [dgit import orig $tt->{F}]
2368 [dgit import tarball $package $cversion $tt->{F}]
2373 printdebug "import main commit\n";
2375 open C, ">../commit.tmp" or die $!;
2376 print C <<END or die $!;
2379 print C <<END or die $! foreach @tartrees;
2382 print C <<END or die $!;
2388 [dgit import $treeimporthow $package $cversion]
2392 my $rawimport_hash = make_commit qw(../commit.tmp);
2394 if (madformat $dsc->{format}) {
2395 printdebug "import apply patches...\n";
2397 # regularise the state of the working tree so that
2398 # the checkout of $rawimport_hash works nicely.
2399 my $dappliedcommit = make_commit_text(<<END);
2406 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2408 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2410 # We need the answers to be reproducible
2411 my @authline = clogp_authline($clogp);
2412 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2413 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2414 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2415 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2416 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2417 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2419 my $path = $ENV{PATH} or die;
2421 # we use ../../gbp-pq-output, which (given that we are in
2422 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2425 foreach my $use_absurd (qw(0 1)) {
2426 runcmd @git, qw(checkout -q unpa);
2427 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2428 local $ENV{PATH} = $path;
2431 progress "warning: $@";
2432 $path = "$absurdity:$path";
2433 progress "$us: trying slow absurd-git-apply...";
2434 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2439 die "forbid absurd git-apply\n" if $use_absurd
2440 && forceing [qw(import-gitapply-no-absurd)];
2441 die "only absurd git-apply!\n" if !$use_absurd
2442 && forceing [qw(import-gitapply-absurd)];
2444 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2445 local $ENV{PATH} = $path if $use_absurd;
2447 my @showcmd = (gbp_pq, qw(import));
2448 my @realcmd = shell_cmd
2449 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2450 debugcmd "+",@realcmd;
2451 if (system @realcmd) {
2452 die +(shellquote @showcmd).
2454 failedcmd_waitstatus()."\n";
2457 my $gapplied = git_rev_parse('HEAD');
2458 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2459 $gappliedtree eq $dappliedtree or
2461 gbp-pq import and dpkg-source disagree!
2462 gbp-pq import gave commit $gapplied
2463 gbp-pq import gave tree $gappliedtree
2464 dpkg-source --before-build gave tree $dappliedtree
2466 $rawimport_hash = $gapplied;
2471 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2476 progress "synthesised git commit from .dsc $cversion";
2478 my $rawimport_mergeinput = {
2479 Commit => $rawimport_hash,
2480 Info => "Import of source package",
2482 my @output = ($rawimport_mergeinput);
2484 if ($lastpush_mergeinput) {
2485 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2486 my $oversion = getfield $oldclogp, 'Version';
2488 version_compare($oversion, $cversion);
2490 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2491 { Message => <<END, ReverseParents => 1 });
2492 Record $package ($cversion) in archive suite $csuite
2494 } elsif ($vcmp > 0) {
2495 print STDERR <<END or die $!;
2497 Version actually in archive: $cversion (older)
2498 Last version pushed with dgit: $oversion (newer or same)
2501 @output = $lastpush_mergeinput;
2503 # Same version. Use what's in the server git branch,
2504 # discarding our own import. (This could happen if the
2505 # server automatically imports all packages into git.)
2506 @output = $lastpush_mergeinput;
2514 sub complete_file_from_dsc ($$;$) {
2515 our ($dstdir, $fi, $refetched) = @_;
2516 # Ensures that we have, in $dstdir, the file $fi, with the correct
2517 # contents. (Downloading it from alongside $dscurl if necessary.)
2518 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2519 # and will set $$refetched=1 if it did so (or tried to).
2521 my $f = $fi->{Filename};
2522 my $tf = "$dstdir/$f";
2526 my $checkhash = sub {
2527 open F, "<", "$tf" or die "$tf: $!";
2528 $fi->{Digester}->reset();
2529 $fi->{Digester}->addfile(*F);
2530 F->error and die $!;
2531 $got = $fi->{Digester}->hexdigest();
2532 return $got eq $fi->{Hash};
2535 if (stat_exists $tf) {
2536 if ($checkhash->()) {
2537 progress "using existing $f";
2541 fail "file $f has hash $got but .dsc".
2542 " demands hash $fi->{Hash} ".
2543 "(perhaps you should delete this file?)";
2545 progress "need to fetch correct version of $f";
2546 unlink $tf or die "$tf $!";
2549 printdebug "$tf does not exist, need to fetch\n";
2553 $furl =~ s{/[^/]+$}{};
2555 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2556 die "$f ?" if $f =~ m#/#;
2557 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2558 return 0 if !act_local();
2561 fail "file $f has hash $got but .dsc".
2562 " demands hash $fi->{Hash} ".
2563 "(got wrong file from archive!)";
2568 sub ensure_we_have_orig () {
2569 my @dfi = dsc_files_info();
2570 foreach my $fi (@dfi) {
2571 my $f = $fi->{Filename};
2572 next unless is_orig_file_in_dsc($f, \@dfi);
2573 complete_file_from_dsc($buildproductsdir, $fi)
2578 #---------- git fetch ----------
2580 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2581 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2583 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2584 # locally fetched refs because they have unhelpful names and clutter
2585 # up gitk etc. So we track whether we have "used up" head ref (ie,
2586 # whether we have made another local ref which refers to this object).
2588 # (If we deleted them unconditionally, then we might end up
2589 # re-fetching the same git objects each time dgit fetch was run.)
2591 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2592 # in git_fetch_us to fetch the refs in question, and possibly a call
2593 # to lrfetchref_used.
2595 our (%lrfetchrefs_f, %lrfetchrefs_d);
2596 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2598 sub lrfetchref_used ($) {
2599 my ($fullrefname) = @_;
2600 my $objid = $lrfetchrefs_f{$fullrefname};
2601 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2604 sub git_lrfetch_sane {
2605 my ($url, $supplementary, @specs) = @_;
2606 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2607 # at least as regards @specs. Also leave the results in
2608 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2609 # able to clean these up.
2611 # With $supplementary==1, @specs must not contain wildcards
2612 # and we add to our previous fetches (non-atomically).
2614 # This is rather miserable:
2615 # When git fetch --prune is passed a fetchspec ending with a *,
2616 # it does a plausible thing. If there is no * then:
2617 # - it matches subpaths too, even if the supplied refspec
2618 # starts refs, and behaves completely madly if the source
2619 # has refs/refs/something. (See, for example, Debian #NNNN.)
2620 # - if there is no matching remote ref, it bombs out the whole
2622 # We want to fetch a fixed ref, and we don't know in advance
2623 # if it exists, so this is not suitable.
2625 # Our workaround is to use git ls-remote. git ls-remote has its
2626 # own qairks. Notably, it has the absurd multi-tail-matching
2627 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2628 # refs/refs/foo etc.
2630 # Also, we want an idempotent snapshot, but we have to make two
2631 # calls to the remote: one to git ls-remote and to git fetch. The
2632 # solution is use git ls-remote to obtain a target state, and
2633 # git fetch to try to generate it. If we don't manage to generate
2634 # the target state, we try again.
2636 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2638 my $specre = join '|', map {
2641 my $wildcard = $x =~ s/\\\*$/.*/;
2642 die if $wildcard && $supplementary;
2645 printdebug "git_lrfetch_sane specre=$specre\n";
2646 my $wanted_rref = sub {
2648 return m/^(?:$specre)$/;
2651 my $fetch_iteration = 0;
2654 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2655 if (++$fetch_iteration > 10) {
2656 fail "too many iterations trying to get sane fetch!";
2659 my @look = map { "refs/$_" } @specs;
2660 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2664 open GITLS, "-|", @lcmd or die $!;
2666 printdebug "=> ", $_;
2667 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2668 my ($objid,$rrefname) = ($1,$2);
2669 if (!$wanted_rref->($rrefname)) {
2671 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2675 $wantr{$rrefname} = $objid;
2678 close GITLS or failedcmd @lcmd;
2680 # OK, now %want is exactly what we want for refs in @specs
2682 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2683 "+refs/$_:".lrfetchrefs."/$_";
2686 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2688 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2689 runcmd_ordryrun_local @fcmd if @fspecs;
2691 if (!$supplementary) {
2692 %lrfetchrefs_f = ();
2696 git_for_each_ref(lrfetchrefs, sub {
2697 my ($objid,$objtype,$lrefname,$reftail) = @_;
2698 $lrfetchrefs_f{$lrefname} = $objid;
2699 $objgot{$objid} = 1;
2702 if ($supplementary) {
2706 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2707 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2708 if (!exists $wantr{$rrefname}) {
2709 if ($wanted_rref->($rrefname)) {
2711 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2715 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2718 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2719 delete $lrfetchrefs_f{$lrefname};
2723 foreach my $rrefname (sort keys %wantr) {
2724 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2725 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2726 my $want = $wantr{$rrefname};
2727 next if $got eq $want;
2728 if (!defined $objgot{$want}) {
2729 fail <<END unless act_local();
2730 --dry-run specified but we actually wanted the results of git fetch,
2731 so this is not going to work. Try running dgit fetch first,
2732 or using --damp-run instead of --dry-run.
2735 warning: git ls-remote suggests we want $lrefname
2736 warning: and it should refer to $want
2737 warning: but git fetch didn't fetch that object to any relevant ref.
2738 warning: This may be due to a race with someone updating the server.
2739 warning: Will try again...
2741 next FETCH_ITERATION;
2744 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2746 runcmd_ordryrun_local @git, qw(update-ref -m),
2747 "dgit fetch git fetch fixup", $lrefname, $want;
2748 $lrfetchrefs_f{$lrefname} = $want;
2753 if (defined $csuite) {
2754 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2755 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2756 my ($objid,$objtype,$lrefname,$reftail) = @_;
2757 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2758 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2762 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2763 Dumper(\%lrfetchrefs_f);
2766 sub git_fetch_us () {
2767 # Want to fetch only what we are going to use, unless
2768 # deliberately-not-ff, in which case we must fetch everything.
2770 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2772 (quiltmode_splitbrain
2773 ? (map { $_->('*',access_nomdistro) }
2774 \&debiantag_new, \&debiantag_maintview)
2775 : debiantags('*',access_nomdistro));
2776 push @specs, server_branch($csuite);
2777 push @specs, $rewritemap;
2778 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2780 my $url = access_giturl();
2781 git_lrfetch_sane $url, 0, @specs;
2784 my @tagpats = debiantags('*',access_nomdistro);
2786 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2787 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2788 printdebug "currently $fullrefname=$objid\n";
2789 $here{$fullrefname} = $objid;
2791 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2792 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2793 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2794 printdebug "offered $lref=$objid\n";
2795 if (!defined $here{$lref}) {
2796 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2797 runcmd_ordryrun_local @upd;
2798 lrfetchref_used $fullrefname;
2799 } elsif ($here{$lref} eq $objid) {
2800 lrfetchref_used $fullrefname;
2803 "Not updating $lref from $here{$lref} to $objid.\n";
2808 #---------- dsc and archive handling ----------
2810 sub mergeinfo_getclogp ($) {
2811 # Ensures thit $mi->{Clogp} exists and returns it
2813 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2816 sub mergeinfo_version ($) {
2817 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2820 sub fetch_from_archive_record_1 ($) {
2822 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
2823 cmdoutput @git, qw(log -n2), $hash;
2824 # ... gives git a chance to complain if our commit is malformed
2827 sub fetch_from_archive_record_2 ($) {
2829 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
2833 dryrun_report @upd_cmd;
2837 sub parse_dsc_field_def_dsc_distro () {
2838 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2839 dgit.default.distro);
2842 sub parse_dsc_field ($$) {
2843 my ($dsc, $what) = @_;
2845 foreach my $field (@ourdscfield) {
2846 $f = $dsc->{$field};
2851 progress "$what: NO git hash";
2852 parse_dsc_field_def_dsc_distro();
2853 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2854 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2855 progress "$what: specified git info ($dsc_distro)";
2856 $dsc_hint_tag = [ $dsc_hint_tag ];
2857 } elsif ($f =~ m/^\w+\s*$/) {
2859 parse_dsc_field_def_dsc_distro();
2860 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2862 progress "$what: specified git hash";
2864 fail "$what: invalid Dgit info";
2868 sub resolve_dsc_field_commit ($$) {
2869 my ($already_distro, $already_mapref) = @_;
2871 return unless defined $dsc_hash;
2874 defined $already_mapref &&
2875 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2876 ? $already_mapref : undef;
2880 my ($what, @fetch) = @_;
2882 local $idistro = $dsc_distro;
2883 my $lrf = lrfetchrefs;
2885 if (!$chase_dsc_distro) {
2887 "not chasing .dsc distro $dsc_distro: not fetching $what";
2892 ".dsc names distro $dsc_distro: fetching $what";
2894 my $url = access_giturl();
2895 if (!defined $url) {
2896 defined $dsc_hint_url or fail <<END;
2897 .dsc Dgit metadata is in context of distro $dsc_distro
2898 for which we have no configured url and .dsc provides no hint
2901 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2902 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2903 parse_cfg_bool "dsc-url-proto-ok", 'false',
2904 cfg("dgit.dsc-url-proto-ok.$proto",
2905 "dgit.default.dsc-url-proto-ok")
2907 .dsc Dgit metadata is in context of distro $dsc_distro
2908 for which we have no configured url;
2909 .dsc provides hinted url with protocol $proto which is unsafe.
2910 (can be overridden by config - consult documentation)
2912 $url = $dsc_hint_url;
2915 git_lrfetch_sane $url, 1, @fetch;
2920 my $rewrite_enable = do {
2921 local $idistro = $dsc_distro;
2922 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2925 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2926 if (!defined $mapref) {
2927 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2928 $mapref = $lrf.'/'.$rewritemap;
2930 my $rewritemapdata = git_cat_file $mapref.':map';
2931 if (defined $rewritemapdata
2932 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2934 "server's git history rewrite map contains a relevant entry!";
2937 if (defined $dsc_hash) {
2938 progress "using rewritten git hash in place of .dsc value";
2940 progress "server data says .dsc hash is to be disregarded";
2945 if (!defined git_cat_file $dsc_hash) {
2946 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2947 my $lrf = $do_fetch->("additional commits", @tags) &&
2948 defined git_cat_file $dsc_hash
2950 .dsc Dgit metadata requires commit $dsc_hash
2951 but we could not obtain that object anywhere.
2953 foreach my $t (@tags) {
2954 my $fullrefname = $lrf.'/'.$t;
2955 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2956 next unless $lrfetchrefs_f{$fullrefname};
2957 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2958 lrfetchref_used $fullrefname;
2963 sub fetch_from_archive () {
2964 ensure_setup_existing_tree();
2966 # Ensures that lrref() is what is actually in the archive, one way
2967 # or another, according to us - ie this client's
2968 # appropritaely-updated archive view. Also returns the commit id.
2969 # If there is nothing in the archive, leaves lrref alone and
2970 # returns undef. git_fetch_us must have already been called.
2974 parse_dsc_field($dsc, 'last upload to archive');
2975 resolve_dsc_field_commit access_basedistro,
2976 lrfetchrefs."/".$rewritemap
2978 progress "no version available from the archive";
2981 # If the archive's .dsc has a Dgit field, there are three
2982 # relevant git commitids we need to choose between and/or merge
2984 # 1. $dsc_hash: the Dgit field from the archive
2985 # 2. $lastpush_hash: the suite branch on the dgit git server
2986 # 3. $lastfetch_hash: our local tracking brach for the suite
2988 # These may all be distinct and need not be in any fast forward
2991 # If the dsc was pushed to this suite, then the server suite
2992 # branch will have been updated; but it might have been pushed to
2993 # a different suite and copied by the archive. Conversely a more
2994 # recent version may have been pushed with dgit but not appeared
2995 # in the archive (yet).
2997 # $lastfetch_hash may be awkward because archive imports
2998 # (particularly, imports of Dgit-less .dscs) are performed only as
2999 # needed on individual clients, so different clients may perform a
3000 # different subset of them - and these imports are only made
3001 # public during push. So $lastfetch_hash may represent a set of
3002 # imports different to a subsequent upload by a different dgit
3005 # Our approach is as follows:
3007 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3008 # descendant of $dsc_hash, then it was pushed by a dgit user who
3009 # had based their work on $dsc_hash, so we should prefer it.
3010 # Otherwise, $dsc_hash was installed into this suite in the
3011 # archive other than by a dgit push, and (necessarily) after the
3012 # last dgit push into that suite (since a dgit push would have
3013 # been descended from the dgit server git branch); thus, in that
3014 # case, we prefer the archive's version (and produce a
3015 # pseudo-merge to overwrite the dgit server git branch).
3017 # (If there is no Dgit field in the archive's .dsc then
3018 # generate_commit_from_dsc uses the version numbers to decide
3019 # whether the suite branch or the archive is newer. If the suite
3020 # branch is newer it ignores the archive's .dsc; otherwise it
3021 # generates an import of the .dsc, and produces a pseudo-merge to
3022 # overwrite the suite branch with the archive contents.)
3024 # The outcome of that part of the algorithm is the `public view',
3025 # and is same for all dgit clients: it does not depend on any
3026 # unpublished history in the local tracking branch.
3028 # As between the public view and the local tracking branch: The
3029 # local tracking branch is only updated by dgit fetch, and
3030 # whenever dgit fetch runs it includes the public view in the
3031 # local tracking branch. Therefore if the public view is not
3032 # descended from the local tracking branch, the local tracking
3033 # branch must contain history which was imported from the archive
3034 # but never pushed; and, its tip is now out of date. So, we make
3035 # a pseudo-merge to overwrite the old imports and stitch the old
3038 # Finally: we do not necessarily reify the public view (as
3039 # described above). This is so that we do not end up stacking two
3040 # pseudo-merges. So what we actually do is figure out the inputs
3041 # to any public view pseudo-merge and put them in @mergeinputs.
3044 # $mergeinputs[]{Commit}
3045 # $mergeinputs[]{Info}
3046 # $mergeinputs[0] is the one whose tree we use
3047 # @mergeinputs is in the order we use in the actual commit)
3050 # $mergeinputs[]{Message} is a commit message to use
3051 # $mergeinputs[]{ReverseParents} if def specifies that parent
3052 # list should be in opposite order
3053 # Such an entry has no Commit or Info. It applies only when found
3054 # in the last entry. (This ugliness is to support making
3055 # identical imports to previous dgit versions.)
3057 my $lastpush_hash = git_get_ref(lrfetchref());
3058 printdebug "previous reference hash=$lastpush_hash\n";
3059 $lastpush_mergeinput = $lastpush_hash && {
3060 Commit => $lastpush_hash,
3061 Info => "dgit suite branch on dgit git server",
3064 my $lastfetch_hash = git_get_ref(lrref());
3065 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3066 my $lastfetch_mergeinput = $lastfetch_hash && {
3067 Commit => $lastfetch_hash,
3068 Info => "dgit client's archive history view",
3071 my $dsc_mergeinput = $dsc_hash && {
3072 Commit => $dsc_hash,
3073 Info => "Dgit field in .dsc from archive",
3077 my $del_lrfetchrefs = sub {
3080 printdebug "del_lrfetchrefs...\n";
3081 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3082 my $objid = $lrfetchrefs_d{$fullrefname};
3083 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3085 $gur ||= new IO::Handle;
3086 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3088 printf $gur "delete %s %s\n", $fullrefname, $objid;
3091 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3095 if (defined $dsc_hash) {
3096 ensure_we_have_orig();
3097 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3098 @mergeinputs = $dsc_mergeinput
3099 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3100 print STDERR <<END or die $!;
3102 Git commit in archive is behind the last version allegedly pushed/uploaded.
3103 Commit referred to by archive: $dsc_hash
3104 Last version pushed with dgit: $lastpush_hash
3107 @mergeinputs = ($lastpush_mergeinput);
3109 # Archive has .dsc which is not a descendant of the last dgit
3110 # push. This can happen if the archive moves .dscs about.
3111 # Just follow its lead.
3112 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3113 progress "archive .dsc names newer git commit";
3114 @mergeinputs = ($dsc_mergeinput);
3116 progress "archive .dsc names other git commit, fixing up";
3117 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3121 @mergeinputs = generate_commits_from_dsc();
3122 # We have just done an import. Now, our import algorithm might
3123 # have been improved. But even so we do not want to generate
3124 # a new different import of the same package. So if the
3125 # version numbers are the same, just use our existing version.
3126 # If the version numbers are different, the archive has changed
3127 # (perhaps, rewound).
3128 if ($lastfetch_mergeinput &&
3129 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3130 (mergeinfo_version $mergeinputs[0]) )) {
3131 @mergeinputs = ($lastfetch_mergeinput);
3133 } elsif ($lastpush_hash) {
3134 # only in git, not in the archive yet
3135 @mergeinputs = ($lastpush_mergeinput);
3136 print STDERR <<END or die $!;
3138 Package not found in the archive, but has allegedly been pushed using dgit.
3142 printdebug "nothing found!\n";
3143 if (defined $skew_warning_vsn) {
3144 print STDERR <<END or die $!;
3146 Warning: relevant archive skew detected.
3147 Archive allegedly contains $skew_warning_vsn
3148 But we were not able to obtain any version from the archive or git.
3152 unshift @end, $del_lrfetchrefs;
3156 if ($lastfetch_hash &&
3158 my $h = $_->{Commit};
3159 $h and is_fast_fwd($lastfetch_hash, $h);
3160 # If true, one of the existing parents of this commit
3161 # is a descendant of the $lastfetch_hash, so we'll
3162 # be ff from that automatically.
3166 push @mergeinputs, $lastfetch_mergeinput;
3169 printdebug "fetch mergeinfos:\n";
3170 foreach my $mi (@mergeinputs) {
3172 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3174 printdebug sprintf " ReverseParents=%d Message=%s",
3175 $mi->{ReverseParents}, $mi->{Message};
3179 my $compat_info= pop @mergeinputs
3180 if $mergeinputs[$#mergeinputs]{Message};
3182 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3185 if (@mergeinputs > 1) {
3187 my $tree_commit = $mergeinputs[0]{Commit};
3189 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3190 $tree =~ m/\n\n/; $tree = $`;
3191 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3194 # We use the changelog author of the package in question the
3195 # author of this pseudo-merge. This is (roughly) correct if
3196 # this commit is simply representing aa non-dgit upload.
3197 # (Roughly because it does not record sponsorship - but we
3198 # don't have sponsorship info because that's in the .changes,
3199 # which isn't in the archivw.)
3201 # But, it might be that we are representing archive history
3202 # updates (including in-archive copies). These are not really
3203 # the responsibility of the person who created the .dsc, but
3204 # there is no-one whose name we should better use. (The
3205 # author of the .dsc-named commit is clearly worse.)
3207 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3208 my $author = clogp_authline $useclogp;
3209 my $cversion = getfield $useclogp, 'Version';
3211 my $mcf = dgit_privdir()."/mergecommit";
3212 open MC, ">", $mcf or die "$mcf $!";
3213 print MC <<END or die $!;
3217 my @parents = grep { $_->{Commit} } @mergeinputs;
3218 @parents = reverse @parents if $compat_info->{ReverseParents};
3219 print MC <<END or die $! foreach @parents;
3223 print MC <<END or die $!;
3229 if (defined $compat_info->{Message}) {
3230 print MC $compat_info->{Message} or die $!;
3232 print MC <<END or die $!;
3233 Record $package ($cversion) in archive suite $csuite
3237 my $message_add_info = sub {
3239 my $mversion = mergeinfo_version $mi;
3240 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3244 $message_add_info->($mergeinputs[0]);
3245 print MC <<END or die $!;
3246 should be treated as descended from
3248 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3252 $hash = make_commit $mcf;
3254 $hash = $mergeinputs[0]{Commit};
3256 printdebug "fetch hash=$hash\n";
3259 my ($lasth, $what) = @_;
3260 return unless $lasth;
3261 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3264 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3266 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3268 fetch_from_archive_record_1($hash);
3270 if (defined $skew_warning_vsn) {
3271 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3272 my $gotclogp = commit_getclogp($hash);
3273 my $got_vsn = getfield $gotclogp, 'Version';
3274 printdebug "SKEW CHECK GOT $got_vsn\n";
3275 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3276 print STDERR <<END or die $!;
3278 Warning: archive skew detected. Using the available version:
3279 Archive allegedly contains $skew_warning_vsn
3280 We were able to obtain only $got_vsn
3286 if ($lastfetch_hash ne $hash) {
3287 fetch_from_archive_record_2($hash);
3290 lrfetchref_used lrfetchref();
3292 check_gitattrs($hash, "fetched source tree");
3294 unshift @end, $del_lrfetchrefs;
3298 sub set_local_git_config ($$) {
3300 runcmd @git, qw(config), $k, $v;
3303 sub setup_mergechangelogs (;$) {
3305 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3307 my $driver = 'dpkg-mergechangelogs';
3308 my $cb = "merge.$driver";
3309 confess unless defined $maindir;
3310 my $attrs = "$maindir_gitcommon/info/attributes";
3311 ensuredir "$maindir_gitcommon/info";
3313 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3314 if (!open ATTRS, "<", $attrs) {
3315 $!==ENOENT or die "$attrs: $!";
3319 next if m{^debian/changelog\s};
3320 print NATTRS $_, "\n" or die $!;
3322 ATTRS->error and die $!;
3325 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3328 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3329 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3331 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3334 sub setup_useremail (;$) {
3336 return unless $always || access_cfg_bool(1, 'setup-useremail');
3339 my ($k, $envvar) = @_;
3340 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3341 return unless defined $v;
3342 set_local_git_config "user.$k", $v;
3345 $setup->('email', 'DEBEMAIL');
3346 $setup->('name', 'DEBFULLNAME');
3349 sub ensure_setup_existing_tree () {
3350 my $k = "remote.$remotename.skipdefaultupdate";
3351 my $c = git_get_config $k;
3352 return if defined $c;
3353 set_local_git_config $k, 'true';
3356 sub open_main_gitattrs () {
3357 confess 'internal error no maindir' unless defined $maindir;
3358 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3360 or die "open $maindir_gitcommon/info/attributes: $!";
3364 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3366 sub is_gitattrs_setup () {
3369 # 1: gitattributes set up and should be left alone
3371 # 0: there is a dgit-defuse-attrs but it needs fixing
3372 # undef: there is none
3373 my $gai = open_main_gitattrs();
3374 return 0 unless $gai;
3376 next unless m{$gitattrs_ourmacro_re};
3377 return 1 if m{\s-working-tree-encoding\s};
3378 printdebug "is_gitattrs_setup: found old macro\n";
3381 $gai->error and die $!;
3382 printdebug "is_gitattrs_setup: found nothing\n";
3386 sub setup_gitattrs (;$) {
3388 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3390 my $already = is_gitattrs_setup();
3393 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3394 not doing further gitattributes setup
3398 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3399 my $af = "$maindir_gitcommon/info/attributes";
3400 ensuredir "$maindir_gitcommon/info";
3402 open GAO, "> $af.new" or die $!;
3403 print GAO <<END or die $! unless defined $already;
3406 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3408 my $gai = open_main_gitattrs();
3411 if (m{$gitattrs_ourmacro_re}) {
3412 die unless defined $already;
3416 print GAO $_, "\n" or die $!;
3418 $gai->error and die $!;
3420 close GAO or die $!;
3421 rename "$af.new", "$af" or die "install $af: $!";
3424 sub setup_new_tree () {
3425 setup_mergechangelogs();
3430 sub check_gitattrs ($$) {
3431 my ($treeish, $what) = @_;
3433 return if is_gitattrs_setup;
3436 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3438 my $gafl = new IO::File;
3439 open $gafl, "-|", @cmd or die $!;
3442 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3444 next unless m{(?:^|/)\.gitattributes$};
3446 # oh dear, found one
3448 dgit: warning: $what contains .gitattributes
3449 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3454 # tree contains no .gitattributes files
3455 $?=0; $!=0; close $gafl or failedcmd @cmd;
3459 sub multisuite_suite_child ($$$) {
3460 my ($tsuite, $merginputs, $fn) = @_;
3461 # in child, sets things up, calls $fn->(), and returns undef
3462 # in parent, returns canonical suite name for $tsuite
3463 my $canonsuitefh = IO::File::new_tmpfile;
3464 my $pid = fork // die $!;
3468 $us .= " [$isuite]";
3469 $debugprefix .= " ";
3470 progress "fetching $tsuite...";
3471 canonicalise_suite();
3472 print $canonsuitefh $csuite, "\n" or die $!;
3473 close $canonsuitefh or die $!;
3477 waitpid $pid,0 == $pid or die $!;
3478 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3479 seek $canonsuitefh,0,0 or die $!;
3480 local $csuite = <$canonsuitefh>;
3481 die $! unless defined $csuite && chomp $csuite;
3483 printdebug "multisuite $tsuite missing\n";
3486 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3487 push @$merginputs, {
3494 sub fork_for_multisuite ($) {
3495 my ($before_fetch_merge) = @_;
3496 # if nothing unusual, just returns ''
3499 # returns 0 to caller in child, to do first of the specified suites
3500 # in child, $csuite is not yet set
3502 # returns 1 to caller in parent, to finish up anything needed after
3503 # in parent, $csuite is set to canonicalised portmanteau
3505 my $org_isuite = $isuite;
3506 my @suites = split /\,/, $isuite;
3507 return '' unless @suites > 1;
3508 printdebug "fork_for_multisuite: @suites\n";
3512 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3514 return 0 unless defined $cbasesuite;
3516 fail "package $package missing in (base suite) $cbasesuite"
3517 unless @mergeinputs;
3519 my @csuites = ($cbasesuite);
3521 $before_fetch_merge->();
3523 foreach my $tsuite (@suites[1..$#suites]) {
3524 $tsuite =~ s/^-/$cbasesuite-/;
3525 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3531 # xxx collecte the ref here
3533 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3534 push @csuites, $csubsuite;
3537 foreach my $mi (@mergeinputs) {
3538 my $ref = git_get_ref $mi->{Ref};
3539 die "$mi->{Ref} ?" unless length $ref;
3540 $mi->{Commit} = $ref;
3543 $csuite = join ",", @csuites;
3545 my $previous = git_get_ref lrref;
3547 unshift @mergeinputs, {
3548 Commit => $previous,
3549 Info => "local combined tracking branch",
3551 "archive seems to have rewound: local tracking branch is ahead!",
3555 foreach my $ix (0..$#mergeinputs) {
3556 $mergeinputs[$ix]{Index} = $ix;
3559 @mergeinputs = sort {
3560 -version_compare(mergeinfo_version $a,
3561 mergeinfo_version $b) # highest version first
3563 $a->{Index} <=> $b->{Index}; # earliest in spec first
3569 foreach my $mi (@mergeinputs) {
3570 printdebug "multisuite merge check $mi->{Info}\n";
3571 foreach my $previous (@needed) {
3572 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3573 printdebug "multisuite merge un-needed $previous->{Info}\n";
3577 printdebug "multisuite merge this-needed\n";
3578 $mi->{Character} = '+';
3581 $needed[0]{Character} = '*';
3583 my $output = $needed[0]{Commit};
3586 printdebug "multisuite merge nontrivial\n";
3587 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3589 my $commit = "tree $tree\n";
3590 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3591 "Input branches:\n";
3593 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3594 printdebug "multisuite merge include $mi->{Info}\n";
3595 $mi->{Character} //= ' ';
3596 $commit .= "parent $mi->{Commit}\n";
3597 $msg .= sprintf " %s %-25s %s\n",
3599 (mergeinfo_version $mi),
3602 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3604 " * marks the highest version branch, which choose to use\n".
3605 " + marks each branch which was not already an ancestor\n\n".
3606 "[dgit multi-suite $csuite]\n";
3608 "author $authline\n".
3609 "committer $authline\n\n";
3610 $output = make_commit_text $commit.$msg;
3611 printdebug "multisuite merge generated $output\n";
3614 fetch_from_archive_record_1($output);
3615 fetch_from_archive_record_2($output);
3617 progress "calculated combined tracking suite $csuite";
3622 sub clone_set_head () {
3623 open H, "> .git/HEAD" or die $!;
3624 print H "ref: ".lref()."\n" or die $!;
3627 sub clone_finish ($) {
3629 runcmd @git, qw(reset --hard), lrref();
3630 runcmd qw(bash -ec), <<'END';
3632 git ls-tree -r --name-only -z HEAD | \
3633 xargs -0r touch -h -r . --
3635 printdone "ready for work in $dstdir";
3639 # in multisuite, returns twice!
3640 # once in parent after first suite fetched,
3641 # and then again in child after everything is finished
3643 badusage "dry run makes no sense with clone" unless act_local();
3645 my $multi_fetched = fork_for_multisuite(sub {
3646 printdebug "multi clone before fetch merge\n";
3650 if ($multi_fetched) {
3651 printdebug "multi clone after fetch merge\n";
3653 clone_finish($dstdir);
3656 printdebug "clone main body\n";
3658 canonicalise_suite();
3659 my $hasgit = check_for_git();
3660 mkdir $dstdir or fail "create \`$dstdir': $!";
3662 runcmd @git, qw(init -q);
3666 my $giturl = access_giturl(1);
3667 if (defined $giturl) {
3668 runcmd @git, qw(remote add), 'origin', $giturl;
3671 progress "fetching existing git history";
3673 runcmd_ordryrun_local @git, qw(fetch origin);
3675 progress "starting new git history";
3677 fetch_from_archive() or no_such_package;
3678 my $vcsgiturl = $dsc->{'Vcs-Git'};
3679 if (length $vcsgiturl) {
3680 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3681 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3683 clone_finish($dstdir);
3687 canonicalise_suite();
3688 if (check_for_git()) {
3691 fetch_from_archive() or no_such_package();
3693 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3694 if (length $vcsgiturl and
3695 (grep { $csuite eq $_ }
3697 cfg 'dgit.vcs-git.suites')) {
3698 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3699 if (defined $current && $current ne $vcsgiturl) {
3701 FYI: Vcs-Git in $csuite has different url to your vcs-git remote.
3702 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3706 printdone "fetched into ".lrref();
3710 my $multi_fetched = fork_for_multisuite(sub { });
3711 fetch_one() unless $multi_fetched; # parent
3712 finish 0 if $multi_fetched eq '0'; # child
3717 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3719 printdone "fetched to ".lrref()." and merged into HEAD";
3722 sub check_not_dirty () {
3723 foreach my $f (qw(local-options local-patch-header)) {
3724 if (stat_exists "debian/source/$f") {
3725 fail "git tree contains debian/source/$f";
3729 return if $includedirty;
3731 git_check_unmodified();
3734 sub commit_admin ($) {
3737 runcmd_ordryrun_local @git, qw(commit -m), $m;
3740 sub quiltify_nofix_bail ($$) {
3741 my ($headinfo, $xinfo) = @_;
3742 if ($quilt_mode eq 'nofix') {
3743 fail "quilt fixup required but quilt mode is \`nofix'\n".
3744 "HEAD commit".$headinfo." differs from tree implied by ".
3745 " debian/patches".$xinfo;
3749 sub commit_quilty_patch () {
3750 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3752 foreach my $l (split /\n/, $output) {
3753 next unless $l =~ m/\S/;
3754 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3758 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3760 progress "nothing quilty to commit, ok.";
3763 quiltify_nofix_bail "", " (wanted to commit patch update)";
3764 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3765 runcmd_ordryrun_local @git, qw(add -f), @adds;
3767 Commit Debian 3.0 (quilt) metadata
3769 [dgit ($our_version) quilt-fixup]
3773 sub get_source_format () {
3775 if (open F, "debian/source/options") {
3779 s/\s+$//; # ignore missing final newline
3781 my ($k, $v) = ($`, $'); #');
3782 $v =~ s/^"(.*)"$/$1/;
3788 F->error and die $!;
3791 die $! unless $!==&ENOENT;
3794 if (!open F, "debian/source/format") {
3795 die $! unless $!==&ENOENT;
3799 F->error and die $!;
3801 return ($_, \%options);
3804 sub madformat_wantfixup ($) {
3806 return 0 unless $format eq '3.0 (quilt)';
3807 our $quilt_mode_warned;
3808 if ($quilt_mode eq 'nocheck') {
3809 progress "Not doing any fixup of \`$format' due to".
3810 " ----no-quilt-fixup or --quilt=nocheck"
3811 unless $quilt_mode_warned++;
3814 progress "Format \`$format', need to check/update patch stack"
3815 unless $quilt_mode_warned++;
3819 sub maybe_split_brain_save ($$$) {
3820 my ($headref, $dgitview, $msg) = @_;
3821 # => message fragment "$saved" describing disposition of $dgitview
3822 my $save = $internal_object_save{'dgit-view'};
3823 return "commit id $dgitview" unless defined $save;
3824 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3826 "dgit --dgit-view-save $msg HEAD=$headref",
3829 return "and left in $save";
3832 # An "infopair" is a tuple [ $thing, $what ]
3833 # (often $thing is a commit hash; $what is a description)
3835 sub infopair_cond_equal ($$) {
3837 $x->[0] eq $y->[0] or fail <<END;
3838 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3842 sub infopair_lrf_tag_lookup ($$) {
3843 my ($tagnames, $what) = @_;
3844 # $tagname may be an array ref
3845 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3846 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3847 foreach my $tagname (@tagnames) {
3848 my $lrefname = lrfetchrefs."/tags/$tagname";
3849 my $tagobj = $lrfetchrefs_f{$lrefname};
3850 next unless defined $tagobj;
3851 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3852 return [ git_rev_parse($tagobj), $what ];
3854 fail @tagnames==1 ? <<END : <<END;
3855 Wanted tag $what (@tagnames) on dgit server, but not found
3857 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3861 sub infopair_cond_ff ($$) {
3862 my ($anc,$desc) = @_;
3863 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3864 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3868 sub pseudomerge_version_check ($$) {
3869 my ($clogp, $archive_hash) = @_;
3871 my $arch_clogp = commit_getclogp $archive_hash;
3872 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3873 'version currently in archive' ];
3874 if (defined $overwrite_version) {
3875 if (length $overwrite_version) {
3876 infopair_cond_equal([ $overwrite_version,
3877 '--overwrite= version' ],
3880 my $v = $i_arch_v->[0];
3881 progress "Checking package changelog for archive version $v ...";
3884 my @xa = ("-f$v", "-t$v");
3885 my $vclogp = parsechangelog @xa;
3888 [ (getfield $vclogp, $fn),
3889 "$fn field from dpkg-parsechangelog @xa" ];
3891 my $cv = $gf->('Version');
3892 infopair_cond_equal($i_arch_v, $cv);
3893 $cd = $gf->('Distribution');
3896 $@ =~ s/^dgit: //gm;
3898 "Perhaps debian/changelog does not mention $v ?";
3900 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3901 $cd->[1] is $cd->[0]
3902 Your tree seems to based on earlier (not uploaded) $v.
3907 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3911 sub pseudomerge_make_commit ($$$$ $$) {
3912 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3913 $msg_cmd, $msg_msg) = @_;
3914 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3916 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3917 my $authline = clogp_authline $clogp;
3921 !defined $overwrite_version ? ""
3922 : !length $overwrite_version ? " --overwrite"
3923 : " --overwrite=".$overwrite_version;
3925 # Contributing parent is the first parent - that makes
3926 # git rev-list --first-parent DTRT.
3927 my $pmf = dgit_privdir()."/pseudomerge";
3928 open MC, ">", $pmf or die "$pmf $!";
3929 print MC <<END or die $!;
3932 parent $archive_hash
3942 return make_commit($pmf);
3945 sub splitbrain_pseudomerge ($$$$) {
3946 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3947 # => $merged_dgitview
3948 printdebug "splitbrain_pseudomerge...\n";
3950 # We: debian/PREVIOUS HEAD($maintview)
3951 # expect: o ----------------- o
3954 # a/d/PREVIOUS $dgitview
3957 # we do: `------------------ o
3961 return $dgitview unless defined $archive_hash;
3962 return $dgitview if deliberately_not_fast_forward();
3964 printdebug "splitbrain_pseudomerge...\n";
3966 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3968 if (!defined $overwrite_version) {
3969 progress "Checking that HEAD inciudes all changes in archive...";
3972 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3974 if (defined $overwrite_version) {
3976 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3977 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3978 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3979 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3980 my $i_archive = [ $archive_hash, "current archive contents" ];
3982 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3984 infopair_cond_equal($i_dgit, $i_archive);
3985 infopair_cond_ff($i_dep14, $i_dgit);
3986 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3989 $@ =~ s/^\n//; chomp $@;
3992 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
3997 my $r = pseudomerge_make_commit
3998 $clogp, $dgitview, $archive_hash, $i_arch_v,
3999 "dgit --quilt=$quilt_mode",
4000 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
4001 Declare fast forward from $i_arch_v->[0]
4003 Make fast forward from $i_arch_v->[0]
4006 maybe_split_brain_save $maintview, $r, "pseudomerge";
4008 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
4012 sub plain_overwrite_pseudomerge ($$$) {
4013 my ($clogp, $head, $archive_hash) = @_;
4015 printdebug "plain_overwrite_pseudomerge...";
4017 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4019 return $head if is_fast_fwd $archive_hash, $head;
4021 my $m = "Declare fast forward from $i_arch_v->[0]";
4023 my $r = pseudomerge_make_commit
4024 $clogp, $head, $archive_hash, $i_arch_v,
4027 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4029 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
4033 sub push_parse_changelog ($) {
4036 my $clogp = Dpkg::Control::Hash->new();
4037 $clogp->load($clogpfn) or die;
4039 my $clogpackage = getfield $clogp, 'Source';
4040 $package //= $clogpackage;
4041 fail "-p specified $package but changelog specified $clogpackage"
4042 unless $package eq $clogpackage;
4043 my $cversion = getfield $clogp, 'Version';
4045 if (!$we_are_initiator) {
4046 # rpush initiator can't do this because it doesn't have $isuite yet
4047 my $tag = debiantag($cversion, access_nomdistro);
4048 runcmd @git, qw(check-ref-format), $tag;
4051 my $dscfn = dscfn($cversion);
4053 return ($clogp, $cversion, $dscfn);
4056 sub push_parse_dsc ($$$) {
4057 my ($dscfn,$dscfnwhat, $cversion) = @_;
4058 $dsc = parsecontrol($dscfn,$dscfnwhat);
4059 my $dversion = getfield $dsc, 'Version';
4060 my $dscpackage = getfield $dsc, 'Source';
4061 ($dscpackage eq $package && $dversion eq $cversion) or
4062 fail "$dscfn is for $dscpackage $dversion".
4063 " but debian/changelog is for $package $cversion";
4066 sub push_tagwants ($$$$) {
4067 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4070 TagFn => \&debiantag,
4075 if (defined $maintviewhead) {
4077 TagFn => \&debiantag_maintview,
4078 Objid => $maintviewhead,
4079 TfSuffix => '-maintview',
4082 } elsif ($dodep14tag eq 'no' ? 0
4083 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4084 : $dodep14tag eq 'always'
4085 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4086 --dep14tag-always (or equivalent in config) means server must support
4087 both "new" and "maint" tag formats, but config says it doesn't.
4089 : die "$dodep14tag ?") {
4091 TagFn => \&debiantag_maintview,
4093 TfSuffix => '-dgit',
4097 foreach my $tw (@tagwants) {
4098 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4099 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4101 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4105 sub push_mktags ($$ $$ $) {
4107 $changesfile,$changesfilewhat,
4110 die unless $tagwants->[0]{View} eq 'dgit';
4112 my $declaredistro = access_nomdistro();
4113 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4114 $dsc->{$ourdscfield[0]} = join " ",
4115 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4117 $dsc->save("$dscfn.tmp") or die $!;
4119 my $changes = parsecontrol($changesfile,$changesfilewhat);
4120 foreach my $field (qw(Source Distribution Version)) {
4121 $changes->{$field} eq $clogp->{$field} or
4122 fail "changes field $field \`$changes->{$field}'".
4123 " does not match changelog \`$clogp->{$field}'";
4126 my $cversion = getfield $clogp, 'Version';
4127 my $clogsuite = getfield $clogp, 'Distribution';
4129 # We make the git tag by hand because (a) that makes it easier
4130 # to control the "tagger" (b) we can do remote signing
4131 my $authline = clogp_authline $clogp;
4132 my $delibs = join(" ", "",@deliberatelies);
4136 my $tfn = $tw->{Tfn};
4137 my $head = $tw->{Objid};
4138 my $tag = $tw->{Tag};
4140 open TO, '>', $tfn->('.tmp') or die $!;
4141 print TO <<END or die $!;
4148 if ($tw->{View} eq 'dgit') {
4149 print TO <<END or die $!;
4150 $package release $cversion for $clogsuite ($csuite) [dgit]
4151 [dgit distro=$declaredistro$delibs]
4153 foreach my $ref (sort keys %previously) {
4154 print TO <<END or die $!;
4155 [dgit previously:$ref=$previously{$ref}]
4158 } elsif ($tw->{View} eq 'maint') {
4159 print TO <<END or die $!;
4160 $package release $cversion for $clogsuite ($csuite)
4161 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4164 die Dumper($tw)."?";
4169 my $tagobjfn = $tfn->('.tmp');
4171 if (!defined $keyid) {
4172 $keyid = access_cfg('keyid','RETURN-UNDEF');
4174 if (!defined $keyid) {
4175 $keyid = getfield $clogp, 'Maintainer';
4177 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4178 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4179 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4180 push @sign_cmd, $tfn->('.tmp');
4181 runcmd_ordryrun @sign_cmd;
4183 $tagobjfn = $tfn->('.signed.tmp');
4184 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4185 $tfn->('.tmp'), $tfn->('.tmp.asc');
4191 my @r = map { $mktag->($_); } @$tagwants;
4195 sub sign_changes ($) {
4196 my ($changesfile) = @_;
4198 my @debsign_cmd = @debsign;
4199 push @debsign_cmd, "-k$keyid" if defined $keyid;
4200 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4201 push @debsign_cmd, $changesfile;
4202 runcmd_ordryrun @debsign_cmd;
4207 printdebug "actually entering push\n";
4209 supplementary_message(<<'END');
4210 Push failed, while checking state of the archive.
4211 You can retry the push, after fixing the problem, if you like.
4213 if (check_for_git()) {
4216 my $archive_hash = fetch_from_archive();
4217 if (!$archive_hash) {
4219 fail "package appears to be new in this suite;".
4220 " if this is intentional, use --new";
4223 supplementary_message(<<'END');
4224 Push failed, while preparing your push.
4225 You can retry the push, after fixing the problem, if you like.
4228 need_tagformat 'new', "quilt mode $quilt_mode"
4229 if quiltmode_splitbrain;
4233 access_giturl(); # check that success is vaguely likely
4234 rpush_handle_protovsn_bothends() if $we_are_initiator;
4237 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4238 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4240 responder_send_file('parsed-changelog', $clogpfn);
4242 my ($clogp, $cversion, $dscfn) =
4243 push_parse_changelog("$clogpfn");
4245 my $dscpath = "$buildproductsdir/$dscfn";
4246 stat_exists $dscpath or
4247 fail "looked for .dsc $dscpath, but $!;".
4248 " maybe you forgot to build";
4250 responder_send_file('dsc', $dscpath);
4252 push_parse_dsc($dscpath, $dscfn, $cversion);
4254 my $format = getfield $dsc, 'Format';
4255 printdebug "format $format\n";
4257 my $symref = git_get_symref();
4258 my $actualhead = git_rev_parse('HEAD');
4260 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4261 runcmd_ordryrun_local @git_debrebase, 'stitch';
4262 $actualhead = git_rev_parse('HEAD');
4265 my $dgithead = $actualhead;
4266 my $maintviewhead = undef;
4268 my $upstreamversion = upstreamversion $clogp->{Version};
4270 if (madformat_wantfixup($format)) {
4271 # user might have not used dgit build, so maybe do this now:
4272 if (quiltmode_splitbrain()) {
4273 changedir $playground;
4274 quilt_make_fake_dsc($upstreamversion);
4276 ($dgithead, $cachekey) =
4277 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4279 "--quilt=$quilt_mode but no cached dgit view:
4280 perhaps HEAD changed since dgit build[-source] ?";
4282 $dgithead = splitbrain_pseudomerge($clogp,
4283 $actualhead, $dgithead,
4285 $maintviewhead = $actualhead;
4287 prep_ud(); # so _only_subdir() works, below
4289 commit_quilty_patch();
4293 if (defined $overwrite_version && !defined $maintviewhead
4295 $dgithead = plain_overwrite_pseudomerge($clogp,
4303 if ($archive_hash) {
4304 if (is_fast_fwd($archive_hash, $dgithead)) {
4306 } elsif (deliberately_not_fast_forward) {
4309 fail "dgit push: HEAD is not a descendant".
4310 " of the archive's version.\n".
4311 "To overwrite the archive's contents,".
4312 " pass --overwrite[=VERSION].\n".
4313 "To rewind history, if permitted by the archive,".
4314 " use --deliberately-not-fast-forward.";
4318 changedir $playground;
4319 progress "checking that $dscfn corresponds to HEAD";
4320 runcmd qw(dpkg-source -x --),
4321 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4322 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4323 check_for_vendor_patches() if madformat($dsc->{format});
4325 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4326 debugcmd "+",@diffcmd;
4328 my $r = system @diffcmd;
4331 my $referent = $split_brain ? $dgithead : 'HEAD';
4332 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4335 my $raw = cmdoutput @git,
4336 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4338 foreach (split /\0/, $raw) {
4339 if (defined $changed) {
4340 push @mode_changes, "$changed: $_\n" if $changed;
4343 } elsif (m/^:0+ 0+ /) {
4345 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4346 $changed = "Mode change from $1 to $2"
4351 if (@mode_changes) {
4352 fail <<END.(join '', @mode_changes).<<END;
4353 HEAD specifies a different tree to $dscfn:
4356 There is a problem with your source tree (see dgit(7) for some hints).
4357 To see a full diff, run git diff $tree $referent
4362 HEAD specifies a different tree to $dscfn:
4364 Perhaps you forgot to build. Or perhaps there is a problem with your
4365 source tree (see dgit(7) for some hints). To see a full diff, run
4366 git diff $tree $referent
4372 if (!$changesfile) {
4373 my $pat = changespat $cversion;
4374 my @cs = glob "$buildproductsdir/$pat";
4375 fail "failed to find unique changes file".
4376 " (looked for $pat in $buildproductsdir);".
4377 " perhaps you need to use dgit -C"
4379 ($changesfile) = @cs;
4381 $changesfile = "$buildproductsdir/$changesfile";
4384 # Check that changes and .dsc agree enough
4385 $changesfile =~ m{[^/]*$};
4386 my $changes = parsecontrol($changesfile,$&);
4387 files_compare_inputs($dsc, $changes)
4388 unless forceing [qw(dsc-changes-mismatch)];
4390 # Check whether this is a source only upload
4391 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4392 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4393 if ($sourceonlypolicy eq 'ok') {
4394 } elsif ($sourceonlypolicy eq 'always') {
4395 forceable_fail [qw(uploading-binaries)],
4396 "uploading binaries, although distroy policy is source only"
4398 } elsif ($sourceonlypolicy eq 'never') {
4399 forceable_fail [qw(uploading-source-only)],
4400 "source-only upload, although distroy policy requires .debs"
4402 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4403 forceable_fail [qw(uploading-source-only)],
4404 "source-only upload, even though package is entirely NEW\n".
4405 "(this is contrary to policy in ".(access_nomdistro()).")"
4408 && !(archive_query('package_not_wholly_new', $package) // 1);
4410 badcfg "unknown source-only-uploads policy \`$sourceonlypolicy'";
4413 # Perhaps adjust .dsc to contain right set of origs
4414 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4416 unless forceing [qw(changes-origs-exactly)];
4418 # Checks complete, we're going to try and go ahead:
4420 responder_send_file('changes',$changesfile);
4421 responder_send_command("param head $dgithead");
4422 responder_send_command("param csuite $csuite");
4423 responder_send_command("param isuite $isuite");
4424 responder_send_command("param tagformat $tagformat");
4425 if (defined $maintviewhead) {
4426 confess "internal error (protovsn=$protovsn)"
4427 if defined $protovsn and $protovsn < 4;
4428 responder_send_command("param maint-view $maintviewhead");
4431 # Perhaps send buildinfo(s) for signing
4432 my $changes_files = getfield $changes, 'Files';
4433 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4434 foreach my $bi (@buildinfos) {
4435 responder_send_command("param buildinfo-filename $bi");
4436 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4439 if (deliberately_not_fast_forward) {
4440 git_for_each_ref(lrfetchrefs, sub {
4441 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4442 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4443 responder_send_command("previously $rrefname=$objid");
4444 $previously{$rrefname} = $objid;
4448 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4449 dgit_privdir()."/tag");
4452 supplementary_message(<<'END');
4453 Push failed, while signing the tag.
4454 You can retry the push, after fixing the problem, if you like.
4456 # If we manage to sign but fail to record it anywhere, it's fine.
4457 if ($we_are_responder) {
4458 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4459 responder_receive_files('signed-tag', @tagobjfns);
4461 @tagobjfns = push_mktags($clogp,$dscpath,
4462 $changesfile,$changesfile,
4465 supplementary_message(<<'END');
4466 Push failed, *after* signing the tag.
4467 If you want to try again, you should use a new version number.
4470 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4472 foreach my $tw (@tagwants) {
4473 my $tag = $tw->{Tag};
4474 my $tagobjfn = $tw->{TagObjFn};
4476 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4477 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4478 runcmd_ordryrun_local
4479 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4482 supplementary_message(<<'END');
4483 Push failed, while updating the remote git repository - see messages above.
4484 If you want to try again, you should use a new version number.
4486 if (!check_for_git()) {
4487 create_remote_git_repo();
4490 my @pushrefs = $forceflag.$dgithead.":".rrref();
4491 foreach my $tw (@tagwants) {
4492 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4495 runcmd_ordryrun @git,
4496 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4497 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4499 supplementary_message(<<'END');
4500 Push failed, while obtaining signatures on the .changes and .dsc.
4501 If it was just that the signature failed, you may try again by using
4502 debsign by hand to sign the changes
4504 and then dput to complete the upload.
4505 If you need to change the package, you must use a new version number.
4507 if ($we_are_responder) {
4508 my $dryrunsuffix = act_local() ? "" : ".tmp";
4509 my @rfiles = ($dscpath, $changesfile);
4510 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4511 responder_receive_files('signed-dsc-changes',
4512 map { "$_$dryrunsuffix" } @rfiles);
4515 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4517 progress "[new .dsc left in $dscpath.tmp]";
4519 sign_changes $changesfile;
4522 supplementary_message(<<END);
4523 Push failed, while uploading package(s) to the archive server.
4524 You can retry the upload of exactly these same files with dput of:
4526 If that .changes file is broken, you will need to use a new version
4527 number for your next attempt at the upload.
4529 my $host = access_cfg('upload-host','RETURN-UNDEF');
4530 my @hostarg = defined($host) ? ($host,) : ();
4531 runcmd_ordryrun @dput, @hostarg, $changesfile;
4532 printdone "pushed and uploaded $cversion";
4534 supplementary_message('');
4535 responder_send_command("complete");
4539 not_necessarily_a_tree();
4544 badusage "-p is not allowed with clone; specify as argument instead"
4545 if defined $package;
4548 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4549 ($package,$isuite) = @ARGV;
4550 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4551 ($package,$dstdir) = @ARGV;
4552 } elsif (@ARGV==3) {
4553 ($package,$isuite,$dstdir) = @ARGV;
4555 badusage "incorrect arguments to dgit clone";
4559 $dstdir ||= "$package";
4560 if (stat_exists $dstdir) {
4561 fail "$dstdir already exists";
4565 if ($rmonerror && !$dryrun_level) {
4566 $cwd_remove= getcwd();
4568 return unless defined $cwd_remove;
4569 if (!chdir "$cwd_remove") {
4570 return if $!==&ENOENT;
4571 die "chdir $cwd_remove: $!";
4573 printdebug "clone rmonerror removing $dstdir\n";
4575 rmtree($dstdir) or die "remove $dstdir: $!\n";
4576 } elsif (grep { $! == $_ }
4577 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4579 print STDERR "check whether to remove $dstdir: $!\n";
4585 $cwd_remove = undef;
4588 sub branchsuite () {
4589 my $branch = git_get_symref();
4590 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4597 sub package_from_d_control () {
4598 if (!defined $package) {
4599 my $sourcep = parsecontrol('debian/control','debian/control');
4600 $package = getfield $sourcep, 'Source';
4604 sub fetchpullargs () {
4605 package_from_d_control();
4607 $isuite = branchsuite();
4609 my $clogp = parsechangelog();
4610 my $clogsuite = getfield $clogp, 'Distribution';
4611 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4613 } elsif (@ARGV==1) {
4616 badusage "incorrect arguments to dgit fetch or dgit pull";
4630 if (quiltmode_splitbrain()) {
4631 my ($format, $fopts) = get_source_format();
4632 madformat($format) and fail <<END
4633 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4641 package_from_d_control();
4642 @ARGV==1 or badusage "dgit checkout needs a suite argument";
4646 foreach my $canon (qw(0 1)) {
4651 canonicalise_suite();
4653 if (length git_get_ref lref()) {
4654 # local branch already exists, yay
4657 if (!length git_get_ref lrref()) {
4665 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4668 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4669 "dgit checkout $isuite";
4670 runcmd (@git, qw(checkout), lbranch());
4673 sub cmd_update_vcs_git () {
4675 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4676 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4678 ($specsuite) = (@ARGV);
4683 if ($ARGV[0] eq '-') {
4685 } elsif ($ARGV[0] eq '-') {
4690 package_from_d_control();
4692 if ($specsuite eq '.') {
4693 $ctrl = parsecontrol 'debian/control', 'debian/control';
4695 $isuite = $specsuite;
4699 my $url = getfield $ctrl, 'Vcs-Git';
4702 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4703 if (!defined $orgurl) {
4704 print STDERR "setting up vcs-git: $url\n";
4705 @cmd = (@git, qw(remote add vcs-git), $url);
4706 } elsif ($orgurl eq $url) {
4707 print STDERR "vcs git already configured: $url\n";
4709 print STDERR "changing vcs-git url to: $url\n";
4710 @cmd = (@git, qw(remote set-url vcs-git), $url);
4712 runcmd_ordryrun_local @cmd;
4714 print "fetching (@ARGV)\n";
4715 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4721 build_or_push_prep_early();
4726 } elsif (@ARGV==1) {
4727 ($specsuite) = (@ARGV);
4729 badusage "incorrect arguments to dgit $subcommand";
4732 local ($package) = $existing_package; # this is a hack
4733 canonicalise_suite();
4735 canonicalise_suite();
4737 if (defined $specsuite &&
4738 $specsuite ne $isuite &&
4739 $specsuite ne $csuite) {
4740 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4741 " but command line specifies $specsuite";
4750 #---------- remote commands' implementation ----------
4752 sub pre_remote_push_build_host {
4753 my ($nrargs) = shift @ARGV;
4754 my (@rargs) = @ARGV[0..$nrargs-1];
4755 @ARGV = @ARGV[$nrargs..$#ARGV];
4757 my ($dir,$vsnwant) = @rargs;
4758 # vsnwant is a comma-separated list; we report which we have
4759 # chosen in our ready response (so other end can tell if they
4762 $we_are_responder = 1;
4763 $us .= " (build host)";
4765 open PI, "<&STDIN" or die $!;
4766 open STDIN, "/dev/null" or die $!;
4767 open PO, ">&STDOUT" or die $!;
4769 open STDOUT, ">&STDERR" or die $!;
4773 ($protovsn) = grep {
4774 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4775 } @rpushprotovsn_support;
4777 fail "build host has dgit rpush protocol versions ".
4778 (join ",", @rpushprotovsn_support).
4779 " but invocation host has $vsnwant"
4780 unless defined $protovsn;
4784 sub cmd_remote_push_build_host {
4785 responder_send_command("dgit-remote-push-ready $protovsn");
4789 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4790 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4791 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4792 # a good error message)
4794 sub rpush_handle_protovsn_bothends () {
4795 if ($protovsn < 4) {
4796 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4805 my $report = i_child_report();
4806 if (defined $report) {
4807 printdebug "($report)\n";
4808 } elsif ($i_child_pid) {
4809 printdebug "(killing build host child $i_child_pid)\n";
4810 kill 15, $i_child_pid;
4812 if (defined $i_tmp && !defined $initiator_tempdir) {
4814 eval { rmtree $i_tmp; };
4819 return unless forkcheck_mainprocess();
4824 my ($base,$selector,@args) = @_;
4825 $selector =~ s/\-/_/g;
4826 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4830 not_necessarily_a_tree();
4835 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4843 push @rargs, join ",", @rpushprotovsn_support;
4846 push @rdgit, @ropts;
4847 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4849 my @cmd = (@ssh, $host, shellquote @rdgit);
4852 $we_are_initiator=1;
4854 if (defined $initiator_tempdir) {
4855 rmtree $initiator_tempdir;
4856 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4857 $i_tmp = $initiator_tempdir;
4861 $i_child_pid = open2(\*RO, \*RI, @cmd);
4863 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4864 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4865 $supplementary_message = '' unless $protovsn >= 3;
4868 my ($icmd,$iargs) = initiator_expect {
4869 m/^(\S+)(?: (.*))?$/;
4872 i_method "i_resp", $icmd, $iargs;
4876 sub i_resp_progress ($) {
4878 my $msg = protocol_read_bytes \*RO, $rhs;
4882 sub i_resp_supplementary_message ($) {
4884 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4887 sub i_resp_complete {
4888 my $pid = $i_child_pid;
4889 $i_child_pid = undef; # prevents killing some other process with same pid
4890 printdebug "waiting for build host child $pid...\n";
4891 my $got = waitpid $pid, 0;
4892 die $! unless $got == $pid;
4893 die "build host child failed $?" if $?;
4896 printdebug "all done\n";
4900 sub i_resp_file ($) {
4902 my $localname = i_method "i_localname", $keyword;
4903 my $localpath = "$i_tmp/$localname";
4904 stat_exists $localpath and
4905 badproto \*RO, "file $keyword ($localpath) twice";
4906 protocol_receive_file \*RO, $localpath;
4907 i_method "i_file", $keyword;
4912 sub i_resp_param ($) {
4913 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4917 sub i_resp_previously ($) {
4918 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4919 or badproto \*RO, "bad previously spec";
4920 my $r = system qw(git check-ref-format), $1;
4921 die "bad previously ref spec ($r)" if $r;
4922 $previously{$1} = $2;
4927 sub i_resp_want ($) {
4929 die "$keyword ?" if $i_wanted{$keyword}++;
4931 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4932 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4933 die unless $isuite =~ m/^$suite_re$/;
4936 rpush_handle_protovsn_bothends();
4938 fail "rpush negotiated protocol version $protovsn".
4939 " which does not support quilt mode $quilt_mode"
4940 if quiltmode_splitbrain;
4942 my @localpaths = i_method "i_want", $keyword;
4943 printdebug "[[ $keyword @localpaths\n";
4944 foreach my $localpath (@localpaths) {
4945 protocol_send_file \*RI, $localpath;
4947 print RI "files-end\n" or die $!;
4950 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4952 sub i_localname_parsed_changelog {
4953 return "remote-changelog.822";
4955 sub i_file_parsed_changelog {
4956 ($i_clogp, $i_version, $i_dscfn) =
4957 push_parse_changelog "$i_tmp/remote-changelog.822";
4958 die if $i_dscfn =~ m#/|^\W#;
4961 sub i_localname_dsc {
4962 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4967 sub i_localname_buildinfo ($) {
4968 my $bi = $i_param{'buildinfo-filename'};
4969 defined $bi or badproto \*RO, "buildinfo before filename";
4970 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4971 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4972 or badproto \*RO, "improper buildinfo filename";
4975 sub i_file_buildinfo {
4976 my $bi = $i_param{'buildinfo-filename'};
4977 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4978 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4979 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4980 files_compare_inputs($bd, $ch);
4981 (getfield $bd, $_) eq (getfield $ch, $_) or
4982 fail "buildinfo mismatch $_"
4983 foreach qw(Source Version);
4984 !defined $bd->{$_} or
4985 fail "buildinfo contains $_"
4986 foreach qw(Changes Changed-by Distribution);
4988 push @i_buildinfos, $bi;
4989 delete $i_param{'buildinfo-filename'};
4992 sub i_localname_changes {
4993 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4994 $i_changesfn = $i_dscfn;
4995 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4996 return $i_changesfn;
4998 sub i_file_changes { }
5000 sub i_want_signed_tag {
5001 printdebug Dumper(\%i_param, $i_dscfn);
5002 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5003 && defined $i_param{'csuite'}
5004 or badproto \*RO, "premature desire for signed-tag";
5005 my $head = $i_param{'head'};
5006 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5008 my $maintview = $i_param{'maint-view'};
5009 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5012 if ($protovsn >= 4) {
5013 my $p = $i_param{'tagformat'} // '<undef>';
5015 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
5018 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5020 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5022 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5025 push_mktags $i_clogp, $i_dscfn,
5026 $i_changesfn, 'remote changes',
5030 sub i_want_signed_dsc_changes {
5031 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5032 sign_changes $i_changesfn;
5033 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5036 #---------- building etc. ----------
5042 #----- `3.0 (quilt)' handling -----
5044 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5046 sub quiltify_dpkg_commit ($$$;$) {
5047 my ($patchname,$author,$msg, $xinfo) = @_;
5050 mkpath '.git/dgit'; # we are in playtree
5051 my $descfn = ".git/dgit/quilt-description.tmp";
5052 open O, '>', $descfn or die "$descfn: $!";
5053 $msg =~ s/\n+/\n\n/;
5054 print O <<END or die $!;
5056 ${xinfo}Subject: $msg
5063 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5064 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5065 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5066 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5070 sub quiltify_trees_differ ($$;$$$) {
5071 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5072 # returns true iff the two tree objects differ other than in debian/
5073 # with $finegrained,
5074 # returns bitmask 01 - differ in upstream files except .gitignore
5075 # 02 - differ in .gitignore
5076 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5077 # is set for each modified .gitignore filename $fn
5078 # if $unrepres is defined, array ref to which is appeneded
5079 # a list of unrepresentable changes (removals of upstream files
5082 my @cmd = (@git, qw(diff-tree -z --no-renames));
5083 push @cmd, qw(--name-only) unless $unrepres;
5084 push @cmd, qw(-r) if $finegrained || $unrepres;
5086 my $diffs= cmdoutput @cmd;
5089 foreach my $f (split /\0/, $diffs) {
5090 if ($unrepres && !@lmodes) {
5091 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5094 my ($oldmode,$newmode) = @lmodes;
5097 next if $f =~ m#^debian(?:/.*)?$#s;
5101 die "not a plain file or symlink\n"
5102 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5103 $oldmode =~ m/^(?:10|12)\d{4}$/;
5104 if ($oldmode =~ m/[^0]/ &&
5105 $newmode =~ m/[^0]/) {
5106 # both old and new files exist
5107 die "mode or type changed\n" if $oldmode ne $newmode;
5108 die "modified symlink\n" unless $newmode =~ m/^10/;
5109 } elsif ($oldmode =~ m/[^0]/) {
5111 die "deletion of symlink\n"
5112 unless $oldmode =~ m/^10/;
5115 die "creation with non-default mode\n"
5116 unless $newmode =~ m/^100644$/ or
5117 $newmode =~ m/^120000$/;
5121 local $/="\n"; chomp $@;
5122 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5126 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5127 $r |= $isignore ? 02 : 01;
5128 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5130 printdebug "quiltify_trees_differ $x $y => $r\n";
5134 sub quiltify_tree_sentinelfiles ($) {
5135 # lists the `sentinel' files present in the tree
5137 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5138 qw(-- debian/rules debian/control);
5143 sub quiltify_splitbrain_needed () {
5144 if (!$split_brain) {
5145 progress "dgit view: changes are required...";
5146 runcmd @git, qw(checkout -q -b dgit-view);
5151 sub quiltify_splitbrain ($$$$$$$) {
5152 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5153 $editedignores, $cachekey) = @_;
5154 my $gitignore_special = 1;
5155 if ($quilt_mode !~ m/gbp|dpm/) {
5156 # treat .gitignore just like any other upstream file
5157 $diffbits = { %$diffbits };
5158 $_ = !!$_ foreach values %$diffbits;
5159 $gitignore_special = 0;
5161 # We would like any commits we generate to be reproducible
5162 my @authline = clogp_authline($clogp);
5163 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5164 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5165 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5166 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5167 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5168 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5170 my $fulldiffhint = sub {
5172 my $cmd = "git diff $x $y -- :/ ':!debian'";
5173 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5174 return "\nFor full diff showing the problem(s), type:\n $cmd\n";
5177 if ($quilt_mode =~ m/gbp|unapplied/ &&
5178 ($diffbits->{O2H} & 01)) {
5180 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
5181 " but git tree differs from orig in upstream files.";
5182 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5183 if (!stat_exists "debian/patches") {
5185 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5189 if ($quilt_mode =~ m/dpm/ &&
5190 ($diffbits->{H2A} & 01)) {
5191 fail <<END. $fulldiffhint->($oldtiptree,'HEAD');
5192 --quilt=$quilt_mode specified, implying patches-applied git tree
5193 but git tree differs from result of applying debian/patches to upstream
5196 if ($quilt_mode =~ m/gbp|unapplied/ &&
5197 ($diffbits->{O2A} & 01)) { # some patches
5198 quiltify_splitbrain_needed();
5199 progress "dgit view: creating patches-applied version using gbp pq";
5200 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5201 # gbp pq import creates a fresh branch; push back to dgit-view
5202 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5203 runcmd @git, qw(checkout -q dgit-view);
5205 if ($quilt_mode =~ m/gbp|dpm/ &&
5206 ($diffbits->{O2A} & 02)) {
5208 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5209 tool which does not create patches for changes to upstream
5210 .gitignores: but, such patches exist in debian/patches.
5213 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5214 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5215 quiltify_splitbrain_needed();
5216 progress "dgit view: creating patch to represent .gitignore changes";
5217 ensuredir "debian/patches";
5218 my $gipatch = "debian/patches/auto-gitignore";
5219 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5220 stat GIPATCH or die "$gipatch: $!";
5221 fail "$gipatch already exists; but want to create it".
5222 " to record .gitignore changes" if (stat _)[7];
5223 print GIPATCH <<END or die "$gipatch: $!";
5224 Subject: Update .gitignore from Debian packaging branch
5226 The Debian packaging git branch contains these updates to the upstream
5227 .gitignore file(s). This patch is autogenerated, to provide these
5228 updates to users of the official Debian archive view of the package.
5230 [dgit ($our_version) update-gitignore]
5233 close GIPATCH or die "$gipatch: $!";
5234 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5235 $unapplied, $headref, "--", sort keys %$editedignores;
5236 open SERIES, "+>>", "debian/patches/series" or die $!;
5237 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5239 defined read SERIES, $newline, 1 or die $!;
5240 print SERIES "\n" or die $! unless $newline eq "\n";
5241 print SERIES "auto-gitignore\n" or die $!;
5242 close SERIES or die $!;
5243 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5245 Commit patch to update .gitignore
5247 [dgit ($our_version) update-gitignore-quilt-fixup]
5251 my $dgitview = git_rev_parse 'HEAD';
5254 # When we no longer need to support squeeze, use --create-reflog
5256 ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
5257 my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
5260 my $oldcache = git_get_ref "refs/$splitbraincache";
5261 if ($oldcache eq $dgitview) {
5262 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5263 # git update-ref doesn't always update, in this case. *sigh*
5264 my $dummy = make_commit_text <<END;
5267 author Dgit <dgit\@example.com> 1000000000 +0000
5268 committer Dgit <dgit\@example.com> 1000000000 +0000
5270 Dummy commit - do not use
5272 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5273 "refs/$splitbraincache", $dummy;
5275 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5278 changedir "$playground/work";
5280 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5281 progress "dgit view: created ($saved)";
5284 sub quiltify ($$$$) {
5285 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5287 # Quilt patchification algorithm
5289 # We search backwards through the history of the main tree's HEAD
5290 # (T) looking for a start commit S whose tree object is identical
5291 # to to the patch tip tree (ie the tree corresponding to the
5292 # current dpkg-committed patch series). For these purposes
5293 # `identical' disregards anything in debian/ - this wrinkle is
5294 # necessary because dpkg-source treates debian/ specially.
5296 # We can only traverse edges where at most one of the ancestors'
5297 # trees differs (in changes outside in debian/). And we cannot
5298 # handle edges which change .pc/ or debian/patches. To avoid
5299 # going down a rathole we avoid traversing edges which introduce
5300 # debian/rules or debian/control. And we set a limit on the
5301 # number of edges we are willing to look at.
5303 # If we succeed, we walk forwards again. For each traversed edge
5304 # PC (with P parent, C child) (starting with P=S and ending with
5305 # C=T) to we do this:
5307 # - dpkg-source --commit with a patch name and message derived from C
5308 # After traversing PT, we git commit the changes which
5309 # should be contained within debian/patches.
5311 # The search for the path S..T is breadth-first. We maintain a
5312 # todo list containing search nodes. A search node identifies a
5313 # commit, and looks something like this:
5315 # Commit => $git_commit_id,
5316 # Child => $c, # or undef if P=T
5317 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5318 # Nontrivial => true iff $p..$c has relevant changes
5325 my %considered; # saves being exponential on some weird graphs
5327 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5330 my ($search,$whynot) = @_;
5331 printdebug " search NOT $search->{Commit} $whynot\n";
5332 $search->{Whynot} = $whynot;
5333 push @nots, $search;
5334 no warnings qw(exiting);
5343 my $c = shift @todo;
5344 next if $considered{$c->{Commit}}++;
5346 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5348 printdebug "quiltify investigate $c->{Commit}\n";
5351 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5352 printdebug " search finished hooray!\n";
5357 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5358 if ($quilt_mode eq 'smash') {
5359 printdebug " search quitting smash\n";
5363 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5364 $not->($c, "has $c_sentinels not $t_sentinels")
5365 if $c_sentinels ne $t_sentinels;
5367 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5368 $commitdata =~ m/\n\n/;
5370 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5371 @parents = map { { Commit => $_, Child => $c } } @parents;
5373 $not->($c, "root commit") if !@parents;
5375 foreach my $p (@parents) {
5376 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5378 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5379 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5381 foreach my $p (@parents) {
5382 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5384 my @cmd= (@git, qw(diff-tree -r --name-only),
5385 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5386 my $patchstackchange = cmdoutput @cmd;
5387 if (length $patchstackchange) {
5388 $patchstackchange =~ s/\n/,/g;
5389 $not->($p, "changed $patchstackchange");
5392 printdebug " search queue P=$p->{Commit} ",
5393 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5399 printdebug "quiltify want to smash\n";
5402 my $x = $_[0]{Commit};
5403 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5406 my $reportnot = sub {
5408 my $s = $abbrev->($notp);
5409 my $c = $notp->{Child};
5410 $s .= "..".$abbrev->($c) if $c;
5411 $s .= ": ".$notp->{Whynot};
5414 if ($quilt_mode eq 'linear') {
5415 print STDERR "\n$us: error: quilt fixup cannot be linear. Stopped at:\n";
5416 foreach my $notp (@nots) {
5417 print STDERR "$us: ", $reportnot->($notp), "\n";
5419 print STDERR "$us: $_\n" foreach @$failsuggestion;
5421 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n".
5422 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5423 } elsif ($quilt_mode eq 'smash') {
5424 } elsif ($quilt_mode eq 'auto') {
5425 progress "quilt fixup cannot be linear, smashing...";
5427 die "$quilt_mode ?";
5430 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5431 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5433 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5435 quiltify_dpkg_commit "auto-$version-$target-$time",
5436 (getfield $clogp, 'Maintainer'),
5437 "Automatically generated patch ($clogp->{Version})\n".
5438 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5442 progress "quiltify linearisation planning successful, executing...";
5444 for (my $p = $sref_S;
5445 my $c = $p->{Child};
5447 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5448 next unless $p->{Nontrivial};
5450 my $cc = $c->{Commit};
5452 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5453 $commitdata =~ m/\n\n/ or die "$c ?";
5456 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5459 my $commitdate = cmdoutput
5460 @git, qw(log -n1 --pretty=format:%aD), $cc;
5462 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5464 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5471 my $gbp_check_suitable = sub {
5476 die "contains unexpected slashes\n" if m{//} || m{/$};
5477 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5478 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5479 die "is series file\n" if m{$series_filename_re}o;
5480 die "too long" if length > 200;
5482 return $_ unless $@;
5483 print STDERR "quiltifying commit $cc:".
5484 " ignoring/dropping Gbp-Pq $what: $@";
5488 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5490 (\S+) \s* \n //ixm) {
5491 $patchname = $gbp_check_suitable->($1, 'Name');
5493 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5495 (\S+) \s* \n //ixm) {
5496 $patchdir = $gbp_check_suitable->($1, 'Topic');
5501 if (!defined $patchname) {
5502 $patchname = $title;
5503 $patchname =~ s/[.:]$//;
5506 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5507 my $translitname = $converter->convert($patchname);
5508 die unless defined $translitname;
5509 $patchname = $translitname;
5512 "dgit: patch title transliteration error: $@"
5514 $patchname =~ y/ A-Z/-a-z/;
5515 $patchname =~ y/-a-z0-9_.+=~//cd;
5516 $patchname =~ s/^\W/x-$&/;
5517 $patchname = substr($patchname,0,40);
5518 $patchname .= ".patch";
5520 if (!defined $patchdir) {
5523 if (length $patchdir) {
5524 $patchname = "$patchdir/$patchname";
5526 if ($patchname =~ m{^(.*)/}) {
5527 mkpath "debian/patches/$1";
5532 stat "debian/patches/$patchname$index";
5534 $!==ENOENT or die "$patchname$index $!";
5536 runcmd @git, qw(checkout -q), $cc;
5538 # We use the tip's changelog so that dpkg-source doesn't
5539 # produce complaining messages from dpkg-parsechangelog. None
5540 # of the information dpkg-source gets from the changelog is
5541 # actually relevant - it gets put into the original message
5542 # which dpkg-source provides our stunt editor, and then
5544 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5546 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5547 "Date: $commitdate\n".
5548 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5550 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5553 runcmd @git, qw(checkout -q master);
5556 sub build_maybe_quilt_fixup () {
5557 my ($format,$fopts) = get_source_format;
5558 return unless madformat_wantfixup $format;
5561 check_for_vendor_patches();
5563 if (quiltmode_splitbrain) {
5564 fail <<END unless access_cfg_tagformats_can_splitbrain;
5565 quilt mode $quilt_mode requires split view so server needs to support
5566 both "new" and "maint" tag formats, but config says it doesn't.
5570 my $clogp = parsechangelog();
5571 my $headref = git_rev_parse('HEAD');
5572 my $symref = git_get_symref();
5574 if ($quilt_mode eq 'linear'
5575 && !$fopts->{'single-debian-patch'}
5576 && branch_is_gdr($symref, $headref)) {
5577 # This is much faster. It also makes patches that gdr
5578 # likes better for future updates without laundering.
5580 # However, it can fail in some casses where we would
5581 # succeed: if there are existing patches, which correspond
5582 # to a prefix of the branch, but are not in gbp/gdr
5583 # format, gdr will fail (exiting status 7), but we might
5584 # be able to figure out where to start linearising. That
5585 # will be slower so hopefully there's not much to do.
5586 my @cmd = (@git_debrebase,
5587 qw(--noop-ok -funclean-mixed -funclean-ordering
5588 make-patches --quiet-would-amend));
5589 # We tolerate soe snags that gdr wouldn't, by default.
5593 failedcmd @cmd if system @cmd and $?!=7*256;
5597 $headref = git_rev_parse('HEAD');
5601 changedir $playground;
5603 my $upstreamversion = upstreamversion $version;
5605 if ($fopts->{'single-debian-patch'}) {
5606 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5608 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5612 runcmd_ordryrun_local
5613 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5616 sub unpack_playtree_mkwork ($) {
5619 mkdir "work" or die $!;
5621 mktree_in_ud_here();
5622 runcmd @git, qw(reset -q --hard), $headref;
5625 sub unpack_playtree_linkorigs ($$) {
5626 my ($upstreamversion, $fn) = @_;
5627 # calls $fn->($leafname);
5629 my $bpd_abs = bpd_abs();
5630 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5631 while ($!=0, defined(my $b = readdir QFD)) {
5632 my $f = bpd_abs()."/".$b;
5634 local ($debuglevel) = $debuglevel-1;
5635 printdebug "QF linkorigs $b, $f ?\n";
5637 next unless is_orig_file_of_vsn $b, $upstreamversion;
5638 printdebug "QF linkorigs $b, $f Y\n";
5639 link_ltarget $f, $b or die "$b $!";
5642 die "$buildproductsdir: $!" if $!;
5646 sub quilt_fixup_delete_pc () {
5647 runcmd @git, qw(rm -rqf .pc);
5649 Commit removal of .pc (quilt series tracking data)
5651 [dgit ($our_version) upgrade quilt-remove-pc]
5655 sub quilt_fixup_singlepatch ($$$) {
5656 my ($clogp, $headref, $upstreamversion) = @_;
5658 progress "starting quiltify (single-debian-patch)";
5660 # dpkg-source --commit generates new patches even if
5661 # single-debian-patch is in debian/source/options. In order to
5662 # get it to generate debian/patches/debian-changes, it is
5663 # necessary to build the source package.
5665 unpack_playtree_linkorigs($upstreamversion, sub { });
5666 unpack_playtree_mkwork($headref);
5668 rmtree("debian/patches");
5670 runcmd @dpkgsource, qw(-b .);
5672 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5673 rename srcfn("$upstreamversion", "/debian/patches"),
5674 "work/debian/patches";
5677 commit_quilty_patch();
5680 sub quilt_make_fake_dsc ($) {
5681 my ($upstreamversion) = @_;
5683 my $fakeversion="$upstreamversion-~~DGITFAKE";
5685 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5686 print $fakedsc <<END or die $!;
5689 Version: $fakeversion
5693 my $dscaddfile=sub {
5696 my $md = new Digest::MD5;
5698 my $fh = new IO::File $b, '<' or die "$b $!";
5703 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5706 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
5708 my @files=qw(debian/source/format debian/rules
5709 debian/control debian/changelog);
5710 foreach my $maybe (qw(debian/patches debian/source/options
5711 debian/tests/control)) {
5712 next unless stat_exists "$maindir/$maybe";
5713 push @files, $maybe;
5716 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5717 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5719 $dscaddfile->($debtar);
5720 close $fakedsc or die $!;
5723 sub quilt_fakedsc2unapplied ($$) {
5724 my ($headref, $upstreamversion) = @_;
5725 # must be run in the playground
5726 # quilt_make_fake_dsc must have been called
5729 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5731 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5732 rename $fakexdir, "fake" or die "$fakexdir $!";
5736 remove_stray_gits("source package");
5737 mktree_in_ud_here();
5741 rmtree 'debian'; # git checkout commitish paths does not delete!
5742 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5743 my $unapplied=git_add_write_tree();
5744 printdebug "fake orig tree object $unapplied\n";
5748 sub quilt_check_splitbrain_cache ($$) {
5749 my ($headref, $upstreamversion) = @_;
5750 # Called only if we are in (potentially) split brain mode.
5751 # Called in playground.
5752 # Computes the cache key and looks in the cache.
5753 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5755 my $splitbrain_cachekey;
5758 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5759 # we look in the reflog of dgit-intern/quilt-cache
5760 # we look for an entry whose message is the key for the cache lookup
5761 my @cachekey = (qw(dgit), $our_version);
5762 push @cachekey, $upstreamversion;
5763 push @cachekey, $quilt_mode;
5764 push @cachekey, $headref;
5766 push @cachekey, hashfile('fake.dsc');
5768 my $srcshash = Digest::SHA->new(256);
5769 my %sfs = ( %INC, '$0(dgit)' => $0 );
5770 foreach my $sfk (sort keys %sfs) {
5771 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5772 $srcshash->add($sfk," ");
5773 $srcshash->add(hashfile($sfs{$sfk}));
5774 $srcshash->add("\n");
5776 push @cachekey, $srcshash->hexdigest();
5777 $splitbrain_cachekey = "@cachekey";
5779 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5781 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5782 debugcmd "|(probably)",@cmd;
5783 my $child = open GC, "-|"; defined $child or die $!;
5785 chdir $maindir or die $!;
5786 if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
5787 $! == ENOENT or die $!;
5788 printdebug ">(no reflog)\n";
5795 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5796 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5799 unpack_playtree_mkwork($headref);
5800 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5801 if ($cachehit ne $headref) {
5802 progress "dgit view: found cached ($saved)";
5803 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5805 return ($cachehit, $splitbrain_cachekey);
5807 progress "dgit view: found cached, no changes required";
5808 return ($headref, $splitbrain_cachekey);
5810 die $! if GC->error;
5811 failedcmd unless close GC;
5813 printdebug "splitbrain cache miss\n";
5814 return (undef, $splitbrain_cachekey);
5817 sub quilt_fixup_multipatch ($$$) {
5818 my ($clogp, $headref, $upstreamversion) = @_;
5820 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5823 # - honour any existing .pc in case it has any strangeness
5824 # - determine the git commit corresponding to the tip of
5825 # the patch stack (if there is one)
5826 # - if there is such a git commit, convert each subsequent
5827 # git commit into a quilt patch with dpkg-source --commit
5828 # - otherwise convert all the differences in the tree into
5829 # a single git commit
5833 # Our git tree doesn't necessarily contain .pc. (Some versions of
5834 # dgit would include the .pc in the git tree.) If there isn't
5835 # one, we need to generate one by unpacking the patches that we
5838 # We first look for a .pc in the git tree. If there is one, we
5839 # will use it. (This is not the normal case.)
5841 # Otherwise need to regenerate .pc so that dpkg-source --commit
5842 # can work. We do this as follows:
5843 # 1. Collect all relevant .orig from parent directory
5844 # 2. Generate a debian.tar.gz out of
5845 # debian/{patches,rules,source/format,source/options}
5846 # 3. Generate a fake .dsc containing just these fields:
5847 # Format Source Version Files
5848 # 4. Extract the fake .dsc
5849 # Now the fake .dsc has a .pc directory.
5850 # (In fact we do this in every case, because in future we will
5851 # want to search for a good base commit for generating patches.)
5853 # Then we can actually do the dpkg-source --commit
5854 # 1. Make a new working tree with the same object
5855 # store as our main tree and check out the main
5857 # 2. Copy .pc from the fake's extraction, if necessary
5858 # 3. Run dpkg-source --commit
5859 # 4. If the result has changes to debian/, then
5860 # - git add them them
5861 # - git add .pc if we had a .pc in-tree
5863 # 5. If we had a .pc in-tree, delete it, and git commit
5864 # 6. Back in the main tree, fast forward to the new HEAD
5866 # Another situation we may have to cope with is gbp-style
5867 # patches-unapplied trees.
5869 # We would want to detect these, so we know to escape into
5870 # quilt_fixup_gbp. However, this is in general not possible.
5871 # Consider a package with a one patch which the dgit user reverts
5872 # (with git revert or the moral equivalent).
5874 # That is indistinguishable in contents from a patches-unapplied
5875 # tree. And looking at the history to distinguish them is not
5876 # useful because the user might have made a confusing-looking git
5877 # history structure (which ought to produce an error if dgit can't
5878 # cope, not a silent reintroduction of an unwanted patch).
5880 # So gbp users will have to pass an option. But we can usually
5881 # detect their failure to do so: if the tree is not a clean
5882 # patches-applied tree, quilt linearisation fails, but the tree
5883 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5884 # they want --quilt=unapplied.
5886 # To help detect this, when we are extracting the fake dsc, we
5887 # first extract it with --skip-patches, and then apply the patches
5888 # afterwards with dpkg-source --before-build. That lets us save a
5889 # tree object corresponding to .origs.
5891 my $splitbrain_cachekey;
5893 quilt_make_fake_dsc($upstreamversion);
5895 if (quiltmode_splitbrain()) {
5897 ($cachehit, $splitbrain_cachekey) =
5898 quilt_check_splitbrain_cache($headref, $upstreamversion);
5899 return if $cachehit;
5901 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
5905 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5907 if (system @bbcmd) {
5908 failedcmd @bbcmd if $? < 0;
5910 failed to apply your git tree's patch stack (from debian/patches/) to
5911 the corresponding upstream tarball(s). Your source tree and .orig
5912 are probably too inconsistent. dgit can only fix up certain kinds of
5913 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
5919 unpack_playtree_mkwork($headref);
5922 if (stat_exists ".pc") {
5924 progress "Tree already contains .pc - will use it then delete it.";
5927 rename '../fake/.pc','.pc' or die $!;
5930 changedir '../fake';
5932 my $oldtiptree=git_add_write_tree();
5933 printdebug "fake o+d/p tree object $unapplied\n";
5934 changedir '../work';
5937 # We calculate some guesswork now about what kind of tree this might
5938 # be. This is mostly for error reporting.
5944 # O = orig, without patches applied
5945 # A = "applied", ie orig with H's debian/patches applied
5946 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5947 \%editedignores, \@unrepres),
5948 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5949 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5953 foreach my $b (qw(01 02)) {
5954 foreach my $v (qw(O2H O2A H2A)) {
5955 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5958 printdebug "differences \@dl @dl.\n";
5961 "$us: base trees orig=%.20s o+d/p=%.20s",
5962 $unapplied, $oldtiptree;
5964 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5965 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5966 $dl[0], $dl[1], $dl[3], $dl[4],
5970 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5972 forceable_fail [qw(unrepresentable)], <<END;
5973 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5978 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5979 push @failsuggestion, "This might be a patches-unapplied branch.";
5980 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5981 push @failsuggestion, "This might be a patches-applied branch.";
5983 push @failsuggestion, "Maybe you need to specify one of".
5984 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5986 if (quiltmode_splitbrain()) {
5987 quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
5988 $diffbits, \%editedignores,
5989 $splitbrain_cachekey);
5993 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5994 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5996 if (!open P, '>>', ".pc/applied-patches") {
5997 $!==&ENOENT or die $!;
6002 commit_quilty_patch();
6004 if ($mustdeletepc) {
6005 quilt_fixup_delete_pc();
6009 sub quilt_fixup_editor () {
6010 my $descfn = $ENV{$fakeeditorenv};
6011 my $editing = $ARGV[$#ARGV];
6012 open I1, '<', $descfn or die "$descfn: $!";
6013 open I2, '<', $editing or die "$editing: $!";
6014 unlink $editing or die "$editing: $!";
6015 open O, '>', $editing or die "$editing: $!";
6016 while (<I1>) { print O or die $!; } I1->error and die $!;
6019 $copying ||= m/^\-\-\- /;
6020 next unless $copying;
6023 I2->error and die $!;
6028 sub maybe_apply_patches_dirtily () {
6029 return unless $quilt_mode =~ m/gbp|unapplied/;
6030 print STDERR <<END or die $!;
6032 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6033 dgit: Have to apply the patches - making the tree dirty.
6034 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6037 $patches_applied_dirtily = 01;
6038 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6039 runcmd qw(dpkg-source --before-build .);
6042 sub maybe_unapply_patches_again () {
6043 progress "dgit: Unapplying patches again to tidy up the tree."
6044 if $patches_applied_dirtily;
6045 runcmd qw(dpkg-source --after-build .)
6046 if $patches_applied_dirtily & 01;
6048 if $patches_applied_dirtily & 02;
6049 $patches_applied_dirtily = 0;
6052 #----- other building -----
6054 our $clean_using_builder;
6055 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
6056 # clean the tree before building (perhaps invoked indirectly by
6057 # whatever we are using to run the build), rather than separately
6058 # and explicitly by us.
6061 return if $clean_using_builder;
6062 if ($cleanmode eq 'dpkg-source') {
6063 maybe_apply_patches_dirtily();
6064 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
6065 } elsif ($cleanmode eq 'dpkg-source-d') {
6066 maybe_apply_patches_dirtily();
6067 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
6068 } elsif ($cleanmode eq 'git') {
6069 runcmd_ordryrun_local @git, qw(clean -xdf);
6070 } elsif ($cleanmode eq 'git-ff') {
6071 runcmd_ordryrun_local @git, qw(clean -xdff);
6072 } elsif ($cleanmode eq 'check') {
6073 my $leftovers = cmdoutput @git, qw(clean -xdn);
6074 if (length $leftovers) {
6075 print STDERR $leftovers, "\n" or die $!;
6076 fail "tree contains uncommitted files and --clean=check specified";
6078 } elsif ($cleanmode eq 'none') {
6085 badusage "clean takes no additional arguments" if @ARGV;
6088 maybe_unapply_patches_again();
6091 # return values from massage_dbp_args are one or both of these flags
6092 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6093 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6095 sub build_or_push_prep_early () {
6096 our $build_or_push_prep_early_done //= 0;
6097 return if $build_or_push_prep_early_done++;
6098 badusage "-p is not allowed with dgit $subcommand" if defined $package;
6099 my $clogp = parsechangelog();
6100 $isuite = getfield $clogp, 'Distribution';
6101 $package = getfield $clogp, 'Source';
6102 $version = getfield $clogp, 'Version';
6103 $dscfn = dscfn($version);
6106 sub build_prep_early () {
6107 build_or_push_prep_early();
6112 sub build_prep ($) {
6115 # clean the tree if we're trying to include dirty changes in the
6116 # source package, or we are running the builder in $maindir
6117 clean_tree() if $includedirty || ($wantsrc & WANTSRC_BUILDER);
6118 build_maybe_quilt_fixup();
6120 my $pat = changespat $version;
6121 foreach my $f (glob "$buildproductsdir/$pat") {
6123 unlink $f or fail "remove old changes file $f: $!";
6125 progress "would remove $f";
6131 sub changesopts_initial () {
6132 my @opts =@changesopts[1..$#changesopts];
6135 sub changesopts_version () {
6136 if (!defined $changes_since_version) {
6139 @vsns = archive_query('archive_query');
6140 my @quirk = access_quirk();
6141 if ($quirk[0] eq 'backports') {
6142 local $isuite = $quirk[2];
6144 canonicalise_suite();
6145 push @vsns, archive_query('archive_query');
6151 "archive query failed (queried because --since-version not specified)";
6154 @vsns = map { $_->[0] } @vsns;
6155 @vsns = sort { -version_compare($a, $b) } @vsns;
6156 $changes_since_version = $vsns[0];
6157 progress "changelog will contain changes since $vsns[0]";
6159 $changes_since_version = '_';
6160 progress "package seems new, not specifying -v<version>";
6163 if ($changes_since_version ne '_') {
6164 return ("-v$changes_since_version");
6170 sub changesopts () {
6171 return (changesopts_initial(), changesopts_version());
6174 sub massage_dbp_args ($;$) {
6175 my ($cmd,$xargs) = @_;
6176 # Since we split the source build out so we can do strange things
6177 # to it, massage the arguments to dpkg-buildpackage so that the
6178 # main build doessn't build source (or add an argument to stop it
6179 # building source by default).
6180 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6181 # -nc has the side effect of specifying -b if nothing else specified
6182 # and some combinations of -S, -b, et al, are errors, rather than
6183 # later simply overriding earlie. So we need to:
6184 # - search the command line for these options
6185 # - pick the last one
6186 # - perhaps add our own as a default
6187 # - perhaps adjust it to the corresponding non-source-building version
6189 foreach my $l ($cmd, $xargs) {
6191 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
6194 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6195 my $r = WANTSRC_BUILDER;
6196 printdebug "massage split $dmode.\n";
6197 $r = $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6198 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6199 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6201 printdebug "massage done $r $dmode.\n";
6203 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6209 my $wasdir = must_getcwd();
6210 changedir $buildproductsdir;
6215 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6216 sub postbuild_mergechanges ($) {
6217 my ($msg_if_onlyone) = @_;
6218 # If there is only one .changes file, fail with $msg_if_onlyone,
6219 # or if that is undef, be a no-op.
6220 # Returns the changes file to report to the user.
6221 my $pat = changespat $version;
6222 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6223 @changesfiles = sort {
6224 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6228 if (@changesfiles==1) {
6229 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
6230 only one changes file from build (@changesfiles)
6232 $result = $changesfiles[0];
6233 } elsif (@changesfiles==2) {
6234 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6235 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6236 fail "$l found in binaries changes file $binchanges"
6239 runcmd_ordryrun_local @mergechanges, @changesfiles;
6240 my $multichanges = changespat $version,'multi';
6242 stat_exists $multichanges or fail "$multichanges: $!";
6243 foreach my $cf (glob $pat) {
6244 next if $cf eq $multichanges;
6245 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6248 $result = $multichanges;
6250 fail "wrong number of different changes files (@changesfiles)";
6252 printdone "build successful, results in $result\n" or die $!;
6255 sub midbuild_checkchanges () {
6256 my $pat = changespat $version;
6257 return if $rmchanges;
6258 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6260 $_ ne changespat $version,'source' and
6261 $_ ne changespat $version,'multi'
6264 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6265 Suggest you delete @unwanted.
6270 sub midbuild_checkchanges_vanilla ($) {
6272 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6275 sub postbuild_mergechanges_vanilla ($) {
6277 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6279 postbuild_mergechanges(undef);
6282 printdone "build successful\n";
6288 $buildproductsdir eq '..' or print STDERR <<END;
6289 $us: warning: build-products-dir set, but not supported by dgit build
6290 $us: warning: things may go wrong or files may go to the wrong place
6292 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6293 my $wantsrc = massage_dbp_args \@dbp;
6294 build_prep($wantsrc);
6295 if ($wantsrc & WANTSRC_SOURCE) {
6297 midbuild_checkchanges_vanilla $wantsrc;
6299 if ($wantsrc & WANTSRC_BUILDER) {
6300 push @dbp, changesopts_version();
6301 maybe_apply_patches_dirtily();
6302 runcmd_ordryrun_local @dbp;
6304 maybe_unapply_patches_again();
6305 postbuild_mergechanges_vanilla $wantsrc;
6309 $quilt_mode //= 'gbp';
6315 # gbp can make .origs out of thin air. In my tests it does this
6316 # even for a 1.0 format package, with no origs present. So I
6317 # guess it keys off just the version number. We don't know
6318 # exactly what .origs ought to exist, but let's assume that we
6319 # should run gbp if: the version has an upstream part and the main
6321 my $upstreamversion = upstreamversion $version;
6322 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6323 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6325 if ($gbp_make_orig) {
6327 $cleanmode = 'none'; # don't do it again
6330 my @dbp = @dpkgbuildpackage;
6332 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6334 if (!length $gbp_build[0]) {
6335 if (length executable_on_path('git-buildpackage')) {
6336 $gbp_build[0] = qw(git-buildpackage);
6338 $gbp_build[0] = 'gbp buildpackage';
6341 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6343 push @cmd, (qw(-us -uc --git-no-sign-tags),
6344 "--git-builder=".(shellquote @dbp));
6346 if ($gbp_make_orig) {
6347 my $priv = dgit_privdir();
6348 my $ok = "$priv/origs-gen-ok";
6349 unlink $ok or $!==&ENOENT or die $!;
6350 my @origs_cmd = @cmd;
6351 push @origs_cmd, qw(--git-cleaner=true);
6352 push @origs_cmd, "--git-prebuild=".
6353 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6354 push @origs_cmd, @ARGV;
6356 debugcmd @origs_cmd;
6358 do { local $!; stat_exists $ok; }
6359 or failedcmd @origs_cmd;
6361 dryrun_report @origs_cmd;
6365 build_prep($wantsrc);
6366 if ($wantsrc & WANTSRC_SOURCE) {
6368 midbuild_checkchanges_vanilla $wantsrc;
6370 if (!$clean_using_builder) {
6371 push @cmd, '--git-cleaner=true';
6374 maybe_unapply_patches_again();
6375 if ($wantsrc & WANTSRC_BUILDER) {
6376 push @cmd, changesopts();
6377 runcmd_ordryrun_local @cmd, @ARGV;
6379 postbuild_mergechanges_vanilla $wantsrc;
6381 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6383 sub building_source_in_playtree {
6384 # If $includedirty, we have to build the source package from the
6385 # working tree, not a playtree, so that uncommitted changes are
6386 # included (copying or hardlinking them into the playtree could
6389 # Note that if we are building a source package in split brain
6390 # mode we do not support including uncommitted changes, because
6391 # that makes quilt fixup too hard. I.e. ($split_brain && (dgit is
6392 # building a source package)) => !$includedirty
6393 return !$includedirty;
6397 $sourcechanges = changespat $version,'source';
6399 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6400 or fail "remove $sourcechanges: $!";
6402 my @cmd = (@dpkgsource, qw(-b --));
6404 if (building_source_in_playtree()) {
6406 my $headref = git_rev_parse('HEAD');
6407 # If we are in split brain, there is already a playtree with
6408 # the thing we should package into a .dsc (thanks to quilt
6409 # fixup). If not, make a playtree
6410 prep_ud() unless $split_brain;
6411 changedir $playground;
6412 unless ($split_brain) {
6413 my $upstreamversion = upstreamversion $version;
6414 unpack_playtree_linkorigs($upstreamversion, sub { });
6415 unpack_playtree_mkwork($headref);
6419 $leafdir = basename $maindir;
6422 runcmd_ordryrun_local @cmd, $leafdir;
6425 runcmd_ordryrun_local qw(sh -ec),
6426 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6427 @dpkggenchanges, qw(-S), changesopts();
6430 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6431 $dsc = parsecontrol($dscfn, "source package");
6435 printdebug " renaming ($why) $l\n";
6436 rename "$l", bpd_abs()."/$l"
6437 or fail "put in place new built file ($l): $!";
6439 foreach my $l (split /\n/, getfield $dsc, 'Files') {
6440 $l =~ m/\S+$/ or next;
6443 $mv->('dsc', $dscfn);
6444 $mv->('changes', $sourcechanges);
6449 sub cmd_build_source {
6450 badusage "build-source takes no additional arguments" if @ARGV;
6451 build_prep(WANTSRC_SOURCE);
6453 maybe_unapply_patches_again();
6454 printdone "source built, results in $dscfn and $sourcechanges";
6457 sub cmd_push_source {
6459 fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
6460 "sense with push-source!" if $includedirty;
6461 build_maybe_quilt_fixup();
6463 my $changes = parsecontrol("$buildproductsdir/$changesfile",
6464 "source changes file");
6465 unless (test_source_only_changes($changes)) {
6466 fail "user-specified changes file is not source-only";
6469 # Building a source package is very fast, so just do it
6471 die "er, patches are applied dirtily but shouldn't be.."
6472 if $patches_applied_dirtily;
6473 $changesfile = $sourcechanges;
6478 sub binary_builder {
6479 my ($bbuilder, $pbmc_msg, @args) = @_;
6480 build_prep(WANTSRC_SOURCE);
6482 midbuild_checkchanges();
6485 stat_exists $dscfn or fail "$dscfn (in build products dir): $!";
6486 stat_exists $sourcechanges
6487 or fail "$sourcechanges (in build products dir): $!";
6489 runcmd_ordryrun_local @$bbuilder, @args;
6491 maybe_unapply_patches_again();
6493 postbuild_mergechanges($pbmc_msg);
6499 binary_builder(\@sbuild, <<END, qw(-d), $isuite, @ARGV, $dscfn);
6500 perhaps you need to pass -A ? (sbuild's default is to build only
6501 arch-specific binaries; dgit 1.4 used to override that.)
6506 my ($pbuilder) = @_;
6508 # @ARGV is allowed to contain only things that should be passed to
6509 # pbuilder under debbuildopts; just massage those
6510 my $wantsrc = massage_dbp_args \@ARGV;
6511 fail "you asked for a builder but your debbuildopts didn't ask for".
6512 " any binaries -- is this really what you meant?"
6513 unless $wantsrc & WANTSRC_BUILDER;
6514 fail "we must build a .dsc to pass to the builder but your debbuiltopts".
6515 " forbids the building of a source package; cannot continue"
6516 unless $wantsrc & WANTSRC_SOURCE;
6517 # We do not want to include the verb "build" in @pbuilder because
6518 # the user can customise @pbuilder and they shouldn't be required
6519 # to include "build" in their customised value. However, if the
6520 # user passes any additional args to pbuilder using the dgit
6521 # option --pbuilder:foo, such args need to come after the "build"
6522 # verb. opts_opt_multi_cmd does all of that.
6523 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
6524 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
6529 pbuilder(\@pbuilder);
6532 sub cmd_cowbuilder {
6533 pbuilder(\@cowbuilder);
6536 sub cmd_quilt_fixup {
6537 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6540 build_maybe_quilt_fixup();
6543 sub cmd_print_unapplied_treeish {
6544 badusage "incorrect arguments to dgit print-unapplied-treeish" if @ARGV;
6545 my $headref = git_rev_parse('HEAD');
6546 my $clogp = commit_getclogp $headref;
6547 $package = getfield $clogp, 'Source';
6548 $version = getfield $clogp, 'Version';
6549 $isuite = getfield $clogp, 'Distribution';
6550 $csuite = $isuite; # we want this to be offline!
6554 changedir $playground;
6555 my $uv = upstreamversion $version;
6556 quilt_make_fake_dsc($uv);
6557 my $u = quilt_fakedsc2unapplied($headref, $uv);
6558 print $u, "\n" or die $!;
6561 sub import_dsc_result {
6562 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6563 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
6565 check_gitattrs($newhash, "source tree");
6567 progress "dgit: import-dsc: $what_msg";
6570 sub cmd_import_dsc {
6574 last unless $ARGV[0] =~ m/^-/;
6577 if (m/^--require-valid-signature$/) {
6580 badusage "unknown dgit import-dsc sub-option \`$_'";
6584 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6585 my ($dscfn, $dstbranch) = @ARGV;
6587 badusage "dry run makes no sense with import-dsc" unless act_local();
6589 my $force = $dstbranch =~ s/^\+// ? +1 :
6590 $dstbranch =~ s/^\.\.// ? -1 :
6592 my $info = $force ? " $&" : '';
6593 $info = "$dscfn$info";
6595 my $specbranch = $dstbranch;
6596 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6597 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6599 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6600 my $chead = cmdoutput_errok @symcmd;
6601 defined $chead or $?==256 or failedcmd @symcmd;
6603 fail "$dstbranch is checked out - will not update it"
6604 if defined $chead and $chead eq $dstbranch;
6606 my $oldhash = git_get_ref $dstbranch;
6608 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6609 $dscdata = do { local $/ = undef; <D>; };
6610 D->error and fail "read $dscfn: $!";
6613 # we don't normally need this so import it here
6614 use Dpkg::Source::Package;
6615 my $dp = new Dpkg::Source::Package filename => $dscfn,
6616 require_valid_signature => $needsig;
6618 local $SIG{__WARN__} = sub {
6620 return unless $needsig;
6621 fail "import-dsc signature check failed";
6623 if (!$dp->is_signed()) {
6624 warn "$us: warning: importing unsigned .dsc\n";
6626 my $r = $dp->check_signature();
6627 die "->check_signature => $r" if $needsig && $r;
6633 $package = getfield $dsc, 'Source';
6635 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6636 unless forceing [qw(import-dsc-with-dgit-field)];
6637 parse_dsc_field_def_dsc_distro();
6639 $isuite = 'DGIT-IMPORT-DSC';
6640 $idistro //= $dsc_distro;
6644 if (defined $dsc_hash) {
6645 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6646 resolve_dsc_field_commit undef, undef;
6648 if (defined $dsc_hash) {
6649 my @cmd = (qw(sh -ec),
6650 "echo $dsc_hash | git cat-file --batch-check");
6651 my $objgot = cmdoutput @cmd;
6652 if ($objgot =~ m#^\w+ missing\b#) {
6654 .dsc contains Dgit field referring to object $dsc_hash
6655 Your git tree does not have that object. Try `git fetch' from a
6656 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6659 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6661 progress "Not fast forward, forced update.";
6663 fail "Not fast forward to $dsc_hash";
6666 import_dsc_result $dstbranch, $dsc_hash,
6667 "dgit import-dsc (Dgit): $info",
6668 "updated git ref $dstbranch";
6673 Branch $dstbranch already exists
6674 Specify ..$specbranch for a pseudo-merge, binding in existing history
6675 Specify +$specbranch to overwrite, discarding existing history
6677 if $oldhash && !$force;
6679 my @dfi = dsc_files_info();
6680 foreach my $fi (@dfi) {
6681 my $f = $fi->{Filename};
6682 my $here = "$buildproductsdir/$f";
6685 fail "lstat $here works but stat gives $! !";
6687 fail "stat $here: $!" unless $! == ENOENT;
6689 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6691 } elsif ($dscfn =~ m#^/#) {
6694 fail "cannot import $dscfn which seems to be inside working tree!";
6696 $there =~ s#/+[^/]+$## or
6697 fail "import $dscfn requires ../$f, but it does not exist";
6699 my $test = $there =~ m{^/} ? $there : "../$there";
6700 stat $test or fail "import $dscfn requires $test, but: $!";
6701 symlink $there, $here or fail "symlink $there to $here: $!";
6702 progress "made symlink $here -> $there";
6703 # print STDERR Dumper($fi);
6705 my @mergeinputs = generate_commits_from_dsc();
6706 die unless @mergeinputs == 1;
6708 my $newhash = $mergeinputs[0]{Commit};
6712 progress "Import, forced update - synthetic orphan git history.";
6713 } elsif ($force < 0) {
6714 progress "Import, merging.";
6715 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6716 my $version = getfield $dsc, 'Version';
6717 my $clogp = commit_getclogp $newhash;
6718 my $authline = clogp_authline $clogp;
6719 $newhash = make_commit_text <<END;
6726 Merge $package ($version) import into $dstbranch
6729 die; # caught earlier
6733 import_dsc_result $dstbranch, $newhash,
6734 "dgit import-dsc: $info",
6735 "results are in in git ref $dstbranch";
6738 sub pre_archive_api_query () {
6739 not_necessarily_a_tree();
6741 sub cmd_archive_api_query {
6742 badusage "need only 1 subpath argument" unless @ARGV==1;
6743 my ($subpath) = @ARGV;
6744 local $isuite = 'DGIT-API-QUERY-CMD';
6745 my @cmd = archive_api_query_cmd($subpath);
6748 exec @cmd or fail "exec curl: $!\n";
6751 sub repos_server_url () {
6752 $package = '_dgit-repos-server';
6753 local $access_forpush = 1;
6754 local $isuite = 'DGIT-REPOS-SERVER';
6755 my $url = access_giturl();
6758 sub pre_clone_dgit_repos_server () {
6759 not_necessarily_a_tree();
6761 sub cmd_clone_dgit_repos_server {
6762 badusage "need destination argument" unless @ARGV==1;
6763 my ($destdir) = @ARGV;
6764 my $url = repos_server_url();
6765 my @cmd = (@git, qw(clone), $url, $destdir);
6767 exec @cmd or fail "exec git clone: $!\n";
6770 sub pre_print_dgit_repos_server_source_url () {
6771 not_necessarily_a_tree();
6773 sub cmd_print_dgit_repos_server_source_url {
6774 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6776 my $url = repos_server_url();
6777 print $url, "\n" or die $!;
6780 sub pre_print_dpkg_source_ignores {
6781 not_necessarily_a_tree();
6783 sub cmd_print_dpkg_source_ignores {
6784 badusage "no arguments allowed to dgit print-dpkg-source-ignores"
6786 print "@dpkg_source_ignores\n" or die $!;
6789 sub cmd_setup_mergechangelogs {
6790 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6791 local $isuite = 'DGIT-SETUP-TREE';
6792 setup_mergechangelogs(1);
6795 sub cmd_setup_useremail {
6796 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6797 local $isuite = 'DGIT-SETUP-TREE';
6801 sub cmd_setup_gitattributes {
6802 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6803 local $isuite = 'DGIT-SETUP-TREE';
6807 sub cmd_setup_new_tree {
6808 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6809 local $isuite = 'DGIT-SETUP-TREE';
6813 #---------- argument parsing and main program ----------
6816 print "dgit version $our_version\n" or die $!;
6820 our (%valopts_long, %valopts_short);
6821 our (%funcopts_long);
6823 our (@modeopt_cfgs);
6825 sub defvalopt ($$$$) {
6826 my ($long,$short,$val_re,$how) = @_;
6827 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6828 $valopts_long{$long} = $oi;
6829 $valopts_short{$short} = $oi;
6830 # $how subref should:
6831 # do whatever assignemnt or thing it likes with $_[0]
6832 # if the option should not be passed on to remote, @rvalopts=()
6833 # or $how can be a scalar ref, meaning simply assign the value
6836 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6837 defvalopt '--distro', '-d', '.+', \$idistro;
6838 defvalopt '', '-k', '.+', \$keyid;
6839 defvalopt '--existing-package','', '.*', \$existing_package;
6840 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6841 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6842 defvalopt '--package', '-p', $package_re, \$package;
6843 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6845 defvalopt '', '-C', '.+', sub {
6846 ($changesfile) = (@_);
6847 if ($changesfile =~ s#^(.*)/##) {
6848 $buildproductsdir = $1;
6852 defvalopt '--initiator-tempdir','','.*', sub {
6853 ($initiator_tempdir) = (@_);
6854 $initiator_tempdir =~ m#^/# or
6855 badusage "--initiator-tempdir must be used specify an".
6856 " absolute, not relative, directory."
6859 sub defoptmodes ($@) {
6860 my ($varref, $cfgkey, $default, %optmap) = @_;
6862 while (my ($opt,$val) = each %optmap) {
6863 $funcopts_long{$opt} = sub { $$varref = $val; };
6864 $permit{$val} = $val;
6866 push @modeopt_cfgs, {
6869 Default => $default,
6874 defoptmodes \$dodep14tag, qw( dep14tag want
6877 --always-dep14tag always );
6882 if (defined $ENV{'DGIT_SSH'}) {
6883 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6884 } elsif (defined $ENV{'GIT_SSH'}) {
6885 @ssh = ($ENV{'GIT_SSH'});
6893 if (!defined $val) {
6894 badusage "$what needs a value" unless @ARGV;
6896 push @rvalopts, $val;
6898 badusage "bad value \`$val' for $what" unless
6899 $val =~ m/^$oi->{Re}$(?!\n)/s;
6900 my $how = $oi->{How};
6901 if (ref($how) eq 'SCALAR') {
6906 push @ropts, @rvalopts;
6910 last unless $ARGV[0] =~ m/^-/;
6914 if (m/^--dry-run$/) {
6917 } elsif (m/^--damp-run$/) {
6920 } elsif (m/^--no-sign$/) {
6923 } elsif (m/^--help$/) {
6925 } elsif (m/^--version$/) {
6927 } elsif (m/^--new$/) {
6930 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6931 ($om = $opts_opt_map{$1}) &&
6935 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6936 !$opts_opt_cmdonly{$1} &&
6937 ($om = $opts_opt_map{$1})) {
6940 } elsif (m/^--(gbp|dpm)$/s) {
6941 push @ropts, "--quilt=$1";
6943 } elsif (m/^--(?:ignore|include)-dirty$/s) {
6946 } elsif (m/^--no-quilt-fixup$/s) {
6948 $quilt_mode = 'nocheck';
6949 } elsif (m/^--no-rm-on-error$/s) {
6952 } elsif (m/^--no-chase-dsc-distro$/s) {
6954 $chase_dsc_distro = 0;
6955 } elsif (m/^--overwrite$/s) {
6957 $overwrite_version = '';
6958 } elsif (m/^--overwrite=(.+)$/s) {
6960 $overwrite_version = $1;
6961 } elsif (m/^--delayed=(\d+)$/s) {
6964 } elsif (my ($k,$v) =
6965 m/^--save-(dgit-view)=(.+)$/s ||
6966 m/^--(dgit-view)-save=(.+)$/s
6969 $v =~ s#^(?!refs/)#refs/heads/#;
6970 $internal_object_save{$k} = $v;
6971 } elsif (m/^--(no-)?rm-old-changes$/s) {
6974 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6976 push @deliberatelies, $&;
6977 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6981 } elsif (m/^--force-/) {
6983 "$us: warning: ignoring unknown force option $_\n";
6985 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6986 # undocumented, for testing
6988 $tagformat_want = [ $1, 'command line', 1 ];
6989 # 1 menas overrides distro configuration
6990 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6991 # undocumented, for testing
6993 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6994 # ^ it's supposed to be an array ref
6995 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6996 $val = $2 ? $' : undef; #';
6997 $valopt->($oi->{Long});
6998 } elsif ($funcopts_long{$_}) {
7000 $funcopts_long{$_}();
7002 badusage "unknown long option \`$_'";
7009 } elsif (s/^-L/-/) {
7012 } elsif (s/^-h/-/) {
7014 } elsif (s/^-D/-/) {
7018 } elsif (s/^-N/-/) {
7023 push @changesopts, $_;
7025 } elsif (s/^-wn$//s) {
7027 $cleanmode = 'none';
7028 } elsif (s/^-wg$//s) {
7031 } elsif (s/^-wgf$//s) {
7033 $cleanmode = 'git-ff';
7034 } elsif (s/^-wd$//s) {
7036 $cleanmode = 'dpkg-source';
7037 } elsif (s/^-wdd$//s) {
7039 $cleanmode = 'dpkg-source-d';
7040 } elsif (s/^-wc$//s) {
7042 $cleanmode = 'check';
7043 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7044 push @git, '-c', $&;
7045 $gitcfgs{cmdline}{$1} = [ $2 ];
7046 } elsif (s/^-c([^=]+)$//s) {
7047 push @git, '-c', $&;
7048 $gitcfgs{cmdline}{$1} = [ 'true' ];
7049 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7051 $val = undef unless length $val;
7052 $valopt->($oi->{Short});
7055 badusage "unknown short option \`$_'";
7062 sub check_env_sanity () {
7063 my $blocked = new POSIX::SigSet;
7064 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
7067 foreach my $name (qw(PIPE CHLD)) {
7068 my $signame = "SIG$name";
7069 my $signum = eval "POSIX::$signame" // die;
7070 die "$signame is set to something other than SIG_DFL\n"
7071 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7072 $blocked->ismember($signum) and
7073 die "$signame is blocked\n";
7079 On entry to dgit, $@
7080 This is a bug produced by something in in your execution environment.
7086 sub parseopts_late_defaults () {
7087 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7088 if defined $idistro;
7089 $isuite //= cfg('dgit.default.default-suite');
7091 foreach my $k (keys %opts_opt_map) {
7092 my $om = $opts_opt_map{$k};
7094 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7096 badcfg "cannot set command for $k"
7097 unless length $om->[0];
7101 foreach my $c (access_cfg_cfgs("opts-$k")) {
7103 map { $_ ? @$_ : () }
7104 map { $gitcfgs{$_}{$c} }
7105 reverse @gitcfgsources;
7106 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7107 "\n" if $debuglevel >= 4;
7109 badcfg "cannot configure options for $k"
7110 if $opts_opt_cmdonly{$k};
7111 my $insertpos = $opts_cfg_insertpos{$k};
7112 @$om = ( @$om[0..$insertpos-1],
7114 @$om[$insertpos..$#$om] );
7118 if (!defined $rmchanges) {
7119 local $access_forpush;
7120 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7123 if (!defined $quilt_mode) {
7124 local $access_forpush;
7125 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7126 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7128 $quilt_mode =~ m/^($quilt_modes_re)$/
7129 or badcfg "unknown quilt-mode \`$quilt_mode'";
7133 foreach my $moc (@modeopt_cfgs) {
7134 local $access_forpush;
7135 my $vr = $moc->{Var};
7136 next if defined $$vr;
7137 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7138 my $v = $moc->{Vals}{$$vr};
7139 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
7143 fail "dgit: --include-dirty is not supported in split view quilt mode"
7144 if $split_brain && $includedirty;
7146 if (!defined $cleanmode) {
7147 local $access_forpush;
7148 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
7149 $cleanmode //= 'dpkg-source';
7151 badcfg "unknown clean-mode \`$cleanmode'" unless
7152 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
7155 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7156 $buildproductsdir //= '..';
7157 $bpd_glob = $buildproductsdir;
7158 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7161 if ($ENV{$fakeeditorenv}) {
7163 quilt_fixup_editor();
7169 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
7170 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7171 if $dryrun_level == 1;
7173 print STDERR $helpmsg or die $!;
7176 $cmd = $subcommand = shift @ARGV;
7179 my $pre_fn = ${*::}{"pre_$cmd"};
7180 $pre_fn->() if $pre_fn;
7182 record_maindir if $invoked_in_git_tree;
7185 my $fn = ${*::}{"cmd_$cmd"};
7186 $fn or badusage "unknown operation $cmd";