3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2017 Ian Jackson
6 # Copyright (C)2017 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 = '..';
72 our $existing_package = 'dpkg';
74 our $changes_since_version;
76 our $overwrite_version; # undef: not specified; '': check changelog
78 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
80 our $split_brain_save;
81 our $we_are_responder;
82 our $we_are_initiator;
83 our $initiator_tempdir;
84 our $patches_applied_dirtily = 00;
88 our $chase_dsc_distro=1;
90 our %forceopts = map { $_=>0 }
91 qw(unrepresentable unsupported-source-format
92 dsc-changes-mismatch changes-origs-exactly
93 import-gitapply-absurd
94 import-gitapply-no-absurd
95 import-dsc-with-dgit-field);
97 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
99 our $suite_re = '[-+.0-9a-z]+';
100 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
101 our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?};
102 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
103 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
105 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
106 our $splitbraincache = 'dgit-intern/quilt-cache';
107 our $rewritemap = 'dgit-rewrite/map';
109 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
111 our (@git) = qw(git);
112 our (@dget) = qw(dget);
113 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
114 our (@dput) = qw(dput);
115 our (@debsign) = qw(debsign);
116 our (@gpg) = qw(gpg);
117 our (@sbuild) = qw(sbuild);
119 our (@dgit) = qw(dgit);
120 our (@git_debrebase) = qw(git-debrebase);
121 our (@aptget) = qw(apt-get);
122 our (@aptcache) = qw(apt-cache);
123 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
124 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
125 our (@dpkggenchanges) = qw(dpkg-genchanges);
126 our (@mergechanges) = qw(mergechanges -f);
127 our (@gbp_build) = ('');
128 our (@gbp_pq) = ('gbp pq');
129 our (@changesopts) = ('');
131 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
134 'debsign' => \@debsign,
136 'sbuild' => \@sbuild,
140 'git-debrebase' => \@git_debrebase,
141 'apt-get' => \@aptget,
142 'apt-cache' => \@aptcache,
143 'dpkg-source' => \@dpkgsource,
144 'dpkg-buildpackage' => \@dpkgbuildpackage,
145 'dpkg-genchanges' => \@dpkggenchanges,
146 'gbp-build' => \@gbp_build,
147 'gbp-pq' => \@gbp_pq,
148 'ch' => \@changesopts,
149 'mergechanges' => \@mergechanges);
151 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
152 our %opts_cfg_insertpos = map {
154 scalar @{ $opts_opt_map{$_} }
155 } keys %opts_opt_map;
157 sub parseopts_late_defaults();
158 sub setup_gitattrs(;$);
159 sub check_gitattrs($$);
166 our $supplementary_message = '';
167 our $need_split_build_invocation = 0;
168 our $split_brain = 0;
172 return unless forkcheck_mainprocess();
173 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
176 our $remotename = 'dgit';
177 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
181 if (!defined $absurdity) {
183 $absurdity =~ s{/[^/]+$}{/absurd} or die;
187 my ($v,$distro) = @_;
188 return $tagformatfn->($v, $distro);
191 sub debiantag_maintview ($$) {
192 my ($v,$distro) = @_;
193 return "$distro/".dep14_version_mangle $v;
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 {
282 push @cmd, split /\s+/, shift @_;
288 return opts_opt_multi_cmd @gbp_pq;
291 sub dgit_privdir () {
292 our $dgit_privdir_made //= ensure_a_playground 'dgit';
295 sub branch_gdr_info ($$) {
296 my ($symref, $head) = @_;
297 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
298 gdr_ffq_prev_branchinfo($symref);
299 return () unless $status eq 'branch';
300 $ffq_prev = git_get_ref $ffq_prev;
301 $gdrlast = git_get_ref $gdrlast;
302 $gdrlast &&= is_fast_fwd $gdrlast, $head;
303 return ($ffq_prev, $gdrlast);
306 sub branch_is_gdr ($$) {
307 my ($symref, $head) = @_;
308 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
309 return 0 unless $ffq_prev || $gdrlast;
313 sub branch_is_gdr_unstitched_ff ($$$) {
314 my ($symref, $head, $ancestor) = @_;
315 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
316 return 0 unless $ffq_prev;
317 return 0 unless is_fast_fwd $ancestor, $ffq_prev;
321 #---------- remote protocol support, common ----------
323 # remote push initiator/responder protocol:
324 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
325 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
326 # < dgit-remote-push-ready <actual-proto-vsn>
333 # > supplementary-message NBYTES # $protovsn >= 3
338 # > file parsed-changelog
339 # [indicates that output of dpkg-parsechangelog follows]
340 # > data-block NBYTES
341 # > [NBYTES bytes of data (no newline)]
342 # [maybe some more blocks]
351 # > param head DGIT-VIEW-HEAD
352 # > param csuite SUITE
353 # > param tagformat old|new
354 # > param maint-view MAINT-VIEW-HEAD
356 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
357 # > file buildinfo # for buildinfos to sign
359 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
360 # # goes into tag, for replay prevention
363 # [indicates that signed tag is wanted]
364 # < data-block NBYTES
365 # < [NBYTES bytes of data (no newline)]
366 # [maybe some more blocks]
370 # > want signed-dsc-changes
371 # < data-block NBYTES [transfer of signed dsc]
373 # < data-block NBYTES [transfer of signed changes]
375 # < data-block NBYTES [transfer of each signed buildinfo
376 # [etc] same number and order as "file buildinfo"]
384 sub i_child_report () {
385 # Sees if our child has died, and reap it if so. Returns a string
386 # describing how it died if it failed, or undef otherwise.
387 return undef unless $i_child_pid;
388 my $got = waitpid $i_child_pid, WNOHANG;
389 return undef if $got <= 0;
390 die unless $got == $i_child_pid;
391 $i_child_pid = undef;
392 return undef unless $?;
393 return "build host child ".waitstatusmsg();
398 fail "connection lost: $!" if $fh->error;
399 fail "protocol violation; $m not expected";
402 sub badproto_badread ($$) {
404 fail "connection lost: $!" if $!;
405 my $report = i_child_report();
406 fail $report if defined $report;
407 badproto $fh, "eof (reading $wh)";
410 sub protocol_expect (&$) {
411 my ($match, $fh) = @_;
414 defined && chomp or badproto_badread $fh, "protocol message";
422 badproto $fh, "\`$_'";
425 sub protocol_send_file ($$) {
426 my ($fh, $ourfn) = @_;
427 open PF, "<", $ourfn or die "$ourfn: $!";
430 my $got = read PF, $d, 65536;
431 die "$ourfn: $!" unless defined $got;
433 print $fh "data-block ".length($d)."\n" or die $!;
434 print $fh $d or die $!;
436 PF->error and die "$ourfn $!";
437 print $fh "data-end\n" or die $!;
441 sub protocol_read_bytes ($$) {
442 my ($fh, $nbytes) = @_;
443 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
445 my $got = read $fh, $d, $nbytes;
446 $got==$nbytes or badproto_badread $fh, "data block";
450 sub protocol_receive_file ($$) {
451 my ($fh, $ourfn) = @_;
452 printdebug "() $ourfn\n";
453 open PF, ">", $ourfn or die "$ourfn: $!";
455 my ($y,$l) = protocol_expect {
456 m/^data-block (.*)$/ ? (1,$1) :
457 m/^data-end$/ ? (0,) :
461 my $d = protocol_read_bytes $fh, $l;
462 print PF $d or die $!;
467 #---------- remote protocol support, responder ----------
469 sub responder_send_command ($) {
471 return unless $we_are_responder;
472 # called even without $we_are_responder
473 printdebug ">> $command\n";
474 print PO $command, "\n" or die $!;
477 sub responder_send_file ($$) {
478 my ($keyword, $ourfn) = @_;
479 return unless $we_are_responder;
480 printdebug "]] $keyword $ourfn\n";
481 responder_send_command "file $keyword";
482 protocol_send_file \*PO, $ourfn;
485 sub responder_receive_files ($@) {
486 my ($keyword, @ourfns) = @_;
487 die unless $we_are_responder;
488 printdebug "[[ $keyword @ourfns\n";
489 responder_send_command "want $keyword";
490 foreach my $fn (@ourfns) {
491 protocol_receive_file \*PI, $fn;
494 protocol_expect { m/^files-end$/ } \*PI;
497 #---------- remote protocol support, initiator ----------
499 sub initiator_expect (&) {
501 protocol_expect { &$match } \*RO;
504 #---------- end remote code ----------
507 if ($we_are_responder) {
509 responder_send_command "progress ".length($m) or die $!;
510 print PO $m or die $!;
520 $ua = LWP::UserAgent->new();
524 progress "downloading $what...";
525 my $r = $ua->get(@_) or die $!;
526 return undef if $r->code == 404;
527 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
528 return $r->decoded_content(charset => 'none');
531 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
533 sub act_local () { return $dryrun_level <= 1; }
534 sub act_scary () { return !$dryrun_level; }
537 if (!$dryrun_level) {
538 progress "$us ok: @_";
540 progress "would be ok: @_ (but dry run only)";
545 printcmd(\*STDERR,$debugprefix."#",@_);
548 sub runcmd_ordryrun {
556 sub runcmd_ordryrun_local {
565 my ($first_shell, @cmd) = @_;
566 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
569 our $helpmsg = <<END;
571 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
572 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
573 dgit [dgit-opts] build [dpkg-buildpackage-opts]
574 dgit [dgit-opts] sbuild [sbuild-opts]
575 dgit [dgit-opts] push [dgit-opts] [suite]
576 dgit [dgit-opts] push-source [dgit-opts] [suite]
577 dgit [dgit-opts] rpush build-host:build-dir ...
578 important dgit options:
579 -k<keyid> sign tag and package with <keyid> instead of default
580 --dry-run -n do not change anything, but go through the motions
581 --damp-run -L like --dry-run but make local changes, without signing
582 --new -N allow introducing a new package
583 --debug -D increase debug level
584 -c<name>=<value> set git config option (used directly by dgit too)
587 our $later_warning_msg = <<END;
588 Perhaps the upload is stuck in incoming. Using the version from git.
592 print STDERR "$us: @_\n", $helpmsg or die $!;
597 @ARGV or badusage "too few arguments";
598 return scalar shift @ARGV;
602 not_necessarily_a_tree();
605 print $helpmsg or die $!;
609 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
611 our %defcfg = ('dgit.default.distro' => 'debian',
612 'dgit.default.default-suite' => 'unstable',
613 'dgit.default.old-dsc-distro' => 'debian',
614 'dgit-suite.*-security.distro' => 'debian-security',
615 'dgit.default.username' => '',
616 'dgit.default.archive-query-default-component' => 'main',
617 'dgit.default.ssh' => 'ssh',
618 'dgit.default.archive-query' => 'madison:',
619 'dgit.default.sshpsql-dbname' => 'service=projectb',
620 'dgit.default.aptget-components' => 'main',
621 'dgit.default.dgit-tag-format' => 'new,old,maint',
622 'dgit.dsc-url-proto-ok.http' => 'true',
623 'dgit.dsc-url-proto-ok.https' => 'true',
624 'dgit.dsc-url-proto-ok.git' => 'true',
625 'dgit.default.dsc-url-proto-ok' => 'false',
626 # old means "repo server accepts pushes with old dgit tags"
627 # new means "repo server accepts pushes with new dgit tags"
628 # maint means "repo server accepts split brain pushes"
629 # hist means "repo server may have old pushes without new tag"
630 # ("hist" is implied by "old")
631 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
632 'dgit-distro.debian.git-check' => 'url',
633 'dgit-distro.debian.git-check-suffix' => '/info/refs',
634 'dgit-distro.debian.new-private-pushers' => 't',
635 'dgit-distro.debian/push.git-url' => '',
636 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
637 'dgit-distro.debian/push.git-user-force' => 'dgit',
638 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
639 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
640 'dgit-distro.debian/push.git-create' => 'true',
641 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
642 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
643 # 'dgit-distro.debian.archive-query-tls-key',
644 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
645 # ^ this does not work because curl is broken nowadays
646 # Fixing #790093 properly will involve providing providing the key
647 # in some pacagke and maybe updating these paths.
649 # 'dgit-distro.debian.archive-query-tls-curl-args',
650 # '--ca-path=/etc/ssl/ca-debian',
651 # ^ this is a workaround but works (only) on DSA-administered machines
652 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
653 'dgit-distro.debian.git-url-suffix' => '',
654 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
655 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
656 'dgit-distro.debian-security.archive-query' => 'aptget:',
657 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
658 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
659 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
660 'dgit-distro.debian-security.nominal-distro' => 'debian',
661 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
662 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
663 'dgit-distro.ubuntu.git-check' => 'false',
664 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
665 'dgit-distro.test-dummy.ssh' => "$td/ssh",
666 'dgit-distro.test-dummy.username' => "alice",
667 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
668 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
669 'dgit-distro.test-dummy.git-url' => "$td/git",
670 'dgit-distro.test-dummy.git-host' => "git",
671 'dgit-distro.test-dummy.git-path' => "$td/git",
672 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
673 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
674 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
675 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
679 our @gitcfgsources = qw(cmdline local global system);
680 our $invoked_in_git_tree = 1;
682 sub git_slurp_config () {
683 # This algoritm is a bit subtle, but this is needed so that for
684 # options which we want to be single-valued, we allow the
685 # different config sources to override properly. See #835858.
686 foreach my $src (@gitcfgsources) {
687 next if $src eq 'cmdline';
688 # we do this ourselves since git doesn't handle it
690 $gitcfgs{$src} = git_slurp_config_src $src;
694 sub git_get_config ($) {
696 foreach my $src (@gitcfgsources) {
697 my $l = $gitcfgs{$src}{$c};
698 confess "internal error ($l $c)" if $l && !ref $l;
699 printdebug"C $c ".(defined $l ?
700 join " ", map { messagequote "'$_'" } @$l :
704 @$l==1 or badcfg "multiple values for $c".
705 " (in $src git config)" if @$l > 1;
713 return undef if $c =~ /RETURN-UNDEF/;
714 printdebug "C? $c\n" if $debuglevel >= 5;
715 my $v = git_get_config($c);
716 return $v if defined $v;
717 my $dv = $defcfg{$c};
719 printdebug "CD $c $dv\n" if $debuglevel >= 4;
723 badcfg "need value for one of: @_\n".
724 "$us: distro or suite appears not to be (properly) supported";
727 sub not_necessarily_a_tree () {
728 # needs to be called from pre_*
729 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
730 $invoked_in_git_tree = 0;
733 sub access_basedistro__noalias () {
734 if (defined $idistro) {
737 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
738 return $def if defined $def;
739 foreach my $src (@gitcfgsources, 'internal') {
740 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
742 foreach my $k (keys %$kl) {
743 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
745 next unless match_glob $dpat, $isuite;
749 return cfg("dgit.default.distro");
753 sub access_basedistro () {
754 my $noalias = access_basedistro__noalias();
755 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
756 return $canon // $noalias;
759 sub access_nomdistro () {
760 my $base = access_basedistro();
761 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
762 $r =~ m/^$distro_re$/ or badcfg
763 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
767 sub access_quirk () {
768 # returns (quirk name, distro to use instead or undef, quirk-specific info)
769 my $basedistro = access_basedistro();
770 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
772 if (defined $backports_quirk) {
773 my $re = $backports_quirk;
774 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
776 $re =~ s/\%/([-0-9a-z_]+)/
777 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
778 if ($isuite =~ m/^$re$/) {
779 return ('backports',"$basedistro-backports",$1);
782 return ('none',undef);
787 sub parse_cfg_bool ($$$) {
788 my ($what,$def,$v) = @_;
791 $v =~ m/^[ty1]/ ? 1 :
792 $v =~ m/^[fn0]/ ? 0 :
793 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
796 sub access_forpush_config () {
797 my $d = access_basedistro();
801 parse_cfg_bool('new-private-pushers', 0,
802 cfg("dgit-distro.$d.new-private-pushers",
805 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
808 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
809 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
810 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
811 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
814 sub access_forpush () {
815 $access_forpush //= access_forpush_config();
816 return $access_forpush;
820 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
821 badcfg "pushing but distro is configured readonly"
822 if access_forpush_config() eq '0';
824 $supplementary_message = <<'END' unless $we_are_responder;
825 Push failed, before we got started.
826 You can retry the push, after fixing the problem, if you like.
828 parseopts_late_defaults();
832 parseopts_late_defaults();
835 sub supplementary_message ($) {
837 if (!$we_are_responder) {
838 $supplementary_message = $msg;
840 } elsif ($protovsn >= 3) {
841 responder_send_command "supplementary-message ".length($msg)
843 print PO $msg or die $!;
847 sub access_distros () {
848 # Returns list of distros to try, in order
851 # 0. `instead of' distro name(s) we have been pointed to
852 # 1. the access_quirk distro, if any
853 # 2a. the user's specified distro, or failing that } basedistro
854 # 2b. the distro calculated from the suite }
855 my @l = access_basedistro();
857 my (undef,$quirkdistro) = access_quirk();
858 unshift @l, $quirkdistro;
859 unshift @l, $instead_distro;
860 @l = grep { defined } @l;
862 push @l, access_nomdistro();
864 if (access_forpush()) {
865 @l = map { ("$_/push", $_) } @l;
870 sub access_cfg_cfgs (@) {
873 # The nesting of these loops determines the search order. We put
874 # the key loop on the outside so that we search all the distros
875 # for each key, before going on to the next key. That means that
876 # if access_cfg is called with a more specific, and then a less
877 # specific, key, an earlier distro can override the less specific
878 # without necessarily overriding any more specific keys. (If the
879 # distro wants to override the more specific keys it can simply do
880 # so; whereas if we did the loop the other way around, it would be
881 # impossible to for an earlier distro to override a less specific
882 # key but not the more specific ones without restating the unknown
883 # values of the more specific keys.
886 # We have to deal with RETURN-UNDEF specially, so that we don't
887 # terminate the search prematurely.
889 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
892 foreach my $d (access_distros()) {
893 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
895 push @cfgs, map { "dgit.default.$_" } @realkeys;
902 my (@cfgs) = access_cfg_cfgs(@keys);
903 my $value = cfg(@cfgs);
907 sub access_cfg_bool ($$) {
908 my ($def, @keys) = @_;
909 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
912 sub string_to_ssh ($) {
914 if ($spec =~ m/\s/) {
915 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
921 sub access_cfg_ssh () {
922 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
923 if (!defined $gitssh) {
926 return string_to_ssh $gitssh;
930 sub access_runeinfo ($) {
932 return ": dgit ".access_basedistro()." $info ;";
935 sub access_someuserhost ($) {
937 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
938 defined($user) && length($user) or
939 $user = access_cfg("$some-user",'username');
940 my $host = access_cfg("$some-host");
941 return length($user) ? "$user\@$host" : $host;
944 sub access_gituserhost () {
945 return access_someuserhost('git');
948 sub access_giturl (;$) {
950 my $url = access_cfg('git-url','RETURN-UNDEF');
953 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
954 return undef unless defined $proto;
957 access_gituserhost().
958 access_cfg('git-path');
960 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
963 return "$url/$package$suffix";
966 sub parsecontrolfh ($$;$) {
967 my ($fh, $desc, $allowsigned) = @_;
968 our $dpkgcontrolhash_noissigned;
971 my %opts = ('name' => $desc);
972 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
973 $c = Dpkg::Control::Hash->new(%opts);
974 $c->parse($fh,$desc) or die "parsing of $desc failed";
975 last if $allowsigned;
976 last if $dpkgcontrolhash_noissigned;
977 my $issigned= $c->get_option('is_pgp_signed');
978 if (!defined $issigned) {
979 $dpkgcontrolhash_noissigned= 1;
980 seek $fh, 0,0 or die "seek $desc: $!";
981 } elsif ($issigned) {
982 fail "control file $desc is (already) PGP-signed. ".
983 " Note that dgit push needs to modify the .dsc and then".
984 " do the signature itself";
993 my ($file, $desc, $allowsigned) = @_;
994 my $fh = new IO::Handle;
995 open $fh, '<', $file or die "$file: $!";
996 my $c = parsecontrolfh($fh,$desc,$allowsigned);
997 $fh->error and die $!;
1003 my ($dctrl,$field) = @_;
1004 my $v = $dctrl->{$field};
1005 return $v if defined $v;
1006 fail "missing field $field in ".$dctrl->get_option('name');
1009 sub parsechangelog {
1010 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
1011 my $p = new IO::Handle;
1012 my @cmd = (qw(dpkg-parsechangelog), @_);
1013 open $p, '-|', @cmd or die $!;
1015 $?=0; $!=0; close $p or failedcmd @cmd;
1019 sub commit_getclogp ($) {
1020 # Returns the parsed changelog hashref for a particular commit
1022 our %commit_getclogp_memo;
1023 my $memo = $commit_getclogp_memo{$objid};
1024 return $memo if $memo;
1026 my $mclog = dgit_privdir()."clog";
1027 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1028 "$objid:debian/changelog";
1029 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1032 sub parse_dscdata () {
1033 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1034 printdebug Dumper($dscdata) if $debuglevel>1;
1035 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1036 printdebug Dumper($dsc) if $debuglevel>1;
1041 sub archive_query ($;@) {
1042 my ($method) = shift @_;
1043 fail "this operation does not support multiple comma-separated suites"
1045 my $query = access_cfg('archive-query','RETURN-UNDEF');
1046 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1049 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1052 sub archive_query_prepend_mirror {
1053 my $m = access_cfg('mirror');
1054 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1057 sub pool_dsc_subpath ($$) {
1058 my ($vsn,$component) = @_; # $package is implict arg
1059 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1060 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1063 sub cfg_apply_map ($$$) {
1064 my ($varref, $what, $mapspec) = @_;
1065 return unless $mapspec;
1067 printdebug "config $what EVAL{ $mapspec; }\n";
1069 eval "package Dgit::Config; $mapspec;";
1074 #---------- `ftpmasterapi' archive query method (nascent) ----------
1076 sub archive_api_query_cmd ($) {
1078 my @cmd = (@curl, qw(-sS));
1079 my $url = access_cfg('archive-query-url');
1080 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1082 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1083 foreach my $key (split /\:/, $keys) {
1084 $key =~ s/\%HOST\%/$host/g;
1086 fail "for $url: stat $key: $!" unless $!==ENOENT;
1089 fail "config requested specific TLS key but do not know".
1090 " how to get curl to use exactly that EE key ($key)";
1091 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1092 # # Sadly the above line does not work because of changes
1093 # # to gnutls. The real fix for #790093 may involve
1094 # # new curl options.
1097 # Fixing #790093 properly will involve providing a value
1098 # for this on clients.
1099 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1100 push @cmd, split / /, $kargs if defined $kargs;
1102 push @cmd, $url.$subpath;
1106 sub api_query ($$;$) {
1108 my ($data, $subpath, $ok404) = @_;
1109 badcfg "ftpmasterapi archive query method takes no data part"
1111 my @cmd = archive_api_query_cmd($subpath);
1112 my $url = $cmd[$#cmd];
1113 push @cmd, qw(-w %{http_code});
1114 my $json = cmdoutput @cmd;
1115 unless ($json =~ s/\d+\d+\d$//) {
1116 failedcmd_report_cmd undef, @cmd;
1117 fail "curl failed to print 3-digit HTTP code";
1120 return undef if $code eq '404' && $ok404;
1121 fail "fetch of $url gave HTTP code $code"
1122 unless $url =~ m#^file://# or $code =~ m/^2/;
1123 return decode_json($json);
1126 sub canonicalise_suite_ftpmasterapi {
1127 my ($proto,$data) = @_;
1128 my $suites = api_query($data, 'suites');
1130 foreach my $entry (@$suites) {
1132 my $v = $entry->{$_};
1133 defined $v && $v eq $isuite;
1134 } qw(codename name);
1135 push @matched, $entry;
1137 fail "unknown suite $isuite" unless @matched;
1140 @matched==1 or die "multiple matches for suite $isuite\n";
1141 $cn = "$matched[0]{codename}";
1142 defined $cn or die "suite $isuite info has no codename\n";
1143 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1145 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1150 sub archive_query_ftpmasterapi {
1151 my ($proto,$data) = @_;
1152 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1154 my $digester = Digest::SHA->new(256);
1155 foreach my $entry (@$info) {
1157 my $vsn = "$entry->{version}";
1158 my ($ok,$msg) = version_check $vsn;
1159 die "bad version: $msg\n" unless $ok;
1160 my $component = "$entry->{component}";
1161 $component =~ m/^$component_re$/ or die "bad component";
1162 my $filename = "$entry->{filename}";
1163 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1164 or die "bad filename";
1165 my $sha256sum = "$entry->{sha256sum}";
1166 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1167 push @rows, [ $vsn, "/pool/$component/$filename",
1168 $digester, $sha256sum ];
1170 die "bad ftpmaster api response: $@\n".Dumper($entry)
1173 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1174 return archive_query_prepend_mirror @rows;
1177 sub file_in_archive_ftpmasterapi {
1178 my ($proto,$data,$filename) = @_;
1179 my $pat = $filename;
1182 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1183 my $info = api_query($data, "file_in_archive/$pat", 1);
1186 #---------- `aptget' archive query method ----------
1189 our $aptget_releasefile;
1190 our $aptget_configpath;
1192 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1193 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1195 sub aptget_cache_clean {
1196 runcmd_ordryrun_local qw(sh -ec),
1197 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1201 sub aptget_lock_acquire () {
1202 my $lockfile = "$aptget_base/lock";
1203 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1204 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1207 sub aptget_prep ($) {
1209 return if defined $aptget_base;
1211 badcfg "aptget archive query method takes no data part"
1214 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1217 ensuredir "$cache/dgit";
1219 access_cfg('aptget-cachekey','RETURN-UNDEF')
1220 // access_nomdistro();
1222 $aptget_base = "$cache/dgit/aptget";
1223 ensuredir $aptget_base;
1225 my $quoted_base = $aptget_base;
1226 die "$quoted_base contains bad chars, cannot continue"
1227 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1229 ensuredir $aptget_base;
1231 aptget_lock_acquire();
1233 aptget_cache_clean();
1235 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1236 my $sourceslist = "source.list#$cachekey";
1238 my $aptsuites = $isuite;
1239 cfg_apply_map(\$aptsuites, 'suite map',
1240 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1242 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1243 printf SRCS "deb-src %s %s %s\n",
1244 access_cfg('mirror'),
1246 access_cfg('aptget-components')
1249 ensuredir "$aptget_base/cache";
1250 ensuredir "$aptget_base/lists";
1252 open CONF, ">", $aptget_configpath or die $!;
1254 Debug::NoLocking "true";
1255 APT::Get::List-Cleanup "false";
1256 #clear APT::Update::Post-Invoke-Success;
1257 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1258 Dir::State::Lists "$quoted_base/lists";
1259 Dir::Etc::preferences "$quoted_base/preferences";
1260 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1261 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1264 foreach my $key (qw(
1267 Dir::Cache::Archives
1268 Dir::Etc::SourceParts
1269 Dir::Etc::preferencesparts
1271 ensuredir "$aptget_base/$key";
1272 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1275 my $oldatime = (time // die $!) - 1;
1276 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1277 next unless stat_exists $oldlist;
1278 my ($mtime) = (stat _)[9];
1279 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1282 runcmd_ordryrun_local aptget_aptget(), qw(update);
1285 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1286 next unless stat_exists $oldlist;
1287 my ($atime) = (stat _)[8];
1288 next if $atime == $oldatime;
1289 push @releasefiles, $oldlist;
1291 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1292 @releasefiles = @inreleasefiles if @inreleasefiles;
1293 die "apt updated wrong number of Release files (@releasefiles), erk"
1294 unless @releasefiles == 1;
1296 ($aptget_releasefile) = @releasefiles;
1299 sub canonicalise_suite_aptget {
1300 my ($proto,$data) = @_;
1303 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1305 foreach my $name (qw(Codename Suite)) {
1306 my $val = $release->{$name};
1308 printdebug "release file $name: $val\n";
1309 $val =~ m/^$suite_re$/o or fail
1310 "Release file ($aptget_releasefile) specifies intolerable $name";
1311 cfg_apply_map(\$val, 'suite rmap',
1312 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1319 sub archive_query_aptget {
1320 my ($proto,$data) = @_;
1323 ensuredir "$aptget_base/source";
1324 foreach my $old (<$aptget_base/source/*.dsc>) {
1325 unlink $old or die "$old: $!";
1328 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1329 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1330 # avoids apt-get source failing with ambiguous error code
1332 runcmd_ordryrun_local
1333 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1334 aptget_aptget(), qw(--download-only --only-source source), $package;
1336 my @dscs = <$aptget_base/source/*.dsc>;
1337 fail "apt-get source did not produce a .dsc" unless @dscs;
1338 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1340 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1343 my $uri = "file://". uri_escape $dscs[0];
1344 $uri =~ s{\%2f}{/}gi;
1345 return [ (getfield $pre_dsc, 'Version'), $uri ];
1348 sub file_in_archive_aptget () { return undef; }
1350 #---------- `dummyapicat' archive query method ----------
1352 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1353 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1355 sub file_in_archive_dummycatapi ($$$) {
1356 my ($proto,$data,$filename) = @_;
1357 my $mirror = access_cfg('mirror');
1358 $mirror =~ s#^file://#/# or die "$mirror ?";
1360 my @cmd = (qw(sh -ec), '
1362 find -name "$2" -print0 |
1364 ', qw(x), $mirror, $filename);
1365 debugcmd "-|", @cmd;
1366 open FIA, "-|", @cmd or die $!;
1369 printdebug "| $_\n";
1370 m/^(\w+) (\S+)$/ or die "$_ ?";
1371 push @out, { sha256sum => $1, filename => $2 };
1373 close FIA or die failedcmd @cmd;
1377 #---------- `madison' archive query method ----------
1379 sub archive_query_madison {
1380 return archive_query_prepend_mirror
1381 map { [ @$_[0..1] ] } madison_get_parse(@_);
1384 sub madison_get_parse {
1385 my ($proto,$data) = @_;
1386 die unless $proto eq 'madison';
1387 if (!length $data) {
1388 $data= access_cfg('madison-distro','RETURN-UNDEF');
1389 $data //= access_basedistro();
1391 $rmad{$proto,$data,$package} ||= cmdoutput
1392 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1393 my $rmad = $rmad{$proto,$data,$package};
1396 foreach my $l (split /\n/, $rmad) {
1397 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1398 \s*( [^ \t|]+ )\s* \|
1399 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1400 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1401 $1 eq $package or die "$rmad $package ?";
1408 $component = access_cfg('archive-query-default-component');
1410 $5 eq 'source' or die "$rmad ?";
1411 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1413 return sort { -version_compare($a->[0],$b->[0]); } @out;
1416 sub canonicalise_suite_madison {
1417 # madison canonicalises for us
1418 my @r = madison_get_parse(@_);
1420 "unable to canonicalise suite using package $package".
1421 " which does not appear to exist in suite $isuite;".
1422 " --existing-package may help";
1426 sub file_in_archive_madison { return undef; }
1428 #---------- `sshpsql' archive query method ----------
1431 my ($data,$runeinfo,$sql) = @_;
1432 if (!length $data) {
1433 $data= access_someuserhost('sshpsql').':'.
1434 access_cfg('sshpsql-dbname');
1436 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1437 my ($userhost,$dbname) = ($`,$'); #';
1439 my @cmd = (access_cfg_ssh, $userhost,
1440 access_runeinfo("ssh-psql $runeinfo").
1441 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1442 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1444 open P, "-|", @cmd or die $!;
1447 printdebug(">|$_|\n");
1450 $!=0; $?=0; close P or failedcmd @cmd;
1452 my $nrows = pop @rows;
1453 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1454 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1455 @rows = map { [ split /\|/, $_ ] } @rows;
1456 my $ncols = scalar @{ shift @rows };
1457 die if grep { scalar @$_ != $ncols } @rows;
1461 sub sql_injection_check {
1462 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1465 sub archive_query_sshpsql ($$) {
1466 my ($proto,$data) = @_;
1467 sql_injection_check $isuite, $package;
1468 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1469 SELECT source.version, component.name, files.filename, files.sha256sum
1471 JOIN src_associations ON source.id = src_associations.source
1472 JOIN suite ON suite.id = src_associations.suite
1473 JOIN dsc_files ON dsc_files.source = source.id
1474 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1475 JOIN component ON component.id = files_archive_map.component_id
1476 JOIN files ON files.id = dsc_files.file
1477 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1478 AND source.source='$package'
1479 AND files.filename LIKE '%.dsc';
1481 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1482 my $digester = Digest::SHA->new(256);
1484 my ($vsn,$component,$filename,$sha256sum) = @$_;
1485 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1487 return archive_query_prepend_mirror @rows;
1490 sub canonicalise_suite_sshpsql ($$) {
1491 my ($proto,$data) = @_;
1492 sql_injection_check $isuite;
1493 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1494 SELECT suite.codename
1495 FROM suite where suite_name='$isuite' or codename='$isuite';
1497 @rows = map { $_->[0] } @rows;
1498 fail "unknown suite $isuite" unless @rows;
1499 die "ambiguous $isuite: @rows ?" if @rows>1;
1503 sub file_in_archive_sshpsql ($$$) { return undef; }
1505 #---------- `dummycat' archive query method ----------
1507 sub canonicalise_suite_dummycat ($$) {
1508 my ($proto,$data) = @_;
1509 my $dpath = "$data/suite.$isuite";
1510 if (!open C, "<", $dpath) {
1511 $!==ENOENT or die "$dpath: $!";
1512 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1516 chomp or die "$dpath: $!";
1518 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1522 sub archive_query_dummycat ($$) {
1523 my ($proto,$data) = @_;
1524 canonicalise_suite();
1525 my $dpath = "$data/package.$csuite.$package";
1526 if (!open C, "<", $dpath) {
1527 $!==ENOENT or die "$dpath: $!";
1528 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1536 printdebug "dummycat query $csuite $package $dpath | $_\n";
1537 my @row = split /\s+/, $_;
1538 @row==2 or die "$dpath: $_ ?";
1541 C->error and die "$dpath: $!";
1543 return archive_query_prepend_mirror
1544 sort { -version_compare($a->[0],$b->[0]); } @rows;
1547 sub file_in_archive_dummycat () { return undef; }
1549 #---------- tag format handling ----------
1551 sub access_cfg_tagformats () {
1552 split /\,/, access_cfg('dgit-tag-format');
1555 sub access_cfg_tagformats_can_splitbrain () {
1556 my %y = map { $_ => 1 } access_cfg_tagformats;
1557 foreach my $needtf (qw(new maint)) {
1558 next if $y{$needtf};
1564 sub need_tagformat ($$) {
1565 my ($fmt, $why) = @_;
1566 fail "need to use tag format $fmt ($why) but also need".
1567 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1568 " - no way to proceed"
1569 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1570 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1573 sub select_tagformat () {
1575 return if $tagformatfn && !$tagformat_want;
1576 die 'bug' if $tagformatfn && $tagformat_want;
1577 # ... $tagformat_want assigned after previous select_tagformat
1579 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1580 printdebug "select_tagformat supported @supported\n";
1582 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1583 printdebug "select_tagformat specified @$tagformat_want\n";
1585 my ($fmt,$why,$override) = @$tagformat_want;
1587 fail "target distro supports tag formats @supported".
1588 " but have to use $fmt ($why)"
1590 or grep { $_ eq $fmt } @supported;
1592 $tagformat_want = undef;
1594 $tagformatfn = ${*::}{"debiantag_$fmt"};
1596 fail "trying to use unknown tag format \`$fmt' ($why) !"
1597 unless $tagformatfn;
1600 #---------- archive query entrypoints and rest of program ----------
1602 sub canonicalise_suite () {
1603 return if defined $csuite;
1604 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1605 $csuite = archive_query('canonicalise_suite');
1606 if ($isuite ne $csuite) {
1607 progress "canonical suite name for $isuite is $csuite";
1609 progress "canonical suite name is $csuite";
1613 sub get_archive_dsc () {
1614 canonicalise_suite();
1615 my @vsns = archive_query('archive_query');
1616 foreach my $vinfo (@vsns) {
1617 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1618 $dscurl = $vsn_dscurl;
1619 $dscdata = url_get($dscurl);
1621 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1626 $digester->add($dscdata);
1627 my $got = $digester->hexdigest();
1629 fail "$dscurl has hash $got but".
1630 " archive told us to expect $digest";
1633 my $fmt = getfield $dsc, 'Format';
1634 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1635 "unsupported source format $fmt, sorry";
1637 $dsc_checked = !!$digester;
1638 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1642 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1645 sub check_for_git ();
1646 sub check_for_git () {
1648 my $how = access_cfg('git-check');
1649 if ($how eq 'ssh-cmd') {
1651 (access_cfg_ssh, access_gituserhost(),
1652 access_runeinfo("git-check $package").
1653 " set -e; cd ".access_cfg('git-path').";".
1654 " if test -d $package.git; then echo 1; else echo 0; fi");
1655 my $r= cmdoutput @cmd;
1656 if (defined $r and $r =~ m/^divert (\w+)$/) {
1658 my ($usedistro,) = access_distros();
1659 # NB that if we are pushing, $usedistro will be $distro/push
1660 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1661 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1662 progress "diverting to $divert (using config for $instead_distro)";
1663 return check_for_git();
1665 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1667 } elsif ($how eq 'url') {
1668 my $prefix = access_cfg('git-check-url','git-url');
1669 my $suffix = access_cfg('git-check-suffix','git-suffix',
1670 'RETURN-UNDEF') // '.git';
1671 my $url = "$prefix/$package$suffix";
1672 my @cmd = (@curl, qw(-sS -I), $url);
1673 my $result = cmdoutput @cmd;
1674 $result =~ s/^\S+ 200 .*\n\r?\n//;
1675 # curl -sS -I with https_proxy prints
1676 # HTTP/1.0 200 Connection established
1677 $result =~ m/^\S+ (404|200) /s or
1678 fail "unexpected results from git check query - ".
1679 Dumper($prefix, $result);
1681 if ($code eq '404') {
1683 } elsif ($code eq '200') {
1688 } elsif ($how eq 'true') {
1690 } elsif ($how eq 'false') {
1693 badcfg "unknown git-check \`$how'";
1697 sub create_remote_git_repo () {
1698 my $how = access_cfg('git-create');
1699 if ($how eq 'ssh-cmd') {
1701 (access_cfg_ssh, access_gituserhost(),
1702 access_runeinfo("git-create $package").
1703 "set -e; cd ".access_cfg('git-path').";".
1704 " cp -a _template $package.git");
1705 } elsif ($how eq 'true') {
1708 badcfg "unknown git-create \`$how'";
1712 our ($dsc_hash,$lastpush_mergeinput);
1713 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1717 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1718 $playground = fresh_playground 'dgit/unpack';
1721 sub mktree_in_ud_here () {
1722 playtree_setup $gitcfgs{local};
1725 sub git_write_tree () {
1726 my $tree = cmdoutput @git, qw(write-tree);
1727 $tree =~ m/^\w+$/ or die "$tree ?";
1731 sub git_add_write_tree () {
1732 runcmd @git, qw(add -Af .);
1733 return git_write_tree();
1736 sub remove_stray_gits ($) {
1738 my @gitscmd = qw(find -name .git -prune -print0);
1739 debugcmd "|",@gitscmd;
1740 open GITS, "-|", @gitscmd or die $!;
1745 print STDERR "$us: warning: removing from $what: ",
1746 (messagequote $_), "\n";
1750 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1753 sub mktree_in_ud_from_only_subdir ($;$) {
1754 my ($what,$raw) = @_;
1755 # changes into the subdir
1758 die "expected one subdir but found @dirs ?" unless @dirs==1;
1759 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1763 remove_stray_gits($what);
1764 mktree_in_ud_here();
1766 my ($format, $fopts) = get_source_format();
1767 if (madformat($format)) {
1772 my $tree=git_add_write_tree();
1773 return ($tree,$dir);
1776 our @files_csum_info_fields =
1777 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1778 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1779 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1781 sub dsc_files_info () {
1782 foreach my $csumi (@files_csum_info_fields) {
1783 my ($fname, $module, $method) = @$csumi;
1784 my $field = $dsc->{$fname};
1785 next unless defined $field;
1786 eval "use $module; 1;" or die $@;
1788 foreach (split /\n/, $field) {
1790 m/^(\w+) (\d+) (\S+)$/ or
1791 fail "could not parse .dsc $fname line \`$_'";
1792 my $digester = eval "$module"."->$method;" or die $@;
1797 Digester => $digester,
1802 fail "missing any supported Checksums-* or Files field in ".
1803 $dsc->get_option('name');
1807 map { $_->{Filename} } dsc_files_info();
1810 sub files_compare_inputs (@) {
1815 my $showinputs = sub {
1816 return join "; ", map { $_->get_option('name') } @$inputs;
1819 foreach my $in (@$inputs) {
1821 my $in_name = $in->get_option('name');
1823 printdebug "files_compare_inputs $in_name\n";
1825 foreach my $csumi (@files_csum_info_fields) {
1826 my ($fname) = @$csumi;
1827 printdebug "files_compare_inputs $in_name $fname\n";
1829 my $field = $in->{$fname};
1830 next unless defined $field;
1833 foreach (split /\n/, $field) {
1836 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1837 fail "could not parse $in_name $fname line \`$_'";
1839 printdebug "files_compare_inputs $in_name $fname $f\n";
1843 my $re = \ $record{$f}{$fname};
1845 $fchecked{$f}{$in_name} = 1;
1847 fail "hash or size of $f varies in $fname fields".
1848 " (between: ".$showinputs->().")";
1853 @files = sort @files;
1854 $expected_files //= \@files;
1855 "@$expected_files" eq "@files" or
1856 fail "file list in $in_name varies between hash fields!";
1859 fail "$in_name has no files list field(s)";
1861 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1864 grep { keys %$_ == @$inputs-1 } values %fchecked
1865 or fail "no file appears in all file lists".
1866 " (looked in: ".$showinputs->().")";
1869 sub is_orig_file_in_dsc ($$) {
1870 my ($f, $dsc_files_info) = @_;
1871 return 0 if @$dsc_files_info <= 1;
1872 # One file means no origs, and the filename doesn't have a "what
1873 # part of dsc" component. (Consider versions ending `.orig'.)
1874 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1878 sub is_orig_file_of_vsn ($$) {
1879 my ($f, $upstreamvsn) = @_;
1880 my $base = srcfn $upstreamvsn, '';
1881 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1885 # This function determines whether a .changes file is source-only from
1886 # the point of view of dak. Thus, it permits *_source.buildinfo
1889 # It does not, however, permit any other buildinfo files. After a
1890 # source-only upload, the buildds will try to upload files like
1891 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1892 # named like this in their (otherwise) source-only upload, the uploads
1893 # of the buildd can be rejected by dak. Fixing the resultant
1894 # situation can require manual intervention. So we block such
1895 # .buildinfo files when the user tells us to perform a source-only
1896 # upload (such as when using the push-source subcommand with the -C
1897 # option, which calls this function).
1899 # Note, though, that when dgit is told to prepare a source-only
1900 # upload, such as when subcommands like build-source and push-source
1901 # without -C are used, dgit has a more restrictive notion of
1902 # source-only .changes than dak: such uploads will never include
1903 # *_source.buildinfo files. This is because there is no use for such
1904 # files when using a tool like dgit to produce the source package, as
1905 # dgit ensures the source is identical to git HEAD.
1906 sub test_source_only_changes ($) {
1908 foreach my $l (split /\n/, getfield $changes, 'Files') {
1909 $l =~ m/\S+$/ or next;
1910 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1911 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1912 print "purportedly source-only changes polluted by $&\n";
1919 sub changes_update_origs_from_dsc ($$$$) {
1920 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1922 printdebug "checking origs needed ($upstreamvsn)...\n";
1923 $_ = getfield $changes, 'Files';
1924 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1925 fail "cannot find section/priority from .changes Files field";
1926 my $placementinfo = $1;
1928 printdebug "checking origs needed placement '$placementinfo'...\n";
1929 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1930 $l =~ m/\S+$/ or next;
1932 printdebug "origs $file | $l\n";
1933 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1934 printdebug "origs $file is_orig\n";
1935 my $have = archive_query('file_in_archive', $file);
1936 if (!defined $have) {
1938 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1944 printdebug "origs $file \$#\$have=$#$have\n";
1945 foreach my $h (@$have) {
1948 foreach my $csumi (@files_csum_info_fields) {
1949 my ($fname, $module, $method, $archivefield) = @$csumi;
1950 next unless defined $h->{$archivefield};
1951 $_ = $dsc->{$fname};
1952 next unless defined;
1953 m/^(\w+) .* \Q$file\E$/m or
1954 fail ".dsc $fname missing entry for $file";
1955 if ($h->{$archivefield} eq $1) {
1959 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1962 die "$file ".Dumper($h)." ?!" if $same && @differ;
1965 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1968 printdebug "origs $file f.same=$found_same".
1969 " #f._differ=$#found_differ\n";
1970 if (@found_differ && !$found_same) {
1972 "archive contains $file with different checksum",
1975 # Now we edit the changes file to add or remove it
1976 foreach my $csumi (@files_csum_info_fields) {
1977 my ($fname, $module, $method, $archivefield) = @$csumi;
1978 next unless defined $changes->{$fname};
1980 # in archive, delete from .changes if it's there
1981 $changed{$file} = "removed" if
1982 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1983 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1984 # not in archive, but it's here in the .changes
1986 my $dsc_data = getfield $dsc, $fname;
1987 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1989 $extra =~ s/ \d+ /$&$placementinfo /
1990 or die "$fname $extra >$dsc_data< ?"
1991 if $fname eq 'Files';
1992 $changes->{$fname} .= "\n". $extra;
1993 $changed{$file} = "added";
1998 foreach my $file (keys %changed) {
2000 "edited .changes for archive .orig contents: %s %s",
2001 $changed{$file}, $file;
2003 my $chtmp = "$changesfile.tmp";
2004 $changes->save($chtmp);
2006 rename $chtmp,$changesfile or die "$changesfile $!";
2008 progress "[new .changes left in $changesfile]";
2011 progress "$changesfile already has appropriate .orig(s) (if any)";
2015 sub make_commit ($) {
2017 return cmdoutput @git, qw(hash-object -w -t commit), $file;
2020 sub make_commit_text ($) {
2023 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
2025 print Dumper($text) if $debuglevel > 1;
2026 my $child = open2($out, $in, @cmd) or die $!;
2029 print $in $text or die $!;
2030 close $in or die $!;
2032 $h =~ m/^\w+$/ or die;
2034 printdebug "=> $h\n";
2037 waitpid $child, 0 == $child or die "$child $!";
2038 $? and failedcmd @cmd;
2042 sub clogp_authline ($) {
2044 my $author = getfield $clogp, 'Maintainer';
2045 if ($author =~ m/^[^"\@]+\,/) {
2046 # single entry Maintainer field with unquoted comma
2047 $author = ($& =~ y/,//rd).$'; # strip the comma
2049 # git wants a single author; any remaining commas in $author
2050 # are by now preceded by @ (or "). It seems safer to punt on
2051 # "..." for now rather than attempting to dequote or something.
2052 $author =~ s#,.*##ms unless $author =~ m/"/;
2053 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2054 my $authline = "$author $date";
2055 $authline =~ m/$git_authline_re/o or
2056 fail "unexpected commit author line format \`$authline'".
2057 " (was generated from changelog Maintainer field)";
2058 return ($1,$2,$3) if wantarray;
2062 sub vendor_patches_distro ($$) {
2063 my ($checkdistro, $what) = @_;
2064 return unless defined $checkdistro;
2066 my $series = "debian/patches/\L$checkdistro\E.series";
2067 printdebug "checking for vendor-specific $series ($what)\n";
2069 if (!open SERIES, "<", $series) {
2070 die "$series $!" unless $!==ENOENT;
2079 Unfortunately, this source package uses a feature of dpkg-source where
2080 the same source package unpacks to different source code on different
2081 distros. dgit cannot safely operate on such packages on affected
2082 distros, because the meaning of source packages is not stable.
2084 Please ask the distro/maintainer to remove the distro-specific series
2085 files and use a different technique (if necessary, uploading actually
2086 different packages, if different distros are supposed to have
2090 fail "Found active distro-specific series file for".
2091 " $checkdistro ($what): $series, cannot continue";
2093 die "$series $!" if SERIES->error;
2097 sub check_for_vendor_patches () {
2098 # This dpkg-source feature doesn't seem to be documented anywhere!
2099 # But it can be found in the changelog (reformatted):
2101 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2102 # Author: Raphael Hertzog <hertzog@debian.org>
2103 # Date: Sun Oct 3 09:36:48 2010 +0200
2105 # dpkg-source: correctly create .pc/.quilt_series with alternate
2108 # If you have debian/patches/ubuntu.series and you were
2109 # unpacking the source package on ubuntu, quilt was still
2110 # directed to debian/patches/series instead of
2111 # debian/patches/ubuntu.series.
2113 # debian/changelog | 3 +++
2114 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2115 # 2 files changed, 6 insertions(+), 1 deletion(-)
2118 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2119 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2120 "Dpkg::Vendor \`current vendor'");
2121 vendor_patches_distro(access_basedistro(),
2122 "(base) distro being accessed");
2123 vendor_patches_distro(access_nomdistro(),
2124 "(nominal) distro being accessed");
2127 sub generate_commits_from_dsc () {
2128 # See big comment in fetch_from_archive, below.
2129 # See also README.dsc-import.
2131 changedir $playground;
2133 my @dfi = dsc_files_info();
2134 foreach my $fi (@dfi) {
2135 my $f = $fi->{Filename};
2136 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2137 my $upper_f = "$maindir/../$f";
2139 printdebug "considering reusing $f: ";
2141 if (link_ltarget "$upper_f,fetch", $f) {
2142 printdebug "linked (using ...,fetch).\n";
2143 } elsif ((printdebug "($!) "),
2145 fail "accessing ../$f,fetch: $!";
2146 } elsif (link_ltarget $upper_f, $f) {
2147 printdebug "linked.\n";
2148 } elsif ((printdebug "($!) "),
2150 fail "accessing ../$f: $!";
2152 printdebug "absent.\n";
2156 complete_file_from_dsc('.', $fi, \$refetched)
2159 printdebug "considering saving $f: ";
2161 if (link $f, $upper_f) {
2162 printdebug "linked.\n";
2163 } elsif ((printdebug "($!) "),
2165 fail "saving ../$f: $!";
2166 } elsif (!$refetched) {
2167 printdebug "no need.\n";
2168 } elsif (link $f, "$upper_f,fetch") {
2169 printdebug "linked (using ...,fetch).\n";
2170 } elsif ((printdebug "($!) "),
2172 fail "saving ../$f,fetch: $!";
2174 printdebug "cannot.\n";
2178 # We unpack and record the orig tarballs first, so that we only
2179 # need disk space for one private copy of the unpacked source.
2180 # But we can't make them into commits until we have the metadata
2181 # from the debian/changelog, so we record the tree objects now and
2182 # make them into commits later.
2184 my $upstreamv = upstreamversion $dsc->{version};
2185 my $orig_f_base = srcfn $upstreamv, '';
2187 foreach my $fi (@dfi) {
2188 # We actually import, and record as a commit, every tarball
2189 # (unless there is only one file, in which case there seems
2192 my $f = $fi->{Filename};
2193 printdebug "import considering $f ";
2194 (printdebug "only one dfi\n"), next if @dfi == 1;
2195 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2196 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2200 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2202 printdebug "Y ", (join ' ', map { $_//"(none)" }
2203 $compr_ext, $orig_f_part
2206 my $input = new IO::File $f, '<' or die "$f $!";
2210 if (defined $compr_ext) {
2212 Dpkg::Compression::compression_guess_from_filename $f;
2213 fail "Dpkg::Compression cannot handle file $f in source package"
2214 if defined $compr_ext && !defined $cname;
2216 new Dpkg::Compression::Process compression => $cname;
2217 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2218 my $compr_fh = new IO::Handle;
2219 my $compr_pid = open $compr_fh, "-|" // die $!;
2221 open STDIN, "<&", $input or die $!;
2223 die "dgit (child): exec $compr_cmd[0]: $!\n";
2228 rmtree "_unpack-tar";
2229 mkdir "_unpack-tar" or die $!;
2230 my @tarcmd = qw(tar -x -f -
2231 --no-same-owner --no-same-permissions
2232 --no-acls --no-xattrs --no-selinux);
2233 my $tar_pid = fork // die $!;
2235 chdir "_unpack-tar" or die $!;
2236 open STDIN, "<&", $input or die $!;
2238 die "dgit (child): exec $tarcmd[0]: $!";
2240 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2241 !$? or failedcmd @tarcmd;
2244 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2246 # finally, we have the results in "tarball", but maybe
2247 # with the wrong permissions
2249 runcmd qw(chmod -R +rwX _unpack-tar);
2250 changedir "_unpack-tar";
2251 remove_stray_gits($f);
2252 mktree_in_ud_here();
2254 my ($tree) = git_add_write_tree();
2255 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2256 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2258 printdebug "one subtree $1\n";
2260 printdebug "multiple subtrees\n";
2263 rmtree "_unpack-tar";
2265 my $ent = [ $f, $tree ];
2267 Orig => !!$orig_f_part,
2268 Sort => (!$orig_f_part ? 2 :
2269 $orig_f_part =~ m/-/g ? 1 :
2277 # put any without "_" first (spec is not clear whether files
2278 # are always in the usual order). Tarballs without "_" are
2279 # the main orig or the debian tarball.
2280 $a->{Sort} <=> $b->{Sort} or
2284 my $any_orig = grep { $_->{Orig} } @tartrees;
2286 my $dscfn = "$package.dsc";
2288 my $treeimporthow = 'package';
2290 open D, ">", $dscfn or die "$dscfn: $!";
2291 print D $dscdata or die "$dscfn: $!";
2292 close D or die "$dscfn: $!";
2293 my @cmd = qw(dpkg-source);
2294 push @cmd, '--no-check' if $dsc_checked;
2295 if (madformat $dsc->{format}) {
2296 push @cmd, '--skip-patches';
2297 $treeimporthow = 'unpatched';
2299 push @cmd, qw(-x --), $dscfn;
2302 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2303 if (madformat $dsc->{format}) {
2304 check_for_vendor_patches();
2308 if (madformat $dsc->{format}) {
2309 my @pcmd = qw(dpkg-source --before-build .);
2310 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2312 $dappliedtree = git_add_write_tree();
2315 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2316 debugcmd "|",@clogcmd;
2317 open CLOGS, "-|", @clogcmd or die $!;
2322 printdebug "import clog search...\n";
2325 my $stanzatext = do { local $/=""; <CLOGS>; };
2326 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2327 last if !defined $stanzatext;
2329 my $desc = "package changelog, entry no.$.";
2330 open my $stanzafh, "<", \$stanzatext or die;
2331 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2332 $clogp //= $thisstanza;
2334 printdebug "import clog $thisstanza->{version} $desc...\n";
2336 last if !$any_orig; # we don't need $r1clogp
2338 # We look for the first (most recent) changelog entry whose
2339 # version number is lower than the upstream version of this
2340 # package. Then the last (least recent) previous changelog
2341 # entry is treated as the one which introduced this upstream
2342 # version and used for the synthetic commits for the upstream
2345 # One might think that a more sophisticated algorithm would be
2346 # necessary. But: we do not want to scan the whole changelog
2347 # file. Stopping when we see an earlier version, which
2348 # necessarily then is an earlier upstream version, is the only
2349 # realistic way to do that. Then, either the earliest
2350 # changelog entry we have seen so far is indeed the earliest
2351 # upload of this upstream version; or there are only changelog
2352 # entries relating to later upstream versions (which is not
2353 # possible unless the changelog and .dsc disagree about the
2354 # version). Then it remains to choose between the physically
2355 # last entry in the file, and the one with the lowest version
2356 # number. If these are not the same, we guess that the
2357 # versions were created in a non-monotic order rather than
2358 # that the changelog entries have been misordered.
2360 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2362 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2363 $r1clogp = $thisstanza;
2365 printdebug "import clog $r1clogp->{version} becomes r1\n";
2367 die $! if CLOGS->error;
2368 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2370 $clogp or fail "package changelog has no entries!";
2372 my $authline = clogp_authline $clogp;
2373 my $changes = getfield $clogp, 'Changes';
2374 $changes =~ s/^\n//; # Changes: \n
2375 my $cversion = getfield $clogp, 'Version';
2378 $r1clogp //= $clogp; # maybe there's only one entry;
2379 my $r1authline = clogp_authline $r1clogp;
2380 # Strictly, r1authline might now be wrong if it's going to be
2381 # unused because !$any_orig. Whatever.
2383 printdebug "import tartrees authline $authline\n";
2384 printdebug "import tartrees r1authline $r1authline\n";
2386 foreach my $tt (@tartrees) {
2387 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2389 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2392 committer $r1authline
2396 [dgit import orig $tt->{F}]
2404 [dgit import tarball $package $cversion $tt->{F}]
2409 printdebug "import main commit\n";
2411 open C, ">../commit.tmp" or die $!;
2412 print C <<END or die $!;
2415 print C <<END or die $! foreach @tartrees;
2418 print C <<END or die $!;
2424 [dgit import $treeimporthow $package $cversion]
2428 my $rawimport_hash = make_commit qw(../commit.tmp);
2430 if (madformat $dsc->{format}) {
2431 printdebug "import apply patches...\n";
2433 # regularise the state of the working tree so that
2434 # the checkout of $rawimport_hash works nicely.
2435 my $dappliedcommit = make_commit_text(<<END);
2442 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2444 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2446 # We need the answers to be reproducible
2447 my @authline = clogp_authline($clogp);
2448 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2449 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2450 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2451 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2452 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2453 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2455 my $path = $ENV{PATH} or die;
2457 # we use ../../gbp-pq-output, which (given that we are in
2458 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2461 foreach my $use_absurd (qw(0 1)) {
2462 runcmd @git, qw(checkout -q unpa);
2463 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2464 local $ENV{PATH} = $path;
2467 progress "warning: $@";
2468 $path = "$absurdity:$path";
2469 progress "$us: trying slow absurd-git-apply...";
2470 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2475 die "forbid absurd git-apply\n" if $use_absurd
2476 && forceing [qw(import-gitapply-no-absurd)];
2477 die "only absurd git-apply!\n" if !$use_absurd
2478 && forceing [qw(import-gitapply-absurd)];
2480 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2481 local $ENV{PATH} = $path if $use_absurd;
2483 my @showcmd = (gbp_pq, qw(import));
2484 my @realcmd = shell_cmd
2485 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2486 debugcmd "+",@realcmd;
2487 if (system @realcmd) {
2488 die +(shellquote @showcmd).
2490 failedcmd_waitstatus()."\n";
2493 my $gapplied = git_rev_parse('HEAD');
2494 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2495 $gappliedtree eq $dappliedtree or
2497 gbp-pq import and dpkg-source disagree!
2498 gbp-pq import gave commit $gapplied
2499 gbp-pq import gave tree $gappliedtree
2500 dpkg-source --before-build gave tree $dappliedtree
2502 $rawimport_hash = $gapplied;
2507 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2512 progress "synthesised git commit from .dsc $cversion";
2514 my $rawimport_mergeinput = {
2515 Commit => $rawimport_hash,
2516 Info => "Import of source package",
2518 my @output = ($rawimport_mergeinput);
2520 if ($lastpush_mergeinput) {
2521 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2522 my $oversion = getfield $oldclogp, 'Version';
2524 version_compare($oversion, $cversion);
2526 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2527 { Message => <<END, ReverseParents => 1 });
2528 Record $package ($cversion) in archive suite $csuite
2530 } elsif ($vcmp > 0) {
2531 print STDERR <<END or die $!;
2533 Version actually in archive: $cversion (older)
2534 Last version pushed with dgit: $oversion (newer or same)
2537 @output = $lastpush_mergeinput;
2539 # Same version. Use what's in the server git branch,
2540 # discarding our own import. (This could happen if the
2541 # server automatically imports all packages into git.)
2542 @output = $lastpush_mergeinput;
2550 sub complete_file_from_dsc ($$;$) {
2551 our ($dstdir, $fi, $refetched) = @_;
2552 # Ensures that we have, in $dstdir, the file $fi, with the correct
2553 # contents. (Downloading it from alongside $dscurl if necessary.)
2554 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2555 # and will set $$refetched=1 if it did so (or tried to).
2557 my $f = $fi->{Filename};
2558 my $tf = "$dstdir/$f";
2562 my $checkhash = sub {
2563 open F, "<", "$tf" or die "$tf: $!";
2564 $fi->{Digester}->reset();
2565 $fi->{Digester}->addfile(*F);
2566 F->error and die $!;
2567 $got = $fi->{Digester}->hexdigest();
2568 return $got eq $fi->{Hash};
2571 if (stat_exists $tf) {
2572 if ($checkhash->()) {
2573 progress "using existing $f";
2577 fail "file $f has hash $got but .dsc".
2578 " demands hash $fi->{Hash} ".
2579 "(perhaps you should delete this file?)";
2581 progress "need to fetch correct version of $f";
2582 unlink $tf or die "$tf $!";
2585 printdebug "$tf does not exist, need to fetch\n";
2589 $furl =~ s{/[^/]+$}{};
2591 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2592 die "$f ?" if $f =~ m#/#;
2593 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2594 return 0 if !act_local();
2597 fail "file $f has hash $got but .dsc".
2598 " demands hash $fi->{Hash} ".
2599 "(got wrong file from archive!)";
2604 sub ensure_we_have_orig () {
2605 my @dfi = dsc_files_info();
2606 foreach my $fi (@dfi) {
2607 my $f = $fi->{Filename};
2608 next unless is_orig_file_in_dsc($f, \@dfi);
2609 complete_file_from_dsc('..', $fi)
2614 #---------- git fetch ----------
2616 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2617 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2619 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2620 # locally fetched refs because they have unhelpful names and clutter
2621 # up gitk etc. So we track whether we have "used up" head ref (ie,
2622 # whether we have made another local ref which refers to this object).
2624 # (If we deleted them unconditionally, then we might end up
2625 # re-fetching the same git objects each time dgit fetch was run.)
2627 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2628 # in git_fetch_us to fetch the refs in question, and possibly a call
2629 # to lrfetchref_used.
2631 our (%lrfetchrefs_f, %lrfetchrefs_d);
2632 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2634 sub lrfetchref_used ($) {
2635 my ($fullrefname) = @_;
2636 my $objid = $lrfetchrefs_f{$fullrefname};
2637 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2640 sub git_lrfetch_sane {
2641 my ($url, $supplementary, @specs) = @_;
2642 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2643 # at least as regards @specs. Also leave the results in
2644 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2645 # able to clean these up.
2647 # With $supplementary==1, @specs must not contain wildcards
2648 # and we add to our previous fetches (non-atomically).
2650 # This is rather miserable:
2651 # When git fetch --prune is passed a fetchspec ending with a *,
2652 # it does a plausible thing. If there is no * then:
2653 # - it matches subpaths too, even if the supplied refspec
2654 # starts refs, and behaves completely madly if the source
2655 # has refs/refs/something. (See, for example, Debian #NNNN.)
2656 # - if there is no matching remote ref, it bombs out the whole
2658 # We want to fetch a fixed ref, and we don't know in advance
2659 # if it exists, so this is not suitable.
2661 # Our workaround is to use git ls-remote. git ls-remote has its
2662 # own qairks. Notably, it has the absurd multi-tail-matching
2663 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2664 # refs/refs/foo etc.
2666 # Also, we want an idempotent snapshot, but we have to make two
2667 # calls to the remote: one to git ls-remote and to git fetch. The
2668 # solution is use git ls-remote to obtain a target state, and
2669 # git fetch to try to generate it. If we don't manage to generate
2670 # the target state, we try again.
2672 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2674 my $specre = join '|', map {
2677 my $wildcard = $x =~ s/\\\*$/.*/;
2678 die if $wildcard && $supplementary;
2681 printdebug "git_lrfetch_sane specre=$specre\n";
2682 my $wanted_rref = sub {
2684 return m/^(?:$specre)$/;
2687 my $fetch_iteration = 0;
2690 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2691 if (++$fetch_iteration > 10) {
2692 fail "too many iterations trying to get sane fetch!";
2695 my @look = map { "refs/$_" } @specs;
2696 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2700 open GITLS, "-|", @lcmd or die $!;
2702 printdebug "=> ", $_;
2703 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2704 my ($objid,$rrefname) = ($1,$2);
2705 if (!$wanted_rref->($rrefname)) {
2707 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2711 $wantr{$rrefname} = $objid;
2714 close GITLS or failedcmd @lcmd;
2716 # OK, now %want is exactly what we want for refs in @specs
2718 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2719 "+refs/$_:".lrfetchrefs."/$_";
2722 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2724 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2725 runcmd_ordryrun_local @fcmd if @fspecs;
2727 if (!$supplementary) {
2728 %lrfetchrefs_f = ();
2732 git_for_each_ref(lrfetchrefs, sub {
2733 my ($objid,$objtype,$lrefname,$reftail) = @_;
2734 $lrfetchrefs_f{$lrefname} = $objid;
2735 $objgot{$objid} = 1;
2738 if ($supplementary) {
2742 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2743 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2744 if (!exists $wantr{$rrefname}) {
2745 if ($wanted_rref->($rrefname)) {
2747 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2751 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2754 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2755 delete $lrfetchrefs_f{$lrefname};
2759 foreach my $rrefname (sort keys %wantr) {
2760 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2761 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2762 my $want = $wantr{$rrefname};
2763 next if $got eq $want;
2764 if (!defined $objgot{$want}) {
2766 warning: git ls-remote suggests we want $lrefname
2767 warning: and it should refer to $want
2768 warning: but git fetch didn't fetch that object to any relevant ref.
2769 warning: This may be due to a race with someone updating the server.
2770 warning: Will try again...
2772 next FETCH_ITERATION;
2775 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2777 runcmd_ordryrun_local @git, qw(update-ref -m),
2778 "dgit fetch git fetch fixup", $lrefname, $want;
2779 $lrfetchrefs_f{$lrefname} = $want;
2784 if (defined $csuite) {
2785 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2786 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2787 my ($objid,$objtype,$lrefname,$reftail) = @_;
2788 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2789 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2793 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2794 Dumper(\%lrfetchrefs_f);
2797 sub git_fetch_us () {
2798 # Want to fetch only what we are going to use, unless
2799 # deliberately-not-ff, in which case we must fetch everything.
2801 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2803 (quiltmode_splitbrain
2804 ? (map { $_->('*',access_nomdistro) }
2805 \&debiantag_new, \&debiantag_maintview)
2806 : debiantags('*',access_nomdistro));
2807 push @specs, server_branch($csuite);
2808 push @specs, $rewritemap;
2809 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2811 my $url = access_giturl();
2812 git_lrfetch_sane $url, 0, @specs;
2815 my @tagpats = debiantags('*',access_nomdistro);
2817 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2818 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2819 printdebug "currently $fullrefname=$objid\n";
2820 $here{$fullrefname} = $objid;
2822 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2823 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2824 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2825 printdebug "offered $lref=$objid\n";
2826 if (!defined $here{$lref}) {
2827 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2828 runcmd_ordryrun_local @upd;
2829 lrfetchref_used $fullrefname;
2830 } elsif ($here{$lref} eq $objid) {
2831 lrfetchref_used $fullrefname;
2834 "Not updating $lref from $here{$lref} to $objid.\n";
2839 #---------- dsc and archive handling ----------
2841 sub mergeinfo_getclogp ($) {
2842 # Ensures thit $mi->{Clogp} exists and returns it
2844 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2847 sub mergeinfo_version ($) {
2848 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2851 sub fetch_from_archive_record_1 ($) {
2853 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2854 'DGIT_ARCHIVE', $hash;
2855 cmdoutput @git, qw(log -n2), $hash;
2856 # ... gives git a chance to complain if our commit is malformed
2859 sub fetch_from_archive_record_2 ($) {
2861 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2865 dryrun_report @upd_cmd;
2869 sub parse_dsc_field_def_dsc_distro () {
2870 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2871 dgit.default.distro);
2874 sub parse_dsc_field ($$) {
2875 my ($dsc, $what) = @_;
2877 foreach my $field (@ourdscfield) {
2878 $f = $dsc->{$field};
2883 progress "$what: NO git hash";
2884 parse_dsc_field_def_dsc_distro();
2885 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2886 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2887 progress "$what: specified git info ($dsc_distro)";
2888 $dsc_hint_tag = [ $dsc_hint_tag ];
2889 } elsif ($f =~ m/^\w+\s*$/) {
2891 parse_dsc_field_def_dsc_distro();
2892 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2894 progress "$what: specified git hash";
2896 fail "$what: invalid Dgit info";
2900 sub resolve_dsc_field_commit ($$) {
2901 my ($already_distro, $already_mapref) = @_;
2903 return unless defined $dsc_hash;
2906 defined $already_mapref &&
2907 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2908 ? $already_mapref : undef;
2912 my ($what, @fetch) = @_;
2914 local $idistro = $dsc_distro;
2915 my $lrf = lrfetchrefs;
2917 if (!$chase_dsc_distro) {
2919 "not chasing .dsc distro $dsc_distro: not fetching $what";
2924 ".dsc names distro $dsc_distro: fetching $what";
2926 my $url = access_giturl();
2927 if (!defined $url) {
2928 defined $dsc_hint_url or fail <<END;
2929 .dsc Dgit metadata is in context of distro $dsc_distro
2930 for which we have no configured url and .dsc provides no hint
2933 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2934 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2935 parse_cfg_bool "dsc-url-proto-ok", 'false',
2936 cfg("dgit.dsc-url-proto-ok.$proto",
2937 "dgit.default.dsc-url-proto-ok")
2939 .dsc Dgit metadata is in context of distro $dsc_distro
2940 for which we have no configured url;
2941 .dsc provides hinted url with protocol $proto which is unsafe.
2942 (can be overridden by config - consult documentation)
2944 $url = $dsc_hint_url;
2947 git_lrfetch_sane $url, 1, @fetch;
2952 my $rewrite_enable = do {
2953 local $idistro = $dsc_distro;
2954 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2957 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2958 if (!defined $mapref) {
2959 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2960 $mapref = $lrf.'/'.$rewritemap;
2962 my $rewritemapdata = git_cat_file $mapref.':map';
2963 if (defined $rewritemapdata
2964 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2966 "server's git history rewrite map contains a relevant entry!";
2969 if (defined $dsc_hash) {
2970 progress "using rewritten git hash in place of .dsc value";
2972 progress "server data says .dsc hash is to be disregarded";
2977 if (!defined git_cat_file $dsc_hash) {
2978 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2979 my $lrf = $do_fetch->("additional commits", @tags) &&
2980 defined git_cat_file $dsc_hash
2982 .dsc Dgit metadata requires commit $dsc_hash
2983 but we could not obtain that object anywhere.
2985 foreach my $t (@tags) {
2986 my $fullrefname = $lrf.'/'.$t;
2987 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2988 next unless $lrfetchrefs_f{$fullrefname};
2989 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2990 lrfetchref_used $fullrefname;
2995 sub fetch_from_archive () {
2996 ensure_setup_existing_tree();
2998 # Ensures that lrref() is what is actually in the archive, one way
2999 # or another, according to us - ie this client's
3000 # appropritaely-updated archive view. Also returns the commit id.
3001 # If there is nothing in the archive, leaves lrref alone and
3002 # returns undef. git_fetch_us must have already been called.
3006 parse_dsc_field($dsc, 'last upload to archive');
3007 resolve_dsc_field_commit access_basedistro,
3008 lrfetchrefs."/".$rewritemap
3010 progress "no version available from the archive";
3013 # If the archive's .dsc has a Dgit field, there are three
3014 # relevant git commitids we need to choose between and/or merge
3016 # 1. $dsc_hash: the Dgit field from the archive
3017 # 2. $lastpush_hash: the suite branch on the dgit git server
3018 # 3. $lastfetch_hash: our local tracking brach for the suite
3020 # These may all be distinct and need not be in any fast forward
3023 # If the dsc was pushed to this suite, then the server suite
3024 # branch will have been updated; but it might have been pushed to
3025 # a different suite and copied by the archive. Conversely a more
3026 # recent version may have been pushed with dgit but not appeared
3027 # in the archive (yet).
3029 # $lastfetch_hash may be awkward because archive imports
3030 # (particularly, imports of Dgit-less .dscs) are performed only as
3031 # needed on individual clients, so different clients may perform a
3032 # different subset of them - and these imports are only made
3033 # public during push. So $lastfetch_hash may represent a set of
3034 # imports different to a subsequent upload by a different dgit
3037 # Our approach is as follows:
3039 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3040 # descendant of $dsc_hash, then it was pushed by a dgit user who
3041 # had based their work on $dsc_hash, so we should prefer it.
3042 # Otherwise, $dsc_hash was installed into this suite in the
3043 # archive other than by a dgit push, and (necessarily) after the
3044 # last dgit push into that suite (since a dgit push would have
3045 # been descended from the dgit server git branch); thus, in that
3046 # case, we prefer the archive's version (and produce a
3047 # pseudo-merge to overwrite the dgit server git branch).
3049 # (If there is no Dgit field in the archive's .dsc then
3050 # generate_commit_from_dsc uses the version numbers to decide
3051 # whether the suite branch or the archive is newer. If the suite
3052 # branch is newer it ignores the archive's .dsc; otherwise it
3053 # generates an import of the .dsc, and produces a pseudo-merge to
3054 # overwrite the suite branch with the archive contents.)
3056 # The outcome of that part of the algorithm is the `public view',
3057 # and is same for all dgit clients: it does not depend on any
3058 # unpublished history in the local tracking branch.
3060 # As between the public view and the local tracking branch: The
3061 # local tracking branch is only updated by dgit fetch, and
3062 # whenever dgit fetch runs it includes the public view in the
3063 # local tracking branch. Therefore if the public view is not
3064 # descended from the local tracking branch, the local tracking
3065 # branch must contain history which was imported from the archive
3066 # but never pushed; and, its tip is now out of date. So, we make
3067 # a pseudo-merge to overwrite the old imports and stitch the old
3070 # Finally: we do not necessarily reify the public view (as
3071 # described above). This is so that we do not end up stacking two
3072 # pseudo-merges. So what we actually do is figure out the inputs
3073 # to any public view pseudo-merge and put them in @mergeinputs.
3076 # $mergeinputs[]{Commit}
3077 # $mergeinputs[]{Info}
3078 # $mergeinputs[0] is the one whose tree we use
3079 # @mergeinputs is in the order we use in the actual commit)
3082 # $mergeinputs[]{Message} is a commit message to use
3083 # $mergeinputs[]{ReverseParents} if def specifies that parent
3084 # list should be in opposite order
3085 # Such an entry has no Commit or Info. It applies only when found
3086 # in the last entry. (This ugliness is to support making
3087 # identical imports to previous dgit versions.)
3089 my $lastpush_hash = git_get_ref(lrfetchref());
3090 printdebug "previous reference hash=$lastpush_hash\n";
3091 $lastpush_mergeinput = $lastpush_hash && {
3092 Commit => $lastpush_hash,
3093 Info => "dgit suite branch on dgit git server",
3096 my $lastfetch_hash = git_get_ref(lrref());
3097 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3098 my $lastfetch_mergeinput = $lastfetch_hash && {
3099 Commit => $lastfetch_hash,
3100 Info => "dgit client's archive history view",
3103 my $dsc_mergeinput = $dsc_hash && {
3104 Commit => $dsc_hash,
3105 Info => "Dgit field in .dsc from archive",
3109 my $del_lrfetchrefs = sub {
3112 printdebug "del_lrfetchrefs...\n";
3113 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3114 my $objid = $lrfetchrefs_d{$fullrefname};
3115 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3117 $gur ||= new IO::Handle;
3118 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3120 printf $gur "delete %s %s\n", $fullrefname, $objid;
3123 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3127 if (defined $dsc_hash) {
3128 ensure_we_have_orig();
3129 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3130 @mergeinputs = $dsc_mergeinput
3131 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3132 print STDERR <<END or die $!;
3134 Git commit in archive is behind the last version allegedly pushed/uploaded.
3135 Commit referred to by archive: $dsc_hash
3136 Last version pushed with dgit: $lastpush_hash
3139 @mergeinputs = ($lastpush_mergeinput);
3141 # Archive has .dsc which is not a descendant of the last dgit
3142 # push. This can happen if the archive moves .dscs about.
3143 # Just follow its lead.
3144 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3145 progress "archive .dsc names newer git commit";
3146 @mergeinputs = ($dsc_mergeinput);
3148 progress "archive .dsc names other git commit, fixing up";
3149 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3153 @mergeinputs = generate_commits_from_dsc();
3154 # We have just done an import. Now, our import algorithm might
3155 # have been improved. But even so we do not want to generate
3156 # a new different import of the same package. So if the
3157 # version numbers are the same, just use our existing version.
3158 # If the version numbers are different, the archive has changed
3159 # (perhaps, rewound).
3160 if ($lastfetch_mergeinput &&
3161 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3162 (mergeinfo_version $mergeinputs[0]) )) {
3163 @mergeinputs = ($lastfetch_mergeinput);
3165 } elsif ($lastpush_hash) {
3166 # only in git, not in the archive yet
3167 @mergeinputs = ($lastpush_mergeinput);
3168 print STDERR <<END or die $!;
3170 Package not found in the archive, but has allegedly been pushed using dgit.
3174 printdebug "nothing found!\n";
3175 if (defined $skew_warning_vsn) {
3176 print STDERR <<END or die $!;
3178 Warning: relevant archive skew detected.
3179 Archive allegedly contains $skew_warning_vsn
3180 But we were not able to obtain any version from the archive or git.
3184 unshift @end, $del_lrfetchrefs;
3188 if ($lastfetch_hash &&
3190 my $h = $_->{Commit};
3191 $h and is_fast_fwd($lastfetch_hash, $h);
3192 # If true, one of the existing parents of this commit
3193 # is a descendant of the $lastfetch_hash, so we'll
3194 # be ff from that automatically.
3198 push @mergeinputs, $lastfetch_mergeinput;
3201 printdebug "fetch mergeinfos:\n";
3202 foreach my $mi (@mergeinputs) {
3204 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3206 printdebug sprintf " ReverseParents=%d Message=%s",
3207 $mi->{ReverseParents}, $mi->{Message};
3211 my $compat_info= pop @mergeinputs
3212 if $mergeinputs[$#mergeinputs]{Message};
3214 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3217 if (@mergeinputs > 1) {
3219 my $tree_commit = $mergeinputs[0]{Commit};
3221 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3222 $tree =~ m/\n\n/; $tree = $`;
3223 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3226 # We use the changelog author of the package in question the
3227 # author of this pseudo-merge. This is (roughly) correct if
3228 # this commit is simply representing aa non-dgit upload.
3229 # (Roughly because it does not record sponsorship - but we
3230 # don't have sponsorship info because that's in the .changes,
3231 # which isn't in the archivw.)
3233 # But, it might be that we are representing archive history
3234 # updates (including in-archive copies). These are not really
3235 # the responsibility of the person who created the .dsc, but
3236 # there is no-one whose name we should better use. (The
3237 # author of the .dsc-named commit is clearly worse.)
3239 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3240 my $author = clogp_authline $useclogp;
3241 my $cversion = getfield $useclogp, 'Version';
3243 my $mcf = dgit_privdir()."/mergecommit";
3244 open MC, ">", $mcf or die "$mcf $!";
3245 print MC <<END or die $!;
3249 my @parents = grep { $_->{Commit} } @mergeinputs;
3250 @parents = reverse @parents if $compat_info->{ReverseParents};
3251 print MC <<END or die $! foreach @parents;
3255 print MC <<END or die $!;
3261 if (defined $compat_info->{Message}) {
3262 print MC $compat_info->{Message} or die $!;
3264 print MC <<END or die $!;
3265 Record $package ($cversion) in archive suite $csuite
3269 my $message_add_info = sub {
3271 my $mversion = mergeinfo_version $mi;
3272 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3276 $message_add_info->($mergeinputs[0]);
3277 print MC <<END or die $!;
3278 should be treated as descended from
3280 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3284 $hash = make_commit $mcf;
3286 $hash = $mergeinputs[0]{Commit};
3288 printdebug "fetch hash=$hash\n";
3291 my ($lasth, $what) = @_;
3292 return unless $lasth;
3293 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3296 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3298 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3300 fetch_from_archive_record_1($hash);
3302 if (defined $skew_warning_vsn) {
3303 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3304 my $gotclogp = commit_getclogp($hash);
3305 my $got_vsn = getfield $gotclogp, 'Version';
3306 printdebug "SKEW CHECK GOT $got_vsn\n";
3307 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3308 print STDERR <<END or die $!;
3310 Warning: archive skew detected. Using the available version:
3311 Archive allegedly contains $skew_warning_vsn
3312 We were able to obtain only $got_vsn
3318 if ($lastfetch_hash ne $hash) {
3319 fetch_from_archive_record_2($hash);
3322 lrfetchref_used lrfetchref();
3324 check_gitattrs($hash, "fetched source tree");
3326 unshift @end, $del_lrfetchrefs;
3330 sub set_local_git_config ($$) {
3332 runcmd @git, qw(config), $k, $v;
3335 sub setup_mergechangelogs (;$) {
3337 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3339 my $driver = 'dpkg-mergechangelogs';
3340 my $cb = "merge.$driver";
3341 confess unless defined $maindir;
3342 my $attrs = "$maindir_gitcommon/info/attributes";
3343 ensuredir "$maindir_gitcommon/info";
3345 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3346 if (!open ATTRS, "<", $attrs) {
3347 $!==ENOENT or die "$attrs: $!";
3351 next if m{^debian/changelog\s};
3352 print NATTRS $_, "\n" or die $!;
3354 ATTRS->error and die $!;
3357 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3360 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3361 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3363 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3366 sub setup_useremail (;$) {
3368 return unless $always || access_cfg_bool(1, 'setup-useremail');
3371 my ($k, $envvar) = @_;
3372 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3373 return unless defined $v;
3374 set_local_git_config "user.$k", $v;
3377 $setup->('email', 'DEBEMAIL');
3378 $setup->('name', 'DEBFULLNAME');
3381 sub ensure_setup_existing_tree () {
3382 my $k = "remote.$remotename.skipdefaultupdate";
3383 my $c = git_get_config $k;
3384 return if defined $c;
3385 set_local_git_config $k, 'true';
3388 sub open_main_gitattrs () {
3389 confess 'internal error no maindir' unless defined $maindir;
3390 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3392 or die "open $maindir_gitcommon/info/attributes: $!";
3396 sub is_gitattrs_setup () {
3397 my $gai = open_main_gitattrs();
3398 return 0 unless $gai;
3400 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3402 $gai->error and die $!;
3406 sub setup_gitattrs (;$) {
3408 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3410 if (is_gitattrs_setup()) {
3412 [attr]dgit-defuse-attrs already found in .git/info/attributes
3413 not doing further gitattributes setup
3417 my $af = "$maindir_gitcommon/info/attributes";
3418 ensuredir "$maindir_gitcommon/info";
3419 open GAO, "> $af.new" or die $!;
3420 print GAO <<END or die $!;
3422 [attr]dgit-defuse-attrs $negate_harmful_gitattrs
3423 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3425 my $gai = open_main_gitattrs();
3429 print GAO $_, "\n" or die $!;
3431 $gai->error and die $!;
3433 close GAO or die $!;
3434 rename "$af.new", "$af" or die "install $af: $!";
3437 sub setup_new_tree () {
3438 setup_mergechangelogs();
3443 sub check_gitattrs ($$) {
3444 my ($treeish, $what) = @_;
3446 return if is_gitattrs_setup;
3449 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3451 my $gafl = new IO::File;
3452 open $gafl, "-|", @cmd or die $!;
3455 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3457 next unless m{(?:^|/)\.gitattributes$};
3459 # oh dear, found one
3461 dgit: warning: $what contains .gitattributes
3462 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3467 # tree contains no .gitattributes files
3468 $?=0; $!=0; close $gafl or failedcmd @cmd;
3472 sub multisuite_suite_child ($$$) {
3473 my ($tsuite, $merginputs, $fn) = @_;
3474 # in child, sets things up, calls $fn->(), and returns undef
3475 # in parent, returns canonical suite name for $tsuite
3476 my $canonsuitefh = IO::File::new_tmpfile;
3477 my $pid = fork // die $!;
3481 $us .= " [$isuite]";
3482 $debugprefix .= " ";
3483 progress "fetching $tsuite...";
3484 canonicalise_suite();
3485 print $canonsuitefh $csuite, "\n" or die $!;
3486 close $canonsuitefh or die $!;
3490 waitpid $pid,0 == $pid or die $!;
3491 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3492 seek $canonsuitefh,0,0 or die $!;
3493 local $csuite = <$canonsuitefh>;
3494 die $! unless defined $csuite && chomp $csuite;
3496 printdebug "multisuite $tsuite missing\n";
3499 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3500 push @$merginputs, {
3507 sub fork_for_multisuite ($) {
3508 my ($before_fetch_merge) = @_;
3509 # if nothing unusual, just returns ''
3512 # returns 0 to caller in child, to do first of the specified suites
3513 # in child, $csuite is not yet set
3515 # returns 1 to caller in parent, to finish up anything needed after
3516 # in parent, $csuite is set to canonicalised portmanteau
3518 my $org_isuite = $isuite;
3519 my @suites = split /\,/, $isuite;
3520 return '' unless @suites > 1;
3521 printdebug "fork_for_multisuite: @suites\n";
3525 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3527 return 0 unless defined $cbasesuite;
3529 fail "package $package missing in (base suite) $cbasesuite"
3530 unless @mergeinputs;
3532 my @csuites = ($cbasesuite);
3534 $before_fetch_merge->();
3536 foreach my $tsuite (@suites[1..$#suites]) {
3537 $tsuite =~ s/^-/$cbasesuite-/;
3538 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3544 # xxx collecte the ref here
3546 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3547 push @csuites, $csubsuite;
3550 foreach my $mi (@mergeinputs) {
3551 my $ref = git_get_ref $mi->{Ref};
3552 die "$mi->{Ref} ?" unless length $ref;
3553 $mi->{Commit} = $ref;
3556 $csuite = join ",", @csuites;
3558 my $previous = git_get_ref lrref;
3560 unshift @mergeinputs, {
3561 Commit => $previous,
3562 Info => "local combined tracking branch",
3564 "archive seems to have rewound: local tracking branch is ahead!",
3568 foreach my $ix (0..$#mergeinputs) {
3569 $mergeinputs[$ix]{Index} = $ix;
3572 @mergeinputs = sort {
3573 -version_compare(mergeinfo_version $a,
3574 mergeinfo_version $b) # highest version first
3576 $a->{Index} <=> $b->{Index}; # earliest in spec first
3582 foreach my $mi (@mergeinputs) {
3583 printdebug "multisuite merge check $mi->{Info}\n";
3584 foreach my $previous (@needed) {
3585 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3586 printdebug "multisuite merge un-needed $previous->{Info}\n";
3590 printdebug "multisuite merge this-needed\n";
3591 $mi->{Character} = '+';
3594 $needed[0]{Character} = '*';
3596 my $output = $needed[0]{Commit};
3599 printdebug "multisuite merge nontrivial\n";
3600 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3602 my $commit = "tree $tree\n";
3603 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3604 "Input branches:\n";
3606 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3607 printdebug "multisuite merge include $mi->{Info}\n";
3608 $mi->{Character} //= ' ';
3609 $commit .= "parent $mi->{Commit}\n";
3610 $msg .= sprintf " %s %-25s %s\n",
3612 (mergeinfo_version $mi),
3615 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3617 " * marks the highest version branch, which choose to use\n".
3618 " + marks each branch which was not already an ancestor\n\n".
3619 "[dgit multi-suite $csuite]\n";
3621 "author $authline\n".
3622 "committer $authline\n\n";
3623 $output = make_commit_text $commit.$msg;
3624 printdebug "multisuite merge generated $output\n";
3627 fetch_from_archive_record_1($output);
3628 fetch_from_archive_record_2($output);
3630 progress "calculated combined tracking suite $csuite";
3635 sub clone_set_head () {
3636 open H, "> .git/HEAD" or die $!;
3637 print H "ref: ".lref()."\n" or die $!;
3640 sub clone_finish ($) {
3642 runcmd @git, qw(reset --hard), lrref();
3643 runcmd qw(bash -ec), <<'END';
3645 git ls-tree -r --name-only -z HEAD | \
3646 xargs -0r touch -h -r . --
3648 printdone "ready for work in $dstdir";
3652 # in multisuite, returns twice!
3653 # once in parent after first suite fetched,
3654 # and then again in child after everything is finished
3656 badusage "dry run makes no sense with clone" unless act_local();
3658 my $multi_fetched = fork_for_multisuite(sub {
3659 printdebug "multi clone before fetch merge\n";
3663 if ($multi_fetched) {
3664 printdebug "multi clone after fetch merge\n";
3666 clone_finish($dstdir);
3669 printdebug "clone main body\n";
3671 canonicalise_suite();
3672 my $hasgit = check_for_git();
3673 mkdir $dstdir or fail "create \`$dstdir': $!";
3675 runcmd @git, qw(init -q);
3679 my $giturl = access_giturl(1);
3680 if (defined $giturl) {
3681 runcmd @git, qw(remote add), 'origin', $giturl;
3684 progress "fetching existing git history";
3686 runcmd_ordryrun_local @git, qw(fetch origin);
3688 progress "starting new git history";
3690 fetch_from_archive() or no_such_package;
3691 my $vcsgiturl = $dsc->{'Vcs-Git'};
3692 if (length $vcsgiturl) {
3693 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3694 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3696 clone_finish($dstdir);
3700 canonicalise_suite();
3701 if (check_for_git()) {
3704 fetch_from_archive() or no_such_package();
3705 printdone "fetched into ".lrref();
3709 my $multi_fetched = fork_for_multisuite(sub { });
3710 fetch() unless $multi_fetched; # parent
3711 return if $multi_fetched eq '0'; # child
3712 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3714 printdone "fetched to ".lrref()." and merged into HEAD";
3717 sub check_not_dirty () {
3718 foreach my $f (qw(local-options local-patch-header)) {
3719 if (stat_exists "debian/source/$f") {
3720 fail "git tree contains debian/source/$f";
3724 return if $ignoredirty;
3726 git_check_unmodified();
3729 sub commit_admin ($) {
3732 runcmd_ordryrun_local @git, qw(commit -m), $m;
3735 sub quiltify_nofix_bail ($$) {
3736 my ($headinfo, $xinfo) = @_;
3737 if ($quilt_mode eq 'nofix') {
3738 fail "quilt fixup required but quilt mode is \`nofix'\n".
3739 "HEAD commit".$headinfo." differs from tree implied by ".
3740 " debian/patches".$xinfo;
3744 sub commit_quilty_patch () {
3745 my $output = cmdoutput @git, qw(status --porcelain);
3747 foreach my $l (split /\n/, $output) {
3748 next unless $l =~ m/\S/;
3749 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3753 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3755 progress "nothing quilty to commit, ok.";
3758 quiltify_nofix_bail "", " (wanted to commit patch update)";
3759 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3760 runcmd_ordryrun_local @git, qw(add -f), @adds;
3762 Commit Debian 3.0 (quilt) metadata
3764 [dgit ($our_version) quilt-fixup]
3768 sub get_source_format () {
3770 if (open F, "debian/source/options") {
3774 s/\s+$//; # ignore missing final newline
3776 my ($k, $v) = ($`, $'); #');
3777 $v =~ s/^"(.*)"$/$1/;
3783 F->error and die $!;
3786 die $! unless $!==&ENOENT;
3789 if (!open F, "debian/source/format") {
3790 die $! unless $!==&ENOENT;
3794 F->error and die $!;
3796 return ($_, \%options);
3799 sub madformat_wantfixup ($) {
3801 return 0 unless $format eq '3.0 (quilt)';
3802 our $quilt_mode_warned;
3803 if ($quilt_mode eq 'nocheck') {
3804 progress "Not doing any fixup of \`$format' due to".
3805 " ----no-quilt-fixup or --quilt=nocheck"
3806 unless $quilt_mode_warned++;
3809 progress "Format \`$format', need to check/update patch stack"
3810 unless $quilt_mode_warned++;
3814 sub maybe_split_brain_save ($$$) {
3815 my ($headref, $dgitview, $msg) = @_;
3816 # => message fragment "$saved" describing disposition of $dgitview
3817 return "commit id $dgitview" unless defined $split_brain_save;
3818 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3819 @git, qw(update-ref -m),
3820 "dgit --dgit-view-save $msg HEAD=$headref",
3821 $split_brain_save, $dgitview);
3823 return "and left in $split_brain_save";
3826 # An "infopair" is a tuple [ $thing, $what ]
3827 # (often $thing is a commit hash; $what is a description)
3829 sub infopair_cond_equal ($$) {
3831 $x->[0] eq $y->[0] or fail <<END;
3832 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3836 sub infopair_lrf_tag_lookup ($$) {
3837 my ($tagnames, $what) = @_;
3838 # $tagname may be an array ref
3839 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3840 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3841 foreach my $tagname (@tagnames) {
3842 my $lrefname = lrfetchrefs."/tags/$tagname";
3843 my $tagobj = $lrfetchrefs_f{$lrefname};
3844 next unless defined $tagobj;
3845 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3846 return [ git_rev_parse($tagobj), $what ];
3848 fail @tagnames==1 ? <<END : <<END;
3849 Wanted tag $what (@tagnames) on dgit server, but not found
3851 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3855 sub infopair_cond_ff ($$) {
3856 my ($anc,$desc) = @_;
3857 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3858 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3862 sub pseudomerge_version_check ($$) {
3863 my ($clogp, $archive_hash) = @_;
3865 my $arch_clogp = commit_getclogp $archive_hash;
3866 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3867 'version currently in archive' ];
3868 if (defined $overwrite_version) {
3869 if (length $overwrite_version) {
3870 infopair_cond_equal([ $overwrite_version,
3871 '--overwrite= version' ],
3874 my $v = $i_arch_v->[0];
3875 progress "Checking package changelog for archive version $v ...";
3878 my @xa = ("-f$v", "-t$v");
3879 my $vclogp = parsechangelog @xa;
3882 [ (getfield $vclogp, $fn),
3883 "$fn field from dpkg-parsechangelog @xa" ];
3885 my $cv = $gf->('Version');
3886 infopair_cond_equal($i_arch_v, $cv);
3887 $cd = $gf->('Distribution');
3890 $@ =~ s/^dgit: //gm;
3892 "Perhaps debian/changelog does not mention $v ?";
3894 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3895 $cd->[1] is $cd->[0]
3896 Your tree seems to based on earlier (not uploaded) $v.
3901 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3905 sub pseudomerge_make_commit ($$$$ $$) {
3906 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3907 $msg_cmd, $msg_msg) = @_;
3908 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3910 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3911 my $authline = clogp_authline $clogp;
3915 !defined $overwrite_version ? ""
3916 : !length $overwrite_version ? " --overwrite"
3917 : " --overwrite=".$overwrite_version;
3919 # Contributing parent is the first parent - that makes
3920 # git rev-list --first-parent DTRT.
3921 my $pmf = dgit_privdir()."/pseudomerge";
3922 open MC, ">", $pmf or die "$pmf $!";
3923 print MC <<END or die $!;
3926 parent $archive_hash
3936 return make_commit($pmf);
3939 sub splitbrain_pseudomerge ($$$$) {
3940 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3941 # => $merged_dgitview
3942 printdebug "splitbrain_pseudomerge...\n";
3944 # We: debian/PREVIOUS HEAD($maintview)
3945 # expect: o ----------------- o
3948 # a/d/PREVIOUS $dgitview
3951 # we do: `------------------ o
3955 return $dgitview unless defined $archive_hash;
3956 return $dgitview if deliberately_not_fast_forward();
3958 printdebug "splitbrain_pseudomerge...\n";
3960 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3962 if (!defined $overwrite_version) {
3963 progress "Checking that HEAD inciudes all changes in archive...";
3966 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3968 if (defined $overwrite_version) {
3970 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3971 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3972 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3973 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3974 my $i_archive = [ $archive_hash, "current archive contents" ];
3976 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3978 infopair_cond_equal($i_dgit, $i_archive);
3979 infopair_cond_ff($i_dep14, $i_dgit);
3980 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3984 $us: check failed (maybe --overwrite is needed, consult documentation)
3989 my $r = pseudomerge_make_commit
3990 $clogp, $dgitview, $archive_hash, $i_arch_v,
3991 "dgit --quilt=$quilt_mode",
3992 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3993 Declare fast forward from $i_arch_v->[0]
3995 Make fast forward from $i_arch_v->[0]
3998 maybe_split_brain_save $maintview, $r, "pseudomerge";
4000 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
4004 sub plain_overwrite_pseudomerge ($$$) {
4005 my ($clogp, $head, $archive_hash) = @_;
4007 printdebug "plain_overwrite_pseudomerge...";
4009 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4011 return $head if is_fast_fwd $archive_hash, $head;
4013 my $m = "Declare fast forward from $i_arch_v->[0]";
4015 my $r = pseudomerge_make_commit
4016 $clogp, $head, $archive_hash, $i_arch_v,
4019 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
4021 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
4025 sub push_parse_changelog ($) {
4028 my $clogp = Dpkg::Control::Hash->new();
4029 $clogp->load($clogpfn) or die;
4031 my $clogpackage = getfield $clogp, 'Source';
4032 $package //= $clogpackage;
4033 fail "-p specified $package but changelog specified $clogpackage"
4034 unless $package eq $clogpackage;
4035 my $cversion = getfield $clogp, 'Version';
4037 if (!$we_are_initiator) {
4038 # rpush initiator can't do this because it doesn't have $isuite yet
4039 my $tag = debiantag($cversion, access_nomdistro);
4040 runcmd @git, qw(check-ref-format), $tag;
4043 my $dscfn = dscfn($cversion);
4045 return ($clogp, $cversion, $dscfn);
4048 sub push_parse_dsc ($$$) {
4049 my ($dscfn,$dscfnwhat, $cversion) = @_;
4050 $dsc = parsecontrol($dscfn,$dscfnwhat);
4051 my $dversion = getfield $dsc, 'Version';
4052 my $dscpackage = getfield $dsc, 'Source';
4053 ($dscpackage eq $package && $dversion eq $cversion) or
4054 fail "$dscfn is for $dscpackage $dversion".
4055 " but debian/changelog is for $package $cversion";
4058 sub push_tagwants ($$$$) {
4059 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4062 TagFn => \&debiantag,
4067 if (defined $maintviewhead) {
4069 TagFn => \&debiantag_maintview,
4070 Objid => $maintviewhead,
4071 TfSuffix => '-maintview',
4074 } elsif ($dodep14tag eq 'no' ? 0
4075 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4076 : $dodep14tag eq 'always'
4077 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4078 --dep14tag-always (or equivalent in config) means server must support
4079 both "new" and "maint" tag formats, but config says it doesn't.
4081 : die "$dodep14tag ?") {
4083 TagFn => \&debiantag_maintview,
4085 TfSuffix => '-dgit',
4089 foreach my $tw (@tagwants) {
4090 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4091 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4093 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4097 sub push_mktags ($$ $$ $) {
4099 $changesfile,$changesfilewhat,
4102 die unless $tagwants->[0]{View} eq 'dgit';
4104 my $declaredistro = access_nomdistro();
4105 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4106 $dsc->{$ourdscfield[0]} = join " ",
4107 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4109 $dsc->save("$dscfn.tmp") or die $!;
4111 my $changes = parsecontrol($changesfile,$changesfilewhat);
4112 foreach my $field (qw(Source Distribution Version)) {
4113 $changes->{$field} eq $clogp->{$field} or
4114 fail "changes field $field \`$changes->{$field}'".
4115 " does not match changelog \`$clogp->{$field}'";
4118 my $cversion = getfield $clogp, 'Version';
4119 my $clogsuite = getfield $clogp, 'Distribution';
4121 # We make the git tag by hand because (a) that makes it easier
4122 # to control the "tagger" (b) we can do remote signing
4123 my $authline = clogp_authline $clogp;
4124 my $delibs = join(" ", "",@deliberatelies);
4128 my $tfn = $tw->{Tfn};
4129 my $head = $tw->{Objid};
4130 my $tag = $tw->{Tag};
4132 open TO, '>', $tfn->('.tmp') or die $!;
4133 print TO <<END or die $!;
4140 if ($tw->{View} eq 'dgit') {
4141 print TO <<END or die $!;
4142 $package release $cversion for $clogsuite ($csuite) [dgit]
4143 [dgit distro=$declaredistro$delibs]
4145 foreach my $ref (sort keys %previously) {
4146 print TO <<END or die $!;
4147 [dgit previously:$ref=$previously{$ref}]
4150 } elsif ($tw->{View} eq 'maint') {
4151 print TO <<END or die $!;
4152 $package release $cversion for $clogsuite ($csuite)
4153 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4156 die Dumper($tw)."?";
4161 my $tagobjfn = $tfn->('.tmp');
4163 if (!defined $keyid) {
4164 $keyid = access_cfg('keyid','RETURN-UNDEF');
4166 if (!defined $keyid) {
4167 $keyid = getfield $clogp, 'Maintainer';
4169 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4170 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4171 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4172 push @sign_cmd, $tfn->('.tmp');
4173 runcmd_ordryrun @sign_cmd;
4175 $tagobjfn = $tfn->('.signed.tmp');
4176 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4177 $tfn->('.tmp'), $tfn->('.tmp.asc');
4183 my @r = map { $mktag->($_); } @$tagwants;
4187 sub sign_changes ($) {
4188 my ($changesfile) = @_;
4190 my @debsign_cmd = @debsign;
4191 push @debsign_cmd, "-k$keyid" if defined $keyid;
4192 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4193 push @debsign_cmd, $changesfile;
4194 runcmd_ordryrun @debsign_cmd;
4199 printdebug "actually entering push\n";
4201 supplementary_message(<<'END');
4202 Push failed, while checking state of the archive.
4203 You can retry the push, after fixing the problem, if you like.
4205 if (check_for_git()) {
4208 my $archive_hash = fetch_from_archive();
4209 if (!$archive_hash) {
4211 fail "package appears to be new in this suite;".
4212 " if this is intentional, use --new";
4215 supplementary_message(<<'END');
4216 Push failed, while preparing your push.
4217 You can retry the push, after fixing the problem, if you like.
4220 need_tagformat 'new', "quilt mode $quilt_mode"
4221 if quiltmode_splitbrain;
4225 access_giturl(); # check that success is vaguely likely
4226 rpush_handle_protovsn_bothends() if $we_are_initiator;
4229 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4230 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4232 responder_send_file('parsed-changelog', $clogpfn);
4234 my ($clogp, $cversion, $dscfn) =
4235 push_parse_changelog("$clogpfn");
4237 my $dscpath = "$buildproductsdir/$dscfn";
4238 stat_exists $dscpath or
4239 fail "looked for .dsc $dscpath, but $!;".
4240 " maybe you forgot to build";
4242 responder_send_file('dsc', $dscpath);
4244 push_parse_dsc($dscpath, $dscfn, $cversion);
4246 my $format = getfield $dsc, 'Format';
4247 printdebug "format $format\n";
4249 my $symref = git_get_symref();
4250 my $actualhead = git_rev_parse('HEAD');
4252 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4253 runcmd_ordryrun_local @git_debrebase, 'stitch';
4254 $actualhead = git_rev_parse('HEAD');
4257 my $dgithead = $actualhead;
4258 my $maintviewhead = undef;
4260 my $upstreamversion = upstreamversion $clogp->{Version};
4262 if (madformat_wantfixup($format)) {
4263 # user might have not used dgit build, so maybe do this now:
4264 if (quiltmode_splitbrain()) {
4265 changedir $playground;
4266 quilt_make_fake_dsc($upstreamversion);
4268 ($dgithead, $cachekey) =
4269 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4271 "--quilt=$quilt_mode but no cached dgit view:
4272 perhaps HEAD changed since dgit build[-source] ?";
4274 $dgithead = splitbrain_pseudomerge($clogp,
4275 $actualhead, $dgithead,
4277 $maintviewhead = $actualhead;
4279 prep_ud(); # so _only_subdir() works, below
4281 commit_quilty_patch();
4285 if (defined $overwrite_version && !defined $maintviewhead) {
4286 $dgithead = plain_overwrite_pseudomerge($clogp,
4294 if ($archive_hash) {
4295 if (is_fast_fwd($archive_hash, $dgithead)) {
4297 } elsif (deliberately_not_fast_forward) {
4300 fail "dgit push: HEAD is not a descendant".
4301 " of the archive's version.\n".
4302 "To overwrite the archive's contents,".
4303 " pass --overwrite[=VERSION].\n".
4304 "To rewind history, if permitted by the archive,".
4305 " use --deliberately-not-fast-forward.";
4309 changedir $playground;
4310 progress "checking that $dscfn corresponds to HEAD";
4311 runcmd qw(dpkg-source -x --),
4312 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4313 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4314 check_for_vendor_patches() if madformat($dsc->{format});
4316 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4317 debugcmd "+",@diffcmd;
4319 my $r = system @diffcmd;
4322 my $referent = $split_brain ? $dgithead : 'HEAD';
4323 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4326 my $raw = cmdoutput @git,
4327 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4329 foreach (split /\0/, $raw) {
4330 if (defined $changed) {
4331 push @mode_changes, "$changed: $_\n" if $changed;
4334 } elsif (m/^:0+ 0+ /) {
4336 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4337 $changed = "Mode change from $1 to $2"
4342 if (@mode_changes) {
4343 fail <<END.(join '', @mode_changes).<<END;
4344 HEAD specifies a different tree to $dscfn:
4347 There is a problem with your source tree (see dgit(7) for some hints).
4348 To see a full diff, run git diff $tree $referent
4353 HEAD specifies a different tree to $dscfn:
4355 Perhaps you forgot to build. Or perhaps there is a problem with your
4356 source tree (see dgit(7) for some hints). To see a full diff, run
4357 git diff $tree $referent
4363 if (!$changesfile) {
4364 my $pat = changespat $cversion;
4365 my @cs = glob "$buildproductsdir/$pat";
4366 fail "failed to find unique changes file".
4367 " (looked for $pat in $buildproductsdir);".
4368 " perhaps you need to use dgit -C"
4370 ($changesfile) = @cs;
4372 $changesfile = "$buildproductsdir/$changesfile";
4375 # Check that changes and .dsc agree enough
4376 $changesfile =~ m{[^/]*$};
4377 my $changes = parsecontrol($changesfile,$&);
4378 files_compare_inputs($dsc, $changes)
4379 unless forceing [qw(dsc-changes-mismatch)];
4381 # Perhaps adjust .dsc to contain right set of origs
4382 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4384 unless forceing [qw(changes-origs-exactly)];
4386 # Checks complete, we're going to try and go ahead:
4388 responder_send_file('changes',$changesfile);
4389 responder_send_command("param head $dgithead");
4390 responder_send_command("param csuite $csuite");
4391 responder_send_command("param isuite $isuite");
4392 responder_send_command("param tagformat $tagformat");
4393 if (defined $maintviewhead) {
4394 die unless ($protovsn//4) >= 4;
4395 responder_send_command("param maint-view $maintviewhead");
4398 # Perhaps send buildinfo(s) for signing
4399 my $changes_files = getfield $changes, 'Files';
4400 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4401 foreach my $bi (@buildinfos) {
4402 responder_send_command("param buildinfo-filename $bi");
4403 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4406 if (deliberately_not_fast_forward) {
4407 git_for_each_ref(lrfetchrefs, sub {
4408 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4409 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4410 responder_send_command("previously $rrefname=$objid");
4411 $previously{$rrefname} = $objid;
4415 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4416 dgit_privdir()."/tag");
4419 supplementary_message(<<'END');
4420 Push failed, while signing the tag.
4421 You can retry the push, after fixing the problem, if you like.
4423 # If we manage to sign but fail to record it anywhere, it's fine.
4424 if ($we_are_responder) {
4425 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4426 responder_receive_files('signed-tag', @tagobjfns);
4428 @tagobjfns = push_mktags($clogp,$dscpath,
4429 $changesfile,$changesfile,
4432 supplementary_message(<<'END');
4433 Push failed, *after* signing the tag.
4434 If you want to try again, you should use a new version number.
4437 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4439 foreach my $tw (@tagwants) {
4440 my $tag = $tw->{Tag};
4441 my $tagobjfn = $tw->{TagObjFn};
4443 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4444 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4445 runcmd_ordryrun_local
4446 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4449 supplementary_message(<<'END');
4450 Push failed, while updating the remote git repository - see messages above.
4451 If you want to try again, you should use a new version number.
4453 if (!check_for_git()) {
4454 create_remote_git_repo();
4457 my @pushrefs = $forceflag.$dgithead.":".rrref();
4458 foreach my $tw (@tagwants) {
4459 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4462 runcmd_ordryrun @git,
4463 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4464 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4466 supplementary_message(<<'END');
4467 Push failed, while obtaining signatures on the .changes and .dsc.
4468 If it was just that the signature failed, you may try again by using
4469 debsign by hand to sign the changes
4471 and then dput to complete the upload.
4472 If you need to change the package, you must use a new version number.
4474 if ($we_are_responder) {
4475 my $dryrunsuffix = act_local() ? "" : ".tmp";
4476 my @rfiles = ($dscpath, $changesfile);
4477 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4478 responder_receive_files('signed-dsc-changes',
4479 map { "$_$dryrunsuffix" } @rfiles);
4482 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4484 progress "[new .dsc left in $dscpath.tmp]";
4486 sign_changes $changesfile;
4489 supplementary_message(<<END);
4490 Push failed, while uploading package(s) to the archive server.
4491 You can retry the upload of exactly these same files with dput of:
4493 If that .changes file is broken, you will need to use a new version
4494 number for your next attempt at the upload.
4496 my $host = access_cfg('upload-host','RETURN-UNDEF');
4497 my @hostarg = defined($host) ? ($host,) : ();
4498 runcmd_ordryrun @dput, @hostarg, $changesfile;
4499 printdone "pushed and uploaded $cversion";
4501 supplementary_message('');
4502 responder_send_command("complete");
4506 not_necessarily_a_tree();
4511 badusage "-p is not allowed with clone; specify as argument instead"
4512 if defined $package;
4515 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4516 ($package,$isuite) = @ARGV;
4517 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4518 ($package,$dstdir) = @ARGV;
4519 } elsif (@ARGV==3) {
4520 ($package,$isuite,$dstdir) = @ARGV;
4522 badusage "incorrect arguments to dgit clone";
4526 $dstdir ||= "$package";
4527 if (stat_exists $dstdir) {
4528 fail "$dstdir already exists";
4532 if ($rmonerror && !$dryrun_level) {
4533 $cwd_remove= getcwd();
4535 return unless defined $cwd_remove;
4536 if (!chdir "$cwd_remove") {
4537 return if $!==&ENOENT;
4538 die "chdir $cwd_remove: $!";
4540 printdebug "clone rmonerror removing $dstdir\n";
4542 rmtree($dstdir) or die "remove $dstdir: $!\n";
4543 } elsif (grep { $! == $_ }
4544 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4546 print STDERR "check whether to remove $dstdir: $!\n";
4552 $cwd_remove = undef;
4555 sub branchsuite () {
4556 my $branch = git_get_symref();
4557 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4564 sub fetchpullargs () {
4565 if (!defined $package) {
4566 my $sourcep = parsecontrol('debian/control','debian/control');
4567 $package = getfield $sourcep, 'Source';
4570 $isuite = branchsuite();
4572 my $clogp = parsechangelog();
4573 my $clogsuite = getfield $clogp, 'Distribution';
4574 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4576 } elsif (@ARGV==1) {
4579 badusage "incorrect arguments to dgit fetch or dgit pull";
4587 my $multi_fetched = fork_for_multisuite(sub { });
4588 finish 0 if $multi_fetched;
4595 if (quiltmode_splitbrain()) {
4596 my ($format, $fopts) = get_source_format();
4597 madformat($format) and fail <<END
4598 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4606 build_or_push_prep_early();
4611 } elsif (@ARGV==1) {
4612 ($specsuite) = (@ARGV);
4614 badusage "incorrect arguments to dgit $subcommand";
4617 local ($package) = $existing_package; # this is a hack
4618 canonicalise_suite();
4620 canonicalise_suite();
4622 if (defined $specsuite &&
4623 $specsuite ne $isuite &&
4624 $specsuite ne $csuite) {
4625 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4626 " but command line specifies $specsuite";
4635 sub cmd_push_source {
4638 my $changes = parsecontrol("$buildproductsdir/$changesfile",
4639 "source changes file");
4640 unless (test_source_only_changes($changes)) {
4641 fail "user-specified changes file is not source-only";
4644 # Building a source package is very fast, so just do it
4645 build_source_for_push();
4650 #---------- remote commands' implementation ----------
4652 sub pre_remote_push_build_host {
4653 my ($nrargs) = shift @ARGV;
4654 my (@rargs) = @ARGV[0..$nrargs-1];
4655 @ARGV = @ARGV[$nrargs..$#ARGV];
4657 my ($dir,$vsnwant) = @rargs;
4658 # vsnwant is a comma-separated list; we report which we have
4659 # chosen in our ready response (so other end can tell if they
4662 $we_are_responder = 1;
4663 $us .= " (build host)";
4665 open PI, "<&STDIN" or die $!;
4666 open STDIN, "/dev/null" or die $!;
4667 open PO, ">&STDOUT" or die $!;
4669 open STDOUT, ">&STDERR" or die $!;
4673 ($protovsn) = grep {
4674 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4675 } @rpushprotovsn_support;
4677 fail "build host has dgit rpush protocol versions ".
4678 (join ",", @rpushprotovsn_support).
4679 " but invocation host has $vsnwant"
4680 unless defined $protovsn;
4684 sub cmd_remote_push_build_host {
4685 responder_send_command("dgit-remote-push-ready $protovsn");
4689 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4690 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4691 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4692 # a good error message)
4694 sub rpush_handle_protovsn_bothends () {
4695 if ($protovsn < 4) {
4696 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4705 my $report = i_child_report();
4706 if (defined $report) {
4707 printdebug "($report)\n";
4708 } elsif ($i_child_pid) {
4709 printdebug "(killing build host child $i_child_pid)\n";
4710 kill 15, $i_child_pid;
4712 if (defined $i_tmp && !defined $initiator_tempdir) {
4714 eval { rmtree $i_tmp; };
4719 return unless forkcheck_mainprocess();
4724 my ($base,$selector,@args) = @_;
4725 $selector =~ s/\-/_/g;
4726 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4730 not_necessarily_a_tree();
4735 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4743 push @rargs, join ",", @rpushprotovsn_support;
4746 push @rdgit, @ropts;
4747 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4749 my @cmd = (@ssh, $host, shellquote @rdgit);
4752 $we_are_initiator=1;
4754 if (defined $initiator_tempdir) {
4755 rmtree $initiator_tempdir;
4756 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4757 $i_tmp = $initiator_tempdir;
4761 $i_child_pid = open2(\*RO, \*RI, @cmd);
4763 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4764 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4765 $supplementary_message = '' unless $protovsn >= 3;
4768 my ($icmd,$iargs) = initiator_expect {
4769 m/^(\S+)(?: (.*))?$/;
4772 i_method "i_resp", $icmd, $iargs;
4776 sub i_resp_progress ($) {
4778 my $msg = protocol_read_bytes \*RO, $rhs;
4782 sub i_resp_supplementary_message ($) {
4784 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4787 sub i_resp_complete {
4788 my $pid = $i_child_pid;
4789 $i_child_pid = undef; # prevents killing some other process with same pid
4790 printdebug "waiting for build host child $pid...\n";
4791 my $got = waitpid $pid, 0;
4792 die $! unless $got == $pid;
4793 die "build host child failed $?" if $?;
4796 printdebug "all done\n";
4800 sub i_resp_file ($) {
4802 my $localname = i_method "i_localname", $keyword;
4803 my $localpath = "$i_tmp/$localname";
4804 stat_exists $localpath and
4805 badproto \*RO, "file $keyword ($localpath) twice";
4806 protocol_receive_file \*RO, $localpath;
4807 i_method "i_file", $keyword;
4812 sub i_resp_param ($) {
4813 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4817 sub i_resp_previously ($) {
4818 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4819 or badproto \*RO, "bad previously spec";
4820 my $r = system qw(git check-ref-format), $1;
4821 die "bad previously ref spec ($r)" if $r;
4822 $previously{$1} = $2;
4827 sub i_resp_want ($) {
4829 die "$keyword ?" if $i_wanted{$keyword}++;
4831 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4832 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4833 die unless $isuite =~ m/^$suite_re$/;
4836 rpush_handle_protovsn_bothends();
4838 fail "rpush negotiated protocol version $protovsn".
4839 " which does not support quilt mode $quilt_mode"
4840 if quiltmode_splitbrain;
4842 my @localpaths = i_method "i_want", $keyword;
4843 printdebug "[[ $keyword @localpaths\n";
4844 foreach my $localpath (@localpaths) {
4845 protocol_send_file \*RI, $localpath;
4847 print RI "files-end\n" or die $!;
4850 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4852 sub i_localname_parsed_changelog {
4853 return "remote-changelog.822";
4855 sub i_file_parsed_changelog {
4856 ($i_clogp, $i_version, $i_dscfn) =
4857 push_parse_changelog "$i_tmp/remote-changelog.822";
4858 die if $i_dscfn =~ m#/|^\W#;
4861 sub i_localname_dsc {
4862 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4867 sub i_localname_buildinfo ($) {
4868 my $bi = $i_param{'buildinfo-filename'};
4869 defined $bi or badproto \*RO, "buildinfo before filename";
4870 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4871 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4872 or badproto \*RO, "improper buildinfo filename";
4875 sub i_file_buildinfo {
4876 my $bi = $i_param{'buildinfo-filename'};
4877 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4878 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4879 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4880 files_compare_inputs($bd, $ch);
4881 (getfield $bd, $_) eq (getfield $ch, $_) or
4882 fail "buildinfo mismatch $_"
4883 foreach qw(Source Version);
4884 !defined $bd->{$_} or
4885 fail "buildinfo contains $_"
4886 foreach qw(Changes Changed-by Distribution);
4888 push @i_buildinfos, $bi;
4889 delete $i_param{'buildinfo-filename'};
4892 sub i_localname_changes {
4893 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4894 $i_changesfn = $i_dscfn;
4895 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4896 return $i_changesfn;
4898 sub i_file_changes { }
4900 sub i_want_signed_tag {
4901 printdebug Dumper(\%i_param, $i_dscfn);
4902 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4903 && defined $i_param{'csuite'}
4904 or badproto \*RO, "premature desire for signed-tag";
4905 my $head = $i_param{'head'};
4906 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4908 my $maintview = $i_param{'maint-view'};
4909 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4912 if ($protovsn >= 4) {
4913 my $p = $i_param{'tagformat'} // '<undef>';
4915 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4918 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4920 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4922 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4925 push_mktags $i_clogp, $i_dscfn,
4926 $i_changesfn, 'remote changes',
4930 sub i_want_signed_dsc_changes {
4931 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4932 sign_changes $i_changesfn;
4933 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4936 #---------- building etc. ----------
4942 #----- `3.0 (quilt)' handling -----
4944 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4946 sub quiltify_dpkg_commit ($$$;$) {
4947 my ($patchname,$author,$msg, $xinfo) = @_;
4950 mkpath '.git/dgit'; # we are in playtree
4951 my $descfn = ".git/dgit/quilt-description.tmp";
4952 open O, '>', $descfn or die "$descfn: $!";
4953 $msg =~ s/\n+/\n\n/;
4954 print O <<END or die $!;
4956 ${xinfo}Subject: $msg
4963 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4964 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4965 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4966 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4970 sub quiltify_trees_differ ($$;$$$) {
4971 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4972 # returns true iff the two tree objects differ other than in debian/
4973 # with $finegrained,
4974 # returns bitmask 01 - differ in upstream files except .gitignore
4975 # 02 - differ in .gitignore
4976 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4977 # is set for each modified .gitignore filename $fn
4978 # if $unrepres is defined, array ref to which is appeneded
4979 # a list of unrepresentable changes (removals of upstream files
4982 my @cmd = (@git, qw(diff-tree -z --no-renames));
4983 push @cmd, qw(--name-only) unless $unrepres;
4984 push @cmd, qw(-r) if $finegrained || $unrepres;
4986 my $diffs= cmdoutput @cmd;
4989 foreach my $f (split /\0/, $diffs) {
4990 if ($unrepres && !@lmodes) {
4991 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4994 my ($oldmode,$newmode) = @lmodes;
4997 next if $f =~ m#^debian(?:/.*)?$#s;
5001 die "not a plain file or symlink\n"
5002 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5003 $oldmode =~ m/^(?:10|12)\d{4}$/;
5004 if ($oldmode =~ m/[^0]/ &&
5005 $newmode =~ m/[^0]/) {
5006 # both old and new files exist
5007 die "mode or type changed\n" if $oldmode ne $newmode;
5008 die "modified symlink\n" unless $newmode =~ m/^10/;
5009 } elsif ($oldmode =~ m/[^0]/) {
5011 die "deletion of symlink\n"
5012 unless $oldmode =~ m/^10/;
5015 die "creation with non-default mode\n"
5016 unless $newmode =~ m/^100644$/ or
5017 $newmode =~ m/^120000$/;
5021 local $/="\n"; chomp $@;
5022 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5026 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5027 $r |= $isignore ? 02 : 01;
5028 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5030 printdebug "quiltify_trees_differ $x $y => $r\n";
5034 sub quiltify_tree_sentinelfiles ($) {
5035 # lists the `sentinel' files present in the tree
5037 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5038 qw(-- debian/rules debian/control);
5043 sub quiltify_splitbrain_needed () {
5044 if (!$split_brain) {
5045 progress "dgit view: changes are required...";
5046 runcmd @git, qw(checkout -q -b dgit-view);
5051 sub quiltify_splitbrain ($$$$$$) {
5052 my ($clogp, $unapplied, $headref, $diffbits,
5053 $editedignores, $cachekey) = @_;
5054 if ($quilt_mode !~ m/gbp|dpm/) {
5055 # treat .gitignore just like any other upstream file
5056 $diffbits = { %$diffbits };
5057 $_ = !!$_ foreach values %$diffbits;
5059 # We would like any commits we generate to be reproducible
5060 my @authline = clogp_authline($clogp);
5061 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5062 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5063 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5064 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5065 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5066 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5068 if ($quilt_mode =~ m/gbp|unapplied/ &&
5069 ($diffbits->{O2H} & 01)) {
5071 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
5072 " but git tree differs from orig in upstream files.";
5073 if (!stat_exists "debian/patches") {
5075 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5079 if ($quilt_mode =~ m/dpm/ &&
5080 ($diffbits->{H2A} & 01)) {
5082 --quilt=$quilt_mode specified, implying patches-applied git tree
5083 but git tree differs from result of applying debian/patches to upstream
5086 if ($quilt_mode =~ m/gbp|unapplied/ &&
5087 ($diffbits->{O2A} & 01)) { # some patches
5088 quiltify_splitbrain_needed();
5089 progress "dgit view: creating patches-applied version using gbp pq";
5090 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5091 # gbp pq import creates a fresh branch; push back to dgit-view
5092 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5093 runcmd @git, qw(checkout -q dgit-view);
5095 if ($quilt_mode =~ m/gbp|dpm/ &&
5096 ($diffbits->{O2A} & 02)) {
5098 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5099 tool which does not create patches for changes to upstream
5100 .gitignores: but, such patches exist in debian/patches.
5103 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5104 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5105 quiltify_splitbrain_needed();
5106 progress "dgit view: creating patch to represent .gitignore changes";
5107 ensuredir "debian/patches";
5108 my $gipatch = "debian/patches/auto-gitignore";
5109 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5110 stat GIPATCH or die "$gipatch: $!";
5111 fail "$gipatch already exists; but want to create it".
5112 " to record .gitignore changes" if (stat _)[7];
5113 print GIPATCH <<END or die "$gipatch: $!";
5114 Subject: Update .gitignore from Debian packaging branch
5116 The Debian packaging git branch contains these updates to the upstream
5117 .gitignore file(s). This patch is autogenerated, to provide these
5118 updates to users of the official Debian archive view of the package.
5120 [dgit ($our_version) update-gitignore]
5123 close GIPATCH or die "$gipatch: $!";
5124 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5125 $unapplied, $headref, "--", sort keys %$editedignores;
5126 open SERIES, "+>>", "debian/patches/series" or die $!;
5127 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5129 defined read SERIES, $newline, 1 or die $!;
5130 print SERIES "\n" or die $! unless $newline eq "\n";
5131 print SERIES "auto-gitignore\n" or die $!;
5132 close SERIES or die $!;
5133 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5135 Commit patch to update .gitignore
5137 [dgit ($our_version) update-gitignore-quilt-fixup]
5141 my $dgitview = git_rev_parse 'HEAD';
5144 # When we no longer need to support squeeze, use --create-reflog
5146 ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
5147 my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
5150 my $oldcache = git_get_ref "refs/$splitbraincache";
5151 if ($oldcache eq $dgitview) {
5152 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5153 # git update-ref doesn't always update, in this case. *sigh*
5154 my $dummy = make_commit_text <<END;
5157 author Dgit <dgit\@example.com> 1000000000 +0000
5158 committer Dgit <dgit\@example.com> 1000000000 +0000
5160 Dummy commit - do not use
5162 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5163 "refs/$splitbraincache", $dummy;
5165 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5168 changedir "$playground/work";
5170 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5171 progress "dgit view: created ($saved)";
5174 sub quiltify ($$$$) {
5175 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5177 # Quilt patchification algorithm
5179 # We search backwards through the history of the main tree's HEAD
5180 # (T) looking for a start commit S whose tree object is identical
5181 # to to the patch tip tree (ie the tree corresponding to the
5182 # current dpkg-committed patch series). For these purposes
5183 # `identical' disregards anything in debian/ - this wrinkle is
5184 # necessary because dpkg-source treates debian/ specially.
5186 # We can only traverse edges where at most one of the ancestors'
5187 # trees differs (in changes outside in debian/). And we cannot
5188 # handle edges which change .pc/ or debian/patches. To avoid
5189 # going down a rathole we avoid traversing edges which introduce
5190 # debian/rules or debian/control. And we set a limit on the
5191 # number of edges we are willing to look at.
5193 # If we succeed, we walk forwards again. For each traversed edge
5194 # PC (with P parent, C child) (starting with P=S and ending with
5195 # C=T) to we do this:
5197 # - dpkg-source --commit with a patch name and message derived from C
5198 # After traversing PT, we git commit the changes which
5199 # should be contained within debian/patches.
5201 # The search for the path S..T is breadth-first. We maintain a
5202 # todo list containing search nodes. A search node identifies a
5203 # commit, and looks something like this:
5205 # Commit => $git_commit_id,
5206 # Child => $c, # or undef if P=T
5207 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5208 # Nontrivial => true iff $p..$c has relevant changes
5215 my %considered; # saves being exponential on some weird graphs
5217 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5220 my ($search,$whynot) = @_;
5221 printdebug " search NOT $search->{Commit} $whynot\n";
5222 $search->{Whynot} = $whynot;
5223 push @nots, $search;
5224 no warnings qw(exiting);
5233 my $c = shift @todo;
5234 next if $considered{$c->{Commit}}++;
5236 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5238 printdebug "quiltify investigate $c->{Commit}\n";
5241 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5242 printdebug " search finished hooray!\n";
5247 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5248 if ($quilt_mode eq 'smash') {
5249 printdebug " search quitting smash\n";
5253 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5254 $not->($c, "has $c_sentinels not $t_sentinels")
5255 if $c_sentinels ne $t_sentinels;
5257 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5258 $commitdata =~ m/\n\n/;
5260 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5261 @parents = map { { Commit => $_, Child => $c } } @parents;
5263 $not->($c, "root commit") if !@parents;
5265 foreach my $p (@parents) {
5266 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5268 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5269 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5271 foreach my $p (@parents) {
5272 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5274 my @cmd= (@git, qw(diff-tree -r --name-only),
5275 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5276 my $patchstackchange = cmdoutput @cmd;
5277 if (length $patchstackchange) {
5278 $patchstackchange =~ s/\n/,/g;
5279 $not->($p, "changed $patchstackchange");
5282 printdebug " search queue P=$p->{Commit} ",
5283 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5289 printdebug "quiltify want to smash\n";
5292 my $x = $_[0]{Commit};
5293 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5296 my $reportnot = sub {
5298 my $s = $abbrev->($notp);
5299 my $c = $notp->{Child};
5300 $s .= "..".$abbrev->($c) if $c;
5301 $s .= ": ".$notp->{Whynot};
5304 if ($quilt_mode eq 'linear') {
5305 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5306 foreach my $notp (@nots) {
5307 print STDERR "$us: ", $reportnot->($notp), "\n";
5309 print STDERR "$us: $_\n" foreach @$failsuggestion;
5310 fail "quilt fixup naive history linearisation failed.\n".
5311 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5312 } elsif ($quilt_mode eq 'smash') {
5313 } elsif ($quilt_mode eq 'auto') {
5314 progress "quilt fixup cannot be linear, smashing...";
5316 die "$quilt_mode ?";
5319 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5320 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5322 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5324 quiltify_dpkg_commit "auto-$version-$target-$time",
5325 (getfield $clogp, 'Maintainer'),
5326 "Automatically generated patch ($clogp->{Version})\n".
5327 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5331 progress "quiltify linearisation planning successful, executing...";
5333 for (my $p = $sref_S;
5334 my $c = $p->{Child};
5336 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5337 next unless $p->{Nontrivial};
5339 my $cc = $c->{Commit};
5341 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5342 $commitdata =~ m/\n\n/ or die "$c ?";
5345 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5348 my $commitdate = cmdoutput
5349 @git, qw(log -n1 --pretty=format:%aD), $cc;
5351 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5353 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5360 my $gbp_check_suitable = sub {
5365 die "contains unexpected slashes\n" if m{//} || m{/$};
5366 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5367 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5368 die "is series file\n" if m{$series_filename_re}o;
5369 die "too long" if length > 200;
5371 return $_ unless $@;
5372 print STDERR "quiltifying commit $cc:".
5373 " ignoring/dropping Gbp-Pq $what: $@";
5377 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5379 (\S+) \s* \n //ixm) {
5380 $patchname = $gbp_check_suitable->($1, 'Name');
5382 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5384 (\S+) \s* \n //ixm) {
5385 $patchdir = $gbp_check_suitable->($1, 'Topic');
5390 if (!defined $patchname) {
5391 $patchname = $title;
5392 $patchname =~ s/[.:]$//;
5395 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5396 my $translitname = $converter->convert($patchname);
5397 die unless defined $translitname;
5398 $patchname = $translitname;
5401 "dgit: patch title transliteration error: $@"
5403 $patchname =~ y/ A-Z/-a-z/;
5404 $patchname =~ y/-a-z0-9_.+=~//cd;
5405 $patchname =~ s/^\W/x-$&/;
5406 $patchname = substr($patchname,0,40);
5407 $patchname .= ".patch";
5409 if (!defined $patchdir) {
5412 if (length $patchdir) {
5413 $patchname = "$patchdir/$patchname";
5415 if ($patchname =~ m{^(.*)/}) {
5416 mkpath "debian/patches/$1";
5421 stat "debian/patches/$patchname$index";
5423 $!==ENOENT or die "$patchname$index $!";
5425 runcmd @git, qw(checkout -q), $cc;
5427 # We use the tip's changelog so that dpkg-source doesn't
5428 # produce complaining messages from dpkg-parsechangelog. None
5429 # of the information dpkg-source gets from the changelog is
5430 # actually relevant - it gets put into the original message
5431 # which dpkg-source provides our stunt editor, and then
5433 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5435 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5436 "Date: $commitdate\n".
5437 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5439 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5442 runcmd @git, qw(checkout -q master);
5445 sub build_maybe_quilt_fixup () {
5446 my ($format,$fopts) = get_source_format;
5447 return unless madformat_wantfixup $format;
5450 check_for_vendor_patches();
5452 if (quiltmode_splitbrain) {
5453 fail <<END unless access_cfg_tagformats_can_splitbrain;
5454 quilt mode $quilt_mode requires split view so server needs to support
5455 both "new" and "maint" tag formats, but config says it doesn't.
5459 my $clogp = parsechangelog();
5460 my $headref = git_rev_parse('HEAD');
5461 my $symref = git_get_symref();
5463 if ($quilt_mode eq 'linear'
5464 && !$fopts->{'single-debian-patch'}
5465 && branch_is_gdr($symref, $headref)) {
5466 # This is much faster. It also makes patches that gdr
5467 # likes better for future updates without laundering.
5469 # However, it can fail in some casses where we would
5470 # succeed: if there are existing patches, which correspond
5471 # to a prefix of the branch, but are not in gbp/gdr
5472 # format, gdr will fail (exiting status 7), but we might
5473 # be able to figure out where to start linearising. That
5474 # will be slower so hopefully there's not much to do.
5475 my @cmd = (@git_debrebase,
5476 qw(--noop-ok -funclean-mixed -funclean-ordering
5477 make-patches --quiet-would-amend));
5478 # We tolerate soe snags that gdr wouldn't, by default.
5481 failedcmd @cmd if system @cmd and $?!=7;
5485 $headref = git_rev_parse('HEAD');
5489 changedir $playground;
5491 my $upstreamversion = upstreamversion $version;
5493 if ($fopts->{'single-debian-patch'}) {
5494 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5496 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5499 die 'bug' if $split_brain && !$need_split_build_invocation;
5502 runcmd_ordryrun_local
5503 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5506 sub quilt_fixup_mkwork ($) {
5509 mkdir "work" or die $!;
5511 mktree_in_ud_here();
5512 runcmd @git, qw(reset -q --hard), $headref;
5515 sub quilt_fixup_linkorigs ($$) {
5516 my ($upstreamversion, $fn) = @_;
5517 # calls $fn->($leafname);
5519 foreach my $f (<$maindir/../*>) { #/){
5520 my $b=$f; $b =~ s{.*/}{};
5522 local ($debuglevel) = $debuglevel-1;
5523 printdebug "QF linkorigs $b, $f ?\n";
5525 next unless is_orig_file_of_vsn $b, $upstreamversion;
5526 printdebug "QF linkorigs $b, $f Y\n";
5527 link_ltarget $f, $b or die "$b $!";
5532 sub quilt_fixup_delete_pc () {
5533 runcmd @git, qw(rm -rqf .pc);
5535 Commit removal of .pc (quilt series tracking data)
5537 [dgit ($our_version) upgrade quilt-remove-pc]
5541 sub quilt_fixup_singlepatch ($$$) {
5542 my ($clogp, $headref, $upstreamversion) = @_;
5544 progress "starting quiltify (single-debian-patch)";
5546 # dpkg-source --commit generates new patches even if
5547 # single-debian-patch is in debian/source/options. In order to
5548 # get it to generate debian/patches/debian-changes, it is
5549 # necessary to build the source package.
5551 quilt_fixup_linkorigs($upstreamversion, sub { });
5552 quilt_fixup_mkwork($headref);
5554 rmtree("debian/patches");
5556 runcmd @dpkgsource, qw(-b .);
5558 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5559 rename srcfn("$upstreamversion", "/debian/patches"),
5560 "work/debian/patches";
5563 commit_quilty_patch();
5566 sub quilt_make_fake_dsc ($) {
5567 my ($upstreamversion) = @_;
5569 my $fakeversion="$upstreamversion-~~DGITFAKE";
5571 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5572 print $fakedsc <<END or die $!;
5575 Version: $fakeversion
5579 my $dscaddfile=sub {
5582 my $md = new Digest::MD5;
5584 my $fh = new IO::File $b, '<' or die "$b $!";
5589 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5592 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5594 my @files=qw(debian/source/format debian/rules
5595 debian/control debian/changelog);
5596 foreach my $maybe (qw(debian/patches debian/source/options
5597 debian/tests/control)) {
5598 next unless stat_exists "$maindir/$maybe";
5599 push @files, $maybe;
5602 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5603 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5605 $dscaddfile->($debtar);
5606 close $fakedsc or die $!;
5609 sub quilt_check_splitbrain_cache ($$) {
5610 my ($headref, $upstreamversion) = @_;
5611 # Called only if we are in (potentially) split brain mode.
5612 # Called in playground.
5613 # Computes the cache key and looks in the cache.
5614 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5616 my $splitbrain_cachekey;
5619 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5620 # we look in the reflog of dgit-intern/quilt-cache
5621 # we look for an entry whose message is the key for the cache lookup
5622 my @cachekey = (qw(dgit), $our_version);
5623 push @cachekey, $upstreamversion;
5624 push @cachekey, $quilt_mode;
5625 push @cachekey, $headref;
5627 push @cachekey, hashfile('fake.dsc');
5629 my $srcshash = Digest::SHA->new(256);
5630 my %sfs = ( %INC, '$0(dgit)' => $0 );
5631 foreach my $sfk (sort keys %sfs) {
5632 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5633 $srcshash->add($sfk," ");
5634 $srcshash->add(hashfile($sfs{$sfk}));
5635 $srcshash->add("\n");
5637 push @cachekey, $srcshash->hexdigest();
5638 $splitbrain_cachekey = "@cachekey";
5640 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5642 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5643 debugcmd "|(probably)",@cmd;
5644 my $child = open GC, "-|"; defined $child or die $!;
5646 chdir $maindir or die $!;
5647 if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
5648 $! == ENOENT or die $!;
5649 printdebug ">(no reflog)\n";
5656 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5657 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5660 quilt_fixup_mkwork($headref);
5661 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5662 if ($cachehit ne $headref) {
5663 progress "dgit view: found cached ($saved)";
5664 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5666 return ($cachehit, $splitbrain_cachekey);
5668 progress "dgit view: found cached, no changes required";
5669 return ($headref, $splitbrain_cachekey);
5671 die $! if GC->error;
5672 failedcmd unless close GC;
5674 printdebug "splitbrain cache miss\n";
5675 return (undef, $splitbrain_cachekey);
5678 sub quilt_fixup_multipatch ($$$) {
5679 my ($clogp, $headref, $upstreamversion) = @_;
5681 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5684 # - honour any existing .pc in case it has any strangeness
5685 # - determine the git commit corresponding to the tip of
5686 # the patch stack (if there is one)
5687 # - if there is such a git commit, convert each subsequent
5688 # git commit into a quilt patch with dpkg-source --commit
5689 # - otherwise convert all the differences in the tree into
5690 # a single git commit
5694 # Our git tree doesn't necessarily contain .pc. (Some versions of
5695 # dgit would include the .pc in the git tree.) If there isn't
5696 # one, we need to generate one by unpacking the patches that we
5699 # We first look for a .pc in the git tree. If there is one, we
5700 # will use it. (This is not the normal case.)
5702 # Otherwise need to regenerate .pc so that dpkg-source --commit
5703 # can work. We do this as follows:
5704 # 1. Collect all relevant .orig from parent directory
5705 # 2. Generate a debian.tar.gz out of
5706 # debian/{patches,rules,source/format,source/options}
5707 # 3. Generate a fake .dsc containing just these fields:
5708 # Format Source Version Files
5709 # 4. Extract the fake .dsc
5710 # Now the fake .dsc has a .pc directory.
5711 # (In fact we do this in every case, because in future we will
5712 # want to search for a good base commit for generating patches.)
5714 # Then we can actually do the dpkg-source --commit
5715 # 1. Make a new working tree with the same object
5716 # store as our main tree and check out the main
5718 # 2. Copy .pc from the fake's extraction, if necessary
5719 # 3. Run dpkg-source --commit
5720 # 4. If the result has changes to debian/, then
5721 # - git add them them
5722 # - git add .pc if we had a .pc in-tree
5724 # 5. If we had a .pc in-tree, delete it, and git commit
5725 # 6. Back in the main tree, fast forward to the new HEAD
5727 # Another situation we may have to cope with is gbp-style
5728 # patches-unapplied trees.
5730 # We would want to detect these, so we know to escape into
5731 # quilt_fixup_gbp. However, this is in general not possible.
5732 # Consider a package with a one patch which the dgit user reverts
5733 # (with git revert or the moral equivalent).
5735 # That is indistinguishable in contents from a patches-unapplied
5736 # tree. And looking at the history to distinguish them is not
5737 # useful because the user might have made a confusing-looking git
5738 # history structure (which ought to produce an error if dgit can't
5739 # cope, not a silent reintroduction of an unwanted patch).
5741 # So gbp users will have to pass an option. But we can usually
5742 # detect their failure to do so: if the tree is not a clean
5743 # patches-applied tree, quilt linearisation fails, but the tree
5744 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5745 # they want --quilt=unapplied.
5747 # To help detect this, when we are extracting the fake dsc, we
5748 # first extract it with --skip-patches, and then apply the patches
5749 # afterwards with dpkg-source --before-build. That lets us save a
5750 # tree object corresponding to .origs.
5752 my $splitbrain_cachekey;
5754 quilt_make_fake_dsc($upstreamversion);
5756 if (quiltmode_splitbrain()) {
5758 ($cachehit, $splitbrain_cachekey) =
5759 quilt_check_splitbrain_cache($headref, $upstreamversion);
5760 return if $cachehit;
5764 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5766 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5767 rename $fakexdir, "fake" or die "$fakexdir $!";
5771 remove_stray_gits("source package");
5772 mktree_in_ud_here();
5776 rmtree 'debian'; # git checkout commitish paths does not delete!
5777 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5778 my $unapplied=git_add_write_tree();
5779 printdebug "fake orig tree object $unapplied\n";
5783 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5785 if (system @bbcmd) {
5786 failedcmd @bbcmd if $? < 0;
5788 failed to apply your git tree's patch stack (from debian/patches/) to
5789 the corresponding upstream tarball(s). Your source tree and .orig
5790 are probably too inconsistent. dgit can only fix up certain kinds of
5791 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5797 quilt_fixup_mkwork($headref);
5800 if (stat_exists ".pc") {
5802 progress "Tree already contains .pc - will use it then delete it.";
5805 rename '../fake/.pc','.pc' or die $!;
5808 changedir '../fake';
5810 my $oldtiptree=git_add_write_tree();
5811 printdebug "fake o+d/p tree object $unapplied\n";
5812 changedir '../work';
5815 # We calculate some guesswork now about what kind of tree this might
5816 # be. This is mostly for error reporting.
5822 # O = orig, without patches applied
5823 # A = "applied", ie orig with H's debian/patches applied
5824 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5825 \%editedignores, \@unrepres),
5826 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5827 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5831 foreach my $b (qw(01 02)) {
5832 foreach my $v (qw(O2H O2A H2A)) {
5833 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5836 printdebug "differences \@dl @dl.\n";
5839 "$us: base trees orig=%.20s o+d/p=%.20s",
5840 $unapplied, $oldtiptree;
5842 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5843 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5844 $dl[0], $dl[1], $dl[3], $dl[4],
5848 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5850 forceable_fail [qw(unrepresentable)], <<END;
5851 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5856 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5857 push @failsuggestion, "This might be a patches-unapplied branch.";
5858 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5859 push @failsuggestion, "This might be a patches-applied branch.";
5861 push @failsuggestion, "Maybe you need to specify one of".
5862 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5864 if (quiltmode_splitbrain()) {
5865 quiltify_splitbrain($clogp, $unapplied, $headref,
5866 $diffbits, \%editedignores,
5867 $splitbrain_cachekey);
5871 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5872 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5874 if (!open P, '>>', ".pc/applied-patches") {
5875 $!==&ENOENT or die $!;
5880 commit_quilty_patch();
5882 if ($mustdeletepc) {
5883 quilt_fixup_delete_pc();
5887 sub quilt_fixup_editor () {
5888 my $descfn = $ENV{$fakeeditorenv};
5889 my $editing = $ARGV[$#ARGV];
5890 open I1, '<', $descfn or die "$descfn: $!";
5891 open I2, '<', $editing or die "$editing: $!";
5892 unlink $editing or die "$editing: $!";
5893 open O, '>', $editing or die "$editing: $!";
5894 while (<I1>) { print O or die $!; } I1->error and die $!;
5897 $copying ||= m/^\-\-\- /;
5898 next unless $copying;
5901 I2->error and die $!;
5906 sub maybe_apply_patches_dirtily () {
5907 return unless $quilt_mode =~ m/gbp|unapplied/;
5908 print STDERR <<END or die $!;
5910 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5911 dgit: Have to apply the patches - making the tree dirty.
5912 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5915 $patches_applied_dirtily = 01;
5916 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5917 runcmd qw(dpkg-source --before-build .);
5920 sub maybe_unapply_patches_again () {
5921 progress "dgit: Unapplying patches again to tidy up the tree."
5922 if $patches_applied_dirtily;
5923 runcmd qw(dpkg-source --after-build .)
5924 if $patches_applied_dirtily & 01;
5926 if $patches_applied_dirtily & 02;
5927 $patches_applied_dirtily = 0;
5930 #----- other building -----
5932 our $clean_using_builder;
5933 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5934 # clean the tree before building (perhaps invoked indirectly by
5935 # whatever we are using to run the build), rather than separately
5936 # and explicitly by us.
5939 return if $clean_using_builder;
5940 if ($cleanmode eq 'dpkg-source') {
5941 maybe_apply_patches_dirtily();
5942 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5943 } elsif ($cleanmode eq 'dpkg-source-d') {
5944 maybe_apply_patches_dirtily();
5945 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5946 } elsif ($cleanmode eq 'git') {
5947 runcmd_ordryrun_local @git, qw(clean -xdf);
5948 } elsif ($cleanmode eq 'git-ff') {
5949 runcmd_ordryrun_local @git, qw(clean -xdff);
5950 } elsif ($cleanmode eq 'check') {
5951 my $leftovers = cmdoutput @git, qw(clean -xdn);
5952 if (length $leftovers) {
5953 print STDERR $leftovers, "\n" or die $!;
5954 fail "tree contains uncommitted files and --clean=check specified";
5956 } elsif ($cleanmode eq 'none') {
5963 badusage "clean takes no additional arguments" if @ARGV;
5966 maybe_unapply_patches_again();
5969 sub build_or_push_prep_early () {
5970 our $build_or_push_prep_early_done //= 0;
5971 return if $build_or_push_prep_early_done++;
5972 badusage "-p is not allowed with dgit $subcommand" if defined $package;
5973 my $clogp = parsechangelog();
5974 $isuite = getfield $clogp, 'Distribution';
5975 $package = getfield $clogp, 'Source';
5976 $version = getfield $clogp, 'Version';
5979 sub build_prep_early () {
5980 build_or_push_prep_early();
5988 build_maybe_quilt_fixup();
5990 my $pat = changespat $version;
5991 foreach my $f (glob "$buildproductsdir/$pat") {
5993 unlink $f or fail "remove old changes file $f: $!";
5995 progress "would remove $f";
6001 sub changesopts_initial () {
6002 my @opts =@changesopts[1..$#changesopts];
6005 sub changesopts_version () {
6006 if (!defined $changes_since_version) {
6007 my @vsns = archive_query('archive_query');
6008 my @quirk = access_quirk();
6009 if ($quirk[0] eq 'backports') {
6010 local $isuite = $quirk[2];
6012 canonicalise_suite();
6013 push @vsns, archive_query('archive_query');
6016 @vsns = map { $_->[0] } @vsns;
6017 @vsns = sort { -version_compare($a, $b) } @vsns;
6018 $changes_since_version = $vsns[0];
6019 progress "changelog will contain changes since $vsns[0]";
6021 $changes_since_version = '_';
6022 progress "package seems new, not specifying -v<version>";
6025 if ($changes_since_version ne '_') {
6026 return ("-v$changes_since_version");
6032 sub changesopts () {
6033 return (changesopts_initial(), changesopts_version());
6036 sub massage_dbp_args ($;$) {
6037 my ($cmd,$xargs) = @_;
6040 # - if we're going to split the source build out so we can
6041 # do strange things to it, massage the arguments to dpkg-buildpackage
6042 # so that the main build doessn't build source (or add an argument
6043 # to stop it building source by default).
6045 # - add -nc to stop dpkg-source cleaning the source tree,
6046 # unless we're not doing a split build and want dpkg-source
6047 # as cleanmode, in which case we can do nothing
6050 # 0 - source will NOT need to be built separately by caller
6051 # +1 - source will need to be built separately by caller
6052 # +2 - source will need to be built separately by caller AND
6053 # dpkg-buildpackage should not in fact be run at all!
6054 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6055 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
6056 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
6057 $clean_using_builder = 1;
6060 # -nc has the side effect of specifying -b if nothing else specified
6061 # and some combinations of -S, -b, et al, are errors, rather than
6062 # later simply overriding earlie. So we need to:
6063 # - search the command line for these options
6064 # - pick the last one
6065 # - perhaps add our own as a default
6066 # - perhaps adjust it to the corresponding non-source-building version
6068 foreach my $l ($cmd, $xargs) {
6070 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
6073 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6075 if ($need_split_build_invocation) {
6076 printdebug "massage split $dmode.\n";
6077 $r = $dmode =~ m/[S]/ ? +2 :
6078 $dmode =~ y/gGF/ABb/ ? +1 :
6079 $dmode =~ m/[ABb]/ ? 0 :
6082 printdebug "massage done $r $dmode.\n";
6084 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6090 my $wasdir = must_getcwd();
6096 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
6097 my ($msg_if_onlyone) = @_;
6098 # If there is only one .changes file, fail with $msg_if_onlyone,
6099 # or if that is undef, be a no-op.
6100 # Returns the changes file to report to the user.
6101 my $pat = changespat $version;
6102 my @changesfiles = glob $pat;
6103 @changesfiles = sort {
6104 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6108 if (@changesfiles==1) {
6109 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
6110 only one changes file from build (@changesfiles)
6112 $result = $changesfiles[0];
6113 } elsif (@changesfiles==2) {
6114 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6115 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6116 fail "$l found in binaries changes file $binchanges"
6119 runcmd_ordryrun_local @mergechanges, @changesfiles;
6120 my $multichanges = changespat $version,'multi';
6122 stat_exists $multichanges or fail "$multichanges: $!";
6123 foreach my $cf (glob $pat) {
6124 next if $cf eq $multichanges;
6125 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6128 $result = $multichanges;
6130 fail "wrong number of different changes files (@changesfiles)";
6132 printdone "build successful, results in $result\n" or die $!;
6135 sub midbuild_checkchanges () {
6136 my $pat = changespat $version;
6137 return if $rmchanges;
6138 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
6139 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
6141 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6142 Suggest you delete @unwanted.
6147 sub midbuild_checkchanges_vanilla ($) {
6149 midbuild_checkchanges() if $wantsrc == 1;
6152 sub postbuild_mergechanges_vanilla ($) {
6154 if ($wantsrc == 1) {
6156 postbuild_mergechanges(undef);
6159 printdone "build successful\n";
6165 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6166 my $wantsrc = massage_dbp_args \@dbp;
6169 midbuild_checkchanges_vanilla $wantsrc;
6174 push @dbp, changesopts_version();
6175 maybe_apply_patches_dirtily();
6176 runcmd_ordryrun_local @dbp;
6178 maybe_unapply_patches_again();
6179 postbuild_mergechanges_vanilla $wantsrc;
6183 $quilt_mode //= 'gbp';
6189 # gbp can make .origs out of thin air. In my tests it does this
6190 # even for a 1.0 format package, with no origs present. So I
6191 # guess it keys off just the version number. We don't know
6192 # exactly what .origs ought to exist, but let's assume that we
6193 # should run gbp if: the version has an upstream part and the main
6195 my $upstreamversion = upstreamversion $version;
6196 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6197 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6199 if ($gbp_make_orig) {
6201 $cleanmode = 'none'; # don't do it again
6202 $need_split_build_invocation = 1;
6205 my @dbp = @dpkgbuildpackage;
6207 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6209 if (!length $gbp_build[0]) {
6210 if (length executable_on_path('git-buildpackage')) {
6211 $gbp_build[0] = qw(git-buildpackage);
6213 $gbp_build[0] = 'gbp buildpackage';
6216 my @cmd = opts_opt_multi_cmd @gbp_build;
6218 push @cmd, (qw(-us -uc --git-no-sign-tags),
6219 "--git-builder=".(shellquote @dbp));
6221 if ($gbp_make_orig) {
6222 my $priv = dgit_privdir();
6223 my $ok = "$priv/origs-gen-ok";
6224 unlink $ok or $!==&ENOENT or die $!;
6225 my @origs_cmd = @cmd;
6226 push @origs_cmd, qw(--git-cleaner=true);
6227 push @origs_cmd, "--git-prebuild=".
6228 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6229 push @origs_cmd, @ARGV;
6231 debugcmd @origs_cmd;
6233 do { local $!; stat_exists $ok; }
6234 or failedcmd @origs_cmd;
6236 dryrun_report @origs_cmd;
6242 midbuild_checkchanges_vanilla $wantsrc;
6244 if (!$clean_using_builder) {
6245 push @cmd, '--git-cleaner=true';
6249 maybe_unapply_patches_again();
6251 push @cmd, changesopts();
6252 runcmd_ordryrun_local @cmd, @ARGV;
6254 postbuild_mergechanges_vanilla $wantsrc;
6256 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6258 sub build_source_for_push {
6260 maybe_unapply_patches_again();
6261 $changesfile = $sourcechanges;
6267 $sourcechanges = changespat $version,'source';
6269 unlink "../$sourcechanges" or $!==ENOENT
6270 or fail "remove $sourcechanges: $!";
6272 $dscfn = dscfn($version);
6273 my @cmd = (@dpkgsource, qw(-b --));
6275 changedir $playground;
6276 runcmd_ordryrun_local @cmd, "work";
6277 my @udfiles = <${package}_*>;
6279 foreach my $f (@udfiles) {
6280 printdebug "source copy, found $f\n";
6283 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6284 $f eq srcfn($version, $&));
6285 printdebug "source copy, found $f - renaming\n";
6286 rename "$playground/$f", "../$f" or $!==ENOENT
6287 or fail "put in place new source file ($f): $!";
6290 my $pwd = must_getcwd();
6291 my $leafdir = basename $pwd;
6293 runcmd_ordryrun_local @cmd, $leafdir;
6296 runcmd_ordryrun_local qw(sh -ec),
6297 'exec >$1; shift; exec "$@"','x',
6298 "../$sourcechanges",
6299 @dpkggenchanges, qw(-S), changesopts();
6302 sub cmd_build_source {
6304 badusage "build-source takes no additional arguments" if @ARGV;
6306 maybe_unapply_patches_again();
6307 printdone "source built, results in $dscfn and $sourcechanges";
6312 midbuild_checkchanges();
6315 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6316 stat_exists $sourcechanges
6317 or fail "$sourcechanges (in parent directory): $!";
6319 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6321 maybe_unapply_patches_again();
6323 postbuild_mergechanges(<<END);
6324 perhaps you need to pass -A ? (sbuild's default is to build only
6325 arch-specific binaries; dgit 1.4 used to override that.)
6330 sub cmd_quilt_fixup {
6331 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6334 build_maybe_quilt_fixup();
6337 sub import_dsc_result {
6338 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6339 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6341 check_gitattrs($newhash, "source tree");
6343 progress "dgit: import-dsc: $what_msg";
6346 sub cmd_import_dsc {
6350 last unless $ARGV[0] =~ m/^-/;
6353 if (m/^--require-valid-signature$/) {
6356 badusage "unknown dgit import-dsc sub-option \`$_'";
6360 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6361 my ($dscfn, $dstbranch) = @ARGV;
6363 badusage "dry run makes no sense with import-dsc" unless act_local();
6365 my $force = $dstbranch =~ s/^\+// ? +1 :
6366 $dstbranch =~ s/^\.\.// ? -1 :
6368 my $info = $force ? " $&" : '';
6369 $info = "$dscfn$info";
6371 my $specbranch = $dstbranch;
6372 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6373 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6375 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6376 my $chead = cmdoutput_errok @symcmd;
6377 defined $chead or $?==256 or failedcmd @symcmd;
6379 fail "$dstbranch is checked out - will not update it"
6380 if defined $chead and $chead eq $dstbranch;
6382 my $oldhash = git_get_ref $dstbranch;
6384 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6385 $dscdata = do { local $/ = undef; <D>; };
6386 D->error and fail "read $dscfn: $!";
6389 # we don't normally need this so import it here
6390 use Dpkg::Source::Package;
6391 my $dp = new Dpkg::Source::Package filename => $dscfn,
6392 require_valid_signature => $needsig;
6394 local $SIG{__WARN__} = sub {
6396 return unless $needsig;
6397 fail "import-dsc signature check failed";
6399 if (!$dp->is_signed()) {
6400 warn "$us: warning: importing unsigned .dsc\n";
6402 my $r = $dp->check_signature();
6403 die "->check_signature => $r" if $needsig && $r;
6409 $package = getfield $dsc, 'Source';
6411 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6412 unless forceing [qw(import-dsc-with-dgit-field)];
6413 parse_dsc_field_def_dsc_distro();
6415 $isuite = 'DGIT-IMPORT-DSC';
6416 $idistro //= $dsc_distro;
6420 if (defined $dsc_hash) {
6421 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6422 resolve_dsc_field_commit undef, undef;
6424 if (defined $dsc_hash) {
6425 my @cmd = (qw(sh -ec),
6426 "echo $dsc_hash | git cat-file --batch-check");
6427 my $objgot = cmdoutput @cmd;
6428 if ($objgot =~ m#^\w+ missing\b#) {
6430 .dsc contains Dgit field referring to object $dsc_hash
6431 Your git tree does not have that object. Try `git fetch' from a
6432 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6435 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6437 progress "Not fast forward, forced update.";
6439 fail "Not fast forward to $dsc_hash";
6442 import_dsc_result $dstbranch, $dsc_hash,
6443 "dgit import-dsc (Dgit): $info",
6444 "updated git ref $dstbranch";
6449 Branch $dstbranch already exists
6450 Specify ..$specbranch for a pseudo-merge, binding in existing history
6451 Specify +$specbranch to overwrite, discarding existing history
6453 if $oldhash && !$force;
6455 my @dfi = dsc_files_info();
6456 foreach my $fi (@dfi) {
6457 my $f = $fi->{Filename};
6461 fail "lstat $here works but stat gives $! !";
6463 fail "stat $here: $!" unless $! == ENOENT;
6465 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6467 } elsif ($dscfn =~ m#^/#) {
6470 fail "cannot import $dscfn which seems to be inside working tree!";
6472 $there =~ s#/+[^/]+$## or
6473 fail "import $dscfn requires ../$f, but it does not exist";
6475 my $test = $there =~ m{^/} ? $there : "../$there";
6476 stat $test or fail "import $dscfn requires $test, but: $!";
6477 symlink $there, $here or fail "symlink $there to $here: $!";
6478 progress "made symlink $here -> $there";
6479 # print STDERR Dumper($fi);
6481 my @mergeinputs = generate_commits_from_dsc();
6482 die unless @mergeinputs == 1;
6484 my $newhash = $mergeinputs[0]{Commit};
6488 progress "Import, forced update - synthetic orphan git history.";
6489 } elsif ($force < 0) {
6490 progress "Import, merging.";
6491 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6492 my $version = getfield $dsc, 'Version';
6493 my $clogp = commit_getclogp $newhash;
6494 my $authline = clogp_authline $clogp;
6495 $newhash = make_commit_text <<END;
6502 Merge $package ($version) import into $dstbranch
6505 die; # caught earlier
6509 import_dsc_result $dstbranch, $newhash,
6510 "dgit import-dsc: $info",
6511 "results are in in git ref $dstbranch";
6514 sub pre_archive_api_query () {
6515 not_necessarily_a_tree();
6517 sub cmd_archive_api_query {
6518 badusage "need only 1 subpath argument" unless @ARGV==1;
6519 my ($subpath) = @ARGV;
6520 local $isuite = 'DGIT-API-QUERY-CMD';
6521 my @cmd = archive_api_query_cmd($subpath);
6524 exec @cmd or fail "exec curl: $!\n";
6527 sub repos_server_url () {
6528 $package = '_dgit-repos-server';
6529 local $access_forpush = 1;
6530 local $isuite = 'DGIT-REPOS-SERVER';
6531 my $url = access_giturl();
6534 sub pre_clone_dgit_repos_server () {
6535 not_necessarily_a_tree();
6537 sub cmd_clone_dgit_repos_server {
6538 badusage "need destination argument" unless @ARGV==1;
6539 my ($destdir) = @ARGV;
6540 my $url = repos_server_url();
6541 my @cmd = (@git, qw(clone), $url, $destdir);
6543 exec @cmd or fail "exec git clone: $!\n";
6546 sub pre_print_dgit_repos_server_source_url () {
6547 not_necessarily_a_tree();
6549 sub cmd_print_dgit_repos_server_source_url {
6550 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6552 my $url = repos_server_url();
6553 print $url, "\n" or die $!;
6556 sub pre_print_dpkg_source_ignores {
6557 not_necessarily_a_tree();
6559 sub cmd_print_dpkg_source_ignores {
6560 badusage "no arguments allowed to dgit print-dpkg-source-ignores"
6562 print "@dpkg_source_ignores\n" or die $!;
6565 sub cmd_setup_mergechangelogs {
6566 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6567 local $isuite = 'DGIT-SETUP-TREE';
6568 setup_mergechangelogs(1);
6571 sub cmd_setup_useremail {
6572 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6573 local $isuite = 'DGIT-SETUP-TREE';
6577 sub cmd_setup_gitattributes {
6578 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6579 local $isuite = 'DGIT-SETUP-TREE';
6583 sub cmd_setup_new_tree {
6584 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6585 local $isuite = 'DGIT-SETUP-TREE';
6589 #---------- argument parsing and main program ----------
6592 print "dgit version $our_version\n" or die $!;
6596 our (%valopts_long, %valopts_short);
6597 our (%funcopts_long);
6599 our (@modeopt_cfgs);
6601 sub defvalopt ($$$$) {
6602 my ($long,$short,$val_re,$how) = @_;
6603 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6604 $valopts_long{$long} = $oi;
6605 $valopts_short{$short} = $oi;
6606 # $how subref should:
6607 # do whatever assignemnt or thing it likes with $_[0]
6608 # if the option should not be passed on to remote, @rvalopts=()
6609 # or $how can be a scalar ref, meaning simply assign the value
6612 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6613 defvalopt '--distro', '-d', '.+', \$idistro;
6614 defvalopt '', '-k', '.+', \$keyid;
6615 defvalopt '--existing-package','', '.*', \$existing_package;
6616 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6617 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6618 defvalopt '--package', '-p', $package_re, \$package;
6619 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6621 defvalopt '', '-C', '.+', sub {
6622 ($changesfile) = (@_);
6623 if ($changesfile =~ s#^(.*)/##) {
6624 $buildproductsdir = $1;
6628 defvalopt '--initiator-tempdir','','.*', sub {
6629 ($initiator_tempdir) = (@_);
6630 $initiator_tempdir =~ m#^/# or
6631 badusage "--initiator-tempdir must be used specify an".
6632 " absolute, not relative, directory."
6635 sub defoptmodes ($@) {
6636 my ($varref, $cfgkey, $default, %optmap) = @_;
6638 while (my ($opt,$val) = each %optmap) {
6639 $funcopts_long{$opt} = sub { $$varref = $val; };
6640 $permit{$val} = $val;
6642 push @modeopt_cfgs, {
6645 Default => $default,
6650 defoptmodes \$dodep14tag, qw( dep14tag want
6653 --always-dep14tag always );
6658 if (defined $ENV{'DGIT_SSH'}) {
6659 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6660 } elsif (defined $ENV{'GIT_SSH'}) {
6661 @ssh = ($ENV{'GIT_SSH'});
6669 if (!defined $val) {
6670 badusage "$what needs a value" unless @ARGV;
6672 push @rvalopts, $val;
6674 badusage "bad value \`$val' for $what" unless
6675 $val =~ m/^$oi->{Re}$(?!\n)/s;
6676 my $how = $oi->{How};
6677 if (ref($how) eq 'SCALAR') {
6682 push @ropts, @rvalopts;
6686 last unless $ARGV[0] =~ m/^-/;
6690 if (m/^--dry-run$/) {
6693 } elsif (m/^--damp-run$/) {
6696 } elsif (m/^--no-sign$/) {
6699 } elsif (m/^--help$/) {
6701 } elsif (m/^--version$/) {
6703 } elsif (m/^--new$/) {
6706 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6707 ($om = $opts_opt_map{$1}) &&
6711 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6712 !$opts_opt_cmdonly{$1} &&
6713 ($om = $opts_opt_map{$1})) {
6716 } elsif (m/^--(gbp|dpm)$/s) {
6717 push @ropts, "--quilt=$1";
6719 } elsif (m/^--ignore-dirty$/s) {
6722 } elsif (m/^--no-quilt-fixup$/s) {
6724 $quilt_mode = 'nocheck';
6725 } elsif (m/^--no-rm-on-error$/s) {
6728 } elsif (m/^--no-chase-dsc-distro$/s) {
6730 $chase_dsc_distro = 0;
6731 } elsif (m/^--overwrite$/s) {
6733 $overwrite_version = '';
6734 } elsif (m/^--overwrite=(.+)$/s) {
6736 $overwrite_version = $1;
6737 } elsif (m/^--delayed=(\d+)$/s) {
6740 } elsif (m/^--dgit-view-save=(.+)$/s) {
6742 $split_brain_save = $1;
6743 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6744 } elsif (m/^--(no-)?rm-old-changes$/s) {
6747 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6749 push @deliberatelies, $&;
6750 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6754 } elsif (m/^--force-/) {
6756 "$us: warning: ignoring unknown force option $_\n";
6758 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6759 # undocumented, for testing
6761 $tagformat_want = [ $1, 'command line', 1 ];
6762 # 1 menas overrides distro configuration
6763 } elsif (m/^--always-split-source-build$/s) {
6764 # undocumented, for testing
6766 $need_split_build_invocation = 1;
6767 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6768 # undocumented, for testing
6770 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6771 # ^ it's supposed to be an array ref
6772 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6773 $val = $2 ? $' : undef; #';
6774 $valopt->($oi->{Long});
6775 } elsif ($funcopts_long{$_}) {
6777 $funcopts_long{$_}();
6779 badusage "unknown long option \`$_'";
6786 } elsif (s/^-L/-/) {
6789 } elsif (s/^-h/-/) {
6791 } elsif (s/^-D/-/) {
6795 } elsif (s/^-N/-/) {
6800 push @changesopts, $_;
6802 } elsif (s/^-wn$//s) {
6804 $cleanmode = 'none';
6805 } elsif (s/^-wg$//s) {
6808 } elsif (s/^-wgf$//s) {
6810 $cleanmode = 'git-ff';
6811 } elsif (s/^-wd$//s) {
6813 $cleanmode = 'dpkg-source';
6814 } elsif (s/^-wdd$//s) {
6816 $cleanmode = 'dpkg-source-d';
6817 } elsif (s/^-wc$//s) {
6819 $cleanmode = 'check';
6820 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6821 push @git, '-c', $&;
6822 $gitcfgs{cmdline}{$1} = [ $2 ];
6823 } elsif (s/^-c([^=]+)$//s) {
6824 push @git, '-c', $&;
6825 $gitcfgs{cmdline}{$1} = [ 'true' ];
6826 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6828 $val = undef unless length $val;
6829 $valopt->($oi->{Short});
6832 badusage "unknown short option \`$_'";
6839 sub check_env_sanity () {
6840 my $blocked = new POSIX::SigSet;
6841 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6844 foreach my $name (qw(PIPE CHLD)) {
6845 my $signame = "SIG$name";
6846 my $signum = eval "POSIX::$signame" // die;
6847 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6848 die "$signame is set to something other than SIG_DFL\n";
6849 $blocked->ismember($signum) and
6850 die "$signame is blocked\n";
6856 On entry to dgit, $@
6857 This is a bug produced by something in in your execution environment.
6863 sub parseopts_late_defaults () {
6864 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6865 if defined $idistro;
6866 $isuite //= cfg('dgit.default.default-suite');
6868 foreach my $k (keys %opts_opt_map) {
6869 my $om = $opts_opt_map{$k};
6871 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6873 badcfg "cannot set command for $k"
6874 unless length $om->[0];
6878 foreach my $c (access_cfg_cfgs("opts-$k")) {
6880 map { $_ ? @$_ : () }
6881 map { $gitcfgs{$_}{$c} }
6882 reverse @gitcfgsources;
6883 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6884 "\n" if $debuglevel >= 4;
6886 badcfg "cannot configure options for $k"
6887 if $opts_opt_cmdonly{$k};
6888 my $insertpos = $opts_cfg_insertpos{$k};
6889 @$om = ( @$om[0..$insertpos-1],
6891 @$om[$insertpos..$#$om] );
6895 if (!defined $rmchanges) {
6896 local $access_forpush;
6897 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6900 if (!defined $quilt_mode) {
6901 local $access_forpush;
6902 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6903 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6905 $quilt_mode =~ m/^($quilt_modes_re)$/
6906 or badcfg "unknown quilt-mode \`$quilt_mode'";
6910 foreach my $moc (@modeopt_cfgs) {
6911 local $access_forpush;
6912 my $vr = $moc->{Var};
6913 next if defined $$vr;
6914 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6915 my $v = $moc->{Vals}{$$vr};
6916 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6920 $need_split_build_invocation ||= quiltmode_splitbrain();
6922 if (!defined $cleanmode) {
6923 local $access_forpush;
6924 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6925 $cleanmode //= 'dpkg-source';
6927 badcfg "unknown clean-mode \`$cleanmode'" unless
6928 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6932 if ($ENV{$fakeeditorenv}) {
6934 quilt_fixup_editor();
6940 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6941 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6942 if $dryrun_level == 1;
6944 print STDERR $helpmsg or die $!;
6947 $cmd = $subcommand = shift @ARGV;
6950 my $pre_fn = ${*::}{"pre_$cmd"};
6951 $pre_fn->() if $pre_fn;
6953 record_maindir if $invoked_in_git_tree;
6956 my $fn = ${*::}{"cmd_$cmd"};
6957 $fn or badusage "unknown operation $cmd";