3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
22 use Debian::Dgit qw(:DEFAULT :playground);
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::MoreUtils qw(pairwise);
38 use Text::Glob qw(match_glob);
39 use Fcntl qw(:DEFAULT :flock);
44 our $our_version = 'UNRELEASED'; ###substituted###
45 our $absurdity = undef; ###substituted###
47 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
58 our $dryrun_level = 0;
60 our $buildproductsdir = '..';
66 our $existing_package = 'dpkg';
68 our $changes_since_version;
70 our $overwrite_version; # undef: not specified; '': check changelog
72 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $we_are_initiator;
77 our $initiator_tempdir;
78 our $patches_applied_dirtily = 00;
82 our $chase_dsc_distro=1;
84 our %forceopts = map { $_=>0 }
85 qw(unrepresentable unsupported-source-format
86 dsc-changes-mismatch changes-origs-exactly
87 import-gitapply-absurd
88 import-gitapply-no-absurd
89 import-dsc-with-dgit-field);
91 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
93 our $suite_re = '[-+.0-9a-z]+';
94 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
95 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
96 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
97 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
99 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
100 our $splitbraincache = 'dgit-intern/quilt-cache';
101 our $rewritemap = 'dgit-rewrite/map';
103 our (@git) = qw(git);
104 our (@dget) = qw(dget);
105 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
106 our (@dput) = qw(dput);
107 our (@debsign) = qw(debsign);
108 our (@gpg) = qw(gpg);
109 our (@sbuild) = qw(sbuild);
111 our (@dgit) = qw(dgit);
112 our (@aptget) = qw(apt-get);
113 our (@aptcache) = qw(apt-cache);
114 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
115 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
116 our (@dpkggenchanges) = qw(dpkg-genchanges);
117 our (@mergechanges) = qw(mergechanges -f);
118 our (@gbp_build) = ('');
119 our (@gbp_pq) = ('gbp pq');
120 our (@changesopts) = ('');
122 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
125 'debsign' => \@debsign,
127 'sbuild' => \@sbuild,
131 'apt-get' => \@aptget,
132 'apt-cache' => \@aptcache,
133 'dpkg-source' => \@dpkgsource,
134 'dpkg-buildpackage' => \@dpkgbuildpackage,
135 'dpkg-genchanges' => \@dpkggenchanges,
136 'gbp-build' => \@gbp_build,
137 'gbp-pq' => \@gbp_pq,
138 'ch' => \@changesopts,
139 'mergechanges' => \@mergechanges);
141 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
142 our %opts_cfg_insertpos = map {
144 scalar @{ $opts_opt_map{$_} }
145 } keys %opts_opt_map;
147 sub parseopts_late_defaults();
148 sub setup_gitattrs(;$);
149 sub check_gitattrs($$);
155 our $supplementary_message = '';
156 our $need_split_build_invocation = 0;
157 our $split_brain = 0;
161 return unless forkcheck_mainprocess();
162 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
165 our $remotename = 'dgit';
166 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
170 if (!defined $absurdity) {
172 $absurdity =~ s{/[^/]+$}{/absurd} or die;
176 my ($v,$distro) = @_;
177 return $tagformatfn->($v, $distro);
180 sub debiantag_maintview ($$) {
181 my ($v,$distro) = @_;
182 return "$distro/".dep14_version_mangle $v;
185 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
187 sub lbranch () { return "$branchprefix/$csuite"; }
188 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
189 sub lref () { return "refs/heads/".lbranch(); }
190 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
191 sub rrref () { return server_ref($csuite); }
201 return "${package}_".(stripepoch $vsn).$sfx
206 return srcfn($vsn,".dsc");
209 sub changespat ($;$) {
210 my ($vsn, $arch) = @_;
211 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
214 sub upstreamversion ($) {
226 return unless forkcheck_mainprocess();
227 foreach my $f (@end) {
229 print STDERR "$us: cleanup: $@" if length $@;
233 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
235 sub forceable_fail ($$) {
236 my ($forceoptsl, $msg) = @_;
237 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
238 print STDERR "warning: overriding problem due to --force:\n". $msg;
242 my ($forceoptsl) = @_;
243 my @got = grep { $forceopts{$_} } @$forceoptsl;
244 return 0 unless @got;
246 "warning: skipping checks or functionality due to --force-$got[0]\n";
249 sub no_such_package () {
250 print STDERR "$us: package $package does not exist in suite $isuite\n";
254 sub deliberately ($) {
256 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
259 sub deliberately_not_fast_forward () {
260 foreach (qw(not-fast-forward fresh-repo)) {
261 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
265 sub quiltmode_splitbrain () {
266 $quilt_mode =~ m/gbp|dpm|unapplied/;
269 sub opts_opt_multi_cmd {
271 push @cmd, split /\s+/, shift @_;
277 return opts_opt_multi_cmd @gbp_pq;
280 #---------- remote protocol support, common ----------
282 # remote push initiator/responder protocol:
283 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
284 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
285 # < dgit-remote-push-ready <actual-proto-vsn>
292 # > supplementary-message NBYTES # $protovsn >= 3
297 # > file parsed-changelog
298 # [indicates that output of dpkg-parsechangelog follows]
299 # > data-block NBYTES
300 # > [NBYTES bytes of data (no newline)]
301 # [maybe some more blocks]
310 # > param head DGIT-VIEW-HEAD
311 # > param csuite SUITE
312 # > param tagformat old|new
313 # > param maint-view MAINT-VIEW-HEAD
315 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
316 # > file buildinfo # for buildinfos to sign
318 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
319 # # goes into tag, for replay prevention
322 # [indicates that signed tag is wanted]
323 # < data-block NBYTES
324 # < [NBYTES bytes of data (no newline)]
325 # [maybe some more blocks]
329 # > want signed-dsc-changes
330 # < data-block NBYTES [transfer of signed dsc]
332 # < data-block NBYTES [transfer of signed changes]
334 # < data-block NBYTES [transfer of each signed buildinfo
335 # [etc] same number and order as "file buildinfo"]
343 sub i_child_report () {
344 # Sees if our child has died, and reap it if so. Returns a string
345 # describing how it died if it failed, or undef otherwise.
346 return undef unless $i_child_pid;
347 my $got = waitpid $i_child_pid, WNOHANG;
348 return undef if $got <= 0;
349 die unless $got == $i_child_pid;
350 $i_child_pid = undef;
351 return undef unless $?;
352 return "build host child ".waitstatusmsg();
357 fail "connection lost: $!" if $fh->error;
358 fail "protocol violation; $m not expected";
361 sub badproto_badread ($$) {
363 fail "connection lost: $!" if $!;
364 my $report = i_child_report();
365 fail $report if defined $report;
366 badproto $fh, "eof (reading $wh)";
369 sub protocol_expect (&$) {
370 my ($match, $fh) = @_;
373 defined && chomp or badproto_badread $fh, "protocol message";
381 badproto $fh, "\`$_'";
384 sub protocol_send_file ($$) {
385 my ($fh, $ourfn) = @_;
386 open PF, "<", $ourfn or die "$ourfn: $!";
389 my $got = read PF, $d, 65536;
390 die "$ourfn: $!" unless defined $got;
392 print $fh "data-block ".length($d)."\n" or die $!;
393 print $fh $d or die $!;
395 PF->error and die "$ourfn $!";
396 print $fh "data-end\n" or die $!;
400 sub protocol_read_bytes ($$) {
401 my ($fh, $nbytes) = @_;
402 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
404 my $got = read $fh, $d, $nbytes;
405 $got==$nbytes or badproto_badread $fh, "data block";
409 sub protocol_receive_file ($$) {
410 my ($fh, $ourfn) = @_;
411 printdebug "() $ourfn\n";
412 open PF, ">", $ourfn or die "$ourfn: $!";
414 my ($y,$l) = protocol_expect {
415 m/^data-block (.*)$/ ? (1,$1) :
416 m/^data-end$/ ? (0,) :
420 my $d = protocol_read_bytes $fh, $l;
421 print PF $d or die $!;
426 #---------- remote protocol support, responder ----------
428 sub responder_send_command ($) {
430 return unless $we_are_responder;
431 # called even without $we_are_responder
432 printdebug ">> $command\n";
433 print PO $command, "\n" or die $!;
436 sub responder_send_file ($$) {
437 my ($keyword, $ourfn) = @_;
438 return unless $we_are_responder;
439 printdebug "]] $keyword $ourfn\n";
440 responder_send_command "file $keyword";
441 protocol_send_file \*PO, $ourfn;
444 sub responder_receive_files ($@) {
445 my ($keyword, @ourfns) = @_;
446 die unless $we_are_responder;
447 printdebug "[[ $keyword @ourfns\n";
448 responder_send_command "want $keyword";
449 foreach my $fn (@ourfns) {
450 protocol_receive_file \*PI, $fn;
453 protocol_expect { m/^files-end$/ } \*PI;
456 #---------- remote protocol support, initiator ----------
458 sub initiator_expect (&) {
460 protocol_expect { &$match } \*RO;
463 #---------- end remote code ----------
466 if ($we_are_responder) {
468 responder_send_command "progress ".length($m) or die $!;
469 print PO $m or die $!;
479 $ua = LWP::UserAgent->new();
483 progress "downloading $what...";
484 my $r = $ua->get(@_) or die $!;
485 return undef if $r->code == 404;
486 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
487 return $r->decoded_content(charset => 'none');
490 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
492 sub act_local () { return $dryrun_level <= 1; }
493 sub act_scary () { return !$dryrun_level; }
496 if (!$dryrun_level) {
497 progress "$us ok: @_";
499 progress "would be ok: @_ (but dry run only)";
504 printcmd(\*STDERR,$debugprefix."#",@_);
507 sub runcmd_ordryrun {
515 sub runcmd_ordryrun_local {
524 my ($first_shell, @cmd) = @_;
525 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
528 our $helpmsg = <<END;
530 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
531 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
532 dgit [dgit-opts] build [dpkg-buildpackage-opts]
533 dgit [dgit-opts] sbuild [sbuild-opts]
534 dgit [dgit-opts] push [dgit-opts] [suite]
535 dgit [dgit-opts] rpush build-host:build-dir ...
536 important dgit options:
537 -k<keyid> sign tag and package with <keyid> instead of default
538 --dry-run -n do not change anything, but go through the motions
539 --damp-run -L like --dry-run but make local changes, without signing
540 --new -N allow introducing a new package
541 --debug -D increase debug level
542 -c<name>=<value> set git config option (used directly by dgit too)
545 our $later_warning_msg = <<END;
546 Perhaps the upload is stuck in incoming. Using the version from git.
550 print STDERR "$us: @_\n", $helpmsg or die $!;
555 @ARGV or badusage "too few arguments";
556 return scalar shift @ARGV;
560 not_necessarily_a_tree();
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);
638 our $invoked_in_git_tree = 1;
640 sub git_slurp_config () {
641 # This algoritm is a bit subtle, but this is needed so that for
642 # options which we want to be single-valued, we allow the
643 # different config sources to override properly. See #835858.
644 foreach my $src (@gitcfgsources) {
645 next if $src eq 'cmdline';
646 # we do this ourselves since git doesn't handle it
648 $gitcfgs{$src} = git_slurp_config_src $src;
652 sub git_get_config ($) {
654 foreach my $src (@gitcfgsources) {
655 my $l = $gitcfgs{$src}{$c};
656 confess "internal error ($l $c)" if $l && !ref $l;
657 printdebug"C $c ".(defined $l ?
658 join " ", map { messagequote "'$_'" } @$l :
662 @$l==1 or badcfg "multiple values for $c".
663 " (in $src git config)" if @$l > 1;
671 return undef if $c =~ /RETURN-UNDEF/;
672 printdebug "C? $c\n" if $debuglevel >= 5;
673 my $v = git_get_config($c);
674 return $v if defined $v;
675 my $dv = $defcfg{$c};
677 printdebug "CD $c $dv\n" if $debuglevel >= 4;
681 badcfg "need value for one of: @_\n".
682 "$us: distro or suite appears not to be (properly) supported";
685 sub not_necessarily_a_tree () {
686 # needs to be called from pre_*
687 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
688 $invoked_in_git_tree = 0;
691 sub access_basedistro__noalias () {
692 if (defined $idistro) {
695 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
696 return $def if defined $def;
697 foreach my $src (@gitcfgsources, 'internal') {
698 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
700 foreach my $k (keys %$kl) {
701 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
703 next unless match_glob $dpat, $isuite;
707 return cfg("dgit.default.distro");
711 sub access_basedistro () {
712 my $noalias = access_basedistro__noalias();
713 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
714 return $canon // $noalias;
717 sub access_nomdistro () {
718 my $base = access_basedistro();
719 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
720 $r =~ m/^$distro_re$/ or badcfg
721 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
725 sub access_quirk () {
726 # returns (quirk name, distro to use instead or undef, quirk-specific info)
727 my $basedistro = access_basedistro();
728 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
730 if (defined $backports_quirk) {
731 my $re = $backports_quirk;
732 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
734 $re =~ s/\%/([-0-9a-z_]+)/
735 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
736 if ($isuite =~ m/^$re$/) {
737 return ('backports',"$basedistro-backports",$1);
740 return ('none',undef);
745 sub parse_cfg_bool ($$$) {
746 my ($what,$def,$v) = @_;
749 $v =~ m/^[ty1]/ ? 1 :
750 $v =~ m/^[fn0]/ ? 0 :
751 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
754 sub access_forpush_config () {
755 my $d = access_basedistro();
759 parse_cfg_bool('new-private-pushers', 0,
760 cfg("dgit-distro.$d.new-private-pushers",
763 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
766 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
767 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
768 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
769 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
772 sub access_forpush () {
773 $access_forpush //= access_forpush_config();
774 return $access_forpush;
778 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
779 badcfg "pushing but distro is configured readonly"
780 if access_forpush_config() eq '0';
782 $supplementary_message = <<'END' unless $we_are_responder;
783 Push failed, before we got started.
784 You can retry the push, after fixing the problem, if you like.
786 parseopts_late_defaults();
790 parseopts_late_defaults();
793 sub supplementary_message ($) {
795 if (!$we_are_responder) {
796 $supplementary_message = $msg;
798 } elsif ($protovsn >= 3) {
799 responder_send_command "supplementary-message ".length($msg)
801 print PO $msg or die $!;
805 sub access_distros () {
806 # Returns list of distros to try, in order
809 # 0. `instead of' distro name(s) we have been pointed to
810 # 1. the access_quirk distro, if any
811 # 2a. the user's specified distro, or failing that } basedistro
812 # 2b. the distro calculated from the suite }
813 my @l = access_basedistro();
815 my (undef,$quirkdistro) = access_quirk();
816 unshift @l, $quirkdistro;
817 unshift @l, $instead_distro;
818 @l = grep { defined } @l;
820 push @l, access_nomdistro();
822 if (access_forpush()) {
823 @l = map { ("$_/push", $_) } @l;
828 sub access_cfg_cfgs (@) {
831 # The nesting of these loops determines the search order. We put
832 # the key loop on the outside so that we search all the distros
833 # for each key, before going on to the next key. That means that
834 # if access_cfg is called with a more specific, and then a less
835 # specific, key, an earlier distro can override the less specific
836 # without necessarily overriding any more specific keys. (If the
837 # distro wants to override the more specific keys it can simply do
838 # so; whereas if we did the loop the other way around, it would be
839 # impossible to for an earlier distro to override a less specific
840 # key but not the more specific ones without restating the unknown
841 # values of the more specific keys.
844 # We have to deal with RETURN-UNDEF specially, so that we don't
845 # terminate the search prematurely.
847 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
850 foreach my $d (access_distros()) {
851 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
853 push @cfgs, map { "dgit.default.$_" } @realkeys;
860 my (@cfgs) = access_cfg_cfgs(@keys);
861 my $value = cfg(@cfgs);
865 sub access_cfg_bool ($$) {
866 my ($def, @keys) = @_;
867 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
870 sub string_to_ssh ($) {
872 if ($spec =~ m/\s/) {
873 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
879 sub access_cfg_ssh () {
880 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
881 if (!defined $gitssh) {
884 return string_to_ssh $gitssh;
888 sub access_runeinfo ($) {
890 return ": dgit ".access_basedistro()." $info ;";
893 sub access_someuserhost ($) {
895 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
896 defined($user) && length($user) or
897 $user = access_cfg("$some-user",'username');
898 my $host = access_cfg("$some-host");
899 return length($user) ? "$user\@$host" : $host;
902 sub access_gituserhost () {
903 return access_someuserhost('git');
906 sub access_giturl (;$) {
908 my $url = access_cfg('git-url','RETURN-UNDEF');
911 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
912 return undef unless defined $proto;
915 access_gituserhost().
916 access_cfg('git-path');
918 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
921 return "$url/$package$suffix";
924 sub parsecontrolfh ($$;$) {
925 my ($fh, $desc, $allowsigned) = @_;
926 our $dpkgcontrolhash_noissigned;
929 my %opts = ('name' => $desc);
930 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
931 $c = Dpkg::Control::Hash->new(%opts);
932 $c->parse($fh,$desc) or die "parsing of $desc failed";
933 last if $allowsigned;
934 last if $dpkgcontrolhash_noissigned;
935 my $issigned= $c->get_option('is_pgp_signed');
936 if (!defined $issigned) {
937 $dpkgcontrolhash_noissigned= 1;
938 seek $fh, 0,0 or die "seek $desc: $!";
939 } elsif ($issigned) {
940 fail "control file $desc is (already) PGP-signed. ".
941 " Note that dgit push needs to modify the .dsc and then".
942 " do the signature itself";
951 my ($file, $desc, $allowsigned) = @_;
952 my $fh = new IO::Handle;
953 open $fh, '<', $file or die "$file: $!";
954 my $c = parsecontrolfh($fh,$desc,$allowsigned);
955 $fh->error and die $!;
961 my ($dctrl,$field) = @_;
962 my $v = $dctrl->{$field};
963 return $v if defined $v;
964 fail "missing field $field in ".$dctrl->get_option('name');
968 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
969 my $p = new IO::Handle;
970 my @cmd = (qw(dpkg-parsechangelog), @_);
971 open $p, '-|', @cmd or die $!;
973 $?=0; $!=0; close $p or failedcmd @cmd;
977 sub commit_getclogp ($) {
978 # Returns the parsed changelog hashref for a particular commit
980 our %commit_getclogp_memo;
981 my $memo = $commit_getclogp_memo{$objid};
982 return $memo if $memo;
984 my $mclog = ".git/dgit/clog-$objid";
985 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
986 "$objid:debian/changelog";
987 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
990 sub parse_dscdata () {
991 my $dscfh = new IO::File \$dscdata, '<' or die $!;
992 printdebug Dumper($dscdata) if $debuglevel>1;
993 $dsc = parsecontrolfh($dscfh,$dscurl,1);
994 printdebug Dumper($dsc) if $debuglevel>1;
999 sub archive_query ($;@) {
1000 my ($method) = shift @_;
1001 fail "this operation does not support multiple comma-separated suites"
1003 my $query = access_cfg('archive-query','RETURN-UNDEF');
1004 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1007 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1010 sub archive_query_prepend_mirror {
1011 my $m = access_cfg('mirror');
1012 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1015 sub pool_dsc_subpath ($$) {
1016 my ($vsn,$component) = @_; # $package is implict arg
1017 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1018 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1021 sub cfg_apply_map ($$$) {
1022 my ($varref, $what, $mapspec) = @_;
1023 return unless $mapspec;
1025 printdebug "config $what EVAL{ $mapspec; }\n";
1027 eval "package Dgit::Config; $mapspec;";
1032 #---------- `ftpmasterapi' archive query method (nascent) ----------
1034 sub archive_api_query_cmd ($) {
1036 my @cmd = (@curl, qw(-sS));
1037 my $url = access_cfg('archive-query-url');
1038 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1040 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1041 foreach my $key (split /\:/, $keys) {
1042 $key =~ s/\%HOST\%/$host/g;
1044 fail "for $url: stat $key: $!" unless $!==ENOENT;
1047 fail "config requested specific TLS key but do not know".
1048 " how to get curl to use exactly that EE key ($key)";
1049 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1050 # # Sadly the above line does not work because of changes
1051 # # to gnutls. The real fix for #790093 may involve
1052 # # new curl options.
1055 # Fixing #790093 properly will involve providing a value
1056 # for this on clients.
1057 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1058 push @cmd, split / /, $kargs if defined $kargs;
1060 push @cmd, $url.$subpath;
1064 sub api_query ($$;$) {
1066 my ($data, $subpath, $ok404) = @_;
1067 badcfg "ftpmasterapi archive query method takes no data part"
1069 my @cmd = archive_api_query_cmd($subpath);
1070 my $url = $cmd[$#cmd];
1071 push @cmd, qw(-w %{http_code});
1072 my $json = cmdoutput @cmd;
1073 unless ($json =~ s/\d+\d+\d$//) {
1074 failedcmd_report_cmd undef, @cmd;
1075 fail "curl failed to print 3-digit HTTP code";
1078 return undef if $code eq '404' && $ok404;
1079 fail "fetch of $url gave HTTP code $code"
1080 unless $url =~ m#^file://# or $code =~ m/^2/;
1081 return decode_json($json);
1084 sub canonicalise_suite_ftpmasterapi {
1085 my ($proto,$data) = @_;
1086 my $suites = api_query($data, 'suites');
1088 foreach my $entry (@$suites) {
1090 my $v = $entry->{$_};
1091 defined $v && $v eq $isuite;
1092 } qw(codename name);
1093 push @matched, $entry;
1095 fail "unknown suite $isuite" unless @matched;
1098 @matched==1 or die "multiple matches for suite $isuite\n";
1099 $cn = "$matched[0]{codename}";
1100 defined $cn or die "suite $isuite info has no codename\n";
1101 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1103 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1108 sub archive_query_ftpmasterapi {
1109 my ($proto,$data) = @_;
1110 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1112 my $digester = Digest::SHA->new(256);
1113 foreach my $entry (@$info) {
1115 my $vsn = "$entry->{version}";
1116 my ($ok,$msg) = version_check $vsn;
1117 die "bad version: $msg\n" unless $ok;
1118 my $component = "$entry->{component}";
1119 $component =~ m/^$component_re$/ or die "bad component";
1120 my $filename = "$entry->{filename}";
1121 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1122 or die "bad filename";
1123 my $sha256sum = "$entry->{sha256sum}";
1124 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1125 push @rows, [ $vsn, "/pool/$component/$filename",
1126 $digester, $sha256sum ];
1128 die "bad ftpmaster api response: $@\n".Dumper($entry)
1131 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1132 return archive_query_prepend_mirror @rows;
1135 sub file_in_archive_ftpmasterapi {
1136 my ($proto,$data,$filename) = @_;
1137 my $pat = $filename;
1140 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1141 my $info = api_query($data, "file_in_archive/$pat", 1);
1144 #---------- `aptget' archive query method ----------
1147 our $aptget_releasefile;
1148 our $aptget_configpath;
1150 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1151 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1153 sub aptget_cache_clean {
1154 runcmd_ordryrun_local qw(sh -ec),
1155 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1159 sub aptget_lock_acquire () {
1160 my $lockfile = "$aptget_base/lock";
1161 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1162 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1165 sub aptget_prep ($) {
1167 return if defined $aptget_base;
1169 badcfg "aptget archive query method takes no data part"
1172 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1175 ensuredir "$cache/dgit";
1177 access_cfg('aptget-cachekey','RETURN-UNDEF')
1178 // access_nomdistro();
1180 $aptget_base = "$cache/dgit/aptget";
1181 ensuredir $aptget_base;
1183 my $quoted_base = $aptget_base;
1184 die "$quoted_base contains bad chars, cannot continue"
1185 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1187 ensuredir $aptget_base;
1189 aptget_lock_acquire();
1191 aptget_cache_clean();
1193 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1194 my $sourceslist = "source.list#$cachekey";
1196 my $aptsuites = $isuite;
1197 cfg_apply_map(\$aptsuites, 'suite map',
1198 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1200 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1201 printf SRCS "deb-src %s %s %s\n",
1202 access_cfg('mirror'),
1204 access_cfg('aptget-components')
1207 ensuredir "$aptget_base/cache";
1208 ensuredir "$aptget_base/lists";
1210 open CONF, ">", $aptget_configpath or die $!;
1212 Debug::NoLocking "true";
1213 APT::Get::List-Cleanup "false";
1214 #clear APT::Update::Post-Invoke-Success;
1215 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1216 Dir::State::Lists "$quoted_base/lists";
1217 Dir::Etc::preferences "$quoted_base/preferences";
1218 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1219 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1222 foreach my $key (qw(
1225 Dir::Cache::Archives
1226 Dir::Etc::SourceParts
1227 Dir::Etc::preferencesparts
1229 ensuredir "$aptget_base/$key";
1230 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1233 my $oldatime = (time // die $!) - 1;
1234 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1235 next unless stat_exists $oldlist;
1236 my ($mtime) = (stat _)[9];
1237 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1240 runcmd_ordryrun_local aptget_aptget(), qw(update);
1243 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1244 next unless stat_exists $oldlist;
1245 my ($atime) = (stat _)[8];
1246 next if $atime == $oldatime;
1247 push @releasefiles, $oldlist;
1249 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1250 @releasefiles = @inreleasefiles if @inreleasefiles;
1251 die "apt updated wrong number of Release files (@releasefiles), erk"
1252 unless @releasefiles == 1;
1254 ($aptget_releasefile) = @releasefiles;
1257 sub canonicalise_suite_aptget {
1258 my ($proto,$data) = @_;
1261 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1263 foreach my $name (qw(Codename Suite)) {
1264 my $val = $release->{$name};
1266 printdebug "release file $name: $val\n";
1267 $val =~ m/^$suite_re$/o or fail
1268 "Release file ($aptget_releasefile) specifies intolerable $name";
1269 cfg_apply_map(\$val, 'suite rmap',
1270 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1277 sub archive_query_aptget {
1278 my ($proto,$data) = @_;
1281 ensuredir "$aptget_base/source";
1282 foreach my $old (<$aptget_base/source/*.dsc>) {
1283 unlink $old or die "$old: $!";
1286 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1287 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1288 # avoids apt-get source failing with ambiguous error code
1290 runcmd_ordryrun_local
1291 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1292 aptget_aptget(), qw(--download-only --only-source source), $package;
1294 my @dscs = <$aptget_base/source/*.dsc>;
1295 fail "apt-get source did not produce a .dsc" unless @dscs;
1296 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1298 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1301 my $uri = "file://". uri_escape $dscs[0];
1302 $uri =~ s{\%2f}{/}gi;
1303 return [ (getfield $pre_dsc, 'Version'), $uri ];
1306 sub file_in_archive_aptget () { return undef; }
1308 #---------- `dummyapicat' archive query method ----------
1310 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1311 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1313 sub file_in_archive_dummycatapi ($$$) {
1314 my ($proto,$data,$filename) = @_;
1315 my $mirror = access_cfg('mirror');
1316 $mirror =~ s#^file://#/# or die "$mirror ?";
1318 my @cmd = (qw(sh -ec), '
1320 find -name "$2" -print0 |
1322 ', qw(x), $mirror, $filename);
1323 debugcmd "-|", @cmd;
1324 open FIA, "-|", @cmd or die $!;
1327 printdebug "| $_\n";
1328 m/^(\w+) (\S+)$/ or die "$_ ?";
1329 push @out, { sha256sum => $1, filename => $2 };
1331 close FIA or die failedcmd @cmd;
1335 #---------- `madison' archive query method ----------
1337 sub archive_query_madison {
1338 return archive_query_prepend_mirror
1339 map { [ @$_[0..1] ] } madison_get_parse(@_);
1342 sub madison_get_parse {
1343 my ($proto,$data) = @_;
1344 die unless $proto eq 'madison';
1345 if (!length $data) {
1346 $data= access_cfg('madison-distro','RETURN-UNDEF');
1347 $data //= access_basedistro();
1349 $rmad{$proto,$data,$package} ||= cmdoutput
1350 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1351 my $rmad = $rmad{$proto,$data,$package};
1354 foreach my $l (split /\n/, $rmad) {
1355 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1356 \s*( [^ \t|]+ )\s* \|
1357 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1358 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1359 $1 eq $package or die "$rmad $package ?";
1366 $component = access_cfg('archive-query-default-component');
1368 $5 eq 'source' or die "$rmad ?";
1369 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1371 return sort { -version_compare($a->[0],$b->[0]); } @out;
1374 sub canonicalise_suite_madison {
1375 # madison canonicalises for us
1376 my @r = madison_get_parse(@_);
1378 "unable to canonicalise suite using package $package".
1379 " which does not appear to exist in suite $isuite;".
1380 " --existing-package may help";
1384 sub file_in_archive_madison { return undef; }
1386 #---------- `sshpsql' archive query method ----------
1389 my ($data,$runeinfo,$sql) = @_;
1390 if (!length $data) {
1391 $data= access_someuserhost('sshpsql').':'.
1392 access_cfg('sshpsql-dbname');
1394 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1395 my ($userhost,$dbname) = ($`,$'); #';
1397 my @cmd = (access_cfg_ssh, $userhost,
1398 access_runeinfo("ssh-psql $runeinfo").
1399 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1400 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1402 open P, "-|", @cmd or die $!;
1405 printdebug(">|$_|\n");
1408 $!=0; $?=0; close P or failedcmd @cmd;
1410 my $nrows = pop @rows;
1411 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1412 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1413 @rows = map { [ split /\|/, $_ ] } @rows;
1414 my $ncols = scalar @{ shift @rows };
1415 die if grep { scalar @$_ != $ncols } @rows;
1419 sub sql_injection_check {
1420 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1423 sub archive_query_sshpsql ($$) {
1424 my ($proto,$data) = @_;
1425 sql_injection_check $isuite, $package;
1426 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1427 SELECT source.version, component.name, files.filename, files.sha256sum
1429 JOIN src_associations ON source.id = src_associations.source
1430 JOIN suite ON suite.id = src_associations.suite
1431 JOIN dsc_files ON dsc_files.source = source.id
1432 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1433 JOIN component ON component.id = files_archive_map.component_id
1434 JOIN files ON files.id = dsc_files.file
1435 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1436 AND source.source='$package'
1437 AND files.filename LIKE '%.dsc';
1439 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1440 my $digester = Digest::SHA->new(256);
1442 my ($vsn,$component,$filename,$sha256sum) = @$_;
1443 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1445 return archive_query_prepend_mirror @rows;
1448 sub canonicalise_suite_sshpsql ($$) {
1449 my ($proto,$data) = @_;
1450 sql_injection_check $isuite;
1451 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1452 SELECT suite.codename
1453 FROM suite where suite_name='$isuite' or codename='$isuite';
1455 @rows = map { $_->[0] } @rows;
1456 fail "unknown suite $isuite" unless @rows;
1457 die "ambiguous $isuite: @rows ?" if @rows>1;
1461 sub file_in_archive_sshpsql ($$$) { return undef; }
1463 #---------- `dummycat' archive query method ----------
1465 sub canonicalise_suite_dummycat ($$) {
1466 my ($proto,$data) = @_;
1467 my $dpath = "$data/suite.$isuite";
1468 if (!open C, "<", $dpath) {
1469 $!==ENOENT or die "$dpath: $!";
1470 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1474 chomp or die "$dpath: $!";
1476 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1480 sub archive_query_dummycat ($$) {
1481 my ($proto,$data) = @_;
1482 canonicalise_suite();
1483 my $dpath = "$data/package.$csuite.$package";
1484 if (!open C, "<", $dpath) {
1485 $!==ENOENT or die "$dpath: $!";
1486 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1494 printdebug "dummycat query $csuite $package $dpath | $_\n";
1495 my @row = split /\s+/, $_;
1496 @row==2 or die "$dpath: $_ ?";
1499 C->error and die "$dpath: $!";
1501 return archive_query_prepend_mirror
1502 sort { -version_compare($a->[0],$b->[0]); } @rows;
1505 sub file_in_archive_dummycat () { return undef; }
1507 #---------- tag format handling ----------
1509 sub access_cfg_tagformats () {
1510 split /\,/, access_cfg('dgit-tag-format');
1513 sub access_cfg_tagformats_can_splitbrain () {
1514 my %y = map { $_ => 1 } access_cfg_tagformats;
1515 foreach my $needtf (qw(new maint)) {
1516 next if $y{$needtf};
1522 sub need_tagformat ($$) {
1523 my ($fmt, $why) = @_;
1524 fail "need to use tag format $fmt ($why) but also need".
1525 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1526 " - no way to proceed"
1527 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1528 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1531 sub select_tagformat () {
1533 return if $tagformatfn && !$tagformat_want;
1534 die 'bug' if $tagformatfn && $tagformat_want;
1535 # ... $tagformat_want assigned after previous select_tagformat
1537 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1538 printdebug "select_tagformat supported @supported\n";
1540 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1541 printdebug "select_tagformat specified @$tagformat_want\n";
1543 my ($fmt,$why,$override) = @$tagformat_want;
1545 fail "target distro supports tag formats @supported".
1546 " but have to use $fmt ($why)"
1548 or grep { $_ eq $fmt } @supported;
1550 $tagformat_want = undef;
1552 $tagformatfn = ${*::}{"debiantag_$fmt"};
1554 fail "trying to use unknown tag format \`$fmt' ($why) !"
1555 unless $tagformatfn;
1558 #---------- archive query entrypoints and rest of program ----------
1560 sub canonicalise_suite () {
1561 return if defined $csuite;
1562 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1563 $csuite = archive_query('canonicalise_suite');
1564 if ($isuite ne $csuite) {
1565 progress "canonical suite name for $isuite is $csuite";
1567 progress "canonical suite name is $csuite";
1571 sub get_archive_dsc () {
1572 canonicalise_suite();
1573 my @vsns = archive_query('archive_query');
1574 foreach my $vinfo (@vsns) {
1575 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1576 $dscurl = $vsn_dscurl;
1577 $dscdata = url_get($dscurl);
1579 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1584 $digester->add($dscdata);
1585 my $got = $digester->hexdigest();
1587 fail "$dscurl has hash $got but".
1588 " archive told us to expect $digest";
1591 my $fmt = getfield $dsc, 'Format';
1592 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1593 "unsupported source format $fmt, sorry";
1595 $dsc_checked = !!$digester;
1596 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1600 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1603 sub check_for_git ();
1604 sub check_for_git () {
1606 my $how = access_cfg('git-check');
1607 if ($how eq 'ssh-cmd') {
1609 (access_cfg_ssh, access_gituserhost(),
1610 access_runeinfo("git-check $package").
1611 " set -e; cd ".access_cfg('git-path').";".
1612 " if test -d $package.git; then echo 1; else echo 0; fi");
1613 my $r= cmdoutput @cmd;
1614 if (defined $r and $r =~ m/^divert (\w+)$/) {
1616 my ($usedistro,) = access_distros();
1617 # NB that if we are pushing, $usedistro will be $distro/push
1618 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1619 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1620 progress "diverting to $divert (using config for $instead_distro)";
1621 return check_for_git();
1623 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1625 } elsif ($how eq 'url') {
1626 my $prefix = access_cfg('git-check-url','git-url');
1627 my $suffix = access_cfg('git-check-suffix','git-suffix',
1628 'RETURN-UNDEF') // '.git';
1629 my $url = "$prefix/$package$suffix";
1630 my @cmd = (@curl, qw(-sS -I), $url);
1631 my $result = cmdoutput @cmd;
1632 $result =~ s/^\S+ 200 .*\n\r?\n//;
1633 # curl -sS -I with https_proxy prints
1634 # HTTP/1.0 200 Connection established
1635 $result =~ m/^\S+ (404|200) /s or
1636 fail "unexpected results from git check query - ".
1637 Dumper($prefix, $result);
1639 if ($code eq '404') {
1641 } elsif ($code eq '200') {
1646 } elsif ($how eq 'true') {
1648 } elsif ($how eq 'false') {
1651 badcfg "unknown git-check \`$how'";
1655 sub create_remote_git_repo () {
1656 my $how = access_cfg('git-create');
1657 if ($how eq 'ssh-cmd') {
1659 (access_cfg_ssh, access_gituserhost(),
1660 access_runeinfo("git-create $package").
1661 "set -e; cd ".access_cfg('git-path').";".
1662 " cp -a _template $package.git");
1663 } elsif ($how eq 'true') {
1666 badcfg "unknown git-create \`$how'";
1670 our ($dsc_hash,$lastpush_mergeinput);
1671 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1675 fresh_playground 'dgit/unpack';
1678 sub mktree_in_ud_here () {
1679 playtree_setup $gitcfgs{local};
1682 sub git_write_tree () {
1683 my $tree = cmdoutput @git, qw(write-tree);
1684 $tree =~ m/^\w+$/ or die "$tree ?";
1688 sub git_add_write_tree () {
1689 runcmd @git, qw(add -Af .);
1690 return git_write_tree();
1693 sub remove_stray_gits ($) {
1695 my @gitscmd = qw(find -name .git -prune -print0);
1696 debugcmd "|",@gitscmd;
1697 open GITS, "-|", @gitscmd or die $!;
1702 print STDERR "$us: warning: removing from $what: ",
1703 (messagequote $_), "\n";
1707 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1710 sub mktree_in_ud_from_only_subdir ($;$) {
1711 my ($what,$raw) = @_;
1712 # changes into the subdir
1715 die "expected one subdir but found @dirs ?" unless @dirs==1;
1716 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1720 remove_stray_gits($what);
1721 mktree_in_ud_here();
1723 my ($format, $fopts) = get_source_format();
1724 if (madformat($format)) {
1729 my $tree=git_add_write_tree();
1730 return ($tree,$dir);
1733 our @files_csum_info_fields =
1734 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1735 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1736 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1738 sub dsc_files_info () {
1739 foreach my $csumi (@files_csum_info_fields) {
1740 my ($fname, $module, $method) = @$csumi;
1741 my $field = $dsc->{$fname};
1742 next unless defined $field;
1743 eval "use $module; 1;" or die $@;
1745 foreach (split /\n/, $field) {
1747 m/^(\w+) (\d+) (\S+)$/ or
1748 fail "could not parse .dsc $fname line \`$_'";
1749 my $digester = eval "$module"."->$method;" or die $@;
1754 Digester => $digester,
1759 fail "missing any supported Checksums-* or Files field in ".
1760 $dsc->get_option('name');
1764 map { $_->{Filename} } dsc_files_info();
1767 sub files_compare_inputs (@) {
1772 my $showinputs = sub {
1773 return join "; ", map { $_->get_option('name') } @$inputs;
1776 foreach my $in (@$inputs) {
1778 my $in_name = $in->get_option('name');
1780 printdebug "files_compare_inputs $in_name\n";
1782 foreach my $csumi (@files_csum_info_fields) {
1783 my ($fname) = @$csumi;
1784 printdebug "files_compare_inputs $in_name $fname\n";
1786 my $field = $in->{$fname};
1787 next unless defined $field;
1790 foreach (split /\n/, $field) {
1793 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1794 fail "could not parse $in_name $fname line \`$_'";
1796 printdebug "files_compare_inputs $in_name $fname $f\n";
1800 my $re = \ $record{$f}{$fname};
1802 $fchecked{$f}{$in_name} = 1;
1804 fail "hash or size of $f varies in $fname fields".
1805 " (between: ".$showinputs->().")";
1810 @files = sort @files;
1811 $expected_files //= \@files;
1812 "@$expected_files" eq "@files" or
1813 fail "file list in $in_name varies between hash fields!";
1816 fail "$in_name has no files list field(s)";
1818 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1821 grep { keys %$_ == @$inputs-1 } values %fchecked
1822 or fail "no file appears in all file lists".
1823 " (looked in: ".$showinputs->().")";
1826 sub is_orig_file_in_dsc ($$) {
1827 my ($f, $dsc_files_info) = @_;
1828 return 0 if @$dsc_files_info <= 1;
1829 # One file means no origs, and the filename doesn't have a "what
1830 # part of dsc" component. (Consider versions ending `.orig'.)
1831 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1835 sub is_orig_file_of_vsn ($$) {
1836 my ($f, $upstreamvsn) = @_;
1837 my $base = srcfn $upstreamvsn, '';
1838 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1842 sub changes_update_origs_from_dsc ($$$$) {
1843 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1845 printdebug "checking origs needed ($upstreamvsn)...\n";
1846 $_ = getfield $changes, 'Files';
1847 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1848 fail "cannot find section/priority from .changes Files field";
1849 my $placementinfo = $1;
1851 printdebug "checking origs needed placement '$placementinfo'...\n";
1852 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1853 $l =~ m/\S+$/ or next;
1855 printdebug "origs $file | $l\n";
1856 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1857 printdebug "origs $file is_orig\n";
1858 my $have = archive_query('file_in_archive', $file);
1859 if (!defined $have) {
1861 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1867 printdebug "origs $file \$#\$have=$#$have\n";
1868 foreach my $h (@$have) {
1871 foreach my $csumi (@files_csum_info_fields) {
1872 my ($fname, $module, $method, $archivefield) = @$csumi;
1873 next unless defined $h->{$archivefield};
1874 $_ = $dsc->{$fname};
1875 next unless defined;
1876 m/^(\w+) .* \Q$file\E$/m or
1877 fail ".dsc $fname missing entry for $file";
1878 if ($h->{$archivefield} eq $1) {
1882 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1885 die "$file ".Dumper($h)." ?!" if $same && @differ;
1888 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1891 printdebug "origs $file f.same=$found_same".
1892 " #f._differ=$#found_differ\n";
1893 if (@found_differ && !$found_same) {
1895 "archive contains $file with different checksum",
1898 # Now we edit the changes file to add or remove it
1899 foreach my $csumi (@files_csum_info_fields) {
1900 my ($fname, $module, $method, $archivefield) = @$csumi;
1901 next unless defined $changes->{$fname};
1903 # in archive, delete from .changes if it's there
1904 $changed{$file} = "removed" if
1905 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1906 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1907 # not in archive, but it's here in the .changes
1909 my $dsc_data = getfield $dsc, $fname;
1910 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1912 $extra =~ s/ \d+ /$&$placementinfo /
1913 or die "$fname $extra >$dsc_data< ?"
1914 if $fname eq 'Files';
1915 $changes->{$fname} .= "\n". $extra;
1916 $changed{$file} = "added";
1921 foreach my $file (keys %changed) {
1923 "edited .changes for archive .orig contents: %s %s",
1924 $changed{$file}, $file;
1926 my $chtmp = "$changesfile.tmp";
1927 $changes->save($chtmp);
1929 rename $chtmp,$changesfile or die "$changesfile $!";
1931 progress "[new .changes left in $changesfile]";
1934 progress "$changesfile already has appropriate .orig(s) (if any)";
1938 sub make_commit ($) {
1940 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1943 sub make_commit_text ($) {
1946 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1948 print Dumper($text) if $debuglevel > 1;
1949 my $child = open2($out, $in, @cmd) or die $!;
1952 print $in $text or die $!;
1953 close $in or die $!;
1955 $h =~ m/^\w+$/ or die;
1957 printdebug "=> $h\n";
1960 waitpid $child, 0 == $child or die "$child $!";
1961 $? and failedcmd @cmd;
1965 sub clogp_authline ($) {
1967 my $author = getfield $clogp, 'Maintainer';
1968 if ($author =~ m/^[^"\@]+\,/) {
1969 # single entry Maintainer field with unquoted comma
1970 $author = ($& =~ y/,//rd).$'; # strip the comma
1972 # git wants a single author; any remaining commas in $author
1973 # are by now preceded by @ (or "). It seems safer to punt on
1974 # "..." for now rather than attempting to dequote or something.
1975 $author =~ s#,.*##ms unless $author =~ m/"/;
1976 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1977 my $authline = "$author $date";
1978 $authline =~ m/$git_authline_re/o or
1979 fail "unexpected commit author line format \`$authline'".
1980 " (was generated from changelog Maintainer field)";
1981 return ($1,$2,$3) if wantarray;
1985 sub vendor_patches_distro ($$) {
1986 my ($checkdistro, $what) = @_;
1987 return unless defined $checkdistro;
1989 my $series = "debian/patches/\L$checkdistro\E.series";
1990 printdebug "checking for vendor-specific $series ($what)\n";
1992 if (!open SERIES, "<", $series) {
1993 die "$series $!" unless $!==ENOENT;
2002 Unfortunately, this source package uses a feature of dpkg-source where
2003 the same source package unpacks to different source code on different
2004 distros. dgit cannot safely operate on such packages on affected
2005 distros, because the meaning of source packages is not stable.
2007 Please ask the distro/maintainer to remove the distro-specific series
2008 files and use a different technique (if necessary, uploading actually
2009 different packages, if different distros are supposed to have
2013 fail "Found active distro-specific series file for".
2014 " $checkdistro ($what): $series, cannot continue";
2016 die "$series $!" if SERIES->error;
2020 sub check_for_vendor_patches () {
2021 # This dpkg-source feature doesn't seem to be documented anywhere!
2022 # But it can be found in the changelog (reformatted):
2024 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2025 # Author: Raphael Hertzog <hertzog@debian.org>
2026 # Date: Sun Oct 3 09:36:48 2010 +0200
2028 # dpkg-source: correctly create .pc/.quilt_series with alternate
2031 # If you have debian/patches/ubuntu.series and you were
2032 # unpacking the source package on ubuntu, quilt was still
2033 # directed to debian/patches/series instead of
2034 # debian/patches/ubuntu.series.
2036 # debian/changelog | 3 +++
2037 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2038 # 2 files changed, 6 insertions(+), 1 deletion(-)
2041 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2042 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2043 "Dpkg::Vendor \`current vendor'");
2044 vendor_patches_distro(access_basedistro(),
2045 "(base) distro being accessed");
2046 vendor_patches_distro(access_nomdistro(),
2047 "(nominal) distro being accessed");
2050 sub generate_commits_from_dsc () {
2051 # See big comment in fetch_from_archive, below.
2052 # See also README.dsc-import.
2054 changedir $playground;
2056 my @dfi = dsc_files_info();
2057 foreach my $fi (@dfi) {
2058 my $f = $fi->{Filename};
2059 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2060 my $upper_f = "$maindir/../$f";
2062 printdebug "considering reusing $f: ";
2064 if (link_ltarget "$upper_f,fetch", $f) {
2065 printdebug "linked (using ...,fetch).\n";
2066 } elsif ((printdebug "($!) "),
2068 fail "accessing ../$f,fetch: $!";
2069 } elsif (link_ltarget $upper_f, $f) {
2070 printdebug "linked.\n";
2071 } elsif ((printdebug "($!) "),
2073 fail "accessing ../$f: $!";
2075 printdebug "absent.\n";
2079 complete_file_from_dsc('.', $fi, \$refetched)
2082 printdebug "considering saving $f: ";
2084 if (link $f, $upper_f) {
2085 printdebug "linked.\n";
2086 } elsif ((printdebug "($!) "),
2088 fail "saving ../$f: $!";
2089 } elsif (!$refetched) {
2090 printdebug "no need.\n";
2091 } elsif (link $f, "$upper_f,fetch") {
2092 printdebug "linked (using ...,fetch).\n";
2093 } elsif ((printdebug "($!) "),
2095 fail "saving ../$f,fetch: $!";
2097 printdebug "cannot.\n";
2101 # We unpack and record the orig tarballs first, so that we only
2102 # need disk space for one private copy of the unpacked source.
2103 # But we can't make them into commits until we have the metadata
2104 # from the debian/changelog, so we record the tree objects now and
2105 # make them into commits later.
2107 my $upstreamv = upstreamversion $dsc->{version};
2108 my $orig_f_base = srcfn $upstreamv, '';
2110 foreach my $fi (@dfi) {
2111 # We actually import, and record as a commit, every tarball
2112 # (unless there is only one file, in which case there seems
2115 my $f = $fi->{Filename};
2116 printdebug "import considering $f ";
2117 (printdebug "only one dfi\n"), next if @dfi == 1;
2118 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2119 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2123 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2125 printdebug "Y ", (join ' ', map { $_//"(none)" }
2126 $compr_ext, $orig_f_part
2129 my $input = new IO::File $f, '<' or die "$f $!";
2133 if (defined $compr_ext) {
2135 Dpkg::Compression::compression_guess_from_filename $f;
2136 fail "Dpkg::Compression cannot handle file $f in source package"
2137 if defined $compr_ext && !defined $cname;
2139 new Dpkg::Compression::Process compression => $cname;
2140 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2141 my $compr_fh = new IO::Handle;
2142 my $compr_pid = open $compr_fh, "-|" // die $!;
2144 open STDIN, "<&", $input or die $!;
2146 die "dgit (child): exec $compr_cmd[0]: $!\n";
2151 rmtree "_unpack-tar";
2152 mkdir "_unpack-tar" or die $!;
2153 my @tarcmd = qw(tar -x -f -
2154 --no-same-owner --no-same-permissions
2155 --no-acls --no-xattrs --no-selinux);
2156 my $tar_pid = fork // die $!;
2158 chdir "_unpack-tar" or die $!;
2159 open STDIN, "<&", $input or die $!;
2161 die "dgit (child): exec $tarcmd[0]: $!";
2163 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2164 !$? or failedcmd @tarcmd;
2167 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2169 # finally, we have the results in "tarball", but maybe
2170 # with the wrong permissions
2172 runcmd qw(chmod -R +rwX _unpack-tar);
2173 changedir "_unpack-tar";
2174 remove_stray_gits($f);
2175 mktree_in_ud_here();
2177 my ($tree) = git_add_write_tree();
2178 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2179 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2181 printdebug "one subtree $1\n";
2183 printdebug "multiple subtrees\n";
2186 rmtree "_unpack-tar";
2188 my $ent = [ $f, $tree ];
2190 Orig => !!$orig_f_part,
2191 Sort => (!$orig_f_part ? 2 :
2192 $orig_f_part =~ m/-/g ? 1 :
2200 # put any without "_" first (spec is not clear whether files
2201 # are always in the usual order). Tarballs without "_" are
2202 # the main orig or the debian tarball.
2203 $a->{Sort} <=> $b->{Sort} or
2207 my $any_orig = grep { $_->{Orig} } @tartrees;
2209 my $dscfn = "$package.dsc";
2211 my $treeimporthow = 'package';
2213 open D, ">", $dscfn or die "$dscfn: $!";
2214 print D $dscdata or die "$dscfn: $!";
2215 close D or die "$dscfn: $!";
2216 my @cmd = qw(dpkg-source);
2217 push @cmd, '--no-check' if $dsc_checked;
2218 if (madformat $dsc->{format}) {
2219 push @cmd, '--skip-patches';
2220 $treeimporthow = 'unpatched';
2222 push @cmd, qw(-x --), $dscfn;
2225 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2226 if (madformat $dsc->{format}) {
2227 check_for_vendor_patches();
2231 if (madformat $dsc->{format}) {
2232 my @pcmd = qw(dpkg-source --before-build .);
2233 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2235 $dappliedtree = git_add_write_tree();
2238 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2239 debugcmd "|",@clogcmd;
2240 open CLOGS, "-|", @clogcmd or die $!;
2245 printdebug "import clog search...\n";
2248 my $stanzatext = do { local $/=""; <CLOGS>; };
2249 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2250 last if !defined $stanzatext;
2252 my $desc = "package changelog, entry no.$.";
2253 open my $stanzafh, "<", \$stanzatext or die;
2254 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2255 $clogp //= $thisstanza;
2257 printdebug "import clog $thisstanza->{version} $desc...\n";
2259 last if !$any_orig; # we don't need $r1clogp
2261 # We look for the first (most recent) changelog entry whose
2262 # version number is lower than the upstream version of this
2263 # package. Then the last (least recent) previous changelog
2264 # entry is treated as the one which introduced this upstream
2265 # version and used for the synthetic commits for the upstream
2268 # One might think that a more sophisticated algorithm would be
2269 # necessary. But: we do not want to scan the whole changelog
2270 # file. Stopping when we see an earlier version, which
2271 # necessarily then is an earlier upstream version, is the only
2272 # realistic way to do that. Then, either the earliest
2273 # changelog entry we have seen so far is indeed the earliest
2274 # upload of this upstream version; or there are only changelog
2275 # entries relating to later upstream versions (which is not
2276 # possible unless the changelog and .dsc disagree about the
2277 # version). Then it remains to choose between the physically
2278 # last entry in the file, and the one with the lowest version
2279 # number. If these are not the same, we guess that the
2280 # versions were created in a non-monotic order rather than
2281 # that the changelog entries have been misordered.
2283 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2285 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2286 $r1clogp = $thisstanza;
2288 printdebug "import clog $r1clogp->{version} becomes r1\n";
2290 die $! if CLOGS->error;
2291 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2293 $clogp or fail "package changelog has no entries!";
2295 my $authline = clogp_authline $clogp;
2296 my $changes = getfield $clogp, 'Changes';
2297 $changes =~ s/^\n//; # Changes: \n
2298 my $cversion = getfield $clogp, 'Version';
2301 $r1clogp //= $clogp; # maybe there's only one entry;
2302 my $r1authline = clogp_authline $r1clogp;
2303 # Strictly, r1authline might now be wrong if it's going to be
2304 # unused because !$any_orig. Whatever.
2306 printdebug "import tartrees authline $authline\n";
2307 printdebug "import tartrees r1authline $r1authline\n";
2309 foreach my $tt (@tartrees) {
2310 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2312 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2315 committer $r1authline
2319 [dgit import orig $tt->{F}]
2327 [dgit import tarball $package $cversion $tt->{F}]
2332 printdebug "import main commit\n";
2334 open C, ">../commit.tmp" or die $!;
2335 print C <<END or die $!;
2338 print C <<END or die $! foreach @tartrees;
2341 print C <<END or die $!;
2347 [dgit import $treeimporthow $package $cversion]
2351 my $rawimport_hash = make_commit qw(../commit.tmp);
2353 if (madformat $dsc->{format}) {
2354 printdebug "import apply patches...\n";
2356 # regularise the state of the working tree so that
2357 # the checkout of $rawimport_hash works nicely.
2358 my $dappliedcommit = make_commit_text(<<END);
2365 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2367 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2369 # We need the answers to be reproducible
2370 my @authline = clogp_authline($clogp);
2371 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2372 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2373 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2374 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2375 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2376 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2378 my $path = $ENV{PATH} or die;
2380 # we use ../../gbp-pq-output, which (given that we are in
2381 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2384 foreach my $use_absurd (qw(0 1)) {
2385 runcmd @git, qw(checkout -q unpa);
2386 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2387 local $ENV{PATH} = $path;
2390 progress "warning: $@";
2391 $path = "$absurdity:$path";
2392 progress "$us: trying slow absurd-git-apply...";
2393 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2398 die "forbid absurd git-apply\n" if $use_absurd
2399 && forceing [qw(import-gitapply-no-absurd)];
2400 die "only absurd git-apply!\n" if !$use_absurd
2401 && forceing [qw(import-gitapply-absurd)];
2403 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2404 local $ENV{PATH} = $path if $use_absurd;
2406 my @showcmd = (gbp_pq, qw(import));
2407 my @realcmd = shell_cmd
2408 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2409 debugcmd "+",@realcmd;
2410 if (system @realcmd) {
2411 die +(shellquote @showcmd).
2413 failedcmd_waitstatus()."\n";
2416 my $gapplied = git_rev_parse('HEAD');
2417 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2418 $gappliedtree eq $dappliedtree or
2420 gbp-pq import and dpkg-source disagree!
2421 gbp-pq import gave commit $gapplied
2422 gbp-pq import gave tree $gappliedtree
2423 dpkg-source --before-build gave tree $dappliedtree
2425 $rawimport_hash = $gapplied;
2430 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2435 progress "synthesised git commit from .dsc $cversion";
2437 my $rawimport_mergeinput = {
2438 Commit => $rawimport_hash,
2439 Info => "Import of source package",
2441 my @output = ($rawimport_mergeinput);
2443 if ($lastpush_mergeinput) {
2444 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2445 my $oversion = getfield $oldclogp, 'Version';
2447 version_compare($oversion, $cversion);
2449 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2450 { Message => <<END, ReverseParents => 1 });
2451 Record $package ($cversion) in archive suite $csuite
2453 } elsif ($vcmp > 0) {
2454 print STDERR <<END or die $!;
2456 Version actually in archive: $cversion (older)
2457 Last version pushed with dgit: $oversion (newer or same)
2460 @output = $lastpush_mergeinput;
2462 # Same version. Use what's in the server git branch,
2463 # discarding our own import. (This could happen if the
2464 # server automatically imports all packages into git.)
2465 @output = $lastpush_mergeinput;
2473 sub complete_file_from_dsc ($$;$) {
2474 our ($dstdir, $fi, $refetched) = @_;
2475 # Ensures that we have, in $dstdir, the file $fi, with the correct
2476 # contents. (Downloading it from alongside $dscurl if necessary.)
2477 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2478 # and will set $$refetched=1 if it did so (or tried to).
2480 my $f = $fi->{Filename};
2481 my $tf = "$dstdir/$f";
2485 my $checkhash = sub {
2486 open F, "<", "$tf" or die "$tf: $!";
2487 $fi->{Digester}->reset();
2488 $fi->{Digester}->addfile(*F);
2489 F->error and die $!;
2490 $got = $fi->{Digester}->hexdigest();
2491 return $got eq $fi->{Hash};
2494 if (stat_exists $tf) {
2495 if ($checkhash->()) {
2496 progress "using existing $f";
2500 fail "file $f has hash $got but .dsc".
2501 " demands hash $fi->{Hash} ".
2502 "(perhaps you should delete this file?)";
2504 progress "need to fetch correct version of $f";
2505 unlink $tf or die "$tf $!";
2508 printdebug "$tf does not exist, need to fetch\n";
2512 $furl =~ s{/[^/]+$}{};
2514 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2515 die "$f ?" if $f =~ m#/#;
2516 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2517 return 0 if !act_local();
2520 fail "file $f has hash $got but .dsc".
2521 " demands hash $fi->{Hash} ".
2522 "(got wrong file from archive!)";
2527 sub ensure_we_have_orig () {
2528 my @dfi = dsc_files_info();
2529 foreach my $fi (@dfi) {
2530 my $f = $fi->{Filename};
2531 next unless is_orig_file_in_dsc($f, \@dfi);
2532 complete_file_from_dsc('..', $fi)
2537 #---------- git fetch ----------
2539 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2540 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2542 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2543 # locally fetched refs because they have unhelpful names and clutter
2544 # up gitk etc. So we track whether we have "used up" head ref (ie,
2545 # whether we have made another local ref which refers to this object).
2547 # (If we deleted them unconditionally, then we might end up
2548 # re-fetching the same git objects each time dgit fetch was run.)
2550 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2551 # in git_fetch_us to fetch the refs in question, and possibly a call
2552 # to lrfetchref_used.
2554 our (%lrfetchrefs_f, %lrfetchrefs_d);
2555 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2557 sub lrfetchref_used ($) {
2558 my ($fullrefname) = @_;
2559 my $objid = $lrfetchrefs_f{$fullrefname};
2560 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2563 sub git_lrfetch_sane {
2564 my ($url, $supplementary, @specs) = @_;
2565 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2566 # at least as regards @specs. Also leave the results in
2567 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2568 # able to clean these up.
2570 # With $supplementary==1, @specs must not contain wildcards
2571 # and we add to our previous fetches (non-atomically).
2573 # This is rather miserable:
2574 # When git fetch --prune is passed a fetchspec ending with a *,
2575 # it does a plausible thing. If there is no * then:
2576 # - it matches subpaths too, even if the supplied refspec
2577 # starts refs, and behaves completely madly if the source
2578 # has refs/refs/something. (See, for example, Debian #NNNN.)
2579 # - if there is no matching remote ref, it bombs out the whole
2581 # We want to fetch a fixed ref, and we don't know in advance
2582 # if it exists, so this is not suitable.
2584 # Our workaround is to use git ls-remote. git ls-remote has its
2585 # own qairks. Notably, it has the absurd multi-tail-matching
2586 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2587 # refs/refs/foo etc.
2589 # Also, we want an idempotent snapshot, but we have to make two
2590 # calls to the remote: one to git ls-remote and to git fetch. The
2591 # solution is use git ls-remote to obtain a target state, and
2592 # git fetch to try to generate it. If we don't manage to generate
2593 # the target state, we try again.
2595 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2597 my $specre = join '|', map {
2600 my $wildcard = $x =~ s/\\\*$/.*/;
2601 die if $wildcard && $supplementary;
2604 printdebug "git_lrfetch_sane specre=$specre\n";
2605 my $wanted_rref = sub {
2607 return m/^(?:$specre)$/;
2610 my $fetch_iteration = 0;
2613 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2614 if (++$fetch_iteration > 10) {
2615 fail "too many iterations trying to get sane fetch!";
2618 my @look = map { "refs/$_" } @specs;
2619 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2623 open GITLS, "-|", @lcmd or die $!;
2625 printdebug "=> ", $_;
2626 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2627 my ($objid,$rrefname) = ($1,$2);
2628 if (!$wanted_rref->($rrefname)) {
2630 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2634 $wantr{$rrefname} = $objid;
2637 close GITLS or failedcmd @lcmd;
2639 # OK, now %want is exactly what we want for refs in @specs
2641 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2642 "+refs/$_:".lrfetchrefs."/$_";
2645 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2647 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2648 runcmd_ordryrun_local @fcmd if @fspecs;
2650 if (!$supplementary) {
2651 %lrfetchrefs_f = ();
2655 git_for_each_ref(lrfetchrefs, sub {
2656 my ($objid,$objtype,$lrefname,$reftail) = @_;
2657 $lrfetchrefs_f{$lrefname} = $objid;
2658 $objgot{$objid} = 1;
2661 if ($supplementary) {
2665 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2666 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2667 if (!exists $wantr{$rrefname}) {
2668 if ($wanted_rref->($rrefname)) {
2670 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2674 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2677 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2678 delete $lrfetchrefs_f{$lrefname};
2682 foreach my $rrefname (sort keys %wantr) {
2683 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2684 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2685 my $want = $wantr{$rrefname};
2686 next if $got eq $want;
2687 if (!defined $objgot{$want}) {
2689 warning: git ls-remote suggests we want $lrefname
2690 warning: and it should refer to $want
2691 warning: but git fetch didn't fetch that object to any relevant ref.
2692 warning: This may be due to a race with someone updating the server.
2693 warning: Will try again...
2695 next FETCH_ITERATION;
2698 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2700 runcmd_ordryrun_local @git, qw(update-ref -m),
2701 "dgit fetch git fetch fixup", $lrefname, $want;
2702 $lrfetchrefs_f{$lrefname} = $want;
2707 if (defined $csuite) {
2708 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2709 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2710 my ($objid,$objtype,$lrefname,$reftail) = @_;
2711 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2712 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2716 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2717 Dumper(\%lrfetchrefs_f);
2720 sub git_fetch_us () {
2721 # Want to fetch only what we are going to use, unless
2722 # deliberately-not-ff, in which case we must fetch everything.
2724 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2726 (quiltmode_splitbrain
2727 ? (map { $_->('*',access_nomdistro) }
2728 \&debiantag_new, \&debiantag_maintview)
2729 : debiantags('*',access_nomdistro));
2730 push @specs, server_branch($csuite);
2731 push @specs, $rewritemap;
2732 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2734 my $url = access_giturl();
2735 git_lrfetch_sane $url, 0, @specs;
2738 my @tagpats = debiantags('*',access_nomdistro);
2740 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2741 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2742 printdebug "currently $fullrefname=$objid\n";
2743 $here{$fullrefname} = $objid;
2745 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2746 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2747 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2748 printdebug "offered $lref=$objid\n";
2749 if (!defined $here{$lref}) {
2750 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2751 runcmd_ordryrun_local @upd;
2752 lrfetchref_used $fullrefname;
2753 } elsif ($here{$lref} eq $objid) {
2754 lrfetchref_used $fullrefname;
2757 "Not updating $lref from $here{$lref} to $objid.\n";
2762 #---------- dsc and archive handling ----------
2764 sub mergeinfo_getclogp ($) {
2765 # Ensures thit $mi->{Clogp} exists and returns it
2767 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2770 sub mergeinfo_version ($) {
2771 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2774 sub fetch_from_archive_record_1 ($) {
2776 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2777 'DGIT_ARCHIVE', $hash;
2778 cmdoutput @git, qw(log -n2), $hash;
2779 # ... gives git a chance to complain if our commit is malformed
2782 sub fetch_from_archive_record_2 ($) {
2784 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2788 dryrun_report @upd_cmd;
2792 sub parse_dsc_field_def_dsc_distro () {
2793 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2794 dgit.default.distro);
2797 sub parse_dsc_field ($$) {
2798 my ($dsc, $what) = @_;
2800 foreach my $field (@ourdscfield) {
2801 $f = $dsc->{$field};
2806 progress "$what: NO git hash";
2807 parse_dsc_field_def_dsc_distro();
2808 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2809 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2810 progress "$what: specified git info ($dsc_distro)";
2811 $dsc_hint_tag = [ $dsc_hint_tag ];
2812 } elsif ($f =~ m/^\w+\s*$/) {
2814 parse_dsc_field_def_dsc_distro();
2815 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2817 progress "$what: specified git hash";
2819 fail "$what: invalid Dgit info";
2823 sub resolve_dsc_field_commit ($$) {
2824 my ($already_distro, $already_mapref) = @_;
2826 return unless defined $dsc_hash;
2829 defined $already_mapref &&
2830 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2831 ? $already_mapref : undef;
2835 my ($what, @fetch) = @_;
2837 local $idistro = $dsc_distro;
2838 my $lrf = lrfetchrefs;
2840 if (!$chase_dsc_distro) {
2842 "not chasing .dsc distro $dsc_distro: not fetching $what";
2847 ".dsc names distro $dsc_distro: fetching $what";
2849 my $url = access_giturl();
2850 if (!defined $url) {
2851 defined $dsc_hint_url or fail <<END;
2852 .dsc Dgit metadata is in context of distro $dsc_distro
2853 for which we have no configured url and .dsc provides no hint
2856 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2857 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2858 parse_cfg_bool "dsc-url-proto-ok", 'false',
2859 cfg("dgit.dsc-url-proto-ok.$proto",
2860 "dgit.default.dsc-url-proto-ok")
2862 .dsc Dgit metadata is in context of distro $dsc_distro
2863 for which we have no configured url;
2864 .dsc provides hinted url with protocol $proto which is unsafe.
2865 (can be overridden by config - consult documentation)
2867 $url = $dsc_hint_url;
2870 git_lrfetch_sane $url, 1, @fetch;
2875 my $rewrite_enable = do {
2876 local $idistro = $dsc_distro;
2877 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2880 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2881 if (!defined $mapref) {
2882 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2883 $mapref = $lrf.'/'.$rewritemap;
2885 my $rewritemapdata = git_cat_file $mapref.':map';
2886 if (defined $rewritemapdata
2887 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2889 "server's git history rewrite map contains a relevant entry!";
2892 if (defined $dsc_hash) {
2893 progress "using rewritten git hash in place of .dsc value";
2895 progress "server data says .dsc hash is to be disregarded";
2900 if (!defined git_cat_file $dsc_hash) {
2901 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2902 my $lrf = $do_fetch->("additional commits", @tags) &&
2903 defined git_cat_file $dsc_hash
2905 .dsc Dgit metadata requires commit $dsc_hash
2906 but we could not obtain that object anywhere.
2908 foreach my $t (@tags) {
2909 my $fullrefname = $lrf.'/'.$t;
2910 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2911 next unless $lrfetchrefs_f{$fullrefname};
2912 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2913 lrfetchref_used $fullrefname;
2918 sub fetch_from_archive () {
2919 ensure_setup_existing_tree();
2921 # Ensures that lrref() is what is actually in the archive, one way
2922 # or another, according to us - ie this client's
2923 # appropritaely-updated archive view. Also returns the commit id.
2924 # If there is nothing in the archive, leaves lrref alone and
2925 # returns undef. git_fetch_us must have already been called.
2929 parse_dsc_field($dsc, 'last upload to archive');
2930 resolve_dsc_field_commit access_basedistro,
2931 lrfetchrefs."/".$rewritemap
2933 progress "no version available from the archive";
2936 # If the archive's .dsc has a Dgit field, there are three
2937 # relevant git commitids we need to choose between and/or merge
2939 # 1. $dsc_hash: the Dgit field from the archive
2940 # 2. $lastpush_hash: the suite branch on the dgit git server
2941 # 3. $lastfetch_hash: our local tracking brach for the suite
2943 # These may all be distinct and need not be in any fast forward
2946 # If the dsc was pushed to this suite, then the server suite
2947 # branch will have been updated; but it might have been pushed to
2948 # a different suite and copied by the archive. Conversely a more
2949 # recent version may have been pushed with dgit but not appeared
2950 # in the archive (yet).
2952 # $lastfetch_hash may be awkward because archive imports
2953 # (particularly, imports of Dgit-less .dscs) are performed only as
2954 # needed on individual clients, so different clients may perform a
2955 # different subset of them - and these imports are only made
2956 # public during push. So $lastfetch_hash may represent a set of
2957 # imports different to a subsequent upload by a different dgit
2960 # Our approach is as follows:
2962 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2963 # descendant of $dsc_hash, then it was pushed by a dgit user who
2964 # had based their work on $dsc_hash, so we should prefer it.
2965 # Otherwise, $dsc_hash was installed into this suite in the
2966 # archive other than by a dgit push, and (necessarily) after the
2967 # last dgit push into that suite (since a dgit push would have
2968 # been descended from the dgit server git branch); thus, in that
2969 # case, we prefer the archive's version (and produce a
2970 # pseudo-merge to overwrite the dgit server git branch).
2972 # (If there is no Dgit field in the archive's .dsc then
2973 # generate_commit_from_dsc uses the version numbers to decide
2974 # whether the suite branch or the archive is newer. If the suite
2975 # branch is newer it ignores the archive's .dsc; otherwise it
2976 # generates an import of the .dsc, and produces a pseudo-merge to
2977 # overwrite the suite branch with the archive contents.)
2979 # The outcome of that part of the algorithm is the `public view',
2980 # and is same for all dgit clients: it does not depend on any
2981 # unpublished history in the local tracking branch.
2983 # As between the public view and the local tracking branch: The
2984 # local tracking branch is only updated by dgit fetch, and
2985 # whenever dgit fetch runs it includes the public view in the
2986 # local tracking branch. Therefore if the public view is not
2987 # descended from the local tracking branch, the local tracking
2988 # branch must contain history which was imported from the archive
2989 # but never pushed; and, its tip is now out of date. So, we make
2990 # a pseudo-merge to overwrite the old imports and stitch the old
2993 # Finally: we do not necessarily reify the public view (as
2994 # described above). This is so that we do not end up stacking two
2995 # pseudo-merges. So what we actually do is figure out the inputs
2996 # to any public view pseudo-merge and put them in @mergeinputs.
2999 # $mergeinputs[]{Commit}
3000 # $mergeinputs[]{Info}
3001 # $mergeinputs[0] is the one whose tree we use
3002 # @mergeinputs is in the order we use in the actual commit)
3005 # $mergeinputs[]{Message} is a commit message to use
3006 # $mergeinputs[]{ReverseParents} if def specifies that parent
3007 # list should be in opposite order
3008 # Such an entry has no Commit or Info. It applies only when found
3009 # in the last entry. (This ugliness is to support making
3010 # identical imports to previous dgit versions.)
3012 my $lastpush_hash = git_get_ref(lrfetchref());
3013 printdebug "previous reference hash=$lastpush_hash\n";
3014 $lastpush_mergeinput = $lastpush_hash && {
3015 Commit => $lastpush_hash,
3016 Info => "dgit suite branch on dgit git server",
3019 my $lastfetch_hash = git_get_ref(lrref());
3020 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3021 my $lastfetch_mergeinput = $lastfetch_hash && {
3022 Commit => $lastfetch_hash,
3023 Info => "dgit client's archive history view",
3026 my $dsc_mergeinput = $dsc_hash && {
3027 Commit => $dsc_hash,
3028 Info => "Dgit field in .dsc from archive",
3032 my $del_lrfetchrefs = sub {
3035 printdebug "del_lrfetchrefs...\n";
3036 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3037 my $objid = $lrfetchrefs_d{$fullrefname};
3038 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3040 $gur ||= new IO::Handle;
3041 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3043 printf $gur "delete %s %s\n", $fullrefname, $objid;
3046 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3050 if (defined $dsc_hash) {
3051 ensure_we_have_orig();
3052 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3053 @mergeinputs = $dsc_mergeinput
3054 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3055 print STDERR <<END or die $!;
3057 Git commit in archive is behind the last version allegedly pushed/uploaded.
3058 Commit referred to by archive: $dsc_hash
3059 Last version pushed with dgit: $lastpush_hash
3062 @mergeinputs = ($lastpush_mergeinput);
3064 # Archive has .dsc which is not a descendant of the last dgit
3065 # push. This can happen if the archive moves .dscs about.
3066 # Just follow its lead.
3067 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3068 progress "archive .dsc names newer git commit";
3069 @mergeinputs = ($dsc_mergeinput);
3071 progress "archive .dsc names other git commit, fixing up";
3072 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3076 @mergeinputs = generate_commits_from_dsc();
3077 # We have just done an import. Now, our import algorithm might
3078 # have been improved. But even so we do not want to generate
3079 # a new different import of the same package. So if the
3080 # version numbers are the same, just use our existing version.
3081 # If the version numbers are different, the archive has changed
3082 # (perhaps, rewound).
3083 if ($lastfetch_mergeinput &&
3084 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3085 (mergeinfo_version $mergeinputs[0]) )) {
3086 @mergeinputs = ($lastfetch_mergeinput);
3088 } elsif ($lastpush_hash) {
3089 # only in git, not in the archive yet
3090 @mergeinputs = ($lastpush_mergeinput);
3091 print STDERR <<END or die $!;
3093 Package not found in the archive, but has allegedly been pushed using dgit.
3097 printdebug "nothing found!\n";
3098 if (defined $skew_warning_vsn) {
3099 print STDERR <<END or die $!;
3101 Warning: relevant archive skew detected.
3102 Archive allegedly contains $skew_warning_vsn
3103 But we were not able to obtain any version from the archive or git.
3107 unshift @end, $del_lrfetchrefs;
3111 if ($lastfetch_hash &&
3113 my $h = $_->{Commit};
3114 $h and is_fast_fwd($lastfetch_hash, $h);
3115 # If true, one of the existing parents of this commit
3116 # is a descendant of the $lastfetch_hash, so we'll
3117 # be ff from that automatically.
3121 push @mergeinputs, $lastfetch_mergeinput;
3124 printdebug "fetch mergeinfos:\n";
3125 foreach my $mi (@mergeinputs) {
3127 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3129 printdebug sprintf " ReverseParents=%d Message=%s",
3130 $mi->{ReverseParents}, $mi->{Message};
3134 my $compat_info= pop @mergeinputs
3135 if $mergeinputs[$#mergeinputs]{Message};
3137 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3140 if (@mergeinputs > 1) {
3142 my $tree_commit = $mergeinputs[0]{Commit};
3144 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3145 $tree =~ m/\n\n/; $tree = $`;
3146 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3149 # We use the changelog author of the package in question the
3150 # author of this pseudo-merge. This is (roughly) correct if
3151 # this commit is simply representing aa non-dgit upload.
3152 # (Roughly because it does not record sponsorship - but we
3153 # don't have sponsorship info because that's in the .changes,
3154 # which isn't in the archivw.)
3156 # But, it might be that we are representing archive history
3157 # updates (including in-archive copies). These are not really
3158 # the responsibility of the person who created the .dsc, but
3159 # there is no-one whose name we should better use. (The
3160 # author of the .dsc-named commit is clearly worse.)
3162 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3163 my $author = clogp_authline $useclogp;
3164 my $cversion = getfield $useclogp, 'Version';
3166 my $mcf = ".git/dgit/mergecommit";
3167 open MC, ">", $mcf or die "$mcf $!";
3168 print MC <<END or die $!;
3172 my @parents = grep { $_->{Commit} } @mergeinputs;
3173 @parents = reverse @parents if $compat_info->{ReverseParents};
3174 print MC <<END or die $! foreach @parents;
3178 print MC <<END or die $!;
3184 if (defined $compat_info->{Message}) {
3185 print MC $compat_info->{Message} or die $!;
3187 print MC <<END or die $!;
3188 Record $package ($cversion) in archive suite $csuite
3192 my $message_add_info = sub {
3194 my $mversion = mergeinfo_version $mi;
3195 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3199 $message_add_info->($mergeinputs[0]);
3200 print MC <<END or die $!;
3201 should be treated as descended from
3203 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3207 $hash = make_commit $mcf;
3209 $hash = $mergeinputs[0]{Commit};
3211 printdebug "fetch hash=$hash\n";
3214 my ($lasth, $what) = @_;
3215 return unless $lasth;
3216 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3219 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3221 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3223 fetch_from_archive_record_1($hash);
3225 if (defined $skew_warning_vsn) {
3227 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3228 my $gotclogp = commit_getclogp($hash);
3229 my $got_vsn = getfield $gotclogp, 'Version';
3230 printdebug "SKEW CHECK GOT $got_vsn\n";
3231 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3232 print STDERR <<END or die $!;
3234 Warning: archive skew detected. Using the available version:
3235 Archive allegedly contains $skew_warning_vsn
3236 We were able to obtain only $got_vsn
3242 if ($lastfetch_hash ne $hash) {
3243 fetch_from_archive_record_2($hash);
3246 lrfetchref_used lrfetchref();
3248 check_gitattrs($hash, "fetched source tree");
3250 unshift @end, $del_lrfetchrefs;
3254 sub set_local_git_config ($$) {
3256 runcmd @git, qw(config), $k, $v;
3259 sub setup_mergechangelogs (;$) {
3261 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3263 my $driver = 'dpkg-mergechangelogs';
3264 my $cb = "merge.$driver";
3265 my $attrs = '.git/info/attributes';
3266 ensuredir '.git/info';
3268 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3269 if (!open ATTRS, "<", $attrs) {
3270 $!==ENOENT or die "$attrs: $!";
3274 next if m{^debian/changelog\s};
3275 print NATTRS $_, "\n" or die $!;
3277 ATTRS->error and die $!;
3280 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3283 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3284 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3286 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3289 sub setup_useremail (;$) {
3291 return unless $always || access_cfg_bool(1, 'setup-useremail');
3294 my ($k, $envvar) = @_;
3295 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3296 return unless defined $v;
3297 set_local_git_config "user.$k", $v;
3300 $setup->('email', 'DEBEMAIL');
3301 $setup->('name', 'DEBFULLNAME');
3304 sub ensure_setup_existing_tree () {
3305 my $k = "remote.$remotename.skipdefaultupdate";
3306 my $c = git_get_config $k;
3307 return if defined $c;
3308 set_local_git_config $k, 'true';
3311 sub open_gitattrs () {
3312 my $gai = new IO::File ".git/info/attributes"
3314 or die "open .git/info/attributes: $!";
3318 sub is_gitattrs_setup () {
3319 my $gai = open_gitattrs();
3320 return 0 unless $gai;
3322 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3324 $gai->error and die $!;
3328 sub setup_gitattrs (;$) {
3330 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3332 if (is_gitattrs_setup()) {
3334 [attr]dgit-defuse-attrs already found in .git/info/attributes
3335 not doing further gitattributes setup
3339 my $af = ".git/info/attributes";
3340 ensuredir '.git/info';
3341 open GAO, "> $af.new" or die $!;
3342 print GAO <<END or die $!;
3344 [attr]dgit-defuse-attrs $negate_harmful_gitattrs
3345 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3347 my $gai = open_gitattrs();
3351 print GAO $_, "\n" or die $!;
3353 $gai->error and die $!;
3355 close GAO or die $!;
3356 rename "$af.new", "$af" or die "install $af: $!";
3359 sub setup_new_tree () {
3360 setup_mergechangelogs();
3365 sub check_gitattrs ($$) {
3366 my ($treeish, $what) = @_;
3368 return if is_gitattrs_setup;
3371 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3373 my $gafl = new IO::File;
3374 open $gafl, "-|", @cmd or die $!;
3377 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3379 next unless m{(?:^|/)\.gitattributes$};
3381 # oh dear, found one
3383 dgit: warning: $what contains .gitattributes
3384 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3389 # tree contains no .gitattributes files
3390 $?=0; $!=0; close $gafl or failedcmd @cmd;
3394 sub multisuite_suite_child ($$$) {
3395 my ($tsuite, $merginputs, $fn) = @_;
3396 # in child, sets things up, calls $fn->(), and returns undef
3397 # in parent, returns canonical suite name for $tsuite
3398 my $canonsuitefh = IO::File::new_tmpfile;
3399 my $pid = fork // die $!;
3403 $us .= " [$isuite]";
3404 $debugprefix .= " ";
3405 progress "fetching $tsuite...";
3406 canonicalise_suite();
3407 print $canonsuitefh $csuite, "\n" or die $!;
3408 close $canonsuitefh or die $!;
3412 waitpid $pid,0 == $pid or die $!;
3413 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3414 seek $canonsuitefh,0,0 or die $!;
3415 local $csuite = <$canonsuitefh>;
3416 die $! unless defined $csuite && chomp $csuite;
3418 printdebug "multisuite $tsuite missing\n";
3421 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3422 push @$merginputs, {
3429 sub fork_for_multisuite ($) {
3430 my ($before_fetch_merge) = @_;
3431 # if nothing unusual, just returns ''
3434 # returns 0 to caller in child, to do first of the specified suites
3435 # in child, $csuite is not yet set
3437 # returns 1 to caller in parent, to finish up anything needed after
3438 # in parent, $csuite is set to canonicalised portmanteau
3440 my $org_isuite = $isuite;
3441 my @suites = split /\,/, $isuite;
3442 return '' unless @suites > 1;
3443 printdebug "fork_for_multisuite: @suites\n";
3447 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3449 return 0 unless defined $cbasesuite;
3451 fail "package $package missing in (base suite) $cbasesuite"
3452 unless @mergeinputs;
3454 my @csuites = ($cbasesuite);
3456 $before_fetch_merge->();
3458 foreach my $tsuite (@suites[1..$#suites]) {
3459 $tsuite =~ s/^-/$cbasesuite-/;
3460 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3466 # xxx collecte the ref here
3468 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3469 push @csuites, $csubsuite;
3472 foreach my $mi (@mergeinputs) {
3473 my $ref = git_get_ref $mi->{Ref};
3474 die "$mi->{Ref} ?" unless length $ref;
3475 $mi->{Commit} = $ref;
3478 $csuite = join ",", @csuites;
3480 my $previous = git_get_ref lrref;
3482 unshift @mergeinputs, {
3483 Commit => $previous,
3484 Info => "local combined tracking branch",
3486 "archive seems to have rewound: local tracking branch is ahead!",
3490 foreach my $ix (0..$#mergeinputs) {
3491 $mergeinputs[$ix]{Index} = $ix;
3494 @mergeinputs = sort {
3495 -version_compare(mergeinfo_version $a,
3496 mergeinfo_version $b) # highest version first
3498 $a->{Index} <=> $b->{Index}; # earliest in spec first
3504 foreach my $mi (@mergeinputs) {
3505 printdebug "multisuite merge check $mi->{Info}\n";
3506 foreach my $previous (@needed) {
3507 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3508 printdebug "multisuite merge un-needed $previous->{Info}\n";
3512 printdebug "multisuite merge this-needed\n";
3513 $mi->{Character} = '+';
3516 $needed[0]{Character} = '*';
3518 my $output = $needed[0]{Commit};
3521 printdebug "multisuite merge nontrivial\n";
3522 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3524 my $commit = "tree $tree\n";
3525 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3526 "Input branches:\n";
3528 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3529 printdebug "multisuite merge include $mi->{Info}\n";
3530 $mi->{Character} //= ' ';
3531 $commit .= "parent $mi->{Commit}\n";
3532 $msg .= sprintf " %s %-25s %s\n",
3534 (mergeinfo_version $mi),
3537 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3539 " * marks the highest version branch, which choose to use\n".
3540 " + marks each branch which was not already an ancestor\n\n".
3541 "[dgit multi-suite $csuite]\n";
3543 "author $authline\n".
3544 "committer $authline\n\n";
3545 $output = make_commit_text $commit.$msg;
3546 printdebug "multisuite merge generated $output\n";
3549 fetch_from_archive_record_1($output);
3550 fetch_from_archive_record_2($output);
3552 progress "calculated combined tracking suite $csuite";
3557 sub clone_set_head () {
3558 open H, "> .git/HEAD" or die $!;
3559 print H "ref: ".lref()."\n" or die $!;
3562 sub clone_finish ($) {
3564 runcmd @git, qw(reset --hard), lrref();
3565 runcmd qw(bash -ec), <<'END';
3567 git ls-tree -r --name-only -z HEAD | \
3568 xargs -0r touch -h -r . --
3570 printdone "ready for work in $dstdir";
3574 # in multisuite, returns twice!
3575 # once in parent after first suite fetched,
3576 # and then again in child after everything is finished
3578 badusage "dry run makes no sense with clone" unless act_local();
3580 my $multi_fetched = fork_for_multisuite(sub {
3581 printdebug "multi clone before fetch merge\n";
3585 if ($multi_fetched) {
3586 printdebug "multi clone after fetch merge\n";
3588 clone_finish($dstdir);
3591 printdebug "clone main body\n";
3593 canonicalise_suite();
3594 my $hasgit = check_for_git();
3595 mkdir $dstdir or fail "create \`$dstdir': $!";
3597 runcmd @git, qw(init -q);
3601 my $giturl = access_giturl(1);
3602 if (defined $giturl) {
3603 runcmd @git, qw(remote add), 'origin', $giturl;
3606 progress "fetching existing git history";
3608 runcmd_ordryrun_local @git, qw(fetch origin);
3610 progress "starting new git history";
3612 fetch_from_archive() or no_such_package;
3613 my $vcsgiturl = $dsc->{'Vcs-Git'};
3614 if (length $vcsgiturl) {
3615 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3616 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3618 clone_finish($dstdir);
3622 canonicalise_suite();
3623 if (check_for_git()) {
3626 fetch_from_archive() or no_such_package();
3627 printdone "fetched into ".lrref();
3631 my $multi_fetched = fork_for_multisuite(sub { });
3632 fetch() unless $multi_fetched; # parent
3633 return if $multi_fetched eq '0'; # child
3634 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3636 printdone "fetched to ".lrref()." and merged into HEAD";
3639 sub check_not_dirty () {
3640 foreach my $f (qw(local-options local-patch-header)) {
3641 if (stat_exists "debian/source/$f") {
3642 fail "git tree contains debian/source/$f";
3646 return if $ignoredirty;
3648 my @cmd = (@git, qw(diff --quiet HEAD));
3650 $!=0; $?=-1; system @cmd;
3653 fail "working tree is dirty (does not match HEAD)";
3659 sub commit_admin ($) {
3662 runcmd_ordryrun_local @git, qw(commit -m), $m;
3665 sub commit_quilty_patch () {
3666 my $output = cmdoutput @git, qw(status --porcelain);
3668 foreach my $l (split /\n/, $output) {
3669 next unless $l =~ m/\S/;
3670 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3674 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3676 progress "nothing quilty to commit, ok.";
3679 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3680 runcmd_ordryrun_local @git, qw(add -f), @adds;
3682 Commit Debian 3.0 (quilt) metadata
3684 [dgit ($our_version) quilt-fixup]
3688 sub get_source_format () {
3690 if (open F, "debian/source/options") {
3694 s/\s+$//; # ignore missing final newline
3696 my ($k, $v) = ($`, $'); #');
3697 $v =~ s/^"(.*)"$/$1/;
3703 F->error and die $!;
3706 die $! unless $!==&ENOENT;
3709 if (!open F, "debian/source/format") {
3710 die $! unless $!==&ENOENT;
3714 F->error and die $!;
3716 return ($_, \%options);
3719 sub madformat_wantfixup ($) {
3721 return 0 unless $format eq '3.0 (quilt)';
3722 our $quilt_mode_warned;
3723 if ($quilt_mode eq 'nocheck') {
3724 progress "Not doing any fixup of \`$format' due to".
3725 " ----no-quilt-fixup or --quilt=nocheck"
3726 unless $quilt_mode_warned++;
3729 progress "Format \`$format', need to check/update patch stack"
3730 unless $quilt_mode_warned++;
3734 sub maybe_split_brain_save ($$$) {
3735 my ($headref, $dgitview, $msg) = @_;
3736 # => message fragment "$saved" describing disposition of $dgitview
3737 return "commit id $dgitview" unless defined $split_brain_save;
3738 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3739 @git, qw(update-ref -m),
3740 "dgit --dgit-view-save $msg HEAD=$headref",
3741 $split_brain_save, $dgitview);
3743 return "and left in $split_brain_save";
3746 # An "infopair" is a tuple [ $thing, $what ]
3747 # (often $thing is a commit hash; $what is a description)
3749 sub infopair_cond_equal ($$) {
3751 $x->[0] eq $y->[0] or fail <<END;
3752 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3756 sub infopair_lrf_tag_lookup ($$) {
3757 my ($tagnames, $what) = @_;
3758 # $tagname may be an array ref
3759 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3760 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3761 foreach my $tagname (@tagnames) {
3762 my $lrefname = lrfetchrefs."/tags/$tagname";
3763 my $tagobj = $lrfetchrefs_f{$lrefname};
3764 next unless defined $tagobj;
3765 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3766 return [ git_rev_parse($tagobj), $what ];
3768 fail @tagnames==1 ? <<END : <<END;
3769 Wanted tag $what (@tagnames) on dgit server, but not found
3771 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3775 sub infopair_cond_ff ($$) {
3776 my ($anc,$desc) = @_;
3777 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3778 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3782 sub pseudomerge_version_check ($$) {
3783 my ($clogp, $archive_hash) = @_;
3785 my $arch_clogp = commit_getclogp $archive_hash;
3786 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3787 'version currently in archive' ];
3788 if (defined $overwrite_version) {
3789 if (length $overwrite_version) {
3790 infopair_cond_equal([ $overwrite_version,
3791 '--overwrite= version' ],
3794 my $v = $i_arch_v->[0];
3795 progress "Checking package changelog for archive version $v ...";
3798 my @xa = ("-f$v", "-t$v");
3799 my $vclogp = parsechangelog @xa;
3802 [ (getfield $vclogp, $fn),
3803 "$fn field from dpkg-parsechangelog @xa" ];
3805 my $cv = $gf->('Version');
3806 infopair_cond_equal($i_arch_v, $cv);
3807 $cd = $gf->('Distribution');
3810 $@ =~ s/^dgit: //gm;
3812 "Perhaps debian/changelog does not mention $v ?";
3814 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3815 $cd->[1] is $cd->[0]
3816 Your tree seems to based on earlier (not uploaded) $v.
3821 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3825 sub pseudomerge_make_commit ($$$$ $$) {
3826 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3827 $msg_cmd, $msg_msg) = @_;
3828 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3830 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3831 my $authline = clogp_authline $clogp;
3835 !defined $overwrite_version ? ""
3836 : !length $overwrite_version ? " --overwrite"
3837 : " --overwrite=".$overwrite_version;
3840 my $pmf = ".git/dgit/pseudomerge";
3841 open MC, ">", $pmf or die "$pmf $!";
3842 print MC <<END or die $!;
3845 parent $archive_hash
3855 return make_commit($pmf);
3858 sub splitbrain_pseudomerge ($$$$) {
3859 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3860 # => $merged_dgitview
3861 printdebug "splitbrain_pseudomerge...\n";
3863 # We: debian/PREVIOUS HEAD($maintview)
3864 # expect: o ----------------- o
3867 # a/d/PREVIOUS $dgitview
3870 # we do: `------------------ o
3874 return $dgitview unless defined $archive_hash;
3875 return $dgitview if deliberately_not_fast_forward();
3877 printdebug "splitbrain_pseudomerge...\n";
3879 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3881 if (!defined $overwrite_version) {
3882 progress "Checking that HEAD inciudes all changes in archive...";
3885 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3887 if (defined $overwrite_version) {
3889 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3890 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3891 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3892 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3893 my $i_archive = [ $archive_hash, "current archive contents" ];
3895 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3897 infopair_cond_equal($i_dgit, $i_archive);
3898 infopair_cond_ff($i_dep14, $i_dgit);
3899 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3903 $us: check failed (maybe --overwrite is needed, consult documentation)
3908 my $r = pseudomerge_make_commit
3909 $clogp, $dgitview, $archive_hash, $i_arch_v,
3910 "dgit --quilt=$quilt_mode",
3911 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3912 Declare fast forward from $i_arch_v->[0]
3914 Make fast forward from $i_arch_v->[0]
3917 maybe_split_brain_save $maintview, $r, "pseudomerge";
3919 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3923 sub plain_overwrite_pseudomerge ($$$) {
3924 my ($clogp, $head, $archive_hash) = @_;
3926 printdebug "plain_overwrite_pseudomerge...";
3928 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3930 return $head if is_fast_fwd $archive_hash, $head;
3932 my $m = "Declare fast forward from $i_arch_v->[0]";
3934 my $r = pseudomerge_make_commit
3935 $clogp, $head, $archive_hash, $i_arch_v,
3938 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3940 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3944 sub push_parse_changelog ($) {
3947 my $clogp = Dpkg::Control::Hash->new();
3948 $clogp->load($clogpfn) or die;
3950 my $clogpackage = getfield $clogp, 'Source';
3951 $package //= $clogpackage;
3952 fail "-p specified $package but changelog specified $clogpackage"
3953 unless $package eq $clogpackage;
3954 my $cversion = getfield $clogp, 'Version';
3956 if (!$we_are_initiator) {
3957 # rpush initiator can't do this because it doesn't have $isuite yet
3958 my $tag = debiantag($cversion, access_nomdistro);
3959 runcmd @git, qw(check-ref-format), $tag;
3962 my $dscfn = dscfn($cversion);
3964 return ($clogp, $cversion, $dscfn);
3967 sub push_parse_dsc ($$$) {
3968 my ($dscfn,$dscfnwhat, $cversion) = @_;
3969 $dsc = parsecontrol($dscfn,$dscfnwhat);
3970 my $dversion = getfield $dsc, 'Version';
3971 my $dscpackage = getfield $dsc, 'Source';
3972 ($dscpackage eq $package && $dversion eq $cversion) or
3973 fail "$dscfn is for $dscpackage $dversion".
3974 " but debian/changelog is for $package $cversion";
3977 sub push_tagwants ($$$$) {
3978 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3981 TagFn => \&debiantag,
3986 if (defined $maintviewhead) {
3988 TagFn => \&debiantag_maintview,
3989 Objid => $maintviewhead,
3990 TfSuffix => '-maintview',
3993 } elsif ($dodep14tag eq 'no' ? 0
3994 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3995 : $dodep14tag eq 'always'
3996 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3997 --dep14tag-always (or equivalent in config) means server must support
3998 both "new" and "maint" tag formats, but config says it doesn't.
4000 : die "$dodep14tag ?") {
4002 TagFn => \&debiantag_maintview,
4004 TfSuffix => '-dgit',
4008 foreach my $tw (@tagwants) {
4009 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4010 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4012 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4016 sub push_mktags ($$ $$ $) {
4018 $changesfile,$changesfilewhat,
4021 die unless $tagwants->[0]{View} eq 'dgit';
4023 my $declaredistro = access_nomdistro();
4024 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4025 $dsc->{$ourdscfield[0]} = join " ",
4026 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4028 $dsc->save("$dscfn.tmp") or die $!;
4030 my $changes = parsecontrol($changesfile,$changesfilewhat);
4031 foreach my $field (qw(Source Distribution Version)) {
4032 $changes->{$field} eq $clogp->{$field} or
4033 fail "changes field $field \`$changes->{$field}'".
4034 " does not match changelog \`$clogp->{$field}'";
4037 my $cversion = getfield $clogp, 'Version';
4038 my $clogsuite = getfield $clogp, 'Distribution';
4040 # We make the git tag by hand because (a) that makes it easier
4041 # to control the "tagger" (b) we can do remote signing
4042 my $authline = clogp_authline $clogp;
4043 my $delibs = join(" ", "",@deliberatelies);
4047 my $tfn = $tw->{Tfn};
4048 my $head = $tw->{Objid};
4049 my $tag = $tw->{Tag};
4051 open TO, '>', $tfn->('.tmp') or die $!;
4052 print TO <<END or die $!;
4059 if ($tw->{View} eq 'dgit') {
4060 print TO <<END or die $!;
4061 $package release $cversion for $clogsuite ($csuite) [dgit]
4062 [dgit distro=$declaredistro$delibs]
4064 foreach my $ref (sort keys %previously) {
4065 print TO <<END or die $!;
4066 [dgit previously:$ref=$previously{$ref}]
4069 } elsif ($tw->{View} eq 'maint') {
4070 print TO <<END or die $!;
4071 $package release $cversion for $clogsuite ($csuite)
4072 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4075 die Dumper($tw)."?";
4080 my $tagobjfn = $tfn->('.tmp');
4082 if (!defined $keyid) {
4083 $keyid = access_cfg('keyid','RETURN-UNDEF');
4085 if (!defined $keyid) {
4086 $keyid = getfield $clogp, 'Maintainer';
4088 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4089 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4090 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4091 push @sign_cmd, $tfn->('.tmp');
4092 runcmd_ordryrun @sign_cmd;
4094 $tagobjfn = $tfn->('.signed.tmp');
4095 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4096 $tfn->('.tmp'), $tfn->('.tmp.asc');
4102 my @r = map { $mktag->($_); } @$tagwants;
4106 sub sign_changes ($) {
4107 my ($changesfile) = @_;
4109 my @debsign_cmd = @debsign;
4110 push @debsign_cmd, "-k$keyid" if defined $keyid;
4111 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4112 push @debsign_cmd, $changesfile;
4113 runcmd_ordryrun @debsign_cmd;
4118 printdebug "actually entering push\n";
4120 supplementary_message(<<'END');
4121 Push failed, while checking state of the archive.
4122 You can retry the push, after fixing the problem, if you like.
4124 if (check_for_git()) {
4127 my $archive_hash = fetch_from_archive();
4128 if (!$archive_hash) {
4130 fail "package appears to be new in this suite;".
4131 " if this is intentional, use --new";
4134 supplementary_message(<<'END');
4135 Push failed, while preparing your push.
4136 You can retry the push, after fixing the problem, if you like.
4139 need_tagformat 'new', "quilt mode $quilt_mode"
4140 if quiltmode_splitbrain;
4144 access_giturl(); # check that success is vaguely likely
4145 rpush_handle_protovsn_bothends() if $we_are_initiator;
4148 my $clogpfn = ".git/dgit/changelog.822.tmp";
4149 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4151 responder_send_file('parsed-changelog', $clogpfn);
4153 my ($clogp, $cversion, $dscfn) =
4154 push_parse_changelog("$clogpfn");
4156 my $dscpath = "$buildproductsdir/$dscfn";
4157 stat_exists $dscpath or
4158 fail "looked for .dsc $dscpath, but $!;".
4159 " maybe you forgot to build";
4161 responder_send_file('dsc', $dscpath);
4163 push_parse_dsc($dscpath, $dscfn, $cversion);
4165 my $format = getfield $dsc, 'Format';
4166 printdebug "format $format\n";
4168 my $actualhead = git_rev_parse('HEAD');
4169 my $dgithead = $actualhead;
4170 my $maintviewhead = undef;
4172 my $upstreamversion = upstreamversion $clogp->{Version};
4174 if (madformat_wantfixup($format)) {
4175 # user might have not used dgit build, so maybe do this now:
4176 if (quiltmode_splitbrain()) {
4177 changedir $playground;
4178 quilt_make_fake_dsc($upstreamversion);
4180 ($dgithead, $cachekey) =
4181 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4183 "--quilt=$quilt_mode but no cached dgit view:
4184 perhaps tree changed since dgit build[-source] ?";
4186 $dgithead = splitbrain_pseudomerge($clogp,
4187 $actualhead, $dgithead,
4189 $maintviewhead = $actualhead;
4191 prep_ud(); # so _only_subdir() works, below
4193 commit_quilty_patch();
4197 if (defined $overwrite_version && !defined $maintviewhead) {
4198 $dgithead = plain_overwrite_pseudomerge($clogp,
4206 if ($archive_hash) {
4207 if (is_fast_fwd($archive_hash, $dgithead)) {
4209 } elsif (deliberately_not_fast_forward) {
4212 fail "dgit push: HEAD is not a descendant".
4213 " of the archive's version.\n".
4214 "To overwrite the archive's contents,".
4215 " pass --overwrite[=VERSION].\n".
4216 "To rewind history, if permitted by the archive,".
4217 " use --deliberately-not-fast-forward.";
4221 changedir $playground;
4222 progress "checking that $dscfn corresponds to HEAD";
4223 runcmd qw(dpkg-source -x --),
4224 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4225 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4226 check_for_vendor_patches() if madformat($dsc->{format});
4228 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4229 debugcmd "+",@diffcmd;
4231 my $r = system @diffcmd;
4234 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4236 HEAD specifies a different tree to $dscfn:
4238 Perhaps you forgot to build. Or perhaps there is a problem with your
4239 source tree (see dgit(7) for some hints). To see a full diff, run
4246 if (!$changesfile) {
4247 my $pat = changespat $cversion;
4248 my @cs = glob "$buildproductsdir/$pat";
4249 fail "failed to find unique changes file".
4250 " (looked for $pat in $buildproductsdir);".
4251 " perhaps you need to use dgit -C"
4253 ($changesfile) = @cs;
4255 $changesfile = "$buildproductsdir/$changesfile";
4258 # Check that changes and .dsc agree enough
4259 $changesfile =~ m{[^/]*$};
4260 my $changes = parsecontrol($changesfile,$&);
4261 files_compare_inputs($dsc, $changes)
4262 unless forceing [qw(dsc-changes-mismatch)];
4264 # Perhaps adjust .dsc to contain right set of origs
4265 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4267 unless forceing [qw(changes-origs-exactly)];
4269 # Checks complete, we're going to try and go ahead:
4271 responder_send_file('changes',$changesfile);
4272 responder_send_command("param head $dgithead");
4273 responder_send_command("param csuite $csuite");
4274 responder_send_command("param isuite $isuite");
4275 responder_send_command("param tagformat $tagformat");
4276 if (defined $maintviewhead) {
4277 die unless ($protovsn//4) >= 4;
4278 responder_send_command("param maint-view $maintviewhead");
4281 # Perhaps send buildinfo(s) for signing
4282 my $changes_files = getfield $changes, 'Files';
4283 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4284 foreach my $bi (@buildinfos) {
4285 responder_send_command("param buildinfo-filename $bi");
4286 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4289 if (deliberately_not_fast_forward) {
4290 git_for_each_ref(lrfetchrefs, sub {
4291 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4292 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4293 responder_send_command("previously $rrefname=$objid");
4294 $previously{$rrefname} = $objid;
4298 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4302 supplementary_message(<<'END');
4303 Push failed, while signing the tag.
4304 You can retry the push, after fixing the problem, if you like.
4306 # If we manage to sign but fail to record it anywhere, it's fine.
4307 if ($we_are_responder) {
4308 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4309 responder_receive_files('signed-tag', @tagobjfns);
4311 @tagobjfns = push_mktags($clogp,$dscpath,
4312 $changesfile,$changesfile,
4315 supplementary_message(<<'END');
4316 Push failed, *after* signing the tag.
4317 If you want to try again, you should use a new version number.
4320 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4322 foreach my $tw (@tagwants) {
4323 my $tag = $tw->{Tag};
4324 my $tagobjfn = $tw->{TagObjFn};
4326 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4327 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4328 runcmd_ordryrun_local
4329 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4332 supplementary_message(<<'END');
4333 Push failed, while updating the remote git repository - see messages above.
4334 If you want to try again, you should use a new version number.
4336 if (!check_for_git()) {
4337 create_remote_git_repo();
4340 my @pushrefs = $forceflag.$dgithead.":".rrref();
4341 foreach my $tw (@tagwants) {
4342 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4345 runcmd_ordryrun @git,
4346 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4347 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4349 supplementary_message(<<'END');
4350 Push failed, while obtaining signatures on the .changes and .dsc.
4351 If it was just that the signature failed, you may try again by using
4352 debsign by hand to sign the changes
4354 and then dput to complete the upload.
4355 If you need to change the package, you must use a new version number.
4357 if ($we_are_responder) {
4358 my $dryrunsuffix = act_local() ? "" : ".tmp";
4359 my @rfiles = ($dscpath, $changesfile);
4360 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4361 responder_receive_files('signed-dsc-changes',
4362 map { "$_$dryrunsuffix" } @rfiles);
4365 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4367 progress "[new .dsc left in $dscpath.tmp]";
4369 sign_changes $changesfile;
4372 supplementary_message(<<END);
4373 Push failed, while uploading package(s) to the archive server.
4374 You can retry the upload of exactly these same files with dput of:
4376 If that .changes file is broken, you will need to use a new version
4377 number for your next attempt at the upload.
4379 my $host = access_cfg('upload-host','RETURN-UNDEF');
4380 my @hostarg = defined($host) ? ($host,) : ();
4381 runcmd_ordryrun @dput, @hostarg, $changesfile;
4382 printdone "pushed and uploaded $cversion";
4384 supplementary_message('');
4385 responder_send_command("complete");
4389 not_necessarily_a_tree();
4394 badusage "-p is not allowed with clone; specify as argument instead"
4395 if defined $package;
4398 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4399 ($package,$isuite) = @ARGV;
4400 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4401 ($package,$dstdir) = @ARGV;
4402 } elsif (@ARGV==3) {
4403 ($package,$isuite,$dstdir) = @ARGV;
4405 badusage "incorrect arguments to dgit clone";
4409 $dstdir ||= "$package";
4410 if (stat_exists $dstdir) {
4411 fail "$dstdir already exists";
4415 if ($rmonerror && !$dryrun_level) {
4416 $cwd_remove= getcwd();
4418 return unless defined $cwd_remove;
4419 if (!chdir "$cwd_remove") {
4420 return if $!==&ENOENT;
4421 die "chdir $cwd_remove: $!";
4423 printdebug "clone rmonerror removing $dstdir\n";
4425 rmtree($dstdir) or die "remove $dstdir: $!\n";
4426 } elsif (grep { $! == $_ }
4427 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4429 print STDERR "check whether to remove $dstdir: $!\n";
4435 $cwd_remove = undef;
4438 sub branchsuite () {
4439 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4440 my $branch = cmdoutput_errok @cmd;
4441 if (!defined $branch) {
4442 $?==256 or failedcmd @cmd;
4445 if ($branch =~ m#$lbranch_re#o) {
4452 sub fetchpullargs () {
4453 if (!defined $package) {
4454 my $sourcep = parsecontrol('debian/control','debian/control');
4455 $package = getfield $sourcep, 'Source';
4458 $isuite = branchsuite();
4460 my $clogp = parsechangelog();
4461 my $clogsuite = getfield $clogp, 'Distribution';
4462 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4464 } elsif (@ARGV==1) {
4467 badusage "incorrect arguments to dgit fetch or dgit pull";
4475 my $multi_fetched = fork_for_multisuite(sub { });
4476 exit 0 if $multi_fetched;
4483 if (quiltmode_splitbrain()) {
4484 my ($format, $fopts) = get_source_format();
4485 madformat($format) and fail <<END
4486 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4494 build_or_push_prep_early();
4499 } elsif (@ARGV==1) {
4500 ($specsuite) = (@ARGV);
4502 badusage "incorrect arguments to dgit $subcommand";
4505 local ($package) = $existing_package; # this is a hack
4506 canonicalise_suite();
4508 canonicalise_suite();
4510 if (defined $specsuite &&
4511 $specsuite ne $isuite &&
4512 $specsuite ne $csuite) {
4513 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4514 " but command line specifies $specsuite";
4523 #---------- remote commands' implementation ----------
4525 sub pre_remote_push_build_host {
4526 my ($nrargs) = shift @ARGV;
4527 my (@rargs) = @ARGV[0..$nrargs-1];
4528 @ARGV = @ARGV[$nrargs..$#ARGV];
4530 my ($dir,$vsnwant) = @rargs;
4531 # vsnwant is a comma-separated list; we report which we have
4532 # chosen in our ready response (so other end can tell if they
4535 $we_are_responder = 1;
4536 $us .= " (build host)";
4538 open PI, "<&STDIN" or die $!;
4539 open STDIN, "/dev/null" or die $!;
4540 open PO, ">&STDOUT" or die $!;
4542 open STDOUT, ">&STDERR" or die $!;
4546 ($protovsn) = grep {
4547 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4548 } @rpushprotovsn_support;
4550 fail "build host has dgit rpush protocol versions ".
4551 (join ",", @rpushprotovsn_support).
4552 " but invocation host has $vsnwant"
4553 unless defined $protovsn;
4557 sub cmd_remote_push_build_host {
4558 responder_send_command("dgit-remote-push-ready $protovsn");
4562 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4563 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4564 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4565 # a good error message)
4567 sub rpush_handle_protovsn_bothends () {
4568 if ($protovsn < 4) {
4569 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4578 my $report = i_child_report();
4579 if (defined $report) {
4580 printdebug "($report)\n";
4581 } elsif ($i_child_pid) {
4582 printdebug "(killing build host child $i_child_pid)\n";
4583 kill 15, $i_child_pid;
4585 if (defined $i_tmp && !defined $initiator_tempdir) {
4587 eval { rmtree $i_tmp; };
4592 return unless forkcheck_mainprocess();
4597 my ($base,$selector,@args) = @_;
4598 $selector =~ s/\-/_/g;
4599 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4603 not_necessarily_a_tree();
4608 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4616 push @rargs, join ",", @rpushprotovsn_support;
4619 push @rdgit, @ropts;
4620 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4622 my @cmd = (@ssh, $host, shellquote @rdgit);
4625 $we_are_initiator=1;
4627 if (defined $initiator_tempdir) {
4628 rmtree $initiator_tempdir;
4629 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4630 $i_tmp = $initiator_tempdir;
4634 $i_child_pid = open2(\*RO, \*RI, @cmd);
4636 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4637 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4638 $supplementary_message = '' unless $protovsn >= 3;
4641 my ($icmd,$iargs) = initiator_expect {
4642 m/^(\S+)(?: (.*))?$/;
4645 i_method "i_resp", $icmd, $iargs;
4649 sub i_resp_progress ($) {
4651 my $msg = protocol_read_bytes \*RO, $rhs;
4655 sub i_resp_supplementary_message ($) {
4657 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4660 sub i_resp_complete {
4661 my $pid = $i_child_pid;
4662 $i_child_pid = undef; # prevents killing some other process with same pid
4663 printdebug "waiting for build host child $pid...\n";
4664 my $got = waitpid $pid, 0;
4665 die $! unless $got == $pid;
4666 die "build host child failed $?" if $?;
4669 printdebug "all done\n";
4673 sub i_resp_file ($) {
4675 my $localname = i_method "i_localname", $keyword;
4676 my $localpath = "$i_tmp/$localname";
4677 stat_exists $localpath and
4678 badproto \*RO, "file $keyword ($localpath) twice";
4679 protocol_receive_file \*RO, $localpath;
4680 i_method "i_file", $keyword;
4685 sub i_resp_param ($) {
4686 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4690 sub i_resp_previously ($) {
4691 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4692 or badproto \*RO, "bad previously spec";
4693 my $r = system qw(git check-ref-format), $1;
4694 die "bad previously ref spec ($r)" if $r;
4695 $previously{$1} = $2;
4700 sub i_resp_want ($) {
4702 die "$keyword ?" if $i_wanted{$keyword}++;
4704 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4705 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4706 die unless $isuite =~ m/^$suite_re$/;
4709 rpush_handle_protovsn_bothends();
4711 fail "rpush negotiated protocol version $protovsn".
4712 " which does not support quilt mode $quilt_mode"
4713 if quiltmode_splitbrain;
4715 my @localpaths = i_method "i_want", $keyword;
4716 printdebug "[[ $keyword @localpaths\n";
4717 foreach my $localpath (@localpaths) {
4718 protocol_send_file \*RI, $localpath;
4720 print RI "files-end\n" or die $!;
4723 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4725 sub i_localname_parsed_changelog {
4726 return "remote-changelog.822";
4728 sub i_file_parsed_changelog {
4729 ($i_clogp, $i_version, $i_dscfn) =
4730 push_parse_changelog "$i_tmp/remote-changelog.822";
4731 die if $i_dscfn =~ m#/|^\W#;
4734 sub i_localname_dsc {
4735 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4740 sub i_localname_buildinfo ($) {
4741 my $bi = $i_param{'buildinfo-filename'};
4742 defined $bi or badproto \*RO, "buildinfo before filename";
4743 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4744 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4745 or badproto \*RO, "improper buildinfo filename";
4748 sub i_file_buildinfo {
4749 my $bi = $i_param{'buildinfo-filename'};
4750 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4751 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4752 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4753 files_compare_inputs($bd, $ch);
4754 (getfield $bd, $_) eq (getfield $ch, $_) or
4755 fail "buildinfo mismatch $_"
4756 foreach qw(Source Version);
4757 !defined $bd->{$_} or
4758 fail "buildinfo contains $_"
4759 foreach qw(Changes Changed-by Distribution);
4761 push @i_buildinfos, $bi;
4762 delete $i_param{'buildinfo-filename'};
4765 sub i_localname_changes {
4766 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4767 $i_changesfn = $i_dscfn;
4768 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4769 return $i_changesfn;
4771 sub i_file_changes { }
4773 sub i_want_signed_tag {
4774 printdebug Dumper(\%i_param, $i_dscfn);
4775 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4776 && defined $i_param{'csuite'}
4777 or badproto \*RO, "premature desire for signed-tag";
4778 my $head = $i_param{'head'};
4779 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4781 my $maintview = $i_param{'maint-view'};
4782 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4785 if ($protovsn >= 4) {
4786 my $p = $i_param{'tagformat'} // '<undef>';
4788 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4791 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4793 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4795 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4798 push_mktags $i_clogp, $i_dscfn,
4799 $i_changesfn, 'remote changes',
4803 sub i_want_signed_dsc_changes {
4804 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4805 sign_changes $i_changesfn;
4806 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4809 #---------- building etc. ----------
4815 #----- `3.0 (quilt)' handling -----
4817 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4819 sub quiltify_dpkg_commit ($$$;$) {
4820 my ($patchname,$author,$msg, $xinfo) = @_;
4824 my $descfn = ".git/dgit/quilt-description.tmp";
4825 open O, '>', $descfn or die "$descfn: $!";
4826 $msg =~ s/\n+/\n\n/;
4827 print O <<END or die $!;
4829 ${xinfo}Subject: $msg
4836 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4837 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4838 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4839 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4843 sub quiltify_trees_differ ($$;$$$) {
4844 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4845 # returns true iff the two tree objects differ other than in debian/
4846 # with $finegrained,
4847 # returns bitmask 01 - differ in upstream files except .gitignore
4848 # 02 - differ in .gitignore
4849 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4850 # is set for each modified .gitignore filename $fn
4851 # if $unrepres is defined, array ref to which is appeneded
4852 # a list of unrepresentable changes (removals of upstream files
4855 my @cmd = (@git, qw(diff-tree -z --no-renames));
4856 push @cmd, qw(--name-only) unless $unrepres;
4857 push @cmd, qw(-r) if $finegrained || $unrepres;
4859 my $diffs= cmdoutput @cmd;
4862 foreach my $f (split /\0/, $diffs) {
4863 if ($unrepres && !@lmodes) {
4864 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4867 my ($oldmode,$newmode) = @lmodes;
4870 next if $f =~ m#^debian(?:/.*)?$#s;
4874 die "not a plain file or symlink\n"
4875 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
4876 $oldmode =~ m/^(?:10|12)\d{4}$/;
4877 if ($oldmode =~ m/[^0]/ &&
4878 $newmode =~ m/[^0]/) {
4879 # both old and new files exist
4880 die "mode or type changed\n" if $oldmode ne $newmode;
4881 die "modified symlink\n" unless $newmode =~ m/^10/;
4882 } elsif ($oldmode =~ m/[^0]/) {
4884 die "deletion of symlink\n"
4885 unless $oldmode =~ m/^10/;
4888 die "creation with non-default mode\n"
4889 unless $newmode =~ m/^100644$/ or
4890 $newmode =~ m/^120000$/;
4894 local $/="\n"; chomp $@;
4895 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4899 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4900 $r |= $isignore ? 02 : 01;
4901 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4903 printdebug "quiltify_trees_differ $x $y => $r\n";
4907 sub quiltify_tree_sentinelfiles ($) {
4908 # lists the `sentinel' files present in the tree
4910 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4911 qw(-- debian/rules debian/control);
4916 sub quiltify_splitbrain_needed () {
4917 if (!$split_brain) {
4918 progress "dgit view: changes are required...";
4919 runcmd @git, qw(checkout -q -b dgit-view);
4924 sub quiltify_splitbrain ($$$$$$) {
4925 my ($clogp, $unapplied, $headref, $diffbits,
4926 $editedignores, $cachekey) = @_;
4927 if ($quilt_mode !~ m/gbp|dpm/) {
4928 # treat .gitignore just like any other upstream file
4929 $diffbits = { %$diffbits };
4930 $_ = !!$_ foreach values %$diffbits;
4932 # We would like any commits we generate to be reproducible
4933 my @authline = clogp_authline($clogp);
4934 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4935 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4936 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4937 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4938 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4939 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4941 if ($quilt_mode =~ m/gbp|unapplied/ &&
4942 ($diffbits->{O2H} & 01)) {
4944 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4945 " but git tree differs from orig in upstream files.";
4946 if (!stat_exists "debian/patches") {
4948 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4952 if ($quilt_mode =~ m/dpm/ &&
4953 ($diffbits->{H2A} & 01)) {
4955 --quilt=$quilt_mode specified, implying patches-applied git tree
4956 but git tree differs from result of applying debian/patches to upstream
4959 if ($quilt_mode =~ m/gbp|unapplied/ &&
4960 ($diffbits->{O2A} & 01)) { # some patches
4961 quiltify_splitbrain_needed();
4962 progress "dgit view: creating patches-applied version using gbp pq";
4963 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4964 # gbp pq import creates a fresh branch; push back to dgit-view
4965 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4966 runcmd @git, qw(checkout -q dgit-view);
4968 if ($quilt_mode =~ m/gbp|dpm/ &&
4969 ($diffbits->{O2A} & 02)) {
4971 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4972 tool which does not create patches for changes to upstream
4973 .gitignores: but, such patches exist in debian/patches.
4976 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4977 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4978 quiltify_splitbrain_needed();
4979 progress "dgit view: creating patch to represent .gitignore changes";
4980 ensuredir "debian/patches";
4981 my $gipatch = "debian/patches/auto-gitignore";
4982 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4983 stat GIPATCH or die "$gipatch: $!";
4984 fail "$gipatch already exists; but want to create it".
4985 " to record .gitignore changes" if (stat _)[7];
4986 print GIPATCH <<END or die "$gipatch: $!";
4987 Subject: Update .gitignore from Debian packaging branch
4989 The Debian packaging git branch contains these updates to the upstream
4990 .gitignore file(s). This patch is autogenerated, to provide these
4991 updates to users of the official Debian archive view of the package.
4993 [dgit ($our_version) update-gitignore]
4996 close GIPATCH or die "$gipatch: $!";
4997 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4998 $unapplied, $headref, "--", sort keys %$editedignores;
4999 open SERIES, "+>>", "debian/patches/series" or die $!;
5000 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5002 defined read SERIES, $newline, 1 or die $!;
5003 print SERIES "\n" or die $! unless $newline eq "\n";
5004 print SERIES "auto-gitignore\n" or die $!;
5005 close SERIES or die $!;
5006 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5008 Commit patch to update .gitignore
5010 [dgit ($our_version) update-gitignore-quilt-fixup]
5014 my $dgitview = git_rev_parse 'HEAD';
5017 # When we no longer need to support squeeze, use --create-reflog
5019 ensuredir ".git/logs/refs/dgit-intern";
5020 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
5023 my $oldcache = git_get_ref "refs/$splitbraincache";
5024 if ($oldcache eq $dgitview) {
5025 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5026 # git update-ref doesn't always update, in this case. *sigh*
5027 my $dummy = make_commit_text <<END;
5030 author Dgit <dgit\@example.com> 1000000000 +0000
5031 committer Dgit <dgit\@example.com> 1000000000 +0000
5033 Dummy commit - do not use
5035 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5036 "refs/$splitbraincache", $dummy;
5038 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5041 changedir "$playground/work";
5043 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5044 progress "dgit view: created ($saved)";
5047 sub quiltify ($$$$) {
5048 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5050 # Quilt patchification algorithm
5052 # We search backwards through the history of the main tree's HEAD
5053 # (T) looking for a start commit S whose tree object is identical
5054 # to to the patch tip tree (ie the tree corresponding to the
5055 # current dpkg-committed patch series). For these purposes
5056 # `identical' disregards anything in debian/ - this wrinkle is
5057 # necessary because dpkg-source treates debian/ specially.
5059 # We can only traverse edges where at most one of the ancestors'
5060 # trees differs (in changes outside in debian/). And we cannot
5061 # handle edges which change .pc/ or debian/patches. To avoid
5062 # going down a rathole we avoid traversing edges which introduce
5063 # debian/rules or debian/control. And we set a limit on the
5064 # number of edges we are willing to look at.
5066 # If we succeed, we walk forwards again. For each traversed edge
5067 # PC (with P parent, C child) (starting with P=S and ending with
5068 # C=T) to we do this:
5070 # - dpkg-source --commit with a patch name and message derived from C
5071 # After traversing PT, we git commit the changes which
5072 # should be contained within debian/patches.
5074 # The search for the path S..T is breadth-first. We maintain a
5075 # todo list containing search nodes. A search node identifies a
5076 # commit, and looks something like this:
5078 # Commit => $git_commit_id,
5079 # Child => $c, # or undef if P=T
5080 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5081 # Nontrivial => true iff $p..$c has relevant changes
5088 my %considered; # saves being exponential on some weird graphs
5090 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5093 my ($search,$whynot) = @_;
5094 printdebug " search NOT $search->{Commit} $whynot\n";
5095 $search->{Whynot} = $whynot;
5096 push @nots, $search;
5097 no warnings qw(exiting);
5106 my $c = shift @todo;
5107 next if $considered{$c->{Commit}}++;
5109 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5111 printdebug "quiltify investigate $c->{Commit}\n";
5114 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5115 printdebug " search finished hooray!\n";
5120 if ($quilt_mode eq 'nofix') {
5121 fail "quilt fixup required but quilt mode is \`nofix'\n".
5122 "HEAD commit $c->{Commit} differs from tree implied by ".
5123 " debian/patches (tree object $oldtiptree)";
5125 if ($quilt_mode eq 'smash') {
5126 printdebug " search quitting smash\n";
5130 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5131 $not->($c, "has $c_sentinels not $t_sentinels")
5132 if $c_sentinels ne $t_sentinels;
5134 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5135 $commitdata =~ m/\n\n/;
5137 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5138 @parents = map { { Commit => $_, Child => $c } } @parents;
5140 $not->($c, "root commit") if !@parents;
5142 foreach my $p (@parents) {
5143 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5145 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5146 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5148 foreach my $p (@parents) {
5149 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5151 my @cmd= (@git, qw(diff-tree -r --name-only),
5152 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5153 my $patchstackchange = cmdoutput @cmd;
5154 if (length $patchstackchange) {
5155 $patchstackchange =~ s/\n/,/g;
5156 $not->($p, "changed $patchstackchange");
5159 printdebug " search queue P=$p->{Commit} ",
5160 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5166 printdebug "quiltify want to smash\n";
5169 my $x = $_[0]{Commit};
5170 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5173 my $reportnot = sub {
5175 my $s = $abbrev->($notp);
5176 my $c = $notp->{Child};
5177 $s .= "..".$abbrev->($c) if $c;
5178 $s .= ": ".$notp->{Whynot};
5181 if ($quilt_mode eq 'linear') {
5182 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5183 foreach my $notp (@nots) {
5184 print STDERR "$us: ", $reportnot->($notp), "\n";
5186 print STDERR "$us: $_\n" foreach @$failsuggestion;
5187 fail "quilt fixup naive history linearisation failed.\n".
5188 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5189 } elsif ($quilt_mode eq 'smash') {
5190 } elsif ($quilt_mode eq 'auto') {
5191 progress "quilt fixup cannot be linear, smashing...";
5193 die "$quilt_mode ?";
5196 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5197 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5199 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5201 quiltify_dpkg_commit "auto-$version-$target-$time",
5202 (getfield $clogp, 'Maintainer'),
5203 "Automatically generated patch ($clogp->{Version})\n".
5204 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5208 progress "quiltify linearisation planning successful, executing...";
5210 for (my $p = $sref_S;
5211 my $c = $p->{Child};
5213 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5214 next unless $p->{Nontrivial};
5216 my $cc = $c->{Commit};
5218 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5219 $commitdata =~ m/\n\n/ or die "$c ?";
5222 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5225 my $commitdate = cmdoutput
5226 @git, qw(log -n1 --pretty=format:%aD), $cc;
5228 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5230 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5237 my $gbp_check_suitable = sub {
5242 die "contains unexpected slashes\n" if m{//} || m{/$};
5243 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5244 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5245 die "is series file\n" if m{$series_filename_re}o;
5246 die "too long" if length > 200;
5248 return $_ unless $@;
5249 print STDERR "quiltifying commit $cc:".
5250 " ignoring/dropping Gbp-Pq $what: $@";
5254 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5256 (\S+) \s* \n //ixm) {
5257 $patchname = $gbp_check_suitable->($1, 'Name');
5259 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5261 (\S+) \s* \n //ixm) {
5262 $patchdir = $gbp_check_suitable->($1, 'Topic');
5267 if (!defined $patchname) {
5268 $patchname = $title;
5269 $patchname =~ s/[.:]$//;
5272 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5273 my $translitname = $converter->convert($patchname);
5274 die unless defined $translitname;
5275 $patchname = $translitname;
5278 "dgit: patch title transliteration error: $@"
5280 $patchname =~ y/ A-Z/-a-z/;
5281 $patchname =~ y/-a-z0-9_.+=~//cd;
5282 $patchname =~ s/^\W/x-$&/;
5283 $patchname = substr($patchname,0,40);
5284 $patchname .= ".patch";
5286 if (!defined $patchdir) {
5289 if (length $patchdir) {
5290 $patchname = "$patchdir/$patchname";
5292 if ($patchname =~ m{^(.*)/}) {
5293 mkpath "debian/patches/$1";
5298 stat "debian/patches/$patchname$index";
5300 $!==ENOENT or die "$patchname$index $!";
5302 runcmd @git, qw(checkout -q), $cc;
5304 # We use the tip's changelog so that dpkg-source doesn't
5305 # produce complaining messages from dpkg-parsechangelog. None
5306 # of the information dpkg-source gets from the changelog is
5307 # actually relevant - it gets put into the original message
5308 # which dpkg-source provides our stunt editor, and then
5310 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5312 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5313 "Date: $commitdate\n".
5314 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5316 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5319 runcmd @git, qw(checkout -q master);
5322 sub build_maybe_quilt_fixup () {
5323 my ($format,$fopts) = get_source_format;
5324 return unless madformat_wantfixup $format;
5327 check_for_vendor_patches();
5329 if (quiltmode_splitbrain) {
5330 fail <<END unless access_cfg_tagformats_can_splitbrain;
5331 quilt mode $quilt_mode requires split view so server needs to support
5332 both "new" and "maint" tag formats, but config says it doesn't.
5336 my $clogp = parsechangelog();
5337 my $headref = git_rev_parse('HEAD');
5340 changedir $playground;
5342 my $upstreamversion = upstreamversion $version;
5344 if ($fopts->{'single-debian-patch'}) {
5345 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5347 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5350 die 'bug' if $split_brain && !$need_split_build_invocation;
5353 runcmd_ordryrun_local
5354 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5357 sub quilt_fixup_mkwork ($) {
5360 mkdir "work" or die $!;
5362 mktree_in_ud_here();
5363 runcmd @git, qw(reset -q --hard), $headref;
5366 sub quilt_fixup_linkorigs ($$) {
5367 my ($upstreamversion, $fn) = @_;
5368 # calls $fn->($leafname);
5370 foreach my $f (<$maindir/../*>) { #/){
5371 my $b=$f; $b =~ s{.*/}{};
5373 local ($debuglevel) = $debuglevel-1;
5374 printdebug "QF linkorigs $b, $f ?\n";
5376 next unless is_orig_file_of_vsn $b, $upstreamversion;
5377 printdebug "QF linkorigs $b, $f Y\n";
5378 link_ltarget $f, $b or die "$b $!";
5383 sub quilt_fixup_delete_pc () {
5384 runcmd @git, qw(rm -rqf .pc);
5386 Commit removal of .pc (quilt series tracking data)
5388 [dgit ($our_version) upgrade quilt-remove-pc]
5392 sub quilt_fixup_singlepatch ($$$) {
5393 my ($clogp, $headref, $upstreamversion) = @_;
5395 progress "starting quiltify (single-debian-patch)";
5397 # dpkg-source --commit generates new patches even if
5398 # single-debian-patch is in debian/source/options. In order to
5399 # get it to generate debian/patches/debian-changes, it is
5400 # necessary to build the source package.
5402 quilt_fixup_linkorigs($upstreamversion, sub { });
5403 quilt_fixup_mkwork($headref);
5405 rmtree("debian/patches");
5407 runcmd @dpkgsource, qw(-b .);
5409 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5410 rename srcfn("$upstreamversion", "/debian/patches"),
5411 "work/debian/patches";
5414 commit_quilty_patch();
5417 sub quilt_make_fake_dsc ($) {
5418 my ($upstreamversion) = @_;
5420 my $fakeversion="$upstreamversion-~~DGITFAKE";
5422 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5423 print $fakedsc <<END or die $!;
5426 Version: $fakeversion
5430 my $dscaddfile=sub {
5433 my $md = new Digest::MD5;
5435 my $fh = new IO::File $b, '<' or die "$b $!";
5440 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5443 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5445 my @files=qw(debian/source/format debian/rules
5446 debian/control debian/changelog);
5447 foreach my $maybe (qw(debian/patches debian/source/options
5448 debian/tests/control)) {
5449 next unless stat_exists "$maindir/$maybe";
5450 push @files, $maybe;
5453 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5454 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5456 $dscaddfile->($debtar);
5457 close $fakedsc or die $!;
5460 sub quilt_check_splitbrain_cache ($$) {
5461 my ($headref, $upstreamversion) = @_;
5462 # Called only if we are in (potentially) split brain mode.
5463 # Called in playground.
5464 # Computes the cache key and looks in the cache.
5465 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5467 my $splitbrain_cachekey;
5470 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5471 # we look in the reflog of dgit-intern/quilt-cache
5472 # we look for an entry whose message is the key for the cache lookup
5473 my @cachekey = (qw(dgit), $our_version);
5474 push @cachekey, $upstreamversion;
5475 push @cachekey, $quilt_mode;
5476 push @cachekey, $headref;
5478 push @cachekey, hashfile('fake.dsc');
5480 my $srcshash = Digest::SHA->new(256);
5481 my %sfs = ( %INC, '$0(dgit)' => $0 );
5482 foreach my $sfk (sort keys %sfs) {
5483 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5484 $srcshash->add($sfk," ");
5485 $srcshash->add(hashfile($sfs{$sfk}));
5486 $srcshash->add("\n");
5488 push @cachekey, $srcshash->hexdigest();
5489 $splitbrain_cachekey = "@cachekey";
5491 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5493 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5494 debugcmd "|(probably)",@cmd;
5495 my $child = open GC, "-|"; defined $child or die $!;
5497 chdir $maindir or die $!;
5498 if (!stat ".git/logs/refs/$splitbraincache") {
5499 $! == ENOENT or die $!;
5500 printdebug ">(no reflog)\n";
5507 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5508 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5511 quilt_fixup_mkwork($headref);
5512 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5513 if ($cachehit ne $headref) {
5514 progress "dgit view: found cached ($saved)";
5515 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5517 return ($cachehit, $splitbrain_cachekey);
5519 progress "dgit view: found cached, no changes required";
5520 return ($headref, $splitbrain_cachekey);
5522 die $! if GC->error;
5523 failedcmd unless close GC;
5525 printdebug "splitbrain cache miss\n";
5526 return (undef, $splitbrain_cachekey);
5529 sub quilt_fixup_multipatch ($$$) {
5530 my ($clogp, $headref, $upstreamversion) = @_;
5532 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5535 # - honour any existing .pc in case it has any strangeness
5536 # - determine the git commit corresponding to the tip of
5537 # the patch stack (if there is one)
5538 # - if there is such a git commit, convert each subsequent
5539 # git commit into a quilt patch with dpkg-source --commit
5540 # - otherwise convert all the differences in the tree into
5541 # a single git commit
5545 # Our git tree doesn't necessarily contain .pc. (Some versions of
5546 # dgit would include the .pc in the git tree.) If there isn't
5547 # one, we need to generate one by unpacking the patches that we
5550 # We first look for a .pc in the git tree. If there is one, we
5551 # will use it. (This is not the normal case.)
5553 # Otherwise need to regenerate .pc so that dpkg-source --commit
5554 # can work. We do this as follows:
5555 # 1. Collect all relevant .orig from parent directory
5556 # 2. Generate a debian.tar.gz out of
5557 # debian/{patches,rules,source/format,source/options}
5558 # 3. Generate a fake .dsc containing just these fields:
5559 # Format Source Version Files
5560 # 4. Extract the fake .dsc
5561 # Now the fake .dsc has a .pc directory.
5562 # (In fact we do this in every case, because in future we will
5563 # want to search for a good base commit for generating patches.)
5565 # Then we can actually do the dpkg-source --commit
5566 # 1. Make a new working tree with the same object
5567 # store as our main tree and check out the main
5569 # 2. Copy .pc from the fake's extraction, if necessary
5570 # 3. Run dpkg-source --commit
5571 # 4. If the result has changes to debian/, then
5572 # - git add them them
5573 # - git add .pc if we had a .pc in-tree
5575 # 5. If we had a .pc in-tree, delete it, and git commit
5576 # 6. Back in the main tree, fast forward to the new HEAD
5578 # Another situation we may have to cope with is gbp-style
5579 # patches-unapplied trees.
5581 # We would want to detect these, so we know to escape into
5582 # quilt_fixup_gbp. However, this is in general not possible.
5583 # Consider a package with a one patch which the dgit user reverts
5584 # (with git revert or the moral equivalent).
5586 # That is indistinguishable in contents from a patches-unapplied
5587 # tree. And looking at the history to distinguish them is not
5588 # useful because the user might have made a confusing-looking git
5589 # history structure (which ought to produce an error if dgit can't
5590 # cope, not a silent reintroduction of an unwanted patch).
5592 # So gbp users will have to pass an option. But we can usually
5593 # detect their failure to do so: if the tree is not a clean
5594 # patches-applied tree, quilt linearisation fails, but the tree
5595 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5596 # they want --quilt=unapplied.
5598 # To help detect this, when we are extracting the fake dsc, we
5599 # first extract it with --skip-patches, and then apply the patches
5600 # afterwards with dpkg-source --before-build. That lets us save a
5601 # tree object corresponding to .origs.
5603 my $splitbrain_cachekey;
5605 quilt_make_fake_dsc($upstreamversion);
5607 if (quiltmode_splitbrain()) {
5609 ($cachehit, $splitbrain_cachekey) =
5610 quilt_check_splitbrain_cache($headref, $upstreamversion);
5611 return if $cachehit;
5615 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5617 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5618 rename $fakexdir, "fake" or die "$fakexdir $!";
5622 remove_stray_gits("source package");
5623 mktree_in_ud_here();
5627 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5628 my $unapplied=git_add_write_tree();
5629 printdebug "fake orig tree object $unapplied\n";
5633 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5635 if (system @bbcmd) {
5636 failedcmd @bbcmd if $? < 0;
5638 failed to apply your git tree's patch stack (from debian/patches/) to
5639 the corresponding upstream tarball(s). Your source tree and .orig
5640 are probably too inconsistent. dgit can only fix up certain kinds of
5641 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5647 quilt_fixup_mkwork($headref);
5650 if (stat_exists ".pc") {
5652 progress "Tree already contains .pc - will use it then delete it.";
5655 rename '../fake/.pc','.pc' or die $!;
5658 changedir '../fake';
5660 my $oldtiptree=git_add_write_tree();
5661 printdebug "fake o+d/p tree object $unapplied\n";
5662 changedir '../work';
5665 # We calculate some guesswork now about what kind of tree this might
5666 # be. This is mostly for error reporting.
5672 # O = orig, without patches applied
5673 # A = "applied", ie orig with H's debian/patches applied
5674 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5675 \%editedignores, \@unrepres),
5676 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5677 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5681 foreach my $b (qw(01 02)) {
5682 foreach my $v (qw(O2H O2A H2A)) {
5683 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5686 printdebug "differences \@dl @dl.\n";
5689 "$us: base trees orig=%.20s o+d/p=%.20s",
5690 $unapplied, $oldtiptree;
5692 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5693 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5694 $dl[0], $dl[1], $dl[3], $dl[4],
5698 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5700 forceable_fail [qw(unrepresentable)], <<END;
5701 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5706 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5707 push @failsuggestion, "This might be a patches-unapplied branch.";
5708 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5709 push @failsuggestion, "This might be a patches-applied branch.";
5711 push @failsuggestion, "Maybe you need to specify one of".
5712 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5714 if (quiltmode_splitbrain()) {
5715 quiltify_splitbrain($clogp, $unapplied, $headref,
5716 $diffbits, \%editedignores,
5717 $splitbrain_cachekey);
5721 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5722 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5724 if (!open P, '>>', ".pc/applied-patches") {
5725 $!==&ENOENT or die $!;
5730 commit_quilty_patch();
5732 if ($mustdeletepc) {
5733 quilt_fixup_delete_pc();
5737 sub quilt_fixup_editor () {
5738 my $descfn = $ENV{$fakeeditorenv};
5739 my $editing = $ARGV[$#ARGV];
5740 open I1, '<', $descfn or die "$descfn: $!";
5741 open I2, '<', $editing or die "$editing: $!";
5742 unlink $editing or die "$editing: $!";
5743 open O, '>', $editing or die "$editing: $!";
5744 while (<I1>) { print O or die $!; } I1->error and die $!;
5747 $copying ||= m/^\-\-\- /;
5748 next unless $copying;
5751 I2->error and die $!;
5756 sub maybe_apply_patches_dirtily () {
5757 return unless $quilt_mode =~ m/gbp|unapplied/;
5758 print STDERR <<END or die $!;
5760 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5761 dgit: Have to apply the patches - making the tree dirty.
5762 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5765 $patches_applied_dirtily = 01;
5766 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5767 runcmd qw(dpkg-source --before-build .);
5770 sub maybe_unapply_patches_again () {
5771 progress "dgit: Unapplying patches again to tidy up the tree."
5772 if $patches_applied_dirtily;
5773 runcmd qw(dpkg-source --after-build .)
5774 if $patches_applied_dirtily & 01;
5776 if $patches_applied_dirtily & 02;
5777 $patches_applied_dirtily = 0;
5780 #----- other building -----
5782 our $clean_using_builder;
5783 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5784 # clean the tree before building (perhaps invoked indirectly by
5785 # whatever we are using to run the build), rather than separately
5786 # and explicitly by us.
5789 return if $clean_using_builder;
5790 if ($cleanmode eq 'dpkg-source') {
5791 maybe_apply_patches_dirtily();
5792 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5793 } elsif ($cleanmode eq 'dpkg-source-d') {
5794 maybe_apply_patches_dirtily();
5795 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5796 } elsif ($cleanmode eq 'git') {
5797 runcmd_ordryrun_local @git, qw(clean -xdf);
5798 } elsif ($cleanmode eq 'git-ff') {
5799 runcmd_ordryrun_local @git, qw(clean -xdff);
5800 } elsif ($cleanmode eq 'check') {
5801 my $leftovers = cmdoutput @git, qw(clean -xdn);
5802 if (length $leftovers) {
5803 print STDERR $leftovers, "\n" or die $!;
5804 fail "tree contains uncommitted files and --clean=check specified";
5806 } elsif ($cleanmode eq 'none') {
5813 badusage "clean takes no additional arguments" if @ARGV;
5816 maybe_unapply_patches_again();
5819 sub build_or_push_prep_early () {
5820 our $build_or_push_prep_early_done //= 0;
5821 return if $build_or_push_prep_early_done++;
5822 badusage "-p is not allowed with dgit $subcommand" if defined $package;
5823 my $clogp = parsechangelog();
5824 $isuite = getfield $clogp, 'Distribution';
5825 $package = getfield $clogp, 'Source';
5826 $version = getfield $clogp, 'Version';
5829 sub build_prep_early () {
5830 build_or_push_prep_early();
5838 build_maybe_quilt_fixup();
5840 my $pat = changespat $version;
5841 foreach my $f (glob "$buildproductsdir/$pat") {
5843 unlink $f or fail "remove old changes file $f: $!";
5845 progress "would remove $f";
5851 sub changesopts_initial () {
5852 my @opts =@changesopts[1..$#changesopts];
5855 sub changesopts_version () {
5856 if (!defined $changes_since_version) {
5857 my @vsns = archive_query('archive_query');
5858 my @quirk = access_quirk();
5859 if ($quirk[0] eq 'backports') {
5860 local $isuite = $quirk[2];
5862 canonicalise_suite();
5863 push @vsns, archive_query('archive_query');
5866 @vsns = map { $_->[0] } @vsns;
5867 @vsns = sort { -version_compare($a, $b) } @vsns;
5868 $changes_since_version = $vsns[0];
5869 progress "changelog will contain changes since $vsns[0]";
5871 $changes_since_version = '_';
5872 progress "package seems new, not specifying -v<version>";
5875 if ($changes_since_version ne '_') {
5876 return ("-v$changes_since_version");
5882 sub changesopts () {
5883 return (changesopts_initial(), changesopts_version());
5886 sub massage_dbp_args ($;$) {
5887 my ($cmd,$xargs) = @_;
5890 # - if we're going to split the source build out so we can
5891 # do strange things to it, massage the arguments to dpkg-buildpackage
5892 # so that the main build doessn't build source (or add an argument
5893 # to stop it building source by default).
5895 # - add -nc to stop dpkg-source cleaning the source tree,
5896 # unless we're not doing a split build and want dpkg-source
5897 # as cleanmode, in which case we can do nothing
5900 # 0 - source will NOT need to be built separately by caller
5901 # +1 - source will need to be built separately by caller
5902 # +2 - source will need to be built separately by caller AND
5903 # dpkg-buildpackage should not in fact be run at all!
5904 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5905 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5906 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5907 $clean_using_builder = 1;
5910 # -nc has the side effect of specifying -b if nothing else specified
5911 # and some combinations of -S, -b, et al, are errors, rather than
5912 # later simply overriding earlie. So we need to:
5913 # - search the command line for these options
5914 # - pick the last one
5915 # - perhaps add our own as a default
5916 # - perhaps adjust it to the corresponding non-source-building version
5918 foreach my $l ($cmd, $xargs) {
5920 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5923 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5925 if ($need_split_build_invocation) {
5926 printdebug "massage split $dmode.\n";
5927 $r = $dmode =~ m/[S]/ ? +2 :
5928 $dmode =~ y/gGF/ABb/ ? +1 :
5929 $dmode =~ m/[ABb]/ ? 0 :
5932 printdebug "massage done $r $dmode.\n";
5934 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5940 my $wasdir = must_getcwd();
5946 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5947 my ($msg_if_onlyone) = @_;
5948 # If there is only one .changes file, fail with $msg_if_onlyone,
5949 # or if that is undef, be a no-op.
5950 # Returns the changes file to report to the user.
5951 my $pat = changespat $version;
5952 my @changesfiles = glob $pat;
5953 @changesfiles = sort {
5954 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5958 if (@changesfiles==1) {
5959 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5960 only one changes file from build (@changesfiles)
5962 $result = $changesfiles[0];
5963 } elsif (@changesfiles==2) {
5964 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5965 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5966 fail "$l found in binaries changes file $binchanges"
5969 runcmd_ordryrun_local @mergechanges, @changesfiles;
5970 my $multichanges = changespat $version,'multi';
5972 stat_exists $multichanges or fail "$multichanges: $!";
5973 foreach my $cf (glob $pat) {
5974 next if $cf eq $multichanges;
5975 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5978 $result = $multichanges;
5980 fail "wrong number of different changes files (@changesfiles)";
5982 printdone "build successful, results in $result\n" or die $!;
5985 sub midbuild_checkchanges () {
5986 my $pat = changespat $version;
5987 return if $rmchanges;
5988 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5989 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5991 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5992 Suggest you delete @unwanted.
5997 sub midbuild_checkchanges_vanilla ($) {
5999 midbuild_checkchanges() if $wantsrc == 1;
6002 sub postbuild_mergechanges_vanilla ($) {
6004 if ($wantsrc == 1) {
6006 postbuild_mergechanges(undef);
6009 printdone "build successful\n";
6015 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6016 my $wantsrc = massage_dbp_args \@dbp;
6019 midbuild_checkchanges_vanilla $wantsrc;
6024 push @dbp, changesopts_version();
6025 maybe_apply_patches_dirtily();
6026 runcmd_ordryrun_local @dbp;
6028 maybe_unapply_patches_again();
6029 postbuild_mergechanges_vanilla $wantsrc;
6033 $quilt_mode //= 'gbp';
6039 # gbp can make .origs out of thin air. In my tests it does this
6040 # even for a 1.0 format package, with no origs present. So I
6041 # guess it keys off just the version number. We don't know
6042 # exactly what .origs ought to exist, but let's assume that we
6043 # should run gbp if: the version has an upstream part and the main
6045 my $upstreamversion = upstreamversion $version;
6046 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6047 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6049 if ($gbp_make_orig) {
6051 $cleanmode = 'none'; # don't do it again
6052 $need_split_build_invocation = 1;
6055 my @dbp = @dpkgbuildpackage;
6057 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6059 if (!length $gbp_build[0]) {
6060 if (length executable_on_path('git-buildpackage')) {
6061 $gbp_build[0] = qw(git-buildpackage);
6063 $gbp_build[0] = 'gbp buildpackage';
6066 my @cmd = opts_opt_multi_cmd @gbp_build;
6068 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6070 if ($gbp_make_orig) {
6071 ensuredir '.git/dgit';
6072 my $ok = '.git/dgit/origs-gen-ok';
6073 unlink $ok or $!==&ENOENT or die $!;
6074 my @origs_cmd = @cmd;
6075 push @origs_cmd, qw(--git-cleaner=true);
6076 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6077 push @origs_cmd, @ARGV;
6079 debugcmd @origs_cmd;
6081 do { local $!; stat_exists $ok; }
6082 or failedcmd @origs_cmd;
6084 dryrun_report @origs_cmd;
6090 midbuild_checkchanges_vanilla $wantsrc;
6092 if (!$clean_using_builder) {
6093 push @cmd, '--git-cleaner=true';
6097 maybe_unapply_patches_again();
6099 push @cmd, changesopts();
6100 runcmd_ordryrun_local @cmd, @ARGV;
6102 postbuild_mergechanges_vanilla $wantsrc;
6104 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6108 my $our_cleanmode = $cleanmode;
6109 if ($need_split_build_invocation) {
6110 # Pretend that clean is being done some other way. This
6111 # forces us not to try to use dpkg-buildpackage to clean and
6112 # build source all in one go; and instead we run dpkg-source
6113 # (and build_prep() will do the clean since $clean_using_builder
6115 $our_cleanmode = 'ELSEWHERE';
6117 if ($our_cleanmode =~ m/^dpkg-source/) {
6118 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6119 $clean_using_builder = 1;
6122 $sourcechanges = changespat $version,'source';
6124 unlink "../$sourcechanges" or $!==ENOENT
6125 or fail "remove $sourcechanges: $!";
6127 $dscfn = dscfn($version);
6128 if ($our_cleanmode eq 'dpkg-source') {
6129 maybe_apply_patches_dirtily();
6130 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6132 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6133 maybe_apply_patches_dirtily();
6134 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6137 my @cmd = (@dpkgsource, qw(-b --));
6139 changedir $playground;
6140 runcmd_ordryrun_local @cmd, "work";
6141 my @udfiles = <${package}_*>;
6143 foreach my $f (@udfiles) {
6144 printdebug "source copy, found $f\n";
6147 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6148 $f eq srcfn($version, $&));
6149 printdebug "source copy, found $f - renaming\n";
6150 rename "$playground/$f", "../$f" or $!==ENOENT
6151 or fail "put in place new source file ($f): $!";
6154 my $pwd = must_getcwd();
6155 my $leafdir = basename $pwd;
6157 runcmd_ordryrun_local @cmd, $leafdir;
6160 runcmd_ordryrun_local qw(sh -ec),
6161 'exec >$1; shift; exec "$@"','x',
6162 "../$sourcechanges",
6163 @dpkggenchanges, qw(-S), changesopts();
6167 sub cmd_build_source {
6169 badusage "build-source takes no additional arguments" if @ARGV;
6171 maybe_unapply_patches_again();
6172 printdone "source built, results in $dscfn and $sourcechanges";
6177 midbuild_checkchanges();
6180 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6181 stat_exists $sourcechanges
6182 or fail "$sourcechanges (in parent directory): $!";
6184 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6186 maybe_unapply_patches_again();
6188 postbuild_mergechanges(<<END);
6189 perhaps you need to pass -A ? (sbuild's default is to build only
6190 arch-specific binaries; dgit 1.4 used to override that.)
6195 sub cmd_quilt_fixup {
6196 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6199 build_maybe_quilt_fixup();
6202 sub import_dsc_result {
6203 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6204 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6206 check_gitattrs($newhash, "source tree");
6208 progress "dgit: import-dsc: $what_msg";
6211 sub cmd_import_dsc {
6215 last unless $ARGV[0] =~ m/^-/;
6218 if (m/^--require-valid-signature$/) {
6221 badusage "unknown dgit import-dsc sub-option \`$_'";
6225 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6226 my ($dscfn, $dstbranch) = @ARGV;
6228 badusage "dry run makes no sense with import-dsc" unless act_local();
6230 my $force = $dstbranch =~ s/^\+// ? +1 :
6231 $dstbranch =~ s/^\.\.// ? -1 :
6233 my $info = $force ? " $&" : '';
6234 $info = "$dscfn$info";
6236 my $specbranch = $dstbranch;
6237 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6238 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6240 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6241 my $chead = cmdoutput_errok @symcmd;
6242 defined $chead or $?==256 or failedcmd @symcmd;
6244 fail "$dstbranch is checked out - will not update it"
6245 if defined $chead and $chead eq $dstbranch;
6247 my $oldhash = git_get_ref $dstbranch;
6249 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6250 $dscdata = do { local $/ = undef; <D>; };
6251 D->error and fail "read $dscfn: $!";
6254 # we don't normally need this so import it here
6255 use Dpkg::Source::Package;
6256 my $dp = new Dpkg::Source::Package filename => $dscfn,
6257 require_valid_signature => $needsig;
6259 local $SIG{__WARN__} = sub {
6261 return unless $needsig;
6262 fail "import-dsc signature check failed";
6264 if (!$dp->is_signed()) {
6265 warn "$us: warning: importing unsigned .dsc\n";
6267 my $r = $dp->check_signature();
6268 die "->check_signature => $r" if $needsig && $r;
6274 $package = getfield $dsc, 'Source';
6276 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6277 unless forceing [qw(import-dsc-with-dgit-field)];
6278 parse_dsc_field_def_dsc_distro();
6280 $isuite = 'DGIT-IMPORT-DSC';
6281 $idistro //= $dsc_distro;
6285 if (defined $dsc_hash) {
6286 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6287 resolve_dsc_field_commit undef, undef;
6289 if (defined $dsc_hash) {
6290 my @cmd = (qw(sh -ec),
6291 "echo $dsc_hash | git cat-file --batch-check");
6292 my $objgot = cmdoutput @cmd;
6293 if ($objgot =~ m#^\w+ missing\b#) {
6295 .dsc contains Dgit field referring to object $dsc_hash
6296 Your git tree does not have that object. Try `git fetch' from a
6297 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6300 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6302 progress "Not fast forward, forced update.";
6304 fail "Not fast forward to $dsc_hash";
6307 import_dsc_result $dstbranch, $dsc_hash,
6308 "dgit import-dsc (Dgit): $info",
6309 "updated git ref $dstbranch";
6314 Branch $dstbranch already exists
6315 Specify ..$specbranch for a pseudo-merge, binding in existing history
6316 Specify +$specbranch to overwrite, discarding existing history
6318 if $oldhash && !$force;
6320 my @dfi = dsc_files_info();
6321 foreach my $fi (@dfi) {
6322 my $f = $fi->{Filename};
6326 fail "lstat $here works but stat gives $! !";
6328 fail "stat $here: $!" unless $! == ENOENT;
6330 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6332 } elsif ($dscfn =~ m#^/#) {
6335 fail "cannot import $dscfn which seems to be inside working tree!";
6337 $there =~ s#/+[^/]+$## or
6338 fail "import $dscfn requires ../$f, but it does not exist";
6340 my $test = $there =~ m{^/} ? $there : "../$there";
6341 stat $test or fail "import $dscfn requires $test, but: $!";
6342 symlink $there, $here or fail "symlink $there to $here: $!";
6343 progress "made symlink $here -> $there";
6344 # print STDERR Dumper($fi);
6346 my @mergeinputs = generate_commits_from_dsc();
6347 die unless @mergeinputs == 1;
6349 my $newhash = $mergeinputs[0]{Commit};
6353 progress "Import, forced update - synthetic orphan git history.";
6354 } elsif ($force < 0) {
6355 progress "Import, merging.";
6356 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6357 my $version = getfield $dsc, 'Version';
6358 my $clogp = commit_getclogp $newhash;
6359 my $authline = clogp_authline $clogp;
6360 $newhash = make_commit_text <<END;
6367 Merge $package ($version) import into $dstbranch
6370 die; # caught earlier
6374 import_dsc_result $dstbranch, $newhash,
6375 "dgit import-dsc: $info",
6376 "results are in in git ref $dstbranch";
6379 sub pre_archive_api_query () {
6380 not_necessarily_a_tree();
6382 sub cmd_archive_api_query {
6383 badusage "need only 1 subpath argument" unless @ARGV==1;
6384 my ($subpath) = @ARGV;
6385 my @cmd = archive_api_query_cmd($subpath);
6388 exec @cmd or fail "exec curl: $!\n";
6391 sub repos_server_url () {
6392 $package = '_dgit-repos-server';
6393 local $access_forpush = 1;
6394 local $isuite = 'DGIT-REPOS-SERVER';
6395 my $url = access_giturl();
6398 sub pre_clone_dgit_repos_server () {
6399 not_necessarily_a_tree();
6401 sub cmd_clone_dgit_repos_server {
6402 badusage "need destination argument" unless @ARGV==1;
6403 my ($destdir) = @ARGV;
6404 my $url = repos_server_url();
6405 my @cmd = (@git, qw(clone), $url, $destdir);
6407 exec @cmd or fail "exec git clone: $!\n";
6410 sub pre_print_dgit_repos_server_source_url () {
6411 not_necessarily_a_tree();
6413 sub cmd_print_dgit_repos_server_source_url {
6414 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6416 my $url = repos_server_url();
6417 print $url, "\n" or die $!;
6420 sub cmd_setup_mergechangelogs {
6421 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6422 local $isuite = 'DGIT-SETUP-TREE';
6423 setup_mergechangelogs(1);
6426 sub cmd_setup_useremail {
6427 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6428 local $isuite = 'DGIT-SETUP-TREE';
6432 sub cmd_setup_gitattributes {
6433 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6434 local $isuite = 'DGIT-SETUP-TREE';
6438 sub cmd_setup_new_tree {
6439 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6440 local $isuite = 'DGIT-SETUP-TREE';
6444 #---------- argument parsing and main program ----------
6447 print "dgit version $our_version\n" or die $!;
6451 our (%valopts_long, %valopts_short);
6452 our (%funcopts_long);
6454 our (@modeopt_cfgs);
6456 sub defvalopt ($$$$) {
6457 my ($long,$short,$val_re,$how) = @_;
6458 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6459 $valopts_long{$long} = $oi;
6460 $valopts_short{$short} = $oi;
6461 # $how subref should:
6462 # do whatever assignemnt or thing it likes with $_[0]
6463 # if the option should not be passed on to remote, @rvalopts=()
6464 # or $how can be a scalar ref, meaning simply assign the value
6467 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6468 defvalopt '--distro', '-d', '.+', \$idistro;
6469 defvalopt '', '-k', '.+', \$keyid;
6470 defvalopt '--existing-package','', '.*', \$existing_package;
6471 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6472 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6473 defvalopt '--package', '-p', $package_re, \$package;
6474 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6476 defvalopt '', '-C', '.+', sub {
6477 ($changesfile) = (@_);
6478 if ($changesfile =~ s#^(.*)/##) {
6479 $buildproductsdir = $1;
6483 defvalopt '--initiator-tempdir','','.*', sub {
6484 ($initiator_tempdir) = (@_);
6485 $initiator_tempdir =~ m#^/# or
6486 badusage "--initiator-tempdir must be used specify an".
6487 " absolute, not relative, directory."
6490 sub defoptmodes ($@) {
6491 my ($varref, $cfgkey, $default, %optmap) = @_;
6493 while (my ($opt,$val) = each %optmap) {
6494 $funcopts_long{$opt} = sub { $$varref = $val; };
6495 $permit{$val} = $val;
6497 push @modeopt_cfgs, {
6500 Default => $default,
6505 defoptmodes \$dodep14tag, qw( dep14tag want
6508 --always-dep14tag always );
6513 if (defined $ENV{'DGIT_SSH'}) {
6514 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6515 } elsif (defined $ENV{'GIT_SSH'}) {
6516 @ssh = ($ENV{'GIT_SSH'});
6524 if (!defined $val) {
6525 badusage "$what needs a value" unless @ARGV;
6527 push @rvalopts, $val;
6529 badusage "bad value \`$val' for $what" unless
6530 $val =~ m/^$oi->{Re}$(?!\n)/s;
6531 my $how = $oi->{How};
6532 if (ref($how) eq 'SCALAR') {
6537 push @ropts, @rvalopts;
6541 last unless $ARGV[0] =~ m/^-/;
6545 if (m/^--dry-run$/) {
6548 } elsif (m/^--damp-run$/) {
6551 } elsif (m/^--no-sign$/) {
6554 } elsif (m/^--help$/) {
6556 } elsif (m/^--version$/) {
6558 } elsif (m/^--new$/) {
6561 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6562 ($om = $opts_opt_map{$1}) &&
6566 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6567 !$opts_opt_cmdonly{$1} &&
6568 ($om = $opts_opt_map{$1})) {
6571 } elsif (m/^--(gbp|dpm)$/s) {
6572 push @ropts, "--quilt=$1";
6574 } elsif (m/^--ignore-dirty$/s) {
6577 } elsif (m/^--no-quilt-fixup$/s) {
6579 $quilt_mode = 'nocheck';
6580 } elsif (m/^--no-rm-on-error$/s) {
6583 } elsif (m/^--no-chase-dsc-distro$/s) {
6585 $chase_dsc_distro = 0;
6586 } elsif (m/^--overwrite$/s) {
6588 $overwrite_version = '';
6589 } elsif (m/^--overwrite=(.+)$/s) {
6591 $overwrite_version = $1;
6592 } elsif (m/^--delayed=(\d+)$/s) {
6595 } elsif (m/^--dgit-view-save=(.+)$/s) {
6597 $split_brain_save = $1;
6598 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6599 } elsif (m/^--(no-)?rm-old-changes$/s) {
6602 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6604 push @deliberatelies, $&;
6605 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6609 } elsif (m/^--force-/) {
6611 "$us: warning: ignoring unknown force option $_\n";
6613 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6614 # undocumented, for testing
6616 $tagformat_want = [ $1, 'command line', 1 ];
6617 # 1 menas overrides distro configuration
6618 } elsif (m/^--always-split-source-build$/s) {
6619 # undocumented, for testing
6621 $need_split_build_invocation = 1;
6622 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6623 # undocumented, for testing
6625 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6626 # ^ it's supposed to be an array ref
6627 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6628 $val = $2 ? $' : undef; #';
6629 $valopt->($oi->{Long});
6630 } elsif ($funcopts_long{$_}) {
6632 $funcopts_long{$_}();
6634 badusage "unknown long option \`$_'";
6641 } elsif (s/^-L/-/) {
6644 } elsif (s/^-h/-/) {
6646 } elsif (s/^-D/-/) {
6650 } elsif (s/^-N/-/) {
6655 push @changesopts, $_;
6657 } elsif (s/^-wn$//s) {
6659 $cleanmode = 'none';
6660 } elsif (s/^-wg$//s) {
6663 } elsif (s/^-wgf$//s) {
6665 $cleanmode = 'git-ff';
6666 } elsif (s/^-wd$//s) {
6668 $cleanmode = 'dpkg-source';
6669 } elsif (s/^-wdd$//s) {
6671 $cleanmode = 'dpkg-source-d';
6672 } elsif (s/^-wc$//s) {
6674 $cleanmode = 'check';
6675 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6676 push @git, '-c', $&;
6677 $gitcfgs{cmdline}{$1} = [ $2 ];
6678 } elsif (s/^-c([^=]+)$//s) {
6679 push @git, '-c', $&;
6680 $gitcfgs{cmdline}{$1} = [ 'true' ];
6681 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6683 $val = undef unless length $val;
6684 $valopt->($oi->{Short});
6687 badusage "unknown short option \`$_'";
6694 sub check_env_sanity () {
6695 my $blocked = new POSIX::SigSet;
6696 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6699 foreach my $name (qw(PIPE CHLD)) {
6700 my $signame = "SIG$name";
6701 my $signum = eval "POSIX::$signame" // die;
6702 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6703 die "$signame is set to something other than SIG_DFL\n";
6704 $blocked->ismember($signum) and
6705 die "$signame is blocked\n";
6711 On entry to dgit, $@
6712 This is a bug produced by something in in your execution environment.
6718 sub parseopts_late_defaults () {
6719 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6720 if defined $idistro;
6721 $isuite //= cfg('dgit.default.default-suite');
6723 foreach my $k (keys %opts_opt_map) {
6724 my $om = $opts_opt_map{$k};
6726 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6728 badcfg "cannot set command for $k"
6729 unless length $om->[0];
6733 foreach my $c (access_cfg_cfgs("opts-$k")) {
6735 map { $_ ? @$_ : () }
6736 map { $gitcfgs{$_}{$c} }
6737 reverse @gitcfgsources;
6738 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6739 "\n" if $debuglevel >= 4;
6741 badcfg "cannot configure options for $k"
6742 if $opts_opt_cmdonly{$k};
6743 my $insertpos = $opts_cfg_insertpos{$k};
6744 @$om = ( @$om[0..$insertpos-1],
6746 @$om[$insertpos..$#$om] );
6750 if (!defined $rmchanges) {
6751 local $access_forpush;
6752 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6755 if (!defined $quilt_mode) {
6756 local $access_forpush;
6757 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6758 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6760 $quilt_mode =~ m/^($quilt_modes_re)$/
6761 or badcfg "unknown quilt-mode \`$quilt_mode'";
6765 foreach my $moc (@modeopt_cfgs) {
6766 local $access_forpush;
6767 my $vr = $moc->{Var};
6768 next if defined $$vr;
6769 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6770 my $v = $moc->{Vals}{$$vr};
6771 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6775 $need_split_build_invocation ||= quiltmode_splitbrain();
6777 if (!defined $cleanmode) {
6778 local $access_forpush;
6779 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6780 $cleanmode //= 'dpkg-source';
6782 badcfg "unknown clean-mode \`$cleanmode'" unless
6783 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6787 if ($ENV{$fakeeditorenv}) {
6789 quilt_fixup_editor();
6795 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6796 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6797 if $dryrun_level == 1;
6799 print STDERR $helpmsg or die $!;
6802 $cmd = $subcommand = shift @ARGV;
6805 my $pre_fn = ${*::}{"pre_$cmd"};
6806 $pre_fn->() if $pre_fn;
6808 record_maindir if $invoked_in_git_tree;
6811 my $fn = ${*::}{"cmd_$cmd"};
6812 $fn or badusage "unknown operation $cmd";