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";
220 sub upstreamversion ($) {
232 return unless forkcheck_mainprocess();
233 foreach my $f (@end) {
235 print STDERR "$us: cleanup: $@" if length $@;
239 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; finish 12; }
241 sub forceable_fail ($$) {
242 my ($forceoptsl, $msg) = @_;
243 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
244 print STDERR "warning: overriding problem due to --force:\n". $msg;
248 my ($forceoptsl) = @_;
249 my @got = grep { $forceopts{$_} } @$forceoptsl;
250 return 0 unless @got;
252 "warning: skipping checks or functionality due to --force-$got[0]\n";
255 sub no_such_package () {
256 print STDERR "$us: package $package does not exist in suite $isuite\n";
260 sub deliberately ($) {
262 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
265 sub deliberately_not_fast_forward () {
266 foreach (qw(not-fast-forward fresh-repo)) {
267 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
271 sub quiltmode_splitbrain () {
272 $quilt_mode =~ m/gbp|dpm|unapplied/;
275 sub opts_opt_multi_cmd {
278 push @cmd, split /\s+/, shift @_;
285 return opts_opt_multi_cmd [], @gbp_pq;
288 sub dgit_privdir () {
289 our $dgit_privdir_made //= ensure_a_playground 'dgit';
293 my $r = $buildproductsdir;
294 $r = "$maindir/$r" unless $r =~ m{^/};
298 sub branch_gdr_info ($$) {
299 my ($symref, $head) = @_;
300 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
301 gdr_ffq_prev_branchinfo($symref);
302 return () unless $status eq 'branch';
303 $ffq_prev = git_get_ref $ffq_prev;
304 $gdrlast = git_get_ref $gdrlast;
305 $gdrlast &&= is_fast_fwd $gdrlast, $head;
306 return ($ffq_prev, $gdrlast);
309 sub branch_is_gdr ($$) {
310 my ($symref, $head) = @_;
311 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
312 return 0 unless $ffq_prev || $gdrlast;
316 sub branch_is_gdr_unstitched_ff ($$$) {
317 my ($symref, $head, $ancestor) = @_;
318 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
319 return 0 unless $ffq_prev;
320 return 0 unless is_fast_fwd $ancestor, $ffq_prev;
324 #---------- remote protocol support, common ----------
326 # remote push initiator/responder protocol:
327 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
328 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
329 # < dgit-remote-push-ready <actual-proto-vsn>
336 # > supplementary-message NBYTES # $protovsn >= 3
341 # > file parsed-changelog
342 # [indicates that output of dpkg-parsechangelog follows]
343 # > data-block NBYTES
344 # > [NBYTES bytes of data (no newline)]
345 # [maybe some more blocks]
354 # > param head DGIT-VIEW-HEAD
355 # > param csuite SUITE
356 # > param tagformat old|new
357 # > param maint-view MAINT-VIEW-HEAD
359 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
360 # > file buildinfo # for buildinfos to sign
362 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
363 # # goes into tag, for replay prevention
366 # [indicates that signed tag is wanted]
367 # < data-block NBYTES
368 # < [NBYTES bytes of data (no newline)]
369 # [maybe some more blocks]
373 # > want signed-dsc-changes
374 # < data-block NBYTES [transfer of signed dsc]
376 # < data-block NBYTES [transfer of signed changes]
378 # < data-block NBYTES [transfer of each signed buildinfo
379 # [etc] same number and order as "file buildinfo"]
387 sub i_child_report () {
388 # Sees if our child has died, and reap it if so. Returns a string
389 # describing how it died if it failed, or undef otherwise.
390 return undef unless $i_child_pid;
391 my $got = waitpid $i_child_pid, WNOHANG;
392 return undef if $got <= 0;
393 die unless $got == $i_child_pid;
394 $i_child_pid = undef;
395 return undef unless $?;
396 return "build host child ".waitstatusmsg();
401 fail "connection lost: $!" if $fh->error;
402 fail "protocol violation; $m not expected";
405 sub badproto_badread ($$) {
407 fail "connection lost: $!" if $!;
408 my $report = i_child_report();
409 fail $report if defined $report;
410 badproto $fh, "eof (reading $wh)";
413 sub protocol_expect (&$) {
414 my ($match, $fh) = @_;
417 defined && chomp or badproto_badread $fh, "protocol message";
425 badproto $fh, "\`$_'";
428 sub protocol_send_file ($$) {
429 my ($fh, $ourfn) = @_;
430 open PF, "<", $ourfn or die "$ourfn: $!";
433 my $got = read PF, $d, 65536;
434 die "$ourfn: $!" unless defined $got;
436 print $fh "data-block ".length($d)."\n" or die $!;
437 print $fh $d or die $!;
439 PF->error and die "$ourfn $!";
440 print $fh "data-end\n" or die $!;
444 sub protocol_read_bytes ($$) {
445 my ($fh, $nbytes) = @_;
446 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
448 my $got = read $fh, $d, $nbytes;
449 $got==$nbytes or badproto_badread $fh, "data block";
453 sub protocol_receive_file ($$) {
454 my ($fh, $ourfn) = @_;
455 printdebug "() $ourfn\n";
456 open PF, ">", $ourfn or die "$ourfn: $!";
458 my ($y,$l) = protocol_expect {
459 m/^data-block (.*)$/ ? (1,$1) :
460 m/^data-end$/ ? (0,) :
464 my $d = protocol_read_bytes $fh, $l;
465 print PF $d or die $!;
470 #---------- remote protocol support, responder ----------
472 sub responder_send_command ($) {
474 return unless $we_are_responder;
475 # called even without $we_are_responder
476 printdebug ">> $command\n";
477 print PO $command, "\n" or die $!;
480 sub responder_send_file ($$) {
481 my ($keyword, $ourfn) = @_;
482 return unless $we_are_responder;
483 printdebug "]] $keyword $ourfn\n";
484 responder_send_command "file $keyword";
485 protocol_send_file \*PO, $ourfn;
488 sub responder_receive_files ($@) {
489 my ($keyword, @ourfns) = @_;
490 die unless $we_are_responder;
491 printdebug "[[ $keyword @ourfns\n";
492 responder_send_command "want $keyword";
493 foreach my $fn (@ourfns) {
494 protocol_receive_file \*PI, $fn;
497 protocol_expect { m/^files-end$/ } \*PI;
500 #---------- remote protocol support, initiator ----------
502 sub initiator_expect (&) {
504 protocol_expect { &$match } \*RO;
507 #---------- end remote code ----------
510 if ($we_are_responder) {
512 responder_send_command "progress ".length($m) or die $!;
513 print PO $m or die $!;
523 $ua = LWP::UserAgent->new();
527 progress "downloading $what...";
528 my $r = $ua->get(@_) or die $!;
529 return undef if $r->code == 404;
530 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
531 return $r->decoded_content(charset => 'none');
534 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
536 sub act_local () { return $dryrun_level <= 1; }
537 sub act_scary () { return !$dryrun_level; }
540 if (!$dryrun_level) {
541 progress "$us ok: @_";
543 progress "would be ok: @_ (but dry run only)";
548 printcmd(\*STDERR,$debugprefix."#",@_);
551 sub runcmd_ordryrun {
559 sub runcmd_ordryrun_local {
567 our $helpmsg = <<END;
569 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
570 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
571 dgit [dgit-opts] build [dpkg-buildpackage-opts]
572 dgit [dgit-opts] sbuild [sbuild-opts]
573 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
574 dgit [dgit-opts] push [dgit-opts] [suite]
575 dgit [dgit-opts] push-source [dgit-opts] [suite]
576 dgit [dgit-opts] rpush build-host:build-dir ...
577 important dgit options:
578 -k<keyid> sign tag and package with <keyid> instead of default
579 --dry-run -n do not change anything, but go through the motions
580 --damp-run -L like --dry-run but make local changes, without signing
581 --new -N allow introducing a new package
582 --debug -D increase debug level
583 -c<name>=<value> set git config option (used directly by dgit too)
586 our $later_warning_msg = <<END;
587 Perhaps the upload is stuck in incoming. Using the version from git.
591 print STDERR "$us: @_\n", $helpmsg or die $!;
596 @ARGV or badusage "too few arguments";
597 return scalar shift @ARGV;
601 not_necessarily_a_tree();
604 print $helpmsg or die $!;
608 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
610 our %defcfg = ('dgit.default.distro' => 'debian',
611 'dgit.default.default-suite' => 'unstable',
612 'dgit.default.old-dsc-distro' => 'debian',
613 'dgit-suite.*-security.distro' => 'debian-security',
614 'dgit.default.username' => '',
615 'dgit.default.archive-query-default-component' => 'main',
616 'dgit.default.ssh' => 'ssh',
617 'dgit.default.archive-query' => 'madison:',
618 'dgit.default.sshpsql-dbname' => 'service=projectb',
619 'dgit.default.aptget-components' => 'main',
620 'dgit.default.dgit-tag-format' => 'new,old,maint',
621 'dgit.default.source-only-uploads' => 'ok',
622 'dgit.dsc-url-proto-ok.http' => 'true',
623 'dgit.dsc-url-proto-ok.https' => 'true',
624 'dgit.dsc-url-proto-ok.git' => 'true',
625 'dgit.vcs-git.suites', => 'sid', # ;-separated
626 'dgit.default.dsc-url-proto-ok' => 'false',
627 # old means "repo server accepts pushes with old dgit tags"
628 # new means "repo server accepts pushes with new dgit tags"
629 # maint means "repo server accepts split brain pushes"
630 # hist means "repo server may have old pushes without new tag"
631 # ("hist" is implied by "old")
632 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
633 'dgit-distro.debian.git-check' => 'url',
634 'dgit-distro.debian.git-check-suffix' => '/info/refs',
635 'dgit-distro.debian.new-private-pushers' => 't',
636 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
637 'dgit-distro.debian/push.git-url' => '',
638 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
639 'dgit-distro.debian/push.git-user-force' => 'dgit',
640 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
641 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
642 'dgit-distro.debian/push.git-create' => 'true',
643 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
644 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
645 # 'dgit-distro.debian.archive-query-tls-key',
646 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
647 # ^ this does not work because curl is broken nowadays
648 # Fixing #790093 properly will involve providing providing the key
649 # in some pacagke and maybe updating these paths.
651 # 'dgit-distro.debian.archive-query-tls-curl-args',
652 # '--ca-path=/etc/ssl/ca-debian',
653 # ^ this is a workaround but works (only) on DSA-administered machines
654 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
655 'dgit-distro.debian.git-url-suffix' => '',
656 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
657 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
658 'dgit-distro.debian-security.archive-query' => 'aptget:',
659 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
660 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
661 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
662 'dgit-distro.debian-security.nominal-distro' => 'debian',
663 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
664 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
665 'dgit-distro.ubuntu.git-check' => 'false',
666 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
667 'dgit-distro.test-dummy.ssh' => "$td/ssh",
668 'dgit-distro.test-dummy.username' => "alice",
669 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
670 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
671 'dgit-distro.test-dummy.git-url' => "$td/git",
672 'dgit-distro.test-dummy.git-host' => "git",
673 'dgit-distro.test-dummy.git-path' => "$td/git",
674 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
675 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
676 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
677 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
681 our @gitcfgsources = qw(cmdline local global system);
682 our $invoked_in_git_tree = 1;
684 sub git_slurp_config () {
685 # This algoritm is a bit subtle, but this is needed so that for
686 # options which we want to be single-valued, we allow the
687 # different config sources to override properly. See #835858.
688 foreach my $src (@gitcfgsources) {
689 next if $src eq 'cmdline';
690 # we do this ourselves since git doesn't handle it
692 $gitcfgs{$src} = git_slurp_config_src $src;
696 sub git_get_config ($) {
698 foreach my $src (@gitcfgsources) {
699 my $l = $gitcfgs{$src}{$c};
700 confess "internal error ($l $c)" if $l && !ref $l;
701 printdebug"C $c ".(defined $l ?
702 join " ", map { messagequote "'$_'" } @$l :
706 @$l==1 or badcfg "multiple values for $c".
707 " (in $src git config)" if @$l > 1;
715 return undef if $c =~ /RETURN-UNDEF/;
716 printdebug "C? $c\n" if $debuglevel >= 5;
717 my $v = git_get_config($c);
718 return $v if defined $v;
719 my $dv = $defcfg{$c};
721 printdebug "CD $c $dv\n" if $debuglevel >= 4;
725 badcfg "need value for one of: @_\n".
726 "$us: distro or suite appears not to be (properly) supported";
729 sub not_necessarily_a_tree () {
730 # needs to be called from pre_*
731 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
732 $invoked_in_git_tree = 0;
735 sub access_basedistro__noalias () {
736 if (defined $idistro) {
739 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
740 return $def if defined $def;
741 foreach my $src (@gitcfgsources, 'internal') {
742 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
744 foreach my $k (keys %$kl) {
745 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
747 next unless match_glob $dpat, $isuite;
751 return cfg("dgit.default.distro");
755 sub access_basedistro () {
756 my $noalias = access_basedistro__noalias();
757 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
758 return $canon // $noalias;
761 sub access_nomdistro () {
762 my $base = access_basedistro();
763 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
764 $r =~ m/^$distro_re$/ or badcfg
765 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
769 sub access_quirk () {
770 # returns (quirk name, distro to use instead or undef, quirk-specific info)
771 my $basedistro = access_basedistro();
772 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
774 if (defined $backports_quirk) {
775 my $re = $backports_quirk;
776 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
778 $re =~ s/\%/([-0-9a-z_]+)/
779 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
780 if ($isuite =~ m/^$re$/) {
781 return ('backports',"$basedistro-backports",$1);
784 return ('none',undef);
789 sub parse_cfg_bool ($$$) {
790 my ($what,$def,$v) = @_;
793 $v =~ m/^[ty1]/ ? 1 :
794 $v =~ m/^[fn0]/ ? 0 :
795 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
798 sub access_forpush_config () {
799 my $d = access_basedistro();
803 parse_cfg_bool('new-private-pushers', 0,
804 cfg("dgit-distro.$d.new-private-pushers",
807 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
810 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
811 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
812 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
813 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
816 sub access_forpush () {
817 $access_forpush //= access_forpush_config();
818 return $access_forpush;
822 confess 'internal error '.Dumper($access_forpush)," ?" if
823 defined $access_forpush and !$access_forpush;
824 badcfg "pushing but distro is configured readonly"
825 if access_forpush_config() eq '0';
827 $supplementary_message = <<'END' unless $we_are_responder;
828 Push failed, before we got started.
829 You can retry the push, after fixing the problem, if you like.
831 parseopts_late_defaults();
835 parseopts_late_defaults();
838 sub supplementary_message ($) {
840 if (!$we_are_responder) {
841 $supplementary_message = $msg;
843 } elsif ($protovsn >= 3) {
844 responder_send_command "supplementary-message ".length($msg)
846 print PO $msg or die $!;
850 sub access_distros () {
851 # Returns list of distros to try, in order
854 # 0. `instead of' distro name(s) we have been pointed to
855 # 1. the access_quirk distro, if any
856 # 2a. the user's specified distro, or failing that } basedistro
857 # 2b. the distro calculated from the suite }
858 my @l = access_basedistro();
860 my (undef,$quirkdistro) = access_quirk();
861 unshift @l, $quirkdistro;
862 unshift @l, $instead_distro;
863 @l = grep { defined } @l;
865 push @l, access_nomdistro();
867 if (access_forpush()) {
868 @l = map { ("$_/push", $_) } @l;
873 sub access_cfg_cfgs (@) {
876 # The nesting of these loops determines the search order. We put
877 # the key loop on the outside so that we search all the distros
878 # for each key, before going on to the next key. That means that
879 # if access_cfg is called with a more specific, and then a less
880 # specific, key, an earlier distro can override the less specific
881 # without necessarily overriding any more specific keys. (If the
882 # distro wants to override the more specific keys it can simply do
883 # so; whereas if we did the loop the other way around, it would be
884 # impossible to for an earlier distro to override a less specific
885 # key but not the more specific ones without restating the unknown
886 # values of the more specific keys.
889 # We have to deal with RETURN-UNDEF specially, so that we don't
890 # terminate the search prematurely.
892 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
895 foreach my $d (access_distros()) {
896 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
898 push @cfgs, map { "dgit.default.$_" } @realkeys;
905 my (@cfgs) = access_cfg_cfgs(@keys);
906 my $value = cfg(@cfgs);
910 sub access_cfg_bool ($$) {
911 my ($def, @keys) = @_;
912 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
915 sub string_to_ssh ($) {
917 if ($spec =~ m/\s/) {
918 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
924 sub access_cfg_ssh () {
925 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
926 if (!defined $gitssh) {
929 return string_to_ssh $gitssh;
933 sub access_runeinfo ($) {
935 return ": dgit ".access_basedistro()." $info ;";
938 sub access_someuserhost ($) {
940 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
941 defined($user) && length($user) or
942 $user = access_cfg("$some-user",'username');
943 my $host = access_cfg("$some-host");
944 return length($user) ? "$user\@$host" : $host;
947 sub access_gituserhost () {
948 return access_someuserhost('git');
951 sub access_giturl (;$) {
953 my $url = access_cfg('git-url','RETURN-UNDEF');
956 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
957 return undef unless defined $proto;
960 access_gituserhost().
961 access_cfg('git-path');
963 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
966 return "$url/$package$suffix";
969 sub commit_getclogp ($) {
970 # Returns the parsed changelog hashref for a particular commit
972 our %commit_getclogp_memo;
973 my $memo = $commit_getclogp_memo{$objid};
974 return $memo if $memo;
976 my $mclog = dgit_privdir()."clog";
977 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
978 "$objid:debian/changelog";
979 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
982 sub parse_dscdata () {
983 my $dscfh = new IO::File \$dscdata, '<' or die $!;
984 printdebug Dumper($dscdata) if $debuglevel>1;
985 $dsc = parsecontrolfh($dscfh,$dscurl,1);
986 printdebug Dumper($dsc) if $debuglevel>1;
991 sub archive_query ($;@) {
992 my ($method) = shift @_;
993 fail "this operation does not support multiple comma-separated suites"
995 my $query = access_cfg('archive-query','RETURN-UNDEF');
996 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
999 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1002 sub archive_query_prepend_mirror {
1003 my $m = access_cfg('mirror');
1004 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1007 sub pool_dsc_subpath ($$) {
1008 my ($vsn,$component) = @_; # $package is implict arg
1009 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1010 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1013 sub cfg_apply_map ($$$) {
1014 my ($varref, $what, $mapspec) = @_;
1015 return unless $mapspec;
1017 printdebug "config $what EVAL{ $mapspec; }\n";
1019 eval "package Dgit::Config; $mapspec;";
1024 #---------- `ftpmasterapi' archive query method (nascent) ----------
1026 sub archive_api_query_cmd ($) {
1028 my @cmd = (@curl, qw(-sS));
1029 my $url = access_cfg('archive-query-url');
1030 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1032 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1033 foreach my $key (split /\:/, $keys) {
1034 $key =~ s/\%HOST\%/$host/g;
1036 fail "for $url: stat $key: $!" unless $!==ENOENT;
1039 fail "config requested specific TLS key but do not know".
1040 " how to get curl to use exactly that EE key ($key)";
1041 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1042 # # Sadly the above line does not work because of changes
1043 # # to gnutls. The real fix for #790093 may involve
1044 # # new curl options.
1047 # Fixing #790093 properly will involve providing a value
1048 # for this on clients.
1049 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1050 push @cmd, split / /, $kargs if defined $kargs;
1052 push @cmd, $url.$subpath;
1056 sub api_query ($$;$) {
1058 my ($data, $subpath, $ok404) = @_;
1059 badcfg "ftpmasterapi archive query method takes no data part"
1061 my @cmd = archive_api_query_cmd($subpath);
1062 my $url = $cmd[$#cmd];
1063 push @cmd, qw(-w %{http_code});
1064 my $json = cmdoutput @cmd;
1065 unless ($json =~ s/\d+\d+\d$//) {
1066 failedcmd_report_cmd undef, @cmd;
1067 fail "curl failed to print 3-digit HTTP code";
1070 return undef if $code eq '404' && $ok404;
1071 fail "fetch of $url gave HTTP code $code"
1072 unless $url =~ m#^file://# or $code =~ m/^2/;
1073 return decode_json($json);
1076 sub canonicalise_suite_ftpmasterapi {
1077 my ($proto,$data) = @_;
1078 my $suites = api_query($data, 'suites');
1080 foreach my $entry (@$suites) {
1082 my $v = $entry->{$_};
1083 defined $v && $v eq $isuite;
1084 } qw(codename name);
1085 push @matched, $entry;
1087 fail "unknown suite $isuite, maybe -d would help" unless @matched;
1090 @matched==1 or die "multiple matches for suite $isuite\n";
1091 $cn = "$matched[0]{codename}";
1092 defined $cn or die "suite $isuite info has no codename\n";
1093 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1095 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1100 sub archive_query_ftpmasterapi {
1101 my ($proto,$data) = @_;
1102 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1104 my $digester = Digest::SHA->new(256);
1105 foreach my $entry (@$info) {
1107 my $vsn = "$entry->{version}";
1108 my ($ok,$msg) = version_check $vsn;
1109 die "bad version: $msg\n" unless $ok;
1110 my $component = "$entry->{component}";
1111 $component =~ m/^$component_re$/ or die "bad component";
1112 my $filename = "$entry->{filename}";
1113 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1114 or die "bad filename";
1115 my $sha256sum = "$entry->{sha256sum}";
1116 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1117 push @rows, [ $vsn, "/pool/$component/$filename",
1118 $digester, $sha256sum ];
1120 die "bad ftpmaster api response: $@\n".Dumper($entry)
1123 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1124 return archive_query_prepend_mirror @rows;
1127 sub file_in_archive_ftpmasterapi {
1128 my ($proto,$data,$filename) = @_;
1129 my $pat = $filename;
1132 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1133 my $info = api_query($data, "file_in_archive/$pat", 1);
1136 sub package_not_wholly_new_ftpmasterapi {
1137 my ($proto,$data,$pkg) = @_;
1138 my $info = api_query($data,"madison?package=${pkg}&f=json");
1142 #---------- `aptget' archive query method ----------
1145 our $aptget_releasefile;
1146 our $aptget_configpath;
1148 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1149 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1151 sub aptget_cache_clean {
1152 runcmd_ordryrun_local qw(sh -ec),
1153 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1157 sub aptget_lock_acquire () {
1158 my $lockfile = "$aptget_base/lock";
1159 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1160 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1163 sub aptget_prep ($) {
1165 return if defined $aptget_base;
1167 badcfg "aptget archive query method takes no data part"
1170 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1173 ensuredir "$cache/dgit";
1175 access_cfg('aptget-cachekey','RETURN-UNDEF')
1176 // access_nomdistro();
1178 $aptget_base = "$cache/dgit/aptget";
1179 ensuredir $aptget_base;
1181 my $quoted_base = $aptget_base;
1182 die "$quoted_base contains bad chars, cannot continue"
1183 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1185 ensuredir $aptget_base;
1187 aptget_lock_acquire();
1189 aptget_cache_clean();
1191 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1192 my $sourceslist = "source.list#$cachekey";
1194 my $aptsuites = $isuite;
1195 cfg_apply_map(\$aptsuites, 'suite map',
1196 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1198 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1199 printf SRCS "deb-src %s %s %s\n",
1200 access_cfg('mirror'),
1202 access_cfg('aptget-components')
1205 ensuredir "$aptget_base/cache";
1206 ensuredir "$aptget_base/lists";
1208 open CONF, ">", $aptget_configpath or die $!;
1210 Debug::NoLocking "true";
1211 APT::Get::List-Cleanup "false";
1212 #clear APT::Update::Post-Invoke-Success;
1213 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1214 Dir::State::Lists "$quoted_base/lists";
1215 Dir::Etc::preferences "$quoted_base/preferences";
1216 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1217 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1220 foreach my $key (qw(
1223 Dir::Cache::Archives
1224 Dir::Etc::SourceParts
1225 Dir::Etc::preferencesparts
1227 ensuredir "$aptget_base/$key";
1228 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1231 my $oldatime = (time // die $!) - 1;
1232 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1233 next unless stat_exists $oldlist;
1234 my ($mtime) = (stat _)[9];
1235 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1238 runcmd_ordryrun_local aptget_aptget(), qw(update);
1241 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1242 next unless stat_exists $oldlist;
1243 my ($atime) = (stat _)[8];
1244 next if $atime == $oldatime;
1245 push @releasefiles, $oldlist;
1247 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1248 @releasefiles = @inreleasefiles if @inreleasefiles;
1249 if (!@releasefiles) {
1251 apt seemed to not to update dgit's cached Release files for $isuite.
1253 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1256 die "apt updated too many Release files (@releasefiles), erk"
1257 unless @releasefiles == 1;
1259 ($aptget_releasefile) = @releasefiles;
1262 sub canonicalise_suite_aptget {
1263 my ($proto,$data) = @_;
1266 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1268 foreach my $name (qw(Codename Suite)) {
1269 my $val = $release->{$name};
1271 printdebug "release file $name: $val\n";
1272 $val =~ m/^$suite_re$/o or fail
1273 "Release file ($aptget_releasefile) specifies intolerable $name";
1274 cfg_apply_map(\$val, 'suite rmap',
1275 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1282 sub archive_query_aptget {
1283 my ($proto,$data) = @_;
1286 ensuredir "$aptget_base/source";
1287 foreach my $old (<$aptget_base/source/*.dsc>) {
1288 unlink $old or die "$old: $!";
1291 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1292 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1293 # avoids apt-get source failing with ambiguous error code
1295 runcmd_ordryrun_local
1296 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1297 aptget_aptget(), qw(--download-only --only-source source), $package;
1299 my @dscs = <$aptget_base/source/*.dsc>;
1300 fail "apt-get source did not produce a .dsc" unless @dscs;
1301 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1303 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1306 my $uri = "file://". uri_escape $dscs[0];
1307 $uri =~ s{\%2f}{/}gi;
1308 return [ (getfield $pre_dsc, 'Version'), $uri ];
1311 sub file_in_archive_aptget () { return undef; }
1312 sub package_not_wholly_new_aptget () { return undef; }
1314 #---------- `dummyapicat' archive query method ----------
1316 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1317 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1319 sub dummycatapi_run_in_mirror ($@) {
1320 # runs $fn with FIA open onto rune
1321 my ($rune, $argl, $fn) = @_;
1323 my $mirror = access_cfg('mirror');
1324 $mirror =~ s#^file://#/# or die "$mirror ?";
1325 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1326 qw(x), $mirror, @$argl);
1327 debugcmd "-|", @cmd;
1328 open FIA, "-|", @cmd or die $!;
1330 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1334 sub file_in_archive_dummycatapi ($$$) {
1335 my ($proto,$data,$filename) = @_;
1337 dummycatapi_run_in_mirror '
1338 find -name "$1" -print0 |
1340 ', [$filename], sub {
1343 printdebug "| $_\n";
1344 m/^(\w+) (\S+)$/ or die "$_ ?";
1345 push @out, { sha256sum => $1, filename => $2 };
1351 sub package_not_wholly_new_dummycatapi {
1352 my ($proto,$data,$pkg) = @_;
1353 dummycatapi_run_in_mirror "
1354 find -name ${pkg}_*.dsc
1361 #---------- `madison' archive query method ----------
1363 sub archive_query_madison {
1364 return archive_query_prepend_mirror
1365 map { [ @$_[0..1] ] } madison_get_parse(@_);
1368 sub madison_get_parse {
1369 my ($proto,$data) = @_;
1370 die unless $proto eq 'madison';
1371 if (!length $data) {
1372 $data= access_cfg('madison-distro','RETURN-UNDEF');
1373 $data //= access_basedistro();
1375 $rmad{$proto,$data,$package} ||= cmdoutput
1376 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1377 my $rmad = $rmad{$proto,$data,$package};
1380 foreach my $l (split /\n/, $rmad) {
1381 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1382 \s*( [^ \t|]+ )\s* \|
1383 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1384 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1385 $1 eq $package or die "$rmad $package ?";
1392 $component = access_cfg('archive-query-default-component');
1394 $5 eq 'source' or die "$rmad ?";
1395 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1397 return sort { -version_compare($a->[0],$b->[0]); } @out;
1400 sub canonicalise_suite_madison {
1401 # madison canonicalises for us
1402 my @r = madison_get_parse(@_);
1404 "unable to canonicalise suite using package $package".
1405 " which does not appear to exist in suite $isuite;".
1406 " --existing-package may help";
1410 sub file_in_archive_madison { return undef; }
1411 sub package_not_wholly_new_madison { return undef; }
1413 #---------- `sshpsql' archive query method ----------
1416 my ($data,$runeinfo,$sql) = @_;
1417 if (!length $data) {
1418 $data= access_someuserhost('sshpsql').':'.
1419 access_cfg('sshpsql-dbname');
1421 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1422 my ($userhost,$dbname) = ($`,$'); #';
1424 my @cmd = (access_cfg_ssh, $userhost,
1425 access_runeinfo("ssh-psql $runeinfo").
1426 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1427 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1429 open P, "-|", @cmd or die $!;
1432 printdebug(">|$_|\n");
1435 $!=0; $?=0; close P or failedcmd @cmd;
1437 my $nrows = pop @rows;
1438 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1439 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1440 @rows = map { [ split /\|/, $_ ] } @rows;
1441 my $ncols = scalar @{ shift @rows };
1442 die if grep { scalar @$_ != $ncols } @rows;
1446 sub sql_injection_check {
1447 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1450 sub archive_query_sshpsql ($$) {
1451 my ($proto,$data) = @_;
1452 sql_injection_check $isuite, $package;
1453 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1454 SELECT source.version, component.name, files.filename, files.sha256sum
1456 JOIN src_associations ON source.id = src_associations.source
1457 JOIN suite ON suite.id = src_associations.suite
1458 JOIN dsc_files ON dsc_files.source = source.id
1459 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1460 JOIN component ON component.id = files_archive_map.component_id
1461 JOIN files ON files.id = dsc_files.file
1462 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1463 AND source.source='$package'
1464 AND files.filename LIKE '%.dsc';
1466 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1467 my $digester = Digest::SHA->new(256);
1469 my ($vsn,$component,$filename,$sha256sum) = @$_;
1470 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1472 return archive_query_prepend_mirror @rows;
1475 sub canonicalise_suite_sshpsql ($$) {
1476 my ($proto,$data) = @_;
1477 sql_injection_check $isuite;
1478 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1479 SELECT suite.codename
1480 FROM suite where suite_name='$isuite' or codename='$isuite';
1482 @rows = map { $_->[0] } @rows;
1483 fail "unknown suite $isuite" unless @rows;
1484 die "ambiguous $isuite: @rows ?" if @rows>1;
1488 sub file_in_archive_sshpsql ($$$) { return undef; }
1489 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1491 #---------- `dummycat' archive query method ----------
1493 sub canonicalise_suite_dummycat ($$) {
1494 my ($proto,$data) = @_;
1495 my $dpath = "$data/suite.$isuite";
1496 if (!open C, "<", $dpath) {
1497 $!==ENOENT or die "$dpath: $!";
1498 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1502 chomp or die "$dpath: $!";
1504 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1508 sub archive_query_dummycat ($$) {
1509 my ($proto,$data) = @_;
1510 canonicalise_suite();
1511 my $dpath = "$data/package.$csuite.$package";
1512 if (!open C, "<", $dpath) {
1513 $!==ENOENT or die "$dpath: $!";
1514 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1522 printdebug "dummycat query $csuite $package $dpath | $_\n";
1523 my @row = split /\s+/, $_;
1524 @row==2 or die "$dpath: $_ ?";
1527 C->error and die "$dpath: $!";
1529 return archive_query_prepend_mirror
1530 sort { -version_compare($a->[0],$b->[0]); } @rows;
1533 sub file_in_archive_dummycat () { return undef; }
1534 sub package_not_wholly_new_dummycat () { return undef; }
1536 #---------- tag format handling ----------
1538 sub access_cfg_tagformats () {
1539 split /\,/, access_cfg('dgit-tag-format');
1542 sub access_cfg_tagformats_can_splitbrain () {
1543 my %y = map { $_ => 1 } access_cfg_tagformats;
1544 foreach my $needtf (qw(new maint)) {
1545 next if $y{$needtf};
1551 sub need_tagformat ($$) {
1552 my ($fmt, $why) = @_;
1553 fail "need to use tag format $fmt ($why) but also need".
1554 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1555 " - no way to proceed"
1556 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1557 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1560 sub select_tagformat () {
1562 return if $tagformatfn && !$tagformat_want;
1563 die 'bug' if $tagformatfn && $tagformat_want;
1564 # ... $tagformat_want assigned after previous select_tagformat
1566 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1567 printdebug "select_tagformat supported @supported\n";
1569 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1570 printdebug "select_tagformat specified @$tagformat_want\n";
1572 my ($fmt,$why,$override) = @$tagformat_want;
1574 fail "target distro supports tag formats @supported".
1575 " but have to use $fmt ($why)"
1577 or grep { $_ eq $fmt } @supported;
1579 $tagformat_want = undef;
1581 $tagformatfn = ${*::}{"debiantag_$fmt"};
1583 fail "trying to use unknown tag format \`$fmt' ($why) !"
1584 unless $tagformatfn;
1587 #---------- archive query entrypoints and rest of program ----------
1589 sub canonicalise_suite () {
1590 return if defined $csuite;
1591 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1592 $csuite = archive_query('canonicalise_suite');
1593 if ($isuite ne $csuite) {
1594 progress "canonical suite name for $isuite is $csuite";
1596 progress "canonical suite name is $csuite";
1600 sub get_archive_dsc () {
1601 canonicalise_suite();
1602 my @vsns = archive_query('archive_query');
1603 foreach my $vinfo (@vsns) {
1604 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1605 $dscurl = $vsn_dscurl;
1606 $dscdata = url_get($dscurl);
1608 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1613 $digester->add($dscdata);
1614 my $got = $digester->hexdigest();
1616 fail "$dscurl has hash $got but".
1617 " archive told us to expect $digest";
1620 my $fmt = getfield $dsc, 'Format';
1621 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1622 "unsupported source format $fmt, sorry";
1624 $dsc_checked = !!$digester;
1625 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1629 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1632 sub check_for_git ();
1633 sub check_for_git () {
1635 my $how = access_cfg('git-check');
1636 if ($how eq 'ssh-cmd') {
1638 (access_cfg_ssh, access_gituserhost(),
1639 access_runeinfo("git-check $package").
1640 " set -e; cd ".access_cfg('git-path').";".
1641 " if test -d $package.git; then echo 1; else echo 0; fi");
1642 my $r= cmdoutput @cmd;
1643 if (defined $r and $r =~ m/^divert (\w+)$/) {
1645 my ($usedistro,) = access_distros();
1646 # NB that if we are pushing, $usedistro will be $distro/push
1647 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1648 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1649 progress "diverting to $divert (using config for $instead_distro)";
1650 return check_for_git();
1652 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1654 } elsif ($how eq 'url') {
1655 my $prefix = access_cfg('git-check-url','git-url');
1656 my $suffix = access_cfg('git-check-suffix','git-suffix',
1657 'RETURN-UNDEF') // '.git';
1658 my $url = "$prefix/$package$suffix";
1659 my @cmd = (@curl, qw(-sS -I), $url);
1660 my $result = cmdoutput @cmd;
1661 $result =~ s/^\S+ 200 .*\n\r?\n//;
1662 # curl -sS -I with https_proxy prints
1663 # HTTP/1.0 200 Connection established
1664 $result =~ m/^\S+ (404|200) /s or
1665 fail "unexpected results from git check query - ".
1666 Dumper($prefix, $result);
1668 if ($code eq '404') {
1670 } elsif ($code eq '200') {
1675 } elsif ($how eq 'true') {
1677 } elsif ($how eq 'false') {
1680 badcfg "unknown git-check \`$how'";
1684 sub create_remote_git_repo () {
1685 my $how = access_cfg('git-create');
1686 if ($how eq 'ssh-cmd') {
1688 (access_cfg_ssh, access_gituserhost(),
1689 access_runeinfo("git-create $package").
1690 "set -e; cd ".access_cfg('git-path').";".
1691 " cp -a _template $package.git");
1692 } elsif ($how eq 'true') {
1695 badcfg "unknown git-create \`$how'";
1699 our ($dsc_hash,$lastpush_mergeinput);
1700 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1704 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1705 $playground = fresh_playground 'dgit/unpack';
1708 sub mktree_in_ud_here () {
1709 playtree_setup $gitcfgs{local};
1712 sub git_write_tree () {
1713 my $tree = cmdoutput @git, qw(write-tree);
1714 $tree =~ m/^\w+$/ or die "$tree ?";
1718 sub git_add_write_tree () {
1719 runcmd @git, qw(add -Af .);
1720 return git_write_tree();
1723 sub remove_stray_gits ($) {
1725 my @gitscmd = qw(find -name .git -prune -print0);
1726 debugcmd "|",@gitscmd;
1727 open GITS, "-|", @gitscmd or die $!;
1732 print STDERR "$us: warning: removing from $what: ",
1733 (messagequote $_), "\n";
1737 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1740 sub mktree_in_ud_from_only_subdir ($;$) {
1741 my ($what,$raw) = @_;
1742 # changes into the subdir
1745 die "expected one subdir but found @dirs ?" unless @dirs==1;
1746 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1750 remove_stray_gits($what);
1751 mktree_in_ud_here();
1753 my ($format, $fopts) = get_source_format();
1754 if (madformat($format)) {
1759 my $tree=git_add_write_tree();
1760 return ($tree,$dir);
1763 our @files_csum_info_fields =
1764 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1765 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1766 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1768 sub dsc_files_info () {
1769 foreach my $csumi (@files_csum_info_fields) {
1770 my ($fname, $module, $method) = @$csumi;
1771 my $field = $dsc->{$fname};
1772 next unless defined $field;
1773 eval "use $module; 1;" or die $@;
1775 foreach (split /\n/, $field) {
1777 m/^(\w+) (\d+) (\S+)$/ or
1778 fail "could not parse .dsc $fname line \`$_'";
1779 my $digester = eval "$module"."->$method;" or die $@;
1784 Digester => $digester,
1789 fail "missing any supported Checksums-* or Files field in ".
1790 $dsc->get_option('name');
1794 map { $_->{Filename} } dsc_files_info();
1797 sub files_compare_inputs (@) {
1802 my $showinputs = sub {
1803 return join "; ", map { $_->get_option('name') } @$inputs;
1806 foreach my $in (@$inputs) {
1808 my $in_name = $in->get_option('name');
1810 printdebug "files_compare_inputs $in_name\n";
1812 foreach my $csumi (@files_csum_info_fields) {
1813 my ($fname) = @$csumi;
1814 printdebug "files_compare_inputs $in_name $fname\n";
1816 my $field = $in->{$fname};
1817 next unless defined $field;
1820 foreach (split /\n/, $field) {
1823 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1824 fail "could not parse $in_name $fname line \`$_'";
1826 printdebug "files_compare_inputs $in_name $fname $f\n";
1830 my $re = \ $record{$f}{$fname};
1832 $fchecked{$f}{$in_name} = 1;
1834 fail "hash or size of $f varies in $fname fields".
1835 " (between: ".$showinputs->().")";
1840 @files = sort @files;
1841 $expected_files //= \@files;
1842 "@$expected_files" eq "@files" or
1843 fail "file list in $in_name varies between hash fields!";
1846 fail "$in_name has no files list field(s)";
1848 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1851 grep { keys %$_ == @$inputs-1 } values %fchecked
1852 or fail "no file appears in all file lists".
1853 " (looked in: ".$showinputs->().")";
1856 sub is_orig_file_in_dsc ($$) {
1857 my ($f, $dsc_files_info) = @_;
1858 return 0 if @$dsc_files_info <= 1;
1859 # One file means no origs, and the filename doesn't have a "what
1860 # part of dsc" component. (Consider versions ending `.orig'.)
1861 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1865 # This function determines whether a .changes file is source-only from
1866 # the point of view of dak. Thus, it permits *_source.buildinfo
1869 # It does not, however, permit any other buildinfo files. After a
1870 # source-only upload, the buildds will try to upload files like
1871 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1872 # named like this in their (otherwise) source-only upload, the uploads
1873 # of the buildd can be rejected by dak. Fixing the resultant
1874 # situation can require manual intervention. So we block such
1875 # .buildinfo files when the user tells us to perform a source-only
1876 # upload (such as when using the push-source subcommand with the -C
1877 # option, which calls this function).
1879 # Note, though, that when dgit is told to prepare a source-only
1880 # upload, such as when subcommands like build-source and push-source
1881 # without -C are used, dgit has a more restrictive notion of
1882 # source-only .changes than dak: such uploads will never include
1883 # *_source.buildinfo files. This is because there is no use for such
1884 # files when using a tool like dgit to produce the source package, as
1885 # dgit ensures the source is identical to git HEAD.
1886 sub test_source_only_changes ($) {
1888 foreach my $l (split /\n/, getfield $changes, 'Files') {
1889 $l =~ m/\S+$/ or next;
1890 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1891 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1892 print "purportedly source-only changes polluted by $&\n";
1899 sub changes_update_origs_from_dsc ($$$$) {
1900 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1902 printdebug "checking origs needed ($upstreamvsn)...\n";
1903 $_ = getfield $changes, 'Files';
1904 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1905 fail "cannot find section/priority from .changes Files field";
1906 my $placementinfo = $1;
1908 printdebug "checking origs needed placement '$placementinfo'...\n";
1909 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1910 $l =~ m/\S+$/ or next;
1912 printdebug "origs $file | $l\n";
1913 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1914 printdebug "origs $file is_orig\n";
1915 my $have = archive_query('file_in_archive', $file);
1916 if (!defined $have) {
1918 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1924 printdebug "origs $file \$#\$have=$#$have\n";
1925 foreach my $h (@$have) {
1928 foreach my $csumi (@files_csum_info_fields) {
1929 my ($fname, $module, $method, $archivefield) = @$csumi;
1930 next unless defined $h->{$archivefield};
1931 $_ = $dsc->{$fname};
1932 next unless defined;
1933 m/^(\w+) .* \Q$file\E$/m or
1934 fail ".dsc $fname missing entry for $file";
1935 if ($h->{$archivefield} eq $1) {
1939 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1942 die "$file ".Dumper($h)." ?!" if $same && @differ;
1945 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1948 printdebug "origs $file f.same=$found_same".
1949 " #f._differ=$#found_differ\n";
1950 if (@found_differ && !$found_same) {
1952 "archive contains $file with different checksum",
1955 # Now we edit the changes file to add or remove it
1956 foreach my $csumi (@files_csum_info_fields) {
1957 my ($fname, $module, $method, $archivefield) = @$csumi;
1958 next unless defined $changes->{$fname};
1960 # in archive, delete from .changes if it's there
1961 $changed{$file} = "removed" if
1962 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
1963 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
1964 # not in archive, but it's here in the .changes
1966 my $dsc_data = getfield $dsc, $fname;
1967 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
1969 $extra =~ s/ \d+ /$&$placementinfo /
1970 or die "$fname $extra >$dsc_data< ?"
1971 if $fname eq 'Files';
1972 $changes->{$fname} .= "\n". $extra;
1973 $changed{$file} = "added";
1978 foreach my $file (keys %changed) {
1980 "edited .changes for archive .orig contents: %s %s",
1981 $changed{$file}, $file;
1983 my $chtmp = "$changesfile.tmp";
1984 $changes->save($chtmp);
1986 rename $chtmp,$changesfile or die "$changesfile $!";
1988 progress "[new .changes left in $changesfile]";
1991 progress "$changesfile already has appropriate .orig(s) (if any)";
1995 sub make_commit ($) {
1997 return cmdoutput @git, qw(hash-object -w -t commit), $file;
2000 sub make_commit_text ($) {
2003 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
2005 print Dumper($text) if $debuglevel > 1;
2006 my $child = open2($out, $in, @cmd) or die $!;
2009 print $in $text or die $!;
2010 close $in or die $!;
2012 $h =~ m/^\w+$/ or die;
2014 printdebug "=> $h\n";
2017 waitpid $child, 0 == $child or die "$child $!";
2018 $? and failedcmd @cmd;
2022 sub clogp_authline ($) {
2024 my $author = getfield $clogp, 'Maintainer';
2025 if ($author =~ m/^[^"\@]+\,/) {
2026 # single entry Maintainer field with unquoted comma
2027 $author = ($& =~ y/,//rd).$'; # strip the comma
2029 # git wants a single author; any remaining commas in $author
2030 # are by now preceded by @ (or "). It seems safer to punt on
2031 # "..." for now rather than attempting to dequote or something.
2032 $author =~ s#,.*##ms unless $author =~ m/"/;
2033 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2034 my $authline = "$author $date";
2035 $authline =~ m/$git_authline_re/o or
2036 fail "unexpected commit author line format \`$authline'".
2037 " (was generated from changelog Maintainer field)";
2038 return ($1,$2,$3) if wantarray;
2042 sub vendor_patches_distro ($$) {
2043 my ($checkdistro, $what) = @_;
2044 return unless defined $checkdistro;
2046 my $series = "debian/patches/\L$checkdistro\E.series";
2047 printdebug "checking for vendor-specific $series ($what)\n";
2049 if (!open SERIES, "<", $series) {
2050 die "$series $!" unless $!==ENOENT;
2059 Unfortunately, this source package uses a feature of dpkg-source where
2060 the same source package unpacks to different source code on different
2061 distros. dgit cannot safely operate on such packages on affected
2062 distros, because the meaning of source packages is not stable.
2064 Please ask the distro/maintainer to remove the distro-specific series
2065 files and use a different technique (if necessary, uploading actually
2066 different packages, if different distros are supposed to have
2070 fail "Found active distro-specific series file for".
2071 " $checkdistro ($what): $series, cannot continue";
2073 die "$series $!" if SERIES->error;
2077 sub check_for_vendor_patches () {
2078 # This dpkg-source feature doesn't seem to be documented anywhere!
2079 # But it can be found in the changelog (reformatted):
2081 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2082 # Author: Raphael Hertzog <hertzog@debian.org>
2083 # Date: Sun Oct 3 09:36:48 2010 +0200
2085 # dpkg-source: correctly create .pc/.quilt_series with alternate
2088 # If you have debian/patches/ubuntu.series and you were
2089 # unpacking the source package on ubuntu, quilt was still
2090 # directed to debian/patches/series instead of
2091 # debian/patches/ubuntu.series.
2093 # debian/changelog | 3 +++
2094 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2095 # 2 files changed, 6 insertions(+), 1 deletion(-)
2098 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2099 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2100 "Dpkg::Vendor \`current vendor'");
2101 vendor_patches_distro(access_basedistro(),
2102 "(base) distro being accessed");
2103 vendor_patches_distro(access_nomdistro(),
2104 "(nominal) distro being accessed");
2107 sub generate_commits_from_dsc () {
2108 # See big comment in fetch_from_archive, below.
2109 # See also README.dsc-import.
2111 changedir $playground;
2113 my @dfi = dsc_files_info();
2114 foreach my $fi (@dfi) {
2115 my $f = $fi->{Filename};
2116 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2117 my $upper_f = (bpd_abs()."/$f");
2119 printdebug "considering reusing $f: ";
2121 if (link_ltarget "$upper_f,fetch", $f) {
2122 printdebug "linked (using ...,fetch).\n";
2123 } elsif ((printdebug "($!) "),
2125 fail "accessing $buildproductsdir/$f,fetch: $!";
2126 } elsif (link_ltarget $upper_f, $f) {
2127 printdebug "linked.\n";
2128 } elsif ((printdebug "($!) "),
2130 fail "accessing $buildproductsdir/$f: $!";
2132 printdebug "absent.\n";
2136 complete_file_from_dsc('.', $fi, \$refetched)
2139 printdebug "considering saving $f: ";
2141 if (link $f, $upper_f) {
2142 printdebug "linked.\n";
2143 } elsif ((printdebug "($!) "),
2145 fail "saving $buildproductsdir/$f: $!";
2146 } elsif (!$refetched) {
2147 printdebug "no need.\n";
2148 } elsif (link $f, "$upper_f,fetch") {
2149 printdebug "linked (using ...,fetch).\n";
2150 } elsif ((printdebug "($!) "),
2152 fail "saving $buildproductsdir/$f,fetch: $!";
2154 printdebug "cannot.\n";
2158 # We unpack and record the orig tarballs first, so that we only
2159 # need disk space for one private copy of the unpacked source.
2160 # But we can't make them into commits until we have the metadata
2161 # from the debian/changelog, so we record the tree objects now and
2162 # make them into commits later.
2164 my $upstreamv = upstreamversion $dsc->{version};
2165 my $orig_f_base = srcfn $upstreamv, '';
2167 foreach my $fi (@dfi) {
2168 # We actually import, and record as a commit, every tarball
2169 # (unless there is only one file, in which case there seems
2172 my $f = $fi->{Filename};
2173 printdebug "import considering $f ";
2174 (printdebug "only one dfi\n"), next if @dfi == 1;
2175 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2176 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2180 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2182 printdebug "Y ", (join ' ', map { $_//"(none)" }
2183 $compr_ext, $orig_f_part
2186 my $input = new IO::File $f, '<' or die "$f $!";
2190 if (defined $compr_ext) {
2192 Dpkg::Compression::compression_guess_from_filename $f;
2193 fail "Dpkg::Compression cannot handle file $f in source package"
2194 if defined $compr_ext && !defined $cname;
2196 new Dpkg::Compression::Process compression => $cname;
2197 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2198 my $compr_fh = new IO::Handle;
2199 my $compr_pid = open $compr_fh, "-|" // die $!;
2201 open STDIN, "<&", $input or die $!;
2203 die "dgit (child): exec $compr_cmd[0]: $!\n";
2208 rmtree "_unpack-tar";
2209 mkdir "_unpack-tar" or die $!;
2210 my @tarcmd = qw(tar -x -f -
2211 --no-same-owner --no-same-permissions
2212 --no-acls --no-xattrs --no-selinux);
2213 my $tar_pid = fork // die $!;
2215 chdir "_unpack-tar" or die $!;
2216 open STDIN, "<&", $input or die $!;
2218 die "dgit (child): exec $tarcmd[0]: $!";
2220 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2221 !$? or failedcmd @tarcmd;
2224 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2226 # finally, we have the results in "tarball", but maybe
2227 # with the wrong permissions
2229 runcmd qw(chmod -R +rwX _unpack-tar);
2230 changedir "_unpack-tar";
2231 remove_stray_gits($f);
2232 mktree_in_ud_here();
2234 my ($tree) = git_add_write_tree();
2235 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2236 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2238 printdebug "one subtree $1\n";
2240 printdebug "multiple subtrees\n";
2243 rmtree "_unpack-tar";
2245 my $ent = [ $f, $tree ];
2247 Orig => !!$orig_f_part,
2248 Sort => (!$orig_f_part ? 2 :
2249 $orig_f_part =~ m/-/g ? 1 :
2257 # put any without "_" first (spec is not clear whether files
2258 # are always in the usual order). Tarballs without "_" are
2259 # the main orig or the debian tarball.
2260 $a->{Sort} <=> $b->{Sort} or
2264 my $any_orig = grep { $_->{Orig} } @tartrees;
2266 my $dscfn = "$package.dsc";
2268 my $treeimporthow = 'package';
2270 open D, ">", $dscfn or die "$dscfn: $!";
2271 print D $dscdata or die "$dscfn: $!";
2272 close D or die "$dscfn: $!";
2273 my @cmd = qw(dpkg-source);
2274 push @cmd, '--no-check' if $dsc_checked;
2275 if (madformat $dsc->{format}) {
2276 push @cmd, '--skip-patches';
2277 $treeimporthow = 'unpatched';
2279 push @cmd, qw(-x --), $dscfn;
2282 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2283 if (madformat $dsc->{format}) {
2284 check_for_vendor_patches();
2288 if (madformat $dsc->{format}) {
2289 my @pcmd = qw(dpkg-source --before-build .);
2290 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2292 $dappliedtree = git_add_write_tree();
2295 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2299 printdebug "import clog search...\n";
2300 parsechangelog_loop \@clogcmd, "package changelog", sub {
2301 my ($thisstanza, $desc) = @_;
2302 no warnings qw(exiting);
2304 $clogp //= $thisstanza;
2306 printdebug "import clog $thisstanza->{version} $desc...\n";
2308 last if !$any_orig; # we don't need $r1clogp
2310 # We look for the first (most recent) changelog entry whose
2311 # version number is lower than the upstream version of this
2312 # package. Then the last (least recent) previous changelog
2313 # entry is treated as the one which introduced this upstream
2314 # version and used for the synthetic commits for the upstream
2317 # One might think that a more sophisticated algorithm would be
2318 # necessary. But: we do not want to scan the whole changelog
2319 # file. Stopping when we see an earlier version, which
2320 # necessarily then is an earlier upstream version, is the only
2321 # realistic way to do that. Then, either the earliest
2322 # changelog entry we have seen so far is indeed the earliest
2323 # upload of this upstream version; or there are only changelog
2324 # entries relating to later upstream versions (which is not
2325 # possible unless the changelog and .dsc disagree about the
2326 # version). Then it remains to choose between the physically
2327 # last entry in the file, and the one with the lowest version
2328 # number. If these are not the same, we guess that the
2329 # versions were created in a non-monotonic order rather than
2330 # that the changelog entries have been misordered.
2332 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2334 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2335 $r1clogp = $thisstanza;
2337 printdebug "import clog $r1clogp->{version} becomes r1\n";
2340 $clogp or fail "package changelog has no entries!";
2342 my $authline = clogp_authline $clogp;
2343 my $changes = getfield $clogp, 'Changes';
2344 $changes =~ s/^\n//; # Changes: \n
2345 my $cversion = getfield $clogp, 'Version';
2348 $r1clogp //= $clogp; # maybe there's only one entry;
2349 my $r1authline = clogp_authline $r1clogp;
2350 # Strictly, r1authline might now be wrong if it's going to be
2351 # unused because !$any_orig. Whatever.
2353 printdebug "import tartrees authline $authline\n";
2354 printdebug "import tartrees r1authline $r1authline\n";
2356 foreach my $tt (@tartrees) {
2357 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2359 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2362 committer $r1authline
2366 [dgit import orig $tt->{F}]
2374 [dgit import tarball $package $cversion $tt->{F}]
2379 printdebug "import main commit\n";
2381 open C, ">../commit.tmp" or die $!;
2382 print C <<END or die $!;
2385 print C <<END or die $! foreach @tartrees;
2388 print C <<END or die $!;
2394 [dgit import $treeimporthow $package $cversion]
2398 my $rawimport_hash = make_commit qw(../commit.tmp);
2400 if (madformat $dsc->{format}) {
2401 printdebug "import apply patches...\n";
2403 # regularise the state of the working tree so that
2404 # the checkout of $rawimport_hash works nicely.
2405 my $dappliedcommit = make_commit_text(<<END);
2412 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2414 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2416 # We need the answers to be reproducible
2417 my @authline = clogp_authline($clogp);
2418 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2419 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2420 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2421 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2422 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2423 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2425 my $path = $ENV{PATH} or die;
2427 # we use ../../gbp-pq-output, which (given that we are in
2428 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2431 foreach my $use_absurd (qw(0 1)) {
2432 runcmd @git, qw(checkout -q unpa);
2433 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2434 local $ENV{PATH} = $path;
2437 progress "warning: $@";
2438 $path = "$absurdity:$path";
2439 progress "$us: trying slow absurd-git-apply...";
2440 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2445 die "forbid absurd git-apply\n" if $use_absurd
2446 && forceing [qw(import-gitapply-no-absurd)];
2447 die "only absurd git-apply!\n" if !$use_absurd
2448 && forceing [qw(import-gitapply-absurd)];
2450 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2451 local $ENV{PATH} = $path if $use_absurd;
2453 my @showcmd = (gbp_pq, qw(import));
2454 my @realcmd = shell_cmd
2455 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2456 debugcmd "+",@realcmd;
2457 if (system @realcmd) {
2458 die +(shellquote @showcmd).
2460 failedcmd_waitstatus()."\n";
2463 my $gapplied = git_rev_parse('HEAD');
2464 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2465 $gappliedtree eq $dappliedtree or
2467 gbp-pq import and dpkg-source disagree!
2468 gbp-pq import gave commit $gapplied
2469 gbp-pq import gave tree $gappliedtree
2470 dpkg-source --before-build gave tree $dappliedtree
2472 $rawimport_hash = $gapplied;
2477 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2482 progress "synthesised git commit from .dsc $cversion";
2484 my $rawimport_mergeinput = {
2485 Commit => $rawimport_hash,
2486 Info => "Import of source package",
2488 my @output = ($rawimport_mergeinput);
2490 if ($lastpush_mergeinput) {
2491 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2492 my $oversion = getfield $oldclogp, 'Version';
2494 version_compare($oversion, $cversion);
2496 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2497 { Message => <<END, ReverseParents => 1 });
2498 Record $package ($cversion) in archive suite $csuite
2500 } elsif ($vcmp > 0) {
2501 print STDERR <<END or die $!;
2503 Version actually in archive: $cversion (older)
2504 Last version pushed with dgit: $oversion (newer or same)
2507 @output = $lastpush_mergeinput;
2509 # Same version. Use what's in the server git branch,
2510 # discarding our own import. (This could happen if the
2511 # server automatically imports all packages into git.)
2512 @output = $lastpush_mergeinput;
2520 sub complete_file_from_dsc ($$;$) {
2521 our ($dstdir, $fi, $refetched) = @_;
2522 # Ensures that we have, in $dstdir, the file $fi, with the correct
2523 # contents. (Downloading it from alongside $dscurl if necessary.)
2524 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2525 # and will set $$refetched=1 if it did so (or tried to).
2527 my $f = $fi->{Filename};
2528 my $tf = "$dstdir/$f";
2532 my $checkhash = sub {
2533 open F, "<", "$tf" or die "$tf: $!";
2534 $fi->{Digester}->reset();
2535 $fi->{Digester}->addfile(*F);
2536 F->error and die $!;
2537 $got = $fi->{Digester}->hexdigest();
2538 return $got eq $fi->{Hash};
2541 if (stat_exists $tf) {
2542 if ($checkhash->()) {
2543 progress "using existing $f";
2547 fail "file $f has hash $got but .dsc".
2548 " demands hash $fi->{Hash} ".
2549 "(perhaps you should delete this file?)";
2551 progress "need to fetch correct version of $f";
2552 unlink $tf or die "$tf $!";
2555 printdebug "$tf does not exist, need to fetch\n";
2559 $furl =~ s{/[^/]+$}{};
2561 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2562 die "$f ?" if $f =~ m#/#;
2563 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2564 return 0 if !act_local();
2567 fail "file $f has hash $got but .dsc".
2568 " demands hash $fi->{Hash} ".
2569 "(got wrong file from archive!)";
2574 sub ensure_we_have_orig () {
2575 my @dfi = dsc_files_info();
2576 foreach my $fi (@dfi) {
2577 my $f = $fi->{Filename};
2578 next unless is_orig_file_in_dsc($f, \@dfi);
2579 complete_file_from_dsc($buildproductsdir, $fi)
2584 #---------- git fetch ----------
2586 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2587 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2589 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2590 # locally fetched refs because they have unhelpful names and clutter
2591 # up gitk etc. So we track whether we have "used up" head ref (ie,
2592 # whether we have made another local ref which refers to this object).
2594 # (If we deleted them unconditionally, then we might end up
2595 # re-fetching the same git objects each time dgit fetch was run.)
2597 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2598 # in git_fetch_us to fetch the refs in question, and possibly a call
2599 # to lrfetchref_used.
2601 our (%lrfetchrefs_f, %lrfetchrefs_d);
2602 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2604 sub lrfetchref_used ($) {
2605 my ($fullrefname) = @_;
2606 my $objid = $lrfetchrefs_f{$fullrefname};
2607 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2610 sub git_lrfetch_sane {
2611 my ($url, $supplementary, @specs) = @_;
2612 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2613 # at least as regards @specs. Also leave the results in
2614 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2615 # able to clean these up.
2617 # With $supplementary==1, @specs must not contain wildcards
2618 # and we add to our previous fetches (non-atomically).
2620 # This is rather miserable:
2621 # When git fetch --prune is passed a fetchspec ending with a *,
2622 # it does a plausible thing. If there is no * then:
2623 # - it matches subpaths too, even if the supplied refspec
2624 # starts refs, and behaves completely madly if the source
2625 # has refs/refs/something. (See, for example, Debian #NNNN.)
2626 # - if there is no matching remote ref, it bombs out the whole
2628 # We want to fetch a fixed ref, and we don't know in advance
2629 # if it exists, so this is not suitable.
2631 # Our workaround is to use git ls-remote. git ls-remote has its
2632 # own qairks. Notably, it has the absurd multi-tail-matching
2633 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2634 # refs/refs/foo etc.
2636 # Also, we want an idempotent snapshot, but we have to make two
2637 # calls to the remote: one to git ls-remote and to git fetch. The
2638 # solution is use git ls-remote to obtain a target state, and
2639 # git fetch to try to generate it. If we don't manage to generate
2640 # the target state, we try again.
2642 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2644 my $specre = join '|', map {
2647 my $wildcard = $x =~ s/\\\*$/.*/;
2648 die if $wildcard && $supplementary;
2651 printdebug "git_lrfetch_sane specre=$specre\n";
2652 my $wanted_rref = sub {
2654 return m/^(?:$specre)$/;
2657 my $fetch_iteration = 0;
2660 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2661 if (++$fetch_iteration > 10) {
2662 fail "too many iterations trying to get sane fetch!";
2665 my @look = map { "refs/$_" } @specs;
2666 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2670 open GITLS, "-|", @lcmd or die $!;
2672 printdebug "=> ", $_;
2673 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2674 my ($objid,$rrefname) = ($1,$2);
2675 if (!$wanted_rref->($rrefname)) {
2677 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2681 $wantr{$rrefname} = $objid;
2684 close GITLS or failedcmd @lcmd;
2686 # OK, now %want is exactly what we want for refs in @specs
2688 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2689 "+refs/$_:".lrfetchrefs."/$_";
2692 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2694 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2695 runcmd_ordryrun_local @fcmd if @fspecs;
2697 if (!$supplementary) {
2698 %lrfetchrefs_f = ();
2702 git_for_each_ref(lrfetchrefs, sub {
2703 my ($objid,$objtype,$lrefname,$reftail) = @_;
2704 $lrfetchrefs_f{$lrefname} = $objid;
2705 $objgot{$objid} = 1;
2708 if ($supplementary) {
2712 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2713 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2714 if (!exists $wantr{$rrefname}) {
2715 if ($wanted_rref->($rrefname)) {
2717 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2721 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2724 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2725 delete $lrfetchrefs_f{$lrefname};
2729 foreach my $rrefname (sort keys %wantr) {
2730 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2731 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2732 my $want = $wantr{$rrefname};
2733 next if $got eq $want;
2734 if (!defined $objgot{$want}) {
2735 fail <<END unless act_local();
2736 --dry-run specified but we actually wanted the results of git fetch,
2737 so this is not going to work. Try running dgit fetch first,
2738 or using --damp-run instead of --dry-run.
2741 warning: git ls-remote suggests we want $lrefname
2742 warning: and it should refer to $want
2743 warning: but git fetch didn't fetch that object to any relevant ref.
2744 warning: This may be due to a race with someone updating the server.
2745 warning: Will try again...
2747 next FETCH_ITERATION;
2750 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2752 runcmd_ordryrun_local @git, qw(update-ref -m),
2753 "dgit fetch git fetch fixup", $lrefname, $want;
2754 $lrfetchrefs_f{$lrefname} = $want;
2759 if (defined $csuite) {
2760 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2761 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2762 my ($objid,$objtype,$lrefname,$reftail) = @_;
2763 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2764 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2768 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2769 Dumper(\%lrfetchrefs_f);
2772 sub git_fetch_us () {
2773 # Want to fetch only what we are going to use, unless
2774 # deliberately-not-ff, in which case we must fetch everything.
2776 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2778 (quiltmode_splitbrain
2779 ? (map { $_->('*',access_nomdistro) }
2780 \&debiantag_new, \&debiantag_maintview)
2781 : debiantags('*',access_nomdistro));
2782 push @specs, server_branch($csuite);
2783 push @specs, $rewritemap;
2784 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2786 my $url = access_giturl();
2787 git_lrfetch_sane $url, 0, @specs;
2790 my @tagpats = debiantags('*',access_nomdistro);
2792 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2793 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2794 printdebug "currently $fullrefname=$objid\n";
2795 $here{$fullrefname} = $objid;
2797 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2798 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2799 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2800 printdebug "offered $lref=$objid\n";
2801 if (!defined $here{$lref}) {
2802 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2803 runcmd_ordryrun_local @upd;
2804 lrfetchref_used $fullrefname;
2805 } elsif ($here{$lref} eq $objid) {
2806 lrfetchref_used $fullrefname;
2809 "Not updating $lref from $here{$lref} to $objid.\n";
2814 #---------- dsc and archive handling ----------
2816 sub mergeinfo_getclogp ($) {
2817 # Ensures thit $mi->{Clogp} exists and returns it
2819 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2822 sub mergeinfo_version ($) {
2823 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2826 sub fetch_from_archive_record_1 ($) {
2828 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
2829 cmdoutput @git, qw(log -n2), $hash;
2830 # ... gives git a chance to complain if our commit is malformed
2833 sub fetch_from_archive_record_2 ($) {
2835 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
2839 dryrun_report @upd_cmd;
2843 sub parse_dsc_field_def_dsc_distro () {
2844 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2845 dgit.default.distro);
2848 sub parse_dsc_field ($$) {
2849 my ($dsc, $what) = @_;
2851 foreach my $field (@ourdscfield) {
2852 $f = $dsc->{$field};
2857 progress "$what: NO git hash";
2858 parse_dsc_field_def_dsc_distro();
2859 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2860 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2861 progress "$what: specified git info ($dsc_distro)";
2862 $dsc_hint_tag = [ $dsc_hint_tag ];
2863 } elsif ($f =~ m/^\w+\s*$/) {
2865 parse_dsc_field_def_dsc_distro();
2866 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2868 progress "$what: specified git hash";
2870 fail "$what: invalid Dgit info";
2874 sub resolve_dsc_field_commit ($$) {
2875 my ($already_distro, $already_mapref) = @_;
2877 return unless defined $dsc_hash;
2880 defined $already_mapref &&
2881 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2882 ? $already_mapref : undef;
2886 my ($what, @fetch) = @_;
2888 local $idistro = $dsc_distro;
2889 my $lrf = lrfetchrefs;
2891 if (!$chase_dsc_distro) {
2893 "not chasing .dsc distro $dsc_distro: not fetching $what";
2898 ".dsc names distro $dsc_distro: fetching $what";
2900 my $url = access_giturl();
2901 if (!defined $url) {
2902 defined $dsc_hint_url or fail <<END;
2903 .dsc Dgit metadata is in context of distro $dsc_distro
2904 for which we have no configured url and .dsc provides no hint
2907 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2908 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2909 parse_cfg_bool "dsc-url-proto-ok", 'false',
2910 cfg("dgit.dsc-url-proto-ok.$proto",
2911 "dgit.default.dsc-url-proto-ok")
2913 .dsc Dgit metadata is in context of distro $dsc_distro
2914 for which we have no configured url;
2915 .dsc provides hinted url with protocol $proto which is unsafe.
2916 (can be overridden by config - consult documentation)
2918 $url = $dsc_hint_url;
2921 git_lrfetch_sane $url, 1, @fetch;
2926 my $rewrite_enable = do {
2927 local $idistro = $dsc_distro;
2928 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2931 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2932 if (!defined $mapref) {
2933 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2934 $mapref = $lrf.'/'.$rewritemap;
2936 my $rewritemapdata = git_cat_file $mapref.':map';
2937 if (defined $rewritemapdata
2938 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2940 "server's git history rewrite map contains a relevant entry!";
2943 if (defined $dsc_hash) {
2944 progress "using rewritten git hash in place of .dsc value";
2946 progress "server data says .dsc hash is to be disregarded";
2951 if (!defined git_cat_file $dsc_hash) {
2952 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2953 my $lrf = $do_fetch->("additional commits", @tags) &&
2954 defined git_cat_file $dsc_hash
2956 .dsc Dgit metadata requires commit $dsc_hash
2957 but we could not obtain that object anywhere.
2959 foreach my $t (@tags) {
2960 my $fullrefname = $lrf.'/'.$t;
2961 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2962 next unless $lrfetchrefs_f{$fullrefname};
2963 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2964 lrfetchref_used $fullrefname;
2969 sub fetch_from_archive () {
2970 ensure_setup_existing_tree();
2972 # Ensures that lrref() is what is actually in the archive, one way
2973 # or another, according to us - ie this client's
2974 # appropritaely-updated archive view. Also returns the commit id.
2975 # If there is nothing in the archive, leaves lrref alone and
2976 # returns undef. git_fetch_us must have already been called.
2980 parse_dsc_field($dsc, 'last upload to archive');
2981 resolve_dsc_field_commit access_basedistro,
2982 lrfetchrefs."/".$rewritemap
2984 progress "no version available from the archive";
2987 # If the archive's .dsc has a Dgit field, there are three
2988 # relevant git commitids we need to choose between and/or merge
2990 # 1. $dsc_hash: the Dgit field from the archive
2991 # 2. $lastpush_hash: the suite branch on the dgit git server
2992 # 3. $lastfetch_hash: our local tracking brach for the suite
2994 # These may all be distinct and need not be in any fast forward
2997 # If the dsc was pushed to this suite, then the server suite
2998 # branch will have been updated; but it might have been pushed to
2999 # a different suite and copied by the archive. Conversely a more
3000 # recent version may have been pushed with dgit but not appeared
3001 # in the archive (yet).
3003 # $lastfetch_hash may be awkward because archive imports
3004 # (particularly, imports of Dgit-less .dscs) are performed only as
3005 # needed on individual clients, so different clients may perform a
3006 # different subset of them - and these imports are only made
3007 # public during push. So $lastfetch_hash may represent a set of
3008 # imports different to a subsequent upload by a different dgit
3011 # Our approach is as follows:
3013 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3014 # descendant of $dsc_hash, then it was pushed by a dgit user who
3015 # had based their work on $dsc_hash, so we should prefer it.
3016 # Otherwise, $dsc_hash was installed into this suite in the
3017 # archive other than by a dgit push, and (necessarily) after the
3018 # last dgit push into that suite (since a dgit push would have
3019 # been descended from the dgit server git branch); thus, in that
3020 # case, we prefer the archive's version (and produce a
3021 # pseudo-merge to overwrite the dgit server git branch).
3023 # (If there is no Dgit field in the archive's .dsc then
3024 # generate_commit_from_dsc uses the version numbers to decide
3025 # whether the suite branch or the archive is newer. If the suite
3026 # branch is newer it ignores the archive's .dsc; otherwise it
3027 # generates an import of the .dsc, and produces a pseudo-merge to
3028 # overwrite the suite branch with the archive contents.)
3030 # The outcome of that part of the algorithm is the `public view',
3031 # and is same for all dgit clients: it does not depend on any
3032 # unpublished history in the local tracking branch.
3034 # As between the public view and the local tracking branch: The
3035 # local tracking branch is only updated by dgit fetch, and
3036 # whenever dgit fetch runs it includes the public view in the
3037 # local tracking branch. Therefore if the public view is not
3038 # descended from the local tracking branch, the local tracking
3039 # branch must contain history which was imported from the archive
3040 # but never pushed; and, its tip is now out of date. So, we make
3041 # a pseudo-merge to overwrite the old imports and stitch the old
3044 # Finally: we do not necessarily reify the public view (as
3045 # described above). This is so that we do not end up stacking two
3046 # pseudo-merges. So what we actually do is figure out the inputs
3047 # to any public view pseudo-merge and put them in @mergeinputs.
3050 # $mergeinputs[]{Commit}
3051 # $mergeinputs[]{Info}
3052 # $mergeinputs[0] is the one whose tree we use
3053 # @mergeinputs is in the order we use in the actual commit)
3056 # $mergeinputs[]{Message} is a commit message to use
3057 # $mergeinputs[]{ReverseParents} if def specifies that parent
3058 # list should be in opposite order
3059 # Such an entry has no Commit or Info. It applies only when found
3060 # in the last entry. (This ugliness is to support making
3061 # identical imports to previous dgit versions.)
3063 my $lastpush_hash = git_get_ref(lrfetchref());
3064 printdebug "previous reference hash=$lastpush_hash\n";
3065 $lastpush_mergeinput = $lastpush_hash && {
3066 Commit => $lastpush_hash,
3067 Info => "dgit suite branch on dgit git server",
3070 my $lastfetch_hash = git_get_ref(lrref());
3071 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3072 my $lastfetch_mergeinput = $lastfetch_hash && {
3073 Commit => $lastfetch_hash,
3074 Info => "dgit client's archive history view",
3077 my $dsc_mergeinput = $dsc_hash && {
3078 Commit => $dsc_hash,
3079 Info => "Dgit field in .dsc from archive",
3083 my $del_lrfetchrefs = sub {
3086 printdebug "del_lrfetchrefs...\n";
3087 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3088 my $objid = $lrfetchrefs_d{$fullrefname};
3089 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3091 $gur ||= new IO::Handle;
3092 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3094 printf $gur "delete %s %s\n", $fullrefname, $objid;
3097 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3101 if (defined $dsc_hash) {
3102 ensure_we_have_orig();
3103 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3104 @mergeinputs = $dsc_mergeinput
3105 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3106 print STDERR <<END or die $!;
3108 Git commit in archive is behind the last version allegedly pushed/uploaded.
3109 Commit referred to by archive: $dsc_hash
3110 Last version pushed with dgit: $lastpush_hash
3113 @mergeinputs = ($lastpush_mergeinput);
3115 # Archive has .dsc which is not a descendant of the last dgit
3116 # push. This can happen if the archive moves .dscs about.
3117 # Just follow its lead.
3118 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3119 progress "archive .dsc names newer git commit";
3120 @mergeinputs = ($dsc_mergeinput);
3122 progress "archive .dsc names other git commit, fixing up";
3123 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3127 @mergeinputs = generate_commits_from_dsc();
3128 # We have just done an import. Now, our import algorithm might
3129 # have been improved. But even so we do not want to generate
3130 # a new different import of the same package. So if the
3131 # version numbers are the same, just use our existing version.
3132 # If the version numbers are different, the archive has changed
3133 # (perhaps, rewound).
3134 if ($lastfetch_mergeinput &&
3135 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3136 (mergeinfo_version $mergeinputs[0]) )) {
3137 @mergeinputs = ($lastfetch_mergeinput);
3139 } elsif ($lastpush_hash) {
3140 # only in git, not in the archive yet
3141 @mergeinputs = ($lastpush_mergeinput);
3142 print STDERR <<END or die $!;
3144 Package not found in the archive, but has allegedly been pushed using dgit.
3148 printdebug "nothing found!\n";
3149 if (defined $skew_warning_vsn) {
3150 print STDERR <<END or die $!;
3152 Warning: relevant archive skew detected.
3153 Archive allegedly contains $skew_warning_vsn
3154 But we were not able to obtain any version from the archive or git.
3158 unshift @end, $del_lrfetchrefs;
3162 if ($lastfetch_hash &&
3164 my $h = $_->{Commit};
3165 $h and is_fast_fwd($lastfetch_hash, $h);
3166 # If true, one of the existing parents of this commit
3167 # is a descendant of the $lastfetch_hash, so we'll
3168 # be ff from that automatically.
3172 push @mergeinputs, $lastfetch_mergeinput;
3175 printdebug "fetch mergeinfos:\n";
3176 foreach my $mi (@mergeinputs) {
3178 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3180 printdebug sprintf " ReverseParents=%d Message=%s",
3181 $mi->{ReverseParents}, $mi->{Message};
3185 my $compat_info= pop @mergeinputs
3186 if $mergeinputs[$#mergeinputs]{Message};
3188 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3191 if (@mergeinputs > 1) {
3193 my $tree_commit = $mergeinputs[0]{Commit};
3195 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3196 $tree =~ m/\n\n/; $tree = $`;
3197 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3200 # We use the changelog author of the package in question the
3201 # author of this pseudo-merge. This is (roughly) correct if
3202 # this commit is simply representing aa non-dgit upload.
3203 # (Roughly because it does not record sponsorship - but we
3204 # don't have sponsorship info because that's in the .changes,
3205 # which isn't in the archivw.)
3207 # But, it might be that we are representing archive history
3208 # updates (including in-archive copies). These are not really
3209 # the responsibility of the person who created the .dsc, but
3210 # there is no-one whose name we should better use. (The
3211 # author of the .dsc-named commit is clearly worse.)
3213 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3214 my $author = clogp_authline $useclogp;
3215 my $cversion = getfield $useclogp, 'Version';
3217 my $mcf = dgit_privdir()."/mergecommit";
3218 open MC, ">", $mcf or die "$mcf $!";
3219 print MC <<END or die $!;
3223 my @parents = grep { $_->{Commit} } @mergeinputs;
3224 @parents = reverse @parents if $compat_info->{ReverseParents};
3225 print MC <<END or die $! foreach @parents;
3229 print MC <<END or die $!;
3235 if (defined $compat_info->{Message}) {
3236 print MC $compat_info->{Message} or die $!;
3238 print MC <<END or die $!;
3239 Record $package ($cversion) in archive suite $csuite
3243 my $message_add_info = sub {
3245 my $mversion = mergeinfo_version $mi;
3246 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3250 $message_add_info->($mergeinputs[0]);
3251 print MC <<END or die $!;
3252 should be treated as descended from
3254 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3258 $hash = make_commit $mcf;
3260 $hash = $mergeinputs[0]{Commit};
3262 printdebug "fetch hash=$hash\n";
3265 my ($lasth, $what) = @_;
3266 return unless $lasth;
3267 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3270 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3272 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3274 fetch_from_archive_record_1($hash);
3276 if (defined $skew_warning_vsn) {
3277 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3278 my $gotclogp = commit_getclogp($hash);
3279 my $got_vsn = getfield $gotclogp, 'Version';
3280 printdebug "SKEW CHECK GOT $got_vsn\n";
3281 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3282 print STDERR <<END or die $!;
3284 Warning: archive skew detected. Using the available version:
3285 Archive allegedly contains $skew_warning_vsn
3286 We were able to obtain only $got_vsn
3292 if ($lastfetch_hash ne $hash) {
3293 fetch_from_archive_record_2($hash);
3296 lrfetchref_used lrfetchref();
3298 check_gitattrs($hash, "fetched source tree");
3300 unshift @end, $del_lrfetchrefs;
3304 sub set_local_git_config ($$) {
3306 runcmd @git, qw(config), $k, $v;
3309 sub setup_mergechangelogs (;$) {
3311 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3313 my $driver = 'dpkg-mergechangelogs';
3314 my $cb = "merge.$driver";
3315 confess unless defined $maindir;
3316 my $attrs = "$maindir_gitcommon/info/attributes";
3317 ensuredir "$maindir_gitcommon/info";
3319 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3320 if (!open ATTRS, "<", $attrs) {
3321 $!==ENOENT or die "$attrs: $!";
3325 next if m{^debian/changelog\s};
3326 print NATTRS $_, "\n" or die $!;
3328 ATTRS->error and die $!;
3331 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3334 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3335 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3337 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3340 sub setup_useremail (;$) {
3342 return unless $always || access_cfg_bool(1, 'setup-useremail');
3345 my ($k, $envvar) = @_;
3346 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3347 return unless defined $v;
3348 set_local_git_config "user.$k", $v;
3351 $setup->('email', 'DEBEMAIL');
3352 $setup->('name', 'DEBFULLNAME');
3355 sub ensure_setup_existing_tree () {
3356 my $k = "remote.$remotename.skipdefaultupdate";
3357 my $c = git_get_config $k;
3358 return if defined $c;
3359 set_local_git_config $k, 'true';
3362 sub open_main_gitattrs () {
3363 confess 'internal error no maindir' unless defined $maindir;
3364 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3366 or die "open $maindir_gitcommon/info/attributes: $!";
3370 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3372 sub is_gitattrs_setup () {
3375 # 1: gitattributes set up and should be left alone
3377 # 0: there is a dgit-defuse-attrs but it needs fixing
3378 # undef: there is none
3379 my $gai = open_main_gitattrs();
3380 return 0 unless $gai;
3382 next unless m{$gitattrs_ourmacro_re};
3383 return 1 if m{\s-working-tree-encoding\s};
3384 printdebug "is_gitattrs_setup: found old macro\n";
3387 $gai->error and die $!;
3388 printdebug "is_gitattrs_setup: found nothing\n";
3392 sub setup_gitattrs (;$) {
3394 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3396 my $already = is_gitattrs_setup();
3399 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3400 not doing further gitattributes setup
3404 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3405 my $af = "$maindir_gitcommon/info/attributes";
3406 ensuredir "$maindir_gitcommon/info";
3408 open GAO, "> $af.new" or die $!;
3409 print GAO <<END or die $! unless defined $already;
3412 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3414 my $gai = open_main_gitattrs();
3417 if (m{$gitattrs_ourmacro_re}) {
3418 die unless defined $already;
3422 print GAO $_, "\n" or die $!;
3424 $gai->error and die $!;
3426 close GAO or die $!;
3427 rename "$af.new", "$af" or die "install $af: $!";
3430 sub setup_new_tree () {
3431 setup_mergechangelogs();
3436 sub check_gitattrs ($$) {
3437 my ($treeish, $what) = @_;
3439 return if is_gitattrs_setup;
3442 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3444 my $gafl = new IO::File;
3445 open $gafl, "-|", @cmd or die $!;
3448 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3450 next unless m{(?:^|/)\.gitattributes$};
3452 # oh dear, found one
3454 dgit: warning: $what contains .gitattributes
3455 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3460 # tree contains no .gitattributes files
3461 $?=0; $!=0; close $gafl or failedcmd @cmd;
3465 sub multisuite_suite_child ($$$) {
3466 my ($tsuite, $merginputs, $fn) = @_;
3467 # in child, sets things up, calls $fn->(), and returns undef
3468 # in parent, returns canonical suite name for $tsuite
3469 my $canonsuitefh = IO::File::new_tmpfile;
3470 my $pid = fork // die $!;
3474 $us .= " [$isuite]";
3475 $debugprefix .= " ";
3476 progress "fetching $tsuite...";
3477 canonicalise_suite();
3478 print $canonsuitefh $csuite, "\n" or die $!;
3479 close $canonsuitefh or die $!;
3483 waitpid $pid,0 == $pid or die $!;
3484 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3485 seek $canonsuitefh,0,0 or die $!;
3486 local $csuite = <$canonsuitefh>;
3487 die $! unless defined $csuite && chomp $csuite;
3489 printdebug "multisuite $tsuite missing\n";
3492 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3493 push @$merginputs, {
3500 sub fork_for_multisuite ($) {
3501 my ($before_fetch_merge) = @_;
3502 # if nothing unusual, just returns ''
3505 # returns 0 to caller in child, to do first of the specified suites
3506 # in child, $csuite is not yet set
3508 # returns 1 to caller in parent, to finish up anything needed after
3509 # in parent, $csuite is set to canonicalised portmanteau
3511 my $org_isuite = $isuite;
3512 my @suites = split /\,/, $isuite;
3513 return '' unless @suites > 1;
3514 printdebug "fork_for_multisuite: @suites\n";
3518 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3520 return 0 unless defined $cbasesuite;
3522 fail "package $package missing in (base suite) $cbasesuite"
3523 unless @mergeinputs;
3525 my @csuites = ($cbasesuite);
3527 $before_fetch_merge->();
3529 foreach my $tsuite (@suites[1..$#suites]) {
3530 $tsuite =~ s/^-/$cbasesuite-/;
3531 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3537 # xxx collecte the ref here
3539 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3540 push @csuites, $csubsuite;
3543 foreach my $mi (@mergeinputs) {
3544 my $ref = git_get_ref $mi->{Ref};
3545 die "$mi->{Ref} ?" unless length $ref;
3546 $mi->{Commit} = $ref;
3549 $csuite = join ",", @csuites;
3551 my $previous = git_get_ref lrref;
3553 unshift @mergeinputs, {
3554 Commit => $previous,
3555 Info => "local combined tracking branch",
3557 "archive seems to have rewound: local tracking branch is ahead!",
3561 foreach my $ix (0..$#mergeinputs) {
3562 $mergeinputs[$ix]{Index} = $ix;
3565 @mergeinputs = sort {
3566 -version_compare(mergeinfo_version $a,
3567 mergeinfo_version $b) # highest version first
3569 $a->{Index} <=> $b->{Index}; # earliest in spec first
3575 foreach my $mi (@mergeinputs) {
3576 printdebug "multisuite merge check $mi->{Info}\n";
3577 foreach my $previous (@needed) {
3578 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3579 printdebug "multisuite merge un-needed $previous->{Info}\n";
3583 printdebug "multisuite merge this-needed\n";
3584 $mi->{Character} = '+';
3587 $needed[0]{Character} = '*';
3589 my $output = $needed[0]{Commit};
3592 printdebug "multisuite merge nontrivial\n";
3593 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3595 my $commit = "tree $tree\n";
3596 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3597 "Input branches:\n";
3599 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3600 printdebug "multisuite merge include $mi->{Info}\n";
3601 $mi->{Character} //= ' ';
3602 $commit .= "parent $mi->{Commit}\n";
3603 $msg .= sprintf " %s %-25s %s\n",
3605 (mergeinfo_version $mi),
3608 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3610 " * marks the highest version branch, which choose to use\n".
3611 " + marks each branch which was not already an ancestor\n\n".
3612 "[dgit multi-suite $csuite]\n";
3614 "author $authline\n".
3615 "committer $authline\n\n";
3616 $output = make_commit_text $commit.$msg;
3617 printdebug "multisuite merge generated $output\n";
3620 fetch_from_archive_record_1($output);
3621 fetch_from_archive_record_2($output);
3623 progress "calculated combined tracking suite $csuite";
3628 sub clone_set_head () {
3629 open H, "> .git/HEAD" or die $!;
3630 print H "ref: ".lref()."\n" or die $!;
3633 sub clone_finish ($) {
3635 runcmd @git, qw(reset --hard), lrref();
3636 runcmd qw(bash -ec), <<'END';
3638 git ls-tree -r --name-only -z HEAD | \
3639 xargs -0r touch -h -r . --
3641 printdone "ready for work in $dstdir";
3645 # in multisuite, returns twice!
3646 # once in parent after first suite fetched,
3647 # and then again in child after everything is finished
3649 badusage "dry run makes no sense with clone" unless act_local();
3651 my $multi_fetched = fork_for_multisuite(sub {
3652 printdebug "multi clone before fetch merge\n";
3656 if ($multi_fetched) {
3657 printdebug "multi clone after fetch merge\n";
3659 clone_finish($dstdir);
3662 printdebug "clone main body\n";
3664 canonicalise_suite();
3665 my $hasgit = check_for_git();
3666 mkdir $dstdir or fail "create \`$dstdir': $!";
3668 runcmd @git, qw(init -q);
3672 my $giturl = access_giturl(1);
3673 if (defined $giturl) {
3674 runcmd @git, qw(remote add), 'origin', $giturl;
3677 progress "fetching existing git history";
3679 runcmd_ordryrun_local @git, qw(fetch origin);
3681 progress "starting new git history";
3683 fetch_from_archive() or no_such_package;
3684 my $vcsgiturl = $dsc->{'Vcs-Git'};
3685 if (length $vcsgiturl) {
3686 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3687 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3689 clone_finish($dstdir);
3693 canonicalise_suite();
3694 if (check_for_git()) {
3697 fetch_from_archive() or no_such_package();
3699 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3700 if (length $vcsgiturl and
3701 (grep { $csuite eq $_ }
3703 cfg 'dgit.vcs-git.suites')) {
3704 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3705 if (defined $current && $current ne $vcsgiturl) {
3707 FYI: Vcs-Git in $csuite has different url to your vcs-git remote.
3708 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3712 printdone "fetched into ".lrref();
3716 my $multi_fetched = fork_for_multisuite(sub { });
3717 fetch_one() unless $multi_fetched; # parent
3718 finish 0 if $multi_fetched eq '0'; # child
3723 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3725 printdone "fetched to ".lrref()." and merged into HEAD";
3728 sub check_not_dirty () {
3729 foreach my $f (qw(local-options local-patch-header)) {
3730 if (stat_exists "debian/source/$f") {
3731 fail "git tree contains debian/source/$f";
3735 return if $includedirty;
3737 git_check_unmodified();
3740 sub commit_admin ($) {
3743 runcmd_ordryrun_local @git, qw(commit -m), $m;
3746 sub quiltify_nofix_bail ($$) {
3747 my ($headinfo, $xinfo) = @_;
3748 if ($quilt_mode eq 'nofix') {
3749 fail "quilt fixup required but quilt mode is \`nofix'\n".
3750 "HEAD commit".$headinfo." differs from tree implied by ".
3751 " debian/patches".$xinfo;
3755 sub commit_quilty_patch () {
3756 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3758 foreach my $l (split /\n/, $output) {
3759 next unless $l =~ m/\S/;
3760 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3764 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3766 progress "nothing quilty to commit, ok.";
3769 quiltify_nofix_bail "", " (wanted to commit patch update)";
3770 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3771 runcmd_ordryrun_local @git, qw(add -f), @adds;
3773 Commit Debian 3.0 (quilt) metadata
3775 [dgit ($our_version) quilt-fixup]
3779 sub get_source_format () {
3781 if (open F, "debian/source/options") {
3785 s/\s+$//; # ignore missing final newline
3787 my ($k, $v) = ($`, $'); #');
3788 $v =~ s/^"(.*)"$/$1/;
3794 F->error and die $!;
3797 die $! unless $!==&ENOENT;
3800 if (!open F, "debian/source/format") {
3801 die $! unless $!==&ENOENT;
3805 F->error and die $!;
3807 return ($_, \%options);
3810 sub madformat_wantfixup ($) {
3812 return 0 unless $format eq '3.0 (quilt)';
3813 our $quilt_mode_warned;
3814 if ($quilt_mode eq 'nocheck') {
3815 progress "Not doing any fixup of \`$format' due to".
3816 " ----no-quilt-fixup or --quilt=nocheck"
3817 unless $quilt_mode_warned++;
3820 progress "Format \`$format', need to check/update patch stack"
3821 unless $quilt_mode_warned++;
3825 sub maybe_split_brain_save ($$$) {
3826 my ($headref, $dgitview, $msg) = @_;
3827 # => message fragment "$saved" describing disposition of $dgitview
3828 my $save = $internal_object_save{'dgit-view'};
3829 return "commit id $dgitview" unless defined $save;
3830 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3832 "dgit --dgit-view-save $msg HEAD=$headref",
3835 return "and left in $save";
3838 # An "infopair" is a tuple [ $thing, $what ]
3839 # (often $thing is a commit hash; $what is a description)
3841 sub infopair_cond_equal ($$) {
3843 $x->[0] eq $y->[0] or fail <<END;
3844 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3848 sub infopair_lrf_tag_lookup ($$) {
3849 my ($tagnames, $what) = @_;
3850 # $tagname may be an array ref
3851 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3852 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3853 foreach my $tagname (@tagnames) {
3854 my $lrefname = lrfetchrefs."/tags/$tagname";
3855 my $tagobj = $lrfetchrefs_f{$lrefname};
3856 next unless defined $tagobj;
3857 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3858 return [ git_rev_parse($tagobj), $what ];
3860 fail @tagnames==1 ? <<END : <<END;
3861 Wanted tag $what (@tagnames) on dgit server, but not found
3863 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3867 sub infopair_cond_ff ($$) {
3868 my ($anc,$desc) = @_;
3869 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3870 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3874 sub pseudomerge_version_check ($$) {
3875 my ($clogp, $archive_hash) = @_;
3877 my $arch_clogp = commit_getclogp $archive_hash;
3878 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3879 'version currently in archive' ];
3880 if (defined $overwrite_version) {
3881 if (length $overwrite_version) {
3882 infopair_cond_equal([ $overwrite_version,
3883 '--overwrite= version' ],
3886 my $v = $i_arch_v->[0];
3887 progress "Checking package changelog for archive version $v ...";
3890 my @xa = ("-f$v", "-t$v");
3891 my $vclogp = parsechangelog @xa;
3894 [ (getfield $vclogp, $fn),
3895 "$fn field from dpkg-parsechangelog @xa" ];
3897 my $cv = $gf->('Version');
3898 infopair_cond_equal($i_arch_v, $cv);
3899 $cd = $gf->('Distribution');
3902 $@ =~ s/^dgit: //gm;
3904 "Perhaps debian/changelog does not mention $v ?";
3906 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3907 $cd->[1] is $cd->[0]
3908 Your tree seems to based on earlier (not uploaded) $v.
3913 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3917 sub pseudomerge_make_commit ($$$$ $$) {
3918 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3919 $msg_cmd, $msg_msg) = @_;
3920 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3922 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3923 my $authline = clogp_authline $clogp;
3927 !defined $overwrite_version ? ""
3928 : !length $overwrite_version ? " --overwrite"
3929 : " --overwrite=".$overwrite_version;
3931 # Contributing parent is the first parent - that makes
3932 # git rev-list --first-parent DTRT.
3933 my $pmf = dgit_privdir()."/pseudomerge";
3934 open MC, ">", $pmf or die "$pmf $!";
3935 print MC <<END or die $!;
3938 parent $archive_hash
3948 return make_commit($pmf);
3951 sub splitbrain_pseudomerge ($$$$) {
3952 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3953 # => $merged_dgitview
3954 printdebug "splitbrain_pseudomerge...\n";
3956 # We: debian/PREVIOUS HEAD($maintview)
3957 # expect: o ----------------- o
3960 # a/d/PREVIOUS $dgitview
3963 # we do: `------------------ o
3967 return $dgitview unless defined $archive_hash;
3968 return $dgitview if deliberately_not_fast_forward();
3970 printdebug "splitbrain_pseudomerge...\n";
3972 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3974 if (!defined $overwrite_version) {
3975 progress "Checking that HEAD inciudes all changes in archive...";
3978 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3980 if (defined $overwrite_version) {
3982 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3983 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3984 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3985 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3986 my $i_archive = [ $archive_hash, "current archive contents" ];
3988 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3990 infopair_cond_equal($i_dgit, $i_archive);
3991 infopair_cond_ff($i_dep14, $i_dgit);
3992 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3995 $@ =~ s/^\n//; chomp $@;
3998 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
4003 my $r = pseudomerge_make_commit
4004 $clogp, $dgitview, $archive_hash, $i_arch_v,
4005 "dgit --quilt=$quilt_mode",
4006 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
4007 Declare fast forward from $i_arch_v->[0]
4009 Make fast forward from $i_arch_v->[0]
4012 maybe_split_brain_save $maintview, $r, "pseudomerge";
4014 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
4018 sub plain_overwrite_pseudomerge ($$$) {
4019 my ($clogp, $head, $archive_hash) = @_;
4021 printdebug "plain_overwrite_pseudomerge...";
4023 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4025 return $head if is_fast_fwd $archive_hash, $head;
4027 my $m = "Declare fast forward from $i_arch_v->[0]";
4029 my $r = pseudomerge_make_commit
4030 $clogp, $head, $archive_hash, $i_arch_v,
4033 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4035 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
4039 sub push_parse_changelog ($) {
4042 my $clogp = Dpkg::Control::Hash->new();
4043 $clogp->load($clogpfn) or die;
4045 my $clogpackage = getfield $clogp, 'Source';
4046 $package //= $clogpackage;
4047 fail "-p specified $package but changelog specified $clogpackage"
4048 unless $package eq $clogpackage;
4049 my $cversion = getfield $clogp, 'Version';
4051 if (!$we_are_initiator) {
4052 # rpush initiator can't do this because it doesn't have $isuite yet
4053 my $tag = debiantag($cversion, access_nomdistro);
4054 runcmd @git, qw(check-ref-format), $tag;
4057 my $dscfn = dscfn($cversion);
4059 return ($clogp, $cversion, $dscfn);
4062 sub push_parse_dsc ($$$) {
4063 my ($dscfn,$dscfnwhat, $cversion) = @_;
4064 $dsc = parsecontrol($dscfn,$dscfnwhat);
4065 my $dversion = getfield $dsc, 'Version';
4066 my $dscpackage = getfield $dsc, 'Source';
4067 ($dscpackage eq $package && $dversion eq $cversion) or
4068 fail "$dscfn is for $dscpackage $dversion".
4069 " but debian/changelog is for $package $cversion";
4072 sub push_tagwants ($$$$) {
4073 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4076 TagFn => \&debiantag,
4081 if (defined $maintviewhead) {
4083 TagFn => \&debiantag_maintview,
4084 Objid => $maintviewhead,
4085 TfSuffix => '-maintview',
4088 } elsif ($dodep14tag eq 'no' ? 0
4089 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4090 : $dodep14tag eq 'always'
4091 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4092 --dep14tag-always (or equivalent in config) means server must support
4093 both "new" and "maint" tag formats, but config says it doesn't.
4095 : die "$dodep14tag ?") {
4097 TagFn => \&debiantag_maintview,
4099 TfSuffix => '-dgit',
4103 foreach my $tw (@tagwants) {
4104 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4105 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4107 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4111 sub push_mktags ($$ $$ $) {
4113 $changesfile,$changesfilewhat,
4116 die unless $tagwants->[0]{View} eq 'dgit';
4118 my $declaredistro = access_nomdistro();
4119 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4120 $dsc->{$ourdscfield[0]} = join " ",
4121 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4123 $dsc->save("$dscfn.tmp") or die $!;
4125 my $changes = parsecontrol($changesfile,$changesfilewhat);
4126 foreach my $field (qw(Source Distribution Version)) {
4127 $changes->{$field} eq $clogp->{$field} or
4128 fail "changes field $field \`$changes->{$field}'".
4129 " does not match changelog \`$clogp->{$field}'";
4132 my $cversion = getfield $clogp, 'Version';
4133 my $clogsuite = getfield $clogp, 'Distribution';
4135 # We make the git tag by hand because (a) that makes it easier
4136 # to control the "tagger" (b) we can do remote signing
4137 my $authline = clogp_authline $clogp;
4138 my $delibs = join(" ", "",@deliberatelies);
4142 my $tfn = $tw->{Tfn};
4143 my $head = $tw->{Objid};
4144 my $tag = $tw->{Tag};
4146 open TO, '>', $tfn->('.tmp') or die $!;
4147 print TO <<END or die $!;
4154 if ($tw->{View} eq 'dgit') {
4155 print TO <<END or die $!;
4156 $package release $cversion for $clogsuite ($csuite) [dgit]
4157 [dgit distro=$declaredistro$delibs]
4159 foreach my $ref (sort keys %previously) {
4160 print TO <<END or die $!;
4161 [dgit previously:$ref=$previously{$ref}]
4164 } elsif ($tw->{View} eq 'maint') {
4165 print TO <<END or die $!;
4166 $package release $cversion for $clogsuite ($csuite)
4167 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4170 die Dumper($tw)."?";
4175 my $tagobjfn = $tfn->('.tmp');
4177 if (!defined $keyid) {
4178 $keyid = access_cfg('keyid','RETURN-UNDEF');
4180 if (!defined $keyid) {
4181 $keyid = getfield $clogp, 'Maintainer';
4183 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4184 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4185 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4186 push @sign_cmd, $tfn->('.tmp');
4187 runcmd_ordryrun @sign_cmd;
4189 $tagobjfn = $tfn->('.signed.tmp');
4190 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4191 $tfn->('.tmp'), $tfn->('.tmp.asc');
4197 my @r = map { $mktag->($_); } @$tagwants;
4201 sub sign_changes ($) {
4202 my ($changesfile) = @_;
4204 my @debsign_cmd = @debsign;
4205 push @debsign_cmd, "-k$keyid" if defined $keyid;
4206 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4207 push @debsign_cmd, $changesfile;
4208 runcmd_ordryrun @debsign_cmd;
4213 printdebug "actually entering push\n";
4215 supplementary_message(<<'END');
4216 Push failed, while checking state of the archive.
4217 You can retry the push, after fixing the problem, if you like.
4219 if (check_for_git()) {
4222 my $archive_hash = fetch_from_archive();
4223 if (!$archive_hash) {
4225 fail "package appears to be new in this suite;".
4226 " if this is intentional, use --new";
4229 supplementary_message(<<'END');
4230 Push failed, while preparing your push.
4231 You can retry the push, after fixing the problem, if you like.
4234 need_tagformat 'new', "quilt mode $quilt_mode"
4235 if quiltmode_splitbrain;
4239 access_giturl(); # check that success is vaguely likely
4240 rpush_handle_protovsn_bothends() if $we_are_initiator;
4243 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4244 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4246 responder_send_file('parsed-changelog', $clogpfn);
4248 my ($clogp, $cversion, $dscfn) =
4249 push_parse_changelog("$clogpfn");
4251 my $dscpath = "$buildproductsdir/$dscfn";
4252 stat_exists $dscpath or
4253 fail "looked for .dsc $dscpath, but $!;".
4254 " maybe you forgot to build";
4256 responder_send_file('dsc', $dscpath);
4258 push_parse_dsc($dscpath, $dscfn, $cversion);
4260 my $format = getfield $dsc, 'Format';
4261 printdebug "format $format\n";
4263 my $symref = git_get_symref();
4264 my $actualhead = git_rev_parse('HEAD');
4266 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4267 runcmd_ordryrun_local @git_debrebase, 'stitch';
4268 $actualhead = git_rev_parse('HEAD');
4271 my $dgithead = $actualhead;
4272 my $maintviewhead = undef;
4274 my $upstreamversion = upstreamversion $clogp->{Version};
4276 if (madformat_wantfixup($format)) {
4277 # user might have not used dgit build, so maybe do this now:
4278 if (quiltmode_splitbrain()) {
4279 changedir $playground;
4280 quilt_make_fake_dsc($upstreamversion);
4282 ($dgithead, $cachekey) =
4283 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4285 "--quilt=$quilt_mode but no cached dgit view:
4286 perhaps HEAD changed since dgit build[-source] ?";
4288 $dgithead = splitbrain_pseudomerge($clogp,
4289 $actualhead, $dgithead,
4291 $maintviewhead = $actualhead;
4293 prep_ud(); # so _only_subdir() works, below
4295 commit_quilty_patch();
4299 if (defined $overwrite_version && !defined $maintviewhead
4301 $dgithead = plain_overwrite_pseudomerge($clogp,
4309 if ($archive_hash) {
4310 if (is_fast_fwd($archive_hash, $dgithead)) {
4312 } elsif (deliberately_not_fast_forward) {
4315 fail "dgit push: HEAD is not a descendant".
4316 " of the archive's version.\n".
4317 "To overwrite the archive's contents,".
4318 " pass --overwrite[=VERSION].\n".
4319 "To rewind history, if permitted by the archive,".
4320 " use --deliberately-not-fast-forward.";
4324 changedir $playground;
4325 progress "checking that $dscfn corresponds to HEAD";
4326 runcmd qw(dpkg-source -x --),
4327 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4328 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4329 check_for_vendor_patches() if madformat($dsc->{format});
4331 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4332 debugcmd "+",@diffcmd;
4334 my $r = system @diffcmd;
4337 my $referent = $split_brain ? $dgithead : 'HEAD';
4338 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4341 my $raw = cmdoutput @git,
4342 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4344 foreach (split /\0/, $raw) {
4345 if (defined $changed) {
4346 push @mode_changes, "$changed: $_\n" if $changed;
4349 } elsif (m/^:0+ 0+ /) {
4351 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4352 $changed = "Mode change from $1 to $2"
4357 if (@mode_changes) {
4358 fail <<END.(join '', @mode_changes).<<END;
4359 HEAD specifies a different tree to $dscfn:
4362 There is a problem with your source tree (see dgit(7) for some hints).
4363 To see a full diff, run git diff $tree $referent
4368 HEAD specifies a different tree to $dscfn:
4370 Perhaps you forgot to build. Or perhaps there is a problem with your
4371 source tree (see dgit(7) for some hints). To see a full diff, run
4372 git diff $tree $referent
4378 if (!$changesfile) {
4379 my $pat = changespat $cversion;
4380 my @cs = glob "$buildproductsdir/$pat";
4381 fail "failed to find unique changes file".
4382 " (looked for $pat in $buildproductsdir);".
4383 " perhaps you need to use dgit -C"
4385 ($changesfile) = @cs;
4387 $changesfile = "$buildproductsdir/$changesfile";
4390 # Check that changes and .dsc agree enough
4391 $changesfile =~ m{[^/]*$};
4392 my $changes = parsecontrol($changesfile,$&);
4393 files_compare_inputs($dsc, $changes)
4394 unless forceing [qw(dsc-changes-mismatch)];
4396 # Check whether this is a source only upload
4397 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4398 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4399 if ($sourceonlypolicy eq 'ok') {
4400 } elsif ($sourceonlypolicy eq 'always') {
4401 forceable_fail [qw(uploading-binaries)],
4402 "uploading binaries, although distroy policy is source only"
4404 } elsif ($sourceonlypolicy eq 'never') {
4405 forceable_fail [qw(uploading-source-only)],
4406 "source-only upload, although distroy policy requires .debs"
4408 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4409 forceable_fail [qw(uploading-source-only)],
4410 "source-only upload, even though package is entirely NEW\n".
4411 "(this is contrary to policy in ".(access_nomdistro()).")"
4414 && !(archive_query('package_not_wholly_new', $package) // 1);
4416 badcfg "unknown source-only-uploads policy \`$sourceonlypolicy'";
4419 # Perhaps adjust .dsc to contain right set of origs
4420 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4422 unless forceing [qw(changes-origs-exactly)];
4424 # Checks complete, we're going to try and go ahead:
4426 responder_send_file('changes',$changesfile);
4427 responder_send_command("param head $dgithead");
4428 responder_send_command("param csuite $csuite");
4429 responder_send_command("param isuite $isuite");
4430 responder_send_command("param tagformat $tagformat");
4431 if (defined $maintviewhead) {
4432 confess "internal error (protovsn=$protovsn)"
4433 if defined $protovsn and $protovsn < 4;
4434 responder_send_command("param maint-view $maintviewhead");
4437 # Perhaps send buildinfo(s) for signing
4438 my $changes_files = getfield $changes, 'Files';
4439 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4440 foreach my $bi (@buildinfos) {
4441 responder_send_command("param buildinfo-filename $bi");
4442 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4445 if (deliberately_not_fast_forward) {
4446 git_for_each_ref(lrfetchrefs, sub {
4447 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4448 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4449 responder_send_command("previously $rrefname=$objid");
4450 $previously{$rrefname} = $objid;
4454 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4455 dgit_privdir()."/tag");
4458 supplementary_message(<<'END');
4459 Push failed, while signing the tag.
4460 You can retry the push, after fixing the problem, if you like.
4462 # If we manage to sign but fail to record it anywhere, it's fine.
4463 if ($we_are_responder) {
4464 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4465 responder_receive_files('signed-tag', @tagobjfns);
4467 @tagobjfns = push_mktags($clogp,$dscpath,
4468 $changesfile,$changesfile,
4471 supplementary_message(<<'END');
4472 Push failed, *after* signing the tag.
4473 If you want to try again, you should use a new version number.
4476 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4478 foreach my $tw (@tagwants) {
4479 my $tag = $tw->{Tag};
4480 my $tagobjfn = $tw->{TagObjFn};
4482 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4483 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4484 runcmd_ordryrun_local
4485 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4488 supplementary_message(<<'END');
4489 Push failed, while updating the remote git repository - see messages above.
4490 If you want to try again, you should use a new version number.
4492 if (!check_for_git()) {
4493 create_remote_git_repo();
4496 my @pushrefs = $forceflag.$dgithead.":".rrref();
4497 foreach my $tw (@tagwants) {
4498 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4501 runcmd_ordryrun @git,
4502 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4503 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4505 supplementary_message(<<'END');
4506 Push failed, while obtaining signatures on the .changes and .dsc.
4507 If it was just that the signature failed, you may try again by using
4508 debsign by hand to sign the changes
4510 and then dput to complete the upload.
4511 If you need to change the package, you must use a new version number.
4513 if ($we_are_responder) {
4514 my $dryrunsuffix = act_local() ? "" : ".tmp";
4515 my @rfiles = ($dscpath, $changesfile);
4516 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4517 responder_receive_files('signed-dsc-changes',
4518 map { "$_$dryrunsuffix" } @rfiles);
4521 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4523 progress "[new .dsc left in $dscpath.tmp]";
4525 sign_changes $changesfile;
4528 supplementary_message(<<END);
4529 Push failed, while uploading package(s) to the archive server.
4530 You can retry the upload of exactly these same files with dput of:
4532 If that .changes file is broken, you will need to use a new version
4533 number for your next attempt at the upload.
4535 my $host = access_cfg('upload-host','RETURN-UNDEF');
4536 my @hostarg = defined($host) ? ($host,) : ();
4537 runcmd_ordryrun @dput, @hostarg, $changesfile;
4538 printdone "pushed and uploaded $cversion";
4540 supplementary_message('');
4541 responder_send_command("complete");
4545 not_necessarily_a_tree();
4550 badusage "-p is not allowed with clone; specify as argument instead"
4551 if defined $package;
4554 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4555 ($package,$isuite) = @ARGV;
4556 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4557 ($package,$dstdir) = @ARGV;
4558 } elsif (@ARGV==3) {
4559 ($package,$isuite,$dstdir) = @ARGV;
4561 badusage "incorrect arguments to dgit clone";
4565 $dstdir ||= "$package";
4566 if (stat_exists $dstdir) {
4567 fail "$dstdir already exists";
4571 if ($rmonerror && !$dryrun_level) {
4572 $cwd_remove= getcwd();
4574 return unless defined $cwd_remove;
4575 if (!chdir "$cwd_remove") {
4576 return if $!==&ENOENT;
4577 die "chdir $cwd_remove: $!";
4579 printdebug "clone rmonerror removing $dstdir\n";
4581 rmtree($dstdir) or die "remove $dstdir: $!\n";
4582 } elsif (grep { $! == $_ }
4583 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4585 print STDERR "check whether to remove $dstdir: $!\n";
4591 $cwd_remove = undef;
4594 sub branchsuite () {
4595 my $branch = git_get_symref();
4596 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4603 sub package_from_d_control () {
4604 if (!defined $package) {
4605 my $sourcep = parsecontrol('debian/control','debian/control');
4606 $package = getfield $sourcep, 'Source';
4610 sub fetchpullargs () {
4611 package_from_d_control();
4613 $isuite = branchsuite();
4615 my $clogp = parsechangelog();
4616 my $clogsuite = getfield $clogp, 'Distribution';
4617 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4619 } elsif (@ARGV==1) {
4622 badusage "incorrect arguments to dgit fetch or dgit pull";
4636 if (quiltmode_splitbrain()) {
4637 my ($format, $fopts) = get_source_format();
4638 madformat($format) and fail <<END
4639 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4647 package_from_d_control();
4648 @ARGV==1 or badusage "dgit checkout needs a suite argument";
4652 foreach my $canon (qw(0 1)) {
4657 canonicalise_suite();
4659 if (length git_get_ref lref()) {
4660 # local branch already exists, yay
4663 if (!length git_get_ref lrref()) {
4671 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4674 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4675 "dgit checkout $isuite";
4676 runcmd (@git, qw(checkout), lbranch());
4679 sub cmd_update_vcs_git () {
4681 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4682 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4684 ($specsuite) = (@ARGV);
4689 if ($ARGV[0] eq '-') {
4691 } elsif ($ARGV[0] eq '-') {
4696 package_from_d_control();
4698 if ($specsuite eq '.') {
4699 $ctrl = parsecontrol 'debian/control', 'debian/control';
4701 $isuite = $specsuite;
4705 my $url = getfield $ctrl, 'Vcs-Git';
4708 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4709 if (!defined $orgurl) {
4710 print STDERR "setting up vcs-git: $url\n";
4711 @cmd = (@git, qw(remote add vcs-git), $url);
4712 } elsif ($orgurl eq $url) {
4713 print STDERR "vcs git already configured: $url\n";
4715 print STDERR "changing vcs-git url to: $url\n";
4716 @cmd = (@git, qw(remote set-url vcs-git), $url);
4718 runcmd_ordryrun_local @cmd;
4720 print "fetching (@ARGV)\n";
4721 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4727 build_or_push_prep_early();
4732 } elsif (@ARGV==1) {
4733 ($specsuite) = (@ARGV);
4735 badusage "incorrect arguments to dgit $subcommand";
4738 local ($package) = $existing_package; # this is a hack
4739 canonicalise_suite();
4741 canonicalise_suite();
4743 if (defined $specsuite &&
4744 $specsuite ne $isuite &&
4745 $specsuite ne $csuite) {
4746 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4747 " but command line specifies $specsuite";
4756 #---------- remote commands' implementation ----------
4758 sub pre_remote_push_build_host {
4759 my ($nrargs) = shift @ARGV;
4760 my (@rargs) = @ARGV[0..$nrargs-1];
4761 @ARGV = @ARGV[$nrargs..$#ARGV];
4763 my ($dir,$vsnwant) = @rargs;
4764 # vsnwant is a comma-separated list; we report which we have
4765 # chosen in our ready response (so other end can tell if they
4768 $we_are_responder = 1;
4769 $us .= " (build host)";
4771 open PI, "<&STDIN" or die $!;
4772 open STDIN, "/dev/null" or die $!;
4773 open PO, ">&STDOUT" or die $!;
4775 open STDOUT, ">&STDERR" or die $!;
4779 ($protovsn) = grep {
4780 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4781 } @rpushprotovsn_support;
4783 fail "build host has dgit rpush protocol versions ".
4784 (join ",", @rpushprotovsn_support).
4785 " but invocation host has $vsnwant"
4786 unless defined $protovsn;
4790 sub cmd_remote_push_build_host {
4791 responder_send_command("dgit-remote-push-ready $protovsn");
4795 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4796 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4797 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4798 # a good error message)
4800 sub rpush_handle_protovsn_bothends () {
4801 if ($protovsn < 4) {
4802 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4811 my $report = i_child_report();
4812 if (defined $report) {
4813 printdebug "($report)\n";
4814 } elsif ($i_child_pid) {
4815 printdebug "(killing build host child $i_child_pid)\n";
4816 kill 15, $i_child_pid;
4818 if (defined $i_tmp && !defined $initiator_tempdir) {
4820 eval { rmtree $i_tmp; };
4825 return unless forkcheck_mainprocess();
4830 my ($base,$selector,@args) = @_;
4831 $selector =~ s/\-/_/g;
4832 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4836 not_necessarily_a_tree();
4841 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4849 push @rargs, join ",", @rpushprotovsn_support;
4852 push @rdgit, @ropts;
4853 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4855 my @cmd = (@ssh, $host, shellquote @rdgit);
4858 $we_are_initiator=1;
4860 if (defined $initiator_tempdir) {
4861 rmtree $initiator_tempdir;
4862 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4863 $i_tmp = $initiator_tempdir;
4867 $i_child_pid = open2(\*RO, \*RI, @cmd);
4869 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4870 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4871 $supplementary_message = '' unless $protovsn >= 3;
4874 my ($icmd,$iargs) = initiator_expect {
4875 m/^(\S+)(?: (.*))?$/;
4878 i_method "i_resp", $icmd, $iargs;
4882 sub i_resp_progress ($) {
4884 my $msg = protocol_read_bytes \*RO, $rhs;
4888 sub i_resp_supplementary_message ($) {
4890 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4893 sub i_resp_complete {
4894 my $pid = $i_child_pid;
4895 $i_child_pid = undef; # prevents killing some other process with same pid
4896 printdebug "waiting for build host child $pid...\n";
4897 my $got = waitpid $pid, 0;
4898 die $! unless $got == $pid;
4899 die "build host child failed $?" if $?;
4902 printdebug "all done\n";
4906 sub i_resp_file ($) {
4908 my $localname = i_method "i_localname", $keyword;
4909 my $localpath = "$i_tmp/$localname";
4910 stat_exists $localpath and
4911 badproto \*RO, "file $keyword ($localpath) twice";
4912 protocol_receive_file \*RO, $localpath;
4913 i_method "i_file", $keyword;
4918 sub i_resp_param ($) {
4919 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4923 sub i_resp_previously ($) {
4924 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4925 or badproto \*RO, "bad previously spec";
4926 my $r = system qw(git check-ref-format), $1;
4927 die "bad previously ref spec ($r)" if $r;
4928 $previously{$1} = $2;
4933 sub i_resp_want ($) {
4935 die "$keyword ?" if $i_wanted{$keyword}++;
4937 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4938 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4939 die unless $isuite =~ m/^$suite_re$/;
4942 rpush_handle_protovsn_bothends();
4944 fail "rpush negotiated protocol version $protovsn".
4945 " which does not support quilt mode $quilt_mode"
4946 if quiltmode_splitbrain;
4948 my @localpaths = i_method "i_want", $keyword;
4949 printdebug "[[ $keyword @localpaths\n";
4950 foreach my $localpath (@localpaths) {
4951 protocol_send_file \*RI, $localpath;
4953 print RI "files-end\n" or die $!;
4956 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4958 sub i_localname_parsed_changelog {
4959 return "remote-changelog.822";
4961 sub i_file_parsed_changelog {
4962 ($i_clogp, $i_version, $i_dscfn) =
4963 push_parse_changelog "$i_tmp/remote-changelog.822";
4964 die if $i_dscfn =~ m#/|^\W#;
4967 sub i_localname_dsc {
4968 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4973 sub i_localname_buildinfo ($) {
4974 my $bi = $i_param{'buildinfo-filename'};
4975 defined $bi or badproto \*RO, "buildinfo before filename";
4976 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4977 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4978 or badproto \*RO, "improper buildinfo filename";
4981 sub i_file_buildinfo {
4982 my $bi = $i_param{'buildinfo-filename'};
4983 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4984 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4985 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4986 files_compare_inputs($bd, $ch);
4987 (getfield $bd, $_) eq (getfield $ch, $_) or
4988 fail "buildinfo mismatch $_"
4989 foreach qw(Source Version);
4990 !defined $bd->{$_} or
4991 fail "buildinfo contains $_"
4992 foreach qw(Changes Changed-by Distribution);
4994 push @i_buildinfos, $bi;
4995 delete $i_param{'buildinfo-filename'};
4998 sub i_localname_changes {
4999 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5000 $i_changesfn = $i_dscfn;
5001 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
5002 return $i_changesfn;
5004 sub i_file_changes { }
5006 sub i_want_signed_tag {
5007 printdebug Dumper(\%i_param, $i_dscfn);
5008 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5009 && defined $i_param{'csuite'}
5010 or badproto \*RO, "premature desire for signed-tag";
5011 my $head = $i_param{'head'};
5012 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5014 my $maintview = $i_param{'maint-view'};
5015 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5018 if ($protovsn >= 4) {
5019 my $p = $i_param{'tagformat'} // '<undef>';
5021 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
5024 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5026 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5028 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5031 push_mktags $i_clogp, $i_dscfn,
5032 $i_changesfn, 'remote changes',
5036 sub i_want_signed_dsc_changes {
5037 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5038 sign_changes $i_changesfn;
5039 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5042 #---------- building etc. ----------
5048 #----- `3.0 (quilt)' handling -----
5050 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5052 sub quiltify_dpkg_commit ($$$;$) {
5053 my ($patchname,$author,$msg, $xinfo) = @_;
5056 mkpath '.git/dgit'; # we are in playtree
5057 my $descfn = ".git/dgit/quilt-description.tmp";
5058 open O, '>', $descfn or die "$descfn: $!";
5059 $msg =~ s/\n+/\n\n/;
5060 print O <<END or die $!;
5062 ${xinfo}Subject: $msg
5069 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5070 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5071 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5072 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5076 sub quiltify_trees_differ ($$;$$$) {
5077 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5078 # returns true iff the two tree objects differ other than in debian/
5079 # with $finegrained,
5080 # returns bitmask 01 - differ in upstream files except .gitignore
5081 # 02 - differ in .gitignore
5082 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5083 # is set for each modified .gitignore filename $fn
5084 # if $unrepres is defined, array ref to which is appeneded
5085 # a list of unrepresentable changes (removals of upstream files
5088 my @cmd = (@git, qw(diff-tree -z --no-renames));
5089 push @cmd, qw(--name-only) unless $unrepres;
5090 push @cmd, qw(-r) if $finegrained || $unrepres;
5092 my $diffs= cmdoutput @cmd;
5095 foreach my $f (split /\0/, $diffs) {
5096 if ($unrepres && !@lmodes) {
5097 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5100 my ($oldmode,$newmode) = @lmodes;
5103 next if $f =~ m#^debian(?:/.*)?$#s;
5107 die "not a plain file or symlink\n"
5108 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5109 $oldmode =~ m/^(?:10|12)\d{4}$/;
5110 if ($oldmode =~ m/[^0]/ &&
5111 $newmode =~ m/[^0]/) {
5112 # both old and new files exist
5113 die "mode or type changed\n" if $oldmode ne $newmode;
5114 die "modified symlink\n" unless $newmode =~ m/^10/;
5115 } elsif ($oldmode =~ m/[^0]/) {
5117 die "deletion of symlink\n"
5118 unless $oldmode =~ m/^10/;
5121 die "creation with non-default mode\n"
5122 unless $newmode =~ m/^100644$/ or
5123 $newmode =~ m/^120000$/;
5127 local $/="\n"; chomp $@;
5128 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5132 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5133 $r |= $isignore ? 02 : 01;
5134 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5136 printdebug "quiltify_trees_differ $x $y => $r\n";
5140 sub quiltify_tree_sentinelfiles ($) {
5141 # lists the `sentinel' files present in the tree
5143 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5144 qw(-- debian/rules debian/control);
5149 sub quiltify_splitbrain_needed () {
5150 if (!$split_brain) {
5151 progress "dgit view: changes are required...";
5152 runcmd @git, qw(checkout -q -b dgit-view);
5157 sub quiltify_splitbrain ($$$$$$$) {
5158 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5159 $editedignores, $cachekey) = @_;
5160 my $gitignore_special = 1;
5161 if ($quilt_mode !~ m/gbp|dpm/) {
5162 # treat .gitignore just like any other upstream file
5163 $diffbits = { %$diffbits };
5164 $_ = !!$_ foreach values %$diffbits;
5165 $gitignore_special = 0;
5167 # We would like any commits we generate to be reproducible
5168 my @authline = clogp_authline($clogp);
5169 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5170 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5171 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5172 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5173 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5174 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5176 my $fulldiffhint = sub {
5178 my $cmd = "git diff $x $y -- :/ ':!debian'";
5179 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5180 return "\nFor full diff showing the problem(s), type:\n $cmd\n";
5183 if ($quilt_mode =~ m/gbp|unapplied/ &&
5184 ($diffbits->{O2H} & 01)) {
5186 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
5187 " but git tree differs from orig in upstream files.";
5188 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5189 if (!stat_exists "debian/patches") {
5191 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5195 if ($quilt_mode =~ m/dpm/ &&
5196 ($diffbits->{H2A} & 01)) {
5197 fail <<END. $fulldiffhint->($oldtiptree,'HEAD');
5198 --quilt=$quilt_mode specified, implying patches-applied git tree
5199 but git tree differs from result of applying debian/patches to upstream
5202 if ($quilt_mode =~ m/gbp|unapplied/ &&
5203 ($diffbits->{O2A} & 01)) { # some patches
5204 quiltify_splitbrain_needed();
5205 progress "dgit view: creating patches-applied version using gbp pq";
5206 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5207 # gbp pq import creates a fresh branch; push back to dgit-view
5208 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5209 runcmd @git, qw(checkout -q dgit-view);
5211 if ($quilt_mode =~ m/gbp|dpm/ &&
5212 ($diffbits->{O2A} & 02)) {
5214 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5215 tool which does not create patches for changes to upstream
5216 .gitignores: but, such patches exist in debian/patches.
5219 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5220 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5221 quiltify_splitbrain_needed();
5222 progress "dgit view: creating patch to represent .gitignore changes";
5223 ensuredir "debian/patches";
5224 my $gipatch = "debian/patches/auto-gitignore";
5225 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5226 stat GIPATCH or die "$gipatch: $!";
5227 fail "$gipatch already exists; but want to create it".
5228 " to record .gitignore changes" if (stat _)[7];
5229 print GIPATCH <<END or die "$gipatch: $!";
5230 Subject: Update .gitignore from Debian packaging branch
5232 The Debian packaging git branch contains these updates to the upstream
5233 .gitignore file(s). This patch is autogenerated, to provide these
5234 updates to users of the official Debian archive view of the package.
5236 [dgit ($our_version) update-gitignore]
5239 close GIPATCH or die "$gipatch: $!";
5240 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5241 $unapplied, $headref, "--", sort keys %$editedignores;
5242 open SERIES, "+>>", "debian/patches/series" or die $!;
5243 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5245 defined read SERIES, $newline, 1 or die $!;
5246 print SERIES "\n" or die $! unless $newline eq "\n";
5247 print SERIES "auto-gitignore\n" or die $!;
5248 close SERIES or die $!;
5249 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5251 Commit patch to update .gitignore
5253 [dgit ($our_version) update-gitignore-quilt-fixup]
5257 my $dgitview = git_rev_parse 'HEAD';
5260 # When we no longer need to support squeeze, use --create-reflog
5262 ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
5263 my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
5266 my $oldcache = git_get_ref "refs/$splitbraincache";
5267 if ($oldcache eq $dgitview) {
5268 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5269 # git update-ref doesn't always update, in this case. *sigh*
5270 my $dummy = make_commit_text <<END;
5273 author Dgit <dgit\@example.com> 1000000000 +0000
5274 committer Dgit <dgit\@example.com> 1000000000 +0000
5276 Dummy commit - do not use
5278 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5279 "refs/$splitbraincache", $dummy;
5281 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5284 changedir "$playground/work";
5286 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5287 progress "dgit view: created ($saved)";
5290 sub quiltify ($$$$) {
5291 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5293 # Quilt patchification algorithm
5295 # We search backwards through the history of the main tree's HEAD
5296 # (T) looking for a start commit S whose tree object is identical
5297 # to to the patch tip tree (ie the tree corresponding to the
5298 # current dpkg-committed patch series). For these purposes
5299 # `identical' disregards anything in debian/ - this wrinkle is
5300 # necessary because dpkg-source treates debian/ specially.
5302 # We can only traverse edges where at most one of the ancestors'
5303 # trees differs (in changes outside in debian/). And we cannot
5304 # handle edges which change .pc/ or debian/patches. To avoid
5305 # going down a rathole we avoid traversing edges which introduce
5306 # debian/rules or debian/control. And we set a limit on the
5307 # number of edges we are willing to look at.
5309 # If we succeed, we walk forwards again. For each traversed edge
5310 # PC (with P parent, C child) (starting with P=S and ending with
5311 # C=T) to we do this:
5313 # - dpkg-source --commit with a patch name and message derived from C
5314 # After traversing PT, we git commit the changes which
5315 # should be contained within debian/patches.
5317 # The search for the path S..T is breadth-first. We maintain a
5318 # todo list containing search nodes. A search node identifies a
5319 # commit, and looks something like this:
5321 # Commit => $git_commit_id,
5322 # Child => $c, # or undef if P=T
5323 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5324 # Nontrivial => true iff $p..$c has relevant changes
5331 my %considered; # saves being exponential on some weird graphs
5333 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5336 my ($search,$whynot) = @_;
5337 printdebug " search NOT $search->{Commit} $whynot\n";
5338 $search->{Whynot} = $whynot;
5339 push @nots, $search;
5340 no warnings qw(exiting);
5349 my $c = shift @todo;
5350 next if $considered{$c->{Commit}}++;
5352 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5354 printdebug "quiltify investigate $c->{Commit}\n";
5357 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5358 printdebug " search finished hooray!\n";
5363 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5364 if ($quilt_mode eq 'smash') {
5365 printdebug " search quitting smash\n";
5369 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5370 $not->($c, "has $c_sentinels not $t_sentinels")
5371 if $c_sentinels ne $t_sentinels;
5373 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5374 $commitdata =~ m/\n\n/;
5376 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5377 @parents = map { { Commit => $_, Child => $c } } @parents;
5379 $not->($c, "root commit") if !@parents;
5381 foreach my $p (@parents) {
5382 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5384 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5385 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5387 foreach my $p (@parents) {
5388 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5390 my @cmd= (@git, qw(diff-tree -r --name-only),
5391 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5392 my $patchstackchange = cmdoutput @cmd;
5393 if (length $patchstackchange) {
5394 $patchstackchange =~ s/\n/,/g;
5395 $not->($p, "changed $patchstackchange");
5398 printdebug " search queue P=$p->{Commit} ",
5399 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5405 printdebug "quiltify want to smash\n";
5408 my $x = $_[0]{Commit};
5409 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5412 my $reportnot = sub {
5414 my $s = $abbrev->($notp);
5415 my $c = $notp->{Child};
5416 $s .= "..".$abbrev->($c) if $c;
5417 $s .= ": ".$notp->{Whynot};
5420 if ($quilt_mode eq 'linear') {
5421 print STDERR "\n$us: error: quilt fixup cannot be linear. Stopped at:\n";
5422 foreach my $notp (@nots) {
5423 print STDERR "$us: ", $reportnot->($notp), "\n";
5425 print STDERR "$us: $_\n" foreach @$failsuggestion;
5427 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n".
5428 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5429 } elsif ($quilt_mode eq 'smash') {
5430 } elsif ($quilt_mode eq 'auto') {
5431 progress "quilt fixup cannot be linear, smashing...";
5433 die "$quilt_mode ?";
5436 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5437 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5439 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5441 quiltify_dpkg_commit "auto-$version-$target-$time",
5442 (getfield $clogp, 'Maintainer'),
5443 "Automatically generated patch ($clogp->{Version})\n".
5444 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5448 progress "quiltify linearisation planning successful, executing...";
5450 for (my $p = $sref_S;
5451 my $c = $p->{Child};
5453 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5454 next unless $p->{Nontrivial};
5456 my $cc = $c->{Commit};
5458 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5459 $commitdata =~ m/\n\n/ or die "$c ?";
5462 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5465 my $commitdate = cmdoutput
5466 @git, qw(log -n1 --pretty=format:%aD), $cc;
5468 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5470 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5477 my $gbp_check_suitable = sub {
5482 die "contains unexpected slashes\n" if m{//} || m{/$};
5483 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5484 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5485 die "is series file\n" if m{$series_filename_re}o;
5486 die "too long" if length > 200;
5488 return $_ unless $@;
5489 print STDERR "quiltifying commit $cc:".
5490 " ignoring/dropping Gbp-Pq $what: $@";
5494 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5496 (\S+) \s* \n //ixm) {
5497 $patchname = $gbp_check_suitable->($1, 'Name');
5499 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5501 (\S+) \s* \n //ixm) {
5502 $patchdir = $gbp_check_suitable->($1, 'Topic');
5507 if (!defined $patchname) {
5508 $patchname = $title;
5509 $patchname =~ s/[.:]$//;
5512 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5513 my $translitname = $converter->convert($patchname);
5514 die unless defined $translitname;
5515 $patchname = $translitname;
5518 "dgit: patch title transliteration error: $@"
5520 $patchname =~ y/ A-Z/-a-z/;
5521 $patchname =~ y/-a-z0-9_.+=~//cd;
5522 $patchname =~ s/^\W/x-$&/;
5523 $patchname = substr($patchname,0,40);
5524 $patchname .= ".patch";
5526 if (!defined $patchdir) {
5529 if (length $patchdir) {
5530 $patchname = "$patchdir/$patchname";
5532 if ($patchname =~ m{^(.*)/}) {
5533 mkpath "debian/patches/$1";
5538 stat "debian/patches/$patchname$index";
5540 $!==ENOENT or die "$patchname$index $!";
5542 runcmd @git, qw(checkout -q), $cc;
5544 # We use the tip's changelog so that dpkg-source doesn't
5545 # produce complaining messages from dpkg-parsechangelog. None
5546 # of the information dpkg-source gets from the changelog is
5547 # actually relevant - it gets put into the original message
5548 # which dpkg-source provides our stunt editor, and then
5550 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5552 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5553 "Date: $commitdate\n".
5554 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5556 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5559 runcmd @git, qw(checkout -q master);
5562 sub build_maybe_quilt_fixup () {
5563 my ($format,$fopts) = get_source_format;
5564 return unless madformat_wantfixup $format;
5567 check_for_vendor_patches();
5569 if (quiltmode_splitbrain) {
5570 fail <<END unless access_cfg_tagformats_can_splitbrain;
5571 quilt mode $quilt_mode requires split view so server needs to support
5572 both "new" and "maint" tag formats, but config says it doesn't.
5576 my $clogp = parsechangelog();
5577 my $headref = git_rev_parse('HEAD');
5578 my $symref = git_get_symref();
5580 if ($quilt_mode eq 'linear'
5581 && !$fopts->{'single-debian-patch'}
5582 && branch_is_gdr($symref, $headref)) {
5583 # This is much faster. It also makes patches that gdr
5584 # likes better for future updates without laundering.
5586 # However, it can fail in some casses where we would
5587 # succeed: if there are existing patches, which correspond
5588 # to a prefix of the branch, but are not in gbp/gdr
5589 # format, gdr will fail (exiting status 7), but we might
5590 # be able to figure out where to start linearising. That
5591 # will be slower so hopefully there's not much to do.
5592 my @cmd = (@git_debrebase,
5593 qw(--noop-ok -funclean-mixed -funclean-ordering
5594 make-patches --quiet-would-amend));
5595 # We tolerate soe snags that gdr wouldn't, by default.
5599 failedcmd @cmd if system @cmd and $?!=7*256;
5603 $headref = git_rev_parse('HEAD');
5607 changedir $playground;
5609 my $upstreamversion = upstreamversion $version;
5611 if ($fopts->{'single-debian-patch'}) {
5612 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5614 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5618 runcmd_ordryrun_local
5619 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5622 sub unpack_playtree_mkwork ($) {
5625 mkdir "work" or die $!;
5627 mktree_in_ud_here();
5628 runcmd @git, qw(reset -q --hard), $headref;
5631 sub unpack_playtree_linkorigs ($$) {
5632 my ($upstreamversion, $fn) = @_;
5633 # calls $fn->($leafname);
5635 my $bpd_abs = bpd_abs();
5636 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5637 while ($!=0, defined(my $b = readdir QFD)) {
5638 my $f = bpd_abs()."/".$b;
5640 local ($debuglevel) = $debuglevel-1;
5641 printdebug "QF linkorigs $b, $f ?\n";
5643 next unless is_orig_file_of_vsn $b, $upstreamversion;
5644 printdebug "QF linkorigs $b, $f Y\n";
5645 link_ltarget $f, $b or die "$b $!";
5648 die "$buildproductsdir: $!" if $!;
5652 sub quilt_fixup_delete_pc () {
5653 runcmd @git, qw(rm -rqf .pc);
5655 Commit removal of .pc (quilt series tracking data)
5657 [dgit ($our_version) upgrade quilt-remove-pc]
5661 sub quilt_fixup_singlepatch ($$$) {
5662 my ($clogp, $headref, $upstreamversion) = @_;
5664 progress "starting quiltify (single-debian-patch)";
5666 # dpkg-source --commit generates new patches even if
5667 # single-debian-patch is in debian/source/options. In order to
5668 # get it to generate debian/patches/debian-changes, it is
5669 # necessary to build the source package.
5671 unpack_playtree_linkorigs($upstreamversion, sub { });
5672 unpack_playtree_mkwork($headref);
5674 rmtree("debian/patches");
5676 runcmd @dpkgsource, qw(-b .);
5678 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5679 rename srcfn("$upstreamversion", "/debian/patches"),
5680 "work/debian/patches";
5683 commit_quilty_patch();
5686 sub quilt_make_fake_dsc ($) {
5687 my ($upstreamversion) = @_;
5689 my $fakeversion="$upstreamversion-~~DGITFAKE";
5691 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5692 print $fakedsc <<END or die $!;
5695 Version: $fakeversion
5699 my $dscaddfile=sub {
5702 my $md = new Digest::MD5;
5704 my $fh = new IO::File $b, '<' or die "$b $!";
5709 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5712 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
5714 my @files=qw(debian/source/format debian/rules
5715 debian/control debian/changelog);
5716 foreach my $maybe (qw(debian/patches debian/source/options
5717 debian/tests/control)) {
5718 next unless stat_exists "$maindir/$maybe";
5719 push @files, $maybe;
5722 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5723 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5725 $dscaddfile->($debtar);
5726 close $fakedsc or die $!;
5729 sub quilt_fakedsc2unapplied ($$) {
5730 my ($headref, $upstreamversion) = @_;
5731 # must be run in the playground
5732 # quilt_make_fake_dsc must have been called
5735 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5737 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5738 rename $fakexdir, "fake" or die "$fakexdir $!";
5742 remove_stray_gits("source package");
5743 mktree_in_ud_here();
5747 rmtree 'debian'; # git checkout commitish paths does not delete!
5748 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5749 my $unapplied=git_add_write_tree();
5750 printdebug "fake orig tree object $unapplied\n";
5754 sub quilt_check_splitbrain_cache ($$) {
5755 my ($headref, $upstreamversion) = @_;
5756 # Called only if we are in (potentially) split brain mode.
5757 # Called in playground.
5758 # Computes the cache key and looks in the cache.
5759 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5761 my $splitbrain_cachekey;
5764 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5765 # we look in the reflog of dgit-intern/quilt-cache
5766 # we look for an entry whose message is the key for the cache lookup
5767 my @cachekey = (qw(dgit), $our_version);
5768 push @cachekey, $upstreamversion;
5769 push @cachekey, $quilt_mode;
5770 push @cachekey, $headref;
5772 push @cachekey, hashfile('fake.dsc');
5774 my $srcshash = Digest::SHA->new(256);
5775 my %sfs = ( %INC, '$0(dgit)' => $0 );
5776 foreach my $sfk (sort keys %sfs) {
5777 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5778 $srcshash->add($sfk," ");
5779 $srcshash->add(hashfile($sfs{$sfk}));
5780 $srcshash->add("\n");
5782 push @cachekey, $srcshash->hexdigest();
5783 $splitbrain_cachekey = "@cachekey";
5785 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5787 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5788 debugcmd "|(probably)",@cmd;
5789 my $child = open GC, "-|"; defined $child or die $!;
5791 chdir $maindir or die $!;
5792 if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
5793 $! == ENOENT or die $!;
5794 printdebug ">(no reflog)\n";
5801 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5802 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5805 unpack_playtree_mkwork($headref);
5806 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5807 if ($cachehit ne $headref) {
5808 progress "dgit view: found cached ($saved)";
5809 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5811 return ($cachehit, $splitbrain_cachekey);
5813 progress "dgit view: found cached, no changes required";
5814 return ($headref, $splitbrain_cachekey);
5816 die $! if GC->error;
5817 failedcmd unless close GC;
5819 printdebug "splitbrain cache miss\n";
5820 return (undef, $splitbrain_cachekey);
5823 sub quilt_fixup_multipatch ($$$) {
5824 my ($clogp, $headref, $upstreamversion) = @_;
5826 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5829 # - honour any existing .pc in case it has any strangeness
5830 # - determine the git commit corresponding to the tip of
5831 # the patch stack (if there is one)
5832 # - if there is such a git commit, convert each subsequent
5833 # git commit into a quilt patch with dpkg-source --commit
5834 # - otherwise convert all the differences in the tree into
5835 # a single git commit
5839 # Our git tree doesn't necessarily contain .pc. (Some versions of
5840 # dgit would include the .pc in the git tree.) If there isn't
5841 # one, we need to generate one by unpacking the patches that we
5844 # We first look for a .pc in the git tree. If there is one, we
5845 # will use it. (This is not the normal case.)
5847 # Otherwise need to regenerate .pc so that dpkg-source --commit
5848 # can work. We do this as follows:
5849 # 1. Collect all relevant .orig from parent directory
5850 # 2. Generate a debian.tar.gz out of
5851 # debian/{patches,rules,source/format,source/options}
5852 # 3. Generate a fake .dsc containing just these fields:
5853 # Format Source Version Files
5854 # 4. Extract the fake .dsc
5855 # Now the fake .dsc has a .pc directory.
5856 # (In fact we do this in every case, because in future we will
5857 # want to search for a good base commit for generating patches.)
5859 # Then we can actually do the dpkg-source --commit
5860 # 1. Make a new working tree with the same object
5861 # store as our main tree and check out the main
5863 # 2. Copy .pc from the fake's extraction, if necessary
5864 # 3. Run dpkg-source --commit
5865 # 4. If the result has changes to debian/, then
5866 # - git add them them
5867 # - git add .pc if we had a .pc in-tree
5869 # 5. If we had a .pc in-tree, delete it, and git commit
5870 # 6. Back in the main tree, fast forward to the new HEAD
5872 # Another situation we may have to cope with is gbp-style
5873 # patches-unapplied trees.
5875 # We would want to detect these, so we know to escape into
5876 # quilt_fixup_gbp. However, this is in general not possible.
5877 # Consider a package with a one patch which the dgit user reverts
5878 # (with git revert or the moral equivalent).
5880 # That is indistinguishable in contents from a patches-unapplied
5881 # tree. And looking at the history to distinguish them is not
5882 # useful because the user might have made a confusing-looking git
5883 # history structure (which ought to produce an error if dgit can't
5884 # cope, not a silent reintroduction of an unwanted patch).
5886 # So gbp users will have to pass an option. But we can usually
5887 # detect their failure to do so: if the tree is not a clean
5888 # patches-applied tree, quilt linearisation fails, but the tree
5889 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5890 # they want --quilt=unapplied.
5892 # To help detect this, when we are extracting the fake dsc, we
5893 # first extract it with --skip-patches, and then apply the patches
5894 # afterwards with dpkg-source --before-build. That lets us save a
5895 # tree object corresponding to .origs.
5897 my $splitbrain_cachekey;
5899 quilt_make_fake_dsc($upstreamversion);
5901 if (quiltmode_splitbrain()) {
5903 ($cachehit, $splitbrain_cachekey) =
5904 quilt_check_splitbrain_cache($headref, $upstreamversion);
5905 return if $cachehit;
5907 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
5911 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5913 if (system @bbcmd) {
5914 failedcmd @bbcmd if $? < 0;
5916 failed to apply your git tree's patch stack (from debian/patches/) to
5917 the corresponding upstream tarball(s). Your source tree and .orig
5918 are probably too inconsistent. dgit can only fix up certain kinds of
5919 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
5925 unpack_playtree_mkwork($headref);
5928 if (stat_exists ".pc") {
5930 progress "Tree already contains .pc - will use it then delete it.";
5933 rename '../fake/.pc','.pc' or die $!;
5936 changedir '../fake';
5938 my $oldtiptree=git_add_write_tree();
5939 printdebug "fake o+d/p tree object $unapplied\n";
5940 changedir '../work';
5943 # We calculate some guesswork now about what kind of tree this might
5944 # be. This is mostly for error reporting.
5950 # O = orig, without patches applied
5951 # A = "applied", ie orig with H's debian/patches applied
5952 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5953 \%editedignores, \@unrepres),
5954 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5955 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5959 foreach my $b (qw(01 02)) {
5960 foreach my $v (qw(O2H O2A H2A)) {
5961 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5964 printdebug "differences \@dl @dl.\n";
5967 "$us: base trees orig=%.20s o+d/p=%.20s",
5968 $unapplied, $oldtiptree;
5970 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5971 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5972 $dl[0], $dl[1], $dl[3], $dl[4],
5976 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5978 forceable_fail [qw(unrepresentable)], <<END;
5979 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5984 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5985 push @failsuggestion, "This might be a patches-unapplied branch.";
5986 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5987 push @failsuggestion, "This might be a patches-applied branch.";
5989 push @failsuggestion, "Maybe you need to specify one of".
5990 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5992 if (quiltmode_splitbrain()) {
5993 quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
5994 $diffbits, \%editedignores,
5995 $splitbrain_cachekey);
5999 progress "starting quiltify (multiple patches, $quilt_mode mode)";
6000 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
6002 if (!open P, '>>', ".pc/applied-patches") {
6003 $!==&ENOENT or die $!;
6008 commit_quilty_patch();
6010 if ($mustdeletepc) {
6011 quilt_fixup_delete_pc();
6015 sub quilt_fixup_editor () {
6016 my $descfn = $ENV{$fakeeditorenv};
6017 my $editing = $ARGV[$#ARGV];
6018 open I1, '<', $descfn or die "$descfn: $!";
6019 open I2, '<', $editing or die "$editing: $!";
6020 unlink $editing or die "$editing: $!";
6021 open O, '>', $editing or die "$editing: $!";
6022 while (<I1>) { print O or die $!; } I1->error and die $!;
6025 $copying ||= m/^\-\-\- /;
6026 next unless $copying;
6029 I2->error and die $!;
6034 sub maybe_apply_patches_dirtily () {
6035 return unless $quilt_mode =~ m/gbp|unapplied/;
6036 print STDERR <<END or die $!;
6038 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6039 dgit: Have to apply the patches - making the tree dirty.
6040 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6043 $patches_applied_dirtily = 01;
6044 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6045 runcmd qw(dpkg-source --before-build .);
6048 sub maybe_unapply_patches_again () {
6049 progress "dgit: Unapplying patches again to tidy up the tree."
6050 if $patches_applied_dirtily;
6051 runcmd qw(dpkg-source --after-build .)
6052 if $patches_applied_dirtily & 01;
6054 if $patches_applied_dirtily & 02;
6055 $patches_applied_dirtily = 0;
6058 #----- other building -----
6060 our $clean_using_builder;
6061 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
6062 # clean the tree before building (perhaps invoked indirectly by
6063 # whatever we are using to run the build), rather than separately
6064 # and explicitly by us.
6067 return if $clean_using_builder;
6068 if ($cleanmode eq 'dpkg-source') {
6069 maybe_apply_patches_dirtily();
6070 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
6071 } elsif ($cleanmode eq 'dpkg-source-d') {
6072 maybe_apply_patches_dirtily();
6073 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
6074 } elsif ($cleanmode eq 'git') {
6075 runcmd_ordryrun_local @git, qw(clean -xdf);
6076 } elsif ($cleanmode eq 'git-ff') {
6077 runcmd_ordryrun_local @git, qw(clean -xdff);
6078 } elsif ($cleanmode eq 'check') {
6079 my $leftovers = cmdoutput @git, qw(clean -xdn);
6080 if (length $leftovers) {
6081 print STDERR $leftovers, "\n" or die $!;
6082 fail "tree contains uncommitted files and --clean=check specified";
6084 } elsif ($cleanmode eq 'none') {
6091 badusage "clean takes no additional arguments" if @ARGV;
6094 maybe_unapply_patches_again();
6097 # return values from massage_dbp_args are one or both of these flags
6098 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6099 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6101 sub build_or_push_prep_early () {
6102 our $build_or_push_prep_early_done //= 0;
6103 return if $build_or_push_prep_early_done++;
6104 badusage "-p is not allowed with dgit $subcommand" if defined $package;
6105 my $clogp = parsechangelog();
6106 $isuite = getfield $clogp, 'Distribution';
6107 $package = getfield $clogp, 'Source';
6108 $version = getfield $clogp, 'Version';
6109 $dscfn = dscfn($version);
6112 sub build_prep_early () {
6113 build_or_push_prep_early();
6118 sub build_prep ($) {
6121 # clean the tree if we're trying to include dirty changes in the
6122 # source package, or we are running the builder in $maindir
6123 clean_tree() if $includedirty || ($wantsrc & WANTSRC_BUILDER);
6124 build_maybe_quilt_fixup();
6126 my $pat = changespat $version;
6127 foreach my $f (glob "$buildproductsdir/$pat") {
6129 unlink $f or fail "remove old changes file $f: $!";
6131 progress "would remove $f";
6137 sub changesopts_initial () {
6138 my @opts =@changesopts[1..$#changesopts];
6141 sub changesopts_version () {
6142 if (!defined $changes_since_version) {
6145 @vsns = archive_query('archive_query');
6146 my @quirk = access_quirk();
6147 if ($quirk[0] eq 'backports') {
6148 local $isuite = $quirk[2];
6150 canonicalise_suite();
6151 push @vsns, archive_query('archive_query');
6157 "archive query failed (queried because --since-version not specified)";
6160 @vsns = map { $_->[0] } @vsns;
6161 @vsns = sort { -version_compare($a, $b) } @vsns;
6162 $changes_since_version = $vsns[0];
6163 progress "changelog will contain changes since $vsns[0]";
6165 $changes_since_version = '_';
6166 progress "package seems new, not specifying -v<version>";
6169 if ($changes_since_version ne '_') {
6170 return ("-v$changes_since_version");
6176 sub changesopts () {
6177 return (changesopts_initial(), changesopts_version());
6180 sub massage_dbp_args ($;$) {
6181 my ($cmd,$xargs) = @_;
6182 # Since we split the source build out so we can do strange things
6183 # to it, massage the arguments to dpkg-buildpackage so that the
6184 # main build doessn't build source (or add an argument to stop it
6185 # building source by default).
6186 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6187 # -nc has the side effect of specifying -b if nothing else specified
6188 # and some combinations of -S, -b, et al, are errors, rather than
6189 # later simply overriding earlie. So we need to:
6190 # - search the command line for these options
6191 # - pick the last one
6192 # - perhaps add our own as a default
6193 # - perhaps adjust it to the corresponding non-source-building version
6195 foreach my $l ($cmd, $xargs) {
6197 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
6200 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6201 my $r = WANTSRC_BUILDER;
6202 printdebug "massage split $dmode.\n";
6203 $r = $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6204 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6205 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6207 printdebug "massage done $r $dmode.\n";
6209 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6215 my $wasdir = must_getcwd();
6216 changedir $buildproductsdir;
6221 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6222 sub postbuild_mergechanges ($) {
6223 my ($msg_if_onlyone) = @_;
6224 # If there is only one .changes file, fail with $msg_if_onlyone,
6225 # or if that is undef, be a no-op.
6226 # Returns the changes file to report to the user.
6227 my $pat = changespat $version;
6228 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6229 @changesfiles = sort {
6230 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6234 if (@changesfiles==1) {
6235 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
6236 only one changes file from build (@changesfiles)
6238 $result = $changesfiles[0];
6239 } elsif (@changesfiles==2) {
6240 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6241 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6242 fail "$l found in binaries changes file $binchanges"
6245 runcmd_ordryrun_local @mergechanges, @changesfiles;
6246 my $multichanges = changespat $version,'multi';
6248 stat_exists $multichanges or fail "$multichanges: $!";
6249 foreach my $cf (glob $pat) {
6250 next if $cf eq $multichanges;
6251 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6254 $result = $multichanges;
6256 fail "wrong number of different changes files (@changesfiles)";
6258 printdone "build successful, results in $result\n" or die $!;
6261 sub midbuild_checkchanges () {
6262 my $pat = changespat $version;
6263 return if $rmchanges;
6264 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6266 $_ ne changespat $version,'source' and
6267 $_ ne changespat $version,'multi'
6270 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6271 Suggest you delete @unwanted.
6276 sub midbuild_checkchanges_vanilla ($) {
6278 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6281 sub postbuild_mergechanges_vanilla ($) {
6283 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6285 postbuild_mergechanges(undef);
6288 printdone "build successful\n";
6294 $buildproductsdir eq '..' or print STDERR <<END;
6295 $us: warning: build-products-dir set, but not supported by dgit build
6296 $us: warning: things may go wrong or files may go to the wrong place
6298 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6299 my $wantsrc = massage_dbp_args \@dbp;
6300 build_prep($wantsrc);
6301 if ($wantsrc & WANTSRC_SOURCE) {
6303 midbuild_checkchanges_vanilla $wantsrc;
6305 if ($wantsrc & WANTSRC_BUILDER) {
6306 push @dbp, changesopts_version();
6307 maybe_apply_patches_dirtily();
6308 runcmd_ordryrun_local @dbp;
6310 maybe_unapply_patches_again();
6311 postbuild_mergechanges_vanilla $wantsrc;
6315 $quilt_mode //= 'gbp';
6321 # gbp can make .origs out of thin air. In my tests it does this
6322 # even for a 1.0 format package, with no origs present. So I
6323 # guess it keys off just the version number. We don't know
6324 # exactly what .origs ought to exist, but let's assume that we
6325 # should run gbp if: the version has an upstream part and the main
6327 my $upstreamversion = upstreamversion $version;
6328 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6329 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6331 if ($gbp_make_orig) {
6333 $cleanmode = 'none'; # don't do it again
6336 my @dbp = @dpkgbuildpackage;
6338 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6340 if (!length $gbp_build[0]) {
6341 if (length executable_on_path('git-buildpackage')) {
6342 $gbp_build[0] = qw(git-buildpackage);
6344 $gbp_build[0] = 'gbp buildpackage';
6347 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6349 push @cmd, (qw(-us -uc --git-no-sign-tags),
6350 "--git-builder=".(shellquote @dbp));
6352 if ($gbp_make_orig) {
6353 my $priv = dgit_privdir();
6354 my $ok = "$priv/origs-gen-ok";
6355 unlink $ok or $!==&ENOENT or die $!;
6356 my @origs_cmd = @cmd;
6357 push @origs_cmd, qw(--git-cleaner=true);
6358 push @origs_cmd, "--git-prebuild=".
6359 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6360 push @origs_cmd, @ARGV;
6362 debugcmd @origs_cmd;
6364 do { local $!; stat_exists $ok; }
6365 or failedcmd @origs_cmd;
6367 dryrun_report @origs_cmd;
6371 build_prep($wantsrc);
6372 if ($wantsrc & WANTSRC_SOURCE) {
6374 midbuild_checkchanges_vanilla $wantsrc;
6376 if (!$clean_using_builder) {
6377 push @cmd, '--git-cleaner=true';
6380 maybe_unapply_patches_again();
6381 if ($wantsrc & WANTSRC_BUILDER) {
6382 push @cmd, changesopts();
6383 runcmd_ordryrun_local @cmd, @ARGV;
6385 postbuild_mergechanges_vanilla $wantsrc;
6387 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6389 sub building_source_in_playtree {
6390 # If $includedirty, we have to build the source package from the
6391 # working tree, not a playtree, so that uncommitted changes are
6392 # included (copying or hardlinking them into the playtree could
6395 # Note that if we are building a source package in split brain
6396 # mode we do not support including uncommitted changes, because
6397 # that makes quilt fixup too hard. I.e. ($split_brain && (dgit is
6398 # building a source package)) => !$includedirty
6399 return !$includedirty;
6403 $sourcechanges = changespat $version,'source';
6405 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6406 or fail "remove $sourcechanges: $!";
6408 my @cmd = (@dpkgsource, qw(-b --));
6410 if (building_source_in_playtree()) {
6412 my $headref = git_rev_parse('HEAD');
6413 # If we are in split brain, there is already a playtree with
6414 # the thing we should package into a .dsc (thanks to quilt
6415 # fixup). If not, make a playtree
6416 prep_ud() unless $split_brain;
6417 changedir $playground;
6418 unless ($split_brain) {
6419 my $upstreamversion = upstreamversion $version;
6420 unpack_playtree_linkorigs($upstreamversion, sub { });
6421 unpack_playtree_mkwork($headref);
6425 $leafdir = basename $maindir;
6428 runcmd_ordryrun_local @cmd, $leafdir;
6431 runcmd_ordryrun_local qw(sh -ec),
6432 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6433 @dpkggenchanges, qw(-S), changesopts();
6436 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6437 $dsc = parsecontrol($dscfn, "source package");
6441 printdebug " renaming ($why) $l\n";
6442 rename "$l", bpd_abs()."/$l"
6443 or fail "put in place new built file ($l): $!";
6445 foreach my $l (split /\n/, getfield $dsc, 'Files') {
6446 $l =~ m/\S+$/ or next;
6449 $mv->('dsc', $dscfn);
6450 $mv->('changes', $sourcechanges);
6455 sub cmd_build_source {
6456 badusage "build-source takes no additional arguments" if @ARGV;
6457 build_prep(WANTSRC_SOURCE);
6459 maybe_unapply_patches_again();
6460 printdone "source built, results in $dscfn and $sourcechanges";
6463 sub cmd_push_source {
6465 fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
6466 "sense with push-source!" if $includedirty;
6467 build_maybe_quilt_fixup();
6469 my $changes = parsecontrol("$buildproductsdir/$changesfile",
6470 "source changes file");
6471 unless (test_source_only_changes($changes)) {
6472 fail "user-specified changes file is not source-only";
6475 # Building a source package is very fast, so just do it
6477 die "er, patches are applied dirtily but shouldn't be.."
6478 if $patches_applied_dirtily;
6479 $changesfile = $sourcechanges;
6484 sub binary_builder {
6485 my ($bbuilder, $pbmc_msg, @args) = @_;
6486 build_prep(WANTSRC_SOURCE);
6488 midbuild_checkchanges();
6491 stat_exists $dscfn or fail "$dscfn (in build products dir): $!";
6492 stat_exists $sourcechanges
6493 or fail "$sourcechanges (in build products dir): $!";
6495 runcmd_ordryrun_local @$bbuilder, @args;
6497 maybe_unapply_patches_again();
6499 postbuild_mergechanges($pbmc_msg);
6505 binary_builder(\@sbuild, <<END, qw(-d), $isuite, @ARGV, $dscfn);
6506 perhaps you need to pass -A ? (sbuild's default is to build only
6507 arch-specific binaries; dgit 1.4 used to override that.)
6512 my ($pbuilder) = @_;
6514 # @ARGV is allowed to contain only things that should be passed to
6515 # pbuilder under debbuildopts; just massage those
6516 my $wantsrc = massage_dbp_args \@ARGV;
6517 fail "you asked for a builder but your debbuildopts didn't ask for".
6518 " any binaries -- is this really what you meant?"
6519 unless $wantsrc & WANTSRC_BUILDER;
6520 fail "we must build a .dsc to pass to the builder but your debbuiltopts".
6521 " forbids the building of a source package; cannot continue"
6522 unless $wantsrc & WANTSRC_SOURCE;
6523 # We do not want to include the verb "build" in @pbuilder because
6524 # the user can customise @pbuilder and they shouldn't be required
6525 # to include "build" in their customised value. However, if the
6526 # user passes any additional args to pbuilder using the dgit
6527 # option --pbuilder:foo, such args need to come after the "build"
6528 # verb. opts_opt_multi_cmd does all of that.
6529 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
6530 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
6535 pbuilder(\@pbuilder);
6538 sub cmd_cowbuilder {
6539 pbuilder(\@cowbuilder);
6542 sub cmd_quilt_fixup {
6543 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6546 build_maybe_quilt_fixup();
6549 sub cmd_print_unapplied_treeish {
6550 badusage "incorrect arguments to dgit print-unapplied-treeish" if @ARGV;
6551 my $headref = git_rev_parse('HEAD');
6552 my $clogp = commit_getclogp $headref;
6553 $package = getfield $clogp, 'Source';
6554 $version = getfield $clogp, 'Version';
6555 $isuite = getfield $clogp, 'Distribution';
6556 $csuite = $isuite; # we want this to be offline!
6560 changedir $playground;
6561 my $uv = upstreamversion $version;
6562 quilt_make_fake_dsc($uv);
6563 my $u = quilt_fakedsc2unapplied($headref, $uv);
6564 print $u, "\n" or die $!;
6567 sub import_dsc_result {
6568 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6569 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
6571 check_gitattrs($newhash, "source tree");
6573 progress "dgit: import-dsc: $what_msg";
6576 sub cmd_import_dsc {
6580 last unless $ARGV[0] =~ m/^-/;
6583 if (m/^--require-valid-signature$/) {
6586 badusage "unknown dgit import-dsc sub-option \`$_'";
6590 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6591 my ($dscfn, $dstbranch) = @ARGV;
6593 badusage "dry run makes no sense with import-dsc" unless act_local();
6595 my $force = $dstbranch =~ s/^\+// ? +1 :
6596 $dstbranch =~ s/^\.\.// ? -1 :
6598 my $info = $force ? " $&" : '';
6599 $info = "$dscfn$info";
6601 my $specbranch = $dstbranch;
6602 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6603 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6605 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6606 my $chead = cmdoutput_errok @symcmd;
6607 defined $chead or $?==256 or failedcmd @symcmd;
6609 fail "$dstbranch is checked out - will not update it"
6610 if defined $chead and $chead eq $dstbranch;
6612 my $oldhash = git_get_ref $dstbranch;
6614 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6615 $dscdata = do { local $/ = undef; <D>; };
6616 D->error and fail "read $dscfn: $!";
6619 # we don't normally need this so import it here
6620 use Dpkg::Source::Package;
6621 my $dp = new Dpkg::Source::Package filename => $dscfn,
6622 require_valid_signature => $needsig;
6624 local $SIG{__WARN__} = sub {
6626 return unless $needsig;
6627 fail "import-dsc signature check failed";
6629 if (!$dp->is_signed()) {
6630 warn "$us: warning: importing unsigned .dsc\n";
6632 my $r = $dp->check_signature();
6633 die "->check_signature => $r" if $needsig && $r;
6639 $package = getfield $dsc, 'Source';
6641 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6642 unless forceing [qw(import-dsc-with-dgit-field)];
6643 parse_dsc_field_def_dsc_distro();
6645 $isuite = 'DGIT-IMPORT-DSC';
6646 $idistro //= $dsc_distro;
6650 if (defined $dsc_hash) {
6651 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6652 resolve_dsc_field_commit undef, undef;
6654 if (defined $dsc_hash) {
6655 my @cmd = (qw(sh -ec),
6656 "echo $dsc_hash | git cat-file --batch-check");
6657 my $objgot = cmdoutput @cmd;
6658 if ($objgot =~ m#^\w+ missing\b#) {
6660 .dsc contains Dgit field referring to object $dsc_hash
6661 Your git tree does not have that object. Try `git fetch' from a
6662 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6665 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6667 progress "Not fast forward, forced update.";
6669 fail "Not fast forward to $dsc_hash";
6672 import_dsc_result $dstbranch, $dsc_hash,
6673 "dgit import-dsc (Dgit): $info",
6674 "updated git ref $dstbranch";
6679 Branch $dstbranch already exists
6680 Specify ..$specbranch for a pseudo-merge, binding in existing history
6681 Specify +$specbranch to overwrite, discarding existing history
6683 if $oldhash && !$force;
6685 my @dfi = dsc_files_info();
6686 foreach my $fi (@dfi) {
6687 my $f = $fi->{Filename};
6688 my $here = "$buildproductsdir/$f";
6691 fail "lstat $here works but stat gives $! !";
6693 fail "stat $here: $!" unless $! == ENOENT;
6695 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6697 } elsif ($dscfn =~ m#^/#) {
6700 fail "cannot import $dscfn which seems to be inside working tree!";
6702 $there =~ s#/+[^/]+$## or
6703 fail "import $dscfn requires ../$f, but it does not exist";
6705 my $test = $there =~ m{^/} ? $there : "../$there";
6706 stat $test or fail "import $dscfn requires $test, but: $!";
6707 symlink $there, $here or fail "symlink $there to $here: $!";
6708 progress "made symlink $here -> $there";
6709 # print STDERR Dumper($fi);
6711 my @mergeinputs = generate_commits_from_dsc();
6712 die unless @mergeinputs == 1;
6714 my $newhash = $mergeinputs[0]{Commit};
6718 progress "Import, forced update - synthetic orphan git history.";
6719 } elsif ($force < 0) {
6720 progress "Import, merging.";
6721 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6722 my $version = getfield $dsc, 'Version';
6723 my $clogp = commit_getclogp $newhash;
6724 my $authline = clogp_authline $clogp;
6725 $newhash = make_commit_text <<END;
6732 Merge $package ($version) import into $dstbranch
6735 die; # caught earlier
6739 import_dsc_result $dstbranch, $newhash,
6740 "dgit import-dsc: $info",
6741 "results are in in git ref $dstbranch";
6744 sub pre_archive_api_query () {
6745 not_necessarily_a_tree();
6747 sub cmd_archive_api_query {
6748 badusage "need only 1 subpath argument" unless @ARGV==1;
6749 my ($subpath) = @ARGV;
6750 local $isuite = 'DGIT-API-QUERY-CMD';
6751 my @cmd = archive_api_query_cmd($subpath);
6754 exec @cmd or fail "exec curl: $!\n";
6757 sub repos_server_url () {
6758 $package = '_dgit-repos-server';
6759 local $access_forpush = 1;
6760 local $isuite = 'DGIT-REPOS-SERVER';
6761 my $url = access_giturl();
6764 sub pre_clone_dgit_repos_server () {
6765 not_necessarily_a_tree();
6767 sub cmd_clone_dgit_repos_server {
6768 badusage "need destination argument" unless @ARGV==1;
6769 my ($destdir) = @ARGV;
6770 my $url = repos_server_url();
6771 my @cmd = (@git, qw(clone), $url, $destdir);
6773 exec @cmd or fail "exec git clone: $!\n";
6776 sub pre_print_dgit_repos_server_source_url () {
6777 not_necessarily_a_tree();
6779 sub cmd_print_dgit_repos_server_source_url {
6780 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6782 my $url = repos_server_url();
6783 print $url, "\n" or die $!;
6786 sub pre_print_dpkg_source_ignores {
6787 not_necessarily_a_tree();
6789 sub cmd_print_dpkg_source_ignores {
6790 badusage "no arguments allowed to dgit print-dpkg-source-ignores"
6792 print "@dpkg_source_ignores\n" or die $!;
6795 sub cmd_setup_mergechangelogs {
6796 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6797 local $isuite = 'DGIT-SETUP-TREE';
6798 setup_mergechangelogs(1);
6801 sub cmd_setup_useremail {
6802 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6803 local $isuite = 'DGIT-SETUP-TREE';
6807 sub cmd_setup_gitattributes {
6808 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6809 local $isuite = 'DGIT-SETUP-TREE';
6813 sub cmd_setup_new_tree {
6814 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6815 local $isuite = 'DGIT-SETUP-TREE';
6819 #---------- argument parsing and main program ----------
6822 print "dgit version $our_version\n" or die $!;
6826 our (%valopts_long, %valopts_short);
6827 our (%funcopts_long);
6829 our (@modeopt_cfgs);
6831 sub defvalopt ($$$$) {
6832 my ($long,$short,$val_re,$how) = @_;
6833 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6834 $valopts_long{$long} = $oi;
6835 $valopts_short{$short} = $oi;
6836 # $how subref should:
6837 # do whatever assignemnt or thing it likes with $_[0]
6838 # if the option should not be passed on to remote, @rvalopts=()
6839 # or $how can be a scalar ref, meaning simply assign the value
6842 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6843 defvalopt '--distro', '-d', '.+', \$idistro;
6844 defvalopt '', '-k', '.+', \$keyid;
6845 defvalopt '--existing-package','', '.*', \$existing_package;
6846 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6847 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6848 defvalopt '--package', '-p', $package_re, \$package;
6849 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6851 defvalopt '', '-C', '.+', sub {
6852 ($changesfile) = (@_);
6853 if ($changesfile =~ s#^(.*)/##) {
6854 $buildproductsdir = $1;
6858 defvalopt '--initiator-tempdir','','.*', sub {
6859 ($initiator_tempdir) = (@_);
6860 $initiator_tempdir =~ m#^/# or
6861 badusage "--initiator-tempdir must be used specify an".
6862 " absolute, not relative, directory."
6865 sub defoptmodes ($@) {
6866 my ($varref, $cfgkey, $default, %optmap) = @_;
6868 while (my ($opt,$val) = each %optmap) {
6869 $funcopts_long{$opt} = sub { $$varref = $val; };
6870 $permit{$val} = $val;
6872 push @modeopt_cfgs, {
6875 Default => $default,
6880 defoptmodes \$dodep14tag, qw( dep14tag want
6883 --always-dep14tag always );
6888 if (defined $ENV{'DGIT_SSH'}) {
6889 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6890 } elsif (defined $ENV{'GIT_SSH'}) {
6891 @ssh = ($ENV{'GIT_SSH'});
6899 if (!defined $val) {
6900 badusage "$what needs a value" unless @ARGV;
6902 push @rvalopts, $val;
6904 badusage "bad value \`$val' for $what" unless
6905 $val =~ m/^$oi->{Re}$(?!\n)/s;
6906 my $how = $oi->{How};
6907 if (ref($how) eq 'SCALAR') {
6912 push @ropts, @rvalopts;
6916 last unless $ARGV[0] =~ m/^-/;
6920 if (m/^--dry-run$/) {
6923 } elsif (m/^--damp-run$/) {
6926 } elsif (m/^--no-sign$/) {
6929 } elsif (m/^--help$/) {
6931 } elsif (m/^--version$/) {
6933 } elsif (m/^--new$/) {
6936 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6937 ($om = $opts_opt_map{$1}) &&
6941 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6942 !$opts_opt_cmdonly{$1} &&
6943 ($om = $opts_opt_map{$1})) {
6946 } elsif (m/^--(gbp|dpm)$/s) {
6947 push @ropts, "--quilt=$1";
6949 } elsif (m/^--(?:ignore|include)-dirty$/s) {
6952 } elsif (m/^--no-quilt-fixup$/s) {
6954 $quilt_mode = 'nocheck';
6955 } elsif (m/^--no-rm-on-error$/s) {
6958 } elsif (m/^--no-chase-dsc-distro$/s) {
6960 $chase_dsc_distro = 0;
6961 } elsif (m/^--overwrite$/s) {
6963 $overwrite_version = '';
6964 } elsif (m/^--overwrite=(.+)$/s) {
6966 $overwrite_version = $1;
6967 } elsif (m/^--delayed=(\d+)$/s) {
6970 } elsif (my ($k,$v) =
6971 m/^--save-(dgit-view)=(.+)$/s ||
6972 m/^--(dgit-view)-save=(.+)$/s
6975 $v =~ s#^(?!refs/)#refs/heads/#;
6976 $internal_object_save{$k} = $v;
6977 } elsif (m/^--(no-)?rm-old-changes$/s) {
6980 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6982 push @deliberatelies, $&;
6983 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6987 } elsif (m/^--force-/) {
6989 "$us: warning: ignoring unknown force option $_\n";
6991 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6992 # undocumented, for testing
6994 $tagformat_want = [ $1, 'command line', 1 ];
6995 # 1 menas overrides distro configuration
6996 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6997 # undocumented, for testing
6999 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
7000 # ^ it's supposed to be an array ref
7001 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
7002 $val = $2 ? $' : undef; #';
7003 $valopt->($oi->{Long});
7004 } elsif ($funcopts_long{$_}) {
7006 $funcopts_long{$_}();
7008 badusage "unknown long option \`$_'";
7015 } elsif (s/^-L/-/) {
7018 } elsif (s/^-h/-/) {
7020 } elsif (s/^-D/-/) {
7024 } elsif (s/^-N/-/) {
7029 push @changesopts, $_;
7031 } elsif (s/^-wn$//s) {
7033 $cleanmode = 'none';
7034 } elsif (s/^-wg$//s) {
7037 } elsif (s/^-wgf$//s) {
7039 $cleanmode = 'git-ff';
7040 } elsif (s/^-wd$//s) {
7042 $cleanmode = 'dpkg-source';
7043 } elsif (s/^-wdd$//s) {
7045 $cleanmode = 'dpkg-source-d';
7046 } elsif (s/^-wc$//s) {
7048 $cleanmode = 'check';
7049 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7050 push @git, '-c', $&;
7051 $gitcfgs{cmdline}{$1} = [ $2 ];
7052 } elsif (s/^-c([^=]+)$//s) {
7053 push @git, '-c', $&;
7054 $gitcfgs{cmdline}{$1} = [ 'true' ];
7055 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7057 $val = undef unless length $val;
7058 $valopt->($oi->{Short});
7061 badusage "unknown short option \`$_'";
7068 sub check_env_sanity () {
7069 my $blocked = new POSIX::SigSet;
7070 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
7073 foreach my $name (qw(PIPE CHLD)) {
7074 my $signame = "SIG$name";
7075 my $signum = eval "POSIX::$signame" // die;
7076 die "$signame is set to something other than SIG_DFL\n"
7077 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7078 $blocked->ismember($signum) and
7079 die "$signame is blocked\n";
7085 On entry to dgit, $@
7086 This is a bug produced by something in in your execution environment.
7092 sub parseopts_late_defaults () {
7093 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7094 if defined $idistro;
7095 $isuite //= cfg('dgit.default.default-suite');
7097 foreach my $k (keys %opts_opt_map) {
7098 my $om = $opts_opt_map{$k};
7100 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7102 badcfg "cannot set command for $k"
7103 unless length $om->[0];
7107 foreach my $c (access_cfg_cfgs("opts-$k")) {
7109 map { $_ ? @$_ : () }
7110 map { $gitcfgs{$_}{$c} }
7111 reverse @gitcfgsources;
7112 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7113 "\n" if $debuglevel >= 4;
7115 badcfg "cannot configure options for $k"
7116 if $opts_opt_cmdonly{$k};
7117 my $insertpos = $opts_cfg_insertpos{$k};
7118 @$om = ( @$om[0..$insertpos-1],
7120 @$om[$insertpos..$#$om] );
7124 if (!defined $rmchanges) {
7125 local $access_forpush;
7126 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7129 if (!defined $quilt_mode) {
7130 local $access_forpush;
7131 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7132 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7134 $quilt_mode =~ m/^($quilt_modes_re)$/
7135 or badcfg "unknown quilt-mode \`$quilt_mode'";
7139 foreach my $moc (@modeopt_cfgs) {
7140 local $access_forpush;
7141 my $vr = $moc->{Var};
7142 next if defined $$vr;
7143 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7144 my $v = $moc->{Vals}{$$vr};
7145 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
7149 fail "dgit: --include-dirty is not supported in split view quilt mode"
7150 if $split_brain && $includedirty;
7152 if (!defined $cleanmode) {
7153 local $access_forpush;
7154 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
7155 $cleanmode //= 'dpkg-source';
7157 badcfg "unknown clean-mode \`$cleanmode'" unless
7158 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
7161 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7162 $buildproductsdir //= '..';
7163 $bpd_glob = $buildproductsdir;
7164 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7167 if ($ENV{$fakeeditorenv}) {
7169 quilt_fixup_editor();
7175 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
7176 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7177 if $dryrun_level == 1;
7179 print STDERR $helpmsg or die $!;
7182 $cmd = $subcommand = shift @ARGV;
7185 my $pre_fn = ${*::}{"pre_$cmd"};
7186 $pre_fn->() if $pre_fn;
7188 record_maindir if $invoked_in_git_tree;
7191 my $fn = ${*::}{"cmd_$cmd"};
7192 $fn or badusage "unknown operation $cmd";