3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
22 use Debian::Dgit qw(:DEFAULT :playground);
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::MoreUtils qw(pairwise);
38 use Text::Glob qw(match_glob);
39 use Fcntl qw(:DEFAULT :flock);
44 our $our_version = 'UNRELEASED'; ###substituted###
45 our $absurdity = undef; ###substituted###
47 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
58 our $dryrun_level = 0;
60 our $buildproductsdir = '..';
66 our $existing_package = 'dpkg';
68 our $changes_since_version;
70 our $overwrite_version; # undef: not specified; '': check changelog
72 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $we_are_initiator;
77 our $initiator_tempdir;
78 our $patches_applied_dirtily = 00;
82 our $chase_dsc_distro=1;
84 our %forceopts = map { $_=>0 }
85 qw(unrepresentable unsupported-source-format
86 dsc-changes-mismatch changes-origs-exactly
87 import-gitapply-absurd
88 import-gitapply-no-absurd
89 import-dsc-with-dgit-field);
91 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
93 our $suite_re = '[-+.0-9a-z]+';
94 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
95 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
96 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
97 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
99 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
100 our $splitbraincache = 'dgit-intern/quilt-cache';
101 our $rewritemap = 'dgit-rewrite/map';
103 our (@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);
1673 fresh_playground 'dgit/unpack';
1676 sub mktree_in_ud_here () {
1677 playtree_setup $gitcfgs{local};
1680 sub git_write_tree () {
1681 my $tree = cmdoutput @git, qw(write-tree);
1682 $tree =~ m/^\w+$/ or die "$tree ?";
1686 sub git_add_write_tree () {
1687 runcmd @git, qw(add -Af .);
1688 return git_write_tree();
1691 sub remove_stray_gits ($) {
1693 my @gitscmd = qw(find -name .git -prune -print0);
1694 debugcmd "|",@gitscmd;
1695 open GITS, "-|", @gitscmd or die $!;
1700 print STDERR "$us: warning: removing from $what: ",
1701 (messagequote $_), "\n";
1705 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1708 sub mktree_in_ud_from_only_subdir ($;$) {
1709 my ($what,$raw) = @_;
1711 # changes into the subdir
1713 die "expected one subdir but found @dirs ?" unless @dirs==1;
1714 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1718 remove_stray_gits($what);
1719 mktree_in_ud_here();
1721 my ($format, $fopts) = get_source_format();
1722 if (madformat($format)) {
1727 my $tree=git_add_write_tree();
1728 return ($tree,$dir);
1731 our @files_csum_info_fields =
1732 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1733 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1734 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1736 sub dsc_files_info () {
1737 foreach my $csumi (@files_csum_info_fields) {
1738 my ($fname, $module, $method) = @$csumi;
1739 my $field = $dsc->{$fname};
1740 next unless defined $field;
1741 eval "use $module; 1;" or die $@;
1743 foreach (split /\n/, $field) {
1745 m/^(\w+) (\d+) (\S+)$/ or
1746 fail "could not parse .dsc $fname line \`$_'";
1747 my $digester = eval "$module"."->$method;" or die $@;
1752 Digester => $digester,
1757 fail "missing any supported Checksums-* or Files field in ".
1758 $dsc->get_option('name');
1762 map { $_->{Filename} } dsc_files_info();
1765 sub files_compare_inputs (@) {
1770 my $showinputs = sub {
1771 return join "; ", map { $_->get_option('name') } @$inputs;
1774 foreach my $in (@$inputs) {
1776 my $in_name = $in->get_option('name');
1778 printdebug "files_compare_inputs $in_name\n";
1780 foreach my $csumi (@files_csum_info_fields) {
1781 my ($fname) = @$csumi;
1782 printdebug "files_compare_inputs $in_name $fname\n";
1784 my $field = $in->{$fname};
1785 next unless defined $field;
1788 foreach (split /\n/, $field) {
1791 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1792 fail "could not parse $in_name $fname line \`$_'";
1794 printdebug "files_compare_inputs $in_name $fname $f\n";
1798 my $re = \ $record{$f}{$fname};
1800 $fchecked{$f}{$in_name} = 1;
1802 fail "hash or size of $f varies in $fname fields".
1803 " (between: ".$showinputs->().")";
1808 @files = sort @files;
1809 $expected_files //= \@files;
1810 "@$expected_files" eq "@files" or
1811 fail "file list in $in_name varies between hash fields!";
1814 fail "$in_name has no files list field(s)";
1816 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1819 grep { keys %$_ == @$inputs-1 } values %fchecked
1820 or fail "no file appears in all file lists".
1821 " (looked in: ".$showinputs->().")";
1824 sub is_orig_file_in_dsc ($$) {
1825 my ($f, $dsc_files_info) = @_;
1826 return 0 if @$dsc_files_info <= 1;
1827 # One file means no origs, and the filename doesn't have a "what
1828 # part of dsc" component. (Consider versions ending `.orig'.)
1829 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1833 sub is_orig_file_of_vsn ($$) {
1834 my ($f, $upstreamvsn) = @_;
1835 my $base = srcfn $upstreamvsn, '';
1836 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1840 sub changes_update_origs_from_dsc ($$$$) {
1841 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1843 printdebug "checking origs needed ($upstreamvsn)...\n";
1844 $_ = getfield $changes, 'Files';
1845 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1846 fail "cannot find section/priority from .changes Files field";
1847 my $placementinfo = $1;
1849 printdebug "checking origs needed placement '$placementinfo'...\n";
1850 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1851 $l =~ m/\S+$/ or next;
1853 printdebug "origs $file | $l\n";
1854 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1855 printdebug "origs $file is_orig\n";
1856 my $have = archive_query('file_in_archive', $file);
1857 if (!defined $have) {
1859 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1865 printdebug "origs $file \$#\$have=$#$have\n";
1866 foreach my $h (@$have) {
1869 foreach my $csumi (@files_csum_info_fields) {
1870 my ($fname, $module, $method, $archivefield) = @$csumi;
1871 next unless defined $h->{$archivefield};
1872 $_ = $dsc->{$fname};
1873 next unless defined;
1874 m/^(\w+) .* \Q$file\E$/m or
1875 fail ".dsc $fname missing entry for $file";
1876 if ($h->{$archivefield} eq $1) {
1880 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1883 die "$file ".Dumper($h)." ?!" if $same && @differ;
1886 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1889 printdebug "origs $file f.same=$found_same".
1890 " #f._differ=$#found_differ\n";
1891 if (@found_differ && !$found_same) {
1893 "archive contains $file with different checksum",
1896 # Now we edit the changes file to add or remove it
1897 foreach my $csumi (@files_csum_info_fields) {
1898 my ($fname, $module, $method, $archivefield) = @$csumi;
1899 next unless defined $changes->{$fname};
1901 # in archive, delete from .changes if it's there
1902 $changed{$file} = "removed" if
1903 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1904 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1905 # not in archive, but it's here in the .changes
1907 my $dsc_data = getfield $dsc, $fname;
1908 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1910 $extra =~ s/ \d+ /$&$placementinfo /
1911 or die "$fname $extra >$dsc_data< ?"
1912 if $fname eq 'Files';
1913 $changes->{$fname} .= "\n". $extra;
1914 $changed{$file} = "added";
1919 foreach my $file (keys %changed) {
1921 "edited .changes for archive .orig contents: %s %s",
1922 $changed{$file}, $file;
1924 my $chtmp = "$changesfile.tmp";
1925 $changes->save($chtmp);
1927 rename $chtmp,$changesfile or die "$changesfile $!";
1929 progress "[new .changes left in $changesfile]";
1932 progress "$changesfile already has appropriate .orig(s) (if any)";
1936 sub make_commit ($) {
1938 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1941 sub make_commit_text ($) {
1944 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1946 print Dumper($text) if $debuglevel > 1;
1947 my $child = open2($out, $in, @cmd) or die $!;
1950 print $in $text or die $!;
1951 close $in or die $!;
1953 $h =~ m/^\w+$/ or die;
1955 printdebug "=> $h\n";
1958 waitpid $child, 0 == $child or die "$child $!";
1959 $? and failedcmd @cmd;
1963 sub clogp_authline ($) {
1965 my $author = getfield $clogp, 'Maintainer';
1966 if ($author =~ m/^[^"\@]+\,/) {
1967 # single entry Maintainer field with unquoted comma
1968 $author = ($& =~ y/,//rd).$'; # strip the comma
1970 # git wants a single author; any remaining commas in $author
1971 # are by now preceded by @ (or "). It seems safer to punt on
1972 # "..." for now rather than attempting to dequote or something.
1973 $author =~ s#,.*##ms unless $author =~ m/"/;
1974 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1975 my $authline = "$author $date";
1976 $authline =~ m/$git_authline_re/o or
1977 fail "unexpected commit author line format \`$authline'".
1978 " (was generated from changelog Maintainer field)";
1979 return ($1,$2,$3) if wantarray;
1983 sub vendor_patches_distro ($$) {
1984 my ($checkdistro, $what) = @_;
1985 return unless defined $checkdistro;
1987 my $series = "debian/patches/\L$checkdistro\E.series";
1988 printdebug "checking for vendor-specific $series ($what)\n";
1990 if (!open SERIES, "<", $series) {
1991 die "$series $!" unless $!==ENOENT;
2000 Unfortunately, this source package uses a feature of dpkg-source where
2001 the same source package unpacks to different source code on different
2002 distros. dgit cannot safely operate on such packages on affected
2003 distros, because the meaning of source packages is not stable.
2005 Please ask the distro/maintainer to remove the distro-specific series
2006 files and use a different technique (if necessary, uploading actually
2007 different packages, if different distros are supposed to have
2011 fail "Found active distro-specific series file for".
2012 " $checkdistro ($what): $series, cannot continue";
2014 die "$series $!" if SERIES->error;
2018 sub check_for_vendor_patches () {
2019 # This dpkg-source feature doesn't seem to be documented anywhere!
2020 # But it can be found in the changelog (reformatted):
2022 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2023 # Author: Raphael Hertzog <hertzog@debian.org>
2024 # Date: Sun Oct 3 09:36:48 2010 +0200
2026 # dpkg-source: correctly create .pc/.quilt_series with alternate
2029 # If you have debian/patches/ubuntu.series and you were
2030 # unpacking the source package on ubuntu, quilt was still
2031 # directed to debian/patches/series instead of
2032 # debian/patches/ubuntu.series.
2034 # debian/changelog | 3 +++
2035 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2036 # 2 files changed, 6 insertions(+), 1 deletion(-)
2039 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2040 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2041 "Dpkg::Vendor \`current vendor'");
2042 vendor_patches_distro(access_basedistro(),
2043 "(base) distro being accessed");
2044 vendor_patches_distro(access_nomdistro(),
2045 "(nominal) distro being accessed");
2048 sub generate_commits_from_dsc () {
2049 # See big comment in fetch_from_archive, below.
2050 # See also README.dsc-import.
2052 changedir $playground;
2054 my @dfi = dsc_files_info();
2055 foreach my $fi (@dfi) {
2056 my $f = $fi->{Filename};
2057 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2058 my $upper_f = "../../../../$f";
2060 printdebug "considering reusing $f: ";
2062 if (link_ltarget "$upper_f,fetch", $f) {
2063 printdebug "linked (using ...,fetch).\n";
2064 } elsif ((printdebug "($!) "),
2066 fail "accessing ../$f,fetch: $!";
2067 } elsif (link_ltarget $upper_f, $f) {
2068 printdebug "linked.\n";
2069 } elsif ((printdebug "($!) "),
2071 fail "accessing ../$f: $!";
2073 printdebug "absent.\n";
2077 complete_file_from_dsc('.', $fi, \$refetched)
2080 printdebug "considering saving $f: ";
2082 if (link $f, $upper_f) {
2083 printdebug "linked.\n";
2084 } elsif ((printdebug "($!) "),
2086 fail "saving ../$f: $!";
2087 } elsif (!$refetched) {
2088 printdebug "no need.\n";
2089 } elsif (link $f, "$upper_f,fetch") {
2090 printdebug "linked (using ...,fetch).\n";
2091 } elsif ((printdebug "($!) "),
2093 fail "saving ../$f,fetch: $!";
2095 printdebug "cannot.\n";
2099 # We unpack and record the orig tarballs first, so that we only
2100 # need disk space for one private copy of the unpacked source.
2101 # But we can't make them into commits until we have the metadata
2102 # from the debian/changelog, so we record the tree objects now and
2103 # make them into commits later.
2105 my $upstreamv = upstreamversion $dsc->{version};
2106 my $orig_f_base = srcfn $upstreamv, '';
2108 foreach my $fi (@dfi) {
2109 # We actually import, and record as a commit, every tarball
2110 # (unless there is only one file, in which case there seems
2113 my $f = $fi->{Filename};
2114 printdebug "import considering $f ";
2115 (printdebug "only one dfi\n"), next if @dfi == 1;
2116 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2117 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2121 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2123 printdebug "Y ", (join ' ', map { $_//"(none)" }
2124 $compr_ext, $orig_f_part
2127 my $input = new IO::File $f, '<' or die "$f $!";
2131 if (defined $compr_ext) {
2133 Dpkg::Compression::compression_guess_from_filename $f;
2134 fail "Dpkg::Compression cannot handle file $f in source package"
2135 if defined $compr_ext && !defined $cname;
2137 new Dpkg::Compression::Process compression => $cname;
2138 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2139 my $compr_fh = new IO::Handle;
2140 my $compr_pid = open $compr_fh, "-|" // die $!;
2142 open STDIN, "<&", $input or die $!;
2144 die "dgit (child): exec $compr_cmd[0]: $!\n";
2149 rmtree "_unpack-tar";
2150 mkdir "_unpack-tar" or die $!;
2151 my @tarcmd = qw(tar -x -f -
2152 --no-same-owner --no-same-permissions
2153 --no-acls --no-xattrs --no-selinux);
2154 my $tar_pid = fork // die $!;
2156 chdir "_unpack-tar" or die $!;
2157 open STDIN, "<&", $input or die $!;
2159 die "dgit (child): exec $tarcmd[0]: $!";
2161 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2162 !$? or failedcmd @tarcmd;
2165 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2167 # finally, we have the results in "tarball", but maybe
2168 # with the wrong permissions
2170 runcmd qw(chmod -R +rwX _unpack-tar);
2171 changedir "_unpack-tar";
2172 remove_stray_gits($f);
2173 mktree_in_ud_here();
2175 my ($tree) = git_add_write_tree();
2176 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2177 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2179 printdebug "one subtree $1\n";
2181 printdebug "multiple subtrees\n";
2184 rmtree "_unpack-tar";
2186 my $ent = [ $f, $tree ];
2188 Orig => !!$orig_f_part,
2189 Sort => (!$orig_f_part ? 2 :
2190 $orig_f_part =~ m/-/g ? 1 :
2198 # put any without "_" first (spec is not clear whether files
2199 # are always in the usual order). Tarballs without "_" are
2200 # the main orig or the debian tarball.
2201 $a->{Sort} <=> $b->{Sort} or
2205 my $any_orig = grep { $_->{Orig} } @tartrees;
2207 my $dscfn = "$package.dsc";
2209 my $treeimporthow = 'package';
2211 open D, ">", $dscfn or die "$dscfn: $!";
2212 print D $dscdata or die "$dscfn: $!";
2213 close D or die "$dscfn: $!";
2214 my @cmd = qw(dpkg-source);
2215 push @cmd, '--no-check' if $dsc_checked;
2216 if (madformat $dsc->{format}) {
2217 push @cmd, '--skip-patches';
2218 $treeimporthow = 'unpatched';
2220 push @cmd, qw(-x --), $dscfn;
2223 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2224 if (madformat $dsc->{format}) {
2225 check_for_vendor_patches();
2229 if (madformat $dsc->{format}) {
2230 my @pcmd = qw(dpkg-source --before-build .);
2231 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2233 $dappliedtree = git_add_write_tree();
2236 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2237 debugcmd "|",@clogcmd;
2238 open CLOGS, "-|", @clogcmd or die $!;
2243 printdebug "import clog search...\n";
2246 my $stanzatext = do { local $/=""; <CLOGS>; };
2247 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2248 last if !defined $stanzatext;
2250 my $desc = "package changelog, entry no.$.";
2251 open my $stanzafh, "<", \$stanzatext or die;
2252 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2253 $clogp //= $thisstanza;
2255 printdebug "import clog $thisstanza->{version} $desc...\n";
2257 last if !$any_orig; # we don't need $r1clogp
2259 # We look for the first (most recent) changelog entry whose
2260 # version number is lower than the upstream version of this
2261 # package. Then the last (least recent) previous changelog
2262 # entry is treated as the one which introduced this upstream
2263 # version and used for the synthetic commits for the upstream
2266 # One might think that a more sophisticated algorithm would be
2267 # necessary. But: we do not want to scan the whole changelog
2268 # file. Stopping when we see an earlier version, which
2269 # necessarily then is an earlier upstream version, is the only
2270 # realistic way to do that. Then, either the earliest
2271 # changelog entry we have seen so far is indeed the earliest
2272 # upload of this upstream version; or there are only changelog
2273 # entries relating to later upstream versions (which is not
2274 # possible unless the changelog and .dsc disagree about the
2275 # version). Then it remains to choose between the physically
2276 # last entry in the file, and the one with the lowest version
2277 # number. If these are not the same, we guess that the
2278 # versions were created in a non-monotic order rather than
2279 # that the changelog entries have been misordered.
2281 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2283 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2284 $r1clogp = $thisstanza;
2286 printdebug "import clog $r1clogp->{version} becomes r1\n";
2288 die $! if CLOGS->error;
2289 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2291 $clogp or fail "package changelog has no entries!";
2293 my $authline = clogp_authline $clogp;
2294 my $changes = getfield $clogp, 'Changes';
2295 $changes =~ s/^\n//; # Changes: \n
2296 my $cversion = getfield $clogp, 'Version';
2299 $r1clogp //= $clogp; # maybe there's only one entry;
2300 my $r1authline = clogp_authline $r1clogp;
2301 # Strictly, r1authline might now be wrong if it's going to be
2302 # unused because !$any_orig. Whatever.
2304 printdebug "import tartrees authline $authline\n";
2305 printdebug "import tartrees r1authline $r1authline\n";
2307 foreach my $tt (@tartrees) {
2308 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2310 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2313 committer $r1authline
2317 [dgit import orig $tt->{F}]
2325 [dgit import tarball $package $cversion $tt->{F}]
2330 printdebug "import main commit\n";
2332 open C, ">../commit.tmp" or die $!;
2333 print C <<END or die $!;
2336 print C <<END or die $! foreach @tartrees;
2339 print C <<END or die $!;
2345 [dgit import $treeimporthow $package $cversion]
2349 my $rawimport_hash = make_commit qw(../commit.tmp);
2351 if (madformat $dsc->{format}) {
2352 printdebug "import apply patches...\n";
2354 # regularise the state of the working tree so that
2355 # the checkout of $rawimport_hash works nicely.
2356 my $dappliedcommit = make_commit_text(<<END);
2363 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2365 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2367 # We need the answers to be reproducible
2368 my @authline = clogp_authline($clogp);
2369 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2370 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2371 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2372 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2373 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2374 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2376 my $path = $ENV{PATH} or die;
2378 foreach my $use_absurd (qw(0 1)) {
2379 runcmd @git, qw(checkout -q unpa);
2380 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2381 local $ENV{PATH} = $path;
2384 progress "warning: $@";
2385 $path = "$absurdity:$path";
2386 progress "$us: trying slow absurd-git-apply...";
2387 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2392 die "forbid absurd git-apply\n" if $use_absurd
2393 && forceing [qw(import-gitapply-no-absurd)];
2394 die "only absurd git-apply!\n" if !$use_absurd
2395 && forceing [qw(import-gitapply-absurd)];
2397 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2398 local $ENV{PATH} = $path if $use_absurd;
2400 my @showcmd = (gbp_pq, qw(import));
2401 my @realcmd = shell_cmd
2402 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2403 debugcmd "+",@realcmd;
2404 if (system @realcmd) {
2405 die +(shellquote @showcmd).
2407 failedcmd_waitstatus()."\n";
2410 my $gapplied = git_rev_parse('HEAD');
2411 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2412 $gappliedtree eq $dappliedtree or
2414 gbp-pq import and dpkg-source disagree!
2415 gbp-pq import gave commit $gapplied
2416 gbp-pq import gave tree $gappliedtree
2417 dpkg-source --before-build gave tree $dappliedtree
2419 $rawimport_hash = $gapplied;
2424 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2429 progress "synthesised git commit from .dsc $cversion";
2431 my $rawimport_mergeinput = {
2432 Commit => $rawimport_hash,
2433 Info => "Import of source package",
2435 my @output = ($rawimport_mergeinput);
2437 if ($lastpush_mergeinput) {
2438 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2439 my $oversion = getfield $oldclogp, 'Version';
2441 version_compare($oversion, $cversion);
2443 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2444 { Message => <<END, ReverseParents => 1 });
2445 Record $package ($cversion) in archive suite $csuite
2447 } elsif ($vcmp > 0) {
2448 print STDERR <<END or die $!;
2450 Version actually in archive: $cversion (older)
2451 Last version pushed with dgit: $oversion (newer or same)
2454 @output = $lastpush_mergeinput;
2456 # Same version. Use what's in the server git branch,
2457 # discarding our own import. (This could happen if the
2458 # server automatically imports all packages into git.)
2459 @output = $lastpush_mergeinput;
2467 sub complete_file_from_dsc ($$;$) {
2468 our ($dstdir, $fi, $refetched) = @_;
2469 # Ensures that we have, in $dstdir, the file $fi, with the correct
2470 # contents. (Downloading it from alongside $dscurl if necessary.)
2471 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2472 # and will set $$refetched=1 if it did so (or tried to).
2474 my $f = $fi->{Filename};
2475 my $tf = "$dstdir/$f";
2479 my $checkhash = sub {
2480 open F, "<", "$tf" or die "$tf: $!";
2481 $fi->{Digester}->reset();
2482 $fi->{Digester}->addfile(*F);
2483 F->error and die $!;
2484 $got = $fi->{Digester}->hexdigest();
2485 return $got eq $fi->{Hash};
2488 if (stat_exists $tf) {
2489 if ($checkhash->()) {
2490 progress "using existing $f";
2494 fail "file $f has hash $got but .dsc".
2495 " demands hash $fi->{Hash} ".
2496 "(perhaps you should delete this file?)";
2498 progress "need to fetch correct version of $f";
2499 unlink $tf or die "$tf $!";
2502 printdebug "$tf does not exist, need to fetch\n";
2506 $furl =~ s{/[^/]+$}{};
2508 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2509 die "$f ?" if $f =~ m#/#;
2510 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2511 return 0 if !act_local();
2514 fail "file $f has hash $got but .dsc".
2515 " demands hash $fi->{Hash} ".
2516 "(got wrong file from archive!)";
2521 sub ensure_we_have_orig () {
2522 my @dfi = dsc_files_info();
2523 foreach my $fi (@dfi) {
2524 my $f = $fi->{Filename};
2525 next unless is_orig_file_in_dsc($f, \@dfi);
2526 complete_file_from_dsc('..', $fi)
2531 #---------- git fetch ----------
2533 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2534 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2536 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2537 # locally fetched refs because they have unhelpful names and clutter
2538 # up gitk etc. So we track whether we have "used up" head ref (ie,
2539 # whether we have made another local ref which refers to this object).
2541 # (If we deleted them unconditionally, then we might end up
2542 # re-fetching the same git objects each time dgit fetch was run.)
2544 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2545 # in git_fetch_us to fetch the refs in question, and possibly a call
2546 # to lrfetchref_used.
2548 our (%lrfetchrefs_f, %lrfetchrefs_d);
2549 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2551 sub lrfetchref_used ($) {
2552 my ($fullrefname) = @_;
2553 my $objid = $lrfetchrefs_f{$fullrefname};
2554 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2557 sub git_lrfetch_sane {
2558 my ($url, $supplementary, @specs) = @_;
2559 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2560 # at least as regards @specs. Also leave the results in
2561 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2562 # able to clean these up.
2564 # With $supplementary==1, @specs must not contain wildcards
2565 # and we add to our previous fetches (non-atomically).
2567 # This is rather miserable:
2568 # When git fetch --prune is passed a fetchspec ending with a *,
2569 # it does a plausible thing. If there is no * then:
2570 # - it matches subpaths too, even if the supplied refspec
2571 # starts refs, and behaves completely madly if the source
2572 # has refs/refs/something. (See, for example, Debian #NNNN.)
2573 # - if there is no matching remote ref, it bombs out the whole
2575 # We want to fetch a fixed ref, and we don't know in advance
2576 # if it exists, so this is not suitable.
2578 # Our workaround is to use git ls-remote. git ls-remote has its
2579 # own qairks. Notably, it has the absurd multi-tail-matching
2580 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2581 # refs/refs/foo etc.
2583 # Also, we want an idempotent snapshot, but we have to make two
2584 # calls to the remote: one to git ls-remote and to git fetch. The
2585 # solution is use git ls-remote to obtain a target state, and
2586 # git fetch to try to generate it. If we don't manage to generate
2587 # the target state, we try again.
2589 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2591 my $specre = join '|', map {
2594 my $wildcard = $x =~ s/\\\*$/.*/;
2595 die if $wildcard && $supplementary;
2598 printdebug "git_lrfetch_sane specre=$specre\n";
2599 my $wanted_rref = sub {
2601 return m/^(?:$specre)$/;
2604 my $fetch_iteration = 0;
2607 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2608 if (++$fetch_iteration > 10) {
2609 fail "too many iterations trying to get sane fetch!";
2612 my @look = map { "refs/$_" } @specs;
2613 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2617 open GITLS, "-|", @lcmd or die $!;
2619 printdebug "=> ", $_;
2620 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2621 my ($objid,$rrefname) = ($1,$2);
2622 if (!$wanted_rref->($rrefname)) {
2624 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2628 $wantr{$rrefname} = $objid;
2631 close GITLS or failedcmd @lcmd;
2633 # OK, now %want is exactly what we want for refs in @specs
2635 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2636 "+refs/$_:".lrfetchrefs."/$_";
2639 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2641 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2642 runcmd_ordryrun_local @fcmd if @fspecs;
2644 if (!$supplementary) {
2645 %lrfetchrefs_f = ();
2649 git_for_each_ref(lrfetchrefs, sub {
2650 my ($objid,$objtype,$lrefname,$reftail) = @_;
2651 $lrfetchrefs_f{$lrefname} = $objid;
2652 $objgot{$objid} = 1;
2655 if ($supplementary) {
2659 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2660 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2661 if (!exists $wantr{$rrefname}) {
2662 if ($wanted_rref->($rrefname)) {
2664 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2668 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2671 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2672 delete $lrfetchrefs_f{$lrefname};
2676 foreach my $rrefname (sort keys %wantr) {
2677 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2678 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2679 my $want = $wantr{$rrefname};
2680 next if $got eq $want;
2681 if (!defined $objgot{$want}) {
2683 warning: git ls-remote suggests we want $lrefname
2684 warning: and it should refer to $want
2685 warning: but git fetch didn't fetch that object to any relevant ref.
2686 warning: This may be due to a race with someone updating the server.
2687 warning: Will try again...
2689 next FETCH_ITERATION;
2692 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2694 runcmd_ordryrun_local @git, qw(update-ref -m),
2695 "dgit fetch git fetch fixup", $lrefname, $want;
2696 $lrfetchrefs_f{$lrefname} = $want;
2701 if (defined $csuite) {
2702 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2703 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2704 my ($objid,$objtype,$lrefname,$reftail) = @_;
2705 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2706 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2710 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2711 Dumper(\%lrfetchrefs_f);
2714 sub git_fetch_us () {
2715 # Want to fetch only what we are going to use, unless
2716 # deliberately-not-ff, in which case we must fetch everything.
2718 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2720 (quiltmode_splitbrain
2721 ? (map { $_->('*',access_nomdistro) }
2722 \&debiantag_new, \&debiantag_maintview)
2723 : debiantags('*',access_nomdistro));
2724 push @specs, server_branch($csuite);
2725 push @specs, $rewritemap;
2726 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2728 my $url = access_giturl();
2729 git_lrfetch_sane $url, 0, @specs;
2732 my @tagpats = debiantags('*',access_nomdistro);
2734 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2735 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2736 printdebug "currently $fullrefname=$objid\n";
2737 $here{$fullrefname} = $objid;
2739 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2740 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2741 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2742 printdebug "offered $lref=$objid\n";
2743 if (!defined $here{$lref}) {
2744 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2745 runcmd_ordryrun_local @upd;
2746 lrfetchref_used $fullrefname;
2747 } elsif ($here{$lref} eq $objid) {
2748 lrfetchref_used $fullrefname;
2751 "Not updating $lref from $here{$lref} to $objid.\n";
2756 #---------- dsc and archive handling ----------
2758 sub mergeinfo_getclogp ($) {
2759 # Ensures thit $mi->{Clogp} exists and returns it
2761 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2764 sub mergeinfo_version ($) {
2765 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2768 sub fetch_from_archive_record_1 ($) {
2770 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2771 'DGIT_ARCHIVE', $hash;
2772 cmdoutput @git, qw(log -n2), $hash;
2773 # ... gives git a chance to complain if our commit is malformed
2776 sub fetch_from_archive_record_2 ($) {
2778 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2782 dryrun_report @upd_cmd;
2786 sub parse_dsc_field_def_dsc_distro () {
2787 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2788 dgit.default.distro);
2791 sub parse_dsc_field ($$) {
2792 my ($dsc, $what) = @_;
2794 foreach my $field (@ourdscfield) {
2795 $f = $dsc->{$field};
2800 progress "$what: NO git hash";
2801 parse_dsc_field_def_dsc_distro();
2802 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2803 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2804 progress "$what: specified git info ($dsc_distro)";
2805 $dsc_hint_tag = [ $dsc_hint_tag ];
2806 } elsif ($f =~ m/^\w+\s*$/) {
2808 parse_dsc_field_def_dsc_distro();
2809 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2811 progress "$what: specified git hash";
2813 fail "$what: invalid Dgit info";
2817 sub resolve_dsc_field_commit ($$) {
2818 my ($already_distro, $already_mapref) = @_;
2820 return unless defined $dsc_hash;
2823 defined $already_mapref &&
2824 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2825 ? $already_mapref : undef;
2829 my ($what, @fetch) = @_;
2831 local $idistro = $dsc_distro;
2832 my $lrf = lrfetchrefs;
2834 if (!$chase_dsc_distro) {
2836 "not chasing .dsc distro $dsc_distro: not fetching $what";
2841 ".dsc names distro $dsc_distro: fetching $what";
2843 my $url = access_giturl();
2844 if (!defined $url) {
2845 defined $dsc_hint_url or fail <<END;
2846 .dsc Dgit metadata is in context of distro $dsc_distro
2847 for which we have no configured url and .dsc provides no hint
2850 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2851 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2852 parse_cfg_bool "dsc-url-proto-ok", 'false',
2853 cfg("dgit.dsc-url-proto-ok.$proto",
2854 "dgit.default.dsc-url-proto-ok")
2856 .dsc Dgit metadata is in context of distro $dsc_distro
2857 for which we have no configured url;
2858 .dsc provides hinted url with protocol $proto which is unsafe.
2859 (can be overridden by config - consult documentation)
2861 $url = $dsc_hint_url;
2864 git_lrfetch_sane $url, 1, @fetch;
2869 my $rewrite_enable = do {
2870 local $idistro = $dsc_distro;
2871 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2874 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2875 if (!defined $mapref) {
2876 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2877 $mapref = $lrf.'/'.$rewritemap;
2879 my $rewritemapdata = git_cat_file $mapref.':map';
2880 if (defined $rewritemapdata
2881 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2883 "server's git history rewrite map contains a relevant entry!";
2886 if (defined $dsc_hash) {
2887 progress "using rewritten git hash in place of .dsc value";
2889 progress "server data says .dsc hash is to be disregarded";
2894 if (!defined git_cat_file $dsc_hash) {
2895 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2896 my $lrf = $do_fetch->("additional commits", @tags) &&
2897 defined git_cat_file $dsc_hash
2899 .dsc Dgit metadata requires commit $dsc_hash
2900 but we could not obtain that object anywhere.
2902 foreach my $t (@tags) {
2903 my $fullrefname = $lrf.'/'.$t;
2904 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2905 next unless $lrfetchrefs_f{$fullrefname};
2906 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2907 lrfetchref_used $fullrefname;
2912 sub fetch_from_archive () {
2913 ensure_setup_existing_tree();
2915 # Ensures that lrref() is what is actually in the archive, one way
2916 # or another, according to us - ie this client's
2917 # appropritaely-updated archive view. Also returns the commit id.
2918 # If there is nothing in the archive, leaves lrref alone and
2919 # returns undef. git_fetch_us must have already been called.
2923 parse_dsc_field($dsc, 'last upload to archive');
2924 resolve_dsc_field_commit access_basedistro,
2925 lrfetchrefs."/".$rewritemap
2927 progress "no version available from the archive";
2930 # If the archive's .dsc has a Dgit field, there are three
2931 # relevant git commitids we need to choose between and/or merge
2933 # 1. $dsc_hash: the Dgit field from the archive
2934 # 2. $lastpush_hash: the suite branch on the dgit git server
2935 # 3. $lastfetch_hash: our local tracking brach for the suite
2937 # These may all be distinct and need not be in any fast forward
2940 # If the dsc was pushed to this suite, then the server suite
2941 # branch will have been updated; but it might have been pushed to
2942 # a different suite and copied by the archive. Conversely a more
2943 # recent version may have been pushed with dgit but not appeared
2944 # in the archive (yet).
2946 # $lastfetch_hash may be awkward because archive imports
2947 # (particularly, imports of Dgit-less .dscs) are performed only as
2948 # needed on individual clients, so different clients may perform a
2949 # different subset of them - and these imports are only made
2950 # public during push. So $lastfetch_hash may represent a set of
2951 # imports different to a subsequent upload by a different dgit
2954 # Our approach is as follows:
2956 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2957 # descendant of $dsc_hash, then it was pushed by a dgit user who
2958 # had based their work on $dsc_hash, so we should prefer it.
2959 # Otherwise, $dsc_hash was installed into this suite in the
2960 # archive other than by a dgit push, and (necessarily) after the
2961 # last dgit push into that suite (since a dgit push would have
2962 # been descended from the dgit server git branch); thus, in that
2963 # case, we prefer the archive's version (and produce a
2964 # pseudo-merge to overwrite the dgit server git branch).
2966 # (If there is no Dgit field in the archive's .dsc then
2967 # generate_commit_from_dsc uses the version numbers to decide
2968 # whether the suite branch or the archive is newer. If the suite
2969 # branch is newer it ignores the archive's .dsc; otherwise it
2970 # generates an import of the .dsc, and produces a pseudo-merge to
2971 # overwrite the suite branch with the archive contents.)
2973 # The outcome of that part of the algorithm is the `public view',
2974 # and is same for all dgit clients: it does not depend on any
2975 # unpublished history in the local tracking branch.
2977 # As between the public view and the local tracking branch: The
2978 # local tracking branch is only updated by dgit fetch, and
2979 # whenever dgit fetch runs it includes the public view in the
2980 # local tracking branch. Therefore if the public view is not
2981 # descended from the local tracking branch, the local tracking
2982 # branch must contain history which was imported from the archive
2983 # but never pushed; and, its tip is now out of date. So, we make
2984 # a pseudo-merge to overwrite the old imports and stitch the old
2987 # Finally: we do not necessarily reify the public view (as
2988 # described above). This is so that we do not end up stacking two
2989 # pseudo-merges. So what we actually do is figure out the inputs
2990 # to any public view pseudo-merge and put them in @mergeinputs.
2993 # $mergeinputs[]{Commit}
2994 # $mergeinputs[]{Info}
2995 # $mergeinputs[0] is the one whose tree we use
2996 # @mergeinputs is in the order we use in the actual commit)
2999 # $mergeinputs[]{Message} is a commit message to use
3000 # $mergeinputs[]{ReverseParents} if def specifies that parent
3001 # list should be in opposite order
3002 # Such an entry has no Commit or Info. It applies only when found
3003 # in the last entry. (This ugliness is to support making
3004 # identical imports to previous dgit versions.)
3006 my $lastpush_hash = git_get_ref(lrfetchref());
3007 printdebug "previous reference hash=$lastpush_hash\n";
3008 $lastpush_mergeinput = $lastpush_hash && {
3009 Commit => $lastpush_hash,
3010 Info => "dgit suite branch on dgit git server",
3013 my $lastfetch_hash = git_get_ref(lrref());
3014 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3015 my $lastfetch_mergeinput = $lastfetch_hash && {
3016 Commit => $lastfetch_hash,
3017 Info => "dgit client's archive history view",
3020 my $dsc_mergeinput = $dsc_hash && {
3021 Commit => $dsc_hash,
3022 Info => "Dgit field in .dsc from archive",
3026 my $del_lrfetchrefs = sub {
3029 printdebug "del_lrfetchrefs...\n";
3030 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3031 my $objid = $lrfetchrefs_d{$fullrefname};
3032 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3034 $gur ||= new IO::Handle;
3035 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3037 printf $gur "delete %s %s\n", $fullrefname, $objid;
3040 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3044 if (defined $dsc_hash) {
3045 ensure_we_have_orig();
3046 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3047 @mergeinputs = $dsc_mergeinput
3048 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3049 print STDERR <<END or die $!;
3051 Git commit in archive is behind the last version allegedly pushed/uploaded.
3052 Commit referred to by archive: $dsc_hash
3053 Last version pushed with dgit: $lastpush_hash
3056 @mergeinputs = ($lastpush_mergeinput);
3058 # Archive has .dsc which is not a descendant of the last dgit
3059 # push. This can happen if the archive moves .dscs about.
3060 # Just follow its lead.
3061 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3062 progress "archive .dsc names newer git commit";
3063 @mergeinputs = ($dsc_mergeinput);
3065 progress "archive .dsc names other git commit, fixing up";
3066 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3070 @mergeinputs = generate_commits_from_dsc();
3071 # We have just done an import. Now, our import algorithm might
3072 # have been improved. But even so we do not want to generate
3073 # a new different import of the same package. So if the
3074 # version numbers are the same, just use our existing version.
3075 # If the version numbers are different, the archive has changed
3076 # (perhaps, rewound).
3077 if ($lastfetch_mergeinput &&
3078 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3079 (mergeinfo_version $mergeinputs[0]) )) {
3080 @mergeinputs = ($lastfetch_mergeinput);
3082 } elsif ($lastpush_hash) {
3083 # only in git, not in the archive yet
3084 @mergeinputs = ($lastpush_mergeinput);
3085 print STDERR <<END or die $!;
3087 Package not found in the archive, but has allegedly been pushed using dgit.
3091 printdebug "nothing found!\n";
3092 if (defined $skew_warning_vsn) {
3093 print STDERR <<END or die $!;
3095 Warning: relevant archive skew detected.
3096 Archive allegedly contains $skew_warning_vsn
3097 But we were not able to obtain any version from the archive or git.
3101 unshift @end, $del_lrfetchrefs;
3105 if ($lastfetch_hash &&
3107 my $h = $_->{Commit};
3108 $h and is_fast_fwd($lastfetch_hash, $h);
3109 # If true, one of the existing parents of this commit
3110 # is a descendant of the $lastfetch_hash, so we'll
3111 # be ff from that automatically.
3115 push @mergeinputs, $lastfetch_mergeinput;
3118 printdebug "fetch mergeinfos:\n";
3119 foreach my $mi (@mergeinputs) {
3121 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3123 printdebug sprintf " ReverseParents=%d Message=%s",
3124 $mi->{ReverseParents}, $mi->{Message};
3128 my $compat_info= pop @mergeinputs
3129 if $mergeinputs[$#mergeinputs]{Message};
3131 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3134 if (@mergeinputs > 1) {
3136 my $tree_commit = $mergeinputs[0]{Commit};
3138 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3139 $tree =~ m/\n\n/; $tree = $`;
3140 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3143 # We use the changelog author of the package in question the
3144 # author of this pseudo-merge. This is (roughly) correct if
3145 # this commit is simply representing aa non-dgit upload.
3146 # (Roughly because it does not record sponsorship - but we
3147 # don't have sponsorship info because that's in the .changes,
3148 # which isn't in the archivw.)
3150 # But, it might be that we are representing archive history
3151 # updates (including in-archive copies). These are not really
3152 # the responsibility of the person who created the .dsc, but
3153 # there is no-one whose name we should better use. (The
3154 # author of the .dsc-named commit is clearly worse.)
3156 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3157 my $author = clogp_authline $useclogp;
3158 my $cversion = getfield $useclogp, 'Version';
3160 my $mcf = ".git/dgit/mergecommit";
3161 open MC, ">", $mcf or die "$mcf $!";
3162 print MC <<END or die $!;
3166 my @parents = grep { $_->{Commit} } @mergeinputs;
3167 @parents = reverse @parents if $compat_info->{ReverseParents};
3168 print MC <<END or die $! foreach @parents;
3172 print MC <<END or die $!;
3178 if (defined $compat_info->{Message}) {
3179 print MC $compat_info->{Message} or die $!;
3181 print MC <<END or die $!;
3182 Record $package ($cversion) in archive suite $csuite
3186 my $message_add_info = sub {
3188 my $mversion = mergeinfo_version $mi;
3189 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3193 $message_add_info->($mergeinputs[0]);
3194 print MC <<END or die $!;
3195 should be treated as descended from
3197 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3201 $hash = make_commit $mcf;
3203 $hash = $mergeinputs[0]{Commit};
3205 printdebug "fetch hash=$hash\n";
3208 my ($lasth, $what) = @_;
3209 return unless $lasth;
3210 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3213 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3215 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3217 fetch_from_archive_record_1($hash);
3219 if (defined $skew_warning_vsn) {
3221 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3222 my $gotclogp = commit_getclogp($hash);
3223 my $got_vsn = getfield $gotclogp, 'Version';
3224 printdebug "SKEW CHECK GOT $got_vsn\n";
3225 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3226 print STDERR <<END or die $!;
3228 Warning: archive skew detected. Using the available version:
3229 Archive allegedly contains $skew_warning_vsn
3230 We were able to obtain only $got_vsn
3236 if ($lastfetch_hash ne $hash) {
3237 fetch_from_archive_record_2($hash);
3240 lrfetchref_used lrfetchref();
3242 check_gitattrs($hash, "fetched source tree");
3244 unshift @end, $del_lrfetchrefs;
3248 sub set_local_git_config ($$) {
3250 runcmd @git, qw(config), $k, $v;
3253 sub setup_mergechangelogs (;$) {
3255 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3257 my $driver = 'dpkg-mergechangelogs';
3258 my $cb = "merge.$driver";
3259 my $attrs = '.git/info/attributes';
3260 ensuredir '.git/info';
3262 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3263 if (!open ATTRS, "<", $attrs) {
3264 $!==ENOENT or die "$attrs: $!";
3268 next if m{^debian/changelog\s};
3269 print NATTRS $_, "\n" or die $!;
3271 ATTRS->error and die $!;
3274 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3277 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3278 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3280 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3283 sub setup_useremail (;$) {
3285 return unless $always || access_cfg_bool(1, 'setup-useremail');
3288 my ($k, $envvar) = @_;
3289 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3290 return unless defined $v;
3291 set_local_git_config "user.$k", $v;
3294 $setup->('email', 'DEBEMAIL');
3295 $setup->('name', 'DEBFULLNAME');
3298 sub ensure_setup_existing_tree () {
3299 my $k = "remote.$remotename.skipdefaultupdate";
3300 my $c = git_get_config $k;
3301 return if defined $c;
3302 set_local_git_config $k, 'true';
3305 sub open_gitattrs () {
3306 my $gai = new IO::File ".git/info/attributes"
3308 or die "open .git/info/attributes: $!";
3312 sub is_gitattrs_setup () {
3313 my $gai = open_gitattrs();
3314 return 0 unless $gai;
3316 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3318 $gai->error and die $!;
3322 sub setup_gitattrs (;$) {
3324 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3326 if (is_gitattrs_setup()) {
3328 [attr]dgit-defuse-attrs already found in .git/info/attributes
3329 not doing further gitattributes setup
3333 my $af = ".git/info/attributes";
3334 ensuredir '.git/info';
3335 open GAO, "> $af.new" or die $!;
3336 print GAO <<END or die $!;
3338 [attr]dgit-defuse-attrs $negate_harmful_gitattrs
3339 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3341 my $gai = open_gitattrs();
3345 print GAO $_, "\n" or die $!;
3347 $gai->error and die $!;
3349 close GAO or die $!;
3350 rename "$af.new", "$af" or die "install $af: $!";
3353 sub setup_new_tree () {
3354 setup_mergechangelogs();
3359 sub check_gitattrs ($$) {
3360 my ($treeish, $what) = @_;
3362 return if is_gitattrs_setup;
3365 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3367 my $gafl = new IO::File;
3368 open $gafl, "-|", @cmd or die $!;
3371 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3373 next unless m{(?:^|/)\.gitattributes$};
3375 # oh dear, found one
3377 dgit: warning: $what contains .gitattributes
3378 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3383 # tree contains no .gitattributes files
3384 $?=0; $!=0; close $gafl or failedcmd @cmd;
3388 sub multisuite_suite_child ($$$) {
3389 my ($tsuite, $merginputs, $fn) = @_;
3390 # in child, sets things up, calls $fn->(), and returns undef
3391 # in parent, returns canonical suite name for $tsuite
3392 my $canonsuitefh = IO::File::new_tmpfile;
3393 my $pid = fork // die $!;
3397 $us .= " [$isuite]";
3398 $debugprefix .= " ";
3399 progress "fetching $tsuite...";
3400 canonicalise_suite();
3401 print $canonsuitefh $csuite, "\n" or die $!;
3402 close $canonsuitefh or die $!;
3406 waitpid $pid,0 == $pid or die $!;
3407 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3408 seek $canonsuitefh,0,0 or die $!;
3409 local $csuite = <$canonsuitefh>;
3410 die $! unless defined $csuite && chomp $csuite;
3412 printdebug "multisuite $tsuite missing\n";
3415 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3416 push @$merginputs, {
3423 sub fork_for_multisuite ($) {
3424 my ($before_fetch_merge) = @_;
3425 # if nothing unusual, just returns ''
3428 # returns 0 to caller in child, to do first of the specified suites
3429 # in child, $csuite is not yet set
3431 # returns 1 to caller in parent, to finish up anything needed after
3432 # in parent, $csuite is set to canonicalised portmanteau
3434 my $org_isuite = $isuite;
3435 my @suites = split /\,/, $isuite;
3436 return '' unless @suites > 1;
3437 printdebug "fork_for_multisuite: @suites\n";
3441 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3443 return 0 unless defined $cbasesuite;
3445 fail "package $package missing in (base suite) $cbasesuite"
3446 unless @mergeinputs;
3448 my @csuites = ($cbasesuite);
3450 $before_fetch_merge->();
3452 foreach my $tsuite (@suites[1..$#suites]) {
3453 $tsuite =~ s/^-/$cbasesuite-/;
3454 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3460 # xxx collecte the ref here
3462 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3463 push @csuites, $csubsuite;
3466 foreach my $mi (@mergeinputs) {
3467 my $ref = git_get_ref $mi->{Ref};
3468 die "$mi->{Ref} ?" unless length $ref;
3469 $mi->{Commit} = $ref;
3472 $csuite = join ",", @csuites;
3474 my $previous = git_get_ref lrref;
3476 unshift @mergeinputs, {
3477 Commit => $previous,
3478 Info => "local combined tracking branch",
3480 "archive seems to have rewound: local tracking branch is ahead!",
3484 foreach my $ix (0..$#mergeinputs) {
3485 $mergeinputs[$ix]{Index} = $ix;
3488 @mergeinputs = sort {
3489 -version_compare(mergeinfo_version $a,
3490 mergeinfo_version $b) # highest version first
3492 $a->{Index} <=> $b->{Index}; # earliest in spec first
3498 foreach my $mi (@mergeinputs) {
3499 printdebug "multisuite merge check $mi->{Info}\n";
3500 foreach my $previous (@needed) {
3501 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3502 printdebug "multisuite merge un-needed $previous->{Info}\n";
3506 printdebug "multisuite merge this-needed\n";
3507 $mi->{Character} = '+';
3510 $needed[0]{Character} = '*';
3512 my $output = $needed[0]{Commit};
3515 printdebug "multisuite merge nontrivial\n";
3516 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3518 my $commit = "tree $tree\n";
3519 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3520 "Input branches:\n";
3522 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3523 printdebug "multisuite merge include $mi->{Info}\n";
3524 $mi->{Character} //= ' ';
3525 $commit .= "parent $mi->{Commit}\n";
3526 $msg .= sprintf " %s %-25s %s\n",
3528 (mergeinfo_version $mi),
3531 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3533 " * marks the highest version branch, which choose to use\n".
3534 " + marks each branch which was not already an ancestor\n\n".
3535 "[dgit multi-suite $csuite]\n";
3537 "author $authline\n".
3538 "committer $authline\n\n";
3539 $output = make_commit_text $commit.$msg;
3540 printdebug "multisuite merge generated $output\n";
3543 fetch_from_archive_record_1($output);
3544 fetch_from_archive_record_2($output);
3546 progress "calculated combined tracking suite $csuite";
3551 sub clone_set_head () {
3552 open H, "> .git/HEAD" or die $!;
3553 print H "ref: ".lref()."\n" or die $!;
3556 sub clone_finish ($) {
3558 runcmd @git, qw(reset --hard), lrref();
3559 runcmd qw(bash -ec), <<'END';
3561 git ls-tree -r --name-only -z HEAD | \
3562 xargs -0r touch -h -r . --
3564 printdone "ready for work in $dstdir";
3568 # in multisuite, returns twice!
3569 # once in parent after first suite fetched,
3570 # and then again in child after everything is finished
3572 badusage "dry run makes no sense with clone" unless act_local();
3574 my $multi_fetched = fork_for_multisuite(sub {
3575 printdebug "multi clone before fetch merge\n";
3578 if ($multi_fetched) {
3579 printdebug "multi clone after fetch merge\n";
3581 clone_finish($dstdir);
3584 printdebug "clone main body\n";
3586 canonicalise_suite();
3587 my $hasgit = check_for_git();
3588 mkdir $dstdir or fail "create \`$dstdir': $!";
3590 runcmd @git, qw(init -q);
3593 my $giturl = access_giturl(1);
3594 if (defined $giturl) {
3595 runcmd @git, qw(remote add), 'origin', $giturl;
3598 progress "fetching existing git history";
3600 runcmd_ordryrun_local @git, qw(fetch origin);
3602 progress "starting new git history";
3604 fetch_from_archive() or no_such_package;
3605 my $vcsgiturl = $dsc->{'Vcs-Git'};
3606 if (length $vcsgiturl) {
3607 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3608 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3610 clone_finish($dstdir);
3614 canonicalise_suite();
3615 if (check_for_git()) {
3618 fetch_from_archive() or no_such_package();
3619 printdone "fetched into ".lrref();
3623 my $multi_fetched = fork_for_multisuite(sub { });
3624 fetch() unless $multi_fetched; # parent
3625 return if $multi_fetched eq '0'; # child
3626 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3628 printdone "fetched to ".lrref()." and merged into HEAD";
3631 sub check_not_dirty () {
3632 foreach my $f (qw(local-options local-patch-header)) {
3633 if (stat_exists "debian/source/$f") {
3634 fail "git tree contains debian/source/$f";
3638 return if $ignoredirty;
3640 my @cmd = (@git, qw(diff --quiet HEAD));
3642 $!=0; $?=-1; system @cmd;
3645 fail "working tree is dirty (does not match HEAD)";
3651 sub commit_admin ($) {
3654 runcmd_ordryrun_local @git, qw(commit -m), $m;
3657 sub commit_quilty_patch () {
3658 my $output = cmdoutput @git, qw(status --porcelain);
3660 foreach my $l (split /\n/, $output) {
3661 next unless $l =~ m/\S/;
3662 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3666 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3668 progress "nothing quilty to commit, ok.";
3671 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3672 runcmd_ordryrun_local @git, qw(add -f), @adds;
3674 Commit Debian 3.0 (quilt) metadata
3676 [dgit ($our_version) quilt-fixup]
3680 sub get_source_format () {
3682 if (open F, "debian/source/options") {
3686 s/\s+$//; # ignore missing final newline
3688 my ($k, $v) = ($`, $'); #');
3689 $v =~ s/^"(.*)"$/$1/;
3695 F->error and die $!;
3698 die $! unless $!==&ENOENT;
3701 if (!open F, "debian/source/format") {
3702 die $! unless $!==&ENOENT;
3706 F->error and die $!;
3708 return ($_, \%options);
3711 sub madformat_wantfixup ($) {
3713 return 0 unless $format eq '3.0 (quilt)';
3714 our $quilt_mode_warned;
3715 if ($quilt_mode eq 'nocheck') {
3716 progress "Not doing any fixup of \`$format' due to".
3717 " ----no-quilt-fixup or --quilt=nocheck"
3718 unless $quilt_mode_warned++;
3721 progress "Format \`$format', need to check/update patch stack"
3722 unless $quilt_mode_warned++;
3726 sub maybe_split_brain_save ($$$) {
3727 my ($headref, $dgitview, $msg) = @_;
3728 # => message fragment "$saved" describing disposition of $dgitview
3729 return "commit id $dgitview" unless defined $split_brain_save;
3730 my @cmd = (shell_cmd "cd ../../../..",
3731 @git, qw(update-ref -m),
3732 "dgit --dgit-view-save $msg HEAD=$headref",
3733 $split_brain_save, $dgitview);
3735 return "and left in $split_brain_save";
3738 # An "infopair" is a tuple [ $thing, $what ]
3739 # (often $thing is a commit hash; $what is a description)
3741 sub infopair_cond_equal ($$) {
3743 $x->[0] eq $y->[0] or fail <<END;
3744 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3748 sub infopair_lrf_tag_lookup ($$) {
3749 my ($tagnames, $what) = @_;
3750 # $tagname may be an array ref
3751 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3752 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3753 foreach my $tagname (@tagnames) {
3754 my $lrefname = lrfetchrefs."/tags/$tagname";
3755 my $tagobj = $lrfetchrefs_f{$lrefname};
3756 next unless defined $tagobj;
3757 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3758 return [ git_rev_parse($tagobj), $what ];
3760 fail @tagnames==1 ? <<END : <<END;
3761 Wanted tag $what (@tagnames) on dgit server, but not found
3763 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3767 sub infopair_cond_ff ($$) {
3768 my ($anc,$desc) = @_;
3769 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3770 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3774 sub pseudomerge_version_check ($$) {
3775 my ($clogp, $archive_hash) = @_;
3777 my $arch_clogp = commit_getclogp $archive_hash;
3778 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3779 'version currently in archive' ];
3780 if (defined $overwrite_version) {
3781 if (length $overwrite_version) {
3782 infopair_cond_equal([ $overwrite_version,
3783 '--overwrite= version' ],
3786 my $v = $i_arch_v->[0];
3787 progress "Checking package changelog for archive version $v ...";
3790 my @xa = ("-f$v", "-t$v");
3791 my $vclogp = parsechangelog @xa;
3794 [ (getfield $vclogp, $fn),
3795 "$fn field from dpkg-parsechangelog @xa" ];
3797 my $cv = $gf->('Version');
3798 infopair_cond_equal($i_arch_v, $cv);
3799 $cd = $gf->('Distribution');
3802 $@ =~ s/^dgit: //gm;
3804 "Perhaps debian/changelog does not mention $v ?";
3806 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3807 $cd->[1] is $cd->[0]
3808 Your tree seems to based on earlier (not uploaded) $v.
3813 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3817 sub pseudomerge_make_commit ($$$$ $$) {
3818 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3819 $msg_cmd, $msg_msg) = @_;
3820 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3822 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3823 my $authline = clogp_authline $clogp;
3827 !defined $overwrite_version ? ""
3828 : !length $overwrite_version ? " --overwrite"
3829 : " --overwrite=".$overwrite_version;
3832 my $pmf = ".git/dgit/pseudomerge";
3833 open MC, ">", $pmf or die "$pmf $!";
3834 print MC <<END or die $!;
3837 parent $archive_hash
3847 return make_commit($pmf);
3850 sub splitbrain_pseudomerge ($$$$) {
3851 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3852 # => $merged_dgitview
3853 printdebug "splitbrain_pseudomerge...\n";
3855 # We: debian/PREVIOUS HEAD($maintview)
3856 # expect: o ----------------- o
3859 # a/d/PREVIOUS $dgitview
3862 # we do: `------------------ o
3866 return $dgitview unless defined $archive_hash;
3867 return $dgitview if deliberately_not_fast_forward();
3869 printdebug "splitbrain_pseudomerge...\n";
3871 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3873 if (!defined $overwrite_version) {
3874 progress "Checking that HEAD inciudes all changes in archive...";
3877 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3879 if (defined $overwrite_version) {
3881 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3882 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3883 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3884 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3885 my $i_archive = [ $archive_hash, "current archive contents" ];
3887 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3889 infopair_cond_equal($i_dgit, $i_archive);
3890 infopair_cond_ff($i_dep14, $i_dgit);
3891 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3895 $us: check failed (maybe --overwrite is needed, consult documentation)
3900 my $r = pseudomerge_make_commit
3901 $clogp, $dgitview, $archive_hash, $i_arch_v,
3902 "dgit --quilt=$quilt_mode",
3903 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3904 Declare fast forward from $i_arch_v->[0]
3906 Make fast forward from $i_arch_v->[0]
3909 maybe_split_brain_save $maintview, $r, "pseudomerge";
3911 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3915 sub plain_overwrite_pseudomerge ($$$) {
3916 my ($clogp, $head, $archive_hash) = @_;
3918 printdebug "plain_overwrite_pseudomerge...";
3920 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3922 return $head if is_fast_fwd $archive_hash, $head;
3924 my $m = "Declare fast forward from $i_arch_v->[0]";
3926 my $r = pseudomerge_make_commit
3927 $clogp, $head, $archive_hash, $i_arch_v,
3930 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3932 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3936 sub push_parse_changelog ($) {
3939 my $clogp = Dpkg::Control::Hash->new();
3940 $clogp->load($clogpfn) or die;
3942 my $clogpackage = getfield $clogp, 'Source';
3943 $package //= $clogpackage;
3944 fail "-p specified $package but changelog specified $clogpackage"
3945 unless $package eq $clogpackage;
3946 my $cversion = getfield $clogp, 'Version';
3948 if (!$we_are_initiator) {
3949 # rpush initiator can't do this because it doesn't have $isuite yet
3950 my $tag = debiantag($cversion, access_nomdistro);
3951 runcmd @git, qw(check-ref-format), $tag;
3954 my $dscfn = dscfn($cversion);
3956 return ($clogp, $cversion, $dscfn);
3959 sub push_parse_dsc ($$$) {
3960 my ($dscfn,$dscfnwhat, $cversion) = @_;
3961 $dsc = parsecontrol($dscfn,$dscfnwhat);
3962 my $dversion = getfield $dsc, 'Version';
3963 my $dscpackage = getfield $dsc, 'Source';
3964 ($dscpackage eq $package && $dversion eq $cversion) or
3965 fail "$dscfn is for $dscpackage $dversion".
3966 " but debian/changelog is for $package $cversion";
3969 sub push_tagwants ($$$$) {
3970 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3973 TagFn => \&debiantag,
3978 if (defined $maintviewhead) {
3980 TagFn => \&debiantag_maintview,
3981 Objid => $maintviewhead,
3982 TfSuffix => '-maintview',
3985 } elsif ($dodep14tag eq 'no' ? 0
3986 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3987 : $dodep14tag eq 'always'
3988 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3989 --dep14tag-always (or equivalent in config) means server must support
3990 both "new" and "maint" tag formats, but config says it doesn't.
3992 : die "$dodep14tag ?") {
3994 TagFn => \&debiantag_maintview,
3996 TfSuffix => '-dgit',
4000 foreach my $tw (@tagwants) {
4001 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4002 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4004 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4008 sub push_mktags ($$ $$ $) {
4010 $changesfile,$changesfilewhat,
4013 die unless $tagwants->[0]{View} eq 'dgit';
4015 my $declaredistro = access_nomdistro();
4016 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4017 $dsc->{$ourdscfield[0]} = join " ",
4018 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4020 $dsc->save("$dscfn.tmp") or die $!;
4022 my $changes = parsecontrol($changesfile,$changesfilewhat);
4023 foreach my $field (qw(Source Distribution Version)) {
4024 $changes->{$field} eq $clogp->{$field} or
4025 fail "changes field $field \`$changes->{$field}'".
4026 " does not match changelog \`$clogp->{$field}'";
4029 my $cversion = getfield $clogp, 'Version';
4030 my $clogsuite = getfield $clogp, 'Distribution';
4032 # We make the git tag by hand because (a) that makes it easier
4033 # to control the "tagger" (b) we can do remote signing
4034 my $authline = clogp_authline $clogp;
4035 my $delibs = join(" ", "",@deliberatelies);
4039 my $tfn = $tw->{Tfn};
4040 my $head = $tw->{Objid};
4041 my $tag = $tw->{Tag};
4043 open TO, '>', $tfn->('.tmp') or die $!;
4044 print TO <<END or die $!;
4051 if ($tw->{View} eq 'dgit') {
4052 print TO <<END or die $!;
4053 $package release $cversion for $clogsuite ($csuite) [dgit]
4054 [dgit distro=$declaredistro$delibs]
4056 foreach my $ref (sort keys %previously) {
4057 print TO <<END or die $!;
4058 [dgit previously:$ref=$previously{$ref}]
4061 } elsif ($tw->{View} eq 'maint') {
4062 print TO <<END or die $!;
4063 $package release $cversion for $clogsuite ($csuite)
4064 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4067 die Dumper($tw)."?";
4072 my $tagobjfn = $tfn->('.tmp');
4074 if (!defined $keyid) {
4075 $keyid = access_cfg('keyid','RETURN-UNDEF');
4077 if (!defined $keyid) {
4078 $keyid = getfield $clogp, 'Maintainer';
4080 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4081 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4082 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4083 push @sign_cmd, $tfn->('.tmp');
4084 runcmd_ordryrun @sign_cmd;
4086 $tagobjfn = $tfn->('.signed.tmp');
4087 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4088 $tfn->('.tmp'), $tfn->('.tmp.asc');
4094 my @r = map { $mktag->($_); } @$tagwants;
4098 sub sign_changes ($) {
4099 my ($changesfile) = @_;
4101 my @debsign_cmd = @debsign;
4102 push @debsign_cmd, "-k$keyid" if defined $keyid;
4103 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4104 push @debsign_cmd, $changesfile;
4105 runcmd_ordryrun @debsign_cmd;
4110 printdebug "actually entering push\n";
4112 supplementary_message(<<'END');
4113 Push failed, while checking state of the archive.
4114 You can retry the push, after fixing the problem, if you like.
4116 if (check_for_git()) {
4119 my $archive_hash = fetch_from_archive();
4120 if (!$archive_hash) {
4122 fail "package appears to be new in this suite;".
4123 " if this is intentional, use --new";
4126 supplementary_message(<<'END');
4127 Push failed, while preparing your push.
4128 You can retry the push, after fixing the problem, if you like.
4131 need_tagformat 'new', "quilt mode $quilt_mode"
4132 if quiltmode_splitbrain;
4136 access_giturl(); # check that success is vaguely likely
4137 rpush_handle_protovsn_bothends() if $we_are_initiator;
4140 my $clogpfn = ".git/dgit/changelog.822.tmp";
4141 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4143 responder_send_file('parsed-changelog', $clogpfn);
4145 my ($clogp, $cversion, $dscfn) =
4146 push_parse_changelog("$clogpfn");
4148 my $dscpath = "$buildproductsdir/$dscfn";
4149 stat_exists $dscpath or
4150 fail "looked for .dsc $dscpath, but $!;".
4151 " maybe you forgot to build";
4153 responder_send_file('dsc', $dscpath);
4155 push_parse_dsc($dscpath, $dscfn, $cversion);
4157 my $format = getfield $dsc, 'Format';
4158 printdebug "format $format\n";
4160 my $actualhead = git_rev_parse('HEAD');
4161 my $dgithead = $actualhead;
4162 my $maintviewhead = undef;
4164 my $upstreamversion = upstreamversion $clogp->{Version};
4166 if (madformat_wantfixup($format)) {
4167 # user might have not used dgit build, so maybe do this now:
4168 if (quiltmode_splitbrain()) {
4169 changedir $playground;
4170 quilt_make_fake_dsc($upstreamversion);
4172 ($dgithead, $cachekey) =
4173 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4175 "--quilt=$quilt_mode but no cached dgit view:
4176 perhaps tree changed since dgit build[-source] ?";
4178 $dgithead = splitbrain_pseudomerge($clogp,
4179 $actualhead, $dgithead,
4181 $maintviewhead = $actualhead;
4183 prep_ud(); # so _only_subdir() works, below
4185 commit_quilty_patch();
4189 if (defined $overwrite_version && !defined $maintviewhead) {
4190 $dgithead = plain_overwrite_pseudomerge($clogp,
4198 if ($archive_hash) {
4199 if (is_fast_fwd($archive_hash, $dgithead)) {
4201 } elsif (deliberately_not_fast_forward) {
4204 fail "dgit push: HEAD is not a descendant".
4205 " of the archive's version.\n".
4206 "To overwrite the archive's contents,".
4207 " pass --overwrite[=VERSION].\n".
4208 "To rewind history, if permitted by the archive,".
4209 " use --deliberately-not-fast-forward.";
4213 changedir $playground;
4214 progress "checking that $dscfn corresponds to HEAD";
4215 runcmd qw(dpkg-source -x --),
4216 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4217 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4218 check_for_vendor_patches() if madformat($dsc->{format});
4220 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4221 debugcmd "+",@diffcmd;
4223 my $r = system @diffcmd;
4226 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4228 HEAD specifies a different tree to $dscfn:
4230 Perhaps you forgot to build. Or perhaps there is a problem with your
4231 source tree (see dgit(7) for some hints). To see a full diff, run
4238 if (!$changesfile) {
4239 my $pat = changespat $cversion;
4240 my @cs = glob "$buildproductsdir/$pat";
4241 fail "failed to find unique changes file".
4242 " (looked for $pat in $buildproductsdir);".
4243 " perhaps you need to use dgit -C"
4245 ($changesfile) = @cs;
4247 $changesfile = "$buildproductsdir/$changesfile";
4250 # Check that changes and .dsc agree enough
4251 $changesfile =~ m{[^/]*$};
4252 my $changes = parsecontrol($changesfile,$&);
4253 files_compare_inputs($dsc, $changes)
4254 unless forceing [qw(dsc-changes-mismatch)];
4256 # Perhaps adjust .dsc to contain right set of origs
4257 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4259 unless forceing [qw(changes-origs-exactly)];
4261 # Checks complete, we're going to try and go ahead:
4263 responder_send_file('changes',$changesfile);
4264 responder_send_command("param head $dgithead");
4265 responder_send_command("param csuite $csuite");
4266 responder_send_command("param isuite $isuite");
4267 responder_send_command("param tagformat $tagformat");
4268 if (defined $maintviewhead) {
4269 die unless ($protovsn//4) >= 4;
4270 responder_send_command("param maint-view $maintviewhead");
4273 # Perhaps send buildinfo(s) for signing
4274 my $changes_files = getfield $changes, 'Files';
4275 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4276 foreach my $bi (@buildinfos) {
4277 responder_send_command("param buildinfo-filename $bi");
4278 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4281 if (deliberately_not_fast_forward) {
4282 git_for_each_ref(lrfetchrefs, sub {
4283 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4284 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4285 responder_send_command("previously $rrefname=$objid");
4286 $previously{$rrefname} = $objid;
4290 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4294 supplementary_message(<<'END');
4295 Push failed, while signing the tag.
4296 You can retry the push, after fixing the problem, if you like.
4298 # If we manage to sign but fail to record it anywhere, it's fine.
4299 if ($we_are_responder) {
4300 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4301 responder_receive_files('signed-tag', @tagobjfns);
4303 @tagobjfns = push_mktags($clogp,$dscpath,
4304 $changesfile,$changesfile,
4307 supplementary_message(<<'END');
4308 Push failed, *after* signing the tag.
4309 If you want to try again, you should use a new version number.
4312 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4314 foreach my $tw (@tagwants) {
4315 my $tag = $tw->{Tag};
4316 my $tagobjfn = $tw->{TagObjFn};
4318 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4319 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4320 runcmd_ordryrun_local
4321 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4324 supplementary_message(<<'END');
4325 Push failed, while updating the remote git repository - see messages above.
4326 If you want to try again, you should use a new version number.
4328 if (!check_for_git()) {
4329 create_remote_git_repo();
4332 my @pushrefs = $forceflag.$dgithead.":".rrref();
4333 foreach my $tw (@tagwants) {
4334 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4337 runcmd_ordryrun @git,
4338 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4339 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4341 supplementary_message(<<'END');
4342 Push failed, while obtaining signatures on the .changes and .dsc.
4343 If it was just that the signature failed, you may try again by using
4344 debsign by hand to sign the changes
4346 and then dput to complete the upload.
4347 If you need to change the package, you must use a new version number.
4349 if ($we_are_responder) {
4350 my $dryrunsuffix = act_local() ? "" : ".tmp";
4351 my @rfiles = ($dscpath, $changesfile);
4352 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4353 responder_receive_files('signed-dsc-changes',
4354 map { "$_$dryrunsuffix" } @rfiles);
4357 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4359 progress "[new .dsc left in $dscpath.tmp]";
4361 sign_changes $changesfile;
4364 supplementary_message(<<END);
4365 Push failed, while uploading package(s) to the archive server.
4366 You can retry the upload of exactly these same files with dput of:
4368 If that .changes file is broken, you will need to use a new version
4369 number for your next attempt at the upload.
4371 my $host = access_cfg('upload-host','RETURN-UNDEF');
4372 my @hostarg = defined($host) ? ($host,) : ();
4373 runcmd_ordryrun @dput, @hostarg, $changesfile;
4374 printdone "pushed and uploaded $cversion";
4376 supplementary_message('');
4377 responder_send_command("complete");
4386 badusage "-p is not allowed with clone; specify as argument instead"
4387 if defined $package;
4390 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4391 ($package,$isuite) = @ARGV;
4392 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4393 ($package,$dstdir) = @ARGV;
4394 } elsif (@ARGV==3) {
4395 ($package,$isuite,$dstdir) = @ARGV;
4397 badusage "incorrect arguments to dgit clone";
4401 $dstdir ||= "$package";
4402 if (stat_exists $dstdir) {
4403 fail "$dstdir already exists";
4407 if ($rmonerror && !$dryrun_level) {
4408 $cwd_remove= getcwd();
4410 return unless defined $cwd_remove;
4411 if (!chdir "$cwd_remove") {
4412 return if $!==&ENOENT;
4413 die "chdir $cwd_remove: $!";
4415 printdebug "clone rmonerror removing $dstdir\n";
4417 rmtree($dstdir) or die "remove $dstdir: $!\n";
4418 } elsif (grep { $! == $_ }
4419 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4421 print STDERR "check whether to remove $dstdir: $!\n";
4427 $cwd_remove = undef;
4430 sub branchsuite () {
4431 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4432 my $branch = cmdoutput_errok @cmd;
4433 if (!defined $branch) {
4434 $?==256 or failedcmd @cmd;
4437 if ($branch =~ m#$lbranch_re#o) {
4444 sub fetchpullargs () {
4445 if (!defined $package) {
4446 my $sourcep = parsecontrol('debian/control','debian/control');
4447 $package = getfield $sourcep, 'Source';
4450 $isuite = branchsuite();
4452 my $clogp = parsechangelog();
4453 my $clogsuite = getfield $clogp, 'Distribution';
4454 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4456 } elsif (@ARGV==1) {
4459 badusage "incorrect arguments to dgit fetch or dgit pull";
4467 my $multi_fetched = fork_for_multisuite(sub { });
4468 exit 0 if $multi_fetched;
4475 if (quiltmode_splitbrain()) {
4476 my ($format, $fopts) = get_source_format();
4477 madformat($format) and fail <<END
4478 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4486 build_or_push_prep_early();
4491 } elsif (@ARGV==1) {
4492 ($specsuite) = (@ARGV);
4494 badusage "incorrect arguments to dgit $subcommand";
4497 local ($package) = $existing_package; # this is a hack
4498 canonicalise_suite();
4500 canonicalise_suite();
4502 if (defined $specsuite &&
4503 $specsuite ne $isuite &&
4504 $specsuite ne $csuite) {
4505 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4506 " but command line specifies $specsuite";
4515 #---------- remote commands' implementation ----------
4517 sub pre_remote_push_build_host {
4518 my ($nrargs) = shift @ARGV;
4519 my (@rargs) = @ARGV[0..$nrargs-1];
4520 @ARGV = @ARGV[$nrargs..$#ARGV];
4522 my ($dir,$vsnwant) = @rargs;
4523 # vsnwant is a comma-separated list; we report which we have
4524 # chosen in our ready response (so other end can tell if they
4527 $we_are_responder = 1;
4528 $us .= " (build host)";
4530 open PI, "<&STDIN" or die $!;
4531 open STDIN, "/dev/null" or die $!;
4532 open PO, ">&STDOUT" or die $!;
4534 open STDOUT, ">&STDERR" or die $!;
4538 ($protovsn) = grep {
4539 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4540 } @rpushprotovsn_support;
4542 fail "build host has dgit rpush protocol versions ".
4543 (join ",", @rpushprotovsn_support).
4544 " but invocation host has $vsnwant"
4545 unless defined $protovsn;
4549 sub cmd_remote_push_build_host {
4550 responder_send_command("dgit-remote-push-ready $protovsn");
4554 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4555 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4556 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4557 # a good error message)
4559 sub rpush_handle_protovsn_bothends () {
4560 if ($protovsn < 4) {
4561 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4570 my $report = i_child_report();
4571 if (defined $report) {
4572 printdebug "($report)\n";
4573 } elsif ($i_child_pid) {
4574 printdebug "(killing build host child $i_child_pid)\n";
4575 kill 15, $i_child_pid;
4577 if (defined $i_tmp && !defined $initiator_tempdir) {
4579 eval { rmtree $i_tmp; };
4584 return unless forkcheck_mainprocess();
4589 my ($base,$selector,@args) = @_;
4590 $selector =~ s/\-/_/g;
4591 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4600 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4608 push @rargs, join ",", @rpushprotovsn_support;
4611 push @rdgit, @ropts;
4612 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4614 my @cmd = (@ssh, $host, shellquote @rdgit);
4617 $we_are_initiator=1;
4619 if (defined $initiator_tempdir) {
4620 rmtree $initiator_tempdir;
4621 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4622 $i_tmp = $initiator_tempdir;
4626 $i_child_pid = open2(\*RO, \*RI, @cmd);
4628 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4629 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4630 $supplementary_message = '' unless $protovsn >= 3;
4633 my ($icmd,$iargs) = initiator_expect {
4634 m/^(\S+)(?: (.*))?$/;
4637 i_method "i_resp", $icmd, $iargs;
4641 sub i_resp_progress ($) {
4643 my $msg = protocol_read_bytes \*RO, $rhs;
4647 sub i_resp_supplementary_message ($) {
4649 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4652 sub i_resp_complete {
4653 my $pid = $i_child_pid;
4654 $i_child_pid = undef; # prevents killing some other process with same pid
4655 printdebug "waiting for build host child $pid...\n";
4656 my $got = waitpid $pid, 0;
4657 die $! unless $got == $pid;
4658 die "build host child failed $?" if $?;
4661 printdebug "all done\n";
4665 sub i_resp_file ($) {
4667 my $localname = i_method "i_localname", $keyword;
4668 my $localpath = "$i_tmp/$localname";
4669 stat_exists $localpath and
4670 badproto \*RO, "file $keyword ($localpath) twice";
4671 protocol_receive_file \*RO, $localpath;
4672 i_method "i_file", $keyword;
4677 sub i_resp_param ($) {
4678 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4682 sub i_resp_previously ($) {
4683 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4684 or badproto \*RO, "bad previously spec";
4685 my $r = system qw(git check-ref-format), $1;
4686 die "bad previously ref spec ($r)" if $r;
4687 $previously{$1} = $2;
4692 sub i_resp_want ($) {
4694 die "$keyword ?" if $i_wanted{$keyword}++;
4696 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4697 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4698 die unless $isuite =~ m/^$suite_re$/;
4701 rpush_handle_protovsn_bothends();
4703 fail "rpush negotiated protocol version $protovsn".
4704 " which does not support quilt mode $quilt_mode"
4705 if quiltmode_splitbrain;
4707 my @localpaths = i_method "i_want", $keyword;
4708 printdebug "[[ $keyword @localpaths\n";
4709 foreach my $localpath (@localpaths) {
4710 protocol_send_file \*RI, $localpath;
4712 print RI "files-end\n" or die $!;
4715 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4717 sub i_localname_parsed_changelog {
4718 return "remote-changelog.822";
4720 sub i_file_parsed_changelog {
4721 ($i_clogp, $i_version, $i_dscfn) =
4722 push_parse_changelog "$i_tmp/remote-changelog.822";
4723 die if $i_dscfn =~ m#/|^\W#;
4726 sub i_localname_dsc {
4727 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4732 sub i_localname_buildinfo ($) {
4733 my $bi = $i_param{'buildinfo-filename'};
4734 defined $bi or badproto \*RO, "buildinfo before filename";
4735 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4736 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4737 or badproto \*RO, "improper buildinfo filename";
4740 sub i_file_buildinfo {
4741 my $bi = $i_param{'buildinfo-filename'};
4742 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4743 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4744 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4745 files_compare_inputs($bd, $ch);
4746 (getfield $bd, $_) eq (getfield $ch, $_) or
4747 fail "buildinfo mismatch $_"
4748 foreach qw(Source Version);
4749 !defined $bd->{$_} or
4750 fail "buildinfo contains $_"
4751 foreach qw(Changes Changed-by Distribution);
4753 push @i_buildinfos, $bi;
4754 delete $i_param{'buildinfo-filename'};
4757 sub i_localname_changes {
4758 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4759 $i_changesfn = $i_dscfn;
4760 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4761 return $i_changesfn;
4763 sub i_file_changes { }
4765 sub i_want_signed_tag {
4766 printdebug Dumper(\%i_param, $i_dscfn);
4767 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4768 && defined $i_param{'csuite'}
4769 or badproto \*RO, "premature desire for signed-tag";
4770 my $head = $i_param{'head'};
4771 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4773 my $maintview = $i_param{'maint-view'};
4774 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4777 if ($protovsn >= 4) {
4778 my $p = $i_param{'tagformat'} // '<undef>';
4780 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4783 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4785 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4787 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4790 push_mktags $i_clogp, $i_dscfn,
4791 $i_changesfn, 'remote changes',
4795 sub i_want_signed_dsc_changes {
4796 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4797 sign_changes $i_changesfn;
4798 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4801 #---------- building etc. ----------
4807 #----- `3.0 (quilt)' handling -----
4809 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4811 sub quiltify_dpkg_commit ($$$;$) {
4812 my ($patchname,$author,$msg, $xinfo) = @_;
4816 my $descfn = ".git/dgit/quilt-description.tmp";
4817 open O, '>', $descfn or die "$descfn: $!";
4818 $msg =~ s/\n+/\n\n/;
4819 print O <<END or die $!;
4821 ${xinfo}Subject: $msg
4828 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4829 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4830 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4831 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4835 sub quiltify_trees_differ ($$;$$$) {
4836 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4837 # returns true iff the two tree objects differ other than in debian/
4838 # with $finegrained,
4839 # returns bitmask 01 - differ in upstream files except .gitignore
4840 # 02 - differ in .gitignore
4841 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4842 # is set for each modified .gitignore filename $fn
4843 # if $unrepres is defined, array ref to which is appeneded
4844 # a list of unrepresentable changes (removals of upstream files
4847 my @cmd = (@git, qw(diff-tree -z --no-renames));
4848 push @cmd, qw(--name-only) unless $unrepres;
4849 push @cmd, qw(-r) if $finegrained || $unrepres;
4851 my $diffs= cmdoutput @cmd;
4854 foreach my $f (split /\0/, $diffs) {
4855 if ($unrepres && !@lmodes) {
4856 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4859 my ($oldmode,$newmode) = @lmodes;
4862 next if $f =~ m#^debian(?:/.*)?$#s;
4866 die "not a plain file or symlink\n"
4867 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
4868 $oldmode =~ m/^(?:10|12)\d{4}$/;
4869 if ($oldmode =~ m/[^0]/ &&
4870 $newmode =~ m/[^0]/) {
4871 # both old and new files exist
4872 die "mode or type changed\n" if $oldmode ne $newmode;
4873 die "modified symlink\n" unless $newmode =~ m/^10/;
4874 } elsif ($oldmode =~ m/[^0]/) {
4876 die "deletion of symlink\n"
4877 unless $oldmode =~ m/^10/;
4880 die "creation with non-default mode\n"
4881 unless $newmode =~ m/^100644$/ or
4882 $newmode =~ m/^120000$/;
4886 local $/="\n"; chomp $@;
4887 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4891 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4892 $r |= $isignore ? 02 : 01;
4893 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4895 printdebug "quiltify_trees_differ $x $y => $r\n";
4899 sub quiltify_tree_sentinelfiles ($) {
4900 # lists the `sentinel' files present in the tree
4902 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4903 qw(-- debian/rules debian/control);
4908 sub quiltify_splitbrain_needed () {
4909 if (!$split_brain) {
4910 progress "dgit view: changes are required...";
4911 runcmd @git, qw(checkout -q -b dgit-view);
4916 sub quiltify_splitbrain ($$$$$$) {
4917 my ($clogp, $unapplied, $headref, $diffbits,
4918 $editedignores, $cachekey) = @_;
4919 if ($quilt_mode !~ m/gbp|dpm/) {
4920 # treat .gitignore just like any other upstream file
4921 $diffbits = { %$diffbits };
4922 $_ = !!$_ foreach values %$diffbits;
4924 # We would like any commits we generate to be reproducible
4925 my @authline = clogp_authline($clogp);
4926 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4927 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4928 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4929 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4930 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4931 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4933 if ($quilt_mode =~ m/gbp|unapplied/ &&
4934 ($diffbits->{O2H} & 01)) {
4936 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4937 " but git tree differs from orig in upstream files.";
4938 if (!stat_exists "debian/patches") {
4940 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4944 if ($quilt_mode =~ m/dpm/ &&
4945 ($diffbits->{H2A} & 01)) {
4947 --quilt=$quilt_mode specified, implying patches-applied git tree
4948 but git tree differs from result of applying debian/patches to upstream
4951 if ($quilt_mode =~ m/gbp|unapplied/ &&
4952 ($diffbits->{O2A} & 01)) { # some patches
4953 quiltify_splitbrain_needed();
4954 progress "dgit view: creating patches-applied version using gbp pq";
4955 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4956 # gbp pq import creates a fresh branch; push back to dgit-view
4957 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4958 runcmd @git, qw(checkout -q dgit-view);
4960 if ($quilt_mode =~ m/gbp|dpm/ &&
4961 ($diffbits->{O2A} & 02)) {
4963 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4964 tool which does not create patches for changes to upstream
4965 .gitignores: but, such patches exist in debian/patches.
4968 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4969 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4970 quiltify_splitbrain_needed();
4971 progress "dgit view: creating patch to represent .gitignore changes";
4972 ensuredir "debian/patches";
4973 my $gipatch = "debian/patches/auto-gitignore";
4974 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4975 stat GIPATCH or die "$gipatch: $!";
4976 fail "$gipatch already exists; but want to create it".
4977 " to record .gitignore changes" if (stat _)[7];
4978 print GIPATCH <<END or die "$gipatch: $!";
4979 Subject: Update .gitignore from Debian packaging branch
4981 The Debian packaging git branch contains these updates to the upstream
4982 .gitignore file(s). This patch is autogenerated, to provide these
4983 updates to users of the official Debian archive view of the package.
4985 [dgit ($our_version) update-gitignore]
4988 close GIPATCH or die "$gipatch: $!";
4989 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4990 $unapplied, $headref, "--", sort keys %$editedignores;
4991 open SERIES, "+>>", "debian/patches/series" or die $!;
4992 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4994 defined read SERIES, $newline, 1 or die $!;
4995 print SERIES "\n" or die $! unless $newline eq "\n";
4996 print SERIES "auto-gitignore\n" or die $!;
4997 close SERIES or die $!;
4998 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5000 Commit patch to update .gitignore
5002 [dgit ($our_version) update-gitignore-quilt-fixup]
5006 my $dgitview = git_rev_parse 'HEAD';
5009 # When we no longer need to support squeeze, use --create-reflog
5011 ensuredir ".git/logs/refs/dgit-intern";
5012 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
5015 my $oldcache = git_get_ref "refs/$splitbraincache";
5016 if ($oldcache eq $dgitview) {
5017 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5018 # git update-ref doesn't always update, in this case. *sigh*
5019 my $dummy = make_commit_text <<END;
5022 author Dgit <dgit\@example.com> 1000000000 +0000
5023 committer Dgit <dgit\@example.com> 1000000000 +0000
5025 Dummy commit - do not use
5027 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5028 "refs/$splitbraincache", $dummy;
5030 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5033 changedir "$playground/work";
5035 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5036 progress "dgit view: created ($saved)";
5039 sub quiltify ($$$$) {
5040 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5042 # Quilt patchification algorithm
5044 # We search backwards through the history of the main tree's HEAD
5045 # (T) looking for a start commit S whose tree object is identical
5046 # to to the patch tip tree (ie the tree corresponding to the
5047 # current dpkg-committed patch series). For these purposes
5048 # `identical' disregards anything in debian/ - this wrinkle is
5049 # necessary because dpkg-source treates debian/ specially.
5051 # We can only traverse edges where at most one of the ancestors'
5052 # trees differs (in changes outside in debian/). And we cannot
5053 # handle edges which change .pc/ or debian/patches. To avoid
5054 # going down a rathole we avoid traversing edges which introduce
5055 # debian/rules or debian/control. And we set a limit on the
5056 # number of edges we are willing to look at.
5058 # If we succeed, we walk forwards again. For each traversed edge
5059 # PC (with P parent, C child) (starting with P=S and ending with
5060 # C=T) to we do this:
5062 # - dpkg-source --commit with a patch name and message derived from C
5063 # After traversing PT, we git commit the changes which
5064 # should be contained within debian/patches.
5066 # The search for the path S..T is breadth-first. We maintain a
5067 # todo list containing search nodes. A search node identifies a
5068 # commit, and looks something like this:
5070 # Commit => $git_commit_id,
5071 # Child => $c, # or undef if P=T
5072 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5073 # Nontrivial => true iff $p..$c has relevant changes
5080 my %considered; # saves being exponential on some weird graphs
5082 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5085 my ($search,$whynot) = @_;
5086 printdebug " search NOT $search->{Commit} $whynot\n";
5087 $search->{Whynot} = $whynot;
5088 push @nots, $search;
5089 no warnings qw(exiting);
5098 my $c = shift @todo;
5099 next if $considered{$c->{Commit}}++;
5101 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5103 printdebug "quiltify investigate $c->{Commit}\n";
5106 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5107 printdebug " search finished hooray!\n";
5112 if ($quilt_mode eq 'nofix') {
5113 fail "quilt fixup required but quilt mode is \`nofix'\n".
5114 "HEAD commit $c->{Commit} differs from tree implied by ".
5115 " debian/patches (tree object $oldtiptree)";
5117 if ($quilt_mode eq 'smash') {
5118 printdebug " search quitting smash\n";
5122 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5123 $not->($c, "has $c_sentinels not $t_sentinels")
5124 if $c_sentinels ne $t_sentinels;
5126 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5127 $commitdata =~ m/\n\n/;
5129 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5130 @parents = map { { Commit => $_, Child => $c } } @parents;
5132 $not->($c, "root commit") if !@parents;
5134 foreach my $p (@parents) {
5135 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5137 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5138 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5140 foreach my $p (@parents) {
5141 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5143 my @cmd= (@git, qw(diff-tree -r --name-only),
5144 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5145 my $patchstackchange = cmdoutput @cmd;
5146 if (length $patchstackchange) {
5147 $patchstackchange =~ s/\n/,/g;
5148 $not->($p, "changed $patchstackchange");
5151 printdebug " search queue P=$p->{Commit} ",
5152 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5158 printdebug "quiltify want to smash\n";
5161 my $x = $_[0]{Commit};
5162 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5165 my $reportnot = sub {
5167 my $s = $abbrev->($notp);
5168 my $c = $notp->{Child};
5169 $s .= "..".$abbrev->($c) if $c;
5170 $s .= ": ".$notp->{Whynot};
5173 if ($quilt_mode eq 'linear') {
5174 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5175 foreach my $notp (@nots) {
5176 print STDERR "$us: ", $reportnot->($notp), "\n";
5178 print STDERR "$us: $_\n" foreach @$failsuggestion;
5179 fail "quilt fixup naive history linearisation failed.\n".
5180 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5181 } elsif ($quilt_mode eq 'smash') {
5182 } elsif ($quilt_mode eq 'auto') {
5183 progress "quilt fixup cannot be linear, smashing...";
5185 die "$quilt_mode ?";
5188 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5189 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5191 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5193 quiltify_dpkg_commit "auto-$version-$target-$time",
5194 (getfield $clogp, 'Maintainer'),
5195 "Automatically generated patch ($clogp->{Version})\n".
5196 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5200 progress "quiltify linearisation planning successful, executing...";
5202 for (my $p = $sref_S;
5203 my $c = $p->{Child};
5205 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5206 next unless $p->{Nontrivial};
5208 my $cc = $c->{Commit};
5210 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5211 $commitdata =~ m/\n\n/ or die "$c ?";
5214 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5217 my $commitdate = cmdoutput
5218 @git, qw(log -n1 --pretty=format:%aD), $cc;
5220 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5222 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5229 my $gbp_check_suitable = sub {
5234 die "contains unexpected slashes\n" if m{//} || m{/$};
5235 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5236 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5237 die "is series file\n" if m{$series_filename_re}o;
5238 die "too long" if length > 200;
5240 return $_ unless $@;
5241 print STDERR "quiltifying commit $cc:".
5242 " ignoring/dropping Gbp-Pq $what: $@";
5246 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5248 (\S+) \s* \n //ixm) {
5249 $patchname = $gbp_check_suitable->($1, 'Name');
5251 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5253 (\S+) \s* \n //ixm) {
5254 $patchdir = $gbp_check_suitable->($1, 'Topic');
5259 if (!defined $patchname) {
5260 $patchname = $title;
5261 $patchname =~ s/[.:]$//;
5264 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5265 my $translitname = $converter->convert($patchname);
5266 die unless defined $translitname;
5267 $patchname = $translitname;
5270 "dgit: patch title transliteration error: $@"
5272 $patchname =~ y/ A-Z/-a-z/;
5273 $patchname =~ y/-a-z0-9_.+=~//cd;
5274 $patchname =~ s/^\W/x-$&/;
5275 $patchname = substr($patchname,0,40);
5276 $patchname .= ".patch";
5278 if (!defined $patchdir) {
5281 if (length $patchdir) {
5282 $patchname = "$patchdir/$patchname";
5284 if ($patchname =~ m{^(.*)/}) {
5285 mkpath "debian/patches/$1";
5290 stat "debian/patches/$patchname$index";
5292 $!==ENOENT or die "$patchname$index $!";
5294 runcmd @git, qw(checkout -q), $cc;
5296 # We use the tip's changelog so that dpkg-source doesn't
5297 # produce complaining messages from dpkg-parsechangelog. None
5298 # of the information dpkg-source gets from the changelog is
5299 # actually relevant - it gets put into the original message
5300 # which dpkg-source provides our stunt editor, and then
5302 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5304 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5305 "Date: $commitdate\n".
5306 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5308 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5311 runcmd @git, qw(checkout -q master);
5314 sub build_maybe_quilt_fixup () {
5315 my ($format,$fopts) = get_source_format;
5316 return unless madformat_wantfixup $format;
5319 check_for_vendor_patches();
5321 if (quiltmode_splitbrain) {
5322 fail <<END unless access_cfg_tagformats_can_splitbrain;
5323 quilt mode $quilt_mode requires split view so server needs to support
5324 both "new" and "maint" tag formats, but config says it doesn't.
5328 my $clogp = parsechangelog();
5329 my $headref = git_rev_parse('HEAD');
5332 changedir $playground;
5334 my $upstreamversion = upstreamversion $version;
5336 if ($fopts->{'single-debian-patch'}) {
5337 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5339 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5342 die 'bug' if $split_brain && !$need_split_build_invocation;
5345 runcmd_ordryrun_local
5346 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5349 sub quilt_fixup_mkwork ($) {
5352 mkdir "work" or die $!;
5354 mktree_in_ud_here();
5355 runcmd @git, qw(reset -q --hard), $headref;
5358 sub quilt_fixup_linkorigs ($$) {
5359 my ($upstreamversion, $fn) = @_;
5360 # calls $fn->($leafname);
5362 foreach my $f (<../../../../*>) { #/){
5363 my $b=$f; $b =~ s{.*/}{};
5365 local ($debuglevel) = $debuglevel-1;
5366 printdebug "QF linkorigs $b, $f ?\n";
5368 next unless is_orig_file_of_vsn $b, $upstreamversion;
5369 printdebug "QF linkorigs $b, $f Y\n";
5370 link_ltarget $f, $b or die "$b $!";
5375 sub quilt_fixup_delete_pc () {
5376 runcmd @git, qw(rm -rqf .pc);
5378 Commit removal of .pc (quilt series tracking data)
5380 [dgit ($our_version) upgrade quilt-remove-pc]
5384 sub quilt_fixup_singlepatch ($$$) {
5385 my ($clogp, $headref, $upstreamversion) = @_;
5387 progress "starting quiltify (single-debian-patch)";
5389 # dpkg-source --commit generates new patches even if
5390 # single-debian-patch is in debian/source/options. In order to
5391 # get it to generate debian/patches/debian-changes, it is
5392 # necessary to build the source package.
5394 quilt_fixup_linkorigs($upstreamversion, sub { });
5395 quilt_fixup_mkwork($headref);
5397 rmtree("debian/patches");
5399 runcmd @dpkgsource, qw(-b .);
5401 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5402 rename srcfn("$upstreamversion", "/debian/patches"),
5403 "work/debian/patches";
5406 commit_quilty_patch();
5409 sub quilt_make_fake_dsc ($) {
5410 my ($upstreamversion) = @_;
5412 my $fakeversion="$upstreamversion-~~DGITFAKE";
5414 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5415 print $fakedsc <<END or die $!;
5418 Version: $fakeversion
5422 my $dscaddfile=sub {
5425 my $md = new Digest::MD5;
5427 my $fh = new IO::File $b, '<' or die "$b $!";
5432 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5435 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5437 my @files=qw(debian/source/format debian/rules
5438 debian/control debian/changelog);
5439 foreach my $maybe (qw(debian/patches debian/source/options
5440 debian/tests/control)) {
5441 next unless stat_exists "../../../$maybe";
5442 push @files, $maybe;
5445 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5446 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5448 $dscaddfile->($debtar);
5449 close $fakedsc or die $!;
5452 sub quilt_check_splitbrain_cache ($$) {
5453 my ($headref, $upstreamversion) = @_;
5454 # Called only if we are in (potentially) split brain mode.
5455 # Called in playground.
5456 # Computes the cache key and looks in the cache.
5457 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5459 my $splitbrain_cachekey;
5462 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5463 # we look in the reflog of dgit-intern/quilt-cache
5464 # we look for an entry whose message is the key for the cache lookup
5465 my @cachekey = (qw(dgit), $our_version);
5466 push @cachekey, $upstreamversion;
5467 push @cachekey, $quilt_mode;
5468 push @cachekey, $headref;
5470 push @cachekey, hashfile('fake.dsc');
5472 my $srcshash = Digest::SHA->new(256);
5473 my %sfs = ( %INC, '$0(dgit)' => $0 );
5474 foreach my $sfk (sort keys %sfs) {
5475 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5476 $srcshash->add($sfk," ");
5477 $srcshash->add(hashfile($sfs{$sfk}));
5478 $srcshash->add("\n");
5480 push @cachekey, $srcshash->hexdigest();
5481 $splitbrain_cachekey = "@cachekey";
5483 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5485 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5486 debugcmd "|(probably)",@cmd;
5487 my $child = open GC, "-|"; defined $child or die $!;
5489 chdir '../../..' or die $!;
5490 if (!stat ".git/logs/refs/$splitbraincache") {
5491 $! == ENOENT or die $!;
5492 printdebug ">(no reflog)\n";
5499 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5500 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5503 quilt_fixup_mkwork($headref);
5504 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5505 if ($cachehit ne $headref) {
5506 progress "dgit view: found cached ($saved)";
5507 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5509 return ($cachehit, $splitbrain_cachekey);
5511 progress "dgit view: found cached, no changes required";
5512 return ($headref, $splitbrain_cachekey);
5514 die $! if GC->error;
5515 failedcmd unless close GC;
5517 printdebug "splitbrain cache miss\n";
5518 return (undef, $splitbrain_cachekey);
5521 sub quilt_fixup_multipatch ($$$) {
5522 my ($clogp, $headref, $upstreamversion) = @_;
5524 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5527 # - honour any existing .pc in case it has any strangeness
5528 # - determine the git commit corresponding to the tip of
5529 # the patch stack (if there is one)
5530 # - if there is such a git commit, convert each subsequent
5531 # git commit into a quilt patch with dpkg-source --commit
5532 # - otherwise convert all the differences in the tree into
5533 # a single git commit
5537 # Our git tree doesn't necessarily contain .pc. (Some versions of
5538 # dgit would include the .pc in the git tree.) If there isn't
5539 # one, we need to generate one by unpacking the patches that we
5542 # We first look for a .pc in the git tree. If there is one, we
5543 # will use it. (This is not the normal case.)
5545 # Otherwise need to regenerate .pc so that dpkg-source --commit
5546 # can work. We do this as follows:
5547 # 1. Collect all relevant .orig from parent directory
5548 # 2. Generate a debian.tar.gz out of
5549 # debian/{patches,rules,source/format,source/options}
5550 # 3. Generate a fake .dsc containing just these fields:
5551 # Format Source Version Files
5552 # 4. Extract the fake .dsc
5553 # Now the fake .dsc has a .pc directory.
5554 # (In fact we do this in every case, because in future we will
5555 # want to search for a good base commit for generating patches.)
5557 # Then we can actually do the dpkg-source --commit
5558 # 1. Make a new working tree with the same object
5559 # store as our main tree and check out the main
5561 # 2. Copy .pc from the fake's extraction, if necessary
5562 # 3. Run dpkg-source --commit
5563 # 4. If the result has changes to debian/, then
5564 # - git add them them
5565 # - git add .pc if we had a .pc in-tree
5567 # 5. If we had a .pc in-tree, delete it, and git commit
5568 # 6. Back in the main tree, fast forward to the new HEAD
5570 # Another situation we may have to cope with is gbp-style
5571 # patches-unapplied trees.
5573 # We would want to detect these, so we know to escape into
5574 # quilt_fixup_gbp. However, this is in general not possible.
5575 # Consider a package with a one patch which the dgit user reverts
5576 # (with git revert or the moral equivalent).
5578 # That is indistinguishable in contents from a patches-unapplied
5579 # tree. And looking at the history to distinguish them is not
5580 # useful because the user might have made a confusing-looking git
5581 # history structure (which ought to produce an error if dgit can't
5582 # cope, not a silent reintroduction of an unwanted patch).
5584 # So gbp users will have to pass an option. But we can usually
5585 # detect their failure to do so: if the tree is not a clean
5586 # patches-applied tree, quilt linearisation fails, but the tree
5587 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5588 # they want --quilt=unapplied.
5590 # To help detect this, when we are extracting the fake dsc, we
5591 # first extract it with --skip-patches, and then apply the patches
5592 # afterwards with dpkg-source --before-build. That lets us save a
5593 # tree object corresponding to .origs.
5595 my $splitbrain_cachekey;
5597 quilt_make_fake_dsc($upstreamversion);
5599 if (quiltmode_splitbrain()) {
5601 ($cachehit, $splitbrain_cachekey) =
5602 quilt_check_splitbrain_cache($headref, $upstreamversion);
5603 return if $cachehit;
5607 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5609 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5610 rename $fakexdir, "fake" or die "$fakexdir $!";
5614 remove_stray_gits("source package");
5615 mktree_in_ud_here();
5619 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5620 my $unapplied=git_add_write_tree();
5621 printdebug "fake orig tree object $unapplied\n";
5625 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5627 if (system @bbcmd) {
5628 failedcmd @bbcmd if $? < 0;
5630 failed to apply your git tree's patch stack (from debian/patches/) to
5631 the corresponding upstream tarball(s). Your source tree and .orig
5632 are probably too inconsistent. dgit can only fix up certain kinds of
5633 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5639 quilt_fixup_mkwork($headref);
5642 if (stat_exists ".pc") {
5644 progress "Tree already contains .pc - will use it then delete it.";
5647 rename '../fake/.pc','.pc' or die $!;
5650 changedir '../fake';
5652 my $oldtiptree=git_add_write_tree();
5653 printdebug "fake o+d/p tree object $unapplied\n";
5654 changedir '../work';
5657 # We calculate some guesswork now about what kind of tree this might
5658 # be. This is mostly for error reporting.
5664 # O = orig, without patches applied
5665 # A = "applied", ie orig with H's debian/patches applied
5666 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5667 \%editedignores, \@unrepres),
5668 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5669 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5673 foreach my $b (qw(01 02)) {
5674 foreach my $v (qw(O2H O2A H2A)) {
5675 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5678 printdebug "differences \@dl @dl.\n";
5681 "$us: base trees orig=%.20s o+d/p=%.20s",
5682 $unapplied, $oldtiptree;
5684 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5685 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5686 $dl[0], $dl[1], $dl[3], $dl[4],
5690 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5692 forceable_fail [qw(unrepresentable)], <<END;
5693 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5698 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5699 push @failsuggestion, "This might be a patches-unapplied branch.";
5700 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5701 push @failsuggestion, "This might be a patches-applied branch.";
5703 push @failsuggestion, "Maybe you need to specify one of".
5704 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5706 if (quiltmode_splitbrain()) {
5707 quiltify_splitbrain($clogp, $unapplied, $headref,
5708 $diffbits, \%editedignores,
5709 $splitbrain_cachekey);
5713 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5714 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5716 if (!open P, '>>', ".pc/applied-patches") {
5717 $!==&ENOENT or die $!;
5722 commit_quilty_patch();
5724 if ($mustdeletepc) {
5725 quilt_fixup_delete_pc();
5729 sub quilt_fixup_editor () {
5730 my $descfn = $ENV{$fakeeditorenv};
5731 my $editing = $ARGV[$#ARGV];
5732 open I1, '<', $descfn or die "$descfn: $!";
5733 open I2, '<', $editing or die "$editing: $!";
5734 unlink $editing or die "$editing: $!";
5735 open O, '>', $editing or die "$editing: $!";
5736 while (<I1>) { print O or die $!; } I1->error and die $!;
5739 $copying ||= m/^\-\-\- /;
5740 next unless $copying;
5743 I2->error and die $!;
5748 sub maybe_apply_patches_dirtily () {
5749 return unless $quilt_mode =~ m/gbp|unapplied/;
5750 print STDERR <<END or die $!;
5752 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5753 dgit: Have to apply the patches - making the tree dirty.
5754 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5757 $patches_applied_dirtily = 01;
5758 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5759 runcmd qw(dpkg-source --before-build .);
5762 sub maybe_unapply_patches_again () {
5763 progress "dgit: Unapplying patches again to tidy up the tree."
5764 if $patches_applied_dirtily;
5765 runcmd qw(dpkg-source --after-build .)
5766 if $patches_applied_dirtily & 01;
5768 if $patches_applied_dirtily & 02;
5769 $patches_applied_dirtily = 0;
5772 #----- other building -----
5774 our $clean_using_builder;
5775 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5776 # clean the tree before building (perhaps invoked indirectly by
5777 # whatever we are using to run the build), rather than separately
5778 # and explicitly by us.
5781 return if $clean_using_builder;
5782 if ($cleanmode eq 'dpkg-source') {
5783 maybe_apply_patches_dirtily();
5784 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5785 } elsif ($cleanmode eq 'dpkg-source-d') {
5786 maybe_apply_patches_dirtily();
5787 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5788 } elsif ($cleanmode eq 'git') {
5789 runcmd_ordryrun_local @git, qw(clean -xdf);
5790 } elsif ($cleanmode eq 'git-ff') {
5791 runcmd_ordryrun_local @git, qw(clean -xdff);
5792 } elsif ($cleanmode eq 'check') {
5793 my $leftovers = cmdoutput @git, qw(clean -xdn);
5794 if (length $leftovers) {
5795 print STDERR $leftovers, "\n" or die $!;
5796 fail "tree contains uncommitted files and --clean=check specified";
5798 } elsif ($cleanmode eq 'none') {
5805 badusage "clean takes no additional arguments" if @ARGV;
5808 maybe_unapply_patches_again();
5811 sub build_or_push_prep_early () {
5812 our $build_or_push_prep_early_done //= 0;
5813 return if $build_or_push_prep_early_done++;
5814 badusage "-p is not allowed with dgit $subcommand" if defined $package;
5815 my $clogp = parsechangelog();
5816 $isuite = getfield $clogp, 'Distribution';
5817 $package = getfield $clogp, 'Source';
5818 $version = getfield $clogp, 'Version';
5821 sub build_prep_early () {
5822 build_or_push_prep_early();
5830 build_maybe_quilt_fixup();
5832 my $pat = changespat $version;
5833 foreach my $f (glob "$buildproductsdir/$pat") {
5835 unlink $f or fail "remove old changes file $f: $!";
5837 progress "would remove $f";
5843 sub changesopts_initial () {
5844 my @opts =@changesopts[1..$#changesopts];
5847 sub changesopts_version () {
5848 if (!defined $changes_since_version) {
5849 my @vsns = archive_query('archive_query');
5850 my @quirk = access_quirk();
5851 if ($quirk[0] eq 'backports') {
5852 local $isuite = $quirk[2];
5854 canonicalise_suite();
5855 push @vsns, archive_query('archive_query');
5858 @vsns = map { $_->[0] } @vsns;
5859 @vsns = sort { -version_compare($a, $b) } @vsns;
5860 $changes_since_version = $vsns[0];
5861 progress "changelog will contain changes since $vsns[0]";
5863 $changes_since_version = '_';
5864 progress "package seems new, not specifying -v<version>";
5867 if ($changes_since_version ne '_') {
5868 return ("-v$changes_since_version");
5874 sub changesopts () {
5875 return (changesopts_initial(), changesopts_version());
5878 sub massage_dbp_args ($;$) {
5879 my ($cmd,$xargs) = @_;
5882 # - if we're going to split the source build out so we can
5883 # do strange things to it, massage the arguments to dpkg-buildpackage
5884 # so that the main build doessn't build source (or add an argument
5885 # to stop it building source by default).
5887 # - add -nc to stop dpkg-source cleaning the source tree,
5888 # unless we're not doing a split build and want dpkg-source
5889 # as cleanmode, in which case we can do nothing
5892 # 0 - source will NOT need to be built separately by caller
5893 # +1 - source will need to be built separately by caller
5894 # +2 - source will need to be built separately by caller AND
5895 # dpkg-buildpackage should not in fact be run at all!
5896 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5897 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5898 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5899 $clean_using_builder = 1;
5902 # -nc has the side effect of specifying -b if nothing else specified
5903 # and some combinations of -S, -b, et al, are errors, rather than
5904 # later simply overriding earlie. So we need to:
5905 # - search the command line for these options
5906 # - pick the last one
5907 # - perhaps add our own as a default
5908 # - perhaps adjust it to the corresponding non-source-building version
5910 foreach my $l ($cmd, $xargs) {
5912 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5915 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5917 if ($need_split_build_invocation) {
5918 printdebug "massage split $dmode.\n";
5919 $r = $dmode =~ m/[S]/ ? +2 :
5920 $dmode =~ y/gGF/ABb/ ? +1 :
5921 $dmode =~ m/[ABb]/ ? 0 :
5924 printdebug "massage done $r $dmode.\n";
5926 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5932 my $wasdir = must_getcwd();
5938 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5939 my ($msg_if_onlyone) = @_;
5940 # If there is only one .changes file, fail with $msg_if_onlyone,
5941 # or if that is undef, be a no-op.
5942 # Returns the changes file to report to the user.
5943 my $pat = changespat $version;
5944 my @changesfiles = glob $pat;
5945 @changesfiles = sort {
5946 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5950 if (@changesfiles==1) {
5951 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5952 only one changes file from build (@changesfiles)
5954 $result = $changesfiles[0];
5955 } elsif (@changesfiles==2) {
5956 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5957 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5958 fail "$l found in binaries changes file $binchanges"
5961 runcmd_ordryrun_local @mergechanges, @changesfiles;
5962 my $multichanges = changespat $version,'multi';
5964 stat_exists $multichanges or fail "$multichanges: $!";
5965 foreach my $cf (glob $pat) {
5966 next if $cf eq $multichanges;
5967 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5970 $result = $multichanges;
5972 fail "wrong number of different changes files (@changesfiles)";
5974 printdone "build successful, results in $result\n" or die $!;
5977 sub midbuild_checkchanges () {
5978 my $pat = changespat $version;
5979 return if $rmchanges;
5980 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5981 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5983 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5984 Suggest you delete @unwanted.
5989 sub midbuild_checkchanges_vanilla ($) {
5991 midbuild_checkchanges() if $wantsrc == 1;
5994 sub postbuild_mergechanges_vanilla ($) {
5996 if ($wantsrc == 1) {
5998 postbuild_mergechanges(undef);
6001 printdone "build successful\n";
6007 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6008 my $wantsrc = massage_dbp_args \@dbp;
6011 midbuild_checkchanges_vanilla $wantsrc;
6016 push @dbp, changesopts_version();
6017 maybe_apply_patches_dirtily();
6018 runcmd_ordryrun_local @dbp;
6020 maybe_unapply_patches_again();
6021 postbuild_mergechanges_vanilla $wantsrc;
6025 $quilt_mode //= 'gbp';
6031 # gbp can make .origs out of thin air. In my tests it does this
6032 # even for a 1.0 format package, with no origs present. So I
6033 # guess it keys off just the version number. We don't know
6034 # exactly what .origs ought to exist, but let's assume that we
6035 # should run gbp if: the version has an upstream part and the main
6037 my $upstreamversion = upstreamversion $version;
6038 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6039 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6041 if ($gbp_make_orig) {
6043 $cleanmode = 'none'; # don't do it again
6044 $need_split_build_invocation = 1;
6047 my @dbp = @dpkgbuildpackage;
6049 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6051 if (!length $gbp_build[0]) {
6052 if (length executable_on_path('git-buildpackage')) {
6053 $gbp_build[0] = qw(git-buildpackage);
6055 $gbp_build[0] = 'gbp buildpackage';
6058 my @cmd = opts_opt_multi_cmd @gbp_build;
6060 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6062 if ($gbp_make_orig) {
6063 ensuredir '.git/dgit';
6064 my $ok = '.git/dgit/origs-gen-ok';
6065 unlink $ok or $!==&ENOENT or die $!;
6066 my @origs_cmd = @cmd;
6067 push @origs_cmd, qw(--git-cleaner=true);
6068 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6069 push @origs_cmd, @ARGV;
6071 debugcmd @origs_cmd;
6073 do { local $!; stat_exists $ok; }
6074 or failedcmd @origs_cmd;
6076 dryrun_report @origs_cmd;
6082 midbuild_checkchanges_vanilla $wantsrc;
6084 if (!$clean_using_builder) {
6085 push @cmd, '--git-cleaner=true';
6089 maybe_unapply_patches_again();
6091 push @cmd, changesopts();
6092 runcmd_ordryrun_local @cmd, @ARGV;
6094 postbuild_mergechanges_vanilla $wantsrc;
6096 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6100 my $our_cleanmode = $cleanmode;
6101 if ($need_split_build_invocation) {
6102 # Pretend that clean is being done some other way. This
6103 # forces us not to try to use dpkg-buildpackage to clean and
6104 # build source all in one go; and instead we run dpkg-source
6105 # (and build_prep() will do the clean since $clean_using_builder
6107 $our_cleanmode = 'ELSEWHERE';
6109 if ($our_cleanmode =~ m/^dpkg-source/) {
6110 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6111 $clean_using_builder = 1;
6114 $sourcechanges = changespat $version,'source';
6116 unlink "../$sourcechanges" or $!==ENOENT
6117 or fail "remove $sourcechanges: $!";
6119 $dscfn = dscfn($version);
6120 if ($our_cleanmode eq 'dpkg-source') {
6121 maybe_apply_patches_dirtily();
6122 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6124 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6125 maybe_apply_patches_dirtily();
6126 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6129 my @cmd = (@dpkgsource, qw(-b --));
6131 changedir $playground;
6132 runcmd_ordryrun_local @cmd, "work";
6133 my @udfiles = <${package}_*>;
6135 foreach my $f (@udfiles) {
6136 printdebug "source copy, found $f\n";
6139 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6140 $f eq srcfn($version, $&));
6141 printdebug "source copy, found $f - renaming\n";
6142 rename "$playground/$f", "../$f" or $!==ENOENT
6143 or fail "put in place new source file ($f): $!";
6146 my $pwd = must_getcwd();
6147 my $leafdir = basename $pwd;
6149 runcmd_ordryrun_local @cmd, $leafdir;
6152 runcmd_ordryrun_local qw(sh -ec),
6153 'exec >$1; shift; exec "$@"','x',
6154 "../$sourcechanges",
6155 @dpkggenchanges, qw(-S), changesopts();
6159 sub cmd_build_source {
6161 badusage "build-source takes no additional arguments" if @ARGV;
6163 maybe_unapply_patches_again();
6164 printdone "source built, results in $dscfn and $sourcechanges";
6169 midbuild_checkchanges();
6172 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6173 stat_exists $sourcechanges
6174 or fail "$sourcechanges (in parent directory): $!";
6176 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6178 maybe_unapply_patches_again();
6180 postbuild_mergechanges(<<END);
6181 perhaps you need to pass -A ? (sbuild's default is to build only
6182 arch-specific binaries; dgit 1.4 used to override that.)
6187 sub cmd_quilt_fixup {
6188 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6191 build_maybe_quilt_fixup();
6194 sub import_dsc_result {
6195 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6196 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6198 check_gitattrs($newhash, "source tree");
6200 progress "dgit: import-dsc: $what_msg";
6203 sub cmd_import_dsc {
6207 last unless $ARGV[0] =~ m/^-/;
6210 if (m/^--require-valid-signature$/) {
6213 badusage "unknown dgit import-dsc sub-option \`$_'";
6217 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6218 my ($dscfn, $dstbranch) = @ARGV;
6220 badusage "dry run makes no sense with import-dsc" unless act_local();
6222 my $force = $dstbranch =~ s/^\+// ? +1 :
6223 $dstbranch =~ s/^\.\.// ? -1 :
6225 my $info = $force ? " $&" : '';
6226 $info = "$dscfn$info";
6228 my $specbranch = $dstbranch;
6229 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6230 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6232 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6233 my $chead = cmdoutput_errok @symcmd;
6234 defined $chead or $?==256 or failedcmd @symcmd;
6236 fail "$dstbranch is checked out - will not update it"
6237 if defined $chead and $chead eq $dstbranch;
6239 my $oldhash = git_get_ref $dstbranch;
6241 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6242 $dscdata = do { local $/ = undef; <D>; };
6243 D->error and fail "read $dscfn: $!";
6246 # we don't normally need this so import it here
6247 use Dpkg::Source::Package;
6248 my $dp = new Dpkg::Source::Package filename => $dscfn,
6249 require_valid_signature => $needsig;
6251 local $SIG{__WARN__} = sub {
6253 return unless $needsig;
6254 fail "import-dsc signature check failed";
6256 if (!$dp->is_signed()) {
6257 warn "$us: warning: importing unsigned .dsc\n";
6259 my $r = $dp->check_signature();
6260 die "->check_signature => $r" if $needsig && $r;
6266 $package = getfield $dsc, 'Source';
6268 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6269 unless forceing [qw(import-dsc-with-dgit-field)];
6270 parse_dsc_field_def_dsc_distro();
6272 $isuite = 'DGIT-IMPORT-DSC';
6273 $idistro //= $dsc_distro;
6277 if (defined $dsc_hash) {
6278 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6279 resolve_dsc_field_commit undef, undef;
6281 if (defined $dsc_hash) {
6282 my @cmd = (qw(sh -ec),
6283 "echo $dsc_hash | git cat-file --batch-check");
6284 my $objgot = cmdoutput @cmd;
6285 if ($objgot =~ m#^\w+ missing\b#) {
6287 .dsc contains Dgit field referring to object $dsc_hash
6288 Your git tree does not have that object. Try `git fetch' from a
6289 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6292 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6294 progress "Not fast forward, forced update.";
6296 fail "Not fast forward to $dsc_hash";
6299 import_dsc_result $dstbranch, $dsc_hash,
6300 "dgit import-dsc (Dgit): $info",
6301 "updated git ref $dstbranch";
6306 Branch $dstbranch already exists
6307 Specify ..$specbranch for a pseudo-merge, binding in existing history
6308 Specify +$specbranch to overwrite, discarding existing history
6310 if $oldhash && !$force;
6312 my @dfi = dsc_files_info();
6313 foreach my $fi (@dfi) {
6314 my $f = $fi->{Filename};
6318 fail "lstat $here works but stat gives $! !";
6320 fail "stat $here: $!" unless $! == ENOENT;
6322 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6324 } elsif ($dscfn =~ m#^/#) {
6327 fail "cannot import $dscfn which seems to be inside working tree!";
6329 $there =~ s#/+[^/]+$## or
6330 fail "import $dscfn requires ../$f, but it does not exist";
6332 my $test = $there =~ m{^/} ? $there : "../$there";
6333 stat $test or fail "import $dscfn requires $test, but: $!";
6334 symlink $there, $here or fail "symlink $there to $here: $!";
6335 progress "made symlink $here -> $there";
6336 # print STDERR Dumper($fi);
6338 my @mergeinputs = generate_commits_from_dsc();
6339 die unless @mergeinputs == 1;
6341 my $newhash = $mergeinputs[0]{Commit};
6345 progress "Import, forced update - synthetic orphan git history.";
6346 } elsif ($force < 0) {
6347 progress "Import, merging.";
6348 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6349 my $version = getfield $dsc, 'Version';
6350 my $clogp = commit_getclogp $newhash;
6351 my $authline = clogp_authline $clogp;
6352 $newhash = make_commit_text <<END;
6359 Merge $package ($version) import into $dstbranch
6362 die; # caught earlier
6366 import_dsc_result $dstbranch, $newhash,
6367 "dgit import-dsc: $info",
6368 "results are in in git ref $dstbranch";
6371 sub pre_archive_api_query () {
6374 sub cmd_archive_api_query {
6375 badusage "need only 1 subpath argument" unless @ARGV==1;
6376 my ($subpath) = @ARGV;
6377 my @cmd = archive_api_query_cmd($subpath);
6380 exec @cmd or fail "exec curl: $!\n";
6383 sub repos_server_url () {
6384 $package = '_dgit-repos-server';
6385 local $access_forpush = 1;
6386 local $isuite = 'DGIT-REPOS-SERVER';
6387 my $url = access_giturl();
6390 sub pre_clone_dgit_repos_server () {
6393 sub cmd_clone_dgit_repos_server {
6394 badusage "need destination argument" unless @ARGV==1;
6395 my ($destdir) = @ARGV;
6396 my $url = repos_server_url();
6397 my @cmd = (@git, qw(clone), $url, $destdir);
6399 exec @cmd or fail "exec git clone: $!\n";
6402 sub pre_print_dgit_repos_server_source_url () {
6405 sub cmd_print_dgit_repos_server_source_url {
6406 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6408 my $url = repos_server_url();
6409 print $url, "\n" or die $!;
6412 sub cmd_setup_mergechangelogs {
6413 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6414 local $isuite = 'DGIT-SETUP-TREE';
6415 setup_mergechangelogs(1);
6418 sub cmd_setup_useremail {
6419 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6420 local $isuite = 'DGIT-SETUP-TREE';
6424 sub cmd_setup_gitattributes {
6425 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6426 local $isuite = 'DGIT-SETUP-TREE';
6430 sub cmd_setup_new_tree {
6431 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6432 local $isuite = 'DGIT-SETUP-TREE';
6436 #---------- argument parsing and main program ----------
6439 print "dgit version $our_version\n" or die $!;
6443 our (%valopts_long, %valopts_short);
6444 our (%funcopts_long);
6446 our (@modeopt_cfgs);
6448 sub defvalopt ($$$$) {
6449 my ($long,$short,$val_re,$how) = @_;
6450 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6451 $valopts_long{$long} = $oi;
6452 $valopts_short{$short} = $oi;
6453 # $how subref should:
6454 # do whatever assignemnt or thing it likes with $_[0]
6455 # if the option should not be passed on to remote, @rvalopts=()
6456 # or $how can be a scalar ref, meaning simply assign the value
6459 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6460 defvalopt '--distro', '-d', '.+', \$idistro;
6461 defvalopt '', '-k', '.+', \$keyid;
6462 defvalopt '--existing-package','', '.*', \$existing_package;
6463 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6464 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6465 defvalopt '--package', '-p', $package_re, \$package;
6466 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6468 defvalopt '', '-C', '.+', sub {
6469 ($changesfile) = (@_);
6470 if ($changesfile =~ s#^(.*)/##) {
6471 $buildproductsdir = $1;
6475 defvalopt '--initiator-tempdir','','.*', sub {
6476 ($initiator_tempdir) = (@_);
6477 $initiator_tempdir =~ m#^/# or
6478 badusage "--initiator-tempdir must be used specify an".
6479 " absolute, not relative, directory."
6482 sub defoptmodes ($@) {
6483 my ($varref, $cfgkey, $default, %optmap) = @_;
6485 while (my ($opt,$val) = each %optmap) {
6486 $funcopts_long{$opt} = sub { $$varref = $val; };
6487 $permit{$val} = $val;
6489 push @modeopt_cfgs, {
6492 Default => $default,
6497 defoptmodes \$dodep14tag, qw( dep14tag want
6500 --always-dep14tag always );
6505 if (defined $ENV{'DGIT_SSH'}) {
6506 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6507 } elsif (defined $ENV{'GIT_SSH'}) {
6508 @ssh = ($ENV{'GIT_SSH'});
6516 if (!defined $val) {
6517 badusage "$what needs a value" unless @ARGV;
6519 push @rvalopts, $val;
6521 badusage "bad value \`$val' for $what" unless
6522 $val =~ m/^$oi->{Re}$(?!\n)/s;
6523 my $how = $oi->{How};
6524 if (ref($how) eq 'SCALAR') {
6529 push @ropts, @rvalopts;
6533 last unless $ARGV[0] =~ m/^-/;
6537 if (m/^--dry-run$/) {
6540 } elsif (m/^--damp-run$/) {
6543 } elsif (m/^--no-sign$/) {
6546 } elsif (m/^--help$/) {
6548 } elsif (m/^--version$/) {
6550 } elsif (m/^--new$/) {
6553 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6554 ($om = $opts_opt_map{$1}) &&
6558 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6559 !$opts_opt_cmdonly{$1} &&
6560 ($om = $opts_opt_map{$1})) {
6563 } elsif (m/^--(gbp|dpm)$/s) {
6564 push @ropts, "--quilt=$1";
6566 } elsif (m/^--ignore-dirty$/s) {
6569 } elsif (m/^--no-quilt-fixup$/s) {
6571 $quilt_mode = 'nocheck';
6572 } elsif (m/^--no-rm-on-error$/s) {
6575 } elsif (m/^--no-chase-dsc-distro$/s) {
6577 $chase_dsc_distro = 0;
6578 } elsif (m/^--overwrite$/s) {
6580 $overwrite_version = '';
6581 } elsif (m/^--overwrite=(.+)$/s) {
6583 $overwrite_version = $1;
6584 } elsif (m/^--delayed=(\d+)$/s) {
6587 } elsif (m/^--dgit-view-save=(.+)$/s) {
6589 $split_brain_save = $1;
6590 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6591 } elsif (m/^--(no-)?rm-old-changes$/s) {
6594 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6596 push @deliberatelies, $&;
6597 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6601 } elsif (m/^--force-/) {
6603 "$us: warning: ignoring unknown force option $_\n";
6605 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6606 # undocumented, for testing
6608 $tagformat_want = [ $1, 'command line', 1 ];
6609 # 1 menas overrides distro configuration
6610 } elsif (m/^--always-split-source-build$/s) {
6611 # undocumented, for testing
6613 $need_split_build_invocation = 1;
6614 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6615 # undocumented, for testing
6617 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6618 # ^ it's supposed to be an array ref
6619 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6620 $val = $2 ? $' : undef; #';
6621 $valopt->($oi->{Long});
6622 } elsif ($funcopts_long{$_}) {
6624 $funcopts_long{$_}();
6626 badusage "unknown long option \`$_'";
6633 } elsif (s/^-L/-/) {
6636 } elsif (s/^-h/-/) {
6638 } elsif (s/^-D/-/) {
6642 } elsif (s/^-N/-/) {
6647 push @changesopts, $_;
6649 } elsif (s/^-wn$//s) {
6651 $cleanmode = 'none';
6652 } elsif (s/^-wg$//s) {
6655 } elsif (s/^-wgf$//s) {
6657 $cleanmode = 'git-ff';
6658 } elsif (s/^-wd$//s) {
6660 $cleanmode = 'dpkg-source';
6661 } elsif (s/^-wdd$//s) {
6663 $cleanmode = 'dpkg-source-d';
6664 } elsif (s/^-wc$//s) {
6666 $cleanmode = 'check';
6667 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6668 push @git, '-c', $&;
6669 $gitcfgs{cmdline}{$1} = [ $2 ];
6670 } elsif (s/^-c([^=]+)$//s) {
6671 push @git, '-c', $&;
6672 $gitcfgs{cmdline}{$1} = [ 'true' ];
6673 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6675 $val = undef unless length $val;
6676 $valopt->($oi->{Short});
6679 badusage "unknown short option \`$_'";
6686 sub check_env_sanity () {
6687 my $blocked = new POSIX::SigSet;
6688 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6691 foreach my $name (qw(PIPE CHLD)) {
6692 my $signame = "SIG$name";
6693 my $signum = eval "POSIX::$signame" // die;
6694 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6695 die "$signame is set to something other than SIG_DFL\n";
6696 $blocked->ismember($signum) and
6697 die "$signame is blocked\n";
6703 On entry to dgit, $@
6704 This is a bug produced by something in in your execution environment.
6710 sub parseopts_late_defaults () {
6711 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6712 if defined $idistro;
6713 $isuite //= cfg('dgit.default.default-suite');
6715 foreach my $k (keys %opts_opt_map) {
6716 my $om = $opts_opt_map{$k};
6718 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6720 badcfg "cannot set command for $k"
6721 unless length $om->[0];
6725 foreach my $c (access_cfg_cfgs("opts-$k")) {
6727 map { $_ ? @$_ : () }
6728 map { $gitcfgs{$_}{$c} }
6729 reverse @gitcfgsources;
6730 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6731 "\n" if $debuglevel >= 4;
6733 badcfg "cannot configure options for $k"
6734 if $opts_opt_cmdonly{$k};
6735 my $insertpos = $opts_cfg_insertpos{$k};
6736 @$om = ( @$om[0..$insertpos-1],
6738 @$om[$insertpos..$#$om] );
6742 if (!defined $rmchanges) {
6743 local $access_forpush;
6744 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6747 if (!defined $quilt_mode) {
6748 local $access_forpush;
6749 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6750 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6752 $quilt_mode =~ m/^($quilt_modes_re)$/
6753 or badcfg "unknown quilt-mode \`$quilt_mode'";
6757 foreach my $moc (@modeopt_cfgs) {
6758 local $access_forpush;
6759 my $vr = $moc->{Var};
6760 next if defined $$vr;
6761 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6762 my $v = $moc->{Vals}{$$vr};
6763 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6767 $need_split_build_invocation ||= quiltmode_splitbrain();
6769 if (!defined $cleanmode) {
6770 local $access_forpush;
6771 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6772 $cleanmode //= 'dpkg-source';
6774 badcfg "unknown clean-mode \`$cleanmode'" unless
6775 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6779 if ($ENV{$fakeeditorenv}) {
6781 quilt_fixup_editor();
6787 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6788 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6789 if $dryrun_level == 1;
6791 print STDERR $helpmsg or die $!;
6794 $cmd = $subcommand = shift @ARGV;
6797 my $pre_fn = ${*::}{"pre_$cmd"};
6798 $pre_fn->() if $pre_fn;
6802 my $fn = ${*::}{"cmd_$cmd"};
6803 $fn or badusage "unknown operation $cmd";