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/>.
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
56 our $dryrun_level = 0;
58 our $buildproductsdir = '..';
64 our $existing_package = 'dpkg';
66 our $changes_since_version;
68 our $overwrite_version; # undef: not specified; '': check changelog
70 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
72 our $split_brain_save;
73 our $we_are_responder;
74 our $we_are_initiator;
75 our $initiator_tempdir;
76 our $patches_applied_dirtily = 00;
80 our $chase_dsc_distro=1;
82 our %forceopts = map { $_=>0 }
83 qw(unrepresentable unsupported-source-format
84 dsc-changes-mismatch changes-origs-exactly
85 import-gitapply-absurd
86 import-gitapply-no-absurd
87 import-dsc-with-dgit-field);
89 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
91 our $suite_re = '[-+.0-9a-z]+';
92 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
93 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
94 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
95 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
97 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
98 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our $rewritemap = 'dgit-rewrite/map';
101 our (@git) = qw(git);
102 our (@dget) = qw(dget);
103 our (@curl) = qw(curl);
104 our (@dput) = qw(dput);
105 our (@debsign) = qw(debsign);
106 our (@gpg) = qw(gpg);
107 our (@sbuild) = qw(sbuild);
109 our (@dgit) = qw(dgit);
110 our (@aptget) = qw(apt-get);
111 our (@aptcache) = qw(apt-cache);
112 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
113 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
114 our (@dpkggenchanges) = qw(dpkg-genchanges);
115 our (@mergechanges) = qw(mergechanges -f);
116 our (@gbp_build) = ('');
117 our (@gbp_pq) = ('gbp pq');
118 our (@changesopts) = ('');
120 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
123 'debsign' => \@debsign,
125 'sbuild' => \@sbuild,
129 'apt-get' => \@aptget,
130 'apt-cache' => \@aptcache,
131 'dpkg-source' => \@dpkgsource,
132 'dpkg-buildpackage' => \@dpkgbuildpackage,
133 'dpkg-genchanges' => \@dpkggenchanges,
134 'gbp-build' => \@gbp_build,
135 'gbp-pq' => \@gbp_pq,
136 'ch' => \@changesopts,
137 'mergechanges' => \@mergechanges);
139 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
140 our %opts_cfg_insertpos = map {
142 scalar @{ $opts_opt_map{$_} }
143 } keys %opts_opt_map;
145 sub parseopts_late_defaults();
146 sub setup_gitattrs(;$);
147 sub check_gitattrs($$);
153 our $supplementary_message = '';
154 our $need_split_build_invocation = 0;
155 our $split_brain = 0;
159 return unless forkcheck_mainprocess();
160 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
163 our $remotename = 'dgit';
164 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
168 if (!defined $absurdity) {
170 $absurdity =~ s{/[^/]+$}{/absurd} or die;
174 my ($v,$distro) = @_;
175 return $tagformatfn->($v, $distro);
178 sub debiantag_maintview ($$) {
179 my ($v,$distro) = @_;
180 return "$distro/".dep14_version_mangle $v;
183 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
185 sub lbranch () { return "$branchprefix/$csuite"; }
186 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
187 sub lref () { return "refs/heads/".lbranch(); }
188 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
189 sub rrref () { return server_ref($csuite); }
199 return "${package}_".(stripepoch $vsn).$sfx
204 return srcfn($vsn,".dsc");
207 sub changespat ($;$) {
208 my ($vsn, $arch) = @_;
209 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
212 sub upstreamversion ($) {
224 return unless forkcheck_mainprocess();
225 foreach my $f (@end) {
227 print STDERR "$us: cleanup: $@" if length $@;
231 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
233 sub forceable_fail ($$) {
234 my ($forceoptsl, $msg) = @_;
235 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
236 print STDERR "warning: overriding problem due to --force:\n". $msg;
240 my ($forceoptsl) = @_;
241 my @got = grep { $forceopts{$_} } @$forceoptsl;
242 return 0 unless @got;
244 "warning: skipping checks or functionality due to --force-$got[0]\n";
247 sub no_such_package () {
248 print STDERR "$us: package $package does not exist in suite $isuite\n";
254 printdebug "CD $newdir\n";
255 chdir $newdir or confess "chdir: $newdir: $!";
258 sub deliberately ($) {
260 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
263 sub deliberately_not_fast_forward () {
264 foreach (qw(not-fast-forward fresh-repo)) {
265 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
269 sub quiltmode_splitbrain () {
270 $quilt_mode =~ m/gbp|dpm|unapplied/;
273 sub opts_opt_multi_cmd {
275 push @cmd, split /\s+/, shift @_;
281 return opts_opt_multi_cmd @gbp_pq;
284 #---------- remote protocol support, common ----------
286 # remote push initiator/responder protocol:
287 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
288 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
289 # < dgit-remote-push-ready <actual-proto-vsn>
296 # > supplementary-message NBYTES # $protovsn >= 3
301 # > file parsed-changelog
302 # [indicates that output of dpkg-parsechangelog follows]
303 # > data-block NBYTES
304 # > [NBYTES bytes of data (no newline)]
305 # [maybe some more blocks]
314 # > param head DGIT-VIEW-HEAD
315 # > param csuite SUITE
316 # > param tagformat old|new
317 # > param maint-view MAINT-VIEW-HEAD
319 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
320 # # goes into tag, for replay prevention
323 # [indicates that signed tag is wanted]
324 # < data-block NBYTES
325 # < [NBYTES bytes of data (no newline)]
326 # [maybe some more blocks]
330 # > want signed-dsc-changes
331 # < data-block NBYTES [transfer of signed dsc]
333 # < data-block NBYTES [transfer of signed changes]
341 sub i_child_report () {
342 # Sees if our child has died, and reap it if so. Returns a string
343 # describing how it died if it failed, or undef otherwise.
344 return undef unless $i_child_pid;
345 my $got = waitpid $i_child_pid, WNOHANG;
346 return undef if $got <= 0;
347 die unless $got == $i_child_pid;
348 $i_child_pid = undef;
349 return undef unless $?;
350 return "build host child ".waitstatusmsg();
355 fail "connection lost: $!" if $fh->error;
356 fail "protocol violation; $m not expected";
359 sub badproto_badread ($$) {
361 fail "connection lost: $!" if $!;
362 my $report = i_child_report();
363 fail $report if defined $report;
364 badproto $fh, "eof (reading $wh)";
367 sub protocol_expect (&$) {
368 my ($match, $fh) = @_;
371 defined && chomp or badproto_badread $fh, "protocol message";
379 badproto $fh, "\`$_'";
382 sub protocol_send_file ($$) {
383 my ($fh, $ourfn) = @_;
384 open PF, "<", $ourfn or die "$ourfn: $!";
387 my $got = read PF, $d, 65536;
388 die "$ourfn: $!" unless defined $got;
390 print $fh "data-block ".length($d)."\n" or die $!;
391 print $fh $d or die $!;
393 PF->error and die "$ourfn $!";
394 print $fh "data-end\n" or die $!;
398 sub protocol_read_bytes ($$) {
399 my ($fh, $nbytes) = @_;
400 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
402 my $got = read $fh, $d, $nbytes;
403 $got==$nbytes or badproto_badread $fh, "data block";
407 sub protocol_receive_file ($$) {
408 my ($fh, $ourfn) = @_;
409 printdebug "() $ourfn\n";
410 open PF, ">", $ourfn or die "$ourfn: $!";
412 my ($y,$l) = protocol_expect {
413 m/^data-block (.*)$/ ? (1,$1) :
414 m/^data-end$/ ? (0,) :
418 my $d = protocol_read_bytes $fh, $l;
419 print PF $d or die $!;
424 #---------- remote protocol support, responder ----------
426 sub responder_send_command ($) {
428 return unless $we_are_responder;
429 # called even without $we_are_responder
430 printdebug ">> $command\n";
431 print PO $command, "\n" or die $!;
434 sub responder_send_file ($$) {
435 my ($keyword, $ourfn) = @_;
436 return unless $we_are_responder;
437 printdebug "]] $keyword $ourfn\n";
438 responder_send_command "file $keyword";
439 protocol_send_file \*PO, $ourfn;
442 sub responder_receive_files ($@) {
443 my ($keyword, @ourfns) = @_;
444 die unless $we_are_responder;
445 printdebug "[[ $keyword @ourfns\n";
446 responder_send_command "want $keyword";
447 foreach my $fn (@ourfns) {
448 protocol_receive_file \*PI, $fn;
451 protocol_expect { m/^files-end$/ } \*PI;
454 #---------- remote protocol support, initiator ----------
456 sub initiator_expect (&) {
458 protocol_expect { &$match } \*RO;
461 #---------- end remote code ----------
464 if ($we_are_responder) {
466 responder_send_command "progress ".length($m) or die $!;
467 print PO $m or die $!;
477 $ua = LWP::UserAgent->new();
481 progress "downloading $what...";
482 my $r = $ua->get(@_) or die $!;
483 return undef if $r->code == 404;
484 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
485 return $r->decoded_content(charset => 'none');
488 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
493 failedcmd @_ if system @_;
496 sub act_local () { return $dryrun_level <= 1; }
497 sub act_scary () { return !$dryrun_level; }
500 if (!$dryrun_level) {
501 progress "$us ok: @_";
503 progress "would be ok: @_ (but dry run only)";
508 printcmd(\*STDERR,$debugprefix."#",@_);
511 sub runcmd_ordryrun {
519 sub runcmd_ordryrun_local {
528 my ($first_shell, @cmd) = @_;
529 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
532 our $helpmsg = <<END;
534 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
535 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
536 dgit [dgit-opts] build [dpkg-buildpackage-opts]
537 dgit [dgit-opts] sbuild [sbuild-opts]
538 dgit [dgit-opts] push [dgit-opts] [suite]
539 dgit [dgit-opts] rpush build-host:build-dir ...
540 important dgit options:
541 -k<keyid> sign tag and package with <keyid> instead of default
542 --dry-run -n do not change anything, but go through the motions
543 --damp-run -L like --dry-run but make local changes, without signing
544 --new -N allow introducing a new package
545 --debug -D increase debug level
546 -c<name>=<value> set git config option (used directly by dgit too)
549 our $later_warning_msg = <<END;
550 Perhaps the upload is stuck in incoming. Using the version from git.
554 print STDERR "$us: @_\n", $helpmsg or die $!;
559 @ARGV or badusage "too few arguments";
560 return scalar shift @ARGV;
564 print $helpmsg or die $!;
568 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
570 our %defcfg = ('dgit.default.distro' => 'debian',
571 'dgit.default.default-suite' => 'unstable',
572 'dgit.default.old-dsc-distro' => 'debian',
573 'dgit-suite.*-security.distro' => 'debian-security',
574 'dgit.default.username' => '',
575 'dgit.default.archive-query-default-component' => 'main',
576 'dgit.default.ssh' => 'ssh',
577 'dgit.default.archive-query' => 'madison:',
578 'dgit.default.sshpsql-dbname' => 'service=projectb',
579 'dgit.default.aptget-components' => 'main',
580 'dgit.default.dgit-tag-format' => 'new,old,maint',
581 'dgit.dsc-url-proto-ok.http' => 'true',
582 'dgit.dsc-url-proto-ok.https' => 'true',
583 'dgit.dsc-url-proto-ok.git' => 'true',
584 'dgit.default.dsc-url-proto-ok' => 'false',
585 # old means "repo server accepts pushes with old dgit tags"
586 # new means "repo server accepts pushes with new dgit tags"
587 # maint means "repo server accepts split brain pushes"
588 # hist means "repo server may have old pushes without new tag"
589 # ("hist" is implied by "old")
590 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
591 'dgit-distro.debian.git-check' => 'url',
592 'dgit-distro.debian.git-check-suffix' => '/info/refs',
593 'dgit-distro.debian.new-private-pushers' => 't',
594 'dgit-distro.debian/push.git-url' => '',
595 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
596 'dgit-distro.debian/push.git-user-force' => 'dgit',
597 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
598 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
599 'dgit-distro.debian/push.git-create' => 'true',
600 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
601 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
602 # 'dgit-distro.debian.archive-query-tls-key',
603 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
604 # ^ this does not work because curl is broken nowadays
605 # Fixing #790093 properly will involve providing providing the key
606 # in some pacagke and maybe updating these paths.
608 # 'dgit-distro.debian.archive-query-tls-curl-args',
609 # '--ca-path=/etc/ssl/ca-debian',
610 # ^ this is a workaround but works (only) on DSA-administered machines
611 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
612 'dgit-distro.debian.git-url-suffix' => '',
613 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
614 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
615 'dgit-distro.debian-security.archive-query' => 'aptget:',
616 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
617 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
618 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
619 'dgit-distro.debian-security.nominal-distro' => 'debian',
620 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
621 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
622 'dgit-distro.ubuntu.git-check' => 'false',
623 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
624 'dgit-distro.test-dummy.ssh' => "$td/ssh",
625 'dgit-distro.test-dummy.username' => "alice",
626 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
627 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
628 'dgit-distro.test-dummy.git-url' => "$td/git",
629 'dgit-distro.test-dummy.git-host' => "git",
630 'dgit-distro.test-dummy.git-path' => "$td/git",
631 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
632 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
633 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
634 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
638 our @gitcfgsources = qw(cmdline local global system);
640 sub git_slurp_config () {
641 local ($debuglevel) = $debuglevel-2;
644 # This algoritm is a bit subtle, but this is needed so that for
645 # options which we want to be single-valued, we allow the
646 # different config sources to override properly. See #835858.
647 foreach my $src (@gitcfgsources) {
648 next if $src eq 'cmdline';
649 # we do this ourselves since git doesn't handle it
651 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
654 open GITS, "-|", @cmd or die $!;
657 printdebug "=> ", (messagequote $_), "\n";
659 push @{ $gitcfgs{$src}{$`} }, $'; #';
663 or ($!==0 && $?==256)
668 sub git_get_config ($) {
670 foreach my $src (@gitcfgsources) {
671 my $l = $gitcfgs{$src}{$c};
672 croak "$l $c" if $l && !ref $l;
673 printdebug"C $c ".(defined $l ?
674 join " ", map { messagequote "'$_'" } @$l :
678 @$l==1 or badcfg "multiple values for $c".
679 " (in $src git config)" if @$l > 1;
687 return undef if $c =~ /RETURN-UNDEF/;
688 printdebug "C? $c\n" if $debuglevel >= 5;
689 my $v = git_get_config($c);
690 return $v if defined $v;
691 my $dv = $defcfg{$c};
693 printdebug "CD $c $dv\n" if $debuglevel >= 4;
697 badcfg "need value for one of: @_\n".
698 "$us: distro or suite appears not to be (properly) supported";
701 sub access_basedistro__noalias () {
702 if (defined $idistro) {
705 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
706 return $def if defined $def;
707 foreach my $src (@gitcfgsources, 'internal') {
708 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
710 foreach my $k (keys %$kl) {
711 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
713 next unless match_glob $dpat, $isuite;
717 return cfg("dgit.default.distro");
721 sub access_basedistro () {
722 my $noalias = access_basedistro__noalias();
723 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
724 return $canon // $noalias;
727 sub access_nomdistro () {
728 my $base = access_basedistro();
729 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
730 $r =~ m/^$distro_re$/ or badcfg
731 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
735 sub access_quirk () {
736 # returns (quirk name, distro to use instead or undef, quirk-specific info)
737 my $basedistro = access_basedistro();
738 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
740 if (defined $backports_quirk) {
741 my $re = $backports_quirk;
742 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
744 $re =~ s/\%/([-0-9a-z_]+)/
745 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
746 if ($isuite =~ m/^$re$/) {
747 return ('backports',"$basedistro-backports",$1);
750 return ('none',undef);
755 sub parse_cfg_bool ($$$) {
756 my ($what,$def,$v) = @_;
759 $v =~ m/^[ty1]/ ? 1 :
760 $v =~ m/^[fn0]/ ? 0 :
761 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
764 sub access_forpush_config () {
765 my $d = access_basedistro();
769 parse_cfg_bool('new-private-pushers', 0,
770 cfg("dgit-distro.$d.new-private-pushers",
773 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
776 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
777 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
778 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
779 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
782 sub access_forpush () {
783 $access_forpush //= access_forpush_config();
784 return $access_forpush;
788 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
789 badcfg "pushing but distro is configured readonly"
790 if access_forpush_config() eq '0';
792 $supplementary_message = <<'END' unless $we_are_responder;
793 Push failed, before we got started.
794 You can retry the push, after fixing the problem, if you like.
796 parseopts_late_defaults();
800 parseopts_late_defaults();
803 sub supplementary_message ($) {
805 if (!$we_are_responder) {
806 $supplementary_message = $msg;
808 } elsif ($protovsn >= 3) {
809 responder_send_command "supplementary-message ".length($msg)
811 print PO $msg or die $!;
815 sub access_distros () {
816 # Returns list of distros to try, in order
819 # 0. `instead of' distro name(s) we have been pointed to
820 # 1. the access_quirk distro, if any
821 # 2a. the user's specified distro, or failing that } basedistro
822 # 2b. the distro calculated from the suite }
823 my @l = access_basedistro();
825 my (undef,$quirkdistro) = access_quirk();
826 unshift @l, $quirkdistro;
827 unshift @l, $instead_distro;
828 @l = grep { defined } @l;
830 push @l, access_nomdistro();
832 if (access_forpush()) {
833 @l = map { ("$_/push", $_) } @l;
838 sub access_cfg_cfgs (@) {
841 # The nesting of these loops determines the search order. We put
842 # the key loop on the outside so that we search all the distros
843 # for each key, before going on to the next key. That means that
844 # if access_cfg is called with a more specific, and then a less
845 # specific, key, an earlier distro can override the less specific
846 # without necessarily overriding any more specific keys. (If the
847 # distro wants to override the more specific keys it can simply do
848 # so; whereas if we did the loop the other way around, it would be
849 # impossible to for an earlier distro to override a less specific
850 # key but not the more specific ones without restating the unknown
851 # values of the more specific keys.
854 # We have to deal with RETURN-UNDEF specially, so that we don't
855 # terminate the search prematurely.
857 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
860 foreach my $d (access_distros()) {
861 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
863 push @cfgs, map { "dgit.default.$_" } @realkeys;
870 my (@cfgs) = access_cfg_cfgs(@keys);
871 my $value = cfg(@cfgs);
875 sub access_cfg_bool ($$) {
876 my ($def, @keys) = @_;
877 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
880 sub string_to_ssh ($) {
882 if ($spec =~ m/\s/) {
883 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
889 sub access_cfg_ssh () {
890 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
891 if (!defined $gitssh) {
894 return string_to_ssh $gitssh;
898 sub access_runeinfo ($) {
900 return ": dgit ".access_basedistro()." $info ;";
903 sub access_someuserhost ($) {
905 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
906 defined($user) && length($user) or
907 $user = access_cfg("$some-user",'username');
908 my $host = access_cfg("$some-host");
909 return length($user) ? "$user\@$host" : $host;
912 sub access_gituserhost () {
913 return access_someuserhost('git');
916 sub access_giturl (;$) {
918 my $url = access_cfg('git-url','RETURN-UNDEF');
921 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
922 return undef unless defined $proto;
925 access_gituserhost().
926 access_cfg('git-path');
928 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
931 return "$url/$package$suffix";
934 sub parsecontrolfh ($$;$) {
935 my ($fh, $desc, $allowsigned) = @_;
936 our $dpkgcontrolhash_noissigned;
939 my %opts = ('name' => $desc);
940 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
941 $c = Dpkg::Control::Hash->new(%opts);
942 $c->parse($fh,$desc) or die "parsing of $desc failed";
943 last if $allowsigned;
944 last if $dpkgcontrolhash_noissigned;
945 my $issigned= $c->get_option('is_pgp_signed');
946 if (!defined $issigned) {
947 $dpkgcontrolhash_noissigned= 1;
948 seek $fh, 0,0 or die "seek $desc: $!";
949 } elsif ($issigned) {
950 fail "control file $desc is (already) PGP-signed. ".
951 " Note that dgit push needs to modify the .dsc and then".
952 " do the signature itself";
961 my ($file, $desc, $allowsigned) = @_;
962 my $fh = new IO::Handle;
963 open $fh, '<', $file or die "$file: $!";
964 my $c = parsecontrolfh($fh,$desc,$allowsigned);
965 $fh->error and die $!;
971 my ($dctrl,$field) = @_;
972 my $v = $dctrl->{$field};
973 return $v if defined $v;
974 fail "missing field $field in ".$dctrl->get_option('name');
978 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
979 my $p = new IO::Handle;
980 my @cmd = (qw(dpkg-parsechangelog), @_);
981 open $p, '-|', @cmd or die $!;
983 $?=0; $!=0; close $p or failedcmd @cmd;
987 sub commit_getclogp ($) {
988 # Returns the parsed changelog hashref for a particular commit
990 our %commit_getclogp_memo;
991 my $memo = $commit_getclogp_memo{$objid};
992 return $memo if $memo;
994 my $mclog = ".git/dgit/clog-$objid";
995 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
996 "$objid:debian/changelog";
997 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1000 sub must_getcwd () {
1002 defined $d or fail "getcwd failed: $!";
1006 sub parse_dscdata () {
1007 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1008 printdebug Dumper($dscdata) if $debuglevel>1;
1009 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1010 printdebug Dumper($dsc) if $debuglevel>1;
1015 sub archive_query ($;@) {
1016 my ($method) = shift @_;
1017 fail "this operation does not support multiple comma-separated suites"
1019 my $query = access_cfg('archive-query','RETURN-UNDEF');
1020 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1023 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1026 sub archive_query_prepend_mirror {
1027 my $m = access_cfg('mirror');
1028 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1031 sub pool_dsc_subpath ($$) {
1032 my ($vsn,$component) = @_; # $package is implict arg
1033 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1034 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1037 sub cfg_apply_map ($$$) {
1038 my ($varref, $what, $mapspec) = @_;
1039 return unless $mapspec;
1041 printdebug "config $what EVAL{ $mapspec; }\n";
1043 eval "package Dgit::Config; $mapspec;";
1048 #---------- `ftpmasterapi' archive query method (nascent) ----------
1050 sub archive_api_query_cmd ($) {
1052 my @cmd = (@curl, qw(-sS));
1053 my $url = access_cfg('archive-query-url');
1054 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1056 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1057 foreach my $key (split /\:/, $keys) {
1058 $key =~ s/\%HOST\%/$host/g;
1060 fail "for $url: stat $key: $!" unless $!==ENOENT;
1063 fail "config requested specific TLS key but do not know".
1064 " how to get curl to use exactly that EE key ($key)";
1065 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1066 # # Sadly the above line does not work because of changes
1067 # # to gnutls. The real fix for #790093 may involve
1068 # # new curl options.
1071 # Fixing #790093 properly will involve providing a value
1072 # for this on clients.
1073 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1074 push @cmd, split / /, $kargs if defined $kargs;
1076 push @cmd, $url.$subpath;
1080 sub api_query ($$;$) {
1082 my ($data, $subpath, $ok404) = @_;
1083 badcfg "ftpmasterapi archive query method takes no data part"
1085 my @cmd = archive_api_query_cmd($subpath);
1086 my $url = $cmd[$#cmd];
1087 push @cmd, qw(-w %{http_code});
1088 my $json = cmdoutput @cmd;
1089 unless ($json =~ s/\d+\d+\d$//) {
1090 failedcmd_report_cmd undef, @cmd;
1091 fail "curl failed to print 3-digit HTTP code";
1094 return undef if $code eq '404' && $ok404;
1095 fail "fetch of $url gave HTTP code $code"
1096 unless $url =~ m#^file://# or $code =~ m/^2/;
1097 return decode_json($json);
1100 sub canonicalise_suite_ftpmasterapi {
1101 my ($proto,$data) = @_;
1102 my $suites = api_query($data, 'suites');
1104 foreach my $entry (@$suites) {
1106 my $v = $entry->{$_};
1107 defined $v && $v eq $isuite;
1108 } qw(codename name);
1109 push @matched, $entry;
1111 fail "unknown suite $isuite" unless @matched;
1114 @matched==1 or die "multiple matches for suite $isuite\n";
1115 $cn = "$matched[0]{codename}";
1116 defined $cn or die "suite $isuite info has no codename\n";
1117 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1119 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1124 sub archive_query_ftpmasterapi {
1125 my ($proto,$data) = @_;
1126 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1128 my $digester = Digest::SHA->new(256);
1129 foreach my $entry (@$info) {
1131 my $vsn = "$entry->{version}";
1132 my ($ok,$msg) = version_check $vsn;
1133 die "bad version: $msg\n" unless $ok;
1134 my $component = "$entry->{component}";
1135 $component =~ m/^$component_re$/ or die "bad component";
1136 my $filename = "$entry->{filename}";
1137 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1138 or die "bad filename";
1139 my $sha256sum = "$entry->{sha256sum}";
1140 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1141 push @rows, [ $vsn, "/pool/$component/$filename",
1142 $digester, $sha256sum ];
1144 die "bad ftpmaster api response: $@\n".Dumper($entry)
1147 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1148 return archive_query_prepend_mirror @rows;
1151 sub file_in_archive_ftpmasterapi {
1152 my ($proto,$data,$filename) = @_;
1153 my $pat = $filename;
1156 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1157 my $info = api_query($data, "file_in_archive/$pat", 1);
1160 #---------- `aptget' archive query method ----------
1163 our $aptget_releasefile;
1164 our $aptget_configpath;
1166 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1167 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1169 sub aptget_cache_clean {
1170 runcmd_ordryrun_local qw(sh -ec),
1171 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1175 sub aptget_lock_acquire () {
1176 my $lockfile = "$aptget_base/lock";
1177 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1178 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1181 sub aptget_prep ($) {
1183 return if defined $aptget_base;
1185 badcfg "aptget archive query method takes no data part"
1188 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1191 ensuredir "$cache/dgit";
1193 access_cfg('aptget-cachekey','RETURN-UNDEF')
1194 // access_nomdistro();
1196 $aptget_base = "$cache/dgit/aptget";
1197 ensuredir $aptget_base;
1199 my $quoted_base = $aptget_base;
1200 die "$quoted_base contains bad chars, cannot continue"
1201 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1203 ensuredir $aptget_base;
1205 aptget_lock_acquire();
1207 aptget_cache_clean();
1209 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1210 my $sourceslist = "source.list#$cachekey";
1212 my $aptsuites = $isuite;
1213 cfg_apply_map(\$aptsuites, 'suite map',
1214 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1216 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1217 printf SRCS "deb-src %s %s %s\n",
1218 access_cfg('mirror'),
1220 access_cfg('aptget-components')
1223 ensuredir "$aptget_base/cache";
1224 ensuredir "$aptget_base/lists";
1226 open CONF, ">", $aptget_configpath or die $!;
1228 Debug::NoLocking "true";
1229 APT::Get::List-Cleanup "false";
1230 #clear APT::Update::Post-Invoke-Success;
1231 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1232 Dir::State::Lists "$quoted_base/lists";
1233 Dir::Etc::preferences "$quoted_base/preferences";
1234 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1235 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1238 foreach my $key (qw(
1241 Dir::Cache::Archives
1242 Dir::Etc::SourceParts
1243 Dir::Etc::preferencesparts
1245 ensuredir "$aptget_base/$key";
1246 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1249 my $oldatime = (time // die $!) - 1;
1250 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1251 next unless stat_exists $oldlist;
1252 my ($mtime) = (stat _)[9];
1253 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1256 runcmd_ordryrun_local aptget_aptget(), qw(update);
1259 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1260 next unless stat_exists $oldlist;
1261 my ($atime) = (stat _)[8];
1262 next if $atime == $oldatime;
1263 push @releasefiles, $oldlist;
1265 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1266 @releasefiles = @inreleasefiles if @inreleasefiles;
1267 die "apt updated wrong number of Release files (@releasefiles), erk"
1268 unless @releasefiles == 1;
1270 ($aptget_releasefile) = @releasefiles;
1273 sub canonicalise_suite_aptget {
1274 my ($proto,$data) = @_;
1277 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1279 foreach my $name (qw(Codename Suite)) {
1280 my $val = $release->{$name};
1282 printdebug "release file $name: $val\n";
1283 $val =~ m/^$suite_re$/o or fail
1284 "Release file ($aptget_releasefile) specifies intolerable $name";
1285 cfg_apply_map(\$val, 'suite rmap',
1286 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1293 sub archive_query_aptget {
1294 my ($proto,$data) = @_;
1297 ensuredir "$aptget_base/source";
1298 foreach my $old (<$aptget_base/source/*.dsc>) {
1299 unlink $old or die "$old: $!";
1302 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1303 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1304 # avoids apt-get source failing with ambiguous error code
1306 runcmd_ordryrun_local
1307 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1308 aptget_aptget(), qw(--download-only --only-source source), $package;
1310 my @dscs = <$aptget_base/source/*.dsc>;
1311 fail "apt-get source did not produce a .dsc" unless @dscs;
1312 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1314 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1317 my $uri = "file://". uri_escape $dscs[0];
1318 $uri =~ s{\%2f}{/}gi;
1319 return [ (getfield $pre_dsc, 'Version'), $uri ];
1322 #---------- `dummyapicat' archive query method ----------
1324 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1325 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1327 sub file_in_archive_dummycatapi ($$$) {
1328 my ($proto,$data,$filename) = @_;
1329 my $mirror = access_cfg('mirror');
1330 $mirror =~ s#^file://#/# or die "$mirror ?";
1332 my @cmd = (qw(sh -ec), '
1334 find -name "$2" -print0 |
1336 ', qw(x), $mirror, $filename);
1337 debugcmd "-|", @cmd;
1338 open FIA, "-|", @cmd or die $!;
1341 printdebug "| $_\n";
1342 m/^(\w+) (\S+)$/ or die "$_ ?";
1343 push @out, { sha256sum => $1, filename => $2 };
1345 close FIA or die failedcmd @cmd;
1349 #---------- `madison' archive query method ----------
1351 sub archive_query_madison {
1352 return archive_query_prepend_mirror
1353 map { [ @$_[0..1] ] } madison_get_parse(@_);
1356 sub madison_get_parse {
1357 my ($proto,$data) = @_;
1358 die unless $proto eq 'madison';
1359 if (!length $data) {
1360 $data= access_cfg('madison-distro','RETURN-UNDEF');
1361 $data //= access_basedistro();
1363 $rmad{$proto,$data,$package} ||= cmdoutput
1364 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1365 my $rmad = $rmad{$proto,$data,$package};
1368 foreach my $l (split /\n/, $rmad) {
1369 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1370 \s*( [^ \t|]+ )\s* \|
1371 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1372 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1373 $1 eq $package or die "$rmad $package ?";
1380 $component = access_cfg('archive-query-default-component');
1382 $5 eq 'source' or die "$rmad ?";
1383 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1385 return sort { -version_compare($a->[0],$b->[0]); } @out;
1388 sub canonicalise_suite_madison {
1389 # madison canonicalises for us
1390 my @r = madison_get_parse(@_);
1392 "unable to canonicalise suite using package $package".
1393 " which does not appear to exist in suite $isuite;".
1394 " --existing-package may help";
1398 sub file_in_archive_madison { return undef; }
1400 #---------- `sshpsql' archive query method ----------
1403 my ($data,$runeinfo,$sql) = @_;
1404 if (!length $data) {
1405 $data= access_someuserhost('sshpsql').':'.
1406 access_cfg('sshpsql-dbname');
1408 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1409 my ($userhost,$dbname) = ($`,$'); #';
1411 my @cmd = (access_cfg_ssh, $userhost,
1412 access_runeinfo("ssh-psql $runeinfo").
1413 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1414 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1416 open P, "-|", @cmd or die $!;
1419 printdebug(">|$_|\n");
1422 $!=0; $?=0; close P or failedcmd @cmd;
1424 my $nrows = pop @rows;
1425 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1426 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1427 @rows = map { [ split /\|/, $_ ] } @rows;
1428 my $ncols = scalar @{ shift @rows };
1429 die if grep { scalar @$_ != $ncols } @rows;
1433 sub sql_injection_check {
1434 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1437 sub archive_query_sshpsql ($$) {
1438 my ($proto,$data) = @_;
1439 sql_injection_check $isuite, $package;
1440 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1441 SELECT source.version, component.name, files.filename, files.sha256sum
1443 JOIN src_associations ON source.id = src_associations.source
1444 JOIN suite ON suite.id = src_associations.suite
1445 JOIN dsc_files ON dsc_files.source = source.id
1446 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1447 JOIN component ON component.id = files_archive_map.component_id
1448 JOIN files ON files.id = dsc_files.file
1449 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1450 AND source.source='$package'
1451 AND files.filename LIKE '%.dsc';
1453 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1454 my $digester = Digest::SHA->new(256);
1456 my ($vsn,$component,$filename,$sha256sum) = @$_;
1457 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1459 return archive_query_prepend_mirror @rows;
1462 sub canonicalise_suite_sshpsql ($$) {
1463 my ($proto,$data) = @_;
1464 sql_injection_check $isuite;
1465 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1466 SELECT suite.codename
1467 FROM suite where suite_name='$isuite' or codename='$isuite';
1469 @rows = map { $_->[0] } @rows;
1470 fail "unknown suite $isuite" unless @rows;
1471 die "ambiguous $isuite: @rows ?" if @rows>1;
1475 sub file_in_archive_sshpsql ($$$) { return undef; }
1477 #---------- `dummycat' archive query method ----------
1479 sub canonicalise_suite_dummycat ($$) {
1480 my ($proto,$data) = @_;
1481 my $dpath = "$data/suite.$isuite";
1482 if (!open C, "<", $dpath) {
1483 $!==ENOENT or die "$dpath: $!";
1484 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1488 chomp or die "$dpath: $!";
1490 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1494 sub archive_query_dummycat ($$) {
1495 my ($proto,$data) = @_;
1496 canonicalise_suite();
1497 my $dpath = "$data/package.$csuite.$package";
1498 if (!open C, "<", $dpath) {
1499 $!==ENOENT or die "$dpath: $!";
1500 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1508 printdebug "dummycat query $csuite $package $dpath | $_\n";
1509 my @row = split /\s+/, $_;
1510 @row==2 or die "$dpath: $_ ?";
1513 C->error and die "$dpath: $!";
1515 return archive_query_prepend_mirror
1516 sort { -version_compare($a->[0],$b->[0]); } @rows;
1519 sub file_in_archive_dummycat () { return undef; }
1521 #---------- tag format handling ----------
1523 sub access_cfg_tagformats () {
1524 split /\,/, access_cfg('dgit-tag-format');
1527 sub access_cfg_tagformats_can_splitbrain () {
1528 my %y = map { $_ => 1 } access_cfg_tagformats;
1529 foreach my $needtf (qw(new maint)) {
1530 next if $y{$needtf};
1536 sub need_tagformat ($$) {
1537 my ($fmt, $why) = @_;
1538 fail "need to use tag format $fmt ($why) but also need".
1539 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1540 " - no way to proceed"
1541 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1542 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1545 sub select_tagformat () {
1547 return if $tagformatfn && !$tagformat_want;
1548 die 'bug' if $tagformatfn && $tagformat_want;
1549 # ... $tagformat_want assigned after previous select_tagformat
1551 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1552 printdebug "select_tagformat supported @supported\n";
1554 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1555 printdebug "select_tagformat specified @$tagformat_want\n";
1557 my ($fmt,$why,$override) = @$tagformat_want;
1559 fail "target distro supports tag formats @supported".
1560 " but have to use $fmt ($why)"
1562 or grep { $_ eq $fmt } @supported;
1564 $tagformat_want = undef;
1566 $tagformatfn = ${*::}{"debiantag_$fmt"};
1568 fail "trying to use unknown tag format \`$fmt' ($why) !"
1569 unless $tagformatfn;
1572 #---------- archive query entrypoints and rest of program ----------
1574 sub canonicalise_suite () {
1575 return if defined $csuite;
1576 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1577 $csuite = archive_query('canonicalise_suite');
1578 if ($isuite ne $csuite) {
1579 progress "canonical suite name for $isuite is $csuite";
1581 progress "canonical suite name is $csuite";
1585 sub get_archive_dsc () {
1586 canonicalise_suite();
1587 my @vsns = archive_query('archive_query');
1588 foreach my $vinfo (@vsns) {
1589 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1590 $dscurl = $vsn_dscurl;
1591 $dscdata = url_get($dscurl);
1593 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1598 $digester->add($dscdata);
1599 my $got = $digester->hexdigest();
1601 fail "$dscurl has hash $got but".
1602 " archive told us to expect $digest";
1605 my $fmt = getfield $dsc, 'Format';
1606 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1607 "unsupported source format $fmt, sorry";
1609 $dsc_checked = !!$digester;
1610 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1614 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1617 sub check_for_git ();
1618 sub check_for_git () {
1620 my $how = access_cfg('git-check');
1621 if ($how eq 'ssh-cmd') {
1623 (access_cfg_ssh, access_gituserhost(),
1624 access_runeinfo("git-check $package").
1625 " set -e; cd ".access_cfg('git-path').";".
1626 " if test -d $package.git; then echo 1; else echo 0; fi");
1627 my $r= cmdoutput @cmd;
1628 if (defined $r and $r =~ m/^divert (\w+)$/) {
1630 my ($usedistro,) = access_distros();
1631 # NB that if we are pushing, $usedistro will be $distro/push
1632 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1633 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1634 progress "diverting to $divert (using config for $instead_distro)";
1635 return check_for_git();
1637 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1639 } elsif ($how eq 'url') {
1640 my $prefix = access_cfg('git-check-url','git-url');
1641 my $suffix = access_cfg('git-check-suffix','git-suffix',
1642 'RETURN-UNDEF') // '.git';
1643 my $url = "$prefix/$package$suffix";
1644 my @cmd = (@curl, qw(-sS -I), $url);
1645 my $result = cmdoutput @cmd;
1646 $result =~ s/^\S+ 200 .*\n\r?\n//;
1647 # curl -sS -I with https_proxy prints
1648 # HTTP/1.0 200 Connection established
1649 $result =~ m/^\S+ (404|200) /s or
1650 fail "unexpected results from git check query - ".
1651 Dumper($prefix, $result);
1653 if ($code eq '404') {
1655 } elsif ($code eq '200') {
1660 } elsif ($how eq 'true') {
1662 } elsif ($how eq 'false') {
1665 badcfg "unknown git-check \`$how'";
1669 sub create_remote_git_repo () {
1670 my $how = access_cfg('git-create');
1671 if ($how eq 'ssh-cmd') {
1673 (access_cfg_ssh, access_gituserhost(),
1674 access_runeinfo("git-create $package").
1675 "set -e; cd ".access_cfg('git-path').";".
1676 " cp -a _template $package.git");
1677 } elsif ($how eq 'true') {
1680 badcfg "unknown git-create \`$how'";
1684 our ($dsc_hash,$lastpush_mergeinput);
1685 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1687 our $ud = '.git/dgit/unpack';
1697 sub mktree_in_ud_here () {
1698 runcmd qw(git init -q);
1699 runcmd qw(git config gc.auto 0);
1700 rmtree('.git/objects');
1701 symlink '../../../../objects','.git/objects' or die $!;
1705 sub git_write_tree () {
1706 my $tree = cmdoutput @git, qw(write-tree);
1707 $tree =~ m/^\w+$/ or die "$tree ?";
1711 sub git_add_write_tree () {
1712 runcmd @git, qw(add -Af .);
1713 return git_write_tree();
1716 sub remove_stray_gits ($) {
1718 my @gitscmd = qw(find -name .git -prune -print0);
1719 debugcmd "|",@gitscmd;
1720 open GITS, "-|", @gitscmd or die $!;
1725 print STDERR "$us: warning: removing from $what: ",
1726 (messagequote $_), "\n";
1730 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1733 sub mktree_in_ud_from_only_subdir ($;$) {
1734 my ($what,$raw) = @_;
1736 # changes into the subdir
1738 die "expected one subdir but found @dirs ?" unless @dirs==1;
1739 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1743 remove_stray_gits($what);
1744 mktree_in_ud_here();
1746 my ($format, $fopts) = get_source_format();
1747 if (madformat($format)) {
1752 my $tree=git_add_write_tree();
1753 return ($tree,$dir);
1756 our @files_csum_info_fields =
1757 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1758 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1759 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1761 sub dsc_files_info () {
1762 foreach my $csumi (@files_csum_info_fields) {
1763 my ($fname, $module, $method) = @$csumi;
1764 my $field = $dsc->{$fname};
1765 next unless defined $field;
1766 eval "use $module; 1;" or die $@;
1768 foreach (split /\n/, $field) {
1770 m/^(\w+) (\d+) (\S+)$/ or
1771 fail "could not parse .dsc $fname line \`$_'";
1772 my $digester = eval "$module"."->$method;" or die $@;
1777 Digester => $digester,
1782 fail "missing any supported Checksums-* or Files field in ".
1783 $dsc->get_option('name');
1787 map { $_->{Filename} } dsc_files_info();
1790 sub files_compare_inputs (@) {
1795 my $showinputs = sub {
1796 return join "; ", map { $_->get_option('name') } @$inputs;
1799 foreach my $in (@$inputs) {
1801 my $in_name = $in->get_option('name');
1803 printdebug "files_compare_inputs $in_name\n";
1805 foreach my $csumi (@files_csum_info_fields) {
1806 my ($fname) = @$csumi;
1807 printdebug "files_compare_inputs $in_name $fname\n";
1809 my $field = $in->{$fname};
1810 next unless defined $field;
1813 foreach (split /\n/, $field) {
1816 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1817 fail "could not parse $in_name $fname line \`$_'";
1819 printdebug "files_compare_inputs $in_name $fname $f\n";
1823 my $re = \ $record{$f}{$fname};
1825 $fchecked{$f}{$in_name} = 1;
1827 fail "hash or size of $f varies in $fname fields".
1828 " (between: ".$showinputs->().")";
1833 @files = sort @files;
1834 $expected_files //= \@files;
1835 "@$expected_files" eq "@files" or
1836 fail "file list in $in_name varies between hash fields!";
1839 fail "$in_name has no files list field(s)";
1841 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1844 grep { keys %$_ == @$inputs-1 } values %fchecked
1845 or fail "no file appears in all file lists".
1846 " (looked in: ".$showinputs->().")";
1849 sub is_orig_file_in_dsc ($$) {
1850 my ($f, $dsc_files_info) = @_;
1851 return 0 if @$dsc_files_info <= 1;
1852 # One file means no origs, and the filename doesn't have a "what
1853 # part of dsc" component. (Consider versions ending `.orig'.)
1854 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1858 sub is_orig_file_of_vsn ($$) {
1859 my ($f, $upstreamvsn) = @_;
1860 my $base = srcfn $upstreamvsn, '';
1861 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1865 sub changes_update_origs_from_dsc ($$$$) {
1866 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1868 printdebug "checking origs needed ($upstreamvsn)...\n";
1869 $_ = getfield $changes, 'Files';
1870 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1871 fail "cannot find section/priority from .changes Files field";
1872 my $placementinfo = $1;
1874 printdebug "checking origs needed placement '$placementinfo'...\n";
1875 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1876 $l =~ m/\S+$/ or next;
1878 printdebug "origs $file | $l\n";
1879 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1880 printdebug "origs $file is_orig\n";
1881 my $have = archive_query('file_in_archive', $file);
1882 if (!defined $have) {
1884 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1890 printdebug "origs $file \$#\$have=$#$have\n";
1891 foreach my $h (@$have) {
1894 foreach my $csumi (@files_csum_info_fields) {
1895 my ($fname, $module, $method, $archivefield) = @$csumi;
1896 next unless defined $h->{$archivefield};
1897 $_ = $dsc->{$fname};
1898 next unless defined;
1899 m/^(\w+) .* \Q$file\E$/m or
1900 fail ".dsc $fname missing entry for $file";
1901 if ($h->{$archivefield} eq $1) {
1905 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1908 die "$file ".Dumper($h)." ?!" if $same && @differ;
1911 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1914 printdebug "origs $file f.same=$found_same".
1915 " #f._differ=$#found_differ\n";
1916 if (@found_differ && !$found_same) {
1918 "archive contains $file with different checksum",
1921 # Now we edit the changes file to add or remove it
1922 foreach my $csumi (@files_csum_info_fields) {
1923 my ($fname, $module, $method, $archivefield) = @$csumi;
1924 next unless defined $changes->{$fname};
1926 # in archive, delete from .changes if it's there
1927 $changed{$file} = "removed" if
1928 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1929 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1930 # not in archive, but it's here in the .changes
1932 my $dsc_data = getfield $dsc, $fname;
1933 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1935 $extra =~ s/ \d+ /$&$placementinfo /
1936 or die "$fname $extra >$dsc_data< ?"
1937 if $fname eq 'Files';
1938 $changes->{$fname} .= "\n". $extra;
1939 $changed{$file} = "added";
1944 foreach my $file (keys %changed) {
1946 "edited .changes for archive .orig contents: %s %s",
1947 $changed{$file}, $file;
1949 my $chtmp = "$changesfile.tmp";
1950 $changes->save($chtmp);
1952 rename $chtmp,$changesfile or die "$changesfile $!";
1954 progress "[new .changes left in $changesfile]";
1957 progress "$changesfile already has appropriate .orig(s) (if any)";
1961 sub make_commit ($) {
1963 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1966 sub make_commit_text ($) {
1969 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1971 print Dumper($text) if $debuglevel > 1;
1972 my $child = open2($out, $in, @cmd) or die $!;
1975 print $in $text or die $!;
1976 close $in or die $!;
1978 $h =~ m/^\w+$/ or die;
1980 printdebug "=> $h\n";
1983 waitpid $child, 0 == $child or die "$child $!";
1984 $? and failedcmd @cmd;
1988 sub clogp_authline ($) {
1990 my $author = getfield $clogp, 'Maintainer';
1991 $author =~ s#,.*##ms;
1992 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1993 my $authline = "$author $date";
1994 $authline =~ m/$git_authline_re/o or
1995 fail "unexpected commit author line format \`$authline'".
1996 " (was generated from changelog Maintainer field)";
1997 return ($1,$2,$3) if wantarray;
2001 sub vendor_patches_distro ($$) {
2002 my ($checkdistro, $what) = @_;
2003 return unless defined $checkdistro;
2005 my $series = "debian/patches/\L$checkdistro\E.series";
2006 printdebug "checking for vendor-specific $series ($what)\n";
2008 if (!open SERIES, "<", $series) {
2009 die "$series $!" unless $!==ENOENT;
2018 Unfortunately, this source package uses a feature of dpkg-source where
2019 the same source package unpacks to different source code on different
2020 distros. dgit cannot safely operate on such packages on affected
2021 distros, because the meaning of source packages is not stable.
2023 Please ask the distro/maintainer to remove the distro-specific series
2024 files and use a different technique (if necessary, uploading actually
2025 different packages, if different distros are supposed to have
2029 fail "Found active distro-specific series file for".
2030 " $checkdistro ($what): $series, cannot continue";
2032 die "$series $!" if SERIES->error;
2036 sub check_for_vendor_patches () {
2037 # This dpkg-source feature doesn't seem to be documented anywhere!
2038 # But it can be found in the changelog (reformatted):
2040 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2041 # Author: Raphael Hertzog <hertzog@debian.org>
2042 # Date: Sun Oct 3 09:36:48 2010 +0200
2044 # dpkg-source: correctly create .pc/.quilt_series with alternate
2047 # If you have debian/patches/ubuntu.series and you were
2048 # unpacking the source package on ubuntu, quilt was still
2049 # directed to debian/patches/series instead of
2050 # debian/patches/ubuntu.series.
2052 # debian/changelog | 3 +++
2053 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2054 # 2 files changed, 6 insertions(+), 1 deletion(-)
2057 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2058 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2059 "Dpkg::Vendor \`current vendor'");
2060 vendor_patches_distro(access_basedistro(),
2061 "(base) distro being accessed");
2062 vendor_patches_distro(access_nomdistro(),
2063 "(nominal) distro being accessed");
2066 sub generate_commits_from_dsc () {
2067 # See big comment in fetch_from_archive, below.
2068 # See also README.dsc-import.
2072 my @dfi = dsc_files_info();
2073 foreach my $fi (@dfi) {
2074 my $f = $fi->{Filename};
2075 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2076 my $upper_f = "../../../../$f";
2078 printdebug "considering reusing $f: ";
2080 if (link_ltarget "$upper_f,fetch", $f) {
2081 printdebug "linked (using ...,fetch).\n";
2082 } elsif ((printdebug "($!) "),
2084 fail "accessing ../$f,fetch: $!";
2085 } elsif (link_ltarget $upper_f, $f) {
2086 printdebug "linked.\n";
2087 } elsif ((printdebug "($!) "),
2089 fail "accessing ../$f: $!";
2091 printdebug "absent.\n";
2095 complete_file_from_dsc('.', $fi, \$refetched)
2098 printdebug "considering saving $f: ";
2100 if (link $f, $upper_f) {
2101 printdebug "linked.\n";
2102 } elsif ((printdebug "($!) "),
2104 fail "saving ../$f: $!";
2105 } elsif (!$refetched) {
2106 printdebug "no need.\n";
2107 } elsif (link $f, "$upper_f,fetch") {
2108 printdebug "linked (using ...,fetch).\n";
2109 } elsif ((printdebug "($!) "),
2111 fail "saving ../$f,fetch: $!";
2113 printdebug "cannot.\n";
2117 # We unpack and record the orig tarballs first, so that we only
2118 # need disk space for one private copy of the unpacked source.
2119 # But we can't make them into commits until we have the metadata
2120 # from the debian/changelog, so we record the tree objects now and
2121 # make them into commits later.
2123 my $upstreamv = upstreamversion $dsc->{version};
2124 my $orig_f_base = srcfn $upstreamv, '';
2126 foreach my $fi (@dfi) {
2127 # We actually import, and record as a commit, every tarball
2128 # (unless there is only one file, in which case there seems
2131 my $f = $fi->{Filename};
2132 printdebug "import considering $f ";
2133 (printdebug "only one dfi\n"), next if @dfi == 1;
2134 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2135 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2139 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2141 printdebug "Y ", (join ' ', map { $_//"(none)" }
2142 $compr_ext, $orig_f_part
2145 my $input = new IO::File $f, '<' or die "$f $!";
2149 if (defined $compr_ext) {
2151 Dpkg::Compression::compression_guess_from_filename $f;
2152 fail "Dpkg::Compression cannot handle file $f in source package"
2153 if defined $compr_ext && !defined $cname;
2155 new Dpkg::Compression::Process compression => $cname;
2156 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2157 my $compr_fh = new IO::Handle;
2158 my $compr_pid = open $compr_fh, "-|" // die $!;
2160 open STDIN, "<&", $input or die $!;
2162 die "dgit (child): exec $compr_cmd[0]: $!\n";
2167 rmtree "_unpack-tar";
2168 mkdir "_unpack-tar" or die $!;
2169 my @tarcmd = qw(tar -x -f -
2170 --no-same-owner --no-same-permissions
2171 --no-acls --no-xattrs --no-selinux);
2172 my $tar_pid = fork // die $!;
2174 chdir "_unpack-tar" or die $!;
2175 open STDIN, "<&", $input or die $!;
2177 die "dgit (child): exec $tarcmd[0]: $!";
2179 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2180 !$? or failedcmd @tarcmd;
2183 (@compr_cmd ? failedcmd @compr_cmd
2185 # finally, we have the results in "tarball", but maybe
2186 # with the wrong permissions
2188 runcmd qw(chmod -R +rwX _unpack-tar);
2189 changedir "_unpack-tar";
2190 remove_stray_gits($f);
2191 mktree_in_ud_here();
2193 my ($tree) = git_add_write_tree();
2194 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2195 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2197 printdebug "one subtree $1\n";
2199 printdebug "multiple subtrees\n";
2202 rmtree "_unpack-tar";
2204 my $ent = [ $f, $tree ];
2206 Orig => !!$orig_f_part,
2207 Sort => (!$orig_f_part ? 2 :
2208 $orig_f_part =~ m/-/g ? 1 :
2216 # put any without "_" first (spec is not clear whether files
2217 # are always in the usual order). Tarballs without "_" are
2218 # the main orig or the debian tarball.
2219 $a->{Sort} <=> $b->{Sort} or
2223 my $any_orig = grep { $_->{Orig} } @tartrees;
2225 my $dscfn = "$package.dsc";
2227 my $treeimporthow = 'package';
2229 open D, ">", $dscfn or die "$dscfn: $!";
2230 print D $dscdata or die "$dscfn: $!";
2231 close D or die "$dscfn: $!";
2232 my @cmd = qw(dpkg-source);
2233 push @cmd, '--no-check' if $dsc_checked;
2234 if (madformat $dsc->{format}) {
2235 push @cmd, '--skip-patches';
2236 $treeimporthow = 'unpatched';
2238 push @cmd, qw(-x --), $dscfn;
2241 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2242 if (madformat $dsc->{format}) {
2243 check_for_vendor_patches();
2247 if (madformat $dsc->{format}) {
2248 my @pcmd = qw(dpkg-source --before-build .);
2249 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2251 $dappliedtree = git_add_write_tree();
2254 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2255 debugcmd "|",@clogcmd;
2256 open CLOGS, "-|", @clogcmd or die $!;
2261 printdebug "import clog search...\n";
2264 my $stanzatext = do { local $/=""; <CLOGS>; };
2265 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2266 last if !defined $stanzatext;
2268 my $desc = "package changelog, entry no.$.";
2269 open my $stanzafh, "<", \$stanzatext or die;
2270 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2271 $clogp //= $thisstanza;
2273 printdebug "import clog $thisstanza->{version} $desc...\n";
2275 last if !$any_orig; # we don't need $r1clogp
2277 # We look for the first (most recent) changelog entry whose
2278 # version number is lower than the upstream version of this
2279 # package. Then the last (least recent) previous changelog
2280 # entry is treated as the one which introduced this upstream
2281 # version and used for the synthetic commits for the upstream
2284 # One might think that a more sophisticated algorithm would be
2285 # necessary. But: we do not want to scan the whole changelog
2286 # file. Stopping when we see an earlier version, which
2287 # necessarily then is an earlier upstream version, is the only
2288 # realistic way to do that. Then, either the earliest
2289 # changelog entry we have seen so far is indeed the earliest
2290 # upload of this upstream version; or there are only changelog
2291 # entries relating to later upstream versions (which is not
2292 # possible unless the changelog and .dsc disagree about the
2293 # version). Then it remains to choose between the physically
2294 # last entry in the file, and the one with the lowest version
2295 # number. If these are not the same, we guess that the
2296 # versions were created in a non-monotic order rather than
2297 # that the changelog entries have been misordered.
2299 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2301 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2302 $r1clogp = $thisstanza;
2304 printdebug "import clog $r1clogp->{version} becomes r1\n";
2306 die $! if CLOGS->error;
2307 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2309 $clogp or fail "package changelog has no entries!";
2311 my $authline = clogp_authline $clogp;
2312 my $changes = getfield $clogp, 'Changes';
2313 my $cversion = getfield $clogp, 'Version';
2316 $r1clogp //= $clogp; # maybe there's only one entry;
2317 my $r1authline = clogp_authline $r1clogp;
2318 # Strictly, r1authline might now be wrong if it's going to be
2319 # unused because !$any_orig. Whatever.
2321 printdebug "import tartrees authline $authline\n";
2322 printdebug "import tartrees r1authline $r1authline\n";
2324 foreach my $tt (@tartrees) {
2325 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2327 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2330 committer $r1authline
2334 [dgit import orig $tt->{F}]
2342 [dgit import tarball $package $cversion $tt->{F}]
2347 printdebug "import main commit\n";
2349 open C, ">../commit.tmp" or die $!;
2350 print C <<END or die $!;
2353 print C <<END or die $! foreach @tartrees;
2356 print C <<END or die $!;
2362 [dgit import $treeimporthow $package $cversion]
2366 my $rawimport_hash = make_commit qw(../commit.tmp);
2368 if (madformat $dsc->{format}) {
2369 printdebug "import apply patches...\n";
2371 # regularise the state of the working tree so that
2372 # the checkout of $rawimport_hash works nicely.
2373 my $dappliedcommit = make_commit_text(<<END);
2380 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2382 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2384 # We need the answers to be reproducible
2385 my @authline = clogp_authline($clogp);
2386 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2387 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2388 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2389 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2390 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2391 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2393 my $path = $ENV{PATH} or die;
2395 foreach my $use_absurd (qw(0 1)) {
2396 runcmd @git, qw(checkout -q unpa);
2397 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2398 local $ENV{PATH} = $path;
2401 progress "warning: $@";
2402 $path = "$absurdity:$path";
2403 progress "$us: trying slow absurd-git-apply...";
2404 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2409 die "forbid absurd git-apply\n" if $use_absurd
2410 && forceing [qw(import-gitapply-no-absurd)];
2411 die "only absurd git-apply!\n" if !$use_absurd
2412 && forceing [qw(import-gitapply-absurd)];
2414 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2415 local $ENV{PATH} = $path if $use_absurd;
2417 my @showcmd = (gbp_pq, qw(import));
2418 my @realcmd = shell_cmd
2419 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2420 debugcmd "+",@realcmd;
2421 if (system @realcmd) {
2422 die +(shellquote @showcmd).
2424 failedcmd_waitstatus()."\n";
2427 my $gapplied = git_rev_parse('HEAD');
2428 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2429 $gappliedtree eq $dappliedtree or
2431 gbp-pq import and dpkg-source disagree!
2432 gbp-pq import gave commit $gapplied
2433 gbp-pq import gave tree $gappliedtree
2434 dpkg-source --before-build gave tree $dappliedtree
2436 $rawimport_hash = $gapplied;
2441 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2446 progress "synthesised git commit from .dsc $cversion";
2448 my $rawimport_mergeinput = {
2449 Commit => $rawimport_hash,
2450 Info => "Import of source package",
2452 my @output = ($rawimport_mergeinput);
2454 if ($lastpush_mergeinput) {
2455 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2456 my $oversion = getfield $oldclogp, 'Version';
2458 version_compare($oversion, $cversion);
2460 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2461 { Message => <<END, ReverseParents => 1 });
2462 Record $package ($cversion) in archive suite $csuite
2464 } elsif ($vcmp > 0) {
2465 print STDERR <<END or die $!;
2467 Version actually in archive: $cversion (older)
2468 Last version pushed with dgit: $oversion (newer or same)
2471 @output = $lastpush_mergeinput;
2473 # Same version. Use what's in the server git branch,
2474 # discarding our own import. (This could happen if the
2475 # server automatically imports all packages into git.)
2476 @output = $lastpush_mergeinput;
2479 changedir '../../../..';
2484 sub complete_file_from_dsc ($$;$) {
2485 our ($dstdir, $fi, $refetched) = @_;
2486 # Ensures that we have, in $dstdir, the file $fi, with the correct
2487 # contents. (Downloading it from alongside $dscurl if necessary.)
2488 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2489 # and will set $$refetched=1 if it did so (or tried to).
2491 my $f = $fi->{Filename};
2492 my $tf = "$dstdir/$f";
2496 my $checkhash = sub {
2497 open F, "<", "$tf" or die "$tf: $!";
2498 $fi->{Digester}->reset();
2499 $fi->{Digester}->addfile(*F);
2500 F->error and die $!;
2501 my $got = $fi->{Digester}->hexdigest();
2502 return $got eq $fi->{Hash};
2505 if (stat_exists $tf) {
2506 if ($checkhash->()) {
2507 progress "using existing $f";
2511 fail "file $f has hash $got but .dsc".
2512 " demands hash $fi->{Hash} ".
2513 "(perhaps you should delete this file?)";
2515 progress "need to fetch correct version of $f";
2516 unlink $tf or die "$tf $!";
2519 printdebug "$tf does not exist, need to fetch\n";
2523 $furl =~ s{/[^/]+$}{};
2525 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2526 die "$f ?" if $f =~ m#/#;
2527 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2528 return 0 if !act_local();
2531 fail "file $f has hash $got but .dsc".
2532 " demands hash $fi->{Hash} ".
2533 "(got wrong file from archive!)";
2538 sub ensure_we_have_orig () {
2539 my @dfi = dsc_files_info();
2540 foreach my $fi (@dfi) {
2541 my $f = $fi->{Filename};
2542 next unless is_orig_file_in_dsc($f, \@dfi);
2543 complete_file_from_dsc('..', $fi)
2548 #---------- git fetch ----------
2550 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2551 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2553 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2554 # locally fetched refs because they have unhelpful names and clutter
2555 # up gitk etc. So we track whether we have "used up" head ref (ie,
2556 # whether we have made another local ref which refers to this object).
2558 # (If we deleted them unconditionally, then we might end up
2559 # re-fetching the same git objects each time dgit fetch was run.)
2561 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2562 # in git_fetch_us to fetch the refs in question, and possibly a call
2563 # to lrfetchref_used.
2565 our (%lrfetchrefs_f, %lrfetchrefs_d);
2566 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2568 sub lrfetchref_used ($) {
2569 my ($fullrefname) = @_;
2570 my $objid = $lrfetchrefs_f{$fullrefname};
2571 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2574 sub git_lrfetch_sane {
2575 my ($supplementary, @specs) = @_;
2576 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2577 # at least as regards @specs. Also leave the results in
2578 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2579 # able to clean these up.
2581 # With $supplementary==1, @specs must not contain wildcards
2582 # and we add to our previous fetches (non-atomically).
2584 # This is rather miserable:
2585 # When git fetch --prune is passed a fetchspec ending with a *,
2586 # it does a plausible thing. If there is no * then:
2587 # - it matches subpaths too, even if the supplied refspec
2588 # starts refs, and behaves completely madly if the source
2589 # has refs/refs/something. (See, for example, Debian #NNNN.)
2590 # - if there is no matching remote ref, it bombs out the whole
2592 # We want to fetch a fixed ref, and we don't know in advance
2593 # if it exists, so this is not suitable.
2595 # Our workaround is to use git ls-remote. git ls-remote has its
2596 # own qairks. Notably, it has the absurd multi-tail-matching
2597 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2598 # refs/refs/foo etc.
2600 # Also, we want an idempotent snapshot, but we have to make two
2601 # calls to the remote: one to git ls-remote and to git fetch. The
2602 # solution is use git ls-remote to obtain a target state, and
2603 # git fetch to try to generate it. If we don't manage to generate
2604 # the target state, we try again.
2606 my $url = access_giturl();
2608 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2610 my $specre = join '|', map {
2613 my $wildcard = $x =~ s/\\\*$/.*/;
2614 die if $wildcard && $supplementary;
2617 printdebug "git_lrfetch_sane specre=$specre\n";
2618 my $wanted_rref = sub {
2620 return m/^(?:$specre)$/;
2623 my $fetch_iteration = 0;
2626 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2627 if (++$fetch_iteration > 10) {
2628 fail "too many iterations trying to get sane fetch!";
2631 my @look = map { "refs/$_" } @specs;
2632 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2636 open GITLS, "-|", @lcmd or die $!;
2638 printdebug "=> ", $_;
2639 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2640 my ($objid,$rrefname) = ($1,$2);
2641 if (!$wanted_rref->($rrefname)) {
2643 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2647 $wantr{$rrefname} = $objid;
2650 close GITLS or failedcmd @lcmd;
2652 # OK, now %want is exactly what we want for refs in @specs
2654 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2655 "+refs/$_:".lrfetchrefs."/$_";
2658 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2660 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2661 runcmd_ordryrun_local @fcmd if @fspecs;
2663 if (!$supplementary) {
2664 %lrfetchrefs_f = ();
2668 git_for_each_ref(lrfetchrefs, sub {
2669 my ($objid,$objtype,$lrefname,$reftail) = @_;
2670 $lrfetchrefs_f{$lrefname} = $objid;
2671 $objgot{$objid} = 1;
2674 if ($supplementary) {
2678 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2679 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2680 if (!exists $wantr{$rrefname}) {
2681 if ($wanted_rref->($rrefname)) {
2683 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2687 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2690 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2691 delete $lrfetchrefs_f{$lrefname};
2695 foreach my $rrefname (sort keys %wantr) {
2696 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2697 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2698 my $want = $wantr{$rrefname};
2699 next if $got eq $want;
2700 if (!defined $objgot{$want}) {
2702 warning: git ls-remote suggests we want $lrefname
2703 warning: and it should refer to $want
2704 warning: but git fetch didn't fetch that object to any relevant ref.
2705 warning: This may be due to a race with someone updating the server.
2706 warning: Will try again...
2708 next FETCH_ITERATION;
2711 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2713 runcmd_ordryrun_local @git, qw(update-ref -m),
2714 "dgit fetch git fetch fixup", $lrefname, $want;
2715 $lrfetchrefs_f{$lrefname} = $want;
2720 if (defined $csuite) {
2721 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2722 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2723 my ($objid,$objtype,$lrefname,$reftail) = @_;
2724 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2725 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2729 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2730 Dumper(\%lrfetchrefs_f);
2733 sub git_fetch_us () {
2734 # Want to fetch only what we are going to use, unless
2735 # deliberately-not-ff, in which case we must fetch everything.
2737 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2739 (quiltmode_splitbrain
2740 ? (map { $_->('*',access_nomdistro) }
2741 \&debiantag_new, \&debiantag_maintview)
2742 : debiantags('*',access_nomdistro));
2743 push @specs, server_branch($csuite);
2744 push @specs, $rewritemap;
2745 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2747 git_lrfetch_sane 0, @specs;
2750 my @tagpats = debiantags('*',access_nomdistro);
2752 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2753 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2754 printdebug "currently $fullrefname=$objid\n";
2755 $here{$fullrefname} = $objid;
2757 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2758 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2759 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2760 printdebug "offered $lref=$objid\n";
2761 if (!defined $here{$lref}) {
2762 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2763 runcmd_ordryrun_local @upd;
2764 lrfetchref_used $fullrefname;
2765 } elsif ($here{$lref} eq $objid) {
2766 lrfetchref_used $fullrefname;
2769 "Not updating $lref from $here{$lref} to $objid.\n";
2774 #---------- dsc and archive handling ----------
2776 sub mergeinfo_getclogp ($) {
2777 # Ensures thit $mi->{Clogp} exists and returns it
2779 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2782 sub mergeinfo_version ($) {
2783 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2786 sub fetch_from_archive_record_1 ($) {
2788 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2789 'DGIT_ARCHIVE', $hash;
2790 cmdoutput @git, qw(log -n2), $hash;
2791 # ... gives git a chance to complain if our commit is malformed
2794 sub fetch_from_archive_record_2 ($) {
2796 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2800 dryrun_report @upd_cmd;
2804 sub parse_dsc_field_def_dsc_distro () {
2805 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2806 dgit.default.distro);
2809 sub parse_dsc_field ($$) {
2810 my ($dsc, $what) = @_;
2812 foreach my $field (@ourdscfield) {
2813 $f = $dsc->{$field};
2818 progress "$what: NO git hash";
2819 parse_dsc_field_def_dsc_distro();
2820 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2821 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2822 progress "$what: specified git info ($dsc_distro)";
2823 $dsc_hint_tag = [ $dsc_hint_tag ];
2824 } elsif ($f =~ m/^\w+\s*$/) {
2826 parse_dsc_field_def_dsc_distro();
2827 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2829 progress "$what: specified git hash";
2831 fail "$what: invalid Dgit info";
2835 sub resolve_dsc_field_commit ($$) {
2836 my ($already_distro, $already_mapref) = @_;
2838 return unless defined $dsc_hash;
2841 defined $already_mapref &&
2842 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2843 ? $already_mapref : undef;
2847 my ($what, @fetch) = @_;
2849 local $idistro = $dsc_distro;
2850 my $lrf = lrfetchrefs;
2852 if (!$chase_dsc_distro) {
2854 "not chasing .dsc distro $dsc_distro: not fetching $what";
2859 ".dsc names distro $dsc_distro: fetching $what";
2861 my $url = access_giturl();
2862 if (!defined $url) {
2863 defined $dsc_hint_url or fail <<END;
2864 .dsc Dgit metadata is in context of distro $dsc_distro
2865 for which we have no configured url and .dsc provides no hint
2868 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2869 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2870 parse_cfg_bool "dsc-url-proto-ok", 'false',
2871 cfg("dgit.dsc-url-proto-ok.$proto",
2872 "dgit.default.dsc-url-proto-ok")
2874 .dsc Dgit metadata is in context of distro $dsc_distro
2875 for which we have no configured url;
2876 .dsc provices hinted url with protocol $proto which is unsafe.
2877 (can be overridden by config - consult documentation)
2879 $url = $dsc_hint_url;
2882 git_lrfetch_sane 1, @fetch;
2887 my $rewrite_enable = do {
2888 local $idistro = $dsc_distro;
2889 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2892 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2893 if (!defined $mapref) {
2894 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2895 $mapref = $lrf.'/'.$rewritemap;
2897 my $rewritemapdata = git_cat_file $mapref.':map';
2898 if (defined $rewritemapdata
2899 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2901 "server's git history rewrite map contains a relevant entry!";
2904 if (defined $dsc_hash) {
2905 progress "using rewritten git hash in place of .dsc value";
2907 progress "server data says .dsc hash is to be disregarded";
2912 if (!defined git_cat_file $dsc_hash) {
2913 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2914 my $lrf = $do_fetch->("additional commits", @tags) &&
2915 defined git_cat_file $dsc_hash
2917 .dsc Dgit metadata requires commit $dsc_hash
2918 but we could not obtain that object anywhere.
2920 foreach my $t (@tags) {
2921 my $fullrefname = $lrf.'/'.$t;
2922 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2923 next unless $lrfetchrefs_f{$fullrefname};
2924 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2925 lrfetchref_used $fullrefname;
2930 sub fetch_from_archive () {
2931 ensure_setup_existing_tree();
2933 # Ensures that lrref() is what is actually in the archive, one way
2934 # or another, according to us - ie this client's
2935 # appropritaely-updated archive view. Also returns the commit id.
2936 # If there is nothing in the archive, leaves lrref alone and
2937 # returns undef. git_fetch_us must have already been called.
2941 parse_dsc_field($dsc, 'last upload to archive');
2942 resolve_dsc_field_commit access_basedistro,
2943 lrfetchrefs."/".$rewritemap
2945 progress "no version available from the archive";
2948 # If the archive's .dsc has a Dgit field, there are three
2949 # relevant git commitids we need to choose between and/or merge
2951 # 1. $dsc_hash: the Dgit field from the archive
2952 # 2. $lastpush_hash: the suite branch on the dgit git server
2953 # 3. $lastfetch_hash: our local tracking brach for the suite
2955 # These may all be distinct and need not be in any fast forward
2958 # If the dsc was pushed to this suite, then the server suite
2959 # branch will have been updated; but it might have been pushed to
2960 # a different suite and copied by the archive. Conversely a more
2961 # recent version may have been pushed with dgit but not appeared
2962 # in the archive (yet).
2964 # $lastfetch_hash may be awkward because archive imports
2965 # (particularly, imports of Dgit-less .dscs) are performed only as
2966 # needed on individual clients, so different clients may perform a
2967 # different subset of them - and these imports are only made
2968 # public during push. So $lastfetch_hash may represent a set of
2969 # imports different to a subsequent upload by a different dgit
2972 # Our approach is as follows:
2974 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2975 # descendant of $dsc_hash, then it was pushed by a dgit user who
2976 # had based their work on $dsc_hash, so we should prefer it.
2977 # Otherwise, $dsc_hash was installed into this suite in the
2978 # archive other than by a dgit push, and (necessarily) after the
2979 # last dgit push into that suite (since a dgit push would have
2980 # been descended from the dgit server git branch); thus, in that
2981 # case, we prefer the archive's version (and produce a
2982 # pseudo-merge to overwrite the dgit server git branch).
2984 # (If there is no Dgit field in the archive's .dsc then
2985 # generate_commit_from_dsc uses the version numbers to decide
2986 # whether the suite branch or the archive is newer. If the suite
2987 # branch is newer it ignores the archive's .dsc; otherwise it
2988 # generates an import of the .dsc, and produces a pseudo-merge to
2989 # overwrite the suite branch with the archive contents.)
2991 # The outcome of that part of the algorithm is the `public view',
2992 # and is same for all dgit clients: it does not depend on any
2993 # unpublished history in the local tracking branch.
2995 # As between the public view and the local tracking branch: The
2996 # local tracking branch is only updated by dgit fetch, and
2997 # whenever dgit fetch runs it includes the public view in the
2998 # local tracking branch. Therefore if the public view is not
2999 # descended from the local tracking branch, the local tracking
3000 # branch must contain history which was imported from the archive
3001 # but never pushed; and, its tip is now out of date. So, we make
3002 # a pseudo-merge to overwrite the old imports and stitch the old
3005 # Finally: we do not necessarily reify the public view (as
3006 # described above). This is so that we do not end up stacking two
3007 # pseudo-merges. So what we actually do is figure out the inputs
3008 # to any public view pseudo-merge and put them in @mergeinputs.
3011 # $mergeinputs[]{Commit}
3012 # $mergeinputs[]{Info}
3013 # $mergeinputs[0] is the one whose tree we use
3014 # @mergeinputs is in the order we use in the actual commit)
3017 # $mergeinputs[]{Message} is a commit message to use
3018 # $mergeinputs[]{ReverseParents} if def specifies that parent
3019 # list should be in opposite order
3020 # Such an entry has no Commit or Info. It applies only when found
3021 # in the last entry. (This ugliness is to support making
3022 # identical imports to previous dgit versions.)
3024 my $lastpush_hash = git_get_ref(lrfetchref());
3025 printdebug "previous reference hash=$lastpush_hash\n";
3026 $lastpush_mergeinput = $lastpush_hash && {
3027 Commit => $lastpush_hash,
3028 Info => "dgit suite branch on dgit git server",
3031 my $lastfetch_hash = git_get_ref(lrref());
3032 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3033 my $lastfetch_mergeinput = $lastfetch_hash && {
3034 Commit => $lastfetch_hash,
3035 Info => "dgit client's archive history view",
3038 my $dsc_mergeinput = $dsc_hash && {
3039 Commit => $dsc_hash,
3040 Info => "Dgit field in .dsc from archive",
3044 my $del_lrfetchrefs = sub {
3047 printdebug "del_lrfetchrefs...\n";
3048 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3049 my $objid = $lrfetchrefs_d{$fullrefname};
3050 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3052 $gur ||= new IO::Handle;
3053 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3055 printf $gur "delete %s %s\n", $fullrefname, $objid;
3058 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3062 if (defined $dsc_hash) {
3063 ensure_we_have_orig();
3064 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3065 @mergeinputs = $dsc_mergeinput
3066 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3067 print STDERR <<END or die $!;
3069 Git commit in archive is behind the last version allegedly pushed/uploaded.
3070 Commit referred to by archive: $dsc_hash
3071 Last version pushed with dgit: $lastpush_hash
3074 @mergeinputs = ($lastpush_mergeinput);
3076 # Archive has .dsc which is not a descendant of the last dgit
3077 # push. This can happen if the archive moves .dscs about.
3078 # Just follow its lead.
3079 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3080 progress "archive .dsc names newer git commit";
3081 @mergeinputs = ($dsc_mergeinput);
3083 progress "archive .dsc names other git commit, fixing up";
3084 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3088 @mergeinputs = generate_commits_from_dsc();
3089 # We have just done an import. Now, our import algorithm might
3090 # have been improved. But even so we do not want to generate
3091 # a new different import of the same package. So if the
3092 # version numbers are the same, just use our existing version.
3093 # If the version numbers are different, the archive has changed
3094 # (perhaps, rewound).
3095 if ($lastfetch_mergeinput &&
3096 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3097 (mergeinfo_version $mergeinputs[0]) )) {
3098 @mergeinputs = ($lastfetch_mergeinput);
3100 } elsif ($lastpush_hash) {
3101 # only in git, not in the archive yet
3102 @mergeinputs = ($lastpush_mergeinput);
3103 print STDERR <<END or die $!;
3105 Package not found in the archive, but has allegedly been pushed using dgit.
3109 printdebug "nothing found!\n";
3110 if (defined $skew_warning_vsn) {
3111 print STDERR <<END or die $!;
3113 Warning: relevant archive skew detected.
3114 Archive allegedly contains $skew_warning_vsn
3115 But we were not able to obtain any version from the archive or git.
3119 unshift @end, $del_lrfetchrefs;
3123 if ($lastfetch_hash &&
3125 my $h = $_->{Commit};
3126 $h and is_fast_fwd($lastfetch_hash, $h);
3127 # If true, one of the existing parents of this commit
3128 # is a descendant of the $lastfetch_hash, so we'll
3129 # be ff from that automatically.
3133 push @mergeinputs, $lastfetch_mergeinput;
3136 printdebug "fetch mergeinfos:\n";
3137 foreach my $mi (@mergeinputs) {
3139 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3141 printdebug sprintf " ReverseParents=%d Message=%s",
3142 $mi->{ReverseParents}, $mi->{Message};
3146 my $compat_info= pop @mergeinputs
3147 if $mergeinputs[$#mergeinputs]{Message};
3149 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3152 if (@mergeinputs > 1) {
3154 my $tree_commit = $mergeinputs[0]{Commit};
3156 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3157 $tree =~ m/\n\n/; $tree = $`;
3158 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3161 # We use the changelog author of the package in question the
3162 # author of this pseudo-merge. This is (roughly) correct if
3163 # this commit is simply representing aa non-dgit upload.
3164 # (Roughly because it does not record sponsorship - but we
3165 # don't have sponsorship info because that's in the .changes,
3166 # which isn't in the archivw.)
3168 # But, it might be that we are representing archive history
3169 # updates (including in-archive copies). These are not really
3170 # the responsibility of the person who created the .dsc, but
3171 # there is no-one whose name we should better use. (The
3172 # author of the .dsc-named commit is clearly worse.)
3174 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3175 my $author = clogp_authline $useclogp;
3176 my $cversion = getfield $useclogp, 'Version';
3178 my $mcf = ".git/dgit/mergecommit";
3179 open MC, ">", $mcf or die "$mcf $!";
3180 print MC <<END or die $!;
3184 my @parents = grep { $_->{Commit} } @mergeinputs;
3185 @parents = reverse @parents if $compat_info->{ReverseParents};
3186 print MC <<END or die $! foreach @parents;
3190 print MC <<END or die $!;
3196 if (defined $compat_info->{Message}) {
3197 print MC $compat_info->{Message} or die $!;
3199 print MC <<END or die $!;
3200 Record $package ($cversion) in archive suite $csuite
3204 my $message_add_info = sub {
3206 my $mversion = mergeinfo_version $mi;
3207 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3211 $message_add_info->($mergeinputs[0]);
3212 print MC <<END or die $!;
3213 should be treated as descended from
3215 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3219 $hash = make_commit $mcf;
3221 $hash = $mergeinputs[0]{Commit};
3223 printdebug "fetch hash=$hash\n";
3226 my ($lasth, $what) = @_;
3227 return unless $lasth;
3228 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3231 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3233 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3235 fetch_from_archive_record_1($hash);
3237 if (defined $skew_warning_vsn) {
3239 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3240 my $gotclogp = commit_getclogp($hash);
3241 my $got_vsn = getfield $gotclogp, 'Version';
3242 printdebug "SKEW CHECK GOT $got_vsn\n";
3243 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3244 print STDERR <<END or die $!;
3246 Warning: archive skew detected. Using the available version:
3247 Archive allegedly contains $skew_warning_vsn
3248 We were able to obtain only $got_vsn
3254 if ($lastfetch_hash ne $hash) {
3255 fetch_from_archive_record_2($hash);
3258 lrfetchref_used lrfetchref();
3260 check_gitattrs($hash, "fetched source tree");
3262 unshift @end, $del_lrfetchrefs;
3266 sub set_local_git_config ($$) {
3268 runcmd @git, qw(config), $k, $v;
3271 sub setup_mergechangelogs (;$) {
3273 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3275 my $driver = 'dpkg-mergechangelogs';
3276 my $cb = "merge.$driver";
3277 my $attrs = '.git/info/attributes';
3278 ensuredir '.git/info';
3280 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3281 if (!open ATTRS, "<", $attrs) {
3282 $!==ENOENT or die "$attrs: $!";
3286 next if m{^debian/changelog\s};
3287 print NATTRS $_, "\n" or die $!;
3289 ATTRS->error and die $!;
3292 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3295 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3296 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3298 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3301 sub setup_useremail (;$) {
3303 return unless $always || access_cfg_bool(1, 'setup-useremail');
3306 my ($k, $envvar) = @_;
3307 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3308 return unless defined $v;
3309 set_local_git_config "user.$k", $v;
3312 $setup->('email', 'DEBEMAIL');
3313 $setup->('name', 'DEBFULLNAME');
3316 sub ensure_setup_existing_tree () {
3317 my $k = "remote.$remotename.skipdefaultupdate";
3318 my $c = git_get_config $k;
3319 return if defined $c;
3320 set_local_git_config $k, 'true';
3323 sub open_gitattrs () {
3324 my $gai = new IO::File ".git/info/attributes"
3326 or die "open .git/info/attributes: $!";
3330 sub is_gitattrs_setup () {
3331 my $gai = open_gitattrs();
3332 return 0 unless $gai;
3334 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3336 $gai->error and die $!;
3340 sub setup_gitattrs (;$) {
3342 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3344 if (is_gitattrs_setup()) {
3346 [attr]dgit-defuse-attrs already found in .git/info/attributes
3347 not doing further gitattributes setup
3351 my $af = ".git/info/attributes";
3352 open GAO, "> $af.new" or die $!;
3353 print GAO <<END or die $!;
3355 [attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
3356 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3358 my $gai = open_gitattrs();
3362 print GAO $_, "\n" or die $!;
3364 $gai->error and die $!;
3366 close GAO or die $!;
3367 rename "$af.new", "$af" or die "install $af: $!";
3370 sub setup_new_tree () {
3371 setup_mergechangelogs();
3376 sub check_gitattrs ($$) {
3377 my ($treeish, $what) = @_;
3379 return if is_gitattrs_setup;
3382 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3384 my $gafl = new IO::File;
3385 open $gafl, "-|", @cmd or die $!;
3388 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3390 next unless m{(?:^|/)\.gitattributes$};
3392 # oh dear, found one
3394 dgit: warning: $what contains .gitattributes
3395 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3400 # tree contains no .gitattributes files
3401 $?=0; $!=0; close $gafl or failedcmd @cmd;
3405 sub multisuite_suite_child ($$$) {
3406 my ($tsuite, $merginputs, $fn) = @_;
3407 # in child, sets things up, calls $fn->(), and returns undef
3408 # in parent, returns canonical suite name for $tsuite
3409 my $canonsuitefh = IO::File::new_tmpfile;
3410 my $pid = fork // die $!;
3414 $us .= " [$isuite]";
3415 $debugprefix .= " ";
3416 progress "fetching $tsuite...";
3417 canonicalise_suite();
3418 print $canonsuitefh $csuite, "\n" or die $!;
3419 close $canonsuitefh or die $!;
3423 waitpid $pid,0 == $pid or die $!;
3424 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3425 seek $canonsuitefh,0,0 or die $!;
3426 local $csuite = <$canonsuitefh>;
3427 die $! unless defined $csuite && chomp $csuite;
3429 printdebug "multisuite $tsuite missing\n";
3432 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3433 push @$merginputs, {
3440 sub fork_for_multisuite ($) {
3441 my ($before_fetch_merge) = @_;
3442 # if nothing unusual, just returns ''
3445 # returns 0 to caller in child, to do first of the specified suites
3446 # in child, $csuite is not yet set
3448 # returns 1 to caller in parent, to finish up anything needed after
3449 # in parent, $csuite is set to canonicalised portmanteau
3451 my $org_isuite = $isuite;
3452 my @suites = split /\,/, $isuite;
3453 return '' unless @suites > 1;
3454 printdebug "fork_for_multisuite: @suites\n";
3458 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3460 return 0 unless defined $cbasesuite;
3462 fail "package $package missing in (base suite) $cbasesuite"
3463 unless @mergeinputs;
3465 my @csuites = ($cbasesuite);
3467 $before_fetch_merge->();
3469 foreach my $tsuite (@suites[1..$#suites]) {
3470 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3476 # xxx collecte the ref here
3478 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3479 push @csuites, $csubsuite;
3482 foreach my $mi (@mergeinputs) {
3483 my $ref = git_get_ref $mi->{Ref};
3484 die "$mi->{Ref} ?" unless length $ref;
3485 $mi->{Commit} = $ref;
3488 $csuite = join ",", @csuites;
3490 my $previous = git_get_ref lrref;
3492 unshift @mergeinputs, {
3493 Commit => $previous,
3494 Info => "local combined tracking branch",
3496 "archive seems to have rewound: local tracking branch is ahead!",
3500 foreach my $ix (0..$#mergeinputs) {
3501 $mergeinputs[$ix]{Index} = $ix;
3504 @mergeinputs = sort {
3505 -version_compare(mergeinfo_version $a,
3506 mergeinfo_version $b) # highest version first
3508 $a->{Index} <=> $b->{Index}; # earliest in spec first
3514 foreach my $mi (@mergeinputs) {
3515 printdebug "multisuite merge check $mi->{Info}\n";
3516 foreach my $previous (@needed) {
3517 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3518 printdebug "multisuite merge un-needed $previous->{Info}\n";
3522 printdebug "multisuite merge this-needed\n";
3523 $mi->{Character} = '+';
3526 $needed[0]{Character} = '*';
3528 my $output = $needed[0]{Commit};
3531 printdebug "multisuite merge nontrivial\n";
3532 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3534 my $commit = "tree $tree\n";
3535 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3536 "Input branches:\n";
3538 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3539 printdebug "multisuite merge include $mi->{Info}\n";
3540 $mi->{Character} //= ' ';
3541 $commit .= "parent $mi->{Commit}\n";
3542 $msg .= sprintf " %s %-25s %s\n",
3544 (mergeinfo_version $mi),
3547 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3549 " * marks the highest version branch, which choose to use\n".
3550 " + marks each branch which was not already an ancestor\n\n".
3551 "[dgit multi-suite $csuite]\n";
3553 "author $authline\n".
3554 "committer $authline\n\n";
3555 $output = make_commit_text $commit.$msg;
3556 printdebug "multisuite merge generated $output\n";
3559 fetch_from_archive_record_1($output);
3560 fetch_from_archive_record_2($output);
3562 progress "calculated combined tracking suite $csuite";
3567 sub clone_set_head () {
3568 open H, "> .git/HEAD" or die $!;
3569 print H "ref: ".lref()."\n" or die $!;
3572 sub clone_finish ($) {
3574 runcmd @git, qw(reset --hard), lrref();
3575 runcmd qw(bash -ec), <<'END';
3577 git ls-tree -r --name-only -z HEAD | \
3578 xargs -0r touch -h -r . --
3580 printdone "ready for work in $dstdir";
3585 badusage "dry run makes no sense with clone" unless act_local();
3587 my $multi_fetched = fork_for_multisuite(sub {
3588 printdebug "multi clone before fetch merge\n";
3591 if ($multi_fetched) {
3592 printdebug "multi clone after fetch merge\n";
3594 clone_finish($dstdir);
3597 printdebug "clone main body\n";
3599 canonicalise_suite();
3600 my $hasgit = check_for_git();
3601 mkdir $dstdir or fail "create \`$dstdir': $!";
3603 runcmd @git, qw(init -q);
3605 my $giturl = access_giturl(1);
3606 if (defined $giturl) {
3607 runcmd @git, qw(remote add), 'origin', $giturl;
3610 progress "fetching existing git history";
3612 runcmd_ordryrun_local @git, qw(fetch origin);
3614 progress "starting new git history";
3616 fetch_from_archive() or no_such_package;
3617 my $vcsgiturl = $dsc->{'Vcs-Git'};
3618 if (length $vcsgiturl) {
3619 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3620 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3623 clone_finish($dstdir);
3627 canonicalise_suite();
3628 if (check_for_git()) {
3631 fetch_from_archive() or no_such_package();
3632 printdone "fetched into ".lrref();
3636 my $multi_fetched = fork_for_multisuite(sub { });
3637 fetch() unless $multi_fetched; # parent
3638 return if $multi_fetched eq '0'; # child
3639 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3641 printdone "fetched to ".lrref()." and merged into HEAD";
3644 sub check_not_dirty () {
3645 foreach my $f (qw(local-options local-patch-header)) {
3646 if (stat_exists "debian/source/$f") {
3647 fail "git tree contains debian/source/$f";
3651 return if $ignoredirty;
3653 my @cmd = (@git, qw(diff --quiet HEAD));
3655 $!=0; $?=-1; system @cmd;
3658 fail "working tree is dirty (does not match HEAD)";
3664 sub commit_admin ($) {
3667 runcmd_ordryrun_local @git, qw(commit -m), $m;
3670 sub commit_quilty_patch () {
3671 my $output = cmdoutput @git, qw(status --porcelain);
3673 foreach my $l (split /\n/, $output) {
3674 next unless $l =~ m/\S/;
3675 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3679 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3681 progress "nothing quilty to commit, ok.";
3684 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3685 runcmd_ordryrun_local @git, qw(add -f), @adds;
3687 Commit Debian 3.0 (quilt) metadata
3689 [dgit ($our_version) quilt-fixup]
3693 sub get_source_format () {
3695 if (open F, "debian/source/options") {
3699 s/\s+$//; # ignore missing final newline
3701 my ($k, $v) = ($`, $'); #');
3702 $v =~ s/^"(.*)"$/$1/;
3708 F->error and die $!;
3711 die $! unless $!==&ENOENT;
3714 if (!open F, "debian/source/format") {
3715 die $! unless $!==&ENOENT;
3719 F->error and die $!;
3721 return ($_, \%options);
3724 sub madformat_wantfixup ($) {
3726 return 0 unless $format eq '3.0 (quilt)';
3727 our $quilt_mode_warned;
3728 if ($quilt_mode eq 'nocheck') {
3729 progress "Not doing any fixup of \`$format' due to".
3730 " ----no-quilt-fixup or --quilt=nocheck"
3731 unless $quilt_mode_warned++;
3734 progress "Format \`$format', need to check/update patch stack"
3735 unless $quilt_mode_warned++;
3739 sub maybe_split_brain_save ($$$) {
3740 my ($headref, $dgitview, $msg) = @_;
3741 # => message fragment "$saved" describing disposition of $dgitview
3742 return "commit id $dgitview" unless defined $split_brain_save;
3743 my @cmd = (shell_cmd "cd ../../../..",
3744 @git, qw(update-ref -m),
3745 "dgit --dgit-view-save $msg HEAD=$headref",
3746 $split_brain_save, $dgitview);
3748 return "and left in $split_brain_save";
3751 # An "infopair" is a tuple [ $thing, $what ]
3752 # (often $thing is a commit hash; $what is a description)
3754 sub infopair_cond_equal ($$) {
3756 $x->[0] eq $y->[0] or fail <<END;
3757 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3761 sub infopair_lrf_tag_lookup ($$) {
3762 my ($tagnames, $what) = @_;
3763 # $tagname may be an array ref
3764 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3765 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3766 foreach my $tagname (@tagnames) {
3767 my $lrefname = lrfetchrefs."/tags/$tagname";
3768 my $tagobj = $lrfetchrefs_f{$lrefname};
3769 next unless defined $tagobj;
3770 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3771 return [ git_rev_parse($tagobj), $what ];
3773 fail @tagnames==1 ? <<END : <<END;
3774 Wanted tag $what (@tagnames) on dgit server, but not found
3776 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3780 sub infopair_cond_ff ($$) {
3781 my ($anc,$desc) = @_;
3782 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3783 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3787 sub pseudomerge_version_check ($$) {
3788 my ($clogp, $archive_hash) = @_;
3790 my $arch_clogp = commit_getclogp $archive_hash;
3791 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3792 'version currently in archive' ];
3793 if (defined $overwrite_version) {
3794 if (length $overwrite_version) {
3795 infopair_cond_equal([ $overwrite_version,
3796 '--overwrite= version' ],
3799 my $v = $i_arch_v->[0];
3800 progress "Checking package changelog for archive version $v ...";
3802 my @xa = ("-f$v", "-t$v");
3803 my $vclogp = parsechangelog @xa;
3804 my $cv = [ (getfield $vclogp, 'Version'),
3805 "Version field from dpkg-parsechangelog @xa" ];
3806 infopair_cond_equal($i_arch_v, $cv);
3809 $@ =~ s/^dgit: //gm;
3811 "Perhaps debian/changelog does not mention $v ?";
3816 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3820 sub pseudomerge_make_commit ($$$$ $$) {
3821 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3822 $msg_cmd, $msg_msg) = @_;
3823 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3825 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3826 my $authline = clogp_authline $clogp;
3830 !defined $overwrite_version ? ""
3831 : !length $overwrite_version ? " --overwrite"
3832 : " --overwrite=".$overwrite_version;
3835 my $pmf = ".git/dgit/pseudomerge";
3836 open MC, ">", $pmf or die "$pmf $!";
3837 print MC <<END or die $!;
3840 parent $archive_hash
3850 return make_commit($pmf);
3853 sub splitbrain_pseudomerge ($$$$) {
3854 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3855 # => $merged_dgitview
3856 printdebug "splitbrain_pseudomerge...\n";
3858 # We: debian/PREVIOUS HEAD($maintview)
3859 # expect: o ----------------- o
3862 # a/d/PREVIOUS $dgitview
3865 # we do: `------------------ o
3869 return $dgitview unless defined $archive_hash;
3871 printdebug "splitbrain_pseudomerge...\n";
3873 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3875 if (!defined $overwrite_version) {
3876 progress "Checking that HEAD inciudes all changes in archive...";
3879 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3881 if (defined $overwrite_version) {
3883 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3884 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3885 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3886 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3887 my $i_archive = [ $archive_hash, "current archive contents" ];
3889 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3891 infopair_cond_equal($i_dgit, $i_archive);
3892 infopair_cond_ff($i_dep14, $i_dgit);
3893 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3897 $us: check failed (maybe --overwrite is needed, consult documentation)
3902 my $r = pseudomerge_make_commit
3903 $clogp, $dgitview, $archive_hash, $i_arch_v,
3904 "dgit --quilt=$quilt_mode",
3905 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3906 Declare fast forward from $i_arch_v->[0]
3908 Make fast forward from $i_arch_v->[0]
3911 maybe_split_brain_save $maintview, $r, "pseudomerge";
3913 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3917 sub plain_overwrite_pseudomerge ($$$) {
3918 my ($clogp, $head, $archive_hash) = @_;
3920 printdebug "plain_overwrite_pseudomerge...";
3922 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3924 return $head if is_fast_fwd $archive_hash, $head;
3926 my $m = "Declare fast forward from $i_arch_v->[0]";
3928 my $r = pseudomerge_make_commit
3929 $clogp, $head, $archive_hash, $i_arch_v,
3932 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3934 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3938 sub push_parse_changelog ($) {
3941 my $clogp = Dpkg::Control::Hash->new();
3942 $clogp->load($clogpfn) or die;
3944 my $clogpackage = getfield $clogp, 'Source';
3945 $package //= $clogpackage;
3946 fail "-p specified $package but changelog specified $clogpackage"
3947 unless $package eq $clogpackage;
3948 my $cversion = getfield $clogp, 'Version';
3950 if (!$we_are_initiator) {
3951 # rpush initiator can't do this because it doesn't have $isuite yet
3952 my $tag = debiantag($cversion, access_nomdistro);
3953 runcmd @git, qw(check-ref-format), $tag;
3956 my $dscfn = dscfn($cversion);
3958 return ($clogp, $cversion, $dscfn);
3961 sub push_parse_dsc ($$$) {
3962 my ($dscfn,$dscfnwhat, $cversion) = @_;
3963 $dsc = parsecontrol($dscfn,$dscfnwhat);
3964 my $dversion = getfield $dsc, 'Version';
3965 my $dscpackage = getfield $dsc, 'Source';
3966 ($dscpackage eq $package && $dversion eq $cversion) or
3967 fail "$dscfn is for $dscpackage $dversion".
3968 " but debian/changelog is for $package $cversion";
3971 sub push_tagwants ($$$$) {
3972 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3975 TagFn => \&debiantag,
3980 if (defined $maintviewhead) {
3982 TagFn => \&debiantag_maintview,
3983 Objid => $maintviewhead,
3984 TfSuffix => '-maintview',
3987 } elsif ($dodep14tag eq 'no' ? 0
3988 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3989 : $dodep14tag eq 'always'
3990 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3991 --dep14tag-always (or equivalent in config) means server must support
3992 both "new" and "maint" tag formats, but config says it doesn't.
3994 : die "$dodep14tag ?") {
3996 TagFn => \&debiantag_maintview,
3998 TfSuffix => '-dgit',
4002 foreach my $tw (@tagwants) {
4003 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4004 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4006 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4010 sub push_mktags ($$ $$ $) {
4012 $changesfile,$changesfilewhat,
4015 die unless $tagwants->[0]{View} eq 'dgit';
4017 my $declaredistro = access_nomdistro();
4018 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4019 $dsc->{$ourdscfield[0]} = join " ",
4020 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4022 $dsc->save("$dscfn.tmp") or die $!;
4024 my $changes = parsecontrol($changesfile,$changesfilewhat);
4025 foreach my $field (qw(Source Distribution Version)) {
4026 $changes->{$field} eq $clogp->{$field} or
4027 fail "changes field $field \`$changes->{$field}'".
4028 " does not match changelog \`$clogp->{$field}'";
4031 my $cversion = getfield $clogp, 'Version';
4032 my $clogsuite = getfield $clogp, 'Distribution';
4034 # We make the git tag by hand because (a) that makes it easier
4035 # to control the "tagger" (b) we can do remote signing
4036 my $authline = clogp_authline $clogp;
4037 my $delibs = join(" ", "",@deliberatelies);
4041 my $tfn = $tw->{Tfn};
4042 my $head = $tw->{Objid};
4043 my $tag = $tw->{Tag};
4045 open TO, '>', $tfn->('.tmp') or die $!;
4046 print TO <<END or die $!;
4053 if ($tw->{View} eq 'dgit') {
4054 print TO <<END or die $!;
4055 $package release $cversion for $clogsuite ($csuite) [dgit]
4056 [dgit distro=$declaredistro$delibs]
4058 foreach my $ref (sort keys %previously) {
4059 print TO <<END or die $!;
4060 [dgit previously:$ref=$previously{$ref}]
4063 } elsif ($tw->{View} eq 'maint') {
4064 print TO <<END or die $!;
4065 $package release $cversion for $clogsuite ($csuite)
4066 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4069 die Dumper($tw)."?";
4074 my $tagobjfn = $tfn->('.tmp');
4076 if (!defined $keyid) {
4077 $keyid = access_cfg('keyid','RETURN-UNDEF');
4079 if (!defined $keyid) {
4080 $keyid = getfield $clogp, 'Maintainer';
4082 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4083 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4084 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4085 push @sign_cmd, $tfn->('.tmp');
4086 runcmd_ordryrun @sign_cmd;
4088 $tagobjfn = $tfn->('.signed.tmp');
4089 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4090 $tfn->('.tmp'), $tfn->('.tmp.asc');
4096 my @r = map { $mktag->($_); } @$tagwants;
4100 sub sign_changes ($) {
4101 my ($changesfile) = @_;
4103 my @debsign_cmd = @debsign;
4104 push @debsign_cmd, "-k$keyid" if defined $keyid;
4105 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4106 push @debsign_cmd, $changesfile;
4107 runcmd_ordryrun @debsign_cmd;
4112 printdebug "actually entering push\n";
4114 supplementary_message(<<'END');
4115 Push failed, while checking state of the archive.
4116 You can retry the push, after fixing the problem, if you like.
4118 if (check_for_git()) {
4121 my $archive_hash = fetch_from_archive();
4122 if (!$archive_hash) {
4124 fail "package appears to be new in this suite;".
4125 " if this is intentional, use --new";
4128 supplementary_message(<<'END');
4129 Push failed, while preparing your push.
4130 You can retry the push, after fixing the problem, if you like.
4133 need_tagformat 'new', "quilt mode $quilt_mode"
4134 if quiltmode_splitbrain;
4138 access_giturl(); # check that success is vaguely likely
4139 rpush_handle_protovsn_bothends() if $we_are_initiator;
4142 my $clogpfn = ".git/dgit/changelog.822.tmp";
4143 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4145 responder_send_file('parsed-changelog', $clogpfn);
4147 my ($clogp, $cversion, $dscfn) =
4148 push_parse_changelog("$clogpfn");
4150 my $dscpath = "$buildproductsdir/$dscfn";
4151 stat_exists $dscpath or
4152 fail "looked for .dsc $dscpath, but $!;".
4153 " maybe you forgot to build";
4155 responder_send_file('dsc', $dscpath);
4157 push_parse_dsc($dscpath, $dscfn, $cversion);
4159 my $format = getfield $dsc, 'Format';
4160 printdebug "format $format\n";
4162 my $actualhead = git_rev_parse('HEAD');
4163 my $dgithead = $actualhead;
4164 my $maintviewhead = undef;
4166 my $upstreamversion = upstreamversion $clogp->{Version};
4168 if (madformat_wantfixup($format)) {
4169 # user might have not used dgit build, so maybe do this now:
4170 if (quiltmode_splitbrain()) {
4172 quilt_make_fake_dsc($upstreamversion);
4174 ($dgithead, $cachekey) =
4175 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4177 "--quilt=$quilt_mode but no cached dgit view:
4178 perhaps tree changed since dgit build[-source] ?";
4180 $dgithead = splitbrain_pseudomerge($clogp,
4181 $actualhead, $dgithead,
4183 $maintviewhead = $actualhead;
4184 changedir '../../../..';
4185 prep_ud(); # so _only_subdir() works, below
4187 commit_quilty_patch();
4191 if (defined $overwrite_version && !defined $maintviewhead) {
4192 $dgithead = plain_overwrite_pseudomerge($clogp,
4200 if ($archive_hash) {
4201 if (is_fast_fwd($archive_hash, $dgithead)) {
4203 } elsif (deliberately_not_fast_forward) {
4206 fail "dgit push: HEAD is not a descendant".
4207 " of the archive's version.\n".
4208 "To overwrite the archive's contents,".
4209 " pass --overwrite[=VERSION].\n".
4210 "To rewind history, if permitted by the archive,".
4211 " use --deliberately-not-fast-forward.";
4216 progress "checking that $dscfn corresponds to HEAD";
4217 runcmd qw(dpkg-source -x --),
4218 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4219 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4220 check_for_vendor_patches() if madformat($dsc->{format});
4221 changedir '../../../..';
4222 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4223 debugcmd "+",@diffcmd;
4225 my $r = system @diffcmd;
4228 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4230 HEAD specifies a different tree to $dscfn:
4232 Perhaps you forgot to build. Or perhaps there is a problem with your
4233 source tree (see dgit(7) for some hints). To see a full diff, run
4240 if (!$changesfile) {
4241 my $pat = changespat $cversion;
4242 my @cs = glob "$buildproductsdir/$pat";
4243 fail "failed to find unique changes file".
4244 " (looked for $pat in $buildproductsdir);".
4245 " perhaps you need to use dgit -C"
4247 ($changesfile) = @cs;
4249 $changesfile = "$buildproductsdir/$changesfile";
4252 # Check that changes and .dsc agree enough
4253 $changesfile =~ m{[^/]*$};
4254 my $changes = parsecontrol($changesfile,$&);
4255 files_compare_inputs($dsc, $changes)
4256 unless forceing [qw(dsc-changes-mismatch)];
4258 # Perhaps adjust .dsc to contain right set of origs
4259 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4261 unless forceing [qw(changes-origs-exactly)];
4263 # Checks complete, we're going to try and go ahead:
4265 responder_send_file('changes',$changesfile);
4266 responder_send_command("param head $dgithead");
4267 responder_send_command("param csuite $csuite");
4268 responder_send_command("param isuite $isuite");
4269 responder_send_command("param tagformat $tagformat");
4270 if (defined $maintviewhead) {
4271 die unless ($protovsn//4) >= 4;
4272 responder_send_command("param maint-view $maintviewhead");
4275 if (deliberately_not_fast_forward) {
4276 git_for_each_ref(lrfetchrefs, sub {
4277 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4278 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4279 responder_send_command("previously $rrefname=$objid");
4280 $previously{$rrefname} = $objid;
4284 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4288 supplementary_message(<<'END');
4289 Push failed, while signing the tag.
4290 You can retry the push, after fixing the problem, if you like.
4292 # If we manage to sign but fail to record it anywhere, it's fine.
4293 if ($we_are_responder) {
4294 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4295 responder_receive_files('signed-tag', @tagobjfns);
4297 @tagobjfns = push_mktags($clogp,$dscpath,
4298 $changesfile,$changesfile,
4301 supplementary_message(<<'END');
4302 Push failed, *after* signing the tag.
4303 If you want to try again, you should use a new version number.
4306 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4308 foreach my $tw (@tagwants) {
4309 my $tag = $tw->{Tag};
4310 my $tagobjfn = $tw->{TagObjFn};
4312 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4313 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4314 runcmd_ordryrun_local
4315 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4318 supplementary_message(<<'END');
4319 Push failed, while updating the remote git repository - see messages above.
4320 If you want to try again, you should use a new version number.
4322 if (!check_for_git()) {
4323 create_remote_git_repo();
4326 my @pushrefs = $forceflag.$dgithead.":".rrref();
4327 foreach my $tw (@tagwants) {
4328 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4331 runcmd_ordryrun @git,
4332 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4333 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4335 supplementary_message(<<'END');
4336 Push failed, while obtaining signatures on the .changes and .dsc.
4337 If it was just that the signature failed, you may try again by using
4338 debsign by hand to sign the changes
4340 and then dput to complete the upload.
4341 If you need to change the package, you must use a new version number.
4343 if ($we_are_responder) {
4344 my $dryrunsuffix = act_local() ? "" : ".tmp";
4345 responder_receive_files('signed-dsc-changes',
4346 "$dscpath$dryrunsuffix",
4347 "$changesfile$dryrunsuffix");
4350 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4352 progress "[new .dsc left in $dscpath.tmp]";
4354 sign_changes $changesfile;
4357 supplementary_message(<<END);
4358 Push failed, while uploading package(s) to the archive server.
4359 You can retry the upload of exactly these same files with dput of:
4361 If that .changes file is broken, you will need to use a new version
4362 number for your next attempt at the upload.
4364 my $host = access_cfg('upload-host','RETURN-UNDEF');
4365 my @hostarg = defined($host) ? ($host,) : ();
4366 runcmd_ordryrun @dput, @hostarg, $changesfile;
4367 printdone "pushed and uploaded $cversion";
4369 supplementary_message('');
4370 responder_send_command("complete");
4376 badusage "-p is not allowed with clone; specify as argument instead"
4377 if defined $package;
4380 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4381 ($package,$isuite) = @ARGV;
4382 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4383 ($package,$dstdir) = @ARGV;
4384 } elsif (@ARGV==3) {
4385 ($package,$isuite,$dstdir) = @ARGV;
4387 badusage "incorrect arguments to dgit clone";
4391 $dstdir ||= "$package";
4392 if (stat_exists $dstdir) {
4393 fail "$dstdir already exists";
4397 if ($rmonerror && !$dryrun_level) {
4398 $cwd_remove= getcwd();
4400 return unless defined $cwd_remove;
4401 if (!chdir "$cwd_remove") {
4402 return if $!==&ENOENT;
4403 die "chdir $cwd_remove: $!";
4405 printdebug "clone rmonerror removing $dstdir\n";
4407 rmtree($dstdir) or die "remove $dstdir: $!\n";
4408 } elsif (grep { $! == $_ }
4409 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4411 print STDERR "check whether to remove $dstdir: $!\n";
4417 $cwd_remove = undef;
4420 sub branchsuite () {
4421 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4422 if ($branch =~ m#$lbranch_re#o) {
4429 sub fetchpullargs () {
4430 if (!defined $package) {
4431 my $sourcep = parsecontrol('debian/control','debian/control');
4432 $package = getfield $sourcep, 'Source';
4435 $isuite = branchsuite();
4437 my $clogp = parsechangelog();
4438 my $clogsuite = getfield $clogp, 'Distribution';
4439 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4441 } elsif (@ARGV==1) {
4444 badusage "incorrect arguments to dgit fetch or dgit pull";
4452 my $multi_fetched = fork_for_multisuite(sub { });
4453 exit 0 if $multi_fetched;
4460 if (quiltmode_splitbrain()) {
4461 my ($format, $fopts) = get_source_format();
4462 madformat($format) and fail <<END
4463 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4471 badusage "-p is not allowed with dgit push" if defined $package;
4473 my $clogp = parsechangelog();
4474 $package = getfield $clogp, 'Source';
4477 } elsif (@ARGV==1) {
4478 ($specsuite) = (@ARGV);
4480 badusage "incorrect arguments to dgit push";
4482 $isuite = getfield $clogp, 'Distribution';
4485 local ($package) = $existing_package; # this is a hack
4486 canonicalise_suite();
4488 canonicalise_suite();
4490 if (defined $specsuite &&
4491 $specsuite ne $isuite &&
4492 $specsuite ne $csuite) {
4493 fail "dgit push: changelog specifies $isuite ($csuite)".
4494 " but command line specifies $specsuite";
4499 #---------- remote commands' implementation ----------
4501 sub cmd_remote_push_build_host {
4502 my ($nrargs) = shift @ARGV;
4503 my (@rargs) = @ARGV[0..$nrargs-1];
4504 @ARGV = @ARGV[$nrargs..$#ARGV];
4506 my ($dir,$vsnwant) = @rargs;
4507 # vsnwant is a comma-separated list; we report which we have
4508 # chosen in our ready response (so other end can tell if they
4511 $we_are_responder = 1;
4512 $us .= " (build host)";
4514 open PI, "<&STDIN" or die $!;
4515 open STDIN, "/dev/null" or die $!;
4516 open PO, ">&STDOUT" or die $!;
4518 open STDOUT, ">&STDERR" or die $!;
4522 ($protovsn) = grep {
4523 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4524 } @rpushprotovsn_support;
4526 fail "build host has dgit rpush protocol versions ".
4527 (join ",", @rpushprotovsn_support).
4528 " but invocation host has $vsnwant"
4529 unless defined $protovsn;
4531 responder_send_command("dgit-remote-push-ready $protovsn");
4536 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4537 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4538 # a good error message)
4540 sub rpush_handle_protovsn_bothends () {
4541 if ($protovsn < 4) {
4542 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4551 my $report = i_child_report();
4552 if (defined $report) {
4553 printdebug "($report)\n";
4554 } elsif ($i_child_pid) {
4555 printdebug "(killing build host child $i_child_pid)\n";
4556 kill 15, $i_child_pid;
4558 if (defined $i_tmp && !defined $initiator_tempdir) {
4560 eval { rmtree $i_tmp; };
4565 return unless forkcheck_mainprocess();
4570 my ($base,$selector,@args) = @_;
4571 $selector =~ s/\-/_/g;
4572 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4578 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4586 push @rargs, join ",", @rpushprotovsn_support;
4589 push @rdgit, @ropts;
4590 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4592 my @cmd = (@ssh, $host, shellquote @rdgit);
4595 $we_are_initiator=1;
4597 if (defined $initiator_tempdir) {
4598 rmtree $initiator_tempdir;
4599 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4600 $i_tmp = $initiator_tempdir;
4604 $i_child_pid = open2(\*RO, \*RI, @cmd);
4606 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4607 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4608 $supplementary_message = '' unless $protovsn >= 3;
4611 my ($icmd,$iargs) = initiator_expect {
4612 m/^(\S+)(?: (.*))?$/;
4615 i_method "i_resp", $icmd, $iargs;
4619 sub i_resp_progress ($) {
4621 my $msg = protocol_read_bytes \*RO, $rhs;
4625 sub i_resp_supplementary_message ($) {
4627 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4630 sub i_resp_complete {
4631 my $pid = $i_child_pid;
4632 $i_child_pid = undef; # prevents killing some other process with same pid
4633 printdebug "waiting for build host child $pid...\n";
4634 my $got = waitpid $pid, 0;
4635 die $! unless $got == $pid;
4636 die "build host child failed $?" if $?;
4639 printdebug "all done\n";
4643 sub i_resp_file ($) {
4645 my $localname = i_method "i_localname", $keyword;
4646 my $localpath = "$i_tmp/$localname";
4647 stat_exists $localpath and
4648 badproto \*RO, "file $keyword ($localpath) twice";
4649 protocol_receive_file \*RO, $localpath;
4650 i_method "i_file", $keyword;
4655 sub i_resp_param ($) {
4656 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4660 sub i_resp_previously ($) {
4661 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4662 or badproto \*RO, "bad previously spec";
4663 my $r = system qw(git check-ref-format), $1;
4664 die "bad previously ref spec ($r)" if $r;
4665 $previously{$1} = $2;
4670 sub i_resp_want ($) {
4672 die "$keyword ?" if $i_wanted{$keyword}++;
4674 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4675 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4676 die unless $isuite =~ m/^$suite_re$/;
4679 rpush_handle_protovsn_bothends();
4681 fail "rpush negotiated protocol version $protovsn".
4682 " which does not support quilt mode $quilt_mode"
4683 if quiltmode_splitbrain;
4685 my @localpaths = i_method "i_want", $keyword;
4686 printdebug "[[ $keyword @localpaths\n";
4687 foreach my $localpath (@localpaths) {
4688 protocol_send_file \*RI, $localpath;
4690 print RI "files-end\n" or die $!;
4693 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4695 sub i_localname_parsed_changelog {
4696 return "remote-changelog.822";
4698 sub i_file_parsed_changelog {
4699 ($i_clogp, $i_version, $i_dscfn) =
4700 push_parse_changelog "$i_tmp/remote-changelog.822";
4701 die if $i_dscfn =~ m#/|^\W#;
4704 sub i_localname_dsc {
4705 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4710 sub i_localname_changes {
4711 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4712 $i_changesfn = $i_dscfn;
4713 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4714 return $i_changesfn;
4716 sub i_file_changes { }
4718 sub i_want_signed_tag {
4719 printdebug Dumper(\%i_param, $i_dscfn);
4720 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4721 && defined $i_param{'csuite'}
4722 or badproto \*RO, "premature desire for signed-tag";
4723 my $head = $i_param{'head'};
4724 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4726 my $maintview = $i_param{'maint-view'};
4727 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4730 if ($protovsn >= 4) {
4731 my $p = $i_param{'tagformat'} // '<undef>';
4733 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4736 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4738 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4740 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4743 push_mktags $i_clogp, $i_dscfn,
4744 $i_changesfn, 'remote changes',
4748 sub i_want_signed_dsc_changes {
4749 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4750 sign_changes $i_changesfn;
4751 return ($i_dscfn, $i_changesfn);
4754 #---------- building etc. ----------
4760 #----- `3.0 (quilt)' handling -----
4762 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4764 sub quiltify_dpkg_commit ($$$;$) {
4765 my ($patchname,$author,$msg, $xinfo) = @_;
4769 my $descfn = ".git/dgit/quilt-description.tmp";
4770 open O, '>', $descfn or die "$descfn: $!";
4771 $msg =~ s/\n+/\n\n/;
4772 print O <<END or die $!;
4774 ${xinfo}Subject: $msg
4781 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4782 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4783 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4784 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4788 sub quiltify_trees_differ ($$;$$$) {
4789 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4790 # returns true iff the two tree objects differ other than in debian/
4791 # with $finegrained,
4792 # returns bitmask 01 - differ in upstream files except .gitignore
4793 # 02 - differ in .gitignore
4794 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4795 # is set for each modified .gitignore filename $fn
4796 # if $unrepres is defined, array ref to which is appeneded
4797 # a list of unrepresentable changes (removals of upstream files
4800 my @cmd = (@git, qw(diff-tree -z));
4801 push @cmd, qw(--name-only) unless $unrepres;
4802 push @cmd, qw(-r) if $finegrained || $unrepres;
4804 my $diffs= cmdoutput @cmd;
4807 foreach my $f (split /\0/, $diffs) {
4808 if ($unrepres && !@lmodes) {
4809 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4812 my ($oldmode,$newmode) = @lmodes;
4815 next if $f =~ m#^debian(?:/.*)?$#s;
4819 die "not a plain file\n"
4820 unless $newmode =~ m/^10\d{4}$/ ||
4821 $oldmode =~ m/^10\d{4}$/;
4822 if ($oldmode =~ m/[^0]/ &&
4823 $newmode =~ m/[^0]/) {
4824 die "mode changed\n" if $oldmode ne $newmode;
4826 die "non-default mode\n"
4827 unless $newmode =~ m/^100644$/ ||
4828 $oldmode =~ m/^100644$/;
4832 local $/="\n"; chomp $@;
4833 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4837 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4838 $r |= $isignore ? 02 : 01;
4839 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4841 printdebug "quiltify_trees_differ $x $y => $r\n";
4845 sub quiltify_tree_sentinelfiles ($) {
4846 # lists the `sentinel' files present in the tree
4848 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4849 qw(-- debian/rules debian/control);
4854 sub quiltify_splitbrain_needed () {
4855 if (!$split_brain) {
4856 progress "dgit view: changes are required...";
4857 runcmd @git, qw(checkout -q -b dgit-view);
4862 sub quiltify_splitbrain ($$$$$$) {
4863 my ($clogp, $unapplied, $headref, $diffbits,
4864 $editedignores, $cachekey) = @_;
4865 if ($quilt_mode !~ m/gbp|dpm/) {
4866 # treat .gitignore just like any other upstream file
4867 $diffbits = { %$diffbits };
4868 $_ = !!$_ foreach values %$diffbits;
4870 # We would like any commits we generate to be reproducible
4871 my @authline = clogp_authline($clogp);
4872 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4873 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4874 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4875 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4876 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4877 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4879 if ($quilt_mode =~ m/gbp|unapplied/ &&
4880 ($diffbits->{O2H} & 01)) {
4882 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4883 " but git tree differs from orig in upstream files.";
4884 if (!stat_exists "debian/patches") {
4886 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4890 if ($quilt_mode =~ m/dpm/ &&
4891 ($diffbits->{H2A} & 01)) {
4893 --quilt=$quilt_mode specified, implying patches-applied git tree
4894 but git tree differs from result of applying debian/patches to upstream
4897 if ($quilt_mode =~ m/gbp|unapplied/ &&
4898 ($diffbits->{O2A} & 01)) { # some patches
4899 quiltify_splitbrain_needed();
4900 progress "dgit view: creating patches-applied version using gbp pq";
4901 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4902 # gbp pq import creates a fresh branch; push back to dgit-view
4903 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4904 runcmd @git, qw(checkout -q dgit-view);
4906 if ($quilt_mode =~ m/gbp|dpm/ &&
4907 ($diffbits->{O2A} & 02)) {
4909 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4910 tool which does not create patches for changes to upstream
4911 .gitignores: but, such patches exist in debian/patches.
4914 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4915 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4916 quiltify_splitbrain_needed();
4917 progress "dgit view: creating patch to represent .gitignore changes";
4918 ensuredir "debian/patches";
4919 my $gipatch = "debian/patches/auto-gitignore";
4920 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4921 stat GIPATCH or die "$gipatch: $!";
4922 fail "$gipatch already exists; but want to create it".
4923 " to record .gitignore changes" if (stat _)[7];
4924 print GIPATCH <<END or die "$gipatch: $!";
4925 Subject: Update .gitignore from Debian packaging branch
4927 The Debian packaging git branch contains these updates to the upstream
4928 .gitignore file(s). This patch is autogenerated, to provide these
4929 updates to users of the official Debian archive view of the package.
4931 [dgit ($our_version) update-gitignore]
4934 close GIPATCH or die "$gipatch: $!";
4935 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4936 $unapplied, $headref, "--", sort keys %$editedignores;
4937 open SERIES, "+>>", "debian/patches/series" or die $!;
4938 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4940 defined read SERIES, $newline, 1 or die $!;
4941 print SERIES "\n" or die $! unless $newline eq "\n";
4942 print SERIES "auto-gitignore\n" or die $!;
4943 close SERIES or die $!;
4944 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4946 Commit patch to update .gitignore
4948 [dgit ($our_version) update-gitignore-quilt-fixup]
4952 my $dgitview = git_rev_parse 'HEAD';
4954 changedir '../../../..';
4955 # When we no longer need to support squeeze, use --create-reflog
4957 ensuredir ".git/logs/refs/dgit-intern";
4958 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4961 my $oldcache = git_get_ref "refs/$splitbraincache";
4962 if ($oldcache eq $dgitview) {
4963 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4964 # git update-ref doesn't always update, in this case. *sigh*
4965 my $dummy = make_commit_text <<END;
4968 author Dgit <dgit\@example.com> 1000000000 +0000
4969 committer Dgit <dgit\@example.com> 1000000000 +0000
4971 Dummy commit - do not use
4973 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4974 "refs/$splitbraincache", $dummy;
4976 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4979 changedir '.git/dgit/unpack/work';
4981 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4982 progress "dgit view: created ($saved)";
4985 sub quiltify ($$$$) {
4986 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4988 # Quilt patchification algorithm
4990 # We search backwards through the history of the main tree's HEAD
4991 # (T) looking for a start commit S whose tree object is identical
4992 # to to the patch tip tree (ie the tree corresponding to the
4993 # current dpkg-committed patch series). For these purposes
4994 # `identical' disregards anything in debian/ - this wrinkle is
4995 # necessary because dpkg-source treates debian/ specially.
4997 # We can only traverse edges where at most one of the ancestors'
4998 # trees differs (in changes outside in debian/). And we cannot
4999 # handle edges which change .pc/ or debian/patches. To avoid
5000 # going down a rathole we avoid traversing edges which introduce
5001 # debian/rules or debian/control. And we set a limit on the
5002 # number of edges we are willing to look at.
5004 # If we succeed, we walk forwards again. For each traversed edge
5005 # PC (with P parent, C child) (starting with P=S and ending with
5006 # C=T) to we do this:
5008 # - dpkg-source --commit with a patch name and message derived from C
5009 # After traversing PT, we git commit the changes which
5010 # should be contained within debian/patches.
5012 # The search for the path S..T is breadth-first. We maintain a
5013 # todo list containing search nodes. A search node identifies a
5014 # commit, and looks something like this:
5016 # Commit => $git_commit_id,
5017 # Child => $c, # or undef if P=T
5018 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5019 # Nontrivial => true iff $p..$c has relevant changes
5026 my %considered; # saves being exponential on some weird graphs
5028 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5031 my ($search,$whynot) = @_;
5032 printdebug " search NOT $search->{Commit} $whynot\n";
5033 $search->{Whynot} = $whynot;
5034 push @nots, $search;
5035 no warnings qw(exiting);
5044 my $c = shift @todo;
5045 next if $considered{$c->{Commit}}++;
5047 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5049 printdebug "quiltify investigate $c->{Commit}\n";
5052 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5053 printdebug " search finished hooray!\n";
5058 if ($quilt_mode eq 'nofix') {
5059 fail "quilt fixup required but quilt mode is \`nofix'\n".
5060 "HEAD commit $c->{Commit} differs from tree implied by ".
5061 " debian/patches (tree object $oldtiptree)";
5063 if ($quilt_mode eq 'smash') {
5064 printdebug " search quitting smash\n";
5068 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5069 $not->($c, "has $c_sentinels not $t_sentinels")
5070 if $c_sentinels ne $t_sentinels;
5072 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5073 $commitdata =~ m/\n\n/;
5075 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5076 @parents = map { { Commit => $_, Child => $c } } @parents;
5078 $not->($c, "root commit") if !@parents;
5080 foreach my $p (@parents) {
5081 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5083 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5084 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5086 foreach my $p (@parents) {
5087 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5089 my @cmd= (@git, qw(diff-tree -r --name-only),
5090 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5091 my $patchstackchange = cmdoutput @cmd;
5092 if (length $patchstackchange) {
5093 $patchstackchange =~ s/\n/,/g;
5094 $not->($p, "changed $patchstackchange");
5097 printdebug " search queue P=$p->{Commit} ",
5098 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5104 printdebug "quiltify want to smash\n";
5107 my $x = $_[0]{Commit};
5108 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5111 my $reportnot = sub {
5113 my $s = $abbrev->($notp);
5114 my $c = $notp->{Child};
5115 $s .= "..".$abbrev->($c) if $c;
5116 $s .= ": ".$notp->{Whynot};
5119 if ($quilt_mode eq 'linear') {
5120 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5121 foreach my $notp (@nots) {
5122 print STDERR "$us: ", $reportnot->($notp), "\n";
5124 print STDERR "$us: $_\n" foreach @$failsuggestion;
5125 fail "quilt fixup naive history linearisation failed.\n".
5126 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5127 } elsif ($quilt_mode eq 'smash') {
5128 } elsif ($quilt_mode eq 'auto') {
5129 progress "quilt fixup cannot be linear, smashing...";
5131 die "$quilt_mode ?";
5134 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5135 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5137 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5139 quiltify_dpkg_commit "auto-$version-$target-$time",
5140 (getfield $clogp, 'Maintainer'),
5141 "Automatically generated patch ($clogp->{Version})\n".
5142 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5146 progress "quiltify linearisation planning successful, executing...";
5148 for (my $p = $sref_S;
5149 my $c = $p->{Child};
5151 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5152 next unless $p->{Nontrivial};
5154 my $cc = $c->{Commit};
5156 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5157 $commitdata =~ m/\n\n/ or die "$c ?";
5160 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5163 my $commitdate = cmdoutput
5164 @git, qw(log -n1 --pretty=format:%aD), $cc;
5166 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5168 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5175 my $gbp_check_suitable = sub {
5180 die "contains unexpected slashes\n" if m{//} || m{/$};
5181 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5182 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5183 die "too long" if length > 200;
5185 return $_ unless $@;
5186 print STDERR "quiltifying commit $cc:".
5187 " ignoring/dropping Gbp-Pq $what: $@";
5191 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5193 (\S+) \s* \n //ixm) {
5194 $patchname = $gbp_check_suitable->($1, 'Name');
5196 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5198 (\S+) \s* \n //ixm) {
5199 $patchdir = $gbp_check_suitable->($1, 'Topic');
5204 if (!defined $patchname) {
5205 $patchname = $title;
5206 $patchname =~ s/[.:]$//;
5209 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5210 my $translitname = $converter->convert($patchname);
5211 die unless defined $translitname;
5212 $patchname = $translitname;
5215 "dgit: patch title transliteration error: $@"
5217 $patchname =~ y/ A-Z/-a-z/;
5218 $patchname =~ y/-a-z0-9_.+=~//cd;
5219 $patchname =~ s/^\W/x-$&/;
5220 $patchname = substr($patchname,0,40);
5222 if (!defined $patchdir) {
5225 if (length $patchdir) {
5226 $patchname = "$patchdir/$patchname";
5228 if ($patchname =~ m{^(.*)/}) {
5229 mkpath "debian/patches/$1";
5234 stat "debian/patches/$patchname$index";
5236 $!==ENOENT or die "$patchname$index $!";
5238 runcmd @git, qw(checkout -q), $cc;
5240 # We use the tip's changelog so that dpkg-source doesn't
5241 # produce complaining messages from dpkg-parsechangelog. None
5242 # of the information dpkg-source gets from the changelog is
5243 # actually relevant - it gets put into the original message
5244 # which dpkg-source provides our stunt editor, and then
5246 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5248 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5249 "Date: $commitdate\n".
5250 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5252 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5255 runcmd @git, qw(checkout -q master);
5258 sub build_maybe_quilt_fixup () {
5259 my ($format,$fopts) = get_source_format;
5260 return unless madformat_wantfixup $format;
5263 check_for_vendor_patches();
5265 if (quiltmode_splitbrain) {
5266 fail <<END unless access_cfg_tagformats_can_splitbrain;
5267 quilt mode $quilt_mode requires split view so server needs to support
5268 both "new" and "maint" tag formats, but config says it doesn't.
5272 my $clogp = parsechangelog();
5273 my $headref = git_rev_parse('HEAD');
5278 my $upstreamversion = upstreamversion $version;
5280 if ($fopts->{'single-debian-patch'}) {
5281 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5283 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5286 die 'bug' if $split_brain && !$need_split_build_invocation;
5288 changedir '../../../..';
5289 runcmd_ordryrun_local
5290 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5293 sub quilt_fixup_mkwork ($) {
5296 mkdir "work" or die $!;
5298 mktree_in_ud_here();
5299 runcmd @git, qw(reset -q --hard), $headref;
5302 sub quilt_fixup_linkorigs ($$) {
5303 my ($upstreamversion, $fn) = @_;
5304 # calls $fn->($leafname);
5306 foreach my $f (<../../../../*>) { #/){
5307 my $b=$f; $b =~ s{.*/}{};
5309 local ($debuglevel) = $debuglevel-1;
5310 printdebug "QF linkorigs $b, $f ?\n";
5312 next unless is_orig_file_of_vsn $b, $upstreamversion;
5313 printdebug "QF linkorigs $b, $f Y\n";
5314 link_ltarget $f, $b or die "$b $!";
5319 sub quilt_fixup_delete_pc () {
5320 runcmd @git, qw(rm -rqf .pc);
5322 Commit removal of .pc (quilt series tracking data)
5324 [dgit ($our_version) upgrade quilt-remove-pc]
5328 sub quilt_fixup_singlepatch ($$$) {
5329 my ($clogp, $headref, $upstreamversion) = @_;
5331 progress "starting quiltify (single-debian-patch)";
5333 # dpkg-source --commit generates new patches even if
5334 # single-debian-patch is in debian/source/options. In order to
5335 # get it to generate debian/patches/debian-changes, it is
5336 # necessary to build the source package.
5338 quilt_fixup_linkorigs($upstreamversion, sub { });
5339 quilt_fixup_mkwork($headref);
5341 rmtree("debian/patches");
5343 runcmd @dpkgsource, qw(-b .);
5345 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5346 rename srcfn("$upstreamversion", "/debian/patches"),
5347 "work/debian/patches";
5350 commit_quilty_patch();
5353 sub quilt_make_fake_dsc ($) {
5354 my ($upstreamversion) = @_;
5356 my $fakeversion="$upstreamversion-~~DGITFAKE";
5358 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5359 print $fakedsc <<END or die $!;
5362 Version: $fakeversion
5366 my $dscaddfile=sub {
5369 my $md = new Digest::MD5;
5371 my $fh = new IO::File $b, '<' or die "$b $!";
5376 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5379 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5381 my @files=qw(debian/source/format debian/rules
5382 debian/control debian/changelog);
5383 foreach my $maybe (qw(debian/patches debian/source/options
5384 debian/tests/control)) {
5385 next unless stat_exists "../../../$maybe";
5386 push @files, $maybe;
5389 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5390 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5392 $dscaddfile->($debtar);
5393 close $fakedsc or die $!;
5396 sub quilt_check_splitbrain_cache ($$) {
5397 my ($headref, $upstreamversion) = @_;
5398 # Called only if we are in (potentially) split brain mode.
5400 # Computes the cache key and looks in the cache.
5401 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5403 my $splitbrain_cachekey;
5406 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5407 # we look in the reflog of dgit-intern/quilt-cache
5408 # we look for an entry whose message is the key for the cache lookup
5409 my @cachekey = (qw(dgit), $our_version);
5410 push @cachekey, $upstreamversion;
5411 push @cachekey, $quilt_mode;
5412 push @cachekey, $headref;
5414 push @cachekey, hashfile('fake.dsc');
5416 my $srcshash = Digest::SHA->new(256);
5417 my %sfs = ( %INC, '$0(dgit)' => $0 );
5418 foreach my $sfk (sort keys %sfs) {
5419 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5420 $srcshash->add($sfk," ");
5421 $srcshash->add(hashfile($sfs{$sfk}));
5422 $srcshash->add("\n");
5424 push @cachekey, $srcshash->hexdigest();
5425 $splitbrain_cachekey = "@cachekey";
5427 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5429 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5430 debugcmd "|(probably)",@cmd;
5431 my $child = open GC, "-|"; defined $child or die $!;
5433 chdir '../../..' or die $!;
5434 if (!stat ".git/logs/refs/$splitbraincache") {
5435 $! == ENOENT or die $!;
5436 printdebug ">(no reflog)\n";
5443 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5444 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5447 quilt_fixup_mkwork($headref);
5448 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5449 if ($cachehit ne $headref) {
5450 progress "dgit view: found cached ($saved)";
5451 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5453 return ($cachehit, $splitbrain_cachekey);
5455 progress "dgit view: found cached, no changes required";
5456 return ($headref, $splitbrain_cachekey);
5458 die $! if GC->error;
5459 failedcmd unless close GC;
5461 printdebug "splitbrain cache miss\n";
5462 return (undef, $splitbrain_cachekey);
5465 sub quilt_fixup_multipatch ($$$) {
5466 my ($clogp, $headref, $upstreamversion) = @_;
5468 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5471 # - honour any existing .pc in case it has any strangeness
5472 # - determine the git commit corresponding to the tip of
5473 # the patch stack (if there is one)
5474 # - if there is such a git commit, convert each subsequent
5475 # git commit into a quilt patch with dpkg-source --commit
5476 # - otherwise convert all the differences in the tree into
5477 # a single git commit
5481 # Our git tree doesn't necessarily contain .pc. (Some versions of
5482 # dgit would include the .pc in the git tree.) If there isn't
5483 # one, we need to generate one by unpacking the patches that we
5486 # We first look for a .pc in the git tree. If there is one, we
5487 # will use it. (This is not the normal case.)
5489 # Otherwise need to regenerate .pc so that dpkg-source --commit
5490 # can work. We do this as follows:
5491 # 1. Collect all relevant .orig from parent directory
5492 # 2. Generate a debian.tar.gz out of
5493 # debian/{patches,rules,source/format,source/options}
5494 # 3. Generate a fake .dsc containing just these fields:
5495 # Format Source Version Files
5496 # 4. Extract the fake .dsc
5497 # Now the fake .dsc has a .pc directory.
5498 # (In fact we do this in every case, because in future we will
5499 # want to search for a good base commit for generating patches.)
5501 # Then we can actually do the dpkg-source --commit
5502 # 1. Make a new working tree with the same object
5503 # store as our main tree and check out the main
5505 # 2. Copy .pc from the fake's extraction, if necessary
5506 # 3. Run dpkg-source --commit
5507 # 4. If the result has changes to debian/, then
5508 # - git add them them
5509 # - git add .pc if we had a .pc in-tree
5511 # 5. If we had a .pc in-tree, delete it, and git commit
5512 # 6. Back in the main tree, fast forward to the new HEAD
5514 # Another situation we may have to cope with is gbp-style
5515 # patches-unapplied trees.
5517 # We would want to detect these, so we know to escape into
5518 # quilt_fixup_gbp. However, this is in general not possible.
5519 # Consider a package with a one patch which the dgit user reverts
5520 # (with git revert or the moral equivalent).
5522 # That is indistinguishable in contents from a patches-unapplied
5523 # tree. And looking at the history to distinguish them is not
5524 # useful because the user might have made a confusing-looking git
5525 # history structure (which ought to produce an error if dgit can't
5526 # cope, not a silent reintroduction of an unwanted patch).
5528 # So gbp users will have to pass an option. But we can usually
5529 # detect their failure to do so: if the tree is not a clean
5530 # patches-applied tree, quilt linearisation fails, but the tree
5531 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5532 # they want --quilt=unapplied.
5534 # To help detect this, when we are extracting the fake dsc, we
5535 # first extract it with --skip-patches, and then apply the patches
5536 # afterwards with dpkg-source --before-build. That lets us save a
5537 # tree object corresponding to .origs.
5539 my $splitbrain_cachekey;
5541 quilt_make_fake_dsc($upstreamversion);
5543 if (quiltmode_splitbrain()) {
5545 ($cachehit, $splitbrain_cachekey) =
5546 quilt_check_splitbrain_cache($headref, $upstreamversion);
5547 return if $cachehit;
5551 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5553 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5554 rename $fakexdir, "fake" or die "$fakexdir $!";
5558 remove_stray_gits("source package");
5559 mktree_in_ud_here();
5563 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5564 my $unapplied=git_add_write_tree();
5565 printdebug "fake orig tree object $unapplied\n";
5569 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5571 if (system @bbcmd) {
5572 failedcmd @bbcmd if $? < 0;
5574 failed to apply your git tree's patch stack (from debian/patches/) to
5575 the corresponding upstream tarball(s). Your source tree and .orig
5576 are probably too inconsistent. dgit can only fix up certain kinds of
5577 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5583 quilt_fixup_mkwork($headref);
5586 if (stat_exists ".pc") {
5588 progress "Tree already contains .pc - will use it then delete it.";
5591 rename '../fake/.pc','.pc' or die $!;
5594 changedir '../fake';
5596 my $oldtiptree=git_add_write_tree();
5597 printdebug "fake o+d/p tree object $unapplied\n";
5598 changedir '../work';
5601 # We calculate some guesswork now about what kind of tree this might
5602 # be. This is mostly for error reporting.
5608 # O = orig, without patches applied
5609 # A = "applied", ie orig with H's debian/patches applied
5610 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5611 \%editedignores, \@unrepres),
5612 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5613 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5617 foreach my $b (qw(01 02)) {
5618 foreach my $v (qw(O2H O2A H2A)) {
5619 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5622 printdebug "differences \@dl @dl.\n";
5625 "$us: base trees orig=%.20s o+d/p=%.20s",
5626 $unapplied, $oldtiptree;
5628 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5629 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5630 $dl[0], $dl[1], $dl[3], $dl[4],
5634 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5636 forceable_fail [qw(unrepresentable)], <<END;
5637 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5642 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5643 push @failsuggestion, "This might be a patches-unapplied branch.";
5644 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5645 push @failsuggestion, "This might be a patches-applied branch.";
5647 push @failsuggestion, "Maybe you need to specify one of".
5648 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5650 if (quiltmode_splitbrain()) {
5651 quiltify_splitbrain($clogp, $unapplied, $headref,
5652 $diffbits, \%editedignores,
5653 $splitbrain_cachekey);
5657 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5658 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5660 if (!open P, '>>', ".pc/applied-patches") {
5661 $!==&ENOENT or die $!;
5666 commit_quilty_patch();
5668 if ($mustdeletepc) {
5669 quilt_fixup_delete_pc();
5673 sub quilt_fixup_editor () {
5674 my $descfn = $ENV{$fakeeditorenv};
5675 my $editing = $ARGV[$#ARGV];
5676 open I1, '<', $descfn or die "$descfn: $!";
5677 open I2, '<', $editing or die "$editing: $!";
5678 unlink $editing or die "$editing: $!";
5679 open O, '>', $editing or die "$editing: $!";
5680 while (<I1>) { print O or die $!; } I1->error and die $!;
5683 $copying ||= m/^\-\-\- /;
5684 next unless $copying;
5687 I2->error and die $!;
5692 sub maybe_apply_patches_dirtily () {
5693 return unless $quilt_mode =~ m/gbp|unapplied/;
5694 print STDERR <<END or die $!;
5696 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5697 dgit: Have to apply the patches - making the tree dirty.
5698 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5701 $patches_applied_dirtily = 01;
5702 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5703 runcmd qw(dpkg-source --before-build .);
5706 sub maybe_unapply_patches_again () {
5707 progress "dgit: Unapplying patches again to tidy up the tree."
5708 if $patches_applied_dirtily;
5709 runcmd qw(dpkg-source --after-build .)
5710 if $patches_applied_dirtily & 01;
5712 if $patches_applied_dirtily & 02;
5713 $patches_applied_dirtily = 0;
5716 #----- other building -----
5718 our $clean_using_builder;
5719 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5720 # clean the tree before building (perhaps invoked indirectly by
5721 # whatever we are using to run the build), rather than separately
5722 # and explicitly by us.
5725 return if $clean_using_builder;
5726 if ($cleanmode eq 'dpkg-source') {
5727 maybe_apply_patches_dirtily();
5728 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5729 } elsif ($cleanmode eq 'dpkg-source-d') {
5730 maybe_apply_patches_dirtily();
5731 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5732 } elsif ($cleanmode eq 'git') {
5733 runcmd_ordryrun_local @git, qw(clean -xdf);
5734 } elsif ($cleanmode eq 'git-ff') {
5735 runcmd_ordryrun_local @git, qw(clean -xdff);
5736 } elsif ($cleanmode eq 'check') {
5737 my $leftovers = cmdoutput @git, qw(clean -xdn);
5738 if (length $leftovers) {
5739 print STDERR $leftovers, "\n" or die $!;
5740 fail "tree contains uncommitted files and --clean=check specified";
5742 } elsif ($cleanmode eq 'none') {
5749 badusage "clean takes no additional arguments" if @ARGV;
5752 maybe_unapply_patches_again();
5755 sub build_prep_early () {
5756 our $build_prep_early_done //= 0;
5757 return if $build_prep_early_done++;
5758 badusage "-p is not allowed when building" if defined $package;
5759 my $clogp = parsechangelog();
5760 $isuite = getfield $clogp, 'Distribution';
5761 $package = getfield $clogp, 'Source';
5762 $version = getfield $clogp, 'Version';
5770 build_maybe_quilt_fixup();
5772 my $pat = changespat $version;
5773 foreach my $f (glob "$buildproductsdir/$pat") {
5775 unlink $f or fail "remove old changes file $f: $!";
5777 progress "would remove $f";
5783 sub changesopts_initial () {
5784 my @opts =@changesopts[1..$#changesopts];
5787 sub changesopts_version () {
5788 if (!defined $changes_since_version) {
5789 my @vsns = archive_query('archive_query');
5790 my @quirk = access_quirk();
5791 if ($quirk[0] eq 'backports') {
5792 local $isuite = $quirk[2];
5794 canonicalise_suite();
5795 push @vsns, archive_query('archive_query');
5798 @vsns = map { $_->[0] } @vsns;
5799 @vsns = sort { -version_compare($a, $b) } @vsns;
5800 $changes_since_version = $vsns[0];
5801 progress "changelog will contain changes since $vsns[0]";
5803 $changes_since_version = '_';
5804 progress "package seems new, not specifying -v<version>";
5807 if ($changes_since_version ne '_') {
5808 return ("-v$changes_since_version");
5814 sub changesopts () {
5815 return (changesopts_initial(), changesopts_version());
5818 sub massage_dbp_args ($;$) {
5819 my ($cmd,$xargs) = @_;
5822 # - if we're going to split the source build out so we can
5823 # do strange things to it, massage the arguments to dpkg-buildpackage
5824 # so that the main build doessn't build source (or add an argument
5825 # to stop it building source by default).
5827 # - add -nc to stop dpkg-source cleaning the source tree,
5828 # unless we're not doing a split build and want dpkg-source
5829 # as cleanmode, in which case we can do nothing
5832 # 0 - source will NOT need to be built separately by caller
5833 # +1 - source will need to be built separately by caller
5834 # +2 - source will need to be built separately by caller AND
5835 # dpkg-buildpackage should not in fact be run at all!
5836 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5837 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5838 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5839 $clean_using_builder = 1;
5842 # -nc has the side effect of specifying -b if nothing else specified
5843 # and some combinations of -S, -b, et al, are errors, rather than
5844 # later simply overriding earlie. So we need to:
5845 # - search the command line for these options
5846 # - pick the last one
5847 # - perhaps add our own as a default
5848 # - perhaps adjust it to the corresponding non-source-building version
5850 foreach my $l ($cmd, $xargs) {
5852 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5855 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5857 if ($need_split_build_invocation) {
5858 printdebug "massage split $dmode.\n";
5859 $r = $dmode =~ m/[S]/ ? +2 :
5860 $dmode =~ y/gGF/ABb/ ? +1 :
5861 $dmode =~ m/[ABb]/ ? 0 :
5864 printdebug "massage done $r $dmode.\n";
5866 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5872 my $wasdir = must_getcwd();
5878 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5879 my ($msg_if_onlyone) = @_;
5880 # If there is only one .changes file, fail with $msg_if_onlyone,
5881 # or if that is undef, be a no-op.
5882 # Returns the changes file to report to the user.
5883 my $pat = changespat $version;
5884 my @changesfiles = glob $pat;
5885 @changesfiles = sort {
5886 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5890 if (@changesfiles==1) {
5891 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5892 only one changes file from build (@changesfiles)
5894 $result = $changesfiles[0];
5895 } elsif (@changesfiles==2) {
5896 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5897 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5898 fail "$l found in binaries changes file $binchanges"
5901 runcmd_ordryrun_local @mergechanges, @changesfiles;
5902 my $multichanges = changespat $version,'multi';
5904 stat_exists $multichanges or fail "$multichanges: $!";
5905 foreach my $cf (glob $pat) {
5906 next if $cf eq $multichanges;
5907 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5910 $result = $multichanges;
5912 fail "wrong number of different changes files (@changesfiles)";
5914 printdone "build successful, results in $result\n" or die $!;
5917 sub midbuild_checkchanges () {
5918 my $pat = changespat $version;
5919 return if $rmchanges;
5920 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5921 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5923 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5924 Suggest you delete @unwanted.
5929 sub midbuild_checkchanges_vanilla ($) {
5931 midbuild_checkchanges() if $wantsrc == 1;
5934 sub postbuild_mergechanges_vanilla ($) {
5936 if ($wantsrc == 1) {
5938 postbuild_mergechanges(undef);
5941 printdone "build successful\n";
5947 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5948 my $wantsrc = massage_dbp_args \@dbp;
5951 midbuild_checkchanges_vanilla $wantsrc;
5956 push @dbp, changesopts_version();
5957 maybe_apply_patches_dirtily();
5958 runcmd_ordryrun_local @dbp;
5960 maybe_unapply_patches_again();
5961 postbuild_mergechanges_vanilla $wantsrc;
5965 $quilt_mode //= 'gbp';
5971 # gbp can make .origs out of thin air. In my tests it does this
5972 # even for a 1.0 format package, with no origs present. So I
5973 # guess it keys off just the version number. We don't know
5974 # exactly what .origs ought to exist, but let's assume that we
5975 # should run gbp if: the version has an upstream part and the main
5977 my $upstreamversion = upstreamversion $version;
5978 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5979 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5981 if ($gbp_make_orig) {
5983 $cleanmode = 'none'; # don't do it again
5984 $need_split_build_invocation = 1;
5987 my @dbp = @dpkgbuildpackage;
5989 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5991 if (!length $gbp_build[0]) {
5992 if (length executable_on_path('git-buildpackage')) {
5993 $gbp_build[0] = qw(git-buildpackage);
5995 $gbp_build[0] = 'gbp buildpackage';
5998 my @cmd = opts_opt_multi_cmd @gbp_build;
6000 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6002 if ($gbp_make_orig) {
6003 ensuredir '.git/dgit';
6004 my $ok = '.git/dgit/origs-gen-ok';
6005 unlink $ok or $!==&ENOENT or die $!;
6006 my @origs_cmd = @cmd;
6007 push @origs_cmd, qw(--git-cleaner=true);
6008 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6009 push @origs_cmd, @ARGV;
6011 debugcmd @origs_cmd;
6013 do { local $!; stat_exists $ok; }
6014 or failedcmd @origs_cmd;
6016 dryrun_report @origs_cmd;
6022 midbuild_checkchanges_vanilla $wantsrc;
6024 if (!$clean_using_builder) {
6025 push @cmd, '--git-cleaner=true';
6029 maybe_unapply_patches_again();
6031 push @cmd, changesopts();
6032 runcmd_ordryrun_local @cmd, @ARGV;
6034 postbuild_mergechanges_vanilla $wantsrc;
6036 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6040 my $our_cleanmode = $cleanmode;
6041 if ($need_split_build_invocation) {
6042 # Pretend that clean is being done some other way. This
6043 # forces us not to try to use dpkg-buildpackage to clean and
6044 # build source all in one go; and instead we run dpkg-source
6045 # (and build_prep() will do the clean since $clean_using_builder
6047 $our_cleanmode = 'ELSEWHERE';
6049 if ($our_cleanmode =~ m/^dpkg-source/) {
6050 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6051 $clean_using_builder = 1;
6054 $sourcechanges = changespat $version,'source';
6056 unlink "../$sourcechanges" or $!==ENOENT
6057 or fail "remove $sourcechanges: $!";
6059 $dscfn = dscfn($version);
6060 if ($our_cleanmode eq 'dpkg-source') {
6061 maybe_apply_patches_dirtily();
6062 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6064 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6065 maybe_apply_patches_dirtily();
6066 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6069 my @cmd = (@dpkgsource, qw(-b --));
6072 runcmd_ordryrun_local @cmd, "work";
6073 my @udfiles = <${package}_*>;
6074 changedir "../../..";
6075 foreach my $f (@udfiles) {
6076 printdebug "source copy, found $f\n";
6079 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6080 $f eq srcfn($version, $&));
6081 printdebug "source copy, found $f - renaming\n";
6082 rename "$ud/$f", "../$f" or $!==ENOENT
6083 or fail "put in place new source file ($f): $!";
6086 my $pwd = must_getcwd();
6087 my $leafdir = basename $pwd;
6089 runcmd_ordryrun_local @cmd, $leafdir;
6092 runcmd_ordryrun_local qw(sh -ec),
6093 'exec >$1; shift; exec "$@"','x',
6094 "../$sourcechanges",
6095 @dpkggenchanges, qw(-S), changesopts();
6099 sub cmd_build_source {
6101 badusage "build-source takes no additional arguments" if @ARGV;
6103 maybe_unapply_patches_again();
6104 printdone "source built, results in $dscfn and $sourcechanges";
6109 midbuild_checkchanges();
6112 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6113 stat_exists $sourcechanges
6114 or fail "$sourcechanges (in parent directory): $!";
6116 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6118 maybe_unapply_patches_again();
6120 postbuild_mergechanges(<<END);
6121 perhaps you need to pass -A ? (sbuild's default is to build only
6122 arch-specific binaries; dgit 1.4 used to override that.)
6127 sub cmd_quilt_fixup {
6128 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6131 build_maybe_quilt_fixup();
6134 sub import_dsc_result {
6135 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6136 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6138 check_gitattrs($newhash, "source tree");
6140 progress "dgit: import-dsc: $what_msg";
6143 sub cmd_import_dsc {
6147 last unless $ARGV[0] =~ m/^-/;
6150 if (m/^--require-valid-signature$/) {
6153 badusage "unknown dgit import-dsc sub-option \`$_'";
6157 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6158 my ($dscfn, $dstbranch) = @ARGV;
6160 badusage "dry run makes no sense with import-dsc" unless act_local();
6162 my $force = $dstbranch =~ s/^\+// ? +1 :
6163 $dstbranch =~ s/^\.\.// ? -1 :
6165 my $info = $force ? " $&" : '';
6166 $info = "$dscfn$info";
6168 my $specbranch = $dstbranch;
6169 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6170 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6172 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6173 my $chead = cmdoutput_errok @symcmd;
6174 defined $chead or $?==256 or failedcmd @symcmd;
6176 fail "$dstbranch is checked out - will not update it"
6177 if defined $chead and $chead eq $dstbranch;
6179 my $oldhash = git_get_ref $dstbranch;
6181 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6182 $dscdata = do { local $/ = undef; <D>; };
6183 D->error and fail "read $dscfn: $!";
6186 # we don't normally need this so import it here
6187 use Dpkg::Source::Package;
6188 my $dp = new Dpkg::Source::Package filename => $dscfn,
6189 require_valid_signature => $needsig;
6191 local $SIG{__WARN__} = sub {
6193 return unless $needsig;
6194 fail "import-dsc signature check failed";
6196 if (!$dp->is_signed()) {
6197 warn "$us: warning: importing unsigned .dsc\n";
6199 my $r = $dp->check_signature();
6200 die "->check_signature => $r" if $needsig && $r;
6206 $package = getfield $dsc, 'Source';
6208 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6209 unless forceing [qw(import-dsc-with-dgit-field)];
6210 parse_dsc_field_def_dsc_distro();
6212 $isuite = 'DGIT-IMPORT-DSC';
6213 $idistro //= $dsc_distro;
6217 if (defined $dsc_hash) {
6218 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6219 resolve_dsc_field_commit undef, undef;
6221 if (defined $dsc_hash) {
6222 my @cmd = (qw(sh -ec),
6223 "echo $dsc_hash | git cat-file --batch-check");
6224 my $objgot = cmdoutput @cmd;
6225 if ($objgot =~ m#^\w+ missing\b#) {
6227 .dsc contains Dgit field referring to object $dsc_hash
6228 Your git tree does not have that object. Try `git fetch' from a
6229 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6232 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6234 progress "Not fast forward, forced update.";
6236 fail "Not fast forward to $dsc_hash";
6239 import_dsc_result $dstbranch, $dsc_hash,
6240 "dgit import-dsc (Dgit): $info",
6241 "updated git ref $dstbranch";
6246 Branch $dstbranch already exists
6247 Specify ..$specbranch for a pseudo-merge, binding in existing history
6248 Specify +$specbranch to overwrite, discarding existing history
6250 if $oldhash && !$force;
6252 my @dfi = dsc_files_info();
6253 foreach my $fi (@dfi) {
6254 my $f = $fi->{Filename};
6256 next if lstat $here;
6257 fail "stat $here: $!" unless $! == ENOENT;
6259 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6261 } elsif ($dscfn =~ m#^/#) {
6264 fail "cannot import $dscfn which seems to be inside working tree!";
6266 $there =~ s#/+[^/]+$## or
6267 fail "cannot import $dscfn which seems to not have a basename";
6269 symlink $there, $here or fail "symlink $there to $here: $!";
6270 progress "made symlink $here -> $there";
6271 # print STDERR Dumper($fi);
6273 my @mergeinputs = generate_commits_from_dsc();
6274 die unless @mergeinputs == 1;
6276 my $newhash = $mergeinputs[0]{Commit};
6280 progress "Import, forced update - synthetic orphan git history.";
6281 } elsif ($force < 0) {
6282 progress "Import, merging.";
6283 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6284 my $version = getfield $dsc, 'Version';
6285 my $clogp = commit_getclogp $newhash;
6286 my $authline = clogp_authline $clogp;
6287 $newhash = make_commit_text <<END;
6294 Merge $package ($version) import into $dstbranch
6297 die; # caught earlier
6301 import_dsc_result $dstbranch, $newhash,
6302 "dgit import-dsc: $info",
6303 "results are in in git ref $dstbranch";
6306 sub cmd_archive_api_query {
6307 badusage "need only 1 subpath argument" unless @ARGV==1;
6308 my ($subpath) = @ARGV;
6309 my @cmd = archive_api_query_cmd($subpath);
6312 exec @cmd or fail "exec curl: $!\n";
6315 sub cmd_clone_dgit_repos_server {
6316 badusage "need destination argument" unless @ARGV==1;
6317 my ($destdir) = @ARGV;
6318 $package = '_dgit-repos-server';
6319 local $access_forpush = 0;
6320 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6322 exec @cmd or fail "exec git clone: $!\n";
6325 sub cmd_print_dgit_repos_server_source_url {
6326 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6328 $package = '_dgit-repos-server';
6329 local $access_forpush = 0;
6330 my $url = access_giturl();
6331 print $url, "\n" or die $!;
6334 sub cmd_setup_mergechangelogs {
6335 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6336 setup_mergechangelogs(1);
6339 sub cmd_setup_useremail {
6340 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6344 sub cmd_setup_gitattributes {
6345 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6349 sub cmd_setup_new_tree {
6350 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6354 #---------- argument parsing and main program ----------
6357 print "dgit version $our_version\n" or die $!;
6361 our (%valopts_long, %valopts_short);
6362 our (%funcopts_long);
6364 our (@modeopt_cfgs);
6366 sub defvalopt ($$$$) {
6367 my ($long,$short,$val_re,$how) = @_;
6368 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6369 $valopts_long{$long} = $oi;
6370 $valopts_short{$short} = $oi;
6371 # $how subref should:
6372 # do whatever assignemnt or thing it likes with $_[0]
6373 # if the option should not be passed on to remote, @rvalopts=()
6374 # or $how can be a scalar ref, meaning simply assign the value
6377 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6378 defvalopt '--distro', '-d', '.+', \$idistro;
6379 defvalopt '', '-k', '.+', \$keyid;
6380 defvalopt '--existing-package','', '.*', \$existing_package;
6381 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6382 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6383 defvalopt '--package', '-p', $package_re, \$package;
6384 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6386 defvalopt '', '-C', '.+', sub {
6387 ($changesfile) = (@_);
6388 if ($changesfile =~ s#^(.*)/##) {
6389 $buildproductsdir = $1;
6393 defvalopt '--initiator-tempdir','','.*', sub {
6394 ($initiator_tempdir) = (@_);
6395 $initiator_tempdir =~ m#^/# or
6396 badusage "--initiator-tempdir must be used specify an".
6397 " absolute, not relative, directory."
6400 sub defoptmodes ($@) {
6401 my ($varref, $cfgkey, $default, %optmap) = @_;
6403 while (my ($opt,$val) = each %optmap) {
6404 $funcopts_long{$opt} = sub { $$varref = $val; };
6405 $permit{$val} = $val;
6407 push @modeopt_cfgs, {
6410 Default => $default,
6415 defoptmodes \$dodep14tag, qw( dep14tag want
6418 --always-dep14tag always );
6423 if (defined $ENV{'DGIT_SSH'}) {
6424 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6425 } elsif (defined $ENV{'GIT_SSH'}) {
6426 @ssh = ($ENV{'GIT_SSH'});
6434 if (!defined $val) {
6435 badusage "$what needs a value" unless @ARGV;
6437 push @rvalopts, $val;
6439 badusage "bad value \`$val' for $what" unless
6440 $val =~ m/^$oi->{Re}$(?!\n)/s;
6441 my $how = $oi->{How};
6442 if (ref($how) eq 'SCALAR') {
6447 push @ropts, @rvalopts;
6451 last unless $ARGV[0] =~ m/^-/;
6455 if (m/^--dry-run$/) {
6458 } elsif (m/^--damp-run$/) {
6461 } elsif (m/^--no-sign$/) {
6464 } elsif (m/^--help$/) {
6466 } elsif (m/^--version$/) {
6468 } elsif (m/^--new$/) {
6471 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6472 ($om = $opts_opt_map{$1}) &&
6476 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6477 !$opts_opt_cmdonly{$1} &&
6478 ($om = $opts_opt_map{$1})) {
6481 } elsif (m/^--(gbp|dpm)$/s) {
6482 push @ropts, "--quilt=$1";
6484 } elsif (m/^--ignore-dirty$/s) {
6487 } elsif (m/^--no-quilt-fixup$/s) {
6489 $quilt_mode = 'nocheck';
6490 } elsif (m/^--no-rm-on-error$/s) {
6493 } elsif (m/^--no-chase-dsc-distro$/s) {
6495 $chase_dsc_distro = 0;
6496 } elsif (m/^--overwrite$/s) {
6498 $overwrite_version = '';
6499 } elsif (m/^--overwrite=(.+)$/s) {
6501 $overwrite_version = $1;
6502 } elsif (m/^--delayed=(\d+)$/s) {
6505 } elsif (m/^--dgit-view-save=(.+)$/s) {
6507 $split_brain_save = $1;
6508 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6509 } elsif (m/^--(no-)?rm-old-changes$/s) {
6512 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6514 push @deliberatelies, $&;
6515 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6519 } elsif (m/^--force-/) {
6521 "$us: warning: ignoring unknown force option $_\n";
6523 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6524 # undocumented, for testing
6526 $tagformat_want = [ $1, 'command line', 1 ];
6527 # 1 menas overrides distro configuration
6528 } elsif (m/^--always-split-source-build$/s) {
6529 # undocumented, for testing
6531 $need_split_build_invocation = 1;
6532 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6533 # undocumented, for testing
6535 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6536 # ^ it's supposed to be an array ref
6537 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6538 $val = $2 ? $' : undef; #';
6539 $valopt->($oi->{Long});
6540 } elsif ($funcopts_long{$_}) {
6542 $funcopts_long{$_}();
6544 badusage "unknown long option \`$_'";
6551 } elsif (s/^-L/-/) {
6554 } elsif (s/^-h/-/) {
6556 } elsif (s/^-D/-/) {
6560 } elsif (s/^-N/-/) {
6565 push @changesopts, $_;
6567 } elsif (s/^-wn$//s) {
6569 $cleanmode = 'none';
6570 } elsif (s/^-wg$//s) {
6573 } elsif (s/^-wgf$//s) {
6575 $cleanmode = 'git-ff';
6576 } elsif (s/^-wd$//s) {
6578 $cleanmode = 'dpkg-source';
6579 } elsif (s/^-wdd$//s) {
6581 $cleanmode = 'dpkg-source-d';
6582 } elsif (s/^-wc$//s) {
6584 $cleanmode = 'check';
6585 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6586 push @git, '-c', $&;
6587 $gitcfgs{cmdline}{$1} = [ $2 ];
6588 } elsif (s/^-c([^=]+)$//s) {
6589 push @git, '-c', $&;
6590 $gitcfgs{cmdline}{$1} = [ 'true' ];
6591 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6593 $val = undef unless length $val;
6594 $valopt->($oi->{Short});
6597 badusage "unknown short option \`$_'";
6604 sub check_env_sanity () {
6605 my $blocked = new POSIX::SigSet;
6606 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6609 foreach my $name (qw(PIPE CHLD)) {
6610 my $signame = "SIG$name";
6611 my $signum = eval "POSIX::$signame" // die;
6612 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6613 die "$signame is set to something other than SIG_DFL\n";
6614 $blocked->ismember($signum) and
6615 die "$signame is blocked\n";
6621 On entry to dgit, $@
6622 This is a bug produced by something in in your execution environment.
6628 sub parseopts_late_defaults () {
6629 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6630 if defined $idistro;
6631 $isuite //= cfg('dgit.default.default-suite');
6633 foreach my $k (keys %opts_opt_map) {
6634 my $om = $opts_opt_map{$k};
6636 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6638 badcfg "cannot set command for $k"
6639 unless length $om->[0];
6643 foreach my $c (access_cfg_cfgs("opts-$k")) {
6645 map { $_ ? @$_ : () }
6646 map { $gitcfgs{$_}{$c} }
6647 reverse @gitcfgsources;
6648 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6649 "\n" if $debuglevel >= 4;
6651 badcfg "cannot configure options for $k"
6652 if $opts_opt_cmdonly{$k};
6653 my $insertpos = $opts_cfg_insertpos{$k};
6654 @$om = ( @$om[0..$insertpos-1],
6656 @$om[$insertpos..$#$om] );
6660 if (!defined $rmchanges) {
6661 local $access_forpush;
6662 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6665 if (!defined $quilt_mode) {
6666 local $access_forpush;
6667 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6668 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6670 $quilt_mode =~ m/^($quilt_modes_re)$/
6671 or badcfg "unknown quilt-mode \`$quilt_mode'";
6675 foreach my $moc (@modeopt_cfgs) {
6676 local $access_forpush;
6677 my $vr = $moc->{Var};
6678 next if defined $$vr;
6679 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6680 my $v = $moc->{Vals}{$$vr};
6681 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6685 $need_split_build_invocation ||= quiltmode_splitbrain();
6687 if (!defined $cleanmode) {
6688 local $access_forpush;
6689 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6690 $cleanmode //= 'dpkg-source';
6692 badcfg "unknown clean-mode \`$cleanmode'" unless
6693 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6697 if ($ENV{$fakeeditorenv}) {
6699 quilt_fixup_editor();
6706 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6707 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6708 if $dryrun_level == 1;
6710 print STDERR $helpmsg or die $!;
6713 my $cmd = shift @ARGV;
6716 my $pre_fn = ${*::}{"pre_$cmd"};
6717 $pre_fn->() if $pre_fn;
6719 my $fn = ${*::}{"cmd_$cmd"};
6720 $fn or badusage "unknown operation $cmd";