3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
22 use Debian::Dgit qw(:DEFAULT :playground);
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::MoreUtils qw(pairwise);
38 use Text::Glob qw(match_glob);
39 use Fcntl qw(:DEFAULT :flock);
44 our $our_version = 'UNRELEASED'; ###substituted###
45 our $absurdity = undef; ###substituted###
47 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
58 our $dryrun_level = 0;
60 our $buildproductsdir = '..';
66 our $existing_package = 'dpkg';
68 our $changes_since_version;
70 our $overwrite_version; # undef: not specified; '': check changelog
72 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $we_are_initiator;
77 our $initiator_tempdir;
78 our $patches_applied_dirtily = 00;
82 our $chase_dsc_distro=1;
84 our %forceopts = map { $_=>0 }
85 qw(unrepresentable unsupported-source-format
86 dsc-changes-mismatch changes-origs-exactly
87 import-gitapply-absurd
88 import-gitapply-no-absurd
89 import-dsc-with-dgit-field);
91 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
93 our $suite_re = '[-+.0-9a-z]+';
94 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
95 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
96 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
97 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
99 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
100 our $splitbraincache = 'dgit-intern/quilt-cache';
101 our $rewritemap = 'dgit-rewrite/map';
103 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
105 our (@git) = qw(git);
106 our (@dget) = qw(dget);
107 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
108 our (@dput) = qw(dput);
109 our (@debsign) = qw(debsign);
110 our (@gpg) = qw(gpg);
111 our (@sbuild) = qw(sbuild);
113 our (@dgit) = qw(dgit);
114 our (@aptget) = qw(apt-get);
115 our (@aptcache) = qw(apt-cache);
116 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
117 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
118 our (@dpkggenchanges) = qw(dpkg-genchanges);
119 our (@mergechanges) = qw(mergechanges -f);
120 our (@gbp_build) = ('');
121 our (@gbp_pq) = ('gbp pq');
122 our (@changesopts) = ('');
124 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
127 'debsign' => \@debsign,
129 'sbuild' => \@sbuild,
133 'apt-get' => \@aptget,
134 'apt-cache' => \@aptcache,
135 'dpkg-source' => \@dpkgsource,
136 'dpkg-buildpackage' => \@dpkgbuildpackage,
137 'dpkg-genchanges' => \@dpkggenchanges,
138 'gbp-build' => \@gbp_build,
139 'gbp-pq' => \@gbp_pq,
140 'ch' => \@changesopts,
141 'mergechanges' => \@mergechanges);
143 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
144 our %opts_cfg_insertpos = map {
146 scalar @{ $opts_opt_map{$_} }
147 } keys %opts_opt_map;
149 sub parseopts_late_defaults();
150 sub setup_gitattrs(;$);
151 sub check_gitattrs($$);
157 our $supplementary_message = '';
158 our $need_split_build_invocation = 0;
159 our $split_brain = 0;
163 return unless forkcheck_mainprocess();
164 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
167 our $remotename = 'dgit';
168 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
172 if (!defined $absurdity) {
174 $absurdity =~ s{/[^/]+$}{/absurd} or die;
178 my ($v,$distro) = @_;
179 return $tagformatfn->($v, $distro);
182 sub debiantag_maintview ($$) {
183 my ($v,$distro) = @_;
184 return "$distro/".dep14_version_mangle $v;
187 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
189 sub lbranch () { return "$branchprefix/$csuite"; }
190 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
191 sub lref () { return "refs/heads/".lbranch(); }
192 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
193 sub rrref () { return server_ref($csuite); }
203 return "${package}_".(stripepoch $vsn).$sfx
208 return srcfn($vsn,".dsc");
211 sub changespat ($;$) {
212 my ($vsn, $arch) = @_;
213 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
216 sub upstreamversion ($) {
228 return unless forkcheck_mainprocess();
229 foreach my $f (@end) {
231 print STDERR "$us: cleanup: $@" if length $@;
235 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
237 sub forceable_fail ($$) {
238 my ($forceoptsl, $msg) = @_;
239 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
240 print STDERR "warning: overriding problem due to --force:\n". $msg;
244 my ($forceoptsl) = @_;
245 my @got = grep { $forceopts{$_} } @$forceoptsl;
246 return 0 unless @got;
248 "warning: skipping checks or functionality due to --force-$got[0]\n";
251 sub no_such_package () {
252 print STDERR "$us: package $package does not exist in suite $isuite\n";
256 sub deliberately ($) {
258 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
261 sub deliberately_not_fast_forward () {
262 foreach (qw(not-fast-forward fresh-repo)) {
263 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
267 sub quiltmode_splitbrain () {
268 $quilt_mode =~ m/gbp|dpm|unapplied/;
271 sub opts_opt_multi_cmd {
273 push @cmd, split /\s+/, shift @_;
279 return opts_opt_multi_cmd @gbp_pq;
282 sub dgit_privdir () {
283 our $dgit_privdir_made //= ensure_a_playground 'dgit';
286 #---------- remote protocol support, common ----------
288 # remote push initiator/responder protocol:
289 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
290 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
291 # < dgit-remote-push-ready <actual-proto-vsn>
298 # > supplementary-message NBYTES # $protovsn >= 3
303 # > file parsed-changelog
304 # [indicates that output of dpkg-parsechangelog follows]
305 # > data-block NBYTES
306 # > [NBYTES bytes of data (no newline)]
307 # [maybe some more blocks]
316 # > param head DGIT-VIEW-HEAD
317 # > param csuite SUITE
318 # > param tagformat old|new
319 # > param maint-view MAINT-VIEW-HEAD
321 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
322 # > file buildinfo # for buildinfos to sign
324 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
325 # # goes into tag, for replay prevention
328 # [indicates that signed tag is wanted]
329 # < data-block NBYTES
330 # < [NBYTES bytes of data (no newline)]
331 # [maybe some more blocks]
335 # > want signed-dsc-changes
336 # < data-block NBYTES [transfer of signed dsc]
338 # < data-block NBYTES [transfer of signed changes]
340 # < data-block NBYTES [transfer of each signed buildinfo
341 # [etc] same number and order as "file buildinfo"]
349 sub i_child_report () {
350 # Sees if our child has died, and reap it if so. Returns a string
351 # describing how it died if it failed, or undef otherwise.
352 return undef unless $i_child_pid;
353 my $got = waitpid $i_child_pid, WNOHANG;
354 return undef if $got <= 0;
355 die unless $got == $i_child_pid;
356 $i_child_pid = undef;
357 return undef unless $?;
358 return "build host child ".waitstatusmsg();
363 fail "connection lost: $!" if $fh->error;
364 fail "protocol violation; $m not expected";
367 sub badproto_badread ($$) {
369 fail "connection lost: $!" if $!;
370 my $report = i_child_report();
371 fail $report if defined $report;
372 badproto $fh, "eof (reading $wh)";
375 sub protocol_expect (&$) {
376 my ($match, $fh) = @_;
379 defined && chomp or badproto_badread $fh, "protocol message";
387 badproto $fh, "\`$_'";
390 sub protocol_send_file ($$) {
391 my ($fh, $ourfn) = @_;
392 open PF, "<", $ourfn or die "$ourfn: $!";
395 my $got = read PF, $d, 65536;
396 die "$ourfn: $!" unless defined $got;
398 print $fh "data-block ".length($d)."\n" or die $!;
399 print $fh $d or die $!;
401 PF->error and die "$ourfn $!";
402 print $fh "data-end\n" or die $!;
406 sub protocol_read_bytes ($$) {
407 my ($fh, $nbytes) = @_;
408 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
410 my $got = read $fh, $d, $nbytes;
411 $got==$nbytes or badproto_badread $fh, "data block";
415 sub protocol_receive_file ($$) {
416 my ($fh, $ourfn) = @_;
417 printdebug "() $ourfn\n";
418 open PF, ">", $ourfn or die "$ourfn: $!";
420 my ($y,$l) = protocol_expect {
421 m/^data-block (.*)$/ ? (1,$1) :
422 m/^data-end$/ ? (0,) :
426 my $d = protocol_read_bytes $fh, $l;
427 print PF $d or die $!;
432 #---------- remote protocol support, responder ----------
434 sub responder_send_command ($) {
436 return unless $we_are_responder;
437 # called even without $we_are_responder
438 printdebug ">> $command\n";
439 print PO $command, "\n" or die $!;
442 sub responder_send_file ($$) {
443 my ($keyword, $ourfn) = @_;
444 return unless $we_are_responder;
445 printdebug "]] $keyword $ourfn\n";
446 responder_send_command "file $keyword";
447 protocol_send_file \*PO, $ourfn;
450 sub responder_receive_files ($@) {
451 my ($keyword, @ourfns) = @_;
452 die unless $we_are_responder;
453 printdebug "[[ $keyword @ourfns\n";
454 responder_send_command "want $keyword";
455 foreach my $fn (@ourfns) {
456 protocol_receive_file \*PI, $fn;
459 protocol_expect { m/^files-end$/ } \*PI;
462 #---------- remote protocol support, initiator ----------
464 sub initiator_expect (&) {
466 protocol_expect { &$match } \*RO;
469 #---------- end remote code ----------
472 if ($we_are_responder) {
474 responder_send_command "progress ".length($m) or die $!;
475 print PO $m or die $!;
485 $ua = LWP::UserAgent->new();
489 progress "downloading $what...";
490 my $r = $ua->get(@_) or die $!;
491 return undef if $r->code == 404;
492 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
493 return $r->decoded_content(charset => 'none');
496 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
498 sub act_local () { return $dryrun_level <= 1; }
499 sub act_scary () { return !$dryrun_level; }
502 if (!$dryrun_level) {
503 progress "$us ok: @_";
505 progress "would be ok: @_ (but dry run only)";
510 printcmd(\*STDERR,$debugprefix."#",@_);
513 sub runcmd_ordryrun {
521 sub runcmd_ordryrun_local {
530 my ($first_shell, @cmd) = @_;
531 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
534 our $helpmsg = <<END;
536 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
537 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
538 dgit [dgit-opts] build [dpkg-buildpackage-opts]
539 dgit [dgit-opts] sbuild [sbuild-opts]
540 dgit [dgit-opts] push [dgit-opts] [suite]
541 dgit [dgit-opts] rpush build-host:build-dir ...
542 important dgit options:
543 -k<keyid> sign tag and package with <keyid> instead of default
544 --dry-run -n do not change anything, but go through the motions
545 --damp-run -L like --dry-run but make local changes, without signing
546 --new -N allow introducing a new package
547 --debug -D increase debug level
548 -c<name>=<value> set git config option (used directly by dgit too)
551 our $later_warning_msg = <<END;
552 Perhaps the upload is stuck in incoming. Using the version from git.
556 print STDERR "$us: @_\n", $helpmsg or die $!;
561 @ARGV or badusage "too few arguments";
562 return scalar shift @ARGV;
566 not_necessarily_a_tree();
569 print $helpmsg or die $!;
573 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
575 our %defcfg = ('dgit.default.distro' => 'debian',
576 'dgit.default.default-suite' => 'unstable',
577 'dgit.default.old-dsc-distro' => 'debian',
578 'dgit-suite.*-security.distro' => 'debian-security',
579 'dgit.default.username' => '',
580 'dgit.default.archive-query-default-component' => 'main',
581 'dgit.default.ssh' => 'ssh',
582 'dgit.default.archive-query' => 'madison:',
583 'dgit.default.sshpsql-dbname' => 'service=projectb',
584 'dgit.default.aptget-components' => 'main',
585 'dgit.default.dgit-tag-format' => 'new,old,maint',
586 'dgit.dsc-url-proto-ok.http' => 'true',
587 'dgit.dsc-url-proto-ok.https' => 'true',
588 'dgit.dsc-url-proto-ok.git' => 'true',
589 'dgit.default.dsc-url-proto-ok' => 'false',
590 # old means "repo server accepts pushes with old dgit tags"
591 # new means "repo server accepts pushes with new dgit tags"
592 # maint means "repo server accepts split brain pushes"
593 # hist means "repo server may have old pushes without new tag"
594 # ("hist" is implied by "old")
595 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
596 'dgit-distro.debian.git-check' => 'url',
597 'dgit-distro.debian.git-check-suffix' => '/info/refs',
598 'dgit-distro.debian.new-private-pushers' => 't',
599 'dgit-distro.debian/push.git-url' => '',
600 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
601 'dgit-distro.debian/push.git-user-force' => 'dgit',
602 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
603 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
604 'dgit-distro.debian/push.git-create' => 'true',
605 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
606 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
607 # 'dgit-distro.debian.archive-query-tls-key',
608 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
609 # ^ this does not work because curl is broken nowadays
610 # Fixing #790093 properly will involve providing providing the key
611 # in some pacagke and maybe updating these paths.
613 # 'dgit-distro.debian.archive-query-tls-curl-args',
614 # '--ca-path=/etc/ssl/ca-debian',
615 # ^ this is a workaround but works (only) on DSA-administered machines
616 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
617 'dgit-distro.debian.git-url-suffix' => '',
618 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
619 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
620 'dgit-distro.debian-security.archive-query' => 'aptget:',
621 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
622 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
623 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
624 'dgit-distro.debian-security.nominal-distro' => 'debian',
625 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
626 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
627 'dgit-distro.ubuntu.git-check' => 'false',
628 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
629 'dgit-distro.test-dummy.ssh' => "$td/ssh",
630 'dgit-distro.test-dummy.username' => "alice",
631 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
632 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
633 'dgit-distro.test-dummy.git-url' => "$td/git",
634 'dgit-distro.test-dummy.git-host' => "git",
635 'dgit-distro.test-dummy.git-path' => "$td/git",
636 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
637 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
638 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
639 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
643 our @gitcfgsources = qw(cmdline local global system);
644 our $invoked_in_git_tree = 1;
646 sub git_slurp_config () {
647 # This algoritm is a bit subtle, but this is needed so that for
648 # options which we want to be single-valued, we allow the
649 # different config sources to override properly. See #835858.
650 foreach my $src (@gitcfgsources) {
651 next if $src eq 'cmdline';
652 # we do this ourselves since git doesn't handle it
654 $gitcfgs{$src} = git_slurp_config_src $src;
658 sub git_get_config ($) {
660 foreach my $src (@gitcfgsources) {
661 my $l = $gitcfgs{$src}{$c};
662 confess "internal error ($l $c)" if $l && !ref $l;
663 printdebug"C $c ".(defined $l ?
664 join " ", map { messagequote "'$_'" } @$l :
668 @$l==1 or badcfg "multiple values for $c".
669 " (in $src git config)" if @$l > 1;
677 return undef if $c =~ /RETURN-UNDEF/;
678 printdebug "C? $c\n" if $debuglevel >= 5;
679 my $v = git_get_config($c);
680 return $v if defined $v;
681 my $dv = $defcfg{$c};
683 printdebug "CD $c $dv\n" if $debuglevel >= 4;
687 badcfg "need value for one of: @_\n".
688 "$us: distro or suite appears not to be (properly) supported";
691 sub not_necessarily_a_tree () {
692 # needs to be called from pre_*
693 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
694 $invoked_in_git_tree = 0;
697 sub access_basedistro__noalias () {
698 if (defined $idistro) {
701 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
702 return $def if defined $def;
703 foreach my $src (@gitcfgsources, 'internal') {
704 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
706 foreach my $k (keys %$kl) {
707 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
709 next unless match_glob $dpat, $isuite;
713 return cfg("dgit.default.distro");
717 sub access_basedistro () {
718 my $noalias = access_basedistro__noalias();
719 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
720 return $canon // $noalias;
723 sub access_nomdistro () {
724 my $base = access_basedistro();
725 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
726 $r =~ m/^$distro_re$/ or badcfg
727 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
731 sub access_quirk () {
732 # returns (quirk name, distro to use instead or undef, quirk-specific info)
733 my $basedistro = access_basedistro();
734 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
736 if (defined $backports_quirk) {
737 my $re = $backports_quirk;
738 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
740 $re =~ s/\%/([-0-9a-z_]+)/
741 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
742 if ($isuite =~ m/^$re$/) {
743 return ('backports',"$basedistro-backports",$1);
746 return ('none',undef);
751 sub parse_cfg_bool ($$$) {
752 my ($what,$def,$v) = @_;
755 $v =~ m/^[ty1]/ ? 1 :
756 $v =~ m/^[fn0]/ ? 0 :
757 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
760 sub access_forpush_config () {
761 my $d = access_basedistro();
765 parse_cfg_bool('new-private-pushers', 0,
766 cfg("dgit-distro.$d.new-private-pushers",
769 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
772 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
773 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
774 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
775 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
778 sub access_forpush () {
779 $access_forpush //= access_forpush_config();
780 return $access_forpush;
784 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
785 badcfg "pushing but distro is configured readonly"
786 if access_forpush_config() eq '0';
788 $supplementary_message = <<'END' unless $we_are_responder;
789 Push failed, before we got started.
790 You can retry the push, after fixing the problem, if you like.
792 parseopts_late_defaults();
796 parseopts_late_defaults();
799 sub supplementary_message ($) {
801 if (!$we_are_responder) {
802 $supplementary_message = $msg;
804 } elsif ($protovsn >= 3) {
805 responder_send_command "supplementary-message ".length($msg)
807 print PO $msg or die $!;
811 sub access_distros () {
812 # Returns list of distros to try, in order
815 # 0. `instead of' distro name(s) we have been pointed to
816 # 1. the access_quirk distro, if any
817 # 2a. the user's specified distro, or failing that } basedistro
818 # 2b. the distro calculated from the suite }
819 my @l = access_basedistro();
821 my (undef,$quirkdistro) = access_quirk();
822 unshift @l, $quirkdistro;
823 unshift @l, $instead_distro;
824 @l = grep { defined } @l;
826 push @l, access_nomdistro();
828 if (access_forpush()) {
829 @l = map { ("$_/push", $_) } @l;
834 sub access_cfg_cfgs (@) {
837 # The nesting of these loops determines the search order. We put
838 # the key loop on the outside so that we search all the distros
839 # for each key, before going on to the next key. That means that
840 # if access_cfg is called with a more specific, and then a less
841 # specific, key, an earlier distro can override the less specific
842 # without necessarily overriding any more specific keys. (If the
843 # distro wants to override the more specific keys it can simply do
844 # so; whereas if we did the loop the other way around, it would be
845 # impossible to for an earlier distro to override a less specific
846 # key but not the more specific ones without restating the unknown
847 # values of the more specific keys.
850 # We have to deal with RETURN-UNDEF specially, so that we don't
851 # terminate the search prematurely.
853 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
856 foreach my $d (access_distros()) {
857 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
859 push @cfgs, map { "dgit.default.$_" } @realkeys;
866 my (@cfgs) = access_cfg_cfgs(@keys);
867 my $value = cfg(@cfgs);
871 sub access_cfg_bool ($$) {
872 my ($def, @keys) = @_;
873 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
876 sub string_to_ssh ($) {
878 if ($spec =~ m/\s/) {
879 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
885 sub access_cfg_ssh () {
886 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
887 if (!defined $gitssh) {
890 return string_to_ssh $gitssh;
894 sub access_runeinfo ($) {
896 return ": dgit ".access_basedistro()." $info ;";
899 sub access_someuserhost ($) {
901 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
902 defined($user) && length($user) or
903 $user = access_cfg("$some-user",'username');
904 my $host = access_cfg("$some-host");
905 return length($user) ? "$user\@$host" : $host;
908 sub access_gituserhost () {
909 return access_someuserhost('git');
912 sub access_giturl (;$) {
914 my $url = access_cfg('git-url','RETURN-UNDEF');
917 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
918 return undef unless defined $proto;
921 access_gituserhost().
922 access_cfg('git-path');
924 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
927 return "$url/$package$suffix";
930 sub parsecontrolfh ($$;$) {
931 my ($fh, $desc, $allowsigned) = @_;
932 our $dpkgcontrolhash_noissigned;
935 my %opts = ('name' => $desc);
936 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
937 $c = Dpkg::Control::Hash->new(%opts);
938 $c->parse($fh,$desc) or die "parsing of $desc failed";
939 last if $allowsigned;
940 last if $dpkgcontrolhash_noissigned;
941 my $issigned= $c->get_option('is_pgp_signed');
942 if (!defined $issigned) {
943 $dpkgcontrolhash_noissigned= 1;
944 seek $fh, 0,0 or die "seek $desc: $!";
945 } elsif ($issigned) {
946 fail "control file $desc is (already) PGP-signed. ".
947 " Note that dgit push needs to modify the .dsc and then".
948 " do the signature itself";
957 my ($file, $desc, $allowsigned) = @_;
958 my $fh = new IO::Handle;
959 open $fh, '<', $file or die "$file: $!";
960 my $c = parsecontrolfh($fh,$desc,$allowsigned);
961 $fh->error and die $!;
967 my ($dctrl,$field) = @_;
968 my $v = $dctrl->{$field};
969 return $v if defined $v;
970 fail "missing field $field in ".$dctrl->get_option('name');
974 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
975 my $p = new IO::Handle;
976 my @cmd = (qw(dpkg-parsechangelog), @_);
977 open $p, '-|', @cmd or die $!;
979 $?=0; $!=0; close $p or failedcmd @cmd;
983 sub commit_getclogp ($) {
984 # Returns the parsed changelog hashref for a particular commit
986 our %commit_getclogp_memo;
987 my $memo = $commit_getclogp_memo{$objid};
988 return $memo if $memo;
990 my $mclog = dgit_privdir()."clog";
991 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
992 "$objid:debian/changelog";
993 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
996 sub parse_dscdata () {
997 my $dscfh = new IO::File \$dscdata, '<' or die $!;
998 printdebug Dumper($dscdata) if $debuglevel>1;
999 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1000 printdebug Dumper($dsc) if $debuglevel>1;
1005 sub archive_query ($;@) {
1006 my ($method) = shift @_;
1007 fail "this operation does not support multiple comma-separated suites"
1009 my $query = access_cfg('archive-query','RETURN-UNDEF');
1010 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1013 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1016 sub archive_query_prepend_mirror {
1017 my $m = access_cfg('mirror');
1018 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1021 sub pool_dsc_subpath ($$) {
1022 my ($vsn,$component) = @_; # $package is implict arg
1023 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1024 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1027 sub cfg_apply_map ($$$) {
1028 my ($varref, $what, $mapspec) = @_;
1029 return unless $mapspec;
1031 printdebug "config $what EVAL{ $mapspec; }\n";
1033 eval "package Dgit::Config; $mapspec;";
1038 #---------- `ftpmasterapi' archive query method (nascent) ----------
1040 sub archive_api_query_cmd ($) {
1042 my @cmd = (@curl, qw(-sS));
1043 my $url = access_cfg('archive-query-url');
1044 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1046 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1047 foreach my $key (split /\:/, $keys) {
1048 $key =~ s/\%HOST\%/$host/g;
1050 fail "for $url: stat $key: $!" unless $!==ENOENT;
1053 fail "config requested specific TLS key but do not know".
1054 " how to get curl to use exactly that EE key ($key)";
1055 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1056 # # Sadly the above line does not work because of changes
1057 # # to gnutls. The real fix for #790093 may involve
1058 # # new curl options.
1061 # Fixing #790093 properly will involve providing a value
1062 # for this on clients.
1063 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1064 push @cmd, split / /, $kargs if defined $kargs;
1066 push @cmd, $url.$subpath;
1070 sub api_query ($$;$) {
1072 my ($data, $subpath, $ok404) = @_;
1073 badcfg "ftpmasterapi archive query method takes no data part"
1075 my @cmd = archive_api_query_cmd($subpath);
1076 my $url = $cmd[$#cmd];
1077 push @cmd, qw(-w %{http_code});
1078 my $json = cmdoutput @cmd;
1079 unless ($json =~ s/\d+\d+\d$//) {
1080 failedcmd_report_cmd undef, @cmd;
1081 fail "curl failed to print 3-digit HTTP code";
1084 return undef if $code eq '404' && $ok404;
1085 fail "fetch of $url gave HTTP code $code"
1086 unless $url =~ m#^file://# or $code =~ m/^2/;
1087 return decode_json($json);
1090 sub canonicalise_suite_ftpmasterapi {
1091 my ($proto,$data) = @_;
1092 my $suites = api_query($data, 'suites');
1094 foreach my $entry (@$suites) {
1096 my $v = $entry->{$_};
1097 defined $v && $v eq $isuite;
1098 } qw(codename name);
1099 push @matched, $entry;
1101 fail "unknown suite $isuite" unless @matched;
1104 @matched==1 or die "multiple matches for suite $isuite\n";
1105 $cn = "$matched[0]{codename}";
1106 defined $cn or die "suite $isuite info has no codename\n";
1107 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1109 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1114 sub archive_query_ftpmasterapi {
1115 my ($proto,$data) = @_;
1116 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1118 my $digester = Digest::SHA->new(256);
1119 foreach my $entry (@$info) {
1121 my $vsn = "$entry->{version}";
1122 my ($ok,$msg) = version_check $vsn;
1123 die "bad version: $msg\n" unless $ok;
1124 my $component = "$entry->{component}";
1125 $component =~ m/^$component_re$/ or die "bad component";
1126 my $filename = "$entry->{filename}";
1127 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1128 or die "bad filename";
1129 my $sha256sum = "$entry->{sha256sum}";
1130 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1131 push @rows, [ $vsn, "/pool/$component/$filename",
1132 $digester, $sha256sum ];
1134 die "bad ftpmaster api response: $@\n".Dumper($entry)
1137 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1138 return archive_query_prepend_mirror @rows;
1141 sub file_in_archive_ftpmasterapi {
1142 my ($proto,$data,$filename) = @_;
1143 my $pat = $filename;
1146 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1147 my $info = api_query($data, "file_in_archive/$pat", 1);
1150 #---------- `aptget' archive query method ----------
1153 our $aptget_releasefile;
1154 our $aptget_configpath;
1156 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1157 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1159 sub aptget_cache_clean {
1160 runcmd_ordryrun_local qw(sh -ec),
1161 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1165 sub aptget_lock_acquire () {
1166 my $lockfile = "$aptget_base/lock";
1167 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1168 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1171 sub aptget_prep ($) {
1173 return if defined $aptget_base;
1175 badcfg "aptget archive query method takes no data part"
1178 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1181 ensuredir "$cache/dgit";
1183 access_cfg('aptget-cachekey','RETURN-UNDEF')
1184 // access_nomdistro();
1186 $aptget_base = "$cache/dgit/aptget";
1187 ensuredir $aptget_base;
1189 my $quoted_base = $aptget_base;
1190 die "$quoted_base contains bad chars, cannot continue"
1191 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1193 ensuredir $aptget_base;
1195 aptget_lock_acquire();
1197 aptget_cache_clean();
1199 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1200 my $sourceslist = "source.list#$cachekey";
1202 my $aptsuites = $isuite;
1203 cfg_apply_map(\$aptsuites, 'suite map',
1204 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1206 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1207 printf SRCS "deb-src %s %s %s\n",
1208 access_cfg('mirror'),
1210 access_cfg('aptget-components')
1213 ensuredir "$aptget_base/cache";
1214 ensuredir "$aptget_base/lists";
1216 open CONF, ">", $aptget_configpath or die $!;
1218 Debug::NoLocking "true";
1219 APT::Get::List-Cleanup "false";
1220 #clear APT::Update::Post-Invoke-Success;
1221 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1222 Dir::State::Lists "$quoted_base/lists";
1223 Dir::Etc::preferences "$quoted_base/preferences";
1224 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1225 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1228 foreach my $key (qw(
1231 Dir::Cache::Archives
1232 Dir::Etc::SourceParts
1233 Dir::Etc::preferencesparts
1235 ensuredir "$aptget_base/$key";
1236 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1239 my $oldatime = (time // die $!) - 1;
1240 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1241 next unless stat_exists $oldlist;
1242 my ($mtime) = (stat _)[9];
1243 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1246 runcmd_ordryrun_local aptget_aptget(), qw(update);
1249 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1250 next unless stat_exists $oldlist;
1251 my ($atime) = (stat _)[8];
1252 next if $atime == $oldatime;
1253 push @releasefiles, $oldlist;
1255 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1256 @releasefiles = @inreleasefiles if @inreleasefiles;
1257 die "apt updated wrong number of Release files (@releasefiles), erk"
1258 unless @releasefiles == 1;
1260 ($aptget_releasefile) = @releasefiles;
1263 sub canonicalise_suite_aptget {
1264 my ($proto,$data) = @_;
1267 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1269 foreach my $name (qw(Codename Suite)) {
1270 my $val = $release->{$name};
1272 printdebug "release file $name: $val\n";
1273 $val =~ m/^$suite_re$/o or fail
1274 "Release file ($aptget_releasefile) specifies intolerable $name";
1275 cfg_apply_map(\$val, 'suite rmap',
1276 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1283 sub archive_query_aptget {
1284 my ($proto,$data) = @_;
1287 ensuredir "$aptget_base/source";
1288 foreach my $old (<$aptget_base/source/*.dsc>) {
1289 unlink $old or die "$old: $!";
1292 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1293 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1294 # avoids apt-get source failing with ambiguous error code
1296 runcmd_ordryrun_local
1297 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1298 aptget_aptget(), qw(--download-only --only-source source), $package;
1300 my @dscs = <$aptget_base/source/*.dsc>;
1301 fail "apt-get source did not produce a .dsc" unless @dscs;
1302 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1304 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1307 my $uri = "file://". uri_escape $dscs[0];
1308 $uri =~ s{\%2f}{/}gi;
1309 return [ (getfield $pre_dsc, 'Version'), $uri ];
1312 sub file_in_archive_aptget () { return undef; }
1314 #---------- `dummyapicat' archive query method ----------
1316 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1317 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1319 sub file_in_archive_dummycatapi ($$$) {
1320 my ($proto,$data,$filename) = @_;
1321 my $mirror = access_cfg('mirror');
1322 $mirror =~ s#^file://#/# or die "$mirror ?";
1324 my @cmd = (qw(sh -ec), '
1326 find -name "$2" -print0 |
1328 ', qw(x), $mirror, $filename);
1329 debugcmd "-|", @cmd;
1330 open FIA, "-|", @cmd or die $!;
1333 printdebug "| $_\n";
1334 m/^(\w+) (\S+)$/ or die "$_ ?";
1335 push @out, { sha256sum => $1, filename => $2 };
1337 close FIA or die failedcmd @cmd;
1341 #---------- `madison' archive query method ----------
1343 sub archive_query_madison {
1344 return archive_query_prepend_mirror
1345 map { [ @$_[0..1] ] } madison_get_parse(@_);
1348 sub madison_get_parse {
1349 my ($proto,$data) = @_;
1350 die unless $proto eq 'madison';
1351 if (!length $data) {
1352 $data= access_cfg('madison-distro','RETURN-UNDEF');
1353 $data //= access_basedistro();
1355 $rmad{$proto,$data,$package} ||= cmdoutput
1356 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1357 my $rmad = $rmad{$proto,$data,$package};
1360 foreach my $l (split /\n/, $rmad) {
1361 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1362 \s*( [^ \t|]+ )\s* \|
1363 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1364 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1365 $1 eq $package or die "$rmad $package ?";
1372 $component = access_cfg('archive-query-default-component');
1374 $5 eq 'source' or die "$rmad ?";
1375 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1377 return sort { -version_compare($a->[0],$b->[0]); } @out;
1380 sub canonicalise_suite_madison {
1381 # madison canonicalises for us
1382 my @r = madison_get_parse(@_);
1384 "unable to canonicalise suite using package $package".
1385 " which does not appear to exist in suite $isuite;".
1386 " --existing-package may help";
1390 sub file_in_archive_madison { return undef; }
1392 #---------- `sshpsql' archive query method ----------
1395 my ($data,$runeinfo,$sql) = @_;
1396 if (!length $data) {
1397 $data= access_someuserhost('sshpsql').':'.
1398 access_cfg('sshpsql-dbname');
1400 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1401 my ($userhost,$dbname) = ($`,$'); #';
1403 my @cmd = (access_cfg_ssh, $userhost,
1404 access_runeinfo("ssh-psql $runeinfo").
1405 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1406 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1408 open P, "-|", @cmd or die $!;
1411 printdebug(">|$_|\n");
1414 $!=0; $?=0; close P or failedcmd @cmd;
1416 my $nrows = pop @rows;
1417 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1418 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1419 @rows = map { [ split /\|/, $_ ] } @rows;
1420 my $ncols = scalar @{ shift @rows };
1421 die if grep { scalar @$_ != $ncols } @rows;
1425 sub sql_injection_check {
1426 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1429 sub archive_query_sshpsql ($$) {
1430 my ($proto,$data) = @_;
1431 sql_injection_check $isuite, $package;
1432 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1433 SELECT source.version, component.name, files.filename, files.sha256sum
1435 JOIN src_associations ON source.id = src_associations.source
1436 JOIN suite ON suite.id = src_associations.suite
1437 JOIN dsc_files ON dsc_files.source = source.id
1438 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1439 JOIN component ON component.id = files_archive_map.component_id
1440 JOIN files ON files.id = dsc_files.file
1441 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1442 AND source.source='$package'
1443 AND files.filename LIKE '%.dsc';
1445 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1446 my $digester = Digest::SHA->new(256);
1448 my ($vsn,$component,$filename,$sha256sum) = @$_;
1449 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1451 return archive_query_prepend_mirror @rows;
1454 sub canonicalise_suite_sshpsql ($$) {
1455 my ($proto,$data) = @_;
1456 sql_injection_check $isuite;
1457 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1458 SELECT suite.codename
1459 FROM suite where suite_name='$isuite' or codename='$isuite';
1461 @rows = map { $_->[0] } @rows;
1462 fail "unknown suite $isuite" unless @rows;
1463 die "ambiguous $isuite: @rows ?" if @rows>1;
1467 sub file_in_archive_sshpsql ($$$) { return undef; }
1469 #---------- `dummycat' archive query method ----------
1471 sub canonicalise_suite_dummycat ($$) {
1472 my ($proto,$data) = @_;
1473 my $dpath = "$data/suite.$isuite";
1474 if (!open C, "<", $dpath) {
1475 $!==ENOENT or die "$dpath: $!";
1476 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1480 chomp or die "$dpath: $!";
1482 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1486 sub archive_query_dummycat ($$) {
1487 my ($proto,$data) = @_;
1488 canonicalise_suite();
1489 my $dpath = "$data/package.$csuite.$package";
1490 if (!open C, "<", $dpath) {
1491 $!==ENOENT or die "$dpath: $!";
1492 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1500 printdebug "dummycat query $csuite $package $dpath | $_\n";
1501 my @row = split /\s+/, $_;
1502 @row==2 or die "$dpath: $_ ?";
1505 C->error and die "$dpath: $!";
1507 return archive_query_prepend_mirror
1508 sort { -version_compare($a->[0],$b->[0]); } @rows;
1511 sub file_in_archive_dummycat () { return undef; }
1513 #---------- tag format handling ----------
1515 sub access_cfg_tagformats () {
1516 split /\,/, access_cfg('dgit-tag-format');
1519 sub access_cfg_tagformats_can_splitbrain () {
1520 my %y = map { $_ => 1 } access_cfg_tagformats;
1521 foreach my $needtf (qw(new maint)) {
1522 next if $y{$needtf};
1528 sub need_tagformat ($$) {
1529 my ($fmt, $why) = @_;
1530 fail "need to use tag format $fmt ($why) but also need".
1531 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1532 " - no way to proceed"
1533 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1534 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1537 sub select_tagformat () {
1539 return if $tagformatfn && !$tagformat_want;
1540 die 'bug' if $tagformatfn && $tagformat_want;
1541 # ... $tagformat_want assigned after previous select_tagformat
1543 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1544 printdebug "select_tagformat supported @supported\n";
1546 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1547 printdebug "select_tagformat specified @$tagformat_want\n";
1549 my ($fmt,$why,$override) = @$tagformat_want;
1551 fail "target distro supports tag formats @supported".
1552 " but have to use $fmt ($why)"
1554 or grep { $_ eq $fmt } @supported;
1556 $tagformat_want = undef;
1558 $tagformatfn = ${*::}{"debiantag_$fmt"};
1560 fail "trying to use unknown tag format \`$fmt' ($why) !"
1561 unless $tagformatfn;
1564 #---------- archive query entrypoints and rest of program ----------
1566 sub canonicalise_suite () {
1567 return if defined $csuite;
1568 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1569 $csuite = archive_query('canonicalise_suite');
1570 if ($isuite ne $csuite) {
1571 progress "canonical suite name for $isuite is $csuite";
1573 progress "canonical suite name is $csuite";
1577 sub get_archive_dsc () {
1578 canonicalise_suite();
1579 my @vsns = archive_query('archive_query');
1580 foreach my $vinfo (@vsns) {
1581 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1582 $dscurl = $vsn_dscurl;
1583 $dscdata = url_get($dscurl);
1585 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1590 $digester->add($dscdata);
1591 my $got = $digester->hexdigest();
1593 fail "$dscurl has hash $got but".
1594 " archive told us to expect $digest";
1597 my $fmt = getfield $dsc, 'Format';
1598 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1599 "unsupported source format $fmt, sorry";
1601 $dsc_checked = !!$digester;
1602 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1606 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1609 sub check_for_git ();
1610 sub check_for_git () {
1612 my $how = access_cfg('git-check');
1613 if ($how eq 'ssh-cmd') {
1615 (access_cfg_ssh, access_gituserhost(),
1616 access_runeinfo("git-check $package").
1617 " set -e; cd ".access_cfg('git-path').";".
1618 " if test -d $package.git; then echo 1; else echo 0; fi");
1619 my $r= cmdoutput @cmd;
1620 if (defined $r and $r =~ m/^divert (\w+)$/) {
1622 my ($usedistro,) = access_distros();
1623 # NB that if we are pushing, $usedistro will be $distro/push
1624 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1625 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1626 progress "diverting to $divert (using config for $instead_distro)";
1627 return check_for_git();
1629 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1631 } elsif ($how eq 'url') {
1632 my $prefix = access_cfg('git-check-url','git-url');
1633 my $suffix = access_cfg('git-check-suffix','git-suffix',
1634 'RETURN-UNDEF') // '.git';
1635 my $url = "$prefix/$package$suffix";
1636 my @cmd = (@curl, qw(-sS -I), $url);
1637 my $result = cmdoutput @cmd;
1638 $result =~ s/^\S+ 200 .*\n\r?\n//;
1639 # curl -sS -I with https_proxy prints
1640 # HTTP/1.0 200 Connection established
1641 $result =~ m/^\S+ (404|200) /s or
1642 fail "unexpected results from git check query - ".
1643 Dumper($prefix, $result);
1645 if ($code eq '404') {
1647 } elsif ($code eq '200') {
1652 } elsif ($how eq 'true') {
1654 } elsif ($how eq 'false') {
1657 badcfg "unknown git-check \`$how'";
1661 sub create_remote_git_repo () {
1662 my $how = access_cfg('git-create');
1663 if ($how eq 'ssh-cmd') {
1665 (access_cfg_ssh, access_gituserhost(),
1666 access_runeinfo("git-create $package").
1667 "set -e; cd ".access_cfg('git-path').";".
1668 " cp -a _template $package.git");
1669 } elsif ($how eq 'true') {
1672 badcfg "unknown git-create \`$how'";
1676 our ($dsc_hash,$lastpush_mergeinput);
1677 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1681 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1682 fresh_playground 'dgit/unpack';
1685 sub mktree_in_ud_here () {
1686 playtree_setup $gitcfgs{local};
1689 sub git_write_tree () {
1690 my $tree = cmdoutput @git, qw(write-tree);
1691 $tree =~ m/^\w+$/ or die "$tree ?";
1695 sub git_add_write_tree () {
1696 runcmd @git, qw(add -Af .);
1697 return git_write_tree();
1700 sub remove_stray_gits ($) {
1702 my @gitscmd = qw(find -name .git -prune -print0);
1703 debugcmd "|",@gitscmd;
1704 open GITS, "-|", @gitscmd or die $!;
1709 print STDERR "$us: warning: removing from $what: ",
1710 (messagequote $_), "\n";
1714 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1717 sub mktree_in_ud_from_only_subdir ($;$) {
1718 my ($what,$raw) = @_;
1719 # changes into the subdir
1722 die "expected one subdir but found @dirs ?" unless @dirs==1;
1723 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1727 remove_stray_gits($what);
1728 mktree_in_ud_here();
1730 my ($format, $fopts) = get_source_format();
1731 if (madformat($format)) {
1736 my $tree=git_add_write_tree();
1737 return ($tree,$dir);
1740 our @files_csum_info_fields =
1741 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1742 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1743 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1745 sub dsc_files_info () {
1746 foreach my $csumi (@files_csum_info_fields) {
1747 my ($fname, $module, $method) = @$csumi;
1748 my $field = $dsc->{$fname};
1749 next unless defined $field;
1750 eval "use $module; 1;" or die $@;
1752 foreach (split /\n/, $field) {
1754 m/^(\w+) (\d+) (\S+)$/ or
1755 fail "could not parse .dsc $fname line \`$_'";
1756 my $digester = eval "$module"."->$method;" or die $@;
1761 Digester => $digester,
1766 fail "missing any supported Checksums-* or Files field in ".
1767 $dsc->get_option('name');
1771 map { $_->{Filename} } dsc_files_info();
1774 sub files_compare_inputs (@) {
1779 my $showinputs = sub {
1780 return join "; ", map { $_->get_option('name') } @$inputs;
1783 foreach my $in (@$inputs) {
1785 my $in_name = $in->get_option('name');
1787 printdebug "files_compare_inputs $in_name\n";
1789 foreach my $csumi (@files_csum_info_fields) {
1790 my ($fname) = @$csumi;
1791 printdebug "files_compare_inputs $in_name $fname\n";
1793 my $field = $in->{$fname};
1794 next unless defined $field;
1797 foreach (split /\n/, $field) {
1800 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1801 fail "could not parse $in_name $fname line \`$_'";
1803 printdebug "files_compare_inputs $in_name $fname $f\n";
1807 my $re = \ $record{$f}{$fname};
1809 $fchecked{$f}{$in_name} = 1;
1811 fail "hash or size of $f varies in $fname fields".
1812 " (between: ".$showinputs->().")";
1817 @files = sort @files;
1818 $expected_files //= \@files;
1819 "@$expected_files" eq "@files" or
1820 fail "file list in $in_name varies between hash fields!";
1823 fail "$in_name has no files list field(s)";
1825 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1828 grep { keys %$_ == @$inputs-1 } values %fchecked
1829 or fail "no file appears in all file lists".
1830 " (looked in: ".$showinputs->().")";
1833 sub is_orig_file_in_dsc ($$) {
1834 my ($f, $dsc_files_info) = @_;
1835 return 0 if @$dsc_files_info <= 1;
1836 # One file means no origs, and the filename doesn't have a "what
1837 # part of dsc" component. (Consider versions ending `.orig'.)
1838 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1842 sub is_orig_file_of_vsn ($$) {
1843 my ($f, $upstreamvsn) = @_;
1844 my $base = srcfn $upstreamvsn, '';
1845 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1849 sub changes_update_origs_from_dsc ($$$$) {
1850 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1852 printdebug "checking origs needed ($upstreamvsn)...\n";
1853 $_ = getfield $changes, 'Files';
1854 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1855 fail "cannot find section/priority from .changes Files field";
1856 my $placementinfo = $1;
1858 printdebug "checking origs needed placement '$placementinfo'...\n";
1859 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1860 $l =~ m/\S+$/ or next;
1862 printdebug "origs $file | $l\n";
1863 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1864 printdebug "origs $file is_orig\n";
1865 my $have = archive_query('file_in_archive', $file);
1866 if (!defined $have) {
1868 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1874 printdebug "origs $file \$#\$have=$#$have\n";
1875 foreach my $h (@$have) {
1878 foreach my $csumi (@files_csum_info_fields) {
1879 my ($fname, $module, $method, $archivefield) = @$csumi;
1880 next unless defined $h->{$archivefield};
1881 $_ = $dsc->{$fname};
1882 next unless defined;
1883 m/^(\w+) .* \Q$file\E$/m or
1884 fail ".dsc $fname missing entry for $file";
1885 if ($h->{$archivefield} eq $1) {
1889 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1892 die "$file ".Dumper($h)." ?!" if $same && @differ;
1895 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1898 printdebug "origs $file f.same=$found_same".
1899 " #f._differ=$#found_differ\n";
1900 if (@found_differ && !$found_same) {
1902 "archive contains $file with different checksum",
1905 # Now we edit the changes file to add or remove it
1906 foreach my $csumi (@files_csum_info_fields) {
1907 my ($fname, $module, $method, $archivefield) = @$csumi;
1908 next unless defined $changes->{$fname};
1910 # in archive, delete from .changes if it's there
1911 $changed{$file} = "removed" if
1912 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1913 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1914 # not in archive, but it's here in the .changes
1916 my $dsc_data = getfield $dsc, $fname;
1917 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1919 $extra =~ s/ \d+ /$&$placementinfo /
1920 or die "$fname $extra >$dsc_data< ?"
1921 if $fname eq 'Files';
1922 $changes->{$fname} .= "\n". $extra;
1923 $changed{$file} = "added";
1928 foreach my $file (keys %changed) {
1930 "edited .changes for archive .orig contents: %s %s",
1931 $changed{$file}, $file;
1933 my $chtmp = "$changesfile.tmp";
1934 $changes->save($chtmp);
1936 rename $chtmp,$changesfile or die "$changesfile $!";
1938 progress "[new .changes left in $changesfile]";
1941 progress "$changesfile already has appropriate .orig(s) (if any)";
1945 sub make_commit ($) {
1947 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1950 sub make_commit_text ($) {
1953 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1955 print Dumper($text) if $debuglevel > 1;
1956 my $child = open2($out, $in, @cmd) or die $!;
1959 print $in $text or die $!;
1960 close $in or die $!;
1962 $h =~ m/^\w+$/ or die;
1964 printdebug "=> $h\n";
1967 waitpid $child, 0 == $child or die "$child $!";
1968 $? and failedcmd @cmd;
1972 sub clogp_authline ($) {
1974 my $author = getfield $clogp, 'Maintainer';
1975 if ($author =~ m/^[^"\@]+\,/) {
1976 # single entry Maintainer field with unquoted comma
1977 $author = ($& =~ y/,//rd).$'; # strip the comma
1979 # git wants a single author; any remaining commas in $author
1980 # are by now preceded by @ (or "). It seems safer to punt on
1981 # "..." for now rather than attempting to dequote or something.
1982 $author =~ s#,.*##ms unless $author =~ m/"/;
1983 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1984 my $authline = "$author $date";
1985 $authline =~ m/$git_authline_re/o or
1986 fail "unexpected commit author line format \`$authline'".
1987 " (was generated from changelog Maintainer field)";
1988 return ($1,$2,$3) if wantarray;
1992 sub vendor_patches_distro ($$) {
1993 my ($checkdistro, $what) = @_;
1994 return unless defined $checkdistro;
1996 my $series = "debian/patches/\L$checkdistro\E.series";
1997 printdebug "checking for vendor-specific $series ($what)\n";
1999 if (!open SERIES, "<", $series) {
2000 die "$series $!" unless $!==ENOENT;
2009 Unfortunately, this source package uses a feature of dpkg-source where
2010 the same source package unpacks to different source code on different
2011 distros. dgit cannot safely operate on such packages on affected
2012 distros, because the meaning of source packages is not stable.
2014 Please ask the distro/maintainer to remove the distro-specific series
2015 files and use a different technique (if necessary, uploading actually
2016 different packages, if different distros are supposed to have
2020 fail "Found active distro-specific series file for".
2021 " $checkdistro ($what): $series, cannot continue";
2023 die "$series $!" if SERIES->error;
2027 sub check_for_vendor_patches () {
2028 # This dpkg-source feature doesn't seem to be documented anywhere!
2029 # But it can be found in the changelog (reformatted):
2031 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2032 # Author: Raphael Hertzog <hertzog@debian.org>
2033 # Date: Sun Oct 3 09:36:48 2010 +0200
2035 # dpkg-source: correctly create .pc/.quilt_series with alternate
2038 # If you have debian/patches/ubuntu.series and you were
2039 # unpacking the source package on ubuntu, quilt was still
2040 # directed to debian/patches/series instead of
2041 # debian/patches/ubuntu.series.
2043 # debian/changelog | 3 +++
2044 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2045 # 2 files changed, 6 insertions(+), 1 deletion(-)
2048 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2049 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2050 "Dpkg::Vendor \`current vendor'");
2051 vendor_patches_distro(access_basedistro(),
2052 "(base) distro being accessed");
2053 vendor_patches_distro(access_nomdistro(),
2054 "(nominal) distro being accessed");
2057 sub generate_commits_from_dsc () {
2058 # See big comment in fetch_from_archive, below.
2059 # See also README.dsc-import.
2061 changedir $playground;
2063 my @dfi = dsc_files_info();
2064 foreach my $fi (@dfi) {
2065 my $f = $fi->{Filename};
2066 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2067 my $upper_f = "$maindir/../$f";
2069 printdebug "considering reusing $f: ";
2071 if (link_ltarget "$upper_f,fetch", $f) {
2072 printdebug "linked (using ...,fetch).\n";
2073 } elsif ((printdebug "($!) "),
2075 fail "accessing ../$f,fetch: $!";
2076 } elsif (link_ltarget $upper_f, $f) {
2077 printdebug "linked.\n";
2078 } elsif ((printdebug "($!) "),
2080 fail "accessing ../$f: $!";
2082 printdebug "absent.\n";
2086 complete_file_from_dsc('.', $fi, \$refetched)
2089 printdebug "considering saving $f: ";
2091 if (link $f, $upper_f) {
2092 printdebug "linked.\n";
2093 } elsif ((printdebug "($!) "),
2095 fail "saving ../$f: $!";
2096 } elsif (!$refetched) {
2097 printdebug "no need.\n";
2098 } elsif (link $f, "$upper_f,fetch") {
2099 printdebug "linked (using ...,fetch).\n";
2100 } elsif ((printdebug "($!) "),
2102 fail "saving ../$f,fetch: $!";
2104 printdebug "cannot.\n";
2108 # We unpack and record the orig tarballs first, so that we only
2109 # need disk space for one private copy of the unpacked source.
2110 # But we can't make them into commits until we have the metadata
2111 # from the debian/changelog, so we record the tree objects now and
2112 # make them into commits later.
2114 my $upstreamv = upstreamversion $dsc->{version};
2115 my $orig_f_base = srcfn $upstreamv, '';
2117 foreach my $fi (@dfi) {
2118 # We actually import, and record as a commit, every tarball
2119 # (unless there is only one file, in which case there seems
2122 my $f = $fi->{Filename};
2123 printdebug "import considering $f ";
2124 (printdebug "only one dfi\n"), next if @dfi == 1;
2125 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2126 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2130 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2132 printdebug "Y ", (join ' ', map { $_//"(none)" }
2133 $compr_ext, $orig_f_part
2136 my $input = new IO::File $f, '<' or die "$f $!";
2140 if (defined $compr_ext) {
2142 Dpkg::Compression::compression_guess_from_filename $f;
2143 fail "Dpkg::Compression cannot handle file $f in source package"
2144 if defined $compr_ext && !defined $cname;
2146 new Dpkg::Compression::Process compression => $cname;
2147 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2148 my $compr_fh = new IO::Handle;
2149 my $compr_pid = open $compr_fh, "-|" // die $!;
2151 open STDIN, "<&", $input or die $!;
2153 die "dgit (child): exec $compr_cmd[0]: $!\n";
2158 rmtree "_unpack-tar";
2159 mkdir "_unpack-tar" or die $!;
2160 my @tarcmd = qw(tar -x -f -
2161 --no-same-owner --no-same-permissions
2162 --no-acls --no-xattrs --no-selinux);
2163 my $tar_pid = fork // die $!;
2165 chdir "_unpack-tar" or die $!;
2166 open STDIN, "<&", $input or die $!;
2168 die "dgit (child): exec $tarcmd[0]: $!";
2170 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2171 !$? or failedcmd @tarcmd;
2174 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2176 # finally, we have the results in "tarball", but maybe
2177 # with the wrong permissions
2179 runcmd qw(chmod -R +rwX _unpack-tar);
2180 changedir "_unpack-tar";
2181 remove_stray_gits($f);
2182 mktree_in_ud_here();
2184 my ($tree) = git_add_write_tree();
2185 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2186 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2188 printdebug "one subtree $1\n";
2190 printdebug "multiple subtrees\n";
2193 rmtree "_unpack-tar";
2195 my $ent = [ $f, $tree ];
2197 Orig => !!$orig_f_part,
2198 Sort => (!$orig_f_part ? 2 :
2199 $orig_f_part =~ m/-/g ? 1 :
2207 # put any without "_" first (spec is not clear whether files
2208 # are always in the usual order). Tarballs without "_" are
2209 # the main orig or the debian tarball.
2210 $a->{Sort} <=> $b->{Sort} or
2214 my $any_orig = grep { $_->{Orig} } @tartrees;
2216 my $dscfn = "$package.dsc";
2218 my $treeimporthow = 'package';
2220 open D, ">", $dscfn or die "$dscfn: $!";
2221 print D $dscdata or die "$dscfn: $!";
2222 close D or die "$dscfn: $!";
2223 my @cmd = qw(dpkg-source);
2224 push @cmd, '--no-check' if $dsc_checked;
2225 if (madformat $dsc->{format}) {
2226 push @cmd, '--skip-patches';
2227 $treeimporthow = 'unpatched';
2229 push @cmd, qw(-x --), $dscfn;
2232 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2233 if (madformat $dsc->{format}) {
2234 check_for_vendor_patches();
2238 if (madformat $dsc->{format}) {
2239 my @pcmd = qw(dpkg-source --before-build .);
2240 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2242 $dappliedtree = git_add_write_tree();
2245 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2246 debugcmd "|",@clogcmd;
2247 open CLOGS, "-|", @clogcmd or die $!;
2252 printdebug "import clog search...\n";
2255 my $stanzatext = do { local $/=""; <CLOGS>; };
2256 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2257 last if !defined $stanzatext;
2259 my $desc = "package changelog, entry no.$.";
2260 open my $stanzafh, "<", \$stanzatext or die;
2261 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2262 $clogp //= $thisstanza;
2264 printdebug "import clog $thisstanza->{version} $desc...\n";
2266 last if !$any_orig; # we don't need $r1clogp
2268 # We look for the first (most recent) changelog entry whose
2269 # version number is lower than the upstream version of this
2270 # package. Then the last (least recent) previous changelog
2271 # entry is treated as the one which introduced this upstream
2272 # version and used for the synthetic commits for the upstream
2275 # One might think that a more sophisticated algorithm would be
2276 # necessary. But: we do not want to scan the whole changelog
2277 # file. Stopping when we see an earlier version, which
2278 # necessarily then is an earlier upstream version, is the only
2279 # realistic way to do that. Then, either the earliest
2280 # changelog entry we have seen so far is indeed the earliest
2281 # upload of this upstream version; or there are only changelog
2282 # entries relating to later upstream versions (which is not
2283 # possible unless the changelog and .dsc disagree about the
2284 # version). Then it remains to choose between the physically
2285 # last entry in the file, and the one with the lowest version
2286 # number. If these are not the same, we guess that the
2287 # versions were created in a non-monotic order rather than
2288 # that the changelog entries have been misordered.
2290 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2292 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2293 $r1clogp = $thisstanza;
2295 printdebug "import clog $r1clogp->{version} becomes r1\n";
2297 die $! if CLOGS->error;
2298 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2300 $clogp or fail "package changelog has no entries!";
2302 my $authline = clogp_authline $clogp;
2303 my $changes = getfield $clogp, 'Changes';
2304 $changes =~ s/^\n//; # Changes: \n
2305 my $cversion = getfield $clogp, 'Version';
2308 $r1clogp //= $clogp; # maybe there's only one entry;
2309 my $r1authline = clogp_authline $r1clogp;
2310 # Strictly, r1authline might now be wrong if it's going to be
2311 # unused because !$any_orig. Whatever.
2313 printdebug "import tartrees authline $authline\n";
2314 printdebug "import tartrees r1authline $r1authline\n";
2316 foreach my $tt (@tartrees) {
2317 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2319 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2322 committer $r1authline
2326 [dgit import orig $tt->{F}]
2334 [dgit import tarball $package $cversion $tt->{F}]
2339 printdebug "import main commit\n";
2341 open C, ">../commit.tmp" or die $!;
2342 print C <<END or die $!;
2345 print C <<END or die $! foreach @tartrees;
2348 print C <<END or die $!;
2354 [dgit import $treeimporthow $package $cversion]
2358 my $rawimport_hash = make_commit qw(../commit.tmp);
2360 if (madformat $dsc->{format}) {
2361 printdebug "import apply patches...\n";
2363 # regularise the state of the working tree so that
2364 # the checkout of $rawimport_hash works nicely.
2365 my $dappliedcommit = make_commit_text(<<END);
2372 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2374 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2376 # We need the answers to be reproducible
2377 my @authline = clogp_authline($clogp);
2378 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2379 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2380 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2381 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2382 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2383 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2385 my $path = $ENV{PATH} or die;
2387 # we use ../../gbp-pq-output, which (given that we are in
2388 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2391 foreach my $use_absurd (qw(0 1)) {
2392 runcmd @git, qw(checkout -q unpa);
2393 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2394 local $ENV{PATH} = $path;
2397 progress "warning: $@";
2398 $path = "$absurdity:$path";
2399 progress "$us: trying slow absurd-git-apply...";
2400 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2405 die "forbid absurd git-apply\n" if $use_absurd
2406 && forceing [qw(import-gitapply-no-absurd)];
2407 die "only absurd git-apply!\n" if !$use_absurd
2408 && forceing [qw(import-gitapply-absurd)];
2410 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2411 local $ENV{PATH} = $path if $use_absurd;
2413 my @showcmd = (gbp_pq, qw(import));
2414 my @realcmd = shell_cmd
2415 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2416 debugcmd "+",@realcmd;
2417 if (system @realcmd) {
2418 die +(shellquote @showcmd).
2420 failedcmd_waitstatus()."\n";
2423 my $gapplied = git_rev_parse('HEAD');
2424 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2425 $gappliedtree eq $dappliedtree or
2427 gbp-pq import and dpkg-source disagree!
2428 gbp-pq import gave commit $gapplied
2429 gbp-pq import gave tree $gappliedtree
2430 dpkg-source --before-build gave tree $dappliedtree
2432 $rawimport_hash = $gapplied;
2437 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2442 progress "synthesised git commit from .dsc $cversion";
2444 my $rawimport_mergeinput = {
2445 Commit => $rawimport_hash,
2446 Info => "Import of source package",
2448 my @output = ($rawimport_mergeinput);
2450 if ($lastpush_mergeinput) {
2451 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2452 my $oversion = getfield $oldclogp, 'Version';
2454 version_compare($oversion, $cversion);
2456 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2457 { Message => <<END, ReverseParents => 1 });
2458 Record $package ($cversion) in archive suite $csuite
2460 } elsif ($vcmp > 0) {
2461 print STDERR <<END or die $!;
2463 Version actually in archive: $cversion (older)
2464 Last version pushed with dgit: $oversion (newer or same)
2467 @output = $lastpush_mergeinput;
2469 # Same version. Use what's in the server git branch,
2470 # discarding our own import. (This could happen if the
2471 # server automatically imports all packages into git.)
2472 @output = $lastpush_mergeinput;
2480 sub complete_file_from_dsc ($$;$) {
2481 our ($dstdir, $fi, $refetched) = @_;
2482 # Ensures that we have, in $dstdir, the file $fi, with the correct
2483 # contents. (Downloading it from alongside $dscurl if necessary.)
2484 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2485 # and will set $$refetched=1 if it did so (or tried to).
2487 my $f = $fi->{Filename};
2488 my $tf = "$dstdir/$f";
2492 my $checkhash = sub {
2493 open F, "<", "$tf" or die "$tf: $!";
2494 $fi->{Digester}->reset();
2495 $fi->{Digester}->addfile(*F);
2496 F->error and die $!;
2497 $got = $fi->{Digester}->hexdigest();
2498 return $got eq $fi->{Hash};
2501 if (stat_exists $tf) {
2502 if ($checkhash->()) {
2503 progress "using existing $f";
2507 fail "file $f has hash $got but .dsc".
2508 " demands hash $fi->{Hash} ".
2509 "(perhaps you should delete this file?)";
2511 progress "need to fetch correct version of $f";
2512 unlink $tf or die "$tf $!";
2515 printdebug "$tf does not exist, need to fetch\n";
2519 $furl =~ s{/[^/]+$}{};
2521 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2522 die "$f ?" if $f =~ m#/#;
2523 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2524 return 0 if !act_local();
2527 fail "file $f has hash $got but .dsc".
2528 " demands hash $fi->{Hash} ".
2529 "(got wrong file from archive!)";
2534 sub ensure_we_have_orig () {
2535 my @dfi = dsc_files_info();
2536 foreach my $fi (@dfi) {
2537 my $f = $fi->{Filename};
2538 next unless is_orig_file_in_dsc($f, \@dfi);
2539 complete_file_from_dsc('..', $fi)
2544 #---------- git fetch ----------
2546 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2547 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2549 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2550 # locally fetched refs because they have unhelpful names and clutter
2551 # up gitk etc. So we track whether we have "used up" head ref (ie,
2552 # whether we have made another local ref which refers to this object).
2554 # (If we deleted them unconditionally, then we might end up
2555 # re-fetching the same git objects each time dgit fetch was run.)
2557 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2558 # in git_fetch_us to fetch the refs in question, and possibly a call
2559 # to lrfetchref_used.
2561 our (%lrfetchrefs_f, %lrfetchrefs_d);
2562 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2564 sub lrfetchref_used ($) {
2565 my ($fullrefname) = @_;
2566 my $objid = $lrfetchrefs_f{$fullrefname};
2567 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2570 sub git_lrfetch_sane {
2571 my ($url, $supplementary, @specs) = @_;
2572 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2573 # at least as regards @specs. Also leave the results in
2574 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2575 # able to clean these up.
2577 # With $supplementary==1, @specs must not contain wildcards
2578 # and we add to our previous fetches (non-atomically).
2580 # This is rather miserable:
2581 # When git fetch --prune is passed a fetchspec ending with a *,
2582 # it does a plausible thing. If there is no * then:
2583 # - it matches subpaths too, even if the supplied refspec
2584 # starts refs, and behaves completely madly if the source
2585 # has refs/refs/something. (See, for example, Debian #NNNN.)
2586 # - if there is no matching remote ref, it bombs out the whole
2588 # We want to fetch a fixed ref, and we don't know in advance
2589 # if it exists, so this is not suitable.
2591 # Our workaround is to use git ls-remote. git ls-remote has its
2592 # own qairks. Notably, it has the absurd multi-tail-matching
2593 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2594 # refs/refs/foo etc.
2596 # Also, we want an idempotent snapshot, but we have to make two
2597 # calls to the remote: one to git ls-remote and to git fetch. The
2598 # solution is use git ls-remote to obtain a target state, and
2599 # git fetch to try to generate it. If we don't manage to generate
2600 # the target state, we try again.
2602 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2604 my $specre = join '|', map {
2607 my $wildcard = $x =~ s/\\\*$/.*/;
2608 die if $wildcard && $supplementary;
2611 printdebug "git_lrfetch_sane specre=$specre\n";
2612 my $wanted_rref = sub {
2614 return m/^(?:$specre)$/;
2617 my $fetch_iteration = 0;
2620 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2621 if (++$fetch_iteration > 10) {
2622 fail "too many iterations trying to get sane fetch!";
2625 my @look = map { "refs/$_" } @specs;
2626 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2630 open GITLS, "-|", @lcmd or die $!;
2632 printdebug "=> ", $_;
2633 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2634 my ($objid,$rrefname) = ($1,$2);
2635 if (!$wanted_rref->($rrefname)) {
2637 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2641 $wantr{$rrefname} = $objid;
2644 close GITLS or failedcmd @lcmd;
2646 # OK, now %want is exactly what we want for refs in @specs
2648 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2649 "+refs/$_:".lrfetchrefs."/$_";
2652 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2654 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2655 runcmd_ordryrun_local @fcmd if @fspecs;
2657 if (!$supplementary) {
2658 %lrfetchrefs_f = ();
2662 git_for_each_ref(lrfetchrefs, sub {
2663 my ($objid,$objtype,$lrefname,$reftail) = @_;
2664 $lrfetchrefs_f{$lrefname} = $objid;
2665 $objgot{$objid} = 1;
2668 if ($supplementary) {
2672 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2673 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2674 if (!exists $wantr{$rrefname}) {
2675 if ($wanted_rref->($rrefname)) {
2677 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2681 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2684 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2685 delete $lrfetchrefs_f{$lrefname};
2689 foreach my $rrefname (sort keys %wantr) {
2690 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2691 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2692 my $want = $wantr{$rrefname};
2693 next if $got eq $want;
2694 if (!defined $objgot{$want}) {
2696 warning: git ls-remote suggests we want $lrefname
2697 warning: and it should refer to $want
2698 warning: but git fetch didn't fetch that object to any relevant ref.
2699 warning: This may be due to a race with someone updating the server.
2700 warning: Will try again...
2702 next FETCH_ITERATION;
2705 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2707 runcmd_ordryrun_local @git, qw(update-ref -m),
2708 "dgit fetch git fetch fixup", $lrefname, $want;
2709 $lrfetchrefs_f{$lrefname} = $want;
2714 if (defined $csuite) {
2715 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2716 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2717 my ($objid,$objtype,$lrefname,$reftail) = @_;
2718 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2719 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2723 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2724 Dumper(\%lrfetchrefs_f);
2727 sub git_fetch_us () {
2728 # Want to fetch only what we are going to use, unless
2729 # deliberately-not-ff, in which case we must fetch everything.
2731 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2733 (quiltmode_splitbrain
2734 ? (map { $_->('*',access_nomdistro) }
2735 \&debiantag_new, \&debiantag_maintview)
2736 : debiantags('*',access_nomdistro));
2737 push @specs, server_branch($csuite);
2738 push @specs, $rewritemap;
2739 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2741 my $url = access_giturl();
2742 git_lrfetch_sane $url, 0, @specs;
2745 my @tagpats = debiantags('*',access_nomdistro);
2747 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2748 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2749 printdebug "currently $fullrefname=$objid\n";
2750 $here{$fullrefname} = $objid;
2752 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2753 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2754 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2755 printdebug "offered $lref=$objid\n";
2756 if (!defined $here{$lref}) {
2757 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2758 runcmd_ordryrun_local @upd;
2759 lrfetchref_used $fullrefname;
2760 } elsif ($here{$lref} eq $objid) {
2761 lrfetchref_used $fullrefname;
2764 "Not updating $lref from $here{$lref} to $objid.\n";
2769 #---------- dsc and archive handling ----------
2771 sub mergeinfo_getclogp ($) {
2772 # Ensures thit $mi->{Clogp} exists and returns it
2774 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2777 sub mergeinfo_version ($) {
2778 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2781 sub fetch_from_archive_record_1 ($) {
2783 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2784 'DGIT_ARCHIVE', $hash;
2785 cmdoutput @git, qw(log -n2), $hash;
2786 # ... gives git a chance to complain if our commit is malformed
2789 sub fetch_from_archive_record_2 ($) {
2791 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2795 dryrun_report @upd_cmd;
2799 sub parse_dsc_field_def_dsc_distro () {
2800 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2801 dgit.default.distro);
2804 sub parse_dsc_field ($$) {
2805 my ($dsc, $what) = @_;
2807 foreach my $field (@ourdscfield) {
2808 $f = $dsc->{$field};
2813 progress "$what: NO git hash";
2814 parse_dsc_field_def_dsc_distro();
2815 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2816 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2817 progress "$what: specified git info ($dsc_distro)";
2818 $dsc_hint_tag = [ $dsc_hint_tag ];
2819 } elsif ($f =~ m/^\w+\s*$/) {
2821 parse_dsc_field_def_dsc_distro();
2822 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2824 progress "$what: specified git hash";
2826 fail "$what: invalid Dgit info";
2830 sub resolve_dsc_field_commit ($$) {
2831 my ($already_distro, $already_mapref) = @_;
2833 return unless defined $dsc_hash;
2836 defined $already_mapref &&
2837 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2838 ? $already_mapref : undef;
2842 my ($what, @fetch) = @_;
2844 local $idistro = $dsc_distro;
2845 my $lrf = lrfetchrefs;
2847 if (!$chase_dsc_distro) {
2849 "not chasing .dsc distro $dsc_distro: not fetching $what";
2854 ".dsc names distro $dsc_distro: fetching $what";
2856 my $url = access_giturl();
2857 if (!defined $url) {
2858 defined $dsc_hint_url or fail <<END;
2859 .dsc Dgit metadata is in context of distro $dsc_distro
2860 for which we have no configured url and .dsc provides no hint
2863 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2864 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2865 parse_cfg_bool "dsc-url-proto-ok", 'false',
2866 cfg("dgit.dsc-url-proto-ok.$proto",
2867 "dgit.default.dsc-url-proto-ok")
2869 .dsc Dgit metadata is in context of distro $dsc_distro
2870 for which we have no configured url;
2871 .dsc provides hinted url with protocol $proto which is unsafe.
2872 (can be overridden by config - consult documentation)
2874 $url = $dsc_hint_url;
2877 git_lrfetch_sane $url, 1, @fetch;
2882 my $rewrite_enable = do {
2883 local $idistro = $dsc_distro;
2884 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2887 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2888 if (!defined $mapref) {
2889 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2890 $mapref = $lrf.'/'.$rewritemap;
2892 my $rewritemapdata = git_cat_file $mapref.':map';
2893 if (defined $rewritemapdata
2894 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2896 "server's git history rewrite map contains a relevant entry!";
2899 if (defined $dsc_hash) {
2900 progress "using rewritten git hash in place of .dsc value";
2902 progress "server data says .dsc hash is to be disregarded";
2907 if (!defined git_cat_file $dsc_hash) {
2908 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2909 my $lrf = $do_fetch->("additional commits", @tags) &&
2910 defined git_cat_file $dsc_hash
2912 .dsc Dgit metadata requires commit $dsc_hash
2913 but we could not obtain that object anywhere.
2915 foreach my $t (@tags) {
2916 my $fullrefname = $lrf.'/'.$t;
2917 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2918 next unless $lrfetchrefs_f{$fullrefname};
2919 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2920 lrfetchref_used $fullrefname;
2925 sub fetch_from_archive () {
2926 ensure_setup_existing_tree();
2928 # Ensures that lrref() is what is actually in the archive, one way
2929 # or another, according to us - ie this client's
2930 # appropritaely-updated archive view. Also returns the commit id.
2931 # If there is nothing in the archive, leaves lrref alone and
2932 # returns undef. git_fetch_us must have already been called.
2936 parse_dsc_field($dsc, 'last upload to archive');
2937 resolve_dsc_field_commit access_basedistro,
2938 lrfetchrefs."/".$rewritemap
2940 progress "no version available from the archive";
2943 # If the archive's .dsc has a Dgit field, there are three
2944 # relevant git commitids we need to choose between and/or merge
2946 # 1. $dsc_hash: the Dgit field from the archive
2947 # 2. $lastpush_hash: the suite branch on the dgit git server
2948 # 3. $lastfetch_hash: our local tracking brach for the suite
2950 # These may all be distinct and need not be in any fast forward
2953 # If the dsc was pushed to this suite, then the server suite
2954 # branch will have been updated; but it might have been pushed to
2955 # a different suite and copied by the archive. Conversely a more
2956 # recent version may have been pushed with dgit but not appeared
2957 # in the archive (yet).
2959 # $lastfetch_hash may be awkward because archive imports
2960 # (particularly, imports of Dgit-less .dscs) are performed only as
2961 # needed on individual clients, so different clients may perform a
2962 # different subset of them - and these imports are only made
2963 # public during push. So $lastfetch_hash may represent a set of
2964 # imports different to a subsequent upload by a different dgit
2967 # Our approach is as follows:
2969 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2970 # descendant of $dsc_hash, then it was pushed by a dgit user who
2971 # had based their work on $dsc_hash, so we should prefer it.
2972 # Otherwise, $dsc_hash was installed into this suite in the
2973 # archive other than by a dgit push, and (necessarily) after the
2974 # last dgit push into that suite (since a dgit push would have
2975 # been descended from the dgit server git branch); thus, in that
2976 # case, we prefer the archive's version (and produce a
2977 # pseudo-merge to overwrite the dgit server git branch).
2979 # (If there is no Dgit field in the archive's .dsc then
2980 # generate_commit_from_dsc uses the version numbers to decide
2981 # whether the suite branch or the archive is newer. If the suite
2982 # branch is newer it ignores the archive's .dsc; otherwise it
2983 # generates an import of the .dsc, and produces a pseudo-merge to
2984 # overwrite the suite branch with the archive contents.)
2986 # The outcome of that part of the algorithm is the `public view',
2987 # and is same for all dgit clients: it does not depend on any
2988 # unpublished history in the local tracking branch.
2990 # As between the public view and the local tracking branch: The
2991 # local tracking branch is only updated by dgit fetch, and
2992 # whenever dgit fetch runs it includes the public view in the
2993 # local tracking branch. Therefore if the public view is not
2994 # descended from the local tracking branch, the local tracking
2995 # branch must contain history which was imported from the archive
2996 # but never pushed; and, its tip is now out of date. So, we make
2997 # a pseudo-merge to overwrite the old imports and stitch the old
3000 # Finally: we do not necessarily reify the public view (as
3001 # described above). This is so that we do not end up stacking two
3002 # pseudo-merges. So what we actually do is figure out the inputs
3003 # to any public view pseudo-merge and put them in @mergeinputs.
3006 # $mergeinputs[]{Commit}
3007 # $mergeinputs[]{Info}
3008 # $mergeinputs[0] is the one whose tree we use
3009 # @mergeinputs is in the order we use in the actual commit)
3012 # $mergeinputs[]{Message} is a commit message to use
3013 # $mergeinputs[]{ReverseParents} if def specifies that parent
3014 # list should be in opposite order
3015 # Such an entry has no Commit or Info. It applies only when found
3016 # in the last entry. (This ugliness is to support making
3017 # identical imports to previous dgit versions.)
3019 my $lastpush_hash = git_get_ref(lrfetchref());
3020 printdebug "previous reference hash=$lastpush_hash\n";
3021 $lastpush_mergeinput = $lastpush_hash && {
3022 Commit => $lastpush_hash,
3023 Info => "dgit suite branch on dgit git server",
3026 my $lastfetch_hash = git_get_ref(lrref());
3027 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3028 my $lastfetch_mergeinput = $lastfetch_hash && {
3029 Commit => $lastfetch_hash,
3030 Info => "dgit client's archive history view",
3033 my $dsc_mergeinput = $dsc_hash && {
3034 Commit => $dsc_hash,
3035 Info => "Dgit field in .dsc from archive",
3039 my $del_lrfetchrefs = sub {
3042 printdebug "del_lrfetchrefs...\n";
3043 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3044 my $objid = $lrfetchrefs_d{$fullrefname};
3045 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3047 $gur ||= new IO::Handle;
3048 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3050 printf $gur "delete %s %s\n", $fullrefname, $objid;
3053 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3057 if (defined $dsc_hash) {
3058 ensure_we_have_orig();
3059 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3060 @mergeinputs = $dsc_mergeinput
3061 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3062 print STDERR <<END or die $!;
3064 Git commit in archive is behind the last version allegedly pushed/uploaded.
3065 Commit referred to by archive: $dsc_hash
3066 Last version pushed with dgit: $lastpush_hash
3069 @mergeinputs = ($lastpush_mergeinput);
3071 # Archive has .dsc which is not a descendant of the last dgit
3072 # push. This can happen if the archive moves .dscs about.
3073 # Just follow its lead.
3074 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3075 progress "archive .dsc names newer git commit";
3076 @mergeinputs = ($dsc_mergeinput);
3078 progress "archive .dsc names other git commit, fixing up";
3079 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3083 @mergeinputs = generate_commits_from_dsc();
3084 # We have just done an import. Now, our import algorithm might
3085 # have been improved. But even so we do not want to generate
3086 # a new different import of the same package. So if the
3087 # version numbers are the same, just use our existing version.
3088 # If the version numbers are different, the archive has changed
3089 # (perhaps, rewound).
3090 if ($lastfetch_mergeinput &&
3091 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3092 (mergeinfo_version $mergeinputs[0]) )) {
3093 @mergeinputs = ($lastfetch_mergeinput);
3095 } elsif ($lastpush_hash) {
3096 # only in git, not in the archive yet
3097 @mergeinputs = ($lastpush_mergeinput);
3098 print STDERR <<END or die $!;
3100 Package not found in the archive, but has allegedly been pushed using dgit.
3104 printdebug "nothing found!\n";
3105 if (defined $skew_warning_vsn) {
3106 print STDERR <<END or die $!;
3108 Warning: relevant archive skew detected.
3109 Archive allegedly contains $skew_warning_vsn
3110 But we were not able to obtain any version from the archive or git.
3114 unshift @end, $del_lrfetchrefs;
3118 if ($lastfetch_hash &&
3120 my $h = $_->{Commit};
3121 $h and is_fast_fwd($lastfetch_hash, $h);
3122 # If true, one of the existing parents of this commit
3123 # is a descendant of the $lastfetch_hash, so we'll
3124 # be ff from that automatically.
3128 push @mergeinputs, $lastfetch_mergeinput;
3131 printdebug "fetch mergeinfos:\n";
3132 foreach my $mi (@mergeinputs) {
3134 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3136 printdebug sprintf " ReverseParents=%d Message=%s",
3137 $mi->{ReverseParents}, $mi->{Message};
3141 my $compat_info= pop @mergeinputs
3142 if $mergeinputs[$#mergeinputs]{Message};
3144 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3147 if (@mergeinputs > 1) {
3149 my $tree_commit = $mergeinputs[0]{Commit};
3151 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3152 $tree =~ m/\n\n/; $tree = $`;
3153 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3156 # We use the changelog author of the package in question the
3157 # author of this pseudo-merge. This is (roughly) correct if
3158 # this commit is simply representing aa non-dgit upload.
3159 # (Roughly because it does not record sponsorship - but we
3160 # don't have sponsorship info because that's in the .changes,
3161 # which isn't in the archivw.)
3163 # But, it might be that we are representing archive history
3164 # updates (including in-archive copies). These are not really
3165 # the responsibility of the person who created the .dsc, but
3166 # there is no-one whose name we should better use. (The
3167 # author of the .dsc-named commit is clearly worse.)
3169 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3170 my $author = clogp_authline $useclogp;
3171 my $cversion = getfield $useclogp, 'Version';
3173 my $mcf = dgit_privdir()."/mergecommit";
3174 open MC, ">", $mcf or die "$mcf $!";
3175 print MC <<END or die $!;
3179 my @parents = grep { $_->{Commit} } @mergeinputs;
3180 @parents = reverse @parents if $compat_info->{ReverseParents};
3181 print MC <<END or die $! foreach @parents;
3185 print MC <<END or die $!;
3191 if (defined $compat_info->{Message}) {
3192 print MC $compat_info->{Message} or die $!;
3194 print MC <<END or die $!;
3195 Record $package ($cversion) in archive suite $csuite
3199 my $message_add_info = sub {
3201 my $mversion = mergeinfo_version $mi;
3202 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3206 $message_add_info->($mergeinputs[0]);
3207 print MC <<END or die $!;
3208 should be treated as descended from
3210 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3214 $hash = make_commit $mcf;
3216 $hash = $mergeinputs[0]{Commit};
3218 printdebug "fetch hash=$hash\n";
3221 my ($lasth, $what) = @_;
3222 return unless $lasth;
3223 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3226 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3228 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3230 fetch_from_archive_record_1($hash);
3232 if (defined $skew_warning_vsn) {
3233 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3234 my $gotclogp = commit_getclogp($hash);
3235 my $got_vsn = getfield $gotclogp, 'Version';
3236 printdebug "SKEW CHECK GOT $got_vsn\n";
3237 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3238 print STDERR <<END or die $!;
3240 Warning: archive skew detected. Using the available version:
3241 Archive allegedly contains $skew_warning_vsn
3242 We were able to obtain only $got_vsn
3248 if ($lastfetch_hash ne $hash) {
3249 fetch_from_archive_record_2($hash);
3252 lrfetchref_used lrfetchref();
3254 check_gitattrs($hash, "fetched source tree");
3256 unshift @end, $del_lrfetchrefs;
3260 sub set_local_git_config ($$) {
3262 runcmd @git, qw(config), $k, $v;
3265 sub setup_mergechangelogs (;$) {
3267 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3269 my $driver = 'dpkg-mergechangelogs';
3270 my $cb = "merge.$driver";
3271 confess unless defined $maindir;
3272 my $attrs = "$maindir_gitcommon/info/attributes";
3273 ensuredir "$maindir_gitcommon/info";
3275 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3276 if (!open ATTRS, "<", $attrs) {
3277 $!==ENOENT or die "$attrs: $!";
3281 next if m{^debian/changelog\s};
3282 print NATTRS $_, "\n" or die $!;
3284 ATTRS->error and die $!;
3287 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3290 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3291 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3293 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3296 sub setup_useremail (;$) {
3298 return unless $always || access_cfg_bool(1, 'setup-useremail');
3301 my ($k, $envvar) = @_;
3302 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3303 return unless defined $v;
3304 set_local_git_config "user.$k", $v;
3307 $setup->('email', 'DEBEMAIL');
3308 $setup->('name', 'DEBFULLNAME');
3311 sub ensure_setup_existing_tree () {
3312 my $k = "remote.$remotename.skipdefaultupdate";
3313 my $c = git_get_config $k;
3314 return if defined $c;
3315 set_local_git_config $k, 'true';
3318 sub open_main_gitattrs () {
3319 confess 'internal error no maindir' unless defined $maindir;
3320 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3322 or die "open $maindir_gitcommon/info/attributes: $!";
3326 sub is_gitattrs_setup () {
3327 my $gai = open_main_gitattrs();
3328 return 0 unless $gai;
3330 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3332 $gai->error and die $!;
3336 sub setup_gitattrs (;$) {
3338 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3340 if (is_gitattrs_setup()) {
3342 [attr]dgit-defuse-attrs already found in .git/info/attributes
3343 not doing further gitattributes setup
3347 my $af = "$maindir_gitcommon/info/attributes";
3348 ensuredir "$maindir_gitcommon/info";
3349 open GAO, "> $af.new" or die $!;
3350 print GAO <<END or die $!;
3352 [attr]dgit-defuse-attrs $negate_harmful_gitattrs
3353 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3355 my $gai = open_main_gitattrs();
3359 print GAO $_, "\n" or die $!;
3361 $gai->error and die $!;
3363 close GAO or die $!;
3364 rename "$af.new", "$af" or die "install $af: $!";
3367 sub setup_new_tree () {
3368 setup_mergechangelogs();
3373 sub check_gitattrs ($$) {
3374 my ($treeish, $what) = @_;
3376 return if is_gitattrs_setup;
3379 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3381 my $gafl = new IO::File;
3382 open $gafl, "-|", @cmd or die $!;
3385 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3387 next unless m{(?:^|/)\.gitattributes$};
3389 # oh dear, found one
3391 dgit: warning: $what contains .gitattributes
3392 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3397 # tree contains no .gitattributes files
3398 $?=0; $!=0; close $gafl or failedcmd @cmd;
3402 sub multisuite_suite_child ($$$) {
3403 my ($tsuite, $merginputs, $fn) = @_;
3404 # in child, sets things up, calls $fn->(), and returns undef
3405 # in parent, returns canonical suite name for $tsuite
3406 my $canonsuitefh = IO::File::new_tmpfile;
3407 my $pid = fork // die $!;
3411 $us .= " [$isuite]";
3412 $debugprefix .= " ";
3413 progress "fetching $tsuite...";
3414 canonicalise_suite();
3415 print $canonsuitefh $csuite, "\n" or die $!;
3416 close $canonsuitefh or die $!;
3420 waitpid $pid,0 == $pid or die $!;
3421 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3422 seek $canonsuitefh,0,0 or die $!;
3423 local $csuite = <$canonsuitefh>;
3424 die $! unless defined $csuite && chomp $csuite;
3426 printdebug "multisuite $tsuite missing\n";
3429 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3430 push @$merginputs, {
3437 sub fork_for_multisuite ($) {
3438 my ($before_fetch_merge) = @_;
3439 # if nothing unusual, just returns ''
3442 # returns 0 to caller in child, to do first of the specified suites
3443 # in child, $csuite is not yet set
3445 # returns 1 to caller in parent, to finish up anything needed after
3446 # in parent, $csuite is set to canonicalised portmanteau
3448 my $org_isuite = $isuite;
3449 my @suites = split /\,/, $isuite;
3450 return '' unless @suites > 1;
3451 printdebug "fork_for_multisuite: @suites\n";
3455 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3457 return 0 unless defined $cbasesuite;
3459 fail "package $package missing in (base suite) $cbasesuite"
3460 unless @mergeinputs;
3462 my @csuites = ($cbasesuite);
3464 $before_fetch_merge->();
3466 foreach my $tsuite (@suites[1..$#suites]) {
3467 $tsuite =~ s/^-/$cbasesuite-/;
3468 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3474 # xxx collecte the ref here
3476 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3477 push @csuites, $csubsuite;
3480 foreach my $mi (@mergeinputs) {
3481 my $ref = git_get_ref $mi->{Ref};
3482 die "$mi->{Ref} ?" unless length $ref;
3483 $mi->{Commit} = $ref;
3486 $csuite = join ",", @csuites;
3488 my $previous = git_get_ref lrref;
3490 unshift @mergeinputs, {
3491 Commit => $previous,
3492 Info => "local combined tracking branch",
3494 "archive seems to have rewound: local tracking branch is ahead!",
3498 foreach my $ix (0..$#mergeinputs) {
3499 $mergeinputs[$ix]{Index} = $ix;
3502 @mergeinputs = sort {
3503 -version_compare(mergeinfo_version $a,
3504 mergeinfo_version $b) # highest version first
3506 $a->{Index} <=> $b->{Index}; # earliest in spec first
3512 foreach my $mi (@mergeinputs) {
3513 printdebug "multisuite merge check $mi->{Info}\n";
3514 foreach my $previous (@needed) {
3515 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3516 printdebug "multisuite merge un-needed $previous->{Info}\n";
3520 printdebug "multisuite merge this-needed\n";
3521 $mi->{Character} = '+';
3524 $needed[0]{Character} = '*';
3526 my $output = $needed[0]{Commit};
3529 printdebug "multisuite merge nontrivial\n";
3530 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3532 my $commit = "tree $tree\n";
3533 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3534 "Input branches:\n";
3536 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3537 printdebug "multisuite merge include $mi->{Info}\n";
3538 $mi->{Character} //= ' ';
3539 $commit .= "parent $mi->{Commit}\n";
3540 $msg .= sprintf " %s %-25s %s\n",
3542 (mergeinfo_version $mi),
3545 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3547 " * marks the highest version branch, which choose to use\n".
3548 " + marks each branch which was not already an ancestor\n\n".
3549 "[dgit multi-suite $csuite]\n";
3551 "author $authline\n".
3552 "committer $authline\n\n";
3553 $output = make_commit_text $commit.$msg;
3554 printdebug "multisuite merge generated $output\n";
3557 fetch_from_archive_record_1($output);
3558 fetch_from_archive_record_2($output);
3560 progress "calculated combined tracking suite $csuite";
3565 sub clone_set_head () {
3566 open H, "> .git/HEAD" or die $!;
3567 print H "ref: ".lref()."\n" or die $!;
3570 sub clone_finish ($) {
3572 runcmd @git, qw(reset --hard), lrref();
3573 runcmd qw(bash -ec), <<'END';
3575 git ls-tree -r --name-only -z HEAD | \
3576 xargs -0r touch -h -r . --
3578 printdone "ready for work in $dstdir";
3582 # in multisuite, returns twice!
3583 # once in parent after first suite fetched,
3584 # and then again in child after everything is finished
3586 badusage "dry run makes no sense with clone" unless act_local();
3588 my $multi_fetched = fork_for_multisuite(sub {
3589 printdebug "multi clone before fetch merge\n";
3593 if ($multi_fetched) {
3594 printdebug "multi clone after fetch merge\n";
3596 clone_finish($dstdir);
3599 printdebug "clone main body\n";
3601 canonicalise_suite();
3602 my $hasgit = check_for_git();
3603 mkdir $dstdir or fail "create \`$dstdir': $!";
3605 runcmd @git, qw(init -q);
3609 my $giturl = access_giturl(1);
3610 if (defined $giturl) {
3611 runcmd @git, qw(remote add), 'origin', $giturl;
3614 progress "fetching existing git history";
3616 runcmd_ordryrun_local @git, qw(fetch origin);
3618 progress "starting new git history";
3620 fetch_from_archive() or no_such_package;
3621 my $vcsgiturl = $dsc->{'Vcs-Git'};
3622 if (length $vcsgiturl) {
3623 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3624 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3626 clone_finish($dstdir);
3630 canonicalise_suite();
3631 if (check_for_git()) {
3634 fetch_from_archive() or no_such_package();
3635 printdone "fetched into ".lrref();
3639 my $multi_fetched = fork_for_multisuite(sub { });
3640 fetch() unless $multi_fetched; # parent
3641 return if $multi_fetched eq '0'; # child
3642 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3644 printdone "fetched to ".lrref()." and merged into HEAD";
3647 sub check_not_dirty () {
3648 foreach my $f (qw(local-options local-patch-header)) {
3649 if (stat_exists "debian/source/$f") {
3650 fail "git tree contains debian/source/$f";
3654 return if $ignoredirty;
3656 my @cmd = (@git, qw(diff --quiet HEAD));
3658 $!=0; $?=-1; system @cmd;
3661 fail "working tree is dirty (does not match HEAD)";
3667 sub commit_admin ($) {
3670 runcmd_ordryrun_local @git, qw(commit -m), $m;
3673 sub commit_quilty_patch () {
3674 my $output = cmdoutput @git, qw(status --porcelain);
3676 foreach my $l (split /\n/, $output) {
3677 next unless $l =~ m/\S/;
3678 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3682 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3684 progress "nothing quilty to commit, ok.";
3687 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3688 runcmd_ordryrun_local @git, qw(add -f), @adds;
3690 Commit Debian 3.0 (quilt) metadata
3692 [dgit ($our_version) quilt-fixup]
3696 sub get_source_format () {
3698 if (open F, "debian/source/options") {
3702 s/\s+$//; # ignore missing final newline
3704 my ($k, $v) = ($`, $'); #');
3705 $v =~ s/^"(.*)"$/$1/;
3711 F->error and die $!;
3714 die $! unless $!==&ENOENT;
3717 if (!open F, "debian/source/format") {
3718 die $! unless $!==&ENOENT;
3722 F->error and die $!;
3724 return ($_, \%options);
3727 sub madformat_wantfixup ($) {
3729 return 0 unless $format eq '3.0 (quilt)';
3730 our $quilt_mode_warned;
3731 if ($quilt_mode eq 'nocheck') {
3732 progress "Not doing any fixup of \`$format' due to".
3733 " ----no-quilt-fixup or --quilt=nocheck"
3734 unless $quilt_mode_warned++;
3737 progress "Format \`$format', need to check/update patch stack"
3738 unless $quilt_mode_warned++;
3742 sub maybe_split_brain_save ($$$) {
3743 my ($headref, $dgitview, $msg) = @_;
3744 # => message fragment "$saved" describing disposition of $dgitview
3745 return "commit id $dgitview" unless defined $split_brain_save;
3746 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3747 @git, qw(update-ref -m),
3748 "dgit --dgit-view-save $msg HEAD=$headref",
3749 $split_brain_save, $dgitview);
3751 return "and left in $split_brain_save";
3754 # An "infopair" is a tuple [ $thing, $what ]
3755 # (often $thing is a commit hash; $what is a description)
3757 sub infopair_cond_equal ($$) {
3759 $x->[0] eq $y->[0] or fail <<END;
3760 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3764 sub infopair_lrf_tag_lookup ($$) {
3765 my ($tagnames, $what) = @_;
3766 # $tagname may be an array ref
3767 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3768 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3769 foreach my $tagname (@tagnames) {
3770 my $lrefname = lrfetchrefs."/tags/$tagname";
3771 my $tagobj = $lrfetchrefs_f{$lrefname};
3772 next unless defined $tagobj;
3773 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3774 return [ git_rev_parse($tagobj), $what ];
3776 fail @tagnames==1 ? <<END : <<END;
3777 Wanted tag $what (@tagnames) on dgit server, but not found
3779 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3783 sub infopair_cond_ff ($$) {
3784 my ($anc,$desc) = @_;
3785 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3786 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3790 sub pseudomerge_version_check ($$) {
3791 my ($clogp, $archive_hash) = @_;
3793 my $arch_clogp = commit_getclogp $archive_hash;
3794 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3795 'version currently in archive' ];
3796 if (defined $overwrite_version) {
3797 if (length $overwrite_version) {
3798 infopair_cond_equal([ $overwrite_version,
3799 '--overwrite= version' ],
3802 my $v = $i_arch_v->[0];
3803 progress "Checking package changelog for archive version $v ...";
3806 my @xa = ("-f$v", "-t$v");
3807 my $vclogp = parsechangelog @xa;
3810 [ (getfield $vclogp, $fn),
3811 "$fn field from dpkg-parsechangelog @xa" ];
3813 my $cv = $gf->('Version');
3814 infopair_cond_equal($i_arch_v, $cv);
3815 $cd = $gf->('Distribution');
3818 $@ =~ s/^dgit: //gm;
3820 "Perhaps debian/changelog does not mention $v ?";
3822 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3823 $cd->[1] is $cd->[0]
3824 Your tree seems to based on earlier (not uploaded) $v.
3829 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3833 sub pseudomerge_make_commit ($$$$ $$) {
3834 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3835 $msg_cmd, $msg_msg) = @_;
3836 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3838 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3839 my $authline = clogp_authline $clogp;
3843 !defined $overwrite_version ? ""
3844 : !length $overwrite_version ? " --overwrite"
3845 : " --overwrite=".$overwrite_version;
3847 my $pmf = dgit_privdir()."/pseudomerge";
3848 open MC, ">", $pmf or die "$pmf $!";
3849 print MC <<END or die $!;
3852 parent $archive_hash
3862 return make_commit($pmf);
3865 sub splitbrain_pseudomerge ($$$$) {
3866 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3867 # => $merged_dgitview
3868 printdebug "splitbrain_pseudomerge...\n";
3870 # We: debian/PREVIOUS HEAD($maintview)
3871 # expect: o ----------------- o
3874 # a/d/PREVIOUS $dgitview
3877 # we do: `------------------ o
3881 return $dgitview unless defined $archive_hash;
3882 return $dgitview if deliberately_not_fast_forward();
3884 printdebug "splitbrain_pseudomerge...\n";
3886 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3888 if (!defined $overwrite_version) {
3889 progress "Checking that HEAD inciudes all changes in archive...";
3892 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3894 if (defined $overwrite_version) {
3896 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3897 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3898 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3899 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3900 my $i_archive = [ $archive_hash, "current archive contents" ];
3902 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3904 infopair_cond_equal($i_dgit, $i_archive);
3905 infopair_cond_ff($i_dep14, $i_dgit);
3906 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3910 $us: check failed (maybe --overwrite is needed, consult documentation)
3915 my $r = pseudomerge_make_commit
3916 $clogp, $dgitview, $archive_hash, $i_arch_v,
3917 "dgit --quilt=$quilt_mode",
3918 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3919 Declare fast forward from $i_arch_v->[0]
3921 Make fast forward from $i_arch_v->[0]
3924 maybe_split_brain_save $maintview, $r, "pseudomerge";
3926 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3930 sub plain_overwrite_pseudomerge ($$$) {
3931 my ($clogp, $head, $archive_hash) = @_;
3933 printdebug "plain_overwrite_pseudomerge...";
3935 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3937 return $head if is_fast_fwd $archive_hash, $head;
3939 my $m = "Declare fast forward from $i_arch_v->[0]";
3941 my $r = pseudomerge_make_commit
3942 $clogp, $head, $archive_hash, $i_arch_v,
3945 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3947 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3951 sub push_parse_changelog ($) {
3954 my $clogp = Dpkg::Control::Hash->new();
3955 $clogp->load($clogpfn) or die;
3957 my $clogpackage = getfield $clogp, 'Source';
3958 $package //= $clogpackage;
3959 fail "-p specified $package but changelog specified $clogpackage"
3960 unless $package eq $clogpackage;
3961 my $cversion = getfield $clogp, 'Version';
3963 if (!$we_are_initiator) {
3964 # rpush initiator can't do this because it doesn't have $isuite yet
3965 my $tag = debiantag($cversion, access_nomdistro);
3966 runcmd @git, qw(check-ref-format), $tag;
3969 my $dscfn = dscfn($cversion);
3971 return ($clogp, $cversion, $dscfn);
3974 sub push_parse_dsc ($$$) {
3975 my ($dscfn,$dscfnwhat, $cversion) = @_;
3976 $dsc = parsecontrol($dscfn,$dscfnwhat);
3977 my $dversion = getfield $dsc, 'Version';
3978 my $dscpackage = getfield $dsc, 'Source';
3979 ($dscpackage eq $package && $dversion eq $cversion) or
3980 fail "$dscfn is for $dscpackage $dversion".
3981 " but debian/changelog is for $package $cversion";
3984 sub push_tagwants ($$$$) {
3985 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3988 TagFn => \&debiantag,
3993 if (defined $maintviewhead) {
3995 TagFn => \&debiantag_maintview,
3996 Objid => $maintviewhead,
3997 TfSuffix => '-maintview',
4000 } elsif ($dodep14tag eq 'no' ? 0
4001 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4002 : $dodep14tag eq 'always'
4003 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4004 --dep14tag-always (or equivalent in config) means server must support
4005 both "new" and "maint" tag formats, but config says it doesn't.
4007 : die "$dodep14tag ?") {
4009 TagFn => \&debiantag_maintview,
4011 TfSuffix => '-dgit',
4015 foreach my $tw (@tagwants) {
4016 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4017 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4019 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4023 sub push_mktags ($$ $$ $) {
4025 $changesfile,$changesfilewhat,
4028 die unless $tagwants->[0]{View} eq 'dgit';
4030 my $declaredistro = access_nomdistro();
4031 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4032 $dsc->{$ourdscfield[0]} = join " ",
4033 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4035 $dsc->save("$dscfn.tmp") or die $!;
4037 my $changes = parsecontrol($changesfile,$changesfilewhat);
4038 foreach my $field (qw(Source Distribution Version)) {
4039 $changes->{$field} eq $clogp->{$field} or
4040 fail "changes field $field \`$changes->{$field}'".
4041 " does not match changelog \`$clogp->{$field}'";
4044 my $cversion = getfield $clogp, 'Version';
4045 my $clogsuite = getfield $clogp, 'Distribution';
4047 # We make the git tag by hand because (a) that makes it easier
4048 # to control the "tagger" (b) we can do remote signing
4049 my $authline = clogp_authline $clogp;
4050 my $delibs = join(" ", "",@deliberatelies);
4054 my $tfn = $tw->{Tfn};
4055 my $head = $tw->{Objid};
4056 my $tag = $tw->{Tag};
4058 open TO, '>', $tfn->('.tmp') or die $!;
4059 print TO <<END or die $!;
4066 if ($tw->{View} eq 'dgit') {
4067 print TO <<END or die $!;
4068 $package release $cversion for $clogsuite ($csuite) [dgit]
4069 [dgit distro=$declaredistro$delibs]
4071 foreach my $ref (sort keys %previously) {
4072 print TO <<END or die $!;
4073 [dgit previously:$ref=$previously{$ref}]
4076 } elsif ($tw->{View} eq 'maint') {
4077 print TO <<END or die $!;
4078 $package release $cversion for $clogsuite ($csuite)
4079 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4082 die Dumper($tw)."?";
4087 my $tagobjfn = $tfn->('.tmp');
4089 if (!defined $keyid) {
4090 $keyid = access_cfg('keyid','RETURN-UNDEF');
4092 if (!defined $keyid) {
4093 $keyid = getfield $clogp, 'Maintainer';
4095 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4096 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4097 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4098 push @sign_cmd, $tfn->('.tmp');
4099 runcmd_ordryrun @sign_cmd;
4101 $tagobjfn = $tfn->('.signed.tmp');
4102 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4103 $tfn->('.tmp'), $tfn->('.tmp.asc');
4109 my @r = map { $mktag->($_); } @$tagwants;
4113 sub sign_changes ($) {
4114 my ($changesfile) = @_;
4116 my @debsign_cmd = @debsign;
4117 push @debsign_cmd, "-k$keyid" if defined $keyid;
4118 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4119 push @debsign_cmd, $changesfile;
4120 runcmd_ordryrun @debsign_cmd;
4125 printdebug "actually entering push\n";
4127 supplementary_message(<<'END');
4128 Push failed, while checking state of the archive.
4129 You can retry the push, after fixing the problem, if you like.
4131 if (check_for_git()) {
4134 my $archive_hash = fetch_from_archive();
4135 if (!$archive_hash) {
4137 fail "package appears to be new in this suite;".
4138 " if this is intentional, use --new";
4141 supplementary_message(<<'END');
4142 Push failed, while preparing your push.
4143 You can retry the push, after fixing the problem, if you like.
4146 need_tagformat 'new', "quilt mode $quilt_mode"
4147 if quiltmode_splitbrain;
4151 access_giturl(); # check that success is vaguely likely
4152 rpush_handle_protovsn_bothends() if $we_are_initiator;
4155 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4156 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4158 responder_send_file('parsed-changelog', $clogpfn);
4160 my ($clogp, $cversion, $dscfn) =
4161 push_parse_changelog("$clogpfn");
4163 my $dscpath = "$buildproductsdir/$dscfn";
4164 stat_exists $dscpath or
4165 fail "looked for .dsc $dscpath, but $!;".
4166 " maybe you forgot to build";
4168 responder_send_file('dsc', $dscpath);
4170 push_parse_dsc($dscpath, $dscfn, $cversion);
4172 my $format = getfield $dsc, 'Format';
4173 printdebug "format $format\n";
4175 my $actualhead = git_rev_parse('HEAD');
4176 my $dgithead = $actualhead;
4177 my $maintviewhead = undef;
4179 my $upstreamversion = upstreamversion $clogp->{Version};
4181 if (madformat_wantfixup($format)) {
4182 # user might have not used dgit build, so maybe do this now:
4183 if (quiltmode_splitbrain()) {
4184 changedir $playground;
4185 quilt_make_fake_dsc($upstreamversion);
4187 ($dgithead, $cachekey) =
4188 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4190 "--quilt=$quilt_mode but no cached dgit view:
4191 perhaps HEAD changed since dgit build[-source] ?";
4193 $dgithead = splitbrain_pseudomerge($clogp,
4194 $actualhead, $dgithead,
4196 $maintviewhead = $actualhead;
4198 prep_ud(); # so _only_subdir() works, below
4200 commit_quilty_patch();
4204 if (defined $overwrite_version && !defined $maintviewhead) {
4205 $dgithead = plain_overwrite_pseudomerge($clogp,
4213 if ($archive_hash) {
4214 if (is_fast_fwd($archive_hash, $dgithead)) {
4216 } elsif (deliberately_not_fast_forward) {
4219 fail "dgit push: HEAD is not a descendant".
4220 " of the archive's version.\n".
4221 "To overwrite the archive's contents,".
4222 " pass --overwrite[=VERSION].\n".
4223 "To rewind history, if permitted by the archive,".
4224 " use --deliberately-not-fast-forward.";
4228 changedir $playground;
4229 progress "checking that $dscfn corresponds to HEAD";
4230 runcmd qw(dpkg-source -x --),
4231 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4232 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4233 check_for_vendor_patches() if madformat($dsc->{format});
4235 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4236 debugcmd "+",@diffcmd;
4238 my $r = system @diffcmd;
4241 my $referent = $split_brain ? $dgithead : 'HEAD';
4242 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4244 HEAD specifies a different tree to $dscfn:
4246 Perhaps you forgot to build. Or perhaps there is a problem with your
4247 source tree (see dgit(7) for some hints). To see a full diff, run
4248 git diff $tree $referent
4254 if (!$changesfile) {
4255 my $pat = changespat $cversion;
4256 my @cs = glob "$buildproductsdir/$pat";
4257 fail "failed to find unique changes file".
4258 " (looked for $pat in $buildproductsdir);".
4259 " perhaps you need to use dgit -C"
4261 ($changesfile) = @cs;
4263 $changesfile = "$buildproductsdir/$changesfile";
4266 # Check that changes and .dsc agree enough
4267 $changesfile =~ m{[^/]*$};
4268 my $changes = parsecontrol($changesfile,$&);
4269 files_compare_inputs($dsc, $changes)
4270 unless forceing [qw(dsc-changes-mismatch)];
4272 # Perhaps adjust .dsc to contain right set of origs
4273 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4275 unless forceing [qw(changes-origs-exactly)];
4277 # Checks complete, we're going to try and go ahead:
4279 responder_send_file('changes',$changesfile);
4280 responder_send_command("param head $dgithead");
4281 responder_send_command("param csuite $csuite");
4282 responder_send_command("param isuite $isuite");
4283 responder_send_command("param tagformat $tagformat");
4284 if (defined $maintviewhead) {
4285 die unless ($protovsn//4) >= 4;
4286 responder_send_command("param maint-view $maintviewhead");
4289 # Perhaps send buildinfo(s) for signing
4290 my $changes_files = getfield $changes, 'Files';
4291 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4292 foreach my $bi (@buildinfos) {
4293 responder_send_command("param buildinfo-filename $bi");
4294 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4297 if (deliberately_not_fast_forward) {
4298 git_for_each_ref(lrfetchrefs, sub {
4299 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4300 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4301 responder_send_command("previously $rrefname=$objid");
4302 $previously{$rrefname} = $objid;
4306 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4307 dgit_privdir()."/tag");
4310 supplementary_message(<<'END');
4311 Push failed, while signing the tag.
4312 You can retry the push, after fixing the problem, if you like.
4314 # If we manage to sign but fail to record it anywhere, it's fine.
4315 if ($we_are_responder) {
4316 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4317 responder_receive_files('signed-tag', @tagobjfns);
4319 @tagobjfns = push_mktags($clogp,$dscpath,
4320 $changesfile,$changesfile,
4323 supplementary_message(<<'END');
4324 Push failed, *after* signing the tag.
4325 If you want to try again, you should use a new version number.
4328 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4330 foreach my $tw (@tagwants) {
4331 my $tag = $tw->{Tag};
4332 my $tagobjfn = $tw->{TagObjFn};
4334 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4335 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4336 runcmd_ordryrun_local
4337 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4340 supplementary_message(<<'END');
4341 Push failed, while updating the remote git repository - see messages above.
4342 If you want to try again, you should use a new version number.
4344 if (!check_for_git()) {
4345 create_remote_git_repo();
4348 my @pushrefs = $forceflag.$dgithead.":".rrref();
4349 foreach my $tw (@tagwants) {
4350 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4353 runcmd_ordryrun @git,
4354 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4355 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4357 supplementary_message(<<'END');
4358 Push failed, while obtaining signatures on the .changes and .dsc.
4359 If it was just that the signature failed, you may try again by using
4360 debsign by hand to sign the changes
4362 and then dput to complete the upload.
4363 If you need to change the package, you must use a new version number.
4365 if ($we_are_responder) {
4366 my $dryrunsuffix = act_local() ? "" : ".tmp";
4367 my @rfiles = ($dscpath, $changesfile);
4368 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4369 responder_receive_files('signed-dsc-changes',
4370 map { "$_$dryrunsuffix" } @rfiles);
4373 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4375 progress "[new .dsc left in $dscpath.tmp]";
4377 sign_changes $changesfile;
4380 supplementary_message(<<END);
4381 Push failed, while uploading package(s) to the archive server.
4382 You can retry the upload of exactly these same files with dput of:
4384 If that .changes file is broken, you will need to use a new version
4385 number for your next attempt at the upload.
4387 my $host = access_cfg('upload-host','RETURN-UNDEF');
4388 my @hostarg = defined($host) ? ($host,) : ();
4389 runcmd_ordryrun @dput, @hostarg, $changesfile;
4390 printdone "pushed and uploaded $cversion";
4392 supplementary_message('');
4393 responder_send_command("complete");
4397 not_necessarily_a_tree();
4402 badusage "-p is not allowed with clone; specify as argument instead"
4403 if defined $package;
4406 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4407 ($package,$isuite) = @ARGV;
4408 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4409 ($package,$dstdir) = @ARGV;
4410 } elsif (@ARGV==3) {
4411 ($package,$isuite,$dstdir) = @ARGV;
4413 badusage "incorrect arguments to dgit clone";
4417 $dstdir ||= "$package";
4418 if (stat_exists $dstdir) {
4419 fail "$dstdir already exists";
4423 if ($rmonerror && !$dryrun_level) {
4424 $cwd_remove= getcwd();
4426 return unless defined $cwd_remove;
4427 if (!chdir "$cwd_remove") {
4428 return if $!==&ENOENT;
4429 die "chdir $cwd_remove: $!";
4431 printdebug "clone rmonerror removing $dstdir\n";
4433 rmtree($dstdir) or die "remove $dstdir: $!\n";
4434 } elsif (grep { $! == $_ }
4435 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4437 print STDERR "check whether to remove $dstdir: $!\n";
4443 $cwd_remove = undef;
4446 sub branchsuite () {
4447 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4448 my $branch = cmdoutput_errok @cmd;
4449 if (!defined $branch) {
4450 $?==256 or failedcmd @cmd;
4453 if ($branch =~ m#$lbranch_re#o) {
4460 sub fetchpullargs () {
4461 if (!defined $package) {
4462 my $sourcep = parsecontrol('debian/control','debian/control');
4463 $package = getfield $sourcep, 'Source';
4466 $isuite = branchsuite();
4468 my $clogp = parsechangelog();
4469 my $clogsuite = getfield $clogp, 'Distribution';
4470 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4472 } elsif (@ARGV==1) {
4475 badusage "incorrect arguments to dgit fetch or dgit pull";
4483 my $multi_fetched = fork_for_multisuite(sub { });
4484 exit 0 if $multi_fetched;
4491 if (quiltmode_splitbrain()) {
4492 my ($format, $fopts) = get_source_format();
4493 madformat($format) and fail <<END
4494 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4502 build_or_push_prep_early();
4507 } elsif (@ARGV==1) {
4508 ($specsuite) = (@ARGV);
4510 badusage "incorrect arguments to dgit $subcommand";
4513 local ($package) = $existing_package; # this is a hack
4514 canonicalise_suite();
4516 canonicalise_suite();
4518 if (defined $specsuite &&
4519 $specsuite ne $isuite &&
4520 $specsuite ne $csuite) {
4521 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4522 " but command line specifies $specsuite";
4531 #---------- remote commands' implementation ----------
4533 sub pre_remote_push_build_host {
4534 my ($nrargs) = shift @ARGV;
4535 my (@rargs) = @ARGV[0..$nrargs-1];
4536 @ARGV = @ARGV[$nrargs..$#ARGV];
4538 my ($dir,$vsnwant) = @rargs;
4539 # vsnwant is a comma-separated list; we report which we have
4540 # chosen in our ready response (so other end can tell if they
4543 $we_are_responder = 1;
4544 $us .= " (build host)";
4546 open PI, "<&STDIN" or die $!;
4547 open STDIN, "/dev/null" or die $!;
4548 open PO, ">&STDOUT" or die $!;
4550 open STDOUT, ">&STDERR" or die $!;
4554 ($protovsn) = grep {
4555 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4556 } @rpushprotovsn_support;
4558 fail "build host has dgit rpush protocol versions ".
4559 (join ",", @rpushprotovsn_support).
4560 " but invocation host has $vsnwant"
4561 unless defined $protovsn;
4565 sub cmd_remote_push_build_host {
4566 responder_send_command("dgit-remote-push-ready $protovsn");
4570 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4571 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4572 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4573 # a good error message)
4575 sub rpush_handle_protovsn_bothends () {
4576 if ($protovsn < 4) {
4577 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4586 my $report = i_child_report();
4587 if (defined $report) {
4588 printdebug "($report)\n";
4589 } elsif ($i_child_pid) {
4590 printdebug "(killing build host child $i_child_pid)\n";
4591 kill 15, $i_child_pid;
4593 if (defined $i_tmp && !defined $initiator_tempdir) {
4595 eval { rmtree $i_tmp; };
4600 return unless forkcheck_mainprocess();
4605 my ($base,$selector,@args) = @_;
4606 $selector =~ s/\-/_/g;
4607 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4611 not_necessarily_a_tree();
4616 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4624 push @rargs, join ",", @rpushprotovsn_support;
4627 push @rdgit, @ropts;
4628 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4630 my @cmd = (@ssh, $host, shellquote @rdgit);
4633 $we_are_initiator=1;
4635 if (defined $initiator_tempdir) {
4636 rmtree $initiator_tempdir;
4637 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4638 $i_tmp = $initiator_tempdir;
4642 $i_child_pid = open2(\*RO, \*RI, @cmd);
4644 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4645 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4646 $supplementary_message = '' unless $protovsn >= 3;
4649 my ($icmd,$iargs) = initiator_expect {
4650 m/^(\S+)(?: (.*))?$/;
4653 i_method "i_resp", $icmd, $iargs;
4657 sub i_resp_progress ($) {
4659 my $msg = protocol_read_bytes \*RO, $rhs;
4663 sub i_resp_supplementary_message ($) {
4665 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4668 sub i_resp_complete {
4669 my $pid = $i_child_pid;
4670 $i_child_pid = undef; # prevents killing some other process with same pid
4671 printdebug "waiting for build host child $pid...\n";
4672 my $got = waitpid $pid, 0;
4673 die $! unless $got == $pid;
4674 die "build host child failed $?" if $?;
4677 printdebug "all done\n";
4681 sub i_resp_file ($) {
4683 my $localname = i_method "i_localname", $keyword;
4684 my $localpath = "$i_tmp/$localname";
4685 stat_exists $localpath and
4686 badproto \*RO, "file $keyword ($localpath) twice";
4687 protocol_receive_file \*RO, $localpath;
4688 i_method "i_file", $keyword;
4693 sub i_resp_param ($) {
4694 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4698 sub i_resp_previously ($) {
4699 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4700 or badproto \*RO, "bad previously spec";
4701 my $r = system qw(git check-ref-format), $1;
4702 die "bad previously ref spec ($r)" if $r;
4703 $previously{$1} = $2;
4708 sub i_resp_want ($) {
4710 die "$keyword ?" if $i_wanted{$keyword}++;
4712 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4713 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4714 die unless $isuite =~ m/^$suite_re$/;
4717 rpush_handle_protovsn_bothends();
4719 fail "rpush negotiated protocol version $protovsn".
4720 " which does not support quilt mode $quilt_mode"
4721 if quiltmode_splitbrain;
4723 my @localpaths = i_method "i_want", $keyword;
4724 printdebug "[[ $keyword @localpaths\n";
4725 foreach my $localpath (@localpaths) {
4726 protocol_send_file \*RI, $localpath;
4728 print RI "files-end\n" or die $!;
4731 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4733 sub i_localname_parsed_changelog {
4734 return "remote-changelog.822";
4736 sub i_file_parsed_changelog {
4737 ($i_clogp, $i_version, $i_dscfn) =
4738 push_parse_changelog "$i_tmp/remote-changelog.822";
4739 die if $i_dscfn =~ m#/|^\W#;
4742 sub i_localname_dsc {
4743 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4748 sub i_localname_buildinfo ($) {
4749 my $bi = $i_param{'buildinfo-filename'};
4750 defined $bi or badproto \*RO, "buildinfo before filename";
4751 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4752 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4753 or badproto \*RO, "improper buildinfo filename";
4756 sub i_file_buildinfo {
4757 my $bi = $i_param{'buildinfo-filename'};
4758 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4759 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4760 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4761 files_compare_inputs($bd, $ch);
4762 (getfield $bd, $_) eq (getfield $ch, $_) or
4763 fail "buildinfo mismatch $_"
4764 foreach qw(Source Version);
4765 !defined $bd->{$_} or
4766 fail "buildinfo contains $_"
4767 foreach qw(Changes Changed-by Distribution);
4769 push @i_buildinfos, $bi;
4770 delete $i_param{'buildinfo-filename'};
4773 sub i_localname_changes {
4774 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4775 $i_changesfn = $i_dscfn;
4776 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4777 return $i_changesfn;
4779 sub i_file_changes { }
4781 sub i_want_signed_tag {
4782 printdebug Dumper(\%i_param, $i_dscfn);
4783 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4784 && defined $i_param{'csuite'}
4785 or badproto \*RO, "premature desire for signed-tag";
4786 my $head = $i_param{'head'};
4787 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4789 my $maintview = $i_param{'maint-view'};
4790 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4793 if ($protovsn >= 4) {
4794 my $p = $i_param{'tagformat'} // '<undef>';
4796 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4799 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4801 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4803 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4806 push_mktags $i_clogp, $i_dscfn,
4807 $i_changesfn, 'remote changes',
4811 sub i_want_signed_dsc_changes {
4812 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4813 sign_changes $i_changesfn;
4814 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4817 #---------- building etc. ----------
4823 #----- `3.0 (quilt)' handling -----
4825 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4827 sub quiltify_dpkg_commit ($$$;$) {
4828 my ($patchname,$author,$msg, $xinfo) = @_;
4831 mkpath '.git/dgit'; # we are in playtree
4832 my $descfn = ".git/dgit/quilt-description.tmp";
4833 open O, '>', $descfn or die "$descfn: $!";
4834 $msg =~ s/\n+/\n\n/;
4835 print O <<END or die $!;
4837 ${xinfo}Subject: $msg
4844 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4845 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4846 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4847 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4851 sub quiltify_trees_differ ($$;$$$) {
4852 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4853 # returns true iff the two tree objects differ other than in debian/
4854 # with $finegrained,
4855 # returns bitmask 01 - differ in upstream files except .gitignore
4856 # 02 - differ in .gitignore
4857 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4858 # is set for each modified .gitignore filename $fn
4859 # if $unrepres is defined, array ref to which is appeneded
4860 # a list of unrepresentable changes (removals of upstream files
4863 my @cmd = (@git, qw(diff-tree -z --no-renames));
4864 push @cmd, qw(--name-only) unless $unrepres;
4865 push @cmd, qw(-r) if $finegrained || $unrepres;
4867 my $diffs= cmdoutput @cmd;
4870 foreach my $f (split /\0/, $diffs) {
4871 if ($unrepres && !@lmodes) {
4872 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4875 my ($oldmode,$newmode) = @lmodes;
4878 next if $f =~ m#^debian(?:/.*)?$#s;
4882 die "not a plain file or symlink\n"
4883 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
4884 $oldmode =~ m/^(?:10|12)\d{4}$/;
4885 if ($oldmode =~ m/[^0]/ &&
4886 $newmode =~ m/[^0]/) {
4887 # both old and new files exist
4888 die "mode or type changed\n" if $oldmode ne $newmode;
4889 die "modified symlink\n" unless $newmode =~ m/^10/;
4890 } elsif ($oldmode =~ m/[^0]/) {
4892 die "deletion of symlink\n"
4893 unless $oldmode =~ m/^10/;
4896 die "creation with non-default mode\n"
4897 unless $newmode =~ m/^100644$/ or
4898 $newmode =~ m/^120000$/;
4902 local $/="\n"; chomp $@;
4903 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4907 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4908 $r |= $isignore ? 02 : 01;
4909 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4911 printdebug "quiltify_trees_differ $x $y => $r\n";
4915 sub quiltify_tree_sentinelfiles ($) {
4916 # lists the `sentinel' files present in the tree
4918 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4919 qw(-- debian/rules debian/control);
4924 sub quiltify_splitbrain_needed () {
4925 if (!$split_brain) {
4926 progress "dgit view: changes are required...";
4927 runcmd @git, qw(checkout -q -b dgit-view);
4932 sub quiltify_splitbrain ($$$$$$) {
4933 my ($clogp, $unapplied, $headref, $diffbits,
4934 $editedignores, $cachekey) = @_;
4935 if ($quilt_mode !~ m/gbp|dpm/) {
4936 # treat .gitignore just like any other upstream file
4937 $diffbits = { %$diffbits };
4938 $_ = !!$_ foreach values %$diffbits;
4940 # We would like any commits we generate to be reproducible
4941 my @authline = clogp_authline($clogp);
4942 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4943 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4944 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4945 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4946 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4947 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4949 if ($quilt_mode =~ m/gbp|unapplied/ &&
4950 ($diffbits->{O2H} & 01)) {
4952 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4953 " but git tree differs from orig in upstream files.";
4954 if (!stat_exists "debian/patches") {
4956 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4960 if ($quilt_mode =~ m/dpm/ &&
4961 ($diffbits->{H2A} & 01)) {
4963 --quilt=$quilt_mode specified, implying patches-applied git tree
4964 but git tree differs from result of applying debian/patches to upstream
4967 if ($quilt_mode =~ m/gbp|unapplied/ &&
4968 ($diffbits->{O2A} & 01)) { # some patches
4969 quiltify_splitbrain_needed();
4970 progress "dgit view: creating patches-applied version using gbp pq";
4971 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4972 # gbp pq import creates a fresh branch; push back to dgit-view
4973 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4974 runcmd @git, qw(checkout -q dgit-view);
4976 if ($quilt_mode =~ m/gbp|dpm/ &&
4977 ($diffbits->{O2A} & 02)) {
4979 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4980 tool which does not create patches for changes to upstream
4981 .gitignores: but, such patches exist in debian/patches.
4984 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4985 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4986 quiltify_splitbrain_needed();
4987 progress "dgit view: creating patch to represent .gitignore changes";
4988 ensuredir "debian/patches";
4989 my $gipatch = "debian/patches/auto-gitignore";
4990 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4991 stat GIPATCH or die "$gipatch: $!";
4992 fail "$gipatch already exists; but want to create it".
4993 " to record .gitignore changes" if (stat _)[7];
4994 print GIPATCH <<END or die "$gipatch: $!";
4995 Subject: Update .gitignore from Debian packaging branch
4997 The Debian packaging git branch contains these updates to the upstream
4998 .gitignore file(s). This patch is autogenerated, to provide these
4999 updates to users of the official Debian archive view of the package.
5001 [dgit ($our_version) update-gitignore]
5004 close GIPATCH or die "$gipatch: $!";
5005 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5006 $unapplied, $headref, "--", sort keys %$editedignores;
5007 open SERIES, "+>>", "debian/patches/series" or die $!;
5008 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5010 defined read SERIES, $newline, 1 or die $!;
5011 print SERIES "\n" or die $! unless $newline eq "\n";
5012 print SERIES "auto-gitignore\n" or die $!;
5013 close SERIES or die $!;
5014 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5016 Commit patch to update .gitignore
5018 [dgit ($our_version) update-gitignore-quilt-fixup]
5022 my $dgitview = git_rev_parse 'HEAD';
5025 # When we no longer need to support squeeze, use --create-reflog
5027 ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
5028 my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
5031 my $oldcache = git_get_ref "refs/$splitbraincache";
5032 if ($oldcache eq $dgitview) {
5033 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5034 # git update-ref doesn't always update, in this case. *sigh*
5035 my $dummy = make_commit_text <<END;
5038 author Dgit <dgit\@example.com> 1000000000 +0000
5039 committer Dgit <dgit\@example.com> 1000000000 +0000
5041 Dummy commit - do not use
5043 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5044 "refs/$splitbraincache", $dummy;
5046 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5049 changedir "$playground/work";
5051 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5052 progress "dgit view: created ($saved)";
5055 sub quiltify ($$$$) {
5056 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5058 # Quilt patchification algorithm
5060 # We search backwards through the history of the main tree's HEAD
5061 # (T) looking for a start commit S whose tree object is identical
5062 # to to the patch tip tree (ie the tree corresponding to the
5063 # current dpkg-committed patch series). For these purposes
5064 # `identical' disregards anything in debian/ - this wrinkle is
5065 # necessary because dpkg-source treates debian/ specially.
5067 # We can only traverse edges where at most one of the ancestors'
5068 # trees differs (in changes outside in debian/). And we cannot
5069 # handle edges which change .pc/ or debian/patches. To avoid
5070 # going down a rathole we avoid traversing edges which introduce
5071 # debian/rules or debian/control. And we set a limit on the
5072 # number of edges we are willing to look at.
5074 # If we succeed, we walk forwards again. For each traversed edge
5075 # PC (with P parent, C child) (starting with P=S and ending with
5076 # C=T) to we do this:
5078 # - dpkg-source --commit with a patch name and message derived from C
5079 # After traversing PT, we git commit the changes which
5080 # should be contained within debian/patches.
5082 # The search for the path S..T is breadth-first. We maintain a
5083 # todo list containing search nodes. A search node identifies a
5084 # commit, and looks something like this:
5086 # Commit => $git_commit_id,
5087 # Child => $c, # or undef if P=T
5088 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5089 # Nontrivial => true iff $p..$c has relevant changes
5096 my %considered; # saves being exponential on some weird graphs
5098 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5101 my ($search,$whynot) = @_;
5102 printdebug " search NOT $search->{Commit} $whynot\n";
5103 $search->{Whynot} = $whynot;
5104 push @nots, $search;
5105 no warnings qw(exiting);
5114 my $c = shift @todo;
5115 next if $considered{$c->{Commit}}++;
5117 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5119 printdebug "quiltify investigate $c->{Commit}\n";
5122 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5123 printdebug " search finished hooray!\n";
5128 if ($quilt_mode eq 'nofix') {
5129 fail "quilt fixup required but quilt mode is \`nofix'\n".
5130 "HEAD commit $c->{Commit} differs from tree implied by ".
5131 " debian/patches (tree object $oldtiptree)";
5133 if ($quilt_mode eq 'smash') {
5134 printdebug " search quitting smash\n";
5138 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5139 $not->($c, "has $c_sentinels not $t_sentinels")
5140 if $c_sentinels ne $t_sentinels;
5142 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5143 $commitdata =~ m/\n\n/;
5145 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5146 @parents = map { { Commit => $_, Child => $c } } @parents;
5148 $not->($c, "root commit") if !@parents;
5150 foreach my $p (@parents) {
5151 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5153 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5154 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5156 foreach my $p (@parents) {
5157 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5159 my @cmd= (@git, qw(diff-tree -r --name-only),
5160 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5161 my $patchstackchange = cmdoutput @cmd;
5162 if (length $patchstackchange) {
5163 $patchstackchange =~ s/\n/,/g;
5164 $not->($p, "changed $patchstackchange");
5167 printdebug " search queue P=$p->{Commit} ",
5168 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5174 printdebug "quiltify want to smash\n";
5177 my $x = $_[0]{Commit};
5178 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5181 my $reportnot = sub {
5183 my $s = $abbrev->($notp);
5184 my $c = $notp->{Child};
5185 $s .= "..".$abbrev->($c) if $c;
5186 $s .= ": ".$notp->{Whynot};
5189 if ($quilt_mode eq 'linear') {
5190 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5191 foreach my $notp (@nots) {
5192 print STDERR "$us: ", $reportnot->($notp), "\n";
5194 print STDERR "$us: $_\n" foreach @$failsuggestion;
5195 fail "quilt fixup naive history linearisation failed.\n".
5196 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5197 } elsif ($quilt_mode eq 'smash') {
5198 } elsif ($quilt_mode eq 'auto') {
5199 progress "quilt fixup cannot be linear, smashing...";
5201 die "$quilt_mode ?";
5204 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5205 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5207 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5209 quiltify_dpkg_commit "auto-$version-$target-$time",
5210 (getfield $clogp, 'Maintainer'),
5211 "Automatically generated patch ($clogp->{Version})\n".
5212 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5216 progress "quiltify linearisation planning successful, executing...";
5218 for (my $p = $sref_S;
5219 my $c = $p->{Child};
5221 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5222 next unless $p->{Nontrivial};
5224 my $cc = $c->{Commit};
5226 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5227 $commitdata =~ m/\n\n/ or die "$c ?";
5230 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5233 my $commitdate = cmdoutput
5234 @git, qw(log -n1 --pretty=format:%aD), $cc;
5236 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5238 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5245 my $gbp_check_suitable = sub {
5250 die "contains unexpected slashes\n" if m{//} || m{/$};
5251 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5252 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5253 die "is series file\n" if m{$series_filename_re}o;
5254 die "too long" if length > 200;
5256 return $_ unless $@;
5257 print STDERR "quiltifying commit $cc:".
5258 " ignoring/dropping Gbp-Pq $what: $@";
5262 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5264 (\S+) \s* \n //ixm) {
5265 $patchname = $gbp_check_suitable->($1, 'Name');
5267 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5269 (\S+) \s* \n //ixm) {
5270 $patchdir = $gbp_check_suitable->($1, 'Topic');
5275 if (!defined $patchname) {
5276 $patchname = $title;
5277 $patchname =~ s/[.:]$//;
5280 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5281 my $translitname = $converter->convert($patchname);
5282 die unless defined $translitname;
5283 $patchname = $translitname;
5286 "dgit: patch title transliteration error: $@"
5288 $patchname =~ y/ A-Z/-a-z/;
5289 $patchname =~ y/-a-z0-9_.+=~//cd;
5290 $patchname =~ s/^\W/x-$&/;
5291 $patchname = substr($patchname,0,40);
5292 $patchname .= ".patch";
5294 if (!defined $patchdir) {
5297 if (length $patchdir) {
5298 $patchname = "$patchdir/$patchname";
5300 if ($patchname =~ m{^(.*)/}) {
5301 mkpath "debian/patches/$1";
5306 stat "debian/patches/$patchname$index";
5308 $!==ENOENT or die "$patchname$index $!";
5310 runcmd @git, qw(checkout -q), $cc;
5312 # We use the tip's changelog so that dpkg-source doesn't
5313 # produce complaining messages from dpkg-parsechangelog. None
5314 # of the information dpkg-source gets from the changelog is
5315 # actually relevant - it gets put into the original message
5316 # which dpkg-source provides our stunt editor, and then
5318 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5320 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5321 "Date: $commitdate\n".
5322 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5324 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5327 runcmd @git, qw(checkout -q master);
5330 sub build_maybe_quilt_fixup () {
5331 my ($format,$fopts) = get_source_format;
5332 return unless madformat_wantfixup $format;
5335 check_for_vendor_patches();
5337 if (quiltmode_splitbrain) {
5338 fail <<END unless access_cfg_tagformats_can_splitbrain;
5339 quilt mode $quilt_mode requires split view so server needs to support
5340 both "new" and "maint" tag formats, but config says it doesn't.
5344 my $clogp = parsechangelog();
5345 my $headref = git_rev_parse('HEAD');
5348 changedir $playground;
5350 my $upstreamversion = upstreamversion $version;
5352 if ($fopts->{'single-debian-patch'}) {
5353 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5355 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5358 die 'bug' if $split_brain && !$need_split_build_invocation;
5361 runcmd_ordryrun_local
5362 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5365 sub quilt_fixup_mkwork ($) {
5368 mkdir "work" or die $!;
5370 mktree_in_ud_here();
5371 runcmd @git, qw(reset -q --hard), $headref;
5374 sub quilt_fixup_linkorigs ($$) {
5375 my ($upstreamversion, $fn) = @_;
5376 # calls $fn->($leafname);
5378 foreach my $f (<$maindir/../*>) { #/){
5379 my $b=$f; $b =~ s{.*/}{};
5381 local ($debuglevel) = $debuglevel-1;
5382 printdebug "QF linkorigs $b, $f ?\n";
5384 next unless is_orig_file_of_vsn $b, $upstreamversion;
5385 printdebug "QF linkorigs $b, $f Y\n";
5386 link_ltarget $f, $b or die "$b $!";
5391 sub quilt_fixup_delete_pc () {
5392 runcmd @git, qw(rm -rqf .pc);
5394 Commit removal of .pc (quilt series tracking data)
5396 [dgit ($our_version) upgrade quilt-remove-pc]
5400 sub quilt_fixup_singlepatch ($$$) {
5401 my ($clogp, $headref, $upstreamversion) = @_;
5403 progress "starting quiltify (single-debian-patch)";
5405 # dpkg-source --commit generates new patches even if
5406 # single-debian-patch is in debian/source/options. In order to
5407 # get it to generate debian/patches/debian-changes, it is
5408 # necessary to build the source package.
5410 quilt_fixup_linkorigs($upstreamversion, sub { });
5411 quilt_fixup_mkwork($headref);
5413 rmtree("debian/patches");
5415 runcmd @dpkgsource, qw(-b .);
5417 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5418 rename srcfn("$upstreamversion", "/debian/patches"),
5419 "work/debian/patches";
5422 commit_quilty_patch();
5425 sub quilt_make_fake_dsc ($) {
5426 my ($upstreamversion) = @_;
5428 my $fakeversion="$upstreamversion-~~DGITFAKE";
5430 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5431 print $fakedsc <<END or die $!;
5434 Version: $fakeversion
5438 my $dscaddfile=sub {
5441 my $md = new Digest::MD5;
5443 my $fh = new IO::File $b, '<' or die "$b $!";
5448 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5451 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5453 my @files=qw(debian/source/format debian/rules
5454 debian/control debian/changelog);
5455 foreach my $maybe (qw(debian/patches debian/source/options
5456 debian/tests/control)) {
5457 next unless stat_exists "$maindir/$maybe";
5458 push @files, $maybe;
5461 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5462 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5464 $dscaddfile->($debtar);
5465 close $fakedsc or die $!;
5468 sub quilt_check_splitbrain_cache ($$) {
5469 my ($headref, $upstreamversion) = @_;
5470 # Called only if we are in (potentially) split brain mode.
5471 # Called in playground.
5472 # Computes the cache key and looks in the cache.
5473 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5475 my $splitbrain_cachekey;
5478 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5479 # we look in the reflog of dgit-intern/quilt-cache
5480 # we look for an entry whose message is the key for the cache lookup
5481 my @cachekey = (qw(dgit), $our_version);
5482 push @cachekey, $upstreamversion;
5483 push @cachekey, $quilt_mode;
5484 push @cachekey, $headref;
5486 push @cachekey, hashfile('fake.dsc');
5488 my $srcshash = Digest::SHA->new(256);
5489 my %sfs = ( %INC, '$0(dgit)' => $0 );
5490 foreach my $sfk (sort keys %sfs) {
5491 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5492 $srcshash->add($sfk," ");
5493 $srcshash->add(hashfile($sfs{$sfk}));
5494 $srcshash->add("\n");
5496 push @cachekey, $srcshash->hexdigest();
5497 $splitbrain_cachekey = "@cachekey";
5499 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5501 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5502 debugcmd "|(probably)",@cmd;
5503 my $child = open GC, "-|"; defined $child or die $!;
5505 chdir $maindir or die $!;
5506 if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
5507 $! == ENOENT or die $!;
5508 printdebug ">(no reflog)\n";
5515 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5516 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5519 quilt_fixup_mkwork($headref);
5520 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5521 if ($cachehit ne $headref) {
5522 progress "dgit view: found cached ($saved)";
5523 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5525 return ($cachehit, $splitbrain_cachekey);
5527 progress "dgit view: found cached, no changes required";
5528 return ($headref, $splitbrain_cachekey);
5530 die $! if GC->error;
5531 failedcmd unless close GC;
5533 printdebug "splitbrain cache miss\n";
5534 return (undef, $splitbrain_cachekey);
5537 sub quilt_fixup_multipatch ($$$) {
5538 my ($clogp, $headref, $upstreamversion) = @_;
5540 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5543 # - honour any existing .pc in case it has any strangeness
5544 # - determine the git commit corresponding to the tip of
5545 # the patch stack (if there is one)
5546 # - if there is such a git commit, convert each subsequent
5547 # git commit into a quilt patch with dpkg-source --commit
5548 # - otherwise convert all the differences in the tree into
5549 # a single git commit
5553 # Our git tree doesn't necessarily contain .pc. (Some versions of
5554 # dgit would include the .pc in the git tree.) If there isn't
5555 # one, we need to generate one by unpacking the patches that we
5558 # We first look for a .pc in the git tree. If there is one, we
5559 # will use it. (This is not the normal case.)
5561 # Otherwise need to regenerate .pc so that dpkg-source --commit
5562 # can work. We do this as follows:
5563 # 1. Collect all relevant .orig from parent directory
5564 # 2. Generate a debian.tar.gz out of
5565 # debian/{patches,rules,source/format,source/options}
5566 # 3. Generate a fake .dsc containing just these fields:
5567 # Format Source Version Files
5568 # 4. Extract the fake .dsc
5569 # Now the fake .dsc has a .pc directory.
5570 # (In fact we do this in every case, because in future we will
5571 # want to search for a good base commit for generating patches.)
5573 # Then we can actually do the dpkg-source --commit
5574 # 1. Make a new working tree with the same object
5575 # store as our main tree and check out the main
5577 # 2. Copy .pc from the fake's extraction, if necessary
5578 # 3. Run dpkg-source --commit
5579 # 4. If the result has changes to debian/, then
5580 # - git add them them
5581 # - git add .pc if we had a .pc in-tree
5583 # 5. If we had a .pc in-tree, delete it, and git commit
5584 # 6. Back in the main tree, fast forward to the new HEAD
5586 # Another situation we may have to cope with is gbp-style
5587 # patches-unapplied trees.
5589 # We would want to detect these, so we know to escape into
5590 # quilt_fixup_gbp. However, this is in general not possible.
5591 # Consider a package with a one patch which the dgit user reverts
5592 # (with git revert or the moral equivalent).
5594 # That is indistinguishable in contents from a patches-unapplied
5595 # tree. And looking at the history to distinguish them is not
5596 # useful because the user might have made a confusing-looking git
5597 # history structure (which ought to produce an error if dgit can't
5598 # cope, not a silent reintroduction of an unwanted patch).
5600 # So gbp users will have to pass an option. But we can usually
5601 # detect their failure to do so: if the tree is not a clean
5602 # patches-applied tree, quilt linearisation fails, but the tree
5603 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5604 # they want --quilt=unapplied.
5606 # To help detect this, when we are extracting the fake dsc, we
5607 # first extract it with --skip-patches, and then apply the patches
5608 # afterwards with dpkg-source --before-build. That lets us save a
5609 # tree object corresponding to .origs.
5611 my $splitbrain_cachekey;
5613 quilt_make_fake_dsc($upstreamversion);
5615 if (quiltmode_splitbrain()) {
5617 ($cachehit, $splitbrain_cachekey) =
5618 quilt_check_splitbrain_cache($headref, $upstreamversion);
5619 return if $cachehit;
5623 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5625 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5626 rename $fakexdir, "fake" or die "$fakexdir $!";
5630 remove_stray_gits("source package");
5631 mktree_in_ud_here();
5635 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5636 my $unapplied=git_add_write_tree();
5637 printdebug "fake orig tree object $unapplied\n";
5641 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5643 if (system @bbcmd) {
5644 failedcmd @bbcmd if $? < 0;
5646 failed to apply your git tree's patch stack (from debian/patches/) to
5647 the corresponding upstream tarball(s). Your source tree and .orig
5648 are probably too inconsistent. dgit can only fix up certain kinds of
5649 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5655 quilt_fixup_mkwork($headref);
5658 if (stat_exists ".pc") {
5660 progress "Tree already contains .pc - will use it then delete it.";
5663 rename '../fake/.pc','.pc' or die $!;
5666 changedir '../fake';
5668 my $oldtiptree=git_add_write_tree();
5669 printdebug "fake o+d/p tree object $unapplied\n";
5670 changedir '../work';
5673 # We calculate some guesswork now about what kind of tree this might
5674 # be. This is mostly for error reporting.
5680 # O = orig, without patches applied
5681 # A = "applied", ie orig with H's debian/patches applied
5682 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5683 \%editedignores, \@unrepres),
5684 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5685 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5689 foreach my $b (qw(01 02)) {
5690 foreach my $v (qw(O2H O2A H2A)) {
5691 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5694 printdebug "differences \@dl @dl.\n";
5697 "$us: base trees orig=%.20s o+d/p=%.20s",
5698 $unapplied, $oldtiptree;
5700 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5701 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5702 $dl[0], $dl[1], $dl[3], $dl[4],
5706 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5708 forceable_fail [qw(unrepresentable)], <<END;
5709 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5714 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5715 push @failsuggestion, "This might be a patches-unapplied branch.";
5716 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5717 push @failsuggestion, "This might be a patches-applied branch.";
5719 push @failsuggestion, "Maybe you need to specify one of".
5720 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5722 if (quiltmode_splitbrain()) {
5723 quiltify_splitbrain($clogp, $unapplied, $headref,
5724 $diffbits, \%editedignores,
5725 $splitbrain_cachekey);
5729 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5730 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5732 if (!open P, '>>', ".pc/applied-patches") {
5733 $!==&ENOENT or die $!;
5738 commit_quilty_patch();
5740 if ($mustdeletepc) {
5741 quilt_fixup_delete_pc();
5745 sub quilt_fixup_editor () {
5746 my $descfn = $ENV{$fakeeditorenv};
5747 my $editing = $ARGV[$#ARGV];
5748 open I1, '<', $descfn or die "$descfn: $!";
5749 open I2, '<', $editing or die "$editing: $!";
5750 unlink $editing or die "$editing: $!";
5751 open O, '>', $editing or die "$editing: $!";
5752 while (<I1>) { print O or die $!; } I1->error and die $!;
5755 $copying ||= m/^\-\-\- /;
5756 next unless $copying;
5759 I2->error and die $!;
5764 sub maybe_apply_patches_dirtily () {
5765 return unless $quilt_mode =~ m/gbp|unapplied/;
5766 print STDERR <<END or die $!;
5768 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5769 dgit: Have to apply the patches - making the tree dirty.
5770 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5773 $patches_applied_dirtily = 01;
5774 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5775 runcmd qw(dpkg-source --before-build .);
5778 sub maybe_unapply_patches_again () {
5779 progress "dgit: Unapplying patches again to tidy up the tree."
5780 if $patches_applied_dirtily;
5781 runcmd qw(dpkg-source --after-build .)
5782 if $patches_applied_dirtily & 01;
5784 if $patches_applied_dirtily & 02;
5785 $patches_applied_dirtily = 0;
5788 #----- other building -----
5790 our $clean_using_builder;
5791 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5792 # clean the tree before building (perhaps invoked indirectly by
5793 # whatever we are using to run the build), rather than separately
5794 # and explicitly by us.
5797 return if $clean_using_builder;
5798 if ($cleanmode eq 'dpkg-source') {
5799 maybe_apply_patches_dirtily();
5800 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5801 } elsif ($cleanmode eq 'dpkg-source-d') {
5802 maybe_apply_patches_dirtily();
5803 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5804 } elsif ($cleanmode eq 'git') {
5805 runcmd_ordryrun_local @git, qw(clean -xdf);
5806 } elsif ($cleanmode eq 'git-ff') {
5807 runcmd_ordryrun_local @git, qw(clean -xdff);
5808 } elsif ($cleanmode eq 'check') {
5809 my $leftovers = cmdoutput @git, qw(clean -xdn);
5810 if (length $leftovers) {
5811 print STDERR $leftovers, "\n" or die $!;
5812 fail "tree contains uncommitted files and --clean=check specified";
5814 } elsif ($cleanmode eq 'none') {
5821 badusage "clean takes no additional arguments" if @ARGV;
5824 maybe_unapply_patches_again();
5827 sub build_or_push_prep_early () {
5828 our $build_or_push_prep_early_done //= 0;
5829 return if $build_or_push_prep_early_done++;
5830 badusage "-p is not allowed with dgit $subcommand" if defined $package;
5831 my $clogp = parsechangelog();
5832 $isuite = getfield $clogp, 'Distribution';
5833 $package = getfield $clogp, 'Source';
5834 $version = getfield $clogp, 'Version';
5837 sub build_prep_early () {
5838 build_or_push_prep_early();
5846 build_maybe_quilt_fixup();
5848 my $pat = changespat $version;
5849 foreach my $f (glob "$buildproductsdir/$pat") {
5851 unlink $f or fail "remove old changes file $f: $!";
5853 progress "would remove $f";
5859 sub changesopts_initial () {
5860 my @opts =@changesopts[1..$#changesopts];
5863 sub changesopts_version () {
5864 if (!defined $changes_since_version) {
5865 my @vsns = archive_query('archive_query');
5866 my @quirk = access_quirk();
5867 if ($quirk[0] eq 'backports') {
5868 local $isuite = $quirk[2];
5870 canonicalise_suite();
5871 push @vsns, archive_query('archive_query');
5874 @vsns = map { $_->[0] } @vsns;
5875 @vsns = sort { -version_compare($a, $b) } @vsns;
5876 $changes_since_version = $vsns[0];
5877 progress "changelog will contain changes since $vsns[0]";
5879 $changes_since_version = '_';
5880 progress "package seems new, not specifying -v<version>";
5883 if ($changes_since_version ne '_') {
5884 return ("-v$changes_since_version");
5890 sub changesopts () {
5891 return (changesopts_initial(), changesopts_version());
5894 sub massage_dbp_args ($;$) {
5895 my ($cmd,$xargs) = @_;
5898 # - if we're going to split the source build out so we can
5899 # do strange things to it, massage the arguments to dpkg-buildpackage
5900 # so that the main build doessn't build source (or add an argument
5901 # to stop it building source by default).
5903 # - add -nc to stop dpkg-source cleaning the source tree,
5904 # unless we're not doing a split build and want dpkg-source
5905 # as cleanmode, in which case we can do nothing
5908 # 0 - source will NOT need to be built separately by caller
5909 # +1 - source will need to be built separately by caller
5910 # +2 - source will need to be built separately by caller AND
5911 # dpkg-buildpackage should not in fact be run at all!
5912 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5913 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5914 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5915 $clean_using_builder = 1;
5918 # -nc has the side effect of specifying -b if nothing else specified
5919 # and some combinations of -S, -b, et al, are errors, rather than
5920 # later simply overriding earlie. So we need to:
5921 # - search the command line for these options
5922 # - pick the last one
5923 # - perhaps add our own as a default
5924 # - perhaps adjust it to the corresponding non-source-building version
5926 foreach my $l ($cmd, $xargs) {
5928 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5931 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5933 if ($need_split_build_invocation) {
5934 printdebug "massage split $dmode.\n";
5935 $r = $dmode =~ m/[S]/ ? +2 :
5936 $dmode =~ y/gGF/ABb/ ? +1 :
5937 $dmode =~ m/[ABb]/ ? 0 :
5940 printdebug "massage done $r $dmode.\n";
5942 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5948 my $wasdir = must_getcwd();
5954 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5955 my ($msg_if_onlyone) = @_;
5956 # If there is only one .changes file, fail with $msg_if_onlyone,
5957 # or if that is undef, be a no-op.
5958 # Returns the changes file to report to the user.
5959 my $pat = changespat $version;
5960 my @changesfiles = glob $pat;
5961 @changesfiles = sort {
5962 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5966 if (@changesfiles==1) {
5967 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5968 only one changes file from build (@changesfiles)
5970 $result = $changesfiles[0];
5971 } elsif (@changesfiles==2) {
5972 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5973 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5974 fail "$l found in binaries changes file $binchanges"
5977 runcmd_ordryrun_local @mergechanges, @changesfiles;
5978 my $multichanges = changespat $version,'multi';
5980 stat_exists $multichanges or fail "$multichanges: $!";
5981 foreach my $cf (glob $pat) {
5982 next if $cf eq $multichanges;
5983 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5986 $result = $multichanges;
5988 fail "wrong number of different changes files (@changesfiles)";
5990 printdone "build successful, results in $result\n" or die $!;
5993 sub midbuild_checkchanges () {
5994 my $pat = changespat $version;
5995 return if $rmchanges;
5996 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5997 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5999 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6000 Suggest you delete @unwanted.
6005 sub midbuild_checkchanges_vanilla ($) {
6007 midbuild_checkchanges() if $wantsrc == 1;
6010 sub postbuild_mergechanges_vanilla ($) {
6012 if ($wantsrc == 1) {
6014 postbuild_mergechanges(undef);
6017 printdone "build successful\n";
6023 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6024 my $wantsrc = massage_dbp_args \@dbp;
6027 midbuild_checkchanges_vanilla $wantsrc;
6032 push @dbp, changesopts_version();
6033 maybe_apply_patches_dirtily();
6034 runcmd_ordryrun_local @dbp;
6036 maybe_unapply_patches_again();
6037 postbuild_mergechanges_vanilla $wantsrc;
6041 $quilt_mode //= 'gbp';
6047 # gbp can make .origs out of thin air. In my tests it does this
6048 # even for a 1.0 format package, with no origs present. So I
6049 # guess it keys off just the version number. We don't know
6050 # exactly what .origs ought to exist, but let's assume that we
6051 # should run gbp if: the version has an upstream part and the main
6053 my $upstreamversion = upstreamversion $version;
6054 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6055 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6057 if ($gbp_make_orig) {
6059 $cleanmode = 'none'; # don't do it again
6060 $need_split_build_invocation = 1;
6063 my @dbp = @dpkgbuildpackage;
6065 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6067 if (!length $gbp_build[0]) {
6068 if (length executable_on_path('git-buildpackage')) {
6069 $gbp_build[0] = qw(git-buildpackage);
6071 $gbp_build[0] = 'gbp buildpackage';
6074 my @cmd = opts_opt_multi_cmd @gbp_build;
6076 push @cmd, (qw(-us -uc --git-no-sign-tags),
6077 "--git-builder=".(shellquote @dbp));
6079 if ($gbp_make_orig) {
6080 my $priv = dgit_privdir();
6081 my $ok = "$priv/origs-gen-ok";
6082 unlink $ok or $!==&ENOENT or die $!;
6083 my @origs_cmd = @cmd;
6084 push @origs_cmd, qw(--git-cleaner=true);
6085 push @origs_cmd, "--git-prebuild=".
6086 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6087 push @origs_cmd, @ARGV;
6089 debugcmd @origs_cmd;
6091 do { local $!; stat_exists $ok; }
6092 or failedcmd @origs_cmd;
6094 dryrun_report @origs_cmd;
6100 midbuild_checkchanges_vanilla $wantsrc;
6102 if (!$clean_using_builder) {
6103 push @cmd, '--git-cleaner=true';
6107 maybe_unapply_patches_again();
6109 push @cmd, changesopts();
6110 runcmd_ordryrun_local @cmd, @ARGV;
6112 postbuild_mergechanges_vanilla $wantsrc;
6114 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6118 my $our_cleanmode = $cleanmode;
6119 if ($need_split_build_invocation) {
6120 # Pretend that clean is being done some other way. This
6121 # forces us not to try to use dpkg-buildpackage to clean and
6122 # build source all in one go; and instead we run dpkg-source
6123 # (and build_prep() will do the clean since $clean_using_builder
6125 $our_cleanmode = 'ELSEWHERE';
6127 if ($our_cleanmode =~ m/^dpkg-source/) {
6128 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6129 $clean_using_builder = 1;
6132 $sourcechanges = changespat $version,'source';
6134 unlink "../$sourcechanges" or $!==ENOENT
6135 or fail "remove $sourcechanges: $!";
6137 $dscfn = dscfn($version);
6138 if ($our_cleanmode eq 'dpkg-source') {
6139 maybe_apply_patches_dirtily();
6140 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6142 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6143 maybe_apply_patches_dirtily();
6144 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6147 my @cmd = (@dpkgsource, qw(-b --));
6149 changedir $playground;
6150 runcmd_ordryrun_local @cmd, "work";
6151 my @udfiles = <${package}_*>;
6153 foreach my $f (@udfiles) {
6154 printdebug "source copy, found $f\n";
6157 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6158 $f eq srcfn($version, $&));
6159 printdebug "source copy, found $f - renaming\n";
6160 rename "$playground/$f", "../$f" or $!==ENOENT
6161 or fail "put in place new source file ($f): $!";
6164 my $pwd = must_getcwd();
6165 my $leafdir = basename $pwd;
6167 runcmd_ordryrun_local @cmd, $leafdir;
6170 runcmd_ordryrun_local qw(sh -ec),
6171 'exec >$1; shift; exec "$@"','x',
6172 "../$sourcechanges",
6173 @dpkggenchanges, qw(-S), changesopts();
6177 sub cmd_build_source {
6179 badusage "build-source takes no additional arguments" if @ARGV;
6181 maybe_unapply_patches_again();
6182 printdone "source built, results in $dscfn and $sourcechanges";
6187 midbuild_checkchanges();
6190 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6191 stat_exists $sourcechanges
6192 or fail "$sourcechanges (in parent directory): $!";
6194 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6196 maybe_unapply_patches_again();
6198 postbuild_mergechanges(<<END);
6199 perhaps you need to pass -A ? (sbuild's default is to build only
6200 arch-specific binaries; dgit 1.4 used to override that.)
6205 sub cmd_quilt_fixup {
6206 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6209 build_maybe_quilt_fixup();
6212 sub import_dsc_result {
6213 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6214 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6216 check_gitattrs($newhash, "source tree");
6218 progress "dgit: import-dsc: $what_msg";
6221 sub cmd_import_dsc {
6225 last unless $ARGV[0] =~ m/^-/;
6228 if (m/^--require-valid-signature$/) {
6231 badusage "unknown dgit import-dsc sub-option \`$_'";
6235 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6236 my ($dscfn, $dstbranch) = @ARGV;
6238 badusage "dry run makes no sense with import-dsc" unless act_local();
6240 my $force = $dstbranch =~ s/^\+// ? +1 :
6241 $dstbranch =~ s/^\.\.// ? -1 :
6243 my $info = $force ? " $&" : '';
6244 $info = "$dscfn$info";
6246 my $specbranch = $dstbranch;
6247 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6248 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6250 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6251 my $chead = cmdoutput_errok @symcmd;
6252 defined $chead or $?==256 or failedcmd @symcmd;
6254 fail "$dstbranch is checked out - will not update it"
6255 if defined $chead and $chead eq $dstbranch;
6257 my $oldhash = git_get_ref $dstbranch;
6259 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6260 $dscdata = do { local $/ = undef; <D>; };
6261 D->error and fail "read $dscfn: $!";
6264 # we don't normally need this so import it here
6265 use Dpkg::Source::Package;
6266 my $dp = new Dpkg::Source::Package filename => $dscfn,
6267 require_valid_signature => $needsig;
6269 local $SIG{__WARN__} = sub {
6271 return unless $needsig;
6272 fail "import-dsc signature check failed";
6274 if (!$dp->is_signed()) {
6275 warn "$us: warning: importing unsigned .dsc\n";
6277 my $r = $dp->check_signature();
6278 die "->check_signature => $r" if $needsig && $r;
6284 $package = getfield $dsc, 'Source';
6286 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6287 unless forceing [qw(import-dsc-with-dgit-field)];
6288 parse_dsc_field_def_dsc_distro();
6290 $isuite = 'DGIT-IMPORT-DSC';
6291 $idistro //= $dsc_distro;
6295 if (defined $dsc_hash) {
6296 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6297 resolve_dsc_field_commit undef, undef;
6299 if (defined $dsc_hash) {
6300 my @cmd = (qw(sh -ec),
6301 "echo $dsc_hash | git cat-file --batch-check");
6302 my $objgot = cmdoutput @cmd;
6303 if ($objgot =~ m#^\w+ missing\b#) {
6305 .dsc contains Dgit field referring to object $dsc_hash
6306 Your git tree does not have that object. Try `git fetch' from a
6307 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6310 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6312 progress "Not fast forward, forced update.";
6314 fail "Not fast forward to $dsc_hash";
6317 import_dsc_result $dstbranch, $dsc_hash,
6318 "dgit import-dsc (Dgit): $info",
6319 "updated git ref $dstbranch";
6324 Branch $dstbranch already exists
6325 Specify ..$specbranch for a pseudo-merge, binding in existing history
6326 Specify +$specbranch to overwrite, discarding existing history
6328 if $oldhash && !$force;
6330 my @dfi = dsc_files_info();
6331 foreach my $fi (@dfi) {
6332 my $f = $fi->{Filename};
6336 fail "lstat $here works but stat gives $! !";
6338 fail "stat $here: $!" unless $! == ENOENT;
6340 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6342 } elsif ($dscfn =~ m#^/#) {
6345 fail "cannot import $dscfn which seems to be inside working tree!";
6347 $there =~ s#/+[^/]+$## or
6348 fail "import $dscfn requires ../$f, but it does not exist";
6350 my $test = $there =~ m{^/} ? $there : "../$there";
6351 stat $test or fail "import $dscfn requires $test, but: $!";
6352 symlink $there, $here or fail "symlink $there to $here: $!";
6353 progress "made symlink $here -> $there";
6354 # print STDERR Dumper($fi);
6356 my @mergeinputs = generate_commits_from_dsc();
6357 die unless @mergeinputs == 1;
6359 my $newhash = $mergeinputs[0]{Commit};
6363 progress "Import, forced update - synthetic orphan git history.";
6364 } elsif ($force < 0) {
6365 progress "Import, merging.";
6366 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6367 my $version = getfield $dsc, 'Version';
6368 my $clogp = commit_getclogp $newhash;
6369 my $authline = clogp_authline $clogp;
6370 $newhash = make_commit_text <<END;
6377 Merge $package ($version) import into $dstbranch
6380 die; # caught earlier
6384 import_dsc_result $dstbranch, $newhash,
6385 "dgit import-dsc: $info",
6386 "results are in in git ref $dstbranch";
6389 sub pre_archive_api_query () {
6390 not_necessarily_a_tree();
6392 sub cmd_archive_api_query {
6393 badusage "need only 1 subpath argument" unless @ARGV==1;
6394 my ($subpath) = @ARGV;
6395 my @cmd = archive_api_query_cmd($subpath);
6398 exec @cmd or fail "exec curl: $!\n";
6401 sub repos_server_url () {
6402 $package = '_dgit-repos-server';
6403 local $access_forpush = 1;
6404 local $isuite = 'DGIT-REPOS-SERVER';
6405 my $url = access_giturl();
6408 sub pre_clone_dgit_repos_server () {
6409 not_necessarily_a_tree();
6411 sub cmd_clone_dgit_repos_server {
6412 badusage "need destination argument" unless @ARGV==1;
6413 my ($destdir) = @ARGV;
6414 my $url = repos_server_url();
6415 my @cmd = (@git, qw(clone), $url, $destdir);
6417 exec @cmd or fail "exec git clone: $!\n";
6420 sub pre_print_dgit_repos_server_source_url () {
6421 not_necessarily_a_tree();
6423 sub cmd_print_dgit_repos_server_source_url {
6424 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6426 my $url = repos_server_url();
6427 print $url, "\n" or die $!;
6430 sub pre_print_dpkg_source_ignores {
6431 not_necessarily_a_tree();
6433 sub cmd_print_dpkg_source_ignores {
6434 badusage "no arguments allowed to dgit print-dpkg-source-ignores"
6436 print "@dpkg_source_ignores\n" or die $!;
6439 sub cmd_setup_mergechangelogs {
6440 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6441 local $isuite = 'DGIT-SETUP-TREE';
6442 setup_mergechangelogs(1);
6445 sub cmd_setup_useremail {
6446 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6447 local $isuite = 'DGIT-SETUP-TREE';
6451 sub cmd_setup_gitattributes {
6452 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6453 local $isuite = 'DGIT-SETUP-TREE';
6457 sub cmd_setup_new_tree {
6458 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6459 local $isuite = 'DGIT-SETUP-TREE';
6463 #---------- argument parsing and main program ----------
6466 print "dgit version $our_version\n" or die $!;
6470 our (%valopts_long, %valopts_short);
6471 our (%funcopts_long);
6473 our (@modeopt_cfgs);
6475 sub defvalopt ($$$$) {
6476 my ($long,$short,$val_re,$how) = @_;
6477 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6478 $valopts_long{$long} = $oi;
6479 $valopts_short{$short} = $oi;
6480 # $how subref should:
6481 # do whatever assignemnt or thing it likes with $_[0]
6482 # if the option should not be passed on to remote, @rvalopts=()
6483 # or $how can be a scalar ref, meaning simply assign the value
6486 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6487 defvalopt '--distro', '-d', '.+', \$idistro;
6488 defvalopt '', '-k', '.+', \$keyid;
6489 defvalopt '--existing-package','', '.*', \$existing_package;
6490 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6491 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6492 defvalopt '--package', '-p', $package_re, \$package;
6493 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6495 defvalopt '', '-C', '.+', sub {
6496 ($changesfile) = (@_);
6497 if ($changesfile =~ s#^(.*)/##) {
6498 $buildproductsdir = $1;
6502 defvalopt '--initiator-tempdir','','.*', sub {
6503 ($initiator_tempdir) = (@_);
6504 $initiator_tempdir =~ m#^/# or
6505 badusage "--initiator-tempdir must be used specify an".
6506 " absolute, not relative, directory."
6509 sub defoptmodes ($@) {
6510 my ($varref, $cfgkey, $default, %optmap) = @_;
6512 while (my ($opt,$val) = each %optmap) {
6513 $funcopts_long{$opt} = sub { $$varref = $val; };
6514 $permit{$val} = $val;
6516 push @modeopt_cfgs, {
6519 Default => $default,
6524 defoptmodes \$dodep14tag, qw( dep14tag want
6527 --always-dep14tag always );
6532 if (defined $ENV{'DGIT_SSH'}) {
6533 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6534 } elsif (defined $ENV{'GIT_SSH'}) {
6535 @ssh = ($ENV{'GIT_SSH'});
6543 if (!defined $val) {
6544 badusage "$what needs a value" unless @ARGV;
6546 push @rvalopts, $val;
6548 badusage "bad value \`$val' for $what" unless
6549 $val =~ m/^$oi->{Re}$(?!\n)/s;
6550 my $how = $oi->{How};
6551 if (ref($how) eq 'SCALAR') {
6556 push @ropts, @rvalopts;
6560 last unless $ARGV[0] =~ m/^-/;
6564 if (m/^--dry-run$/) {
6567 } elsif (m/^--damp-run$/) {
6570 } elsif (m/^--no-sign$/) {
6573 } elsif (m/^--help$/) {
6575 } elsif (m/^--version$/) {
6577 } elsif (m/^--new$/) {
6580 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6581 ($om = $opts_opt_map{$1}) &&
6585 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6586 !$opts_opt_cmdonly{$1} &&
6587 ($om = $opts_opt_map{$1})) {
6590 } elsif (m/^--(gbp|dpm)$/s) {
6591 push @ropts, "--quilt=$1";
6593 } elsif (m/^--ignore-dirty$/s) {
6596 } elsif (m/^--no-quilt-fixup$/s) {
6598 $quilt_mode = 'nocheck';
6599 } elsif (m/^--no-rm-on-error$/s) {
6602 } elsif (m/^--no-chase-dsc-distro$/s) {
6604 $chase_dsc_distro = 0;
6605 } elsif (m/^--overwrite$/s) {
6607 $overwrite_version = '';
6608 } elsif (m/^--overwrite=(.+)$/s) {
6610 $overwrite_version = $1;
6611 } elsif (m/^--delayed=(\d+)$/s) {
6614 } elsif (m/^--dgit-view-save=(.+)$/s) {
6616 $split_brain_save = $1;
6617 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6618 } elsif (m/^--(no-)?rm-old-changes$/s) {
6621 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6623 push @deliberatelies, $&;
6624 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6628 } elsif (m/^--force-/) {
6630 "$us: warning: ignoring unknown force option $_\n";
6632 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6633 # undocumented, for testing
6635 $tagformat_want = [ $1, 'command line', 1 ];
6636 # 1 menas overrides distro configuration
6637 } elsif (m/^--always-split-source-build$/s) {
6638 # undocumented, for testing
6640 $need_split_build_invocation = 1;
6641 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6642 # undocumented, for testing
6644 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6645 # ^ it's supposed to be an array ref
6646 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6647 $val = $2 ? $' : undef; #';
6648 $valopt->($oi->{Long});
6649 } elsif ($funcopts_long{$_}) {
6651 $funcopts_long{$_}();
6653 badusage "unknown long option \`$_'";
6660 } elsif (s/^-L/-/) {
6663 } elsif (s/^-h/-/) {
6665 } elsif (s/^-D/-/) {
6669 } elsif (s/^-N/-/) {
6674 push @changesopts, $_;
6676 } elsif (s/^-wn$//s) {
6678 $cleanmode = 'none';
6679 } elsif (s/^-wg$//s) {
6682 } elsif (s/^-wgf$//s) {
6684 $cleanmode = 'git-ff';
6685 } elsif (s/^-wd$//s) {
6687 $cleanmode = 'dpkg-source';
6688 } elsif (s/^-wdd$//s) {
6690 $cleanmode = 'dpkg-source-d';
6691 } elsif (s/^-wc$//s) {
6693 $cleanmode = 'check';
6694 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6695 push @git, '-c', $&;
6696 $gitcfgs{cmdline}{$1} = [ $2 ];
6697 } elsif (s/^-c([^=]+)$//s) {
6698 push @git, '-c', $&;
6699 $gitcfgs{cmdline}{$1} = [ 'true' ];
6700 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6702 $val = undef unless length $val;
6703 $valopt->($oi->{Short});
6706 badusage "unknown short option \`$_'";
6713 sub check_env_sanity () {
6714 my $blocked = new POSIX::SigSet;
6715 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6718 foreach my $name (qw(PIPE CHLD)) {
6719 my $signame = "SIG$name";
6720 my $signum = eval "POSIX::$signame" // die;
6721 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6722 die "$signame is set to something other than SIG_DFL\n";
6723 $blocked->ismember($signum) and
6724 die "$signame is blocked\n";
6730 On entry to dgit, $@
6731 This is a bug produced by something in in your execution environment.
6737 sub parseopts_late_defaults () {
6738 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6739 if defined $idistro;
6740 $isuite //= cfg('dgit.default.default-suite');
6742 foreach my $k (keys %opts_opt_map) {
6743 my $om = $opts_opt_map{$k};
6745 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6747 badcfg "cannot set command for $k"
6748 unless length $om->[0];
6752 foreach my $c (access_cfg_cfgs("opts-$k")) {
6754 map { $_ ? @$_ : () }
6755 map { $gitcfgs{$_}{$c} }
6756 reverse @gitcfgsources;
6757 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6758 "\n" if $debuglevel >= 4;
6760 badcfg "cannot configure options for $k"
6761 if $opts_opt_cmdonly{$k};
6762 my $insertpos = $opts_cfg_insertpos{$k};
6763 @$om = ( @$om[0..$insertpos-1],
6765 @$om[$insertpos..$#$om] );
6769 if (!defined $rmchanges) {
6770 local $access_forpush;
6771 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6774 if (!defined $quilt_mode) {
6775 local $access_forpush;
6776 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6777 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6779 $quilt_mode =~ m/^($quilt_modes_re)$/
6780 or badcfg "unknown quilt-mode \`$quilt_mode'";
6784 foreach my $moc (@modeopt_cfgs) {
6785 local $access_forpush;
6786 my $vr = $moc->{Var};
6787 next if defined $$vr;
6788 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6789 my $v = $moc->{Vals}{$$vr};
6790 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6794 $need_split_build_invocation ||= quiltmode_splitbrain();
6796 if (!defined $cleanmode) {
6797 local $access_forpush;
6798 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6799 $cleanmode //= 'dpkg-source';
6801 badcfg "unknown clean-mode \`$cleanmode'" unless
6802 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6806 if ($ENV{$fakeeditorenv}) {
6808 quilt_fixup_editor();
6814 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6815 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6816 if $dryrun_level == 1;
6818 print STDERR $helpmsg or die $!;
6821 $cmd = $subcommand = shift @ARGV;
6824 my $pre_fn = ${*::}{"pre_$cmd"};
6825 $pre_fn->() if $pre_fn;
6827 record_maindir if $invoked_in_git_tree;
6830 my $fn = ${*::}{"cmd_$cmd"};
6831 $fn or badusage "unknown operation $cmd";