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 confess "internal error ($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 ($url, $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 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2608 my $specre = join '|', map {
2611 my $wildcard = $x =~ s/\\\*$/.*/;
2612 die if $wildcard && $supplementary;
2615 printdebug "git_lrfetch_sane specre=$specre\n";
2616 my $wanted_rref = sub {
2618 return m/^(?:$specre)$/;
2621 my $fetch_iteration = 0;
2624 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2625 if (++$fetch_iteration > 10) {
2626 fail "too many iterations trying to get sane fetch!";
2629 my @look = map { "refs/$_" } @specs;
2630 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2634 open GITLS, "-|", @lcmd or die $!;
2636 printdebug "=> ", $_;
2637 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2638 my ($objid,$rrefname) = ($1,$2);
2639 if (!$wanted_rref->($rrefname)) {
2641 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2645 $wantr{$rrefname} = $objid;
2648 close GITLS or failedcmd @lcmd;
2650 # OK, now %want is exactly what we want for refs in @specs
2652 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2653 "+refs/$_:".lrfetchrefs."/$_";
2656 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2658 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2659 runcmd_ordryrun_local @fcmd if @fspecs;
2661 if (!$supplementary) {
2662 %lrfetchrefs_f = ();
2666 git_for_each_ref(lrfetchrefs, sub {
2667 my ($objid,$objtype,$lrefname,$reftail) = @_;
2668 $lrfetchrefs_f{$lrefname} = $objid;
2669 $objgot{$objid} = 1;
2672 if ($supplementary) {
2676 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2677 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2678 if (!exists $wantr{$rrefname}) {
2679 if ($wanted_rref->($rrefname)) {
2681 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2685 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2688 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2689 delete $lrfetchrefs_f{$lrefname};
2693 foreach my $rrefname (sort keys %wantr) {
2694 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2695 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2696 my $want = $wantr{$rrefname};
2697 next if $got eq $want;
2698 if (!defined $objgot{$want}) {
2700 warning: git ls-remote suggests we want $lrefname
2701 warning: and it should refer to $want
2702 warning: but git fetch didn't fetch that object to any relevant ref.
2703 warning: This may be due to a race with someone updating the server.
2704 warning: Will try again...
2706 next FETCH_ITERATION;
2709 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2711 runcmd_ordryrun_local @git, qw(update-ref -m),
2712 "dgit fetch git fetch fixup", $lrefname, $want;
2713 $lrfetchrefs_f{$lrefname} = $want;
2718 if (defined $csuite) {
2719 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2720 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2721 my ($objid,$objtype,$lrefname,$reftail) = @_;
2722 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2723 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2727 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2728 Dumper(\%lrfetchrefs_f);
2731 sub git_fetch_us () {
2732 # Want to fetch only what we are going to use, unless
2733 # deliberately-not-ff, in which case we must fetch everything.
2735 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2737 (quiltmode_splitbrain
2738 ? (map { $_->('*',access_nomdistro) }
2739 \&debiantag_new, \&debiantag_maintview)
2740 : debiantags('*',access_nomdistro));
2741 push @specs, server_branch($csuite);
2742 push @specs, $rewritemap;
2743 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2745 my $url = access_giturl();
2746 git_lrfetch_sane $url, 0, @specs;
2749 my @tagpats = debiantags('*',access_nomdistro);
2751 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2752 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2753 printdebug "currently $fullrefname=$objid\n";
2754 $here{$fullrefname} = $objid;
2756 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2757 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2758 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2759 printdebug "offered $lref=$objid\n";
2760 if (!defined $here{$lref}) {
2761 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2762 runcmd_ordryrun_local @upd;
2763 lrfetchref_used $fullrefname;
2764 } elsif ($here{$lref} eq $objid) {
2765 lrfetchref_used $fullrefname;
2768 "Not updating $lref from $here{$lref} to $objid.\n";
2773 #---------- dsc and archive handling ----------
2775 sub mergeinfo_getclogp ($) {
2776 # Ensures thit $mi->{Clogp} exists and returns it
2778 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2781 sub mergeinfo_version ($) {
2782 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2785 sub fetch_from_archive_record_1 ($) {
2787 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2788 'DGIT_ARCHIVE', $hash;
2789 cmdoutput @git, qw(log -n2), $hash;
2790 # ... gives git a chance to complain if our commit is malformed
2793 sub fetch_from_archive_record_2 ($) {
2795 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2799 dryrun_report @upd_cmd;
2803 sub parse_dsc_field_def_dsc_distro () {
2804 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2805 dgit.default.distro);
2808 sub parse_dsc_field ($$) {
2809 my ($dsc, $what) = @_;
2811 foreach my $field (@ourdscfield) {
2812 $f = $dsc->{$field};
2817 progress "$what: NO git hash";
2818 parse_dsc_field_def_dsc_distro();
2819 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2820 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2821 progress "$what: specified git info ($dsc_distro)";
2822 $dsc_hint_tag = [ $dsc_hint_tag ];
2823 } elsif ($f =~ m/^\w+\s*$/) {
2825 parse_dsc_field_def_dsc_distro();
2826 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2828 progress "$what: specified git hash";
2830 fail "$what: invalid Dgit info";
2834 sub resolve_dsc_field_commit ($$) {
2835 my ($already_distro, $already_mapref) = @_;
2837 return unless defined $dsc_hash;
2840 defined $already_mapref &&
2841 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2842 ? $already_mapref : undef;
2846 my ($what, @fetch) = @_;
2848 local $idistro = $dsc_distro;
2849 my $lrf = lrfetchrefs;
2851 if (!$chase_dsc_distro) {
2853 "not chasing .dsc distro $dsc_distro: not fetching $what";
2858 ".dsc names distro $dsc_distro: fetching $what";
2860 my $url = access_giturl();
2861 if (!defined $url) {
2862 defined $dsc_hint_url or fail <<END;
2863 .dsc Dgit metadata is in context of distro $dsc_distro
2864 for which we have no configured url and .dsc provides no hint
2867 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2868 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2869 parse_cfg_bool "dsc-url-proto-ok", 'false',
2870 cfg("dgit.dsc-url-proto-ok.$proto",
2871 "dgit.default.dsc-url-proto-ok")
2873 .dsc Dgit metadata is in context of distro $dsc_distro
2874 for which we have no configured url;
2875 .dsc provides hinted url with protocol $proto which is unsafe.
2876 (can be overridden by config - consult documentation)
2878 $url = $dsc_hint_url;
2881 git_lrfetch_sane $url, 1, @fetch;
2886 my $rewrite_enable = do {
2887 local $idistro = $dsc_distro;
2888 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2891 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2892 if (!defined $mapref) {
2893 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2894 $mapref = $lrf.'/'.$rewritemap;
2896 my $rewritemapdata = git_cat_file $mapref.':map';
2897 if (defined $rewritemapdata
2898 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2900 "server's git history rewrite map contains a relevant entry!";
2903 if (defined $dsc_hash) {
2904 progress "using rewritten git hash in place of .dsc value";
2906 progress "server data says .dsc hash is to be disregarded";
2911 if (!defined git_cat_file $dsc_hash) {
2912 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2913 my $lrf = $do_fetch->("additional commits", @tags) &&
2914 defined git_cat_file $dsc_hash
2916 .dsc Dgit metadata requires commit $dsc_hash
2917 but we could not obtain that object anywhere.
2919 foreach my $t (@tags) {
2920 my $fullrefname = $lrf.'/'.$t;
2921 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2922 next unless $lrfetchrefs_f{$fullrefname};
2923 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2924 lrfetchref_used $fullrefname;
2929 sub fetch_from_archive () {
2930 ensure_setup_existing_tree();
2932 # Ensures that lrref() is what is actually in the archive, one way
2933 # or another, according to us - ie this client's
2934 # appropritaely-updated archive view. Also returns the commit id.
2935 # If there is nothing in the archive, leaves lrref alone and
2936 # returns undef. git_fetch_us must have already been called.
2940 parse_dsc_field($dsc, 'last upload to archive');
2941 resolve_dsc_field_commit access_basedistro,
2942 lrfetchrefs."/".$rewritemap
2944 progress "no version available from the archive";
2947 # If the archive's .dsc has a Dgit field, there are three
2948 # relevant git commitids we need to choose between and/or merge
2950 # 1. $dsc_hash: the Dgit field from the archive
2951 # 2. $lastpush_hash: the suite branch on the dgit git server
2952 # 3. $lastfetch_hash: our local tracking brach for the suite
2954 # These may all be distinct and need not be in any fast forward
2957 # If the dsc was pushed to this suite, then the server suite
2958 # branch will have been updated; but it might have been pushed to
2959 # a different suite and copied by the archive. Conversely a more
2960 # recent version may have been pushed with dgit but not appeared
2961 # in the archive (yet).
2963 # $lastfetch_hash may be awkward because archive imports
2964 # (particularly, imports of Dgit-less .dscs) are performed only as
2965 # needed on individual clients, so different clients may perform a
2966 # different subset of them - and these imports are only made
2967 # public during push. So $lastfetch_hash may represent a set of
2968 # imports different to a subsequent upload by a different dgit
2971 # Our approach is as follows:
2973 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2974 # descendant of $dsc_hash, then it was pushed by a dgit user who
2975 # had based their work on $dsc_hash, so we should prefer it.
2976 # Otherwise, $dsc_hash was installed into this suite in the
2977 # archive other than by a dgit push, and (necessarily) after the
2978 # last dgit push into that suite (since a dgit push would have
2979 # been descended from the dgit server git branch); thus, in that
2980 # case, we prefer the archive's version (and produce a
2981 # pseudo-merge to overwrite the dgit server git branch).
2983 # (If there is no Dgit field in the archive's .dsc then
2984 # generate_commit_from_dsc uses the version numbers to decide
2985 # whether the suite branch or the archive is newer. If the suite
2986 # branch is newer it ignores the archive's .dsc; otherwise it
2987 # generates an import of the .dsc, and produces a pseudo-merge to
2988 # overwrite the suite branch with the archive contents.)
2990 # The outcome of that part of the algorithm is the `public view',
2991 # and is same for all dgit clients: it does not depend on any
2992 # unpublished history in the local tracking branch.
2994 # As between the public view and the local tracking branch: The
2995 # local tracking branch is only updated by dgit fetch, and
2996 # whenever dgit fetch runs it includes the public view in the
2997 # local tracking branch. Therefore if the public view is not
2998 # descended from the local tracking branch, the local tracking
2999 # branch must contain history which was imported from the archive
3000 # but never pushed; and, its tip is now out of date. So, we make
3001 # a pseudo-merge to overwrite the old imports and stitch the old
3004 # Finally: we do not necessarily reify the public view (as
3005 # described above). This is so that we do not end up stacking two
3006 # pseudo-merges. So what we actually do is figure out the inputs
3007 # to any public view pseudo-merge and put them in @mergeinputs.
3010 # $mergeinputs[]{Commit}
3011 # $mergeinputs[]{Info}
3012 # $mergeinputs[0] is the one whose tree we use
3013 # @mergeinputs is in the order we use in the actual commit)
3016 # $mergeinputs[]{Message} is a commit message to use
3017 # $mergeinputs[]{ReverseParents} if def specifies that parent
3018 # list should be in opposite order
3019 # Such an entry has no Commit or Info. It applies only when found
3020 # in the last entry. (This ugliness is to support making
3021 # identical imports to previous dgit versions.)
3023 my $lastpush_hash = git_get_ref(lrfetchref());
3024 printdebug "previous reference hash=$lastpush_hash\n";
3025 $lastpush_mergeinput = $lastpush_hash && {
3026 Commit => $lastpush_hash,
3027 Info => "dgit suite branch on dgit git server",
3030 my $lastfetch_hash = git_get_ref(lrref());
3031 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3032 my $lastfetch_mergeinput = $lastfetch_hash && {
3033 Commit => $lastfetch_hash,
3034 Info => "dgit client's archive history view",
3037 my $dsc_mergeinput = $dsc_hash && {
3038 Commit => $dsc_hash,
3039 Info => "Dgit field in .dsc from archive",
3043 my $del_lrfetchrefs = sub {
3046 printdebug "del_lrfetchrefs...\n";
3047 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3048 my $objid = $lrfetchrefs_d{$fullrefname};
3049 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3051 $gur ||= new IO::Handle;
3052 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3054 printf $gur "delete %s %s\n", $fullrefname, $objid;
3057 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3061 if (defined $dsc_hash) {
3062 ensure_we_have_orig();
3063 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3064 @mergeinputs = $dsc_mergeinput
3065 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3066 print STDERR <<END or die $!;
3068 Git commit in archive is behind the last version allegedly pushed/uploaded.
3069 Commit referred to by archive: $dsc_hash
3070 Last version pushed with dgit: $lastpush_hash
3073 @mergeinputs = ($lastpush_mergeinput);
3075 # Archive has .dsc which is not a descendant of the last dgit
3076 # push. This can happen if the archive moves .dscs about.
3077 # Just follow its lead.
3078 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3079 progress "archive .dsc names newer git commit";
3080 @mergeinputs = ($dsc_mergeinput);
3082 progress "archive .dsc names other git commit, fixing up";
3083 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3087 @mergeinputs = generate_commits_from_dsc();
3088 # We have just done an import. Now, our import algorithm might
3089 # have been improved. But even so we do not want to generate
3090 # a new different import of the same package. So if the
3091 # version numbers are the same, just use our existing version.
3092 # If the version numbers are different, the archive has changed
3093 # (perhaps, rewound).
3094 if ($lastfetch_mergeinput &&
3095 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3096 (mergeinfo_version $mergeinputs[0]) )) {
3097 @mergeinputs = ($lastfetch_mergeinput);
3099 } elsif ($lastpush_hash) {
3100 # only in git, not in the archive yet
3101 @mergeinputs = ($lastpush_mergeinput);
3102 print STDERR <<END or die $!;
3104 Package not found in the archive, but has allegedly been pushed using dgit.
3108 printdebug "nothing found!\n";
3109 if (defined $skew_warning_vsn) {
3110 print STDERR <<END or die $!;
3112 Warning: relevant archive skew detected.
3113 Archive allegedly contains $skew_warning_vsn
3114 But we were not able to obtain any version from the archive or git.
3118 unshift @end, $del_lrfetchrefs;
3122 if ($lastfetch_hash &&
3124 my $h = $_->{Commit};
3125 $h and is_fast_fwd($lastfetch_hash, $h);
3126 # If true, one of the existing parents of this commit
3127 # is a descendant of the $lastfetch_hash, so we'll
3128 # be ff from that automatically.
3132 push @mergeinputs, $lastfetch_mergeinput;
3135 printdebug "fetch mergeinfos:\n";
3136 foreach my $mi (@mergeinputs) {
3138 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3140 printdebug sprintf " ReverseParents=%d Message=%s",
3141 $mi->{ReverseParents}, $mi->{Message};
3145 my $compat_info= pop @mergeinputs
3146 if $mergeinputs[$#mergeinputs]{Message};
3148 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3151 if (@mergeinputs > 1) {
3153 my $tree_commit = $mergeinputs[0]{Commit};
3155 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3156 $tree =~ m/\n\n/; $tree = $`;
3157 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3160 # We use the changelog author of the package in question the
3161 # author of this pseudo-merge. This is (roughly) correct if
3162 # this commit is simply representing aa non-dgit upload.
3163 # (Roughly because it does not record sponsorship - but we
3164 # don't have sponsorship info because that's in the .changes,
3165 # which isn't in the archivw.)
3167 # But, it might be that we are representing archive history
3168 # updates (including in-archive copies). These are not really
3169 # the responsibility of the person who created the .dsc, but
3170 # there is no-one whose name we should better use. (The
3171 # author of the .dsc-named commit is clearly worse.)
3173 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3174 my $author = clogp_authline $useclogp;
3175 my $cversion = getfield $useclogp, 'Version';
3177 my $mcf = ".git/dgit/mergecommit";
3178 open MC, ">", $mcf or die "$mcf $!";
3179 print MC <<END or die $!;
3183 my @parents = grep { $_->{Commit} } @mergeinputs;
3184 @parents = reverse @parents if $compat_info->{ReverseParents};
3185 print MC <<END or die $! foreach @parents;
3189 print MC <<END or die $!;
3195 if (defined $compat_info->{Message}) {
3196 print MC $compat_info->{Message} or die $!;
3198 print MC <<END or die $!;
3199 Record $package ($cversion) in archive suite $csuite
3203 my $message_add_info = sub {
3205 my $mversion = mergeinfo_version $mi;
3206 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3210 $message_add_info->($mergeinputs[0]);
3211 print MC <<END or die $!;
3212 should be treated as descended from
3214 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3218 $hash = make_commit $mcf;
3220 $hash = $mergeinputs[0]{Commit};
3222 printdebug "fetch hash=$hash\n";
3225 my ($lasth, $what) = @_;
3226 return unless $lasth;
3227 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3230 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3232 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3234 fetch_from_archive_record_1($hash);
3236 if (defined $skew_warning_vsn) {
3238 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3239 my $gotclogp = commit_getclogp($hash);
3240 my $got_vsn = getfield $gotclogp, 'Version';
3241 printdebug "SKEW CHECK GOT $got_vsn\n";
3242 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3243 print STDERR <<END or die $!;
3245 Warning: archive skew detected. Using the available version:
3246 Archive allegedly contains $skew_warning_vsn
3247 We were able to obtain only $got_vsn
3253 if ($lastfetch_hash ne $hash) {
3254 fetch_from_archive_record_2($hash);
3257 lrfetchref_used lrfetchref();
3259 check_gitattrs($hash, "fetched source tree");
3261 unshift @end, $del_lrfetchrefs;
3265 sub set_local_git_config ($$) {
3267 runcmd @git, qw(config), $k, $v;
3270 sub setup_mergechangelogs (;$) {
3272 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3274 my $driver = 'dpkg-mergechangelogs';
3275 my $cb = "merge.$driver";
3276 my $attrs = '.git/info/attributes';
3277 ensuredir '.git/info';
3279 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3280 if (!open ATTRS, "<", $attrs) {
3281 $!==ENOENT or die "$attrs: $!";
3285 next if m{^debian/changelog\s};
3286 print NATTRS $_, "\n" or die $!;
3288 ATTRS->error and die $!;
3291 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3294 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3295 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3297 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3300 sub setup_useremail (;$) {
3302 return unless $always || access_cfg_bool(1, 'setup-useremail');
3305 my ($k, $envvar) = @_;
3306 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3307 return unless defined $v;
3308 set_local_git_config "user.$k", $v;
3311 $setup->('email', 'DEBEMAIL');
3312 $setup->('name', 'DEBFULLNAME');
3315 sub ensure_setup_existing_tree () {
3316 my $k = "remote.$remotename.skipdefaultupdate";
3317 my $c = git_get_config $k;
3318 return if defined $c;
3319 set_local_git_config $k, 'true';
3322 sub open_gitattrs () {
3323 my $gai = new IO::File ".git/info/attributes"
3325 or die "open .git/info/attributes: $!";
3329 sub is_gitattrs_setup () {
3330 my $gai = open_gitattrs();
3331 return 0 unless $gai;
3333 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3335 $gai->error and die $!;
3339 sub setup_gitattrs (;$) {
3341 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3343 if (is_gitattrs_setup()) {
3345 [attr]dgit-defuse-attrs already found in .git/info/attributes
3346 not doing further gitattributes setup
3350 my $af = ".git/info/attributes";
3351 open GAO, "> $af.new" or die $!;
3352 print GAO <<END or die $!;
3354 [attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
3355 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3357 my $gai = open_gitattrs();
3361 print GAO $_, "\n" or die $!;
3363 $gai->error and die $!;
3365 close GAO or die $!;
3366 rename "$af.new", "$af" or die "install $af: $!";
3369 sub setup_new_tree () {
3370 setup_mergechangelogs();
3375 sub check_gitattrs ($$) {
3376 my ($treeish, $what) = @_;
3378 return if is_gitattrs_setup;
3381 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3383 my $gafl = new IO::File;
3384 open $gafl, "-|", @cmd or die $!;
3387 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3389 next unless m{(?:^|/)\.gitattributes$};
3391 # oh dear, found one
3393 dgit: warning: $what contains .gitattributes
3394 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3399 # tree contains no .gitattributes files
3400 $?=0; $!=0; close $gafl or failedcmd @cmd;
3404 sub multisuite_suite_child ($$$) {
3405 my ($tsuite, $merginputs, $fn) = @_;
3406 # in child, sets things up, calls $fn->(), and returns undef
3407 # in parent, returns canonical suite name for $tsuite
3408 my $canonsuitefh = IO::File::new_tmpfile;
3409 my $pid = fork // die $!;
3413 $us .= " [$isuite]";
3414 $debugprefix .= " ";
3415 progress "fetching $tsuite...";
3416 canonicalise_suite();
3417 print $canonsuitefh $csuite, "\n" or die $!;
3418 close $canonsuitefh or die $!;
3422 waitpid $pid,0 == $pid or die $!;
3423 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3424 seek $canonsuitefh,0,0 or die $!;
3425 local $csuite = <$canonsuitefh>;
3426 die $! unless defined $csuite && chomp $csuite;
3428 printdebug "multisuite $tsuite missing\n";
3431 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3432 push @$merginputs, {
3439 sub fork_for_multisuite ($) {
3440 my ($before_fetch_merge) = @_;
3441 # if nothing unusual, just returns ''
3444 # returns 0 to caller in child, to do first of the specified suites
3445 # in child, $csuite is not yet set
3447 # returns 1 to caller in parent, to finish up anything needed after
3448 # in parent, $csuite is set to canonicalised portmanteau
3450 my $org_isuite = $isuite;
3451 my @suites = split /\,/, $isuite;
3452 return '' unless @suites > 1;
3453 printdebug "fork_for_multisuite: @suites\n";
3457 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3459 return 0 unless defined $cbasesuite;
3461 fail "package $package missing in (base suite) $cbasesuite"
3462 unless @mergeinputs;
3464 my @csuites = ($cbasesuite);
3466 $before_fetch_merge->();
3468 foreach my $tsuite (@suites[1..$#suites]) {
3469 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3475 # xxx collecte the ref here
3477 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3478 push @csuites, $csubsuite;
3481 foreach my $mi (@mergeinputs) {
3482 my $ref = git_get_ref $mi->{Ref};
3483 die "$mi->{Ref} ?" unless length $ref;
3484 $mi->{Commit} = $ref;
3487 $csuite = join ",", @csuites;
3489 my $previous = git_get_ref lrref;
3491 unshift @mergeinputs, {
3492 Commit => $previous,
3493 Info => "local combined tracking branch",
3495 "archive seems to have rewound: local tracking branch is ahead!",
3499 foreach my $ix (0..$#mergeinputs) {
3500 $mergeinputs[$ix]{Index} = $ix;
3503 @mergeinputs = sort {
3504 -version_compare(mergeinfo_version $a,
3505 mergeinfo_version $b) # highest version first
3507 $a->{Index} <=> $b->{Index}; # earliest in spec first
3513 foreach my $mi (@mergeinputs) {
3514 printdebug "multisuite merge check $mi->{Info}\n";
3515 foreach my $previous (@needed) {
3516 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3517 printdebug "multisuite merge un-needed $previous->{Info}\n";
3521 printdebug "multisuite merge this-needed\n";
3522 $mi->{Character} = '+';
3525 $needed[0]{Character} = '*';
3527 my $output = $needed[0]{Commit};
3530 printdebug "multisuite merge nontrivial\n";
3531 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3533 my $commit = "tree $tree\n";
3534 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3535 "Input branches:\n";
3537 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3538 printdebug "multisuite merge include $mi->{Info}\n";
3539 $mi->{Character} //= ' ';
3540 $commit .= "parent $mi->{Commit}\n";
3541 $msg .= sprintf " %s %-25s %s\n",
3543 (mergeinfo_version $mi),
3546 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3548 " * marks the highest version branch, which choose to use\n".
3549 " + marks each branch which was not already an ancestor\n\n".
3550 "[dgit multi-suite $csuite]\n";
3552 "author $authline\n".
3553 "committer $authline\n\n";
3554 $output = make_commit_text $commit.$msg;
3555 printdebug "multisuite merge generated $output\n";
3558 fetch_from_archive_record_1($output);
3559 fetch_from_archive_record_2($output);
3561 progress "calculated combined tracking suite $csuite";
3566 sub clone_set_head () {
3567 open H, "> .git/HEAD" or die $!;
3568 print H "ref: ".lref()."\n" or die $!;
3571 sub clone_finish ($) {
3573 runcmd @git, qw(reset --hard), lrref();
3574 runcmd qw(bash -ec), <<'END';
3576 git ls-tree -r --name-only -z HEAD | \
3577 xargs -0r touch -h -r . --
3579 printdone "ready for work in $dstdir";
3584 badusage "dry run makes no sense with clone" unless act_local();
3586 my $multi_fetched = fork_for_multisuite(sub {
3587 printdebug "multi clone before fetch merge\n";
3590 if ($multi_fetched) {
3591 printdebug "multi clone after fetch merge\n";
3593 clone_finish($dstdir);
3596 printdebug "clone main body\n";
3598 canonicalise_suite();
3599 my $hasgit = check_for_git();
3600 mkdir $dstdir or fail "create \`$dstdir': $!";
3602 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;
3622 clone_finish($dstdir);
3626 canonicalise_suite();
3627 if (check_for_git()) {
3630 fetch_from_archive() or no_such_package();
3631 printdone "fetched into ".lrref();
3635 my $multi_fetched = fork_for_multisuite(sub { });
3636 fetch() unless $multi_fetched; # parent
3637 return if $multi_fetched eq '0'; # child
3638 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3640 printdone "fetched to ".lrref()." and merged into HEAD";
3643 sub check_not_dirty () {
3644 foreach my $f (qw(local-options local-patch-header)) {
3645 if (stat_exists "debian/source/$f") {
3646 fail "git tree contains debian/source/$f";
3650 return if $ignoredirty;
3652 my @cmd = (@git, qw(diff --quiet HEAD));
3654 $!=0; $?=-1; system @cmd;
3657 fail "working tree is dirty (does not match HEAD)";
3663 sub commit_admin ($) {
3666 runcmd_ordryrun_local @git, qw(commit -m), $m;
3669 sub commit_quilty_patch () {
3670 my $output = cmdoutput @git, qw(status --porcelain);
3672 foreach my $l (split /\n/, $output) {
3673 next unless $l =~ m/\S/;
3674 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3678 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3680 progress "nothing quilty to commit, ok.";
3683 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3684 runcmd_ordryrun_local @git, qw(add -f), @adds;
3686 Commit Debian 3.0 (quilt) metadata
3688 [dgit ($our_version) quilt-fixup]
3692 sub get_source_format () {
3694 if (open F, "debian/source/options") {
3698 s/\s+$//; # ignore missing final newline
3700 my ($k, $v) = ($`, $'); #');
3701 $v =~ s/^"(.*)"$/$1/;
3707 F->error and die $!;
3710 die $! unless $!==&ENOENT;
3713 if (!open F, "debian/source/format") {
3714 die $! unless $!==&ENOENT;
3718 F->error and die $!;
3720 return ($_, \%options);
3723 sub madformat_wantfixup ($) {
3725 return 0 unless $format eq '3.0 (quilt)';
3726 our $quilt_mode_warned;
3727 if ($quilt_mode eq 'nocheck') {
3728 progress "Not doing any fixup of \`$format' due to".
3729 " ----no-quilt-fixup or --quilt=nocheck"
3730 unless $quilt_mode_warned++;
3733 progress "Format \`$format', need to check/update patch stack"
3734 unless $quilt_mode_warned++;
3738 sub maybe_split_brain_save ($$$) {
3739 my ($headref, $dgitview, $msg) = @_;
3740 # => message fragment "$saved" describing disposition of $dgitview
3741 return "commit id $dgitview" unless defined $split_brain_save;
3742 my @cmd = (shell_cmd "cd ../../../..",
3743 @git, qw(update-ref -m),
3744 "dgit --dgit-view-save $msg HEAD=$headref",
3745 $split_brain_save, $dgitview);
3747 return "and left in $split_brain_save";
3750 # An "infopair" is a tuple [ $thing, $what ]
3751 # (often $thing is a commit hash; $what is a description)
3753 sub infopair_cond_equal ($$) {
3755 $x->[0] eq $y->[0] or fail <<END;
3756 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3760 sub infopair_lrf_tag_lookup ($$) {
3761 my ($tagnames, $what) = @_;
3762 # $tagname may be an array ref
3763 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3764 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3765 foreach my $tagname (@tagnames) {
3766 my $lrefname = lrfetchrefs."/tags/$tagname";
3767 my $tagobj = $lrfetchrefs_f{$lrefname};
3768 next unless defined $tagobj;
3769 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3770 return [ git_rev_parse($tagobj), $what ];
3772 fail @tagnames==1 ? <<END : <<END;
3773 Wanted tag $what (@tagnames) on dgit server, but not found
3775 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3779 sub infopair_cond_ff ($$) {
3780 my ($anc,$desc) = @_;
3781 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3782 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3786 sub pseudomerge_version_check ($$) {
3787 my ($clogp, $archive_hash) = @_;
3789 my $arch_clogp = commit_getclogp $archive_hash;
3790 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3791 'version currently in archive' ];
3792 if (defined $overwrite_version) {
3793 if (length $overwrite_version) {
3794 infopair_cond_equal([ $overwrite_version,
3795 '--overwrite= version' ],
3798 my $v = $i_arch_v->[0];
3799 progress "Checking package changelog for archive version $v ...";
3801 my @xa = ("-f$v", "-t$v");
3802 my $vclogp = parsechangelog @xa;
3803 my $cv = [ (getfield $vclogp, 'Version'),
3804 "Version field from dpkg-parsechangelog @xa" ];
3805 infopair_cond_equal($i_arch_v, $cv);
3808 $@ =~ s/^dgit: //gm;
3810 "Perhaps debian/changelog does not mention $v ?";
3815 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3819 sub pseudomerge_make_commit ($$$$ $$) {
3820 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3821 $msg_cmd, $msg_msg) = @_;
3822 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3824 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3825 my $authline = clogp_authline $clogp;
3829 !defined $overwrite_version ? ""
3830 : !length $overwrite_version ? " --overwrite"
3831 : " --overwrite=".$overwrite_version;
3834 my $pmf = ".git/dgit/pseudomerge";
3835 open MC, ">", $pmf or die "$pmf $!";
3836 print MC <<END or die $!;
3839 parent $archive_hash
3849 return make_commit($pmf);
3852 sub splitbrain_pseudomerge ($$$$) {
3853 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3854 # => $merged_dgitview
3855 printdebug "splitbrain_pseudomerge...\n";
3857 # We: debian/PREVIOUS HEAD($maintview)
3858 # expect: o ----------------- o
3861 # a/d/PREVIOUS $dgitview
3864 # we do: `------------------ o
3868 return $dgitview unless defined $archive_hash;
3870 printdebug "splitbrain_pseudomerge...\n";
3872 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3874 if (!defined $overwrite_version) {
3875 progress "Checking that HEAD inciudes all changes in archive...";
3878 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3880 if (defined $overwrite_version) {
3882 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3883 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3884 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3885 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3886 my $i_archive = [ $archive_hash, "current archive contents" ];
3888 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3890 infopair_cond_equal($i_dgit, $i_archive);
3891 infopair_cond_ff($i_dep14, $i_dgit);
3892 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3896 $us: check failed (maybe --overwrite is needed, consult documentation)
3901 my $r = pseudomerge_make_commit
3902 $clogp, $dgitview, $archive_hash, $i_arch_v,
3903 "dgit --quilt=$quilt_mode",
3904 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3905 Declare fast forward from $i_arch_v->[0]
3907 Make fast forward from $i_arch_v->[0]
3910 maybe_split_brain_save $maintview, $r, "pseudomerge";
3912 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3916 sub plain_overwrite_pseudomerge ($$$) {
3917 my ($clogp, $head, $archive_hash) = @_;
3919 printdebug "plain_overwrite_pseudomerge...";
3921 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3923 return $head if is_fast_fwd $archive_hash, $head;
3925 my $m = "Declare fast forward from $i_arch_v->[0]";
3927 my $r = pseudomerge_make_commit
3928 $clogp, $head, $archive_hash, $i_arch_v,
3931 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3933 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3937 sub push_parse_changelog ($) {
3940 my $clogp = Dpkg::Control::Hash->new();
3941 $clogp->load($clogpfn) or die;
3943 my $clogpackage = getfield $clogp, 'Source';
3944 $package //= $clogpackage;
3945 fail "-p specified $package but changelog specified $clogpackage"
3946 unless $package eq $clogpackage;
3947 my $cversion = getfield $clogp, 'Version';
3949 if (!$we_are_initiator) {
3950 # rpush initiator can't do this because it doesn't have $isuite yet
3951 my $tag = debiantag($cversion, access_nomdistro);
3952 runcmd @git, qw(check-ref-format), $tag;
3955 my $dscfn = dscfn($cversion);
3957 return ($clogp, $cversion, $dscfn);
3960 sub push_parse_dsc ($$$) {
3961 my ($dscfn,$dscfnwhat, $cversion) = @_;
3962 $dsc = parsecontrol($dscfn,$dscfnwhat);
3963 my $dversion = getfield $dsc, 'Version';
3964 my $dscpackage = getfield $dsc, 'Source';
3965 ($dscpackage eq $package && $dversion eq $cversion) or
3966 fail "$dscfn is for $dscpackage $dversion".
3967 " but debian/changelog is for $package $cversion";
3970 sub push_tagwants ($$$$) {
3971 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3974 TagFn => \&debiantag,
3979 if (defined $maintviewhead) {
3981 TagFn => \&debiantag_maintview,
3982 Objid => $maintviewhead,
3983 TfSuffix => '-maintview',
3986 } elsif ($dodep14tag eq 'no' ? 0
3987 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3988 : $dodep14tag eq 'always'
3989 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3990 --dep14tag-always (or equivalent in config) means server must support
3991 both "new" and "maint" tag formats, but config says it doesn't.
3993 : die "$dodep14tag ?") {
3995 TagFn => \&debiantag_maintview,
3997 TfSuffix => '-dgit',
4001 foreach my $tw (@tagwants) {
4002 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4003 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4005 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4009 sub push_mktags ($$ $$ $) {
4011 $changesfile,$changesfilewhat,
4014 die unless $tagwants->[0]{View} eq 'dgit';
4016 my $declaredistro = access_nomdistro();
4017 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4018 $dsc->{$ourdscfield[0]} = join " ",
4019 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4021 $dsc->save("$dscfn.tmp") or die $!;
4023 my $changes = parsecontrol($changesfile,$changesfilewhat);
4024 foreach my $field (qw(Source Distribution Version)) {
4025 $changes->{$field} eq $clogp->{$field} or
4026 fail "changes field $field \`$changes->{$field}'".
4027 " does not match changelog \`$clogp->{$field}'";
4030 my $cversion = getfield $clogp, 'Version';
4031 my $clogsuite = getfield $clogp, 'Distribution';
4033 # We make the git tag by hand because (a) that makes it easier
4034 # to control the "tagger" (b) we can do remote signing
4035 my $authline = clogp_authline $clogp;
4036 my $delibs = join(" ", "",@deliberatelies);
4040 my $tfn = $tw->{Tfn};
4041 my $head = $tw->{Objid};
4042 my $tag = $tw->{Tag};
4044 open TO, '>', $tfn->('.tmp') or die $!;
4045 print TO <<END or die $!;
4052 if ($tw->{View} eq 'dgit') {
4053 print TO <<END or die $!;
4054 $package release $cversion for $clogsuite ($csuite) [dgit]
4055 [dgit distro=$declaredistro$delibs]
4057 foreach my $ref (sort keys %previously) {
4058 print TO <<END or die $!;
4059 [dgit previously:$ref=$previously{$ref}]
4062 } elsif ($tw->{View} eq 'maint') {
4063 print TO <<END or die $!;
4064 $package release $cversion for $clogsuite ($csuite)
4065 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4068 die Dumper($tw)."?";
4073 my $tagobjfn = $tfn->('.tmp');
4075 if (!defined $keyid) {
4076 $keyid = access_cfg('keyid','RETURN-UNDEF');
4078 if (!defined $keyid) {
4079 $keyid = getfield $clogp, 'Maintainer';
4081 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4082 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4083 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4084 push @sign_cmd, $tfn->('.tmp');
4085 runcmd_ordryrun @sign_cmd;
4087 $tagobjfn = $tfn->('.signed.tmp');
4088 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4089 $tfn->('.tmp'), $tfn->('.tmp.asc');
4095 my @r = map { $mktag->($_); } @$tagwants;
4099 sub sign_changes ($) {
4100 my ($changesfile) = @_;
4102 my @debsign_cmd = @debsign;
4103 push @debsign_cmd, "-k$keyid" if defined $keyid;
4104 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4105 push @debsign_cmd, $changesfile;
4106 runcmd_ordryrun @debsign_cmd;
4111 printdebug "actually entering push\n";
4113 supplementary_message(<<'END');
4114 Push failed, while checking state of the archive.
4115 You can retry the push, after fixing the problem, if you like.
4117 if (check_for_git()) {
4120 my $archive_hash = fetch_from_archive();
4121 if (!$archive_hash) {
4123 fail "package appears to be new in this suite;".
4124 " if this is intentional, use --new";
4127 supplementary_message(<<'END');
4128 Push failed, while preparing your push.
4129 You can retry the push, after fixing the problem, if you like.
4132 need_tagformat 'new', "quilt mode $quilt_mode"
4133 if quiltmode_splitbrain;
4137 access_giturl(); # check that success is vaguely likely
4138 rpush_handle_protovsn_bothends() if $we_are_initiator;
4141 my $clogpfn = ".git/dgit/changelog.822.tmp";
4142 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4144 responder_send_file('parsed-changelog', $clogpfn);
4146 my ($clogp, $cversion, $dscfn) =
4147 push_parse_changelog("$clogpfn");
4149 my $dscpath = "$buildproductsdir/$dscfn";
4150 stat_exists $dscpath or
4151 fail "looked for .dsc $dscpath, but $!;".
4152 " maybe you forgot to build";
4154 responder_send_file('dsc', $dscpath);
4156 push_parse_dsc($dscpath, $dscfn, $cversion);
4158 my $format = getfield $dsc, 'Format';
4159 printdebug "format $format\n";
4161 my $actualhead = git_rev_parse('HEAD');
4162 my $dgithead = $actualhead;
4163 my $maintviewhead = undef;
4165 my $upstreamversion = upstreamversion $clogp->{Version};
4167 if (madformat_wantfixup($format)) {
4168 # user might have not used dgit build, so maybe do this now:
4169 if (quiltmode_splitbrain()) {
4171 quilt_make_fake_dsc($upstreamversion);
4173 ($dgithead, $cachekey) =
4174 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4176 "--quilt=$quilt_mode but no cached dgit view:
4177 perhaps tree changed since dgit build[-source] ?";
4179 $dgithead = splitbrain_pseudomerge($clogp,
4180 $actualhead, $dgithead,
4182 $maintviewhead = $actualhead;
4183 changedir '../../../..';
4184 prep_ud(); # so _only_subdir() works, below
4186 commit_quilty_patch();
4190 if (defined $overwrite_version && !defined $maintviewhead) {
4191 $dgithead = plain_overwrite_pseudomerge($clogp,
4199 if ($archive_hash) {
4200 if (is_fast_fwd($archive_hash, $dgithead)) {
4202 } elsif (deliberately_not_fast_forward) {
4205 fail "dgit push: HEAD is not a descendant".
4206 " of the archive's version.\n".
4207 "To overwrite the archive's contents,".
4208 " pass --overwrite[=VERSION].\n".
4209 "To rewind history, if permitted by the archive,".
4210 " use --deliberately-not-fast-forward.";
4215 progress "checking that $dscfn corresponds to HEAD";
4216 runcmd qw(dpkg-source -x --),
4217 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4218 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4219 check_for_vendor_patches() if madformat($dsc->{format});
4220 changedir '../../../..';
4221 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4222 debugcmd "+",@diffcmd;
4224 my $r = system @diffcmd;
4227 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4229 HEAD specifies a different tree to $dscfn:
4231 Perhaps you forgot to build. Or perhaps there is a problem with your
4232 source tree (see dgit(7) for some hints). To see a full diff, run
4239 if (!$changesfile) {
4240 my $pat = changespat $cversion;
4241 my @cs = glob "$buildproductsdir/$pat";
4242 fail "failed to find unique changes file".
4243 " (looked for $pat in $buildproductsdir);".
4244 " perhaps you need to use dgit -C"
4246 ($changesfile) = @cs;
4248 $changesfile = "$buildproductsdir/$changesfile";
4251 # Check that changes and .dsc agree enough
4252 $changesfile =~ m{[^/]*$};
4253 my $changes = parsecontrol($changesfile,$&);
4254 files_compare_inputs($dsc, $changes)
4255 unless forceing [qw(dsc-changes-mismatch)];
4257 # Perhaps adjust .dsc to contain right set of origs
4258 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4260 unless forceing [qw(changes-origs-exactly)];
4262 # Checks complete, we're going to try and go ahead:
4264 responder_send_file('changes',$changesfile);
4265 responder_send_command("param head $dgithead");
4266 responder_send_command("param csuite $csuite");
4267 responder_send_command("param isuite $isuite");
4268 responder_send_command("param tagformat $tagformat");
4269 if (defined $maintviewhead) {
4270 die unless ($protovsn//4) >= 4;
4271 responder_send_command("param maint-view $maintviewhead");
4274 if (deliberately_not_fast_forward) {
4275 git_for_each_ref(lrfetchrefs, sub {
4276 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4277 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4278 responder_send_command("previously $rrefname=$objid");
4279 $previously{$rrefname} = $objid;
4283 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4287 supplementary_message(<<'END');
4288 Push failed, while signing the tag.
4289 You can retry the push, after fixing the problem, if you like.
4291 # If we manage to sign but fail to record it anywhere, it's fine.
4292 if ($we_are_responder) {
4293 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4294 responder_receive_files('signed-tag', @tagobjfns);
4296 @tagobjfns = push_mktags($clogp,$dscpath,
4297 $changesfile,$changesfile,
4300 supplementary_message(<<'END');
4301 Push failed, *after* signing the tag.
4302 If you want to try again, you should use a new version number.
4305 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4307 foreach my $tw (@tagwants) {
4308 my $tag = $tw->{Tag};
4309 my $tagobjfn = $tw->{TagObjFn};
4311 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4312 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4313 runcmd_ordryrun_local
4314 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4317 supplementary_message(<<'END');
4318 Push failed, while updating the remote git repository - see messages above.
4319 If you want to try again, you should use a new version number.
4321 if (!check_for_git()) {
4322 create_remote_git_repo();
4325 my @pushrefs = $forceflag.$dgithead.":".rrref();
4326 foreach my $tw (@tagwants) {
4327 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4330 runcmd_ordryrun @git,
4331 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4332 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4334 supplementary_message(<<'END');
4335 Push failed, while obtaining signatures on the .changes and .dsc.
4336 If it was just that the signature failed, you may try again by using
4337 debsign by hand to sign the changes
4339 and then dput to complete the upload.
4340 If you need to change the package, you must use a new version number.
4342 if ($we_are_responder) {
4343 my $dryrunsuffix = act_local() ? "" : ".tmp";
4344 responder_receive_files('signed-dsc-changes',
4345 "$dscpath$dryrunsuffix",
4346 "$changesfile$dryrunsuffix");
4349 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4351 progress "[new .dsc left in $dscpath.tmp]";
4353 sign_changes $changesfile;
4356 supplementary_message(<<END);
4357 Push failed, while uploading package(s) to the archive server.
4358 You can retry the upload of exactly these same files with dput of:
4360 If that .changes file is broken, you will need to use a new version
4361 number for your next attempt at the upload.
4363 my $host = access_cfg('upload-host','RETURN-UNDEF');
4364 my @hostarg = defined($host) ? ($host,) : ();
4365 runcmd_ordryrun @dput, @hostarg, $changesfile;
4366 printdone "pushed and uploaded $cversion";
4368 supplementary_message('');
4369 responder_send_command("complete");
4375 badusage "-p is not allowed with clone; specify as argument instead"
4376 if defined $package;
4379 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4380 ($package,$isuite) = @ARGV;
4381 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4382 ($package,$dstdir) = @ARGV;
4383 } elsif (@ARGV==3) {
4384 ($package,$isuite,$dstdir) = @ARGV;
4386 badusage "incorrect arguments to dgit clone";
4390 $dstdir ||= "$package";
4391 if (stat_exists $dstdir) {
4392 fail "$dstdir already exists";
4396 if ($rmonerror && !$dryrun_level) {
4397 $cwd_remove= getcwd();
4399 return unless defined $cwd_remove;
4400 if (!chdir "$cwd_remove") {
4401 return if $!==&ENOENT;
4402 die "chdir $cwd_remove: $!";
4404 printdebug "clone rmonerror removing $dstdir\n";
4406 rmtree($dstdir) or die "remove $dstdir: $!\n";
4407 } elsif (grep { $! == $_ }
4408 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4410 print STDERR "check whether to remove $dstdir: $!\n";
4416 $cwd_remove = undef;
4419 sub branchsuite () {
4420 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4421 if ($branch =~ m#$lbranch_re#o) {
4428 sub fetchpullargs () {
4429 if (!defined $package) {
4430 my $sourcep = parsecontrol('debian/control','debian/control');
4431 $package = getfield $sourcep, 'Source';
4434 $isuite = branchsuite();
4436 my $clogp = parsechangelog();
4437 my $clogsuite = getfield $clogp, 'Distribution';
4438 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4440 } elsif (@ARGV==1) {
4443 badusage "incorrect arguments to dgit fetch or dgit pull";
4451 my $multi_fetched = fork_for_multisuite(sub { });
4452 exit 0 if $multi_fetched;
4459 if (quiltmode_splitbrain()) {
4460 my ($format, $fopts) = get_source_format();
4461 madformat($format) and fail <<END
4462 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4470 badusage "-p is not allowed with dgit push" if defined $package;
4472 my $clogp = parsechangelog();
4473 $package = getfield $clogp, 'Source';
4476 } elsif (@ARGV==1) {
4477 ($specsuite) = (@ARGV);
4479 badusage "incorrect arguments to dgit push";
4481 $isuite = getfield $clogp, 'Distribution';
4484 local ($package) = $existing_package; # this is a hack
4485 canonicalise_suite();
4487 canonicalise_suite();
4489 if (defined $specsuite &&
4490 $specsuite ne $isuite &&
4491 $specsuite ne $csuite) {
4492 fail "dgit push: changelog specifies $isuite ($csuite)".
4493 " but command line specifies $specsuite";
4498 #---------- remote commands' implementation ----------
4500 sub cmd_remote_push_build_host {
4501 my ($nrargs) = shift @ARGV;
4502 my (@rargs) = @ARGV[0..$nrargs-1];
4503 @ARGV = @ARGV[$nrargs..$#ARGV];
4505 my ($dir,$vsnwant) = @rargs;
4506 # vsnwant is a comma-separated list; we report which we have
4507 # chosen in our ready response (so other end can tell if they
4510 $we_are_responder = 1;
4511 $us .= " (build host)";
4513 open PI, "<&STDIN" or die $!;
4514 open STDIN, "/dev/null" or die $!;
4515 open PO, ">&STDOUT" or die $!;
4517 open STDOUT, ">&STDERR" or die $!;
4521 ($protovsn) = grep {
4522 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4523 } @rpushprotovsn_support;
4525 fail "build host has dgit rpush protocol versions ".
4526 (join ",", @rpushprotovsn_support).
4527 " but invocation host has $vsnwant"
4528 unless defined $protovsn;
4530 responder_send_command("dgit-remote-push-ready $protovsn");
4535 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4536 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4537 # a good error message)
4539 sub rpush_handle_protovsn_bothends () {
4540 if ($protovsn < 4) {
4541 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4550 my $report = i_child_report();
4551 if (defined $report) {
4552 printdebug "($report)\n";
4553 } elsif ($i_child_pid) {
4554 printdebug "(killing build host child $i_child_pid)\n";
4555 kill 15, $i_child_pid;
4557 if (defined $i_tmp && !defined $initiator_tempdir) {
4559 eval { rmtree $i_tmp; };
4564 return unless forkcheck_mainprocess();
4569 my ($base,$selector,@args) = @_;
4570 $selector =~ s/\-/_/g;
4571 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4577 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4585 push @rargs, join ",", @rpushprotovsn_support;
4588 push @rdgit, @ropts;
4589 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4591 my @cmd = (@ssh, $host, shellquote @rdgit);
4594 $we_are_initiator=1;
4596 if (defined $initiator_tempdir) {
4597 rmtree $initiator_tempdir;
4598 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4599 $i_tmp = $initiator_tempdir;
4603 $i_child_pid = open2(\*RO, \*RI, @cmd);
4605 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4606 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4607 $supplementary_message = '' unless $protovsn >= 3;
4610 my ($icmd,$iargs) = initiator_expect {
4611 m/^(\S+)(?: (.*))?$/;
4614 i_method "i_resp", $icmd, $iargs;
4618 sub i_resp_progress ($) {
4620 my $msg = protocol_read_bytes \*RO, $rhs;
4624 sub i_resp_supplementary_message ($) {
4626 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4629 sub i_resp_complete {
4630 my $pid = $i_child_pid;
4631 $i_child_pid = undef; # prevents killing some other process with same pid
4632 printdebug "waiting for build host child $pid...\n";
4633 my $got = waitpid $pid, 0;
4634 die $! unless $got == $pid;
4635 die "build host child failed $?" if $?;
4638 printdebug "all done\n";
4642 sub i_resp_file ($) {
4644 my $localname = i_method "i_localname", $keyword;
4645 my $localpath = "$i_tmp/$localname";
4646 stat_exists $localpath and
4647 badproto \*RO, "file $keyword ($localpath) twice";
4648 protocol_receive_file \*RO, $localpath;
4649 i_method "i_file", $keyword;
4654 sub i_resp_param ($) {
4655 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4659 sub i_resp_previously ($) {
4660 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4661 or badproto \*RO, "bad previously spec";
4662 my $r = system qw(git check-ref-format), $1;
4663 die "bad previously ref spec ($r)" if $r;
4664 $previously{$1} = $2;
4669 sub i_resp_want ($) {
4671 die "$keyword ?" if $i_wanted{$keyword}++;
4673 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4674 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4675 die unless $isuite =~ m/^$suite_re$/;
4678 rpush_handle_protovsn_bothends();
4680 fail "rpush negotiated protocol version $protovsn".
4681 " which does not support quilt mode $quilt_mode"
4682 if quiltmode_splitbrain;
4684 my @localpaths = i_method "i_want", $keyword;
4685 printdebug "[[ $keyword @localpaths\n";
4686 foreach my $localpath (@localpaths) {
4687 protocol_send_file \*RI, $localpath;
4689 print RI "files-end\n" or die $!;
4692 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4694 sub i_localname_parsed_changelog {
4695 return "remote-changelog.822";
4697 sub i_file_parsed_changelog {
4698 ($i_clogp, $i_version, $i_dscfn) =
4699 push_parse_changelog "$i_tmp/remote-changelog.822";
4700 die if $i_dscfn =~ m#/|^\W#;
4703 sub i_localname_dsc {
4704 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4709 sub i_localname_changes {
4710 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4711 $i_changesfn = $i_dscfn;
4712 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4713 return $i_changesfn;
4715 sub i_file_changes { }
4717 sub i_want_signed_tag {
4718 printdebug Dumper(\%i_param, $i_dscfn);
4719 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4720 && defined $i_param{'csuite'}
4721 or badproto \*RO, "premature desire for signed-tag";
4722 my $head = $i_param{'head'};
4723 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4725 my $maintview = $i_param{'maint-view'};
4726 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4729 if ($protovsn >= 4) {
4730 my $p = $i_param{'tagformat'} // '<undef>';
4732 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4735 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4737 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4739 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4742 push_mktags $i_clogp, $i_dscfn,
4743 $i_changesfn, 'remote changes',
4747 sub i_want_signed_dsc_changes {
4748 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4749 sign_changes $i_changesfn;
4750 return ($i_dscfn, $i_changesfn);
4753 #---------- building etc. ----------
4759 #----- `3.0 (quilt)' handling -----
4761 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4763 sub quiltify_dpkg_commit ($$$;$) {
4764 my ($patchname,$author,$msg, $xinfo) = @_;
4768 my $descfn = ".git/dgit/quilt-description.tmp";
4769 open O, '>', $descfn or die "$descfn: $!";
4770 $msg =~ s/\n+/\n\n/;
4771 print O <<END or die $!;
4773 ${xinfo}Subject: $msg
4780 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4781 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4782 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4783 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4787 sub quiltify_trees_differ ($$;$$$) {
4788 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4789 # returns true iff the two tree objects differ other than in debian/
4790 # with $finegrained,
4791 # returns bitmask 01 - differ in upstream files except .gitignore
4792 # 02 - differ in .gitignore
4793 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4794 # is set for each modified .gitignore filename $fn
4795 # if $unrepres is defined, array ref to which is appeneded
4796 # a list of unrepresentable changes (removals of upstream files
4799 my @cmd = (@git, qw(diff-tree -z));
4800 push @cmd, qw(--name-only) unless $unrepres;
4801 push @cmd, qw(-r) if $finegrained || $unrepres;
4803 my $diffs= cmdoutput @cmd;
4806 foreach my $f (split /\0/, $diffs) {
4807 if ($unrepres && !@lmodes) {
4808 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4811 my ($oldmode,$newmode) = @lmodes;
4814 next if $f =~ m#^debian(?:/.*)?$#s;
4818 die "not a plain file\n"
4819 unless $newmode =~ m/^10\d{4}$/ ||
4820 $oldmode =~ m/^10\d{4}$/;
4821 if ($oldmode =~ m/[^0]/ &&
4822 $newmode =~ m/[^0]/) {
4823 die "mode changed\n" if $oldmode ne $newmode;
4825 die "non-default mode\n"
4826 unless $newmode =~ m/^100644$/ ||
4827 $oldmode =~ m/^100644$/;
4831 local $/="\n"; chomp $@;
4832 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4836 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4837 $r |= $isignore ? 02 : 01;
4838 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4840 printdebug "quiltify_trees_differ $x $y => $r\n";
4844 sub quiltify_tree_sentinelfiles ($) {
4845 # lists the `sentinel' files present in the tree
4847 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4848 qw(-- debian/rules debian/control);
4853 sub quiltify_splitbrain_needed () {
4854 if (!$split_brain) {
4855 progress "dgit view: changes are required...";
4856 runcmd @git, qw(checkout -q -b dgit-view);
4861 sub quiltify_splitbrain ($$$$$$) {
4862 my ($clogp, $unapplied, $headref, $diffbits,
4863 $editedignores, $cachekey) = @_;
4864 if ($quilt_mode !~ m/gbp|dpm/) {
4865 # treat .gitignore just like any other upstream file
4866 $diffbits = { %$diffbits };
4867 $_ = !!$_ foreach values %$diffbits;
4869 # We would like any commits we generate to be reproducible
4870 my @authline = clogp_authline($clogp);
4871 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4872 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4873 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4874 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4875 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4876 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4878 if ($quilt_mode =~ m/gbp|unapplied/ &&
4879 ($diffbits->{O2H} & 01)) {
4881 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4882 " but git tree differs from orig in upstream files.";
4883 if (!stat_exists "debian/patches") {
4885 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4889 if ($quilt_mode =~ m/dpm/ &&
4890 ($diffbits->{H2A} & 01)) {
4892 --quilt=$quilt_mode specified, implying patches-applied git tree
4893 but git tree differs from result of applying debian/patches to upstream
4896 if ($quilt_mode =~ m/gbp|unapplied/ &&
4897 ($diffbits->{O2A} & 01)) { # some patches
4898 quiltify_splitbrain_needed();
4899 progress "dgit view: creating patches-applied version using gbp pq";
4900 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4901 # gbp pq import creates a fresh branch; push back to dgit-view
4902 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4903 runcmd @git, qw(checkout -q dgit-view);
4905 if ($quilt_mode =~ m/gbp|dpm/ &&
4906 ($diffbits->{O2A} & 02)) {
4908 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4909 tool which does not create patches for changes to upstream
4910 .gitignores: but, such patches exist in debian/patches.
4913 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4914 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4915 quiltify_splitbrain_needed();
4916 progress "dgit view: creating patch to represent .gitignore changes";
4917 ensuredir "debian/patches";
4918 my $gipatch = "debian/patches/auto-gitignore";
4919 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4920 stat GIPATCH or die "$gipatch: $!";
4921 fail "$gipatch already exists; but want to create it".
4922 " to record .gitignore changes" if (stat _)[7];
4923 print GIPATCH <<END or die "$gipatch: $!";
4924 Subject: Update .gitignore from Debian packaging branch
4926 The Debian packaging git branch contains these updates to the upstream
4927 .gitignore file(s). This patch is autogenerated, to provide these
4928 updates to users of the official Debian archive view of the package.
4930 [dgit ($our_version) update-gitignore]
4933 close GIPATCH or die "$gipatch: $!";
4934 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4935 $unapplied, $headref, "--", sort keys %$editedignores;
4936 open SERIES, "+>>", "debian/patches/series" or die $!;
4937 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4939 defined read SERIES, $newline, 1 or die $!;
4940 print SERIES "\n" or die $! unless $newline eq "\n";
4941 print SERIES "auto-gitignore\n" or die $!;
4942 close SERIES or die $!;
4943 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4945 Commit patch to update .gitignore
4947 [dgit ($our_version) update-gitignore-quilt-fixup]
4951 my $dgitview = git_rev_parse 'HEAD';
4953 changedir '../../../..';
4954 # When we no longer need to support squeeze, use --create-reflog
4956 ensuredir ".git/logs/refs/dgit-intern";
4957 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4960 my $oldcache = git_get_ref "refs/$splitbraincache";
4961 if ($oldcache eq $dgitview) {
4962 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4963 # git update-ref doesn't always update, in this case. *sigh*
4964 my $dummy = make_commit_text <<END;
4967 author Dgit <dgit\@example.com> 1000000000 +0000
4968 committer Dgit <dgit\@example.com> 1000000000 +0000
4970 Dummy commit - do not use
4972 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4973 "refs/$splitbraincache", $dummy;
4975 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4978 changedir '.git/dgit/unpack/work';
4980 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4981 progress "dgit view: created ($saved)";
4984 sub quiltify ($$$$) {
4985 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4987 # Quilt patchification algorithm
4989 # We search backwards through the history of the main tree's HEAD
4990 # (T) looking for a start commit S whose tree object is identical
4991 # to to the patch tip tree (ie the tree corresponding to the
4992 # current dpkg-committed patch series). For these purposes
4993 # `identical' disregards anything in debian/ - this wrinkle is
4994 # necessary because dpkg-source treates debian/ specially.
4996 # We can only traverse edges where at most one of the ancestors'
4997 # trees differs (in changes outside in debian/). And we cannot
4998 # handle edges which change .pc/ or debian/patches. To avoid
4999 # going down a rathole we avoid traversing edges which introduce
5000 # debian/rules or debian/control. And we set a limit on the
5001 # number of edges we are willing to look at.
5003 # If we succeed, we walk forwards again. For each traversed edge
5004 # PC (with P parent, C child) (starting with P=S and ending with
5005 # C=T) to we do this:
5007 # - dpkg-source --commit with a patch name and message derived from C
5008 # After traversing PT, we git commit the changes which
5009 # should be contained within debian/patches.
5011 # The search for the path S..T is breadth-first. We maintain a
5012 # todo list containing search nodes. A search node identifies a
5013 # commit, and looks something like this:
5015 # Commit => $git_commit_id,
5016 # Child => $c, # or undef if P=T
5017 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5018 # Nontrivial => true iff $p..$c has relevant changes
5025 my %considered; # saves being exponential on some weird graphs
5027 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5030 my ($search,$whynot) = @_;
5031 printdebug " search NOT $search->{Commit} $whynot\n";
5032 $search->{Whynot} = $whynot;
5033 push @nots, $search;
5034 no warnings qw(exiting);
5043 my $c = shift @todo;
5044 next if $considered{$c->{Commit}}++;
5046 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5048 printdebug "quiltify investigate $c->{Commit}\n";
5051 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5052 printdebug " search finished hooray!\n";
5057 if ($quilt_mode eq 'nofix') {
5058 fail "quilt fixup required but quilt mode is \`nofix'\n".
5059 "HEAD commit $c->{Commit} differs from tree implied by ".
5060 " debian/patches (tree object $oldtiptree)";
5062 if ($quilt_mode eq 'smash') {
5063 printdebug " search quitting smash\n";
5067 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5068 $not->($c, "has $c_sentinels not $t_sentinels")
5069 if $c_sentinels ne $t_sentinels;
5071 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5072 $commitdata =~ m/\n\n/;
5074 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5075 @parents = map { { Commit => $_, Child => $c } } @parents;
5077 $not->($c, "root commit") if !@parents;
5079 foreach my $p (@parents) {
5080 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5082 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5083 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5085 foreach my $p (@parents) {
5086 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5088 my @cmd= (@git, qw(diff-tree -r --name-only),
5089 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5090 my $patchstackchange = cmdoutput @cmd;
5091 if (length $patchstackchange) {
5092 $patchstackchange =~ s/\n/,/g;
5093 $not->($p, "changed $patchstackchange");
5096 printdebug " search queue P=$p->{Commit} ",
5097 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5103 printdebug "quiltify want to smash\n";
5106 my $x = $_[0]{Commit};
5107 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5110 my $reportnot = sub {
5112 my $s = $abbrev->($notp);
5113 my $c = $notp->{Child};
5114 $s .= "..".$abbrev->($c) if $c;
5115 $s .= ": ".$notp->{Whynot};
5118 if ($quilt_mode eq 'linear') {
5119 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5120 foreach my $notp (@nots) {
5121 print STDERR "$us: ", $reportnot->($notp), "\n";
5123 print STDERR "$us: $_\n" foreach @$failsuggestion;
5124 fail "quilt fixup naive history linearisation failed.\n".
5125 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5126 } elsif ($quilt_mode eq 'smash') {
5127 } elsif ($quilt_mode eq 'auto') {
5128 progress "quilt fixup cannot be linear, smashing...";
5130 die "$quilt_mode ?";
5133 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5134 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5136 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5138 quiltify_dpkg_commit "auto-$version-$target-$time",
5139 (getfield $clogp, 'Maintainer'),
5140 "Automatically generated patch ($clogp->{Version})\n".
5141 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5145 progress "quiltify linearisation planning successful, executing...";
5147 for (my $p = $sref_S;
5148 my $c = $p->{Child};
5150 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5151 next unless $p->{Nontrivial};
5153 my $cc = $c->{Commit};
5155 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5156 $commitdata =~ m/\n\n/ or die "$c ?";
5159 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5162 my $commitdate = cmdoutput
5163 @git, qw(log -n1 --pretty=format:%aD), $cc;
5165 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5167 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5174 my $gbp_check_suitable = sub {
5179 die "contains unexpected slashes\n" if m{//} || m{/$};
5180 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5181 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5182 die "too long" if length > 200;
5184 return $_ unless $@;
5185 print STDERR "quiltifying commit $cc:".
5186 " ignoring/dropping Gbp-Pq $what: $@";
5190 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5192 (\S+) \s* \n //ixm) {
5193 $patchname = $gbp_check_suitable->($1, 'Name');
5195 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5197 (\S+) \s* \n //ixm) {
5198 $patchdir = $gbp_check_suitable->($1, 'Topic');
5203 if (!defined $patchname) {
5204 $patchname = $title;
5205 $patchname =~ s/[.:]$//;
5208 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5209 my $translitname = $converter->convert($patchname);
5210 die unless defined $translitname;
5211 $patchname = $translitname;
5214 "dgit: patch title transliteration error: $@"
5216 $patchname =~ y/ A-Z/-a-z/;
5217 $patchname =~ y/-a-z0-9_.+=~//cd;
5218 $patchname =~ s/^\W/x-$&/;
5219 $patchname = substr($patchname,0,40);
5221 if (!defined $patchdir) {
5224 if (length $patchdir) {
5225 $patchname = "$patchdir/$patchname";
5227 if ($patchname =~ m{^(.*)/}) {
5228 mkpath "debian/patches/$1";
5233 stat "debian/patches/$patchname$index";
5235 $!==ENOENT or die "$patchname$index $!";
5237 runcmd @git, qw(checkout -q), $cc;
5239 # We use the tip's changelog so that dpkg-source doesn't
5240 # produce complaining messages from dpkg-parsechangelog. None
5241 # of the information dpkg-source gets from the changelog is
5242 # actually relevant - it gets put into the original message
5243 # which dpkg-source provides our stunt editor, and then
5245 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5247 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5248 "Date: $commitdate\n".
5249 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5251 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5254 runcmd @git, qw(checkout -q master);
5257 sub build_maybe_quilt_fixup () {
5258 my ($format,$fopts) = get_source_format;
5259 return unless madformat_wantfixup $format;
5262 check_for_vendor_patches();
5264 if (quiltmode_splitbrain) {
5265 fail <<END unless access_cfg_tagformats_can_splitbrain;
5266 quilt mode $quilt_mode requires split view so server needs to support
5267 both "new" and "maint" tag formats, but config says it doesn't.
5271 my $clogp = parsechangelog();
5272 my $headref = git_rev_parse('HEAD');
5277 my $upstreamversion = upstreamversion $version;
5279 if ($fopts->{'single-debian-patch'}) {
5280 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5282 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5285 die 'bug' if $split_brain && !$need_split_build_invocation;
5287 changedir '../../../..';
5288 runcmd_ordryrun_local
5289 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5292 sub quilt_fixup_mkwork ($) {
5295 mkdir "work" or die $!;
5297 mktree_in_ud_here();
5298 runcmd @git, qw(reset -q --hard), $headref;
5301 sub quilt_fixup_linkorigs ($$) {
5302 my ($upstreamversion, $fn) = @_;
5303 # calls $fn->($leafname);
5305 foreach my $f (<../../../../*>) { #/){
5306 my $b=$f; $b =~ s{.*/}{};
5308 local ($debuglevel) = $debuglevel-1;
5309 printdebug "QF linkorigs $b, $f ?\n";
5311 next unless is_orig_file_of_vsn $b, $upstreamversion;
5312 printdebug "QF linkorigs $b, $f Y\n";
5313 link_ltarget $f, $b or die "$b $!";
5318 sub quilt_fixup_delete_pc () {
5319 runcmd @git, qw(rm -rqf .pc);
5321 Commit removal of .pc (quilt series tracking data)
5323 [dgit ($our_version) upgrade quilt-remove-pc]
5327 sub quilt_fixup_singlepatch ($$$) {
5328 my ($clogp, $headref, $upstreamversion) = @_;
5330 progress "starting quiltify (single-debian-patch)";
5332 # dpkg-source --commit generates new patches even if
5333 # single-debian-patch is in debian/source/options. In order to
5334 # get it to generate debian/patches/debian-changes, it is
5335 # necessary to build the source package.
5337 quilt_fixup_linkorigs($upstreamversion, sub { });
5338 quilt_fixup_mkwork($headref);
5340 rmtree("debian/patches");
5342 runcmd @dpkgsource, qw(-b .);
5344 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5345 rename srcfn("$upstreamversion", "/debian/patches"),
5346 "work/debian/patches";
5349 commit_quilty_patch();
5352 sub quilt_make_fake_dsc ($) {
5353 my ($upstreamversion) = @_;
5355 my $fakeversion="$upstreamversion-~~DGITFAKE";
5357 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5358 print $fakedsc <<END or die $!;
5361 Version: $fakeversion
5365 my $dscaddfile=sub {
5368 my $md = new Digest::MD5;
5370 my $fh = new IO::File $b, '<' or die "$b $!";
5375 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5378 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5380 my @files=qw(debian/source/format debian/rules
5381 debian/control debian/changelog);
5382 foreach my $maybe (qw(debian/patches debian/source/options
5383 debian/tests/control)) {
5384 next unless stat_exists "../../../$maybe";
5385 push @files, $maybe;
5388 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5389 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5391 $dscaddfile->($debtar);
5392 close $fakedsc or die $!;
5395 sub quilt_check_splitbrain_cache ($$) {
5396 my ($headref, $upstreamversion) = @_;
5397 # Called only if we are in (potentially) split brain mode.
5399 # Computes the cache key and looks in the cache.
5400 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5402 my $splitbrain_cachekey;
5405 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5406 # we look in the reflog of dgit-intern/quilt-cache
5407 # we look for an entry whose message is the key for the cache lookup
5408 my @cachekey = (qw(dgit), $our_version);
5409 push @cachekey, $upstreamversion;
5410 push @cachekey, $quilt_mode;
5411 push @cachekey, $headref;
5413 push @cachekey, hashfile('fake.dsc');
5415 my $srcshash = Digest::SHA->new(256);
5416 my %sfs = ( %INC, '$0(dgit)' => $0 );
5417 foreach my $sfk (sort keys %sfs) {
5418 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5419 $srcshash->add($sfk," ");
5420 $srcshash->add(hashfile($sfs{$sfk}));
5421 $srcshash->add("\n");
5423 push @cachekey, $srcshash->hexdigest();
5424 $splitbrain_cachekey = "@cachekey";
5426 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5428 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5429 debugcmd "|(probably)",@cmd;
5430 my $child = open GC, "-|"; defined $child or die $!;
5432 chdir '../../..' or die $!;
5433 if (!stat ".git/logs/refs/$splitbraincache") {
5434 $! == ENOENT or die $!;
5435 printdebug ">(no reflog)\n";
5442 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5443 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5446 quilt_fixup_mkwork($headref);
5447 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5448 if ($cachehit ne $headref) {
5449 progress "dgit view: found cached ($saved)";
5450 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5452 return ($cachehit, $splitbrain_cachekey);
5454 progress "dgit view: found cached, no changes required";
5455 return ($headref, $splitbrain_cachekey);
5457 die $! if GC->error;
5458 failedcmd unless close GC;
5460 printdebug "splitbrain cache miss\n";
5461 return (undef, $splitbrain_cachekey);
5464 sub quilt_fixup_multipatch ($$$) {
5465 my ($clogp, $headref, $upstreamversion) = @_;
5467 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5470 # - honour any existing .pc in case it has any strangeness
5471 # - determine the git commit corresponding to the tip of
5472 # the patch stack (if there is one)
5473 # - if there is such a git commit, convert each subsequent
5474 # git commit into a quilt patch with dpkg-source --commit
5475 # - otherwise convert all the differences in the tree into
5476 # a single git commit
5480 # Our git tree doesn't necessarily contain .pc. (Some versions of
5481 # dgit would include the .pc in the git tree.) If there isn't
5482 # one, we need to generate one by unpacking the patches that we
5485 # We first look for a .pc in the git tree. If there is one, we
5486 # will use it. (This is not the normal case.)
5488 # Otherwise need to regenerate .pc so that dpkg-source --commit
5489 # can work. We do this as follows:
5490 # 1. Collect all relevant .orig from parent directory
5491 # 2. Generate a debian.tar.gz out of
5492 # debian/{patches,rules,source/format,source/options}
5493 # 3. Generate a fake .dsc containing just these fields:
5494 # Format Source Version Files
5495 # 4. Extract the fake .dsc
5496 # Now the fake .dsc has a .pc directory.
5497 # (In fact we do this in every case, because in future we will
5498 # want to search for a good base commit for generating patches.)
5500 # Then we can actually do the dpkg-source --commit
5501 # 1. Make a new working tree with the same object
5502 # store as our main tree and check out the main
5504 # 2. Copy .pc from the fake's extraction, if necessary
5505 # 3. Run dpkg-source --commit
5506 # 4. If the result has changes to debian/, then
5507 # - git add them them
5508 # - git add .pc if we had a .pc in-tree
5510 # 5. If we had a .pc in-tree, delete it, and git commit
5511 # 6. Back in the main tree, fast forward to the new HEAD
5513 # Another situation we may have to cope with is gbp-style
5514 # patches-unapplied trees.
5516 # We would want to detect these, so we know to escape into
5517 # quilt_fixup_gbp. However, this is in general not possible.
5518 # Consider a package with a one patch which the dgit user reverts
5519 # (with git revert or the moral equivalent).
5521 # That is indistinguishable in contents from a patches-unapplied
5522 # tree. And looking at the history to distinguish them is not
5523 # useful because the user might have made a confusing-looking git
5524 # history structure (which ought to produce an error if dgit can't
5525 # cope, not a silent reintroduction of an unwanted patch).
5527 # So gbp users will have to pass an option. But we can usually
5528 # detect their failure to do so: if the tree is not a clean
5529 # patches-applied tree, quilt linearisation fails, but the tree
5530 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5531 # they want --quilt=unapplied.
5533 # To help detect this, when we are extracting the fake dsc, we
5534 # first extract it with --skip-patches, and then apply the patches
5535 # afterwards with dpkg-source --before-build. That lets us save a
5536 # tree object corresponding to .origs.
5538 my $splitbrain_cachekey;
5540 quilt_make_fake_dsc($upstreamversion);
5542 if (quiltmode_splitbrain()) {
5544 ($cachehit, $splitbrain_cachekey) =
5545 quilt_check_splitbrain_cache($headref, $upstreamversion);
5546 return if $cachehit;
5550 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5552 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5553 rename $fakexdir, "fake" or die "$fakexdir $!";
5557 remove_stray_gits("source package");
5558 mktree_in_ud_here();
5562 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5563 my $unapplied=git_add_write_tree();
5564 printdebug "fake orig tree object $unapplied\n";
5568 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5570 if (system @bbcmd) {
5571 failedcmd @bbcmd if $? < 0;
5573 failed to apply your git tree's patch stack (from debian/patches/) to
5574 the corresponding upstream tarball(s). Your source tree and .orig
5575 are probably too inconsistent. dgit can only fix up certain kinds of
5576 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5582 quilt_fixup_mkwork($headref);
5585 if (stat_exists ".pc") {
5587 progress "Tree already contains .pc - will use it then delete it.";
5590 rename '../fake/.pc','.pc' or die $!;
5593 changedir '../fake';
5595 my $oldtiptree=git_add_write_tree();
5596 printdebug "fake o+d/p tree object $unapplied\n";
5597 changedir '../work';
5600 # We calculate some guesswork now about what kind of tree this might
5601 # be. This is mostly for error reporting.
5607 # O = orig, without patches applied
5608 # A = "applied", ie orig with H's debian/patches applied
5609 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5610 \%editedignores, \@unrepres),
5611 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5612 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5616 foreach my $b (qw(01 02)) {
5617 foreach my $v (qw(O2H O2A H2A)) {
5618 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5621 printdebug "differences \@dl @dl.\n";
5624 "$us: base trees orig=%.20s o+d/p=%.20s",
5625 $unapplied, $oldtiptree;
5627 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5628 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5629 $dl[0], $dl[1], $dl[3], $dl[4],
5633 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5635 forceable_fail [qw(unrepresentable)], <<END;
5636 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5641 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5642 push @failsuggestion, "This might be a patches-unapplied branch.";
5643 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5644 push @failsuggestion, "This might be a patches-applied branch.";
5646 push @failsuggestion, "Maybe you need to specify one of".
5647 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5649 if (quiltmode_splitbrain()) {
5650 quiltify_splitbrain($clogp, $unapplied, $headref,
5651 $diffbits, \%editedignores,
5652 $splitbrain_cachekey);
5656 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5657 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5659 if (!open P, '>>', ".pc/applied-patches") {
5660 $!==&ENOENT or die $!;
5665 commit_quilty_patch();
5667 if ($mustdeletepc) {
5668 quilt_fixup_delete_pc();
5672 sub quilt_fixup_editor () {
5673 my $descfn = $ENV{$fakeeditorenv};
5674 my $editing = $ARGV[$#ARGV];
5675 open I1, '<', $descfn or die "$descfn: $!";
5676 open I2, '<', $editing or die "$editing: $!";
5677 unlink $editing or die "$editing: $!";
5678 open O, '>', $editing or die "$editing: $!";
5679 while (<I1>) { print O or die $!; } I1->error and die $!;
5682 $copying ||= m/^\-\-\- /;
5683 next unless $copying;
5686 I2->error and die $!;
5691 sub maybe_apply_patches_dirtily () {
5692 return unless $quilt_mode =~ m/gbp|unapplied/;
5693 print STDERR <<END or die $!;
5695 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5696 dgit: Have to apply the patches - making the tree dirty.
5697 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5700 $patches_applied_dirtily = 01;
5701 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5702 runcmd qw(dpkg-source --before-build .);
5705 sub maybe_unapply_patches_again () {
5706 progress "dgit: Unapplying patches again to tidy up the tree."
5707 if $patches_applied_dirtily;
5708 runcmd qw(dpkg-source --after-build .)
5709 if $patches_applied_dirtily & 01;
5711 if $patches_applied_dirtily & 02;
5712 $patches_applied_dirtily = 0;
5715 #----- other building -----
5717 our $clean_using_builder;
5718 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5719 # clean the tree before building (perhaps invoked indirectly by
5720 # whatever we are using to run the build), rather than separately
5721 # and explicitly by us.
5724 return if $clean_using_builder;
5725 if ($cleanmode eq 'dpkg-source') {
5726 maybe_apply_patches_dirtily();
5727 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5728 } elsif ($cleanmode eq 'dpkg-source-d') {
5729 maybe_apply_patches_dirtily();
5730 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5731 } elsif ($cleanmode eq 'git') {
5732 runcmd_ordryrun_local @git, qw(clean -xdf);
5733 } elsif ($cleanmode eq 'git-ff') {
5734 runcmd_ordryrun_local @git, qw(clean -xdff);
5735 } elsif ($cleanmode eq 'check') {
5736 my $leftovers = cmdoutput @git, qw(clean -xdn);
5737 if (length $leftovers) {
5738 print STDERR $leftovers, "\n" or die $!;
5739 fail "tree contains uncommitted files and --clean=check specified";
5741 } elsif ($cleanmode eq 'none') {
5748 badusage "clean takes no additional arguments" if @ARGV;
5751 maybe_unapply_patches_again();
5754 sub build_prep_early () {
5755 our $build_prep_early_done //= 0;
5756 return if $build_prep_early_done++;
5757 badusage "-p is not allowed when building" if defined $package;
5758 my $clogp = parsechangelog();
5759 $isuite = getfield $clogp, 'Distribution';
5760 $package = getfield $clogp, 'Source';
5761 $version = getfield $clogp, 'Version';
5769 build_maybe_quilt_fixup();
5771 my $pat = changespat $version;
5772 foreach my $f (glob "$buildproductsdir/$pat") {
5774 unlink $f or fail "remove old changes file $f: $!";
5776 progress "would remove $f";
5782 sub changesopts_initial () {
5783 my @opts =@changesopts[1..$#changesopts];
5786 sub changesopts_version () {
5787 if (!defined $changes_since_version) {
5788 my @vsns = archive_query('archive_query');
5789 my @quirk = access_quirk();
5790 if ($quirk[0] eq 'backports') {
5791 local $isuite = $quirk[2];
5793 canonicalise_suite();
5794 push @vsns, archive_query('archive_query');
5797 @vsns = map { $_->[0] } @vsns;
5798 @vsns = sort { -version_compare($a, $b) } @vsns;
5799 $changes_since_version = $vsns[0];
5800 progress "changelog will contain changes since $vsns[0]";
5802 $changes_since_version = '_';
5803 progress "package seems new, not specifying -v<version>";
5806 if ($changes_since_version ne '_') {
5807 return ("-v$changes_since_version");
5813 sub changesopts () {
5814 return (changesopts_initial(), changesopts_version());
5817 sub massage_dbp_args ($;$) {
5818 my ($cmd,$xargs) = @_;
5821 # - if we're going to split the source build out so we can
5822 # do strange things to it, massage the arguments to dpkg-buildpackage
5823 # so that the main build doessn't build source (or add an argument
5824 # to stop it building source by default).
5826 # - add -nc to stop dpkg-source cleaning the source tree,
5827 # unless we're not doing a split build and want dpkg-source
5828 # as cleanmode, in which case we can do nothing
5831 # 0 - source will NOT need to be built separately by caller
5832 # +1 - source will need to be built separately by caller
5833 # +2 - source will need to be built separately by caller AND
5834 # dpkg-buildpackage should not in fact be run at all!
5835 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5836 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5837 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5838 $clean_using_builder = 1;
5841 # -nc has the side effect of specifying -b if nothing else specified
5842 # and some combinations of -S, -b, et al, are errors, rather than
5843 # later simply overriding earlie. So we need to:
5844 # - search the command line for these options
5845 # - pick the last one
5846 # - perhaps add our own as a default
5847 # - perhaps adjust it to the corresponding non-source-building version
5849 foreach my $l ($cmd, $xargs) {
5851 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5854 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5856 if ($need_split_build_invocation) {
5857 printdebug "massage split $dmode.\n";
5858 $r = $dmode =~ m/[S]/ ? +2 :
5859 $dmode =~ y/gGF/ABb/ ? +1 :
5860 $dmode =~ m/[ABb]/ ? 0 :
5863 printdebug "massage done $r $dmode.\n";
5865 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5871 my $wasdir = must_getcwd();
5877 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5878 my ($msg_if_onlyone) = @_;
5879 # If there is only one .changes file, fail with $msg_if_onlyone,
5880 # or if that is undef, be a no-op.
5881 # Returns the changes file to report to the user.
5882 my $pat = changespat $version;
5883 my @changesfiles = glob $pat;
5884 @changesfiles = sort {
5885 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5889 if (@changesfiles==1) {
5890 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5891 only one changes file from build (@changesfiles)
5893 $result = $changesfiles[0];
5894 } elsif (@changesfiles==2) {
5895 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5896 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5897 fail "$l found in binaries changes file $binchanges"
5900 runcmd_ordryrun_local @mergechanges, @changesfiles;
5901 my $multichanges = changespat $version,'multi';
5903 stat_exists $multichanges or fail "$multichanges: $!";
5904 foreach my $cf (glob $pat) {
5905 next if $cf eq $multichanges;
5906 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5909 $result = $multichanges;
5911 fail "wrong number of different changes files (@changesfiles)";
5913 printdone "build successful, results in $result\n" or die $!;
5916 sub midbuild_checkchanges () {
5917 my $pat = changespat $version;
5918 return if $rmchanges;
5919 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5920 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5922 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5923 Suggest you delete @unwanted.
5928 sub midbuild_checkchanges_vanilla ($) {
5930 midbuild_checkchanges() if $wantsrc == 1;
5933 sub postbuild_mergechanges_vanilla ($) {
5935 if ($wantsrc == 1) {
5937 postbuild_mergechanges(undef);
5940 printdone "build successful\n";
5946 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5947 my $wantsrc = massage_dbp_args \@dbp;
5950 midbuild_checkchanges_vanilla $wantsrc;
5955 push @dbp, changesopts_version();
5956 maybe_apply_patches_dirtily();
5957 runcmd_ordryrun_local @dbp;
5959 maybe_unapply_patches_again();
5960 postbuild_mergechanges_vanilla $wantsrc;
5964 $quilt_mode //= 'gbp';
5970 # gbp can make .origs out of thin air. In my tests it does this
5971 # even for a 1.0 format package, with no origs present. So I
5972 # guess it keys off just the version number. We don't know
5973 # exactly what .origs ought to exist, but let's assume that we
5974 # should run gbp if: the version has an upstream part and the main
5976 my $upstreamversion = upstreamversion $version;
5977 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5978 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5980 if ($gbp_make_orig) {
5982 $cleanmode = 'none'; # don't do it again
5983 $need_split_build_invocation = 1;
5986 my @dbp = @dpkgbuildpackage;
5988 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5990 if (!length $gbp_build[0]) {
5991 if (length executable_on_path('git-buildpackage')) {
5992 $gbp_build[0] = qw(git-buildpackage);
5994 $gbp_build[0] = 'gbp buildpackage';
5997 my @cmd = opts_opt_multi_cmd @gbp_build;
5999 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6001 if ($gbp_make_orig) {
6002 ensuredir '.git/dgit';
6003 my $ok = '.git/dgit/origs-gen-ok';
6004 unlink $ok or $!==&ENOENT or die $!;
6005 my @origs_cmd = @cmd;
6006 push @origs_cmd, qw(--git-cleaner=true);
6007 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6008 push @origs_cmd, @ARGV;
6010 debugcmd @origs_cmd;
6012 do { local $!; stat_exists $ok; }
6013 or failedcmd @origs_cmd;
6015 dryrun_report @origs_cmd;
6021 midbuild_checkchanges_vanilla $wantsrc;
6023 if (!$clean_using_builder) {
6024 push @cmd, '--git-cleaner=true';
6028 maybe_unapply_patches_again();
6030 push @cmd, changesopts();
6031 runcmd_ordryrun_local @cmd, @ARGV;
6033 postbuild_mergechanges_vanilla $wantsrc;
6035 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6039 my $our_cleanmode = $cleanmode;
6040 if ($need_split_build_invocation) {
6041 # Pretend that clean is being done some other way. This
6042 # forces us not to try to use dpkg-buildpackage to clean and
6043 # build source all in one go; and instead we run dpkg-source
6044 # (and build_prep() will do the clean since $clean_using_builder
6046 $our_cleanmode = 'ELSEWHERE';
6048 if ($our_cleanmode =~ m/^dpkg-source/) {
6049 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6050 $clean_using_builder = 1;
6053 $sourcechanges = changespat $version,'source';
6055 unlink "../$sourcechanges" or $!==ENOENT
6056 or fail "remove $sourcechanges: $!";
6058 $dscfn = dscfn($version);
6059 if ($our_cleanmode eq 'dpkg-source') {
6060 maybe_apply_patches_dirtily();
6061 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6063 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6064 maybe_apply_patches_dirtily();
6065 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6068 my @cmd = (@dpkgsource, qw(-b --));
6071 runcmd_ordryrun_local @cmd, "work";
6072 my @udfiles = <${package}_*>;
6073 changedir "../../..";
6074 foreach my $f (@udfiles) {
6075 printdebug "source copy, found $f\n";
6078 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6079 $f eq srcfn($version, $&));
6080 printdebug "source copy, found $f - renaming\n";
6081 rename "$ud/$f", "../$f" or $!==ENOENT
6082 or fail "put in place new source file ($f): $!";
6085 my $pwd = must_getcwd();
6086 my $leafdir = basename $pwd;
6088 runcmd_ordryrun_local @cmd, $leafdir;
6091 runcmd_ordryrun_local qw(sh -ec),
6092 'exec >$1; shift; exec "$@"','x',
6093 "../$sourcechanges",
6094 @dpkggenchanges, qw(-S), changesopts();
6098 sub cmd_build_source {
6100 badusage "build-source takes no additional arguments" if @ARGV;
6102 maybe_unapply_patches_again();
6103 printdone "source built, results in $dscfn and $sourcechanges";
6108 midbuild_checkchanges();
6111 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6112 stat_exists $sourcechanges
6113 or fail "$sourcechanges (in parent directory): $!";
6115 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6117 maybe_unapply_patches_again();
6119 postbuild_mergechanges(<<END);
6120 perhaps you need to pass -A ? (sbuild's default is to build only
6121 arch-specific binaries; dgit 1.4 used to override that.)
6126 sub cmd_quilt_fixup {
6127 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6130 build_maybe_quilt_fixup();
6133 sub import_dsc_result {
6134 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6135 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6137 check_gitattrs($newhash, "source tree");
6139 progress "dgit: import-dsc: $what_msg";
6142 sub cmd_import_dsc {
6146 last unless $ARGV[0] =~ m/^-/;
6149 if (m/^--require-valid-signature$/) {
6152 badusage "unknown dgit import-dsc sub-option \`$_'";
6156 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6157 my ($dscfn, $dstbranch) = @ARGV;
6159 badusage "dry run makes no sense with import-dsc" unless act_local();
6161 my $force = $dstbranch =~ s/^\+// ? +1 :
6162 $dstbranch =~ s/^\.\.// ? -1 :
6164 my $info = $force ? " $&" : '';
6165 $info = "$dscfn$info";
6167 my $specbranch = $dstbranch;
6168 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6169 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6171 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6172 my $chead = cmdoutput_errok @symcmd;
6173 defined $chead or $?==256 or failedcmd @symcmd;
6175 fail "$dstbranch is checked out - will not update it"
6176 if defined $chead and $chead eq $dstbranch;
6178 my $oldhash = git_get_ref $dstbranch;
6180 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6181 $dscdata = do { local $/ = undef; <D>; };
6182 D->error and fail "read $dscfn: $!";
6185 # we don't normally need this so import it here
6186 use Dpkg::Source::Package;
6187 my $dp = new Dpkg::Source::Package filename => $dscfn,
6188 require_valid_signature => $needsig;
6190 local $SIG{__WARN__} = sub {
6192 return unless $needsig;
6193 fail "import-dsc signature check failed";
6195 if (!$dp->is_signed()) {
6196 warn "$us: warning: importing unsigned .dsc\n";
6198 my $r = $dp->check_signature();
6199 die "->check_signature => $r" if $needsig && $r;
6205 $package = getfield $dsc, 'Source';
6207 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6208 unless forceing [qw(import-dsc-with-dgit-field)];
6209 parse_dsc_field_def_dsc_distro();
6211 $isuite = 'DGIT-IMPORT-DSC';
6212 $idistro //= $dsc_distro;
6216 if (defined $dsc_hash) {
6217 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6218 resolve_dsc_field_commit undef, undef;
6220 if (defined $dsc_hash) {
6221 my @cmd = (qw(sh -ec),
6222 "echo $dsc_hash | git cat-file --batch-check");
6223 my $objgot = cmdoutput @cmd;
6224 if ($objgot =~ m#^\w+ missing\b#) {
6226 .dsc contains Dgit field referring to object $dsc_hash
6227 Your git tree does not have that object. Try `git fetch' from a
6228 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6231 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6233 progress "Not fast forward, forced update.";
6235 fail "Not fast forward to $dsc_hash";
6238 import_dsc_result $dstbranch, $dsc_hash,
6239 "dgit import-dsc (Dgit): $info",
6240 "updated git ref $dstbranch";
6245 Branch $dstbranch already exists
6246 Specify ..$specbranch for a pseudo-merge, binding in existing history
6247 Specify +$specbranch to overwrite, discarding existing history
6249 if $oldhash && !$force;
6251 my @dfi = dsc_files_info();
6252 foreach my $fi (@dfi) {
6253 my $f = $fi->{Filename};
6255 next if lstat $here;
6256 fail "stat $here: $!" unless $! == ENOENT;
6258 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6260 } elsif ($dscfn =~ m#^/#) {
6263 fail "cannot import $dscfn which seems to be inside working tree!";
6265 $there =~ s#/+[^/]+$## or
6266 fail "cannot import $dscfn which seems to not have a basename";
6268 symlink $there, $here or fail "symlink $there to $here: $!";
6269 progress "made symlink $here -> $there";
6270 # print STDERR Dumper($fi);
6272 my @mergeinputs = generate_commits_from_dsc();
6273 die unless @mergeinputs == 1;
6275 my $newhash = $mergeinputs[0]{Commit};
6279 progress "Import, forced update - synthetic orphan git history.";
6280 } elsif ($force < 0) {
6281 progress "Import, merging.";
6282 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6283 my $version = getfield $dsc, 'Version';
6284 my $clogp = commit_getclogp $newhash;
6285 my $authline = clogp_authline $clogp;
6286 $newhash = make_commit_text <<END;
6293 Merge $package ($version) import into $dstbranch
6296 die; # caught earlier
6300 import_dsc_result $dstbranch, $newhash,
6301 "dgit import-dsc: $info",
6302 "results are in in git ref $dstbranch";
6305 sub cmd_archive_api_query {
6306 badusage "need only 1 subpath argument" unless @ARGV==1;
6307 my ($subpath) = @ARGV;
6308 my @cmd = archive_api_query_cmd($subpath);
6311 exec @cmd or fail "exec curl: $!\n";
6314 sub cmd_clone_dgit_repos_server {
6315 badusage "need destination argument" unless @ARGV==1;
6316 my ($destdir) = @ARGV;
6317 $package = '_dgit-repos-server';
6318 local $access_forpush = 0;
6319 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6321 exec @cmd or fail "exec git clone: $!\n";
6324 sub cmd_print_dgit_repos_server_source_url {
6325 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6327 $package = '_dgit-repos-server';
6328 local $access_forpush = 0;
6329 my $url = access_giturl();
6330 print $url, "\n" or die $!;
6333 sub cmd_setup_mergechangelogs {
6334 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6335 setup_mergechangelogs(1);
6338 sub cmd_setup_useremail {
6339 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6343 sub cmd_setup_gitattributes {
6344 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6348 sub cmd_setup_new_tree {
6349 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6353 #---------- argument parsing and main program ----------
6356 print "dgit version $our_version\n" or die $!;
6360 our (%valopts_long, %valopts_short);
6361 our (%funcopts_long);
6363 our (@modeopt_cfgs);
6365 sub defvalopt ($$$$) {
6366 my ($long,$short,$val_re,$how) = @_;
6367 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6368 $valopts_long{$long} = $oi;
6369 $valopts_short{$short} = $oi;
6370 # $how subref should:
6371 # do whatever assignemnt or thing it likes with $_[0]
6372 # if the option should not be passed on to remote, @rvalopts=()
6373 # or $how can be a scalar ref, meaning simply assign the value
6376 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6377 defvalopt '--distro', '-d', '.+', \$idistro;
6378 defvalopt '', '-k', '.+', \$keyid;
6379 defvalopt '--existing-package','', '.*', \$existing_package;
6380 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6381 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6382 defvalopt '--package', '-p', $package_re, \$package;
6383 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6385 defvalopt '', '-C', '.+', sub {
6386 ($changesfile) = (@_);
6387 if ($changesfile =~ s#^(.*)/##) {
6388 $buildproductsdir = $1;
6392 defvalopt '--initiator-tempdir','','.*', sub {
6393 ($initiator_tempdir) = (@_);
6394 $initiator_tempdir =~ m#^/# or
6395 badusage "--initiator-tempdir must be used specify an".
6396 " absolute, not relative, directory."
6399 sub defoptmodes ($@) {
6400 my ($varref, $cfgkey, $default, %optmap) = @_;
6402 while (my ($opt,$val) = each %optmap) {
6403 $funcopts_long{$opt} = sub { $$varref = $val; };
6404 $permit{$val} = $val;
6406 push @modeopt_cfgs, {
6409 Default => $default,
6414 defoptmodes \$dodep14tag, qw( dep14tag want
6417 --always-dep14tag always );
6422 if (defined $ENV{'DGIT_SSH'}) {
6423 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6424 } elsif (defined $ENV{'GIT_SSH'}) {
6425 @ssh = ($ENV{'GIT_SSH'});
6433 if (!defined $val) {
6434 badusage "$what needs a value" unless @ARGV;
6436 push @rvalopts, $val;
6438 badusage "bad value \`$val' for $what" unless
6439 $val =~ m/^$oi->{Re}$(?!\n)/s;
6440 my $how = $oi->{How};
6441 if (ref($how) eq 'SCALAR') {
6446 push @ropts, @rvalopts;
6450 last unless $ARGV[0] =~ m/^-/;
6454 if (m/^--dry-run$/) {
6457 } elsif (m/^--damp-run$/) {
6460 } elsif (m/^--no-sign$/) {
6463 } elsif (m/^--help$/) {
6465 } elsif (m/^--version$/) {
6467 } elsif (m/^--new$/) {
6470 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6471 ($om = $opts_opt_map{$1}) &&
6475 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6476 !$opts_opt_cmdonly{$1} &&
6477 ($om = $opts_opt_map{$1})) {
6480 } elsif (m/^--(gbp|dpm)$/s) {
6481 push @ropts, "--quilt=$1";
6483 } elsif (m/^--ignore-dirty$/s) {
6486 } elsif (m/^--no-quilt-fixup$/s) {
6488 $quilt_mode = 'nocheck';
6489 } elsif (m/^--no-rm-on-error$/s) {
6492 } elsif (m/^--no-chase-dsc-distro$/s) {
6494 $chase_dsc_distro = 0;
6495 } elsif (m/^--overwrite$/s) {
6497 $overwrite_version = '';
6498 } elsif (m/^--overwrite=(.+)$/s) {
6500 $overwrite_version = $1;
6501 } elsif (m/^--delayed=(\d+)$/s) {
6504 } elsif (m/^--dgit-view-save=(.+)$/s) {
6506 $split_brain_save = $1;
6507 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6508 } elsif (m/^--(no-)?rm-old-changes$/s) {
6511 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6513 push @deliberatelies, $&;
6514 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6518 } elsif (m/^--force-/) {
6520 "$us: warning: ignoring unknown force option $_\n";
6522 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6523 # undocumented, for testing
6525 $tagformat_want = [ $1, 'command line', 1 ];
6526 # 1 menas overrides distro configuration
6527 } elsif (m/^--always-split-source-build$/s) {
6528 # undocumented, for testing
6530 $need_split_build_invocation = 1;
6531 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6532 # undocumented, for testing
6534 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6535 # ^ it's supposed to be an array ref
6536 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6537 $val = $2 ? $' : undef; #';
6538 $valopt->($oi->{Long});
6539 } elsif ($funcopts_long{$_}) {
6541 $funcopts_long{$_}();
6543 badusage "unknown long option \`$_'";
6550 } elsif (s/^-L/-/) {
6553 } elsif (s/^-h/-/) {
6555 } elsif (s/^-D/-/) {
6559 } elsif (s/^-N/-/) {
6564 push @changesopts, $_;
6566 } elsif (s/^-wn$//s) {
6568 $cleanmode = 'none';
6569 } elsif (s/^-wg$//s) {
6572 } elsif (s/^-wgf$//s) {
6574 $cleanmode = 'git-ff';
6575 } elsif (s/^-wd$//s) {
6577 $cleanmode = 'dpkg-source';
6578 } elsif (s/^-wdd$//s) {
6580 $cleanmode = 'dpkg-source-d';
6581 } elsif (s/^-wc$//s) {
6583 $cleanmode = 'check';
6584 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6585 push @git, '-c', $&;
6586 $gitcfgs{cmdline}{$1} = [ $2 ];
6587 } elsif (s/^-c([^=]+)$//s) {
6588 push @git, '-c', $&;
6589 $gitcfgs{cmdline}{$1} = [ 'true' ];
6590 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6592 $val = undef unless length $val;
6593 $valopt->($oi->{Short});
6596 badusage "unknown short option \`$_'";
6603 sub check_env_sanity () {
6604 my $blocked = new POSIX::SigSet;
6605 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6608 foreach my $name (qw(PIPE CHLD)) {
6609 my $signame = "SIG$name";
6610 my $signum = eval "POSIX::$signame" // die;
6611 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6612 die "$signame is set to something other than SIG_DFL\n";
6613 $blocked->ismember($signum) and
6614 die "$signame is blocked\n";
6620 On entry to dgit, $@
6621 This is a bug produced by something in in your execution environment.
6627 sub parseopts_late_defaults () {
6628 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6629 if defined $idistro;
6630 $isuite //= cfg('dgit.default.default-suite');
6632 foreach my $k (keys %opts_opt_map) {
6633 my $om = $opts_opt_map{$k};
6635 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6637 badcfg "cannot set command for $k"
6638 unless length $om->[0];
6642 foreach my $c (access_cfg_cfgs("opts-$k")) {
6644 map { $_ ? @$_ : () }
6645 map { $gitcfgs{$_}{$c} }
6646 reverse @gitcfgsources;
6647 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6648 "\n" if $debuglevel >= 4;
6650 badcfg "cannot configure options for $k"
6651 if $opts_opt_cmdonly{$k};
6652 my $insertpos = $opts_cfg_insertpos{$k};
6653 @$om = ( @$om[0..$insertpos-1],
6655 @$om[$insertpos..$#$om] );
6659 if (!defined $rmchanges) {
6660 local $access_forpush;
6661 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6664 if (!defined $quilt_mode) {
6665 local $access_forpush;
6666 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6667 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6669 $quilt_mode =~ m/^($quilt_modes_re)$/
6670 or badcfg "unknown quilt-mode \`$quilt_mode'";
6674 foreach my $moc (@modeopt_cfgs) {
6675 local $access_forpush;
6676 my $vr = $moc->{Var};
6677 next if defined $$vr;
6678 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6679 my $v = $moc->{Vals}{$$vr};
6680 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6684 $need_split_build_invocation ||= quiltmode_splitbrain();
6686 if (!defined $cleanmode) {
6687 local $access_forpush;
6688 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6689 $cleanmode //= 'dpkg-source';
6691 badcfg "unknown clean-mode \`$cleanmode'" unless
6692 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6696 if ($ENV{$fakeeditorenv}) {
6698 quilt_fixup_editor();
6705 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6706 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6707 if $dryrun_level == 1;
6709 print STDERR $helpmsg or die $!;
6712 my $cmd = shift @ARGV;
6715 my $pre_fn = ${*::}{"pre_$cmd"};
6716 $pre_fn->() if $pre_fn;
6718 my $fn = ${*::}{"cmd_$cmd"};
6719 $fn or badusage "unknown operation $cmd";