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';
103 our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?};
104 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
105 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
107 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
108 our $splitbraincache = 'dgit-intern/quilt-cache';
109 our $rewritemap = 'dgit-rewrite/map';
111 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
113 our (@git) = qw(git);
114 our (@dget) = qw(dget);
115 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
116 our (@dput) = qw(dput);
117 our (@debsign) = qw(debsign);
118 our (@gpg) = qw(gpg);
119 our (@sbuild) = qw(sbuild);
121 our (@dgit) = qw(dgit);
122 our (@git_debrebase) = qw(git-debrebase);
123 our (@aptget) = qw(apt-get);
124 our (@aptcache) = qw(apt-cache);
125 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
126 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
127 our (@dpkggenchanges) = qw(dpkg-genchanges);
128 our (@mergechanges) = qw(mergechanges -f);
129 our (@gbp_build) = ('');
130 our (@gbp_pq) = ('gbp pq');
131 our (@changesopts) = ('');
132 our (@pbuilder) = ("sudo -E pbuilder");
133 our (@cowbuilder) = ("sudo -E cowbuilder");
135 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
138 'debsign' => \@debsign,
140 'sbuild' => \@sbuild,
144 'git-debrebase' => \@git_debrebase,
145 'apt-get' => \@aptget,
146 'apt-cache' => \@aptcache,
147 'dpkg-source' => \@dpkgsource,
148 'dpkg-buildpackage' => \@dpkgbuildpackage,
149 'dpkg-genchanges' => \@dpkggenchanges,
150 'gbp-build' => \@gbp_build,
151 'gbp-pq' => \@gbp_pq,
152 'ch' => \@changesopts,
153 'mergechanges' => \@mergechanges,
154 'pbuilder' => \@pbuilder,
155 'cowbuilder' => \@cowbuilder);
157 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
158 our %opts_cfg_insertpos = map {
160 scalar @{ $opts_opt_map{$_} }
161 } keys %opts_opt_map;
163 sub parseopts_late_defaults();
164 sub setup_gitattrs(;$);
165 sub check_gitattrs($$);
172 our $supplementary_message = '';
173 our $split_brain = 0;
177 return unless forkcheck_mainprocess();
178 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
181 our $remotename = 'dgit';
182 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
186 if (!defined $absurdity) {
188 $absurdity =~ s{/[^/]+$}{/absurd} or die;
192 my ($v,$distro) = @_;
193 return $tagformatfn->($v, $distro);
196 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
198 sub lbranch () { return "$branchprefix/$csuite"; }
199 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
200 sub lref () { return "refs/heads/".lbranch(); }
201 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
202 sub rrref () { return server_ref($csuite); }
212 return "${package}_".(stripepoch $vsn).$sfx
217 return srcfn($vsn,".dsc");
220 sub changespat ($;$) {
221 my ($vsn, $arch) = @_;
222 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
225 sub upstreamversion ($) {
237 return unless forkcheck_mainprocess();
238 foreach my $f (@end) {
240 print STDERR "$us: cleanup: $@" if length $@;
244 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; finish 12; }
246 sub forceable_fail ($$) {
247 my ($forceoptsl, $msg) = @_;
248 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
249 print STDERR "warning: overriding problem due to --force:\n". $msg;
253 my ($forceoptsl) = @_;
254 my @got = grep { $forceopts{$_} } @$forceoptsl;
255 return 0 unless @got;
257 "warning: skipping checks or functionality due to --force-$got[0]\n";
260 sub no_such_package () {
261 print STDERR "$us: package $package does not exist in suite $isuite\n";
265 sub deliberately ($) {
267 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
270 sub deliberately_not_fast_forward () {
271 foreach (qw(not-fast-forward fresh-repo)) {
272 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
276 sub quiltmode_splitbrain () {
277 $quilt_mode =~ m/gbp|dpm|unapplied/;
280 sub opts_opt_multi_cmd {
283 push @cmd, split /\s+/, shift @_;
290 return opts_opt_multi_cmd [], @gbp_pq;
293 sub dgit_privdir () {
294 our $dgit_privdir_made //= ensure_a_playground 'dgit';
298 my $r = $buildproductsdir;
299 $r = "$maindir/$r" unless $r =~ m{^/};
303 sub branch_gdr_info ($$) {
304 my ($symref, $head) = @_;
305 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
306 gdr_ffq_prev_branchinfo($symref);
307 return () unless $status eq 'branch';
308 $ffq_prev = git_get_ref $ffq_prev;
309 $gdrlast = git_get_ref $gdrlast;
310 $gdrlast &&= is_fast_fwd $gdrlast, $head;
311 return ($ffq_prev, $gdrlast);
314 sub branch_is_gdr ($$) {
315 my ($symref, $head) = @_;
316 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
317 return 0 unless $ffq_prev || $gdrlast;
321 sub branch_is_gdr_unstitched_ff ($$$) {
322 my ($symref, $head, $ancestor) = @_;
323 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
324 return 0 unless $ffq_prev;
325 return 0 unless is_fast_fwd $ancestor, $ffq_prev;
329 #---------- remote protocol support, common ----------
331 # remote push initiator/responder protocol:
332 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
333 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
334 # < dgit-remote-push-ready <actual-proto-vsn>
341 # > supplementary-message NBYTES # $protovsn >= 3
346 # > file parsed-changelog
347 # [indicates that output of dpkg-parsechangelog follows]
348 # > data-block NBYTES
349 # > [NBYTES bytes of data (no newline)]
350 # [maybe some more blocks]
359 # > param head DGIT-VIEW-HEAD
360 # > param csuite SUITE
361 # > param tagformat old|new
362 # > param maint-view MAINT-VIEW-HEAD
364 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
365 # > file buildinfo # for buildinfos to sign
367 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
368 # # goes into tag, for replay prevention
371 # [indicates that signed tag is wanted]
372 # < data-block NBYTES
373 # < [NBYTES bytes of data (no newline)]
374 # [maybe some more blocks]
378 # > want signed-dsc-changes
379 # < data-block NBYTES [transfer of signed dsc]
381 # < data-block NBYTES [transfer of signed changes]
383 # < data-block NBYTES [transfer of each signed buildinfo
384 # [etc] same number and order as "file buildinfo"]
392 sub i_child_report () {
393 # Sees if our child has died, and reap it if so. Returns a string
394 # describing how it died if it failed, or undef otherwise.
395 return undef unless $i_child_pid;
396 my $got = waitpid $i_child_pid, WNOHANG;
397 return undef if $got <= 0;
398 die unless $got == $i_child_pid;
399 $i_child_pid = undef;
400 return undef unless $?;
401 return "build host child ".waitstatusmsg();
406 fail "connection lost: $!" if $fh->error;
407 fail "protocol violation; $m not expected";
410 sub badproto_badread ($$) {
412 fail "connection lost: $!" if $!;
413 my $report = i_child_report();
414 fail $report if defined $report;
415 badproto $fh, "eof (reading $wh)";
418 sub protocol_expect (&$) {
419 my ($match, $fh) = @_;
422 defined && chomp or badproto_badread $fh, "protocol message";
430 badproto $fh, "\`$_'";
433 sub protocol_send_file ($$) {
434 my ($fh, $ourfn) = @_;
435 open PF, "<", $ourfn or die "$ourfn: $!";
438 my $got = read PF, $d, 65536;
439 die "$ourfn: $!" unless defined $got;
441 print $fh "data-block ".length($d)."\n" or die $!;
442 print $fh $d or die $!;
444 PF->error and die "$ourfn $!";
445 print $fh "data-end\n" or die $!;
449 sub protocol_read_bytes ($$) {
450 my ($fh, $nbytes) = @_;
451 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
453 my $got = read $fh, $d, $nbytes;
454 $got==$nbytes or badproto_badread $fh, "data block";
458 sub protocol_receive_file ($$) {
459 my ($fh, $ourfn) = @_;
460 printdebug "() $ourfn\n";
461 open PF, ">", $ourfn or die "$ourfn: $!";
463 my ($y,$l) = protocol_expect {
464 m/^data-block (.*)$/ ? (1,$1) :
465 m/^data-end$/ ? (0,) :
469 my $d = protocol_read_bytes $fh, $l;
470 print PF $d or die $!;
475 #---------- remote protocol support, responder ----------
477 sub responder_send_command ($) {
479 return unless $we_are_responder;
480 # called even without $we_are_responder
481 printdebug ">> $command\n";
482 print PO $command, "\n" or die $!;
485 sub responder_send_file ($$) {
486 my ($keyword, $ourfn) = @_;
487 return unless $we_are_responder;
488 printdebug "]] $keyword $ourfn\n";
489 responder_send_command "file $keyword";
490 protocol_send_file \*PO, $ourfn;
493 sub responder_receive_files ($@) {
494 my ($keyword, @ourfns) = @_;
495 die unless $we_are_responder;
496 printdebug "[[ $keyword @ourfns\n";
497 responder_send_command "want $keyword";
498 foreach my $fn (@ourfns) {
499 protocol_receive_file \*PI, $fn;
502 protocol_expect { m/^files-end$/ } \*PI;
505 #---------- remote protocol support, initiator ----------
507 sub initiator_expect (&) {
509 protocol_expect { &$match } \*RO;
512 #---------- end remote code ----------
515 if ($we_are_responder) {
517 responder_send_command "progress ".length($m) or die $!;
518 print PO $m or die $!;
528 $ua = LWP::UserAgent->new();
532 progress "downloading $what...";
533 my $r = $ua->get(@_) or die $!;
534 return undef if $r->code == 404;
535 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
536 return $r->decoded_content(charset => 'none');
539 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
541 sub act_local () { return $dryrun_level <= 1; }
542 sub act_scary () { return !$dryrun_level; }
545 if (!$dryrun_level) {
546 progress "$us ok: @_";
548 progress "would be ok: @_ (but dry run only)";
553 printcmd(\*STDERR,$debugprefix."#",@_);
556 sub runcmd_ordryrun {
564 sub runcmd_ordryrun_local {
572 our $helpmsg = <<END;
574 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
575 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
576 dgit [dgit-opts] build [dpkg-buildpackage-opts]
577 dgit [dgit-opts] sbuild [sbuild-opts]
578 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
579 dgit [dgit-opts] push [dgit-opts] [suite]
580 dgit [dgit-opts] push-source [dgit-opts] [suite]
581 dgit [dgit-opts] rpush build-host:build-dir ...
582 important dgit options:
583 -k<keyid> sign tag and package with <keyid> instead of default
584 --dry-run -n do not change anything, but go through the motions
585 --damp-run -L like --dry-run but make local changes, without signing
586 --new -N allow introducing a new package
587 --debug -D increase debug level
588 -c<name>=<value> set git config option (used directly by dgit too)
591 our $later_warning_msg = <<END;
592 Perhaps the upload is stuck in incoming. Using the version from git.
596 print STDERR "$us: @_\n", $helpmsg or die $!;
601 @ARGV or badusage "too few arguments";
602 return scalar shift @ARGV;
606 not_necessarily_a_tree();
609 print $helpmsg or die $!;
613 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
615 our %defcfg = ('dgit.default.distro' => 'debian',
616 'dgit.default.default-suite' => 'unstable',
617 'dgit.default.old-dsc-distro' => 'debian',
618 'dgit-suite.*-security.distro' => 'debian-security',
619 'dgit.default.username' => '',
620 'dgit.default.archive-query-default-component' => 'main',
621 'dgit.default.ssh' => 'ssh',
622 'dgit.default.archive-query' => 'madison:',
623 'dgit.default.sshpsql-dbname' => 'service=projectb',
624 'dgit.default.aptget-components' => 'main',
625 'dgit.default.dgit-tag-format' => 'new,old,maint',
626 'dgit.default.source-only-uploads' => 'ok',
627 'dgit.dsc-url-proto-ok.http' => 'true',
628 'dgit.dsc-url-proto-ok.https' => 'true',
629 'dgit.dsc-url-proto-ok.git' => 'true',
630 'dgit.vcs-git.suites', => 'sid', # ;-separated
631 'dgit.default.dsc-url-proto-ok' => 'false',
632 # old means "repo server accepts pushes with old dgit tags"
633 # new means "repo server accepts pushes with new dgit tags"
634 # maint means "repo server accepts split brain pushes"
635 # hist means "repo server may have old pushes without new tag"
636 # ("hist" is implied by "old")
637 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
638 'dgit-distro.debian.git-check' => 'url',
639 'dgit-distro.debian.git-check-suffix' => '/info/refs',
640 'dgit-distro.debian.new-private-pushers' => 't',
641 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
642 'dgit-distro.debian/push.git-url' => '',
643 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
644 'dgit-distro.debian/push.git-user-force' => 'dgit',
645 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
646 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
647 'dgit-distro.debian/push.git-create' => 'true',
648 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
649 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
650 # 'dgit-distro.debian.archive-query-tls-key',
651 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
652 # ^ this does not work because curl is broken nowadays
653 # Fixing #790093 properly will involve providing providing the key
654 # in some pacagke and maybe updating these paths.
656 # 'dgit-distro.debian.archive-query-tls-curl-args',
657 # '--ca-path=/etc/ssl/ca-debian',
658 # ^ this is a workaround but works (only) on DSA-administered machines
659 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
660 'dgit-distro.debian.git-url-suffix' => '',
661 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
662 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
663 'dgit-distro.debian-security.archive-query' => 'aptget:',
664 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
665 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
666 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
667 'dgit-distro.debian-security.nominal-distro' => 'debian',
668 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
669 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
670 'dgit-distro.ubuntu.git-check' => 'false',
671 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
672 'dgit-distro.test-dummy.ssh' => "$td/ssh",
673 'dgit-distro.test-dummy.username' => "alice",
674 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
675 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
676 'dgit-distro.test-dummy.git-url' => "$td/git",
677 'dgit-distro.test-dummy.git-host' => "git",
678 'dgit-distro.test-dummy.git-path' => "$td/git",
679 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
680 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
681 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
682 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
686 our @gitcfgsources = qw(cmdline local global system);
687 our $invoked_in_git_tree = 1;
689 sub git_slurp_config () {
690 # This algoritm is a bit subtle, but this is needed so that for
691 # options which we want to be single-valued, we allow the
692 # different config sources to override properly. See #835858.
693 foreach my $src (@gitcfgsources) {
694 next if $src eq 'cmdline';
695 # we do this ourselves since git doesn't handle it
697 $gitcfgs{$src} = git_slurp_config_src $src;
701 sub git_get_config ($) {
703 foreach my $src (@gitcfgsources) {
704 my $l = $gitcfgs{$src}{$c};
705 confess "internal error ($l $c)" if $l && !ref $l;
706 printdebug"C $c ".(defined $l ?
707 join " ", map { messagequote "'$_'" } @$l :
711 @$l==1 or badcfg "multiple values for $c".
712 " (in $src git config)" if @$l > 1;
720 return undef if $c =~ /RETURN-UNDEF/;
721 printdebug "C? $c\n" if $debuglevel >= 5;
722 my $v = git_get_config($c);
723 return $v if defined $v;
724 my $dv = $defcfg{$c};
726 printdebug "CD $c $dv\n" if $debuglevel >= 4;
730 badcfg "need value for one of: @_\n".
731 "$us: distro or suite appears not to be (properly) supported";
734 sub not_necessarily_a_tree () {
735 # needs to be called from pre_*
736 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
737 $invoked_in_git_tree = 0;
740 sub access_basedistro__noalias () {
741 if (defined $idistro) {
744 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
745 return $def if defined $def;
746 foreach my $src (@gitcfgsources, 'internal') {
747 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
749 foreach my $k (keys %$kl) {
750 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
752 next unless match_glob $dpat, $isuite;
756 return cfg("dgit.default.distro");
760 sub access_basedistro () {
761 my $noalias = access_basedistro__noalias();
762 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
763 return $canon // $noalias;
766 sub access_nomdistro () {
767 my $base = access_basedistro();
768 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
769 $r =~ m/^$distro_re$/ or badcfg
770 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
774 sub access_quirk () {
775 # returns (quirk name, distro to use instead or undef, quirk-specific info)
776 my $basedistro = access_basedistro();
777 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
779 if (defined $backports_quirk) {
780 my $re = $backports_quirk;
781 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
783 $re =~ s/\%/([-0-9a-z_]+)/
784 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
785 if ($isuite =~ m/^$re$/) {
786 return ('backports',"$basedistro-backports",$1);
789 return ('none',undef);
794 sub parse_cfg_bool ($$$) {
795 my ($what,$def,$v) = @_;
798 $v =~ m/^[ty1]/ ? 1 :
799 $v =~ m/^[fn0]/ ? 0 :
800 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
803 sub access_forpush_config () {
804 my $d = access_basedistro();
808 parse_cfg_bool('new-private-pushers', 0,
809 cfg("dgit-distro.$d.new-private-pushers",
812 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
815 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
816 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
817 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
818 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
821 sub access_forpush () {
822 $access_forpush //= access_forpush_config();
823 return $access_forpush;
827 confess 'internal error '.Dumper($access_forpush)," ?" if
828 defined $access_forpush and !$access_forpush;
829 badcfg "pushing but distro is configured readonly"
830 if access_forpush_config() eq '0';
832 $supplementary_message = <<'END' unless $we_are_responder;
833 Push failed, before we got started.
834 You can retry the push, after fixing the problem, if you like.
836 parseopts_late_defaults();
840 parseopts_late_defaults();
843 sub supplementary_message ($) {
845 if (!$we_are_responder) {
846 $supplementary_message = $msg;
848 } elsif ($protovsn >= 3) {
849 responder_send_command "supplementary-message ".length($msg)
851 print PO $msg or die $!;
855 sub access_distros () {
856 # Returns list of distros to try, in order
859 # 0. `instead of' distro name(s) we have been pointed to
860 # 1. the access_quirk distro, if any
861 # 2a. the user's specified distro, or failing that } basedistro
862 # 2b. the distro calculated from the suite }
863 my @l = access_basedistro();
865 my (undef,$quirkdistro) = access_quirk();
866 unshift @l, $quirkdistro;
867 unshift @l, $instead_distro;
868 @l = grep { defined } @l;
870 push @l, access_nomdistro();
872 if (access_forpush()) {
873 @l = map { ("$_/push", $_) } @l;
878 sub access_cfg_cfgs (@) {
881 # The nesting of these loops determines the search order. We put
882 # the key loop on the outside so that we search all the distros
883 # for each key, before going on to the next key. That means that
884 # if access_cfg is called with a more specific, and then a less
885 # specific, key, an earlier distro can override the less specific
886 # without necessarily overriding any more specific keys. (If the
887 # distro wants to override the more specific keys it can simply do
888 # so; whereas if we did the loop the other way around, it would be
889 # impossible to for an earlier distro to override a less specific
890 # key but not the more specific ones without restating the unknown
891 # values of the more specific keys.
894 # We have to deal with RETURN-UNDEF specially, so that we don't
895 # terminate the search prematurely.
897 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
900 foreach my $d (access_distros()) {
901 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
903 push @cfgs, map { "dgit.default.$_" } @realkeys;
910 my (@cfgs) = access_cfg_cfgs(@keys);
911 my $value = cfg(@cfgs);
915 sub access_cfg_bool ($$) {
916 my ($def, @keys) = @_;
917 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
920 sub string_to_ssh ($) {
922 if ($spec =~ m/\s/) {
923 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
929 sub access_cfg_ssh () {
930 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
931 if (!defined $gitssh) {
934 return string_to_ssh $gitssh;
938 sub access_runeinfo ($) {
940 return ": dgit ".access_basedistro()." $info ;";
943 sub access_someuserhost ($) {
945 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
946 defined($user) && length($user) or
947 $user = access_cfg("$some-user",'username');
948 my $host = access_cfg("$some-host");
949 return length($user) ? "$user\@$host" : $host;
952 sub access_gituserhost () {
953 return access_someuserhost('git');
956 sub access_giturl (;$) {
958 my $url = access_cfg('git-url','RETURN-UNDEF');
961 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
962 return undef unless defined $proto;
965 access_gituserhost().
966 access_cfg('git-path');
968 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
971 return "$url/$package$suffix";
974 sub commit_getclogp ($) {
975 # Returns the parsed changelog hashref for a particular commit
977 our %commit_getclogp_memo;
978 my $memo = $commit_getclogp_memo{$objid};
979 return $memo if $memo;
981 my $mclog = dgit_privdir()."clog";
982 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
983 "$objid:debian/changelog";
984 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
987 sub parse_dscdata () {
988 my $dscfh = new IO::File \$dscdata, '<' or die $!;
989 printdebug Dumper($dscdata) if $debuglevel>1;
990 $dsc = parsecontrolfh($dscfh,$dscurl,1);
991 printdebug Dumper($dsc) if $debuglevel>1;
996 sub archive_query ($;@) {
997 my ($method) = shift @_;
998 fail "this operation does not support multiple comma-separated suites"
1000 my $query = access_cfg('archive-query','RETURN-UNDEF');
1001 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1004 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1007 sub archive_query_prepend_mirror {
1008 my $m = access_cfg('mirror');
1009 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1012 sub pool_dsc_subpath ($$) {
1013 my ($vsn,$component) = @_; # $package is implict arg
1014 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1015 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1018 sub cfg_apply_map ($$$) {
1019 my ($varref, $what, $mapspec) = @_;
1020 return unless $mapspec;
1022 printdebug "config $what EVAL{ $mapspec; }\n";
1024 eval "package Dgit::Config; $mapspec;";
1029 #---------- `ftpmasterapi' archive query method (nascent) ----------
1031 sub archive_api_query_cmd ($) {
1033 my @cmd = (@curl, qw(-sS));
1034 my $url = access_cfg('archive-query-url');
1035 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1037 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1038 foreach my $key (split /\:/, $keys) {
1039 $key =~ s/\%HOST\%/$host/g;
1041 fail "for $url: stat $key: $!" unless $!==ENOENT;
1044 fail "config requested specific TLS key but do not know".
1045 " how to get curl to use exactly that EE key ($key)";
1046 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1047 # # Sadly the above line does not work because of changes
1048 # # to gnutls. The real fix for #790093 may involve
1049 # # new curl options.
1052 # Fixing #790093 properly will involve providing a value
1053 # for this on clients.
1054 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1055 push @cmd, split / /, $kargs if defined $kargs;
1057 push @cmd, $url.$subpath;
1061 sub api_query ($$;$) {
1063 my ($data, $subpath, $ok404) = @_;
1064 badcfg "ftpmasterapi archive query method takes no data part"
1066 my @cmd = archive_api_query_cmd($subpath);
1067 my $url = $cmd[$#cmd];
1068 push @cmd, qw(-w %{http_code});
1069 my $json = cmdoutput @cmd;
1070 unless ($json =~ s/\d+\d+\d$//) {
1071 failedcmd_report_cmd undef, @cmd;
1072 fail "curl failed to print 3-digit HTTP code";
1075 return undef if $code eq '404' && $ok404;
1076 fail "fetch of $url gave HTTP code $code"
1077 unless $url =~ m#^file://# or $code =~ m/^2/;
1078 return decode_json($json);
1081 sub canonicalise_suite_ftpmasterapi {
1082 my ($proto,$data) = @_;
1083 my $suites = api_query($data, 'suites');
1085 foreach my $entry (@$suites) {
1087 my $v = $entry->{$_};
1088 defined $v && $v eq $isuite;
1089 } qw(codename name);
1090 push @matched, $entry;
1092 fail "unknown suite $isuite" unless @matched;
1095 @matched==1 or die "multiple matches for suite $isuite\n";
1096 $cn = "$matched[0]{codename}";
1097 defined $cn or die "suite $isuite info has no codename\n";
1098 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1100 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1105 sub archive_query_ftpmasterapi {
1106 my ($proto,$data) = @_;
1107 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1109 my $digester = Digest::SHA->new(256);
1110 foreach my $entry (@$info) {
1112 my $vsn = "$entry->{version}";
1113 my ($ok,$msg) = version_check $vsn;
1114 die "bad version: $msg\n" unless $ok;
1115 my $component = "$entry->{component}";
1116 $component =~ m/^$component_re$/ or die "bad component";
1117 my $filename = "$entry->{filename}";
1118 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1119 or die "bad filename";
1120 my $sha256sum = "$entry->{sha256sum}";
1121 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1122 push @rows, [ $vsn, "/pool/$component/$filename",
1123 $digester, $sha256sum ];
1125 die "bad ftpmaster api response: $@\n".Dumper($entry)
1128 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1129 return archive_query_prepend_mirror @rows;
1132 sub file_in_archive_ftpmasterapi {
1133 my ($proto,$data,$filename) = @_;
1134 my $pat = $filename;
1137 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1138 my $info = api_query($data, "file_in_archive/$pat", 1);
1141 sub package_not_wholly_new_ftpmasterapi {
1142 my ($proto,$data,$pkg) = @_;
1143 my $info = api_query($data,"madison?package=${pkg}&f=json");
1147 #---------- `aptget' archive query method ----------
1150 our $aptget_releasefile;
1151 our $aptget_configpath;
1153 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1154 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1156 sub aptget_cache_clean {
1157 runcmd_ordryrun_local qw(sh -ec),
1158 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1162 sub aptget_lock_acquire () {
1163 my $lockfile = "$aptget_base/lock";
1164 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1165 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1168 sub aptget_prep ($) {
1170 return if defined $aptget_base;
1172 badcfg "aptget archive query method takes no data part"
1175 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1178 ensuredir "$cache/dgit";
1180 access_cfg('aptget-cachekey','RETURN-UNDEF')
1181 // access_nomdistro();
1183 $aptget_base = "$cache/dgit/aptget";
1184 ensuredir $aptget_base;
1186 my $quoted_base = $aptget_base;
1187 die "$quoted_base contains bad chars, cannot continue"
1188 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1190 ensuredir $aptget_base;
1192 aptget_lock_acquire();
1194 aptget_cache_clean();
1196 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1197 my $sourceslist = "source.list#$cachekey";
1199 my $aptsuites = $isuite;
1200 cfg_apply_map(\$aptsuites, 'suite map',
1201 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1203 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1204 printf SRCS "deb-src %s %s %s\n",
1205 access_cfg('mirror'),
1207 access_cfg('aptget-components')
1210 ensuredir "$aptget_base/cache";
1211 ensuredir "$aptget_base/lists";
1213 open CONF, ">", $aptget_configpath or die $!;
1215 Debug::NoLocking "true";
1216 APT::Get::List-Cleanup "false";
1217 #clear APT::Update::Post-Invoke-Success;
1218 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1219 Dir::State::Lists "$quoted_base/lists";
1220 Dir::Etc::preferences "$quoted_base/preferences";
1221 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1222 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1225 foreach my $key (qw(
1228 Dir::Cache::Archives
1229 Dir::Etc::SourceParts
1230 Dir::Etc::preferencesparts
1232 ensuredir "$aptget_base/$key";
1233 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1236 my $oldatime = (time // die $!) - 1;
1237 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1238 next unless stat_exists $oldlist;
1239 my ($mtime) = (stat _)[9];
1240 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1243 runcmd_ordryrun_local aptget_aptget(), qw(update);
1246 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1247 next unless stat_exists $oldlist;
1248 my ($atime) = (stat _)[8];
1249 next if $atime == $oldatime;
1250 push @releasefiles, $oldlist;
1252 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1253 @releasefiles = @inreleasefiles if @inreleasefiles;
1254 if (!@releasefiles) {
1256 apt seemed to not to update dgit's cached Release files for $isuite.
1258 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1261 die "apt updated too many Release files (@releasefiles), erk"
1262 unless @releasefiles == 1;
1264 ($aptget_releasefile) = @releasefiles;
1267 sub canonicalise_suite_aptget {
1268 my ($proto,$data) = @_;
1271 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1273 foreach my $name (qw(Codename Suite)) {
1274 my $val = $release->{$name};
1276 printdebug "release file $name: $val\n";
1277 $val =~ m/^$suite_re$/o or fail
1278 "Release file ($aptget_releasefile) specifies intolerable $name";
1279 cfg_apply_map(\$val, 'suite rmap',
1280 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1287 sub archive_query_aptget {
1288 my ($proto,$data) = @_;
1291 ensuredir "$aptget_base/source";
1292 foreach my $old (<$aptget_base/source/*.dsc>) {
1293 unlink $old or die "$old: $!";
1296 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1297 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1298 # avoids apt-get source failing with ambiguous error code
1300 runcmd_ordryrun_local
1301 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1302 aptget_aptget(), qw(--download-only --only-source source), $package;
1304 my @dscs = <$aptget_base/source/*.dsc>;
1305 fail "apt-get source did not produce a .dsc" unless @dscs;
1306 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1308 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1311 my $uri = "file://". uri_escape $dscs[0];
1312 $uri =~ s{\%2f}{/}gi;
1313 return [ (getfield $pre_dsc, 'Version'), $uri ];
1316 sub file_in_archive_aptget () { return undef; }
1317 sub package_not_wholly_new_aptget () { return undef; }
1319 #---------- `dummyapicat' archive query method ----------
1321 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1322 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1324 sub dummycatapi_run_in_mirror ($@) {
1325 # runs $fn with FIA open onto rune
1326 my ($rune, $argl, $fn) = @_;
1328 my $mirror = access_cfg('mirror');
1329 $mirror =~ s#^file://#/# or die "$mirror ?";
1330 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1331 qw(x), $mirror, @$argl);
1332 debugcmd "-|", @cmd;
1333 open FIA, "-|", @cmd or die $!;
1335 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1339 sub file_in_archive_dummycatapi ($$$) {
1340 my ($proto,$data,$filename) = @_;
1342 dummycatapi_run_in_mirror '
1343 find -name "$1" -print0 |
1345 ', [$filename], sub {
1348 printdebug "| $_\n";
1349 m/^(\w+) (\S+)$/ or die "$_ ?";
1350 push @out, { sha256sum => $1, filename => $2 };
1356 sub package_not_wholly_new_dummycatapi {
1357 my ($proto,$data,$pkg) = @_;
1358 dummycatapi_run_in_mirror "
1359 find -name ${pkg}_*.dsc
1366 #---------- `madison' archive query method ----------
1368 sub archive_query_madison {
1369 return archive_query_prepend_mirror
1370 map { [ @$_[0..1] ] } madison_get_parse(@_);
1373 sub madison_get_parse {
1374 my ($proto,$data) = @_;
1375 die unless $proto eq 'madison';
1376 if (!length $data) {
1377 $data= access_cfg('madison-distro','RETURN-UNDEF');
1378 $data //= access_basedistro();
1380 $rmad{$proto,$data,$package} ||= cmdoutput
1381 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1382 my $rmad = $rmad{$proto,$data,$package};
1385 foreach my $l (split /\n/, $rmad) {
1386 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1387 \s*( [^ \t|]+ )\s* \|
1388 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1389 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1390 $1 eq $package or die "$rmad $package ?";
1397 $component = access_cfg('archive-query-default-component');
1399 $5 eq 'source' or die "$rmad ?";
1400 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1402 return sort { -version_compare($a->[0],$b->[0]); } @out;
1405 sub canonicalise_suite_madison {
1406 # madison canonicalises for us
1407 my @r = madison_get_parse(@_);
1409 "unable to canonicalise suite using package $package".
1410 " which does not appear to exist in suite $isuite;".
1411 " --existing-package may help";
1415 sub file_in_archive_madison { return undef; }
1416 sub package_not_wholly_new_madison { return undef; }
1418 #---------- `sshpsql' archive query method ----------
1421 my ($data,$runeinfo,$sql) = @_;
1422 if (!length $data) {
1423 $data= access_someuserhost('sshpsql').':'.
1424 access_cfg('sshpsql-dbname');
1426 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1427 my ($userhost,$dbname) = ($`,$'); #';
1429 my @cmd = (access_cfg_ssh, $userhost,
1430 access_runeinfo("ssh-psql $runeinfo").
1431 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1432 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1434 open P, "-|", @cmd or die $!;
1437 printdebug(">|$_|\n");
1440 $!=0; $?=0; close P or failedcmd @cmd;
1442 my $nrows = pop @rows;
1443 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1444 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1445 @rows = map { [ split /\|/, $_ ] } @rows;
1446 my $ncols = scalar @{ shift @rows };
1447 die if grep { scalar @$_ != $ncols } @rows;
1451 sub sql_injection_check {
1452 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1455 sub archive_query_sshpsql ($$) {
1456 my ($proto,$data) = @_;
1457 sql_injection_check $isuite, $package;
1458 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1459 SELECT source.version, component.name, files.filename, files.sha256sum
1461 JOIN src_associations ON source.id = src_associations.source
1462 JOIN suite ON suite.id = src_associations.suite
1463 JOIN dsc_files ON dsc_files.source = source.id
1464 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1465 JOIN component ON component.id = files_archive_map.component_id
1466 JOIN files ON files.id = dsc_files.file
1467 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1468 AND source.source='$package'
1469 AND files.filename LIKE '%.dsc';
1471 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1472 my $digester = Digest::SHA->new(256);
1474 my ($vsn,$component,$filename,$sha256sum) = @$_;
1475 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1477 return archive_query_prepend_mirror @rows;
1480 sub canonicalise_suite_sshpsql ($$) {
1481 my ($proto,$data) = @_;
1482 sql_injection_check $isuite;
1483 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1484 SELECT suite.codename
1485 FROM suite where suite_name='$isuite' or codename='$isuite';
1487 @rows = map { $_->[0] } @rows;
1488 fail "unknown suite $isuite" unless @rows;
1489 die "ambiguous $isuite: @rows ?" if @rows>1;
1493 sub file_in_archive_sshpsql ($$$) { return undef; }
1494 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1496 #---------- `dummycat' archive query method ----------
1498 sub canonicalise_suite_dummycat ($$) {
1499 my ($proto,$data) = @_;
1500 my $dpath = "$data/suite.$isuite";
1501 if (!open C, "<", $dpath) {
1502 $!==ENOENT or die "$dpath: $!";
1503 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1507 chomp or die "$dpath: $!";
1509 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1513 sub archive_query_dummycat ($$) {
1514 my ($proto,$data) = @_;
1515 canonicalise_suite();
1516 my $dpath = "$data/package.$csuite.$package";
1517 if (!open C, "<", $dpath) {
1518 $!==ENOENT or die "$dpath: $!";
1519 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1527 printdebug "dummycat query $csuite $package $dpath | $_\n";
1528 my @row = split /\s+/, $_;
1529 @row==2 or die "$dpath: $_ ?";
1532 C->error and die "$dpath: $!";
1534 return archive_query_prepend_mirror
1535 sort { -version_compare($a->[0],$b->[0]); } @rows;
1538 sub file_in_archive_dummycat () { return undef; }
1539 sub package_not_wholly_new_dummycat () { return undef; }
1541 #---------- tag format handling ----------
1543 sub access_cfg_tagformats () {
1544 split /\,/, access_cfg('dgit-tag-format');
1547 sub access_cfg_tagformats_can_splitbrain () {
1548 my %y = map { $_ => 1 } access_cfg_tagformats;
1549 foreach my $needtf (qw(new maint)) {
1550 next if $y{$needtf};
1556 sub need_tagformat ($$) {
1557 my ($fmt, $why) = @_;
1558 fail "need to use tag format $fmt ($why) but also need".
1559 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1560 " - no way to proceed"
1561 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1562 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1565 sub select_tagformat () {
1567 return if $tagformatfn && !$tagformat_want;
1568 die 'bug' if $tagformatfn && $tagformat_want;
1569 # ... $tagformat_want assigned after previous select_tagformat
1571 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1572 printdebug "select_tagformat supported @supported\n";
1574 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1575 printdebug "select_tagformat specified @$tagformat_want\n";
1577 my ($fmt,$why,$override) = @$tagformat_want;
1579 fail "target distro supports tag formats @supported".
1580 " but have to use $fmt ($why)"
1582 or grep { $_ eq $fmt } @supported;
1584 $tagformat_want = undef;
1586 $tagformatfn = ${*::}{"debiantag_$fmt"};
1588 fail "trying to use unknown tag format \`$fmt' ($why) !"
1589 unless $tagformatfn;
1592 #---------- archive query entrypoints and rest of program ----------
1594 sub canonicalise_suite () {
1595 return if defined $csuite;
1596 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1597 $csuite = archive_query('canonicalise_suite');
1598 if ($isuite ne $csuite) {
1599 progress "canonical suite name for $isuite is $csuite";
1601 progress "canonical suite name is $csuite";
1605 sub get_archive_dsc () {
1606 canonicalise_suite();
1607 my @vsns = archive_query('archive_query');
1608 foreach my $vinfo (@vsns) {
1609 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1610 $dscurl = $vsn_dscurl;
1611 $dscdata = url_get($dscurl);
1613 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1618 $digester->add($dscdata);
1619 my $got = $digester->hexdigest();
1621 fail "$dscurl has hash $got but".
1622 " archive told us to expect $digest";
1625 my $fmt = getfield $dsc, 'Format';
1626 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1627 "unsupported source format $fmt, sorry";
1629 $dsc_checked = !!$digester;
1630 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1634 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1637 sub check_for_git ();
1638 sub check_for_git () {
1640 my $how = access_cfg('git-check');
1641 if ($how eq 'ssh-cmd') {
1643 (access_cfg_ssh, access_gituserhost(),
1644 access_runeinfo("git-check $package").
1645 " set -e; cd ".access_cfg('git-path').";".
1646 " if test -d $package.git; then echo 1; else echo 0; fi");
1647 my $r= cmdoutput @cmd;
1648 if (defined $r and $r =~ m/^divert (\w+)$/) {
1650 my ($usedistro,) = access_distros();
1651 # NB that if we are pushing, $usedistro will be $distro/push
1652 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1653 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1654 progress "diverting to $divert (using config for $instead_distro)";
1655 return check_for_git();
1657 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1659 } elsif ($how eq 'url') {
1660 my $prefix = access_cfg('git-check-url','git-url');
1661 my $suffix = access_cfg('git-check-suffix','git-suffix',
1662 'RETURN-UNDEF') // '.git';
1663 my $url = "$prefix/$package$suffix";
1664 my @cmd = (@curl, qw(-sS -I), $url);
1665 my $result = cmdoutput @cmd;
1666 $result =~ s/^\S+ 200 .*\n\r?\n//;
1667 # curl -sS -I with https_proxy prints
1668 # HTTP/1.0 200 Connection established
1669 $result =~ m/^\S+ (404|200) /s or
1670 fail "unexpected results from git check query - ".
1671 Dumper($prefix, $result);
1673 if ($code eq '404') {
1675 } elsif ($code eq '200') {
1680 } elsif ($how eq 'true') {
1682 } elsif ($how eq 'false') {
1685 badcfg "unknown git-check \`$how'";
1689 sub create_remote_git_repo () {
1690 my $how = access_cfg('git-create');
1691 if ($how eq 'ssh-cmd') {
1693 (access_cfg_ssh, access_gituserhost(),
1694 access_runeinfo("git-create $package").
1695 "set -e; cd ".access_cfg('git-path').";".
1696 " cp -a _template $package.git");
1697 } elsif ($how eq 'true') {
1700 badcfg "unknown git-create \`$how'";
1704 our ($dsc_hash,$lastpush_mergeinput);
1705 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1709 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1710 $playground = fresh_playground 'dgit/unpack';
1713 sub mktree_in_ud_here () {
1714 playtree_setup $gitcfgs{local};
1717 sub git_write_tree () {
1718 my $tree = cmdoutput @git, qw(write-tree);
1719 $tree =~ m/^\w+$/ or die "$tree ?";
1723 sub git_add_write_tree () {
1724 runcmd @git, qw(add -Af .);
1725 return git_write_tree();
1728 sub remove_stray_gits ($) {
1730 my @gitscmd = qw(find -name .git -prune -print0);
1731 debugcmd "|",@gitscmd;
1732 open GITS, "-|", @gitscmd or die $!;
1737 print STDERR "$us: warning: removing from $what: ",
1738 (messagequote $_), "\n";
1742 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1745 sub mktree_in_ud_from_only_subdir ($;$) {
1746 my ($what,$raw) = @_;
1747 # changes into the subdir
1750 die "expected one subdir but found @dirs ?" unless @dirs==1;
1751 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1755 remove_stray_gits($what);
1756 mktree_in_ud_here();
1758 my ($format, $fopts) = get_source_format();
1759 if (madformat($format)) {
1764 my $tree=git_add_write_tree();
1765 return ($tree,$dir);
1768 our @files_csum_info_fields =
1769 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1770 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1771 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1773 sub dsc_files_info () {
1774 foreach my $csumi (@files_csum_info_fields) {
1775 my ($fname, $module, $method) = @$csumi;
1776 my $field = $dsc->{$fname};
1777 next unless defined $field;
1778 eval "use $module; 1;" or die $@;
1780 foreach (split /\n/, $field) {
1782 m/^(\w+) (\d+) (\S+)$/ or
1783 fail "could not parse .dsc $fname line \`$_'";
1784 my $digester = eval "$module"."->$method;" or die $@;
1789 Digester => $digester,
1794 fail "missing any supported Checksums-* or Files field in ".
1795 $dsc->get_option('name');
1799 map { $_->{Filename} } dsc_files_info();
1802 sub files_compare_inputs (@) {
1807 my $showinputs = sub {
1808 return join "; ", map { $_->get_option('name') } @$inputs;
1811 foreach my $in (@$inputs) {
1813 my $in_name = $in->get_option('name');
1815 printdebug "files_compare_inputs $in_name\n";
1817 foreach my $csumi (@files_csum_info_fields) {
1818 my ($fname) = @$csumi;
1819 printdebug "files_compare_inputs $in_name $fname\n";
1821 my $field = $in->{$fname};
1822 next unless defined $field;
1825 foreach (split /\n/, $field) {
1828 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1829 fail "could not parse $in_name $fname line \`$_'";
1831 printdebug "files_compare_inputs $in_name $fname $f\n";
1835 my $re = \ $record{$f}{$fname};
1837 $fchecked{$f}{$in_name} = 1;
1839 fail "hash or size of $f varies in $fname fields".
1840 " (between: ".$showinputs->().")";
1845 @files = sort @files;
1846 $expected_files //= \@files;
1847 "@$expected_files" eq "@files" or
1848 fail "file list in $in_name varies between hash fields!";
1851 fail "$in_name has no files list field(s)";
1853 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1856 grep { keys %$_ == @$inputs-1 } values %fchecked
1857 or fail "no file appears in all file lists".
1858 " (looked in: ".$showinputs->().")";
1861 sub is_orig_file_in_dsc ($$) {
1862 my ($f, $dsc_files_info) = @_;
1863 return 0 if @$dsc_files_info <= 1;
1864 # One file means no origs, and the filename doesn't have a "what
1865 # part of dsc" component. (Consider versions ending `.orig'.)
1866 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1870 sub is_orig_file_of_vsn ($$) {
1871 my ($f, $upstreamvsn) = @_;
1872 my $base = srcfn $upstreamvsn, '';
1873 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1877 # This function determines whether a .changes file is source-only from
1878 # the point of view of dak. Thus, it permits *_source.buildinfo
1881 # It does not, however, permit any other buildinfo files. After a
1882 # source-only upload, the buildds will try to upload files like
1883 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1884 # named like this in their (otherwise) source-only upload, the uploads
1885 # of the buildd can be rejected by dak. Fixing the resultant
1886 # situation can require manual intervention. So we block such
1887 # .buildinfo files when the user tells us to perform a source-only
1888 # upload (such as when using the push-source subcommand with the -C
1889 # option, which calls this function).
1891 # Note, though, that when dgit is told to prepare a source-only
1892 # upload, such as when subcommands like build-source and push-source
1893 # without -C are used, dgit has a more restrictive notion of
1894 # source-only .changes than dak: such uploads will never include
1895 # *_source.buildinfo files. This is because there is no use for such
1896 # files when using a tool like dgit to produce the source package, as
1897 # dgit ensures the source is identical to git HEAD.
1898 sub test_source_only_changes ($) {
1900 foreach my $l (split /\n/, getfield $changes, 'Files') {
1901 $l =~ m/\S+$/ or next;
1902 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1903 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1904 print "purportedly source-only changes polluted by $&\n";
1911 sub changes_update_origs_from_dsc ($$$$) {
1912 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1914 printdebug "checking origs needed ($upstreamvsn)...\n";
1915 $_ = getfield $changes, 'Files';
1916 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1917 fail "cannot find section/priority from .changes Files field";
1918 my $placementinfo = $1;
1920 printdebug "checking origs needed placement '$placementinfo'...\n";
1921 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1922 $l =~ m/\S+$/ or next;
1924 printdebug "origs $file | $l\n";
1925 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1926 printdebug "origs $file is_orig\n";
1927 my $have = archive_query('file_in_archive', $file);
1928 if (!defined $have) {
1930 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1936 printdebug "origs $file \$#\$have=$#$have\n";
1937 foreach my $h (@$have) {
1940 foreach my $csumi (@files_csum_info_fields) {
1941 my ($fname, $module, $method, $archivefield) = @$csumi;
1942 next unless defined $h->{$archivefield};
1943 $_ = $dsc->{$fname};
1944 next unless defined;
1945 m/^(\w+) .* \Q$file\E$/m or
1946 fail ".dsc $fname missing entry for $file";
1947 if ($h->{$archivefield} eq $1) {
1951 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1954 die "$file ".Dumper($h)." ?!" if $same && @differ;
1957 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1960 printdebug "origs $file f.same=$found_same".
1961 " #f._differ=$#found_differ\n";
1962 if (@found_differ && !$found_same) {
1964 "archive contains $file with different checksum",
1967 # Now we edit the changes file to add or remove it
1968 foreach my $csumi (@files_csum_info_fields) {
1969 my ($fname, $module, $method, $archivefield) = @$csumi;
1970 next unless defined $changes->{$fname};
1972 # in archive, delete from .changes if it's there
1973 $changed{$file} = "removed" if
1974 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
1975 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
1976 # not in archive, but it's here in the .changes
1978 my $dsc_data = getfield $dsc, $fname;
1979 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
1981 $extra =~ s/ \d+ /$&$placementinfo /
1982 or die "$fname $extra >$dsc_data< ?"
1983 if $fname eq 'Files';
1984 $changes->{$fname} .= "\n". $extra;
1985 $changed{$file} = "added";
1990 foreach my $file (keys %changed) {
1992 "edited .changes for archive .orig contents: %s %s",
1993 $changed{$file}, $file;
1995 my $chtmp = "$changesfile.tmp";
1996 $changes->save($chtmp);
1998 rename $chtmp,$changesfile or die "$changesfile $!";
2000 progress "[new .changes left in $changesfile]";
2003 progress "$changesfile already has appropriate .orig(s) (if any)";
2007 sub make_commit ($) {
2009 return cmdoutput @git, qw(hash-object -w -t commit), $file;
2012 sub make_commit_text ($) {
2015 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
2017 print Dumper($text) if $debuglevel > 1;
2018 my $child = open2($out, $in, @cmd) or die $!;
2021 print $in $text or die $!;
2022 close $in or die $!;
2024 $h =~ m/^\w+$/ or die;
2026 printdebug "=> $h\n";
2029 waitpid $child, 0 == $child or die "$child $!";
2030 $? and failedcmd @cmd;
2034 sub clogp_authline ($) {
2036 my $author = getfield $clogp, 'Maintainer';
2037 if ($author =~ m/^[^"\@]+\,/) {
2038 # single entry Maintainer field with unquoted comma
2039 $author = ($& =~ y/,//rd).$'; # strip the comma
2041 # git wants a single author; any remaining commas in $author
2042 # are by now preceded by @ (or "). It seems safer to punt on
2043 # "..." for now rather than attempting to dequote or something.
2044 $author =~ s#,.*##ms unless $author =~ m/"/;
2045 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2046 my $authline = "$author $date";
2047 $authline =~ m/$git_authline_re/o or
2048 fail "unexpected commit author line format \`$authline'".
2049 " (was generated from changelog Maintainer field)";
2050 return ($1,$2,$3) if wantarray;
2054 sub vendor_patches_distro ($$) {
2055 my ($checkdistro, $what) = @_;
2056 return unless defined $checkdistro;
2058 my $series = "debian/patches/\L$checkdistro\E.series";
2059 printdebug "checking for vendor-specific $series ($what)\n";
2061 if (!open SERIES, "<", $series) {
2062 die "$series $!" unless $!==ENOENT;
2071 Unfortunately, this source package uses a feature of dpkg-source where
2072 the same source package unpacks to different source code on different
2073 distros. dgit cannot safely operate on such packages on affected
2074 distros, because the meaning of source packages is not stable.
2076 Please ask the distro/maintainer to remove the distro-specific series
2077 files and use a different technique (if necessary, uploading actually
2078 different packages, if different distros are supposed to have
2082 fail "Found active distro-specific series file for".
2083 " $checkdistro ($what): $series, cannot continue";
2085 die "$series $!" if SERIES->error;
2089 sub check_for_vendor_patches () {
2090 # This dpkg-source feature doesn't seem to be documented anywhere!
2091 # But it can be found in the changelog (reformatted):
2093 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2094 # Author: Raphael Hertzog <hertzog@debian.org>
2095 # Date: Sun Oct 3 09:36:48 2010 +0200
2097 # dpkg-source: correctly create .pc/.quilt_series with alternate
2100 # If you have debian/patches/ubuntu.series and you were
2101 # unpacking the source package on ubuntu, quilt was still
2102 # directed to debian/patches/series instead of
2103 # debian/patches/ubuntu.series.
2105 # debian/changelog | 3 +++
2106 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2107 # 2 files changed, 6 insertions(+), 1 deletion(-)
2110 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2111 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2112 "Dpkg::Vendor \`current vendor'");
2113 vendor_patches_distro(access_basedistro(),
2114 "(base) distro being accessed");
2115 vendor_patches_distro(access_nomdistro(),
2116 "(nominal) distro being accessed");
2119 sub generate_commits_from_dsc () {
2120 # See big comment in fetch_from_archive, below.
2121 # See also README.dsc-import.
2123 changedir $playground;
2125 my @dfi = dsc_files_info();
2126 foreach my $fi (@dfi) {
2127 my $f = $fi->{Filename};
2128 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2129 my $upper_f = (bpd_abs()."/$f");
2131 printdebug "considering reusing $f: ";
2133 if (link_ltarget "$upper_f,fetch", $f) {
2134 printdebug "linked (using ...,fetch).\n";
2135 } elsif ((printdebug "($!) "),
2137 fail "accessing $buildproductsdir/$f,fetch: $!";
2138 } elsif (link_ltarget $upper_f, $f) {
2139 printdebug "linked.\n";
2140 } elsif ((printdebug "($!) "),
2142 fail "accessing $buildproductsdir/$f: $!";
2144 printdebug "absent.\n";
2148 complete_file_from_dsc('.', $fi, \$refetched)
2151 printdebug "considering saving $f: ";
2153 if (link $f, $upper_f) {
2154 printdebug "linked.\n";
2155 } elsif ((printdebug "($!) "),
2157 fail "saving $buildproductsdir/$f: $!";
2158 } elsif (!$refetched) {
2159 printdebug "no need.\n";
2160 } elsif (link $f, "$upper_f,fetch") {
2161 printdebug "linked (using ...,fetch).\n";
2162 } elsif ((printdebug "($!) "),
2164 fail "saving $buildproductsdir/$f,fetch: $!";
2166 printdebug "cannot.\n";
2170 # We unpack and record the orig tarballs first, so that we only
2171 # need disk space for one private copy of the unpacked source.
2172 # But we can't make them into commits until we have the metadata
2173 # from the debian/changelog, so we record the tree objects now and
2174 # make them into commits later.
2176 my $upstreamv = upstreamversion $dsc->{version};
2177 my $orig_f_base = srcfn $upstreamv, '';
2179 foreach my $fi (@dfi) {
2180 # We actually import, and record as a commit, every tarball
2181 # (unless there is only one file, in which case there seems
2184 my $f = $fi->{Filename};
2185 printdebug "import considering $f ";
2186 (printdebug "only one dfi\n"), next if @dfi == 1;
2187 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2188 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2192 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2194 printdebug "Y ", (join ' ', map { $_//"(none)" }
2195 $compr_ext, $orig_f_part
2198 my $input = new IO::File $f, '<' or die "$f $!";
2202 if (defined $compr_ext) {
2204 Dpkg::Compression::compression_guess_from_filename $f;
2205 fail "Dpkg::Compression cannot handle file $f in source package"
2206 if defined $compr_ext && !defined $cname;
2208 new Dpkg::Compression::Process compression => $cname;
2209 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2210 my $compr_fh = new IO::Handle;
2211 my $compr_pid = open $compr_fh, "-|" // die $!;
2213 open STDIN, "<&", $input or die $!;
2215 die "dgit (child): exec $compr_cmd[0]: $!\n";
2220 rmtree "_unpack-tar";
2221 mkdir "_unpack-tar" or die $!;
2222 my @tarcmd = qw(tar -x -f -
2223 --no-same-owner --no-same-permissions
2224 --no-acls --no-xattrs --no-selinux);
2225 my $tar_pid = fork // die $!;
2227 chdir "_unpack-tar" or die $!;
2228 open STDIN, "<&", $input or die $!;
2230 die "dgit (child): exec $tarcmd[0]: $!";
2232 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2233 !$? or failedcmd @tarcmd;
2236 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2238 # finally, we have the results in "tarball", but maybe
2239 # with the wrong permissions
2241 runcmd qw(chmod -R +rwX _unpack-tar);
2242 changedir "_unpack-tar";
2243 remove_stray_gits($f);
2244 mktree_in_ud_here();
2246 my ($tree) = git_add_write_tree();
2247 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2248 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2250 printdebug "one subtree $1\n";
2252 printdebug "multiple subtrees\n";
2255 rmtree "_unpack-tar";
2257 my $ent = [ $f, $tree ];
2259 Orig => !!$orig_f_part,
2260 Sort => (!$orig_f_part ? 2 :
2261 $orig_f_part =~ m/-/g ? 1 :
2269 # put any without "_" first (spec is not clear whether files
2270 # are always in the usual order). Tarballs without "_" are
2271 # the main orig or the debian tarball.
2272 $a->{Sort} <=> $b->{Sort} or
2276 my $any_orig = grep { $_->{Orig} } @tartrees;
2278 my $dscfn = "$package.dsc";
2280 my $treeimporthow = 'package';
2282 open D, ">", $dscfn or die "$dscfn: $!";
2283 print D $dscdata or die "$dscfn: $!";
2284 close D or die "$dscfn: $!";
2285 my @cmd = qw(dpkg-source);
2286 push @cmd, '--no-check' if $dsc_checked;
2287 if (madformat $dsc->{format}) {
2288 push @cmd, '--skip-patches';
2289 $treeimporthow = 'unpatched';
2291 push @cmd, qw(-x --), $dscfn;
2294 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2295 if (madformat $dsc->{format}) {
2296 check_for_vendor_patches();
2300 if (madformat $dsc->{format}) {
2301 my @pcmd = qw(dpkg-source --before-build .);
2302 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2304 $dappliedtree = git_add_write_tree();
2307 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2311 printdebug "import clog search...\n";
2312 parsechangelog_loop \@clogcmd, "package changelog", sub {
2313 my ($thisstanza, $desc) = @_;
2314 no warnings qw(exiting);
2316 $clogp //= $thisstanza;
2318 printdebug "import clog $thisstanza->{version} $desc...\n";
2320 last if !$any_orig; # we don't need $r1clogp
2322 # We look for the first (most recent) changelog entry whose
2323 # version number is lower than the upstream version of this
2324 # package. Then the last (least recent) previous changelog
2325 # entry is treated as the one which introduced this upstream
2326 # version and used for the synthetic commits for the upstream
2329 # One might think that a more sophisticated algorithm would be
2330 # necessary. But: we do not want to scan the whole changelog
2331 # file. Stopping when we see an earlier version, which
2332 # necessarily then is an earlier upstream version, is the only
2333 # realistic way to do that. Then, either the earliest
2334 # changelog entry we have seen so far is indeed the earliest
2335 # upload of this upstream version; or there are only changelog
2336 # entries relating to later upstream versions (which is not
2337 # possible unless the changelog and .dsc disagree about the
2338 # version). Then it remains to choose between the physically
2339 # last entry in the file, and the one with the lowest version
2340 # number. If these are not the same, we guess that the
2341 # versions were created in a non-monotonic order rather than
2342 # that the changelog entries have been misordered.
2344 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2346 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2347 $r1clogp = $thisstanza;
2349 printdebug "import clog $r1clogp->{version} becomes r1\n";
2352 $clogp or fail "package changelog has no entries!";
2354 my $authline = clogp_authline $clogp;
2355 my $changes = getfield $clogp, 'Changes';
2356 $changes =~ s/^\n//; # Changes: \n
2357 my $cversion = getfield $clogp, 'Version';
2360 $r1clogp //= $clogp; # maybe there's only one entry;
2361 my $r1authline = clogp_authline $r1clogp;
2362 # Strictly, r1authline might now be wrong if it's going to be
2363 # unused because !$any_orig. Whatever.
2365 printdebug "import tartrees authline $authline\n";
2366 printdebug "import tartrees r1authline $r1authline\n";
2368 foreach my $tt (@tartrees) {
2369 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2371 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2374 committer $r1authline
2378 [dgit import orig $tt->{F}]
2386 [dgit import tarball $package $cversion $tt->{F}]
2391 printdebug "import main commit\n";
2393 open C, ">../commit.tmp" or die $!;
2394 print C <<END or die $!;
2397 print C <<END or die $! foreach @tartrees;
2400 print C <<END or die $!;
2406 [dgit import $treeimporthow $package $cversion]
2410 my $rawimport_hash = make_commit qw(../commit.tmp);
2412 if (madformat $dsc->{format}) {
2413 printdebug "import apply patches...\n";
2415 # regularise the state of the working tree so that
2416 # the checkout of $rawimport_hash works nicely.
2417 my $dappliedcommit = make_commit_text(<<END);
2424 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2426 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2428 # We need the answers to be reproducible
2429 my @authline = clogp_authline($clogp);
2430 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2431 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2432 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2433 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2434 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2435 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2437 my $path = $ENV{PATH} or die;
2439 # we use ../../gbp-pq-output, which (given that we are in
2440 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2443 foreach my $use_absurd (qw(0 1)) {
2444 runcmd @git, qw(checkout -q unpa);
2445 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2446 local $ENV{PATH} = $path;
2449 progress "warning: $@";
2450 $path = "$absurdity:$path";
2451 progress "$us: trying slow absurd-git-apply...";
2452 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2457 die "forbid absurd git-apply\n" if $use_absurd
2458 && forceing [qw(import-gitapply-no-absurd)];
2459 die "only absurd git-apply!\n" if !$use_absurd
2460 && forceing [qw(import-gitapply-absurd)];
2462 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2463 local $ENV{PATH} = $path if $use_absurd;
2465 my @showcmd = (gbp_pq, qw(import));
2466 my @realcmd = shell_cmd
2467 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2468 debugcmd "+",@realcmd;
2469 if (system @realcmd) {
2470 die +(shellquote @showcmd).
2472 failedcmd_waitstatus()."\n";
2475 my $gapplied = git_rev_parse('HEAD');
2476 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2477 $gappliedtree eq $dappliedtree or
2479 gbp-pq import and dpkg-source disagree!
2480 gbp-pq import gave commit $gapplied
2481 gbp-pq import gave tree $gappliedtree
2482 dpkg-source --before-build gave tree $dappliedtree
2484 $rawimport_hash = $gapplied;
2489 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2494 progress "synthesised git commit from .dsc $cversion";
2496 my $rawimport_mergeinput = {
2497 Commit => $rawimport_hash,
2498 Info => "Import of source package",
2500 my @output = ($rawimport_mergeinput);
2502 if ($lastpush_mergeinput) {
2503 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2504 my $oversion = getfield $oldclogp, 'Version';
2506 version_compare($oversion, $cversion);
2508 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2509 { Message => <<END, ReverseParents => 1 });
2510 Record $package ($cversion) in archive suite $csuite
2512 } elsif ($vcmp > 0) {
2513 print STDERR <<END or die $!;
2515 Version actually in archive: $cversion (older)
2516 Last version pushed with dgit: $oversion (newer or same)
2519 @output = $lastpush_mergeinput;
2521 # Same version. Use what's in the server git branch,
2522 # discarding our own import. (This could happen if the
2523 # server automatically imports all packages into git.)
2524 @output = $lastpush_mergeinput;
2532 sub complete_file_from_dsc ($$;$) {
2533 our ($dstdir, $fi, $refetched) = @_;
2534 # Ensures that we have, in $dstdir, the file $fi, with the correct
2535 # contents. (Downloading it from alongside $dscurl if necessary.)
2536 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2537 # and will set $$refetched=1 if it did so (or tried to).
2539 my $f = $fi->{Filename};
2540 my $tf = "$dstdir/$f";
2544 my $checkhash = sub {
2545 open F, "<", "$tf" or die "$tf: $!";
2546 $fi->{Digester}->reset();
2547 $fi->{Digester}->addfile(*F);
2548 F->error and die $!;
2549 $got = $fi->{Digester}->hexdigest();
2550 return $got eq $fi->{Hash};
2553 if (stat_exists $tf) {
2554 if ($checkhash->()) {
2555 progress "using existing $f";
2559 fail "file $f has hash $got but .dsc".
2560 " demands hash $fi->{Hash} ".
2561 "(perhaps you should delete this file?)";
2563 progress "need to fetch correct version of $f";
2564 unlink $tf or die "$tf $!";
2567 printdebug "$tf does not exist, need to fetch\n";
2571 $furl =~ s{/[^/]+$}{};
2573 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2574 die "$f ?" if $f =~ m#/#;
2575 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2576 return 0 if !act_local();
2579 fail "file $f has hash $got but .dsc".
2580 " demands hash $fi->{Hash} ".
2581 "(got wrong file from archive!)";
2586 sub ensure_we_have_orig () {
2587 my @dfi = dsc_files_info();
2588 foreach my $fi (@dfi) {
2589 my $f = $fi->{Filename};
2590 next unless is_orig_file_in_dsc($f, \@dfi);
2591 complete_file_from_dsc($buildproductsdir, $fi)
2596 #---------- git fetch ----------
2598 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2599 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2601 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2602 # locally fetched refs because they have unhelpful names and clutter
2603 # up gitk etc. So we track whether we have "used up" head ref (ie,
2604 # whether we have made another local ref which refers to this object).
2606 # (If we deleted them unconditionally, then we might end up
2607 # re-fetching the same git objects each time dgit fetch was run.)
2609 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2610 # in git_fetch_us to fetch the refs in question, and possibly a call
2611 # to lrfetchref_used.
2613 our (%lrfetchrefs_f, %lrfetchrefs_d);
2614 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2616 sub lrfetchref_used ($) {
2617 my ($fullrefname) = @_;
2618 my $objid = $lrfetchrefs_f{$fullrefname};
2619 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2622 sub git_lrfetch_sane {
2623 my ($url, $supplementary, @specs) = @_;
2624 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2625 # at least as regards @specs. Also leave the results in
2626 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2627 # able to clean these up.
2629 # With $supplementary==1, @specs must not contain wildcards
2630 # and we add to our previous fetches (non-atomically).
2632 # This is rather miserable:
2633 # When git fetch --prune is passed a fetchspec ending with a *,
2634 # it does a plausible thing. If there is no * then:
2635 # - it matches subpaths too, even if the supplied refspec
2636 # starts refs, and behaves completely madly if the source
2637 # has refs/refs/something. (See, for example, Debian #NNNN.)
2638 # - if there is no matching remote ref, it bombs out the whole
2640 # We want to fetch a fixed ref, and we don't know in advance
2641 # if it exists, so this is not suitable.
2643 # Our workaround is to use git ls-remote. git ls-remote has its
2644 # own qairks. Notably, it has the absurd multi-tail-matching
2645 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2646 # refs/refs/foo etc.
2648 # Also, we want an idempotent snapshot, but we have to make two
2649 # calls to the remote: one to git ls-remote and to git fetch. The
2650 # solution is use git ls-remote to obtain a target state, and
2651 # git fetch to try to generate it. If we don't manage to generate
2652 # the target state, we try again.
2654 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2656 my $specre = join '|', map {
2659 my $wildcard = $x =~ s/\\\*$/.*/;
2660 die if $wildcard && $supplementary;
2663 printdebug "git_lrfetch_sane specre=$specre\n";
2664 my $wanted_rref = sub {
2666 return m/^(?:$specre)$/;
2669 my $fetch_iteration = 0;
2672 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2673 if (++$fetch_iteration > 10) {
2674 fail "too many iterations trying to get sane fetch!";
2677 my @look = map { "refs/$_" } @specs;
2678 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2682 open GITLS, "-|", @lcmd or die $!;
2684 printdebug "=> ", $_;
2685 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2686 my ($objid,$rrefname) = ($1,$2);
2687 if (!$wanted_rref->($rrefname)) {
2689 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2693 $wantr{$rrefname} = $objid;
2696 close GITLS or failedcmd @lcmd;
2698 # OK, now %want is exactly what we want for refs in @specs
2700 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2701 "+refs/$_:".lrfetchrefs."/$_";
2704 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2706 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2707 runcmd_ordryrun_local @fcmd if @fspecs;
2709 if (!$supplementary) {
2710 %lrfetchrefs_f = ();
2714 git_for_each_ref(lrfetchrefs, sub {
2715 my ($objid,$objtype,$lrefname,$reftail) = @_;
2716 $lrfetchrefs_f{$lrefname} = $objid;
2717 $objgot{$objid} = 1;
2720 if ($supplementary) {
2724 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2725 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2726 if (!exists $wantr{$rrefname}) {
2727 if ($wanted_rref->($rrefname)) {
2729 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2733 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2736 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2737 delete $lrfetchrefs_f{$lrefname};
2741 foreach my $rrefname (sort keys %wantr) {
2742 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2743 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2744 my $want = $wantr{$rrefname};
2745 next if $got eq $want;
2746 if (!defined $objgot{$want}) {
2747 fail <<END unless act_local();
2748 --dry-run specified but we actually wanted the results of git fetch,
2749 so this is not going to work. Try running dgit fetch first,
2750 or using --damp-run instead of --dry-run.
2753 warning: git ls-remote suggests we want $lrefname
2754 warning: and it should refer to $want
2755 warning: but git fetch didn't fetch that object to any relevant ref.
2756 warning: This may be due to a race with someone updating the server.
2757 warning: Will try again...
2759 next FETCH_ITERATION;
2762 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2764 runcmd_ordryrun_local @git, qw(update-ref -m),
2765 "dgit fetch git fetch fixup", $lrefname, $want;
2766 $lrfetchrefs_f{$lrefname} = $want;
2771 if (defined $csuite) {
2772 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2773 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2774 my ($objid,$objtype,$lrefname,$reftail) = @_;
2775 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2776 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2780 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2781 Dumper(\%lrfetchrefs_f);
2784 sub git_fetch_us () {
2785 # Want to fetch only what we are going to use, unless
2786 # deliberately-not-ff, in which case we must fetch everything.
2788 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2790 (quiltmode_splitbrain
2791 ? (map { $_->('*',access_nomdistro) }
2792 \&debiantag_new, \&debiantag_maintview)
2793 : debiantags('*',access_nomdistro));
2794 push @specs, server_branch($csuite);
2795 push @specs, $rewritemap;
2796 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2798 my $url = access_giturl();
2799 git_lrfetch_sane $url, 0, @specs;
2802 my @tagpats = debiantags('*',access_nomdistro);
2804 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2805 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2806 printdebug "currently $fullrefname=$objid\n";
2807 $here{$fullrefname} = $objid;
2809 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2810 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2811 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2812 printdebug "offered $lref=$objid\n";
2813 if (!defined $here{$lref}) {
2814 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2815 runcmd_ordryrun_local @upd;
2816 lrfetchref_used $fullrefname;
2817 } elsif ($here{$lref} eq $objid) {
2818 lrfetchref_used $fullrefname;
2821 "Not updating $lref from $here{$lref} to $objid.\n";
2826 #---------- dsc and archive handling ----------
2828 sub mergeinfo_getclogp ($) {
2829 # Ensures thit $mi->{Clogp} exists and returns it
2831 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2834 sub mergeinfo_version ($) {
2835 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2838 sub fetch_from_archive_record_1 ($) {
2840 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
2841 cmdoutput @git, qw(log -n2), $hash;
2842 # ... gives git a chance to complain if our commit is malformed
2845 sub fetch_from_archive_record_2 ($) {
2847 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
2851 dryrun_report @upd_cmd;
2855 sub parse_dsc_field_def_dsc_distro () {
2856 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2857 dgit.default.distro);
2860 sub parse_dsc_field ($$) {
2861 my ($dsc, $what) = @_;
2863 foreach my $field (@ourdscfield) {
2864 $f = $dsc->{$field};
2869 progress "$what: NO git hash";
2870 parse_dsc_field_def_dsc_distro();
2871 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2872 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2873 progress "$what: specified git info ($dsc_distro)";
2874 $dsc_hint_tag = [ $dsc_hint_tag ];
2875 } elsif ($f =~ m/^\w+\s*$/) {
2877 parse_dsc_field_def_dsc_distro();
2878 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2880 progress "$what: specified git hash";
2882 fail "$what: invalid Dgit info";
2886 sub resolve_dsc_field_commit ($$) {
2887 my ($already_distro, $already_mapref) = @_;
2889 return unless defined $dsc_hash;
2892 defined $already_mapref &&
2893 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2894 ? $already_mapref : undef;
2898 my ($what, @fetch) = @_;
2900 local $idistro = $dsc_distro;
2901 my $lrf = lrfetchrefs;
2903 if (!$chase_dsc_distro) {
2905 "not chasing .dsc distro $dsc_distro: not fetching $what";
2910 ".dsc names distro $dsc_distro: fetching $what";
2912 my $url = access_giturl();
2913 if (!defined $url) {
2914 defined $dsc_hint_url or fail <<END;
2915 .dsc Dgit metadata is in context of distro $dsc_distro
2916 for which we have no configured url and .dsc provides no hint
2919 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2920 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2921 parse_cfg_bool "dsc-url-proto-ok", 'false',
2922 cfg("dgit.dsc-url-proto-ok.$proto",
2923 "dgit.default.dsc-url-proto-ok")
2925 .dsc Dgit metadata is in context of distro $dsc_distro
2926 for which we have no configured url;
2927 .dsc provides hinted url with protocol $proto which is unsafe.
2928 (can be overridden by config - consult documentation)
2930 $url = $dsc_hint_url;
2933 git_lrfetch_sane $url, 1, @fetch;
2938 my $rewrite_enable = do {
2939 local $idistro = $dsc_distro;
2940 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2943 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2944 if (!defined $mapref) {
2945 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2946 $mapref = $lrf.'/'.$rewritemap;
2948 my $rewritemapdata = git_cat_file $mapref.':map';
2949 if (defined $rewritemapdata
2950 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2952 "server's git history rewrite map contains a relevant entry!";
2955 if (defined $dsc_hash) {
2956 progress "using rewritten git hash in place of .dsc value";
2958 progress "server data says .dsc hash is to be disregarded";
2963 if (!defined git_cat_file $dsc_hash) {
2964 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2965 my $lrf = $do_fetch->("additional commits", @tags) &&
2966 defined git_cat_file $dsc_hash
2968 .dsc Dgit metadata requires commit $dsc_hash
2969 but we could not obtain that object anywhere.
2971 foreach my $t (@tags) {
2972 my $fullrefname = $lrf.'/'.$t;
2973 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2974 next unless $lrfetchrefs_f{$fullrefname};
2975 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2976 lrfetchref_used $fullrefname;
2981 sub fetch_from_archive () {
2982 ensure_setup_existing_tree();
2984 # Ensures that lrref() is what is actually in the archive, one way
2985 # or another, according to us - ie this client's
2986 # appropritaely-updated archive view. Also returns the commit id.
2987 # If there is nothing in the archive, leaves lrref alone and
2988 # returns undef. git_fetch_us must have already been called.
2992 parse_dsc_field($dsc, 'last upload to archive');
2993 resolve_dsc_field_commit access_basedistro,
2994 lrfetchrefs."/".$rewritemap
2996 progress "no version available from the archive";
2999 # If the archive's .dsc has a Dgit field, there are three
3000 # relevant git commitids we need to choose between and/or merge
3002 # 1. $dsc_hash: the Dgit field from the archive
3003 # 2. $lastpush_hash: the suite branch on the dgit git server
3004 # 3. $lastfetch_hash: our local tracking brach for the suite
3006 # These may all be distinct and need not be in any fast forward
3009 # If the dsc was pushed to this suite, then the server suite
3010 # branch will have been updated; but it might have been pushed to
3011 # a different suite and copied by the archive. Conversely a more
3012 # recent version may have been pushed with dgit but not appeared
3013 # in the archive (yet).
3015 # $lastfetch_hash may be awkward because archive imports
3016 # (particularly, imports of Dgit-less .dscs) are performed only as
3017 # needed on individual clients, so different clients may perform a
3018 # different subset of them - and these imports are only made
3019 # public during push. So $lastfetch_hash may represent a set of
3020 # imports different to a subsequent upload by a different dgit
3023 # Our approach is as follows:
3025 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3026 # descendant of $dsc_hash, then it was pushed by a dgit user who
3027 # had based their work on $dsc_hash, so we should prefer it.
3028 # Otherwise, $dsc_hash was installed into this suite in the
3029 # archive other than by a dgit push, and (necessarily) after the
3030 # last dgit push into that suite (since a dgit push would have
3031 # been descended from the dgit server git branch); thus, in that
3032 # case, we prefer the archive's version (and produce a
3033 # pseudo-merge to overwrite the dgit server git branch).
3035 # (If there is no Dgit field in the archive's .dsc then
3036 # generate_commit_from_dsc uses the version numbers to decide
3037 # whether the suite branch or the archive is newer. If the suite
3038 # branch is newer it ignores the archive's .dsc; otherwise it
3039 # generates an import of the .dsc, and produces a pseudo-merge to
3040 # overwrite the suite branch with the archive contents.)
3042 # The outcome of that part of the algorithm is the `public view',
3043 # and is same for all dgit clients: it does not depend on any
3044 # unpublished history in the local tracking branch.
3046 # As between the public view and the local tracking branch: The
3047 # local tracking branch is only updated by dgit fetch, and
3048 # whenever dgit fetch runs it includes the public view in the
3049 # local tracking branch. Therefore if the public view is not
3050 # descended from the local tracking branch, the local tracking
3051 # branch must contain history which was imported from the archive
3052 # but never pushed; and, its tip is now out of date. So, we make
3053 # a pseudo-merge to overwrite the old imports and stitch the old
3056 # Finally: we do not necessarily reify the public view (as
3057 # described above). This is so that we do not end up stacking two
3058 # pseudo-merges. So what we actually do is figure out the inputs
3059 # to any public view pseudo-merge and put them in @mergeinputs.
3062 # $mergeinputs[]{Commit}
3063 # $mergeinputs[]{Info}
3064 # $mergeinputs[0] is the one whose tree we use
3065 # @mergeinputs is in the order we use in the actual commit)
3068 # $mergeinputs[]{Message} is a commit message to use
3069 # $mergeinputs[]{ReverseParents} if def specifies that parent
3070 # list should be in opposite order
3071 # Such an entry has no Commit or Info. It applies only when found
3072 # in the last entry. (This ugliness is to support making
3073 # identical imports to previous dgit versions.)
3075 my $lastpush_hash = git_get_ref(lrfetchref());
3076 printdebug "previous reference hash=$lastpush_hash\n";
3077 $lastpush_mergeinput = $lastpush_hash && {
3078 Commit => $lastpush_hash,
3079 Info => "dgit suite branch on dgit git server",
3082 my $lastfetch_hash = git_get_ref(lrref());
3083 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3084 my $lastfetch_mergeinput = $lastfetch_hash && {
3085 Commit => $lastfetch_hash,
3086 Info => "dgit client's archive history view",
3089 my $dsc_mergeinput = $dsc_hash && {
3090 Commit => $dsc_hash,
3091 Info => "Dgit field in .dsc from archive",
3095 my $del_lrfetchrefs = sub {
3098 printdebug "del_lrfetchrefs...\n";
3099 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3100 my $objid = $lrfetchrefs_d{$fullrefname};
3101 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3103 $gur ||= new IO::Handle;
3104 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3106 printf $gur "delete %s %s\n", $fullrefname, $objid;
3109 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3113 if (defined $dsc_hash) {
3114 ensure_we_have_orig();
3115 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3116 @mergeinputs = $dsc_mergeinput
3117 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3118 print STDERR <<END or die $!;
3120 Git commit in archive is behind the last version allegedly pushed/uploaded.
3121 Commit referred to by archive: $dsc_hash
3122 Last version pushed with dgit: $lastpush_hash
3125 @mergeinputs = ($lastpush_mergeinput);
3127 # Archive has .dsc which is not a descendant of the last dgit
3128 # push. This can happen if the archive moves .dscs about.
3129 # Just follow its lead.
3130 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3131 progress "archive .dsc names newer git commit";
3132 @mergeinputs = ($dsc_mergeinput);
3134 progress "archive .dsc names other git commit, fixing up";
3135 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3139 @mergeinputs = generate_commits_from_dsc();
3140 # We have just done an import. Now, our import algorithm might
3141 # have been improved. But even so we do not want to generate
3142 # a new different import of the same package. So if the
3143 # version numbers are the same, just use our existing version.
3144 # If the version numbers are different, the archive has changed
3145 # (perhaps, rewound).
3146 if ($lastfetch_mergeinput &&
3147 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3148 (mergeinfo_version $mergeinputs[0]) )) {
3149 @mergeinputs = ($lastfetch_mergeinput);
3151 } elsif ($lastpush_hash) {
3152 # only in git, not in the archive yet
3153 @mergeinputs = ($lastpush_mergeinput);
3154 print STDERR <<END or die $!;
3156 Package not found in the archive, but has allegedly been pushed using dgit.
3160 printdebug "nothing found!\n";
3161 if (defined $skew_warning_vsn) {
3162 print STDERR <<END or die $!;
3164 Warning: relevant archive skew detected.
3165 Archive allegedly contains $skew_warning_vsn
3166 But we were not able to obtain any version from the archive or git.
3170 unshift @end, $del_lrfetchrefs;
3174 if ($lastfetch_hash &&
3176 my $h = $_->{Commit};
3177 $h and is_fast_fwd($lastfetch_hash, $h);
3178 # If true, one of the existing parents of this commit
3179 # is a descendant of the $lastfetch_hash, so we'll
3180 # be ff from that automatically.
3184 push @mergeinputs, $lastfetch_mergeinput;
3187 printdebug "fetch mergeinfos:\n";
3188 foreach my $mi (@mergeinputs) {
3190 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3192 printdebug sprintf " ReverseParents=%d Message=%s",
3193 $mi->{ReverseParents}, $mi->{Message};
3197 my $compat_info= pop @mergeinputs
3198 if $mergeinputs[$#mergeinputs]{Message};
3200 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3203 if (@mergeinputs > 1) {
3205 my $tree_commit = $mergeinputs[0]{Commit};
3207 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3208 $tree =~ m/\n\n/; $tree = $`;
3209 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3212 # We use the changelog author of the package in question the
3213 # author of this pseudo-merge. This is (roughly) correct if
3214 # this commit is simply representing aa non-dgit upload.
3215 # (Roughly because it does not record sponsorship - but we
3216 # don't have sponsorship info because that's in the .changes,
3217 # which isn't in the archivw.)
3219 # But, it might be that we are representing archive history
3220 # updates (including in-archive copies). These are not really
3221 # the responsibility of the person who created the .dsc, but
3222 # there is no-one whose name we should better use. (The
3223 # author of the .dsc-named commit is clearly worse.)
3225 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3226 my $author = clogp_authline $useclogp;
3227 my $cversion = getfield $useclogp, 'Version';
3229 my $mcf = dgit_privdir()."/mergecommit";
3230 open MC, ">", $mcf or die "$mcf $!";
3231 print MC <<END or die $!;
3235 my @parents = grep { $_->{Commit} } @mergeinputs;
3236 @parents = reverse @parents if $compat_info->{ReverseParents};
3237 print MC <<END or die $! foreach @parents;
3241 print MC <<END or die $!;
3247 if (defined $compat_info->{Message}) {
3248 print MC $compat_info->{Message} or die $!;
3250 print MC <<END or die $!;
3251 Record $package ($cversion) in archive suite $csuite
3255 my $message_add_info = sub {
3257 my $mversion = mergeinfo_version $mi;
3258 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3262 $message_add_info->($mergeinputs[0]);
3263 print MC <<END or die $!;
3264 should be treated as descended from
3266 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3270 $hash = make_commit $mcf;
3272 $hash = $mergeinputs[0]{Commit};
3274 printdebug "fetch hash=$hash\n";
3277 my ($lasth, $what) = @_;
3278 return unless $lasth;
3279 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3282 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3284 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3286 fetch_from_archive_record_1($hash);
3288 if (defined $skew_warning_vsn) {
3289 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3290 my $gotclogp = commit_getclogp($hash);
3291 my $got_vsn = getfield $gotclogp, 'Version';
3292 printdebug "SKEW CHECK GOT $got_vsn\n";
3293 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3294 print STDERR <<END or die $!;
3296 Warning: archive skew detected. Using the available version:
3297 Archive allegedly contains $skew_warning_vsn
3298 We were able to obtain only $got_vsn
3304 if ($lastfetch_hash ne $hash) {
3305 fetch_from_archive_record_2($hash);
3308 lrfetchref_used lrfetchref();
3310 check_gitattrs($hash, "fetched source tree");
3312 unshift @end, $del_lrfetchrefs;
3316 sub set_local_git_config ($$) {
3318 runcmd @git, qw(config), $k, $v;
3321 sub setup_mergechangelogs (;$) {
3323 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3325 my $driver = 'dpkg-mergechangelogs';
3326 my $cb = "merge.$driver";
3327 confess unless defined $maindir;
3328 my $attrs = "$maindir_gitcommon/info/attributes";
3329 ensuredir "$maindir_gitcommon/info";
3331 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3332 if (!open ATTRS, "<", $attrs) {
3333 $!==ENOENT or die "$attrs: $!";
3337 next if m{^debian/changelog\s};
3338 print NATTRS $_, "\n" or die $!;
3340 ATTRS->error and die $!;
3343 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3346 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3347 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3349 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3352 sub setup_useremail (;$) {
3354 return unless $always || access_cfg_bool(1, 'setup-useremail');
3357 my ($k, $envvar) = @_;
3358 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3359 return unless defined $v;
3360 set_local_git_config "user.$k", $v;
3363 $setup->('email', 'DEBEMAIL');
3364 $setup->('name', 'DEBFULLNAME');
3367 sub ensure_setup_existing_tree () {
3368 my $k = "remote.$remotename.skipdefaultupdate";
3369 my $c = git_get_config $k;
3370 return if defined $c;
3371 set_local_git_config $k, 'true';
3374 sub open_main_gitattrs () {
3375 confess 'internal error no maindir' unless defined $maindir;
3376 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3378 or die "open $maindir_gitcommon/info/attributes: $!";
3382 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3384 sub is_gitattrs_setup () {
3387 # 1: gitattributes set up and should be left alone
3389 # 0: there is a dgit-defuse-attrs but it needs fixing
3390 # undef: there is none
3391 my $gai = open_main_gitattrs();
3392 return 0 unless $gai;
3394 next unless m{$gitattrs_ourmacro_re};
3395 return 1 if m{\s-working-tree-encoding\s};
3396 printdebug "is_gitattrs_setup: found old macro\n";
3399 $gai->error and die $!;
3400 printdebug "is_gitattrs_setup: found nothing\n";
3404 sub setup_gitattrs (;$) {
3406 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3408 my $already = is_gitattrs_setup();
3411 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3412 not doing further gitattributes setup
3416 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3417 my $af = "$maindir_gitcommon/info/attributes";
3418 ensuredir "$maindir_gitcommon/info";
3420 open GAO, "> $af.new" or die $!;
3421 print GAO <<END or die $! unless defined $already;
3424 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3426 my $gai = open_main_gitattrs();
3429 if (m{$gitattrs_ourmacro_re}) {
3430 die unless defined $already;
3434 print GAO $_, "\n" or die $!;
3436 $gai->error and die $!;
3438 close GAO or die $!;
3439 rename "$af.new", "$af" or die "install $af: $!";
3442 sub setup_new_tree () {
3443 setup_mergechangelogs();
3448 sub check_gitattrs ($$) {
3449 my ($treeish, $what) = @_;
3451 return if is_gitattrs_setup;
3454 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3456 my $gafl = new IO::File;
3457 open $gafl, "-|", @cmd or die $!;
3460 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3462 next unless m{(?:^|/)\.gitattributes$};
3464 # oh dear, found one
3466 dgit: warning: $what contains .gitattributes
3467 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3472 # tree contains no .gitattributes files
3473 $?=0; $!=0; close $gafl or failedcmd @cmd;
3477 sub multisuite_suite_child ($$$) {
3478 my ($tsuite, $merginputs, $fn) = @_;
3479 # in child, sets things up, calls $fn->(), and returns undef
3480 # in parent, returns canonical suite name for $tsuite
3481 my $canonsuitefh = IO::File::new_tmpfile;
3482 my $pid = fork // die $!;
3486 $us .= " [$isuite]";
3487 $debugprefix .= " ";
3488 progress "fetching $tsuite...";
3489 canonicalise_suite();
3490 print $canonsuitefh $csuite, "\n" or die $!;
3491 close $canonsuitefh or die $!;
3495 waitpid $pid,0 == $pid or die $!;
3496 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3497 seek $canonsuitefh,0,0 or die $!;
3498 local $csuite = <$canonsuitefh>;
3499 die $! unless defined $csuite && chomp $csuite;
3501 printdebug "multisuite $tsuite missing\n";
3504 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3505 push @$merginputs, {
3512 sub fork_for_multisuite ($) {
3513 my ($before_fetch_merge) = @_;
3514 # if nothing unusual, just returns ''
3517 # returns 0 to caller in child, to do first of the specified suites
3518 # in child, $csuite is not yet set
3520 # returns 1 to caller in parent, to finish up anything needed after
3521 # in parent, $csuite is set to canonicalised portmanteau
3523 my $org_isuite = $isuite;
3524 my @suites = split /\,/, $isuite;
3525 return '' unless @suites > 1;
3526 printdebug "fork_for_multisuite: @suites\n";
3530 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3532 return 0 unless defined $cbasesuite;
3534 fail "package $package missing in (base suite) $cbasesuite"
3535 unless @mergeinputs;
3537 my @csuites = ($cbasesuite);
3539 $before_fetch_merge->();
3541 foreach my $tsuite (@suites[1..$#suites]) {
3542 $tsuite =~ s/^-/$cbasesuite-/;
3543 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3549 # xxx collecte the ref here
3551 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3552 push @csuites, $csubsuite;
3555 foreach my $mi (@mergeinputs) {
3556 my $ref = git_get_ref $mi->{Ref};
3557 die "$mi->{Ref} ?" unless length $ref;
3558 $mi->{Commit} = $ref;
3561 $csuite = join ",", @csuites;
3563 my $previous = git_get_ref lrref;
3565 unshift @mergeinputs, {
3566 Commit => $previous,
3567 Info => "local combined tracking branch",
3569 "archive seems to have rewound: local tracking branch is ahead!",
3573 foreach my $ix (0..$#mergeinputs) {
3574 $mergeinputs[$ix]{Index} = $ix;
3577 @mergeinputs = sort {
3578 -version_compare(mergeinfo_version $a,
3579 mergeinfo_version $b) # highest version first
3581 $a->{Index} <=> $b->{Index}; # earliest in spec first
3587 foreach my $mi (@mergeinputs) {
3588 printdebug "multisuite merge check $mi->{Info}\n";
3589 foreach my $previous (@needed) {
3590 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3591 printdebug "multisuite merge un-needed $previous->{Info}\n";
3595 printdebug "multisuite merge this-needed\n";
3596 $mi->{Character} = '+';
3599 $needed[0]{Character} = '*';
3601 my $output = $needed[0]{Commit};
3604 printdebug "multisuite merge nontrivial\n";
3605 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3607 my $commit = "tree $tree\n";
3608 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3609 "Input branches:\n";
3611 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3612 printdebug "multisuite merge include $mi->{Info}\n";
3613 $mi->{Character} //= ' ';
3614 $commit .= "parent $mi->{Commit}\n";
3615 $msg .= sprintf " %s %-25s %s\n",
3617 (mergeinfo_version $mi),
3620 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3622 " * marks the highest version branch, which choose to use\n".
3623 " + marks each branch which was not already an ancestor\n\n".
3624 "[dgit multi-suite $csuite]\n";
3626 "author $authline\n".
3627 "committer $authline\n\n";
3628 $output = make_commit_text $commit.$msg;
3629 printdebug "multisuite merge generated $output\n";
3632 fetch_from_archive_record_1($output);
3633 fetch_from_archive_record_2($output);
3635 progress "calculated combined tracking suite $csuite";
3640 sub clone_set_head () {
3641 open H, "> .git/HEAD" or die $!;
3642 print H "ref: ".lref()."\n" or die $!;
3645 sub clone_finish ($) {
3647 runcmd @git, qw(reset --hard), lrref();
3648 runcmd qw(bash -ec), <<'END';
3650 git ls-tree -r --name-only -z HEAD | \
3651 xargs -0r touch -h -r . --
3653 printdone "ready for work in $dstdir";
3657 # in multisuite, returns twice!
3658 # once in parent after first suite fetched,
3659 # and then again in child after everything is finished
3661 badusage "dry run makes no sense with clone" unless act_local();
3663 my $multi_fetched = fork_for_multisuite(sub {
3664 printdebug "multi clone before fetch merge\n";
3668 if ($multi_fetched) {
3669 printdebug "multi clone after fetch merge\n";
3671 clone_finish($dstdir);
3674 printdebug "clone main body\n";
3676 canonicalise_suite();
3677 my $hasgit = check_for_git();
3678 mkdir $dstdir or fail "create \`$dstdir': $!";
3680 runcmd @git, qw(init -q);
3684 my $giturl = access_giturl(1);
3685 if (defined $giturl) {
3686 runcmd @git, qw(remote add), 'origin', $giturl;
3689 progress "fetching existing git history";
3691 runcmd_ordryrun_local @git, qw(fetch origin);
3693 progress "starting new git history";
3695 fetch_from_archive() or no_such_package;
3696 my $vcsgiturl = $dsc->{'Vcs-Git'};
3697 if (length $vcsgiturl) {
3698 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3699 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3701 clone_finish($dstdir);
3705 canonicalise_suite();
3706 if (check_for_git()) {
3709 fetch_from_archive() or no_such_package();
3711 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3712 if (length $vcsgiturl and
3713 (grep { $csuite eq $_ }
3715 cfg 'dgit.vcs-git.suites')) {
3716 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3717 if (defined $current && $current ne $vcsgiturl) {
3719 FYI: Vcs-Git in $csuite has different url to your vcs-git remote.
3720 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3724 printdone "fetched into ".lrref();
3728 my $multi_fetched = fork_for_multisuite(sub { });
3729 fetch_one() unless $multi_fetched; # parent
3730 finish 0 if $multi_fetched eq '0'; # child
3735 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3737 printdone "fetched to ".lrref()." and merged into HEAD";
3740 sub check_not_dirty () {
3741 foreach my $f (qw(local-options local-patch-header)) {
3742 if (stat_exists "debian/source/$f") {
3743 fail "git tree contains debian/source/$f";
3747 return if $includedirty;
3749 git_check_unmodified();
3752 sub commit_admin ($) {
3755 runcmd_ordryrun_local @git, qw(commit -m), $m;
3758 sub quiltify_nofix_bail ($$) {
3759 my ($headinfo, $xinfo) = @_;
3760 if ($quilt_mode eq 'nofix') {
3761 fail "quilt fixup required but quilt mode is \`nofix'\n".
3762 "HEAD commit".$headinfo." differs from tree implied by ".
3763 " debian/patches".$xinfo;
3767 sub commit_quilty_patch () {
3768 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3770 foreach my $l (split /\n/, $output) {
3771 next unless $l =~ m/\S/;
3772 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3776 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3778 progress "nothing quilty to commit, ok.";
3781 quiltify_nofix_bail "", " (wanted to commit patch update)";
3782 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3783 runcmd_ordryrun_local @git, qw(add -f), @adds;
3785 Commit Debian 3.0 (quilt) metadata
3787 [dgit ($our_version) quilt-fixup]
3791 sub get_source_format () {
3793 if (open F, "debian/source/options") {
3797 s/\s+$//; # ignore missing final newline
3799 my ($k, $v) = ($`, $'); #');
3800 $v =~ s/^"(.*)"$/$1/;
3806 F->error and die $!;
3809 die $! unless $!==&ENOENT;
3812 if (!open F, "debian/source/format") {
3813 die $! unless $!==&ENOENT;
3817 F->error and die $!;
3819 return ($_, \%options);
3822 sub madformat_wantfixup ($) {
3824 return 0 unless $format eq '3.0 (quilt)';
3825 our $quilt_mode_warned;
3826 if ($quilt_mode eq 'nocheck') {
3827 progress "Not doing any fixup of \`$format' due to".
3828 " ----no-quilt-fixup or --quilt=nocheck"
3829 unless $quilt_mode_warned++;
3832 progress "Format \`$format', need to check/update patch stack"
3833 unless $quilt_mode_warned++;
3837 sub maybe_split_brain_save ($$$) {
3838 my ($headref, $dgitview, $msg) = @_;
3839 # => message fragment "$saved" describing disposition of $dgitview
3840 my $save = $internal_object_save{'dgit-view'};
3841 return "commit id $dgitview" unless defined $save;
3842 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3844 "dgit --dgit-view-save $msg HEAD=$headref",
3847 return "and left in $save";
3850 # An "infopair" is a tuple [ $thing, $what ]
3851 # (often $thing is a commit hash; $what is a description)
3853 sub infopair_cond_equal ($$) {
3855 $x->[0] eq $y->[0] or fail <<END;
3856 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3860 sub infopair_lrf_tag_lookup ($$) {
3861 my ($tagnames, $what) = @_;
3862 # $tagname may be an array ref
3863 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3864 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3865 foreach my $tagname (@tagnames) {
3866 my $lrefname = lrfetchrefs."/tags/$tagname";
3867 my $tagobj = $lrfetchrefs_f{$lrefname};
3868 next unless defined $tagobj;
3869 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3870 return [ git_rev_parse($tagobj), $what ];
3872 fail @tagnames==1 ? <<END : <<END;
3873 Wanted tag $what (@tagnames) on dgit server, but not found
3875 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3879 sub infopair_cond_ff ($$) {
3880 my ($anc,$desc) = @_;
3881 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3882 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3886 sub pseudomerge_version_check ($$) {
3887 my ($clogp, $archive_hash) = @_;
3889 my $arch_clogp = commit_getclogp $archive_hash;
3890 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3891 'version currently in archive' ];
3892 if (defined $overwrite_version) {
3893 if (length $overwrite_version) {
3894 infopair_cond_equal([ $overwrite_version,
3895 '--overwrite= version' ],
3898 my $v = $i_arch_v->[0];
3899 progress "Checking package changelog for archive version $v ...";
3902 my @xa = ("-f$v", "-t$v");
3903 my $vclogp = parsechangelog @xa;
3906 [ (getfield $vclogp, $fn),
3907 "$fn field from dpkg-parsechangelog @xa" ];
3909 my $cv = $gf->('Version');
3910 infopair_cond_equal($i_arch_v, $cv);
3911 $cd = $gf->('Distribution');
3914 $@ =~ s/^dgit: //gm;
3916 "Perhaps debian/changelog does not mention $v ?";
3918 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3919 $cd->[1] is $cd->[0]
3920 Your tree seems to based on earlier (not uploaded) $v.
3925 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3929 sub pseudomerge_make_commit ($$$$ $$) {
3930 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3931 $msg_cmd, $msg_msg) = @_;
3932 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3934 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3935 my $authline = clogp_authline $clogp;
3939 !defined $overwrite_version ? ""
3940 : !length $overwrite_version ? " --overwrite"
3941 : " --overwrite=".$overwrite_version;
3943 # Contributing parent is the first parent - that makes
3944 # git rev-list --first-parent DTRT.
3945 my $pmf = dgit_privdir()."/pseudomerge";
3946 open MC, ">", $pmf or die "$pmf $!";
3947 print MC <<END or die $!;
3950 parent $archive_hash
3960 return make_commit($pmf);
3963 sub splitbrain_pseudomerge ($$$$) {
3964 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3965 # => $merged_dgitview
3966 printdebug "splitbrain_pseudomerge...\n";
3968 # We: debian/PREVIOUS HEAD($maintview)
3969 # expect: o ----------------- o
3972 # a/d/PREVIOUS $dgitview
3975 # we do: `------------------ o
3979 return $dgitview unless defined $archive_hash;
3980 return $dgitview if deliberately_not_fast_forward();
3982 printdebug "splitbrain_pseudomerge...\n";
3984 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3986 if (!defined $overwrite_version) {
3987 progress "Checking that HEAD inciudes all changes in archive...";
3990 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3992 if (defined $overwrite_version) {
3994 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3995 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3996 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3997 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3998 my $i_archive = [ $archive_hash, "current archive contents" ];
4000 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
4002 infopair_cond_equal($i_dgit, $i_archive);
4003 infopair_cond_ff($i_dep14, $i_dgit);
4004 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
4007 $@ =~ s/^\n//; chomp $@;
4010 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
4015 my $r = pseudomerge_make_commit
4016 $clogp, $dgitview, $archive_hash, $i_arch_v,
4017 "dgit --quilt=$quilt_mode",
4018 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
4019 Declare fast forward from $i_arch_v->[0]
4021 Make fast forward from $i_arch_v->[0]
4024 maybe_split_brain_save $maintview, $r, "pseudomerge";
4026 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
4030 sub plain_overwrite_pseudomerge ($$$) {
4031 my ($clogp, $head, $archive_hash) = @_;
4033 printdebug "plain_overwrite_pseudomerge...";
4035 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4037 return $head if is_fast_fwd $archive_hash, $head;
4039 my $m = "Declare fast forward from $i_arch_v->[0]";
4041 my $r = pseudomerge_make_commit
4042 $clogp, $head, $archive_hash, $i_arch_v,
4045 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4047 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
4051 sub push_parse_changelog ($) {
4054 my $clogp = Dpkg::Control::Hash->new();
4055 $clogp->load($clogpfn) or die;
4057 my $clogpackage = getfield $clogp, 'Source';
4058 $package //= $clogpackage;
4059 fail "-p specified $package but changelog specified $clogpackage"
4060 unless $package eq $clogpackage;
4061 my $cversion = getfield $clogp, 'Version';
4063 if (!$we_are_initiator) {
4064 # rpush initiator can't do this because it doesn't have $isuite yet
4065 my $tag = debiantag($cversion, access_nomdistro);
4066 runcmd @git, qw(check-ref-format), $tag;
4069 my $dscfn = dscfn($cversion);
4071 return ($clogp, $cversion, $dscfn);
4074 sub push_parse_dsc ($$$) {
4075 my ($dscfn,$dscfnwhat, $cversion) = @_;
4076 $dsc = parsecontrol($dscfn,$dscfnwhat);
4077 my $dversion = getfield $dsc, 'Version';
4078 my $dscpackage = getfield $dsc, 'Source';
4079 ($dscpackage eq $package && $dversion eq $cversion) or
4080 fail "$dscfn is for $dscpackage $dversion".
4081 " but debian/changelog is for $package $cversion";
4084 sub push_tagwants ($$$$) {
4085 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4088 TagFn => \&debiantag,
4093 if (defined $maintviewhead) {
4095 TagFn => \&debiantag_maintview,
4096 Objid => $maintviewhead,
4097 TfSuffix => '-maintview',
4100 } elsif ($dodep14tag eq 'no' ? 0
4101 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4102 : $dodep14tag eq 'always'
4103 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4104 --dep14tag-always (or equivalent in config) means server must support
4105 both "new" and "maint" tag formats, but config says it doesn't.
4107 : die "$dodep14tag ?") {
4109 TagFn => \&debiantag_maintview,
4111 TfSuffix => '-dgit',
4115 foreach my $tw (@tagwants) {
4116 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4117 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4119 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4123 sub push_mktags ($$ $$ $) {
4125 $changesfile,$changesfilewhat,
4128 die unless $tagwants->[0]{View} eq 'dgit';
4130 my $declaredistro = access_nomdistro();
4131 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4132 $dsc->{$ourdscfield[0]} = join " ",
4133 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4135 $dsc->save("$dscfn.tmp") or die $!;
4137 my $changes = parsecontrol($changesfile,$changesfilewhat);
4138 foreach my $field (qw(Source Distribution Version)) {
4139 $changes->{$field} eq $clogp->{$field} or
4140 fail "changes field $field \`$changes->{$field}'".
4141 " does not match changelog \`$clogp->{$field}'";
4144 my $cversion = getfield $clogp, 'Version';
4145 my $clogsuite = getfield $clogp, 'Distribution';
4147 # We make the git tag by hand because (a) that makes it easier
4148 # to control the "tagger" (b) we can do remote signing
4149 my $authline = clogp_authline $clogp;
4150 my $delibs = join(" ", "",@deliberatelies);
4154 my $tfn = $tw->{Tfn};
4155 my $head = $tw->{Objid};
4156 my $tag = $tw->{Tag};
4158 open TO, '>', $tfn->('.tmp') or die $!;
4159 print TO <<END or die $!;
4166 if ($tw->{View} eq 'dgit') {
4167 print TO <<END or die $!;
4168 $package release $cversion for $clogsuite ($csuite) [dgit]
4169 [dgit distro=$declaredistro$delibs]
4171 foreach my $ref (sort keys %previously) {
4172 print TO <<END or die $!;
4173 [dgit previously:$ref=$previously{$ref}]
4176 } elsif ($tw->{View} eq 'maint') {
4177 print TO <<END or die $!;
4178 $package release $cversion for $clogsuite ($csuite)
4179 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4182 die Dumper($tw)."?";
4187 my $tagobjfn = $tfn->('.tmp');
4189 if (!defined $keyid) {
4190 $keyid = access_cfg('keyid','RETURN-UNDEF');
4192 if (!defined $keyid) {
4193 $keyid = getfield $clogp, 'Maintainer';
4195 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4196 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4197 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4198 push @sign_cmd, $tfn->('.tmp');
4199 runcmd_ordryrun @sign_cmd;
4201 $tagobjfn = $tfn->('.signed.tmp');
4202 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4203 $tfn->('.tmp'), $tfn->('.tmp.asc');
4209 my @r = map { $mktag->($_); } @$tagwants;
4213 sub sign_changes ($) {
4214 my ($changesfile) = @_;
4216 my @debsign_cmd = @debsign;
4217 push @debsign_cmd, "-k$keyid" if defined $keyid;
4218 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4219 push @debsign_cmd, $changesfile;
4220 runcmd_ordryrun @debsign_cmd;
4225 printdebug "actually entering push\n";
4227 supplementary_message(<<'END');
4228 Push failed, while checking state of the archive.
4229 You can retry the push, after fixing the problem, if you like.
4231 if (check_for_git()) {
4234 my $archive_hash = fetch_from_archive();
4235 if (!$archive_hash) {
4237 fail "package appears to be new in this suite;".
4238 " if this is intentional, use --new";
4241 supplementary_message(<<'END');
4242 Push failed, while preparing your push.
4243 You can retry the push, after fixing the problem, if you like.
4246 need_tagformat 'new', "quilt mode $quilt_mode"
4247 if quiltmode_splitbrain;
4251 access_giturl(); # check that success is vaguely likely
4252 rpush_handle_protovsn_bothends() if $we_are_initiator;
4255 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4256 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4258 responder_send_file('parsed-changelog', $clogpfn);
4260 my ($clogp, $cversion, $dscfn) =
4261 push_parse_changelog("$clogpfn");
4263 my $dscpath = "$buildproductsdir/$dscfn";
4264 stat_exists $dscpath or
4265 fail "looked for .dsc $dscpath, but $!;".
4266 " maybe you forgot to build";
4268 responder_send_file('dsc', $dscpath);
4270 push_parse_dsc($dscpath, $dscfn, $cversion);
4272 my $format = getfield $dsc, 'Format';
4273 printdebug "format $format\n";
4275 my $symref = git_get_symref();
4276 my $actualhead = git_rev_parse('HEAD');
4278 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4279 runcmd_ordryrun_local @git_debrebase, 'stitch';
4280 $actualhead = git_rev_parse('HEAD');
4283 my $dgithead = $actualhead;
4284 my $maintviewhead = undef;
4286 my $upstreamversion = upstreamversion $clogp->{Version};
4288 if (madformat_wantfixup($format)) {
4289 # user might have not used dgit build, so maybe do this now:
4290 if (quiltmode_splitbrain()) {
4291 changedir $playground;
4292 quilt_make_fake_dsc($upstreamversion);
4294 ($dgithead, $cachekey) =
4295 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4297 "--quilt=$quilt_mode but no cached dgit view:
4298 perhaps HEAD changed since dgit build[-source] ?";
4300 $dgithead = splitbrain_pseudomerge($clogp,
4301 $actualhead, $dgithead,
4303 $maintviewhead = $actualhead;
4305 prep_ud(); # so _only_subdir() works, below
4307 commit_quilty_patch();
4311 if (defined $overwrite_version && !defined $maintviewhead
4313 $dgithead = plain_overwrite_pseudomerge($clogp,
4321 if ($archive_hash) {
4322 if (is_fast_fwd($archive_hash, $dgithead)) {
4324 } elsif (deliberately_not_fast_forward) {
4327 fail "dgit push: HEAD is not a descendant".
4328 " of the archive's version.\n".
4329 "To overwrite the archive's contents,".
4330 " pass --overwrite[=VERSION].\n".
4331 "To rewind history, if permitted by the archive,".
4332 " use --deliberately-not-fast-forward.";
4336 changedir $playground;
4337 progress "checking that $dscfn corresponds to HEAD";
4338 runcmd qw(dpkg-source -x --),
4339 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4340 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4341 check_for_vendor_patches() if madformat($dsc->{format});
4343 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4344 debugcmd "+",@diffcmd;
4346 my $r = system @diffcmd;
4349 my $referent = $split_brain ? $dgithead : 'HEAD';
4350 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4353 my $raw = cmdoutput @git,
4354 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4356 foreach (split /\0/, $raw) {
4357 if (defined $changed) {
4358 push @mode_changes, "$changed: $_\n" if $changed;
4361 } elsif (m/^:0+ 0+ /) {
4363 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4364 $changed = "Mode change from $1 to $2"
4369 if (@mode_changes) {
4370 fail <<END.(join '', @mode_changes).<<END;
4371 HEAD specifies a different tree to $dscfn:
4374 There is a problem with your source tree (see dgit(7) for some hints).
4375 To see a full diff, run git diff $tree $referent
4380 HEAD specifies a different tree to $dscfn:
4382 Perhaps you forgot to build. Or perhaps there is a problem with your
4383 source tree (see dgit(7) for some hints). To see a full diff, run
4384 git diff $tree $referent
4390 if (!$changesfile) {
4391 my $pat = changespat $cversion;
4392 my @cs = glob "$buildproductsdir/$pat";
4393 fail "failed to find unique changes file".
4394 " (looked for $pat in $buildproductsdir);".
4395 " perhaps you need to use dgit -C"
4397 ($changesfile) = @cs;
4399 $changesfile = "$buildproductsdir/$changesfile";
4402 # Check that changes and .dsc agree enough
4403 $changesfile =~ m{[^/]*$};
4404 my $changes = parsecontrol($changesfile,$&);
4405 files_compare_inputs($dsc, $changes)
4406 unless forceing [qw(dsc-changes-mismatch)];
4408 # Check whether this is a source only upload
4409 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4410 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4411 if ($sourceonlypolicy eq 'ok') {
4412 } elsif ($sourceonlypolicy eq 'always') {
4413 forceable_fail [qw(uploading-binaries)],
4414 "uploading binaries, although distroy policy is source only"
4416 } elsif ($sourceonlypolicy eq 'never') {
4417 forceable_fail [qw(uploading-source-only)],
4418 "source-only upload, although distroy policy requires .debs"
4420 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4421 forceable_fail [qw(uploading-source-only)],
4422 "source-only upload, even though package is entirely NEW\n".
4423 "(this is contrary to policy in ".(access_nomdistro()).")"
4426 && !(archive_query('package_not_wholly_new', $package) // 1);
4428 badcfg "unknown source-only-uploads policy \`$sourceonlypolicy'";
4431 # Perhaps adjust .dsc to contain right set of origs
4432 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4434 unless forceing [qw(changes-origs-exactly)];
4436 # Checks complete, we're going to try and go ahead:
4438 responder_send_file('changes',$changesfile);
4439 responder_send_command("param head $dgithead");
4440 responder_send_command("param csuite $csuite");
4441 responder_send_command("param isuite $isuite");
4442 responder_send_command("param tagformat $tagformat");
4443 if (defined $maintviewhead) {
4444 confess "internal error (protovsn=$protovsn)"
4445 if defined $protovsn and $protovsn < 4;
4446 responder_send_command("param maint-view $maintviewhead");
4449 # Perhaps send buildinfo(s) for signing
4450 my $changes_files = getfield $changes, 'Files';
4451 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4452 foreach my $bi (@buildinfos) {
4453 responder_send_command("param buildinfo-filename $bi");
4454 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4457 if (deliberately_not_fast_forward) {
4458 git_for_each_ref(lrfetchrefs, sub {
4459 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4460 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4461 responder_send_command("previously $rrefname=$objid");
4462 $previously{$rrefname} = $objid;
4466 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4467 dgit_privdir()."/tag");
4470 supplementary_message(<<'END');
4471 Push failed, while signing the tag.
4472 You can retry the push, after fixing the problem, if you like.
4474 # If we manage to sign but fail to record it anywhere, it's fine.
4475 if ($we_are_responder) {
4476 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4477 responder_receive_files('signed-tag', @tagobjfns);
4479 @tagobjfns = push_mktags($clogp,$dscpath,
4480 $changesfile,$changesfile,
4483 supplementary_message(<<'END');
4484 Push failed, *after* signing the tag.
4485 If you want to try again, you should use a new version number.
4488 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4490 foreach my $tw (@tagwants) {
4491 my $tag = $tw->{Tag};
4492 my $tagobjfn = $tw->{TagObjFn};
4494 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4495 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4496 runcmd_ordryrun_local
4497 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4500 supplementary_message(<<'END');
4501 Push failed, while updating the remote git repository - see messages above.
4502 If you want to try again, you should use a new version number.
4504 if (!check_for_git()) {
4505 create_remote_git_repo();
4508 my @pushrefs = $forceflag.$dgithead.":".rrref();
4509 foreach my $tw (@tagwants) {
4510 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4513 runcmd_ordryrun @git,
4514 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4515 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4517 supplementary_message(<<'END');
4518 Push failed, while obtaining signatures on the .changes and .dsc.
4519 If it was just that the signature failed, you may try again by using
4520 debsign by hand to sign the changes
4522 and then dput to complete the upload.
4523 If you need to change the package, you must use a new version number.
4525 if ($we_are_responder) {
4526 my $dryrunsuffix = act_local() ? "" : ".tmp";
4527 my @rfiles = ($dscpath, $changesfile);
4528 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4529 responder_receive_files('signed-dsc-changes',
4530 map { "$_$dryrunsuffix" } @rfiles);
4533 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4535 progress "[new .dsc left in $dscpath.tmp]";
4537 sign_changes $changesfile;
4540 supplementary_message(<<END);
4541 Push failed, while uploading package(s) to the archive server.
4542 You can retry the upload of exactly these same files with dput of:
4544 If that .changes file is broken, you will need to use a new version
4545 number for your next attempt at the upload.
4547 my $host = access_cfg('upload-host','RETURN-UNDEF');
4548 my @hostarg = defined($host) ? ($host,) : ();
4549 runcmd_ordryrun @dput, @hostarg, $changesfile;
4550 printdone "pushed and uploaded $cversion";
4552 supplementary_message('');
4553 responder_send_command("complete");
4557 not_necessarily_a_tree();
4562 badusage "-p is not allowed with clone; specify as argument instead"
4563 if defined $package;
4566 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4567 ($package,$isuite) = @ARGV;
4568 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4569 ($package,$dstdir) = @ARGV;
4570 } elsif (@ARGV==3) {
4571 ($package,$isuite,$dstdir) = @ARGV;
4573 badusage "incorrect arguments to dgit clone";
4577 $dstdir ||= "$package";
4578 if (stat_exists $dstdir) {
4579 fail "$dstdir already exists";
4583 if ($rmonerror && !$dryrun_level) {
4584 $cwd_remove= getcwd();
4586 return unless defined $cwd_remove;
4587 if (!chdir "$cwd_remove") {
4588 return if $!==&ENOENT;
4589 die "chdir $cwd_remove: $!";
4591 printdebug "clone rmonerror removing $dstdir\n";
4593 rmtree($dstdir) or die "remove $dstdir: $!\n";
4594 } elsif (grep { $! == $_ }
4595 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4597 print STDERR "check whether to remove $dstdir: $!\n";
4603 $cwd_remove = undef;
4606 sub branchsuite () {
4607 my $branch = git_get_symref();
4608 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4615 sub package_from_d_control () {
4616 if (!defined $package) {
4617 my $sourcep = parsecontrol('debian/control','debian/control');
4618 $package = getfield $sourcep, 'Source';
4622 sub fetchpullargs () {
4623 package_from_d_control();
4625 $isuite = branchsuite();
4627 my $clogp = parsechangelog();
4628 my $clogsuite = getfield $clogp, 'Distribution';
4629 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4631 } elsif (@ARGV==1) {
4634 badusage "incorrect arguments to dgit fetch or dgit pull";
4648 if (quiltmode_splitbrain()) {
4649 my ($format, $fopts) = get_source_format();
4650 madformat($format) and fail <<END
4651 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4659 package_from_d_control();
4660 @ARGV==1 or badusage "dgit checkout needs a suite argument";
4664 foreach my $canon (qw(0 1)) {
4669 canonicalise_suite();
4671 if (length git_get_ref lref()) {
4672 # local branch already exists, yay
4675 if (!length git_get_ref lrref()) {
4683 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4686 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4687 "dgit checkout $isuite";
4688 runcmd (@git, qw(checkout), lbranch());
4691 sub cmd_update_vcs_git () {
4693 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4694 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4696 ($specsuite) = (@ARGV);
4701 if ($ARGV[0] eq '-') {
4703 } elsif ($ARGV[0] eq '-') {
4708 package_from_d_control();
4710 if ($specsuite eq '.') {
4711 $ctrl = parsecontrol 'debian/control', 'debian/control';
4713 $isuite = $specsuite;
4717 my $url = getfield $ctrl, 'Vcs-Git';
4720 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4721 if (!defined $orgurl) {
4722 print STDERR "setting up vcs-git: $url\n";
4723 @cmd = (@git, qw(remote add vcs-git), $url);
4724 } elsif ($orgurl eq $url) {
4725 print STDERR "vcs git already configured: $url\n";
4727 print STDERR "changing vcs-git url to: $url\n";
4728 @cmd = (@git, qw(remote set-url vcs-git), $url);
4730 runcmd_ordryrun_local @cmd;
4732 print "fetching (@ARGV)\n";
4733 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4739 build_or_push_prep_early();
4744 } elsif (@ARGV==1) {
4745 ($specsuite) = (@ARGV);
4747 badusage "incorrect arguments to dgit $subcommand";
4750 local ($package) = $existing_package; # this is a hack
4751 canonicalise_suite();
4753 canonicalise_suite();
4755 if (defined $specsuite &&
4756 $specsuite ne $isuite &&
4757 $specsuite ne $csuite) {
4758 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4759 " but command line specifies $specsuite";
4768 #---------- remote commands' implementation ----------
4770 sub pre_remote_push_build_host {
4771 my ($nrargs) = shift @ARGV;
4772 my (@rargs) = @ARGV[0..$nrargs-1];
4773 @ARGV = @ARGV[$nrargs..$#ARGV];
4775 my ($dir,$vsnwant) = @rargs;
4776 # vsnwant is a comma-separated list; we report which we have
4777 # chosen in our ready response (so other end can tell if they
4780 $we_are_responder = 1;
4781 $us .= " (build host)";
4783 open PI, "<&STDIN" or die $!;
4784 open STDIN, "/dev/null" or die $!;
4785 open PO, ">&STDOUT" or die $!;
4787 open STDOUT, ">&STDERR" or die $!;
4791 ($protovsn) = grep {
4792 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4793 } @rpushprotovsn_support;
4795 fail "build host has dgit rpush protocol versions ".
4796 (join ",", @rpushprotovsn_support).
4797 " but invocation host has $vsnwant"
4798 unless defined $protovsn;
4802 sub cmd_remote_push_build_host {
4803 responder_send_command("dgit-remote-push-ready $protovsn");
4807 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4808 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4809 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4810 # a good error message)
4812 sub rpush_handle_protovsn_bothends () {
4813 if ($protovsn < 4) {
4814 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4823 my $report = i_child_report();
4824 if (defined $report) {
4825 printdebug "($report)\n";
4826 } elsif ($i_child_pid) {
4827 printdebug "(killing build host child $i_child_pid)\n";
4828 kill 15, $i_child_pid;
4830 if (defined $i_tmp && !defined $initiator_tempdir) {
4832 eval { rmtree $i_tmp; };
4837 return unless forkcheck_mainprocess();
4842 my ($base,$selector,@args) = @_;
4843 $selector =~ s/\-/_/g;
4844 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4848 not_necessarily_a_tree();
4853 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4861 push @rargs, join ",", @rpushprotovsn_support;
4864 push @rdgit, @ropts;
4865 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4867 my @cmd = (@ssh, $host, shellquote @rdgit);
4870 $we_are_initiator=1;
4872 if (defined $initiator_tempdir) {
4873 rmtree $initiator_tempdir;
4874 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4875 $i_tmp = $initiator_tempdir;
4879 $i_child_pid = open2(\*RO, \*RI, @cmd);
4881 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4882 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4883 $supplementary_message = '' unless $protovsn >= 3;
4886 my ($icmd,$iargs) = initiator_expect {
4887 m/^(\S+)(?: (.*))?$/;
4890 i_method "i_resp", $icmd, $iargs;
4894 sub i_resp_progress ($) {
4896 my $msg = protocol_read_bytes \*RO, $rhs;
4900 sub i_resp_supplementary_message ($) {
4902 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4905 sub i_resp_complete {
4906 my $pid = $i_child_pid;
4907 $i_child_pid = undef; # prevents killing some other process with same pid
4908 printdebug "waiting for build host child $pid...\n";
4909 my $got = waitpid $pid, 0;
4910 die $! unless $got == $pid;
4911 die "build host child failed $?" if $?;
4914 printdebug "all done\n";
4918 sub i_resp_file ($) {
4920 my $localname = i_method "i_localname", $keyword;
4921 my $localpath = "$i_tmp/$localname";
4922 stat_exists $localpath and
4923 badproto \*RO, "file $keyword ($localpath) twice";
4924 protocol_receive_file \*RO, $localpath;
4925 i_method "i_file", $keyword;
4930 sub i_resp_param ($) {
4931 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4935 sub i_resp_previously ($) {
4936 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4937 or badproto \*RO, "bad previously spec";
4938 my $r = system qw(git check-ref-format), $1;
4939 die "bad previously ref spec ($r)" if $r;
4940 $previously{$1} = $2;
4945 sub i_resp_want ($) {
4947 die "$keyword ?" if $i_wanted{$keyword}++;
4949 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4950 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4951 die unless $isuite =~ m/^$suite_re$/;
4954 rpush_handle_protovsn_bothends();
4956 fail "rpush negotiated protocol version $protovsn".
4957 " which does not support quilt mode $quilt_mode"
4958 if quiltmode_splitbrain;
4960 my @localpaths = i_method "i_want", $keyword;
4961 printdebug "[[ $keyword @localpaths\n";
4962 foreach my $localpath (@localpaths) {
4963 protocol_send_file \*RI, $localpath;
4965 print RI "files-end\n" or die $!;
4968 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4970 sub i_localname_parsed_changelog {
4971 return "remote-changelog.822";
4973 sub i_file_parsed_changelog {
4974 ($i_clogp, $i_version, $i_dscfn) =
4975 push_parse_changelog "$i_tmp/remote-changelog.822";
4976 die if $i_dscfn =~ m#/|^\W#;
4979 sub i_localname_dsc {
4980 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4985 sub i_localname_buildinfo ($) {
4986 my $bi = $i_param{'buildinfo-filename'};
4987 defined $bi or badproto \*RO, "buildinfo before filename";
4988 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4989 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4990 or badproto \*RO, "improper buildinfo filename";
4993 sub i_file_buildinfo {
4994 my $bi = $i_param{'buildinfo-filename'};
4995 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4996 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4997 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4998 files_compare_inputs($bd, $ch);
4999 (getfield $bd, $_) eq (getfield $ch, $_) or
5000 fail "buildinfo mismatch $_"
5001 foreach qw(Source Version);
5002 !defined $bd->{$_} or
5003 fail "buildinfo contains $_"
5004 foreach qw(Changes Changed-by Distribution);
5006 push @i_buildinfos, $bi;
5007 delete $i_param{'buildinfo-filename'};
5010 sub i_localname_changes {
5011 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5012 $i_changesfn = $i_dscfn;
5013 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
5014 return $i_changesfn;
5016 sub i_file_changes { }
5018 sub i_want_signed_tag {
5019 printdebug Dumper(\%i_param, $i_dscfn);
5020 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5021 && defined $i_param{'csuite'}
5022 or badproto \*RO, "premature desire for signed-tag";
5023 my $head = $i_param{'head'};
5024 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5026 my $maintview = $i_param{'maint-view'};
5027 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5030 if ($protovsn >= 4) {
5031 my $p = $i_param{'tagformat'} // '<undef>';
5033 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
5036 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5038 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5040 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5043 push_mktags $i_clogp, $i_dscfn,
5044 $i_changesfn, 'remote changes',
5048 sub i_want_signed_dsc_changes {
5049 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5050 sign_changes $i_changesfn;
5051 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5054 #---------- building etc. ----------
5060 #----- `3.0 (quilt)' handling -----
5062 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5064 sub quiltify_dpkg_commit ($$$;$) {
5065 my ($patchname,$author,$msg, $xinfo) = @_;
5068 mkpath '.git/dgit'; # we are in playtree
5069 my $descfn = ".git/dgit/quilt-description.tmp";
5070 open O, '>', $descfn or die "$descfn: $!";
5071 $msg =~ s/\n+/\n\n/;
5072 print O <<END or die $!;
5074 ${xinfo}Subject: $msg
5081 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5082 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5083 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5084 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5088 sub quiltify_trees_differ ($$;$$$) {
5089 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5090 # returns true iff the two tree objects differ other than in debian/
5091 # with $finegrained,
5092 # returns bitmask 01 - differ in upstream files except .gitignore
5093 # 02 - differ in .gitignore
5094 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5095 # is set for each modified .gitignore filename $fn
5096 # if $unrepres is defined, array ref to which is appeneded
5097 # a list of unrepresentable changes (removals of upstream files
5100 my @cmd = (@git, qw(diff-tree -z --no-renames));
5101 push @cmd, qw(--name-only) unless $unrepres;
5102 push @cmd, qw(-r) if $finegrained || $unrepres;
5104 my $diffs= cmdoutput @cmd;
5107 foreach my $f (split /\0/, $diffs) {
5108 if ($unrepres && !@lmodes) {
5109 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5112 my ($oldmode,$newmode) = @lmodes;
5115 next if $f =~ m#^debian(?:/.*)?$#s;
5119 die "not a plain file or symlink\n"
5120 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5121 $oldmode =~ m/^(?:10|12)\d{4}$/;
5122 if ($oldmode =~ m/[^0]/ &&
5123 $newmode =~ m/[^0]/) {
5124 # both old and new files exist
5125 die "mode or type changed\n" if $oldmode ne $newmode;
5126 die "modified symlink\n" unless $newmode =~ m/^10/;
5127 } elsif ($oldmode =~ m/[^0]/) {
5129 die "deletion of symlink\n"
5130 unless $oldmode =~ m/^10/;
5133 die "creation with non-default mode\n"
5134 unless $newmode =~ m/^100644$/ or
5135 $newmode =~ m/^120000$/;
5139 local $/="\n"; chomp $@;
5140 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5144 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5145 $r |= $isignore ? 02 : 01;
5146 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5148 printdebug "quiltify_trees_differ $x $y => $r\n";
5152 sub quiltify_tree_sentinelfiles ($) {
5153 # lists the `sentinel' files present in the tree
5155 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5156 qw(-- debian/rules debian/control);
5161 sub quiltify_splitbrain_needed () {
5162 if (!$split_brain) {
5163 progress "dgit view: changes are required...";
5164 runcmd @git, qw(checkout -q -b dgit-view);
5169 sub quiltify_splitbrain ($$$$$$$) {
5170 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5171 $editedignores, $cachekey) = @_;
5172 my $gitignore_special = 1;
5173 if ($quilt_mode !~ m/gbp|dpm/) {
5174 # treat .gitignore just like any other upstream file
5175 $diffbits = { %$diffbits };
5176 $_ = !!$_ foreach values %$diffbits;
5177 $gitignore_special = 0;
5179 # We would like any commits we generate to be reproducible
5180 my @authline = clogp_authline($clogp);
5181 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5182 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5183 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5184 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5185 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5186 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5188 my $fulldiffhint = sub {
5190 my $cmd = "git diff $x $y -- :/ ':!debian'";
5191 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5192 return "\nFor full diff showing the problem(s), type:\n $cmd\n";
5195 if ($quilt_mode =~ m/gbp|unapplied/ &&
5196 ($diffbits->{O2H} & 01)) {
5198 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
5199 " but git tree differs from orig in upstream files.";
5200 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5201 if (!stat_exists "debian/patches") {
5203 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5207 if ($quilt_mode =~ m/dpm/ &&
5208 ($diffbits->{H2A} & 01)) {
5209 fail <<END. $fulldiffhint->($oldtiptree,'HEAD');
5210 --quilt=$quilt_mode specified, implying patches-applied git tree
5211 but git tree differs from result of applying debian/patches to upstream
5214 if ($quilt_mode =~ m/gbp|unapplied/ &&
5215 ($diffbits->{O2A} & 01)) { # some patches
5216 quiltify_splitbrain_needed();
5217 progress "dgit view: creating patches-applied version using gbp pq";
5218 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5219 # gbp pq import creates a fresh branch; push back to dgit-view
5220 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5221 runcmd @git, qw(checkout -q dgit-view);
5223 if ($quilt_mode =~ m/gbp|dpm/ &&
5224 ($diffbits->{O2A} & 02)) {
5226 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5227 tool which does not create patches for changes to upstream
5228 .gitignores: but, such patches exist in debian/patches.
5231 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5232 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5233 quiltify_splitbrain_needed();
5234 progress "dgit view: creating patch to represent .gitignore changes";
5235 ensuredir "debian/patches";
5236 my $gipatch = "debian/patches/auto-gitignore";
5237 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5238 stat GIPATCH or die "$gipatch: $!";
5239 fail "$gipatch already exists; but want to create it".
5240 " to record .gitignore changes" if (stat _)[7];
5241 print GIPATCH <<END or die "$gipatch: $!";
5242 Subject: Update .gitignore from Debian packaging branch
5244 The Debian packaging git branch contains these updates to the upstream
5245 .gitignore file(s). This patch is autogenerated, to provide these
5246 updates to users of the official Debian archive view of the package.
5248 [dgit ($our_version) update-gitignore]
5251 close GIPATCH or die "$gipatch: $!";
5252 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5253 $unapplied, $headref, "--", sort keys %$editedignores;
5254 open SERIES, "+>>", "debian/patches/series" or die $!;
5255 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5257 defined read SERIES, $newline, 1 or die $!;
5258 print SERIES "\n" or die $! unless $newline eq "\n";
5259 print SERIES "auto-gitignore\n" or die $!;
5260 close SERIES or die $!;
5261 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5263 Commit patch to update .gitignore
5265 [dgit ($our_version) update-gitignore-quilt-fixup]
5269 my $dgitview = git_rev_parse 'HEAD';
5272 # When we no longer need to support squeeze, use --create-reflog
5274 ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
5275 my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
5278 my $oldcache = git_get_ref "refs/$splitbraincache";
5279 if ($oldcache eq $dgitview) {
5280 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5281 # git update-ref doesn't always update, in this case. *sigh*
5282 my $dummy = make_commit_text <<END;
5285 author Dgit <dgit\@example.com> 1000000000 +0000
5286 committer Dgit <dgit\@example.com> 1000000000 +0000
5288 Dummy commit - do not use
5290 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5291 "refs/$splitbraincache", $dummy;
5293 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5296 changedir "$playground/work";
5298 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5299 progress "dgit view: created ($saved)";
5302 sub quiltify ($$$$) {
5303 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5305 # Quilt patchification algorithm
5307 # We search backwards through the history of the main tree's HEAD
5308 # (T) looking for a start commit S whose tree object is identical
5309 # to to the patch tip tree (ie the tree corresponding to the
5310 # current dpkg-committed patch series). For these purposes
5311 # `identical' disregards anything in debian/ - this wrinkle is
5312 # necessary because dpkg-source treates debian/ specially.
5314 # We can only traverse edges where at most one of the ancestors'
5315 # trees differs (in changes outside in debian/). And we cannot
5316 # handle edges which change .pc/ or debian/patches. To avoid
5317 # going down a rathole we avoid traversing edges which introduce
5318 # debian/rules or debian/control. And we set a limit on the
5319 # number of edges we are willing to look at.
5321 # If we succeed, we walk forwards again. For each traversed edge
5322 # PC (with P parent, C child) (starting with P=S and ending with
5323 # C=T) to we do this:
5325 # - dpkg-source --commit with a patch name and message derived from C
5326 # After traversing PT, we git commit the changes which
5327 # should be contained within debian/patches.
5329 # The search for the path S..T is breadth-first. We maintain a
5330 # todo list containing search nodes. A search node identifies a
5331 # commit, and looks something like this:
5333 # Commit => $git_commit_id,
5334 # Child => $c, # or undef if P=T
5335 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5336 # Nontrivial => true iff $p..$c has relevant changes
5343 my %considered; # saves being exponential on some weird graphs
5345 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5348 my ($search,$whynot) = @_;
5349 printdebug " search NOT $search->{Commit} $whynot\n";
5350 $search->{Whynot} = $whynot;
5351 push @nots, $search;
5352 no warnings qw(exiting);
5361 my $c = shift @todo;
5362 next if $considered{$c->{Commit}}++;
5364 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5366 printdebug "quiltify investigate $c->{Commit}\n";
5369 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5370 printdebug " search finished hooray!\n";
5375 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5376 if ($quilt_mode eq 'smash') {
5377 printdebug " search quitting smash\n";
5381 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5382 $not->($c, "has $c_sentinels not $t_sentinels")
5383 if $c_sentinels ne $t_sentinels;
5385 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5386 $commitdata =~ m/\n\n/;
5388 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5389 @parents = map { { Commit => $_, Child => $c } } @parents;
5391 $not->($c, "root commit") if !@parents;
5393 foreach my $p (@parents) {
5394 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5396 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5397 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5399 foreach my $p (@parents) {
5400 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5402 my @cmd= (@git, qw(diff-tree -r --name-only),
5403 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5404 my $patchstackchange = cmdoutput @cmd;
5405 if (length $patchstackchange) {
5406 $patchstackchange =~ s/\n/,/g;
5407 $not->($p, "changed $patchstackchange");
5410 printdebug " search queue P=$p->{Commit} ",
5411 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5417 printdebug "quiltify want to smash\n";
5420 my $x = $_[0]{Commit};
5421 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5424 my $reportnot = sub {
5426 my $s = $abbrev->($notp);
5427 my $c = $notp->{Child};
5428 $s .= "..".$abbrev->($c) if $c;
5429 $s .= ": ".$notp->{Whynot};
5432 if ($quilt_mode eq 'linear') {
5433 print STDERR "\n$us: error: quilt fixup cannot be linear. Stopped at:\n";
5434 foreach my $notp (@nots) {
5435 print STDERR "$us: ", $reportnot->($notp), "\n";
5437 print STDERR "$us: $_\n" foreach @$failsuggestion;
5439 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n".
5440 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5441 } elsif ($quilt_mode eq 'smash') {
5442 } elsif ($quilt_mode eq 'auto') {
5443 progress "quilt fixup cannot be linear, smashing...";
5445 die "$quilt_mode ?";
5448 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5449 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5451 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5453 quiltify_dpkg_commit "auto-$version-$target-$time",
5454 (getfield $clogp, 'Maintainer'),
5455 "Automatically generated patch ($clogp->{Version})\n".
5456 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5460 progress "quiltify linearisation planning successful, executing...";
5462 for (my $p = $sref_S;
5463 my $c = $p->{Child};
5465 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5466 next unless $p->{Nontrivial};
5468 my $cc = $c->{Commit};
5470 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5471 $commitdata =~ m/\n\n/ or die "$c ?";
5474 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5477 my $commitdate = cmdoutput
5478 @git, qw(log -n1 --pretty=format:%aD), $cc;
5480 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5482 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5489 my $gbp_check_suitable = sub {
5494 die "contains unexpected slashes\n" if m{//} || m{/$};
5495 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5496 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5497 die "is series file\n" if m{$series_filename_re}o;
5498 die "too long" if length > 200;
5500 return $_ unless $@;
5501 print STDERR "quiltifying commit $cc:".
5502 " ignoring/dropping Gbp-Pq $what: $@";
5506 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5508 (\S+) \s* \n //ixm) {
5509 $patchname = $gbp_check_suitable->($1, 'Name');
5511 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5513 (\S+) \s* \n //ixm) {
5514 $patchdir = $gbp_check_suitable->($1, 'Topic');
5519 if (!defined $patchname) {
5520 $patchname = $title;
5521 $patchname =~ s/[.:]$//;
5524 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5525 my $translitname = $converter->convert($patchname);
5526 die unless defined $translitname;
5527 $patchname = $translitname;
5530 "dgit: patch title transliteration error: $@"
5532 $patchname =~ y/ A-Z/-a-z/;
5533 $patchname =~ y/-a-z0-9_.+=~//cd;
5534 $patchname =~ s/^\W/x-$&/;
5535 $patchname = substr($patchname,0,40);
5536 $patchname .= ".patch";
5538 if (!defined $patchdir) {
5541 if (length $patchdir) {
5542 $patchname = "$patchdir/$patchname";
5544 if ($patchname =~ m{^(.*)/}) {
5545 mkpath "debian/patches/$1";
5550 stat "debian/patches/$patchname$index";
5552 $!==ENOENT or die "$patchname$index $!";
5554 runcmd @git, qw(checkout -q), $cc;
5556 # We use the tip's changelog so that dpkg-source doesn't
5557 # produce complaining messages from dpkg-parsechangelog. None
5558 # of the information dpkg-source gets from the changelog is
5559 # actually relevant - it gets put into the original message
5560 # which dpkg-source provides our stunt editor, and then
5562 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5564 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5565 "Date: $commitdate\n".
5566 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5568 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5571 runcmd @git, qw(checkout -q master);
5574 sub build_maybe_quilt_fixup () {
5575 my ($format,$fopts) = get_source_format;
5576 return unless madformat_wantfixup $format;
5579 check_for_vendor_patches();
5581 if (quiltmode_splitbrain) {
5582 fail <<END unless access_cfg_tagformats_can_splitbrain;
5583 quilt mode $quilt_mode requires split view so server needs to support
5584 both "new" and "maint" tag formats, but config says it doesn't.
5588 my $clogp = parsechangelog();
5589 my $headref = git_rev_parse('HEAD');
5590 my $symref = git_get_symref();
5592 if ($quilt_mode eq 'linear'
5593 && !$fopts->{'single-debian-patch'}
5594 && branch_is_gdr($symref, $headref)) {
5595 # This is much faster. It also makes patches that gdr
5596 # likes better for future updates without laundering.
5598 # However, it can fail in some casses where we would
5599 # succeed: if there are existing patches, which correspond
5600 # to a prefix of the branch, but are not in gbp/gdr
5601 # format, gdr will fail (exiting status 7), but we might
5602 # be able to figure out where to start linearising. That
5603 # will be slower so hopefully there's not much to do.
5604 my @cmd = (@git_debrebase,
5605 qw(--noop-ok -funclean-mixed -funclean-ordering
5606 make-patches --quiet-would-amend));
5607 # We tolerate soe snags that gdr wouldn't, by default.
5611 failedcmd @cmd if system @cmd and $?!=7*256;
5615 $headref = git_rev_parse('HEAD');
5619 changedir $playground;
5621 my $upstreamversion = upstreamversion $version;
5623 if ($fopts->{'single-debian-patch'}) {
5624 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5626 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5630 runcmd_ordryrun_local
5631 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5634 sub unpack_playtree_mkwork ($) {
5637 mkdir "work" or die $!;
5639 mktree_in_ud_here();
5640 runcmd @git, qw(reset -q --hard), $headref;
5643 sub unpack_playtree_linkorigs ($$) {
5644 my ($upstreamversion, $fn) = @_;
5645 # calls $fn->($leafname);
5647 my $bpd_abs = bpd_abs();
5648 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5649 while ($!=0, defined(my $b = readdir QFD)) {
5650 my $f = bpd_abs()."/".$b;
5652 local ($debuglevel) = $debuglevel-1;
5653 printdebug "QF linkorigs $b, $f ?\n";
5655 next unless is_orig_file_of_vsn $b, $upstreamversion;
5656 printdebug "QF linkorigs $b, $f Y\n";
5657 link_ltarget $f, $b or die "$b $!";
5660 die "$buildproductsdir: $!" if $!;
5664 sub quilt_fixup_delete_pc () {
5665 runcmd @git, qw(rm -rqf .pc);
5667 Commit removal of .pc (quilt series tracking data)
5669 [dgit ($our_version) upgrade quilt-remove-pc]
5673 sub quilt_fixup_singlepatch ($$$) {
5674 my ($clogp, $headref, $upstreamversion) = @_;
5676 progress "starting quiltify (single-debian-patch)";
5678 # dpkg-source --commit generates new patches even if
5679 # single-debian-patch is in debian/source/options. In order to
5680 # get it to generate debian/patches/debian-changes, it is
5681 # necessary to build the source package.
5683 unpack_playtree_linkorigs($upstreamversion, sub { });
5684 unpack_playtree_mkwork($headref);
5686 rmtree("debian/patches");
5688 runcmd @dpkgsource, qw(-b .);
5690 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5691 rename srcfn("$upstreamversion", "/debian/patches"),
5692 "work/debian/patches";
5695 commit_quilty_patch();
5698 sub quilt_make_fake_dsc ($) {
5699 my ($upstreamversion) = @_;
5701 my $fakeversion="$upstreamversion-~~DGITFAKE";
5703 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5704 print $fakedsc <<END or die $!;
5707 Version: $fakeversion
5711 my $dscaddfile=sub {
5714 my $md = new Digest::MD5;
5716 my $fh = new IO::File $b, '<' or die "$b $!";
5721 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5724 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
5726 my @files=qw(debian/source/format debian/rules
5727 debian/control debian/changelog);
5728 foreach my $maybe (qw(debian/patches debian/source/options
5729 debian/tests/control)) {
5730 next unless stat_exists "$maindir/$maybe";
5731 push @files, $maybe;
5734 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5735 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5737 $dscaddfile->($debtar);
5738 close $fakedsc or die $!;
5741 sub quilt_fakedsc2unapplied ($$) {
5742 my ($headref, $upstreamversion) = @_;
5743 # must be run in the playground
5744 # quilt_make_fake_dsc must have been called
5747 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5749 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5750 rename $fakexdir, "fake" or die "$fakexdir $!";
5754 remove_stray_gits("source package");
5755 mktree_in_ud_here();
5759 rmtree 'debian'; # git checkout commitish paths does not delete!
5760 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5761 my $unapplied=git_add_write_tree();
5762 printdebug "fake orig tree object $unapplied\n";
5766 sub quilt_check_splitbrain_cache ($$) {
5767 my ($headref, $upstreamversion) = @_;
5768 # Called only if we are in (potentially) split brain mode.
5769 # Called in playground.
5770 # Computes the cache key and looks in the cache.
5771 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5773 my $splitbrain_cachekey;
5776 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5777 # we look in the reflog of dgit-intern/quilt-cache
5778 # we look for an entry whose message is the key for the cache lookup
5779 my @cachekey = (qw(dgit), $our_version);
5780 push @cachekey, $upstreamversion;
5781 push @cachekey, $quilt_mode;
5782 push @cachekey, $headref;
5784 push @cachekey, hashfile('fake.dsc');
5786 my $srcshash = Digest::SHA->new(256);
5787 my %sfs = ( %INC, '$0(dgit)' => $0 );
5788 foreach my $sfk (sort keys %sfs) {
5789 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5790 $srcshash->add($sfk," ");
5791 $srcshash->add(hashfile($sfs{$sfk}));
5792 $srcshash->add("\n");
5794 push @cachekey, $srcshash->hexdigest();
5795 $splitbrain_cachekey = "@cachekey";
5797 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5799 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5800 debugcmd "|(probably)",@cmd;
5801 my $child = open GC, "-|"; defined $child or die $!;
5803 chdir $maindir or die $!;
5804 if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
5805 $! == ENOENT or die $!;
5806 printdebug ">(no reflog)\n";
5813 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5814 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5817 unpack_playtree_mkwork($headref);
5818 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5819 if ($cachehit ne $headref) {
5820 progress "dgit view: found cached ($saved)";
5821 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5823 return ($cachehit, $splitbrain_cachekey);
5825 progress "dgit view: found cached, no changes required";
5826 return ($headref, $splitbrain_cachekey);
5828 die $! if GC->error;
5829 failedcmd unless close GC;
5831 printdebug "splitbrain cache miss\n";
5832 return (undef, $splitbrain_cachekey);
5835 sub quilt_fixup_multipatch ($$$) {
5836 my ($clogp, $headref, $upstreamversion) = @_;
5838 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5841 # - honour any existing .pc in case it has any strangeness
5842 # - determine the git commit corresponding to the tip of
5843 # the patch stack (if there is one)
5844 # - if there is such a git commit, convert each subsequent
5845 # git commit into a quilt patch with dpkg-source --commit
5846 # - otherwise convert all the differences in the tree into
5847 # a single git commit
5851 # Our git tree doesn't necessarily contain .pc. (Some versions of
5852 # dgit would include the .pc in the git tree.) If there isn't
5853 # one, we need to generate one by unpacking the patches that we
5856 # We first look for a .pc in the git tree. If there is one, we
5857 # will use it. (This is not the normal case.)
5859 # Otherwise need to regenerate .pc so that dpkg-source --commit
5860 # can work. We do this as follows:
5861 # 1. Collect all relevant .orig from parent directory
5862 # 2. Generate a debian.tar.gz out of
5863 # debian/{patches,rules,source/format,source/options}
5864 # 3. Generate a fake .dsc containing just these fields:
5865 # Format Source Version Files
5866 # 4. Extract the fake .dsc
5867 # Now the fake .dsc has a .pc directory.
5868 # (In fact we do this in every case, because in future we will
5869 # want to search for a good base commit for generating patches.)
5871 # Then we can actually do the dpkg-source --commit
5872 # 1. Make a new working tree with the same object
5873 # store as our main tree and check out the main
5875 # 2. Copy .pc from the fake's extraction, if necessary
5876 # 3. Run dpkg-source --commit
5877 # 4. If the result has changes to debian/, then
5878 # - git add them them
5879 # - git add .pc if we had a .pc in-tree
5881 # 5. If we had a .pc in-tree, delete it, and git commit
5882 # 6. Back in the main tree, fast forward to the new HEAD
5884 # Another situation we may have to cope with is gbp-style
5885 # patches-unapplied trees.
5887 # We would want to detect these, so we know to escape into
5888 # quilt_fixup_gbp. However, this is in general not possible.
5889 # Consider a package with a one patch which the dgit user reverts
5890 # (with git revert or the moral equivalent).
5892 # That is indistinguishable in contents from a patches-unapplied
5893 # tree. And looking at the history to distinguish them is not
5894 # useful because the user might have made a confusing-looking git
5895 # history structure (which ought to produce an error if dgit can't
5896 # cope, not a silent reintroduction of an unwanted patch).
5898 # So gbp users will have to pass an option. But we can usually
5899 # detect their failure to do so: if the tree is not a clean
5900 # patches-applied tree, quilt linearisation fails, but the tree
5901 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5902 # they want --quilt=unapplied.
5904 # To help detect this, when we are extracting the fake dsc, we
5905 # first extract it with --skip-patches, and then apply the patches
5906 # afterwards with dpkg-source --before-build. That lets us save a
5907 # tree object corresponding to .origs.
5909 my $splitbrain_cachekey;
5911 quilt_make_fake_dsc($upstreamversion);
5913 if (quiltmode_splitbrain()) {
5915 ($cachehit, $splitbrain_cachekey) =
5916 quilt_check_splitbrain_cache($headref, $upstreamversion);
5917 return if $cachehit;
5919 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
5923 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5925 if (system @bbcmd) {
5926 failedcmd @bbcmd if $? < 0;
5928 failed to apply your git tree's patch stack (from debian/patches/) to
5929 the corresponding upstream tarball(s). Your source tree and .orig
5930 are probably too inconsistent. dgit can only fix up certain kinds of
5931 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
5937 unpack_playtree_mkwork($headref);
5940 if (stat_exists ".pc") {
5942 progress "Tree already contains .pc - will use it then delete it.";
5945 rename '../fake/.pc','.pc' or die $!;
5948 changedir '../fake';
5950 my $oldtiptree=git_add_write_tree();
5951 printdebug "fake o+d/p tree object $unapplied\n";
5952 changedir '../work';
5955 # We calculate some guesswork now about what kind of tree this might
5956 # be. This is mostly for error reporting.
5962 # O = orig, without patches applied
5963 # A = "applied", ie orig with H's debian/patches applied
5964 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5965 \%editedignores, \@unrepres),
5966 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5967 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5971 foreach my $b (qw(01 02)) {
5972 foreach my $v (qw(O2H O2A H2A)) {
5973 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5976 printdebug "differences \@dl @dl.\n";
5979 "$us: base trees orig=%.20s o+d/p=%.20s",
5980 $unapplied, $oldtiptree;
5982 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5983 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5984 $dl[0], $dl[1], $dl[3], $dl[4],
5988 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5990 forceable_fail [qw(unrepresentable)], <<END;
5991 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5996 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5997 push @failsuggestion, "This might be a patches-unapplied branch.";
5998 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5999 push @failsuggestion, "This might be a patches-applied branch.";
6001 push @failsuggestion, "Maybe you need to specify one of".
6002 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
6004 if (quiltmode_splitbrain()) {
6005 quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
6006 $diffbits, \%editedignores,
6007 $splitbrain_cachekey);
6011 progress "starting quiltify (multiple patches, $quilt_mode mode)";
6012 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
6014 if (!open P, '>>', ".pc/applied-patches") {
6015 $!==&ENOENT or die $!;
6020 commit_quilty_patch();
6022 if ($mustdeletepc) {
6023 quilt_fixup_delete_pc();
6027 sub quilt_fixup_editor () {
6028 my $descfn = $ENV{$fakeeditorenv};
6029 my $editing = $ARGV[$#ARGV];
6030 open I1, '<', $descfn or die "$descfn: $!";
6031 open I2, '<', $editing or die "$editing: $!";
6032 unlink $editing or die "$editing: $!";
6033 open O, '>', $editing or die "$editing: $!";
6034 while (<I1>) { print O or die $!; } I1->error and die $!;
6037 $copying ||= m/^\-\-\- /;
6038 next unless $copying;
6041 I2->error and die $!;
6046 sub maybe_apply_patches_dirtily () {
6047 return unless $quilt_mode =~ m/gbp|unapplied/;
6048 print STDERR <<END or die $!;
6050 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6051 dgit: Have to apply the patches - making the tree dirty.
6052 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6055 $patches_applied_dirtily = 01;
6056 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6057 runcmd qw(dpkg-source --before-build .);
6060 sub maybe_unapply_patches_again () {
6061 progress "dgit: Unapplying patches again to tidy up the tree."
6062 if $patches_applied_dirtily;
6063 runcmd qw(dpkg-source --after-build .)
6064 if $patches_applied_dirtily & 01;
6066 if $patches_applied_dirtily & 02;
6067 $patches_applied_dirtily = 0;
6070 #----- other building -----
6072 our $clean_using_builder;
6073 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
6074 # clean the tree before building (perhaps invoked indirectly by
6075 # whatever we are using to run the build), rather than separately
6076 # and explicitly by us.
6079 return if $clean_using_builder;
6080 if ($cleanmode eq 'dpkg-source') {
6081 maybe_apply_patches_dirtily();
6082 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
6083 } elsif ($cleanmode eq 'dpkg-source-d') {
6084 maybe_apply_patches_dirtily();
6085 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
6086 } elsif ($cleanmode eq 'git') {
6087 runcmd_ordryrun_local @git, qw(clean -xdf);
6088 } elsif ($cleanmode eq 'git-ff') {
6089 runcmd_ordryrun_local @git, qw(clean -xdff);
6090 } elsif ($cleanmode eq 'check') {
6091 my $leftovers = cmdoutput @git, qw(clean -xdn);
6092 if (length $leftovers) {
6093 print STDERR $leftovers, "\n" or die $!;
6094 fail "tree contains uncommitted files and --clean=check specified";
6096 } elsif ($cleanmode eq 'none') {
6103 badusage "clean takes no additional arguments" if @ARGV;
6106 maybe_unapply_patches_again();
6109 # return values from massage_dbp_args are one or both of these flags
6110 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6111 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6113 sub build_or_push_prep_early () {
6114 our $build_or_push_prep_early_done //= 0;
6115 return if $build_or_push_prep_early_done++;
6116 badusage "-p is not allowed with dgit $subcommand" if defined $package;
6117 my $clogp = parsechangelog();
6118 $isuite = getfield $clogp, 'Distribution';
6119 $package = getfield $clogp, 'Source';
6120 $version = getfield $clogp, 'Version';
6121 $dscfn = dscfn($version);
6124 sub build_prep_early () {
6125 build_or_push_prep_early();
6130 sub build_prep ($) {
6133 # clean the tree if we're trying to include dirty changes in the
6134 # source package, or we are running the builder in $maindir
6135 clean_tree() if $includedirty || ($wantsrc & WANTSRC_BUILDER);
6136 build_maybe_quilt_fixup();
6138 my $pat = changespat $version;
6139 foreach my $f (glob "$buildproductsdir/$pat") {
6141 unlink $f or fail "remove old changes file $f: $!";
6143 progress "would remove $f";
6149 sub changesopts_initial () {
6150 my @opts =@changesopts[1..$#changesopts];
6153 sub changesopts_version () {
6154 if (!defined $changes_since_version) {
6157 @vsns = archive_query('archive_query');
6158 my @quirk = access_quirk();
6159 if ($quirk[0] eq 'backports') {
6160 local $isuite = $quirk[2];
6162 canonicalise_suite();
6163 push @vsns, archive_query('archive_query');
6169 "archive query failed (queried because --since-version not specified)";
6172 @vsns = map { $_->[0] } @vsns;
6173 @vsns = sort { -version_compare($a, $b) } @vsns;
6174 $changes_since_version = $vsns[0];
6175 progress "changelog will contain changes since $vsns[0]";
6177 $changes_since_version = '_';
6178 progress "package seems new, not specifying -v<version>";
6181 if ($changes_since_version ne '_') {
6182 return ("-v$changes_since_version");
6188 sub changesopts () {
6189 return (changesopts_initial(), changesopts_version());
6192 sub massage_dbp_args ($;$) {
6193 my ($cmd,$xargs) = @_;
6194 # Since we split the source build out so we can do strange things
6195 # to it, massage the arguments to dpkg-buildpackage so that the
6196 # main build doessn't build source (or add an argument to stop it
6197 # building source by default).
6198 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6199 # -nc has the side effect of specifying -b if nothing else specified
6200 # and some combinations of -S, -b, et al, are errors, rather than
6201 # later simply overriding earlie. So we need to:
6202 # - search the command line for these options
6203 # - pick the last one
6204 # - perhaps add our own as a default
6205 # - perhaps adjust it to the corresponding non-source-building version
6207 foreach my $l ($cmd, $xargs) {
6209 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
6212 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6213 my $r = WANTSRC_BUILDER;
6214 printdebug "massage split $dmode.\n";
6215 $r = $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6216 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6217 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6219 printdebug "massage done $r $dmode.\n";
6221 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6227 my $wasdir = must_getcwd();
6228 changedir $buildproductsdir;
6233 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6234 sub postbuild_mergechanges ($) {
6235 my ($msg_if_onlyone) = @_;
6236 # If there is only one .changes file, fail with $msg_if_onlyone,
6237 # or if that is undef, be a no-op.
6238 # Returns the changes file to report to the user.
6239 my $pat = changespat $version;
6240 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6241 @changesfiles = sort {
6242 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6246 if (@changesfiles==1) {
6247 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
6248 only one changes file from build (@changesfiles)
6250 $result = $changesfiles[0];
6251 } elsif (@changesfiles==2) {
6252 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6253 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6254 fail "$l found in binaries changes file $binchanges"
6257 runcmd_ordryrun_local @mergechanges, @changesfiles;
6258 my $multichanges = changespat $version,'multi';
6260 stat_exists $multichanges or fail "$multichanges: $!";
6261 foreach my $cf (glob $pat) {
6262 next if $cf eq $multichanges;
6263 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6266 $result = $multichanges;
6268 fail "wrong number of different changes files (@changesfiles)";
6270 printdone "build successful, results in $result\n" or die $!;
6273 sub midbuild_checkchanges () {
6274 my $pat = changespat $version;
6275 return if $rmchanges;
6276 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6278 $_ ne changespat $version,'source' and
6279 $_ ne changespat $version,'multi'
6282 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6283 Suggest you delete @unwanted.
6288 sub midbuild_checkchanges_vanilla ($) {
6290 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6293 sub postbuild_mergechanges_vanilla ($) {
6295 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6297 postbuild_mergechanges(undef);
6300 printdone "build successful\n";
6306 $buildproductsdir eq '..' or print STDERR <<END;
6307 $us: warning: build-products-dir set, but not supported by dgit build
6308 $us: warning: things may go wrong or files may go to the wrong place
6310 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6311 my $wantsrc = massage_dbp_args \@dbp;
6312 build_prep($wantsrc);
6313 if ($wantsrc & WANTSRC_SOURCE) {
6315 midbuild_checkchanges_vanilla $wantsrc;
6317 if ($wantsrc & WANTSRC_BUILDER) {
6318 push @dbp, changesopts_version();
6319 maybe_apply_patches_dirtily();
6320 runcmd_ordryrun_local @dbp;
6322 maybe_unapply_patches_again();
6323 postbuild_mergechanges_vanilla $wantsrc;
6327 $quilt_mode //= 'gbp';
6333 # gbp can make .origs out of thin air. In my tests it does this
6334 # even for a 1.0 format package, with no origs present. So I
6335 # guess it keys off just the version number. We don't know
6336 # exactly what .origs ought to exist, but let's assume that we
6337 # should run gbp if: the version has an upstream part and the main
6339 my $upstreamversion = upstreamversion $version;
6340 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6341 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6343 if ($gbp_make_orig) {
6345 $cleanmode = 'none'; # don't do it again
6348 my @dbp = @dpkgbuildpackage;
6350 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6352 if (!length $gbp_build[0]) {
6353 if (length executable_on_path('git-buildpackage')) {
6354 $gbp_build[0] = qw(git-buildpackage);
6356 $gbp_build[0] = 'gbp buildpackage';
6359 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6361 push @cmd, (qw(-us -uc --git-no-sign-tags),
6362 "--git-builder=".(shellquote @dbp));
6364 if ($gbp_make_orig) {
6365 my $priv = dgit_privdir();
6366 my $ok = "$priv/origs-gen-ok";
6367 unlink $ok or $!==&ENOENT or die $!;
6368 my @origs_cmd = @cmd;
6369 push @origs_cmd, qw(--git-cleaner=true);
6370 push @origs_cmd, "--git-prebuild=".
6371 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6372 push @origs_cmd, @ARGV;
6374 debugcmd @origs_cmd;
6376 do { local $!; stat_exists $ok; }
6377 or failedcmd @origs_cmd;
6379 dryrun_report @origs_cmd;
6383 build_prep($wantsrc);
6384 if ($wantsrc & WANTSRC_SOURCE) {
6386 midbuild_checkchanges_vanilla $wantsrc;
6388 if (!$clean_using_builder) {
6389 push @cmd, '--git-cleaner=true';
6392 maybe_unapply_patches_again();
6393 if ($wantsrc & WANTSRC_BUILDER) {
6394 push @cmd, changesopts();
6395 runcmd_ordryrun_local @cmd, @ARGV;
6397 postbuild_mergechanges_vanilla $wantsrc;
6399 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6401 sub building_source_in_playtree {
6402 # If $includedirty, we have to build the source package from the
6403 # working tree, not a playtree, so that uncommitted changes are
6404 # included (copying or hardlinking them into the playtree could
6407 # Note that if we are building a source package in split brain
6408 # mode we do not support including uncommitted changes, because
6409 # that makes quilt fixup too hard. I.e. ($split_brain && (dgit is
6410 # building a source package)) => !$includedirty
6411 return !$includedirty;
6415 $sourcechanges = changespat $version,'source';
6417 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6418 or fail "remove $sourcechanges: $!";
6420 my @cmd = (@dpkgsource, qw(-b --));
6422 if (building_source_in_playtree()) {
6424 my $headref = git_rev_parse('HEAD');
6425 # If we are in split brain, there is already a playtree with
6426 # the thing we should package into a .dsc (thanks to quilt
6427 # fixup). If not, make a playtree
6428 prep_ud() unless $split_brain;
6429 changedir $playground;
6430 unless ($split_brain) {
6431 my $upstreamversion = upstreamversion $version;
6432 unpack_playtree_linkorigs($upstreamversion, sub { });
6433 unpack_playtree_mkwork($headref);
6437 $leafdir = basename $maindir;
6440 runcmd_ordryrun_local @cmd, $leafdir;
6443 runcmd_ordryrun_local qw(sh -ec),
6444 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6445 @dpkggenchanges, qw(-S), changesopts();
6448 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6449 $dsc = parsecontrol($dscfn, "source package");
6453 printdebug " renaming ($why) $l\n";
6454 rename "$l", bpd_abs()."/$l"
6455 or fail "put in place new built file ($l): $!";
6457 foreach my $l (split /\n/, getfield $dsc, 'Files') {
6458 $l =~ m/\S+$/ or next;
6461 $mv->('dsc', $dscfn);
6462 $mv->('changes', $sourcechanges);
6467 sub cmd_build_source {
6468 badusage "build-source takes no additional arguments" if @ARGV;
6469 build_prep(WANTSRC_SOURCE);
6471 maybe_unapply_patches_again();
6472 printdone "source built, results in $dscfn and $sourcechanges";
6475 sub cmd_push_source {
6477 fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
6478 "sense with push-source!" if $includedirty;
6479 build_maybe_quilt_fixup();
6481 my $changes = parsecontrol("$buildproductsdir/$changesfile",
6482 "source changes file");
6483 unless (test_source_only_changes($changes)) {
6484 fail "user-specified changes file is not source-only";
6487 # Building a source package is very fast, so just do it
6489 die "er, patches are applied dirtily but shouldn't be.."
6490 if $patches_applied_dirtily;
6491 $changesfile = $sourcechanges;
6496 sub binary_builder {
6497 my ($bbuilder, $pbmc_msg, @args) = @_;
6498 build_prep(WANTSRC_SOURCE);
6500 midbuild_checkchanges();
6503 stat_exists $dscfn or fail "$dscfn (in build products dir): $!";
6504 stat_exists $sourcechanges
6505 or fail "$sourcechanges (in build products dir): $!";
6507 runcmd_ordryrun_local @$bbuilder, @args;
6509 maybe_unapply_patches_again();
6511 postbuild_mergechanges($pbmc_msg);
6517 binary_builder(\@sbuild, <<END, qw(-d), $isuite, @ARGV, $dscfn);
6518 perhaps you need to pass -A ? (sbuild's default is to build only
6519 arch-specific binaries; dgit 1.4 used to override that.)
6524 my ($pbuilder) = @_;
6526 # @ARGV is allowed to contain only things that should be passed to
6527 # pbuilder under debbuildopts; just massage those
6528 my $wantsrc = massage_dbp_args \@ARGV;
6529 fail "you asked for a builder but your debbuildopts didn't ask for".
6530 " any binaries -- is this really what you meant?"
6531 unless $wantsrc & WANTSRC_BUILDER;
6532 fail "we must build a .dsc to pass to the builder but your debbuiltopts".
6533 " forbids the building of a source package; cannot continue"
6534 unless $wantsrc & WANTSRC_SOURCE;
6535 # We do not want to include the verb "build" in @pbuilder because
6536 # the user can customise @pbuilder and they shouldn't be required
6537 # to include "build" in their customised value. However, if the
6538 # user passes any additional args to pbuilder using the dgit
6539 # option --pbuilder:foo, such args need to come after the "build"
6540 # verb. opts_opt_multi_cmd does all of that.
6541 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
6542 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
6547 pbuilder(\@pbuilder);
6550 sub cmd_cowbuilder {
6551 pbuilder(\@cowbuilder);
6554 sub cmd_quilt_fixup {
6555 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6558 build_maybe_quilt_fixup();
6561 sub cmd_print_unapplied_treeish {
6562 badusage "incorrect arguments to dgit print-unapplied-treeish" if @ARGV;
6563 my $headref = git_rev_parse('HEAD');
6564 my $clogp = commit_getclogp $headref;
6565 $package = getfield $clogp, 'Source';
6566 $version = getfield $clogp, 'Version';
6567 $isuite = getfield $clogp, 'Distribution';
6568 $csuite = $isuite; # we want this to be offline!
6572 changedir $playground;
6573 my $uv = upstreamversion $version;
6574 quilt_make_fake_dsc($uv);
6575 my $u = quilt_fakedsc2unapplied($headref, $uv);
6576 print $u, "\n" or die $!;
6579 sub import_dsc_result {
6580 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6581 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
6583 check_gitattrs($newhash, "source tree");
6585 progress "dgit: import-dsc: $what_msg";
6588 sub cmd_import_dsc {
6592 last unless $ARGV[0] =~ m/^-/;
6595 if (m/^--require-valid-signature$/) {
6598 badusage "unknown dgit import-dsc sub-option \`$_'";
6602 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6603 my ($dscfn, $dstbranch) = @ARGV;
6605 badusage "dry run makes no sense with import-dsc" unless act_local();
6607 my $force = $dstbranch =~ s/^\+// ? +1 :
6608 $dstbranch =~ s/^\.\.// ? -1 :
6610 my $info = $force ? " $&" : '';
6611 $info = "$dscfn$info";
6613 my $specbranch = $dstbranch;
6614 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6615 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6617 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6618 my $chead = cmdoutput_errok @symcmd;
6619 defined $chead or $?==256 or failedcmd @symcmd;
6621 fail "$dstbranch is checked out - will not update it"
6622 if defined $chead and $chead eq $dstbranch;
6624 my $oldhash = git_get_ref $dstbranch;
6626 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6627 $dscdata = do { local $/ = undef; <D>; };
6628 D->error and fail "read $dscfn: $!";
6631 # we don't normally need this so import it here
6632 use Dpkg::Source::Package;
6633 my $dp = new Dpkg::Source::Package filename => $dscfn,
6634 require_valid_signature => $needsig;
6636 local $SIG{__WARN__} = sub {
6638 return unless $needsig;
6639 fail "import-dsc signature check failed";
6641 if (!$dp->is_signed()) {
6642 warn "$us: warning: importing unsigned .dsc\n";
6644 my $r = $dp->check_signature();
6645 die "->check_signature => $r" if $needsig && $r;
6651 $package = getfield $dsc, 'Source';
6653 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6654 unless forceing [qw(import-dsc-with-dgit-field)];
6655 parse_dsc_field_def_dsc_distro();
6657 $isuite = 'DGIT-IMPORT-DSC';
6658 $idistro //= $dsc_distro;
6662 if (defined $dsc_hash) {
6663 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6664 resolve_dsc_field_commit undef, undef;
6666 if (defined $dsc_hash) {
6667 my @cmd = (qw(sh -ec),
6668 "echo $dsc_hash | git cat-file --batch-check");
6669 my $objgot = cmdoutput @cmd;
6670 if ($objgot =~ m#^\w+ missing\b#) {
6672 .dsc contains Dgit field referring to object $dsc_hash
6673 Your git tree does not have that object. Try `git fetch' from a
6674 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6677 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6679 progress "Not fast forward, forced update.";
6681 fail "Not fast forward to $dsc_hash";
6684 import_dsc_result $dstbranch, $dsc_hash,
6685 "dgit import-dsc (Dgit): $info",
6686 "updated git ref $dstbranch";
6691 Branch $dstbranch already exists
6692 Specify ..$specbranch for a pseudo-merge, binding in existing history
6693 Specify +$specbranch to overwrite, discarding existing history
6695 if $oldhash && !$force;
6697 my @dfi = dsc_files_info();
6698 foreach my $fi (@dfi) {
6699 my $f = $fi->{Filename};
6700 my $here = "$buildproductsdir/$f";
6703 fail "lstat $here works but stat gives $! !";
6705 fail "stat $here: $!" unless $! == ENOENT;
6707 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6709 } elsif ($dscfn =~ m#^/#) {
6712 fail "cannot import $dscfn which seems to be inside working tree!";
6714 $there =~ s#/+[^/]+$## or
6715 fail "import $dscfn requires ../$f, but it does not exist";
6717 my $test = $there =~ m{^/} ? $there : "../$there";
6718 stat $test or fail "import $dscfn requires $test, but: $!";
6719 symlink $there, $here or fail "symlink $there to $here: $!";
6720 progress "made symlink $here -> $there";
6721 # print STDERR Dumper($fi);
6723 my @mergeinputs = generate_commits_from_dsc();
6724 die unless @mergeinputs == 1;
6726 my $newhash = $mergeinputs[0]{Commit};
6730 progress "Import, forced update - synthetic orphan git history.";
6731 } elsif ($force < 0) {
6732 progress "Import, merging.";
6733 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6734 my $version = getfield $dsc, 'Version';
6735 my $clogp = commit_getclogp $newhash;
6736 my $authline = clogp_authline $clogp;
6737 $newhash = make_commit_text <<END;
6744 Merge $package ($version) import into $dstbranch
6747 die; # caught earlier
6751 import_dsc_result $dstbranch, $newhash,
6752 "dgit import-dsc: $info",
6753 "results are in in git ref $dstbranch";
6756 sub pre_archive_api_query () {
6757 not_necessarily_a_tree();
6759 sub cmd_archive_api_query {
6760 badusage "need only 1 subpath argument" unless @ARGV==1;
6761 my ($subpath) = @ARGV;
6762 local $isuite = 'DGIT-API-QUERY-CMD';
6763 my @cmd = archive_api_query_cmd($subpath);
6766 exec @cmd or fail "exec curl: $!\n";
6769 sub repos_server_url () {
6770 $package = '_dgit-repos-server';
6771 local $access_forpush = 1;
6772 local $isuite = 'DGIT-REPOS-SERVER';
6773 my $url = access_giturl();
6776 sub pre_clone_dgit_repos_server () {
6777 not_necessarily_a_tree();
6779 sub cmd_clone_dgit_repos_server {
6780 badusage "need destination argument" unless @ARGV==1;
6781 my ($destdir) = @ARGV;
6782 my $url = repos_server_url();
6783 my @cmd = (@git, qw(clone), $url, $destdir);
6785 exec @cmd or fail "exec git clone: $!\n";
6788 sub pre_print_dgit_repos_server_source_url () {
6789 not_necessarily_a_tree();
6791 sub cmd_print_dgit_repos_server_source_url {
6792 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6794 my $url = repos_server_url();
6795 print $url, "\n" or die $!;
6798 sub pre_print_dpkg_source_ignores {
6799 not_necessarily_a_tree();
6801 sub cmd_print_dpkg_source_ignores {
6802 badusage "no arguments allowed to dgit print-dpkg-source-ignores"
6804 print "@dpkg_source_ignores\n" or die $!;
6807 sub cmd_setup_mergechangelogs {
6808 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6809 local $isuite = 'DGIT-SETUP-TREE';
6810 setup_mergechangelogs(1);
6813 sub cmd_setup_useremail {
6814 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6815 local $isuite = 'DGIT-SETUP-TREE';
6819 sub cmd_setup_gitattributes {
6820 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6821 local $isuite = 'DGIT-SETUP-TREE';
6825 sub cmd_setup_new_tree {
6826 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6827 local $isuite = 'DGIT-SETUP-TREE';
6831 #---------- argument parsing and main program ----------
6834 print "dgit version $our_version\n" or die $!;
6838 our (%valopts_long, %valopts_short);
6839 our (%funcopts_long);
6841 our (@modeopt_cfgs);
6843 sub defvalopt ($$$$) {
6844 my ($long,$short,$val_re,$how) = @_;
6845 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6846 $valopts_long{$long} = $oi;
6847 $valopts_short{$short} = $oi;
6848 # $how subref should:
6849 # do whatever assignemnt or thing it likes with $_[0]
6850 # if the option should not be passed on to remote, @rvalopts=()
6851 # or $how can be a scalar ref, meaning simply assign the value
6854 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6855 defvalopt '--distro', '-d', '.+', \$idistro;
6856 defvalopt '', '-k', '.+', \$keyid;
6857 defvalopt '--existing-package','', '.*', \$existing_package;
6858 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6859 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6860 defvalopt '--package', '-p', $package_re, \$package;
6861 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6863 defvalopt '', '-C', '.+', sub {
6864 ($changesfile) = (@_);
6865 if ($changesfile =~ s#^(.*)/##) {
6866 $buildproductsdir = $1;
6870 defvalopt '--initiator-tempdir','','.*', sub {
6871 ($initiator_tempdir) = (@_);
6872 $initiator_tempdir =~ m#^/# or
6873 badusage "--initiator-tempdir must be used specify an".
6874 " absolute, not relative, directory."
6877 sub defoptmodes ($@) {
6878 my ($varref, $cfgkey, $default, %optmap) = @_;
6880 while (my ($opt,$val) = each %optmap) {
6881 $funcopts_long{$opt} = sub { $$varref = $val; };
6882 $permit{$val} = $val;
6884 push @modeopt_cfgs, {
6887 Default => $default,
6892 defoptmodes \$dodep14tag, qw( dep14tag want
6895 --always-dep14tag always );
6900 if (defined $ENV{'DGIT_SSH'}) {
6901 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6902 } elsif (defined $ENV{'GIT_SSH'}) {
6903 @ssh = ($ENV{'GIT_SSH'});
6911 if (!defined $val) {
6912 badusage "$what needs a value" unless @ARGV;
6914 push @rvalopts, $val;
6916 badusage "bad value \`$val' for $what" unless
6917 $val =~ m/^$oi->{Re}$(?!\n)/s;
6918 my $how = $oi->{How};
6919 if (ref($how) eq 'SCALAR') {
6924 push @ropts, @rvalopts;
6928 last unless $ARGV[0] =~ m/^-/;
6932 if (m/^--dry-run$/) {
6935 } elsif (m/^--damp-run$/) {
6938 } elsif (m/^--no-sign$/) {
6941 } elsif (m/^--help$/) {
6943 } elsif (m/^--version$/) {
6945 } elsif (m/^--new$/) {
6948 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6949 ($om = $opts_opt_map{$1}) &&
6953 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6954 !$opts_opt_cmdonly{$1} &&
6955 ($om = $opts_opt_map{$1})) {
6958 } elsif (m/^--(gbp|dpm)$/s) {
6959 push @ropts, "--quilt=$1";
6961 } elsif (m/^--(?:ignore|include)-dirty$/s) {
6964 } elsif (m/^--no-quilt-fixup$/s) {
6966 $quilt_mode = 'nocheck';
6967 } elsif (m/^--no-rm-on-error$/s) {
6970 } elsif (m/^--no-chase-dsc-distro$/s) {
6972 $chase_dsc_distro = 0;
6973 } elsif (m/^--overwrite$/s) {
6975 $overwrite_version = '';
6976 } elsif (m/^--overwrite=(.+)$/s) {
6978 $overwrite_version = $1;
6979 } elsif (m/^--delayed=(\d+)$/s) {
6982 } elsif (my ($k,$v) =
6983 m/^--save-(dgit-view)=(.+)$/s ||
6984 m/^--(dgit-view)-save=(.+)$/s
6987 $v =~ s#^(?!refs/)#refs/heads/#;
6988 $internal_object_save{$k} = $v;
6989 } elsif (m/^--(no-)?rm-old-changes$/s) {
6992 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6994 push @deliberatelies, $&;
6995 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6999 } elsif (m/^--force-/) {
7001 "$us: warning: ignoring unknown force option $_\n";
7003 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
7004 # undocumented, for testing
7006 $tagformat_want = [ $1, 'command line', 1 ];
7007 # 1 menas overrides distro configuration
7008 } elsif (m/^--config-lookup-explode=(.+)$/s) {
7009 # undocumented, for testing
7011 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
7012 # ^ it's supposed to be an array ref
7013 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
7014 $val = $2 ? $' : undef; #';
7015 $valopt->($oi->{Long});
7016 } elsif ($funcopts_long{$_}) {
7018 $funcopts_long{$_}();
7020 badusage "unknown long option \`$_'";
7027 } elsif (s/^-L/-/) {
7030 } elsif (s/^-h/-/) {
7032 } elsif (s/^-D/-/) {
7036 } elsif (s/^-N/-/) {
7041 push @changesopts, $_;
7043 } elsif (s/^-wn$//s) {
7045 $cleanmode = 'none';
7046 } elsif (s/^-wg$//s) {
7049 } elsif (s/^-wgf$//s) {
7051 $cleanmode = 'git-ff';
7052 } elsif (s/^-wd$//s) {
7054 $cleanmode = 'dpkg-source';
7055 } elsif (s/^-wdd$//s) {
7057 $cleanmode = 'dpkg-source-d';
7058 } elsif (s/^-wc$//s) {
7060 $cleanmode = 'check';
7061 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7062 push @git, '-c', $&;
7063 $gitcfgs{cmdline}{$1} = [ $2 ];
7064 } elsif (s/^-c([^=]+)$//s) {
7065 push @git, '-c', $&;
7066 $gitcfgs{cmdline}{$1} = [ 'true' ];
7067 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7069 $val = undef unless length $val;
7070 $valopt->($oi->{Short});
7073 badusage "unknown short option \`$_'";
7080 sub check_env_sanity () {
7081 my $blocked = new POSIX::SigSet;
7082 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
7085 foreach my $name (qw(PIPE CHLD)) {
7086 my $signame = "SIG$name";
7087 my $signum = eval "POSIX::$signame" // die;
7088 die "$signame is set to something other than SIG_DFL\n"
7089 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7090 $blocked->ismember($signum) and
7091 die "$signame is blocked\n";
7097 On entry to dgit, $@
7098 This is a bug produced by something in in your execution environment.
7104 sub parseopts_late_defaults () {
7105 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7106 if defined $idistro;
7107 $isuite //= cfg('dgit.default.default-suite');
7109 foreach my $k (keys %opts_opt_map) {
7110 my $om = $opts_opt_map{$k};
7112 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7114 badcfg "cannot set command for $k"
7115 unless length $om->[0];
7119 foreach my $c (access_cfg_cfgs("opts-$k")) {
7121 map { $_ ? @$_ : () }
7122 map { $gitcfgs{$_}{$c} }
7123 reverse @gitcfgsources;
7124 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7125 "\n" if $debuglevel >= 4;
7127 badcfg "cannot configure options for $k"
7128 if $opts_opt_cmdonly{$k};
7129 my $insertpos = $opts_cfg_insertpos{$k};
7130 @$om = ( @$om[0..$insertpos-1],
7132 @$om[$insertpos..$#$om] );
7136 if (!defined $rmchanges) {
7137 local $access_forpush;
7138 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7141 if (!defined $quilt_mode) {
7142 local $access_forpush;
7143 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7144 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7146 $quilt_mode =~ m/^($quilt_modes_re)$/
7147 or badcfg "unknown quilt-mode \`$quilt_mode'";
7151 foreach my $moc (@modeopt_cfgs) {
7152 local $access_forpush;
7153 my $vr = $moc->{Var};
7154 next if defined $$vr;
7155 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7156 my $v = $moc->{Vals}{$$vr};
7157 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
7161 fail "dgit: --include-dirty is not supported in split view quilt mode"
7162 if $split_brain && $includedirty;
7164 if (!defined $cleanmode) {
7165 local $access_forpush;
7166 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
7167 $cleanmode //= 'dpkg-source';
7169 badcfg "unknown clean-mode \`$cleanmode'" unless
7170 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
7173 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7174 $buildproductsdir //= '..';
7175 $bpd_glob = $buildproductsdir;
7176 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7179 if ($ENV{$fakeeditorenv}) {
7181 quilt_fixup_editor();
7187 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
7188 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7189 if $dryrun_level == 1;
7191 print STDERR $helpmsg or die $!;
7194 $cmd = $subcommand = shift @ARGV;
7197 my $pre_fn = ${*::}{"pre_$cmd"};
7198 $pre_fn->() if $pre_fn;
7200 record_maindir if $invoked_in_git_tree;
7203 my $fn = ${*::}{"cmd_$cmd"};
7204 $fn or badusage "unknown operation $cmd";