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 sub file_in_archive_aptget () { return undef; }
1324 #---------- `dummyapicat' archive query method ----------
1326 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1327 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1329 sub file_in_archive_dummycatapi ($$$) {
1330 my ($proto,$data,$filename) = @_;
1331 my $mirror = access_cfg('mirror');
1332 $mirror =~ s#^file://#/# or die "$mirror ?";
1334 my @cmd = (qw(sh -ec), '
1336 find -name "$2" -print0 |
1338 ', qw(x), $mirror, $filename);
1339 debugcmd "-|", @cmd;
1340 open FIA, "-|", @cmd or die $!;
1343 printdebug "| $_\n";
1344 m/^(\w+) (\S+)$/ or die "$_ ?";
1345 push @out, { sha256sum => $1, filename => $2 };
1347 close FIA or die failedcmd @cmd;
1351 #---------- `madison' archive query method ----------
1353 sub archive_query_madison {
1354 return archive_query_prepend_mirror
1355 map { [ @$_[0..1] ] } madison_get_parse(@_);
1358 sub madison_get_parse {
1359 my ($proto,$data) = @_;
1360 die unless $proto eq 'madison';
1361 if (!length $data) {
1362 $data= access_cfg('madison-distro','RETURN-UNDEF');
1363 $data //= access_basedistro();
1365 $rmad{$proto,$data,$package} ||= cmdoutput
1366 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1367 my $rmad = $rmad{$proto,$data,$package};
1370 foreach my $l (split /\n/, $rmad) {
1371 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1372 \s*( [^ \t|]+ )\s* \|
1373 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1374 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1375 $1 eq $package or die "$rmad $package ?";
1382 $component = access_cfg('archive-query-default-component');
1384 $5 eq 'source' or die "$rmad ?";
1385 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1387 return sort { -version_compare($a->[0],$b->[0]); } @out;
1390 sub canonicalise_suite_madison {
1391 # madison canonicalises for us
1392 my @r = madison_get_parse(@_);
1394 "unable to canonicalise suite using package $package".
1395 " which does not appear to exist in suite $isuite;".
1396 " --existing-package may help";
1400 sub file_in_archive_madison { return undef; }
1402 #---------- `sshpsql' archive query method ----------
1405 my ($data,$runeinfo,$sql) = @_;
1406 if (!length $data) {
1407 $data= access_someuserhost('sshpsql').':'.
1408 access_cfg('sshpsql-dbname');
1410 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1411 my ($userhost,$dbname) = ($`,$'); #';
1413 my @cmd = (access_cfg_ssh, $userhost,
1414 access_runeinfo("ssh-psql $runeinfo").
1415 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1416 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1418 open P, "-|", @cmd or die $!;
1421 printdebug(">|$_|\n");
1424 $!=0; $?=0; close P or failedcmd @cmd;
1426 my $nrows = pop @rows;
1427 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1428 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1429 @rows = map { [ split /\|/, $_ ] } @rows;
1430 my $ncols = scalar @{ shift @rows };
1431 die if grep { scalar @$_ != $ncols } @rows;
1435 sub sql_injection_check {
1436 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1439 sub archive_query_sshpsql ($$) {
1440 my ($proto,$data) = @_;
1441 sql_injection_check $isuite, $package;
1442 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1443 SELECT source.version, component.name, files.filename, files.sha256sum
1445 JOIN src_associations ON source.id = src_associations.source
1446 JOIN suite ON suite.id = src_associations.suite
1447 JOIN dsc_files ON dsc_files.source = source.id
1448 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1449 JOIN component ON component.id = files_archive_map.component_id
1450 JOIN files ON files.id = dsc_files.file
1451 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1452 AND source.source='$package'
1453 AND files.filename LIKE '%.dsc';
1455 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1456 my $digester = Digest::SHA->new(256);
1458 my ($vsn,$component,$filename,$sha256sum) = @$_;
1459 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1461 return archive_query_prepend_mirror @rows;
1464 sub canonicalise_suite_sshpsql ($$) {
1465 my ($proto,$data) = @_;
1466 sql_injection_check $isuite;
1467 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1468 SELECT suite.codename
1469 FROM suite where suite_name='$isuite' or codename='$isuite';
1471 @rows = map { $_->[0] } @rows;
1472 fail "unknown suite $isuite" unless @rows;
1473 die "ambiguous $isuite: @rows ?" if @rows>1;
1477 sub file_in_archive_sshpsql ($$$) { return undef; }
1479 #---------- `dummycat' archive query method ----------
1481 sub canonicalise_suite_dummycat ($$) {
1482 my ($proto,$data) = @_;
1483 my $dpath = "$data/suite.$isuite";
1484 if (!open C, "<", $dpath) {
1485 $!==ENOENT or die "$dpath: $!";
1486 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1490 chomp or die "$dpath: $!";
1492 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1496 sub archive_query_dummycat ($$) {
1497 my ($proto,$data) = @_;
1498 canonicalise_suite();
1499 my $dpath = "$data/package.$csuite.$package";
1500 if (!open C, "<", $dpath) {
1501 $!==ENOENT or die "$dpath: $!";
1502 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1510 printdebug "dummycat query $csuite $package $dpath | $_\n";
1511 my @row = split /\s+/, $_;
1512 @row==2 or die "$dpath: $_ ?";
1515 C->error and die "$dpath: $!";
1517 return archive_query_prepend_mirror
1518 sort { -version_compare($a->[0],$b->[0]); } @rows;
1521 sub file_in_archive_dummycat () { return undef; }
1523 #---------- tag format handling ----------
1525 sub access_cfg_tagformats () {
1526 split /\,/, access_cfg('dgit-tag-format');
1529 sub access_cfg_tagformats_can_splitbrain () {
1530 my %y = map { $_ => 1 } access_cfg_tagformats;
1531 foreach my $needtf (qw(new maint)) {
1532 next if $y{$needtf};
1538 sub need_tagformat ($$) {
1539 my ($fmt, $why) = @_;
1540 fail "need to use tag format $fmt ($why) but also need".
1541 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1542 " - no way to proceed"
1543 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1544 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1547 sub select_tagformat () {
1549 return if $tagformatfn && !$tagformat_want;
1550 die 'bug' if $tagformatfn && $tagformat_want;
1551 # ... $tagformat_want assigned after previous select_tagformat
1553 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1554 printdebug "select_tagformat supported @supported\n";
1556 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1557 printdebug "select_tagformat specified @$tagformat_want\n";
1559 my ($fmt,$why,$override) = @$tagformat_want;
1561 fail "target distro supports tag formats @supported".
1562 " but have to use $fmt ($why)"
1564 or grep { $_ eq $fmt } @supported;
1566 $tagformat_want = undef;
1568 $tagformatfn = ${*::}{"debiantag_$fmt"};
1570 fail "trying to use unknown tag format \`$fmt' ($why) !"
1571 unless $tagformatfn;
1574 #---------- archive query entrypoints and rest of program ----------
1576 sub canonicalise_suite () {
1577 return if defined $csuite;
1578 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1579 $csuite = archive_query('canonicalise_suite');
1580 if ($isuite ne $csuite) {
1581 progress "canonical suite name for $isuite is $csuite";
1583 progress "canonical suite name is $csuite";
1587 sub get_archive_dsc () {
1588 canonicalise_suite();
1589 my @vsns = archive_query('archive_query');
1590 foreach my $vinfo (@vsns) {
1591 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1592 $dscurl = $vsn_dscurl;
1593 $dscdata = url_get($dscurl);
1595 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1600 $digester->add($dscdata);
1601 my $got = $digester->hexdigest();
1603 fail "$dscurl has hash $got but".
1604 " archive told us to expect $digest";
1607 my $fmt = getfield $dsc, 'Format';
1608 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1609 "unsupported source format $fmt, sorry";
1611 $dsc_checked = !!$digester;
1612 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1616 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1619 sub check_for_git ();
1620 sub check_for_git () {
1622 my $how = access_cfg('git-check');
1623 if ($how eq 'ssh-cmd') {
1625 (access_cfg_ssh, access_gituserhost(),
1626 access_runeinfo("git-check $package").
1627 " set -e; cd ".access_cfg('git-path').";".
1628 " if test -d $package.git; then echo 1; else echo 0; fi");
1629 my $r= cmdoutput @cmd;
1630 if (defined $r and $r =~ m/^divert (\w+)$/) {
1632 my ($usedistro,) = access_distros();
1633 # NB that if we are pushing, $usedistro will be $distro/push
1634 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1635 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1636 progress "diverting to $divert (using config for $instead_distro)";
1637 return check_for_git();
1639 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1641 } elsif ($how eq 'url') {
1642 my $prefix = access_cfg('git-check-url','git-url');
1643 my $suffix = access_cfg('git-check-suffix','git-suffix',
1644 'RETURN-UNDEF') // '.git';
1645 my $url = "$prefix/$package$suffix";
1646 my @cmd = (@curl, qw(-sS -I), $url);
1647 my $result = cmdoutput @cmd;
1648 $result =~ s/^\S+ 200 .*\n\r?\n//;
1649 # curl -sS -I with https_proxy prints
1650 # HTTP/1.0 200 Connection established
1651 $result =~ m/^\S+ (404|200) /s or
1652 fail "unexpected results from git check query - ".
1653 Dumper($prefix, $result);
1655 if ($code eq '404') {
1657 } elsif ($code eq '200') {
1662 } elsif ($how eq 'true') {
1664 } elsif ($how eq 'false') {
1667 badcfg "unknown git-check \`$how'";
1671 sub create_remote_git_repo () {
1672 my $how = access_cfg('git-create');
1673 if ($how eq 'ssh-cmd') {
1675 (access_cfg_ssh, access_gituserhost(),
1676 access_runeinfo("git-create $package").
1677 "set -e; cd ".access_cfg('git-path').";".
1678 " cp -a _template $package.git");
1679 } elsif ($how eq 'true') {
1682 badcfg "unknown git-create \`$how'";
1686 our ($dsc_hash,$lastpush_mergeinput);
1687 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1689 our $ud = '.git/dgit/unpack';
1699 sub mktree_in_ud_here () {
1700 runcmd qw(git init -q);
1701 runcmd qw(git config gc.auto 0);
1702 rmtree('.git/objects');
1703 symlink '../../../../objects','.git/objects' or die $!;
1707 sub git_write_tree () {
1708 my $tree = cmdoutput @git, qw(write-tree);
1709 $tree =~ m/^\w+$/ or die "$tree ?";
1713 sub git_add_write_tree () {
1714 runcmd @git, qw(add -Af .);
1715 return git_write_tree();
1718 sub remove_stray_gits ($) {
1720 my @gitscmd = qw(find -name .git -prune -print0);
1721 debugcmd "|",@gitscmd;
1722 open GITS, "-|", @gitscmd or die $!;
1727 print STDERR "$us: warning: removing from $what: ",
1728 (messagequote $_), "\n";
1732 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1735 sub mktree_in_ud_from_only_subdir ($;$) {
1736 my ($what,$raw) = @_;
1738 # changes into the subdir
1740 die "expected one subdir but found @dirs ?" unless @dirs==1;
1741 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1745 remove_stray_gits($what);
1746 mktree_in_ud_here();
1748 my ($format, $fopts) = get_source_format();
1749 if (madformat($format)) {
1754 my $tree=git_add_write_tree();
1755 return ($tree,$dir);
1758 our @files_csum_info_fields =
1759 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1760 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1761 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1763 sub dsc_files_info () {
1764 foreach my $csumi (@files_csum_info_fields) {
1765 my ($fname, $module, $method) = @$csumi;
1766 my $field = $dsc->{$fname};
1767 next unless defined $field;
1768 eval "use $module; 1;" or die $@;
1770 foreach (split /\n/, $field) {
1772 m/^(\w+) (\d+) (\S+)$/ or
1773 fail "could not parse .dsc $fname line \`$_'";
1774 my $digester = eval "$module"."->$method;" or die $@;
1779 Digester => $digester,
1784 fail "missing any supported Checksums-* or Files field in ".
1785 $dsc->get_option('name');
1789 map { $_->{Filename} } dsc_files_info();
1792 sub files_compare_inputs (@) {
1797 my $showinputs = sub {
1798 return join "; ", map { $_->get_option('name') } @$inputs;
1801 foreach my $in (@$inputs) {
1803 my $in_name = $in->get_option('name');
1805 printdebug "files_compare_inputs $in_name\n";
1807 foreach my $csumi (@files_csum_info_fields) {
1808 my ($fname) = @$csumi;
1809 printdebug "files_compare_inputs $in_name $fname\n";
1811 my $field = $in->{$fname};
1812 next unless defined $field;
1815 foreach (split /\n/, $field) {
1818 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1819 fail "could not parse $in_name $fname line \`$_'";
1821 printdebug "files_compare_inputs $in_name $fname $f\n";
1825 my $re = \ $record{$f}{$fname};
1827 $fchecked{$f}{$in_name} = 1;
1829 fail "hash or size of $f varies in $fname fields".
1830 " (between: ".$showinputs->().")";
1835 @files = sort @files;
1836 $expected_files //= \@files;
1837 "@$expected_files" eq "@files" or
1838 fail "file list in $in_name varies between hash fields!";
1841 fail "$in_name has no files list field(s)";
1843 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1846 grep { keys %$_ == @$inputs-1 } values %fchecked
1847 or fail "no file appears in all file lists".
1848 " (looked in: ".$showinputs->().")";
1851 sub is_orig_file_in_dsc ($$) {
1852 my ($f, $dsc_files_info) = @_;
1853 return 0 if @$dsc_files_info <= 1;
1854 # One file means no origs, and the filename doesn't have a "what
1855 # part of dsc" component. (Consider versions ending `.orig'.)
1856 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1860 sub is_orig_file_of_vsn ($$) {
1861 my ($f, $upstreamvsn) = @_;
1862 my $base = srcfn $upstreamvsn, '';
1863 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1867 sub changes_update_origs_from_dsc ($$$$) {
1868 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1870 printdebug "checking origs needed ($upstreamvsn)...\n";
1871 $_ = getfield $changes, 'Files';
1872 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1873 fail "cannot find section/priority from .changes Files field";
1874 my $placementinfo = $1;
1876 printdebug "checking origs needed placement '$placementinfo'...\n";
1877 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1878 $l =~ m/\S+$/ or next;
1880 printdebug "origs $file | $l\n";
1881 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1882 printdebug "origs $file is_orig\n";
1883 my $have = archive_query('file_in_archive', $file);
1884 if (!defined $have) {
1886 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1892 printdebug "origs $file \$#\$have=$#$have\n";
1893 foreach my $h (@$have) {
1896 foreach my $csumi (@files_csum_info_fields) {
1897 my ($fname, $module, $method, $archivefield) = @$csumi;
1898 next unless defined $h->{$archivefield};
1899 $_ = $dsc->{$fname};
1900 next unless defined;
1901 m/^(\w+) .* \Q$file\E$/m or
1902 fail ".dsc $fname missing entry for $file";
1903 if ($h->{$archivefield} eq $1) {
1907 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1910 die "$file ".Dumper($h)." ?!" if $same && @differ;
1913 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1916 printdebug "origs $file f.same=$found_same".
1917 " #f._differ=$#found_differ\n";
1918 if (@found_differ && !$found_same) {
1920 "archive contains $file with different checksum",
1923 # Now we edit the changes file to add or remove it
1924 foreach my $csumi (@files_csum_info_fields) {
1925 my ($fname, $module, $method, $archivefield) = @$csumi;
1926 next unless defined $changes->{$fname};
1928 # in archive, delete from .changes if it's there
1929 $changed{$file} = "removed" if
1930 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1931 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1932 # not in archive, but it's here in the .changes
1934 my $dsc_data = getfield $dsc, $fname;
1935 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1937 $extra =~ s/ \d+ /$&$placementinfo /
1938 or die "$fname $extra >$dsc_data< ?"
1939 if $fname eq 'Files';
1940 $changes->{$fname} .= "\n". $extra;
1941 $changed{$file} = "added";
1946 foreach my $file (keys %changed) {
1948 "edited .changes for archive .orig contents: %s %s",
1949 $changed{$file}, $file;
1951 my $chtmp = "$changesfile.tmp";
1952 $changes->save($chtmp);
1954 rename $chtmp,$changesfile or die "$changesfile $!";
1956 progress "[new .changes left in $changesfile]";
1959 progress "$changesfile already has appropriate .orig(s) (if any)";
1963 sub make_commit ($) {
1965 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1968 sub make_commit_text ($) {
1971 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1973 print Dumper($text) if $debuglevel > 1;
1974 my $child = open2($out, $in, @cmd) or die $!;
1977 print $in $text or die $!;
1978 close $in or die $!;
1980 $h =~ m/^\w+$/ or die;
1982 printdebug "=> $h\n";
1985 waitpid $child, 0 == $child or die "$child $!";
1986 $? and failedcmd @cmd;
1990 sub clogp_authline ($) {
1992 my $author = getfield $clogp, 'Maintainer';
1993 $author =~ s#,.*##ms;
1994 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1995 my $authline = "$author $date";
1996 $authline =~ m/$git_authline_re/o or
1997 fail "unexpected commit author line format \`$authline'".
1998 " (was generated from changelog Maintainer field)";
1999 return ($1,$2,$3) if wantarray;
2003 sub vendor_patches_distro ($$) {
2004 my ($checkdistro, $what) = @_;
2005 return unless defined $checkdistro;
2007 my $series = "debian/patches/\L$checkdistro\E.series";
2008 printdebug "checking for vendor-specific $series ($what)\n";
2010 if (!open SERIES, "<", $series) {
2011 die "$series $!" unless $!==ENOENT;
2020 Unfortunately, this source package uses a feature of dpkg-source where
2021 the same source package unpacks to different source code on different
2022 distros. dgit cannot safely operate on such packages on affected
2023 distros, because the meaning of source packages is not stable.
2025 Please ask the distro/maintainer to remove the distro-specific series
2026 files and use a different technique (if necessary, uploading actually
2027 different packages, if different distros are supposed to have
2031 fail "Found active distro-specific series file for".
2032 " $checkdistro ($what): $series, cannot continue";
2034 die "$series $!" if SERIES->error;
2038 sub check_for_vendor_patches () {
2039 # This dpkg-source feature doesn't seem to be documented anywhere!
2040 # But it can be found in the changelog (reformatted):
2042 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2043 # Author: Raphael Hertzog <hertzog@debian.org>
2044 # Date: Sun Oct 3 09:36:48 2010 +0200
2046 # dpkg-source: correctly create .pc/.quilt_series with alternate
2049 # If you have debian/patches/ubuntu.series and you were
2050 # unpacking the source package on ubuntu, quilt was still
2051 # directed to debian/patches/series instead of
2052 # debian/patches/ubuntu.series.
2054 # debian/changelog | 3 +++
2055 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2056 # 2 files changed, 6 insertions(+), 1 deletion(-)
2059 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2060 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2061 "Dpkg::Vendor \`current vendor'");
2062 vendor_patches_distro(access_basedistro(),
2063 "(base) distro being accessed");
2064 vendor_patches_distro(access_nomdistro(),
2065 "(nominal) distro being accessed");
2068 sub generate_commits_from_dsc () {
2069 # See big comment in fetch_from_archive, below.
2070 # See also README.dsc-import.
2074 my @dfi = dsc_files_info();
2075 foreach my $fi (@dfi) {
2076 my $f = $fi->{Filename};
2077 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2078 my $upper_f = "../../../../$f";
2080 printdebug "considering reusing $f: ";
2082 if (link_ltarget "$upper_f,fetch", $f) {
2083 printdebug "linked (using ...,fetch).\n";
2084 } elsif ((printdebug "($!) "),
2086 fail "accessing ../$f,fetch: $!";
2087 } elsif (link_ltarget $upper_f, $f) {
2088 printdebug "linked.\n";
2089 } elsif ((printdebug "($!) "),
2091 fail "accessing ../$f: $!";
2093 printdebug "absent.\n";
2097 complete_file_from_dsc('.', $fi, \$refetched)
2100 printdebug "considering saving $f: ";
2102 if (link $f, $upper_f) {
2103 printdebug "linked.\n";
2104 } elsif ((printdebug "($!) "),
2106 fail "saving ../$f: $!";
2107 } elsif (!$refetched) {
2108 printdebug "no need.\n";
2109 } elsif (link $f, "$upper_f,fetch") {
2110 printdebug "linked (using ...,fetch).\n";
2111 } elsif ((printdebug "($!) "),
2113 fail "saving ../$f,fetch: $!";
2115 printdebug "cannot.\n";
2119 # We unpack and record the orig tarballs first, so that we only
2120 # need disk space for one private copy of the unpacked source.
2121 # But we can't make them into commits until we have the metadata
2122 # from the debian/changelog, so we record the tree objects now and
2123 # make them into commits later.
2125 my $upstreamv = upstreamversion $dsc->{version};
2126 my $orig_f_base = srcfn $upstreamv, '';
2128 foreach my $fi (@dfi) {
2129 # We actually import, and record as a commit, every tarball
2130 # (unless there is only one file, in which case there seems
2133 my $f = $fi->{Filename};
2134 printdebug "import considering $f ";
2135 (printdebug "only one dfi\n"), next if @dfi == 1;
2136 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2137 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2141 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2143 printdebug "Y ", (join ' ', map { $_//"(none)" }
2144 $compr_ext, $orig_f_part
2147 my $input = new IO::File $f, '<' or die "$f $!";
2151 if (defined $compr_ext) {
2153 Dpkg::Compression::compression_guess_from_filename $f;
2154 fail "Dpkg::Compression cannot handle file $f in source package"
2155 if defined $compr_ext && !defined $cname;
2157 new Dpkg::Compression::Process compression => $cname;
2158 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2159 my $compr_fh = new IO::Handle;
2160 my $compr_pid = open $compr_fh, "-|" // die $!;
2162 open STDIN, "<&", $input or die $!;
2164 die "dgit (child): exec $compr_cmd[0]: $!\n";
2169 rmtree "_unpack-tar";
2170 mkdir "_unpack-tar" or die $!;
2171 my @tarcmd = qw(tar -x -f -
2172 --no-same-owner --no-same-permissions
2173 --no-acls --no-xattrs --no-selinux);
2174 my $tar_pid = fork // die $!;
2176 chdir "_unpack-tar" or die $!;
2177 open STDIN, "<&", $input or die $!;
2179 die "dgit (child): exec $tarcmd[0]: $!";
2181 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2182 !$? or failedcmd @tarcmd;
2185 (@compr_cmd ? failedcmd @compr_cmd
2187 # finally, we have the results in "tarball", but maybe
2188 # with the wrong permissions
2190 runcmd qw(chmod -R +rwX _unpack-tar);
2191 changedir "_unpack-tar";
2192 remove_stray_gits($f);
2193 mktree_in_ud_here();
2195 my ($tree) = git_add_write_tree();
2196 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2197 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2199 printdebug "one subtree $1\n";
2201 printdebug "multiple subtrees\n";
2204 rmtree "_unpack-tar";
2206 my $ent = [ $f, $tree ];
2208 Orig => !!$orig_f_part,
2209 Sort => (!$orig_f_part ? 2 :
2210 $orig_f_part =~ m/-/g ? 1 :
2218 # put any without "_" first (spec is not clear whether files
2219 # are always in the usual order). Tarballs without "_" are
2220 # the main orig or the debian tarball.
2221 $a->{Sort} <=> $b->{Sort} or
2225 my $any_orig = grep { $_->{Orig} } @tartrees;
2227 my $dscfn = "$package.dsc";
2229 my $treeimporthow = 'package';
2231 open D, ">", $dscfn or die "$dscfn: $!";
2232 print D $dscdata or die "$dscfn: $!";
2233 close D or die "$dscfn: $!";
2234 my @cmd = qw(dpkg-source);
2235 push @cmd, '--no-check' if $dsc_checked;
2236 if (madformat $dsc->{format}) {
2237 push @cmd, '--skip-patches';
2238 $treeimporthow = 'unpatched';
2240 push @cmd, qw(-x --), $dscfn;
2243 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2244 if (madformat $dsc->{format}) {
2245 check_for_vendor_patches();
2249 if (madformat $dsc->{format}) {
2250 my @pcmd = qw(dpkg-source --before-build .);
2251 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2253 $dappliedtree = git_add_write_tree();
2256 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2257 debugcmd "|",@clogcmd;
2258 open CLOGS, "-|", @clogcmd or die $!;
2263 printdebug "import clog search...\n";
2266 my $stanzatext = do { local $/=""; <CLOGS>; };
2267 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2268 last if !defined $stanzatext;
2270 my $desc = "package changelog, entry no.$.";
2271 open my $stanzafh, "<", \$stanzatext or die;
2272 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2273 $clogp //= $thisstanza;
2275 printdebug "import clog $thisstanza->{version} $desc...\n";
2277 last if !$any_orig; # we don't need $r1clogp
2279 # We look for the first (most recent) changelog entry whose
2280 # version number is lower than the upstream version of this
2281 # package. Then the last (least recent) previous changelog
2282 # entry is treated as the one which introduced this upstream
2283 # version and used for the synthetic commits for the upstream
2286 # One might think that a more sophisticated algorithm would be
2287 # necessary. But: we do not want to scan the whole changelog
2288 # file. Stopping when we see an earlier version, which
2289 # necessarily then is an earlier upstream version, is the only
2290 # realistic way to do that. Then, either the earliest
2291 # changelog entry we have seen so far is indeed the earliest
2292 # upload of this upstream version; or there are only changelog
2293 # entries relating to later upstream versions (which is not
2294 # possible unless the changelog and .dsc disagree about the
2295 # version). Then it remains to choose between the physically
2296 # last entry in the file, and the one with the lowest version
2297 # number. If these are not the same, we guess that the
2298 # versions were created in a non-monotic order rather than
2299 # that the changelog entries have been misordered.
2301 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2303 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2304 $r1clogp = $thisstanza;
2306 printdebug "import clog $r1clogp->{version} becomes r1\n";
2308 die $! if CLOGS->error;
2309 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2311 $clogp or fail "package changelog has no entries!";
2313 my $authline = clogp_authline $clogp;
2314 my $changes = getfield $clogp, 'Changes';
2315 my $cversion = getfield $clogp, 'Version';
2318 $r1clogp //= $clogp; # maybe there's only one entry;
2319 my $r1authline = clogp_authline $r1clogp;
2320 # Strictly, r1authline might now be wrong if it's going to be
2321 # unused because !$any_orig. Whatever.
2323 printdebug "import tartrees authline $authline\n";
2324 printdebug "import tartrees r1authline $r1authline\n";
2326 foreach my $tt (@tartrees) {
2327 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2329 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2332 committer $r1authline
2336 [dgit import orig $tt->{F}]
2344 [dgit import tarball $package $cversion $tt->{F}]
2349 printdebug "import main commit\n";
2351 open C, ">../commit.tmp" or die $!;
2352 print C <<END or die $!;
2355 print C <<END or die $! foreach @tartrees;
2358 print C <<END or die $!;
2364 [dgit import $treeimporthow $package $cversion]
2368 my $rawimport_hash = make_commit qw(../commit.tmp);
2370 if (madformat $dsc->{format}) {
2371 printdebug "import apply patches...\n";
2373 # regularise the state of the working tree so that
2374 # the checkout of $rawimport_hash works nicely.
2375 my $dappliedcommit = make_commit_text(<<END);
2382 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2384 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2386 # We need the answers to be reproducible
2387 my @authline = clogp_authline($clogp);
2388 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2389 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2390 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2391 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2392 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2393 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2395 my $path = $ENV{PATH} or die;
2397 foreach my $use_absurd (qw(0 1)) {
2398 runcmd @git, qw(checkout -q unpa);
2399 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2400 local $ENV{PATH} = $path;
2403 progress "warning: $@";
2404 $path = "$absurdity:$path";
2405 progress "$us: trying slow absurd-git-apply...";
2406 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2411 die "forbid absurd git-apply\n" if $use_absurd
2412 && forceing [qw(import-gitapply-no-absurd)];
2413 die "only absurd git-apply!\n" if !$use_absurd
2414 && forceing [qw(import-gitapply-absurd)];
2416 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2417 local $ENV{PATH} = $path if $use_absurd;
2419 my @showcmd = (gbp_pq, qw(import));
2420 my @realcmd = shell_cmd
2421 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2422 debugcmd "+",@realcmd;
2423 if (system @realcmd) {
2424 die +(shellquote @showcmd).
2426 failedcmd_waitstatus()."\n";
2429 my $gapplied = git_rev_parse('HEAD');
2430 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2431 $gappliedtree eq $dappliedtree or
2433 gbp-pq import and dpkg-source disagree!
2434 gbp-pq import gave commit $gapplied
2435 gbp-pq import gave tree $gappliedtree
2436 dpkg-source --before-build gave tree $dappliedtree
2438 $rawimport_hash = $gapplied;
2443 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2448 progress "synthesised git commit from .dsc $cversion";
2450 my $rawimport_mergeinput = {
2451 Commit => $rawimport_hash,
2452 Info => "Import of source package",
2454 my @output = ($rawimport_mergeinput);
2456 if ($lastpush_mergeinput) {
2457 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2458 my $oversion = getfield $oldclogp, 'Version';
2460 version_compare($oversion, $cversion);
2462 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2463 { Message => <<END, ReverseParents => 1 });
2464 Record $package ($cversion) in archive suite $csuite
2466 } elsif ($vcmp > 0) {
2467 print STDERR <<END or die $!;
2469 Version actually in archive: $cversion (older)
2470 Last version pushed with dgit: $oversion (newer or same)
2473 @output = $lastpush_mergeinput;
2475 # Same version. Use what's in the server git branch,
2476 # discarding our own import. (This could happen if the
2477 # server automatically imports all packages into git.)
2478 @output = $lastpush_mergeinput;
2481 changedir '../../../..';
2486 sub complete_file_from_dsc ($$;$) {
2487 our ($dstdir, $fi, $refetched) = @_;
2488 # Ensures that we have, in $dstdir, the file $fi, with the correct
2489 # contents. (Downloading it from alongside $dscurl if necessary.)
2490 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2491 # and will set $$refetched=1 if it did so (or tried to).
2493 my $f = $fi->{Filename};
2494 my $tf = "$dstdir/$f";
2498 my $checkhash = sub {
2499 open F, "<", "$tf" or die "$tf: $!";
2500 $fi->{Digester}->reset();
2501 $fi->{Digester}->addfile(*F);
2502 F->error and die $!;
2503 my $got = $fi->{Digester}->hexdigest();
2504 return $got eq $fi->{Hash};
2507 if (stat_exists $tf) {
2508 if ($checkhash->()) {
2509 progress "using existing $f";
2513 fail "file $f has hash $got but .dsc".
2514 " demands hash $fi->{Hash} ".
2515 "(perhaps you should delete this file?)";
2517 progress "need to fetch correct version of $f";
2518 unlink $tf or die "$tf $!";
2521 printdebug "$tf does not exist, need to fetch\n";
2525 $furl =~ s{/[^/]+$}{};
2527 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2528 die "$f ?" if $f =~ m#/#;
2529 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2530 return 0 if !act_local();
2533 fail "file $f has hash $got but .dsc".
2534 " demands hash $fi->{Hash} ".
2535 "(got wrong file from archive!)";
2540 sub ensure_we_have_orig () {
2541 my @dfi = dsc_files_info();
2542 foreach my $fi (@dfi) {
2543 my $f = $fi->{Filename};
2544 next unless is_orig_file_in_dsc($f, \@dfi);
2545 complete_file_from_dsc('..', $fi)
2550 #---------- git fetch ----------
2552 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2553 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2555 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2556 # locally fetched refs because they have unhelpful names and clutter
2557 # up gitk etc. So we track whether we have "used up" head ref (ie,
2558 # whether we have made another local ref which refers to this object).
2560 # (If we deleted them unconditionally, then we might end up
2561 # re-fetching the same git objects each time dgit fetch was run.)
2563 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2564 # in git_fetch_us to fetch the refs in question, and possibly a call
2565 # to lrfetchref_used.
2567 our (%lrfetchrefs_f, %lrfetchrefs_d);
2568 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2570 sub lrfetchref_used ($) {
2571 my ($fullrefname) = @_;
2572 my $objid = $lrfetchrefs_f{$fullrefname};
2573 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2576 sub git_lrfetch_sane {
2577 my ($url, $supplementary, @specs) = @_;
2578 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2579 # at least as regards @specs. Also leave the results in
2580 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2581 # able to clean these up.
2583 # With $supplementary==1, @specs must not contain wildcards
2584 # and we add to our previous fetches (non-atomically).
2586 # This is rather miserable:
2587 # When git fetch --prune is passed a fetchspec ending with a *,
2588 # it does a plausible thing. If there is no * then:
2589 # - it matches subpaths too, even if the supplied refspec
2590 # starts refs, and behaves completely madly if the source
2591 # has refs/refs/something. (See, for example, Debian #NNNN.)
2592 # - if there is no matching remote ref, it bombs out the whole
2594 # We want to fetch a fixed ref, and we don't know in advance
2595 # if it exists, so this is not suitable.
2597 # Our workaround is to use git ls-remote. git ls-remote has its
2598 # own qairks. Notably, it has the absurd multi-tail-matching
2599 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2600 # refs/refs/foo etc.
2602 # Also, we want an idempotent snapshot, but we have to make two
2603 # calls to the remote: one to git ls-remote and to git fetch. The
2604 # solution is use git ls-remote to obtain a target state, and
2605 # git fetch to try to generate it. If we don't manage to generate
2606 # the target state, we try again.
2608 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2610 my $specre = join '|', map {
2613 my $wildcard = $x =~ s/\\\*$/.*/;
2614 die if $wildcard && $supplementary;
2617 printdebug "git_lrfetch_sane specre=$specre\n";
2618 my $wanted_rref = sub {
2620 return m/^(?:$specre)$/;
2623 my $fetch_iteration = 0;
2626 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2627 if (++$fetch_iteration > 10) {
2628 fail "too many iterations trying to get sane fetch!";
2631 my @look = map { "refs/$_" } @specs;
2632 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2636 open GITLS, "-|", @lcmd or die $!;
2638 printdebug "=> ", $_;
2639 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2640 my ($objid,$rrefname) = ($1,$2);
2641 if (!$wanted_rref->($rrefname)) {
2643 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2647 $wantr{$rrefname} = $objid;
2650 close GITLS or failedcmd @lcmd;
2652 # OK, now %want is exactly what we want for refs in @specs
2654 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2655 "+refs/$_:".lrfetchrefs."/$_";
2658 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2660 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2661 runcmd_ordryrun_local @fcmd if @fspecs;
2663 if (!$supplementary) {
2664 %lrfetchrefs_f = ();
2668 git_for_each_ref(lrfetchrefs, sub {
2669 my ($objid,$objtype,$lrefname,$reftail) = @_;
2670 $lrfetchrefs_f{$lrefname} = $objid;
2671 $objgot{$objid} = 1;
2674 if ($supplementary) {
2678 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2679 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2680 if (!exists $wantr{$rrefname}) {
2681 if ($wanted_rref->($rrefname)) {
2683 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2687 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2690 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2691 delete $lrfetchrefs_f{$lrefname};
2695 foreach my $rrefname (sort keys %wantr) {
2696 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2697 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2698 my $want = $wantr{$rrefname};
2699 next if $got eq $want;
2700 if (!defined $objgot{$want}) {
2702 warning: git ls-remote suggests we want $lrefname
2703 warning: and it should refer to $want
2704 warning: but git fetch didn't fetch that object to any relevant ref.
2705 warning: This may be due to a race with someone updating the server.
2706 warning: Will try again...
2708 next FETCH_ITERATION;
2711 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2713 runcmd_ordryrun_local @git, qw(update-ref -m),
2714 "dgit fetch git fetch fixup", $lrefname, $want;
2715 $lrfetchrefs_f{$lrefname} = $want;
2720 if (defined $csuite) {
2721 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2722 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2723 my ($objid,$objtype,$lrefname,$reftail) = @_;
2724 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2725 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2729 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2730 Dumper(\%lrfetchrefs_f);
2733 sub git_fetch_us () {
2734 # Want to fetch only what we are going to use, unless
2735 # deliberately-not-ff, in which case we must fetch everything.
2737 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2739 (quiltmode_splitbrain
2740 ? (map { $_->('*',access_nomdistro) }
2741 \&debiantag_new, \&debiantag_maintview)
2742 : debiantags('*',access_nomdistro));
2743 push @specs, server_branch($csuite);
2744 push @specs, $rewritemap;
2745 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2747 my $url = access_giturl();
2748 git_lrfetch_sane $url, 0, @specs;
2751 my @tagpats = debiantags('*',access_nomdistro);
2753 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2754 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2755 printdebug "currently $fullrefname=$objid\n";
2756 $here{$fullrefname} = $objid;
2758 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2759 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2760 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2761 printdebug "offered $lref=$objid\n";
2762 if (!defined $here{$lref}) {
2763 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2764 runcmd_ordryrun_local @upd;
2765 lrfetchref_used $fullrefname;
2766 } elsif ($here{$lref} eq $objid) {
2767 lrfetchref_used $fullrefname;
2770 "Not updating $lref from $here{$lref} to $objid.\n";
2775 #---------- dsc and archive handling ----------
2777 sub mergeinfo_getclogp ($) {
2778 # Ensures thit $mi->{Clogp} exists and returns it
2780 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2783 sub mergeinfo_version ($) {
2784 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2787 sub fetch_from_archive_record_1 ($) {
2789 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2790 'DGIT_ARCHIVE', $hash;
2791 cmdoutput @git, qw(log -n2), $hash;
2792 # ... gives git a chance to complain if our commit is malformed
2795 sub fetch_from_archive_record_2 ($) {
2797 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2801 dryrun_report @upd_cmd;
2805 sub parse_dsc_field_def_dsc_distro () {
2806 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2807 dgit.default.distro);
2810 sub parse_dsc_field ($$) {
2811 my ($dsc, $what) = @_;
2813 foreach my $field (@ourdscfield) {
2814 $f = $dsc->{$field};
2819 progress "$what: NO git hash";
2820 parse_dsc_field_def_dsc_distro();
2821 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2822 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2823 progress "$what: specified git info ($dsc_distro)";
2824 $dsc_hint_tag = [ $dsc_hint_tag ];
2825 } elsif ($f =~ m/^\w+\s*$/) {
2827 parse_dsc_field_def_dsc_distro();
2828 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2830 progress "$what: specified git hash";
2832 fail "$what: invalid Dgit info";
2836 sub resolve_dsc_field_commit ($$) {
2837 my ($already_distro, $already_mapref) = @_;
2839 return unless defined $dsc_hash;
2842 defined $already_mapref &&
2843 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2844 ? $already_mapref : undef;
2848 my ($what, @fetch) = @_;
2850 local $idistro = $dsc_distro;
2851 my $lrf = lrfetchrefs;
2853 if (!$chase_dsc_distro) {
2855 "not chasing .dsc distro $dsc_distro: not fetching $what";
2860 ".dsc names distro $dsc_distro: fetching $what";
2862 my $url = access_giturl();
2863 if (!defined $url) {
2864 defined $dsc_hint_url or fail <<END;
2865 .dsc Dgit metadata is in context of distro $dsc_distro
2866 for which we have no configured url and .dsc provides no hint
2869 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2870 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2871 parse_cfg_bool "dsc-url-proto-ok", 'false',
2872 cfg("dgit.dsc-url-proto-ok.$proto",
2873 "dgit.default.dsc-url-proto-ok")
2875 .dsc Dgit metadata is in context of distro $dsc_distro
2876 for which we have no configured url;
2877 .dsc provides hinted url with protocol $proto which is unsafe.
2878 (can be overridden by config - consult documentation)
2880 $url = $dsc_hint_url;
2883 git_lrfetch_sane $url, 1, @fetch;
2888 my $rewrite_enable = do {
2889 local $idistro = $dsc_distro;
2890 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2893 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2894 if (!defined $mapref) {
2895 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2896 $mapref = $lrf.'/'.$rewritemap;
2898 my $rewritemapdata = git_cat_file $mapref.':map';
2899 if (defined $rewritemapdata
2900 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2902 "server's git history rewrite map contains a relevant entry!";
2905 if (defined $dsc_hash) {
2906 progress "using rewritten git hash in place of .dsc value";
2908 progress "server data says .dsc hash is to be disregarded";
2913 if (!defined git_cat_file $dsc_hash) {
2914 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2915 my $lrf = $do_fetch->("additional commits", @tags) &&
2916 defined git_cat_file $dsc_hash
2918 .dsc Dgit metadata requires commit $dsc_hash
2919 but we could not obtain that object anywhere.
2921 foreach my $t (@tags) {
2922 my $fullrefname = $lrf.'/'.$t;
2923 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2924 next unless $lrfetchrefs_f{$fullrefname};
2925 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2926 lrfetchref_used $fullrefname;
2931 sub fetch_from_archive () {
2932 ensure_setup_existing_tree();
2934 # Ensures that lrref() is what is actually in the archive, one way
2935 # or another, according to us - ie this client's
2936 # appropritaely-updated archive view. Also returns the commit id.
2937 # If there is nothing in the archive, leaves lrref alone and
2938 # returns undef. git_fetch_us must have already been called.
2942 parse_dsc_field($dsc, 'last upload to archive');
2943 resolve_dsc_field_commit access_basedistro,
2944 lrfetchrefs."/".$rewritemap
2946 progress "no version available from the archive";
2949 # If the archive's .dsc has a Dgit field, there are three
2950 # relevant git commitids we need to choose between and/or merge
2952 # 1. $dsc_hash: the Dgit field from the archive
2953 # 2. $lastpush_hash: the suite branch on the dgit git server
2954 # 3. $lastfetch_hash: our local tracking brach for the suite
2956 # These may all be distinct and need not be in any fast forward
2959 # If the dsc was pushed to this suite, then the server suite
2960 # branch will have been updated; but it might have been pushed to
2961 # a different suite and copied by the archive. Conversely a more
2962 # recent version may have been pushed with dgit but not appeared
2963 # in the archive (yet).
2965 # $lastfetch_hash may be awkward because archive imports
2966 # (particularly, imports of Dgit-less .dscs) are performed only as
2967 # needed on individual clients, so different clients may perform a
2968 # different subset of them - and these imports are only made
2969 # public during push. So $lastfetch_hash may represent a set of
2970 # imports different to a subsequent upload by a different dgit
2973 # Our approach is as follows:
2975 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2976 # descendant of $dsc_hash, then it was pushed by a dgit user who
2977 # had based their work on $dsc_hash, so we should prefer it.
2978 # Otherwise, $dsc_hash was installed into this suite in the
2979 # archive other than by a dgit push, and (necessarily) after the
2980 # last dgit push into that suite (since a dgit push would have
2981 # been descended from the dgit server git branch); thus, in that
2982 # case, we prefer the archive's version (and produce a
2983 # pseudo-merge to overwrite the dgit server git branch).
2985 # (If there is no Dgit field in the archive's .dsc then
2986 # generate_commit_from_dsc uses the version numbers to decide
2987 # whether the suite branch or the archive is newer. If the suite
2988 # branch is newer it ignores the archive's .dsc; otherwise it
2989 # generates an import of the .dsc, and produces a pseudo-merge to
2990 # overwrite the suite branch with the archive contents.)
2992 # The outcome of that part of the algorithm is the `public view',
2993 # and is same for all dgit clients: it does not depend on any
2994 # unpublished history in the local tracking branch.
2996 # As between the public view and the local tracking branch: The
2997 # local tracking branch is only updated by dgit fetch, and
2998 # whenever dgit fetch runs it includes the public view in the
2999 # local tracking branch. Therefore if the public view is not
3000 # descended from the local tracking branch, the local tracking
3001 # branch must contain history which was imported from the archive
3002 # but never pushed; and, its tip is now out of date. So, we make
3003 # a pseudo-merge to overwrite the old imports and stitch the old
3006 # Finally: we do not necessarily reify the public view (as
3007 # described above). This is so that we do not end up stacking two
3008 # pseudo-merges. So what we actually do is figure out the inputs
3009 # to any public view pseudo-merge and put them in @mergeinputs.
3012 # $mergeinputs[]{Commit}
3013 # $mergeinputs[]{Info}
3014 # $mergeinputs[0] is the one whose tree we use
3015 # @mergeinputs is in the order we use in the actual commit)
3018 # $mergeinputs[]{Message} is a commit message to use
3019 # $mergeinputs[]{ReverseParents} if def specifies that parent
3020 # list should be in opposite order
3021 # Such an entry has no Commit or Info. It applies only when found
3022 # in the last entry. (This ugliness is to support making
3023 # identical imports to previous dgit versions.)
3025 my $lastpush_hash = git_get_ref(lrfetchref());
3026 printdebug "previous reference hash=$lastpush_hash\n";
3027 $lastpush_mergeinput = $lastpush_hash && {
3028 Commit => $lastpush_hash,
3029 Info => "dgit suite branch on dgit git server",
3032 my $lastfetch_hash = git_get_ref(lrref());
3033 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3034 my $lastfetch_mergeinput = $lastfetch_hash && {
3035 Commit => $lastfetch_hash,
3036 Info => "dgit client's archive history view",
3039 my $dsc_mergeinput = $dsc_hash && {
3040 Commit => $dsc_hash,
3041 Info => "Dgit field in .dsc from archive",
3045 my $del_lrfetchrefs = sub {
3048 printdebug "del_lrfetchrefs...\n";
3049 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3050 my $objid = $lrfetchrefs_d{$fullrefname};
3051 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3053 $gur ||= new IO::Handle;
3054 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3056 printf $gur "delete %s %s\n", $fullrefname, $objid;
3059 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3063 if (defined $dsc_hash) {
3064 ensure_we_have_orig();
3065 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3066 @mergeinputs = $dsc_mergeinput
3067 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3068 print STDERR <<END or die $!;
3070 Git commit in archive is behind the last version allegedly pushed/uploaded.
3071 Commit referred to by archive: $dsc_hash
3072 Last version pushed with dgit: $lastpush_hash
3075 @mergeinputs = ($lastpush_mergeinput);
3077 # Archive has .dsc which is not a descendant of the last dgit
3078 # push. This can happen if the archive moves .dscs about.
3079 # Just follow its lead.
3080 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3081 progress "archive .dsc names newer git commit";
3082 @mergeinputs = ($dsc_mergeinput);
3084 progress "archive .dsc names other git commit, fixing up";
3085 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3089 @mergeinputs = generate_commits_from_dsc();
3090 # We have just done an import. Now, our import algorithm might
3091 # have been improved. But even so we do not want to generate
3092 # a new different import of the same package. So if the
3093 # version numbers are the same, just use our existing version.
3094 # If the version numbers are different, the archive has changed
3095 # (perhaps, rewound).
3096 if ($lastfetch_mergeinput &&
3097 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3098 (mergeinfo_version $mergeinputs[0]) )) {
3099 @mergeinputs = ($lastfetch_mergeinput);
3101 } elsif ($lastpush_hash) {
3102 # only in git, not in the archive yet
3103 @mergeinputs = ($lastpush_mergeinput);
3104 print STDERR <<END or die $!;
3106 Package not found in the archive, but has allegedly been pushed using dgit.
3110 printdebug "nothing found!\n";
3111 if (defined $skew_warning_vsn) {
3112 print STDERR <<END or die $!;
3114 Warning: relevant archive skew detected.
3115 Archive allegedly contains $skew_warning_vsn
3116 But we were not able to obtain any version from the archive or git.
3120 unshift @end, $del_lrfetchrefs;
3124 if ($lastfetch_hash &&
3126 my $h = $_->{Commit};
3127 $h and is_fast_fwd($lastfetch_hash, $h);
3128 # If true, one of the existing parents of this commit
3129 # is a descendant of the $lastfetch_hash, so we'll
3130 # be ff from that automatically.
3134 push @mergeinputs, $lastfetch_mergeinput;
3137 printdebug "fetch mergeinfos:\n";
3138 foreach my $mi (@mergeinputs) {
3140 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3142 printdebug sprintf " ReverseParents=%d Message=%s",
3143 $mi->{ReverseParents}, $mi->{Message};
3147 my $compat_info= pop @mergeinputs
3148 if $mergeinputs[$#mergeinputs]{Message};
3150 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3153 if (@mergeinputs > 1) {
3155 my $tree_commit = $mergeinputs[0]{Commit};
3157 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3158 $tree =~ m/\n\n/; $tree = $`;
3159 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3162 # We use the changelog author of the package in question the
3163 # author of this pseudo-merge. This is (roughly) correct if
3164 # this commit is simply representing aa non-dgit upload.
3165 # (Roughly because it does not record sponsorship - but we
3166 # don't have sponsorship info because that's in the .changes,
3167 # which isn't in the archivw.)
3169 # But, it might be that we are representing archive history
3170 # updates (including in-archive copies). These are not really
3171 # the responsibility of the person who created the .dsc, but
3172 # there is no-one whose name we should better use. (The
3173 # author of the .dsc-named commit is clearly worse.)
3175 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3176 my $author = clogp_authline $useclogp;
3177 my $cversion = getfield $useclogp, 'Version';
3179 my $mcf = ".git/dgit/mergecommit";
3180 open MC, ">", $mcf or die "$mcf $!";
3181 print MC <<END or die $!;
3185 my @parents = grep { $_->{Commit} } @mergeinputs;
3186 @parents = reverse @parents if $compat_info->{ReverseParents};
3187 print MC <<END or die $! foreach @parents;
3191 print MC <<END or die $!;
3197 if (defined $compat_info->{Message}) {
3198 print MC $compat_info->{Message} or die $!;
3200 print MC <<END or die $!;
3201 Record $package ($cversion) in archive suite $csuite
3205 my $message_add_info = sub {
3207 my $mversion = mergeinfo_version $mi;
3208 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3212 $message_add_info->($mergeinputs[0]);
3213 print MC <<END or die $!;
3214 should be treated as descended from
3216 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3220 $hash = make_commit $mcf;
3222 $hash = $mergeinputs[0]{Commit};
3224 printdebug "fetch hash=$hash\n";
3227 my ($lasth, $what) = @_;
3228 return unless $lasth;
3229 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3232 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3234 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3236 fetch_from_archive_record_1($hash);
3238 if (defined $skew_warning_vsn) {
3240 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3241 my $gotclogp = commit_getclogp($hash);
3242 my $got_vsn = getfield $gotclogp, 'Version';
3243 printdebug "SKEW CHECK GOT $got_vsn\n";
3244 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3245 print STDERR <<END or die $!;
3247 Warning: archive skew detected. Using the available version:
3248 Archive allegedly contains $skew_warning_vsn
3249 We were able to obtain only $got_vsn
3255 if ($lastfetch_hash ne $hash) {
3256 fetch_from_archive_record_2($hash);
3259 lrfetchref_used lrfetchref();
3261 check_gitattrs($hash, "fetched source tree");
3263 unshift @end, $del_lrfetchrefs;
3267 sub set_local_git_config ($$) {
3269 runcmd @git, qw(config), $k, $v;
3272 sub setup_mergechangelogs (;$) {
3274 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3276 my $driver = 'dpkg-mergechangelogs';
3277 my $cb = "merge.$driver";
3278 my $attrs = '.git/info/attributes';
3279 ensuredir '.git/info';
3281 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3282 if (!open ATTRS, "<", $attrs) {
3283 $!==ENOENT or die "$attrs: $!";
3287 next if m{^debian/changelog\s};
3288 print NATTRS $_, "\n" or die $!;
3290 ATTRS->error and die $!;
3293 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3296 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3297 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3299 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3302 sub setup_useremail (;$) {
3304 return unless $always || access_cfg_bool(1, 'setup-useremail');
3307 my ($k, $envvar) = @_;
3308 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3309 return unless defined $v;
3310 set_local_git_config "user.$k", $v;
3313 $setup->('email', 'DEBEMAIL');
3314 $setup->('name', 'DEBFULLNAME');
3317 sub ensure_setup_existing_tree () {
3318 my $k = "remote.$remotename.skipdefaultupdate";
3319 my $c = git_get_config $k;
3320 return if defined $c;
3321 set_local_git_config $k, 'true';
3324 sub open_gitattrs () {
3325 my $gai = new IO::File ".git/info/attributes"
3327 or die "open .git/info/attributes: $!";
3331 sub is_gitattrs_setup () {
3332 my $gai = open_gitattrs();
3333 return 0 unless $gai;
3335 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3337 $gai->error and die $!;
3341 sub setup_gitattrs (;$) {
3343 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3345 if (is_gitattrs_setup()) {
3347 [attr]dgit-defuse-attrs already found in .git/info/attributes
3348 not doing further gitattributes setup
3352 my $af = ".git/info/attributes";
3353 open GAO, "> $af.new" or die $!;
3354 print GAO <<END or die $!;
3356 [attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
3357 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3359 my $gai = open_gitattrs();
3363 print GAO $_, "\n" or die $!;
3365 $gai->error and die $!;
3367 close GAO or die $!;
3368 rename "$af.new", "$af" or die "install $af: $!";
3371 sub setup_new_tree () {
3372 setup_mergechangelogs();
3377 sub check_gitattrs ($$) {
3378 my ($treeish, $what) = @_;
3380 return if is_gitattrs_setup;
3383 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3385 my $gafl = new IO::File;
3386 open $gafl, "-|", @cmd or die $!;
3389 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3391 next unless m{(?:^|/)\.gitattributes$};
3393 # oh dear, found one
3395 dgit: warning: $what contains .gitattributes
3396 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3401 # tree contains no .gitattributes files
3402 $?=0; $!=0; close $gafl or failedcmd @cmd;
3406 sub multisuite_suite_child ($$$) {
3407 my ($tsuite, $merginputs, $fn) = @_;
3408 # in child, sets things up, calls $fn->(), and returns undef
3409 # in parent, returns canonical suite name for $tsuite
3410 my $canonsuitefh = IO::File::new_tmpfile;
3411 my $pid = fork // die $!;
3415 $us .= " [$isuite]";
3416 $debugprefix .= " ";
3417 progress "fetching $tsuite...";
3418 canonicalise_suite();
3419 print $canonsuitefh $csuite, "\n" or die $!;
3420 close $canonsuitefh or die $!;
3424 waitpid $pid,0 == $pid or die $!;
3425 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3426 seek $canonsuitefh,0,0 or die $!;
3427 local $csuite = <$canonsuitefh>;
3428 die $! unless defined $csuite && chomp $csuite;
3430 printdebug "multisuite $tsuite missing\n";
3433 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3434 push @$merginputs, {
3441 sub fork_for_multisuite ($) {
3442 my ($before_fetch_merge) = @_;
3443 # if nothing unusual, just returns ''
3446 # returns 0 to caller in child, to do first of the specified suites
3447 # in child, $csuite is not yet set
3449 # returns 1 to caller in parent, to finish up anything needed after
3450 # in parent, $csuite is set to canonicalised portmanteau
3452 my $org_isuite = $isuite;
3453 my @suites = split /\,/, $isuite;
3454 return '' unless @suites > 1;
3455 printdebug "fork_for_multisuite: @suites\n";
3459 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3461 return 0 unless defined $cbasesuite;
3463 fail "package $package missing in (base suite) $cbasesuite"
3464 unless @mergeinputs;
3466 my @csuites = ($cbasesuite);
3468 $before_fetch_merge->();
3470 foreach my $tsuite (@suites[1..$#suites]) {
3471 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3477 # xxx collecte the ref here
3479 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3480 push @csuites, $csubsuite;
3483 foreach my $mi (@mergeinputs) {
3484 my $ref = git_get_ref $mi->{Ref};
3485 die "$mi->{Ref} ?" unless length $ref;
3486 $mi->{Commit} = $ref;
3489 $csuite = join ",", @csuites;
3491 my $previous = git_get_ref lrref;
3493 unshift @mergeinputs, {
3494 Commit => $previous,
3495 Info => "local combined tracking branch",
3497 "archive seems to have rewound: local tracking branch is ahead!",
3501 foreach my $ix (0..$#mergeinputs) {
3502 $mergeinputs[$ix]{Index} = $ix;
3505 @mergeinputs = sort {
3506 -version_compare(mergeinfo_version $a,
3507 mergeinfo_version $b) # highest version first
3509 $a->{Index} <=> $b->{Index}; # earliest in spec first
3515 foreach my $mi (@mergeinputs) {
3516 printdebug "multisuite merge check $mi->{Info}\n";
3517 foreach my $previous (@needed) {
3518 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3519 printdebug "multisuite merge un-needed $previous->{Info}\n";
3523 printdebug "multisuite merge this-needed\n";
3524 $mi->{Character} = '+';
3527 $needed[0]{Character} = '*';
3529 my $output = $needed[0]{Commit};
3532 printdebug "multisuite merge nontrivial\n";
3533 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3535 my $commit = "tree $tree\n";
3536 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3537 "Input branches:\n";
3539 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3540 printdebug "multisuite merge include $mi->{Info}\n";
3541 $mi->{Character} //= ' ';
3542 $commit .= "parent $mi->{Commit}\n";
3543 $msg .= sprintf " %s %-25s %s\n",
3545 (mergeinfo_version $mi),
3548 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3550 " * marks the highest version branch, which choose to use\n".
3551 " + marks each branch which was not already an ancestor\n\n".
3552 "[dgit multi-suite $csuite]\n";
3554 "author $authline\n".
3555 "committer $authline\n\n";
3556 $output = make_commit_text $commit.$msg;
3557 printdebug "multisuite merge generated $output\n";
3560 fetch_from_archive_record_1($output);
3561 fetch_from_archive_record_2($output);
3563 progress "calculated combined tracking suite $csuite";
3568 sub clone_set_head () {
3569 open H, "> .git/HEAD" or die $!;
3570 print H "ref: ".lref()."\n" or die $!;
3573 sub clone_finish ($) {
3575 runcmd @git, qw(reset --hard), lrref();
3576 runcmd qw(bash -ec), <<'END';
3578 git ls-tree -r --name-only -z HEAD | \
3579 xargs -0r touch -h -r . --
3581 printdone "ready for work in $dstdir";
3586 badusage "dry run makes no sense with clone" unless act_local();
3588 my $multi_fetched = fork_for_multisuite(sub {
3589 printdebug "multi clone before fetch merge\n";
3592 if ($multi_fetched) {
3593 printdebug "multi clone after fetch merge\n";
3595 clone_finish($dstdir);
3598 printdebug "clone main body\n";
3600 canonicalise_suite();
3601 my $hasgit = check_for_git();
3602 mkdir $dstdir or fail "create \`$dstdir': $!";
3604 runcmd @git, qw(init -q);
3607 my $giturl = access_giturl(1);
3608 if (defined $giturl) {
3609 runcmd @git, qw(remote add), 'origin', $giturl;
3612 progress "fetching existing git history";
3614 runcmd_ordryrun_local @git, qw(fetch origin);
3616 progress "starting new git history";
3618 fetch_from_archive() or no_such_package;
3619 my $vcsgiturl = $dsc->{'Vcs-Git'};
3620 if (length $vcsgiturl) {
3621 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3622 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3624 clone_finish($dstdir);
3628 canonicalise_suite();
3629 if (check_for_git()) {
3632 fetch_from_archive() or no_such_package();
3633 printdone "fetched into ".lrref();
3637 my $multi_fetched = fork_for_multisuite(sub { });
3638 fetch() unless $multi_fetched; # parent
3639 return if $multi_fetched eq '0'; # child
3640 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3642 printdone "fetched to ".lrref()." and merged into HEAD";
3645 sub check_not_dirty () {
3646 foreach my $f (qw(local-options local-patch-header)) {
3647 if (stat_exists "debian/source/$f") {
3648 fail "git tree contains debian/source/$f";
3652 return if $ignoredirty;
3654 my @cmd = (@git, qw(diff --quiet HEAD));
3656 $!=0; $?=-1; system @cmd;
3659 fail "working tree is dirty (does not match HEAD)";
3665 sub commit_admin ($) {
3668 runcmd_ordryrun_local @git, qw(commit -m), $m;
3671 sub commit_quilty_patch () {
3672 my $output = cmdoutput @git, qw(status --porcelain);
3674 foreach my $l (split /\n/, $output) {
3675 next unless $l =~ m/\S/;
3676 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3680 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3682 progress "nothing quilty to commit, ok.";
3685 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3686 runcmd_ordryrun_local @git, qw(add -f), @adds;
3688 Commit Debian 3.0 (quilt) metadata
3690 [dgit ($our_version) quilt-fixup]
3694 sub get_source_format () {
3696 if (open F, "debian/source/options") {
3700 s/\s+$//; # ignore missing final newline
3702 my ($k, $v) = ($`, $'); #');
3703 $v =~ s/^"(.*)"$/$1/;
3709 F->error and die $!;
3712 die $! unless $!==&ENOENT;
3715 if (!open F, "debian/source/format") {
3716 die $! unless $!==&ENOENT;
3720 F->error and die $!;
3722 return ($_, \%options);
3725 sub madformat_wantfixup ($) {
3727 return 0 unless $format eq '3.0 (quilt)';
3728 our $quilt_mode_warned;
3729 if ($quilt_mode eq 'nocheck') {
3730 progress "Not doing any fixup of \`$format' due to".
3731 " ----no-quilt-fixup or --quilt=nocheck"
3732 unless $quilt_mode_warned++;
3735 progress "Format \`$format', need to check/update patch stack"
3736 unless $quilt_mode_warned++;
3740 sub maybe_split_brain_save ($$$) {
3741 my ($headref, $dgitview, $msg) = @_;
3742 # => message fragment "$saved" describing disposition of $dgitview
3743 return "commit id $dgitview" unless defined $split_brain_save;
3744 my @cmd = (shell_cmd "cd ../../../..",
3745 @git, qw(update-ref -m),
3746 "dgit --dgit-view-save $msg HEAD=$headref",
3747 $split_brain_save, $dgitview);
3749 return "and left in $split_brain_save";
3752 # An "infopair" is a tuple [ $thing, $what ]
3753 # (often $thing is a commit hash; $what is a description)
3755 sub infopair_cond_equal ($$) {
3757 $x->[0] eq $y->[0] or fail <<END;
3758 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3762 sub infopair_lrf_tag_lookup ($$) {
3763 my ($tagnames, $what) = @_;
3764 # $tagname may be an array ref
3765 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3766 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3767 foreach my $tagname (@tagnames) {
3768 my $lrefname = lrfetchrefs."/tags/$tagname";
3769 my $tagobj = $lrfetchrefs_f{$lrefname};
3770 next unless defined $tagobj;
3771 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3772 return [ git_rev_parse($tagobj), $what ];
3774 fail @tagnames==1 ? <<END : <<END;
3775 Wanted tag $what (@tagnames) on dgit server, but not found
3777 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3781 sub infopair_cond_ff ($$) {
3782 my ($anc,$desc) = @_;
3783 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3784 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3788 sub pseudomerge_version_check ($$) {
3789 my ($clogp, $archive_hash) = @_;
3791 my $arch_clogp = commit_getclogp $archive_hash;
3792 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3793 'version currently in archive' ];
3794 if (defined $overwrite_version) {
3795 if (length $overwrite_version) {
3796 infopair_cond_equal([ $overwrite_version,
3797 '--overwrite= version' ],
3800 my $v = $i_arch_v->[0];
3801 progress "Checking package changelog for archive version $v ...";
3803 my @xa = ("-f$v", "-t$v");
3804 my $vclogp = parsechangelog @xa;
3805 my $cv = [ (getfield $vclogp, 'Version'),
3806 "Version field from dpkg-parsechangelog @xa" ];
3807 infopair_cond_equal($i_arch_v, $cv);
3810 $@ =~ s/^dgit: //gm;
3812 "Perhaps debian/changelog does not mention $v ?";
3817 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3821 sub pseudomerge_make_commit ($$$$ $$) {
3822 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3823 $msg_cmd, $msg_msg) = @_;
3824 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3826 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3827 my $authline = clogp_authline $clogp;
3831 !defined $overwrite_version ? ""
3832 : !length $overwrite_version ? " --overwrite"
3833 : " --overwrite=".$overwrite_version;
3836 my $pmf = ".git/dgit/pseudomerge";
3837 open MC, ">", $pmf or die "$pmf $!";
3838 print MC <<END or die $!;
3841 parent $archive_hash
3851 return make_commit($pmf);
3854 sub splitbrain_pseudomerge ($$$$) {
3855 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3856 # => $merged_dgitview
3857 printdebug "splitbrain_pseudomerge...\n";
3859 # We: debian/PREVIOUS HEAD($maintview)
3860 # expect: o ----------------- o
3863 # a/d/PREVIOUS $dgitview
3866 # we do: `------------------ o
3870 return $dgitview unless defined $archive_hash;
3872 printdebug "splitbrain_pseudomerge...\n";
3874 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3876 if (!defined $overwrite_version) {
3877 progress "Checking that HEAD inciudes all changes in archive...";
3880 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3882 if (defined $overwrite_version) {
3884 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3885 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3886 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3887 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3888 my $i_archive = [ $archive_hash, "current archive contents" ];
3890 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3892 infopair_cond_equal($i_dgit, $i_archive);
3893 infopair_cond_ff($i_dep14, $i_dgit);
3894 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3898 $us: check failed (maybe --overwrite is needed, consult documentation)
3903 my $r = pseudomerge_make_commit
3904 $clogp, $dgitview, $archive_hash, $i_arch_v,
3905 "dgit --quilt=$quilt_mode",
3906 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3907 Declare fast forward from $i_arch_v->[0]
3909 Make fast forward from $i_arch_v->[0]
3912 maybe_split_brain_save $maintview, $r, "pseudomerge";
3914 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3918 sub plain_overwrite_pseudomerge ($$$) {
3919 my ($clogp, $head, $archive_hash) = @_;
3921 printdebug "plain_overwrite_pseudomerge...";
3923 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3925 return $head if is_fast_fwd $archive_hash, $head;
3927 my $m = "Declare fast forward from $i_arch_v->[0]";
3929 my $r = pseudomerge_make_commit
3930 $clogp, $head, $archive_hash, $i_arch_v,
3933 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3935 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3939 sub push_parse_changelog ($) {
3942 my $clogp = Dpkg::Control::Hash->new();
3943 $clogp->load($clogpfn) or die;
3945 my $clogpackage = getfield $clogp, 'Source';
3946 $package //= $clogpackage;
3947 fail "-p specified $package but changelog specified $clogpackage"
3948 unless $package eq $clogpackage;
3949 my $cversion = getfield $clogp, 'Version';
3951 if (!$we_are_initiator) {
3952 # rpush initiator can't do this because it doesn't have $isuite yet
3953 my $tag = debiantag($cversion, access_nomdistro);
3954 runcmd @git, qw(check-ref-format), $tag;
3957 my $dscfn = dscfn($cversion);
3959 return ($clogp, $cversion, $dscfn);
3962 sub push_parse_dsc ($$$) {
3963 my ($dscfn,$dscfnwhat, $cversion) = @_;
3964 $dsc = parsecontrol($dscfn,$dscfnwhat);
3965 my $dversion = getfield $dsc, 'Version';
3966 my $dscpackage = getfield $dsc, 'Source';
3967 ($dscpackage eq $package && $dversion eq $cversion) or
3968 fail "$dscfn is for $dscpackage $dversion".
3969 " but debian/changelog is for $package $cversion";
3972 sub push_tagwants ($$$$) {
3973 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3976 TagFn => \&debiantag,
3981 if (defined $maintviewhead) {
3983 TagFn => \&debiantag_maintview,
3984 Objid => $maintviewhead,
3985 TfSuffix => '-maintview',
3988 } elsif ($dodep14tag eq 'no' ? 0
3989 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3990 : $dodep14tag eq 'always'
3991 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3992 --dep14tag-always (or equivalent in config) means server must support
3993 both "new" and "maint" tag formats, but config says it doesn't.
3995 : die "$dodep14tag ?") {
3997 TagFn => \&debiantag_maintview,
3999 TfSuffix => '-dgit',
4003 foreach my $tw (@tagwants) {
4004 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4005 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4007 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4011 sub push_mktags ($$ $$ $) {
4013 $changesfile,$changesfilewhat,
4016 die unless $tagwants->[0]{View} eq 'dgit';
4018 my $declaredistro = access_nomdistro();
4019 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4020 $dsc->{$ourdscfield[0]} = join " ",
4021 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4023 $dsc->save("$dscfn.tmp") or die $!;
4025 my $changes = parsecontrol($changesfile,$changesfilewhat);
4026 foreach my $field (qw(Source Distribution Version)) {
4027 $changes->{$field} eq $clogp->{$field} or
4028 fail "changes field $field \`$changes->{$field}'".
4029 " does not match changelog \`$clogp->{$field}'";
4032 my $cversion = getfield $clogp, 'Version';
4033 my $clogsuite = getfield $clogp, 'Distribution';
4035 # We make the git tag by hand because (a) that makes it easier
4036 # to control the "tagger" (b) we can do remote signing
4037 my $authline = clogp_authline $clogp;
4038 my $delibs = join(" ", "",@deliberatelies);
4042 my $tfn = $tw->{Tfn};
4043 my $head = $tw->{Objid};
4044 my $tag = $tw->{Tag};
4046 open TO, '>', $tfn->('.tmp') or die $!;
4047 print TO <<END or die $!;
4054 if ($tw->{View} eq 'dgit') {
4055 print TO <<END or die $!;
4056 $package release $cversion for $clogsuite ($csuite) [dgit]
4057 [dgit distro=$declaredistro$delibs]
4059 foreach my $ref (sort keys %previously) {
4060 print TO <<END or die $!;
4061 [dgit previously:$ref=$previously{$ref}]
4064 } elsif ($tw->{View} eq 'maint') {
4065 print TO <<END or die $!;
4066 $package release $cversion for $clogsuite ($csuite)
4067 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4070 die Dumper($tw)."?";
4075 my $tagobjfn = $tfn->('.tmp');
4077 if (!defined $keyid) {
4078 $keyid = access_cfg('keyid','RETURN-UNDEF');
4080 if (!defined $keyid) {
4081 $keyid = getfield $clogp, 'Maintainer';
4083 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4084 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4085 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4086 push @sign_cmd, $tfn->('.tmp');
4087 runcmd_ordryrun @sign_cmd;
4089 $tagobjfn = $tfn->('.signed.tmp');
4090 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4091 $tfn->('.tmp'), $tfn->('.tmp.asc');
4097 my @r = map { $mktag->($_); } @$tagwants;
4101 sub sign_changes ($) {
4102 my ($changesfile) = @_;
4104 my @debsign_cmd = @debsign;
4105 push @debsign_cmd, "-k$keyid" if defined $keyid;
4106 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4107 push @debsign_cmd, $changesfile;
4108 runcmd_ordryrun @debsign_cmd;
4113 printdebug "actually entering push\n";
4115 supplementary_message(<<'END');
4116 Push failed, while checking state of the archive.
4117 You can retry the push, after fixing the problem, if you like.
4119 if (check_for_git()) {
4122 my $archive_hash = fetch_from_archive();
4123 if (!$archive_hash) {
4125 fail "package appears to be new in this suite;".
4126 " if this is intentional, use --new";
4129 supplementary_message(<<'END');
4130 Push failed, while preparing your push.
4131 You can retry the push, after fixing the problem, if you like.
4134 need_tagformat 'new', "quilt mode $quilt_mode"
4135 if quiltmode_splitbrain;
4139 access_giturl(); # check that success is vaguely likely
4140 rpush_handle_protovsn_bothends() if $we_are_initiator;
4143 my $clogpfn = ".git/dgit/changelog.822.tmp";
4144 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4146 responder_send_file('parsed-changelog', $clogpfn);
4148 my ($clogp, $cversion, $dscfn) =
4149 push_parse_changelog("$clogpfn");
4151 my $dscpath = "$buildproductsdir/$dscfn";
4152 stat_exists $dscpath or
4153 fail "looked for .dsc $dscpath, but $!;".
4154 " maybe you forgot to build";
4156 responder_send_file('dsc', $dscpath);
4158 push_parse_dsc($dscpath, $dscfn, $cversion);
4160 my $format = getfield $dsc, 'Format';
4161 printdebug "format $format\n";
4163 my $actualhead = git_rev_parse('HEAD');
4164 my $dgithead = $actualhead;
4165 my $maintviewhead = undef;
4167 my $upstreamversion = upstreamversion $clogp->{Version};
4169 if (madformat_wantfixup($format)) {
4170 # user might have not used dgit build, so maybe do this now:
4171 if (quiltmode_splitbrain()) {
4173 quilt_make_fake_dsc($upstreamversion);
4175 ($dgithead, $cachekey) =
4176 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4178 "--quilt=$quilt_mode but no cached dgit view:
4179 perhaps tree changed since dgit build[-source] ?";
4181 $dgithead = splitbrain_pseudomerge($clogp,
4182 $actualhead, $dgithead,
4184 $maintviewhead = $actualhead;
4185 changedir '../../../..';
4186 prep_ud(); # so _only_subdir() works, below
4188 commit_quilty_patch();
4192 if (defined $overwrite_version && !defined $maintviewhead) {
4193 $dgithead = plain_overwrite_pseudomerge($clogp,
4201 if ($archive_hash) {
4202 if (is_fast_fwd($archive_hash, $dgithead)) {
4204 } elsif (deliberately_not_fast_forward) {
4207 fail "dgit push: HEAD is not a descendant".
4208 " of the archive's version.\n".
4209 "To overwrite the archive's contents,".
4210 " pass --overwrite[=VERSION].\n".
4211 "To rewind history, if permitted by the archive,".
4212 " use --deliberately-not-fast-forward.";
4217 progress "checking that $dscfn corresponds to HEAD";
4218 runcmd qw(dpkg-source -x --),
4219 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4220 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4221 check_for_vendor_patches() if madformat($dsc->{format});
4222 changedir '../../../..';
4223 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4224 debugcmd "+",@diffcmd;
4226 my $r = system @diffcmd;
4229 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4231 HEAD specifies a different tree to $dscfn:
4233 Perhaps you forgot to build. Or perhaps there is a problem with your
4234 source tree (see dgit(7) for some hints). To see a full diff, run
4241 if (!$changesfile) {
4242 my $pat = changespat $cversion;
4243 my @cs = glob "$buildproductsdir/$pat";
4244 fail "failed to find unique changes file".
4245 " (looked for $pat in $buildproductsdir);".
4246 " perhaps you need to use dgit -C"
4248 ($changesfile) = @cs;
4250 $changesfile = "$buildproductsdir/$changesfile";
4253 # Check that changes and .dsc agree enough
4254 $changesfile =~ m{[^/]*$};
4255 my $changes = parsecontrol($changesfile,$&);
4256 files_compare_inputs($dsc, $changes)
4257 unless forceing [qw(dsc-changes-mismatch)];
4259 # Perhaps adjust .dsc to contain right set of origs
4260 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4262 unless forceing [qw(changes-origs-exactly)];
4264 # Checks complete, we're going to try and go ahead:
4266 responder_send_file('changes',$changesfile);
4267 responder_send_command("param head $dgithead");
4268 responder_send_command("param csuite $csuite");
4269 responder_send_command("param isuite $isuite");
4270 responder_send_command("param tagformat $tagformat");
4271 if (defined $maintviewhead) {
4272 die unless ($protovsn//4) >= 4;
4273 responder_send_command("param maint-view $maintviewhead");
4276 if (deliberately_not_fast_forward) {
4277 git_for_each_ref(lrfetchrefs, sub {
4278 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4279 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4280 responder_send_command("previously $rrefname=$objid");
4281 $previously{$rrefname} = $objid;
4285 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4289 supplementary_message(<<'END');
4290 Push failed, while signing the tag.
4291 You can retry the push, after fixing the problem, if you like.
4293 # If we manage to sign but fail to record it anywhere, it's fine.
4294 if ($we_are_responder) {
4295 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4296 responder_receive_files('signed-tag', @tagobjfns);
4298 @tagobjfns = push_mktags($clogp,$dscpath,
4299 $changesfile,$changesfile,
4302 supplementary_message(<<'END');
4303 Push failed, *after* signing the tag.
4304 If you want to try again, you should use a new version number.
4307 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4309 foreach my $tw (@tagwants) {
4310 my $tag = $tw->{Tag};
4311 my $tagobjfn = $tw->{TagObjFn};
4313 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4314 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4315 runcmd_ordryrun_local
4316 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4319 supplementary_message(<<'END');
4320 Push failed, while updating the remote git repository - see messages above.
4321 If you want to try again, you should use a new version number.
4323 if (!check_for_git()) {
4324 create_remote_git_repo();
4327 my @pushrefs = $forceflag.$dgithead.":".rrref();
4328 foreach my $tw (@tagwants) {
4329 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4332 runcmd_ordryrun @git,
4333 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4334 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4336 supplementary_message(<<'END');
4337 Push failed, while obtaining signatures on the .changes and .dsc.
4338 If it was just that the signature failed, you may try again by using
4339 debsign by hand to sign the changes
4341 and then dput to complete the upload.
4342 If you need to change the package, you must use a new version number.
4344 if ($we_are_responder) {
4345 my $dryrunsuffix = act_local() ? "" : ".tmp";
4346 responder_receive_files('signed-dsc-changes',
4347 "$dscpath$dryrunsuffix",
4348 "$changesfile$dryrunsuffix");
4351 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4353 progress "[new .dsc left in $dscpath.tmp]";
4355 sign_changes $changesfile;
4358 supplementary_message(<<END);
4359 Push failed, while uploading package(s) to the archive server.
4360 You can retry the upload of exactly these same files with dput of:
4362 If that .changes file is broken, you will need to use a new version
4363 number for your next attempt at the upload.
4365 my $host = access_cfg('upload-host','RETURN-UNDEF');
4366 my @hostarg = defined($host) ? ($host,) : ();
4367 runcmd_ordryrun @dput, @hostarg, $changesfile;
4368 printdone "pushed and uploaded $cversion";
4370 supplementary_message('');
4371 responder_send_command("complete");
4377 badusage "-p is not allowed with clone; specify as argument instead"
4378 if defined $package;
4381 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4382 ($package,$isuite) = @ARGV;
4383 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4384 ($package,$dstdir) = @ARGV;
4385 } elsif (@ARGV==3) {
4386 ($package,$isuite,$dstdir) = @ARGV;
4388 badusage "incorrect arguments to dgit clone";
4392 $dstdir ||= "$package";
4393 if (stat_exists $dstdir) {
4394 fail "$dstdir already exists";
4398 if ($rmonerror && !$dryrun_level) {
4399 $cwd_remove= getcwd();
4401 return unless defined $cwd_remove;
4402 if (!chdir "$cwd_remove") {
4403 return if $!==&ENOENT;
4404 die "chdir $cwd_remove: $!";
4406 printdebug "clone rmonerror removing $dstdir\n";
4408 rmtree($dstdir) or die "remove $dstdir: $!\n";
4409 } elsif (grep { $! == $_ }
4410 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4412 print STDERR "check whether to remove $dstdir: $!\n";
4418 $cwd_remove = undef;
4421 sub branchsuite () {
4422 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4423 if ($branch =~ m#$lbranch_re#o) {
4430 sub fetchpullargs () {
4431 if (!defined $package) {
4432 my $sourcep = parsecontrol('debian/control','debian/control');
4433 $package = getfield $sourcep, 'Source';
4436 $isuite = branchsuite();
4438 my $clogp = parsechangelog();
4439 my $clogsuite = getfield $clogp, 'Distribution';
4440 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4442 } elsif (@ARGV==1) {
4445 badusage "incorrect arguments to dgit fetch or dgit pull";
4453 my $multi_fetched = fork_for_multisuite(sub { });
4454 exit 0 if $multi_fetched;
4461 if (quiltmode_splitbrain()) {
4462 my ($format, $fopts) = get_source_format();
4463 madformat($format) and fail <<END
4464 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4472 badusage "-p is not allowed with dgit push" if defined $package;
4474 my $clogp = parsechangelog();
4475 $package = getfield $clogp, 'Source';
4478 } elsif (@ARGV==1) {
4479 ($specsuite) = (@ARGV);
4481 badusage "incorrect arguments to dgit push";
4483 $isuite = getfield $clogp, 'Distribution';
4486 local ($package) = $existing_package; # this is a hack
4487 canonicalise_suite();
4489 canonicalise_suite();
4491 if (defined $specsuite &&
4492 $specsuite ne $isuite &&
4493 $specsuite ne $csuite) {
4494 fail "dgit push: changelog specifies $isuite ($csuite)".
4495 " but command line specifies $specsuite";
4500 #---------- remote commands' implementation ----------
4502 sub cmd_remote_push_build_host {
4503 my ($nrargs) = shift @ARGV;
4504 my (@rargs) = @ARGV[0..$nrargs-1];
4505 @ARGV = @ARGV[$nrargs..$#ARGV];
4507 my ($dir,$vsnwant) = @rargs;
4508 # vsnwant is a comma-separated list; we report which we have
4509 # chosen in our ready response (so other end can tell if they
4512 $we_are_responder = 1;
4513 $us .= " (build host)";
4515 open PI, "<&STDIN" or die $!;
4516 open STDIN, "/dev/null" or die $!;
4517 open PO, ">&STDOUT" or die $!;
4519 open STDOUT, ">&STDERR" or die $!;
4523 ($protovsn) = grep {
4524 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4525 } @rpushprotovsn_support;
4527 fail "build host has dgit rpush protocol versions ".
4528 (join ",", @rpushprotovsn_support).
4529 " but invocation host has $vsnwant"
4530 unless defined $protovsn;
4532 responder_send_command("dgit-remote-push-ready $protovsn");
4537 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4538 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4539 # a good error message)
4541 sub rpush_handle_protovsn_bothends () {
4542 if ($protovsn < 4) {
4543 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4552 my $report = i_child_report();
4553 if (defined $report) {
4554 printdebug "($report)\n";
4555 } elsif ($i_child_pid) {
4556 printdebug "(killing build host child $i_child_pid)\n";
4557 kill 15, $i_child_pid;
4559 if (defined $i_tmp && !defined $initiator_tempdir) {
4561 eval { rmtree $i_tmp; };
4566 return unless forkcheck_mainprocess();
4571 my ($base,$selector,@args) = @_;
4572 $selector =~ s/\-/_/g;
4573 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4579 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4587 push @rargs, join ",", @rpushprotovsn_support;
4590 push @rdgit, @ropts;
4591 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4593 my @cmd = (@ssh, $host, shellquote @rdgit);
4596 $we_are_initiator=1;
4598 if (defined $initiator_tempdir) {
4599 rmtree $initiator_tempdir;
4600 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4601 $i_tmp = $initiator_tempdir;
4605 $i_child_pid = open2(\*RO, \*RI, @cmd);
4607 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4608 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4609 $supplementary_message = '' unless $protovsn >= 3;
4612 my ($icmd,$iargs) = initiator_expect {
4613 m/^(\S+)(?: (.*))?$/;
4616 i_method "i_resp", $icmd, $iargs;
4620 sub i_resp_progress ($) {
4622 my $msg = protocol_read_bytes \*RO, $rhs;
4626 sub i_resp_supplementary_message ($) {
4628 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4631 sub i_resp_complete {
4632 my $pid = $i_child_pid;
4633 $i_child_pid = undef; # prevents killing some other process with same pid
4634 printdebug "waiting for build host child $pid...\n";
4635 my $got = waitpid $pid, 0;
4636 die $! unless $got == $pid;
4637 die "build host child failed $?" if $?;
4640 printdebug "all done\n";
4644 sub i_resp_file ($) {
4646 my $localname = i_method "i_localname", $keyword;
4647 my $localpath = "$i_tmp/$localname";
4648 stat_exists $localpath and
4649 badproto \*RO, "file $keyword ($localpath) twice";
4650 protocol_receive_file \*RO, $localpath;
4651 i_method "i_file", $keyword;
4656 sub i_resp_param ($) {
4657 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4661 sub i_resp_previously ($) {
4662 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4663 or badproto \*RO, "bad previously spec";
4664 my $r = system qw(git check-ref-format), $1;
4665 die "bad previously ref spec ($r)" if $r;
4666 $previously{$1} = $2;
4671 sub i_resp_want ($) {
4673 die "$keyword ?" if $i_wanted{$keyword}++;
4675 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4676 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4677 die unless $isuite =~ m/^$suite_re$/;
4680 rpush_handle_protovsn_bothends();
4682 fail "rpush negotiated protocol version $protovsn".
4683 " which does not support quilt mode $quilt_mode"
4684 if quiltmode_splitbrain;
4686 my @localpaths = i_method "i_want", $keyword;
4687 printdebug "[[ $keyword @localpaths\n";
4688 foreach my $localpath (@localpaths) {
4689 protocol_send_file \*RI, $localpath;
4691 print RI "files-end\n" or die $!;
4694 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4696 sub i_localname_parsed_changelog {
4697 return "remote-changelog.822";
4699 sub i_file_parsed_changelog {
4700 ($i_clogp, $i_version, $i_dscfn) =
4701 push_parse_changelog "$i_tmp/remote-changelog.822";
4702 die if $i_dscfn =~ m#/|^\W#;
4705 sub i_localname_dsc {
4706 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4711 sub i_localname_changes {
4712 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4713 $i_changesfn = $i_dscfn;
4714 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4715 return $i_changesfn;
4717 sub i_file_changes { }
4719 sub i_want_signed_tag {
4720 printdebug Dumper(\%i_param, $i_dscfn);
4721 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4722 && defined $i_param{'csuite'}
4723 or badproto \*RO, "premature desire for signed-tag";
4724 my $head = $i_param{'head'};
4725 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4727 my $maintview = $i_param{'maint-view'};
4728 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4731 if ($protovsn >= 4) {
4732 my $p = $i_param{'tagformat'} // '<undef>';
4734 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4737 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4739 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4741 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4744 push_mktags $i_clogp, $i_dscfn,
4745 $i_changesfn, 'remote changes',
4749 sub i_want_signed_dsc_changes {
4750 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4751 sign_changes $i_changesfn;
4752 return ($i_dscfn, $i_changesfn);
4755 #---------- building etc. ----------
4761 #----- `3.0 (quilt)' handling -----
4763 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4765 sub quiltify_dpkg_commit ($$$;$) {
4766 my ($patchname,$author,$msg, $xinfo) = @_;
4770 my $descfn = ".git/dgit/quilt-description.tmp";
4771 open O, '>', $descfn or die "$descfn: $!";
4772 $msg =~ s/\n+/\n\n/;
4773 print O <<END or die $!;
4775 ${xinfo}Subject: $msg
4782 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4783 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4784 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4785 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4789 sub quiltify_trees_differ ($$;$$$) {
4790 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4791 # returns true iff the two tree objects differ other than in debian/
4792 # with $finegrained,
4793 # returns bitmask 01 - differ in upstream files except .gitignore
4794 # 02 - differ in .gitignore
4795 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4796 # is set for each modified .gitignore filename $fn
4797 # if $unrepres is defined, array ref to which is appeneded
4798 # a list of unrepresentable changes (removals of upstream files
4801 my @cmd = (@git, qw(diff-tree -z));
4802 push @cmd, qw(--name-only) unless $unrepres;
4803 push @cmd, qw(-r) if $finegrained || $unrepres;
4805 my $diffs= cmdoutput @cmd;
4808 foreach my $f (split /\0/, $diffs) {
4809 if ($unrepres && !@lmodes) {
4810 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4813 my ($oldmode,$newmode) = @lmodes;
4816 next if $f =~ m#^debian(?:/.*)?$#s;
4820 die "not a plain file\n"
4821 unless $newmode =~ m/^10\d{4}$/ ||
4822 $oldmode =~ m/^10\d{4}$/;
4823 if ($oldmode =~ m/[^0]/ &&
4824 $newmode =~ m/[^0]/) {
4825 die "mode changed\n" if $oldmode ne $newmode;
4827 die "non-default mode\n"
4828 unless $newmode =~ m/^100644$/ ||
4829 $oldmode =~ m/^100644$/;
4833 local $/="\n"; chomp $@;
4834 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4838 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4839 $r |= $isignore ? 02 : 01;
4840 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4842 printdebug "quiltify_trees_differ $x $y => $r\n";
4846 sub quiltify_tree_sentinelfiles ($) {
4847 # lists the `sentinel' files present in the tree
4849 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4850 qw(-- debian/rules debian/control);
4855 sub quiltify_splitbrain_needed () {
4856 if (!$split_brain) {
4857 progress "dgit view: changes are required...";
4858 runcmd @git, qw(checkout -q -b dgit-view);
4863 sub quiltify_splitbrain ($$$$$$) {
4864 my ($clogp, $unapplied, $headref, $diffbits,
4865 $editedignores, $cachekey) = @_;
4866 if ($quilt_mode !~ m/gbp|dpm/) {
4867 # treat .gitignore just like any other upstream file
4868 $diffbits = { %$diffbits };
4869 $_ = !!$_ foreach values %$diffbits;
4871 # We would like any commits we generate to be reproducible
4872 my @authline = clogp_authline($clogp);
4873 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4874 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4875 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4876 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4877 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4878 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4880 if ($quilt_mode =~ m/gbp|unapplied/ &&
4881 ($diffbits->{O2H} & 01)) {
4883 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4884 " but git tree differs from orig in upstream files.";
4885 if (!stat_exists "debian/patches") {
4887 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4891 if ($quilt_mode =~ m/dpm/ &&
4892 ($diffbits->{H2A} & 01)) {
4894 --quilt=$quilt_mode specified, implying patches-applied git tree
4895 but git tree differs from result of applying debian/patches to upstream
4898 if ($quilt_mode =~ m/gbp|unapplied/ &&
4899 ($diffbits->{O2A} & 01)) { # some patches
4900 quiltify_splitbrain_needed();
4901 progress "dgit view: creating patches-applied version using gbp pq";
4902 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4903 # gbp pq import creates a fresh branch; push back to dgit-view
4904 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4905 runcmd @git, qw(checkout -q dgit-view);
4907 if ($quilt_mode =~ m/gbp|dpm/ &&
4908 ($diffbits->{O2A} & 02)) {
4910 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4911 tool which does not create patches for changes to upstream
4912 .gitignores: but, such patches exist in debian/patches.
4915 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4916 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4917 quiltify_splitbrain_needed();
4918 progress "dgit view: creating patch to represent .gitignore changes";
4919 ensuredir "debian/patches";
4920 my $gipatch = "debian/patches/auto-gitignore";
4921 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4922 stat GIPATCH or die "$gipatch: $!";
4923 fail "$gipatch already exists; but want to create it".
4924 " to record .gitignore changes" if (stat _)[7];
4925 print GIPATCH <<END or die "$gipatch: $!";
4926 Subject: Update .gitignore from Debian packaging branch
4928 The Debian packaging git branch contains these updates to the upstream
4929 .gitignore file(s). This patch is autogenerated, to provide these
4930 updates to users of the official Debian archive view of the package.
4932 [dgit ($our_version) update-gitignore]
4935 close GIPATCH or die "$gipatch: $!";
4936 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4937 $unapplied, $headref, "--", sort keys %$editedignores;
4938 open SERIES, "+>>", "debian/patches/series" or die $!;
4939 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4941 defined read SERIES, $newline, 1 or die $!;
4942 print SERIES "\n" or die $! unless $newline eq "\n";
4943 print SERIES "auto-gitignore\n" or die $!;
4944 close SERIES or die $!;
4945 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4947 Commit patch to update .gitignore
4949 [dgit ($our_version) update-gitignore-quilt-fixup]
4953 my $dgitview = git_rev_parse 'HEAD';
4955 changedir '../../../..';
4956 # When we no longer need to support squeeze, use --create-reflog
4958 ensuredir ".git/logs/refs/dgit-intern";
4959 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4962 my $oldcache = git_get_ref "refs/$splitbraincache";
4963 if ($oldcache eq $dgitview) {
4964 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4965 # git update-ref doesn't always update, in this case. *sigh*
4966 my $dummy = make_commit_text <<END;
4969 author Dgit <dgit\@example.com> 1000000000 +0000
4970 committer Dgit <dgit\@example.com> 1000000000 +0000
4972 Dummy commit - do not use
4974 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4975 "refs/$splitbraincache", $dummy;
4977 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4980 changedir '.git/dgit/unpack/work';
4982 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4983 progress "dgit view: created ($saved)";
4986 sub quiltify ($$$$) {
4987 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4989 # Quilt patchification algorithm
4991 # We search backwards through the history of the main tree's HEAD
4992 # (T) looking for a start commit S whose tree object is identical
4993 # to to the patch tip tree (ie the tree corresponding to the
4994 # current dpkg-committed patch series). For these purposes
4995 # `identical' disregards anything in debian/ - this wrinkle is
4996 # necessary because dpkg-source treates debian/ specially.
4998 # We can only traverse edges where at most one of the ancestors'
4999 # trees differs (in changes outside in debian/). And we cannot
5000 # handle edges which change .pc/ or debian/patches. To avoid
5001 # going down a rathole we avoid traversing edges which introduce
5002 # debian/rules or debian/control. And we set a limit on the
5003 # number of edges we are willing to look at.
5005 # If we succeed, we walk forwards again. For each traversed edge
5006 # PC (with P parent, C child) (starting with P=S and ending with
5007 # C=T) to we do this:
5009 # - dpkg-source --commit with a patch name and message derived from C
5010 # After traversing PT, we git commit the changes which
5011 # should be contained within debian/patches.
5013 # The search for the path S..T is breadth-first. We maintain a
5014 # todo list containing search nodes. A search node identifies a
5015 # commit, and looks something like this:
5017 # Commit => $git_commit_id,
5018 # Child => $c, # or undef if P=T
5019 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5020 # Nontrivial => true iff $p..$c has relevant changes
5027 my %considered; # saves being exponential on some weird graphs
5029 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5032 my ($search,$whynot) = @_;
5033 printdebug " search NOT $search->{Commit} $whynot\n";
5034 $search->{Whynot} = $whynot;
5035 push @nots, $search;
5036 no warnings qw(exiting);
5045 my $c = shift @todo;
5046 next if $considered{$c->{Commit}}++;
5048 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5050 printdebug "quiltify investigate $c->{Commit}\n";
5053 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5054 printdebug " search finished hooray!\n";
5059 if ($quilt_mode eq 'nofix') {
5060 fail "quilt fixup required but quilt mode is \`nofix'\n".
5061 "HEAD commit $c->{Commit} differs from tree implied by ".
5062 " debian/patches (tree object $oldtiptree)";
5064 if ($quilt_mode eq 'smash') {
5065 printdebug " search quitting smash\n";
5069 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5070 $not->($c, "has $c_sentinels not $t_sentinels")
5071 if $c_sentinels ne $t_sentinels;
5073 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5074 $commitdata =~ m/\n\n/;
5076 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5077 @parents = map { { Commit => $_, Child => $c } } @parents;
5079 $not->($c, "root commit") if !@parents;
5081 foreach my $p (@parents) {
5082 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5084 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5085 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5087 foreach my $p (@parents) {
5088 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5090 my @cmd= (@git, qw(diff-tree -r --name-only),
5091 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5092 my $patchstackchange = cmdoutput @cmd;
5093 if (length $patchstackchange) {
5094 $patchstackchange =~ s/\n/,/g;
5095 $not->($p, "changed $patchstackchange");
5098 printdebug " search queue P=$p->{Commit} ",
5099 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5105 printdebug "quiltify want to smash\n";
5108 my $x = $_[0]{Commit};
5109 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5112 my $reportnot = sub {
5114 my $s = $abbrev->($notp);
5115 my $c = $notp->{Child};
5116 $s .= "..".$abbrev->($c) if $c;
5117 $s .= ": ".$notp->{Whynot};
5120 if ($quilt_mode eq 'linear') {
5121 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5122 foreach my $notp (@nots) {
5123 print STDERR "$us: ", $reportnot->($notp), "\n";
5125 print STDERR "$us: $_\n" foreach @$failsuggestion;
5126 fail "quilt fixup naive history linearisation failed.\n".
5127 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5128 } elsif ($quilt_mode eq 'smash') {
5129 } elsif ($quilt_mode eq 'auto') {
5130 progress "quilt fixup cannot be linear, smashing...";
5132 die "$quilt_mode ?";
5135 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5136 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5138 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5140 quiltify_dpkg_commit "auto-$version-$target-$time",
5141 (getfield $clogp, 'Maintainer'),
5142 "Automatically generated patch ($clogp->{Version})\n".
5143 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5147 progress "quiltify linearisation planning successful, executing...";
5149 for (my $p = $sref_S;
5150 my $c = $p->{Child};
5152 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5153 next unless $p->{Nontrivial};
5155 my $cc = $c->{Commit};
5157 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5158 $commitdata =~ m/\n\n/ or die "$c ?";
5161 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5164 my $commitdate = cmdoutput
5165 @git, qw(log -n1 --pretty=format:%aD), $cc;
5167 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5169 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5176 my $gbp_check_suitable = sub {
5181 die "contains unexpected slashes\n" if m{//} || m{/$};
5182 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5183 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5184 die "too long" if length > 200;
5186 return $_ unless $@;
5187 print STDERR "quiltifying commit $cc:".
5188 " ignoring/dropping Gbp-Pq $what: $@";
5192 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5194 (\S+) \s* \n //ixm) {
5195 $patchname = $gbp_check_suitable->($1, 'Name');
5197 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5199 (\S+) \s* \n //ixm) {
5200 $patchdir = $gbp_check_suitable->($1, 'Topic');
5205 if (!defined $patchname) {
5206 $patchname = $title;
5207 $patchname =~ s/[.:]$//;
5210 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5211 my $translitname = $converter->convert($patchname);
5212 die unless defined $translitname;
5213 $patchname = $translitname;
5216 "dgit: patch title transliteration error: $@"
5218 $patchname =~ y/ A-Z/-a-z/;
5219 $patchname =~ y/-a-z0-9_.+=~//cd;
5220 $patchname =~ s/^\W/x-$&/;
5221 $patchname = substr($patchname,0,40);
5223 if (!defined $patchdir) {
5226 if (length $patchdir) {
5227 $patchname = "$patchdir/$patchname";
5229 if ($patchname =~ m{^(.*)/}) {
5230 mkpath "debian/patches/$1";
5235 stat "debian/patches/$patchname$index";
5237 $!==ENOENT or die "$patchname$index $!";
5239 runcmd @git, qw(checkout -q), $cc;
5241 # We use the tip's changelog so that dpkg-source doesn't
5242 # produce complaining messages from dpkg-parsechangelog. None
5243 # of the information dpkg-source gets from the changelog is
5244 # actually relevant - it gets put into the original message
5245 # which dpkg-source provides our stunt editor, and then
5247 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5249 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5250 "Date: $commitdate\n".
5251 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5253 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5256 runcmd @git, qw(checkout -q master);
5259 sub build_maybe_quilt_fixup () {
5260 my ($format,$fopts) = get_source_format;
5261 return unless madformat_wantfixup $format;
5264 check_for_vendor_patches();
5266 if (quiltmode_splitbrain) {
5267 fail <<END unless access_cfg_tagformats_can_splitbrain;
5268 quilt mode $quilt_mode requires split view so server needs to support
5269 both "new" and "maint" tag formats, but config says it doesn't.
5273 my $clogp = parsechangelog();
5274 my $headref = git_rev_parse('HEAD');
5279 my $upstreamversion = upstreamversion $version;
5281 if ($fopts->{'single-debian-patch'}) {
5282 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5284 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5287 die 'bug' if $split_brain && !$need_split_build_invocation;
5289 changedir '../../../..';
5290 runcmd_ordryrun_local
5291 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5294 sub quilt_fixup_mkwork ($) {
5297 mkdir "work" or die $!;
5299 mktree_in_ud_here();
5300 runcmd @git, qw(reset -q --hard), $headref;
5303 sub quilt_fixup_linkorigs ($$) {
5304 my ($upstreamversion, $fn) = @_;
5305 # calls $fn->($leafname);
5307 foreach my $f (<../../../../*>) { #/){
5308 my $b=$f; $b =~ s{.*/}{};
5310 local ($debuglevel) = $debuglevel-1;
5311 printdebug "QF linkorigs $b, $f ?\n";
5313 next unless is_orig_file_of_vsn $b, $upstreamversion;
5314 printdebug "QF linkorigs $b, $f Y\n";
5315 link_ltarget $f, $b or die "$b $!";
5320 sub quilt_fixup_delete_pc () {
5321 runcmd @git, qw(rm -rqf .pc);
5323 Commit removal of .pc (quilt series tracking data)
5325 [dgit ($our_version) upgrade quilt-remove-pc]
5329 sub quilt_fixup_singlepatch ($$$) {
5330 my ($clogp, $headref, $upstreamversion) = @_;
5332 progress "starting quiltify (single-debian-patch)";
5334 # dpkg-source --commit generates new patches even if
5335 # single-debian-patch is in debian/source/options. In order to
5336 # get it to generate debian/patches/debian-changes, it is
5337 # necessary to build the source package.
5339 quilt_fixup_linkorigs($upstreamversion, sub { });
5340 quilt_fixup_mkwork($headref);
5342 rmtree("debian/patches");
5344 runcmd @dpkgsource, qw(-b .);
5346 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5347 rename srcfn("$upstreamversion", "/debian/patches"),
5348 "work/debian/patches";
5351 commit_quilty_patch();
5354 sub quilt_make_fake_dsc ($) {
5355 my ($upstreamversion) = @_;
5357 my $fakeversion="$upstreamversion-~~DGITFAKE";
5359 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5360 print $fakedsc <<END or die $!;
5363 Version: $fakeversion
5367 my $dscaddfile=sub {
5370 my $md = new Digest::MD5;
5372 my $fh = new IO::File $b, '<' or die "$b $!";
5377 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5380 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5382 my @files=qw(debian/source/format debian/rules
5383 debian/control debian/changelog);
5384 foreach my $maybe (qw(debian/patches debian/source/options
5385 debian/tests/control)) {
5386 next unless stat_exists "../../../$maybe";
5387 push @files, $maybe;
5390 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5391 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5393 $dscaddfile->($debtar);
5394 close $fakedsc or die $!;
5397 sub quilt_check_splitbrain_cache ($$) {
5398 my ($headref, $upstreamversion) = @_;
5399 # Called only if we are in (potentially) split brain mode.
5401 # Computes the cache key and looks in the cache.
5402 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5404 my $splitbrain_cachekey;
5407 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5408 # we look in the reflog of dgit-intern/quilt-cache
5409 # we look for an entry whose message is the key for the cache lookup
5410 my @cachekey = (qw(dgit), $our_version);
5411 push @cachekey, $upstreamversion;
5412 push @cachekey, $quilt_mode;
5413 push @cachekey, $headref;
5415 push @cachekey, hashfile('fake.dsc');
5417 my $srcshash = Digest::SHA->new(256);
5418 my %sfs = ( %INC, '$0(dgit)' => $0 );
5419 foreach my $sfk (sort keys %sfs) {
5420 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5421 $srcshash->add($sfk," ");
5422 $srcshash->add(hashfile($sfs{$sfk}));
5423 $srcshash->add("\n");
5425 push @cachekey, $srcshash->hexdigest();
5426 $splitbrain_cachekey = "@cachekey";
5428 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5430 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5431 debugcmd "|(probably)",@cmd;
5432 my $child = open GC, "-|"; defined $child or die $!;
5434 chdir '../../..' or die $!;
5435 if (!stat ".git/logs/refs/$splitbraincache") {
5436 $! == ENOENT or die $!;
5437 printdebug ">(no reflog)\n";
5444 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5445 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5448 quilt_fixup_mkwork($headref);
5449 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5450 if ($cachehit ne $headref) {
5451 progress "dgit view: found cached ($saved)";
5452 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5454 return ($cachehit, $splitbrain_cachekey);
5456 progress "dgit view: found cached, no changes required";
5457 return ($headref, $splitbrain_cachekey);
5459 die $! if GC->error;
5460 failedcmd unless close GC;
5462 printdebug "splitbrain cache miss\n";
5463 return (undef, $splitbrain_cachekey);
5466 sub quilt_fixup_multipatch ($$$) {
5467 my ($clogp, $headref, $upstreamversion) = @_;
5469 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5472 # - honour any existing .pc in case it has any strangeness
5473 # - determine the git commit corresponding to the tip of
5474 # the patch stack (if there is one)
5475 # - if there is such a git commit, convert each subsequent
5476 # git commit into a quilt patch with dpkg-source --commit
5477 # - otherwise convert all the differences in the tree into
5478 # a single git commit
5482 # Our git tree doesn't necessarily contain .pc. (Some versions of
5483 # dgit would include the .pc in the git tree.) If there isn't
5484 # one, we need to generate one by unpacking the patches that we
5487 # We first look for a .pc in the git tree. If there is one, we
5488 # will use it. (This is not the normal case.)
5490 # Otherwise need to regenerate .pc so that dpkg-source --commit
5491 # can work. We do this as follows:
5492 # 1. Collect all relevant .orig from parent directory
5493 # 2. Generate a debian.tar.gz out of
5494 # debian/{patches,rules,source/format,source/options}
5495 # 3. Generate a fake .dsc containing just these fields:
5496 # Format Source Version Files
5497 # 4. Extract the fake .dsc
5498 # Now the fake .dsc has a .pc directory.
5499 # (In fact we do this in every case, because in future we will
5500 # want to search for a good base commit for generating patches.)
5502 # Then we can actually do the dpkg-source --commit
5503 # 1. Make a new working tree with the same object
5504 # store as our main tree and check out the main
5506 # 2. Copy .pc from the fake's extraction, if necessary
5507 # 3. Run dpkg-source --commit
5508 # 4. If the result has changes to debian/, then
5509 # - git add them them
5510 # - git add .pc if we had a .pc in-tree
5512 # 5. If we had a .pc in-tree, delete it, and git commit
5513 # 6. Back in the main tree, fast forward to the new HEAD
5515 # Another situation we may have to cope with is gbp-style
5516 # patches-unapplied trees.
5518 # We would want to detect these, so we know to escape into
5519 # quilt_fixup_gbp. However, this is in general not possible.
5520 # Consider a package with a one patch which the dgit user reverts
5521 # (with git revert or the moral equivalent).
5523 # That is indistinguishable in contents from a patches-unapplied
5524 # tree. And looking at the history to distinguish them is not
5525 # useful because the user might have made a confusing-looking git
5526 # history structure (which ought to produce an error if dgit can't
5527 # cope, not a silent reintroduction of an unwanted patch).
5529 # So gbp users will have to pass an option. But we can usually
5530 # detect their failure to do so: if the tree is not a clean
5531 # patches-applied tree, quilt linearisation fails, but the tree
5532 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5533 # they want --quilt=unapplied.
5535 # To help detect this, when we are extracting the fake dsc, we
5536 # first extract it with --skip-patches, and then apply the patches
5537 # afterwards with dpkg-source --before-build. That lets us save a
5538 # tree object corresponding to .origs.
5540 my $splitbrain_cachekey;
5542 quilt_make_fake_dsc($upstreamversion);
5544 if (quiltmode_splitbrain()) {
5546 ($cachehit, $splitbrain_cachekey) =
5547 quilt_check_splitbrain_cache($headref, $upstreamversion);
5548 return if $cachehit;
5552 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5554 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5555 rename $fakexdir, "fake" or die "$fakexdir $!";
5559 remove_stray_gits("source package");
5560 mktree_in_ud_here();
5564 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5565 my $unapplied=git_add_write_tree();
5566 printdebug "fake orig tree object $unapplied\n";
5570 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5572 if (system @bbcmd) {
5573 failedcmd @bbcmd if $? < 0;
5575 failed to apply your git tree's patch stack (from debian/patches/) to
5576 the corresponding upstream tarball(s). Your source tree and .orig
5577 are probably too inconsistent. dgit can only fix up certain kinds of
5578 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5584 quilt_fixup_mkwork($headref);
5587 if (stat_exists ".pc") {
5589 progress "Tree already contains .pc - will use it then delete it.";
5592 rename '../fake/.pc','.pc' or die $!;
5595 changedir '../fake';
5597 my $oldtiptree=git_add_write_tree();
5598 printdebug "fake o+d/p tree object $unapplied\n";
5599 changedir '../work';
5602 # We calculate some guesswork now about what kind of tree this might
5603 # be. This is mostly for error reporting.
5609 # O = orig, without patches applied
5610 # A = "applied", ie orig with H's debian/patches applied
5611 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5612 \%editedignores, \@unrepres),
5613 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5614 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5618 foreach my $b (qw(01 02)) {
5619 foreach my $v (qw(O2H O2A H2A)) {
5620 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5623 printdebug "differences \@dl @dl.\n";
5626 "$us: base trees orig=%.20s o+d/p=%.20s",
5627 $unapplied, $oldtiptree;
5629 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5630 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5631 $dl[0], $dl[1], $dl[3], $dl[4],
5635 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5637 forceable_fail [qw(unrepresentable)], <<END;
5638 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5643 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5644 push @failsuggestion, "This might be a patches-unapplied branch.";
5645 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5646 push @failsuggestion, "This might be a patches-applied branch.";
5648 push @failsuggestion, "Maybe you need to specify one of".
5649 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5651 if (quiltmode_splitbrain()) {
5652 quiltify_splitbrain($clogp, $unapplied, $headref,
5653 $diffbits, \%editedignores,
5654 $splitbrain_cachekey);
5658 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5659 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5661 if (!open P, '>>', ".pc/applied-patches") {
5662 $!==&ENOENT or die $!;
5667 commit_quilty_patch();
5669 if ($mustdeletepc) {
5670 quilt_fixup_delete_pc();
5674 sub quilt_fixup_editor () {
5675 my $descfn = $ENV{$fakeeditorenv};
5676 my $editing = $ARGV[$#ARGV];
5677 open I1, '<', $descfn or die "$descfn: $!";
5678 open I2, '<', $editing or die "$editing: $!";
5679 unlink $editing or die "$editing: $!";
5680 open O, '>', $editing or die "$editing: $!";
5681 while (<I1>) { print O or die $!; } I1->error and die $!;
5684 $copying ||= m/^\-\-\- /;
5685 next unless $copying;
5688 I2->error and die $!;
5693 sub maybe_apply_patches_dirtily () {
5694 return unless $quilt_mode =~ m/gbp|unapplied/;
5695 print STDERR <<END or die $!;
5697 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5698 dgit: Have to apply the patches - making the tree dirty.
5699 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5702 $patches_applied_dirtily = 01;
5703 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5704 runcmd qw(dpkg-source --before-build .);
5707 sub maybe_unapply_patches_again () {
5708 progress "dgit: Unapplying patches again to tidy up the tree."
5709 if $patches_applied_dirtily;
5710 runcmd qw(dpkg-source --after-build .)
5711 if $patches_applied_dirtily & 01;
5713 if $patches_applied_dirtily & 02;
5714 $patches_applied_dirtily = 0;
5717 #----- other building -----
5719 our $clean_using_builder;
5720 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5721 # clean the tree before building (perhaps invoked indirectly by
5722 # whatever we are using to run the build), rather than separately
5723 # and explicitly by us.
5726 return if $clean_using_builder;
5727 if ($cleanmode eq 'dpkg-source') {
5728 maybe_apply_patches_dirtily();
5729 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5730 } elsif ($cleanmode eq 'dpkg-source-d') {
5731 maybe_apply_patches_dirtily();
5732 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5733 } elsif ($cleanmode eq 'git') {
5734 runcmd_ordryrun_local @git, qw(clean -xdf);
5735 } elsif ($cleanmode eq 'git-ff') {
5736 runcmd_ordryrun_local @git, qw(clean -xdff);
5737 } elsif ($cleanmode eq 'check') {
5738 my $leftovers = cmdoutput @git, qw(clean -xdn);
5739 if (length $leftovers) {
5740 print STDERR $leftovers, "\n" or die $!;
5741 fail "tree contains uncommitted files and --clean=check specified";
5743 } elsif ($cleanmode eq 'none') {
5750 badusage "clean takes no additional arguments" if @ARGV;
5753 maybe_unapply_patches_again();
5756 sub build_prep_early () {
5757 our $build_prep_early_done //= 0;
5758 return if $build_prep_early_done++;
5759 badusage "-p is not allowed when building" if defined $package;
5760 my $clogp = parsechangelog();
5761 $isuite = getfield $clogp, 'Distribution';
5762 $package = getfield $clogp, 'Source';
5763 $version = getfield $clogp, 'Version';
5771 build_maybe_quilt_fixup();
5773 my $pat = changespat $version;
5774 foreach my $f (glob "$buildproductsdir/$pat") {
5776 unlink $f or fail "remove old changes file $f: $!";
5778 progress "would remove $f";
5784 sub changesopts_initial () {
5785 my @opts =@changesopts[1..$#changesopts];
5788 sub changesopts_version () {
5789 if (!defined $changes_since_version) {
5790 my @vsns = archive_query('archive_query');
5791 my @quirk = access_quirk();
5792 if ($quirk[0] eq 'backports') {
5793 local $isuite = $quirk[2];
5795 canonicalise_suite();
5796 push @vsns, archive_query('archive_query');
5799 @vsns = map { $_->[0] } @vsns;
5800 @vsns = sort { -version_compare($a, $b) } @vsns;
5801 $changes_since_version = $vsns[0];
5802 progress "changelog will contain changes since $vsns[0]";
5804 $changes_since_version = '_';
5805 progress "package seems new, not specifying -v<version>";
5808 if ($changes_since_version ne '_') {
5809 return ("-v$changes_since_version");
5815 sub changesopts () {
5816 return (changesopts_initial(), changesopts_version());
5819 sub massage_dbp_args ($;$) {
5820 my ($cmd,$xargs) = @_;
5823 # - if we're going to split the source build out so we can
5824 # do strange things to it, massage the arguments to dpkg-buildpackage
5825 # so that the main build doessn't build source (or add an argument
5826 # to stop it building source by default).
5828 # - add -nc to stop dpkg-source cleaning the source tree,
5829 # unless we're not doing a split build and want dpkg-source
5830 # as cleanmode, in which case we can do nothing
5833 # 0 - source will NOT need to be built separately by caller
5834 # +1 - source will need to be built separately by caller
5835 # +2 - source will need to be built separately by caller AND
5836 # dpkg-buildpackage should not in fact be run at all!
5837 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5838 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5839 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5840 $clean_using_builder = 1;
5843 # -nc has the side effect of specifying -b if nothing else specified
5844 # and some combinations of -S, -b, et al, are errors, rather than
5845 # later simply overriding earlie. So we need to:
5846 # - search the command line for these options
5847 # - pick the last one
5848 # - perhaps add our own as a default
5849 # - perhaps adjust it to the corresponding non-source-building version
5851 foreach my $l ($cmd, $xargs) {
5853 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5856 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5858 if ($need_split_build_invocation) {
5859 printdebug "massage split $dmode.\n";
5860 $r = $dmode =~ m/[S]/ ? +2 :
5861 $dmode =~ y/gGF/ABb/ ? +1 :
5862 $dmode =~ m/[ABb]/ ? 0 :
5865 printdebug "massage done $r $dmode.\n";
5867 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5873 my $wasdir = must_getcwd();
5879 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5880 my ($msg_if_onlyone) = @_;
5881 # If there is only one .changes file, fail with $msg_if_onlyone,
5882 # or if that is undef, be a no-op.
5883 # Returns the changes file to report to the user.
5884 my $pat = changespat $version;
5885 my @changesfiles = glob $pat;
5886 @changesfiles = sort {
5887 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5891 if (@changesfiles==1) {
5892 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5893 only one changes file from build (@changesfiles)
5895 $result = $changesfiles[0];
5896 } elsif (@changesfiles==2) {
5897 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5898 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5899 fail "$l found in binaries changes file $binchanges"
5902 runcmd_ordryrun_local @mergechanges, @changesfiles;
5903 my $multichanges = changespat $version,'multi';
5905 stat_exists $multichanges or fail "$multichanges: $!";
5906 foreach my $cf (glob $pat) {
5907 next if $cf eq $multichanges;
5908 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5911 $result = $multichanges;
5913 fail "wrong number of different changes files (@changesfiles)";
5915 printdone "build successful, results in $result\n" or die $!;
5918 sub midbuild_checkchanges () {
5919 my $pat = changespat $version;
5920 return if $rmchanges;
5921 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5922 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5924 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5925 Suggest you delete @unwanted.
5930 sub midbuild_checkchanges_vanilla ($) {
5932 midbuild_checkchanges() if $wantsrc == 1;
5935 sub postbuild_mergechanges_vanilla ($) {
5937 if ($wantsrc == 1) {
5939 postbuild_mergechanges(undef);
5942 printdone "build successful\n";
5948 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5949 my $wantsrc = massage_dbp_args \@dbp;
5952 midbuild_checkchanges_vanilla $wantsrc;
5957 push @dbp, changesopts_version();
5958 maybe_apply_patches_dirtily();
5959 runcmd_ordryrun_local @dbp;
5961 maybe_unapply_patches_again();
5962 postbuild_mergechanges_vanilla $wantsrc;
5966 $quilt_mode //= 'gbp';
5972 # gbp can make .origs out of thin air. In my tests it does this
5973 # even for a 1.0 format package, with no origs present. So I
5974 # guess it keys off just the version number. We don't know
5975 # exactly what .origs ought to exist, but let's assume that we
5976 # should run gbp if: the version has an upstream part and the main
5978 my $upstreamversion = upstreamversion $version;
5979 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5980 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5982 if ($gbp_make_orig) {
5984 $cleanmode = 'none'; # don't do it again
5985 $need_split_build_invocation = 1;
5988 my @dbp = @dpkgbuildpackage;
5990 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5992 if (!length $gbp_build[0]) {
5993 if (length executable_on_path('git-buildpackage')) {
5994 $gbp_build[0] = qw(git-buildpackage);
5996 $gbp_build[0] = 'gbp buildpackage';
5999 my @cmd = opts_opt_multi_cmd @gbp_build;
6001 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6003 if ($gbp_make_orig) {
6004 ensuredir '.git/dgit';
6005 my $ok = '.git/dgit/origs-gen-ok';
6006 unlink $ok or $!==&ENOENT or die $!;
6007 my @origs_cmd = @cmd;
6008 push @origs_cmd, qw(--git-cleaner=true);
6009 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6010 push @origs_cmd, @ARGV;
6012 debugcmd @origs_cmd;
6014 do { local $!; stat_exists $ok; }
6015 or failedcmd @origs_cmd;
6017 dryrun_report @origs_cmd;
6023 midbuild_checkchanges_vanilla $wantsrc;
6025 if (!$clean_using_builder) {
6026 push @cmd, '--git-cleaner=true';
6030 maybe_unapply_patches_again();
6032 push @cmd, changesopts();
6033 runcmd_ordryrun_local @cmd, @ARGV;
6035 postbuild_mergechanges_vanilla $wantsrc;
6037 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6041 my $our_cleanmode = $cleanmode;
6042 if ($need_split_build_invocation) {
6043 # Pretend that clean is being done some other way. This
6044 # forces us not to try to use dpkg-buildpackage to clean and
6045 # build source all in one go; and instead we run dpkg-source
6046 # (and build_prep() will do the clean since $clean_using_builder
6048 $our_cleanmode = 'ELSEWHERE';
6050 if ($our_cleanmode =~ m/^dpkg-source/) {
6051 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6052 $clean_using_builder = 1;
6055 $sourcechanges = changespat $version,'source';
6057 unlink "../$sourcechanges" or $!==ENOENT
6058 or fail "remove $sourcechanges: $!";
6060 $dscfn = dscfn($version);
6061 if ($our_cleanmode eq 'dpkg-source') {
6062 maybe_apply_patches_dirtily();
6063 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6065 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6066 maybe_apply_patches_dirtily();
6067 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6070 my @cmd = (@dpkgsource, qw(-b --));
6073 runcmd_ordryrun_local @cmd, "work";
6074 my @udfiles = <${package}_*>;
6075 changedir "../../..";
6076 foreach my $f (@udfiles) {
6077 printdebug "source copy, found $f\n";
6080 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6081 $f eq srcfn($version, $&));
6082 printdebug "source copy, found $f - renaming\n";
6083 rename "$ud/$f", "../$f" or $!==ENOENT
6084 or fail "put in place new source file ($f): $!";
6087 my $pwd = must_getcwd();
6088 my $leafdir = basename $pwd;
6090 runcmd_ordryrun_local @cmd, $leafdir;
6093 runcmd_ordryrun_local qw(sh -ec),
6094 'exec >$1; shift; exec "$@"','x',
6095 "../$sourcechanges",
6096 @dpkggenchanges, qw(-S), changesopts();
6100 sub cmd_build_source {
6102 badusage "build-source takes no additional arguments" if @ARGV;
6104 maybe_unapply_patches_again();
6105 printdone "source built, results in $dscfn and $sourcechanges";
6110 midbuild_checkchanges();
6113 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6114 stat_exists $sourcechanges
6115 or fail "$sourcechanges (in parent directory): $!";
6117 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6119 maybe_unapply_patches_again();
6121 postbuild_mergechanges(<<END);
6122 perhaps you need to pass -A ? (sbuild's default is to build only
6123 arch-specific binaries; dgit 1.4 used to override that.)
6128 sub cmd_quilt_fixup {
6129 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6132 build_maybe_quilt_fixup();
6135 sub import_dsc_result {
6136 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6137 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6139 check_gitattrs($newhash, "source tree");
6141 progress "dgit: import-dsc: $what_msg";
6144 sub cmd_import_dsc {
6148 last unless $ARGV[0] =~ m/^-/;
6151 if (m/^--require-valid-signature$/) {
6154 badusage "unknown dgit import-dsc sub-option \`$_'";
6158 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6159 my ($dscfn, $dstbranch) = @ARGV;
6161 badusage "dry run makes no sense with import-dsc" unless act_local();
6163 my $force = $dstbranch =~ s/^\+// ? +1 :
6164 $dstbranch =~ s/^\.\.// ? -1 :
6166 my $info = $force ? " $&" : '';
6167 $info = "$dscfn$info";
6169 my $specbranch = $dstbranch;
6170 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6171 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6173 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6174 my $chead = cmdoutput_errok @symcmd;
6175 defined $chead or $?==256 or failedcmd @symcmd;
6177 fail "$dstbranch is checked out - will not update it"
6178 if defined $chead and $chead eq $dstbranch;
6180 my $oldhash = git_get_ref $dstbranch;
6182 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6183 $dscdata = do { local $/ = undef; <D>; };
6184 D->error and fail "read $dscfn: $!";
6187 # we don't normally need this so import it here
6188 use Dpkg::Source::Package;
6189 my $dp = new Dpkg::Source::Package filename => $dscfn,
6190 require_valid_signature => $needsig;
6192 local $SIG{__WARN__} = sub {
6194 return unless $needsig;
6195 fail "import-dsc signature check failed";
6197 if (!$dp->is_signed()) {
6198 warn "$us: warning: importing unsigned .dsc\n";
6200 my $r = $dp->check_signature();
6201 die "->check_signature => $r" if $needsig && $r;
6207 $package = getfield $dsc, 'Source';
6209 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6210 unless forceing [qw(import-dsc-with-dgit-field)];
6211 parse_dsc_field_def_dsc_distro();
6213 $isuite = 'DGIT-IMPORT-DSC';
6214 $idistro //= $dsc_distro;
6218 if (defined $dsc_hash) {
6219 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6220 resolve_dsc_field_commit undef, undef;
6222 if (defined $dsc_hash) {
6223 my @cmd = (qw(sh -ec),
6224 "echo $dsc_hash | git cat-file --batch-check");
6225 my $objgot = cmdoutput @cmd;
6226 if ($objgot =~ m#^\w+ missing\b#) {
6228 .dsc contains Dgit field referring to object $dsc_hash
6229 Your git tree does not have that object. Try `git fetch' from a
6230 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6233 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6235 progress "Not fast forward, forced update.";
6237 fail "Not fast forward to $dsc_hash";
6240 import_dsc_result $dstbranch, $dsc_hash,
6241 "dgit import-dsc (Dgit): $info",
6242 "updated git ref $dstbranch";
6247 Branch $dstbranch already exists
6248 Specify ..$specbranch for a pseudo-merge, binding in existing history
6249 Specify +$specbranch to overwrite, discarding existing history
6251 if $oldhash && !$force;
6253 my @dfi = dsc_files_info();
6254 foreach my $fi (@dfi) {
6255 my $f = $fi->{Filename};
6257 next if lstat $here;
6258 fail "stat $here: $!" unless $! == ENOENT;
6260 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6262 } elsif ($dscfn =~ m#^/#) {
6265 fail "cannot import $dscfn which seems to be inside working tree!";
6267 $there =~ s#/+[^/]+$## or
6268 fail "cannot import $dscfn which seems to not have a basename";
6270 symlink $there, $here or fail "symlink $there to $here: $!";
6271 progress "made symlink $here -> $there";
6272 # print STDERR Dumper($fi);
6274 my @mergeinputs = generate_commits_from_dsc();
6275 die unless @mergeinputs == 1;
6277 my $newhash = $mergeinputs[0]{Commit};
6281 progress "Import, forced update - synthetic orphan git history.";
6282 } elsif ($force < 0) {
6283 progress "Import, merging.";
6284 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6285 my $version = getfield $dsc, 'Version';
6286 my $clogp = commit_getclogp $newhash;
6287 my $authline = clogp_authline $clogp;
6288 $newhash = make_commit_text <<END;
6295 Merge $package ($version) import into $dstbranch
6298 die; # caught earlier
6302 import_dsc_result $dstbranch, $newhash,
6303 "dgit import-dsc: $info",
6304 "results are in in git ref $dstbranch";
6307 sub cmd_archive_api_query {
6308 badusage "need only 1 subpath argument" unless @ARGV==1;
6309 my ($subpath) = @ARGV;
6310 my @cmd = archive_api_query_cmd($subpath);
6313 exec @cmd or fail "exec curl: $!\n";
6316 sub repos_server_url () {
6317 $package = '_dgit-repos-server';
6318 local $access_forpush = 1;
6319 local $isuite = 'DGIT-REPOS-SERVER';
6320 my $url = access_giturl();
6323 sub cmd_clone_dgit_repos_server {
6324 badusage "need destination argument" unless @ARGV==1;
6325 my ($destdir) = @ARGV;
6326 my $url = repos_server_url();
6327 my @cmd = (@git, qw(clone), $url, $destdir);
6329 exec @cmd or fail "exec git clone: $!\n";
6332 sub cmd_print_dgit_repos_server_source_url {
6333 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6335 my $url = repos_server_url();
6336 print $url, "\n" or die $!;
6339 sub cmd_setup_mergechangelogs {
6340 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6341 setup_mergechangelogs(1);
6344 sub cmd_setup_useremail {
6345 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6349 sub cmd_setup_gitattributes {
6350 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6354 sub cmd_setup_new_tree {
6355 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6359 #---------- argument parsing and main program ----------
6362 print "dgit version $our_version\n" or die $!;
6366 our (%valopts_long, %valopts_short);
6367 our (%funcopts_long);
6369 our (@modeopt_cfgs);
6371 sub defvalopt ($$$$) {
6372 my ($long,$short,$val_re,$how) = @_;
6373 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6374 $valopts_long{$long} = $oi;
6375 $valopts_short{$short} = $oi;
6376 # $how subref should:
6377 # do whatever assignemnt or thing it likes with $_[0]
6378 # if the option should not be passed on to remote, @rvalopts=()
6379 # or $how can be a scalar ref, meaning simply assign the value
6382 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6383 defvalopt '--distro', '-d', '.+', \$idistro;
6384 defvalopt '', '-k', '.+', \$keyid;
6385 defvalopt '--existing-package','', '.*', \$existing_package;
6386 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6387 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6388 defvalopt '--package', '-p', $package_re, \$package;
6389 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6391 defvalopt '', '-C', '.+', sub {
6392 ($changesfile) = (@_);
6393 if ($changesfile =~ s#^(.*)/##) {
6394 $buildproductsdir = $1;
6398 defvalopt '--initiator-tempdir','','.*', sub {
6399 ($initiator_tempdir) = (@_);
6400 $initiator_tempdir =~ m#^/# or
6401 badusage "--initiator-tempdir must be used specify an".
6402 " absolute, not relative, directory."
6405 sub defoptmodes ($@) {
6406 my ($varref, $cfgkey, $default, %optmap) = @_;
6408 while (my ($opt,$val) = each %optmap) {
6409 $funcopts_long{$opt} = sub { $$varref = $val; };
6410 $permit{$val} = $val;
6412 push @modeopt_cfgs, {
6415 Default => $default,
6420 defoptmodes \$dodep14tag, qw( dep14tag want
6423 --always-dep14tag always );
6428 if (defined $ENV{'DGIT_SSH'}) {
6429 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6430 } elsif (defined $ENV{'GIT_SSH'}) {
6431 @ssh = ($ENV{'GIT_SSH'});
6439 if (!defined $val) {
6440 badusage "$what needs a value" unless @ARGV;
6442 push @rvalopts, $val;
6444 badusage "bad value \`$val' for $what" unless
6445 $val =~ m/^$oi->{Re}$(?!\n)/s;
6446 my $how = $oi->{How};
6447 if (ref($how) eq 'SCALAR') {
6452 push @ropts, @rvalopts;
6456 last unless $ARGV[0] =~ m/^-/;
6460 if (m/^--dry-run$/) {
6463 } elsif (m/^--damp-run$/) {
6466 } elsif (m/^--no-sign$/) {
6469 } elsif (m/^--help$/) {
6471 } elsif (m/^--version$/) {
6473 } elsif (m/^--new$/) {
6476 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6477 ($om = $opts_opt_map{$1}) &&
6481 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6482 !$opts_opt_cmdonly{$1} &&
6483 ($om = $opts_opt_map{$1})) {
6486 } elsif (m/^--(gbp|dpm)$/s) {
6487 push @ropts, "--quilt=$1";
6489 } elsif (m/^--ignore-dirty$/s) {
6492 } elsif (m/^--no-quilt-fixup$/s) {
6494 $quilt_mode = 'nocheck';
6495 } elsif (m/^--no-rm-on-error$/s) {
6498 } elsif (m/^--no-chase-dsc-distro$/s) {
6500 $chase_dsc_distro = 0;
6501 } elsif (m/^--overwrite$/s) {
6503 $overwrite_version = '';
6504 } elsif (m/^--overwrite=(.+)$/s) {
6506 $overwrite_version = $1;
6507 } elsif (m/^--delayed=(\d+)$/s) {
6510 } elsif (m/^--dgit-view-save=(.+)$/s) {
6512 $split_brain_save = $1;
6513 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6514 } elsif (m/^--(no-)?rm-old-changes$/s) {
6517 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6519 push @deliberatelies, $&;
6520 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6524 } elsif (m/^--force-/) {
6526 "$us: warning: ignoring unknown force option $_\n";
6528 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6529 # undocumented, for testing
6531 $tagformat_want = [ $1, 'command line', 1 ];
6532 # 1 menas overrides distro configuration
6533 } elsif (m/^--always-split-source-build$/s) {
6534 # undocumented, for testing
6536 $need_split_build_invocation = 1;
6537 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6538 # undocumented, for testing
6540 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6541 # ^ it's supposed to be an array ref
6542 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6543 $val = $2 ? $' : undef; #';
6544 $valopt->($oi->{Long});
6545 } elsif ($funcopts_long{$_}) {
6547 $funcopts_long{$_}();
6549 badusage "unknown long option \`$_'";
6556 } elsif (s/^-L/-/) {
6559 } elsif (s/^-h/-/) {
6561 } elsif (s/^-D/-/) {
6565 } elsif (s/^-N/-/) {
6570 push @changesopts, $_;
6572 } elsif (s/^-wn$//s) {
6574 $cleanmode = 'none';
6575 } elsif (s/^-wg$//s) {
6578 } elsif (s/^-wgf$//s) {
6580 $cleanmode = 'git-ff';
6581 } elsif (s/^-wd$//s) {
6583 $cleanmode = 'dpkg-source';
6584 } elsif (s/^-wdd$//s) {
6586 $cleanmode = 'dpkg-source-d';
6587 } elsif (s/^-wc$//s) {
6589 $cleanmode = 'check';
6590 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6591 push @git, '-c', $&;
6592 $gitcfgs{cmdline}{$1} = [ $2 ];
6593 } elsif (s/^-c([^=]+)$//s) {
6594 push @git, '-c', $&;
6595 $gitcfgs{cmdline}{$1} = [ 'true' ];
6596 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6598 $val = undef unless length $val;
6599 $valopt->($oi->{Short});
6602 badusage "unknown short option \`$_'";
6609 sub check_env_sanity () {
6610 my $blocked = new POSIX::SigSet;
6611 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6614 foreach my $name (qw(PIPE CHLD)) {
6615 my $signame = "SIG$name";
6616 my $signum = eval "POSIX::$signame" // die;
6617 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6618 die "$signame is set to something other than SIG_DFL\n";
6619 $blocked->ismember($signum) and
6620 die "$signame is blocked\n";
6626 On entry to dgit, $@
6627 This is a bug produced by something in in your execution environment.
6633 sub parseopts_late_defaults () {
6634 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6635 if defined $idistro;
6636 $isuite //= cfg('dgit.default.default-suite');
6638 foreach my $k (keys %opts_opt_map) {
6639 my $om = $opts_opt_map{$k};
6641 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6643 badcfg "cannot set command for $k"
6644 unless length $om->[0];
6648 foreach my $c (access_cfg_cfgs("opts-$k")) {
6650 map { $_ ? @$_ : () }
6651 map { $gitcfgs{$_}{$c} }
6652 reverse @gitcfgsources;
6653 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6654 "\n" if $debuglevel >= 4;
6656 badcfg "cannot configure options for $k"
6657 if $opts_opt_cmdonly{$k};
6658 my $insertpos = $opts_cfg_insertpos{$k};
6659 @$om = ( @$om[0..$insertpos-1],
6661 @$om[$insertpos..$#$om] );
6665 if (!defined $rmchanges) {
6666 local $access_forpush;
6667 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6670 if (!defined $quilt_mode) {
6671 local $access_forpush;
6672 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6673 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6675 $quilt_mode =~ m/^($quilt_modes_re)$/
6676 or badcfg "unknown quilt-mode \`$quilt_mode'";
6680 foreach my $moc (@modeopt_cfgs) {
6681 local $access_forpush;
6682 my $vr = $moc->{Var};
6683 next if defined $$vr;
6684 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6685 my $v = $moc->{Vals}{$$vr};
6686 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6690 $need_split_build_invocation ||= quiltmode_splitbrain();
6692 if (!defined $cleanmode) {
6693 local $access_forpush;
6694 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6695 $cleanmode //= 'dpkg-source';
6697 badcfg "unknown clean-mode \`$cleanmode'" unless
6698 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6702 if ($ENV{$fakeeditorenv}) {
6704 quilt_fixup_editor();
6711 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6712 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6713 if $dryrun_level == 1;
6715 print STDERR $helpmsg or die $!;
6718 my $cmd = shift @ARGV;
6721 my $pre_fn = ${*::}{"pre_$cmd"};
6722 $pre_fn->() if $pre_fn;
6724 my $fn = ${*::}{"cmd_$cmd"};
6725 $fn or badusage "unknown operation $cmd";