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
58 our $dryrun_level = 0;
60 our $buildproductsdir = '..';
66 our $existing_package = 'dpkg';
68 our $changes_since_version;
70 our $overwrite_version; # undef: not specified; '': check changelog
72 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $we_are_initiator;
77 our $initiator_tempdir;
78 our $patches_applied_dirtily = 00;
82 our $chase_dsc_distro=1;
84 our %forceopts = map { $_=>0 }
85 qw(unrepresentable unsupported-source-format
86 dsc-changes-mismatch changes-origs-exactly
87 import-gitapply-absurd
88 import-gitapply-no-absurd
89 import-dsc-with-dgit-field);
91 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
93 our $suite_re = '[-+.0-9a-z]+';
94 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
95 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
96 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
97 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
99 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
100 our $splitbraincache = 'dgit-intern/quilt-cache';
101 our $rewritemap = 'dgit-rewrite/map';
103 our (@git) = qw(git);
104 our (@dget) = qw(dget);
105 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
106 our (@dput) = qw(dput);
107 our (@debsign) = qw(debsign);
108 our (@gpg) = qw(gpg);
109 our (@sbuild) = qw(sbuild);
111 our (@dgit) = qw(dgit);
112 our (@aptget) = qw(apt-get);
113 our (@aptcache) = qw(apt-cache);
114 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
115 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
116 our (@dpkggenchanges) = qw(dpkg-genchanges);
117 our (@mergechanges) = qw(mergechanges -f);
118 our (@gbp_build) = ('');
119 our (@gbp_pq) = ('gbp pq');
120 our (@changesopts) = ('');
122 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
125 'debsign' => \@debsign,
127 'sbuild' => \@sbuild,
131 'apt-get' => \@aptget,
132 'apt-cache' => \@aptcache,
133 'dpkg-source' => \@dpkgsource,
134 'dpkg-buildpackage' => \@dpkgbuildpackage,
135 'dpkg-genchanges' => \@dpkggenchanges,
136 'gbp-build' => \@gbp_build,
137 'gbp-pq' => \@gbp_pq,
138 'ch' => \@changesopts,
139 'mergechanges' => \@mergechanges);
141 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
142 our %opts_cfg_insertpos = map {
144 scalar @{ $opts_opt_map{$_} }
145 } keys %opts_opt_map;
147 sub parseopts_late_defaults();
148 sub setup_gitattrs(;$);
149 sub check_gitattrs($$);
155 our $supplementary_message = '';
156 our $need_split_build_invocation = 0;
157 our $split_brain = 0;
161 return unless forkcheck_mainprocess();
162 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
165 our $remotename = 'dgit';
166 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
170 if (!defined $absurdity) {
172 $absurdity =~ s{/[^/]+$}{/absurd} or die;
176 my ($v,$distro) = @_;
177 return $tagformatfn->($v, $distro);
180 sub debiantag_maintview ($$) {
181 my ($v,$distro) = @_;
182 return "$distro/".dep14_version_mangle $v;
185 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
187 sub lbranch () { return "$branchprefix/$csuite"; }
188 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
189 sub lref () { return "refs/heads/".lbranch(); }
190 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
191 sub rrref () { return server_ref($csuite); }
201 return "${package}_".(stripepoch $vsn).$sfx
206 return srcfn($vsn,".dsc");
209 sub changespat ($;$) {
210 my ($vsn, $arch) = @_;
211 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
214 sub upstreamversion ($) {
226 return unless forkcheck_mainprocess();
227 foreach my $f (@end) {
229 print STDERR "$us: cleanup: $@" if length $@;
233 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
235 sub forceable_fail ($$) {
236 my ($forceoptsl, $msg) = @_;
237 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
238 print STDERR "warning: overriding problem due to --force:\n". $msg;
242 my ($forceoptsl) = @_;
243 my @got = grep { $forceopts{$_} } @$forceoptsl;
244 return 0 unless @got;
246 "warning: skipping checks or functionality due to --force-$got[0]\n";
249 sub no_such_package () {
250 print STDERR "$us: package $package does not exist in suite $isuite\n";
254 sub deliberately ($) {
256 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
259 sub deliberately_not_fast_forward () {
260 foreach (qw(not-fast-forward fresh-repo)) {
261 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
265 sub quiltmode_splitbrain () {
266 $quilt_mode =~ m/gbp|dpm|unapplied/;
269 sub opts_opt_multi_cmd {
271 push @cmd, split /\s+/, shift @_;
277 return opts_opt_multi_cmd @gbp_pq;
280 #---------- remote protocol support, common ----------
282 # remote push initiator/responder protocol:
283 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
284 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
285 # < dgit-remote-push-ready <actual-proto-vsn>
292 # > supplementary-message NBYTES # $protovsn >= 3
297 # > file parsed-changelog
298 # [indicates that output of dpkg-parsechangelog follows]
299 # > data-block NBYTES
300 # > [NBYTES bytes of data (no newline)]
301 # [maybe some more blocks]
310 # > param head DGIT-VIEW-HEAD
311 # > param csuite SUITE
312 # > param tagformat old|new
313 # > param maint-view MAINT-VIEW-HEAD
315 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
316 # > file buildinfo # for buildinfos to sign
318 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
319 # # goes into tag, for replay prevention
322 # [indicates that signed tag is wanted]
323 # < data-block NBYTES
324 # < [NBYTES bytes of data (no newline)]
325 # [maybe some more blocks]
329 # > want signed-dsc-changes
330 # < data-block NBYTES [transfer of signed dsc]
332 # < data-block NBYTES [transfer of signed changes]
334 # < data-block NBYTES [transfer of each signed buildinfo
335 # [etc] same number and order as "file buildinfo"]
343 sub i_child_report () {
344 # Sees if our child has died, and reap it if so. Returns a string
345 # describing how it died if it failed, or undef otherwise.
346 return undef unless $i_child_pid;
347 my $got = waitpid $i_child_pid, WNOHANG;
348 return undef if $got <= 0;
349 die unless $got == $i_child_pid;
350 $i_child_pid = undef;
351 return undef unless $?;
352 return "build host child ".waitstatusmsg();
357 fail "connection lost: $!" if $fh->error;
358 fail "protocol violation; $m not expected";
361 sub badproto_badread ($$) {
363 fail "connection lost: $!" if $!;
364 my $report = i_child_report();
365 fail $report if defined $report;
366 badproto $fh, "eof (reading $wh)";
369 sub protocol_expect (&$) {
370 my ($match, $fh) = @_;
373 defined && chomp or badproto_badread $fh, "protocol message";
381 badproto $fh, "\`$_'";
384 sub protocol_send_file ($$) {
385 my ($fh, $ourfn) = @_;
386 open PF, "<", $ourfn or die "$ourfn: $!";
389 my $got = read PF, $d, 65536;
390 die "$ourfn: $!" unless defined $got;
392 print $fh "data-block ".length($d)."\n" or die $!;
393 print $fh $d or die $!;
395 PF->error and die "$ourfn $!";
396 print $fh "data-end\n" or die $!;
400 sub protocol_read_bytes ($$) {
401 my ($fh, $nbytes) = @_;
402 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
404 my $got = read $fh, $d, $nbytes;
405 $got==$nbytes or badproto_badread $fh, "data block";
409 sub protocol_receive_file ($$) {
410 my ($fh, $ourfn) = @_;
411 printdebug "() $ourfn\n";
412 open PF, ">", $ourfn or die "$ourfn: $!";
414 my ($y,$l) = protocol_expect {
415 m/^data-block (.*)$/ ? (1,$1) :
416 m/^data-end$/ ? (0,) :
420 my $d = protocol_read_bytes $fh, $l;
421 print PF $d or die $!;
426 #---------- remote protocol support, responder ----------
428 sub responder_send_command ($) {
430 return unless $we_are_responder;
431 # called even without $we_are_responder
432 printdebug ">> $command\n";
433 print PO $command, "\n" or die $!;
436 sub responder_send_file ($$) {
437 my ($keyword, $ourfn) = @_;
438 return unless $we_are_responder;
439 printdebug "]] $keyword $ourfn\n";
440 responder_send_command "file $keyword";
441 protocol_send_file \*PO, $ourfn;
444 sub responder_receive_files ($@) {
445 my ($keyword, @ourfns) = @_;
446 die unless $we_are_responder;
447 printdebug "[[ $keyword @ourfns\n";
448 responder_send_command "want $keyword";
449 foreach my $fn (@ourfns) {
450 protocol_receive_file \*PI, $fn;
453 protocol_expect { m/^files-end$/ } \*PI;
456 #---------- remote protocol support, initiator ----------
458 sub initiator_expect (&) {
460 protocol_expect { &$match } \*RO;
463 #---------- end remote code ----------
466 if ($we_are_responder) {
468 responder_send_command "progress ".length($m) or die $!;
469 print PO $m or die $!;
479 $ua = LWP::UserAgent->new();
483 progress "downloading $what...";
484 my $r = $ua->get(@_) or die $!;
485 return undef if $r->code == 404;
486 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
487 return $r->decoded_content(charset => 'none');
490 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
492 sub act_local () { return $dryrun_level <= 1; }
493 sub act_scary () { return !$dryrun_level; }
496 if (!$dryrun_level) {
497 progress "$us ok: @_";
499 progress "would be ok: @_ (but dry run only)";
504 printcmd(\*STDERR,$debugprefix."#",@_);
507 sub runcmd_ordryrun {
515 sub runcmd_ordryrun_local {
524 my ($first_shell, @cmd) = @_;
525 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
528 our $helpmsg = <<END;
530 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
531 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
532 dgit [dgit-opts] build [dpkg-buildpackage-opts]
533 dgit [dgit-opts] sbuild [sbuild-opts]
534 dgit [dgit-opts] push [dgit-opts] [suite]
535 dgit [dgit-opts] rpush build-host:build-dir ...
536 important dgit options:
537 -k<keyid> sign tag and package with <keyid> instead of default
538 --dry-run -n do not change anything, but go through the motions
539 --damp-run -L like --dry-run but make local changes, without signing
540 --new -N allow introducing a new package
541 --debug -D increase debug level
542 -c<name>=<value> set git config option (used directly by dgit too)
545 our $later_warning_msg = <<END;
546 Perhaps the upload is stuck in incoming. Using the version from git.
550 print STDERR "$us: @_\n", $helpmsg or die $!;
555 @ARGV or badusage "too few arguments";
556 return scalar shift @ARGV;
563 print $helpmsg or die $!;
567 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
569 our %defcfg = ('dgit.default.distro' => 'debian',
570 'dgit.default.default-suite' => 'unstable',
571 'dgit.default.old-dsc-distro' => 'debian',
572 'dgit-suite.*-security.distro' => 'debian-security',
573 'dgit.default.username' => '',
574 'dgit.default.archive-query-default-component' => 'main',
575 'dgit.default.ssh' => 'ssh',
576 'dgit.default.archive-query' => 'madison:',
577 'dgit.default.sshpsql-dbname' => 'service=projectb',
578 'dgit.default.aptget-components' => 'main',
579 'dgit.default.dgit-tag-format' => 'new,old,maint',
580 'dgit.dsc-url-proto-ok.http' => 'true',
581 'dgit.dsc-url-proto-ok.https' => 'true',
582 'dgit.dsc-url-proto-ok.git' => 'true',
583 'dgit.default.dsc-url-proto-ok' => 'false',
584 # old means "repo server accepts pushes with old dgit tags"
585 # new means "repo server accepts pushes with new dgit tags"
586 # maint means "repo server accepts split brain pushes"
587 # hist means "repo server may have old pushes without new tag"
588 # ("hist" is implied by "old")
589 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
590 'dgit-distro.debian.git-check' => 'url',
591 'dgit-distro.debian.git-check-suffix' => '/info/refs',
592 'dgit-distro.debian.new-private-pushers' => 't',
593 'dgit-distro.debian/push.git-url' => '',
594 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
595 'dgit-distro.debian/push.git-user-force' => 'dgit',
596 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
597 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
598 'dgit-distro.debian/push.git-create' => 'true',
599 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
600 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
601 # 'dgit-distro.debian.archive-query-tls-key',
602 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
603 # ^ this does not work because curl is broken nowadays
604 # Fixing #790093 properly will involve providing providing the key
605 # in some pacagke and maybe updating these paths.
607 # 'dgit-distro.debian.archive-query-tls-curl-args',
608 # '--ca-path=/etc/ssl/ca-debian',
609 # ^ this is a workaround but works (only) on DSA-administered machines
610 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
611 'dgit-distro.debian.git-url-suffix' => '',
612 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
613 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
614 'dgit-distro.debian-security.archive-query' => 'aptget:',
615 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
616 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
617 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
618 'dgit-distro.debian-security.nominal-distro' => 'debian',
619 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
620 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
621 'dgit-distro.ubuntu.git-check' => 'false',
622 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
623 'dgit-distro.test-dummy.ssh' => "$td/ssh",
624 'dgit-distro.test-dummy.username' => "alice",
625 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
626 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
627 'dgit-distro.test-dummy.git-url' => "$td/git",
628 'dgit-distro.test-dummy.git-host' => "git",
629 'dgit-distro.test-dummy.git-path' => "$td/git",
630 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
631 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
632 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
633 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
637 our @gitcfgsources = qw(cmdline local global system);
639 sub git_slurp_config () {
640 # This algoritm is a bit subtle, but this is needed so that for
641 # options which we want to be single-valued, we allow the
642 # different config sources to override properly. See #835858.
643 foreach my $src (@gitcfgsources) {
644 next if $src eq 'cmdline';
645 # we do this ourselves since git doesn't handle it
647 $gitcfgs{$src} = git_slurp_config_src $src;
651 sub git_get_config ($) {
653 foreach my $src (@gitcfgsources) {
654 my $l = $gitcfgs{$src}{$c};
655 confess "internal error ($l $c)" if $l && !ref $l;
656 printdebug"C $c ".(defined $l ?
657 join " ", map { messagequote "'$_'" } @$l :
661 @$l==1 or badcfg "multiple values for $c".
662 " (in $src git config)" if @$l > 1;
670 return undef if $c =~ /RETURN-UNDEF/;
671 printdebug "C? $c\n" if $debuglevel >= 5;
672 my $v = git_get_config($c);
673 return $v if defined $v;
674 my $dv = $defcfg{$c};
676 printdebug "CD $c $dv\n" if $debuglevel >= 4;
680 badcfg "need value for one of: @_\n".
681 "$us: distro or suite appears not to be (properly) supported";
684 sub no_local_git_cfg () {
685 # needs to be called from pre_*
686 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
689 sub access_basedistro__noalias () {
690 if (defined $idistro) {
693 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
694 return $def if defined $def;
695 foreach my $src (@gitcfgsources, 'internal') {
696 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
698 foreach my $k (keys %$kl) {
699 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
701 next unless match_glob $dpat, $isuite;
705 return cfg("dgit.default.distro");
709 sub access_basedistro () {
710 my $noalias = access_basedistro__noalias();
711 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
712 return $canon // $noalias;
715 sub access_nomdistro () {
716 my $base = access_basedistro();
717 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
718 $r =~ m/^$distro_re$/ or badcfg
719 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
723 sub access_quirk () {
724 # returns (quirk name, distro to use instead or undef, quirk-specific info)
725 my $basedistro = access_basedistro();
726 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
728 if (defined $backports_quirk) {
729 my $re = $backports_quirk;
730 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
732 $re =~ s/\%/([-0-9a-z_]+)/
733 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
734 if ($isuite =~ m/^$re$/) {
735 return ('backports',"$basedistro-backports",$1);
738 return ('none',undef);
743 sub parse_cfg_bool ($$$) {
744 my ($what,$def,$v) = @_;
747 $v =~ m/^[ty1]/ ? 1 :
748 $v =~ m/^[fn0]/ ? 0 :
749 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
752 sub access_forpush_config () {
753 my $d = access_basedistro();
757 parse_cfg_bool('new-private-pushers', 0,
758 cfg("dgit-distro.$d.new-private-pushers",
761 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
764 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
765 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
766 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
767 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
770 sub access_forpush () {
771 $access_forpush //= access_forpush_config();
772 return $access_forpush;
776 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
777 badcfg "pushing but distro is configured readonly"
778 if access_forpush_config() eq '0';
780 $supplementary_message = <<'END' unless $we_are_responder;
781 Push failed, before we got started.
782 You can retry the push, after fixing the problem, if you like.
784 parseopts_late_defaults();
788 parseopts_late_defaults();
791 sub supplementary_message ($) {
793 if (!$we_are_responder) {
794 $supplementary_message = $msg;
796 } elsif ($protovsn >= 3) {
797 responder_send_command "supplementary-message ".length($msg)
799 print PO $msg or die $!;
803 sub access_distros () {
804 # Returns list of distros to try, in order
807 # 0. `instead of' distro name(s) we have been pointed to
808 # 1. the access_quirk distro, if any
809 # 2a. the user's specified distro, or failing that } basedistro
810 # 2b. the distro calculated from the suite }
811 my @l = access_basedistro();
813 my (undef,$quirkdistro) = access_quirk();
814 unshift @l, $quirkdistro;
815 unshift @l, $instead_distro;
816 @l = grep { defined } @l;
818 push @l, access_nomdistro();
820 if (access_forpush()) {
821 @l = map { ("$_/push", $_) } @l;
826 sub access_cfg_cfgs (@) {
829 # The nesting of these loops determines the search order. We put
830 # the key loop on the outside so that we search all the distros
831 # for each key, before going on to the next key. That means that
832 # if access_cfg is called with a more specific, and then a less
833 # specific, key, an earlier distro can override the less specific
834 # without necessarily overriding any more specific keys. (If the
835 # distro wants to override the more specific keys it can simply do
836 # so; whereas if we did the loop the other way around, it would be
837 # impossible to for an earlier distro to override a less specific
838 # key but not the more specific ones without restating the unknown
839 # values of the more specific keys.
842 # We have to deal with RETURN-UNDEF specially, so that we don't
843 # terminate the search prematurely.
845 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
848 foreach my $d (access_distros()) {
849 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
851 push @cfgs, map { "dgit.default.$_" } @realkeys;
858 my (@cfgs) = access_cfg_cfgs(@keys);
859 my $value = cfg(@cfgs);
863 sub access_cfg_bool ($$) {
864 my ($def, @keys) = @_;
865 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
868 sub string_to_ssh ($) {
870 if ($spec =~ m/\s/) {
871 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
877 sub access_cfg_ssh () {
878 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
879 if (!defined $gitssh) {
882 return string_to_ssh $gitssh;
886 sub access_runeinfo ($) {
888 return ": dgit ".access_basedistro()." $info ;";
891 sub access_someuserhost ($) {
893 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
894 defined($user) && length($user) or
895 $user = access_cfg("$some-user",'username');
896 my $host = access_cfg("$some-host");
897 return length($user) ? "$user\@$host" : $host;
900 sub access_gituserhost () {
901 return access_someuserhost('git');
904 sub access_giturl (;$) {
906 my $url = access_cfg('git-url','RETURN-UNDEF');
909 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
910 return undef unless defined $proto;
913 access_gituserhost().
914 access_cfg('git-path');
916 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
919 return "$url/$package$suffix";
922 sub parsecontrolfh ($$;$) {
923 my ($fh, $desc, $allowsigned) = @_;
924 our $dpkgcontrolhash_noissigned;
927 my %opts = ('name' => $desc);
928 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
929 $c = Dpkg::Control::Hash->new(%opts);
930 $c->parse($fh,$desc) or die "parsing of $desc failed";
931 last if $allowsigned;
932 last if $dpkgcontrolhash_noissigned;
933 my $issigned= $c->get_option('is_pgp_signed');
934 if (!defined $issigned) {
935 $dpkgcontrolhash_noissigned= 1;
936 seek $fh, 0,0 or die "seek $desc: $!";
937 } elsif ($issigned) {
938 fail "control file $desc is (already) PGP-signed. ".
939 " Note that dgit push needs to modify the .dsc and then".
940 " do the signature itself";
949 my ($file, $desc, $allowsigned) = @_;
950 my $fh = new IO::Handle;
951 open $fh, '<', $file or die "$file: $!";
952 my $c = parsecontrolfh($fh,$desc,$allowsigned);
953 $fh->error and die $!;
959 my ($dctrl,$field) = @_;
960 my $v = $dctrl->{$field};
961 return $v if defined $v;
962 fail "missing field $field in ".$dctrl->get_option('name');
966 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
967 my $p = new IO::Handle;
968 my @cmd = (qw(dpkg-parsechangelog), @_);
969 open $p, '-|', @cmd or die $!;
971 $?=0; $!=0; close $p or failedcmd @cmd;
975 sub commit_getclogp ($) {
976 # Returns the parsed changelog hashref for a particular commit
978 our %commit_getclogp_memo;
979 my $memo = $commit_getclogp_memo{$objid};
980 return $memo if $memo;
982 my $mclog = ".git/dgit/clog-$objid";
983 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
984 "$objid:debian/changelog";
985 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
988 sub parse_dscdata () {
989 my $dscfh = new IO::File \$dscdata, '<' or die $!;
990 printdebug Dumper($dscdata) if $debuglevel>1;
991 $dsc = parsecontrolfh($dscfh,$dscurl,1);
992 printdebug Dumper($dsc) if $debuglevel>1;
997 sub archive_query ($;@) {
998 my ($method) = shift @_;
999 fail "this operation does not support multiple comma-separated suites"
1001 my $query = access_cfg('archive-query','RETURN-UNDEF');
1002 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1005 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1008 sub archive_query_prepend_mirror {
1009 my $m = access_cfg('mirror');
1010 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1013 sub pool_dsc_subpath ($$) {
1014 my ($vsn,$component) = @_; # $package is implict arg
1015 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1016 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1019 sub cfg_apply_map ($$$) {
1020 my ($varref, $what, $mapspec) = @_;
1021 return unless $mapspec;
1023 printdebug "config $what EVAL{ $mapspec; }\n";
1025 eval "package Dgit::Config; $mapspec;";
1030 #---------- `ftpmasterapi' archive query method (nascent) ----------
1032 sub archive_api_query_cmd ($) {
1034 my @cmd = (@curl, qw(-sS));
1035 my $url = access_cfg('archive-query-url');
1036 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1038 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1039 foreach my $key (split /\:/, $keys) {
1040 $key =~ s/\%HOST\%/$host/g;
1042 fail "for $url: stat $key: $!" unless $!==ENOENT;
1045 fail "config requested specific TLS key but do not know".
1046 " how to get curl to use exactly that EE key ($key)";
1047 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1048 # # Sadly the above line does not work because of changes
1049 # # to gnutls. The real fix for #790093 may involve
1050 # # new curl options.
1053 # Fixing #790093 properly will involve providing a value
1054 # for this on clients.
1055 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1056 push @cmd, split / /, $kargs if defined $kargs;
1058 push @cmd, $url.$subpath;
1062 sub api_query ($$;$) {
1064 my ($data, $subpath, $ok404) = @_;
1065 badcfg "ftpmasterapi archive query method takes no data part"
1067 my @cmd = archive_api_query_cmd($subpath);
1068 my $url = $cmd[$#cmd];
1069 push @cmd, qw(-w %{http_code});
1070 my $json = cmdoutput @cmd;
1071 unless ($json =~ s/\d+\d+\d$//) {
1072 failedcmd_report_cmd undef, @cmd;
1073 fail "curl failed to print 3-digit HTTP code";
1076 return undef if $code eq '404' && $ok404;
1077 fail "fetch of $url gave HTTP code $code"
1078 unless $url =~ m#^file://# or $code =~ m/^2/;
1079 return decode_json($json);
1082 sub canonicalise_suite_ftpmasterapi {
1083 my ($proto,$data) = @_;
1084 my $suites = api_query($data, 'suites');
1086 foreach my $entry (@$suites) {
1088 my $v = $entry->{$_};
1089 defined $v && $v eq $isuite;
1090 } qw(codename name);
1091 push @matched, $entry;
1093 fail "unknown suite $isuite" unless @matched;
1096 @matched==1 or die "multiple matches for suite $isuite\n";
1097 $cn = "$matched[0]{codename}";
1098 defined $cn or die "suite $isuite info has no codename\n";
1099 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1101 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1106 sub archive_query_ftpmasterapi {
1107 my ($proto,$data) = @_;
1108 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1110 my $digester = Digest::SHA->new(256);
1111 foreach my $entry (@$info) {
1113 my $vsn = "$entry->{version}";
1114 my ($ok,$msg) = version_check $vsn;
1115 die "bad version: $msg\n" unless $ok;
1116 my $component = "$entry->{component}";
1117 $component =~ m/^$component_re$/ or die "bad component";
1118 my $filename = "$entry->{filename}";
1119 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1120 or die "bad filename";
1121 my $sha256sum = "$entry->{sha256sum}";
1122 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1123 push @rows, [ $vsn, "/pool/$component/$filename",
1124 $digester, $sha256sum ];
1126 die "bad ftpmaster api response: $@\n".Dumper($entry)
1129 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1130 return archive_query_prepend_mirror @rows;
1133 sub file_in_archive_ftpmasterapi {
1134 my ($proto,$data,$filename) = @_;
1135 my $pat = $filename;
1138 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1139 my $info = api_query($data, "file_in_archive/$pat", 1);
1142 #---------- `aptget' archive query method ----------
1145 our $aptget_releasefile;
1146 our $aptget_configpath;
1148 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1149 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1151 sub aptget_cache_clean {
1152 runcmd_ordryrun_local qw(sh -ec),
1153 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1157 sub aptget_lock_acquire () {
1158 my $lockfile = "$aptget_base/lock";
1159 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1160 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1163 sub aptget_prep ($) {
1165 return if defined $aptget_base;
1167 badcfg "aptget archive query method takes no data part"
1170 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1173 ensuredir "$cache/dgit";
1175 access_cfg('aptget-cachekey','RETURN-UNDEF')
1176 // access_nomdistro();
1178 $aptget_base = "$cache/dgit/aptget";
1179 ensuredir $aptget_base;
1181 my $quoted_base = $aptget_base;
1182 die "$quoted_base contains bad chars, cannot continue"
1183 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1185 ensuredir $aptget_base;
1187 aptget_lock_acquire();
1189 aptget_cache_clean();
1191 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1192 my $sourceslist = "source.list#$cachekey";
1194 my $aptsuites = $isuite;
1195 cfg_apply_map(\$aptsuites, 'suite map',
1196 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1198 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1199 printf SRCS "deb-src %s %s %s\n",
1200 access_cfg('mirror'),
1202 access_cfg('aptget-components')
1205 ensuredir "$aptget_base/cache";
1206 ensuredir "$aptget_base/lists";
1208 open CONF, ">", $aptget_configpath or die $!;
1210 Debug::NoLocking "true";
1211 APT::Get::List-Cleanup "false";
1212 #clear APT::Update::Post-Invoke-Success;
1213 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1214 Dir::State::Lists "$quoted_base/lists";
1215 Dir::Etc::preferences "$quoted_base/preferences";
1216 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1217 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1220 foreach my $key (qw(
1223 Dir::Cache::Archives
1224 Dir::Etc::SourceParts
1225 Dir::Etc::preferencesparts
1227 ensuredir "$aptget_base/$key";
1228 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1231 my $oldatime = (time // die $!) - 1;
1232 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1233 next unless stat_exists $oldlist;
1234 my ($mtime) = (stat _)[9];
1235 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1238 runcmd_ordryrun_local aptget_aptget(), qw(update);
1241 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1242 next unless stat_exists $oldlist;
1243 my ($atime) = (stat _)[8];
1244 next if $atime == $oldatime;
1245 push @releasefiles, $oldlist;
1247 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1248 @releasefiles = @inreleasefiles if @inreleasefiles;
1249 die "apt updated wrong number of Release files (@releasefiles), erk"
1250 unless @releasefiles == 1;
1252 ($aptget_releasefile) = @releasefiles;
1255 sub canonicalise_suite_aptget {
1256 my ($proto,$data) = @_;
1259 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1261 foreach my $name (qw(Codename Suite)) {
1262 my $val = $release->{$name};
1264 printdebug "release file $name: $val\n";
1265 $val =~ m/^$suite_re$/o or fail
1266 "Release file ($aptget_releasefile) specifies intolerable $name";
1267 cfg_apply_map(\$val, 'suite rmap',
1268 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1275 sub archive_query_aptget {
1276 my ($proto,$data) = @_;
1279 ensuredir "$aptget_base/source";
1280 foreach my $old (<$aptget_base/source/*.dsc>) {
1281 unlink $old or die "$old: $!";
1284 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1285 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1286 # avoids apt-get source failing with ambiguous error code
1288 runcmd_ordryrun_local
1289 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1290 aptget_aptget(), qw(--download-only --only-source source), $package;
1292 my @dscs = <$aptget_base/source/*.dsc>;
1293 fail "apt-get source did not produce a .dsc" unless @dscs;
1294 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1296 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1299 my $uri = "file://". uri_escape $dscs[0];
1300 $uri =~ s{\%2f}{/}gi;
1301 return [ (getfield $pre_dsc, 'Version'), $uri ];
1304 sub file_in_archive_aptget () { return undef; }
1306 #---------- `dummyapicat' archive query method ----------
1308 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1309 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1311 sub file_in_archive_dummycatapi ($$$) {
1312 my ($proto,$data,$filename) = @_;
1313 my $mirror = access_cfg('mirror');
1314 $mirror =~ s#^file://#/# or die "$mirror ?";
1316 my @cmd = (qw(sh -ec), '
1318 find -name "$2" -print0 |
1320 ', qw(x), $mirror, $filename);
1321 debugcmd "-|", @cmd;
1322 open FIA, "-|", @cmd or die $!;
1325 printdebug "| $_\n";
1326 m/^(\w+) (\S+)$/ or die "$_ ?";
1327 push @out, { sha256sum => $1, filename => $2 };
1329 close FIA or die failedcmd @cmd;
1333 #---------- `madison' archive query method ----------
1335 sub archive_query_madison {
1336 return archive_query_prepend_mirror
1337 map { [ @$_[0..1] ] } madison_get_parse(@_);
1340 sub madison_get_parse {
1341 my ($proto,$data) = @_;
1342 die unless $proto eq 'madison';
1343 if (!length $data) {
1344 $data= access_cfg('madison-distro','RETURN-UNDEF');
1345 $data //= access_basedistro();
1347 $rmad{$proto,$data,$package} ||= cmdoutput
1348 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1349 my $rmad = $rmad{$proto,$data,$package};
1352 foreach my $l (split /\n/, $rmad) {
1353 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1354 \s*( [^ \t|]+ )\s* \|
1355 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1356 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1357 $1 eq $package or die "$rmad $package ?";
1364 $component = access_cfg('archive-query-default-component');
1366 $5 eq 'source' or die "$rmad ?";
1367 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1369 return sort { -version_compare($a->[0],$b->[0]); } @out;
1372 sub canonicalise_suite_madison {
1373 # madison canonicalises for us
1374 my @r = madison_get_parse(@_);
1376 "unable to canonicalise suite using package $package".
1377 " which does not appear to exist in suite $isuite;".
1378 " --existing-package may help";
1382 sub file_in_archive_madison { return undef; }
1384 #---------- `sshpsql' archive query method ----------
1387 my ($data,$runeinfo,$sql) = @_;
1388 if (!length $data) {
1389 $data= access_someuserhost('sshpsql').':'.
1390 access_cfg('sshpsql-dbname');
1392 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1393 my ($userhost,$dbname) = ($`,$'); #';
1395 my @cmd = (access_cfg_ssh, $userhost,
1396 access_runeinfo("ssh-psql $runeinfo").
1397 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1398 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1400 open P, "-|", @cmd or die $!;
1403 printdebug(">|$_|\n");
1406 $!=0; $?=0; close P or failedcmd @cmd;
1408 my $nrows = pop @rows;
1409 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1410 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1411 @rows = map { [ split /\|/, $_ ] } @rows;
1412 my $ncols = scalar @{ shift @rows };
1413 die if grep { scalar @$_ != $ncols } @rows;
1417 sub sql_injection_check {
1418 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1421 sub archive_query_sshpsql ($$) {
1422 my ($proto,$data) = @_;
1423 sql_injection_check $isuite, $package;
1424 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1425 SELECT source.version, component.name, files.filename, files.sha256sum
1427 JOIN src_associations ON source.id = src_associations.source
1428 JOIN suite ON suite.id = src_associations.suite
1429 JOIN dsc_files ON dsc_files.source = source.id
1430 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1431 JOIN component ON component.id = files_archive_map.component_id
1432 JOIN files ON files.id = dsc_files.file
1433 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1434 AND source.source='$package'
1435 AND files.filename LIKE '%.dsc';
1437 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1438 my $digester = Digest::SHA->new(256);
1440 my ($vsn,$component,$filename,$sha256sum) = @$_;
1441 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1443 return archive_query_prepend_mirror @rows;
1446 sub canonicalise_suite_sshpsql ($$) {
1447 my ($proto,$data) = @_;
1448 sql_injection_check $isuite;
1449 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1450 SELECT suite.codename
1451 FROM suite where suite_name='$isuite' or codename='$isuite';
1453 @rows = map { $_->[0] } @rows;
1454 fail "unknown suite $isuite" unless @rows;
1455 die "ambiguous $isuite: @rows ?" if @rows>1;
1459 sub file_in_archive_sshpsql ($$$) { return undef; }
1461 #---------- `dummycat' archive query method ----------
1463 sub canonicalise_suite_dummycat ($$) {
1464 my ($proto,$data) = @_;
1465 my $dpath = "$data/suite.$isuite";
1466 if (!open C, "<", $dpath) {
1467 $!==ENOENT or die "$dpath: $!";
1468 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1472 chomp or die "$dpath: $!";
1474 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1478 sub archive_query_dummycat ($$) {
1479 my ($proto,$data) = @_;
1480 canonicalise_suite();
1481 my $dpath = "$data/package.$csuite.$package";
1482 if (!open C, "<", $dpath) {
1483 $!==ENOENT or die "$dpath: $!";
1484 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1492 printdebug "dummycat query $csuite $package $dpath | $_\n";
1493 my @row = split /\s+/, $_;
1494 @row==2 or die "$dpath: $_ ?";
1497 C->error and die "$dpath: $!";
1499 return archive_query_prepend_mirror
1500 sort { -version_compare($a->[0],$b->[0]); } @rows;
1503 sub file_in_archive_dummycat () { return undef; }
1505 #---------- tag format handling ----------
1507 sub access_cfg_tagformats () {
1508 split /\,/, access_cfg('dgit-tag-format');
1511 sub access_cfg_tagformats_can_splitbrain () {
1512 my %y = map { $_ => 1 } access_cfg_tagformats;
1513 foreach my $needtf (qw(new maint)) {
1514 next if $y{$needtf};
1520 sub need_tagformat ($$) {
1521 my ($fmt, $why) = @_;
1522 fail "need to use tag format $fmt ($why) but also need".
1523 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1524 " - no way to proceed"
1525 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1526 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1529 sub select_tagformat () {
1531 return if $tagformatfn && !$tagformat_want;
1532 die 'bug' if $tagformatfn && $tagformat_want;
1533 # ... $tagformat_want assigned after previous select_tagformat
1535 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1536 printdebug "select_tagformat supported @supported\n";
1538 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1539 printdebug "select_tagformat specified @$tagformat_want\n";
1541 my ($fmt,$why,$override) = @$tagformat_want;
1543 fail "target distro supports tag formats @supported".
1544 " but have to use $fmt ($why)"
1546 or grep { $_ eq $fmt } @supported;
1548 $tagformat_want = undef;
1550 $tagformatfn = ${*::}{"debiantag_$fmt"};
1552 fail "trying to use unknown tag format \`$fmt' ($why) !"
1553 unless $tagformatfn;
1556 #---------- archive query entrypoints and rest of program ----------
1558 sub canonicalise_suite () {
1559 return if defined $csuite;
1560 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1561 $csuite = archive_query('canonicalise_suite');
1562 if ($isuite ne $csuite) {
1563 progress "canonical suite name for $isuite is $csuite";
1565 progress "canonical suite name is $csuite";
1569 sub get_archive_dsc () {
1570 canonicalise_suite();
1571 my @vsns = archive_query('archive_query');
1572 foreach my $vinfo (@vsns) {
1573 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1574 $dscurl = $vsn_dscurl;
1575 $dscdata = url_get($dscurl);
1577 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1582 $digester->add($dscdata);
1583 my $got = $digester->hexdigest();
1585 fail "$dscurl has hash $got but".
1586 " archive told us to expect $digest";
1589 my $fmt = getfield $dsc, 'Format';
1590 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1591 "unsupported source format $fmt, sorry";
1593 $dsc_checked = !!$digester;
1594 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1598 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1601 sub check_for_git ();
1602 sub check_for_git () {
1604 my $how = access_cfg('git-check');
1605 if ($how eq 'ssh-cmd') {
1607 (access_cfg_ssh, access_gituserhost(),
1608 access_runeinfo("git-check $package").
1609 " set -e; cd ".access_cfg('git-path').";".
1610 " if test -d $package.git; then echo 1; else echo 0; fi");
1611 my $r= cmdoutput @cmd;
1612 if (defined $r and $r =~ m/^divert (\w+)$/) {
1614 my ($usedistro,) = access_distros();
1615 # NB that if we are pushing, $usedistro will be $distro/push
1616 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1617 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1618 progress "diverting to $divert (using config for $instead_distro)";
1619 return check_for_git();
1621 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1623 } elsif ($how eq 'url') {
1624 my $prefix = access_cfg('git-check-url','git-url');
1625 my $suffix = access_cfg('git-check-suffix','git-suffix',
1626 'RETURN-UNDEF') // '.git';
1627 my $url = "$prefix/$package$suffix";
1628 my @cmd = (@curl, qw(-sS -I), $url);
1629 my $result = cmdoutput @cmd;
1630 $result =~ s/^\S+ 200 .*\n\r?\n//;
1631 # curl -sS -I with https_proxy prints
1632 # HTTP/1.0 200 Connection established
1633 $result =~ m/^\S+ (404|200) /s or
1634 fail "unexpected results from git check query - ".
1635 Dumper($prefix, $result);
1637 if ($code eq '404') {
1639 } elsif ($code eq '200') {
1644 } elsif ($how eq 'true') {
1646 } elsif ($how eq 'false') {
1649 badcfg "unknown git-check \`$how'";
1653 sub create_remote_git_repo () {
1654 my $how = access_cfg('git-create');
1655 if ($how eq 'ssh-cmd') {
1657 (access_cfg_ssh, access_gituserhost(),
1658 access_runeinfo("git-create $package").
1659 "set -e; cd ".access_cfg('git-path').";".
1660 " cp -a _template $package.git");
1661 } elsif ($how eq 'true') {
1664 badcfg "unknown git-create \`$how'";
1668 our ($dsc_hash,$lastpush_mergeinput);
1669 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1671 our $ud = '.git/dgit/unpack';
1680 sub mktree_in_ud_here () {
1681 playtree_setup $gitcfgs{local};
1684 sub git_write_tree () {
1685 my $tree = cmdoutput @git, qw(write-tree);
1686 $tree =~ m/^\w+$/ or die "$tree ?";
1690 sub git_add_write_tree () {
1691 runcmd @git, qw(add -Af .);
1692 return git_write_tree();
1695 sub remove_stray_gits ($) {
1697 my @gitscmd = qw(find -name .git -prune -print0);
1698 debugcmd "|",@gitscmd;
1699 open GITS, "-|", @gitscmd or die $!;
1704 print STDERR "$us: warning: removing from $what: ",
1705 (messagequote $_), "\n";
1709 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1712 sub mktree_in_ud_from_only_subdir ($;$) {
1713 my ($what,$raw) = @_;
1715 # changes into the subdir
1717 die "expected one subdir but found @dirs ?" unless @dirs==1;
1718 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1722 remove_stray_gits($what);
1723 mktree_in_ud_here();
1725 my ($format, $fopts) = get_source_format();
1726 if (madformat($format)) {
1731 my $tree=git_add_write_tree();
1732 return ($tree,$dir);
1735 our @files_csum_info_fields =
1736 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1737 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1738 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1740 sub dsc_files_info () {
1741 foreach my $csumi (@files_csum_info_fields) {
1742 my ($fname, $module, $method) = @$csumi;
1743 my $field = $dsc->{$fname};
1744 next unless defined $field;
1745 eval "use $module; 1;" or die $@;
1747 foreach (split /\n/, $field) {
1749 m/^(\w+) (\d+) (\S+)$/ or
1750 fail "could not parse .dsc $fname line \`$_'";
1751 my $digester = eval "$module"."->$method;" or die $@;
1756 Digester => $digester,
1761 fail "missing any supported Checksums-* or Files field in ".
1762 $dsc->get_option('name');
1766 map { $_->{Filename} } dsc_files_info();
1769 sub files_compare_inputs (@) {
1774 my $showinputs = sub {
1775 return join "; ", map { $_->get_option('name') } @$inputs;
1778 foreach my $in (@$inputs) {
1780 my $in_name = $in->get_option('name');
1782 printdebug "files_compare_inputs $in_name\n";
1784 foreach my $csumi (@files_csum_info_fields) {
1785 my ($fname) = @$csumi;
1786 printdebug "files_compare_inputs $in_name $fname\n";
1788 my $field = $in->{$fname};
1789 next unless defined $field;
1792 foreach (split /\n/, $field) {
1795 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1796 fail "could not parse $in_name $fname line \`$_'";
1798 printdebug "files_compare_inputs $in_name $fname $f\n";
1802 my $re = \ $record{$f}{$fname};
1804 $fchecked{$f}{$in_name} = 1;
1806 fail "hash or size of $f varies in $fname fields".
1807 " (between: ".$showinputs->().")";
1812 @files = sort @files;
1813 $expected_files //= \@files;
1814 "@$expected_files" eq "@files" or
1815 fail "file list in $in_name varies between hash fields!";
1818 fail "$in_name has no files list field(s)";
1820 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1823 grep { keys %$_ == @$inputs-1 } values %fchecked
1824 or fail "no file appears in all file lists".
1825 " (looked in: ".$showinputs->().")";
1828 sub is_orig_file_in_dsc ($$) {
1829 my ($f, $dsc_files_info) = @_;
1830 return 0 if @$dsc_files_info <= 1;
1831 # One file means no origs, and the filename doesn't have a "what
1832 # part of dsc" component. (Consider versions ending `.orig'.)
1833 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1837 sub is_orig_file_of_vsn ($$) {
1838 my ($f, $upstreamvsn) = @_;
1839 my $base = srcfn $upstreamvsn, '';
1840 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1844 sub changes_update_origs_from_dsc ($$$$) {
1845 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1847 printdebug "checking origs needed ($upstreamvsn)...\n";
1848 $_ = getfield $changes, 'Files';
1849 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1850 fail "cannot find section/priority from .changes Files field";
1851 my $placementinfo = $1;
1853 printdebug "checking origs needed placement '$placementinfo'...\n";
1854 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1855 $l =~ m/\S+$/ or next;
1857 printdebug "origs $file | $l\n";
1858 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1859 printdebug "origs $file is_orig\n";
1860 my $have = archive_query('file_in_archive', $file);
1861 if (!defined $have) {
1863 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1869 printdebug "origs $file \$#\$have=$#$have\n";
1870 foreach my $h (@$have) {
1873 foreach my $csumi (@files_csum_info_fields) {
1874 my ($fname, $module, $method, $archivefield) = @$csumi;
1875 next unless defined $h->{$archivefield};
1876 $_ = $dsc->{$fname};
1877 next unless defined;
1878 m/^(\w+) .* \Q$file\E$/m or
1879 fail ".dsc $fname missing entry for $file";
1880 if ($h->{$archivefield} eq $1) {
1884 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1887 die "$file ".Dumper($h)." ?!" if $same && @differ;
1890 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1893 printdebug "origs $file f.same=$found_same".
1894 " #f._differ=$#found_differ\n";
1895 if (@found_differ && !$found_same) {
1897 "archive contains $file with different checksum",
1900 # Now we edit the changes file to add or remove it
1901 foreach my $csumi (@files_csum_info_fields) {
1902 my ($fname, $module, $method, $archivefield) = @$csumi;
1903 next unless defined $changes->{$fname};
1905 # in archive, delete from .changes if it's there
1906 $changed{$file} = "removed" if
1907 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1908 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1909 # not in archive, but it's here in the .changes
1911 my $dsc_data = getfield $dsc, $fname;
1912 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1914 $extra =~ s/ \d+ /$&$placementinfo /
1915 or die "$fname $extra >$dsc_data< ?"
1916 if $fname eq 'Files';
1917 $changes->{$fname} .= "\n". $extra;
1918 $changed{$file} = "added";
1923 foreach my $file (keys %changed) {
1925 "edited .changes for archive .orig contents: %s %s",
1926 $changed{$file}, $file;
1928 my $chtmp = "$changesfile.tmp";
1929 $changes->save($chtmp);
1931 rename $chtmp,$changesfile or die "$changesfile $!";
1933 progress "[new .changes left in $changesfile]";
1936 progress "$changesfile already has appropriate .orig(s) (if any)";
1940 sub make_commit ($) {
1942 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1945 sub make_commit_text ($) {
1948 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1950 print Dumper($text) if $debuglevel > 1;
1951 my $child = open2($out, $in, @cmd) or die $!;
1954 print $in $text or die $!;
1955 close $in or die $!;
1957 $h =~ m/^\w+$/ or die;
1959 printdebug "=> $h\n";
1962 waitpid $child, 0 == $child or die "$child $!";
1963 $? and failedcmd @cmd;
1967 sub clogp_authline ($) {
1969 my $author = getfield $clogp, 'Maintainer';
1970 if ($author =~ m/^[^"\@]+\,/) {
1971 # single entry Maintainer field with unquoted comma
1972 $author = ($& =~ y/,//rd).$'; # strip the comma
1974 # git wants a single author; any remaining commas in $author
1975 # are by now preceded by @ (or "). It seems safer to punt on
1976 # "..." for now rather than attempting to dequote or something.
1977 $author =~ s#,.*##ms unless $author =~ m/"/;
1978 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1979 my $authline = "$author $date";
1980 $authline =~ m/$git_authline_re/o or
1981 fail "unexpected commit author line format \`$authline'".
1982 " (was generated from changelog Maintainer field)";
1983 return ($1,$2,$3) if wantarray;
1987 sub vendor_patches_distro ($$) {
1988 my ($checkdistro, $what) = @_;
1989 return unless defined $checkdistro;
1991 my $series = "debian/patches/\L$checkdistro\E.series";
1992 printdebug "checking for vendor-specific $series ($what)\n";
1994 if (!open SERIES, "<", $series) {
1995 die "$series $!" unless $!==ENOENT;
2004 Unfortunately, this source package uses a feature of dpkg-source where
2005 the same source package unpacks to different source code on different
2006 distros. dgit cannot safely operate on such packages on affected
2007 distros, because the meaning of source packages is not stable.
2009 Please ask the distro/maintainer to remove the distro-specific series
2010 files and use a different technique (if necessary, uploading actually
2011 different packages, if different distros are supposed to have
2015 fail "Found active distro-specific series file for".
2016 " $checkdistro ($what): $series, cannot continue";
2018 die "$series $!" if SERIES->error;
2022 sub check_for_vendor_patches () {
2023 # This dpkg-source feature doesn't seem to be documented anywhere!
2024 # But it can be found in the changelog (reformatted):
2026 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2027 # Author: Raphael Hertzog <hertzog@debian.org>
2028 # Date: Sun Oct 3 09:36:48 2010 +0200
2030 # dpkg-source: correctly create .pc/.quilt_series with alternate
2033 # If you have debian/patches/ubuntu.series and you were
2034 # unpacking the source package on ubuntu, quilt was still
2035 # directed to debian/patches/series instead of
2036 # debian/patches/ubuntu.series.
2038 # debian/changelog | 3 +++
2039 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2040 # 2 files changed, 6 insertions(+), 1 deletion(-)
2043 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2044 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2045 "Dpkg::Vendor \`current vendor'");
2046 vendor_patches_distro(access_basedistro(),
2047 "(base) distro being accessed");
2048 vendor_patches_distro(access_nomdistro(),
2049 "(nominal) distro being accessed");
2052 sub generate_commits_from_dsc () {
2053 # See big comment in fetch_from_archive, below.
2054 # See also README.dsc-import.
2058 my @dfi = dsc_files_info();
2059 foreach my $fi (@dfi) {
2060 my $f = $fi->{Filename};
2061 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2062 my $upper_f = "../../../../$f";
2064 printdebug "considering reusing $f: ";
2066 if (link_ltarget "$upper_f,fetch", $f) {
2067 printdebug "linked (using ...,fetch).\n";
2068 } elsif ((printdebug "($!) "),
2070 fail "accessing ../$f,fetch: $!";
2071 } elsif (link_ltarget $upper_f, $f) {
2072 printdebug "linked.\n";
2073 } elsif ((printdebug "($!) "),
2075 fail "accessing ../$f: $!";
2077 printdebug "absent.\n";
2081 complete_file_from_dsc('.', $fi, \$refetched)
2084 printdebug "considering saving $f: ";
2086 if (link $f, $upper_f) {
2087 printdebug "linked.\n";
2088 } elsif ((printdebug "($!) "),
2090 fail "saving ../$f: $!";
2091 } elsif (!$refetched) {
2092 printdebug "no need.\n";
2093 } elsif (link $f, "$upper_f,fetch") {
2094 printdebug "linked (using ...,fetch).\n";
2095 } elsif ((printdebug "($!) "),
2097 fail "saving ../$f,fetch: $!";
2099 printdebug "cannot.\n";
2103 # We unpack and record the orig tarballs first, so that we only
2104 # need disk space for one private copy of the unpacked source.
2105 # But we can't make them into commits until we have the metadata
2106 # from the debian/changelog, so we record the tree objects now and
2107 # make them into commits later.
2109 my $upstreamv = upstreamversion $dsc->{version};
2110 my $orig_f_base = srcfn $upstreamv, '';
2112 foreach my $fi (@dfi) {
2113 # We actually import, and record as a commit, every tarball
2114 # (unless there is only one file, in which case there seems
2117 my $f = $fi->{Filename};
2118 printdebug "import considering $f ";
2119 (printdebug "only one dfi\n"), next if @dfi == 1;
2120 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2121 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2125 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2127 printdebug "Y ", (join ' ', map { $_//"(none)" }
2128 $compr_ext, $orig_f_part
2131 my $input = new IO::File $f, '<' or die "$f $!";
2135 if (defined $compr_ext) {
2137 Dpkg::Compression::compression_guess_from_filename $f;
2138 fail "Dpkg::Compression cannot handle file $f in source package"
2139 if defined $compr_ext && !defined $cname;
2141 new Dpkg::Compression::Process compression => $cname;
2142 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2143 my $compr_fh = new IO::Handle;
2144 my $compr_pid = open $compr_fh, "-|" // die $!;
2146 open STDIN, "<&", $input or die $!;
2148 die "dgit (child): exec $compr_cmd[0]: $!\n";
2153 rmtree "_unpack-tar";
2154 mkdir "_unpack-tar" or die $!;
2155 my @tarcmd = qw(tar -x -f -
2156 --no-same-owner --no-same-permissions
2157 --no-acls --no-xattrs --no-selinux);
2158 my $tar_pid = fork // die $!;
2160 chdir "_unpack-tar" or die $!;
2161 open STDIN, "<&", $input or die $!;
2163 die "dgit (child): exec $tarcmd[0]: $!";
2165 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2166 !$? or failedcmd @tarcmd;
2169 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2171 # finally, we have the results in "tarball", but maybe
2172 # with the wrong permissions
2174 runcmd qw(chmod -R +rwX _unpack-tar);
2175 changedir "_unpack-tar";
2176 remove_stray_gits($f);
2177 mktree_in_ud_here();
2179 my ($tree) = git_add_write_tree();
2180 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2181 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2183 printdebug "one subtree $1\n";
2185 printdebug "multiple subtrees\n";
2188 rmtree "_unpack-tar";
2190 my $ent = [ $f, $tree ];
2192 Orig => !!$orig_f_part,
2193 Sort => (!$orig_f_part ? 2 :
2194 $orig_f_part =~ m/-/g ? 1 :
2202 # put any without "_" first (spec is not clear whether files
2203 # are always in the usual order). Tarballs without "_" are
2204 # the main orig or the debian tarball.
2205 $a->{Sort} <=> $b->{Sort} or
2209 my $any_orig = grep { $_->{Orig} } @tartrees;
2211 my $dscfn = "$package.dsc";
2213 my $treeimporthow = 'package';
2215 open D, ">", $dscfn or die "$dscfn: $!";
2216 print D $dscdata or die "$dscfn: $!";
2217 close D or die "$dscfn: $!";
2218 my @cmd = qw(dpkg-source);
2219 push @cmd, '--no-check' if $dsc_checked;
2220 if (madformat $dsc->{format}) {
2221 push @cmd, '--skip-patches';
2222 $treeimporthow = 'unpatched';
2224 push @cmd, qw(-x --), $dscfn;
2227 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2228 if (madformat $dsc->{format}) {
2229 check_for_vendor_patches();
2233 if (madformat $dsc->{format}) {
2234 my @pcmd = qw(dpkg-source --before-build .);
2235 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2237 $dappliedtree = git_add_write_tree();
2240 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2241 debugcmd "|",@clogcmd;
2242 open CLOGS, "-|", @clogcmd or die $!;
2247 printdebug "import clog search...\n";
2250 my $stanzatext = do { local $/=""; <CLOGS>; };
2251 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2252 last if !defined $stanzatext;
2254 my $desc = "package changelog, entry no.$.";
2255 open my $stanzafh, "<", \$stanzatext or die;
2256 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2257 $clogp //= $thisstanza;
2259 printdebug "import clog $thisstanza->{version} $desc...\n";
2261 last if !$any_orig; # we don't need $r1clogp
2263 # We look for the first (most recent) changelog entry whose
2264 # version number is lower than the upstream version of this
2265 # package. Then the last (least recent) previous changelog
2266 # entry is treated as the one which introduced this upstream
2267 # version and used for the synthetic commits for the upstream
2270 # One might think that a more sophisticated algorithm would be
2271 # necessary. But: we do not want to scan the whole changelog
2272 # file. Stopping when we see an earlier version, which
2273 # necessarily then is an earlier upstream version, is the only
2274 # realistic way to do that. Then, either the earliest
2275 # changelog entry we have seen so far is indeed the earliest
2276 # upload of this upstream version; or there are only changelog
2277 # entries relating to later upstream versions (which is not
2278 # possible unless the changelog and .dsc disagree about the
2279 # version). Then it remains to choose between the physically
2280 # last entry in the file, and the one with the lowest version
2281 # number. If these are not the same, we guess that the
2282 # versions were created in a non-monotic order rather than
2283 # that the changelog entries have been misordered.
2285 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2287 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2288 $r1clogp = $thisstanza;
2290 printdebug "import clog $r1clogp->{version} becomes r1\n";
2292 die $! if CLOGS->error;
2293 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2295 $clogp or fail "package changelog has no entries!";
2297 my $authline = clogp_authline $clogp;
2298 my $changes = getfield $clogp, 'Changes';
2299 $changes =~ s/^\n//; # Changes: \n
2300 my $cversion = getfield $clogp, 'Version';
2303 $r1clogp //= $clogp; # maybe there's only one entry;
2304 my $r1authline = clogp_authline $r1clogp;
2305 # Strictly, r1authline might now be wrong if it's going to be
2306 # unused because !$any_orig. Whatever.
2308 printdebug "import tartrees authline $authline\n";
2309 printdebug "import tartrees r1authline $r1authline\n";
2311 foreach my $tt (@tartrees) {
2312 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2314 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2317 committer $r1authline
2321 [dgit import orig $tt->{F}]
2329 [dgit import tarball $package $cversion $tt->{F}]
2334 printdebug "import main commit\n";
2336 open C, ">../commit.tmp" or die $!;
2337 print C <<END or die $!;
2340 print C <<END or die $! foreach @tartrees;
2343 print C <<END or die $!;
2349 [dgit import $treeimporthow $package $cversion]
2353 my $rawimport_hash = make_commit qw(../commit.tmp);
2355 if (madformat $dsc->{format}) {
2356 printdebug "import apply patches...\n";
2358 # regularise the state of the working tree so that
2359 # the checkout of $rawimport_hash works nicely.
2360 my $dappliedcommit = make_commit_text(<<END);
2367 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2369 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2371 # We need the answers to be reproducible
2372 my @authline = clogp_authline($clogp);
2373 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2374 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2375 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2376 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2377 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2378 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2380 my $path = $ENV{PATH} or die;
2382 foreach my $use_absurd (qw(0 1)) {
2383 runcmd @git, qw(checkout -q unpa);
2384 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2385 local $ENV{PATH} = $path;
2388 progress "warning: $@";
2389 $path = "$absurdity:$path";
2390 progress "$us: trying slow absurd-git-apply...";
2391 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2396 die "forbid absurd git-apply\n" if $use_absurd
2397 && forceing [qw(import-gitapply-no-absurd)];
2398 die "only absurd git-apply!\n" if !$use_absurd
2399 && forceing [qw(import-gitapply-absurd)];
2401 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2402 local $ENV{PATH} = $path if $use_absurd;
2404 my @showcmd = (gbp_pq, qw(import));
2405 my @realcmd = shell_cmd
2406 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2407 debugcmd "+",@realcmd;
2408 if (system @realcmd) {
2409 die +(shellquote @showcmd).
2411 failedcmd_waitstatus()."\n";
2414 my $gapplied = git_rev_parse('HEAD');
2415 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2416 $gappliedtree eq $dappliedtree or
2418 gbp-pq import and dpkg-source disagree!
2419 gbp-pq import gave commit $gapplied
2420 gbp-pq import gave tree $gappliedtree
2421 dpkg-source --before-build gave tree $dappliedtree
2423 $rawimport_hash = $gapplied;
2428 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2433 progress "synthesised git commit from .dsc $cversion";
2435 my $rawimport_mergeinput = {
2436 Commit => $rawimport_hash,
2437 Info => "Import of source package",
2439 my @output = ($rawimport_mergeinput);
2441 if ($lastpush_mergeinput) {
2442 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2443 my $oversion = getfield $oldclogp, 'Version';
2445 version_compare($oversion, $cversion);
2447 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2448 { Message => <<END, ReverseParents => 1 });
2449 Record $package ($cversion) in archive suite $csuite
2451 } elsif ($vcmp > 0) {
2452 print STDERR <<END or die $!;
2454 Version actually in archive: $cversion (older)
2455 Last version pushed with dgit: $oversion (newer or same)
2458 @output = $lastpush_mergeinput;
2460 # Same version. Use what's in the server git branch,
2461 # discarding our own import. (This could happen if the
2462 # server automatically imports all packages into git.)
2463 @output = $lastpush_mergeinput;
2466 changedir '../../../..';
2471 sub complete_file_from_dsc ($$;$) {
2472 our ($dstdir, $fi, $refetched) = @_;
2473 # Ensures that we have, in $dstdir, the file $fi, with the correct
2474 # contents. (Downloading it from alongside $dscurl if necessary.)
2475 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2476 # and will set $$refetched=1 if it did so (or tried to).
2478 my $f = $fi->{Filename};
2479 my $tf = "$dstdir/$f";
2483 my $checkhash = sub {
2484 open F, "<", "$tf" or die "$tf: $!";
2485 $fi->{Digester}->reset();
2486 $fi->{Digester}->addfile(*F);
2487 F->error and die $!;
2488 $got = $fi->{Digester}->hexdigest();
2489 return $got eq $fi->{Hash};
2492 if (stat_exists $tf) {
2493 if ($checkhash->()) {
2494 progress "using existing $f";
2498 fail "file $f has hash $got but .dsc".
2499 " demands hash $fi->{Hash} ".
2500 "(perhaps you should delete this file?)";
2502 progress "need to fetch correct version of $f";
2503 unlink $tf or die "$tf $!";
2506 printdebug "$tf does not exist, need to fetch\n";
2510 $furl =~ s{/[^/]+$}{};
2512 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2513 die "$f ?" if $f =~ m#/#;
2514 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2515 return 0 if !act_local();
2518 fail "file $f has hash $got but .dsc".
2519 " demands hash $fi->{Hash} ".
2520 "(got wrong file from archive!)";
2525 sub ensure_we_have_orig () {
2526 my @dfi = dsc_files_info();
2527 foreach my $fi (@dfi) {
2528 my $f = $fi->{Filename};
2529 next unless is_orig_file_in_dsc($f, \@dfi);
2530 complete_file_from_dsc('..', $fi)
2535 #---------- git fetch ----------
2537 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2538 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2540 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2541 # locally fetched refs because they have unhelpful names and clutter
2542 # up gitk etc. So we track whether we have "used up" head ref (ie,
2543 # whether we have made another local ref which refers to this object).
2545 # (If we deleted them unconditionally, then we might end up
2546 # re-fetching the same git objects each time dgit fetch was run.)
2548 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2549 # in git_fetch_us to fetch the refs in question, and possibly a call
2550 # to lrfetchref_used.
2552 our (%lrfetchrefs_f, %lrfetchrefs_d);
2553 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2555 sub lrfetchref_used ($) {
2556 my ($fullrefname) = @_;
2557 my $objid = $lrfetchrefs_f{$fullrefname};
2558 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2561 sub git_lrfetch_sane {
2562 my ($url, $supplementary, @specs) = @_;
2563 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2564 # at least as regards @specs. Also leave the results in
2565 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2566 # able to clean these up.
2568 # With $supplementary==1, @specs must not contain wildcards
2569 # and we add to our previous fetches (non-atomically).
2571 # This is rather miserable:
2572 # When git fetch --prune is passed a fetchspec ending with a *,
2573 # it does a plausible thing. If there is no * then:
2574 # - it matches subpaths too, even if the supplied refspec
2575 # starts refs, and behaves completely madly if the source
2576 # has refs/refs/something. (See, for example, Debian #NNNN.)
2577 # - if there is no matching remote ref, it bombs out the whole
2579 # We want to fetch a fixed ref, and we don't know in advance
2580 # if it exists, so this is not suitable.
2582 # Our workaround is to use git ls-remote. git ls-remote has its
2583 # own qairks. Notably, it has the absurd multi-tail-matching
2584 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2585 # refs/refs/foo etc.
2587 # Also, we want an idempotent snapshot, but we have to make two
2588 # calls to the remote: one to git ls-remote and to git fetch. The
2589 # solution is use git ls-remote to obtain a target state, and
2590 # git fetch to try to generate it. If we don't manage to generate
2591 # the target state, we try again.
2593 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2595 my $specre = join '|', map {
2598 my $wildcard = $x =~ s/\\\*$/.*/;
2599 die if $wildcard && $supplementary;
2602 printdebug "git_lrfetch_sane specre=$specre\n";
2603 my $wanted_rref = sub {
2605 return m/^(?:$specre)$/;
2608 my $fetch_iteration = 0;
2611 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2612 if (++$fetch_iteration > 10) {
2613 fail "too many iterations trying to get sane fetch!";
2616 my @look = map { "refs/$_" } @specs;
2617 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2621 open GITLS, "-|", @lcmd or die $!;
2623 printdebug "=> ", $_;
2624 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2625 my ($objid,$rrefname) = ($1,$2);
2626 if (!$wanted_rref->($rrefname)) {
2628 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2632 $wantr{$rrefname} = $objid;
2635 close GITLS or failedcmd @lcmd;
2637 # OK, now %want is exactly what we want for refs in @specs
2639 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2640 "+refs/$_:".lrfetchrefs."/$_";
2643 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2645 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2646 runcmd_ordryrun_local @fcmd if @fspecs;
2648 if (!$supplementary) {
2649 %lrfetchrefs_f = ();
2653 git_for_each_ref(lrfetchrefs, sub {
2654 my ($objid,$objtype,$lrefname,$reftail) = @_;
2655 $lrfetchrefs_f{$lrefname} = $objid;
2656 $objgot{$objid} = 1;
2659 if ($supplementary) {
2663 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2664 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2665 if (!exists $wantr{$rrefname}) {
2666 if ($wanted_rref->($rrefname)) {
2668 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2672 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2675 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2676 delete $lrfetchrefs_f{$lrefname};
2680 foreach my $rrefname (sort keys %wantr) {
2681 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2682 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2683 my $want = $wantr{$rrefname};
2684 next if $got eq $want;
2685 if (!defined $objgot{$want}) {
2687 warning: git ls-remote suggests we want $lrefname
2688 warning: and it should refer to $want
2689 warning: but git fetch didn't fetch that object to any relevant ref.
2690 warning: This may be due to a race with someone updating the server.
2691 warning: Will try again...
2693 next FETCH_ITERATION;
2696 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2698 runcmd_ordryrun_local @git, qw(update-ref -m),
2699 "dgit fetch git fetch fixup", $lrefname, $want;
2700 $lrfetchrefs_f{$lrefname} = $want;
2705 if (defined $csuite) {
2706 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2707 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2708 my ($objid,$objtype,$lrefname,$reftail) = @_;
2709 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2710 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2714 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2715 Dumper(\%lrfetchrefs_f);
2718 sub git_fetch_us () {
2719 # Want to fetch only what we are going to use, unless
2720 # deliberately-not-ff, in which case we must fetch everything.
2722 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2724 (quiltmode_splitbrain
2725 ? (map { $_->('*',access_nomdistro) }
2726 \&debiantag_new, \&debiantag_maintview)
2727 : debiantags('*',access_nomdistro));
2728 push @specs, server_branch($csuite);
2729 push @specs, $rewritemap;
2730 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2732 my $url = access_giturl();
2733 git_lrfetch_sane $url, 0, @specs;
2736 my @tagpats = debiantags('*',access_nomdistro);
2738 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2739 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2740 printdebug "currently $fullrefname=$objid\n";
2741 $here{$fullrefname} = $objid;
2743 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2744 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2745 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2746 printdebug "offered $lref=$objid\n";
2747 if (!defined $here{$lref}) {
2748 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2749 runcmd_ordryrun_local @upd;
2750 lrfetchref_used $fullrefname;
2751 } elsif ($here{$lref} eq $objid) {
2752 lrfetchref_used $fullrefname;
2755 "Not updating $lref from $here{$lref} to $objid.\n";
2760 #---------- dsc and archive handling ----------
2762 sub mergeinfo_getclogp ($) {
2763 # Ensures thit $mi->{Clogp} exists and returns it
2765 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2768 sub mergeinfo_version ($) {
2769 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2772 sub fetch_from_archive_record_1 ($) {
2774 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2775 'DGIT_ARCHIVE', $hash;
2776 cmdoutput @git, qw(log -n2), $hash;
2777 # ... gives git a chance to complain if our commit is malformed
2780 sub fetch_from_archive_record_2 ($) {
2782 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2786 dryrun_report @upd_cmd;
2790 sub parse_dsc_field_def_dsc_distro () {
2791 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2792 dgit.default.distro);
2795 sub parse_dsc_field ($$) {
2796 my ($dsc, $what) = @_;
2798 foreach my $field (@ourdscfield) {
2799 $f = $dsc->{$field};
2804 progress "$what: NO git hash";
2805 parse_dsc_field_def_dsc_distro();
2806 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2807 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2808 progress "$what: specified git info ($dsc_distro)";
2809 $dsc_hint_tag = [ $dsc_hint_tag ];
2810 } elsif ($f =~ m/^\w+\s*$/) {
2812 parse_dsc_field_def_dsc_distro();
2813 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2815 progress "$what: specified git hash";
2817 fail "$what: invalid Dgit info";
2821 sub resolve_dsc_field_commit ($$) {
2822 my ($already_distro, $already_mapref) = @_;
2824 return unless defined $dsc_hash;
2827 defined $already_mapref &&
2828 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2829 ? $already_mapref : undef;
2833 my ($what, @fetch) = @_;
2835 local $idistro = $dsc_distro;
2836 my $lrf = lrfetchrefs;
2838 if (!$chase_dsc_distro) {
2840 "not chasing .dsc distro $dsc_distro: not fetching $what";
2845 ".dsc names distro $dsc_distro: fetching $what";
2847 my $url = access_giturl();
2848 if (!defined $url) {
2849 defined $dsc_hint_url or fail <<END;
2850 .dsc Dgit metadata is in context of distro $dsc_distro
2851 for which we have no configured url and .dsc provides no hint
2854 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2855 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2856 parse_cfg_bool "dsc-url-proto-ok", 'false',
2857 cfg("dgit.dsc-url-proto-ok.$proto",
2858 "dgit.default.dsc-url-proto-ok")
2860 .dsc Dgit metadata is in context of distro $dsc_distro
2861 for which we have no configured url;
2862 .dsc provides hinted url with protocol $proto which is unsafe.
2863 (can be overridden by config - consult documentation)
2865 $url = $dsc_hint_url;
2868 git_lrfetch_sane $url, 1, @fetch;
2873 my $rewrite_enable = do {
2874 local $idistro = $dsc_distro;
2875 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2878 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2879 if (!defined $mapref) {
2880 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2881 $mapref = $lrf.'/'.$rewritemap;
2883 my $rewritemapdata = git_cat_file $mapref.':map';
2884 if (defined $rewritemapdata
2885 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2887 "server's git history rewrite map contains a relevant entry!";
2890 if (defined $dsc_hash) {
2891 progress "using rewritten git hash in place of .dsc value";
2893 progress "server data says .dsc hash is to be disregarded";
2898 if (!defined git_cat_file $dsc_hash) {
2899 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2900 my $lrf = $do_fetch->("additional commits", @tags) &&
2901 defined git_cat_file $dsc_hash
2903 .dsc Dgit metadata requires commit $dsc_hash
2904 but we could not obtain that object anywhere.
2906 foreach my $t (@tags) {
2907 my $fullrefname = $lrf.'/'.$t;
2908 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2909 next unless $lrfetchrefs_f{$fullrefname};
2910 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2911 lrfetchref_used $fullrefname;
2916 sub fetch_from_archive () {
2917 ensure_setup_existing_tree();
2919 # Ensures that lrref() is what is actually in the archive, one way
2920 # or another, according to us - ie this client's
2921 # appropritaely-updated archive view. Also returns the commit id.
2922 # If there is nothing in the archive, leaves lrref alone and
2923 # returns undef. git_fetch_us must have already been called.
2927 parse_dsc_field($dsc, 'last upload to archive');
2928 resolve_dsc_field_commit access_basedistro,
2929 lrfetchrefs."/".$rewritemap
2931 progress "no version available from the archive";
2934 # If the archive's .dsc has a Dgit field, there are three
2935 # relevant git commitids we need to choose between and/or merge
2937 # 1. $dsc_hash: the Dgit field from the archive
2938 # 2. $lastpush_hash: the suite branch on the dgit git server
2939 # 3. $lastfetch_hash: our local tracking brach for the suite
2941 # These may all be distinct and need not be in any fast forward
2944 # If the dsc was pushed to this suite, then the server suite
2945 # branch will have been updated; but it might have been pushed to
2946 # a different suite and copied by the archive. Conversely a more
2947 # recent version may have been pushed with dgit but not appeared
2948 # in the archive (yet).
2950 # $lastfetch_hash may be awkward because archive imports
2951 # (particularly, imports of Dgit-less .dscs) are performed only as
2952 # needed on individual clients, so different clients may perform a
2953 # different subset of them - and these imports are only made
2954 # public during push. So $lastfetch_hash may represent a set of
2955 # imports different to a subsequent upload by a different dgit
2958 # Our approach is as follows:
2960 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2961 # descendant of $dsc_hash, then it was pushed by a dgit user who
2962 # had based their work on $dsc_hash, so we should prefer it.
2963 # Otherwise, $dsc_hash was installed into this suite in the
2964 # archive other than by a dgit push, and (necessarily) after the
2965 # last dgit push into that suite (since a dgit push would have
2966 # been descended from the dgit server git branch); thus, in that
2967 # case, we prefer the archive's version (and produce a
2968 # pseudo-merge to overwrite the dgit server git branch).
2970 # (If there is no Dgit field in the archive's .dsc then
2971 # generate_commit_from_dsc uses the version numbers to decide
2972 # whether the suite branch or the archive is newer. If the suite
2973 # branch is newer it ignores the archive's .dsc; otherwise it
2974 # generates an import of the .dsc, and produces a pseudo-merge to
2975 # overwrite the suite branch with the archive contents.)
2977 # The outcome of that part of the algorithm is the `public view',
2978 # and is same for all dgit clients: it does not depend on any
2979 # unpublished history in the local tracking branch.
2981 # As between the public view and the local tracking branch: The
2982 # local tracking branch is only updated by dgit fetch, and
2983 # whenever dgit fetch runs it includes the public view in the
2984 # local tracking branch. Therefore if the public view is not
2985 # descended from the local tracking branch, the local tracking
2986 # branch must contain history which was imported from the archive
2987 # but never pushed; and, its tip is now out of date. So, we make
2988 # a pseudo-merge to overwrite the old imports and stitch the old
2991 # Finally: we do not necessarily reify the public view (as
2992 # described above). This is so that we do not end up stacking two
2993 # pseudo-merges. So what we actually do is figure out the inputs
2994 # to any public view pseudo-merge and put them in @mergeinputs.
2997 # $mergeinputs[]{Commit}
2998 # $mergeinputs[]{Info}
2999 # $mergeinputs[0] is the one whose tree we use
3000 # @mergeinputs is in the order we use in the actual commit)
3003 # $mergeinputs[]{Message} is a commit message to use
3004 # $mergeinputs[]{ReverseParents} if def specifies that parent
3005 # list should be in opposite order
3006 # Such an entry has no Commit or Info. It applies only when found
3007 # in the last entry. (This ugliness is to support making
3008 # identical imports to previous dgit versions.)
3010 my $lastpush_hash = git_get_ref(lrfetchref());
3011 printdebug "previous reference hash=$lastpush_hash\n";
3012 $lastpush_mergeinput = $lastpush_hash && {
3013 Commit => $lastpush_hash,
3014 Info => "dgit suite branch on dgit git server",
3017 my $lastfetch_hash = git_get_ref(lrref());
3018 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3019 my $lastfetch_mergeinput = $lastfetch_hash && {
3020 Commit => $lastfetch_hash,
3021 Info => "dgit client's archive history view",
3024 my $dsc_mergeinput = $dsc_hash && {
3025 Commit => $dsc_hash,
3026 Info => "Dgit field in .dsc from archive",
3030 my $del_lrfetchrefs = sub {
3033 printdebug "del_lrfetchrefs...\n";
3034 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3035 my $objid = $lrfetchrefs_d{$fullrefname};
3036 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3038 $gur ||= new IO::Handle;
3039 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3041 printf $gur "delete %s %s\n", $fullrefname, $objid;
3044 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3048 if (defined $dsc_hash) {
3049 ensure_we_have_orig();
3050 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3051 @mergeinputs = $dsc_mergeinput
3052 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3053 print STDERR <<END or die $!;
3055 Git commit in archive is behind the last version allegedly pushed/uploaded.
3056 Commit referred to by archive: $dsc_hash
3057 Last version pushed with dgit: $lastpush_hash
3060 @mergeinputs = ($lastpush_mergeinput);
3062 # Archive has .dsc which is not a descendant of the last dgit
3063 # push. This can happen if the archive moves .dscs about.
3064 # Just follow its lead.
3065 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3066 progress "archive .dsc names newer git commit";
3067 @mergeinputs = ($dsc_mergeinput);
3069 progress "archive .dsc names other git commit, fixing up";
3070 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3074 @mergeinputs = generate_commits_from_dsc();
3075 # We have just done an import. Now, our import algorithm might
3076 # have been improved. But even so we do not want to generate
3077 # a new different import of the same package. So if the
3078 # version numbers are the same, just use our existing version.
3079 # If the version numbers are different, the archive has changed
3080 # (perhaps, rewound).
3081 if ($lastfetch_mergeinput &&
3082 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3083 (mergeinfo_version $mergeinputs[0]) )) {
3084 @mergeinputs = ($lastfetch_mergeinput);
3086 } elsif ($lastpush_hash) {
3087 # only in git, not in the archive yet
3088 @mergeinputs = ($lastpush_mergeinput);
3089 print STDERR <<END or die $!;
3091 Package not found in the archive, but has allegedly been pushed using dgit.
3095 printdebug "nothing found!\n";
3096 if (defined $skew_warning_vsn) {
3097 print STDERR <<END or die $!;
3099 Warning: relevant archive skew detected.
3100 Archive allegedly contains $skew_warning_vsn
3101 But we were not able to obtain any version from the archive or git.
3105 unshift @end, $del_lrfetchrefs;
3109 if ($lastfetch_hash &&
3111 my $h = $_->{Commit};
3112 $h and is_fast_fwd($lastfetch_hash, $h);
3113 # If true, one of the existing parents of this commit
3114 # is a descendant of the $lastfetch_hash, so we'll
3115 # be ff from that automatically.
3119 push @mergeinputs, $lastfetch_mergeinput;
3122 printdebug "fetch mergeinfos:\n";
3123 foreach my $mi (@mergeinputs) {
3125 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3127 printdebug sprintf " ReverseParents=%d Message=%s",
3128 $mi->{ReverseParents}, $mi->{Message};
3132 my $compat_info= pop @mergeinputs
3133 if $mergeinputs[$#mergeinputs]{Message};
3135 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3138 if (@mergeinputs > 1) {
3140 my $tree_commit = $mergeinputs[0]{Commit};
3142 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3143 $tree =~ m/\n\n/; $tree = $`;
3144 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3147 # We use the changelog author of the package in question the
3148 # author of this pseudo-merge. This is (roughly) correct if
3149 # this commit is simply representing aa non-dgit upload.
3150 # (Roughly because it does not record sponsorship - but we
3151 # don't have sponsorship info because that's in the .changes,
3152 # which isn't in the archivw.)
3154 # But, it might be that we are representing archive history
3155 # updates (including in-archive copies). These are not really
3156 # the responsibility of the person who created the .dsc, but
3157 # there is no-one whose name we should better use. (The
3158 # author of the .dsc-named commit is clearly worse.)
3160 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3161 my $author = clogp_authline $useclogp;
3162 my $cversion = getfield $useclogp, 'Version';
3164 my $mcf = ".git/dgit/mergecommit";
3165 open MC, ">", $mcf or die "$mcf $!";
3166 print MC <<END or die $!;
3170 my @parents = grep { $_->{Commit} } @mergeinputs;
3171 @parents = reverse @parents if $compat_info->{ReverseParents};
3172 print MC <<END or die $! foreach @parents;
3176 print MC <<END or die $!;
3182 if (defined $compat_info->{Message}) {
3183 print MC $compat_info->{Message} or die $!;
3185 print MC <<END or die $!;
3186 Record $package ($cversion) in archive suite $csuite
3190 my $message_add_info = sub {
3192 my $mversion = mergeinfo_version $mi;
3193 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3197 $message_add_info->($mergeinputs[0]);
3198 print MC <<END or die $!;
3199 should be treated as descended from
3201 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3205 $hash = make_commit $mcf;
3207 $hash = $mergeinputs[0]{Commit};
3209 printdebug "fetch hash=$hash\n";
3212 my ($lasth, $what) = @_;
3213 return unless $lasth;
3214 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3217 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3219 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3221 fetch_from_archive_record_1($hash);
3223 if (defined $skew_warning_vsn) {
3225 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3226 my $gotclogp = commit_getclogp($hash);
3227 my $got_vsn = getfield $gotclogp, 'Version';
3228 printdebug "SKEW CHECK GOT $got_vsn\n";
3229 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3230 print STDERR <<END or die $!;
3232 Warning: archive skew detected. Using the available version:
3233 Archive allegedly contains $skew_warning_vsn
3234 We were able to obtain only $got_vsn
3240 if ($lastfetch_hash ne $hash) {
3241 fetch_from_archive_record_2($hash);
3244 lrfetchref_used lrfetchref();
3246 check_gitattrs($hash, "fetched source tree");
3248 unshift @end, $del_lrfetchrefs;
3252 sub set_local_git_config ($$) {
3254 runcmd @git, qw(config), $k, $v;
3257 sub setup_mergechangelogs (;$) {
3259 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3261 my $driver = 'dpkg-mergechangelogs';
3262 my $cb = "merge.$driver";
3263 my $attrs = '.git/info/attributes';
3264 ensuredir '.git/info';
3266 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3267 if (!open ATTRS, "<", $attrs) {
3268 $!==ENOENT or die "$attrs: $!";
3272 next if m{^debian/changelog\s};
3273 print NATTRS $_, "\n" or die $!;
3275 ATTRS->error and die $!;
3278 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3281 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3282 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3284 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3287 sub setup_useremail (;$) {
3289 return unless $always || access_cfg_bool(1, 'setup-useremail');
3292 my ($k, $envvar) = @_;
3293 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3294 return unless defined $v;
3295 set_local_git_config "user.$k", $v;
3298 $setup->('email', 'DEBEMAIL');
3299 $setup->('name', 'DEBFULLNAME');
3302 sub ensure_setup_existing_tree () {
3303 my $k = "remote.$remotename.skipdefaultupdate";
3304 my $c = git_get_config $k;
3305 return if defined $c;
3306 set_local_git_config $k, 'true';
3309 sub open_gitattrs () {
3310 my $gai = new IO::File ".git/info/attributes"
3312 or die "open .git/info/attributes: $!";
3316 sub is_gitattrs_setup () {
3317 my $gai = open_gitattrs();
3318 return 0 unless $gai;
3320 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3322 $gai->error and die $!;
3326 sub setup_gitattrs (;$) {
3328 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3330 if (is_gitattrs_setup()) {
3332 [attr]dgit-defuse-attrs already found in .git/info/attributes
3333 not doing further gitattributes setup
3337 my $af = ".git/info/attributes";
3338 ensuredir '.git/info';
3339 open GAO, "> $af.new" or die $!;
3340 print GAO <<END or die $!;
3342 [attr]dgit-defuse-attrs $negate_harmful_gitattrs
3343 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3345 my $gai = open_gitattrs();
3349 print GAO $_, "\n" or die $!;
3351 $gai->error and die $!;
3353 close GAO or die $!;
3354 rename "$af.new", "$af" or die "install $af: $!";
3357 sub setup_new_tree () {
3358 setup_mergechangelogs();
3363 sub check_gitattrs ($$) {
3364 my ($treeish, $what) = @_;
3366 return if is_gitattrs_setup;
3369 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3371 my $gafl = new IO::File;
3372 open $gafl, "-|", @cmd or die $!;
3375 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3377 next unless m{(?:^|/)\.gitattributes$};
3379 # oh dear, found one
3381 dgit: warning: $what contains .gitattributes
3382 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3387 # tree contains no .gitattributes files
3388 $?=0; $!=0; close $gafl or failedcmd @cmd;
3392 sub multisuite_suite_child ($$$) {
3393 my ($tsuite, $merginputs, $fn) = @_;
3394 # in child, sets things up, calls $fn->(), and returns undef
3395 # in parent, returns canonical suite name for $tsuite
3396 my $canonsuitefh = IO::File::new_tmpfile;
3397 my $pid = fork // die $!;
3401 $us .= " [$isuite]";
3402 $debugprefix .= " ";
3403 progress "fetching $tsuite...";
3404 canonicalise_suite();
3405 print $canonsuitefh $csuite, "\n" or die $!;
3406 close $canonsuitefh or die $!;
3410 waitpid $pid,0 == $pid or die $!;
3411 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3412 seek $canonsuitefh,0,0 or die $!;
3413 local $csuite = <$canonsuitefh>;
3414 die $! unless defined $csuite && chomp $csuite;
3416 printdebug "multisuite $tsuite missing\n";
3419 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3420 push @$merginputs, {
3427 sub fork_for_multisuite ($) {
3428 my ($before_fetch_merge) = @_;
3429 # if nothing unusual, just returns ''
3432 # returns 0 to caller in child, to do first of the specified suites
3433 # in child, $csuite is not yet set
3435 # returns 1 to caller in parent, to finish up anything needed after
3436 # in parent, $csuite is set to canonicalised portmanteau
3438 my $org_isuite = $isuite;
3439 my @suites = split /\,/, $isuite;
3440 return '' unless @suites > 1;
3441 printdebug "fork_for_multisuite: @suites\n";
3445 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3447 return 0 unless defined $cbasesuite;
3449 fail "package $package missing in (base suite) $cbasesuite"
3450 unless @mergeinputs;
3452 my @csuites = ($cbasesuite);
3454 $before_fetch_merge->();
3456 foreach my $tsuite (@suites[1..$#suites]) {
3457 $tsuite =~ s/^-/$cbasesuite-/;
3458 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3464 # xxx collecte the ref here
3466 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3467 push @csuites, $csubsuite;
3470 foreach my $mi (@mergeinputs) {
3471 my $ref = git_get_ref $mi->{Ref};
3472 die "$mi->{Ref} ?" unless length $ref;
3473 $mi->{Commit} = $ref;
3476 $csuite = join ",", @csuites;
3478 my $previous = git_get_ref lrref;
3480 unshift @mergeinputs, {
3481 Commit => $previous,
3482 Info => "local combined tracking branch",
3484 "archive seems to have rewound: local tracking branch is ahead!",
3488 foreach my $ix (0..$#mergeinputs) {
3489 $mergeinputs[$ix]{Index} = $ix;
3492 @mergeinputs = sort {
3493 -version_compare(mergeinfo_version $a,
3494 mergeinfo_version $b) # highest version first
3496 $a->{Index} <=> $b->{Index}; # earliest in spec first
3502 foreach my $mi (@mergeinputs) {
3503 printdebug "multisuite merge check $mi->{Info}\n";
3504 foreach my $previous (@needed) {
3505 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3506 printdebug "multisuite merge un-needed $previous->{Info}\n";
3510 printdebug "multisuite merge this-needed\n";
3511 $mi->{Character} = '+';
3514 $needed[0]{Character} = '*';
3516 my $output = $needed[0]{Commit};
3519 printdebug "multisuite merge nontrivial\n";
3520 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3522 my $commit = "tree $tree\n";
3523 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3524 "Input branches:\n";
3526 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3527 printdebug "multisuite merge include $mi->{Info}\n";
3528 $mi->{Character} //= ' ';
3529 $commit .= "parent $mi->{Commit}\n";
3530 $msg .= sprintf " %s %-25s %s\n",
3532 (mergeinfo_version $mi),
3535 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3537 " * marks the highest version branch, which choose to use\n".
3538 " + marks each branch which was not already an ancestor\n\n".
3539 "[dgit multi-suite $csuite]\n";
3541 "author $authline\n".
3542 "committer $authline\n\n";
3543 $output = make_commit_text $commit.$msg;
3544 printdebug "multisuite merge generated $output\n";
3547 fetch_from_archive_record_1($output);
3548 fetch_from_archive_record_2($output);
3550 progress "calculated combined tracking suite $csuite";
3555 sub clone_set_head () {
3556 open H, "> .git/HEAD" or die $!;
3557 print H "ref: ".lref()."\n" or die $!;
3560 sub clone_finish ($) {
3562 runcmd @git, qw(reset --hard), lrref();
3563 runcmd qw(bash -ec), <<'END';
3565 git ls-tree -r --name-only -z HEAD | \
3566 xargs -0r touch -h -r . --
3568 printdone "ready for work in $dstdir";
3572 # in multisuite, returns twice!
3573 # once in parent after first suite fetched,
3574 # and then again in child after everything is finished
3576 badusage "dry run makes no sense with clone" unless act_local();
3578 my $multi_fetched = fork_for_multisuite(sub {
3579 printdebug "multi clone before fetch merge\n";
3582 if ($multi_fetched) {
3583 printdebug "multi clone after fetch merge\n";
3585 clone_finish($dstdir);
3588 printdebug "clone main body\n";
3590 canonicalise_suite();
3591 my $hasgit = check_for_git();
3592 mkdir $dstdir or fail "create \`$dstdir': $!";
3594 runcmd @git, qw(init -q);
3597 my $giturl = access_giturl(1);
3598 if (defined $giturl) {
3599 runcmd @git, qw(remote add), 'origin', $giturl;
3602 progress "fetching existing git history";
3604 runcmd_ordryrun_local @git, qw(fetch origin);
3606 progress "starting new git history";
3608 fetch_from_archive() or no_such_package;
3609 my $vcsgiturl = $dsc->{'Vcs-Git'};
3610 if (length $vcsgiturl) {
3611 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3612 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3614 clone_finish($dstdir);
3618 canonicalise_suite();
3619 if (check_for_git()) {
3622 fetch_from_archive() or no_such_package();
3623 printdone "fetched into ".lrref();
3627 my $multi_fetched = fork_for_multisuite(sub { });
3628 fetch() unless $multi_fetched; # parent
3629 return if $multi_fetched eq '0'; # child
3630 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3632 printdone "fetched to ".lrref()." and merged into HEAD";
3635 sub check_not_dirty () {
3636 foreach my $f (qw(local-options local-patch-header)) {
3637 if (stat_exists "debian/source/$f") {
3638 fail "git tree contains debian/source/$f";
3642 return if $ignoredirty;
3644 my @cmd = (@git, qw(diff --quiet HEAD));
3646 $!=0; $?=-1; system @cmd;
3649 fail "working tree is dirty (does not match HEAD)";
3655 sub commit_admin ($) {
3658 runcmd_ordryrun_local @git, qw(commit -m), $m;
3661 sub commit_quilty_patch () {
3662 my $output = cmdoutput @git, qw(status --porcelain);
3664 foreach my $l (split /\n/, $output) {
3665 next unless $l =~ m/\S/;
3666 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3670 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3672 progress "nothing quilty to commit, ok.";
3675 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3676 runcmd_ordryrun_local @git, qw(add -f), @adds;
3678 Commit Debian 3.0 (quilt) metadata
3680 [dgit ($our_version) quilt-fixup]
3684 sub get_source_format () {
3686 if (open F, "debian/source/options") {
3690 s/\s+$//; # ignore missing final newline
3692 my ($k, $v) = ($`, $'); #');
3693 $v =~ s/^"(.*)"$/$1/;
3699 F->error and die $!;
3702 die $! unless $!==&ENOENT;
3705 if (!open F, "debian/source/format") {
3706 die $! unless $!==&ENOENT;
3710 F->error and die $!;
3712 return ($_, \%options);
3715 sub madformat_wantfixup ($) {
3717 return 0 unless $format eq '3.0 (quilt)';
3718 our $quilt_mode_warned;
3719 if ($quilt_mode eq 'nocheck') {
3720 progress "Not doing any fixup of \`$format' due to".
3721 " ----no-quilt-fixup or --quilt=nocheck"
3722 unless $quilt_mode_warned++;
3725 progress "Format \`$format', need to check/update patch stack"
3726 unless $quilt_mode_warned++;
3730 sub maybe_split_brain_save ($$$) {
3731 my ($headref, $dgitview, $msg) = @_;
3732 # => message fragment "$saved" describing disposition of $dgitview
3733 return "commit id $dgitview" unless defined $split_brain_save;
3734 my @cmd = (shell_cmd "cd ../../../..",
3735 @git, qw(update-ref -m),
3736 "dgit --dgit-view-save $msg HEAD=$headref",
3737 $split_brain_save, $dgitview);
3739 return "and left in $split_brain_save";
3742 # An "infopair" is a tuple [ $thing, $what ]
3743 # (often $thing is a commit hash; $what is a description)
3745 sub infopair_cond_equal ($$) {
3747 $x->[0] eq $y->[0] or fail <<END;
3748 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3752 sub infopair_lrf_tag_lookup ($$) {
3753 my ($tagnames, $what) = @_;
3754 # $tagname may be an array ref
3755 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3756 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3757 foreach my $tagname (@tagnames) {
3758 my $lrefname = lrfetchrefs."/tags/$tagname";
3759 my $tagobj = $lrfetchrefs_f{$lrefname};
3760 next unless defined $tagobj;
3761 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3762 return [ git_rev_parse($tagobj), $what ];
3764 fail @tagnames==1 ? <<END : <<END;
3765 Wanted tag $what (@tagnames) on dgit server, but not found
3767 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3771 sub infopair_cond_ff ($$) {
3772 my ($anc,$desc) = @_;
3773 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3774 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3778 sub pseudomerge_version_check ($$) {
3779 my ($clogp, $archive_hash) = @_;
3781 my $arch_clogp = commit_getclogp $archive_hash;
3782 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3783 'version currently in archive' ];
3784 if (defined $overwrite_version) {
3785 if (length $overwrite_version) {
3786 infopair_cond_equal([ $overwrite_version,
3787 '--overwrite= version' ],
3790 my $v = $i_arch_v->[0];
3791 progress "Checking package changelog for archive version $v ...";
3794 my @xa = ("-f$v", "-t$v");
3795 my $vclogp = parsechangelog @xa;
3798 [ (getfield $vclogp, $fn),
3799 "$fn field from dpkg-parsechangelog @xa" ];
3801 my $cv = $gf->('Version');
3802 infopair_cond_equal($i_arch_v, $cv);
3803 $cd = $gf->('Distribution');
3806 $@ =~ s/^dgit: //gm;
3808 "Perhaps debian/changelog does not mention $v ?";
3810 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3811 $cd->[1] is $cd->[0]
3812 Your tree seems to based on earlier (not uploaded) $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;
3871 return $dgitview if deliberately_not_fast_forward();
3873 printdebug "splitbrain_pseudomerge...\n";
3875 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3877 if (!defined $overwrite_version) {
3878 progress "Checking that HEAD inciudes all changes in archive...";
3881 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3883 if (defined $overwrite_version) {
3885 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3886 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3887 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3888 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3889 my $i_archive = [ $archive_hash, "current archive contents" ];
3891 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3893 infopair_cond_equal($i_dgit, $i_archive);
3894 infopair_cond_ff($i_dep14, $i_dgit);
3895 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3899 $us: check failed (maybe --overwrite is needed, consult documentation)
3904 my $r = pseudomerge_make_commit
3905 $clogp, $dgitview, $archive_hash, $i_arch_v,
3906 "dgit --quilt=$quilt_mode",
3907 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3908 Declare fast forward from $i_arch_v->[0]
3910 Make fast forward from $i_arch_v->[0]
3913 maybe_split_brain_save $maintview, $r, "pseudomerge";
3915 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3919 sub plain_overwrite_pseudomerge ($$$) {
3920 my ($clogp, $head, $archive_hash) = @_;
3922 printdebug "plain_overwrite_pseudomerge...";
3924 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3926 return $head if is_fast_fwd $archive_hash, $head;
3928 my $m = "Declare fast forward from $i_arch_v->[0]";
3930 my $r = pseudomerge_make_commit
3931 $clogp, $head, $archive_hash, $i_arch_v,
3934 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3936 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3940 sub push_parse_changelog ($) {
3943 my $clogp = Dpkg::Control::Hash->new();
3944 $clogp->load($clogpfn) or die;
3946 my $clogpackage = getfield $clogp, 'Source';
3947 $package //= $clogpackage;
3948 fail "-p specified $package but changelog specified $clogpackage"
3949 unless $package eq $clogpackage;
3950 my $cversion = getfield $clogp, 'Version';
3952 if (!$we_are_initiator) {
3953 # rpush initiator can't do this because it doesn't have $isuite yet
3954 my $tag = debiantag($cversion, access_nomdistro);
3955 runcmd @git, qw(check-ref-format), $tag;
3958 my $dscfn = dscfn($cversion);
3960 return ($clogp, $cversion, $dscfn);
3963 sub push_parse_dsc ($$$) {
3964 my ($dscfn,$dscfnwhat, $cversion) = @_;
3965 $dsc = parsecontrol($dscfn,$dscfnwhat);
3966 my $dversion = getfield $dsc, 'Version';
3967 my $dscpackage = getfield $dsc, 'Source';
3968 ($dscpackage eq $package && $dversion eq $cversion) or
3969 fail "$dscfn is for $dscpackage $dversion".
3970 " but debian/changelog is for $package $cversion";
3973 sub push_tagwants ($$$$) {
3974 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3977 TagFn => \&debiantag,
3982 if (defined $maintviewhead) {
3984 TagFn => \&debiantag_maintview,
3985 Objid => $maintviewhead,
3986 TfSuffix => '-maintview',
3989 } elsif ($dodep14tag eq 'no' ? 0
3990 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3991 : $dodep14tag eq 'always'
3992 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3993 --dep14tag-always (or equivalent in config) means server must support
3994 both "new" and "maint" tag formats, but config says it doesn't.
3996 : die "$dodep14tag ?") {
3998 TagFn => \&debiantag_maintview,
4000 TfSuffix => '-dgit',
4004 foreach my $tw (@tagwants) {
4005 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4006 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4008 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4012 sub push_mktags ($$ $$ $) {
4014 $changesfile,$changesfilewhat,
4017 die unless $tagwants->[0]{View} eq 'dgit';
4019 my $declaredistro = access_nomdistro();
4020 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4021 $dsc->{$ourdscfield[0]} = join " ",
4022 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4024 $dsc->save("$dscfn.tmp") or die $!;
4026 my $changes = parsecontrol($changesfile,$changesfilewhat);
4027 foreach my $field (qw(Source Distribution Version)) {
4028 $changes->{$field} eq $clogp->{$field} or
4029 fail "changes field $field \`$changes->{$field}'".
4030 " does not match changelog \`$clogp->{$field}'";
4033 my $cversion = getfield $clogp, 'Version';
4034 my $clogsuite = getfield $clogp, 'Distribution';
4036 # We make the git tag by hand because (a) that makes it easier
4037 # to control the "tagger" (b) we can do remote signing
4038 my $authline = clogp_authline $clogp;
4039 my $delibs = join(" ", "",@deliberatelies);
4043 my $tfn = $tw->{Tfn};
4044 my $head = $tw->{Objid};
4045 my $tag = $tw->{Tag};
4047 open TO, '>', $tfn->('.tmp') or die $!;
4048 print TO <<END or die $!;
4055 if ($tw->{View} eq 'dgit') {
4056 print TO <<END or die $!;
4057 $package release $cversion for $clogsuite ($csuite) [dgit]
4058 [dgit distro=$declaredistro$delibs]
4060 foreach my $ref (sort keys %previously) {
4061 print TO <<END or die $!;
4062 [dgit previously:$ref=$previously{$ref}]
4065 } elsif ($tw->{View} eq 'maint') {
4066 print TO <<END or die $!;
4067 $package release $cversion for $clogsuite ($csuite)
4068 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4071 die Dumper($tw)."?";
4076 my $tagobjfn = $tfn->('.tmp');
4078 if (!defined $keyid) {
4079 $keyid = access_cfg('keyid','RETURN-UNDEF');
4081 if (!defined $keyid) {
4082 $keyid = getfield $clogp, 'Maintainer';
4084 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4085 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4086 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4087 push @sign_cmd, $tfn->('.tmp');
4088 runcmd_ordryrun @sign_cmd;
4090 $tagobjfn = $tfn->('.signed.tmp');
4091 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4092 $tfn->('.tmp'), $tfn->('.tmp.asc');
4098 my @r = map { $mktag->($_); } @$tagwants;
4102 sub sign_changes ($) {
4103 my ($changesfile) = @_;
4105 my @debsign_cmd = @debsign;
4106 push @debsign_cmd, "-k$keyid" if defined $keyid;
4107 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4108 push @debsign_cmd, $changesfile;
4109 runcmd_ordryrun @debsign_cmd;
4114 printdebug "actually entering push\n";
4116 supplementary_message(<<'END');
4117 Push failed, while checking state of the archive.
4118 You can retry the push, after fixing the problem, if you like.
4120 if (check_for_git()) {
4123 my $archive_hash = fetch_from_archive();
4124 if (!$archive_hash) {
4126 fail "package appears to be new in this suite;".
4127 " if this is intentional, use --new";
4130 supplementary_message(<<'END');
4131 Push failed, while preparing your push.
4132 You can retry the push, after fixing the problem, if you like.
4135 need_tagformat 'new', "quilt mode $quilt_mode"
4136 if quiltmode_splitbrain;
4140 access_giturl(); # check that success is vaguely likely
4141 rpush_handle_protovsn_bothends() if $we_are_initiator;
4144 my $clogpfn = ".git/dgit/changelog.822.tmp";
4145 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4147 responder_send_file('parsed-changelog', $clogpfn);
4149 my ($clogp, $cversion, $dscfn) =
4150 push_parse_changelog("$clogpfn");
4152 my $dscpath = "$buildproductsdir/$dscfn";
4153 stat_exists $dscpath or
4154 fail "looked for .dsc $dscpath, but $!;".
4155 " maybe you forgot to build";
4157 responder_send_file('dsc', $dscpath);
4159 push_parse_dsc($dscpath, $dscfn, $cversion);
4161 my $format = getfield $dsc, 'Format';
4162 printdebug "format $format\n";
4164 my $actualhead = git_rev_parse('HEAD');
4165 my $dgithead = $actualhead;
4166 my $maintviewhead = undef;
4168 my $upstreamversion = upstreamversion $clogp->{Version};
4170 if (madformat_wantfixup($format)) {
4171 # user might have not used dgit build, so maybe do this now:
4172 if (quiltmode_splitbrain()) {
4174 quilt_make_fake_dsc($upstreamversion);
4176 ($dgithead, $cachekey) =
4177 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4179 "--quilt=$quilt_mode but no cached dgit view:
4180 perhaps tree changed since dgit build[-source] ?";
4182 $dgithead = splitbrain_pseudomerge($clogp,
4183 $actualhead, $dgithead,
4185 $maintviewhead = $actualhead;
4186 changedir '../../../..';
4187 prep_ud(); # so _only_subdir() works, below
4189 commit_quilty_patch();
4193 if (defined $overwrite_version && !defined $maintviewhead) {
4194 $dgithead = plain_overwrite_pseudomerge($clogp,
4202 if ($archive_hash) {
4203 if (is_fast_fwd($archive_hash, $dgithead)) {
4205 } elsif (deliberately_not_fast_forward) {
4208 fail "dgit push: HEAD is not a descendant".
4209 " of the archive's version.\n".
4210 "To overwrite the archive's contents,".
4211 " pass --overwrite[=VERSION].\n".
4212 "To rewind history, if permitted by the archive,".
4213 " use --deliberately-not-fast-forward.";
4218 progress "checking that $dscfn corresponds to HEAD";
4219 runcmd qw(dpkg-source -x --),
4220 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4221 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4222 check_for_vendor_patches() if madformat($dsc->{format});
4223 changedir '../../../..';
4224 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4225 debugcmd "+",@diffcmd;
4227 my $r = system @diffcmd;
4230 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4232 HEAD specifies a different tree to $dscfn:
4234 Perhaps you forgot to build. Or perhaps there is a problem with your
4235 source tree (see dgit(7) for some hints). To see a full diff, run
4242 if (!$changesfile) {
4243 my $pat = changespat $cversion;
4244 my @cs = glob "$buildproductsdir/$pat";
4245 fail "failed to find unique changes file".
4246 " (looked for $pat in $buildproductsdir);".
4247 " perhaps you need to use dgit -C"
4249 ($changesfile) = @cs;
4251 $changesfile = "$buildproductsdir/$changesfile";
4254 # Check that changes and .dsc agree enough
4255 $changesfile =~ m{[^/]*$};
4256 my $changes = parsecontrol($changesfile,$&);
4257 files_compare_inputs($dsc, $changes)
4258 unless forceing [qw(dsc-changes-mismatch)];
4260 # Perhaps adjust .dsc to contain right set of origs
4261 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4263 unless forceing [qw(changes-origs-exactly)];
4265 # Checks complete, we're going to try and go ahead:
4267 responder_send_file('changes',$changesfile);
4268 responder_send_command("param head $dgithead");
4269 responder_send_command("param csuite $csuite");
4270 responder_send_command("param isuite $isuite");
4271 responder_send_command("param tagformat $tagformat");
4272 if (defined $maintviewhead) {
4273 die unless ($protovsn//4) >= 4;
4274 responder_send_command("param maint-view $maintviewhead");
4277 # Perhaps send buildinfo(s) for signing
4278 my $changes_files = getfield $changes, 'Files';
4279 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4280 foreach my $bi (@buildinfos) {
4281 responder_send_command("param buildinfo-filename $bi");
4282 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4285 if (deliberately_not_fast_forward) {
4286 git_for_each_ref(lrfetchrefs, sub {
4287 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4288 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4289 responder_send_command("previously $rrefname=$objid");
4290 $previously{$rrefname} = $objid;
4294 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4298 supplementary_message(<<'END');
4299 Push failed, while signing the tag.
4300 You can retry the push, after fixing the problem, if you like.
4302 # If we manage to sign but fail to record it anywhere, it's fine.
4303 if ($we_are_responder) {
4304 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4305 responder_receive_files('signed-tag', @tagobjfns);
4307 @tagobjfns = push_mktags($clogp,$dscpath,
4308 $changesfile,$changesfile,
4311 supplementary_message(<<'END');
4312 Push failed, *after* signing the tag.
4313 If you want to try again, you should use a new version number.
4316 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4318 foreach my $tw (@tagwants) {
4319 my $tag = $tw->{Tag};
4320 my $tagobjfn = $tw->{TagObjFn};
4322 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4323 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4324 runcmd_ordryrun_local
4325 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4328 supplementary_message(<<'END');
4329 Push failed, while updating the remote git repository - see messages above.
4330 If you want to try again, you should use a new version number.
4332 if (!check_for_git()) {
4333 create_remote_git_repo();
4336 my @pushrefs = $forceflag.$dgithead.":".rrref();
4337 foreach my $tw (@tagwants) {
4338 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4341 runcmd_ordryrun @git,
4342 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4343 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4345 supplementary_message(<<'END');
4346 Push failed, while obtaining signatures on the .changes and .dsc.
4347 If it was just that the signature failed, you may try again by using
4348 debsign by hand to sign the changes
4350 and then dput to complete the upload.
4351 If you need to change the package, you must use a new version number.
4353 if ($we_are_responder) {
4354 my $dryrunsuffix = act_local() ? "" : ".tmp";
4355 my @rfiles = ($dscpath, $changesfile);
4356 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4357 responder_receive_files('signed-dsc-changes',
4358 map { "$_$dryrunsuffix" } @rfiles);
4361 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4363 progress "[new .dsc left in $dscpath.tmp]";
4365 sign_changes $changesfile;
4368 supplementary_message(<<END);
4369 Push failed, while uploading package(s) to the archive server.
4370 You can retry the upload of exactly these same files with dput of:
4372 If that .changes file is broken, you will need to use a new version
4373 number for your next attempt at the upload.
4375 my $host = access_cfg('upload-host','RETURN-UNDEF');
4376 my @hostarg = defined($host) ? ($host,) : ();
4377 runcmd_ordryrun @dput, @hostarg, $changesfile;
4378 printdone "pushed and uploaded $cversion";
4380 supplementary_message('');
4381 responder_send_command("complete");
4390 badusage "-p is not allowed with clone; specify as argument instead"
4391 if defined $package;
4394 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4395 ($package,$isuite) = @ARGV;
4396 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4397 ($package,$dstdir) = @ARGV;
4398 } elsif (@ARGV==3) {
4399 ($package,$isuite,$dstdir) = @ARGV;
4401 badusage "incorrect arguments to dgit clone";
4405 $dstdir ||= "$package";
4406 if (stat_exists $dstdir) {
4407 fail "$dstdir already exists";
4411 if ($rmonerror && !$dryrun_level) {
4412 $cwd_remove= getcwd();
4414 return unless defined $cwd_remove;
4415 if (!chdir "$cwd_remove") {
4416 return if $!==&ENOENT;
4417 die "chdir $cwd_remove: $!";
4419 printdebug "clone rmonerror removing $dstdir\n";
4421 rmtree($dstdir) or die "remove $dstdir: $!\n";
4422 } elsif (grep { $! == $_ }
4423 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4425 print STDERR "check whether to remove $dstdir: $!\n";
4431 $cwd_remove = undef;
4434 sub branchsuite () {
4435 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4436 my $branch = cmdoutput_errok @cmd;
4437 if (!defined $branch) {
4438 $?==256 or failedcmd @cmd;
4441 if ($branch =~ m#$lbranch_re#o) {
4448 sub fetchpullargs () {
4449 if (!defined $package) {
4450 my $sourcep = parsecontrol('debian/control','debian/control');
4451 $package = getfield $sourcep, 'Source';
4454 $isuite = branchsuite();
4456 my $clogp = parsechangelog();
4457 my $clogsuite = getfield $clogp, 'Distribution';
4458 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4460 } elsif (@ARGV==1) {
4463 badusage "incorrect arguments to dgit fetch or dgit pull";
4471 my $multi_fetched = fork_for_multisuite(sub { });
4472 exit 0 if $multi_fetched;
4479 if (quiltmode_splitbrain()) {
4480 my ($format, $fopts) = get_source_format();
4481 madformat($format) and fail <<END
4482 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4490 build_or_push_prep_early();
4495 } elsif (@ARGV==1) {
4496 ($specsuite) = (@ARGV);
4498 badusage "incorrect arguments to dgit $subcommand";
4501 local ($package) = $existing_package; # this is a hack
4502 canonicalise_suite();
4504 canonicalise_suite();
4506 if (defined $specsuite &&
4507 $specsuite ne $isuite &&
4508 $specsuite ne $csuite) {
4509 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4510 " but command line specifies $specsuite";
4519 #---------- remote commands' implementation ----------
4521 sub pre_remote_push_build_host {
4522 my ($nrargs) = shift @ARGV;
4523 my (@rargs) = @ARGV[0..$nrargs-1];
4524 @ARGV = @ARGV[$nrargs..$#ARGV];
4526 my ($dir,$vsnwant) = @rargs;
4527 # vsnwant is a comma-separated list; we report which we have
4528 # chosen in our ready response (so other end can tell if they
4531 $we_are_responder = 1;
4532 $us .= " (build host)";
4534 open PI, "<&STDIN" or die $!;
4535 open STDIN, "/dev/null" or die $!;
4536 open PO, ">&STDOUT" or die $!;
4538 open STDOUT, ">&STDERR" or die $!;
4542 ($protovsn) = grep {
4543 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4544 } @rpushprotovsn_support;
4546 fail "build host has dgit rpush protocol versions ".
4547 (join ",", @rpushprotovsn_support).
4548 " but invocation host has $vsnwant"
4549 unless defined $protovsn;
4553 sub cmd_remote_push_build_host {
4554 responder_send_command("dgit-remote-push-ready $protovsn");
4558 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4559 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4560 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4561 # a good error message)
4563 sub rpush_handle_protovsn_bothends () {
4564 if ($protovsn < 4) {
4565 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4574 my $report = i_child_report();
4575 if (defined $report) {
4576 printdebug "($report)\n";
4577 } elsif ($i_child_pid) {
4578 printdebug "(killing build host child $i_child_pid)\n";
4579 kill 15, $i_child_pid;
4581 if (defined $i_tmp && !defined $initiator_tempdir) {
4583 eval { rmtree $i_tmp; };
4588 return unless forkcheck_mainprocess();
4593 my ($base,$selector,@args) = @_;
4594 $selector =~ s/\-/_/g;
4595 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4604 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4612 push @rargs, join ",", @rpushprotovsn_support;
4615 push @rdgit, @ropts;
4616 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4618 my @cmd = (@ssh, $host, shellquote @rdgit);
4621 $we_are_initiator=1;
4623 if (defined $initiator_tempdir) {
4624 rmtree $initiator_tempdir;
4625 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4626 $i_tmp = $initiator_tempdir;
4630 $i_child_pid = open2(\*RO, \*RI, @cmd);
4632 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4633 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4634 $supplementary_message = '' unless $protovsn >= 3;
4637 my ($icmd,$iargs) = initiator_expect {
4638 m/^(\S+)(?: (.*))?$/;
4641 i_method "i_resp", $icmd, $iargs;
4645 sub i_resp_progress ($) {
4647 my $msg = protocol_read_bytes \*RO, $rhs;
4651 sub i_resp_supplementary_message ($) {
4653 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4656 sub i_resp_complete {
4657 my $pid = $i_child_pid;
4658 $i_child_pid = undef; # prevents killing some other process with same pid
4659 printdebug "waiting for build host child $pid...\n";
4660 my $got = waitpid $pid, 0;
4661 die $! unless $got == $pid;
4662 die "build host child failed $?" if $?;
4665 printdebug "all done\n";
4669 sub i_resp_file ($) {
4671 my $localname = i_method "i_localname", $keyword;
4672 my $localpath = "$i_tmp/$localname";
4673 stat_exists $localpath and
4674 badproto \*RO, "file $keyword ($localpath) twice";
4675 protocol_receive_file \*RO, $localpath;
4676 i_method "i_file", $keyword;
4681 sub i_resp_param ($) {
4682 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4686 sub i_resp_previously ($) {
4687 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4688 or badproto \*RO, "bad previously spec";
4689 my $r = system qw(git check-ref-format), $1;
4690 die "bad previously ref spec ($r)" if $r;
4691 $previously{$1} = $2;
4696 sub i_resp_want ($) {
4698 die "$keyword ?" if $i_wanted{$keyword}++;
4700 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4701 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4702 die unless $isuite =~ m/^$suite_re$/;
4705 rpush_handle_protovsn_bothends();
4707 fail "rpush negotiated protocol version $protovsn".
4708 " which does not support quilt mode $quilt_mode"
4709 if quiltmode_splitbrain;
4711 my @localpaths = i_method "i_want", $keyword;
4712 printdebug "[[ $keyword @localpaths\n";
4713 foreach my $localpath (@localpaths) {
4714 protocol_send_file \*RI, $localpath;
4716 print RI "files-end\n" or die $!;
4719 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4721 sub i_localname_parsed_changelog {
4722 return "remote-changelog.822";
4724 sub i_file_parsed_changelog {
4725 ($i_clogp, $i_version, $i_dscfn) =
4726 push_parse_changelog "$i_tmp/remote-changelog.822";
4727 die if $i_dscfn =~ m#/|^\W#;
4730 sub i_localname_dsc {
4731 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4736 sub i_localname_buildinfo ($) {
4737 my $bi = $i_param{'buildinfo-filename'};
4738 defined $bi or badproto \*RO, "buildinfo before filename";
4739 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4740 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4741 or badproto \*RO, "improper buildinfo filename";
4744 sub i_file_buildinfo {
4745 my $bi = $i_param{'buildinfo-filename'};
4746 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4747 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4748 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4749 files_compare_inputs($bd, $ch);
4750 (getfield $bd, $_) eq (getfield $ch, $_) or
4751 fail "buildinfo mismatch $_"
4752 foreach qw(Source Version);
4753 !defined $bd->{$_} or
4754 fail "buildinfo contains $_"
4755 foreach qw(Changes Changed-by Distribution);
4757 push @i_buildinfos, $bi;
4758 delete $i_param{'buildinfo-filename'};
4761 sub i_localname_changes {
4762 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4763 $i_changesfn = $i_dscfn;
4764 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4765 return $i_changesfn;
4767 sub i_file_changes { }
4769 sub i_want_signed_tag {
4770 printdebug Dumper(\%i_param, $i_dscfn);
4771 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4772 && defined $i_param{'csuite'}
4773 or badproto \*RO, "premature desire for signed-tag";
4774 my $head = $i_param{'head'};
4775 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4777 my $maintview = $i_param{'maint-view'};
4778 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4781 if ($protovsn >= 4) {
4782 my $p = $i_param{'tagformat'} // '<undef>';
4784 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4787 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4789 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4791 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4794 push_mktags $i_clogp, $i_dscfn,
4795 $i_changesfn, 'remote changes',
4799 sub i_want_signed_dsc_changes {
4800 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4801 sign_changes $i_changesfn;
4802 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4805 #---------- building etc. ----------
4811 #----- `3.0 (quilt)' handling -----
4813 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4815 sub quiltify_dpkg_commit ($$$;$) {
4816 my ($patchname,$author,$msg, $xinfo) = @_;
4820 my $descfn = ".git/dgit/quilt-description.tmp";
4821 open O, '>', $descfn or die "$descfn: $!";
4822 $msg =~ s/\n+/\n\n/;
4823 print O <<END or die $!;
4825 ${xinfo}Subject: $msg
4832 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4833 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4834 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4835 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4839 sub quiltify_trees_differ ($$;$$$) {
4840 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4841 # returns true iff the two tree objects differ other than in debian/
4842 # with $finegrained,
4843 # returns bitmask 01 - differ in upstream files except .gitignore
4844 # 02 - differ in .gitignore
4845 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4846 # is set for each modified .gitignore filename $fn
4847 # if $unrepres is defined, array ref to which is appeneded
4848 # a list of unrepresentable changes (removals of upstream files
4851 my @cmd = (@git, qw(diff-tree -z --no-renames));
4852 push @cmd, qw(--name-only) unless $unrepres;
4853 push @cmd, qw(-r) if $finegrained || $unrepres;
4855 my $diffs= cmdoutput @cmd;
4858 foreach my $f (split /\0/, $diffs) {
4859 if ($unrepres && !@lmodes) {
4860 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4863 my ($oldmode,$newmode) = @lmodes;
4866 next if $f =~ m#^debian(?:/.*)?$#s;
4870 die "not a plain file or symlink\n"
4871 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
4872 $oldmode =~ m/^(?:10|12)\d{4}$/;
4873 if ($oldmode =~ m/[^0]/ &&
4874 $newmode =~ m/[^0]/) {
4875 # both old and new files exist
4876 die "mode or type changed\n" if $oldmode ne $newmode;
4877 die "modified symlink\n" unless $newmode =~ m/^10/;
4878 } elsif ($oldmode =~ m/[^0]/) {
4880 die "deletion of symlink\n"
4881 unless $oldmode =~ m/^10/;
4884 die "creation with non-default mode\n"
4885 unless $newmode =~ m/^100644$/ or
4886 $newmode =~ m/^120000$/;
4890 local $/="\n"; chomp $@;
4891 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4895 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4896 $r |= $isignore ? 02 : 01;
4897 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4899 printdebug "quiltify_trees_differ $x $y => $r\n";
4903 sub quiltify_tree_sentinelfiles ($) {
4904 # lists the `sentinel' files present in the tree
4906 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4907 qw(-- debian/rules debian/control);
4912 sub quiltify_splitbrain_needed () {
4913 if (!$split_brain) {
4914 progress "dgit view: changes are required...";
4915 runcmd @git, qw(checkout -q -b dgit-view);
4920 sub quiltify_splitbrain ($$$$$$) {
4921 my ($clogp, $unapplied, $headref, $diffbits,
4922 $editedignores, $cachekey) = @_;
4923 if ($quilt_mode !~ m/gbp|dpm/) {
4924 # treat .gitignore just like any other upstream file
4925 $diffbits = { %$diffbits };
4926 $_ = !!$_ foreach values %$diffbits;
4928 # We would like any commits we generate to be reproducible
4929 my @authline = clogp_authline($clogp);
4930 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4931 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4932 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4933 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4934 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4935 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4937 if ($quilt_mode =~ m/gbp|unapplied/ &&
4938 ($diffbits->{O2H} & 01)) {
4940 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4941 " but git tree differs from orig in upstream files.";
4942 if (!stat_exists "debian/patches") {
4944 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4948 if ($quilt_mode =~ m/dpm/ &&
4949 ($diffbits->{H2A} & 01)) {
4951 --quilt=$quilt_mode specified, implying patches-applied git tree
4952 but git tree differs from result of applying debian/patches to upstream
4955 if ($quilt_mode =~ m/gbp|unapplied/ &&
4956 ($diffbits->{O2A} & 01)) { # some patches
4957 quiltify_splitbrain_needed();
4958 progress "dgit view: creating patches-applied version using gbp pq";
4959 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4960 # gbp pq import creates a fresh branch; push back to dgit-view
4961 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4962 runcmd @git, qw(checkout -q dgit-view);
4964 if ($quilt_mode =~ m/gbp|dpm/ &&
4965 ($diffbits->{O2A} & 02)) {
4967 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4968 tool which does not create patches for changes to upstream
4969 .gitignores: but, such patches exist in debian/patches.
4972 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4973 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4974 quiltify_splitbrain_needed();
4975 progress "dgit view: creating patch to represent .gitignore changes";
4976 ensuredir "debian/patches";
4977 my $gipatch = "debian/patches/auto-gitignore";
4978 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4979 stat GIPATCH or die "$gipatch: $!";
4980 fail "$gipatch already exists; but want to create it".
4981 " to record .gitignore changes" if (stat _)[7];
4982 print GIPATCH <<END or die "$gipatch: $!";
4983 Subject: Update .gitignore from Debian packaging branch
4985 The Debian packaging git branch contains these updates to the upstream
4986 .gitignore file(s). This patch is autogenerated, to provide these
4987 updates to users of the official Debian archive view of the package.
4989 [dgit ($our_version) update-gitignore]
4992 close GIPATCH or die "$gipatch: $!";
4993 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4994 $unapplied, $headref, "--", sort keys %$editedignores;
4995 open SERIES, "+>>", "debian/patches/series" or die $!;
4996 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4998 defined read SERIES, $newline, 1 or die $!;
4999 print SERIES "\n" or die $! unless $newline eq "\n";
5000 print SERIES "auto-gitignore\n" or die $!;
5001 close SERIES or die $!;
5002 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5004 Commit patch to update .gitignore
5006 [dgit ($our_version) update-gitignore-quilt-fixup]
5010 my $dgitview = git_rev_parse 'HEAD';
5012 changedir '../../../..';
5013 # When we no longer need to support squeeze, use --create-reflog
5015 ensuredir ".git/logs/refs/dgit-intern";
5016 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
5019 my $oldcache = git_get_ref "refs/$splitbraincache";
5020 if ($oldcache eq $dgitview) {
5021 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5022 # git update-ref doesn't always update, in this case. *sigh*
5023 my $dummy = make_commit_text <<END;
5026 author Dgit <dgit\@example.com> 1000000000 +0000
5027 committer Dgit <dgit\@example.com> 1000000000 +0000
5029 Dummy commit - do not use
5031 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5032 "refs/$splitbraincache", $dummy;
5034 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5037 changedir '.git/dgit/unpack/work';
5039 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5040 progress "dgit view: created ($saved)";
5043 sub quiltify ($$$$) {
5044 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5046 # Quilt patchification algorithm
5048 # We search backwards through the history of the main tree's HEAD
5049 # (T) looking for a start commit S whose tree object is identical
5050 # to to the patch tip tree (ie the tree corresponding to the
5051 # current dpkg-committed patch series). For these purposes
5052 # `identical' disregards anything in debian/ - this wrinkle is
5053 # necessary because dpkg-source treates debian/ specially.
5055 # We can only traverse edges where at most one of the ancestors'
5056 # trees differs (in changes outside in debian/). And we cannot
5057 # handle edges which change .pc/ or debian/patches. To avoid
5058 # going down a rathole we avoid traversing edges which introduce
5059 # debian/rules or debian/control. And we set a limit on the
5060 # number of edges we are willing to look at.
5062 # If we succeed, we walk forwards again. For each traversed edge
5063 # PC (with P parent, C child) (starting with P=S and ending with
5064 # C=T) to we do this:
5066 # - dpkg-source --commit with a patch name and message derived from C
5067 # After traversing PT, we git commit the changes which
5068 # should be contained within debian/patches.
5070 # The search for the path S..T is breadth-first. We maintain a
5071 # todo list containing search nodes. A search node identifies a
5072 # commit, and looks something like this:
5074 # Commit => $git_commit_id,
5075 # Child => $c, # or undef if P=T
5076 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5077 # Nontrivial => true iff $p..$c has relevant changes
5084 my %considered; # saves being exponential on some weird graphs
5086 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5089 my ($search,$whynot) = @_;
5090 printdebug " search NOT $search->{Commit} $whynot\n";
5091 $search->{Whynot} = $whynot;
5092 push @nots, $search;
5093 no warnings qw(exiting);
5102 my $c = shift @todo;
5103 next if $considered{$c->{Commit}}++;
5105 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5107 printdebug "quiltify investigate $c->{Commit}\n";
5110 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5111 printdebug " search finished hooray!\n";
5116 if ($quilt_mode eq 'nofix') {
5117 fail "quilt fixup required but quilt mode is \`nofix'\n".
5118 "HEAD commit $c->{Commit} differs from tree implied by ".
5119 " debian/patches (tree object $oldtiptree)";
5121 if ($quilt_mode eq 'smash') {
5122 printdebug " search quitting smash\n";
5126 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5127 $not->($c, "has $c_sentinels not $t_sentinels")
5128 if $c_sentinels ne $t_sentinels;
5130 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5131 $commitdata =~ m/\n\n/;
5133 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5134 @parents = map { { Commit => $_, Child => $c } } @parents;
5136 $not->($c, "root commit") if !@parents;
5138 foreach my $p (@parents) {
5139 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5141 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5142 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5144 foreach my $p (@parents) {
5145 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5147 my @cmd= (@git, qw(diff-tree -r --name-only),
5148 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5149 my $patchstackchange = cmdoutput @cmd;
5150 if (length $patchstackchange) {
5151 $patchstackchange =~ s/\n/,/g;
5152 $not->($p, "changed $patchstackchange");
5155 printdebug " search queue P=$p->{Commit} ",
5156 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5162 printdebug "quiltify want to smash\n";
5165 my $x = $_[0]{Commit};
5166 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5169 my $reportnot = sub {
5171 my $s = $abbrev->($notp);
5172 my $c = $notp->{Child};
5173 $s .= "..".$abbrev->($c) if $c;
5174 $s .= ": ".$notp->{Whynot};
5177 if ($quilt_mode eq 'linear') {
5178 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5179 foreach my $notp (@nots) {
5180 print STDERR "$us: ", $reportnot->($notp), "\n";
5182 print STDERR "$us: $_\n" foreach @$failsuggestion;
5183 fail "quilt fixup naive history linearisation failed.\n".
5184 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5185 } elsif ($quilt_mode eq 'smash') {
5186 } elsif ($quilt_mode eq 'auto') {
5187 progress "quilt fixup cannot be linear, smashing...";
5189 die "$quilt_mode ?";
5192 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5193 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5195 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5197 quiltify_dpkg_commit "auto-$version-$target-$time",
5198 (getfield $clogp, 'Maintainer'),
5199 "Automatically generated patch ($clogp->{Version})\n".
5200 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5204 progress "quiltify linearisation planning successful, executing...";
5206 for (my $p = $sref_S;
5207 my $c = $p->{Child};
5209 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5210 next unless $p->{Nontrivial};
5212 my $cc = $c->{Commit};
5214 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5215 $commitdata =~ m/\n\n/ or die "$c ?";
5218 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5221 my $commitdate = cmdoutput
5222 @git, qw(log -n1 --pretty=format:%aD), $cc;
5224 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5226 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5233 my $gbp_check_suitable = sub {
5238 die "contains unexpected slashes\n" if m{//} || m{/$};
5239 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5240 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5241 die "is series file\n" if m{$series_filename_re}o;
5242 die "too long" if length > 200;
5244 return $_ unless $@;
5245 print STDERR "quiltifying commit $cc:".
5246 " ignoring/dropping Gbp-Pq $what: $@";
5250 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5252 (\S+) \s* \n //ixm) {
5253 $patchname = $gbp_check_suitable->($1, 'Name');
5255 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5257 (\S+) \s* \n //ixm) {
5258 $patchdir = $gbp_check_suitable->($1, 'Topic');
5263 if (!defined $patchname) {
5264 $patchname = $title;
5265 $patchname =~ s/[.:]$//;
5268 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5269 my $translitname = $converter->convert($patchname);
5270 die unless defined $translitname;
5271 $patchname = $translitname;
5274 "dgit: patch title transliteration error: $@"
5276 $patchname =~ y/ A-Z/-a-z/;
5277 $patchname =~ y/-a-z0-9_.+=~//cd;
5278 $patchname =~ s/^\W/x-$&/;
5279 $patchname = substr($patchname,0,40);
5280 $patchname .= ".patch";
5282 if (!defined $patchdir) {
5285 if (length $patchdir) {
5286 $patchname = "$patchdir/$patchname";
5288 if ($patchname =~ m{^(.*)/}) {
5289 mkpath "debian/patches/$1";
5294 stat "debian/patches/$patchname$index";
5296 $!==ENOENT or die "$patchname$index $!";
5298 runcmd @git, qw(checkout -q), $cc;
5300 # We use the tip's changelog so that dpkg-source doesn't
5301 # produce complaining messages from dpkg-parsechangelog. None
5302 # of the information dpkg-source gets from the changelog is
5303 # actually relevant - it gets put into the original message
5304 # which dpkg-source provides our stunt editor, and then
5306 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5308 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5309 "Date: $commitdate\n".
5310 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5312 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5315 runcmd @git, qw(checkout -q master);
5318 sub build_maybe_quilt_fixup () {
5319 my ($format,$fopts) = get_source_format;
5320 return unless madformat_wantfixup $format;
5323 check_for_vendor_patches();
5325 if (quiltmode_splitbrain) {
5326 fail <<END unless access_cfg_tagformats_can_splitbrain;
5327 quilt mode $quilt_mode requires split view so server needs to support
5328 both "new" and "maint" tag formats, but config says it doesn't.
5332 my $clogp = parsechangelog();
5333 my $headref = git_rev_parse('HEAD');
5338 my $upstreamversion = upstreamversion $version;
5340 if ($fopts->{'single-debian-patch'}) {
5341 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5343 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5346 die 'bug' if $split_brain && !$need_split_build_invocation;
5348 changedir '../../../..';
5349 runcmd_ordryrun_local
5350 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5353 sub quilt_fixup_mkwork ($) {
5356 mkdir "work" or die $!;
5358 mktree_in_ud_here();
5359 runcmd @git, qw(reset -q --hard), $headref;
5362 sub quilt_fixup_linkorigs ($$) {
5363 my ($upstreamversion, $fn) = @_;
5364 # calls $fn->($leafname);
5366 foreach my $f (<../../../../*>) { #/){
5367 my $b=$f; $b =~ s{.*/}{};
5369 local ($debuglevel) = $debuglevel-1;
5370 printdebug "QF linkorigs $b, $f ?\n";
5372 next unless is_orig_file_of_vsn $b, $upstreamversion;
5373 printdebug "QF linkorigs $b, $f Y\n";
5374 link_ltarget $f, $b or die "$b $!";
5379 sub quilt_fixup_delete_pc () {
5380 runcmd @git, qw(rm -rqf .pc);
5382 Commit removal of .pc (quilt series tracking data)
5384 [dgit ($our_version) upgrade quilt-remove-pc]
5388 sub quilt_fixup_singlepatch ($$$) {
5389 my ($clogp, $headref, $upstreamversion) = @_;
5391 progress "starting quiltify (single-debian-patch)";
5393 # dpkg-source --commit generates new patches even if
5394 # single-debian-patch is in debian/source/options. In order to
5395 # get it to generate debian/patches/debian-changes, it is
5396 # necessary to build the source package.
5398 quilt_fixup_linkorigs($upstreamversion, sub { });
5399 quilt_fixup_mkwork($headref);
5401 rmtree("debian/patches");
5403 runcmd @dpkgsource, qw(-b .);
5405 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5406 rename srcfn("$upstreamversion", "/debian/patches"),
5407 "work/debian/patches";
5410 commit_quilty_patch();
5413 sub quilt_make_fake_dsc ($) {
5414 my ($upstreamversion) = @_;
5416 my $fakeversion="$upstreamversion-~~DGITFAKE";
5418 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5419 print $fakedsc <<END or die $!;
5422 Version: $fakeversion
5426 my $dscaddfile=sub {
5429 my $md = new Digest::MD5;
5431 my $fh = new IO::File $b, '<' or die "$b $!";
5436 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5439 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5441 my @files=qw(debian/source/format debian/rules
5442 debian/control debian/changelog);
5443 foreach my $maybe (qw(debian/patches debian/source/options
5444 debian/tests/control)) {
5445 next unless stat_exists "../../../$maybe";
5446 push @files, $maybe;
5449 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5450 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5452 $dscaddfile->($debtar);
5453 close $fakedsc or die $!;
5456 sub quilt_check_splitbrain_cache ($$) {
5457 my ($headref, $upstreamversion) = @_;
5458 # Called only if we are in (potentially) split brain mode.
5460 # Computes the cache key and looks in the cache.
5461 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5463 my $splitbrain_cachekey;
5466 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5467 # we look in the reflog of dgit-intern/quilt-cache
5468 # we look for an entry whose message is the key for the cache lookup
5469 my @cachekey = (qw(dgit), $our_version);
5470 push @cachekey, $upstreamversion;
5471 push @cachekey, $quilt_mode;
5472 push @cachekey, $headref;
5474 push @cachekey, hashfile('fake.dsc');
5476 my $srcshash = Digest::SHA->new(256);
5477 my %sfs = ( %INC, '$0(dgit)' => $0 );
5478 foreach my $sfk (sort keys %sfs) {
5479 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5480 $srcshash->add($sfk," ");
5481 $srcshash->add(hashfile($sfs{$sfk}));
5482 $srcshash->add("\n");
5484 push @cachekey, $srcshash->hexdigest();
5485 $splitbrain_cachekey = "@cachekey";
5487 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5489 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5490 debugcmd "|(probably)",@cmd;
5491 my $child = open GC, "-|"; defined $child or die $!;
5493 chdir '../../..' or die $!;
5494 if (!stat ".git/logs/refs/$splitbraincache") {
5495 $! == ENOENT or die $!;
5496 printdebug ">(no reflog)\n";
5503 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5504 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5507 quilt_fixup_mkwork($headref);
5508 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5509 if ($cachehit ne $headref) {
5510 progress "dgit view: found cached ($saved)";
5511 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5513 return ($cachehit, $splitbrain_cachekey);
5515 progress "dgit view: found cached, no changes required";
5516 return ($headref, $splitbrain_cachekey);
5518 die $! if GC->error;
5519 failedcmd unless close GC;
5521 printdebug "splitbrain cache miss\n";
5522 return (undef, $splitbrain_cachekey);
5525 sub quilt_fixup_multipatch ($$$) {
5526 my ($clogp, $headref, $upstreamversion) = @_;
5528 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5531 # - honour any existing .pc in case it has any strangeness
5532 # - determine the git commit corresponding to the tip of
5533 # the patch stack (if there is one)
5534 # - if there is such a git commit, convert each subsequent
5535 # git commit into a quilt patch with dpkg-source --commit
5536 # - otherwise convert all the differences in the tree into
5537 # a single git commit
5541 # Our git tree doesn't necessarily contain .pc. (Some versions of
5542 # dgit would include the .pc in the git tree.) If there isn't
5543 # one, we need to generate one by unpacking the patches that we
5546 # We first look for a .pc in the git tree. If there is one, we
5547 # will use it. (This is not the normal case.)
5549 # Otherwise need to regenerate .pc so that dpkg-source --commit
5550 # can work. We do this as follows:
5551 # 1. Collect all relevant .orig from parent directory
5552 # 2. Generate a debian.tar.gz out of
5553 # debian/{patches,rules,source/format,source/options}
5554 # 3. Generate a fake .dsc containing just these fields:
5555 # Format Source Version Files
5556 # 4. Extract the fake .dsc
5557 # Now the fake .dsc has a .pc directory.
5558 # (In fact we do this in every case, because in future we will
5559 # want to search for a good base commit for generating patches.)
5561 # Then we can actually do the dpkg-source --commit
5562 # 1. Make a new working tree with the same object
5563 # store as our main tree and check out the main
5565 # 2. Copy .pc from the fake's extraction, if necessary
5566 # 3. Run dpkg-source --commit
5567 # 4. If the result has changes to debian/, then
5568 # - git add them them
5569 # - git add .pc if we had a .pc in-tree
5571 # 5. If we had a .pc in-tree, delete it, and git commit
5572 # 6. Back in the main tree, fast forward to the new HEAD
5574 # Another situation we may have to cope with is gbp-style
5575 # patches-unapplied trees.
5577 # We would want to detect these, so we know to escape into
5578 # quilt_fixup_gbp. However, this is in general not possible.
5579 # Consider a package with a one patch which the dgit user reverts
5580 # (with git revert or the moral equivalent).
5582 # That is indistinguishable in contents from a patches-unapplied
5583 # tree. And looking at the history to distinguish them is not
5584 # useful because the user might have made a confusing-looking git
5585 # history structure (which ought to produce an error if dgit can't
5586 # cope, not a silent reintroduction of an unwanted patch).
5588 # So gbp users will have to pass an option. But we can usually
5589 # detect their failure to do so: if the tree is not a clean
5590 # patches-applied tree, quilt linearisation fails, but the tree
5591 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5592 # they want --quilt=unapplied.
5594 # To help detect this, when we are extracting the fake dsc, we
5595 # first extract it with --skip-patches, and then apply the patches
5596 # afterwards with dpkg-source --before-build. That lets us save a
5597 # tree object corresponding to .origs.
5599 my $splitbrain_cachekey;
5601 quilt_make_fake_dsc($upstreamversion);
5603 if (quiltmode_splitbrain()) {
5605 ($cachehit, $splitbrain_cachekey) =
5606 quilt_check_splitbrain_cache($headref, $upstreamversion);
5607 return if $cachehit;
5611 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5613 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5614 rename $fakexdir, "fake" or die "$fakexdir $!";
5618 remove_stray_gits("source package");
5619 mktree_in_ud_here();
5623 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5624 my $unapplied=git_add_write_tree();
5625 printdebug "fake orig tree object $unapplied\n";
5629 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5631 if (system @bbcmd) {
5632 failedcmd @bbcmd if $? < 0;
5634 failed to apply your git tree's patch stack (from debian/patches/) to
5635 the corresponding upstream tarball(s). Your source tree and .orig
5636 are probably too inconsistent. dgit can only fix up certain kinds of
5637 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5643 quilt_fixup_mkwork($headref);
5646 if (stat_exists ".pc") {
5648 progress "Tree already contains .pc - will use it then delete it.";
5651 rename '../fake/.pc','.pc' or die $!;
5654 changedir '../fake';
5656 my $oldtiptree=git_add_write_tree();
5657 printdebug "fake o+d/p tree object $unapplied\n";
5658 changedir '../work';
5661 # We calculate some guesswork now about what kind of tree this might
5662 # be. This is mostly for error reporting.
5668 # O = orig, without patches applied
5669 # A = "applied", ie orig with H's debian/patches applied
5670 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5671 \%editedignores, \@unrepres),
5672 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5673 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5677 foreach my $b (qw(01 02)) {
5678 foreach my $v (qw(O2H O2A H2A)) {
5679 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5682 printdebug "differences \@dl @dl.\n";
5685 "$us: base trees orig=%.20s o+d/p=%.20s",
5686 $unapplied, $oldtiptree;
5688 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5689 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5690 $dl[0], $dl[1], $dl[3], $dl[4],
5694 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5696 forceable_fail [qw(unrepresentable)], <<END;
5697 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5702 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5703 push @failsuggestion, "This might be a patches-unapplied branch.";
5704 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5705 push @failsuggestion, "This might be a patches-applied branch.";
5707 push @failsuggestion, "Maybe you need to specify one of".
5708 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5710 if (quiltmode_splitbrain()) {
5711 quiltify_splitbrain($clogp, $unapplied, $headref,
5712 $diffbits, \%editedignores,
5713 $splitbrain_cachekey);
5717 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5718 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5720 if (!open P, '>>', ".pc/applied-patches") {
5721 $!==&ENOENT or die $!;
5726 commit_quilty_patch();
5728 if ($mustdeletepc) {
5729 quilt_fixup_delete_pc();
5733 sub quilt_fixup_editor () {
5734 my $descfn = $ENV{$fakeeditorenv};
5735 my $editing = $ARGV[$#ARGV];
5736 open I1, '<', $descfn or die "$descfn: $!";
5737 open I2, '<', $editing or die "$editing: $!";
5738 unlink $editing or die "$editing: $!";
5739 open O, '>', $editing or die "$editing: $!";
5740 while (<I1>) { print O or die $!; } I1->error and die $!;
5743 $copying ||= m/^\-\-\- /;
5744 next unless $copying;
5747 I2->error and die $!;
5752 sub maybe_apply_patches_dirtily () {
5753 return unless $quilt_mode =~ m/gbp|unapplied/;
5754 print STDERR <<END or die $!;
5756 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5757 dgit: Have to apply the patches - making the tree dirty.
5758 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5761 $patches_applied_dirtily = 01;
5762 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5763 runcmd qw(dpkg-source --before-build .);
5766 sub maybe_unapply_patches_again () {
5767 progress "dgit: Unapplying patches again to tidy up the tree."
5768 if $patches_applied_dirtily;
5769 runcmd qw(dpkg-source --after-build .)
5770 if $patches_applied_dirtily & 01;
5772 if $patches_applied_dirtily & 02;
5773 $patches_applied_dirtily = 0;
5776 #----- other building -----
5778 our $clean_using_builder;
5779 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5780 # clean the tree before building (perhaps invoked indirectly by
5781 # whatever we are using to run the build), rather than separately
5782 # and explicitly by us.
5785 return if $clean_using_builder;
5786 if ($cleanmode eq 'dpkg-source') {
5787 maybe_apply_patches_dirtily();
5788 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5789 } elsif ($cleanmode eq 'dpkg-source-d') {
5790 maybe_apply_patches_dirtily();
5791 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5792 } elsif ($cleanmode eq 'git') {
5793 runcmd_ordryrun_local @git, qw(clean -xdf);
5794 } elsif ($cleanmode eq 'git-ff') {
5795 runcmd_ordryrun_local @git, qw(clean -xdff);
5796 } elsif ($cleanmode eq 'check') {
5797 my $leftovers = cmdoutput @git, qw(clean -xdn);
5798 if (length $leftovers) {
5799 print STDERR $leftovers, "\n" or die $!;
5800 fail "tree contains uncommitted files and --clean=check specified";
5802 } elsif ($cleanmode eq 'none') {
5809 badusage "clean takes no additional arguments" if @ARGV;
5812 maybe_unapply_patches_again();
5815 sub build_or_push_prep_early () {
5816 our $build_or_push_prep_early_done //= 0;
5817 return if $build_or_push_prep_early_done++;
5818 badusage "-p is not allowed with dgit $subcommand" if defined $package;
5819 my $clogp = parsechangelog();
5820 $isuite = getfield $clogp, 'Distribution';
5821 $package = getfield $clogp, 'Source';
5822 $version = getfield $clogp, 'Version';
5825 sub build_prep_early () {
5826 build_or_push_prep_early();
5834 build_maybe_quilt_fixup();
5836 my $pat = changespat $version;
5837 foreach my $f (glob "$buildproductsdir/$pat") {
5839 unlink $f or fail "remove old changes file $f: $!";
5841 progress "would remove $f";
5847 sub changesopts_initial () {
5848 my @opts =@changesopts[1..$#changesopts];
5851 sub changesopts_version () {
5852 if (!defined $changes_since_version) {
5853 my @vsns = archive_query('archive_query');
5854 my @quirk = access_quirk();
5855 if ($quirk[0] eq 'backports') {
5856 local $isuite = $quirk[2];
5858 canonicalise_suite();
5859 push @vsns, archive_query('archive_query');
5862 @vsns = map { $_->[0] } @vsns;
5863 @vsns = sort { -version_compare($a, $b) } @vsns;
5864 $changes_since_version = $vsns[0];
5865 progress "changelog will contain changes since $vsns[0]";
5867 $changes_since_version = '_';
5868 progress "package seems new, not specifying -v<version>";
5871 if ($changes_since_version ne '_') {
5872 return ("-v$changes_since_version");
5878 sub changesopts () {
5879 return (changesopts_initial(), changesopts_version());
5882 sub massage_dbp_args ($;$) {
5883 my ($cmd,$xargs) = @_;
5886 # - if we're going to split the source build out so we can
5887 # do strange things to it, massage the arguments to dpkg-buildpackage
5888 # so that the main build doessn't build source (or add an argument
5889 # to stop it building source by default).
5891 # - add -nc to stop dpkg-source cleaning the source tree,
5892 # unless we're not doing a split build and want dpkg-source
5893 # as cleanmode, in which case we can do nothing
5896 # 0 - source will NOT need to be built separately by caller
5897 # +1 - source will need to be built separately by caller
5898 # +2 - source will need to be built separately by caller AND
5899 # dpkg-buildpackage should not in fact be run at all!
5900 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5901 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5902 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5903 $clean_using_builder = 1;
5906 # -nc has the side effect of specifying -b if nothing else specified
5907 # and some combinations of -S, -b, et al, are errors, rather than
5908 # later simply overriding earlie. So we need to:
5909 # - search the command line for these options
5910 # - pick the last one
5911 # - perhaps add our own as a default
5912 # - perhaps adjust it to the corresponding non-source-building version
5914 foreach my $l ($cmd, $xargs) {
5916 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5919 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5921 if ($need_split_build_invocation) {
5922 printdebug "massage split $dmode.\n";
5923 $r = $dmode =~ m/[S]/ ? +2 :
5924 $dmode =~ y/gGF/ABb/ ? +1 :
5925 $dmode =~ m/[ABb]/ ? 0 :
5928 printdebug "massage done $r $dmode.\n";
5930 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5936 my $wasdir = must_getcwd();
5942 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5943 my ($msg_if_onlyone) = @_;
5944 # If there is only one .changes file, fail with $msg_if_onlyone,
5945 # or if that is undef, be a no-op.
5946 # Returns the changes file to report to the user.
5947 my $pat = changespat $version;
5948 my @changesfiles = glob $pat;
5949 @changesfiles = sort {
5950 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5954 if (@changesfiles==1) {
5955 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5956 only one changes file from build (@changesfiles)
5958 $result = $changesfiles[0];
5959 } elsif (@changesfiles==2) {
5960 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5961 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5962 fail "$l found in binaries changes file $binchanges"
5965 runcmd_ordryrun_local @mergechanges, @changesfiles;
5966 my $multichanges = changespat $version,'multi';
5968 stat_exists $multichanges or fail "$multichanges: $!";
5969 foreach my $cf (glob $pat) {
5970 next if $cf eq $multichanges;
5971 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5974 $result = $multichanges;
5976 fail "wrong number of different changes files (@changesfiles)";
5978 printdone "build successful, results in $result\n" or die $!;
5981 sub midbuild_checkchanges () {
5982 my $pat = changespat $version;
5983 return if $rmchanges;
5984 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5985 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5987 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5988 Suggest you delete @unwanted.
5993 sub midbuild_checkchanges_vanilla ($) {
5995 midbuild_checkchanges() if $wantsrc == 1;
5998 sub postbuild_mergechanges_vanilla ($) {
6000 if ($wantsrc == 1) {
6002 postbuild_mergechanges(undef);
6005 printdone "build successful\n";
6011 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6012 my $wantsrc = massage_dbp_args \@dbp;
6015 midbuild_checkchanges_vanilla $wantsrc;
6020 push @dbp, changesopts_version();
6021 maybe_apply_patches_dirtily();
6022 runcmd_ordryrun_local @dbp;
6024 maybe_unapply_patches_again();
6025 postbuild_mergechanges_vanilla $wantsrc;
6029 $quilt_mode //= 'gbp';
6035 # gbp can make .origs out of thin air. In my tests it does this
6036 # even for a 1.0 format package, with no origs present. So I
6037 # guess it keys off just the version number. We don't know
6038 # exactly what .origs ought to exist, but let's assume that we
6039 # should run gbp if: the version has an upstream part and the main
6041 my $upstreamversion = upstreamversion $version;
6042 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6043 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6045 if ($gbp_make_orig) {
6047 $cleanmode = 'none'; # don't do it again
6048 $need_split_build_invocation = 1;
6051 my @dbp = @dpkgbuildpackage;
6053 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6055 if (!length $gbp_build[0]) {
6056 if (length executable_on_path('git-buildpackage')) {
6057 $gbp_build[0] = qw(git-buildpackage);
6059 $gbp_build[0] = 'gbp buildpackage';
6062 my @cmd = opts_opt_multi_cmd @gbp_build;
6064 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6066 if ($gbp_make_orig) {
6067 ensuredir '.git/dgit';
6068 my $ok = '.git/dgit/origs-gen-ok';
6069 unlink $ok or $!==&ENOENT or die $!;
6070 my @origs_cmd = @cmd;
6071 push @origs_cmd, qw(--git-cleaner=true);
6072 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6073 push @origs_cmd, @ARGV;
6075 debugcmd @origs_cmd;
6077 do { local $!; stat_exists $ok; }
6078 or failedcmd @origs_cmd;
6080 dryrun_report @origs_cmd;
6086 midbuild_checkchanges_vanilla $wantsrc;
6088 if (!$clean_using_builder) {
6089 push @cmd, '--git-cleaner=true';
6093 maybe_unapply_patches_again();
6095 push @cmd, changesopts();
6096 runcmd_ordryrun_local @cmd, @ARGV;
6098 postbuild_mergechanges_vanilla $wantsrc;
6100 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6104 my $our_cleanmode = $cleanmode;
6105 if ($need_split_build_invocation) {
6106 # Pretend that clean is being done some other way. This
6107 # forces us not to try to use dpkg-buildpackage to clean and
6108 # build source all in one go; and instead we run dpkg-source
6109 # (and build_prep() will do the clean since $clean_using_builder
6111 $our_cleanmode = 'ELSEWHERE';
6113 if ($our_cleanmode =~ m/^dpkg-source/) {
6114 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6115 $clean_using_builder = 1;
6118 $sourcechanges = changespat $version,'source';
6120 unlink "../$sourcechanges" or $!==ENOENT
6121 or fail "remove $sourcechanges: $!";
6123 $dscfn = dscfn($version);
6124 if ($our_cleanmode eq 'dpkg-source') {
6125 maybe_apply_patches_dirtily();
6126 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6128 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6129 maybe_apply_patches_dirtily();
6130 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6133 my @cmd = (@dpkgsource, qw(-b --));
6136 runcmd_ordryrun_local @cmd, "work";
6137 my @udfiles = <${package}_*>;
6138 changedir "../../..";
6139 foreach my $f (@udfiles) {
6140 printdebug "source copy, found $f\n";
6143 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6144 $f eq srcfn($version, $&));
6145 printdebug "source copy, found $f - renaming\n";
6146 rename "$ud/$f", "../$f" or $!==ENOENT
6147 or fail "put in place new source file ($f): $!";
6150 my $pwd = must_getcwd();
6151 my $leafdir = basename $pwd;
6153 runcmd_ordryrun_local @cmd, $leafdir;
6156 runcmd_ordryrun_local qw(sh -ec),
6157 'exec >$1; shift; exec "$@"','x',
6158 "../$sourcechanges",
6159 @dpkggenchanges, qw(-S), changesopts();
6163 sub cmd_build_source {
6165 badusage "build-source takes no additional arguments" if @ARGV;
6167 maybe_unapply_patches_again();
6168 printdone "source built, results in $dscfn and $sourcechanges";
6173 midbuild_checkchanges();
6176 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6177 stat_exists $sourcechanges
6178 or fail "$sourcechanges (in parent directory): $!";
6180 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6182 maybe_unapply_patches_again();
6184 postbuild_mergechanges(<<END);
6185 perhaps you need to pass -A ? (sbuild's default is to build only
6186 arch-specific binaries; dgit 1.4 used to override that.)
6191 sub cmd_quilt_fixup {
6192 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6195 build_maybe_quilt_fixup();
6198 sub import_dsc_result {
6199 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6200 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6202 check_gitattrs($newhash, "source tree");
6204 progress "dgit: import-dsc: $what_msg";
6207 sub cmd_import_dsc {
6211 last unless $ARGV[0] =~ m/^-/;
6214 if (m/^--require-valid-signature$/) {
6217 badusage "unknown dgit import-dsc sub-option \`$_'";
6221 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6222 my ($dscfn, $dstbranch) = @ARGV;
6224 badusage "dry run makes no sense with import-dsc" unless act_local();
6226 my $force = $dstbranch =~ s/^\+// ? +1 :
6227 $dstbranch =~ s/^\.\.// ? -1 :
6229 my $info = $force ? " $&" : '';
6230 $info = "$dscfn$info";
6232 my $specbranch = $dstbranch;
6233 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6234 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6236 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6237 my $chead = cmdoutput_errok @symcmd;
6238 defined $chead or $?==256 or failedcmd @symcmd;
6240 fail "$dstbranch is checked out - will not update it"
6241 if defined $chead and $chead eq $dstbranch;
6243 my $oldhash = git_get_ref $dstbranch;
6245 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6246 $dscdata = do { local $/ = undef; <D>; };
6247 D->error and fail "read $dscfn: $!";
6250 # we don't normally need this so import it here
6251 use Dpkg::Source::Package;
6252 my $dp = new Dpkg::Source::Package filename => $dscfn,
6253 require_valid_signature => $needsig;
6255 local $SIG{__WARN__} = sub {
6257 return unless $needsig;
6258 fail "import-dsc signature check failed";
6260 if (!$dp->is_signed()) {
6261 warn "$us: warning: importing unsigned .dsc\n";
6263 my $r = $dp->check_signature();
6264 die "->check_signature => $r" if $needsig && $r;
6270 $package = getfield $dsc, 'Source';
6272 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6273 unless forceing [qw(import-dsc-with-dgit-field)];
6274 parse_dsc_field_def_dsc_distro();
6276 $isuite = 'DGIT-IMPORT-DSC';
6277 $idistro //= $dsc_distro;
6281 if (defined $dsc_hash) {
6282 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6283 resolve_dsc_field_commit undef, undef;
6285 if (defined $dsc_hash) {
6286 my @cmd = (qw(sh -ec),
6287 "echo $dsc_hash | git cat-file --batch-check");
6288 my $objgot = cmdoutput @cmd;
6289 if ($objgot =~ m#^\w+ missing\b#) {
6291 .dsc contains Dgit field referring to object $dsc_hash
6292 Your git tree does not have that object. Try `git fetch' from a
6293 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6296 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6298 progress "Not fast forward, forced update.";
6300 fail "Not fast forward to $dsc_hash";
6303 import_dsc_result $dstbranch, $dsc_hash,
6304 "dgit import-dsc (Dgit): $info",
6305 "updated git ref $dstbranch";
6310 Branch $dstbranch already exists
6311 Specify ..$specbranch for a pseudo-merge, binding in existing history
6312 Specify +$specbranch to overwrite, discarding existing history
6314 if $oldhash && !$force;
6316 my @dfi = dsc_files_info();
6317 foreach my $fi (@dfi) {
6318 my $f = $fi->{Filename};
6322 fail "lstat $here works but stat gives $! !";
6324 fail "stat $here: $!" unless $! == ENOENT;
6326 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6328 } elsif ($dscfn =~ m#^/#) {
6331 fail "cannot import $dscfn which seems to be inside working tree!";
6333 $there =~ s#/+[^/]+$## or
6334 fail "import $dscfn requires ../$f, but it does not exist";
6336 my $test = $there =~ m{^/} ? $there : "../$there";
6337 stat $test or fail "import $dscfn requires $test, but: $!";
6338 symlink $there, $here or fail "symlink $there to $here: $!";
6339 progress "made symlink $here -> $there";
6340 # print STDERR Dumper($fi);
6342 my @mergeinputs = generate_commits_from_dsc();
6343 die unless @mergeinputs == 1;
6345 my $newhash = $mergeinputs[0]{Commit};
6349 progress "Import, forced update - synthetic orphan git history.";
6350 } elsif ($force < 0) {
6351 progress "Import, merging.";
6352 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6353 my $version = getfield $dsc, 'Version';
6354 my $clogp = commit_getclogp $newhash;
6355 my $authline = clogp_authline $clogp;
6356 $newhash = make_commit_text <<END;
6363 Merge $package ($version) import into $dstbranch
6366 die; # caught earlier
6370 import_dsc_result $dstbranch, $newhash,
6371 "dgit import-dsc: $info",
6372 "results are in in git ref $dstbranch";
6375 sub pre_archive_api_query () {
6378 sub cmd_archive_api_query {
6379 badusage "need only 1 subpath argument" unless @ARGV==1;
6380 my ($subpath) = @ARGV;
6381 my @cmd = archive_api_query_cmd($subpath);
6384 exec @cmd or fail "exec curl: $!\n";
6387 sub repos_server_url () {
6388 $package = '_dgit-repos-server';
6389 local $access_forpush = 1;
6390 local $isuite = 'DGIT-REPOS-SERVER';
6391 my $url = access_giturl();
6394 sub pre_clone_dgit_repos_server () {
6397 sub cmd_clone_dgit_repos_server {
6398 badusage "need destination argument" unless @ARGV==1;
6399 my ($destdir) = @ARGV;
6400 my $url = repos_server_url();
6401 my @cmd = (@git, qw(clone), $url, $destdir);
6403 exec @cmd or fail "exec git clone: $!\n";
6406 sub pre_print_dgit_repos_server_source_url () {
6409 sub cmd_print_dgit_repos_server_source_url {
6410 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6412 my $url = repos_server_url();
6413 print $url, "\n" or die $!;
6416 sub cmd_setup_mergechangelogs {
6417 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6418 local $isuite = 'DGIT-SETUP-TREE';
6419 setup_mergechangelogs(1);
6422 sub cmd_setup_useremail {
6423 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6424 local $isuite = 'DGIT-SETUP-TREE';
6428 sub cmd_setup_gitattributes {
6429 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6430 local $isuite = 'DGIT-SETUP-TREE';
6434 sub cmd_setup_new_tree {
6435 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6436 local $isuite = 'DGIT-SETUP-TREE';
6440 #---------- argument parsing and main program ----------
6443 print "dgit version $our_version\n" or die $!;
6447 our (%valopts_long, %valopts_short);
6448 our (%funcopts_long);
6450 our (@modeopt_cfgs);
6452 sub defvalopt ($$$$) {
6453 my ($long,$short,$val_re,$how) = @_;
6454 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6455 $valopts_long{$long} = $oi;
6456 $valopts_short{$short} = $oi;
6457 # $how subref should:
6458 # do whatever assignemnt or thing it likes with $_[0]
6459 # if the option should not be passed on to remote, @rvalopts=()
6460 # or $how can be a scalar ref, meaning simply assign the value
6463 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6464 defvalopt '--distro', '-d', '.+', \$idistro;
6465 defvalopt '', '-k', '.+', \$keyid;
6466 defvalopt '--existing-package','', '.*', \$existing_package;
6467 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6468 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6469 defvalopt '--package', '-p', $package_re, \$package;
6470 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6472 defvalopt '', '-C', '.+', sub {
6473 ($changesfile) = (@_);
6474 if ($changesfile =~ s#^(.*)/##) {
6475 $buildproductsdir = $1;
6479 defvalopt '--initiator-tempdir','','.*', sub {
6480 ($initiator_tempdir) = (@_);
6481 $initiator_tempdir =~ m#^/# or
6482 badusage "--initiator-tempdir must be used specify an".
6483 " absolute, not relative, directory."
6486 sub defoptmodes ($@) {
6487 my ($varref, $cfgkey, $default, %optmap) = @_;
6489 while (my ($opt,$val) = each %optmap) {
6490 $funcopts_long{$opt} = sub { $$varref = $val; };
6491 $permit{$val} = $val;
6493 push @modeopt_cfgs, {
6496 Default => $default,
6501 defoptmodes \$dodep14tag, qw( dep14tag want
6504 --always-dep14tag always );
6509 if (defined $ENV{'DGIT_SSH'}) {
6510 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6511 } elsif (defined $ENV{'GIT_SSH'}) {
6512 @ssh = ($ENV{'GIT_SSH'});
6520 if (!defined $val) {
6521 badusage "$what needs a value" unless @ARGV;
6523 push @rvalopts, $val;
6525 badusage "bad value \`$val' for $what" unless
6526 $val =~ m/^$oi->{Re}$(?!\n)/s;
6527 my $how = $oi->{How};
6528 if (ref($how) eq 'SCALAR') {
6533 push @ropts, @rvalopts;
6537 last unless $ARGV[0] =~ m/^-/;
6541 if (m/^--dry-run$/) {
6544 } elsif (m/^--damp-run$/) {
6547 } elsif (m/^--no-sign$/) {
6550 } elsif (m/^--help$/) {
6552 } elsif (m/^--version$/) {
6554 } elsif (m/^--new$/) {
6557 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6558 ($om = $opts_opt_map{$1}) &&
6562 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6563 !$opts_opt_cmdonly{$1} &&
6564 ($om = $opts_opt_map{$1})) {
6567 } elsif (m/^--(gbp|dpm)$/s) {
6568 push @ropts, "--quilt=$1";
6570 } elsif (m/^--ignore-dirty$/s) {
6573 } elsif (m/^--no-quilt-fixup$/s) {
6575 $quilt_mode = 'nocheck';
6576 } elsif (m/^--no-rm-on-error$/s) {
6579 } elsif (m/^--no-chase-dsc-distro$/s) {
6581 $chase_dsc_distro = 0;
6582 } elsif (m/^--overwrite$/s) {
6584 $overwrite_version = '';
6585 } elsif (m/^--overwrite=(.+)$/s) {
6587 $overwrite_version = $1;
6588 } elsif (m/^--delayed=(\d+)$/s) {
6591 } elsif (m/^--dgit-view-save=(.+)$/s) {
6593 $split_brain_save = $1;
6594 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6595 } elsif (m/^--(no-)?rm-old-changes$/s) {
6598 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6600 push @deliberatelies, $&;
6601 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6605 } elsif (m/^--force-/) {
6607 "$us: warning: ignoring unknown force option $_\n";
6609 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6610 # undocumented, for testing
6612 $tagformat_want = [ $1, 'command line', 1 ];
6613 # 1 menas overrides distro configuration
6614 } elsif (m/^--always-split-source-build$/s) {
6615 # undocumented, for testing
6617 $need_split_build_invocation = 1;
6618 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6619 # undocumented, for testing
6621 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6622 # ^ it's supposed to be an array ref
6623 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6624 $val = $2 ? $' : undef; #';
6625 $valopt->($oi->{Long});
6626 } elsif ($funcopts_long{$_}) {
6628 $funcopts_long{$_}();
6630 badusage "unknown long option \`$_'";
6637 } elsif (s/^-L/-/) {
6640 } elsif (s/^-h/-/) {
6642 } elsif (s/^-D/-/) {
6646 } elsif (s/^-N/-/) {
6651 push @changesopts, $_;
6653 } elsif (s/^-wn$//s) {
6655 $cleanmode = 'none';
6656 } elsif (s/^-wg$//s) {
6659 } elsif (s/^-wgf$//s) {
6661 $cleanmode = 'git-ff';
6662 } elsif (s/^-wd$//s) {
6664 $cleanmode = 'dpkg-source';
6665 } elsif (s/^-wdd$//s) {
6667 $cleanmode = 'dpkg-source-d';
6668 } elsif (s/^-wc$//s) {
6670 $cleanmode = 'check';
6671 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6672 push @git, '-c', $&;
6673 $gitcfgs{cmdline}{$1} = [ $2 ];
6674 } elsif (s/^-c([^=]+)$//s) {
6675 push @git, '-c', $&;
6676 $gitcfgs{cmdline}{$1} = [ 'true' ];
6677 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6679 $val = undef unless length $val;
6680 $valopt->($oi->{Short});
6683 badusage "unknown short option \`$_'";
6690 sub check_env_sanity () {
6691 my $blocked = new POSIX::SigSet;
6692 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6695 foreach my $name (qw(PIPE CHLD)) {
6696 my $signame = "SIG$name";
6697 my $signum = eval "POSIX::$signame" // die;
6698 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6699 die "$signame is set to something other than SIG_DFL\n";
6700 $blocked->ismember($signum) and
6701 die "$signame is blocked\n";
6707 On entry to dgit, $@
6708 This is a bug produced by something in in your execution environment.
6714 sub parseopts_late_defaults () {
6715 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6716 if defined $idistro;
6717 $isuite //= cfg('dgit.default.default-suite');
6719 foreach my $k (keys %opts_opt_map) {
6720 my $om = $opts_opt_map{$k};
6722 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6724 badcfg "cannot set command for $k"
6725 unless length $om->[0];
6729 foreach my $c (access_cfg_cfgs("opts-$k")) {
6731 map { $_ ? @$_ : () }
6732 map { $gitcfgs{$_}{$c} }
6733 reverse @gitcfgsources;
6734 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6735 "\n" if $debuglevel >= 4;
6737 badcfg "cannot configure options for $k"
6738 if $opts_opt_cmdonly{$k};
6739 my $insertpos = $opts_cfg_insertpos{$k};
6740 @$om = ( @$om[0..$insertpos-1],
6742 @$om[$insertpos..$#$om] );
6746 if (!defined $rmchanges) {
6747 local $access_forpush;
6748 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6751 if (!defined $quilt_mode) {
6752 local $access_forpush;
6753 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6754 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6756 $quilt_mode =~ m/^($quilt_modes_re)$/
6757 or badcfg "unknown quilt-mode \`$quilt_mode'";
6761 foreach my $moc (@modeopt_cfgs) {
6762 local $access_forpush;
6763 my $vr = $moc->{Var};
6764 next if defined $$vr;
6765 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6766 my $v = $moc->{Vals}{$$vr};
6767 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6771 $need_split_build_invocation ||= quiltmode_splitbrain();
6773 if (!defined $cleanmode) {
6774 local $access_forpush;
6775 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6776 $cleanmode //= 'dpkg-source';
6778 badcfg "unknown clean-mode \`$cleanmode'" unless
6779 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6783 if ($ENV{$fakeeditorenv}) {
6785 quilt_fixup_editor();
6791 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6792 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6793 if $dryrun_level == 1;
6795 print STDERR $helpmsg or die $!;
6798 $cmd = $subcommand = shift @ARGV;
6801 my $pre_fn = ${*::}{"pre_$cmd"};
6802 $pre_fn->() if $pre_fn;
6806 my $fn = ${*::}{"cmd_$cmd"};
6807 $fn or badusage "unknown operation $cmd";