3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
43 our $our_version = 'UNRELEASED'; ###substituted###
45 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
48 our $isuite = 'unstable';
54 our $dryrun_level = 0;
56 our $buildproductsdir = '..';
62 our $existing_package = 'dpkg';
64 our $changes_since_version;
66 our $overwrite_version; # undef: not specified; '': check changelog
68 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
69 our $we_are_responder;
70 our $initiator_tempdir;
71 our $patches_applied_dirtily = 00;
76 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
78 our $suite_re = '[-+.0-9a-z]+';
79 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
80 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
81 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
82 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
84 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
85 our $splitbraincache = 'dgit-intern/quilt-cache';
88 our (@dget) = qw(dget);
89 our (@curl) = qw(curl);
90 our (@dput) = qw(dput);
91 our (@debsign) = qw(debsign);
93 our (@sbuild) = qw(sbuild);
95 our (@dgit) = qw(dgit);
96 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
97 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
98 our (@dpkggenchanges) = qw(dpkg-genchanges);
99 our (@mergechanges) = qw(mergechanges -f);
100 our (@gbp_build) = ('');
101 our (@gbp_pq) = ('gbp pq');
102 our (@changesopts) = ('');
104 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
107 'debsign' => \@debsign,
109 'sbuild' => \@sbuild,
113 'dpkg-source' => \@dpkgsource,
114 'dpkg-buildpackage' => \@dpkgbuildpackage,
115 'dpkg-genchanges' => \@dpkggenchanges,
116 'gbp-build' => \@gbp_build,
117 'gbp-pq' => \@gbp_pq,
118 'ch' => \@changesopts,
119 'mergechanges' => \@mergechanges);
121 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
122 our %opts_cfg_insertpos = map {
124 scalar @{ $opts_opt_map{$_} }
125 } keys %opts_opt_map;
127 sub finalise_opts_opts();
133 our $supplementary_message = '';
134 our $need_split_build_invocation = 0;
135 our $split_brain = 0;
139 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
142 our $remotename = 'dgit';
143 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
148 my ($v,$distro) = @_;
149 return $tagformatfn->($v, $distro);
152 sub debiantag_maintview ($$) {
153 my ($v,$distro) = @_;
158 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
160 sub lbranch () { return "$branchprefix/$csuite"; }
161 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
162 sub lref () { return "refs/heads/".lbranch(); }
163 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
164 sub rrref () { return server_ref($csuite); }
166 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
167 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
169 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
170 # locally fetched refs because they have unhelpful names and clutter
171 # up gitk etc. So we track whether we have "used up" head ref (ie,
172 # whether we have made another local ref which refers to this object).
174 # (If we deleted them unconditionally, then we might end up
175 # re-fetching the same git objects each time dgit fetch was run.)
177 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
178 # in git_fetch_us to fetch the refs in question, and possibly a call
179 # to lrfetchref_used.
181 our (%lrfetchrefs_f, %lrfetchrefs_d);
182 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
184 sub lrfetchref_used ($) {
185 my ($fullrefname) = @_;
186 my $objid = $lrfetchrefs_f{$fullrefname};
187 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
198 return "${package}_".(stripepoch $vsn).$sfx
203 return srcfn($vsn,".dsc");
206 sub changespat ($;$) {
207 my ($vsn, $arch) = @_;
208 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
217 foreach my $f (@end) {
219 print STDERR "$us: cleanup: $@" if length $@;
223 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
225 sub no_such_package () {
226 print STDERR "$us: package $package does not exist in suite $isuite\n";
232 printdebug "CD $newdir\n";
233 chdir $newdir or confess "chdir: $newdir: $!";
236 sub deliberately ($) {
238 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
241 sub deliberately_not_fast_forward () {
242 foreach (qw(not-fast-forward fresh-repo)) {
243 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
247 sub quiltmode_splitbrain () {
248 $quilt_mode =~ m/gbp|dpm|unapplied/;
251 sub opts_opt_multi_cmd {
253 push @cmd, split /\s+/, shift @_;
259 return opts_opt_multi_cmd @gbp_pq;
262 #---------- remote protocol support, common ----------
264 # remote push initiator/responder protocol:
265 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
266 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
267 # < dgit-remote-push-ready <actual-proto-vsn>
274 # > supplementary-message NBYTES # $protovsn >= 3
279 # > file parsed-changelog
280 # [indicates that output of dpkg-parsechangelog follows]
281 # > data-block NBYTES
282 # > [NBYTES bytes of data (no newline)]
283 # [maybe some more blocks]
292 # > param head DGIT-VIEW-HEAD
293 # > param csuite SUITE
294 # > param tagformat old|new
295 # > param maint-view MAINT-VIEW-HEAD
297 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
298 # # goes into tag, for replay prevention
301 # [indicates that signed tag is wanted]
302 # < data-block NBYTES
303 # < [NBYTES bytes of data (no newline)]
304 # [maybe some more blocks]
308 # > want signed-dsc-changes
309 # < data-block NBYTES [transfer of signed dsc]
311 # < data-block NBYTES [transfer of signed changes]
319 sub i_child_report () {
320 # Sees if our child has died, and reap it if so. Returns a string
321 # describing how it died if it failed, or undef otherwise.
322 return undef unless $i_child_pid;
323 my $got = waitpid $i_child_pid, WNOHANG;
324 return undef if $got <= 0;
325 die unless $got == $i_child_pid;
326 $i_child_pid = undef;
327 return undef unless $?;
328 return "build host child ".waitstatusmsg();
333 fail "connection lost: $!" if $fh->error;
334 fail "protocol violation; $m not expected";
337 sub badproto_badread ($$) {
339 fail "connection lost: $!" if $!;
340 my $report = i_child_report();
341 fail $report if defined $report;
342 badproto $fh, "eof (reading $wh)";
345 sub protocol_expect (&$) {
346 my ($match, $fh) = @_;
349 defined && chomp or badproto_badread $fh, "protocol message";
357 badproto $fh, "\`$_'";
360 sub protocol_send_file ($$) {
361 my ($fh, $ourfn) = @_;
362 open PF, "<", $ourfn or die "$ourfn: $!";
365 my $got = read PF, $d, 65536;
366 die "$ourfn: $!" unless defined $got;
368 print $fh "data-block ".length($d)."\n" or die $!;
369 print $fh $d or die $!;
371 PF->error and die "$ourfn $!";
372 print $fh "data-end\n" or die $!;
376 sub protocol_read_bytes ($$) {
377 my ($fh, $nbytes) = @_;
378 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
380 my $got = read $fh, $d, $nbytes;
381 $got==$nbytes or badproto_badread $fh, "data block";
385 sub protocol_receive_file ($$) {
386 my ($fh, $ourfn) = @_;
387 printdebug "() $ourfn\n";
388 open PF, ">", $ourfn or die "$ourfn: $!";
390 my ($y,$l) = protocol_expect {
391 m/^data-block (.*)$/ ? (1,$1) :
392 m/^data-end$/ ? (0,) :
396 my $d = protocol_read_bytes $fh, $l;
397 print PF $d or die $!;
402 #---------- remote protocol support, responder ----------
404 sub responder_send_command ($) {
406 return unless $we_are_responder;
407 # called even without $we_are_responder
408 printdebug ">> $command\n";
409 print PO $command, "\n" or die $!;
412 sub responder_send_file ($$) {
413 my ($keyword, $ourfn) = @_;
414 return unless $we_are_responder;
415 printdebug "]] $keyword $ourfn\n";
416 responder_send_command "file $keyword";
417 protocol_send_file \*PO, $ourfn;
420 sub responder_receive_files ($@) {
421 my ($keyword, @ourfns) = @_;
422 die unless $we_are_responder;
423 printdebug "[[ $keyword @ourfns\n";
424 responder_send_command "want $keyword";
425 foreach my $fn (@ourfns) {
426 protocol_receive_file \*PI, $fn;
429 protocol_expect { m/^files-end$/ } \*PI;
432 #---------- remote protocol support, initiator ----------
434 sub initiator_expect (&) {
436 protocol_expect { &$match } \*RO;
439 #---------- end remote code ----------
442 if ($we_are_responder) {
444 responder_send_command "progress ".length($m) or die $!;
445 print PO $m or die $!;
455 $ua = LWP::UserAgent->new();
459 progress "downloading $what...";
460 my $r = $ua->get(@_) or die $!;
461 return undef if $r->code == 404;
462 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
463 return $r->decoded_content(charset => 'none');
466 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
471 failedcmd @_ if system @_;
474 sub act_local () { return $dryrun_level <= 1; }
475 sub act_scary () { return !$dryrun_level; }
478 if (!$dryrun_level) {
479 progress "dgit ok: @_";
481 progress "would be ok: @_ (but dry run only)";
486 printcmd(\*STDERR,$debugprefix."#",@_);
489 sub runcmd_ordryrun {
497 sub runcmd_ordryrun_local {
506 my ($first_shell, @cmd) = @_;
507 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
510 our $helpmsg = <<END;
512 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
513 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
514 dgit [dgit-opts] build [dpkg-buildpackage-opts]
515 dgit [dgit-opts] sbuild [sbuild-opts]
516 dgit [dgit-opts] push [dgit-opts] [suite]
517 dgit [dgit-opts] rpush build-host:build-dir ...
518 important dgit options:
519 -k<keyid> sign tag and package with <keyid> instead of default
520 --dry-run -n do not change anything, but go through the motions
521 --damp-run -L like --dry-run but make local changes, without signing
522 --new -N allow introducing a new package
523 --debug -D increase debug level
524 -c<name>=<value> set git config option (used directly by dgit too)
527 our $later_warning_msg = <<END;
528 Perhaps the upload is stuck in incoming. Using the version from git.
532 print STDERR "$us: @_\n", $helpmsg or die $!;
537 @ARGV or badusage "too few arguments";
538 return scalar shift @ARGV;
542 print $helpmsg or die $!;
546 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
548 our %defcfg = ('dgit.default.distro' => 'debian',
549 'dgit.default.username' => '',
550 'dgit.default.archive-query-default-component' => 'main',
551 'dgit.default.ssh' => 'ssh',
552 'dgit.default.archive-query' => 'madison:',
553 'dgit.default.sshpsql-dbname' => 'service=projectb',
554 'dgit.default.dgit-tag-format' => 'new,old,maint',
555 # old means "repo server accepts pushes with old dgit tags"
556 # new means "repo server accepts pushes with new dgit tags"
557 # maint means "repo server accepts split brain pushes"
558 # hist means "repo server may have old pushes without new tag"
559 # ("hist" is implied by "old")
560 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
561 'dgit-distro.debian.git-check' => 'url',
562 'dgit-distro.debian.git-check-suffix' => '/info/refs',
563 'dgit-distro.debian.new-private-pushers' => 't',
564 'dgit-distro.debian/push.git-url' => '',
565 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
566 'dgit-distro.debian/push.git-user-force' => 'dgit',
567 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
568 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
569 'dgit-distro.debian/push.git-create' => 'true',
570 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
571 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
572 # 'dgit-distro.debian.archive-query-tls-key',
573 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
574 # ^ this does not work because curl is broken nowadays
575 # Fixing #790093 properly will involve providing providing the key
576 # in some pacagke and maybe updating these paths.
578 # 'dgit-distro.debian.archive-query-tls-curl-args',
579 # '--ca-path=/etc/ssl/ca-debian',
580 # ^ this is a workaround but works (only) on DSA-administered machines
581 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
582 'dgit-distro.debian.git-url-suffix' => '',
583 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
584 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
585 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
586 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
587 'dgit-distro.ubuntu.git-check' => 'false',
588 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
589 'dgit-distro.test-dummy.ssh' => "$td/ssh",
590 'dgit-distro.test-dummy.username' => "alice",
591 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
592 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
593 'dgit-distro.test-dummy.git-url' => "$td/git",
594 'dgit-distro.test-dummy.git-host' => "git",
595 'dgit-distro.test-dummy.git-path' => "$td/git",
596 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
597 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
598 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
599 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
603 our @gitcfgsources = qw(cmdline local global system);
605 sub git_slurp_config () {
606 local ($debuglevel) = $debuglevel-2;
609 # This algoritm is a bit subtle, but this is needed so that for
610 # options which we want to be single-valued, we allow the
611 # different config sources to override properly. See #835858.
612 foreach my $src (@gitcfgsources) {
613 next if $src eq 'cmdline';
614 # we do this ourselves since git doesn't handle it
616 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
619 open GITS, "-|", @cmd or die $!;
622 printdebug "=> ", (messagequote $_), "\n";
624 push @{ $gitcfgs{$src}{$`} }, $'; #';
628 or ($!==0 && $?==256)
633 sub git_get_config ($) {
635 foreach my $src (@gitcfgsources) {
636 my $l = $gitcfgs{$src}{$c};
637 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
640 @$l==1 or badcfg "multiple values for $c".
641 " (in $src git config)" if @$l > 1;
649 return undef if $c =~ /RETURN-UNDEF/;
650 my $v = git_get_config($c);
651 return $v if defined $v;
652 my $dv = $defcfg{$c};
653 return $dv if defined $dv;
655 badcfg "need value for one of: @_\n".
656 "$us: distro or suite appears not to be (properly) supported";
659 sub access_basedistro () {
660 if (defined $idistro) {
663 return cfg("dgit-suite.$isuite.distro",
664 "dgit.default.distro");
668 sub access_quirk () {
669 # returns (quirk name, distro to use instead or undef, quirk-specific info)
670 my $basedistro = access_basedistro();
671 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
673 if (defined $backports_quirk) {
674 my $re = $backports_quirk;
675 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
677 $re =~ s/\%/([-0-9a-z_]+)/
678 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
679 if ($isuite =~ m/^$re$/) {
680 return ('backports',"$basedistro-backports",$1);
683 return ('none',undef);
688 sub parse_cfg_bool ($$$) {
689 my ($what,$def,$v) = @_;
692 $v =~ m/^[ty1]/ ? 1 :
693 $v =~ m/^[fn0]/ ? 0 :
694 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
697 sub access_forpush_config () {
698 my $d = access_basedistro();
702 parse_cfg_bool('new-private-pushers', 0,
703 cfg("dgit-distro.$d.new-private-pushers",
706 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
709 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
710 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
711 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
712 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
715 sub access_forpush () {
716 $access_forpush //= access_forpush_config();
717 return $access_forpush;
721 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
722 badcfg "pushing but distro is configured readonly"
723 if access_forpush_config() eq '0';
725 $supplementary_message = <<'END' unless $we_are_responder;
726 Push failed, before we got started.
727 You can retry the push, after fixing the problem, if you like.
729 finalise_opts_opts();
733 finalise_opts_opts();
736 sub supplementary_message ($) {
738 if (!$we_are_responder) {
739 $supplementary_message = $msg;
741 } elsif ($protovsn >= 3) {
742 responder_send_command "supplementary-message ".length($msg)
744 print PO $msg or die $!;
748 sub access_distros () {
749 # Returns list of distros to try, in order
752 # 0. `instead of' distro name(s) we have been pointed to
753 # 1. the access_quirk distro, if any
754 # 2a. the user's specified distro, or failing that } basedistro
755 # 2b. the distro calculated from the suite }
756 my @l = access_basedistro();
758 my (undef,$quirkdistro) = access_quirk();
759 unshift @l, $quirkdistro;
760 unshift @l, $instead_distro;
761 @l = grep { defined } @l;
763 if (access_forpush()) {
764 @l = map { ("$_/push", $_) } @l;
769 sub access_cfg_cfgs (@) {
772 # The nesting of these loops determines the search order. We put
773 # the key loop on the outside so that we search all the distros
774 # for each key, before going on to the next key. That means that
775 # if access_cfg is called with a more specific, and then a less
776 # specific, key, an earlier distro can override the less specific
777 # without necessarily overriding any more specific keys. (If the
778 # distro wants to override the more specific keys it can simply do
779 # so; whereas if we did the loop the other way around, it would be
780 # impossible to for an earlier distro to override a less specific
781 # key but not the more specific ones without restating the unknown
782 # values of the more specific keys.
785 # We have to deal with RETURN-UNDEF specially, so that we don't
786 # terminate the search prematurely.
788 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
791 foreach my $d (access_distros()) {
792 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
794 push @cfgs, map { "dgit.default.$_" } @realkeys;
801 my (@cfgs) = access_cfg_cfgs(@keys);
802 my $value = cfg(@cfgs);
806 sub access_cfg_bool ($$) {
807 my ($def, @keys) = @_;
808 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
811 sub string_to_ssh ($) {
813 if ($spec =~ m/\s/) {
814 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
820 sub access_cfg_ssh () {
821 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
822 if (!defined $gitssh) {
825 return string_to_ssh $gitssh;
829 sub access_runeinfo ($) {
831 return ": dgit ".access_basedistro()." $info ;";
834 sub access_someuserhost ($) {
836 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
837 defined($user) && length($user) or
838 $user = access_cfg("$some-user",'username');
839 my $host = access_cfg("$some-host");
840 return length($user) ? "$user\@$host" : $host;
843 sub access_gituserhost () {
844 return access_someuserhost('git');
847 sub access_giturl (;$) {
849 my $url = access_cfg('git-url','RETURN-UNDEF');
852 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
853 return undef unless defined $proto;
856 access_gituserhost().
857 access_cfg('git-path');
859 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
862 return "$url/$package$suffix";
865 sub parsecontrolfh ($$;$) {
866 my ($fh, $desc, $allowsigned) = @_;
867 our $dpkgcontrolhash_noissigned;
870 my %opts = ('name' => $desc);
871 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
872 $c = Dpkg::Control::Hash->new(%opts);
873 $c->parse($fh,$desc) or die "parsing of $desc failed";
874 last if $allowsigned;
875 last if $dpkgcontrolhash_noissigned;
876 my $issigned= $c->get_option('is_pgp_signed');
877 if (!defined $issigned) {
878 $dpkgcontrolhash_noissigned= 1;
879 seek $fh, 0,0 or die "seek $desc: $!";
880 } elsif ($issigned) {
881 fail "control file $desc is (already) PGP-signed. ".
882 " Note that dgit push needs to modify the .dsc and then".
883 " do the signature itself";
892 my ($file, $desc) = @_;
893 my $fh = new IO::Handle;
894 open $fh, '<', $file or die "$file: $!";
895 my $c = parsecontrolfh($fh,$desc);
896 $fh->error and die $!;
902 my ($dctrl,$field) = @_;
903 my $v = $dctrl->{$field};
904 return $v if defined $v;
905 fail "missing field $field in ".$dctrl->get_option('name');
909 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
910 my $p = new IO::Handle;
911 my @cmd = (qw(dpkg-parsechangelog), @_);
912 open $p, '-|', @cmd or die $!;
914 $?=0; $!=0; close $p or failedcmd @cmd;
918 sub commit_getclogp ($) {
919 # Returns the parsed changelog hashref for a particular commit
921 our %commit_getclogp_memo;
922 my $memo = $commit_getclogp_memo{$objid};
923 return $memo if $memo;
925 my $mclog = ".git/dgit/clog-$objid";
926 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
927 "$objid:debian/changelog";
928 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
933 defined $d or fail "getcwd failed: $!";
939 sub archive_query ($) {
941 my $query = access_cfg('archive-query','RETURN-UNDEF');
942 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
945 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
948 sub pool_dsc_subpath ($$) {
949 my ($vsn,$component) = @_; # $package is implict arg
950 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
951 return "/pool/$component/$prefix/$package/".dscfn($vsn);
954 #---------- `ftpmasterapi' archive query method (nascent) ----------
956 sub archive_api_query_cmd ($) {
958 my @cmd = (@curl, qw(-sS));
959 my $url = access_cfg('archive-query-url');
960 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
962 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
963 foreach my $key (split /\:/, $keys) {
964 $key =~ s/\%HOST\%/$host/g;
966 fail "for $url: stat $key: $!" unless $!==ENOENT;
969 fail "config requested specific TLS key but do not know".
970 " how to get curl to use exactly that EE key ($key)";
971 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
972 # # Sadly the above line does not work because of changes
973 # # to gnutls. The real fix for #790093 may involve
974 # # new curl options.
977 # Fixing #790093 properly will involve providing a value
978 # for this on clients.
979 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
980 push @cmd, split / /, $kargs if defined $kargs;
982 push @cmd, $url.$subpath;
988 my ($data, $subpath) = @_;
989 badcfg "ftpmasterapi archive query method takes no data part"
991 my @cmd = archive_api_query_cmd($subpath);
992 my $url = $cmd[$#cmd];
993 push @cmd, qw(-w %{http_code});
994 my $json = cmdoutput @cmd;
995 unless ($json =~ s/\d+\d+\d$//) {
996 failedcmd_report_cmd undef, @cmd;
997 fail "curl failed to print 3-digit HTTP code";
1000 fail "fetch of $url gave HTTP code $code"
1001 unless $url =~ m#^file://# or $code =~ m/^2/;
1002 return decode_json($json);
1005 sub canonicalise_suite_ftpmasterapi () {
1006 my ($proto,$data) = @_;
1007 my $suites = api_query($data, 'suites');
1009 foreach my $entry (@$suites) {
1011 my $v = $entry->{$_};
1012 defined $v && $v eq $isuite;
1013 } qw(codename name);
1014 push @matched, $entry;
1016 fail "unknown suite $isuite" unless @matched;
1019 @matched==1 or die "multiple matches for suite $isuite\n";
1020 $cn = "$matched[0]{codename}";
1021 defined $cn or die "suite $isuite info has no codename\n";
1022 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1024 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1029 sub archive_query_ftpmasterapi () {
1030 my ($proto,$data) = @_;
1031 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1033 my $digester = Digest::SHA->new(256);
1034 foreach my $entry (@$info) {
1036 my $vsn = "$entry->{version}";
1037 my ($ok,$msg) = version_check $vsn;
1038 die "bad version: $msg\n" unless $ok;
1039 my $component = "$entry->{component}";
1040 $component =~ m/^$component_re$/ or die "bad component";
1041 my $filename = "$entry->{filename}";
1042 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1043 or die "bad filename";
1044 my $sha256sum = "$entry->{sha256sum}";
1045 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1046 push @rows, [ $vsn, "/pool/$component/$filename",
1047 $digester, $sha256sum ];
1049 die "bad ftpmaster api response: $@\n".Dumper($entry)
1052 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1056 #---------- `madison' archive query method ----------
1058 sub archive_query_madison {
1059 return map { [ @$_[0..1] ] } madison_get_parse(@_);
1062 sub madison_get_parse {
1063 my ($proto,$data) = @_;
1064 die unless $proto eq 'madison';
1065 if (!length $data) {
1066 $data= access_cfg('madison-distro','RETURN-UNDEF');
1067 $data //= access_basedistro();
1069 $rmad{$proto,$data,$package} ||= cmdoutput
1070 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1071 my $rmad = $rmad{$proto,$data,$package};
1074 foreach my $l (split /\n/, $rmad) {
1075 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1076 \s*( [^ \t|]+ )\s* \|
1077 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1078 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1079 $1 eq $package or die "$rmad $package ?";
1086 $component = access_cfg('archive-query-default-component');
1088 $5 eq 'source' or die "$rmad ?";
1089 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1091 return sort { -version_compare($a->[0],$b->[0]); } @out;
1094 sub canonicalise_suite_madison {
1095 # madison canonicalises for us
1096 my @r = madison_get_parse(@_);
1098 "unable to canonicalise suite using package $package".
1099 " which does not appear to exist in suite $isuite;".
1100 " --existing-package may help";
1104 #---------- `sshpsql' archive query method ----------
1107 my ($data,$runeinfo,$sql) = @_;
1108 if (!length $data) {
1109 $data= access_someuserhost('sshpsql').':'.
1110 access_cfg('sshpsql-dbname');
1112 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1113 my ($userhost,$dbname) = ($`,$'); #';
1115 my @cmd = (access_cfg_ssh, $userhost,
1116 access_runeinfo("ssh-psql $runeinfo").
1117 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1118 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1120 open P, "-|", @cmd or die $!;
1123 printdebug(">|$_|\n");
1126 $!=0; $?=0; close P or failedcmd @cmd;
1128 my $nrows = pop @rows;
1129 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1130 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1131 @rows = map { [ split /\|/, $_ ] } @rows;
1132 my $ncols = scalar @{ shift @rows };
1133 die if grep { scalar @$_ != $ncols } @rows;
1137 sub sql_injection_check {
1138 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1141 sub archive_query_sshpsql ($$) {
1142 my ($proto,$data) = @_;
1143 sql_injection_check $isuite, $package;
1144 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1145 SELECT source.version, component.name, files.filename, files.sha256sum
1147 JOIN src_associations ON source.id = src_associations.source
1148 JOIN suite ON suite.id = src_associations.suite
1149 JOIN dsc_files ON dsc_files.source = source.id
1150 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1151 JOIN component ON component.id = files_archive_map.component_id
1152 JOIN files ON files.id = dsc_files.file
1153 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1154 AND source.source='$package'
1155 AND files.filename LIKE '%.dsc';
1157 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1158 my $digester = Digest::SHA->new(256);
1160 my ($vsn,$component,$filename,$sha256sum) = @$_;
1161 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1166 sub canonicalise_suite_sshpsql ($$) {
1167 my ($proto,$data) = @_;
1168 sql_injection_check $isuite;
1169 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1170 SELECT suite.codename
1171 FROM suite where suite_name='$isuite' or codename='$isuite';
1173 @rows = map { $_->[0] } @rows;
1174 fail "unknown suite $isuite" unless @rows;
1175 die "ambiguous $isuite: @rows ?" if @rows>1;
1179 #---------- `dummycat' archive query method ----------
1181 sub canonicalise_suite_dummycat ($$) {
1182 my ($proto,$data) = @_;
1183 my $dpath = "$data/suite.$isuite";
1184 if (!open C, "<", $dpath) {
1185 $!==ENOENT or die "$dpath: $!";
1186 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1190 chomp or die "$dpath: $!";
1192 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1196 sub archive_query_dummycat ($$) {
1197 my ($proto,$data) = @_;
1198 canonicalise_suite();
1199 my $dpath = "$data/package.$csuite.$package";
1200 if (!open C, "<", $dpath) {
1201 $!==ENOENT or die "$dpath: $!";
1202 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1210 printdebug "dummycat query $csuite $package $dpath | $_\n";
1211 my @row = split /\s+/, $_;
1212 @row==2 or die "$dpath: $_ ?";
1215 C->error and die "$dpath: $!";
1217 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1220 #---------- tag format handling ----------
1222 sub access_cfg_tagformats () {
1223 split /\,/, access_cfg('dgit-tag-format');
1226 sub need_tagformat ($$) {
1227 my ($fmt, $why) = @_;
1228 fail "need to use tag format $fmt ($why) but also need".
1229 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1230 " - no way to proceed"
1231 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1232 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1235 sub select_tagformat () {
1237 return if $tagformatfn && !$tagformat_want;
1238 die 'bug' if $tagformatfn && $tagformat_want;
1239 # ... $tagformat_want assigned after previous select_tagformat
1241 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1242 printdebug "select_tagformat supported @supported\n";
1244 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1245 printdebug "select_tagformat specified @$tagformat_want\n";
1247 my ($fmt,$why,$override) = @$tagformat_want;
1249 fail "target distro supports tag formats @supported".
1250 " but have to use $fmt ($why)"
1252 or grep { $_ eq $fmt } @supported;
1254 $tagformat_want = undef;
1256 $tagformatfn = ${*::}{"debiantag_$fmt"};
1258 fail "trying to use unknown tag format \`$fmt' ($why) !"
1259 unless $tagformatfn;
1262 #---------- archive query entrypoints and rest of program ----------
1264 sub canonicalise_suite () {
1265 return if defined $csuite;
1266 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1267 $csuite = archive_query('canonicalise_suite');
1268 if ($isuite ne $csuite) {
1269 progress "canonical suite name for $isuite is $csuite";
1273 sub get_archive_dsc () {
1274 canonicalise_suite();
1275 my @vsns = archive_query('archive_query');
1276 foreach my $vinfo (@vsns) {
1277 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1278 $dscurl = access_cfg('mirror').$subpath;
1279 $dscdata = url_get($dscurl);
1281 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1286 $digester->add($dscdata);
1287 my $got = $digester->hexdigest();
1289 fail "$dscurl has hash $got but".
1290 " archive told us to expect $digest";
1292 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1293 printdebug Dumper($dscdata) if $debuglevel>1;
1294 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1295 printdebug Dumper($dsc) if $debuglevel>1;
1296 my $fmt = getfield $dsc, 'Format';
1297 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
1298 $dsc_checked = !!$digester;
1299 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1303 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1306 sub check_for_git ();
1307 sub check_for_git () {
1309 my $how = access_cfg('git-check');
1310 if ($how eq 'ssh-cmd') {
1312 (access_cfg_ssh, access_gituserhost(),
1313 access_runeinfo("git-check $package").
1314 " set -e; cd ".access_cfg('git-path').";".
1315 " if test -d $package.git; then echo 1; else echo 0; fi");
1316 my $r= cmdoutput @cmd;
1317 if (defined $r and $r =~ m/^divert (\w+)$/) {
1319 my ($usedistro,) = access_distros();
1320 # NB that if we are pushing, $usedistro will be $distro/push
1321 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1322 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1323 progress "diverting to $divert (using config for $instead_distro)";
1324 return check_for_git();
1326 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1328 } elsif ($how eq 'url') {
1329 my $prefix = access_cfg('git-check-url','git-url');
1330 my $suffix = access_cfg('git-check-suffix','git-suffix',
1331 'RETURN-UNDEF') // '.git';
1332 my $url = "$prefix/$package$suffix";
1333 my @cmd = (@curl, qw(-sS -I), $url);
1334 my $result = cmdoutput @cmd;
1335 $result =~ s/^\S+ 200 .*\n\r?\n//;
1336 # curl -sS -I with https_proxy prints
1337 # HTTP/1.0 200 Connection established
1338 $result =~ m/^\S+ (404|200) /s or
1339 fail "unexpected results from git check query - ".
1340 Dumper($prefix, $result);
1342 if ($code eq '404') {
1344 } elsif ($code eq '200') {
1349 } elsif ($how eq 'true') {
1351 } elsif ($how eq 'false') {
1354 badcfg "unknown git-check \`$how'";
1358 sub create_remote_git_repo () {
1359 my $how = access_cfg('git-create');
1360 if ($how eq 'ssh-cmd') {
1362 (access_cfg_ssh, access_gituserhost(),
1363 access_runeinfo("git-create $package").
1364 "set -e; cd ".access_cfg('git-path').";".
1365 " cp -a _template $package.git");
1366 } elsif ($how eq 'true') {
1369 badcfg "unknown git-create \`$how'";
1373 our ($dsc_hash,$lastpush_mergeinput);
1375 our $ud = '.git/dgit/unpack';
1385 sub mktree_in_ud_here () {
1386 runcmd qw(git init -q);
1387 runcmd qw(git config gc.auto 0);
1388 rmtree('.git/objects');
1389 symlink '../../../../objects','.git/objects' or die $!;
1392 sub git_write_tree () {
1393 my $tree = cmdoutput @git, qw(write-tree);
1394 $tree =~ m/^\w+$/ or die "$tree ?";
1398 sub remove_stray_gits () {
1399 my @gitscmd = qw(find -name .git -prune -print0);
1400 debugcmd "|",@gitscmd;
1401 open GITS, "-|", @gitscmd or die $!;
1406 print STDERR "$us: warning: removing from source package: ",
1407 (messagequote $_), "\n";
1411 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1414 sub mktree_in_ud_from_only_subdir (;$) {
1417 # changes into the subdir
1419 die "expected one subdir but found @dirs ?" unless @dirs==1;
1420 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1424 remove_stray_gits();
1425 mktree_in_ud_here();
1427 my ($format, $fopts) = get_source_format();
1428 if (madformat($format)) {
1433 runcmd @git, qw(add -Af);
1434 my $tree=git_write_tree();
1435 return ($tree,$dir);
1438 our @files_csum_info_fields =
1439 (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1440 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1441 ['Files', 'Digest::MD5', 'new()']);
1443 sub dsc_files_info () {
1444 foreach my $csumi (@files_csum_info_fields) {
1445 my ($fname, $module, $method) = @$csumi;
1446 my $field = $dsc->{$fname};
1447 next unless defined $field;
1448 eval "use $module; 1;" or die $@;
1450 foreach (split /\n/, $field) {
1452 m/^(\w+) (\d+) (\S+)$/ or
1453 fail "could not parse .dsc $fname line \`$_'";
1454 my $digester = eval "$module"."->$method;" or die $@;
1459 Digester => $digester,
1464 fail "missing any supported Checksums-* or Files field in ".
1465 $dsc->get_option('name');
1469 map { $_->{Filename} } dsc_files_info();
1472 sub files_compare_inputs (@) {
1477 my $showinputs = sub {
1478 return join "; ", map { $_->get_option('name') } @$inputs;
1481 foreach my $in (@$inputs) {
1483 my $in_name = $in->get_option('name');
1485 printdebug "files_compare_inputs $in_name\n";
1487 foreach my $csumi (@files_csum_info_fields) {
1488 my ($fname) = @$csumi;
1489 printdebug "files_compare_inputs $in_name $fname\n";
1491 my $field = $in->{$fname};
1492 next unless defined $field;
1495 foreach (split /\n/, $field) {
1498 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1499 fail "could not parse $in_name $fname line \`$_'";
1501 printdebug "files_compare_inputs $in_name $fname $f\n";
1505 my $re = \ $record{$f}{$fname};
1507 $fchecked{$f}{$in_name} = 1;
1509 fail "hash or size of $f varies in $fname fields".
1510 " (between: ".$showinputs->().")";
1515 @files = sort @files;
1516 $expected_files //= \@files;
1517 "@$expected_files" eq "@files" or
1518 fail "file list in $in_name varies between hash fields!";
1521 fail "$in_name has no files list field(s)";
1523 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1526 grep { keys %$_ == @$inputs-1 } values %fchecked
1527 or fail "no file appears in all file lists".
1528 " (looked in: ".$showinputs->().")";
1531 sub is_orig_file_in_dsc ($$) {
1532 my ($f, $dsc_files_info) = @_;
1533 return 0 if @$dsc_files_info <= 1;
1534 # One file means no origs, and the filename doesn't have a "what
1535 # part of dsc" component. (Consider versions ending `.orig'.)
1536 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1540 sub is_orig_file_of_vsn ($$) {
1541 my ($f, $upstreamvsn) = @_;
1542 my $base = srcfn $upstreamvsn, '';
1543 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1547 sub make_commit ($) {
1549 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1552 sub make_commit_text ($) {
1555 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1557 print Dumper($text) if $debuglevel > 1;
1558 my $child = open2($out, $in, @cmd) or die $!;
1561 print $in $text or die $!;
1562 close $in or die $!;
1564 $h =~ m/^\w+$/ or die;
1566 printdebug "=> $h\n";
1569 waitpid $child, 0 == $child or die "$child $!";
1570 $? and failedcmd @cmd;
1574 sub clogp_authline ($) {
1576 my $author = getfield $clogp, 'Maintainer';
1577 $author =~ s#,.*##ms;
1578 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1579 my $authline = "$author $date";
1580 $authline =~ m/$git_authline_re/o or
1581 fail "unexpected commit author line format \`$authline'".
1582 " (was generated from changelog Maintainer field)";
1583 return ($1,$2,$3) if wantarray;
1587 sub vendor_patches_distro ($$) {
1588 my ($checkdistro, $what) = @_;
1589 return unless defined $checkdistro;
1591 my $series = "debian/patches/\L$checkdistro\E.series";
1592 printdebug "checking for vendor-specific $series ($what)\n";
1594 if (!open SERIES, "<", $series) {
1595 die "$series $!" unless $!==ENOENT;
1604 Unfortunately, this source package uses a feature of dpkg-source where
1605 the same source package unpacks to different source code on different
1606 distros. dgit cannot safely operate on such packages on affected
1607 distros, because the meaning of source packages is not stable.
1609 Please ask the distro/maintainer to remove the distro-specific series
1610 files and use a different technique (if necessary, uploading actually
1611 different packages, if different distros are supposed to have
1615 fail "Found active distro-specific series file for".
1616 " $checkdistro ($what): $series, cannot continue";
1618 die "$series $!" if SERIES->error;
1622 sub check_for_vendor_patches () {
1623 # This dpkg-source feature doesn't seem to be documented anywhere!
1624 # But it can be found in the changelog (reformatted):
1626 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1627 # Author: Raphael Hertzog <hertzog@debian.org>
1628 # Date: Sun Oct 3 09:36:48 2010 +0200
1630 # dpkg-source: correctly create .pc/.quilt_series with alternate
1633 # If you have debian/patches/ubuntu.series and you were
1634 # unpacking the source package on ubuntu, quilt was still
1635 # directed to debian/patches/series instead of
1636 # debian/patches/ubuntu.series.
1638 # debian/changelog | 3 +++
1639 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1640 # 2 files changed, 6 insertions(+), 1 deletion(-)
1643 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1644 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1645 "Dpkg::Vendor \`current vendor'");
1646 vendor_patches_distro(access_basedistro(),
1647 "distro being accessed");
1650 sub generate_commits_from_dsc () {
1651 # See big comment in fetch_from_archive, below.
1652 # See also README.dsc-import.
1656 my @dfi = dsc_files_info();
1657 foreach my $fi (@dfi) {
1658 my $f = $fi->{Filename};
1659 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1661 link_ltarget "../../../$f", $f
1665 complete_file_from_dsc('.', $fi)
1668 if (is_orig_file_in_dsc($f, \@dfi)) {
1669 link $f, "../../../../$f"
1675 # We unpack and record the orig tarballs first, so that we only
1676 # need disk space for one private copy of the unpacked source.
1677 # But we can't make them into commits until we have the metadata
1678 # from the debian/changelog, so we record the tree objects now and
1679 # make them into commits later.
1681 my $upstreamv = $dsc->{version};
1682 $upstreamv =~ s/-[^-]+$//;
1683 my $orig_f_base = srcfn $upstreamv, '';
1685 foreach my $fi (@dfi) {
1686 # We actually import, and record as a commit, every tarball
1687 # (unless there is only one file, in which case there seems
1690 my $f = $fi->{Filename};
1691 printdebug "import considering $f ";
1692 (printdebug "only one dfi\n"), next if @dfi == 1;
1693 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1694 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1698 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1700 printdebug "Y ", (join ' ', map { $_//"(none)" }
1701 $compr_ext, $orig_f_part
1704 my $input = new IO::File $f, '<' or die "$f $!";
1708 if (defined $compr_ext) {
1710 Dpkg::Compression::compression_guess_from_filename $f;
1711 fail "Dpkg::Compression cannot handle file $f in source package"
1712 if defined $compr_ext && !defined $cname;
1714 new Dpkg::Compression::Process compression => $cname;
1715 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1716 my $compr_fh = new IO::Handle;
1717 my $compr_pid = open $compr_fh, "-|" // die $!;
1719 open STDIN, "<&", $input or die $!;
1721 die "dgit (child): exec $compr_cmd[0]: $!\n";
1726 rmtree "../unpack-tar";
1727 mkdir "../unpack-tar" or die $!;
1728 my @tarcmd = qw(tar -x -f -
1729 --no-same-owner --no-same-permissions
1730 --no-acls --no-xattrs --no-selinux);
1731 my $tar_pid = fork // die $!;
1733 chdir "../unpack-tar" or die $!;
1734 open STDIN, "<&", $input or die $!;
1736 die "dgit (child): exec $tarcmd[0]: $!";
1738 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1739 !$? or failedcmd @tarcmd;
1742 (@compr_cmd ? failedcmd @compr_cmd
1744 # finally, we have the results in "tarball", but maybe
1745 # with the wrong permissions
1747 runcmd qw(chmod -R +rwX ../unpack-tar);
1748 changedir "../unpack-tar";
1749 my ($tree) = mktree_in_ud_from_only_subdir(1);
1750 changedir "../../unpack";
1751 rmtree "../unpack-tar";
1753 my $ent = [ $f, $tree ];
1755 Orig => !!$orig_f_part,
1756 Sort => (!$orig_f_part ? 2 :
1757 $orig_f_part =~ m/-/g ? 1 :
1765 # put any without "_" first (spec is not clear whether files
1766 # are always in the usual order). Tarballs without "_" are
1767 # the main orig or the debian tarball.
1768 $a->{Sort} <=> $b->{Sort} or
1772 my $any_orig = grep { $_->{Orig} } @tartrees;
1774 my $dscfn = "$package.dsc";
1776 my $treeimporthow = 'package';
1778 open D, ">", $dscfn or die "$dscfn: $!";
1779 print D $dscdata or die "$dscfn: $!";
1780 close D or die "$dscfn: $!";
1781 my @cmd = qw(dpkg-source);
1782 push @cmd, '--no-check' if $dsc_checked;
1783 if (madformat $dsc->{format}) {
1784 push @cmd, '--skip-patches';
1785 $treeimporthow = 'unpatched';
1787 push @cmd, qw(-x --), $dscfn;
1790 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1791 if (madformat $dsc->{format}) {
1792 check_for_vendor_patches();
1796 if (madformat $dsc->{format}) {
1797 my @pcmd = qw(dpkg-source --before-build .);
1798 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1800 runcmd @git, qw(add -Af);
1801 $dappliedtree = git_write_tree();
1804 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1805 debugcmd "|",@clogcmd;
1806 open CLOGS, "-|", @clogcmd or die $!;
1811 printdebug "import clog search...\n";
1814 my $stanzatext = do { local $/=""; <CLOGS>; };
1815 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1816 last if !defined $stanzatext;
1818 my $desc = "package changelog, entry no.$.";
1819 open my $stanzafh, "<", \$stanzatext or die;
1820 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1821 $clogp //= $thisstanza;
1823 printdebug "import clog $thisstanza->{version} $desc...\n";
1825 last if !$any_orig; # we don't need $r1clogp
1827 # We look for the first (most recent) changelog entry whose
1828 # version number is lower than the upstream version of this
1829 # package. Then the last (least recent) previous changelog
1830 # entry is treated as the one which introduced this upstream
1831 # version and used for the synthetic commits for the upstream
1834 # One might think that a more sophisticated algorithm would be
1835 # necessary. But: we do not want to scan the whole changelog
1836 # file. Stopping when we see an earlier version, which
1837 # necessarily then is an earlier upstream version, is the only
1838 # realistic way to do that. Then, either the earliest
1839 # changelog entry we have seen so far is indeed the earliest
1840 # upload of this upstream version; or there are only changelog
1841 # entries relating to later upstream versions (which is not
1842 # possible unless the changelog and .dsc disagree about the
1843 # version). Then it remains to choose between the physically
1844 # last entry in the file, and the one with the lowest version
1845 # number. If these are not the same, we guess that the
1846 # versions were created in a non-monotic order rather than
1847 # that the changelog entries have been misordered.
1849 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
1851 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
1852 $r1clogp = $thisstanza;
1854 printdebug "import clog $r1clogp->{version} becomes r1\n";
1856 die $! if CLOGS->error;
1857 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
1859 $clogp or fail "package changelog has no entries!";
1861 my $authline = clogp_authline $clogp;
1862 my $changes = getfield $clogp, 'Changes';
1863 my $cversion = getfield $clogp, 'Version';
1866 $r1clogp //= $clogp; # maybe there's only one entry;
1867 my $r1authline = clogp_authline $r1clogp;
1868 # Strictly, r1authline might now be wrong if it's going to be
1869 # unused because !$any_orig. Whatever.
1871 printdebug "import tartrees authline $authline\n";
1872 printdebug "import tartrees r1authline $r1authline\n";
1874 foreach my $tt (@tartrees) {
1875 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
1877 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
1880 committer $r1authline
1884 [dgit import orig $tt->{F}]
1892 [dgit import tarball $package $cversion $tt->{F}]
1897 printdebug "import main commit\n";
1899 open C, ">../commit.tmp" or die $!;
1900 print C <<END or die $!;
1903 print C <<END or die $! foreach @tartrees;
1906 print C <<END or die $!;
1912 [dgit import $treeimporthow $package $cversion]
1916 my $rawimport_hash = make_commit qw(../commit.tmp);
1918 if (madformat $dsc->{format}) {
1919 printdebug "import apply patches...\n";
1921 # regularise the state of the working tree so that
1922 # the checkout of $rawimport_hash works nicely.
1923 my $dappliedcommit = make_commit_text(<<END);
1930 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
1932 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
1934 # We need the answers to be reproducible
1935 my @authline = clogp_authline($clogp);
1936 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
1937 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
1938 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
1939 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
1940 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
1941 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
1944 runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
1948 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
1952 my $gapplied = git_rev_parse('HEAD');
1953 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
1954 $gappliedtree eq $dappliedtree or
1956 gbp-pq import and dpkg-source disagree!
1957 gbp-pq import gave commit $gapplied
1958 gbp-pq import gave tree $gappliedtree
1959 dpkg-source --before-build gave tree $dappliedtree
1961 $rawimport_hash = $gapplied;
1964 progress "synthesised git commit from .dsc $cversion";
1966 my $rawimport_mergeinput = {
1967 Commit => $rawimport_hash,
1968 Info => "Import of source package",
1970 my @output = ($rawimport_mergeinput);
1972 if ($lastpush_mergeinput) {
1973 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
1974 my $oversion = getfield $oldclogp, 'Version';
1976 version_compare($oversion, $cversion);
1978 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
1979 { Message => <<END, ReverseParents => 1 });
1980 Record $package ($cversion) in archive suite $csuite
1982 } elsif ($vcmp > 0) {
1983 print STDERR <<END or die $!;
1985 Version actually in archive: $cversion (older)
1986 Last version pushed with dgit: $oversion (newer or same)
1989 @output = $lastpush_mergeinput;
1991 # Same version. Use what's in the server git branch,
1992 # discarding our own import. (This could happen if the
1993 # server automatically imports all packages into git.)
1994 @output = $lastpush_mergeinput;
1997 changedir '../../../..';
2002 sub complete_file_from_dsc ($$) {
2003 our ($dstdir, $fi) = @_;
2004 # Ensures that we have, in $dir, the file $fi, with the correct
2005 # contents. (Downloading it from alongside $dscurl if necessary.)
2007 my $f = $fi->{Filename};
2008 my $tf = "$dstdir/$f";
2011 if (stat_exists $tf) {
2012 progress "using existing $f";
2015 $furl =~ s{/[^/]+$}{};
2017 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2018 die "$f ?" if $f =~ m#/#;
2019 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2020 return 0 if !act_local();
2024 open F, "<", "$tf" or die "$tf: $!";
2025 $fi->{Digester}->reset();
2026 $fi->{Digester}->addfile(*F);
2027 F->error and die $!;
2028 my $got = $fi->{Digester}->hexdigest();
2029 $got eq $fi->{Hash} or
2030 fail "file $f has hash $got but .dsc".
2031 " demands hash $fi->{Hash} ".
2032 ($downloaded ? "(got wrong file from archive!)"
2033 : "(perhaps you should delete this file?)");
2038 sub ensure_we_have_orig () {
2039 my @dfi = dsc_files_info();
2040 foreach my $fi (@dfi) {
2041 my $f = $fi->{Filename};
2042 next unless is_orig_file_in_dsc($f, \@dfi);
2043 complete_file_from_dsc('..', $fi)
2048 sub git_fetch_us () {
2049 # Want to fetch only what we are going to use, unless
2050 # deliberately-not-ff, in which case we must fetch everything.
2052 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2054 (quiltmode_splitbrain
2055 ? (map { $_->('*',access_basedistro) }
2056 \&debiantag_new, \&debiantag_maintview)
2057 : debiantags('*',access_basedistro));
2058 push @specs, server_branch($csuite);
2059 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2061 # This is rather miserable:
2062 # When git fetch --prune is passed a fetchspec ending with a *,
2063 # it does a plausible thing. If there is no * then:
2064 # - it matches subpaths too, even if the supplied refspec
2065 # starts refs, and behaves completely madly if the source
2066 # has refs/refs/something. (See, for example, Debian #NNNN.)
2067 # - if there is no matching remote ref, it bombs out the whole
2069 # We want to fetch a fixed ref, and we don't know in advance
2070 # if it exists, so this is not suitable.
2072 # Our workaround is to use git ls-remote. git ls-remote has its
2073 # own qairks. Notably, it has the absurd multi-tail-matching
2074 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2075 # refs/refs/foo etc.
2077 # Also, we want an idempotent snapshot, but we have to make two
2078 # calls to the remote: one to git ls-remote and to git fetch. The
2079 # solution is use git ls-remote to obtain a target state, and
2080 # git fetch to try to generate it. If we don't manage to generate
2081 # the target state, we try again.
2083 my $specre = join '|', map {
2089 printdebug "git_fetch_us specre=$specre\n";
2090 my $wanted_rref = sub {
2092 return m/^(?:$specre)$/o;
2095 my $fetch_iteration = 0;
2098 if (++$fetch_iteration > 10) {
2099 fail "too many iterations trying to get sane fetch!";
2102 my @look = map { "refs/$_" } @specs;
2103 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2107 open GITLS, "-|", @lcmd or die $!;
2109 printdebug "=> ", $_;
2110 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2111 my ($objid,$rrefname) = ($1,$2);
2112 if (!$wanted_rref->($rrefname)) {
2114 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2118 $wantr{$rrefname} = $objid;
2121 close GITLS or failedcmd @lcmd;
2123 # OK, now %want is exactly what we want for refs in @specs
2125 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2126 "+refs/$_:".lrfetchrefs."/$_";
2129 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2130 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2133 %lrfetchrefs_f = ();
2136 git_for_each_ref(lrfetchrefs, sub {
2137 my ($objid,$objtype,$lrefname,$reftail) = @_;
2138 $lrfetchrefs_f{$lrefname} = $objid;
2139 $objgot{$objid} = 1;
2142 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2143 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2144 if (!exists $wantr{$rrefname}) {
2145 if ($wanted_rref->($rrefname)) {
2147 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2151 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2154 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2155 delete $lrfetchrefs_f{$lrefname};
2159 foreach my $rrefname (sort keys %wantr) {
2160 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2161 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2162 my $want = $wantr{$rrefname};
2163 next if $got eq $want;
2164 if (!defined $objgot{$want}) {
2166 warning: git ls-remote suggests we want $lrefname
2167 warning: and it should refer to $want
2168 warning: but git fetch didn't fetch that object to any relevant ref.
2169 warning: This may be due to a race with someone updating the server.
2170 warning: Will try again...
2172 next FETCH_ITERATION;
2175 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2177 runcmd_ordryrun_local @git, qw(update-ref -m),
2178 "dgit fetch git fetch fixup", $lrefname, $want;
2179 $lrfetchrefs_f{$lrefname} = $want;
2183 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2184 Dumper(\%lrfetchrefs_f);
2187 my @tagpats = debiantags('*',access_basedistro);
2189 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2190 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2191 printdebug "currently $fullrefname=$objid\n";
2192 $here{$fullrefname} = $objid;
2194 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2195 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2196 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2197 printdebug "offered $lref=$objid\n";
2198 if (!defined $here{$lref}) {
2199 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2200 runcmd_ordryrun_local @upd;
2201 lrfetchref_used $fullrefname;
2202 } elsif ($here{$lref} eq $objid) {
2203 lrfetchref_used $fullrefname;
2206 "Not updateting $lref from $here{$lref} to $objid.\n";
2211 sub mergeinfo_getclogp ($) {
2212 # Ensures thit $mi->{Clogp} exists and returns it
2214 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2217 sub mergeinfo_version ($) {
2218 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2221 sub fetch_from_archive () {
2222 ensure_setup_existing_tree();
2224 # Ensures that lrref() is what is actually in the archive, one way
2225 # or another, according to us - ie this client's
2226 # appropritaely-updated archive view. Also returns the commit id.
2227 # If there is nothing in the archive, leaves lrref alone and
2228 # returns undef. git_fetch_us must have already been called.
2232 foreach my $field (@ourdscfield) {
2233 $dsc_hash = $dsc->{$field};
2234 last if defined $dsc_hash;
2236 if (defined $dsc_hash) {
2237 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2239 progress "last upload to archive specified git hash";
2241 progress "last upload to archive has NO git hash";
2244 progress "no version available from the archive";
2247 # If the archive's .dsc has a Dgit field, there are three
2248 # relevant git commitids we need to choose between and/or merge
2250 # 1. $dsc_hash: the Dgit field from the archive
2251 # 2. $lastpush_hash: the suite branch on the dgit git server
2252 # 3. $lastfetch_hash: our local tracking brach for the suite
2254 # These may all be distinct and need not be in any fast forward
2257 # If the dsc was pushed to this suite, then the server suite
2258 # branch will have been updated; but it might have been pushed to
2259 # a different suite and copied by the archive. Conversely a more
2260 # recent version may have been pushed with dgit but not appeared
2261 # in the archive (yet).
2263 # $lastfetch_hash may be awkward because archive imports
2264 # (particularly, imports of Dgit-less .dscs) are performed only as
2265 # needed on individual clients, so different clients may perform a
2266 # different subset of them - and these imports are only made
2267 # public during push. So $lastfetch_hash may represent a set of
2268 # imports different to a subsequent upload by a different dgit
2271 # Our approach is as follows:
2273 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2274 # descendant of $dsc_hash, then it was pushed by a dgit user who
2275 # had based their work on $dsc_hash, so we should prefer it.
2276 # Otherwise, $dsc_hash was installed into this suite in the
2277 # archive other than by a dgit push, and (necessarily) after the
2278 # last dgit push into that suite (since a dgit push would have
2279 # been descended from the dgit server git branch); thus, in that
2280 # case, we prefer the archive's version (and produce a
2281 # pseudo-merge to overwrite the dgit server git branch).
2283 # (If there is no Dgit field in the archive's .dsc then
2284 # generate_commit_from_dsc uses the version numbers to decide
2285 # whether the suite branch or the archive is newer. If the suite
2286 # branch is newer it ignores the archive's .dsc; otherwise it
2287 # generates an import of the .dsc, and produces a pseudo-merge to
2288 # overwrite the suite branch with the archive contents.)
2290 # The outcome of that part of the algorithm is the `public view',
2291 # and is same for all dgit clients: it does not depend on any
2292 # unpublished history in the local tracking branch.
2294 # As between the public view and the local tracking branch: The
2295 # local tracking branch is only updated by dgit fetch, and
2296 # whenever dgit fetch runs it includes the public view in the
2297 # local tracking branch. Therefore if the public view is not
2298 # descended from the local tracking branch, the local tracking
2299 # branch must contain history which was imported from the archive
2300 # but never pushed; and, its tip is now out of date. So, we make
2301 # a pseudo-merge to overwrite the old imports and stitch the old
2304 # Finally: we do not necessarily reify the public view (as
2305 # described above). This is so that we do not end up stacking two
2306 # pseudo-merges. So what we actually do is figure out the inputs
2307 # to any public view pseudo-merge and put them in @mergeinputs.
2310 # $mergeinputs[]{Commit}
2311 # $mergeinputs[]{Info}
2312 # $mergeinputs[0] is the one whose tree we use
2313 # @mergeinputs is in the order we use in the actual commit)
2316 # $mergeinputs[]{Message} is a commit message to use
2317 # $mergeinputs[]{ReverseParents} if def specifies that parent
2318 # list should be in opposite order
2319 # Such an entry has no Commit or Info. It applies only when found
2320 # in the last entry. (This ugliness is to support making
2321 # identical imports to previous dgit versions.)
2323 my $lastpush_hash = git_get_ref(lrfetchref());
2324 printdebug "previous reference hash=$lastpush_hash\n";
2325 $lastpush_mergeinput = $lastpush_hash && {
2326 Commit => $lastpush_hash,
2327 Info => "dgit suite branch on dgit git server",
2330 my $lastfetch_hash = git_get_ref(lrref());
2331 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2332 my $lastfetch_mergeinput = $lastfetch_hash && {
2333 Commit => $lastfetch_hash,
2334 Info => "dgit client's archive history view",
2337 my $dsc_mergeinput = $dsc_hash && {
2338 Commit => $dsc_hash,
2339 Info => "Dgit field in .dsc from archive",
2343 my $del_lrfetchrefs = sub {
2346 printdebug "del_lrfetchrefs...\n";
2347 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2348 my $objid = $lrfetchrefs_d{$fullrefname};
2349 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2351 $gur ||= new IO::Handle;
2352 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2354 printf $gur "delete %s %s\n", $fullrefname, $objid;
2357 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2361 if (defined $dsc_hash) {
2362 fail "missing remote git history even though dsc has hash -".
2363 " could not find ref ".rref()." at ".access_giturl()
2364 unless $lastpush_hash;
2365 ensure_we_have_orig();
2366 if ($dsc_hash eq $lastpush_hash) {
2367 @mergeinputs = $dsc_mergeinput
2368 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2369 print STDERR <<END or die $!;
2371 Git commit in archive is behind the last version allegedly pushed/uploaded.
2372 Commit referred to by archive: $dsc_hash
2373 Last version pushed with dgit: $lastpush_hash
2376 @mergeinputs = ($lastpush_mergeinput);
2378 # Archive has .dsc which is not a descendant of the last dgit
2379 # push. This can happen if the archive moves .dscs about.
2380 # Just follow its lead.
2381 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2382 progress "archive .dsc names newer git commit";
2383 @mergeinputs = ($dsc_mergeinput);
2385 progress "archive .dsc names other git commit, fixing up";
2386 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2390 @mergeinputs = generate_commits_from_dsc();
2391 # We have just done an import. Now, our import algorithm might
2392 # have been improved. But even so we do not want to generate
2393 # a new different import of the same package. So if the
2394 # version numbers are the same, just use our existing version.
2395 # If the version numbers are different, the archive has changed
2396 # (perhaps, rewound).
2397 if ($lastfetch_mergeinput &&
2398 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2399 (mergeinfo_version $mergeinputs[0]) )) {
2400 @mergeinputs = ($lastfetch_mergeinput);
2402 } elsif ($lastpush_hash) {
2403 # only in git, not in the archive yet
2404 @mergeinputs = ($lastpush_mergeinput);
2405 print STDERR <<END or die $!;
2407 Package not found in the archive, but has allegedly been pushed using dgit.
2411 printdebug "nothing found!\n";
2412 if (defined $skew_warning_vsn) {
2413 print STDERR <<END or die $!;
2415 Warning: relevant archive skew detected.
2416 Archive allegedly contains $skew_warning_vsn
2417 But we were not able to obtain any version from the archive or git.
2421 unshift @end, $del_lrfetchrefs;
2425 if ($lastfetch_hash &&
2427 my $h = $_->{Commit};
2428 $h and is_fast_fwd($lastfetch_hash, $h);
2429 # If true, one of the existing parents of this commit
2430 # is a descendant of the $lastfetch_hash, so we'll
2431 # be ff from that automatically.
2435 push @mergeinputs, $lastfetch_mergeinput;
2438 printdebug "fetch mergeinfos:\n";
2439 foreach my $mi (@mergeinputs) {
2441 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2443 printdebug sprintf " ReverseParents=%d Message=%s",
2444 $mi->{ReverseParents}, $mi->{Message};
2448 my $compat_info= pop @mergeinputs
2449 if $mergeinputs[$#mergeinputs]{Message};
2451 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2454 if (@mergeinputs > 1) {
2456 my $tree_commit = $mergeinputs[0]{Commit};
2458 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2459 $tree =~ m/\n\n/; $tree = $`;
2460 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2463 # We use the changelog author of the package in question the
2464 # author of this pseudo-merge. This is (roughly) correct if
2465 # this commit is simply representing aa non-dgit upload.
2466 # (Roughly because it does not record sponsorship - but we
2467 # don't have sponsorship info because that's in the .changes,
2468 # which isn't in the archivw.)
2470 # But, it might be that we are representing archive history
2471 # updates (including in-archive copies). These are not really
2472 # the responsibility of the person who created the .dsc, but
2473 # there is no-one whose name we should better use. (The
2474 # author of the .dsc-named commit is clearly worse.)
2476 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2477 my $author = clogp_authline $useclogp;
2478 my $cversion = getfield $useclogp, 'Version';
2480 my $mcf = ".git/dgit/mergecommit";
2481 open MC, ">", $mcf or die "$mcf $!";
2482 print MC <<END or die $!;
2486 my @parents = grep { $_->{Commit} } @mergeinputs;
2487 @parents = reverse @parents if $compat_info->{ReverseParents};
2488 print MC <<END or die $! foreach @parents;
2492 print MC <<END or die $!;
2498 if (defined $compat_info->{Message}) {
2499 print MC $compat_info->{Message} or die $!;
2501 print MC <<END or die $!;
2502 Record $package ($cversion) in archive suite $csuite
2506 my $message_add_info = sub {
2508 my $mversion = mergeinfo_version $mi;
2509 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2513 $message_add_info->($mergeinputs[0]);
2514 print MC <<END or die $!;
2515 should be treated as descended from
2517 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2521 $hash = make_commit $mcf;
2523 $hash = $mergeinputs[0]{Commit};
2525 printdebug "fetch hash=$hash\n";
2528 my ($lasth, $what) = @_;
2529 return unless $lasth;
2530 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2533 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2534 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2536 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2537 'DGIT_ARCHIVE', $hash;
2538 cmdoutput @git, qw(log -n2), $hash;
2539 # ... gives git a chance to complain if our commit is malformed
2541 if (defined $skew_warning_vsn) {
2543 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2544 my $gotclogp = commit_getclogp($hash);
2545 my $got_vsn = getfield $gotclogp, 'Version';
2546 printdebug "SKEW CHECK GOT $got_vsn\n";
2547 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2548 print STDERR <<END or die $!;
2550 Warning: archive skew detected. Using the available version:
2551 Archive allegedly contains $skew_warning_vsn
2552 We were able to obtain only $got_vsn
2558 if ($lastfetch_hash ne $hash) {
2559 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2563 dryrun_report @upd_cmd;
2567 lrfetchref_used lrfetchref();
2569 unshift @end, $del_lrfetchrefs;
2573 sub set_local_git_config ($$) {
2575 runcmd @git, qw(config), $k, $v;
2578 sub setup_mergechangelogs (;$) {
2580 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2582 my $driver = 'dpkg-mergechangelogs';
2583 my $cb = "merge.$driver";
2584 my $attrs = '.git/info/attributes';
2585 ensuredir '.git/info';
2587 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2588 if (!open ATTRS, "<", $attrs) {
2589 $!==ENOENT or die "$attrs: $!";
2593 next if m{^debian/changelog\s};
2594 print NATTRS $_, "\n" or die $!;
2596 ATTRS->error and die $!;
2599 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2602 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2603 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2605 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2608 sub setup_useremail (;$) {
2610 return unless $always || access_cfg_bool(1, 'setup-useremail');
2613 my ($k, $envvar) = @_;
2614 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2615 return unless defined $v;
2616 set_local_git_config "user.$k", $v;
2619 $setup->('email', 'DEBEMAIL');
2620 $setup->('name', 'DEBFULLNAME');
2623 sub ensure_setup_existing_tree () {
2624 my $k = "remote.$remotename.skipdefaultupdate";
2625 my $c = git_get_config $k;
2626 return if defined $c;
2627 set_local_git_config $k, 'true';
2630 sub setup_new_tree () {
2631 setup_mergechangelogs();
2637 canonicalise_suite();
2638 badusage "dry run makes no sense with clone" unless act_local();
2639 my $hasgit = check_for_git();
2640 mkdir $dstdir or fail "create \`$dstdir': $!";
2642 runcmd @git, qw(init -q);
2643 my $giturl = access_giturl(1);
2644 if (defined $giturl) {
2645 open H, "> .git/HEAD" or die $!;
2646 print H "ref: ".lref()."\n" or die $!;
2648 runcmd @git, qw(remote add), 'origin', $giturl;
2651 progress "fetching existing git history";
2653 runcmd_ordryrun_local @git, qw(fetch origin);
2655 progress "starting new git history";
2657 fetch_from_archive() or no_such_package;
2658 my $vcsgiturl = $dsc->{'Vcs-Git'};
2659 if (length $vcsgiturl) {
2660 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2661 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2664 runcmd @git, qw(reset --hard), lrref();
2665 printdone "ready for work in $dstdir";
2669 if (check_for_git()) {
2672 fetch_from_archive() or no_such_package();
2673 printdone "fetched into ".lrref();
2678 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2680 printdone "fetched to ".lrref()." and merged into HEAD";
2683 sub check_not_dirty () {
2684 foreach my $f (qw(local-options local-patch-header)) {
2685 if (stat_exists "debian/source/$f") {
2686 fail "git tree contains debian/source/$f";
2690 return if $ignoredirty;
2692 my @cmd = (@git, qw(diff --quiet HEAD));
2694 $!=0; $?=-1; system @cmd;
2697 fail "working tree is dirty (does not match HEAD)";
2703 sub commit_admin ($) {
2706 runcmd_ordryrun_local @git, qw(commit -m), $m;
2709 sub commit_quilty_patch () {
2710 my $output = cmdoutput @git, qw(status --porcelain);
2712 foreach my $l (split /\n/, $output) {
2713 next unless $l =~ m/\S/;
2714 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2718 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2720 progress "nothing quilty to commit, ok.";
2723 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2724 runcmd_ordryrun_local @git, qw(add -f), @adds;
2726 Commit Debian 3.0 (quilt) metadata
2728 [dgit ($our_version) quilt-fixup]
2732 sub get_source_format () {
2734 if (open F, "debian/source/options") {
2738 s/\s+$//; # ignore missing final newline
2740 my ($k, $v) = ($`, $'); #');
2741 $v =~ s/^"(.*)"$/$1/;
2747 F->error and die $!;
2750 die $! unless $!==&ENOENT;
2753 if (!open F, "debian/source/format") {
2754 die $! unless $!==&ENOENT;
2758 F->error and die $!;
2760 return ($_, \%options);
2763 sub madformat_wantfixup ($) {
2765 return 0 unless $format eq '3.0 (quilt)';
2766 our $quilt_mode_warned;
2767 if ($quilt_mode eq 'nocheck') {
2768 progress "Not doing any fixup of \`$format' due to".
2769 " ----no-quilt-fixup or --quilt=nocheck"
2770 unless $quilt_mode_warned++;
2773 progress "Format \`$format', need to check/update patch stack"
2774 unless $quilt_mode_warned++;
2778 # An "infopair" is a tuple [ $thing, $what ]
2779 # (often $thing is a commit hash; $what is a description)
2781 sub infopair_cond_equal ($$) {
2783 $x->[0] eq $y->[0] or fail <<END;
2784 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
2788 sub infopair_lrf_tag_lookup ($$) {
2789 my ($tagnames, $what) = @_;
2790 # $tagname may be an array ref
2791 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
2792 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
2793 foreach my $tagname (@tagnames) {
2794 my $lrefname = lrfetchrefs."/tags/$tagname";
2795 my $tagobj = $lrfetchrefs_f{$lrefname};
2796 next unless defined $tagobj;
2797 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
2798 return [ git_rev_parse($tagobj), $what ];
2800 fail @tagnames==1 ? <<END : <<END;
2801 Wanted tag $what (@tagnames) on dgit server, but not found
2803 Wanted tag $what (one of: @tagnames) on dgit server, but not found
2807 sub infopair_cond_ff ($$) {
2808 my ($anc,$desc) = @_;
2809 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
2810 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
2814 sub pseudomerge_version_check ($$) {
2815 my ($clogp, $archive_hash) = @_;
2817 my $arch_clogp = commit_getclogp $archive_hash;
2818 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
2819 'version currently in archive' ];
2820 if (defined $overwrite_version) {
2821 if (length $overwrite_version) {
2822 infopair_cond_equal([ $overwrite_version,
2823 '--overwrite= version' ],
2826 my $v = $i_arch_v->[0];
2827 progress "Checking package changelog for archive version $v ...";
2829 my @xa = ("-f$v", "-t$v");
2830 my $vclogp = parsechangelog @xa;
2831 my $cv = [ (getfield $vclogp, 'Version'),
2832 "Version field from dpkg-parsechangelog @xa" ];
2833 infopair_cond_equal($i_arch_v, $cv);
2836 $@ =~ s/^dgit: //gm;
2838 "Perhaps debian/changelog does not mention $v ?";
2843 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
2847 sub pseudomerge_make_commit ($$$$ $$) {
2848 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
2849 $msg_cmd, $msg_msg) = @_;
2850 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
2852 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
2853 my $authline = clogp_authline $clogp;
2857 !defined $overwrite_version ? ""
2858 : !length $overwrite_version ? " --overwrite"
2859 : " --overwrite=".$overwrite_version;
2862 my $pmf = ".git/dgit/pseudomerge";
2863 open MC, ">", $pmf or die "$pmf $!";
2864 print MC <<END or die $!;
2867 parent $archive_hash
2877 return make_commit($pmf);
2880 sub splitbrain_pseudomerge ($$$$) {
2881 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
2882 # => $merged_dgitview
2883 printdebug "splitbrain_pseudomerge...\n";
2885 # We: debian/PREVIOUS HEAD($maintview)
2886 # expect: o ----------------- o
2889 # a/d/PREVIOUS $dgitview
2892 # we do: `------------------ o
2896 printdebug "splitbrain_pseudomerge...\n";
2898 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
2900 return $dgitview unless defined $archive_hash;
2902 if (!defined $overwrite_version) {
2903 progress "Checking that HEAD inciudes all changes in archive...";
2906 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
2908 if (defined $overwrite_version) {
2910 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
2911 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
2912 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
2913 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
2914 my $i_archive = [ $archive_hash, "current archive contents" ];
2916 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
2918 infopair_cond_equal($i_dgit, $i_archive);
2919 infopair_cond_ff($i_dep14, $i_dgit);
2920 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
2924 $us: check failed (maybe --overwrite is needed, consult documentation)
2929 my $r = pseudomerge_make_commit
2930 $clogp, $dgitview, $archive_hash, $i_arch_v,
2931 "dgit --quilt=$quilt_mode",
2932 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
2933 Declare fast forward from $i_arch_v->[0]
2935 Make fast forward from $i_arch_v->[0]
2938 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
2942 sub plain_overwrite_pseudomerge ($$$) {
2943 my ($clogp, $head, $archive_hash) = @_;
2945 printdebug "plain_overwrite_pseudomerge...";
2947 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
2949 return $head if is_fast_fwd $archive_hash, $head;
2951 my $m = "Declare fast forward from $i_arch_v->[0]";
2953 my $r = pseudomerge_make_commit
2954 $clogp, $head, $archive_hash, $i_arch_v,
2957 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
2959 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
2963 sub push_parse_changelog ($) {
2966 my $clogp = Dpkg::Control::Hash->new();
2967 $clogp->load($clogpfn) or die;
2969 $package = getfield $clogp, 'Source';
2970 my $cversion = getfield $clogp, 'Version';
2971 my $tag = debiantag($cversion, access_basedistro);
2972 runcmd @git, qw(check-ref-format), $tag;
2974 my $dscfn = dscfn($cversion);
2976 return ($clogp, $cversion, $dscfn);
2979 sub push_parse_dsc ($$$) {
2980 my ($dscfn,$dscfnwhat, $cversion) = @_;
2981 $dsc = parsecontrol($dscfn,$dscfnwhat);
2982 my $dversion = getfield $dsc, 'Version';
2983 my $dscpackage = getfield $dsc, 'Source';
2984 ($dscpackage eq $package && $dversion eq $cversion) or
2985 fail "$dscfn is for $dscpackage $dversion".
2986 " but debian/changelog is for $package $cversion";
2989 sub push_tagwants ($$$$) {
2990 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
2993 TagFn => \&debiantag,
2998 if (defined $maintviewhead) {
3000 TagFn => \&debiantag_maintview,
3001 Objid => $maintviewhead,
3002 TfSuffix => '-maintview',
3006 foreach my $tw (@tagwants) {
3007 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
3008 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3010 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3014 sub push_mktags ($$ $$ $) {
3016 $changesfile,$changesfilewhat,
3019 die unless $tagwants->[0]{View} eq 'dgit';
3021 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3022 $dsc->save("$dscfn.tmp") or die $!;
3024 my $changes = parsecontrol($changesfile,$changesfilewhat);
3025 foreach my $field (qw(Source Distribution Version)) {
3026 $changes->{$field} eq $clogp->{$field} or
3027 fail "changes field $field \`$changes->{$field}'".
3028 " does not match changelog \`$clogp->{$field}'";
3031 my $cversion = getfield $clogp, 'Version';
3032 my $clogsuite = getfield $clogp, 'Distribution';
3034 # We make the git tag by hand because (a) that makes it easier
3035 # to control the "tagger" (b) we can do remote signing
3036 my $authline = clogp_authline $clogp;
3037 my $delibs = join(" ", "",@deliberatelies);
3038 my $declaredistro = access_basedistro();
3042 my $tfn = $tw->{Tfn};
3043 my $head = $tw->{Objid};
3044 my $tag = $tw->{Tag};
3046 open TO, '>', $tfn->('.tmp') or die $!;
3047 print TO <<END or die $!;
3054 if ($tw->{View} eq 'dgit') {
3055 print TO <<END or die $!;
3056 $package release $cversion for $clogsuite ($csuite) [dgit]
3057 [dgit distro=$declaredistro$delibs]
3059 foreach my $ref (sort keys %previously) {
3060 print TO <<END or die $!;
3061 [dgit previously:$ref=$previously{$ref}]
3064 } elsif ($tw->{View} eq 'maint') {
3065 print TO <<END or die $!;
3066 $package release $cversion for $clogsuite ($csuite)
3067 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3070 die Dumper($tw)."?";
3075 my $tagobjfn = $tfn->('.tmp');
3077 if (!defined $keyid) {
3078 $keyid = access_cfg('keyid','RETURN-UNDEF');
3080 if (!defined $keyid) {
3081 $keyid = getfield $clogp, 'Maintainer';
3083 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3084 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3085 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3086 push @sign_cmd, $tfn->('.tmp');
3087 runcmd_ordryrun @sign_cmd;
3089 $tagobjfn = $tfn->('.signed.tmp');
3090 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3091 $tfn->('.tmp'), $tfn->('.tmp.asc');
3097 my @r = map { $mktag->($_); } @$tagwants;
3101 sub sign_changes ($) {
3102 my ($changesfile) = @_;
3104 my @debsign_cmd = @debsign;
3105 push @debsign_cmd, "-k$keyid" if defined $keyid;
3106 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3107 push @debsign_cmd, $changesfile;
3108 runcmd_ordryrun @debsign_cmd;
3113 printdebug "actually entering push\n";
3115 supplementary_message(<<'END');
3116 Push failed, while checking state of the archive.
3117 You can retry the push, after fixing the problem, if you like.
3119 if (check_for_git()) {
3122 my $archive_hash = fetch_from_archive();
3123 if (!$archive_hash) {
3125 fail "package appears to be new in this suite;".
3126 " if this is intentional, use --new";
3129 supplementary_message(<<'END');
3130 Push failed, while preparing your push.
3131 You can retry the push, after fixing the problem, if you like.
3134 need_tagformat 'new', "quilt mode $quilt_mode"
3135 if quiltmode_splitbrain;
3139 access_giturl(); # check that success is vaguely likely
3142 my $clogpfn = ".git/dgit/changelog.822.tmp";
3143 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3145 responder_send_file('parsed-changelog', $clogpfn);
3147 my ($clogp, $cversion, $dscfn) =
3148 push_parse_changelog("$clogpfn");
3150 my $dscpath = "$buildproductsdir/$dscfn";
3151 stat_exists $dscpath or
3152 fail "looked for .dsc $dscfn, but $!;".
3153 " maybe you forgot to build";
3155 responder_send_file('dsc', $dscpath);
3157 push_parse_dsc($dscpath, $dscfn, $cversion);
3159 my $format = getfield $dsc, 'Format';
3160 printdebug "format $format\n";
3162 my $actualhead = git_rev_parse('HEAD');
3163 my $dgithead = $actualhead;
3164 my $maintviewhead = undef;
3166 if (madformat_wantfixup($format)) {
3167 # user might have not used dgit build, so maybe do this now:
3168 if (quiltmode_splitbrain()) {
3169 my $upstreamversion = $clogp->{Version};
3170 $upstreamversion =~ s/-[^-]*$//;
3172 quilt_make_fake_dsc($upstreamversion);
3174 ($dgithead, $cachekey) =
3175 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3177 "--quilt=$quilt_mode but no cached dgit view:
3178 perhaps tree changed since dgit build[-source] ?";
3180 $dgithead = splitbrain_pseudomerge($clogp,
3181 $actualhead, $dgithead,
3183 $maintviewhead = $actualhead;
3184 changedir '../../../..';
3185 prep_ud(); # so _only_subdir() works, below
3187 commit_quilty_patch();
3191 if (defined $overwrite_version && !defined $maintviewhead) {
3192 $dgithead = plain_overwrite_pseudomerge($clogp,
3200 if ($archive_hash) {
3201 if (is_fast_fwd($archive_hash, $dgithead)) {
3203 } elsif (deliberately_not_fast_forward) {
3206 fail "dgit push: HEAD is not a descendant".
3207 " of the archive's version.\n".
3208 "To overwrite the archive's contents,".
3209 " pass --overwrite[=VERSION].\n".
3210 "To rewind history, if permitted by the archive,".
3211 " use --deliberately-not-fast-forward.";
3216 progress "checking that $dscfn corresponds to HEAD";
3217 runcmd qw(dpkg-source -x --),
3218 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3219 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3220 check_for_vendor_patches() if madformat($dsc->{format});
3221 changedir '../../../..';
3222 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3223 debugcmd "+",@diffcmd;
3225 my $r = system @diffcmd;
3228 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3230 HEAD specifies a different tree to $dscfn:
3232 Perhaps you forgot to build. Or perhaps there is a problem with your
3233 source tree (see dgit(7) for some hints). To see a full diff, run
3240 if (!$changesfile) {
3241 my $pat = changespat $cversion;
3242 my @cs = glob "$buildproductsdir/$pat";
3243 fail "failed to find unique changes file".
3244 " (looked for $pat in $buildproductsdir);".
3245 " perhaps you need to use dgit -C"
3247 ($changesfile) = @cs;
3249 $changesfile = "$buildproductsdir/$changesfile";
3252 # Check that changes and .dsc agree enough
3253 $changesfile =~ m{[^/]*$};
3254 files_compare_inputs($dsc, parsecontrol($changesfile,$&));
3256 # Checks complete, we're going to try and go ahead:
3258 responder_send_file('changes',$changesfile);
3259 responder_send_command("param head $dgithead");
3260 responder_send_command("param csuite $csuite");
3261 responder_send_command("param tagformat $tagformat");
3262 if (defined $maintviewhead) {
3263 die unless ($protovsn//4) >= 4;
3264 responder_send_command("param maint-view $maintviewhead");
3267 if (deliberately_not_fast_forward) {
3268 git_for_each_ref(lrfetchrefs, sub {
3269 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3270 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3271 responder_send_command("previously $rrefname=$objid");
3272 $previously{$rrefname} = $objid;
3276 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3280 supplementary_message(<<'END');
3281 Push failed, while signing the tag.
3282 You can retry the push, after fixing the problem, if you like.
3284 # If we manage to sign but fail to record it anywhere, it's fine.
3285 if ($we_are_responder) {
3286 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3287 responder_receive_files('signed-tag', @tagobjfns);
3289 @tagobjfns = push_mktags($clogp,$dscpath,
3290 $changesfile,$changesfile,
3293 supplementary_message(<<'END');
3294 Push failed, *after* signing the tag.
3295 If you want to try again, you should use a new version number.
3298 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3300 foreach my $tw (@tagwants) {
3301 my $tag = $tw->{Tag};
3302 my $tagobjfn = $tw->{TagObjFn};
3304 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3305 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3306 runcmd_ordryrun_local
3307 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3310 supplementary_message(<<'END');
3311 Push failed, while updating the remote git repository - see messages above.
3312 If you want to try again, you should use a new version number.
3314 if (!check_for_git()) {
3315 create_remote_git_repo();
3318 my @pushrefs = $forceflag.$dgithead.":".rrref();
3319 foreach my $tw (@tagwants) {
3320 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3323 runcmd_ordryrun @git,
3324 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3325 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3327 supplementary_message(<<'END');
3328 Push failed, after updating the remote git repository.
3329 If you want to try again, you must use a new version number.
3331 if ($we_are_responder) {
3332 my $dryrunsuffix = act_local() ? "" : ".tmp";
3333 responder_receive_files('signed-dsc-changes',
3334 "$dscpath$dryrunsuffix",
3335 "$changesfile$dryrunsuffix");
3338 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3340 progress "[new .dsc left in $dscpath.tmp]";
3342 sign_changes $changesfile;
3345 supplementary_message(<<END);
3346 Push failed, while uploading package(s) to the archive server.
3347 You can retry the upload of exactly these same files with dput of:
3349 If that .changes file is broken, you will need to use a new version
3350 number for your next attempt at the upload.
3352 my $host = access_cfg('upload-host','RETURN-UNDEF');
3353 my @hostarg = defined($host) ? ($host,) : ();
3354 runcmd_ordryrun @dput, @hostarg, $changesfile;
3355 printdone "pushed and uploaded $cversion";
3357 supplementary_message('');
3358 responder_send_command("complete");
3365 badusage "-p is not allowed with clone; specify as argument instead"
3366 if defined $package;
3369 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3370 ($package,$isuite) = @ARGV;
3371 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3372 ($package,$dstdir) = @ARGV;
3373 } elsif (@ARGV==3) {
3374 ($package,$isuite,$dstdir) = @ARGV;
3376 badusage "incorrect arguments to dgit clone";
3378 $dstdir ||= "$package";
3380 if (stat_exists $dstdir) {
3381 fail "$dstdir already exists";
3385 if ($rmonerror && !$dryrun_level) {
3386 $cwd_remove= getcwd();
3388 return unless defined $cwd_remove;
3389 if (!chdir "$cwd_remove") {
3390 return if $!==&ENOENT;
3391 die "chdir $cwd_remove: $!";
3394 rmtree($dstdir) or die "remove $dstdir: $!\n";
3395 } elsif (grep { $! == $_ }
3396 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3398 print STDERR "check whether to remove $dstdir: $!\n";
3404 $cwd_remove = undef;
3407 sub branchsuite () {
3408 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3409 if ($branch =~ m#$lbranch_re#o) {
3416 sub fetchpullargs () {
3418 if (!defined $package) {
3419 my $sourcep = parsecontrol('debian/control','debian/control');
3420 $package = getfield $sourcep, 'Source';
3423 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3425 my $clogp = parsechangelog();
3426 $isuite = getfield $clogp, 'Distribution';
3428 canonicalise_suite();
3429 progress "fetching from suite $csuite";
3430 } elsif (@ARGV==1) {
3432 canonicalise_suite();
3434 badusage "incorrect arguments to dgit fetch or dgit pull";
3453 badusage "-p is not allowed with dgit push" if defined $package;
3455 my $clogp = parsechangelog();
3456 $package = getfield $clogp, 'Source';
3459 } elsif (@ARGV==1) {
3460 ($specsuite) = (@ARGV);
3462 badusage "incorrect arguments to dgit push";
3464 $isuite = getfield $clogp, 'Distribution';
3466 local ($package) = $existing_package; # this is a hack
3467 canonicalise_suite();
3469 canonicalise_suite();
3471 if (defined $specsuite &&
3472 $specsuite ne $isuite &&
3473 $specsuite ne $csuite) {
3474 fail "dgit push: changelog specifies $isuite ($csuite)".
3475 " but command line specifies $specsuite";
3480 #---------- remote commands' implementation ----------
3482 sub cmd_remote_push_build_host {
3483 my ($nrargs) = shift @ARGV;
3484 my (@rargs) = @ARGV[0..$nrargs-1];
3485 @ARGV = @ARGV[$nrargs..$#ARGV];
3487 my ($dir,$vsnwant) = @rargs;
3488 # vsnwant is a comma-separated list; we report which we have
3489 # chosen in our ready response (so other end can tell if they
3492 $we_are_responder = 1;
3493 $us .= " (build host)";
3497 open PI, "<&STDIN" or die $!;
3498 open STDIN, "/dev/null" or die $!;
3499 open PO, ">&STDOUT" or die $!;
3501 open STDOUT, ">&STDERR" or die $!;
3505 ($protovsn) = grep {
3506 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3507 } @rpushprotovsn_support;
3509 fail "build host has dgit rpush protocol versions ".
3510 (join ",", @rpushprotovsn_support).
3511 " but invocation host has $vsnwant"
3512 unless defined $protovsn;
3514 responder_send_command("dgit-remote-push-ready $protovsn");
3515 rpush_handle_protovsn_bothends();
3520 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3521 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3522 # a good error message)
3524 sub rpush_handle_protovsn_bothends () {
3525 if ($protovsn < 4) {
3526 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3535 my $report = i_child_report();
3536 if (defined $report) {
3537 printdebug "($report)\n";
3538 } elsif ($i_child_pid) {
3539 printdebug "(killing build host child $i_child_pid)\n";
3540 kill 15, $i_child_pid;
3542 if (defined $i_tmp && !defined $initiator_tempdir) {
3544 eval { rmtree $i_tmp; };
3548 END { i_cleanup(); }
3551 my ($base,$selector,@args) = @_;
3552 $selector =~ s/\-/_/g;
3553 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3560 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3568 push @rargs, join ",", @rpushprotovsn_support;
3571 push @rdgit, @ropts;
3572 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3574 my @cmd = (@ssh, $host, shellquote @rdgit);
3577 if (defined $initiator_tempdir) {
3578 rmtree $initiator_tempdir;
3579 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3580 $i_tmp = $initiator_tempdir;
3584 $i_child_pid = open2(\*RO, \*RI, @cmd);
3586 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3587 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3588 $supplementary_message = '' unless $protovsn >= 3;
3590 fail "rpush negotiated protocol version $protovsn".
3591 " which does not support quilt mode $quilt_mode"
3592 if quiltmode_splitbrain;
3594 rpush_handle_protovsn_bothends();
3596 my ($icmd,$iargs) = initiator_expect {
3597 m/^(\S+)(?: (.*))?$/;
3600 i_method "i_resp", $icmd, $iargs;
3604 sub i_resp_progress ($) {
3606 my $msg = protocol_read_bytes \*RO, $rhs;
3610 sub i_resp_supplementary_message ($) {
3612 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3615 sub i_resp_complete {
3616 my $pid = $i_child_pid;
3617 $i_child_pid = undef; # prevents killing some other process with same pid
3618 printdebug "waiting for build host child $pid...\n";
3619 my $got = waitpid $pid, 0;
3620 die $! unless $got == $pid;
3621 die "build host child failed $?" if $?;
3624 printdebug "all done\n";
3628 sub i_resp_file ($) {
3630 my $localname = i_method "i_localname", $keyword;
3631 my $localpath = "$i_tmp/$localname";
3632 stat_exists $localpath and
3633 badproto \*RO, "file $keyword ($localpath) twice";
3634 protocol_receive_file \*RO, $localpath;
3635 i_method "i_file", $keyword;
3640 sub i_resp_param ($) {
3641 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3645 sub i_resp_previously ($) {
3646 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3647 or badproto \*RO, "bad previously spec";
3648 my $r = system qw(git check-ref-format), $1;
3649 die "bad previously ref spec ($r)" if $r;
3650 $previously{$1} = $2;
3655 sub i_resp_want ($) {
3657 die "$keyword ?" if $i_wanted{$keyword}++;
3658 my @localpaths = i_method "i_want", $keyword;
3659 printdebug "[[ $keyword @localpaths\n";
3660 foreach my $localpath (@localpaths) {
3661 protocol_send_file \*RI, $localpath;
3663 print RI "files-end\n" or die $!;
3666 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3668 sub i_localname_parsed_changelog {
3669 return "remote-changelog.822";
3671 sub i_file_parsed_changelog {
3672 ($i_clogp, $i_version, $i_dscfn) =
3673 push_parse_changelog "$i_tmp/remote-changelog.822";
3674 die if $i_dscfn =~ m#/|^\W#;
3677 sub i_localname_dsc {
3678 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3683 sub i_localname_changes {
3684 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3685 $i_changesfn = $i_dscfn;
3686 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3687 return $i_changesfn;
3689 sub i_file_changes { }
3691 sub i_want_signed_tag {
3692 printdebug Dumper(\%i_param, $i_dscfn);
3693 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3694 && defined $i_param{'csuite'}
3695 or badproto \*RO, "premature desire for signed-tag";
3696 my $head = $i_param{'head'};
3697 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3699 my $maintview = $i_param{'maint-view'};
3700 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3703 if ($protovsn >= 4) {
3704 my $p = $i_param{'tagformat'} // '<undef>';
3706 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3709 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3711 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3713 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3716 push_mktags $i_clogp, $i_dscfn,
3717 $i_changesfn, 'remote changes',
3721 sub i_want_signed_dsc_changes {
3722 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3723 sign_changes $i_changesfn;
3724 return ($i_dscfn, $i_changesfn);
3727 #---------- building etc. ----------
3733 #----- `3.0 (quilt)' handling -----
3735 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3737 sub quiltify_dpkg_commit ($$$;$) {
3738 my ($patchname,$author,$msg, $xinfo) = @_;
3742 my $descfn = ".git/dgit/quilt-description.tmp";
3743 open O, '>', $descfn or die "$descfn: $!";
3744 $msg =~ s/\n+/\n\n/;
3745 print O <<END or die $!;
3747 ${xinfo}Subject: $msg
3754 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3755 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3756 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3757 runcmd @dpkgsource, qw(--commit .), $patchname;
3761 sub quiltify_trees_differ ($$;$$$) {
3762 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
3763 # returns true iff the two tree objects differ other than in debian/
3764 # with $finegrained,
3765 # returns bitmask 01 - differ in upstream files except .gitignore
3766 # 02 - differ in .gitignore
3767 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3768 # is set for each modified .gitignore filename $fn
3769 # if $unrepres is defined, array ref to which is appeneded
3770 # a list of unrepresentable changes (removals of upstream files
3773 my @cmd = (@git, qw(diff-tree -z));
3774 push @cmd, qw(--name-only) unless $unrepres;
3775 push @cmd, qw(-r) if $finegrained || $unrepres;
3777 my $diffs= cmdoutput @cmd;
3780 foreach my $f (split /\0/, $diffs) {
3781 if ($unrepres && !@lmodes) {
3782 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
3785 my ($oldmode,$newmode) = @lmodes;
3788 next if $f =~ m#^debian(?:/.*)?$#s;
3792 die "deleted\n" unless $newmode =~ m/[^0]/;
3793 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
3794 if ($oldmode =~ m/[^0]/) {
3795 die "mode changed\n" if $oldmode ne $newmode;
3797 die "non-default mode\n" unless $newmode =~ m/^100644$/;
3801 local $/="\n"; chomp $@;
3802 push @$unrepres, [ $f, $@ ];
3806 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
3807 $r |= $isignore ? 02 : 01;
3808 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
3810 printdebug "quiltify_trees_differ $x $y => $r\n";
3814 sub quiltify_tree_sentinelfiles ($) {
3815 # lists the `sentinel' files present in the tree
3817 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
3818 qw(-- debian/rules debian/control);
3823 sub quiltify_splitbrain_needed () {
3824 if (!$split_brain) {
3825 progress "dgit view: changes are required...";
3826 runcmd @git, qw(checkout -q -b dgit-view);
3831 sub quiltify_splitbrain ($$$$$$) {
3832 my ($clogp, $unapplied, $headref, $diffbits,
3833 $editedignores, $cachekey) = @_;
3834 if ($quilt_mode !~ m/gbp|dpm/) {
3835 # treat .gitignore just like any other upstream file
3836 $diffbits = { %$diffbits };
3837 $_ = !!$_ foreach values %$diffbits;
3839 # We would like any commits we generate to be reproducible
3840 my @authline = clogp_authline($clogp);
3841 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
3842 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
3843 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
3844 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
3845 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
3846 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
3848 if ($quilt_mode =~ m/gbp|unapplied/ &&
3849 ($diffbits->{O2H} & 01)) {
3851 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
3852 " but git tree differs from orig in upstream files.";
3853 if (!stat_exists "debian/patches") {
3855 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
3859 if ($quilt_mode =~ m/dpm/ &&
3860 ($diffbits->{H2A} & 01)) {
3862 --quilt=$quilt_mode specified, implying patches-applied git tree
3863 but git tree differs from result of applying debian/patches to upstream
3866 if ($quilt_mode =~ m/gbp|unapplied/ &&
3867 ($diffbits->{O2A} & 01)) { # some patches
3868 quiltify_splitbrain_needed();
3869 progress "dgit view: creating patches-applied version using gbp pq";
3870 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
3871 # gbp pq import creates a fresh branch; push back to dgit-view
3872 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
3873 runcmd @git, qw(checkout -q dgit-view);
3875 if ($quilt_mode =~ m/gbp|dpm/ &&
3876 ($diffbits->{O2A} & 02)) {
3878 --quilt=$quilt_mode specified, implying that HEAD is for use with a
3879 tool which does not create patches for changes to upstream
3880 .gitignores: but, such patches exist in debian/patches.
3883 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
3884 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
3885 quiltify_splitbrain_needed();
3886 progress "dgit view: creating patch to represent .gitignore changes";
3887 ensuredir "debian/patches";
3888 my $gipatch = "debian/patches/auto-gitignore";
3889 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
3890 stat GIPATCH or die "$gipatch: $!";
3891 fail "$gipatch already exists; but want to create it".
3892 " to record .gitignore changes" if (stat _)[7];
3893 print GIPATCH <<END or die "$gipatch: $!";
3894 Subject: Update .gitignore from Debian packaging branch
3896 The Debian packaging git branch contains these updates to the upstream
3897 .gitignore file(s). This patch is autogenerated, to provide these
3898 updates to users of the official Debian archive view of the package.
3900 [dgit ($our_version) update-gitignore]
3903 close GIPATCH or die "$gipatch: $!";
3904 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
3905 $unapplied, $headref, "--", sort keys %$editedignores;
3906 open SERIES, "+>>", "debian/patches/series" or die $!;
3907 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
3909 defined read SERIES, $newline, 1 or die $!;
3910 print SERIES "\n" or die $! unless $newline eq "\n";
3911 print SERIES "auto-gitignore\n" or die $!;
3912 close SERIES or die $!;
3913 runcmd @git, qw(add -- debian/patches/series), $gipatch;
3915 Commit patch to update .gitignore
3917 [dgit ($our_version) update-gitignore-quilt-fixup]
3921 my $dgitview = git_rev_parse 'HEAD';
3923 changedir '../../../..';
3924 # When we no longer need to support squeeze, use --create-reflog
3926 ensuredir ".git/logs/refs/dgit-intern";
3927 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
3930 my $oldcache = git_get_ref "refs/$splitbraincache";
3931 if ($oldcache eq $dgitview) {
3932 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
3933 # git update-ref doesn't always update, in this case. *sigh*
3934 my $dummy = make_commit_text <<END;
3937 author Dgit <dgit\@example.com> 1000000000 +0000
3938 committer Dgit <dgit\@example.com> 1000000000 +0000
3940 Dummy commit - do not use
3942 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
3943 "refs/$splitbraincache", $dummy;
3945 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
3948 progress "dgit view: created (commit id $dgitview)";
3950 changedir '.git/dgit/unpack/work';
3953 sub quiltify ($$$$) {
3954 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
3956 # Quilt patchification algorithm
3958 # We search backwards through the history of the main tree's HEAD
3959 # (T) looking for a start commit S whose tree object is identical
3960 # to to the patch tip tree (ie the tree corresponding to the
3961 # current dpkg-committed patch series). For these purposes
3962 # `identical' disregards anything in debian/ - this wrinkle is
3963 # necessary because dpkg-source treates debian/ specially.
3965 # We can only traverse edges where at most one of the ancestors'
3966 # trees differs (in changes outside in debian/). And we cannot
3967 # handle edges which change .pc/ or debian/patches. To avoid
3968 # going down a rathole we avoid traversing edges which introduce
3969 # debian/rules or debian/control. And we set a limit on the
3970 # number of edges we are willing to look at.
3972 # If we succeed, we walk forwards again. For each traversed edge
3973 # PC (with P parent, C child) (starting with P=S and ending with
3974 # C=T) to we do this:
3976 # - dpkg-source --commit with a patch name and message derived from C
3977 # After traversing PT, we git commit the changes which
3978 # should be contained within debian/patches.
3980 # The search for the path S..T is breadth-first. We maintain a
3981 # todo list containing search nodes. A search node identifies a
3982 # commit, and looks something like this:
3984 # Commit => $git_commit_id,
3985 # Child => $c, # or undef if P=T
3986 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
3987 # Nontrivial => true iff $p..$c has relevant changes
3994 my %considered; # saves being exponential on some weird graphs
3996 my $t_sentinels = quiltify_tree_sentinelfiles $target;
3999 my ($search,$whynot) = @_;
4000 printdebug " search NOT $search->{Commit} $whynot\n";
4001 $search->{Whynot} = $whynot;
4002 push @nots, $search;
4003 no warnings qw(exiting);
4012 my $c = shift @todo;
4013 next if $considered{$c->{Commit}}++;
4015 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4017 printdebug "quiltify investigate $c->{Commit}\n";
4020 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4021 printdebug " search finished hooray!\n";
4026 if ($quilt_mode eq 'nofix') {
4027 fail "quilt fixup required but quilt mode is \`nofix'\n".
4028 "HEAD commit $c->{Commit} differs from tree implied by ".
4029 " debian/patches (tree object $oldtiptree)";
4031 if ($quilt_mode eq 'smash') {
4032 printdebug " search quitting smash\n";
4036 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4037 $not->($c, "has $c_sentinels not $t_sentinels")
4038 if $c_sentinels ne $t_sentinels;
4040 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4041 $commitdata =~ m/\n\n/;
4043 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4044 @parents = map { { Commit => $_, Child => $c } } @parents;
4046 $not->($c, "root commit") if !@parents;
4048 foreach my $p (@parents) {
4049 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4051 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4052 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4054 foreach my $p (@parents) {
4055 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4057 my @cmd= (@git, qw(diff-tree -r --name-only),
4058 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4059 my $patchstackchange = cmdoutput @cmd;
4060 if (length $patchstackchange) {
4061 $patchstackchange =~ s/\n/,/g;
4062 $not->($p, "changed $patchstackchange");
4065 printdebug " search queue P=$p->{Commit} ",
4066 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4072 printdebug "quiltify want to smash\n";
4075 my $x = $_[0]{Commit};
4076 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4079 my $reportnot = sub {
4081 my $s = $abbrev->($notp);
4082 my $c = $notp->{Child};
4083 $s .= "..".$abbrev->($c) if $c;
4084 $s .= ": ".$notp->{Whynot};
4087 if ($quilt_mode eq 'linear') {
4088 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4089 foreach my $notp (@nots) {
4090 print STDERR "$us: ", $reportnot->($notp), "\n";
4092 print STDERR "$us: $_\n" foreach @$failsuggestion;
4093 fail "quilt fixup naive history linearisation failed.\n".
4094 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4095 } elsif ($quilt_mode eq 'smash') {
4096 } elsif ($quilt_mode eq 'auto') {
4097 progress "quilt fixup cannot be linear, smashing...";
4099 die "$quilt_mode ?";
4102 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4103 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4105 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4107 quiltify_dpkg_commit "auto-$version-$target-$time",
4108 (getfield $clogp, 'Maintainer'),
4109 "Automatically generated patch ($clogp->{Version})\n".
4110 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4114 progress "quiltify linearisation planning successful, executing...";
4116 for (my $p = $sref_S;
4117 my $c = $p->{Child};
4119 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4120 next unless $p->{Nontrivial};
4122 my $cc = $c->{Commit};
4124 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4125 $commitdata =~ m/\n\n/ or die "$c ?";
4128 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4131 my $commitdate = cmdoutput
4132 @git, qw(log -n1 --pretty=format:%aD), $cc;
4134 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4136 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4143 my $gbp_check_suitable = sub {
4148 die "contains unexpected slashes\n" if m{//} || m{/$};
4149 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4150 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4151 die "too long" if length > 200;
4153 return $_ unless $@;
4154 print STDERR "quiltifying commit $cc:".
4155 " ignoring/dropping Gbp-Pq $what: $@";
4159 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4161 (\S+) \s* \n //ixm) {
4162 $patchname = $gbp_check_suitable->($1, 'Name');
4164 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4166 (\S+) \s* \n //ixm) {
4167 $patchdir = $gbp_check_suitable->($1, 'Topic');
4172 if (!defined $patchname) {
4173 $patchname = $title;
4174 $patchname =~ s/[.:]$//;
4177 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4178 my $translitname = $converter->convert($patchname);
4179 die unless defined $translitname;
4180 $patchname = $translitname;
4183 "dgit: patch title transliteration error: $@"
4185 $patchname =~ y/ A-Z/-a-z/;
4186 $patchname =~ y/-a-z0-9_.+=~//cd;
4187 $patchname =~ s/^\W/x-$&/;
4188 $patchname = substr($patchname,0,40);
4190 if (!defined $patchdir) {
4193 if (length $patchdir) {
4194 $patchname = "$patchdir/$patchname";
4196 if ($patchname =~ m{^(.*)/}) {
4197 mkpath "debian/patches/$1";
4202 stat "debian/patches/$patchname$index";
4204 $!==ENOENT or die "$patchname$index $!";
4206 runcmd @git, qw(checkout -q), $cc;
4208 # We use the tip's changelog so that dpkg-source doesn't
4209 # produce complaining messages from dpkg-parsechangelog. None
4210 # of the information dpkg-source gets from the changelog is
4211 # actually relevant - it gets put into the original message
4212 # which dpkg-source provides our stunt editor, and then
4214 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4216 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4217 "Date: $commitdate\n".
4218 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4220 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4223 runcmd @git, qw(checkout -q master);
4226 sub build_maybe_quilt_fixup () {
4227 my ($format,$fopts) = get_source_format;
4228 return unless madformat_wantfixup $format;
4231 check_for_vendor_patches();
4233 if (quiltmode_splitbrain) {
4234 foreach my $needtf (qw(new maint)) {
4235 next if grep { $_ eq $needtf } access_cfg_tagformats;
4237 quilt mode $quilt_mode requires split view so server needs to support
4238 both "new" and "maint" tag formats, but config says it doesn't.
4243 my $clogp = parsechangelog();
4244 my $headref = git_rev_parse('HEAD');
4249 my $upstreamversion=$version;
4250 $upstreamversion =~ s/-[^-]*$//;
4252 if ($fopts->{'single-debian-patch'}) {
4253 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4255 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4258 die 'bug' if $split_brain && !$need_split_build_invocation;
4260 changedir '../../../..';
4261 runcmd_ordryrun_local
4262 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4265 sub quilt_fixup_mkwork ($) {
4268 mkdir "work" or die $!;
4270 mktree_in_ud_here();
4271 runcmd @git, qw(reset -q --hard), $headref;
4274 sub quilt_fixup_linkorigs ($$) {
4275 my ($upstreamversion, $fn) = @_;
4276 # calls $fn->($leafname);
4278 foreach my $f (<../../../../*>) { #/){
4279 my $b=$f; $b =~ s{.*/}{};
4281 local ($debuglevel) = $debuglevel-1;
4282 printdebug "QF linkorigs $b, $f ?\n";
4284 next unless is_orig_file_of_vsn $b, $upstreamversion;
4285 printdebug "QF linkorigs $b, $f Y\n";
4286 link_ltarget $f, $b or die "$b $!";
4291 sub quilt_fixup_delete_pc () {
4292 runcmd @git, qw(rm -rqf .pc);
4294 Commit removal of .pc (quilt series tracking data)
4296 [dgit ($our_version) upgrade quilt-remove-pc]
4300 sub quilt_fixup_singlepatch ($$$) {
4301 my ($clogp, $headref, $upstreamversion) = @_;
4303 progress "starting quiltify (single-debian-patch)";
4305 # dpkg-source --commit generates new patches even if
4306 # single-debian-patch is in debian/source/options. In order to
4307 # get it to generate debian/patches/debian-changes, it is
4308 # necessary to build the source package.
4310 quilt_fixup_linkorigs($upstreamversion, sub { });
4311 quilt_fixup_mkwork($headref);
4313 rmtree("debian/patches");
4315 runcmd @dpkgsource, qw(-b .);
4317 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4318 rename srcfn("$upstreamversion", "/debian/patches"),
4319 "work/debian/patches";
4322 commit_quilty_patch();
4325 sub quilt_make_fake_dsc ($) {
4326 my ($upstreamversion) = @_;
4328 my $fakeversion="$upstreamversion-~~DGITFAKE";
4330 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4331 print $fakedsc <<END or die $!;
4334 Version: $fakeversion
4338 my $dscaddfile=sub {
4341 my $md = new Digest::MD5;
4343 my $fh = new IO::File $b, '<' or die "$b $!";
4348 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4351 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4353 my @files=qw(debian/source/format debian/rules
4354 debian/control debian/changelog);
4355 foreach my $maybe (qw(debian/patches debian/source/options
4356 debian/tests/control)) {
4357 next unless stat_exists "../../../$maybe";
4358 push @files, $maybe;
4361 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4362 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4364 $dscaddfile->($debtar);
4365 close $fakedsc or die $!;
4368 sub quilt_check_splitbrain_cache ($$) {
4369 my ($headref, $upstreamversion) = @_;
4370 # Called only if we are in (potentially) split brain mode.
4372 # Computes the cache key and looks in the cache.
4373 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4375 my $splitbrain_cachekey;
4378 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4379 # we look in the reflog of dgit-intern/quilt-cache
4380 # we look for an entry whose message is the key for the cache lookup
4381 my @cachekey = (qw(dgit), $our_version);
4382 push @cachekey, $upstreamversion;
4383 push @cachekey, $quilt_mode;
4384 push @cachekey, $headref;
4386 push @cachekey, hashfile('fake.dsc');
4388 my $srcshash = Digest::SHA->new(256);
4389 my %sfs = ( %INC, '$0(dgit)' => $0 );
4390 foreach my $sfk (sort keys %sfs) {
4391 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4392 $srcshash->add($sfk," ");
4393 $srcshash->add(hashfile($sfs{$sfk}));
4394 $srcshash->add("\n");
4396 push @cachekey, $srcshash->hexdigest();
4397 $splitbrain_cachekey = "@cachekey";
4399 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4401 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4402 debugcmd "|(probably)",@cmd;
4403 my $child = open GC, "-|"; defined $child or die $!;
4405 chdir '../../..' or die $!;
4406 if (!stat ".git/logs/refs/$splitbraincache") {
4407 $! == ENOENT or die $!;
4408 printdebug ">(no reflog)\n";
4415 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4416 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4419 quilt_fixup_mkwork($headref);
4420 if ($cachehit ne $headref) {
4421 progress "dgit view: found cached (commit id $cachehit)";
4422 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4424 return ($cachehit, $splitbrain_cachekey);
4426 progress "dgit view: found cached, no changes required";
4427 return ($headref, $splitbrain_cachekey);
4429 die $! if GC->error;
4430 failedcmd unless close GC;
4432 printdebug "splitbrain cache miss\n";
4433 return (undef, $splitbrain_cachekey);
4436 sub quilt_fixup_multipatch ($$$) {
4437 my ($clogp, $headref, $upstreamversion) = @_;
4439 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4442 # - honour any existing .pc in case it has any strangeness
4443 # - determine the git commit corresponding to the tip of
4444 # the patch stack (if there is one)
4445 # - if there is such a git commit, convert each subsequent
4446 # git commit into a quilt patch with dpkg-source --commit
4447 # - otherwise convert all the differences in the tree into
4448 # a single git commit
4452 # Our git tree doesn't necessarily contain .pc. (Some versions of
4453 # dgit would include the .pc in the git tree.) If there isn't
4454 # one, we need to generate one by unpacking the patches that we
4457 # We first look for a .pc in the git tree. If there is one, we
4458 # will use it. (This is not the normal case.)
4460 # Otherwise need to regenerate .pc so that dpkg-source --commit
4461 # can work. We do this as follows:
4462 # 1. Collect all relevant .orig from parent directory
4463 # 2. Generate a debian.tar.gz out of
4464 # debian/{patches,rules,source/format,source/options}
4465 # 3. Generate a fake .dsc containing just these fields:
4466 # Format Source Version Files
4467 # 4. Extract the fake .dsc
4468 # Now the fake .dsc has a .pc directory.
4469 # (In fact we do this in every case, because in future we will
4470 # want to search for a good base commit for generating patches.)
4472 # Then we can actually do the dpkg-source --commit
4473 # 1. Make a new working tree with the same object
4474 # store as our main tree and check out the main
4476 # 2. Copy .pc from the fake's extraction, if necessary
4477 # 3. Run dpkg-source --commit
4478 # 4. If the result has changes to debian/, then
4479 # - git add them them
4480 # - git add .pc if we had a .pc in-tree
4482 # 5. If we had a .pc in-tree, delete it, and git commit
4483 # 6. Back in the main tree, fast forward to the new HEAD
4485 # Another situation we may have to cope with is gbp-style
4486 # patches-unapplied trees.
4488 # We would want to detect these, so we know to escape into
4489 # quilt_fixup_gbp. However, this is in general not possible.
4490 # Consider a package with a one patch which the dgit user reverts
4491 # (with git revert or the moral equivalent).
4493 # That is indistinguishable in contents from a patches-unapplied
4494 # tree. And looking at the history to distinguish them is not
4495 # useful because the user might have made a confusing-looking git
4496 # history structure (which ought to produce an error if dgit can't
4497 # cope, not a silent reintroduction of an unwanted patch).
4499 # So gbp users will have to pass an option. But we can usually
4500 # detect their failure to do so: if the tree is not a clean
4501 # patches-applied tree, quilt linearisation fails, but the tree
4502 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4503 # they want --quilt=unapplied.
4505 # To help detect this, when we are extracting the fake dsc, we
4506 # first extract it with --skip-patches, and then apply the patches
4507 # afterwards with dpkg-source --before-build. That lets us save a
4508 # tree object corresponding to .origs.
4510 my $splitbrain_cachekey;
4512 quilt_make_fake_dsc($upstreamversion);
4514 if (quiltmode_splitbrain()) {
4516 ($cachehit, $splitbrain_cachekey) =
4517 quilt_check_splitbrain_cache($headref, $upstreamversion);
4518 return if $cachehit;
4522 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4524 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4525 rename $fakexdir, "fake" or die "$fakexdir $!";
4529 remove_stray_gits();
4530 mktree_in_ud_here();
4534 runcmd @git, qw(add -Af .);
4535 my $unapplied=git_write_tree();
4536 printdebug "fake orig tree object $unapplied\n";
4540 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4542 if (system @bbcmd) {
4543 failedcmd @bbcmd if $? < 0;
4545 failed to apply your git tree's patch stack (from debian/patches/) to
4546 the corresponding upstream tarball(s). Your source tree and .orig
4547 are probably too inconsistent. dgit can only fix up certain kinds of
4548 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
4554 quilt_fixup_mkwork($headref);
4557 if (stat_exists ".pc") {
4559 progress "Tree already contains .pc - will use it then delete it.";
4562 rename '../fake/.pc','.pc' or die $!;
4565 changedir '../fake';
4567 runcmd @git, qw(add -Af .);
4568 my $oldtiptree=git_write_tree();
4569 printdebug "fake o+d/p tree object $unapplied\n";
4570 changedir '../work';
4573 # We calculate some guesswork now about what kind of tree this might
4574 # be. This is mostly for error reporting.
4580 # O = orig, without patches applied
4581 # A = "applied", ie orig with H's debian/patches applied
4582 O2H => quiltify_trees_differ($unapplied,$headref, 1,
4583 \%editedignores, \@unrepres),
4584 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4585 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4589 foreach my $b (qw(01 02)) {
4590 foreach my $v (qw(O2H O2A H2A)) {
4591 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4594 printdebug "differences \@dl @dl.\n";
4597 "$us: base trees orig=%.20s o+d/p=%.20s",
4598 $unapplied, $oldtiptree;
4600 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4601 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4602 $dl[0], $dl[1], $dl[3], $dl[4],
4606 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
4609 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
4614 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
4615 push @failsuggestion, "This might be a patches-unapplied branch.";
4616 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4617 push @failsuggestion, "This might be a patches-applied branch.";
4619 push @failsuggestion, "Maybe you need to specify one of".
4620 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
4622 if (quiltmode_splitbrain()) {
4623 quiltify_splitbrain($clogp, $unapplied, $headref,
4624 $diffbits, \%editedignores,
4625 $splitbrain_cachekey);
4629 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4630 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4632 if (!open P, '>>', ".pc/applied-patches") {
4633 $!==&ENOENT or die $!;
4638 commit_quilty_patch();
4640 if ($mustdeletepc) {
4641 quilt_fixup_delete_pc();
4645 sub quilt_fixup_editor () {
4646 my $descfn = $ENV{$fakeeditorenv};
4647 my $editing = $ARGV[$#ARGV];
4648 open I1, '<', $descfn or die "$descfn: $!";
4649 open I2, '<', $editing or die "$editing: $!";
4650 unlink $editing or die "$editing: $!";
4651 open O, '>', $editing or die "$editing: $!";
4652 while (<I1>) { print O or die $!; } I1->error and die $!;
4655 $copying ||= m/^\-\-\- /;
4656 next unless $copying;
4659 I2->error and die $!;
4664 sub maybe_apply_patches_dirtily () {
4665 return unless $quilt_mode =~ m/gbp|unapplied/;
4666 print STDERR <<END or die $!;
4668 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4669 dgit: Have to apply the patches - making the tree dirty.
4670 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4673 $patches_applied_dirtily = 01;
4674 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4675 runcmd qw(dpkg-source --before-build .);
4678 sub maybe_unapply_patches_again () {
4679 progress "dgit: Unapplying patches again to tidy up the tree."
4680 if $patches_applied_dirtily;
4681 runcmd qw(dpkg-source --after-build .)
4682 if $patches_applied_dirtily & 01;
4684 if $patches_applied_dirtily & 02;
4685 $patches_applied_dirtily = 0;
4688 #----- other building -----
4690 our $clean_using_builder;
4691 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4692 # clean the tree before building (perhaps invoked indirectly by
4693 # whatever we are using to run the build), rather than separately
4694 # and explicitly by us.
4697 return if $clean_using_builder;
4698 if ($cleanmode eq 'dpkg-source') {
4699 maybe_apply_patches_dirtily();
4700 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4701 } elsif ($cleanmode eq 'dpkg-source-d') {
4702 maybe_apply_patches_dirtily();
4703 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4704 } elsif ($cleanmode eq 'git') {
4705 runcmd_ordryrun_local @git, qw(clean -xdf);
4706 } elsif ($cleanmode eq 'git-ff') {
4707 runcmd_ordryrun_local @git, qw(clean -xdff);
4708 } elsif ($cleanmode eq 'check') {
4709 my $leftovers = cmdoutput @git, qw(clean -xdn);
4710 if (length $leftovers) {
4711 print STDERR $leftovers, "\n" or die $!;
4712 fail "tree contains uncommitted files and --clean=check specified";
4714 } elsif ($cleanmode eq 'none') {
4721 badusage "clean takes no additional arguments" if @ARGV;
4724 maybe_unapply_patches_again();
4729 badusage "-p is not allowed when building" if defined $package;
4732 my $clogp = parsechangelog();
4733 $isuite = getfield $clogp, 'Distribution';
4734 $package = getfield $clogp, 'Source';
4735 $version = getfield $clogp, 'Version';
4736 build_maybe_quilt_fixup();
4738 my $pat = changespat $version;
4739 foreach my $f (glob "$buildproductsdir/$pat") {
4741 unlink $f or fail "remove old changes file $f: $!";
4743 progress "would remove $f";
4749 sub changesopts_initial () {
4750 my @opts =@changesopts[1..$#changesopts];
4753 sub changesopts_version () {
4754 if (!defined $changes_since_version) {
4755 my @vsns = archive_query('archive_query');
4756 my @quirk = access_quirk();
4757 if ($quirk[0] eq 'backports') {
4758 local $isuite = $quirk[2];
4760 canonicalise_suite();
4761 push @vsns, archive_query('archive_query');
4764 @vsns = map { $_->[0] } @vsns;
4765 @vsns = sort { -version_compare($a, $b) } @vsns;
4766 $changes_since_version = $vsns[0];
4767 progress "changelog will contain changes since $vsns[0]";
4769 $changes_since_version = '_';
4770 progress "package seems new, not specifying -v<version>";
4773 if ($changes_since_version ne '_') {
4774 return ("-v$changes_since_version");
4780 sub changesopts () {
4781 return (changesopts_initial(), changesopts_version());
4784 sub massage_dbp_args ($;$) {
4785 my ($cmd,$xargs) = @_;
4788 # - if we're going to split the source build out so we can
4789 # do strange things to it, massage the arguments to dpkg-buildpackage
4790 # so that the main build doessn't build source (or add an argument
4791 # to stop it building source by default).
4793 # - add -nc to stop dpkg-source cleaning the source tree,
4794 # unless we're not doing a split build and want dpkg-source
4795 # as cleanmode, in which case we can do nothing
4798 # 0 - source will NOT need to be built separately by caller
4799 # +1 - source will need to be built separately by caller
4800 # +2 - source will need to be built separately by caller AND
4801 # dpkg-buildpackage should not in fact be run at all!
4802 debugcmd '#massaging#', @$cmd if $debuglevel>1;
4803 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
4804 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
4805 $clean_using_builder = 1;
4808 # -nc has the side effect of specifying -b if nothing else specified
4809 # and some combinations of -S, -b, et al, are errors, rather than
4810 # later simply overriding earlie. So we need to:
4811 # - search the command line for these options
4812 # - pick the last one
4813 # - perhaps add our own as a default
4814 # - perhaps adjust it to the corresponding non-source-building version
4816 foreach my $l ($cmd, $xargs) {
4818 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
4821 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
4823 if ($need_split_build_invocation) {
4824 printdebug "massage split $dmode.\n";
4825 $r = $dmode =~ m/[S]/ ? +2 :
4826 $dmode =~ y/gGF/ABb/ ? +1 :
4827 $dmode =~ m/[ABb]/ ? 0 :
4830 printdebug "massage done $r $dmode.\n";
4832 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
4837 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
4838 my $wantsrc = massage_dbp_args \@dbp;
4845 push @dbp, changesopts_version();
4846 maybe_apply_patches_dirtily();
4847 runcmd_ordryrun_local @dbp;
4849 maybe_unapply_patches_again();
4850 printdone "build successful\n";
4854 $quilt_mode //= 'gbp';
4858 my @dbp = @dpkgbuildpackage;
4860 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
4862 if (!length $gbp_build[0]) {
4863 if (length executable_on_path('git-buildpackage')) {
4864 $gbp_build[0] = qw(git-buildpackage);
4866 $gbp_build[0] = 'gbp buildpackage';
4869 my @cmd = opts_opt_multi_cmd @gbp_build;
4871 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
4876 if (!$clean_using_builder) {
4877 push @cmd, '--git-cleaner=true';
4881 maybe_unapply_patches_again();
4883 push @cmd, changesopts();
4884 runcmd_ordryrun_local @cmd, @ARGV;
4886 printdone "build successful\n";
4888 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
4891 my $our_cleanmode = $cleanmode;
4892 if ($need_split_build_invocation) {
4893 # Pretend that clean is being done some other way. This
4894 # forces us not to try to use dpkg-buildpackage to clean and
4895 # build source all in one go; and instead we run dpkg-source
4896 # (and build_prep() will do the clean since $clean_using_builder
4898 $our_cleanmode = 'ELSEWHERE';
4900 if ($our_cleanmode =~ m/^dpkg-source/) {
4901 # dpkg-source invocation (below) will clean, so build_prep shouldn't
4902 $clean_using_builder = 1;
4905 $sourcechanges = changespat $version,'source';
4907 unlink "../$sourcechanges" or $!==ENOENT
4908 or fail "remove $sourcechanges: $!";
4910 $dscfn = dscfn($version);
4911 if ($our_cleanmode eq 'dpkg-source') {
4912 maybe_apply_patches_dirtily();
4913 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
4915 } elsif ($our_cleanmode eq 'dpkg-source-d') {
4916 maybe_apply_patches_dirtily();
4917 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
4920 my @cmd = (@dpkgsource, qw(-b --));
4923 runcmd_ordryrun_local @cmd, "work";
4924 my @udfiles = <${package}_*>;
4925 changedir "../../..";
4926 foreach my $f (@udfiles) {
4927 printdebug "source copy, found $f\n";
4930 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
4931 $f eq srcfn($version, $&));
4932 printdebug "source copy, found $f - renaming\n";
4933 rename "$ud/$f", "../$f" or $!==ENOENT
4934 or fail "put in place new source file ($f): $!";
4937 my $pwd = must_getcwd();
4938 my $leafdir = basename $pwd;
4940 runcmd_ordryrun_local @cmd, $leafdir;
4943 runcmd_ordryrun_local qw(sh -ec),
4944 'exec >$1; shift; exec "$@"','x',
4945 "../$sourcechanges",
4946 @dpkggenchanges, qw(-S), changesopts();
4950 sub cmd_build_source {
4951 badusage "build-source takes no additional arguments" if @ARGV;
4953 maybe_unapply_patches_again();
4954 printdone "source built, results in $dscfn and $sourcechanges";
4959 my $pat = changespat $version;
4961 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
4962 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
4964 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
4965 Suggest you delete @unwanted.
4969 my $wasdir = must_getcwd();
4972 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
4973 stat_exists $sourcechanges
4974 or fail "$sourcechanges (in parent directory): $!";
4976 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
4977 my @changesfiles = glob $pat;
4978 @changesfiles = sort {
4979 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
4982 fail <<END if @changesfiles==1;
4983 only one changes file from sbuild (@changesfiles)
4984 perhaps you need to pass -A ? (sbuild's default is to build only
4985 arch-specific binaries; dgit 1.4 used to override that.)
4987 fail "wrong number of different changes files (@changesfiles)"
4988 unless @changesfiles==2;
4989 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
4990 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
4991 fail "$l found in binaries changes file $binchanges"
4994 runcmd_ordryrun_local @mergechanges, @changesfiles;
4995 my $multichanges = changespat $version,'multi';
4997 stat_exists $multichanges or fail "$multichanges: $!";
4998 foreach my $cf (glob $pat) {
4999 next if $cf eq $multichanges;
5000 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5004 maybe_unapply_patches_again();
5005 printdone "build successful, results in $multichanges\n" or die $!;
5008 sub cmd_quilt_fixup {
5009 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5010 my $clogp = parsechangelog();
5011 $version = getfield $clogp, 'Version';
5012 $package = getfield $clogp, 'Source';
5015 build_maybe_quilt_fixup();
5018 sub cmd_archive_api_query {
5019 badusage "need only 1 subpath argument" unless @ARGV==1;
5020 my ($subpath) = @ARGV;
5021 my @cmd = archive_api_query_cmd($subpath);
5024 exec @cmd or fail "exec curl: $!\n";
5027 sub cmd_clone_dgit_repos_server {
5028 badusage "need destination argument" unless @ARGV==1;
5029 my ($destdir) = @ARGV;
5030 $package = '_dgit-repos-server';
5031 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5033 exec @cmd or fail "exec git clone: $!\n";
5036 sub cmd_setup_mergechangelogs {
5037 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5038 setup_mergechangelogs(1);
5041 sub cmd_setup_useremail {
5042 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5046 sub cmd_setup_new_tree {
5047 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5051 #---------- argument parsing and main program ----------
5054 print "dgit version $our_version\n" or die $!;
5058 our (%valopts_long, %valopts_short);
5061 sub defvalopt ($$$$) {
5062 my ($long,$short,$val_re,$how) = @_;
5063 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5064 $valopts_long{$long} = $oi;
5065 $valopts_short{$short} = $oi;
5066 # $how subref should:
5067 # do whatever assignemnt or thing it likes with $_[0]
5068 # if the option should not be passed on to remote, @rvalopts=()
5069 # or $how can be a scalar ref, meaning simply assign the value
5072 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5073 defvalopt '--distro', '-d', '.+', \$idistro;
5074 defvalopt '', '-k', '.+', \$keyid;
5075 defvalopt '--existing-package','', '.*', \$existing_package;
5076 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5077 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5078 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5080 defvalopt '', '-C', '.+', sub {
5081 ($changesfile) = (@_);
5082 if ($changesfile =~ s#^(.*)/##) {
5083 $buildproductsdir = $1;
5087 defvalopt '--initiator-tempdir','','.*', sub {
5088 ($initiator_tempdir) = (@_);
5089 $initiator_tempdir =~ m#^/# or
5090 badusage "--initiator-tempdir must be used specify an".
5091 " absolute, not relative, directory."
5097 if (defined $ENV{'DGIT_SSH'}) {
5098 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5099 } elsif (defined $ENV{'GIT_SSH'}) {
5100 @ssh = ($ENV{'GIT_SSH'});
5108 if (!defined $val) {
5109 badusage "$what needs a value" unless @ARGV;
5111 push @rvalopts, $val;
5113 badusage "bad value \`$val' for $what" unless
5114 $val =~ m/^$oi->{Re}$(?!\n)/s;
5115 my $how = $oi->{How};
5116 if (ref($how) eq 'SCALAR') {
5121 push @ropts, @rvalopts;
5125 last unless $ARGV[0] =~ m/^-/;
5129 if (m/^--dry-run$/) {
5132 } elsif (m/^--damp-run$/) {
5135 } elsif (m/^--no-sign$/) {
5138 } elsif (m/^--help$/) {
5140 } elsif (m/^--version$/) {
5142 } elsif (m/^--new$/) {
5145 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5146 ($om = $opts_opt_map{$1}) &&
5150 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5151 !$opts_opt_cmdonly{$1} &&
5152 ($om = $opts_opt_map{$1})) {
5155 } elsif (m/^--(gbp|dpm)$/s) {
5156 push @ropts, "--quilt=$1";
5158 } elsif (m/^--ignore-dirty$/s) {
5161 } elsif (m/^--no-quilt-fixup$/s) {
5163 $quilt_mode = 'nocheck';
5164 } elsif (m/^--no-rm-on-error$/s) {
5167 } elsif (m/^--overwrite$/s) {
5169 $overwrite_version = '';
5170 } elsif (m/^--overwrite=(.+)$/s) {
5172 $overwrite_version = $1;
5173 } elsif (m/^--(no-)?rm-old-changes$/s) {
5176 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5178 push @deliberatelies, $&;
5179 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5180 # undocumented, for testing
5182 $tagformat_want = [ $1, 'command line', 1 ];
5183 # 1 menas overrides distro configuration
5184 } elsif (m/^--always-split-source-build$/s) {
5185 # undocumented, for testing
5187 $need_split_build_invocation = 1;
5188 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5189 $val = $2 ? $' : undef; #';
5190 $valopt->($oi->{Long});
5192 badusage "unknown long option \`$_'";
5199 } elsif (s/^-L/-/) {
5202 } elsif (s/^-h/-/) {
5204 } elsif (s/^-D/-/) {
5208 } elsif (s/^-N/-/) {
5213 push @changesopts, $_;
5215 } elsif (s/^-wn$//s) {
5217 $cleanmode = 'none';
5218 } elsif (s/^-wg$//s) {
5221 } elsif (s/^-wgf$//s) {
5223 $cleanmode = 'git-ff';
5224 } elsif (s/^-wd$//s) {
5226 $cleanmode = 'dpkg-source';
5227 } elsif (s/^-wdd$//s) {
5229 $cleanmode = 'dpkg-source-d';
5230 } elsif (s/^-wc$//s) {
5232 $cleanmode = 'check';
5233 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5234 push @git, '-c', $&;
5235 $gitcfgs{cmdline}{$1} = [ $2 ];
5236 } elsif (s/^-c([^=]+)$//s) {
5237 push @git, '-c', $&;
5238 $gitcfgs{cmdline}{$1} = [ 'true' ];
5239 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5241 $val = undef unless length $val;
5242 $valopt->($oi->{Short});
5245 badusage "unknown short option \`$_'";
5252 sub check_env_sanity () {
5253 my $blocked = new POSIX::SigSet;
5254 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5257 foreach my $name (qw(PIPE CHLD)) {
5258 my $signame = "SIG$name";
5259 my $signum = eval "POSIX::$signame" // die;
5260 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5261 die "$signame is set to something other than SIG_DFL\n";
5262 $blocked->ismember($signum) and
5263 die "$signame is blocked\n";
5269 On entry to dgit, $@
5270 This is a bug produced by something in in your execution environment.
5276 sub finalise_opts_opts () {
5277 foreach my $k (keys %opts_opt_map) {
5278 my $om = $opts_opt_map{$k};
5280 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5282 badcfg "cannot set command for $k"
5283 unless length $om->[0];
5287 foreach my $c (access_cfg_cfgs("opts-$k")) {
5289 map { $_ ? @$_ : () }
5290 map { $gitcfgs{$_}{$c} }
5291 reverse @gitcfgsources;
5292 printdebug "CL $c ", (join " ", map { shellquote } @vl),
5293 "\n" if $debuglevel >= 4;
5295 badcfg "cannot configure options for $k"
5296 if $opts_opt_cmdonly{$k};
5297 my $insertpos = $opts_cfg_insertpos{$k};
5298 @$om = ( @$om[0..$insertpos-1],
5300 @$om[$insertpos..$#$om] );
5305 if ($ENV{$fakeeditorenv}) {
5307 quilt_fixup_editor();
5314 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5315 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5316 if $dryrun_level == 1;
5318 print STDERR $helpmsg or die $!;
5321 my $cmd = shift @ARGV;
5324 my $pre_fn = ${*::}{"pre_$cmd"};
5325 $pre_fn->() if $pre_fn;
5327 if (!defined $rmchanges) {
5328 local $access_forpush;
5329 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5332 if (!defined $quilt_mode) {
5333 local $access_forpush;
5334 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5335 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5337 $quilt_mode =~ m/^($quilt_modes_re)$/
5338 or badcfg "unknown quilt-mode \`$quilt_mode'";
5342 $need_split_build_invocation ||= quiltmode_splitbrain();
5344 if (!defined $cleanmode) {
5345 local $access_forpush;
5346 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5347 $cleanmode //= 'dpkg-source';
5349 badcfg "unknown clean-mode \`$cleanmode'" unless
5350 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5353 my $fn = ${*::}{"cmd_$cmd"};
5354 $fn or badusage "unknown operation $cmd";