3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::MoreUtils qw(pairwise);
38 use Text::Glob qw(match_glob);
39 use Fcntl qw(:DEFAULT :flock);
44 our $our_version = 'UNRELEASED'; ###substituted###
45 our $absurdity = undef; ###substituted###
47 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
58 our $dryrun_level = 0;
60 our $buildproductsdir = '..';
66 our $existing_package = 'dpkg';
68 our $changes_since_version;
70 our $overwrite_version; # undef: not specified; '': check changelog
72 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $we_are_initiator;
77 our $initiator_tempdir;
78 our $patches_applied_dirtily = 00;
82 our $chase_dsc_distro=1;
84 our %forceopts = map { $_=>0 }
85 qw(unrepresentable unsupported-source-format
86 dsc-changes-mismatch changes-origs-exactly
87 import-gitapply-absurd
88 import-gitapply-no-absurd
89 import-dsc-with-dgit-field);
91 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
93 our $suite_re = '[-+.0-9a-z]+';
94 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
95 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
96 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
97 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
99 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
100 our $splitbraincache = 'dgit-intern/quilt-cache';
101 our $rewritemap = 'dgit-rewrite/map';
103 our (@git) = qw(git);
104 our (@dget) = qw(dget);
105 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
106 our (@dput) = qw(dput);
107 our (@debsign) = qw(debsign);
108 our (@gpg) = qw(gpg);
109 our (@sbuild) = qw(sbuild);
111 our (@dgit) = qw(dgit);
112 our (@aptget) = qw(apt-get);
113 our (@aptcache) = qw(apt-cache);
114 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
115 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
116 our (@dpkggenchanges) = qw(dpkg-genchanges);
117 our (@mergechanges) = qw(mergechanges -f);
118 our (@gbp_build) = ('');
119 our (@gbp_pq) = ('gbp pq');
120 our (@changesopts) = ('');
122 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
125 'debsign' => \@debsign,
127 'sbuild' => \@sbuild,
131 'apt-get' => \@aptget,
132 'apt-cache' => \@aptcache,
133 'dpkg-source' => \@dpkgsource,
134 'dpkg-buildpackage' => \@dpkgbuildpackage,
135 'dpkg-genchanges' => \@dpkggenchanges,
136 'gbp-build' => \@gbp_build,
137 'gbp-pq' => \@gbp_pq,
138 'ch' => \@changesopts,
139 'mergechanges' => \@mergechanges);
141 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
142 our %opts_cfg_insertpos = map {
144 scalar @{ $opts_opt_map{$_} }
145 } keys %opts_opt_map;
147 sub parseopts_late_defaults();
148 sub setup_gitattrs(;$);
149 sub check_gitattrs($$);
155 our $supplementary_message = '';
156 our $need_split_build_invocation = 0;
157 our $split_brain = 0;
161 return unless forkcheck_mainprocess();
162 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
165 our $remotename = 'dgit';
166 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
170 if (!defined $absurdity) {
172 $absurdity =~ s{/[^/]+$}{/absurd} or die;
176 my ($v,$distro) = @_;
177 return $tagformatfn->($v, $distro);
180 sub debiantag_maintview ($$) {
181 my ($v,$distro) = @_;
182 return "$distro/".dep14_version_mangle $v;
185 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
187 sub lbranch () { return "$branchprefix/$csuite"; }
188 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
189 sub lref () { return "refs/heads/".lbranch(); }
190 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
191 sub rrref () { return server_ref($csuite); }
201 return "${package}_".(stripepoch $vsn).$sfx
206 return srcfn($vsn,".dsc");
209 sub changespat ($;$) {
210 my ($vsn, $arch) = @_;
211 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
214 sub upstreamversion ($) {
226 return unless forkcheck_mainprocess();
227 foreach my $f (@end) {
229 print STDERR "$us: cleanup: $@" if length $@;
233 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
235 sub forceable_fail ($$) {
236 my ($forceoptsl, $msg) = @_;
237 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
238 print STDERR "warning: overriding problem due to --force:\n". $msg;
242 my ($forceoptsl) = @_;
243 my @got = grep { $forceopts{$_} } @$forceoptsl;
244 return 0 unless @got;
246 "warning: skipping checks or functionality due to --force-$got[0]\n";
249 sub no_such_package () {
250 print STDERR "$us: package $package does not exist in suite $isuite\n";
254 sub deliberately ($) {
256 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
259 sub deliberately_not_fast_forward () {
260 foreach (qw(not-fast-forward fresh-repo)) {
261 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
265 sub quiltmode_splitbrain () {
266 $quilt_mode =~ m/gbp|dpm|unapplied/;
269 sub opts_opt_multi_cmd {
271 push @cmd, split /\s+/, shift @_;
277 return opts_opt_multi_cmd @gbp_pq;
280 #---------- remote protocol support, common ----------
282 # remote push initiator/responder protocol:
283 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
284 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
285 # < dgit-remote-push-ready <actual-proto-vsn>
292 # > supplementary-message NBYTES # $protovsn >= 3
297 # > file parsed-changelog
298 # [indicates that output of dpkg-parsechangelog follows]
299 # > data-block NBYTES
300 # > [NBYTES bytes of data (no newline)]
301 # [maybe some more blocks]
310 # > param head DGIT-VIEW-HEAD
311 # > param csuite SUITE
312 # > param tagformat old|new
313 # > param maint-view MAINT-VIEW-HEAD
315 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
316 # > file buildinfo # for buildinfos to sign
318 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
319 # # goes into tag, for replay prevention
322 # [indicates that signed tag is wanted]
323 # < data-block NBYTES
324 # < [NBYTES bytes of data (no newline)]
325 # [maybe some more blocks]
329 # > want signed-dsc-changes
330 # < data-block NBYTES [transfer of signed dsc]
332 # < data-block NBYTES [transfer of signed changes]
334 # < data-block NBYTES [transfer of each signed buildinfo
335 # [etc] same number and order as "file buildinfo"]
343 sub i_child_report () {
344 # Sees if our child has died, and reap it if so. Returns a string
345 # describing how it died if it failed, or undef otherwise.
346 return undef unless $i_child_pid;
347 my $got = waitpid $i_child_pid, WNOHANG;
348 return undef if $got <= 0;
349 die unless $got == $i_child_pid;
350 $i_child_pid = undef;
351 return undef unless $?;
352 return "build host child ".waitstatusmsg();
357 fail "connection lost: $!" if $fh->error;
358 fail "protocol violation; $m not expected";
361 sub badproto_badread ($$) {
363 fail "connection lost: $!" if $!;
364 my $report = i_child_report();
365 fail $report if defined $report;
366 badproto $fh, "eof (reading $wh)";
369 sub protocol_expect (&$) {
370 my ($match, $fh) = @_;
373 defined && chomp or badproto_badread $fh, "protocol message";
381 badproto $fh, "\`$_'";
384 sub protocol_send_file ($$) {
385 my ($fh, $ourfn) = @_;
386 open PF, "<", $ourfn or die "$ourfn: $!";
389 my $got = read PF, $d, 65536;
390 die "$ourfn: $!" unless defined $got;
392 print $fh "data-block ".length($d)."\n" or die $!;
393 print $fh $d or die $!;
395 PF->error and die "$ourfn $!";
396 print $fh "data-end\n" or die $!;
400 sub protocol_read_bytes ($$) {
401 my ($fh, $nbytes) = @_;
402 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
404 my $got = read $fh, $d, $nbytes;
405 $got==$nbytes or badproto_badread $fh, "data block";
409 sub protocol_receive_file ($$) {
410 my ($fh, $ourfn) = @_;
411 printdebug "() $ourfn\n";
412 open PF, ">", $ourfn or die "$ourfn: $!";
414 my ($y,$l) = protocol_expect {
415 m/^data-block (.*)$/ ? (1,$1) :
416 m/^data-end$/ ? (0,) :
420 my $d = protocol_read_bytes $fh, $l;
421 print PF $d or die $!;
426 #---------- remote protocol support, responder ----------
428 sub responder_send_command ($) {
430 return unless $we_are_responder;
431 # called even without $we_are_responder
432 printdebug ">> $command\n";
433 print PO $command, "\n" or die $!;
436 sub responder_send_file ($$) {
437 my ($keyword, $ourfn) = @_;
438 return unless $we_are_responder;
439 printdebug "]] $keyword $ourfn\n";
440 responder_send_command "file $keyword";
441 protocol_send_file \*PO, $ourfn;
444 sub responder_receive_files ($@) {
445 my ($keyword, @ourfns) = @_;
446 die unless $we_are_responder;
447 printdebug "[[ $keyword @ourfns\n";
448 responder_send_command "want $keyword";
449 foreach my $fn (@ourfns) {
450 protocol_receive_file \*PI, $fn;
453 protocol_expect { m/^files-end$/ } \*PI;
456 #---------- remote protocol support, initiator ----------
458 sub initiator_expect (&) {
460 protocol_expect { &$match } \*RO;
463 #---------- end remote code ----------
466 if ($we_are_responder) {
468 responder_send_command "progress ".length($m) or die $!;
469 print PO $m or die $!;
479 $ua = LWP::UserAgent->new();
483 progress "downloading $what...";
484 my $r = $ua->get(@_) or die $!;
485 return undef if $r->code == 404;
486 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
487 return $r->decoded_content(charset => 'none');
490 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
492 sub act_local () { return $dryrun_level <= 1; }
493 sub act_scary () { return !$dryrun_level; }
496 if (!$dryrun_level) {
497 progress "$us ok: @_";
499 progress "would be ok: @_ (but dry run only)";
504 printcmd(\*STDERR,$debugprefix."#",@_);
507 sub runcmd_ordryrun {
515 sub runcmd_ordryrun_local {
524 my ($first_shell, @cmd) = @_;
525 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
528 our $helpmsg = <<END;
530 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
531 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
532 dgit [dgit-opts] build [dpkg-buildpackage-opts]
533 dgit [dgit-opts] sbuild [sbuild-opts]
534 dgit [dgit-opts] push [dgit-opts] [suite]
535 dgit [dgit-opts] rpush build-host:build-dir ...
536 important dgit options:
537 -k<keyid> sign tag and package with <keyid> instead of default
538 --dry-run -n do not change anything, but go through the motions
539 --damp-run -L like --dry-run but make local changes, without signing
540 --new -N allow introducing a new package
541 --debug -D increase debug level
542 -c<name>=<value> set git config option (used directly by dgit too)
545 our $later_warning_msg = <<END;
546 Perhaps the upload is stuck in incoming. Using the version from git.
550 print STDERR "$us: @_\n", $helpmsg or die $!;
555 @ARGV or badusage "too few arguments";
556 return scalar shift @ARGV;
563 print $helpmsg or die $!;
567 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
569 our %defcfg = ('dgit.default.distro' => 'debian',
570 'dgit.default.default-suite' => 'unstable',
571 'dgit.default.old-dsc-distro' => 'debian',
572 'dgit-suite.*-security.distro' => 'debian-security',
573 'dgit.default.username' => '',
574 'dgit.default.archive-query-default-component' => 'main',
575 'dgit.default.ssh' => 'ssh',
576 'dgit.default.archive-query' => 'madison:',
577 'dgit.default.sshpsql-dbname' => 'service=projectb',
578 'dgit.default.aptget-components' => 'main',
579 'dgit.default.dgit-tag-format' => 'new,old,maint',
580 'dgit.dsc-url-proto-ok.http' => 'true',
581 'dgit.dsc-url-proto-ok.https' => 'true',
582 'dgit.dsc-url-proto-ok.git' => 'true',
583 'dgit.default.dsc-url-proto-ok' => 'false',
584 # old means "repo server accepts pushes with old dgit tags"
585 # new means "repo server accepts pushes with new dgit tags"
586 # maint means "repo server accepts split brain pushes"
587 # hist means "repo server may have old pushes without new tag"
588 # ("hist" is implied by "old")
589 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
590 'dgit-distro.debian.git-check' => 'url',
591 'dgit-distro.debian.git-check-suffix' => '/info/refs',
592 'dgit-distro.debian.new-private-pushers' => 't',
593 'dgit-distro.debian/push.git-url' => '',
594 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
595 'dgit-distro.debian/push.git-user-force' => 'dgit',
596 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
597 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
598 'dgit-distro.debian/push.git-create' => 'true',
599 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
600 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
601 # 'dgit-distro.debian.archive-query-tls-key',
602 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
603 # ^ this does not work because curl is broken nowadays
604 # Fixing #790093 properly will involve providing providing the key
605 # in some pacagke and maybe updating these paths.
607 # 'dgit-distro.debian.archive-query-tls-curl-args',
608 # '--ca-path=/etc/ssl/ca-debian',
609 # ^ this is a workaround but works (only) on DSA-administered machines
610 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
611 'dgit-distro.debian.git-url-suffix' => '',
612 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
613 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
614 'dgit-distro.debian-security.archive-query' => 'aptget:',
615 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
616 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
617 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
618 'dgit-distro.debian-security.nominal-distro' => 'debian',
619 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
620 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
621 'dgit-distro.ubuntu.git-check' => 'false',
622 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
623 'dgit-distro.test-dummy.ssh' => "$td/ssh",
624 'dgit-distro.test-dummy.username' => "alice",
625 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
626 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
627 'dgit-distro.test-dummy.git-url' => "$td/git",
628 'dgit-distro.test-dummy.git-host' => "git",
629 'dgit-distro.test-dummy.git-path' => "$td/git",
630 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
631 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
632 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
633 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
637 our @gitcfgsources = qw(cmdline local global system);
639 sub git_slurp_config () {
640 # This algoritm is a bit subtle, but this is needed so that for
641 # options which we want to be single-valued, we allow the
642 # different config sources to override properly. See #835858.
643 foreach my $src (@gitcfgsources) {
644 next if $src eq 'cmdline';
645 # we do this ourselves since git doesn't handle it
647 $gitcfgs{$src} = git_slurp_config_src $src;
651 sub git_get_config ($) {
653 foreach my $src (@gitcfgsources) {
654 my $l = $gitcfgs{$src}{$c};
655 confess "internal error ($l $c)" if $l && !ref $l;
656 printdebug"C $c ".(defined $l ?
657 join " ", map { messagequote "'$_'" } @$l :
661 @$l==1 or badcfg "multiple values for $c".
662 " (in $src git config)" if @$l > 1;
670 return undef if $c =~ /RETURN-UNDEF/;
671 printdebug "C? $c\n" if $debuglevel >= 5;
672 my $v = git_get_config($c);
673 return $v if defined $v;
674 my $dv = $defcfg{$c};
676 printdebug "CD $c $dv\n" if $debuglevel >= 4;
680 badcfg "need value for one of: @_\n".
681 "$us: distro or suite appears not to be (properly) supported";
684 sub no_local_git_cfg () {
685 # needs to be called from pre_*
686 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
689 sub access_basedistro__noalias () {
690 if (defined $idistro) {
693 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
694 return $def if defined $def;
695 foreach my $src (@gitcfgsources, 'internal') {
696 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
698 foreach my $k (keys %$kl) {
699 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
701 next unless match_glob $dpat, $isuite;
705 return cfg("dgit.default.distro");
709 sub access_basedistro () {
710 my $noalias = access_basedistro__noalias();
711 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
712 return $canon // $noalias;
715 sub access_nomdistro () {
716 my $base = access_basedistro();
717 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
718 $r =~ m/^$distro_re$/ or badcfg
719 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
723 sub access_quirk () {
724 # returns (quirk name, distro to use instead or undef, quirk-specific info)
725 my $basedistro = access_basedistro();
726 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
728 if (defined $backports_quirk) {
729 my $re = $backports_quirk;
730 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
732 $re =~ s/\%/([-0-9a-z_]+)/
733 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
734 if ($isuite =~ m/^$re$/) {
735 return ('backports',"$basedistro-backports",$1);
738 return ('none',undef);
743 sub parse_cfg_bool ($$$) {
744 my ($what,$def,$v) = @_;
747 $v =~ m/^[ty1]/ ? 1 :
748 $v =~ m/^[fn0]/ ? 0 :
749 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
752 sub access_forpush_config () {
753 my $d = access_basedistro();
757 parse_cfg_bool('new-private-pushers', 0,
758 cfg("dgit-distro.$d.new-private-pushers",
761 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
764 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
765 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
766 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
767 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
770 sub access_forpush () {
771 $access_forpush //= access_forpush_config();
772 return $access_forpush;
776 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
777 badcfg "pushing but distro is configured readonly"
778 if access_forpush_config() eq '0';
780 $supplementary_message = <<'END' unless $we_are_responder;
781 Push failed, before we got started.
782 You can retry the push, after fixing the problem, if you like.
784 parseopts_late_defaults();
788 parseopts_late_defaults();
791 sub supplementary_message ($) {
793 if (!$we_are_responder) {
794 $supplementary_message = $msg;
796 } elsif ($protovsn >= 3) {
797 responder_send_command "supplementary-message ".length($msg)
799 print PO $msg or die $!;
803 sub access_distros () {
804 # Returns list of distros to try, in order
807 # 0. `instead of' distro name(s) we have been pointed to
808 # 1. the access_quirk distro, if any
809 # 2a. the user's specified distro, or failing that } basedistro
810 # 2b. the distro calculated from the suite }
811 my @l = access_basedistro();
813 my (undef,$quirkdistro) = access_quirk();
814 unshift @l, $quirkdistro;
815 unshift @l, $instead_distro;
816 @l = grep { defined } @l;
818 push @l, access_nomdistro();
820 if (access_forpush()) {
821 @l = map { ("$_/push", $_) } @l;
826 sub access_cfg_cfgs (@) {
829 # The nesting of these loops determines the search order. We put
830 # the key loop on the outside so that we search all the distros
831 # for each key, before going on to the next key. That means that
832 # if access_cfg is called with a more specific, and then a less
833 # specific, key, an earlier distro can override the less specific
834 # without necessarily overriding any more specific keys. (If the
835 # distro wants to override the more specific keys it can simply do
836 # so; whereas if we did the loop the other way around, it would be
837 # impossible to for an earlier distro to override a less specific
838 # key but not the more specific ones without restating the unknown
839 # values of the more specific keys.
842 # We have to deal with RETURN-UNDEF specially, so that we don't
843 # terminate the search prematurely.
845 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
848 foreach my $d (access_distros()) {
849 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
851 push @cfgs, map { "dgit.default.$_" } @realkeys;
858 my (@cfgs) = access_cfg_cfgs(@keys);
859 my $value = cfg(@cfgs);
863 sub access_cfg_bool ($$) {
864 my ($def, @keys) = @_;
865 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
868 sub string_to_ssh ($) {
870 if ($spec =~ m/\s/) {
871 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
877 sub access_cfg_ssh () {
878 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
879 if (!defined $gitssh) {
882 return string_to_ssh $gitssh;
886 sub access_runeinfo ($) {
888 return ": dgit ".access_basedistro()." $info ;";
891 sub access_someuserhost ($) {
893 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
894 defined($user) && length($user) or
895 $user = access_cfg("$some-user",'username');
896 my $host = access_cfg("$some-host");
897 return length($user) ? "$user\@$host" : $host;
900 sub access_gituserhost () {
901 return access_someuserhost('git');
904 sub access_giturl (;$) {
906 my $url = access_cfg('git-url','RETURN-UNDEF');
909 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
910 return undef unless defined $proto;
913 access_gituserhost().
914 access_cfg('git-path');
916 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
919 return "$url/$package$suffix";
922 sub parsecontrolfh ($$;$) {
923 my ($fh, $desc, $allowsigned) = @_;
924 our $dpkgcontrolhash_noissigned;
927 my %opts = ('name' => $desc);
928 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
929 $c = Dpkg::Control::Hash->new(%opts);
930 $c->parse($fh,$desc) or die "parsing of $desc failed";
931 last if $allowsigned;
932 last if $dpkgcontrolhash_noissigned;
933 my $issigned= $c->get_option('is_pgp_signed');
934 if (!defined $issigned) {
935 $dpkgcontrolhash_noissigned= 1;
936 seek $fh, 0,0 or die "seek $desc: $!";
937 } elsif ($issigned) {
938 fail "control file $desc is (already) PGP-signed. ".
939 " Note that dgit push needs to modify the .dsc and then".
940 " do the signature itself";
949 my ($file, $desc, $allowsigned) = @_;
950 my $fh = new IO::Handle;
951 open $fh, '<', $file or die "$file: $!";
952 my $c = parsecontrolfh($fh,$desc,$allowsigned);
953 $fh->error and die $!;
959 my ($dctrl,$field) = @_;
960 my $v = $dctrl->{$field};
961 return $v if defined $v;
962 fail "missing field $field in ".$dctrl->get_option('name');
966 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
967 my $p = new IO::Handle;
968 my @cmd = (qw(dpkg-parsechangelog), @_);
969 open $p, '-|', @cmd or die $!;
971 $?=0; $!=0; close $p or failedcmd @cmd;
975 sub commit_getclogp ($) {
976 # Returns the parsed changelog hashref for a particular commit
978 our %commit_getclogp_memo;
979 my $memo = $commit_getclogp_memo{$objid};
980 return $memo if $memo;
982 my $mclog = ".git/dgit/clog-$objid";
983 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
984 "$objid:debian/changelog";
985 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
990 defined $d or fail "getcwd failed: $!";
994 sub parse_dscdata () {
995 my $dscfh = new IO::File \$dscdata, '<' or die $!;
996 printdebug Dumper($dscdata) if $debuglevel>1;
997 $dsc = parsecontrolfh($dscfh,$dscurl,1);
998 printdebug Dumper($dsc) if $debuglevel>1;
1003 sub archive_query ($;@) {
1004 my ($method) = shift @_;
1005 fail "this operation does not support multiple comma-separated suites"
1007 my $query = access_cfg('archive-query','RETURN-UNDEF');
1008 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1011 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1014 sub archive_query_prepend_mirror {
1015 my $m = access_cfg('mirror');
1016 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1019 sub pool_dsc_subpath ($$) {
1020 my ($vsn,$component) = @_; # $package is implict arg
1021 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1022 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1025 sub cfg_apply_map ($$$) {
1026 my ($varref, $what, $mapspec) = @_;
1027 return unless $mapspec;
1029 printdebug "config $what EVAL{ $mapspec; }\n";
1031 eval "package Dgit::Config; $mapspec;";
1036 #---------- `ftpmasterapi' archive query method (nascent) ----------
1038 sub archive_api_query_cmd ($) {
1040 my @cmd = (@curl, qw(-sS));
1041 my $url = access_cfg('archive-query-url');
1042 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1044 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1045 foreach my $key (split /\:/, $keys) {
1046 $key =~ s/\%HOST\%/$host/g;
1048 fail "for $url: stat $key: $!" unless $!==ENOENT;
1051 fail "config requested specific TLS key but do not know".
1052 " how to get curl to use exactly that EE key ($key)";
1053 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1054 # # Sadly the above line does not work because of changes
1055 # # to gnutls. The real fix for #790093 may involve
1056 # # new curl options.
1059 # Fixing #790093 properly will involve providing a value
1060 # for this on clients.
1061 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1062 push @cmd, split / /, $kargs if defined $kargs;
1064 push @cmd, $url.$subpath;
1068 sub api_query ($$;$) {
1070 my ($data, $subpath, $ok404) = @_;
1071 badcfg "ftpmasterapi archive query method takes no data part"
1073 my @cmd = archive_api_query_cmd($subpath);
1074 my $url = $cmd[$#cmd];
1075 push @cmd, qw(-w %{http_code});
1076 my $json = cmdoutput @cmd;
1077 unless ($json =~ s/\d+\d+\d$//) {
1078 failedcmd_report_cmd undef, @cmd;
1079 fail "curl failed to print 3-digit HTTP code";
1082 return undef if $code eq '404' && $ok404;
1083 fail "fetch of $url gave HTTP code $code"
1084 unless $url =~ m#^file://# or $code =~ m/^2/;
1085 return decode_json($json);
1088 sub canonicalise_suite_ftpmasterapi {
1089 my ($proto,$data) = @_;
1090 my $suites = api_query($data, 'suites');
1092 foreach my $entry (@$suites) {
1094 my $v = $entry->{$_};
1095 defined $v && $v eq $isuite;
1096 } qw(codename name);
1097 push @matched, $entry;
1099 fail "unknown suite $isuite" unless @matched;
1102 @matched==1 or die "multiple matches for suite $isuite\n";
1103 $cn = "$matched[0]{codename}";
1104 defined $cn or die "suite $isuite info has no codename\n";
1105 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1107 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1112 sub archive_query_ftpmasterapi {
1113 my ($proto,$data) = @_;
1114 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1116 my $digester = Digest::SHA->new(256);
1117 foreach my $entry (@$info) {
1119 my $vsn = "$entry->{version}";
1120 my ($ok,$msg) = version_check $vsn;
1121 die "bad version: $msg\n" unless $ok;
1122 my $component = "$entry->{component}";
1123 $component =~ m/^$component_re$/ or die "bad component";
1124 my $filename = "$entry->{filename}";
1125 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1126 or die "bad filename";
1127 my $sha256sum = "$entry->{sha256sum}";
1128 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1129 push @rows, [ $vsn, "/pool/$component/$filename",
1130 $digester, $sha256sum ];
1132 die "bad ftpmaster api response: $@\n".Dumper($entry)
1135 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1136 return archive_query_prepend_mirror @rows;
1139 sub file_in_archive_ftpmasterapi {
1140 my ($proto,$data,$filename) = @_;
1141 my $pat = $filename;
1144 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1145 my $info = api_query($data, "file_in_archive/$pat", 1);
1148 #---------- `aptget' archive query method ----------
1151 our $aptget_releasefile;
1152 our $aptget_configpath;
1154 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1155 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1157 sub aptget_cache_clean {
1158 runcmd_ordryrun_local qw(sh -ec),
1159 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1163 sub aptget_lock_acquire () {
1164 my $lockfile = "$aptget_base/lock";
1165 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1166 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1169 sub aptget_prep ($) {
1171 return if defined $aptget_base;
1173 badcfg "aptget archive query method takes no data part"
1176 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1179 ensuredir "$cache/dgit";
1181 access_cfg('aptget-cachekey','RETURN-UNDEF')
1182 // access_nomdistro();
1184 $aptget_base = "$cache/dgit/aptget";
1185 ensuredir $aptget_base;
1187 my $quoted_base = $aptget_base;
1188 die "$quoted_base contains bad chars, cannot continue"
1189 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1191 ensuredir $aptget_base;
1193 aptget_lock_acquire();
1195 aptget_cache_clean();
1197 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1198 my $sourceslist = "source.list#$cachekey";
1200 my $aptsuites = $isuite;
1201 cfg_apply_map(\$aptsuites, 'suite map',
1202 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1204 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1205 printf SRCS "deb-src %s %s %s\n",
1206 access_cfg('mirror'),
1208 access_cfg('aptget-components')
1211 ensuredir "$aptget_base/cache";
1212 ensuredir "$aptget_base/lists";
1214 open CONF, ">", $aptget_configpath or die $!;
1216 Debug::NoLocking "true";
1217 APT::Get::List-Cleanup "false";
1218 #clear APT::Update::Post-Invoke-Success;
1219 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1220 Dir::State::Lists "$quoted_base/lists";
1221 Dir::Etc::preferences "$quoted_base/preferences";
1222 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1223 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1226 foreach my $key (qw(
1229 Dir::Cache::Archives
1230 Dir::Etc::SourceParts
1231 Dir::Etc::preferencesparts
1233 ensuredir "$aptget_base/$key";
1234 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1237 my $oldatime = (time // die $!) - 1;
1238 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1239 next unless stat_exists $oldlist;
1240 my ($mtime) = (stat _)[9];
1241 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1244 runcmd_ordryrun_local aptget_aptget(), qw(update);
1247 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1248 next unless stat_exists $oldlist;
1249 my ($atime) = (stat _)[8];
1250 next if $atime == $oldatime;
1251 push @releasefiles, $oldlist;
1253 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1254 @releasefiles = @inreleasefiles if @inreleasefiles;
1255 die "apt updated wrong number of Release files (@releasefiles), erk"
1256 unless @releasefiles == 1;
1258 ($aptget_releasefile) = @releasefiles;
1261 sub canonicalise_suite_aptget {
1262 my ($proto,$data) = @_;
1265 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1267 foreach my $name (qw(Codename Suite)) {
1268 my $val = $release->{$name};
1270 printdebug "release file $name: $val\n";
1271 $val =~ m/^$suite_re$/o or fail
1272 "Release file ($aptget_releasefile) specifies intolerable $name";
1273 cfg_apply_map(\$val, 'suite rmap',
1274 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1281 sub archive_query_aptget {
1282 my ($proto,$data) = @_;
1285 ensuredir "$aptget_base/source";
1286 foreach my $old (<$aptget_base/source/*.dsc>) {
1287 unlink $old or die "$old: $!";
1290 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1291 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1292 # avoids apt-get source failing with ambiguous error code
1294 runcmd_ordryrun_local
1295 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1296 aptget_aptget(), qw(--download-only --only-source source), $package;
1298 my @dscs = <$aptget_base/source/*.dsc>;
1299 fail "apt-get source did not produce a .dsc" unless @dscs;
1300 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1302 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1305 my $uri = "file://". uri_escape $dscs[0];
1306 $uri =~ s{\%2f}{/}gi;
1307 return [ (getfield $pre_dsc, 'Version'), $uri ];
1310 sub file_in_archive_aptget () { return undef; }
1312 #---------- `dummyapicat' archive query method ----------
1314 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1315 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1317 sub file_in_archive_dummycatapi ($$$) {
1318 my ($proto,$data,$filename) = @_;
1319 my $mirror = access_cfg('mirror');
1320 $mirror =~ s#^file://#/# or die "$mirror ?";
1322 my @cmd = (qw(sh -ec), '
1324 find -name "$2" -print0 |
1326 ', qw(x), $mirror, $filename);
1327 debugcmd "-|", @cmd;
1328 open FIA, "-|", @cmd or die $!;
1331 printdebug "| $_\n";
1332 m/^(\w+) (\S+)$/ or die "$_ ?";
1333 push @out, { sha256sum => $1, filename => $2 };
1335 close FIA or die failedcmd @cmd;
1339 #---------- `madison' archive query method ----------
1341 sub archive_query_madison {
1342 return archive_query_prepend_mirror
1343 map { [ @$_[0..1] ] } madison_get_parse(@_);
1346 sub madison_get_parse {
1347 my ($proto,$data) = @_;
1348 die unless $proto eq 'madison';
1349 if (!length $data) {
1350 $data= access_cfg('madison-distro','RETURN-UNDEF');
1351 $data //= access_basedistro();
1353 $rmad{$proto,$data,$package} ||= cmdoutput
1354 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1355 my $rmad = $rmad{$proto,$data,$package};
1358 foreach my $l (split /\n/, $rmad) {
1359 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1360 \s*( [^ \t|]+ )\s* \|
1361 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1362 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1363 $1 eq $package or die "$rmad $package ?";
1370 $component = access_cfg('archive-query-default-component');
1372 $5 eq 'source' or die "$rmad ?";
1373 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1375 return sort { -version_compare($a->[0],$b->[0]); } @out;
1378 sub canonicalise_suite_madison {
1379 # madison canonicalises for us
1380 my @r = madison_get_parse(@_);
1382 "unable to canonicalise suite using package $package".
1383 " which does not appear to exist in suite $isuite;".
1384 " --existing-package may help";
1388 sub file_in_archive_madison { return undef; }
1390 #---------- `sshpsql' archive query method ----------
1393 my ($data,$runeinfo,$sql) = @_;
1394 if (!length $data) {
1395 $data= access_someuserhost('sshpsql').':'.
1396 access_cfg('sshpsql-dbname');
1398 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1399 my ($userhost,$dbname) = ($`,$'); #';
1401 my @cmd = (access_cfg_ssh, $userhost,
1402 access_runeinfo("ssh-psql $runeinfo").
1403 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1404 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1406 open P, "-|", @cmd or die $!;
1409 printdebug(">|$_|\n");
1412 $!=0; $?=0; close P or failedcmd @cmd;
1414 my $nrows = pop @rows;
1415 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1416 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1417 @rows = map { [ split /\|/, $_ ] } @rows;
1418 my $ncols = scalar @{ shift @rows };
1419 die if grep { scalar @$_ != $ncols } @rows;
1423 sub sql_injection_check {
1424 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1427 sub archive_query_sshpsql ($$) {
1428 my ($proto,$data) = @_;
1429 sql_injection_check $isuite, $package;
1430 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1431 SELECT source.version, component.name, files.filename, files.sha256sum
1433 JOIN src_associations ON source.id = src_associations.source
1434 JOIN suite ON suite.id = src_associations.suite
1435 JOIN dsc_files ON dsc_files.source = source.id
1436 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1437 JOIN component ON component.id = files_archive_map.component_id
1438 JOIN files ON files.id = dsc_files.file
1439 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1440 AND source.source='$package'
1441 AND files.filename LIKE '%.dsc';
1443 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1444 my $digester = Digest::SHA->new(256);
1446 my ($vsn,$component,$filename,$sha256sum) = @$_;
1447 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1449 return archive_query_prepend_mirror @rows;
1452 sub canonicalise_suite_sshpsql ($$) {
1453 my ($proto,$data) = @_;
1454 sql_injection_check $isuite;
1455 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1456 SELECT suite.codename
1457 FROM suite where suite_name='$isuite' or codename='$isuite';
1459 @rows = map { $_->[0] } @rows;
1460 fail "unknown suite $isuite" unless @rows;
1461 die "ambiguous $isuite: @rows ?" if @rows>1;
1465 sub file_in_archive_sshpsql ($$$) { return undef; }
1467 #---------- `dummycat' archive query method ----------
1469 sub canonicalise_suite_dummycat ($$) {
1470 my ($proto,$data) = @_;
1471 my $dpath = "$data/suite.$isuite";
1472 if (!open C, "<", $dpath) {
1473 $!==ENOENT or die "$dpath: $!";
1474 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1478 chomp or die "$dpath: $!";
1480 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1484 sub archive_query_dummycat ($$) {
1485 my ($proto,$data) = @_;
1486 canonicalise_suite();
1487 my $dpath = "$data/package.$csuite.$package";
1488 if (!open C, "<", $dpath) {
1489 $!==ENOENT or die "$dpath: $!";
1490 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1498 printdebug "dummycat query $csuite $package $dpath | $_\n";
1499 my @row = split /\s+/, $_;
1500 @row==2 or die "$dpath: $_ ?";
1503 C->error and die "$dpath: $!";
1505 return archive_query_prepend_mirror
1506 sort { -version_compare($a->[0],$b->[0]); } @rows;
1509 sub file_in_archive_dummycat () { return undef; }
1511 #---------- tag format handling ----------
1513 sub access_cfg_tagformats () {
1514 split /\,/, access_cfg('dgit-tag-format');
1517 sub access_cfg_tagformats_can_splitbrain () {
1518 my %y = map { $_ => 1 } access_cfg_tagformats;
1519 foreach my $needtf (qw(new maint)) {
1520 next if $y{$needtf};
1526 sub need_tagformat ($$) {
1527 my ($fmt, $why) = @_;
1528 fail "need to use tag format $fmt ($why) but also need".
1529 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1530 " - no way to proceed"
1531 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1532 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1535 sub select_tagformat () {
1537 return if $tagformatfn && !$tagformat_want;
1538 die 'bug' if $tagformatfn && $tagformat_want;
1539 # ... $tagformat_want assigned after previous select_tagformat
1541 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1542 printdebug "select_tagformat supported @supported\n";
1544 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1545 printdebug "select_tagformat specified @$tagformat_want\n";
1547 my ($fmt,$why,$override) = @$tagformat_want;
1549 fail "target distro supports tag formats @supported".
1550 " but have to use $fmt ($why)"
1552 or grep { $_ eq $fmt } @supported;
1554 $tagformat_want = undef;
1556 $tagformatfn = ${*::}{"debiantag_$fmt"};
1558 fail "trying to use unknown tag format \`$fmt' ($why) !"
1559 unless $tagformatfn;
1562 #---------- archive query entrypoints and rest of program ----------
1564 sub canonicalise_suite () {
1565 return if defined $csuite;
1566 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1567 $csuite = archive_query('canonicalise_suite');
1568 if ($isuite ne $csuite) {
1569 progress "canonical suite name for $isuite is $csuite";
1571 progress "canonical suite name is $csuite";
1575 sub get_archive_dsc () {
1576 canonicalise_suite();
1577 my @vsns = archive_query('archive_query');
1578 foreach my $vinfo (@vsns) {
1579 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1580 $dscurl = $vsn_dscurl;
1581 $dscdata = url_get($dscurl);
1583 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1588 $digester->add($dscdata);
1589 my $got = $digester->hexdigest();
1591 fail "$dscurl has hash $got but".
1592 " archive told us to expect $digest";
1595 my $fmt = getfield $dsc, 'Format';
1596 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1597 "unsupported source format $fmt, sorry";
1599 $dsc_checked = !!$digester;
1600 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1604 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1607 sub check_for_git ();
1608 sub check_for_git () {
1610 my $how = access_cfg('git-check');
1611 if ($how eq 'ssh-cmd') {
1613 (access_cfg_ssh, access_gituserhost(),
1614 access_runeinfo("git-check $package").
1615 " set -e; cd ".access_cfg('git-path').";".
1616 " if test -d $package.git; then echo 1; else echo 0; fi");
1617 my $r= cmdoutput @cmd;
1618 if (defined $r and $r =~ m/^divert (\w+)$/) {
1620 my ($usedistro,) = access_distros();
1621 # NB that if we are pushing, $usedistro will be $distro/push
1622 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1623 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1624 progress "diverting to $divert (using config for $instead_distro)";
1625 return check_for_git();
1627 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1629 } elsif ($how eq 'url') {
1630 my $prefix = access_cfg('git-check-url','git-url');
1631 my $suffix = access_cfg('git-check-suffix','git-suffix',
1632 'RETURN-UNDEF') // '.git';
1633 my $url = "$prefix/$package$suffix";
1634 my @cmd = (@curl, qw(-sS -I), $url);
1635 my $result = cmdoutput @cmd;
1636 $result =~ s/^\S+ 200 .*\n\r?\n//;
1637 # curl -sS -I with https_proxy prints
1638 # HTTP/1.0 200 Connection established
1639 $result =~ m/^\S+ (404|200) /s or
1640 fail "unexpected results from git check query - ".
1641 Dumper($prefix, $result);
1643 if ($code eq '404') {
1645 } elsif ($code eq '200') {
1650 } elsif ($how eq 'true') {
1652 } elsif ($how eq 'false') {
1655 badcfg "unknown git-check \`$how'";
1659 sub create_remote_git_repo () {
1660 my $how = access_cfg('git-create');
1661 if ($how eq 'ssh-cmd') {
1663 (access_cfg_ssh, access_gituserhost(),
1664 access_runeinfo("git-create $package").
1665 "set -e; cd ".access_cfg('git-path').";".
1666 " cp -a _template $package.git");
1667 } elsif ($how eq 'true') {
1670 badcfg "unknown git-create \`$how'";
1674 our ($dsc_hash,$lastpush_mergeinput);
1675 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1677 our $ud = '.git/dgit/unpack';
1687 sub mktree_in_ud_here () {
1688 workarea_setup $gitcfgs{local};
1691 sub git_write_tree () {
1692 my $tree = cmdoutput @git, qw(write-tree);
1693 $tree =~ m/^\w+$/ or die "$tree ?";
1697 sub git_add_write_tree () {
1698 runcmd @git, qw(add -Af .);
1699 return git_write_tree();
1702 sub remove_stray_gits ($) {
1704 my @gitscmd = qw(find -name .git -prune -print0);
1705 debugcmd "|",@gitscmd;
1706 open GITS, "-|", @gitscmd or die $!;
1711 print STDERR "$us: warning: removing from $what: ",
1712 (messagequote $_), "\n";
1716 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1719 sub mktree_in_ud_from_only_subdir ($;$) {
1720 my ($what,$raw) = @_;
1722 # changes into the subdir
1724 die "expected one subdir but found @dirs ?" unless @dirs==1;
1725 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1729 remove_stray_gits($what);
1730 mktree_in_ud_here();
1732 my ($format, $fopts) = get_source_format();
1733 if (madformat($format)) {
1738 my $tree=git_add_write_tree();
1739 return ($tree,$dir);
1742 our @files_csum_info_fields =
1743 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1744 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1745 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1747 sub dsc_files_info () {
1748 foreach my $csumi (@files_csum_info_fields) {
1749 my ($fname, $module, $method) = @$csumi;
1750 my $field = $dsc->{$fname};
1751 next unless defined $field;
1752 eval "use $module; 1;" or die $@;
1754 foreach (split /\n/, $field) {
1756 m/^(\w+) (\d+) (\S+)$/ or
1757 fail "could not parse .dsc $fname line \`$_'";
1758 my $digester = eval "$module"."->$method;" or die $@;
1763 Digester => $digester,
1768 fail "missing any supported Checksums-* or Files field in ".
1769 $dsc->get_option('name');
1773 map { $_->{Filename} } dsc_files_info();
1776 sub files_compare_inputs (@) {
1781 my $showinputs = sub {
1782 return join "; ", map { $_->get_option('name') } @$inputs;
1785 foreach my $in (@$inputs) {
1787 my $in_name = $in->get_option('name');
1789 printdebug "files_compare_inputs $in_name\n";
1791 foreach my $csumi (@files_csum_info_fields) {
1792 my ($fname) = @$csumi;
1793 printdebug "files_compare_inputs $in_name $fname\n";
1795 my $field = $in->{$fname};
1796 next unless defined $field;
1799 foreach (split /\n/, $field) {
1802 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1803 fail "could not parse $in_name $fname line \`$_'";
1805 printdebug "files_compare_inputs $in_name $fname $f\n";
1809 my $re = \ $record{$f}{$fname};
1811 $fchecked{$f}{$in_name} = 1;
1813 fail "hash or size of $f varies in $fname fields".
1814 " (between: ".$showinputs->().")";
1819 @files = sort @files;
1820 $expected_files //= \@files;
1821 "@$expected_files" eq "@files" or
1822 fail "file list in $in_name varies between hash fields!";
1825 fail "$in_name has no files list field(s)";
1827 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1830 grep { keys %$_ == @$inputs-1 } values %fchecked
1831 or fail "no file appears in all file lists".
1832 " (looked in: ".$showinputs->().")";
1835 sub is_orig_file_in_dsc ($$) {
1836 my ($f, $dsc_files_info) = @_;
1837 return 0 if @$dsc_files_info <= 1;
1838 # One file means no origs, and the filename doesn't have a "what
1839 # part of dsc" component. (Consider versions ending `.orig'.)
1840 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1844 sub is_orig_file_of_vsn ($$) {
1845 my ($f, $upstreamvsn) = @_;
1846 my $base = srcfn $upstreamvsn, '';
1847 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1851 sub changes_update_origs_from_dsc ($$$$) {
1852 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1854 printdebug "checking origs needed ($upstreamvsn)...\n";
1855 $_ = getfield $changes, 'Files';
1856 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1857 fail "cannot find section/priority from .changes Files field";
1858 my $placementinfo = $1;
1860 printdebug "checking origs needed placement '$placementinfo'...\n";
1861 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1862 $l =~ m/\S+$/ or next;
1864 printdebug "origs $file | $l\n";
1865 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1866 printdebug "origs $file is_orig\n";
1867 my $have = archive_query('file_in_archive', $file);
1868 if (!defined $have) {
1870 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1876 printdebug "origs $file \$#\$have=$#$have\n";
1877 foreach my $h (@$have) {
1880 foreach my $csumi (@files_csum_info_fields) {
1881 my ($fname, $module, $method, $archivefield) = @$csumi;
1882 next unless defined $h->{$archivefield};
1883 $_ = $dsc->{$fname};
1884 next unless defined;
1885 m/^(\w+) .* \Q$file\E$/m or
1886 fail ".dsc $fname missing entry for $file";
1887 if ($h->{$archivefield} eq $1) {
1891 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1894 die "$file ".Dumper($h)." ?!" if $same && @differ;
1897 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1900 printdebug "origs $file f.same=$found_same".
1901 " #f._differ=$#found_differ\n";
1902 if (@found_differ && !$found_same) {
1904 "archive contains $file with different checksum",
1907 # Now we edit the changes file to add or remove it
1908 foreach my $csumi (@files_csum_info_fields) {
1909 my ($fname, $module, $method, $archivefield) = @$csumi;
1910 next unless defined $changes->{$fname};
1912 # in archive, delete from .changes if it's there
1913 $changed{$file} = "removed" if
1914 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1915 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1916 # not in archive, but it's here in the .changes
1918 my $dsc_data = getfield $dsc, $fname;
1919 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1921 $extra =~ s/ \d+ /$&$placementinfo /
1922 or die "$fname $extra >$dsc_data< ?"
1923 if $fname eq 'Files';
1924 $changes->{$fname} .= "\n". $extra;
1925 $changed{$file} = "added";
1930 foreach my $file (keys %changed) {
1932 "edited .changes for archive .orig contents: %s %s",
1933 $changed{$file}, $file;
1935 my $chtmp = "$changesfile.tmp";
1936 $changes->save($chtmp);
1938 rename $chtmp,$changesfile or die "$changesfile $!";
1940 progress "[new .changes left in $changesfile]";
1943 progress "$changesfile already has appropriate .orig(s) (if any)";
1947 sub make_commit ($) {
1949 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1952 sub make_commit_text ($) {
1955 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1957 print Dumper($text) if $debuglevel > 1;
1958 my $child = open2($out, $in, @cmd) or die $!;
1961 print $in $text or die $!;
1962 close $in or die $!;
1964 $h =~ m/^\w+$/ or die;
1966 printdebug "=> $h\n";
1969 waitpid $child, 0 == $child or die "$child $!";
1970 $? and failedcmd @cmd;
1974 sub clogp_authline ($) {
1976 my $author = getfield $clogp, 'Maintainer';
1977 if ($author =~ m/^[^"\@]+\,/) {
1978 # single entry Maintainer field with unquoted comma
1979 $author = ($& =~ y/,//rd).$'; # strip the comma
1981 # git wants a single author; any remaining commas in $author
1982 # are by now preceded by @ (or "). It seems safer to punt on
1983 # "..." for now rather than attempting to dequote or something.
1984 $author =~ s#,.*##ms unless $author =~ m/"/;
1985 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1986 my $authline = "$author $date";
1987 $authline =~ m/$git_authline_re/o or
1988 fail "unexpected commit author line format \`$authline'".
1989 " (was generated from changelog Maintainer field)";
1990 return ($1,$2,$3) if wantarray;
1994 sub vendor_patches_distro ($$) {
1995 my ($checkdistro, $what) = @_;
1996 return unless defined $checkdistro;
1998 my $series = "debian/patches/\L$checkdistro\E.series";
1999 printdebug "checking for vendor-specific $series ($what)\n";
2001 if (!open SERIES, "<", $series) {
2002 die "$series $!" unless $!==ENOENT;
2011 Unfortunately, this source package uses a feature of dpkg-source where
2012 the same source package unpacks to different source code on different
2013 distros. dgit cannot safely operate on such packages on affected
2014 distros, because the meaning of source packages is not stable.
2016 Please ask the distro/maintainer to remove the distro-specific series
2017 files and use a different technique (if necessary, uploading actually
2018 different packages, if different distros are supposed to have
2022 fail "Found active distro-specific series file for".
2023 " $checkdistro ($what): $series, cannot continue";
2025 die "$series $!" if SERIES->error;
2029 sub check_for_vendor_patches () {
2030 # This dpkg-source feature doesn't seem to be documented anywhere!
2031 # But it can be found in the changelog (reformatted):
2033 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2034 # Author: Raphael Hertzog <hertzog@debian.org>
2035 # Date: Sun Oct 3 09:36:48 2010 +0200
2037 # dpkg-source: correctly create .pc/.quilt_series with alternate
2040 # If you have debian/patches/ubuntu.series and you were
2041 # unpacking the source package on ubuntu, quilt was still
2042 # directed to debian/patches/series instead of
2043 # debian/patches/ubuntu.series.
2045 # debian/changelog | 3 +++
2046 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2047 # 2 files changed, 6 insertions(+), 1 deletion(-)
2050 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2051 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2052 "Dpkg::Vendor \`current vendor'");
2053 vendor_patches_distro(access_basedistro(),
2054 "(base) distro being accessed");
2055 vendor_patches_distro(access_nomdistro(),
2056 "(nominal) distro being accessed");
2059 sub generate_commits_from_dsc () {
2060 # See big comment in fetch_from_archive, below.
2061 # See also README.dsc-import.
2065 my @dfi = dsc_files_info();
2066 foreach my $fi (@dfi) {
2067 my $f = $fi->{Filename};
2068 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2069 my $upper_f = "../../../../$f";
2071 printdebug "considering reusing $f: ";
2073 if (link_ltarget "$upper_f,fetch", $f) {
2074 printdebug "linked (using ...,fetch).\n";
2075 } elsif ((printdebug "($!) "),
2077 fail "accessing ../$f,fetch: $!";
2078 } elsif (link_ltarget $upper_f, $f) {
2079 printdebug "linked.\n";
2080 } elsif ((printdebug "($!) "),
2082 fail "accessing ../$f: $!";
2084 printdebug "absent.\n";
2088 complete_file_from_dsc('.', $fi, \$refetched)
2091 printdebug "considering saving $f: ";
2093 if (link $f, $upper_f) {
2094 printdebug "linked.\n";
2095 } elsif ((printdebug "($!) "),
2097 fail "saving ../$f: $!";
2098 } elsif (!$refetched) {
2099 printdebug "no need.\n";
2100 } elsif (link $f, "$upper_f,fetch") {
2101 printdebug "linked (using ...,fetch).\n";
2102 } elsif ((printdebug "($!) "),
2104 fail "saving ../$f,fetch: $!";
2106 printdebug "cannot.\n";
2110 # We unpack and record the orig tarballs first, so that we only
2111 # need disk space for one private copy of the unpacked source.
2112 # But we can't make them into commits until we have the metadata
2113 # from the debian/changelog, so we record the tree objects now and
2114 # make them into commits later.
2116 my $upstreamv = upstreamversion $dsc->{version};
2117 my $orig_f_base = srcfn $upstreamv, '';
2119 foreach my $fi (@dfi) {
2120 # We actually import, and record as a commit, every tarball
2121 # (unless there is only one file, in which case there seems
2124 my $f = $fi->{Filename};
2125 printdebug "import considering $f ";
2126 (printdebug "only one dfi\n"), next if @dfi == 1;
2127 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2128 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2132 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2134 printdebug "Y ", (join ' ', map { $_//"(none)" }
2135 $compr_ext, $orig_f_part
2138 my $input = new IO::File $f, '<' or die "$f $!";
2142 if (defined $compr_ext) {
2144 Dpkg::Compression::compression_guess_from_filename $f;
2145 fail "Dpkg::Compression cannot handle file $f in source package"
2146 if defined $compr_ext && !defined $cname;
2148 new Dpkg::Compression::Process compression => $cname;
2149 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2150 my $compr_fh = new IO::Handle;
2151 my $compr_pid = open $compr_fh, "-|" // die $!;
2153 open STDIN, "<&", $input or die $!;
2155 die "dgit (child): exec $compr_cmd[0]: $!\n";
2160 rmtree "_unpack-tar";
2161 mkdir "_unpack-tar" or die $!;
2162 my @tarcmd = qw(tar -x -f -
2163 --no-same-owner --no-same-permissions
2164 --no-acls --no-xattrs --no-selinux);
2165 my $tar_pid = fork // die $!;
2167 chdir "_unpack-tar" or die $!;
2168 open STDIN, "<&", $input or die $!;
2170 die "dgit (child): exec $tarcmd[0]: $!";
2172 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2173 !$? or failedcmd @tarcmd;
2176 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2178 # finally, we have the results in "tarball", but maybe
2179 # with the wrong permissions
2181 runcmd qw(chmod -R +rwX _unpack-tar);
2182 changedir "_unpack-tar";
2183 remove_stray_gits($f);
2184 mktree_in_ud_here();
2186 my ($tree) = git_add_write_tree();
2187 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2188 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2190 printdebug "one subtree $1\n";
2192 printdebug "multiple subtrees\n";
2195 rmtree "_unpack-tar";
2197 my $ent = [ $f, $tree ];
2199 Orig => !!$orig_f_part,
2200 Sort => (!$orig_f_part ? 2 :
2201 $orig_f_part =~ m/-/g ? 1 :
2209 # put any without "_" first (spec is not clear whether files
2210 # are always in the usual order). Tarballs without "_" are
2211 # the main orig or the debian tarball.
2212 $a->{Sort} <=> $b->{Sort} or
2216 my $any_orig = grep { $_->{Orig} } @tartrees;
2218 my $dscfn = "$package.dsc";
2220 my $treeimporthow = 'package';
2222 open D, ">", $dscfn or die "$dscfn: $!";
2223 print D $dscdata or die "$dscfn: $!";
2224 close D or die "$dscfn: $!";
2225 my @cmd = qw(dpkg-source);
2226 push @cmd, '--no-check' if $dsc_checked;
2227 if (madformat $dsc->{format}) {
2228 push @cmd, '--skip-patches';
2229 $treeimporthow = 'unpatched';
2231 push @cmd, qw(-x --), $dscfn;
2234 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2235 if (madformat $dsc->{format}) {
2236 check_for_vendor_patches();
2240 if (madformat $dsc->{format}) {
2241 my @pcmd = qw(dpkg-source --before-build .);
2242 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2244 $dappliedtree = git_add_write_tree();
2247 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2248 debugcmd "|",@clogcmd;
2249 open CLOGS, "-|", @clogcmd or die $!;
2254 printdebug "import clog search...\n";
2257 my $stanzatext = do { local $/=""; <CLOGS>; };
2258 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2259 last if !defined $stanzatext;
2261 my $desc = "package changelog, entry no.$.";
2262 open my $stanzafh, "<", \$stanzatext or die;
2263 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2264 $clogp //= $thisstanza;
2266 printdebug "import clog $thisstanza->{version} $desc...\n";
2268 last if !$any_orig; # we don't need $r1clogp
2270 # We look for the first (most recent) changelog entry whose
2271 # version number is lower than the upstream version of this
2272 # package. Then the last (least recent) previous changelog
2273 # entry is treated as the one which introduced this upstream
2274 # version and used for the synthetic commits for the upstream
2277 # One might think that a more sophisticated algorithm would be
2278 # necessary. But: we do not want to scan the whole changelog
2279 # file. Stopping when we see an earlier version, which
2280 # necessarily then is an earlier upstream version, is the only
2281 # realistic way to do that. Then, either the earliest
2282 # changelog entry we have seen so far is indeed the earliest
2283 # upload of this upstream version; or there are only changelog
2284 # entries relating to later upstream versions (which is not
2285 # possible unless the changelog and .dsc disagree about the
2286 # version). Then it remains to choose between the physically
2287 # last entry in the file, and the one with the lowest version
2288 # number. If these are not the same, we guess that the
2289 # versions were created in a non-monotic order rather than
2290 # that the changelog entries have been misordered.
2292 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2294 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2295 $r1clogp = $thisstanza;
2297 printdebug "import clog $r1clogp->{version} becomes r1\n";
2299 die $! if CLOGS->error;
2300 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2302 $clogp or fail "package changelog has no entries!";
2304 my $authline = clogp_authline $clogp;
2305 my $changes = getfield $clogp, 'Changes';
2306 $changes =~ s/^\n//; # Changes: \n
2307 my $cversion = getfield $clogp, 'Version';
2310 $r1clogp //= $clogp; # maybe there's only one entry;
2311 my $r1authline = clogp_authline $r1clogp;
2312 # Strictly, r1authline might now be wrong if it's going to be
2313 # unused because !$any_orig. Whatever.
2315 printdebug "import tartrees authline $authline\n";
2316 printdebug "import tartrees r1authline $r1authline\n";
2318 foreach my $tt (@tartrees) {
2319 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2321 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2324 committer $r1authline
2328 [dgit import orig $tt->{F}]
2336 [dgit import tarball $package $cversion $tt->{F}]
2341 printdebug "import main commit\n";
2343 open C, ">../commit.tmp" or die $!;
2344 print C <<END or die $!;
2347 print C <<END or die $! foreach @tartrees;
2350 print C <<END or die $!;
2356 [dgit import $treeimporthow $package $cversion]
2360 my $rawimport_hash = make_commit qw(../commit.tmp);
2362 if (madformat $dsc->{format}) {
2363 printdebug "import apply patches...\n";
2365 # regularise the state of the working tree so that
2366 # the checkout of $rawimport_hash works nicely.
2367 my $dappliedcommit = make_commit_text(<<END);
2374 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2376 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2378 # We need the answers to be reproducible
2379 my @authline = clogp_authline($clogp);
2380 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2381 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2382 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2383 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2384 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2385 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2387 my $path = $ENV{PATH} or die;
2389 foreach my $use_absurd (qw(0 1)) {
2390 runcmd @git, qw(checkout -q unpa);
2391 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2392 local $ENV{PATH} = $path;
2395 progress "warning: $@";
2396 $path = "$absurdity:$path";
2397 progress "$us: trying slow absurd-git-apply...";
2398 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2403 die "forbid absurd git-apply\n" if $use_absurd
2404 && forceing [qw(import-gitapply-no-absurd)];
2405 die "only absurd git-apply!\n" if !$use_absurd
2406 && forceing [qw(import-gitapply-absurd)];
2408 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2409 local $ENV{PATH} = $path if $use_absurd;
2411 my @showcmd = (gbp_pq, qw(import));
2412 my @realcmd = shell_cmd
2413 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2414 debugcmd "+",@realcmd;
2415 if (system @realcmd) {
2416 die +(shellquote @showcmd).
2418 failedcmd_waitstatus()."\n";
2421 my $gapplied = git_rev_parse('HEAD');
2422 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2423 $gappliedtree eq $dappliedtree or
2425 gbp-pq import and dpkg-source disagree!
2426 gbp-pq import gave commit $gapplied
2427 gbp-pq import gave tree $gappliedtree
2428 dpkg-source --before-build gave tree $dappliedtree
2430 $rawimport_hash = $gapplied;
2435 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2440 progress "synthesised git commit from .dsc $cversion";
2442 my $rawimport_mergeinput = {
2443 Commit => $rawimport_hash,
2444 Info => "Import of source package",
2446 my @output = ($rawimport_mergeinput);
2448 if ($lastpush_mergeinput) {
2449 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2450 my $oversion = getfield $oldclogp, 'Version';
2452 version_compare($oversion, $cversion);
2454 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2455 { Message => <<END, ReverseParents => 1 });
2456 Record $package ($cversion) in archive suite $csuite
2458 } elsif ($vcmp > 0) {
2459 print STDERR <<END or die $!;
2461 Version actually in archive: $cversion (older)
2462 Last version pushed with dgit: $oversion (newer or same)
2465 @output = $lastpush_mergeinput;
2467 # Same version. Use what's in the server git branch,
2468 # discarding our own import. (This could happen if the
2469 # server automatically imports all packages into git.)
2470 @output = $lastpush_mergeinput;
2473 changedir '../../../..';
2478 sub complete_file_from_dsc ($$;$) {
2479 our ($dstdir, $fi, $refetched) = @_;
2480 # Ensures that we have, in $dstdir, the file $fi, with the correct
2481 # contents. (Downloading it from alongside $dscurl if necessary.)
2482 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2483 # and will set $$refetched=1 if it did so (or tried to).
2485 my $f = $fi->{Filename};
2486 my $tf = "$dstdir/$f";
2490 my $checkhash = sub {
2491 open F, "<", "$tf" or die "$tf: $!";
2492 $fi->{Digester}->reset();
2493 $fi->{Digester}->addfile(*F);
2494 F->error and die $!;
2495 $got = $fi->{Digester}->hexdigest();
2496 return $got eq $fi->{Hash};
2499 if (stat_exists $tf) {
2500 if ($checkhash->()) {
2501 progress "using existing $f";
2505 fail "file $f has hash $got but .dsc".
2506 " demands hash $fi->{Hash} ".
2507 "(perhaps you should delete this file?)";
2509 progress "need to fetch correct version of $f";
2510 unlink $tf or die "$tf $!";
2513 printdebug "$tf does not exist, need to fetch\n";
2517 $furl =~ s{/[^/]+$}{};
2519 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2520 die "$f ?" if $f =~ m#/#;
2521 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2522 return 0 if !act_local();
2525 fail "file $f has hash $got but .dsc".
2526 " demands hash $fi->{Hash} ".
2527 "(got wrong file from archive!)";
2532 sub ensure_we_have_orig () {
2533 my @dfi = dsc_files_info();
2534 foreach my $fi (@dfi) {
2535 my $f = $fi->{Filename};
2536 next unless is_orig_file_in_dsc($f, \@dfi);
2537 complete_file_from_dsc('..', $fi)
2542 #---------- git fetch ----------
2544 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2545 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2547 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2548 # locally fetched refs because they have unhelpful names and clutter
2549 # up gitk etc. So we track whether we have "used up" head ref (ie,
2550 # whether we have made another local ref which refers to this object).
2552 # (If we deleted them unconditionally, then we might end up
2553 # re-fetching the same git objects each time dgit fetch was run.)
2555 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2556 # in git_fetch_us to fetch the refs in question, and possibly a call
2557 # to lrfetchref_used.
2559 our (%lrfetchrefs_f, %lrfetchrefs_d);
2560 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2562 sub lrfetchref_used ($) {
2563 my ($fullrefname) = @_;
2564 my $objid = $lrfetchrefs_f{$fullrefname};
2565 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2568 sub git_lrfetch_sane {
2569 my ($url, $supplementary, @specs) = @_;
2570 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2571 # at least as regards @specs. Also leave the results in
2572 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2573 # able to clean these up.
2575 # With $supplementary==1, @specs must not contain wildcards
2576 # and we add to our previous fetches (non-atomically).
2578 # This is rather miserable:
2579 # When git fetch --prune is passed a fetchspec ending with a *,
2580 # it does a plausible thing. If there is no * then:
2581 # - it matches subpaths too, even if the supplied refspec
2582 # starts refs, and behaves completely madly if the source
2583 # has refs/refs/something. (See, for example, Debian #NNNN.)
2584 # - if there is no matching remote ref, it bombs out the whole
2586 # We want to fetch a fixed ref, and we don't know in advance
2587 # if it exists, so this is not suitable.
2589 # Our workaround is to use git ls-remote. git ls-remote has its
2590 # own qairks. Notably, it has the absurd multi-tail-matching
2591 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2592 # refs/refs/foo etc.
2594 # Also, we want an idempotent snapshot, but we have to make two
2595 # calls to the remote: one to git ls-remote and to git fetch. The
2596 # solution is use git ls-remote to obtain a target state, and
2597 # git fetch to try to generate it. If we don't manage to generate
2598 # the target state, we try again.
2600 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2602 my $specre = join '|', map {
2605 my $wildcard = $x =~ s/\\\*$/.*/;
2606 die if $wildcard && $supplementary;
2609 printdebug "git_lrfetch_sane specre=$specre\n";
2610 my $wanted_rref = sub {
2612 return m/^(?:$specre)$/;
2615 my $fetch_iteration = 0;
2618 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2619 if (++$fetch_iteration > 10) {
2620 fail "too many iterations trying to get sane fetch!";
2623 my @look = map { "refs/$_" } @specs;
2624 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2628 open GITLS, "-|", @lcmd or die $!;
2630 printdebug "=> ", $_;
2631 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2632 my ($objid,$rrefname) = ($1,$2);
2633 if (!$wanted_rref->($rrefname)) {
2635 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2639 $wantr{$rrefname} = $objid;
2642 close GITLS or failedcmd @lcmd;
2644 # OK, now %want is exactly what we want for refs in @specs
2646 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2647 "+refs/$_:".lrfetchrefs."/$_";
2650 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2652 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2653 runcmd_ordryrun_local @fcmd if @fspecs;
2655 if (!$supplementary) {
2656 %lrfetchrefs_f = ();
2660 git_for_each_ref(lrfetchrefs, sub {
2661 my ($objid,$objtype,$lrefname,$reftail) = @_;
2662 $lrfetchrefs_f{$lrefname} = $objid;
2663 $objgot{$objid} = 1;
2666 if ($supplementary) {
2670 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2671 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2672 if (!exists $wantr{$rrefname}) {
2673 if ($wanted_rref->($rrefname)) {
2675 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2679 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2682 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2683 delete $lrfetchrefs_f{$lrefname};
2687 foreach my $rrefname (sort keys %wantr) {
2688 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2689 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2690 my $want = $wantr{$rrefname};
2691 next if $got eq $want;
2692 if (!defined $objgot{$want}) {
2694 warning: git ls-remote suggests we want $lrefname
2695 warning: and it should refer to $want
2696 warning: but git fetch didn't fetch that object to any relevant ref.
2697 warning: This may be due to a race with someone updating the server.
2698 warning: Will try again...
2700 next FETCH_ITERATION;
2703 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2705 runcmd_ordryrun_local @git, qw(update-ref -m),
2706 "dgit fetch git fetch fixup", $lrefname, $want;
2707 $lrfetchrefs_f{$lrefname} = $want;
2712 if (defined $csuite) {
2713 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2714 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2715 my ($objid,$objtype,$lrefname,$reftail) = @_;
2716 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2717 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2721 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2722 Dumper(\%lrfetchrefs_f);
2725 sub git_fetch_us () {
2726 # Want to fetch only what we are going to use, unless
2727 # deliberately-not-ff, in which case we must fetch everything.
2729 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2731 (quiltmode_splitbrain
2732 ? (map { $_->('*',access_nomdistro) }
2733 \&debiantag_new, \&debiantag_maintview)
2734 : debiantags('*',access_nomdistro));
2735 push @specs, server_branch($csuite);
2736 push @specs, $rewritemap;
2737 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2739 my $url = access_giturl();
2740 git_lrfetch_sane $url, 0, @specs;
2743 my @tagpats = debiantags('*',access_nomdistro);
2745 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2746 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2747 printdebug "currently $fullrefname=$objid\n";
2748 $here{$fullrefname} = $objid;
2750 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2751 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2752 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2753 printdebug "offered $lref=$objid\n";
2754 if (!defined $here{$lref}) {
2755 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2756 runcmd_ordryrun_local @upd;
2757 lrfetchref_used $fullrefname;
2758 } elsif ($here{$lref} eq $objid) {
2759 lrfetchref_used $fullrefname;
2762 "Not updating $lref from $here{$lref} to $objid.\n";
2767 #---------- dsc and archive handling ----------
2769 sub mergeinfo_getclogp ($) {
2770 # Ensures thit $mi->{Clogp} exists and returns it
2772 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2775 sub mergeinfo_version ($) {
2776 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2779 sub fetch_from_archive_record_1 ($) {
2781 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2782 'DGIT_ARCHIVE', $hash;
2783 cmdoutput @git, qw(log -n2), $hash;
2784 # ... gives git a chance to complain if our commit is malformed
2787 sub fetch_from_archive_record_2 ($) {
2789 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2793 dryrun_report @upd_cmd;
2797 sub parse_dsc_field_def_dsc_distro () {
2798 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2799 dgit.default.distro);
2802 sub parse_dsc_field ($$) {
2803 my ($dsc, $what) = @_;
2805 foreach my $field (@ourdscfield) {
2806 $f = $dsc->{$field};
2811 progress "$what: NO git hash";
2812 parse_dsc_field_def_dsc_distro();
2813 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2814 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2815 progress "$what: specified git info ($dsc_distro)";
2816 $dsc_hint_tag = [ $dsc_hint_tag ];
2817 } elsif ($f =~ m/^\w+\s*$/) {
2819 parse_dsc_field_def_dsc_distro();
2820 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2822 progress "$what: specified git hash";
2824 fail "$what: invalid Dgit info";
2828 sub resolve_dsc_field_commit ($$) {
2829 my ($already_distro, $already_mapref) = @_;
2831 return unless defined $dsc_hash;
2834 defined $already_mapref &&
2835 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2836 ? $already_mapref : undef;
2840 my ($what, @fetch) = @_;
2842 local $idistro = $dsc_distro;
2843 my $lrf = lrfetchrefs;
2845 if (!$chase_dsc_distro) {
2847 "not chasing .dsc distro $dsc_distro: not fetching $what";
2852 ".dsc names distro $dsc_distro: fetching $what";
2854 my $url = access_giturl();
2855 if (!defined $url) {
2856 defined $dsc_hint_url or fail <<END;
2857 .dsc Dgit metadata is in context of distro $dsc_distro
2858 for which we have no configured url and .dsc provides no hint
2861 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2862 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2863 parse_cfg_bool "dsc-url-proto-ok", 'false',
2864 cfg("dgit.dsc-url-proto-ok.$proto",
2865 "dgit.default.dsc-url-proto-ok")
2867 .dsc Dgit metadata is in context of distro $dsc_distro
2868 for which we have no configured url;
2869 .dsc provides hinted url with protocol $proto which is unsafe.
2870 (can be overridden by config - consult documentation)
2872 $url = $dsc_hint_url;
2875 git_lrfetch_sane $url, 1, @fetch;
2880 my $rewrite_enable = do {
2881 local $idistro = $dsc_distro;
2882 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2885 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2886 if (!defined $mapref) {
2887 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2888 $mapref = $lrf.'/'.$rewritemap;
2890 my $rewritemapdata = git_cat_file $mapref.':map';
2891 if (defined $rewritemapdata
2892 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2894 "server's git history rewrite map contains a relevant entry!";
2897 if (defined $dsc_hash) {
2898 progress "using rewritten git hash in place of .dsc value";
2900 progress "server data says .dsc hash is to be disregarded";
2905 if (!defined git_cat_file $dsc_hash) {
2906 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2907 my $lrf = $do_fetch->("additional commits", @tags) &&
2908 defined git_cat_file $dsc_hash
2910 .dsc Dgit metadata requires commit $dsc_hash
2911 but we could not obtain that object anywhere.
2913 foreach my $t (@tags) {
2914 my $fullrefname = $lrf.'/'.$t;
2915 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2916 next unless $lrfetchrefs_f{$fullrefname};
2917 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2918 lrfetchref_used $fullrefname;
2923 sub fetch_from_archive () {
2924 ensure_setup_existing_tree();
2926 # Ensures that lrref() is what is actually in the archive, one way
2927 # or another, according to us - ie this client's
2928 # appropritaely-updated archive view. Also returns the commit id.
2929 # If there is nothing in the archive, leaves lrref alone and
2930 # returns undef. git_fetch_us must have already been called.
2934 parse_dsc_field($dsc, 'last upload to archive');
2935 resolve_dsc_field_commit access_basedistro,
2936 lrfetchrefs."/".$rewritemap
2938 progress "no version available from the archive";
2941 # If the archive's .dsc has a Dgit field, there are three
2942 # relevant git commitids we need to choose between and/or merge
2944 # 1. $dsc_hash: the Dgit field from the archive
2945 # 2. $lastpush_hash: the suite branch on the dgit git server
2946 # 3. $lastfetch_hash: our local tracking brach for the suite
2948 # These may all be distinct and need not be in any fast forward
2951 # If the dsc was pushed to this suite, then the server suite
2952 # branch will have been updated; but it might have been pushed to
2953 # a different suite and copied by the archive. Conversely a more
2954 # recent version may have been pushed with dgit but not appeared
2955 # in the archive (yet).
2957 # $lastfetch_hash may be awkward because archive imports
2958 # (particularly, imports of Dgit-less .dscs) are performed only as
2959 # needed on individual clients, so different clients may perform a
2960 # different subset of them - and these imports are only made
2961 # public during push. So $lastfetch_hash may represent a set of
2962 # imports different to a subsequent upload by a different dgit
2965 # Our approach is as follows:
2967 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2968 # descendant of $dsc_hash, then it was pushed by a dgit user who
2969 # had based their work on $dsc_hash, so we should prefer it.
2970 # Otherwise, $dsc_hash was installed into this suite in the
2971 # archive other than by a dgit push, and (necessarily) after the
2972 # last dgit push into that suite (since a dgit push would have
2973 # been descended from the dgit server git branch); thus, in that
2974 # case, we prefer the archive's version (and produce a
2975 # pseudo-merge to overwrite the dgit server git branch).
2977 # (If there is no Dgit field in the archive's .dsc then
2978 # generate_commit_from_dsc uses the version numbers to decide
2979 # whether the suite branch or the archive is newer. If the suite
2980 # branch is newer it ignores the archive's .dsc; otherwise it
2981 # generates an import of the .dsc, and produces a pseudo-merge to
2982 # overwrite the suite branch with the archive contents.)
2984 # The outcome of that part of the algorithm is the `public view',
2985 # and is same for all dgit clients: it does not depend on any
2986 # unpublished history in the local tracking branch.
2988 # As between the public view and the local tracking branch: The
2989 # local tracking branch is only updated by dgit fetch, and
2990 # whenever dgit fetch runs it includes the public view in the
2991 # local tracking branch. Therefore if the public view is not
2992 # descended from the local tracking branch, the local tracking
2993 # branch must contain history which was imported from the archive
2994 # but never pushed; and, its tip is now out of date. So, we make
2995 # a pseudo-merge to overwrite the old imports and stitch the old
2998 # Finally: we do not necessarily reify the public view (as
2999 # described above). This is so that we do not end up stacking two
3000 # pseudo-merges. So what we actually do is figure out the inputs
3001 # to any public view pseudo-merge and put them in @mergeinputs.
3004 # $mergeinputs[]{Commit}
3005 # $mergeinputs[]{Info}
3006 # $mergeinputs[0] is the one whose tree we use
3007 # @mergeinputs is in the order we use in the actual commit)
3010 # $mergeinputs[]{Message} is a commit message to use
3011 # $mergeinputs[]{ReverseParents} if def specifies that parent
3012 # list should be in opposite order
3013 # Such an entry has no Commit or Info. It applies only when found
3014 # in the last entry. (This ugliness is to support making
3015 # identical imports to previous dgit versions.)
3017 my $lastpush_hash = git_get_ref(lrfetchref());
3018 printdebug "previous reference hash=$lastpush_hash\n";
3019 $lastpush_mergeinput = $lastpush_hash && {
3020 Commit => $lastpush_hash,
3021 Info => "dgit suite branch on dgit git server",
3024 my $lastfetch_hash = git_get_ref(lrref());
3025 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3026 my $lastfetch_mergeinput = $lastfetch_hash && {
3027 Commit => $lastfetch_hash,
3028 Info => "dgit client's archive history view",
3031 my $dsc_mergeinput = $dsc_hash && {
3032 Commit => $dsc_hash,
3033 Info => "Dgit field in .dsc from archive",
3037 my $del_lrfetchrefs = sub {
3040 printdebug "del_lrfetchrefs...\n";
3041 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3042 my $objid = $lrfetchrefs_d{$fullrefname};
3043 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3045 $gur ||= new IO::Handle;
3046 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3048 printf $gur "delete %s %s\n", $fullrefname, $objid;
3051 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3055 if (defined $dsc_hash) {
3056 ensure_we_have_orig();
3057 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3058 @mergeinputs = $dsc_mergeinput
3059 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3060 print STDERR <<END or die $!;
3062 Git commit in archive is behind the last version allegedly pushed/uploaded.
3063 Commit referred to by archive: $dsc_hash
3064 Last version pushed with dgit: $lastpush_hash
3067 @mergeinputs = ($lastpush_mergeinput);
3069 # Archive has .dsc which is not a descendant of the last dgit
3070 # push. This can happen if the archive moves .dscs about.
3071 # Just follow its lead.
3072 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3073 progress "archive .dsc names newer git commit";
3074 @mergeinputs = ($dsc_mergeinput);
3076 progress "archive .dsc names other git commit, fixing up";
3077 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3081 @mergeinputs = generate_commits_from_dsc();
3082 # We have just done an import. Now, our import algorithm might
3083 # have been improved. But even so we do not want to generate
3084 # a new different import of the same package. So if the
3085 # version numbers are the same, just use our existing version.
3086 # If the version numbers are different, the archive has changed
3087 # (perhaps, rewound).
3088 if ($lastfetch_mergeinput &&
3089 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3090 (mergeinfo_version $mergeinputs[0]) )) {
3091 @mergeinputs = ($lastfetch_mergeinput);
3093 } elsif ($lastpush_hash) {
3094 # only in git, not in the archive yet
3095 @mergeinputs = ($lastpush_mergeinput);
3096 print STDERR <<END or die $!;
3098 Package not found in the archive, but has allegedly been pushed using dgit.
3102 printdebug "nothing found!\n";
3103 if (defined $skew_warning_vsn) {
3104 print STDERR <<END or die $!;
3106 Warning: relevant archive skew detected.
3107 Archive allegedly contains $skew_warning_vsn
3108 But we were not able to obtain any version from the archive or git.
3112 unshift @end, $del_lrfetchrefs;
3116 if ($lastfetch_hash &&
3118 my $h = $_->{Commit};
3119 $h and is_fast_fwd($lastfetch_hash, $h);
3120 # If true, one of the existing parents of this commit
3121 # is a descendant of the $lastfetch_hash, so we'll
3122 # be ff from that automatically.
3126 push @mergeinputs, $lastfetch_mergeinput;
3129 printdebug "fetch mergeinfos:\n";
3130 foreach my $mi (@mergeinputs) {
3132 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3134 printdebug sprintf " ReverseParents=%d Message=%s",
3135 $mi->{ReverseParents}, $mi->{Message};
3139 my $compat_info= pop @mergeinputs
3140 if $mergeinputs[$#mergeinputs]{Message};
3142 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3145 if (@mergeinputs > 1) {
3147 my $tree_commit = $mergeinputs[0]{Commit};
3149 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3150 $tree =~ m/\n\n/; $tree = $`;
3151 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3154 # We use the changelog author of the package in question the
3155 # author of this pseudo-merge. This is (roughly) correct if
3156 # this commit is simply representing aa non-dgit upload.
3157 # (Roughly because it does not record sponsorship - but we
3158 # don't have sponsorship info because that's in the .changes,
3159 # which isn't in the archivw.)
3161 # But, it might be that we are representing archive history
3162 # updates (including in-archive copies). These are not really
3163 # the responsibility of the person who created the .dsc, but
3164 # there is no-one whose name we should better use. (The
3165 # author of the .dsc-named commit is clearly worse.)
3167 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3168 my $author = clogp_authline $useclogp;
3169 my $cversion = getfield $useclogp, 'Version';
3171 my $mcf = ".git/dgit/mergecommit";
3172 open MC, ">", $mcf or die "$mcf $!";
3173 print MC <<END or die $!;
3177 my @parents = grep { $_->{Commit} } @mergeinputs;
3178 @parents = reverse @parents if $compat_info->{ReverseParents};
3179 print MC <<END or die $! foreach @parents;
3183 print MC <<END or die $!;
3189 if (defined $compat_info->{Message}) {
3190 print MC $compat_info->{Message} or die $!;
3192 print MC <<END or die $!;
3193 Record $package ($cversion) in archive suite $csuite
3197 my $message_add_info = sub {
3199 my $mversion = mergeinfo_version $mi;
3200 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3204 $message_add_info->($mergeinputs[0]);
3205 print MC <<END or die $!;
3206 should be treated as descended from
3208 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3212 $hash = make_commit $mcf;
3214 $hash = $mergeinputs[0]{Commit};
3216 printdebug "fetch hash=$hash\n";
3219 my ($lasth, $what) = @_;
3220 return unless $lasth;
3221 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3224 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3226 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3228 fetch_from_archive_record_1($hash);
3230 if (defined $skew_warning_vsn) {
3232 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3233 my $gotclogp = commit_getclogp($hash);
3234 my $got_vsn = getfield $gotclogp, 'Version';
3235 printdebug "SKEW CHECK GOT $got_vsn\n";
3236 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3237 print STDERR <<END or die $!;
3239 Warning: archive skew detected. Using the available version:
3240 Archive allegedly contains $skew_warning_vsn
3241 We were able to obtain only $got_vsn
3247 if ($lastfetch_hash ne $hash) {
3248 fetch_from_archive_record_2($hash);
3251 lrfetchref_used lrfetchref();
3253 check_gitattrs($hash, "fetched source tree");
3255 unshift @end, $del_lrfetchrefs;
3259 sub set_local_git_config ($$) {
3261 runcmd @git, qw(config), $k, $v;
3264 sub setup_mergechangelogs (;$) {
3266 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3268 my $driver = 'dpkg-mergechangelogs';
3269 my $cb = "merge.$driver";
3270 my $attrs = '.git/info/attributes';
3271 ensuredir '.git/info';
3273 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3274 if (!open ATTRS, "<", $attrs) {
3275 $!==ENOENT or die "$attrs: $!";
3279 next if m{^debian/changelog\s};
3280 print NATTRS $_, "\n" or die $!;
3282 ATTRS->error and die $!;
3285 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3288 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3289 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3291 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3294 sub setup_useremail (;$) {
3296 return unless $always || access_cfg_bool(1, 'setup-useremail');
3299 my ($k, $envvar) = @_;
3300 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3301 return unless defined $v;
3302 set_local_git_config "user.$k", $v;
3305 $setup->('email', 'DEBEMAIL');
3306 $setup->('name', 'DEBFULLNAME');
3309 sub ensure_setup_existing_tree () {
3310 my $k = "remote.$remotename.skipdefaultupdate";
3311 my $c = git_get_config $k;
3312 return if defined $c;
3313 set_local_git_config $k, 'true';
3316 sub open_gitattrs () {
3317 my $gai = new IO::File ".git/info/attributes"
3319 or die "open .git/info/attributes: $!";
3323 sub is_gitattrs_setup () {
3324 my $gai = open_gitattrs();
3325 return 0 unless $gai;
3327 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3329 $gai->error and die $!;
3333 sub setup_gitattrs (;$) {
3335 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3337 if (is_gitattrs_setup()) {
3339 [attr]dgit-defuse-attrs already found in .git/info/attributes
3340 not doing further gitattributes setup
3344 my $af = ".git/info/attributes";
3345 ensuredir '.git/info';
3346 open GAO, "> $af.new" or die $!;
3347 print GAO <<END or die $!;
3349 [attr]dgit-defuse-attrs $negate_harmful_gitattrs
3350 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3352 my $gai = open_gitattrs();
3356 print GAO $_, "\n" or die $!;
3358 $gai->error and die $!;
3360 close GAO or die $!;
3361 rename "$af.new", "$af" or die "install $af: $!";
3364 sub setup_new_tree () {
3365 setup_mergechangelogs();
3370 sub check_gitattrs ($$) {
3371 my ($treeish, $what) = @_;
3373 return if is_gitattrs_setup;
3376 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3378 my $gafl = new IO::File;
3379 open $gafl, "-|", @cmd or die $!;
3382 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3384 next unless m{(?:^|/)\.gitattributes$};
3386 # oh dear, found one
3388 dgit: warning: $what contains .gitattributes
3389 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3394 # tree contains no .gitattributes files
3395 $?=0; $!=0; close $gafl or failedcmd @cmd;
3399 sub multisuite_suite_child ($$$) {
3400 my ($tsuite, $merginputs, $fn) = @_;
3401 # in child, sets things up, calls $fn->(), and returns undef
3402 # in parent, returns canonical suite name for $tsuite
3403 my $canonsuitefh = IO::File::new_tmpfile;
3404 my $pid = fork // die $!;
3408 $us .= " [$isuite]";
3409 $debugprefix .= " ";
3410 progress "fetching $tsuite...";
3411 canonicalise_suite();
3412 print $canonsuitefh $csuite, "\n" or die $!;
3413 close $canonsuitefh or die $!;
3417 waitpid $pid,0 == $pid or die $!;
3418 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3419 seek $canonsuitefh,0,0 or die $!;
3420 local $csuite = <$canonsuitefh>;
3421 die $! unless defined $csuite && chomp $csuite;
3423 printdebug "multisuite $tsuite missing\n";
3426 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3427 push @$merginputs, {
3434 sub fork_for_multisuite ($) {
3435 my ($before_fetch_merge) = @_;
3436 # if nothing unusual, just returns ''
3439 # returns 0 to caller in child, to do first of the specified suites
3440 # in child, $csuite is not yet set
3442 # returns 1 to caller in parent, to finish up anything needed after
3443 # in parent, $csuite is set to canonicalised portmanteau
3445 my $org_isuite = $isuite;
3446 my @suites = split /\,/, $isuite;
3447 return '' unless @suites > 1;
3448 printdebug "fork_for_multisuite: @suites\n";
3452 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3454 return 0 unless defined $cbasesuite;
3456 fail "package $package missing in (base suite) $cbasesuite"
3457 unless @mergeinputs;
3459 my @csuites = ($cbasesuite);
3461 $before_fetch_merge->();
3463 foreach my $tsuite (@suites[1..$#suites]) {
3464 $tsuite =~ s/^-/$cbasesuite-/;
3465 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3471 # xxx collecte the ref here
3473 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3474 push @csuites, $csubsuite;
3477 foreach my $mi (@mergeinputs) {
3478 my $ref = git_get_ref $mi->{Ref};
3479 die "$mi->{Ref} ?" unless length $ref;
3480 $mi->{Commit} = $ref;
3483 $csuite = join ",", @csuites;
3485 my $previous = git_get_ref lrref;
3487 unshift @mergeinputs, {
3488 Commit => $previous,
3489 Info => "local combined tracking branch",
3491 "archive seems to have rewound: local tracking branch is ahead!",
3495 foreach my $ix (0..$#mergeinputs) {
3496 $mergeinputs[$ix]{Index} = $ix;
3499 @mergeinputs = sort {
3500 -version_compare(mergeinfo_version $a,
3501 mergeinfo_version $b) # highest version first
3503 $a->{Index} <=> $b->{Index}; # earliest in spec first
3509 foreach my $mi (@mergeinputs) {
3510 printdebug "multisuite merge check $mi->{Info}\n";
3511 foreach my $previous (@needed) {
3512 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3513 printdebug "multisuite merge un-needed $previous->{Info}\n";
3517 printdebug "multisuite merge this-needed\n";
3518 $mi->{Character} = '+';
3521 $needed[0]{Character} = '*';
3523 my $output = $needed[0]{Commit};
3526 printdebug "multisuite merge nontrivial\n";
3527 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3529 my $commit = "tree $tree\n";
3530 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3531 "Input branches:\n";
3533 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3534 printdebug "multisuite merge include $mi->{Info}\n";
3535 $mi->{Character} //= ' ';
3536 $commit .= "parent $mi->{Commit}\n";
3537 $msg .= sprintf " %s %-25s %s\n",
3539 (mergeinfo_version $mi),
3542 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3544 " * marks the highest version branch, which choose to use\n".
3545 " + marks each branch which was not already an ancestor\n\n".
3546 "[dgit multi-suite $csuite]\n";
3548 "author $authline\n".
3549 "committer $authline\n\n";
3550 $output = make_commit_text $commit.$msg;
3551 printdebug "multisuite merge generated $output\n";
3554 fetch_from_archive_record_1($output);
3555 fetch_from_archive_record_2($output);
3557 progress "calculated combined tracking suite $csuite";
3562 sub clone_set_head () {
3563 open H, "> .git/HEAD" or die $!;
3564 print H "ref: ".lref()."\n" or die $!;
3567 sub clone_finish ($) {
3569 runcmd @git, qw(reset --hard), lrref();
3570 runcmd qw(bash -ec), <<'END';
3572 git ls-tree -r --name-only -z HEAD | \
3573 xargs -0r touch -h -r . --
3575 printdone "ready for work in $dstdir";
3579 # in multisuite, returns twice!
3580 # once in parent after first suite fetched,
3581 # and then again in child after everything is finished
3583 badusage "dry run makes no sense with clone" unless act_local();
3585 my $multi_fetched = fork_for_multisuite(sub {
3586 printdebug "multi clone before fetch merge\n";
3589 if ($multi_fetched) {
3590 printdebug "multi clone after fetch merge\n";
3592 clone_finish($dstdir);
3595 printdebug "clone main body\n";
3597 canonicalise_suite();
3598 my $hasgit = check_for_git();
3599 mkdir $dstdir or fail "create \`$dstdir': $!";
3601 runcmd @git, qw(init -q);
3604 my $giturl = access_giturl(1);
3605 if (defined $giturl) {
3606 runcmd @git, qw(remote add), 'origin', $giturl;
3609 progress "fetching existing git history";
3611 runcmd_ordryrun_local @git, qw(fetch origin);
3613 progress "starting new git history";
3615 fetch_from_archive() or no_such_package;
3616 my $vcsgiturl = $dsc->{'Vcs-Git'};
3617 if (length $vcsgiturl) {
3618 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3619 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3621 clone_finish($dstdir);
3625 canonicalise_suite();
3626 if (check_for_git()) {
3629 fetch_from_archive() or no_such_package();
3630 printdone "fetched into ".lrref();
3634 my $multi_fetched = fork_for_multisuite(sub { });
3635 fetch() unless $multi_fetched; # parent
3636 return if $multi_fetched eq '0'; # child
3637 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3639 printdone "fetched to ".lrref()." and merged into HEAD";
3642 sub check_not_dirty () {
3643 foreach my $f (qw(local-options local-patch-header)) {
3644 if (stat_exists "debian/source/$f") {
3645 fail "git tree contains debian/source/$f";
3649 return if $ignoredirty;
3651 my @cmd = (@git, qw(diff --quiet HEAD));
3653 $!=0; $?=-1; system @cmd;
3656 fail "working tree is dirty (does not match HEAD)";
3662 sub commit_admin ($) {
3665 runcmd_ordryrun_local @git, qw(commit -m), $m;
3668 sub commit_quilty_patch () {
3669 my $output = cmdoutput @git, qw(status --porcelain);
3671 foreach my $l (split /\n/, $output) {
3672 next unless $l =~ m/\S/;
3673 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3677 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3679 progress "nothing quilty to commit, ok.";
3682 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3683 runcmd_ordryrun_local @git, qw(add -f), @adds;
3685 Commit Debian 3.0 (quilt) metadata
3687 [dgit ($our_version) quilt-fixup]
3691 sub get_source_format () {
3693 if (open F, "debian/source/options") {
3697 s/\s+$//; # ignore missing final newline
3699 my ($k, $v) = ($`, $'); #');
3700 $v =~ s/^"(.*)"$/$1/;
3706 F->error and die $!;
3709 die $! unless $!==&ENOENT;
3712 if (!open F, "debian/source/format") {
3713 die $! unless $!==&ENOENT;
3717 F->error and die $!;
3719 return ($_, \%options);
3722 sub madformat_wantfixup ($) {
3724 return 0 unless $format eq '3.0 (quilt)';
3725 our $quilt_mode_warned;
3726 if ($quilt_mode eq 'nocheck') {
3727 progress "Not doing any fixup of \`$format' due to".
3728 " ----no-quilt-fixup or --quilt=nocheck"
3729 unless $quilt_mode_warned++;
3732 progress "Format \`$format', need to check/update patch stack"
3733 unless $quilt_mode_warned++;
3737 sub maybe_split_brain_save ($$$) {
3738 my ($headref, $dgitview, $msg) = @_;
3739 # => message fragment "$saved" describing disposition of $dgitview
3740 return "commit id $dgitview" unless defined $split_brain_save;
3741 my @cmd = (shell_cmd "cd ../../../..",
3742 @git, qw(update-ref -m),
3743 "dgit --dgit-view-save $msg HEAD=$headref",
3744 $split_brain_save, $dgitview);
3746 return "and left in $split_brain_save";
3749 # An "infopair" is a tuple [ $thing, $what ]
3750 # (often $thing is a commit hash; $what is a description)
3752 sub infopair_cond_equal ($$) {
3754 $x->[0] eq $y->[0] or fail <<END;
3755 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3759 sub infopair_lrf_tag_lookup ($$) {
3760 my ($tagnames, $what) = @_;
3761 # $tagname may be an array ref
3762 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3763 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3764 foreach my $tagname (@tagnames) {
3765 my $lrefname = lrfetchrefs."/tags/$tagname";
3766 my $tagobj = $lrfetchrefs_f{$lrefname};
3767 next unless defined $tagobj;
3768 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3769 return [ git_rev_parse($tagobj), $what ];
3771 fail @tagnames==1 ? <<END : <<END;
3772 Wanted tag $what (@tagnames) on dgit server, but not found
3774 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3778 sub infopair_cond_ff ($$) {
3779 my ($anc,$desc) = @_;
3780 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3781 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3785 sub pseudomerge_version_check ($$) {
3786 my ($clogp, $archive_hash) = @_;
3788 my $arch_clogp = commit_getclogp $archive_hash;
3789 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3790 'version currently in archive' ];
3791 if (defined $overwrite_version) {
3792 if (length $overwrite_version) {
3793 infopair_cond_equal([ $overwrite_version,
3794 '--overwrite= version' ],
3797 my $v = $i_arch_v->[0];
3798 progress "Checking package changelog for archive version $v ...";
3801 my @xa = ("-f$v", "-t$v");
3802 my $vclogp = parsechangelog @xa;
3805 [ (getfield $vclogp, $fn),
3806 "$fn field from dpkg-parsechangelog @xa" ];
3808 my $cv = $gf->('Version');
3809 infopair_cond_equal($i_arch_v, $cv);
3810 $cd = $gf->('Distribution');
3813 $@ =~ s/^dgit: //gm;
3815 "Perhaps debian/changelog does not mention $v ?";
3817 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3818 $cd->[1] is $cd->[0]
3819 Your tree seems to based on earlier (not uploaded) $v.
3824 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3828 sub pseudomerge_make_commit ($$$$ $$) {
3829 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3830 $msg_cmd, $msg_msg) = @_;
3831 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3833 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3834 my $authline = clogp_authline $clogp;
3838 !defined $overwrite_version ? ""
3839 : !length $overwrite_version ? " --overwrite"
3840 : " --overwrite=".$overwrite_version;
3843 my $pmf = ".git/dgit/pseudomerge";
3844 open MC, ">", $pmf or die "$pmf $!";
3845 print MC <<END or die $!;
3848 parent $archive_hash
3858 return make_commit($pmf);
3861 sub splitbrain_pseudomerge ($$$$) {
3862 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3863 # => $merged_dgitview
3864 printdebug "splitbrain_pseudomerge...\n";
3866 # We: debian/PREVIOUS HEAD($maintview)
3867 # expect: o ----------------- o
3870 # a/d/PREVIOUS $dgitview
3873 # we do: `------------------ o
3877 return $dgitview unless defined $archive_hash;
3878 return $dgitview if deliberately_not_fast_forward();
3880 printdebug "splitbrain_pseudomerge...\n";
3882 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3884 if (!defined $overwrite_version) {
3885 progress "Checking that HEAD inciudes all changes in archive...";
3888 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3890 if (defined $overwrite_version) {
3892 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3893 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3894 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3895 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3896 my $i_archive = [ $archive_hash, "current archive contents" ];
3898 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3900 infopair_cond_equal($i_dgit, $i_archive);
3901 infopair_cond_ff($i_dep14, $i_dgit);
3902 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3906 $us: check failed (maybe --overwrite is needed, consult documentation)
3911 my $r = pseudomerge_make_commit
3912 $clogp, $dgitview, $archive_hash, $i_arch_v,
3913 "dgit --quilt=$quilt_mode",
3914 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3915 Declare fast forward from $i_arch_v->[0]
3917 Make fast forward from $i_arch_v->[0]
3920 maybe_split_brain_save $maintview, $r, "pseudomerge";
3922 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3926 sub plain_overwrite_pseudomerge ($$$) {
3927 my ($clogp, $head, $archive_hash) = @_;
3929 printdebug "plain_overwrite_pseudomerge...";
3931 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3933 return $head if is_fast_fwd $archive_hash, $head;
3935 my $m = "Declare fast forward from $i_arch_v->[0]";
3937 my $r = pseudomerge_make_commit
3938 $clogp, $head, $archive_hash, $i_arch_v,
3941 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3943 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3947 sub push_parse_changelog ($) {
3950 my $clogp = Dpkg::Control::Hash->new();
3951 $clogp->load($clogpfn) or die;
3953 my $clogpackage = getfield $clogp, 'Source';
3954 $package //= $clogpackage;
3955 fail "-p specified $package but changelog specified $clogpackage"
3956 unless $package eq $clogpackage;
3957 my $cversion = getfield $clogp, 'Version';
3959 if (!$we_are_initiator) {
3960 # rpush initiator can't do this because it doesn't have $isuite yet
3961 my $tag = debiantag($cversion, access_nomdistro);
3962 runcmd @git, qw(check-ref-format), $tag;
3965 my $dscfn = dscfn($cversion);
3967 return ($clogp, $cversion, $dscfn);
3970 sub push_parse_dsc ($$$) {
3971 my ($dscfn,$dscfnwhat, $cversion) = @_;
3972 $dsc = parsecontrol($dscfn,$dscfnwhat);
3973 my $dversion = getfield $dsc, 'Version';
3974 my $dscpackage = getfield $dsc, 'Source';
3975 ($dscpackage eq $package && $dversion eq $cversion) or
3976 fail "$dscfn is for $dscpackage $dversion".
3977 " but debian/changelog is for $package $cversion";
3980 sub push_tagwants ($$$$) {
3981 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3984 TagFn => \&debiantag,
3989 if (defined $maintviewhead) {
3991 TagFn => \&debiantag_maintview,
3992 Objid => $maintviewhead,
3993 TfSuffix => '-maintview',
3996 } elsif ($dodep14tag eq 'no' ? 0
3997 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3998 : $dodep14tag eq 'always'
3999 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4000 --dep14tag-always (or equivalent in config) means server must support
4001 both "new" and "maint" tag formats, but config says it doesn't.
4003 : die "$dodep14tag ?") {
4005 TagFn => \&debiantag_maintview,
4007 TfSuffix => '-dgit',
4011 foreach my $tw (@tagwants) {
4012 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4013 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4015 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4019 sub push_mktags ($$ $$ $) {
4021 $changesfile,$changesfilewhat,
4024 die unless $tagwants->[0]{View} eq 'dgit';
4026 my $declaredistro = access_nomdistro();
4027 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4028 $dsc->{$ourdscfield[0]} = join " ",
4029 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4031 $dsc->save("$dscfn.tmp") or die $!;
4033 my $changes = parsecontrol($changesfile,$changesfilewhat);
4034 foreach my $field (qw(Source Distribution Version)) {
4035 $changes->{$field} eq $clogp->{$field} or
4036 fail "changes field $field \`$changes->{$field}'".
4037 " does not match changelog \`$clogp->{$field}'";
4040 my $cversion = getfield $clogp, 'Version';
4041 my $clogsuite = getfield $clogp, 'Distribution';
4043 # We make the git tag by hand because (a) that makes it easier
4044 # to control the "tagger" (b) we can do remote signing
4045 my $authline = clogp_authline $clogp;
4046 my $delibs = join(" ", "",@deliberatelies);
4050 my $tfn = $tw->{Tfn};
4051 my $head = $tw->{Objid};
4052 my $tag = $tw->{Tag};
4054 open TO, '>', $tfn->('.tmp') or die $!;
4055 print TO <<END or die $!;
4062 if ($tw->{View} eq 'dgit') {
4063 print TO <<END or die $!;
4064 $package release $cversion for $clogsuite ($csuite) [dgit]
4065 [dgit distro=$declaredistro$delibs]
4067 foreach my $ref (sort keys %previously) {
4068 print TO <<END or die $!;
4069 [dgit previously:$ref=$previously{$ref}]
4072 } elsif ($tw->{View} eq 'maint') {
4073 print TO <<END or die $!;
4074 $package release $cversion for $clogsuite ($csuite)
4075 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4078 die Dumper($tw)."?";
4083 my $tagobjfn = $tfn->('.tmp');
4085 if (!defined $keyid) {
4086 $keyid = access_cfg('keyid','RETURN-UNDEF');
4088 if (!defined $keyid) {
4089 $keyid = getfield $clogp, 'Maintainer';
4091 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4092 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4093 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4094 push @sign_cmd, $tfn->('.tmp');
4095 runcmd_ordryrun @sign_cmd;
4097 $tagobjfn = $tfn->('.signed.tmp');
4098 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4099 $tfn->('.tmp'), $tfn->('.tmp.asc');
4105 my @r = map { $mktag->($_); } @$tagwants;
4109 sub sign_changes ($) {
4110 my ($changesfile) = @_;
4112 my @debsign_cmd = @debsign;
4113 push @debsign_cmd, "-k$keyid" if defined $keyid;
4114 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4115 push @debsign_cmd, $changesfile;
4116 runcmd_ordryrun @debsign_cmd;
4121 printdebug "actually entering push\n";
4123 supplementary_message(<<'END');
4124 Push failed, while checking state of the archive.
4125 You can retry the push, after fixing the problem, if you like.
4127 if (check_for_git()) {
4130 my $archive_hash = fetch_from_archive();
4131 if (!$archive_hash) {
4133 fail "package appears to be new in this suite;".
4134 " if this is intentional, use --new";
4137 supplementary_message(<<'END');
4138 Push failed, while preparing your push.
4139 You can retry the push, after fixing the problem, if you like.
4142 need_tagformat 'new', "quilt mode $quilt_mode"
4143 if quiltmode_splitbrain;
4147 access_giturl(); # check that success is vaguely likely
4148 rpush_handle_protovsn_bothends() if $we_are_initiator;
4151 my $clogpfn = ".git/dgit/changelog.822.tmp";
4152 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4154 responder_send_file('parsed-changelog', $clogpfn);
4156 my ($clogp, $cversion, $dscfn) =
4157 push_parse_changelog("$clogpfn");
4159 my $dscpath = "$buildproductsdir/$dscfn";
4160 stat_exists $dscpath or
4161 fail "looked for .dsc $dscpath, but $!;".
4162 " maybe you forgot to build";
4164 responder_send_file('dsc', $dscpath);
4166 push_parse_dsc($dscpath, $dscfn, $cversion);
4168 my $format = getfield $dsc, 'Format';
4169 printdebug "format $format\n";
4171 my $actualhead = git_rev_parse('HEAD');
4172 my $dgithead = $actualhead;
4173 my $maintviewhead = undef;
4175 my $upstreamversion = upstreamversion $clogp->{Version};
4177 if (madformat_wantfixup($format)) {
4178 # user might have not used dgit build, so maybe do this now:
4179 if (quiltmode_splitbrain()) {
4181 quilt_make_fake_dsc($upstreamversion);
4183 ($dgithead, $cachekey) =
4184 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4186 "--quilt=$quilt_mode but no cached dgit view:
4187 perhaps tree changed since dgit build[-source] ?";
4189 $dgithead = splitbrain_pseudomerge($clogp,
4190 $actualhead, $dgithead,
4192 $maintviewhead = $actualhead;
4193 changedir '../../../..';
4194 prep_ud(); # so _only_subdir() works, below
4196 commit_quilty_patch();
4200 if (defined $overwrite_version && !defined $maintviewhead) {
4201 $dgithead = plain_overwrite_pseudomerge($clogp,
4209 if ($archive_hash) {
4210 if (is_fast_fwd($archive_hash, $dgithead)) {
4212 } elsif (deliberately_not_fast_forward) {
4215 fail "dgit push: HEAD is not a descendant".
4216 " of the archive's version.\n".
4217 "To overwrite the archive's contents,".
4218 " pass --overwrite[=VERSION].\n".
4219 "To rewind history, if permitted by the archive,".
4220 " use --deliberately-not-fast-forward.";
4225 progress "checking that $dscfn corresponds to HEAD";
4226 runcmd qw(dpkg-source -x --),
4227 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4228 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4229 check_for_vendor_patches() if madformat($dsc->{format});
4230 changedir '../../../..';
4231 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4232 debugcmd "+",@diffcmd;
4234 my $r = system @diffcmd;
4237 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4239 HEAD specifies a different tree to $dscfn:
4241 Perhaps you forgot to build. Or perhaps there is a problem with your
4242 source tree (see dgit(7) for some hints). To see a full diff, run
4249 if (!$changesfile) {
4250 my $pat = changespat $cversion;
4251 my @cs = glob "$buildproductsdir/$pat";
4252 fail "failed to find unique changes file".
4253 " (looked for $pat in $buildproductsdir);".
4254 " perhaps you need to use dgit -C"
4256 ($changesfile) = @cs;
4258 $changesfile = "$buildproductsdir/$changesfile";
4261 # Check that changes and .dsc agree enough
4262 $changesfile =~ m{[^/]*$};
4263 my $changes = parsecontrol($changesfile,$&);
4264 files_compare_inputs($dsc, $changes)
4265 unless forceing [qw(dsc-changes-mismatch)];
4267 # Perhaps adjust .dsc to contain right set of origs
4268 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4270 unless forceing [qw(changes-origs-exactly)];
4272 # Checks complete, we're going to try and go ahead:
4274 responder_send_file('changes',$changesfile);
4275 responder_send_command("param head $dgithead");
4276 responder_send_command("param csuite $csuite");
4277 responder_send_command("param isuite $isuite");
4278 responder_send_command("param tagformat $tagformat");
4279 if (defined $maintviewhead) {
4280 die unless ($protovsn//4) >= 4;
4281 responder_send_command("param maint-view $maintviewhead");
4284 # Perhaps send buildinfo(s) for signing
4285 my $changes_files = getfield $changes, 'Files';
4286 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4287 foreach my $bi (@buildinfos) {
4288 responder_send_command("param buildinfo-filename $bi");
4289 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4292 if (deliberately_not_fast_forward) {
4293 git_for_each_ref(lrfetchrefs, sub {
4294 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4295 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4296 responder_send_command("previously $rrefname=$objid");
4297 $previously{$rrefname} = $objid;
4301 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4305 supplementary_message(<<'END');
4306 Push failed, while signing the tag.
4307 You can retry the push, after fixing the problem, if you like.
4309 # If we manage to sign but fail to record it anywhere, it's fine.
4310 if ($we_are_responder) {
4311 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4312 responder_receive_files('signed-tag', @tagobjfns);
4314 @tagobjfns = push_mktags($clogp,$dscpath,
4315 $changesfile,$changesfile,
4318 supplementary_message(<<'END');
4319 Push failed, *after* signing the tag.
4320 If you want to try again, you should use a new version number.
4323 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4325 foreach my $tw (@tagwants) {
4326 my $tag = $tw->{Tag};
4327 my $tagobjfn = $tw->{TagObjFn};
4329 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4330 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4331 runcmd_ordryrun_local
4332 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4335 supplementary_message(<<'END');
4336 Push failed, while updating the remote git repository - see messages above.
4337 If you want to try again, you should use a new version number.
4339 if (!check_for_git()) {
4340 create_remote_git_repo();
4343 my @pushrefs = $forceflag.$dgithead.":".rrref();
4344 foreach my $tw (@tagwants) {
4345 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4348 runcmd_ordryrun @git,
4349 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4350 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4352 supplementary_message(<<'END');
4353 Push failed, while obtaining signatures on the .changes and .dsc.
4354 If it was just that the signature failed, you may try again by using
4355 debsign by hand to sign the changes
4357 and then dput to complete the upload.
4358 If you need to change the package, you must use a new version number.
4360 if ($we_are_responder) {
4361 my $dryrunsuffix = act_local() ? "" : ".tmp";
4362 my @rfiles = ($dscpath, $changesfile);
4363 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4364 responder_receive_files('signed-dsc-changes',
4365 map { "$_$dryrunsuffix" } @rfiles);
4368 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4370 progress "[new .dsc left in $dscpath.tmp]";
4372 sign_changes $changesfile;
4375 supplementary_message(<<END);
4376 Push failed, while uploading package(s) to the archive server.
4377 You can retry the upload of exactly these same files with dput of:
4379 If that .changes file is broken, you will need to use a new version
4380 number for your next attempt at the upload.
4382 my $host = access_cfg('upload-host','RETURN-UNDEF');
4383 my @hostarg = defined($host) ? ($host,) : ();
4384 runcmd_ordryrun @dput, @hostarg, $changesfile;
4385 printdone "pushed and uploaded $cversion";
4387 supplementary_message('');
4388 responder_send_command("complete");
4397 badusage "-p is not allowed with clone; specify as argument instead"
4398 if defined $package;
4401 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4402 ($package,$isuite) = @ARGV;
4403 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4404 ($package,$dstdir) = @ARGV;
4405 } elsif (@ARGV==3) {
4406 ($package,$isuite,$dstdir) = @ARGV;
4408 badusage "incorrect arguments to dgit clone";
4412 $dstdir ||= "$package";
4413 if (stat_exists $dstdir) {
4414 fail "$dstdir already exists";
4418 if ($rmonerror && !$dryrun_level) {
4419 $cwd_remove= getcwd();
4421 return unless defined $cwd_remove;
4422 if (!chdir "$cwd_remove") {
4423 return if $!==&ENOENT;
4424 die "chdir $cwd_remove: $!";
4426 printdebug "clone rmonerror removing $dstdir\n";
4428 rmtree($dstdir) or die "remove $dstdir: $!\n";
4429 } elsif (grep { $! == $_ }
4430 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4432 print STDERR "check whether to remove $dstdir: $!\n";
4438 $cwd_remove = undef;
4441 sub branchsuite () {
4442 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4443 my $branch = cmdoutput_errok @cmd;
4444 if (!defined $branch) {
4445 $?==256 or failedcmd @cmd;
4448 if ($branch =~ m#$lbranch_re#o) {
4455 sub fetchpullargs () {
4456 if (!defined $package) {
4457 my $sourcep = parsecontrol('debian/control','debian/control');
4458 $package = getfield $sourcep, 'Source';
4461 $isuite = branchsuite();
4463 my $clogp = parsechangelog();
4464 my $clogsuite = getfield $clogp, 'Distribution';
4465 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4467 } elsif (@ARGV==1) {
4470 badusage "incorrect arguments to dgit fetch or dgit pull";
4478 my $multi_fetched = fork_for_multisuite(sub { });
4479 exit 0 if $multi_fetched;
4486 if (quiltmode_splitbrain()) {
4487 my ($format, $fopts) = get_source_format();
4488 madformat($format) and fail <<END
4489 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4497 badusage "-p is not allowed with dgit push" if defined $package;
4499 my $clogp = parsechangelog();
4500 $package = getfield $clogp, 'Source';
4503 } elsif (@ARGV==1) {
4504 ($specsuite) = (@ARGV);
4506 badusage "incorrect arguments to dgit push";
4508 $isuite = getfield $clogp, 'Distribution';
4511 local ($package) = $existing_package; # this is a hack
4512 canonicalise_suite();
4514 canonicalise_suite();
4516 if (defined $specsuite &&
4517 $specsuite ne $isuite &&
4518 $specsuite ne $csuite) {
4519 fail "dgit push: changelog specifies $isuite ($csuite)".
4520 " but command line specifies $specsuite";
4525 #---------- remote commands' implementation ----------
4527 sub pre_remote_push_build_host {
4528 my ($nrargs) = shift @ARGV;
4529 my (@rargs) = @ARGV[0..$nrargs-1];
4530 @ARGV = @ARGV[$nrargs..$#ARGV];
4532 my ($dir,$vsnwant) = @rargs;
4533 # vsnwant is a comma-separated list; we report which we have
4534 # chosen in our ready response (so other end can tell if they
4537 $we_are_responder = 1;
4538 $us .= " (build host)";
4540 open PI, "<&STDIN" or die $!;
4541 open STDIN, "/dev/null" or die $!;
4542 open PO, ">&STDOUT" or die $!;
4544 open STDOUT, ">&STDERR" or die $!;
4548 ($protovsn) = grep {
4549 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4550 } @rpushprotovsn_support;
4552 fail "build host has dgit rpush protocol versions ".
4553 (join ",", @rpushprotovsn_support).
4554 " but invocation host has $vsnwant"
4555 unless defined $protovsn;
4559 sub cmd_remote_push_build_host {
4560 responder_send_command("dgit-remote-push-ready $protovsn");
4564 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4565 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4566 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4567 # a good error message)
4569 sub rpush_handle_protovsn_bothends () {
4570 if ($protovsn < 4) {
4571 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4580 my $report = i_child_report();
4581 if (defined $report) {
4582 printdebug "($report)\n";
4583 } elsif ($i_child_pid) {
4584 printdebug "(killing build host child $i_child_pid)\n";
4585 kill 15, $i_child_pid;
4587 if (defined $i_tmp && !defined $initiator_tempdir) {
4589 eval { rmtree $i_tmp; };
4594 return unless forkcheck_mainprocess();
4599 my ($base,$selector,@args) = @_;
4600 $selector =~ s/\-/_/g;
4601 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4610 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4618 push @rargs, join ",", @rpushprotovsn_support;
4621 push @rdgit, @ropts;
4622 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4624 my @cmd = (@ssh, $host, shellquote @rdgit);
4627 $we_are_initiator=1;
4629 if (defined $initiator_tempdir) {
4630 rmtree $initiator_tempdir;
4631 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4632 $i_tmp = $initiator_tempdir;
4636 $i_child_pid = open2(\*RO, \*RI, @cmd);
4638 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4639 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4640 $supplementary_message = '' unless $protovsn >= 3;
4643 my ($icmd,$iargs) = initiator_expect {
4644 m/^(\S+)(?: (.*))?$/;
4647 i_method "i_resp", $icmd, $iargs;
4651 sub i_resp_progress ($) {
4653 my $msg = protocol_read_bytes \*RO, $rhs;
4657 sub i_resp_supplementary_message ($) {
4659 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4662 sub i_resp_complete {
4663 my $pid = $i_child_pid;
4664 $i_child_pid = undef; # prevents killing some other process with same pid
4665 printdebug "waiting for build host child $pid...\n";
4666 my $got = waitpid $pid, 0;
4667 die $! unless $got == $pid;
4668 die "build host child failed $?" if $?;
4671 printdebug "all done\n";
4675 sub i_resp_file ($) {
4677 my $localname = i_method "i_localname", $keyword;
4678 my $localpath = "$i_tmp/$localname";
4679 stat_exists $localpath and
4680 badproto \*RO, "file $keyword ($localpath) twice";
4681 protocol_receive_file \*RO, $localpath;
4682 i_method "i_file", $keyword;
4687 sub i_resp_param ($) {
4688 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4692 sub i_resp_previously ($) {
4693 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4694 or badproto \*RO, "bad previously spec";
4695 my $r = system qw(git check-ref-format), $1;
4696 die "bad previously ref spec ($r)" if $r;
4697 $previously{$1} = $2;
4702 sub i_resp_want ($) {
4704 die "$keyword ?" if $i_wanted{$keyword}++;
4706 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4707 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4708 die unless $isuite =~ m/^$suite_re$/;
4711 rpush_handle_protovsn_bothends();
4713 fail "rpush negotiated protocol version $protovsn".
4714 " which does not support quilt mode $quilt_mode"
4715 if quiltmode_splitbrain;
4717 my @localpaths = i_method "i_want", $keyword;
4718 printdebug "[[ $keyword @localpaths\n";
4719 foreach my $localpath (@localpaths) {
4720 protocol_send_file \*RI, $localpath;
4722 print RI "files-end\n" or die $!;
4725 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4727 sub i_localname_parsed_changelog {
4728 return "remote-changelog.822";
4730 sub i_file_parsed_changelog {
4731 ($i_clogp, $i_version, $i_dscfn) =
4732 push_parse_changelog "$i_tmp/remote-changelog.822";
4733 die if $i_dscfn =~ m#/|^\W#;
4736 sub i_localname_dsc {
4737 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4742 sub i_localname_buildinfo ($) {
4743 my $bi = $i_param{'buildinfo-filename'};
4744 defined $bi or badproto \*RO, "buildinfo before filename";
4745 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4746 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4747 or badproto \*RO, "improper buildinfo filename";
4750 sub i_file_buildinfo {
4751 my $bi = $i_param{'buildinfo-filename'};
4752 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4753 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4754 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4755 files_compare_inputs($bd, $ch);
4756 (getfield $bd, $_) eq (getfield $ch, $_) or
4757 fail "buildinfo mismatch $_"
4758 foreach qw(Source Version);
4759 !defined $bd->{$_} or
4760 fail "buildinfo contains $_"
4761 foreach qw(Changes Changed-by Distribution);
4763 push @i_buildinfos, $bi;
4764 delete $i_param{'buildinfo-filename'};
4767 sub i_localname_changes {
4768 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4769 $i_changesfn = $i_dscfn;
4770 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4771 return $i_changesfn;
4773 sub i_file_changes { }
4775 sub i_want_signed_tag {
4776 printdebug Dumper(\%i_param, $i_dscfn);
4777 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4778 && defined $i_param{'csuite'}
4779 or badproto \*RO, "premature desire for signed-tag";
4780 my $head = $i_param{'head'};
4781 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4783 my $maintview = $i_param{'maint-view'};
4784 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4787 if ($protovsn >= 4) {
4788 my $p = $i_param{'tagformat'} // '<undef>';
4790 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4793 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4795 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4797 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4800 push_mktags $i_clogp, $i_dscfn,
4801 $i_changesfn, 'remote changes',
4805 sub i_want_signed_dsc_changes {
4806 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4807 sign_changes $i_changesfn;
4808 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4811 #---------- building etc. ----------
4817 #----- `3.0 (quilt)' handling -----
4819 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4821 sub quiltify_dpkg_commit ($$$;$) {
4822 my ($patchname,$author,$msg, $xinfo) = @_;
4826 my $descfn = ".git/dgit/quilt-description.tmp";
4827 open O, '>', $descfn or die "$descfn: $!";
4828 $msg =~ s/\n+/\n\n/;
4829 print O <<END or die $!;
4831 ${xinfo}Subject: $msg
4838 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4839 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4840 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4841 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4845 sub quiltify_trees_differ ($$;$$$) {
4846 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4847 # returns true iff the two tree objects differ other than in debian/
4848 # with $finegrained,
4849 # returns bitmask 01 - differ in upstream files except .gitignore
4850 # 02 - differ in .gitignore
4851 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4852 # is set for each modified .gitignore filename $fn
4853 # if $unrepres is defined, array ref to which is appeneded
4854 # a list of unrepresentable changes (removals of upstream files
4857 my @cmd = (@git, qw(diff-tree -z --no-renames));
4858 push @cmd, qw(--name-only) unless $unrepres;
4859 push @cmd, qw(-r) if $finegrained || $unrepres;
4861 my $diffs= cmdoutput @cmd;
4864 foreach my $f (split /\0/, $diffs) {
4865 if ($unrepres && !@lmodes) {
4866 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4869 my ($oldmode,$newmode) = @lmodes;
4872 next if $f =~ m#^debian(?:/.*)?$#s;
4876 die "not a plain file or symlink\n"
4877 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
4878 $oldmode =~ m/^(?:10|12)\d{4}$/;
4879 if ($oldmode =~ m/[^0]/ &&
4880 $newmode =~ m/[^0]/) {
4881 # both old and new files exist
4882 die "mode or type changed\n" if $oldmode ne $newmode;
4883 die "modified symlink\n" unless $newmode =~ m/^10/;
4884 } elsif ($oldmode =~ m/[^0]/) {
4886 die "deletion of symlink\n"
4887 unless $oldmode =~ m/^10/;
4890 die "creation with non-default mode\n"
4891 unless $newmode =~ m/^100644$/ or
4892 $newmode =~ m/^120000$/;
4896 local $/="\n"; chomp $@;
4897 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4901 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4902 $r |= $isignore ? 02 : 01;
4903 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4905 printdebug "quiltify_trees_differ $x $y => $r\n";
4909 sub quiltify_tree_sentinelfiles ($) {
4910 # lists the `sentinel' files present in the tree
4912 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4913 qw(-- debian/rules debian/control);
4918 sub quiltify_splitbrain_needed () {
4919 if (!$split_brain) {
4920 progress "dgit view: changes are required...";
4921 runcmd @git, qw(checkout -q -b dgit-view);
4926 sub quiltify_splitbrain ($$$$$$) {
4927 my ($clogp, $unapplied, $headref, $diffbits,
4928 $editedignores, $cachekey) = @_;
4929 if ($quilt_mode !~ m/gbp|dpm/) {
4930 # treat .gitignore just like any other upstream file
4931 $diffbits = { %$diffbits };
4932 $_ = !!$_ foreach values %$diffbits;
4934 # We would like any commits we generate to be reproducible
4935 my @authline = clogp_authline($clogp);
4936 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4937 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4938 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4939 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4940 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4941 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4943 if ($quilt_mode =~ m/gbp|unapplied/ &&
4944 ($diffbits->{O2H} & 01)) {
4946 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4947 " but git tree differs from orig in upstream files.";
4948 if (!stat_exists "debian/patches") {
4950 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4954 if ($quilt_mode =~ m/dpm/ &&
4955 ($diffbits->{H2A} & 01)) {
4957 --quilt=$quilt_mode specified, implying patches-applied git tree
4958 but git tree differs from result of applying debian/patches to upstream
4961 if ($quilt_mode =~ m/gbp|unapplied/ &&
4962 ($diffbits->{O2A} & 01)) { # some patches
4963 quiltify_splitbrain_needed();
4964 progress "dgit view: creating patches-applied version using gbp pq";
4965 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4966 # gbp pq import creates a fresh branch; push back to dgit-view
4967 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4968 runcmd @git, qw(checkout -q dgit-view);
4970 if ($quilt_mode =~ m/gbp|dpm/ &&
4971 ($diffbits->{O2A} & 02)) {
4973 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4974 tool which does not create patches for changes to upstream
4975 .gitignores: but, such patches exist in debian/patches.
4978 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4979 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4980 quiltify_splitbrain_needed();
4981 progress "dgit view: creating patch to represent .gitignore changes";
4982 ensuredir "debian/patches";
4983 my $gipatch = "debian/patches/auto-gitignore";
4984 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4985 stat GIPATCH or die "$gipatch: $!";
4986 fail "$gipatch already exists; but want to create it".
4987 " to record .gitignore changes" if (stat _)[7];
4988 print GIPATCH <<END or die "$gipatch: $!";
4989 Subject: Update .gitignore from Debian packaging branch
4991 The Debian packaging git branch contains these updates to the upstream
4992 .gitignore file(s). This patch is autogenerated, to provide these
4993 updates to users of the official Debian archive view of the package.
4995 [dgit ($our_version) update-gitignore]
4998 close GIPATCH or die "$gipatch: $!";
4999 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5000 $unapplied, $headref, "--", sort keys %$editedignores;
5001 open SERIES, "+>>", "debian/patches/series" or die $!;
5002 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5004 defined read SERIES, $newline, 1 or die $!;
5005 print SERIES "\n" or die $! unless $newline eq "\n";
5006 print SERIES "auto-gitignore\n" or die $!;
5007 close SERIES or die $!;
5008 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5010 Commit patch to update .gitignore
5012 [dgit ($our_version) update-gitignore-quilt-fixup]
5016 my $dgitview = git_rev_parse 'HEAD';
5018 changedir '../../../..';
5019 # When we no longer need to support squeeze, use --create-reflog
5021 ensuredir ".git/logs/refs/dgit-intern";
5022 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
5025 my $oldcache = git_get_ref "refs/$splitbraincache";
5026 if ($oldcache eq $dgitview) {
5027 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5028 # git update-ref doesn't always update, in this case. *sigh*
5029 my $dummy = make_commit_text <<END;
5032 author Dgit <dgit\@example.com> 1000000000 +0000
5033 committer Dgit <dgit\@example.com> 1000000000 +0000
5035 Dummy commit - do not use
5037 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5038 "refs/$splitbraincache", $dummy;
5040 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5043 changedir '.git/dgit/unpack/work';
5045 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5046 progress "dgit view: created ($saved)";
5049 sub quiltify ($$$$) {
5050 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5052 # Quilt patchification algorithm
5054 # We search backwards through the history of the main tree's HEAD
5055 # (T) looking for a start commit S whose tree object is identical
5056 # to to the patch tip tree (ie the tree corresponding to the
5057 # current dpkg-committed patch series). For these purposes
5058 # `identical' disregards anything in debian/ - this wrinkle is
5059 # necessary because dpkg-source treates debian/ specially.
5061 # We can only traverse edges where at most one of the ancestors'
5062 # trees differs (in changes outside in debian/). And we cannot
5063 # handle edges which change .pc/ or debian/patches. To avoid
5064 # going down a rathole we avoid traversing edges which introduce
5065 # debian/rules or debian/control. And we set a limit on the
5066 # number of edges we are willing to look at.
5068 # If we succeed, we walk forwards again. For each traversed edge
5069 # PC (with P parent, C child) (starting with P=S and ending with
5070 # C=T) to we do this:
5072 # - dpkg-source --commit with a patch name and message derived from C
5073 # After traversing PT, we git commit the changes which
5074 # should be contained within debian/patches.
5076 # The search for the path S..T is breadth-first. We maintain a
5077 # todo list containing search nodes. A search node identifies a
5078 # commit, and looks something like this:
5080 # Commit => $git_commit_id,
5081 # Child => $c, # or undef if P=T
5082 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5083 # Nontrivial => true iff $p..$c has relevant changes
5090 my %considered; # saves being exponential on some weird graphs
5092 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5095 my ($search,$whynot) = @_;
5096 printdebug " search NOT $search->{Commit} $whynot\n";
5097 $search->{Whynot} = $whynot;
5098 push @nots, $search;
5099 no warnings qw(exiting);
5108 my $c = shift @todo;
5109 next if $considered{$c->{Commit}}++;
5111 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5113 printdebug "quiltify investigate $c->{Commit}\n";
5116 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5117 printdebug " search finished hooray!\n";
5122 if ($quilt_mode eq 'nofix') {
5123 fail "quilt fixup required but quilt mode is \`nofix'\n".
5124 "HEAD commit $c->{Commit} differs from tree implied by ".
5125 " debian/patches (tree object $oldtiptree)";
5127 if ($quilt_mode eq 'smash') {
5128 printdebug " search quitting smash\n";
5132 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5133 $not->($c, "has $c_sentinels not $t_sentinels")
5134 if $c_sentinels ne $t_sentinels;
5136 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5137 $commitdata =~ m/\n\n/;
5139 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5140 @parents = map { { Commit => $_, Child => $c } } @parents;
5142 $not->($c, "root commit") if !@parents;
5144 foreach my $p (@parents) {
5145 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5147 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5148 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5150 foreach my $p (@parents) {
5151 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5153 my @cmd= (@git, qw(diff-tree -r --name-only),
5154 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5155 my $patchstackchange = cmdoutput @cmd;
5156 if (length $patchstackchange) {
5157 $patchstackchange =~ s/\n/,/g;
5158 $not->($p, "changed $patchstackchange");
5161 printdebug " search queue P=$p->{Commit} ",
5162 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5168 printdebug "quiltify want to smash\n";
5171 my $x = $_[0]{Commit};
5172 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5175 my $reportnot = sub {
5177 my $s = $abbrev->($notp);
5178 my $c = $notp->{Child};
5179 $s .= "..".$abbrev->($c) if $c;
5180 $s .= ": ".$notp->{Whynot};
5183 if ($quilt_mode eq 'linear') {
5184 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5185 foreach my $notp (@nots) {
5186 print STDERR "$us: ", $reportnot->($notp), "\n";
5188 print STDERR "$us: $_\n" foreach @$failsuggestion;
5189 fail "quilt fixup naive history linearisation failed.\n".
5190 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5191 } elsif ($quilt_mode eq 'smash') {
5192 } elsif ($quilt_mode eq 'auto') {
5193 progress "quilt fixup cannot be linear, smashing...";
5195 die "$quilt_mode ?";
5198 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5199 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5201 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5203 quiltify_dpkg_commit "auto-$version-$target-$time",
5204 (getfield $clogp, 'Maintainer'),
5205 "Automatically generated patch ($clogp->{Version})\n".
5206 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5210 progress "quiltify linearisation planning successful, executing...";
5212 for (my $p = $sref_S;
5213 my $c = $p->{Child};
5215 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5216 next unless $p->{Nontrivial};
5218 my $cc = $c->{Commit};
5220 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5221 $commitdata =~ m/\n\n/ or die "$c ?";
5224 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5227 my $commitdate = cmdoutput
5228 @git, qw(log -n1 --pretty=format:%aD), $cc;
5230 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5232 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5239 my $gbp_check_suitable = sub {
5244 die "contains unexpected slashes\n" if m{//} || m{/$};
5245 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5246 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5247 die "is series file\n" if m{$series_filename_re}o;
5248 die "too long" if length > 200;
5250 return $_ unless $@;
5251 print STDERR "quiltifying commit $cc:".
5252 " ignoring/dropping Gbp-Pq $what: $@";
5256 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5258 (\S+) \s* \n //ixm) {
5259 $patchname = $gbp_check_suitable->($1, 'Name');
5261 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5263 (\S+) \s* \n //ixm) {
5264 $patchdir = $gbp_check_suitable->($1, 'Topic');
5269 if (!defined $patchname) {
5270 $patchname = $title;
5271 $patchname =~ s/[.:]$//;
5274 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5275 my $translitname = $converter->convert($patchname);
5276 die unless defined $translitname;
5277 $patchname = $translitname;
5280 "dgit: patch title transliteration error: $@"
5282 $patchname =~ y/ A-Z/-a-z/;
5283 $patchname =~ y/-a-z0-9_.+=~//cd;
5284 $patchname =~ s/^\W/x-$&/;
5285 $patchname = substr($patchname,0,40);
5286 $patchname .= ".patch";
5288 if (!defined $patchdir) {
5291 if (length $patchdir) {
5292 $patchname = "$patchdir/$patchname";
5294 if ($patchname =~ m{^(.*)/}) {
5295 mkpath "debian/patches/$1";
5300 stat "debian/patches/$patchname$index";
5302 $!==ENOENT or die "$patchname$index $!";
5304 runcmd @git, qw(checkout -q), $cc;
5306 # We use the tip's changelog so that dpkg-source doesn't
5307 # produce complaining messages from dpkg-parsechangelog. None
5308 # of the information dpkg-source gets from the changelog is
5309 # actually relevant - it gets put into the original message
5310 # which dpkg-source provides our stunt editor, and then
5312 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5314 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5315 "Date: $commitdate\n".
5316 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5318 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5321 runcmd @git, qw(checkout -q master);
5324 sub build_maybe_quilt_fixup () {
5325 my ($format,$fopts) = get_source_format;
5326 return unless madformat_wantfixup $format;
5329 check_for_vendor_patches();
5331 if (quiltmode_splitbrain) {
5332 fail <<END unless access_cfg_tagformats_can_splitbrain;
5333 quilt mode $quilt_mode requires split view so server needs to support
5334 both "new" and "maint" tag formats, but config says it doesn't.
5338 my $clogp = parsechangelog();
5339 my $headref = git_rev_parse('HEAD');
5344 my $upstreamversion = upstreamversion $version;
5346 if ($fopts->{'single-debian-patch'}) {
5347 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5349 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5352 die 'bug' if $split_brain && !$need_split_build_invocation;
5354 changedir '../../../..';
5355 runcmd_ordryrun_local
5356 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5359 sub quilt_fixup_mkwork ($) {
5362 mkdir "work" or die $!;
5364 mktree_in_ud_here();
5365 runcmd @git, qw(reset -q --hard), $headref;
5368 sub quilt_fixup_linkorigs ($$) {
5369 my ($upstreamversion, $fn) = @_;
5370 # calls $fn->($leafname);
5372 foreach my $f (<../../../../*>) { #/){
5373 my $b=$f; $b =~ s{.*/}{};
5375 local ($debuglevel) = $debuglevel-1;
5376 printdebug "QF linkorigs $b, $f ?\n";
5378 next unless is_orig_file_of_vsn $b, $upstreamversion;
5379 printdebug "QF linkorigs $b, $f Y\n";
5380 link_ltarget $f, $b or die "$b $!";
5385 sub quilt_fixup_delete_pc () {
5386 runcmd @git, qw(rm -rqf .pc);
5388 Commit removal of .pc (quilt series tracking data)
5390 [dgit ($our_version) upgrade quilt-remove-pc]
5394 sub quilt_fixup_singlepatch ($$$) {
5395 my ($clogp, $headref, $upstreamversion) = @_;
5397 progress "starting quiltify (single-debian-patch)";
5399 # dpkg-source --commit generates new patches even if
5400 # single-debian-patch is in debian/source/options. In order to
5401 # get it to generate debian/patches/debian-changes, it is
5402 # necessary to build the source package.
5404 quilt_fixup_linkorigs($upstreamversion, sub { });
5405 quilt_fixup_mkwork($headref);
5407 rmtree("debian/patches");
5409 runcmd @dpkgsource, qw(-b .);
5411 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5412 rename srcfn("$upstreamversion", "/debian/patches"),
5413 "work/debian/patches";
5416 commit_quilty_patch();
5419 sub quilt_make_fake_dsc ($) {
5420 my ($upstreamversion) = @_;
5422 my $fakeversion="$upstreamversion-~~DGITFAKE";
5424 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5425 print $fakedsc <<END or die $!;
5428 Version: $fakeversion
5432 my $dscaddfile=sub {
5435 my $md = new Digest::MD5;
5437 my $fh = new IO::File $b, '<' or die "$b $!";
5442 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5445 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5447 my @files=qw(debian/source/format debian/rules
5448 debian/control debian/changelog);
5449 foreach my $maybe (qw(debian/patches debian/source/options
5450 debian/tests/control)) {
5451 next unless stat_exists "../../../$maybe";
5452 push @files, $maybe;
5455 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5456 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5458 $dscaddfile->($debtar);
5459 close $fakedsc or die $!;
5462 sub quilt_check_splitbrain_cache ($$) {
5463 my ($headref, $upstreamversion) = @_;
5464 # Called only if we are in (potentially) split brain mode.
5466 # Computes the cache key and looks in the cache.
5467 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5469 my $splitbrain_cachekey;
5472 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5473 # we look in the reflog of dgit-intern/quilt-cache
5474 # we look for an entry whose message is the key for the cache lookup
5475 my @cachekey = (qw(dgit), $our_version);
5476 push @cachekey, $upstreamversion;
5477 push @cachekey, $quilt_mode;
5478 push @cachekey, $headref;
5480 push @cachekey, hashfile('fake.dsc');
5482 my $srcshash = Digest::SHA->new(256);
5483 my %sfs = ( %INC, '$0(dgit)' => $0 );
5484 foreach my $sfk (sort keys %sfs) {
5485 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5486 $srcshash->add($sfk," ");
5487 $srcshash->add(hashfile($sfs{$sfk}));
5488 $srcshash->add("\n");
5490 push @cachekey, $srcshash->hexdigest();
5491 $splitbrain_cachekey = "@cachekey";
5493 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5495 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5496 debugcmd "|(probably)",@cmd;
5497 my $child = open GC, "-|"; defined $child or die $!;
5499 chdir '../../..' or die $!;
5500 if (!stat ".git/logs/refs/$splitbraincache") {
5501 $! == ENOENT or die $!;
5502 printdebug ">(no reflog)\n";
5509 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5510 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5513 quilt_fixup_mkwork($headref);
5514 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5515 if ($cachehit ne $headref) {
5516 progress "dgit view: found cached ($saved)";
5517 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5519 return ($cachehit, $splitbrain_cachekey);
5521 progress "dgit view: found cached, no changes required";
5522 return ($headref, $splitbrain_cachekey);
5524 die $! if GC->error;
5525 failedcmd unless close GC;
5527 printdebug "splitbrain cache miss\n";
5528 return (undef, $splitbrain_cachekey);
5531 sub quilt_fixup_multipatch ($$$) {
5532 my ($clogp, $headref, $upstreamversion) = @_;
5534 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5537 # - honour any existing .pc in case it has any strangeness
5538 # - determine the git commit corresponding to the tip of
5539 # the patch stack (if there is one)
5540 # - if there is such a git commit, convert each subsequent
5541 # git commit into a quilt patch with dpkg-source --commit
5542 # - otherwise convert all the differences in the tree into
5543 # a single git commit
5547 # Our git tree doesn't necessarily contain .pc. (Some versions of
5548 # dgit would include the .pc in the git tree.) If there isn't
5549 # one, we need to generate one by unpacking the patches that we
5552 # We first look for a .pc in the git tree. If there is one, we
5553 # will use it. (This is not the normal case.)
5555 # Otherwise need to regenerate .pc so that dpkg-source --commit
5556 # can work. We do this as follows:
5557 # 1. Collect all relevant .orig from parent directory
5558 # 2. Generate a debian.tar.gz out of
5559 # debian/{patches,rules,source/format,source/options}
5560 # 3. Generate a fake .dsc containing just these fields:
5561 # Format Source Version Files
5562 # 4. Extract the fake .dsc
5563 # Now the fake .dsc has a .pc directory.
5564 # (In fact we do this in every case, because in future we will
5565 # want to search for a good base commit for generating patches.)
5567 # Then we can actually do the dpkg-source --commit
5568 # 1. Make a new working tree with the same object
5569 # store as our main tree and check out the main
5571 # 2. Copy .pc from the fake's extraction, if necessary
5572 # 3. Run dpkg-source --commit
5573 # 4. If the result has changes to debian/, then
5574 # - git add them them
5575 # - git add .pc if we had a .pc in-tree
5577 # 5. If we had a .pc in-tree, delete it, and git commit
5578 # 6. Back in the main tree, fast forward to the new HEAD
5580 # Another situation we may have to cope with is gbp-style
5581 # patches-unapplied trees.
5583 # We would want to detect these, so we know to escape into
5584 # quilt_fixup_gbp. However, this is in general not possible.
5585 # Consider a package with a one patch which the dgit user reverts
5586 # (with git revert or the moral equivalent).
5588 # That is indistinguishable in contents from a patches-unapplied
5589 # tree. And looking at the history to distinguish them is not
5590 # useful because the user might have made a confusing-looking git
5591 # history structure (which ought to produce an error if dgit can't
5592 # cope, not a silent reintroduction of an unwanted patch).
5594 # So gbp users will have to pass an option. But we can usually
5595 # detect their failure to do so: if the tree is not a clean
5596 # patches-applied tree, quilt linearisation fails, but the tree
5597 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5598 # they want --quilt=unapplied.
5600 # To help detect this, when we are extracting the fake dsc, we
5601 # first extract it with --skip-patches, and then apply the patches
5602 # afterwards with dpkg-source --before-build. That lets us save a
5603 # tree object corresponding to .origs.
5605 my $splitbrain_cachekey;
5607 quilt_make_fake_dsc($upstreamversion);
5609 if (quiltmode_splitbrain()) {
5611 ($cachehit, $splitbrain_cachekey) =
5612 quilt_check_splitbrain_cache($headref, $upstreamversion);
5613 return if $cachehit;
5617 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5619 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5620 rename $fakexdir, "fake" or die "$fakexdir $!";
5624 remove_stray_gits("source package");
5625 mktree_in_ud_here();
5629 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5630 my $unapplied=git_add_write_tree();
5631 printdebug "fake orig tree object $unapplied\n";
5635 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5637 if (system @bbcmd) {
5638 failedcmd @bbcmd if $? < 0;
5640 failed to apply your git tree's patch stack (from debian/patches/) to
5641 the corresponding upstream tarball(s). Your source tree and .orig
5642 are probably too inconsistent. dgit can only fix up certain kinds of
5643 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5649 quilt_fixup_mkwork($headref);
5652 if (stat_exists ".pc") {
5654 progress "Tree already contains .pc - will use it then delete it.";
5657 rename '../fake/.pc','.pc' or die $!;
5660 changedir '../fake';
5662 my $oldtiptree=git_add_write_tree();
5663 printdebug "fake o+d/p tree object $unapplied\n";
5664 changedir '../work';
5667 # We calculate some guesswork now about what kind of tree this might
5668 # be. This is mostly for error reporting.
5674 # O = orig, without patches applied
5675 # A = "applied", ie orig with H's debian/patches applied
5676 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5677 \%editedignores, \@unrepres),
5678 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5679 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5683 foreach my $b (qw(01 02)) {
5684 foreach my $v (qw(O2H O2A H2A)) {
5685 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5688 printdebug "differences \@dl @dl.\n";
5691 "$us: base trees orig=%.20s o+d/p=%.20s",
5692 $unapplied, $oldtiptree;
5694 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5695 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5696 $dl[0], $dl[1], $dl[3], $dl[4],
5700 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5702 forceable_fail [qw(unrepresentable)], <<END;
5703 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5708 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5709 push @failsuggestion, "This might be a patches-unapplied branch.";
5710 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5711 push @failsuggestion, "This might be a patches-applied branch.";
5713 push @failsuggestion, "Maybe you need to specify one of".
5714 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5716 if (quiltmode_splitbrain()) {
5717 quiltify_splitbrain($clogp, $unapplied, $headref,
5718 $diffbits, \%editedignores,
5719 $splitbrain_cachekey);
5723 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5724 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5726 if (!open P, '>>', ".pc/applied-patches") {
5727 $!==&ENOENT or die $!;
5732 commit_quilty_patch();
5734 if ($mustdeletepc) {
5735 quilt_fixup_delete_pc();
5739 sub quilt_fixup_editor () {
5740 my $descfn = $ENV{$fakeeditorenv};
5741 my $editing = $ARGV[$#ARGV];
5742 open I1, '<', $descfn or die "$descfn: $!";
5743 open I2, '<', $editing or die "$editing: $!";
5744 unlink $editing or die "$editing: $!";
5745 open O, '>', $editing or die "$editing: $!";
5746 while (<I1>) { print O or die $!; } I1->error and die $!;
5749 $copying ||= m/^\-\-\- /;
5750 next unless $copying;
5753 I2->error and die $!;
5758 sub maybe_apply_patches_dirtily () {
5759 return unless $quilt_mode =~ m/gbp|unapplied/;
5760 print STDERR <<END or die $!;
5762 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5763 dgit: Have to apply the patches - making the tree dirty.
5764 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5767 $patches_applied_dirtily = 01;
5768 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5769 runcmd qw(dpkg-source --before-build .);
5772 sub maybe_unapply_patches_again () {
5773 progress "dgit: Unapplying patches again to tidy up the tree."
5774 if $patches_applied_dirtily;
5775 runcmd qw(dpkg-source --after-build .)
5776 if $patches_applied_dirtily & 01;
5778 if $patches_applied_dirtily & 02;
5779 $patches_applied_dirtily = 0;
5782 #----- other building -----
5784 our $clean_using_builder;
5785 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5786 # clean the tree before building (perhaps invoked indirectly by
5787 # whatever we are using to run the build), rather than separately
5788 # and explicitly by us.
5791 return if $clean_using_builder;
5792 if ($cleanmode eq 'dpkg-source') {
5793 maybe_apply_patches_dirtily();
5794 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5795 } elsif ($cleanmode eq 'dpkg-source-d') {
5796 maybe_apply_patches_dirtily();
5797 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5798 } elsif ($cleanmode eq 'git') {
5799 runcmd_ordryrun_local @git, qw(clean -xdf);
5800 } elsif ($cleanmode eq 'git-ff') {
5801 runcmd_ordryrun_local @git, qw(clean -xdff);
5802 } elsif ($cleanmode eq 'check') {
5803 my $leftovers = cmdoutput @git, qw(clean -xdn);
5804 if (length $leftovers) {
5805 print STDERR $leftovers, "\n" or die $!;
5806 fail "tree contains uncommitted files and --clean=check specified";
5808 } elsif ($cleanmode eq 'none') {
5815 badusage "clean takes no additional arguments" if @ARGV;
5818 maybe_unapply_patches_again();
5821 sub build_prep_early () {
5822 our $build_prep_early_done //= 0;
5823 return if $build_prep_early_done++;
5824 badusage "-p is not allowed when building" if defined $package;
5825 my $clogp = parsechangelog();
5826 $isuite = getfield $clogp, 'Distribution';
5827 $package = getfield $clogp, 'Source';
5828 $version = getfield $clogp, 'Version';
5836 build_maybe_quilt_fixup();
5838 my $pat = changespat $version;
5839 foreach my $f (glob "$buildproductsdir/$pat") {
5841 unlink $f or fail "remove old changes file $f: $!";
5843 progress "would remove $f";
5849 sub changesopts_initial () {
5850 my @opts =@changesopts[1..$#changesopts];
5853 sub changesopts_version () {
5854 if (!defined $changes_since_version) {
5855 my @vsns = archive_query('archive_query');
5856 my @quirk = access_quirk();
5857 if ($quirk[0] eq 'backports') {
5858 local $isuite = $quirk[2];
5860 canonicalise_suite();
5861 push @vsns, archive_query('archive_query');
5864 @vsns = map { $_->[0] } @vsns;
5865 @vsns = sort { -version_compare($a, $b) } @vsns;
5866 $changes_since_version = $vsns[0];
5867 progress "changelog will contain changes since $vsns[0]";
5869 $changes_since_version = '_';
5870 progress "package seems new, not specifying -v<version>";
5873 if ($changes_since_version ne '_') {
5874 return ("-v$changes_since_version");
5880 sub changesopts () {
5881 return (changesopts_initial(), changesopts_version());
5884 sub massage_dbp_args ($;$) {
5885 my ($cmd,$xargs) = @_;
5888 # - if we're going to split the source build out so we can
5889 # do strange things to it, massage the arguments to dpkg-buildpackage
5890 # so that the main build doessn't build source (or add an argument
5891 # to stop it building source by default).
5893 # - add -nc to stop dpkg-source cleaning the source tree,
5894 # unless we're not doing a split build and want dpkg-source
5895 # as cleanmode, in which case we can do nothing
5898 # 0 - source will NOT need to be built separately by caller
5899 # +1 - source will need to be built separately by caller
5900 # +2 - source will need to be built separately by caller AND
5901 # dpkg-buildpackage should not in fact be run at all!
5902 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5903 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5904 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5905 $clean_using_builder = 1;
5908 # -nc has the side effect of specifying -b if nothing else specified
5909 # and some combinations of -S, -b, et al, are errors, rather than
5910 # later simply overriding earlie. So we need to:
5911 # - search the command line for these options
5912 # - pick the last one
5913 # - perhaps add our own as a default
5914 # - perhaps adjust it to the corresponding non-source-building version
5916 foreach my $l ($cmd, $xargs) {
5918 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5921 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5923 if ($need_split_build_invocation) {
5924 printdebug "massage split $dmode.\n";
5925 $r = $dmode =~ m/[S]/ ? +2 :
5926 $dmode =~ y/gGF/ABb/ ? +1 :
5927 $dmode =~ m/[ABb]/ ? 0 :
5930 printdebug "massage done $r $dmode.\n";
5932 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5938 my $wasdir = must_getcwd();
5944 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5945 my ($msg_if_onlyone) = @_;
5946 # If there is only one .changes file, fail with $msg_if_onlyone,
5947 # or if that is undef, be a no-op.
5948 # Returns the changes file to report to the user.
5949 my $pat = changespat $version;
5950 my @changesfiles = glob $pat;
5951 @changesfiles = sort {
5952 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5956 if (@changesfiles==1) {
5957 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5958 only one changes file from build (@changesfiles)
5960 $result = $changesfiles[0];
5961 } elsif (@changesfiles==2) {
5962 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5963 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5964 fail "$l found in binaries changes file $binchanges"
5967 runcmd_ordryrun_local @mergechanges, @changesfiles;
5968 my $multichanges = changespat $version,'multi';
5970 stat_exists $multichanges or fail "$multichanges: $!";
5971 foreach my $cf (glob $pat) {
5972 next if $cf eq $multichanges;
5973 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5976 $result = $multichanges;
5978 fail "wrong number of different changes files (@changesfiles)";
5980 printdone "build successful, results in $result\n" or die $!;
5983 sub midbuild_checkchanges () {
5984 my $pat = changespat $version;
5985 return if $rmchanges;
5986 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5987 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5989 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5990 Suggest you delete @unwanted.
5995 sub midbuild_checkchanges_vanilla ($) {
5997 midbuild_checkchanges() if $wantsrc == 1;
6000 sub postbuild_mergechanges_vanilla ($) {
6002 if ($wantsrc == 1) {
6004 postbuild_mergechanges(undef);
6007 printdone "build successful\n";
6013 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6014 my $wantsrc = massage_dbp_args \@dbp;
6017 midbuild_checkchanges_vanilla $wantsrc;
6022 push @dbp, changesopts_version();
6023 maybe_apply_patches_dirtily();
6024 runcmd_ordryrun_local @dbp;
6026 maybe_unapply_patches_again();
6027 postbuild_mergechanges_vanilla $wantsrc;
6031 $quilt_mode //= 'gbp';
6037 # gbp can make .origs out of thin air. In my tests it does this
6038 # even for a 1.0 format package, with no origs present. So I
6039 # guess it keys off just the version number. We don't know
6040 # exactly what .origs ought to exist, but let's assume that we
6041 # should run gbp if: the version has an upstream part and the main
6043 my $upstreamversion = upstreamversion $version;
6044 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6045 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6047 if ($gbp_make_orig) {
6049 $cleanmode = 'none'; # don't do it again
6050 $need_split_build_invocation = 1;
6053 my @dbp = @dpkgbuildpackage;
6055 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6057 if (!length $gbp_build[0]) {
6058 if (length executable_on_path('git-buildpackage')) {
6059 $gbp_build[0] = qw(git-buildpackage);
6061 $gbp_build[0] = 'gbp buildpackage';
6064 my @cmd = opts_opt_multi_cmd @gbp_build;
6066 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6068 if ($gbp_make_orig) {
6069 ensuredir '.git/dgit';
6070 my $ok = '.git/dgit/origs-gen-ok';
6071 unlink $ok or $!==&ENOENT or die $!;
6072 my @origs_cmd = @cmd;
6073 push @origs_cmd, qw(--git-cleaner=true);
6074 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6075 push @origs_cmd, @ARGV;
6077 debugcmd @origs_cmd;
6079 do { local $!; stat_exists $ok; }
6080 or failedcmd @origs_cmd;
6082 dryrun_report @origs_cmd;
6088 midbuild_checkchanges_vanilla $wantsrc;
6090 if (!$clean_using_builder) {
6091 push @cmd, '--git-cleaner=true';
6095 maybe_unapply_patches_again();
6097 push @cmd, changesopts();
6098 runcmd_ordryrun_local @cmd, @ARGV;
6100 postbuild_mergechanges_vanilla $wantsrc;
6102 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6106 my $our_cleanmode = $cleanmode;
6107 if ($need_split_build_invocation) {
6108 # Pretend that clean is being done some other way. This
6109 # forces us not to try to use dpkg-buildpackage to clean and
6110 # build source all in one go; and instead we run dpkg-source
6111 # (and build_prep() will do the clean since $clean_using_builder
6113 $our_cleanmode = 'ELSEWHERE';
6115 if ($our_cleanmode =~ m/^dpkg-source/) {
6116 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6117 $clean_using_builder = 1;
6120 $sourcechanges = changespat $version,'source';
6122 unlink "../$sourcechanges" or $!==ENOENT
6123 or fail "remove $sourcechanges: $!";
6125 $dscfn = dscfn($version);
6126 if ($our_cleanmode eq 'dpkg-source') {
6127 maybe_apply_patches_dirtily();
6128 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6130 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6131 maybe_apply_patches_dirtily();
6132 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6135 my @cmd = (@dpkgsource, qw(-b --));
6138 runcmd_ordryrun_local @cmd, "work";
6139 my @udfiles = <${package}_*>;
6140 changedir "../../..";
6141 foreach my $f (@udfiles) {
6142 printdebug "source copy, found $f\n";
6145 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6146 $f eq srcfn($version, $&));
6147 printdebug "source copy, found $f - renaming\n";
6148 rename "$ud/$f", "../$f" or $!==ENOENT
6149 or fail "put in place new source file ($f): $!";
6152 my $pwd = must_getcwd();
6153 my $leafdir = basename $pwd;
6155 runcmd_ordryrun_local @cmd, $leafdir;
6158 runcmd_ordryrun_local qw(sh -ec),
6159 'exec >$1; shift; exec "$@"','x',
6160 "../$sourcechanges",
6161 @dpkggenchanges, qw(-S), changesopts();
6165 sub cmd_build_source {
6167 badusage "build-source takes no additional arguments" if @ARGV;
6169 maybe_unapply_patches_again();
6170 printdone "source built, results in $dscfn and $sourcechanges";
6175 midbuild_checkchanges();
6178 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6179 stat_exists $sourcechanges
6180 or fail "$sourcechanges (in parent directory): $!";
6182 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6184 maybe_unapply_patches_again();
6186 postbuild_mergechanges(<<END);
6187 perhaps you need to pass -A ? (sbuild's default is to build only
6188 arch-specific binaries; dgit 1.4 used to override that.)
6193 sub cmd_quilt_fixup {
6194 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6197 build_maybe_quilt_fixup();
6200 sub import_dsc_result {
6201 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6202 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6204 check_gitattrs($newhash, "source tree");
6206 progress "dgit: import-dsc: $what_msg";
6209 sub cmd_import_dsc {
6213 last unless $ARGV[0] =~ m/^-/;
6216 if (m/^--require-valid-signature$/) {
6219 badusage "unknown dgit import-dsc sub-option \`$_'";
6223 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6224 my ($dscfn, $dstbranch) = @ARGV;
6226 badusage "dry run makes no sense with import-dsc" unless act_local();
6228 my $force = $dstbranch =~ s/^\+// ? +1 :
6229 $dstbranch =~ s/^\.\.// ? -1 :
6231 my $info = $force ? " $&" : '';
6232 $info = "$dscfn$info";
6234 my $specbranch = $dstbranch;
6235 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6236 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6238 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6239 my $chead = cmdoutput_errok @symcmd;
6240 defined $chead or $?==256 or failedcmd @symcmd;
6242 fail "$dstbranch is checked out - will not update it"
6243 if defined $chead and $chead eq $dstbranch;
6245 my $oldhash = git_get_ref $dstbranch;
6247 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6248 $dscdata = do { local $/ = undef; <D>; };
6249 D->error and fail "read $dscfn: $!";
6252 # we don't normally need this so import it here
6253 use Dpkg::Source::Package;
6254 my $dp = new Dpkg::Source::Package filename => $dscfn,
6255 require_valid_signature => $needsig;
6257 local $SIG{__WARN__} = sub {
6259 return unless $needsig;
6260 fail "import-dsc signature check failed";
6262 if (!$dp->is_signed()) {
6263 warn "$us: warning: importing unsigned .dsc\n";
6265 my $r = $dp->check_signature();
6266 die "->check_signature => $r" if $needsig && $r;
6272 $package = getfield $dsc, 'Source';
6274 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6275 unless forceing [qw(import-dsc-with-dgit-field)];
6276 parse_dsc_field_def_dsc_distro();
6278 $isuite = 'DGIT-IMPORT-DSC';
6279 $idistro //= $dsc_distro;
6283 if (defined $dsc_hash) {
6284 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6285 resolve_dsc_field_commit undef, undef;
6287 if (defined $dsc_hash) {
6288 my @cmd = (qw(sh -ec),
6289 "echo $dsc_hash | git cat-file --batch-check");
6290 my $objgot = cmdoutput @cmd;
6291 if ($objgot =~ m#^\w+ missing\b#) {
6293 .dsc contains Dgit field referring to object $dsc_hash
6294 Your git tree does not have that object. Try `git fetch' from a
6295 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6298 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6300 progress "Not fast forward, forced update.";
6302 fail "Not fast forward to $dsc_hash";
6305 import_dsc_result $dstbranch, $dsc_hash,
6306 "dgit import-dsc (Dgit): $info",
6307 "updated git ref $dstbranch";
6312 Branch $dstbranch already exists
6313 Specify ..$specbranch for a pseudo-merge, binding in existing history
6314 Specify +$specbranch to overwrite, discarding existing history
6316 if $oldhash && !$force;
6318 my @dfi = dsc_files_info();
6319 foreach my $fi (@dfi) {
6320 my $f = $fi->{Filename};
6324 fail "lstat $here works but stat gives $! !";
6326 fail "stat $here: $!" unless $! == ENOENT;
6328 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6330 } elsif ($dscfn =~ m#^/#) {
6333 fail "cannot import $dscfn which seems to be inside working tree!";
6335 $there =~ s#/+[^/]+$## or
6336 fail "import $dscfn requires ../$f, but it does not exist";
6338 my $test = $there =~ m{^/} ? $there : "../$there";
6339 stat $test or fail "import $dscfn requires $test, but: $!";
6340 symlink $there, $here or fail "symlink $there to $here: $!";
6341 progress "made symlink $here -> $there";
6342 # print STDERR Dumper($fi);
6344 my @mergeinputs = generate_commits_from_dsc();
6345 die unless @mergeinputs == 1;
6347 my $newhash = $mergeinputs[0]{Commit};
6351 progress "Import, forced update - synthetic orphan git history.";
6352 } elsif ($force < 0) {
6353 progress "Import, merging.";
6354 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6355 my $version = getfield $dsc, 'Version';
6356 my $clogp = commit_getclogp $newhash;
6357 my $authline = clogp_authline $clogp;
6358 $newhash = make_commit_text <<END;
6365 Merge $package ($version) import into $dstbranch
6368 die; # caught earlier
6372 import_dsc_result $dstbranch, $newhash,
6373 "dgit import-dsc: $info",
6374 "results are in in git ref $dstbranch";
6377 sub pre_archive_api_query () {
6380 sub cmd_archive_api_query {
6381 badusage "need only 1 subpath argument" unless @ARGV==1;
6382 my ($subpath) = @ARGV;
6383 my @cmd = archive_api_query_cmd($subpath);
6386 exec @cmd or fail "exec curl: $!\n";
6389 sub repos_server_url () {
6390 $package = '_dgit-repos-server';
6391 local $access_forpush = 1;
6392 local $isuite = 'DGIT-REPOS-SERVER';
6393 my $url = access_giturl();
6396 sub pre_clone_dgit_repos_server () {
6399 sub cmd_clone_dgit_repos_server {
6400 badusage "need destination argument" unless @ARGV==1;
6401 my ($destdir) = @ARGV;
6402 my $url = repos_server_url();
6403 my @cmd = (@git, qw(clone), $url, $destdir);
6405 exec @cmd or fail "exec git clone: $!\n";
6408 sub pre_print_dgit_repos_server_source_url () {
6411 sub cmd_print_dgit_repos_server_source_url {
6412 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6414 my $url = repos_server_url();
6415 print $url, "\n" or die $!;
6418 sub cmd_setup_mergechangelogs {
6419 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6420 local $isuite = 'DGIT-SETUP-TREE';
6421 setup_mergechangelogs(1);
6424 sub cmd_setup_useremail {
6425 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6426 local $isuite = 'DGIT-SETUP-TREE';
6430 sub cmd_setup_gitattributes {
6431 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6432 local $isuite = 'DGIT-SETUP-TREE';
6436 sub cmd_setup_new_tree {
6437 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6438 local $isuite = 'DGIT-SETUP-TREE';
6442 #---------- argument parsing and main program ----------
6445 print "dgit version $our_version\n" or die $!;
6449 our (%valopts_long, %valopts_short);
6450 our (%funcopts_long);
6452 our (@modeopt_cfgs);
6454 sub defvalopt ($$$$) {
6455 my ($long,$short,$val_re,$how) = @_;
6456 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6457 $valopts_long{$long} = $oi;
6458 $valopts_short{$short} = $oi;
6459 # $how subref should:
6460 # do whatever assignemnt or thing it likes with $_[0]
6461 # if the option should not be passed on to remote, @rvalopts=()
6462 # or $how can be a scalar ref, meaning simply assign the value
6465 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6466 defvalopt '--distro', '-d', '.+', \$idistro;
6467 defvalopt '', '-k', '.+', \$keyid;
6468 defvalopt '--existing-package','', '.*', \$existing_package;
6469 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6470 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6471 defvalopt '--package', '-p', $package_re, \$package;
6472 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6474 defvalopt '', '-C', '.+', sub {
6475 ($changesfile) = (@_);
6476 if ($changesfile =~ s#^(.*)/##) {
6477 $buildproductsdir = $1;
6481 defvalopt '--initiator-tempdir','','.*', sub {
6482 ($initiator_tempdir) = (@_);
6483 $initiator_tempdir =~ m#^/# or
6484 badusage "--initiator-tempdir must be used specify an".
6485 " absolute, not relative, directory."
6488 sub defoptmodes ($@) {
6489 my ($varref, $cfgkey, $default, %optmap) = @_;
6491 while (my ($opt,$val) = each %optmap) {
6492 $funcopts_long{$opt} = sub { $$varref = $val; };
6493 $permit{$val} = $val;
6495 push @modeopt_cfgs, {
6498 Default => $default,
6503 defoptmodes \$dodep14tag, qw( dep14tag want
6506 --always-dep14tag always );
6511 if (defined $ENV{'DGIT_SSH'}) {
6512 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6513 } elsif (defined $ENV{'GIT_SSH'}) {
6514 @ssh = ($ENV{'GIT_SSH'});
6522 if (!defined $val) {
6523 badusage "$what needs a value" unless @ARGV;
6525 push @rvalopts, $val;
6527 badusage "bad value \`$val' for $what" unless
6528 $val =~ m/^$oi->{Re}$(?!\n)/s;
6529 my $how = $oi->{How};
6530 if (ref($how) eq 'SCALAR') {
6535 push @ropts, @rvalopts;
6539 last unless $ARGV[0] =~ m/^-/;
6543 if (m/^--dry-run$/) {
6546 } elsif (m/^--damp-run$/) {
6549 } elsif (m/^--no-sign$/) {
6552 } elsif (m/^--help$/) {
6554 } elsif (m/^--version$/) {
6556 } elsif (m/^--new$/) {
6559 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6560 ($om = $opts_opt_map{$1}) &&
6564 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6565 !$opts_opt_cmdonly{$1} &&
6566 ($om = $opts_opt_map{$1})) {
6569 } elsif (m/^--(gbp|dpm)$/s) {
6570 push @ropts, "--quilt=$1";
6572 } elsif (m/^--ignore-dirty$/s) {
6575 } elsif (m/^--no-quilt-fixup$/s) {
6577 $quilt_mode = 'nocheck';
6578 } elsif (m/^--no-rm-on-error$/s) {
6581 } elsif (m/^--no-chase-dsc-distro$/s) {
6583 $chase_dsc_distro = 0;
6584 } elsif (m/^--overwrite$/s) {
6586 $overwrite_version = '';
6587 } elsif (m/^--overwrite=(.+)$/s) {
6589 $overwrite_version = $1;
6590 } elsif (m/^--delayed=(\d+)$/s) {
6593 } elsif (m/^--dgit-view-save=(.+)$/s) {
6595 $split_brain_save = $1;
6596 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6597 } elsif (m/^--(no-)?rm-old-changes$/s) {
6600 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6602 push @deliberatelies, $&;
6603 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6607 } elsif (m/^--force-/) {
6609 "$us: warning: ignoring unknown force option $_\n";
6611 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6612 # undocumented, for testing
6614 $tagformat_want = [ $1, 'command line', 1 ];
6615 # 1 menas overrides distro configuration
6616 } elsif (m/^--always-split-source-build$/s) {
6617 # undocumented, for testing
6619 $need_split_build_invocation = 1;
6620 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6621 # undocumented, for testing
6623 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6624 # ^ it's supposed to be an array ref
6625 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6626 $val = $2 ? $' : undef; #';
6627 $valopt->($oi->{Long});
6628 } elsif ($funcopts_long{$_}) {
6630 $funcopts_long{$_}();
6632 badusage "unknown long option \`$_'";
6639 } elsif (s/^-L/-/) {
6642 } elsif (s/^-h/-/) {
6644 } elsif (s/^-D/-/) {
6648 } elsif (s/^-N/-/) {
6653 push @changesopts, $_;
6655 } elsif (s/^-wn$//s) {
6657 $cleanmode = 'none';
6658 } elsif (s/^-wg$//s) {
6661 } elsif (s/^-wgf$//s) {
6663 $cleanmode = 'git-ff';
6664 } elsif (s/^-wd$//s) {
6666 $cleanmode = 'dpkg-source';
6667 } elsif (s/^-wdd$//s) {
6669 $cleanmode = 'dpkg-source-d';
6670 } elsif (s/^-wc$//s) {
6672 $cleanmode = 'check';
6673 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6674 push @git, '-c', $&;
6675 $gitcfgs{cmdline}{$1} = [ $2 ];
6676 } elsif (s/^-c([^=]+)$//s) {
6677 push @git, '-c', $&;
6678 $gitcfgs{cmdline}{$1} = [ 'true' ];
6679 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6681 $val = undef unless length $val;
6682 $valopt->($oi->{Short});
6685 badusage "unknown short option \`$_'";
6692 sub check_env_sanity () {
6693 my $blocked = new POSIX::SigSet;
6694 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6697 foreach my $name (qw(PIPE CHLD)) {
6698 my $signame = "SIG$name";
6699 my $signum = eval "POSIX::$signame" // die;
6700 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6701 die "$signame is set to something other than SIG_DFL\n";
6702 $blocked->ismember($signum) and
6703 die "$signame is blocked\n";
6709 On entry to dgit, $@
6710 This is a bug produced by something in in your execution environment.
6716 sub parseopts_late_defaults () {
6717 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6718 if defined $idistro;
6719 $isuite //= cfg('dgit.default.default-suite');
6721 foreach my $k (keys %opts_opt_map) {
6722 my $om = $opts_opt_map{$k};
6724 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6726 badcfg "cannot set command for $k"
6727 unless length $om->[0];
6731 foreach my $c (access_cfg_cfgs("opts-$k")) {
6733 map { $_ ? @$_ : () }
6734 map { $gitcfgs{$_}{$c} }
6735 reverse @gitcfgsources;
6736 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6737 "\n" if $debuglevel >= 4;
6739 badcfg "cannot configure options for $k"
6740 if $opts_opt_cmdonly{$k};
6741 my $insertpos = $opts_cfg_insertpos{$k};
6742 @$om = ( @$om[0..$insertpos-1],
6744 @$om[$insertpos..$#$om] );
6748 if (!defined $rmchanges) {
6749 local $access_forpush;
6750 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6753 if (!defined $quilt_mode) {
6754 local $access_forpush;
6755 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6756 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6758 $quilt_mode =~ m/^($quilt_modes_re)$/
6759 or badcfg "unknown quilt-mode \`$quilt_mode'";
6763 foreach my $moc (@modeopt_cfgs) {
6764 local $access_forpush;
6765 my $vr = $moc->{Var};
6766 next if defined $$vr;
6767 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6768 my $v = $moc->{Vals}{$$vr};
6769 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6773 $need_split_build_invocation ||= quiltmode_splitbrain();
6775 if (!defined $cleanmode) {
6776 local $access_forpush;
6777 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6778 $cleanmode //= 'dpkg-source';
6780 badcfg "unknown clean-mode \`$cleanmode'" unless
6781 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6785 if ($ENV{$fakeeditorenv}) {
6787 quilt_fixup_editor();
6793 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6794 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6795 if $dryrun_level == 1;
6797 print STDERR $helpmsg or die $!;
6800 $cmd = $subcommand = shift @ARGV;
6803 my $pre_fn = ${*::}{"pre_$cmd"};
6804 $pre_fn->() if $pre_fn;
6808 my $fn = ${*::}{"cmd_$cmd"};
6809 $fn or badusage "unknown operation $cmd";