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###
44 our $absurdity = undef; ###substituted###
46 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
49 our $isuite = 'unstable';
55 our $dryrun_level = 0;
57 our $buildproductsdir = '..';
63 our $existing_package = 'dpkg';
65 our $changes_since_version;
67 our $overwrite_version; # undef: not specified; '': check changelog
69 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
70 our $split_brain_save;
71 our $we_are_responder;
72 our $initiator_tempdir;
73 our $patches_applied_dirtily = 00;
78 our %forceopts = map { $_=>0 }
79 qw(unrepresentable unsupported-source-format
80 dsc-changes-mismatch changes-origs-exactly
81 import-gitapply-absurd
82 import-gitapply-no-absurd
83 import-dsc-with-dgit-field);
85 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
87 our $suite_re = '[-+.0-9a-z]+';
88 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
89 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
90 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
91 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
93 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
94 our $splitbraincache = 'dgit-intern/quilt-cache';
97 our (@dget) = qw(dget);
98 our (@curl) = qw(curl);
99 our (@dput) = qw(dput);
100 our (@debsign) = qw(debsign);
101 our (@gpg) = qw(gpg);
102 our (@sbuild) = qw(sbuild);
104 our (@dgit) = qw(dgit);
105 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
106 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
107 our (@dpkggenchanges) = qw(dpkg-genchanges);
108 our (@mergechanges) = qw(mergechanges -f);
109 our (@gbp_build) = ('');
110 our (@gbp_pq) = ('gbp pq');
111 our (@changesopts) = ('');
113 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
116 'debsign' => \@debsign,
118 'sbuild' => \@sbuild,
122 'dpkg-source' => \@dpkgsource,
123 'dpkg-buildpackage' => \@dpkgbuildpackage,
124 'dpkg-genchanges' => \@dpkggenchanges,
125 'gbp-build' => \@gbp_build,
126 'gbp-pq' => \@gbp_pq,
127 'ch' => \@changesopts,
128 'mergechanges' => \@mergechanges);
130 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
131 our %opts_cfg_insertpos = map {
133 scalar @{ $opts_opt_map{$_} }
134 } keys %opts_opt_map;
136 sub finalise_opts_opts();
142 our $supplementary_message = '';
143 our $need_split_build_invocation = 0;
144 our $split_brain = 0;
148 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
151 our $remotename = 'dgit';
152 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
156 if (!defined $absurdity) {
158 $absurdity =~ s{/[^/]+$}{/absurd} or die;
162 my ($v,$distro) = @_;
163 return $tagformatfn->($v, $distro);
166 sub debiantag_maintview ($$) {
167 my ($v,$distro) = @_;
172 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
174 sub lbranch () { return "$branchprefix/$csuite"; }
175 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
176 sub lref () { return "refs/heads/".lbranch(); }
177 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
178 sub rrref () { return server_ref($csuite); }
180 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
181 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
183 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
184 # locally fetched refs because they have unhelpful names and clutter
185 # up gitk etc. So we track whether we have "used up" head ref (ie,
186 # whether we have made another local ref which refers to this object).
188 # (If we deleted them unconditionally, then we might end up
189 # re-fetching the same git objects each time dgit fetch was run.)
191 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
192 # in git_fetch_us to fetch the refs in question, and possibly a call
193 # to lrfetchref_used.
195 our (%lrfetchrefs_f, %lrfetchrefs_d);
196 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
198 sub lrfetchref_used ($) {
199 my ($fullrefname) = @_;
200 my $objid = $lrfetchrefs_f{$fullrefname};
201 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
212 return "${package}_".(stripepoch $vsn).$sfx
217 return srcfn($vsn,".dsc");
220 sub changespat ($;$) {
221 my ($vsn, $arch) = @_;
222 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
231 foreach my $f (@end) {
233 print STDERR "$us: cleanup: $@" if length $@;
237 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
239 sub forceable_fail ($$) {
240 my ($forceoptsl, $msg) = @_;
241 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
242 print STDERR "warning: overriding problem due to --force:\n". $msg;
246 my ($forceoptsl) = @_;
247 my @got = grep { $forceopts{$_} } @$forceoptsl;
248 return 0 unless @got;
250 "warning: skipping checks or functionality due to --force-$got[0]\n";
253 sub no_such_package () {
254 print STDERR "$us: package $package does not exist in suite $isuite\n";
260 printdebug "CD $newdir\n";
261 chdir $newdir or confess "chdir: $newdir: $!";
264 sub deliberately ($) {
266 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
269 sub deliberately_not_fast_forward () {
270 foreach (qw(not-fast-forward fresh-repo)) {
271 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
275 sub quiltmode_splitbrain () {
276 $quilt_mode =~ m/gbp|dpm|unapplied/;
279 sub opts_opt_multi_cmd {
281 push @cmd, split /\s+/, shift @_;
287 return opts_opt_multi_cmd @gbp_pq;
290 #---------- remote protocol support, common ----------
292 # remote push initiator/responder protocol:
293 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
294 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
295 # < dgit-remote-push-ready <actual-proto-vsn>
302 # > supplementary-message NBYTES # $protovsn >= 3
307 # > file parsed-changelog
308 # [indicates that output of dpkg-parsechangelog follows]
309 # > data-block NBYTES
310 # > [NBYTES bytes of data (no newline)]
311 # [maybe some more blocks]
320 # > param head DGIT-VIEW-HEAD
321 # > param csuite SUITE
322 # > param tagformat old|new
323 # > param maint-view MAINT-VIEW-HEAD
325 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
326 # # goes into tag, for replay prevention
329 # [indicates that signed tag is wanted]
330 # < data-block NBYTES
331 # < [NBYTES bytes of data (no newline)]
332 # [maybe some more blocks]
336 # > want signed-dsc-changes
337 # < data-block NBYTES [transfer of signed dsc]
339 # < data-block NBYTES [transfer of signed changes]
347 sub i_child_report () {
348 # Sees if our child has died, and reap it if so. Returns a string
349 # describing how it died if it failed, or undef otherwise.
350 return undef unless $i_child_pid;
351 my $got = waitpid $i_child_pid, WNOHANG;
352 return undef if $got <= 0;
353 die unless $got == $i_child_pid;
354 $i_child_pid = undef;
355 return undef unless $?;
356 return "build host child ".waitstatusmsg();
361 fail "connection lost: $!" if $fh->error;
362 fail "protocol violation; $m not expected";
365 sub badproto_badread ($$) {
367 fail "connection lost: $!" if $!;
368 my $report = i_child_report();
369 fail $report if defined $report;
370 badproto $fh, "eof (reading $wh)";
373 sub protocol_expect (&$) {
374 my ($match, $fh) = @_;
377 defined && chomp or badproto_badread $fh, "protocol message";
385 badproto $fh, "\`$_'";
388 sub protocol_send_file ($$) {
389 my ($fh, $ourfn) = @_;
390 open PF, "<", $ourfn or die "$ourfn: $!";
393 my $got = read PF, $d, 65536;
394 die "$ourfn: $!" unless defined $got;
396 print $fh "data-block ".length($d)."\n" or die $!;
397 print $fh $d or die $!;
399 PF->error and die "$ourfn $!";
400 print $fh "data-end\n" or die $!;
404 sub protocol_read_bytes ($$) {
405 my ($fh, $nbytes) = @_;
406 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
408 my $got = read $fh, $d, $nbytes;
409 $got==$nbytes or badproto_badread $fh, "data block";
413 sub protocol_receive_file ($$) {
414 my ($fh, $ourfn) = @_;
415 printdebug "() $ourfn\n";
416 open PF, ">", $ourfn or die "$ourfn: $!";
418 my ($y,$l) = protocol_expect {
419 m/^data-block (.*)$/ ? (1,$1) :
420 m/^data-end$/ ? (0,) :
424 my $d = protocol_read_bytes $fh, $l;
425 print PF $d or die $!;
430 #---------- remote protocol support, responder ----------
432 sub responder_send_command ($) {
434 return unless $we_are_responder;
435 # called even without $we_are_responder
436 printdebug ">> $command\n";
437 print PO $command, "\n" or die $!;
440 sub responder_send_file ($$) {
441 my ($keyword, $ourfn) = @_;
442 return unless $we_are_responder;
443 printdebug "]] $keyword $ourfn\n";
444 responder_send_command "file $keyword";
445 protocol_send_file \*PO, $ourfn;
448 sub responder_receive_files ($@) {
449 my ($keyword, @ourfns) = @_;
450 die unless $we_are_responder;
451 printdebug "[[ $keyword @ourfns\n";
452 responder_send_command "want $keyword";
453 foreach my $fn (@ourfns) {
454 protocol_receive_file \*PI, $fn;
457 protocol_expect { m/^files-end$/ } \*PI;
460 #---------- remote protocol support, initiator ----------
462 sub initiator_expect (&) {
464 protocol_expect { &$match } \*RO;
467 #---------- end remote code ----------
470 if ($we_are_responder) {
472 responder_send_command "progress ".length($m) or die $!;
473 print PO $m or die $!;
483 $ua = LWP::UserAgent->new();
487 progress "downloading $what...";
488 my $r = $ua->get(@_) or die $!;
489 return undef if $r->code == 404;
490 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
491 return $r->decoded_content(charset => 'none');
494 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
499 failedcmd @_ if system @_;
502 sub act_local () { return $dryrun_level <= 1; }
503 sub act_scary () { return !$dryrun_level; }
506 if (!$dryrun_level) {
507 progress "dgit ok: @_";
509 progress "would be ok: @_ (but dry run only)";
514 printcmd(\*STDERR,$debugprefix."#",@_);
517 sub runcmd_ordryrun {
525 sub runcmd_ordryrun_local {
534 my ($first_shell, @cmd) = @_;
535 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
538 our $helpmsg = <<END;
540 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
541 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
542 dgit [dgit-opts] build [dpkg-buildpackage-opts]
543 dgit [dgit-opts] sbuild [sbuild-opts]
544 dgit [dgit-opts] push [dgit-opts] [suite]
545 dgit [dgit-opts] rpush build-host:build-dir ...
546 important dgit options:
547 -k<keyid> sign tag and package with <keyid> instead of default
548 --dry-run -n do not change anything, but go through the motions
549 --damp-run -L like --dry-run but make local changes, without signing
550 --new -N allow introducing a new package
551 --debug -D increase debug level
552 -c<name>=<value> set git config option (used directly by dgit too)
555 our $later_warning_msg = <<END;
556 Perhaps the upload is stuck in incoming. Using the version from git.
560 print STDERR "$us: @_\n", $helpmsg or die $!;
565 @ARGV or badusage "too few arguments";
566 return scalar shift @ARGV;
570 print $helpmsg or die $!;
574 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
576 our %defcfg = ('dgit.default.distro' => 'debian',
577 'dgit.default.username' => '',
578 'dgit.default.archive-query-default-component' => 'main',
579 'dgit.default.ssh' => 'ssh',
580 'dgit.default.archive-query' => 'madison:',
581 'dgit.default.sshpsql-dbname' => 'service=projectb',
582 'dgit.default.dgit-tag-format' => 'new,old,maint',
583 # old means "repo server accepts pushes with old dgit tags"
584 # new means "repo server accepts pushes with new dgit tags"
585 # maint means "repo server accepts split brain pushes"
586 # hist means "repo server may have old pushes without new tag"
587 # ("hist" is implied by "old")
588 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
589 'dgit-distro.debian.git-check' => 'url',
590 'dgit-distro.debian.git-check-suffix' => '/info/refs',
591 'dgit-distro.debian.new-private-pushers' => 't',
592 'dgit-distro.debian/push.git-url' => '',
593 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
594 'dgit-distro.debian/push.git-user-force' => 'dgit',
595 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
596 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
597 'dgit-distro.debian/push.git-create' => 'true',
598 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
599 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
600 # 'dgit-distro.debian.archive-query-tls-key',
601 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
602 # ^ this does not work because curl is broken nowadays
603 # Fixing #790093 properly will involve providing providing the key
604 # in some pacagke and maybe updating these paths.
606 # 'dgit-distro.debian.archive-query-tls-curl-args',
607 # '--ca-path=/etc/ssl/ca-debian',
608 # ^ this is a workaround but works (only) on DSA-administered machines
609 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
610 'dgit-distro.debian.git-url-suffix' => '',
611 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
612 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
613 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
614 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
615 'dgit-distro.ubuntu.git-check' => 'false',
616 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
617 'dgit-distro.test-dummy.ssh' => "$td/ssh",
618 'dgit-distro.test-dummy.username' => "alice",
619 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
620 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
621 'dgit-distro.test-dummy.git-url' => "$td/git",
622 'dgit-distro.test-dummy.git-host' => "git",
623 'dgit-distro.test-dummy.git-path' => "$td/git",
624 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
625 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
626 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
627 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
631 our @gitcfgsources = qw(cmdline local global system);
633 sub git_slurp_config () {
634 local ($debuglevel) = $debuglevel-2;
637 # This algoritm is a bit subtle, but this is needed so that for
638 # options which we want to be single-valued, we allow the
639 # different config sources to override properly. See #835858.
640 foreach my $src (@gitcfgsources) {
641 next if $src eq 'cmdline';
642 # we do this ourselves since git doesn't handle it
644 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
647 open GITS, "-|", @cmd or die $!;
650 printdebug "=> ", (messagequote $_), "\n";
652 push @{ $gitcfgs{$src}{$`} }, $'; #';
656 or ($!==0 && $?==256)
661 sub git_get_config ($) {
663 foreach my $src (@gitcfgsources) {
664 my $l = $gitcfgs{$src}{$c};
665 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
668 @$l==1 or badcfg "multiple values for $c".
669 " (in $src git config)" if @$l > 1;
677 return undef if $c =~ /RETURN-UNDEF/;
678 my $v = git_get_config($c);
679 return $v if defined $v;
680 my $dv = $defcfg{$c};
681 return $dv if defined $dv;
683 badcfg "need value for one of: @_\n".
684 "$us: distro or suite appears not to be (properly) supported";
687 sub access_basedistro () {
688 if (defined $idistro) {
691 return cfg("dgit-suite.$isuite.distro",
692 "dgit.default.distro");
696 sub access_quirk () {
697 # returns (quirk name, distro to use instead or undef, quirk-specific info)
698 my $basedistro = access_basedistro();
699 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
701 if (defined $backports_quirk) {
702 my $re = $backports_quirk;
703 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
705 $re =~ s/\%/([-0-9a-z_]+)/
706 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
707 if ($isuite =~ m/^$re$/) {
708 return ('backports',"$basedistro-backports",$1);
711 return ('none',undef);
716 sub parse_cfg_bool ($$$) {
717 my ($what,$def,$v) = @_;
720 $v =~ m/^[ty1]/ ? 1 :
721 $v =~ m/^[fn0]/ ? 0 :
722 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
725 sub access_forpush_config () {
726 my $d = access_basedistro();
730 parse_cfg_bool('new-private-pushers', 0,
731 cfg("dgit-distro.$d.new-private-pushers",
734 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
737 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
738 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
739 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
740 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
743 sub access_forpush () {
744 $access_forpush //= access_forpush_config();
745 return $access_forpush;
749 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
750 badcfg "pushing but distro is configured readonly"
751 if access_forpush_config() eq '0';
753 $supplementary_message = <<'END' unless $we_are_responder;
754 Push failed, before we got started.
755 You can retry the push, after fixing the problem, if you like.
757 finalise_opts_opts();
761 finalise_opts_opts();
764 sub supplementary_message ($) {
766 if (!$we_are_responder) {
767 $supplementary_message = $msg;
769 } elsif ($protovsn >= 3) {
770 responder_send_command "supplementary-message ".length($msg)
772 print PO $msg or die $!;
776 sub access_distros () {
777 # Returns list of distros to try, in order
780 # 0. `instead of' distro name(s) we have been pointed to
781 # 1. the access_quirk distro, if any
782 # 2a. the user's specified distro, or failing that } basedistro
783 # 2b. the distro calculated from the suite }
784 my @l = access_basedistro();
786 my (undef,$quirkdistro) = access_quirk();
787 unshift @l, $quirkdistro;
788 unshift @l, $instead_distro;
789 @l = grep { defined } @l;
791 if (access_forpush()) {
792 @l = map { ("$_/push", $_) } @l;
797 sub access_cfg_cfgs (@) {
800 # The nesting of these loops determines the search order. We put
801 # the key loop on the outside so that we search all the distros
802 # for each key, before going on to the next key. That means that
803 # if access_cfg is called with a more specific, and then a less
804 # specific, key, an earlier distro can override the less specific
805 # without necessarily overriding any more specific keys. (If the
806 # distro wants to override the more specific keys it can simply do
807 # so; whereas if we did the loop the other way around, it would be
808 # impossible to for an earlier distro to override a less specific
809 # key but not the more specific ones without restating the unknown
810 # values of the more specific keys.
813 # We have to deal with RETURN-UNDEF specially, so that we don't
814 # terminate the search prematurely.
816 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
819 foreach my $d (access_distros()) {
820 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
822 push @cfgs, map { "dgit.default.$_" } @realkeys;
829 my (@cfgs) = access_cfg_cfgs(@keys);
830 my $value = cfg(@cfgs);
834 sub access_cfg_bool ($$) {
835 my ($def, @keys) = @_;
836 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
839 sub string_to_ssh ($) {
841 if ($spec =~ m/\s/) {
842 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
848 sub access_cfg_ssh () {
849 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
850 if (!defined $gitssh) {
853 return string_to_ssh $gitssh;
857 sub access_runeinfo ($) {
859 return ": dgit ".access_basedistro()." $info ;";
862 sub access_someuserhost ($) {
864 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
865 defined($user) && length($user) or
866 $user = access_cfg("$some-user",'username');
867 my $host = access_cfg("$some-host");
868 return length($user) ? "$user\@$host" : $host;
871 sub access_gituserhost () {
872 return access_someuserhost('git');
875 sub access_giturl (;$) {
877 my $url = access_cfg('git-url','RETURN-UNDEF');
880 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
881 return undef unless defined $proto;
884 access_gituserhost().
885 access_cfg('git-path');
887 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
890 return "$url/$package$suffix";
893 sub parsecontrolfh ($$;$) {
894 my ($fh, $desc, $allowsigned) = @_;
895 our $dpkgcontrolhash_noissigned;
898 my %opts = ('name' => $desc);
899 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
900 $c = Dpkg::Control::Hash->new(%opts);
901 $c->parse($fh,$desc) or die "parsing of $desc failed";
902 last if $allowsigned;
903 last if $dpkgcontrolhash_noissigned;
904 my $issigned= $c->get_option('is_pgp_signed');
905 if (!defined $issigned) {
906 $dpkgcontrolhash_noissigned= 1;
907 seek $fh, 0,0 or die "seek $desc: $!";
908 } elsif ($issigned) {
909 fail "control file $desc is (already) PGP-signed. ".
910 " Note that dgit push needs to modify the .dsc and then".
911 " do the signature itself";
920 my ($file, $desc) = @_;
921 my $fh = new IO::Handle;
922 open $fh, '<', $file or die "$file: $!";
923 my $c = parsecontrolfh($fh,$desc);
924 $fh->error and die $!;
930 my ($dctrl,$field) = @_;
931 my $v = $dctrl->{$field};
932 return $v if defined $v;
933 fail "missing field $field in ".$dctrl->get_option('name');
937 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
938 my $p = new IO::Handle;
939 my @cmd = (qw(dpkg-parsechangelog), @_);
940 open $p, '-|', @cmd or die $!;
942 $?=0; $!=0; close $p or failedcmd @cmd;
946 sub commit_getclogp ($) {
947 # Returns the parsed changelog hashref for a particular commit
949 our %commit_getclogp_memo;
950 my $memo = $commit_getclogp_memo{$objid};
951 return $memo if $memo;
953 my $mclog = ".git/dgit/clog-$objid";
954 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
955 "$objid:debian/changelog";
956 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
961 defined $d or fail "getcwd failed: $!";
965 sub parse_dscdata () {
966 my $dscfh = new IO::File \$dscdata, '<' or die $!;
967 printdebug Dumper($dscdata) if $debuglevel>1;
968 $dsc = parsecontrolfh($dscfh,$dscurl,1);
969 printdebug Dumper($dsc) if $debuglevel>1;
974 sub archive_query ($;@) {
975 my ($method) = shift @_;
976 my $query = access_cfg('archive-query','RETURN-UNDEF');
977 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
980 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
983 sub pool_dsc_subpath ($$) {
984 my ($vsn,$component) = @_; # $package is implict arg
985 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
986 return "/pool/$component/$prefix/$package/".dscfn($vsn);
989 #---------- `ftpmasterapi' archive query method (nascent) ----------
991 sub archive_api_query_cmd ($) {
993 my @cmd = (@curl, qw(-sS));
994 my $url = access_cfg('archive-query-url');
995 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
997 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
998 foreach my $key (split /\:/, $keys) {
999 $key =~ s/\%HOST\%/$host/g;
1001 fail "for $url: stat $key: $!" unless $!==ENOENT;
1004 fail "config requested specific TLS key but do not know".
1005 " how to get curl to use exactly that EE key ($key)";
1006 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1007 # # Sadly the above line does not work because of changes
1008 # # to gnutls. The real fix for #790093 may involve
1009 # # new curl options.
1012 # Fixing #790093 properly will involve providing a value
1013 # for this on clients.
1014 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1015 push @cmd, split / /, $kargs if defined $kargs;
1017 push @cmd, $url.$subpath;
1021 sub api_query ($$;$) {
1023 my ($data, $subpath, $ok404) = @_;
1024 badcfg "ftpmasterapi archive query method takes no data part"
1026 my @cmd = archive_api_query_cmd($subpath);
1027 my $url = $cmd[$#cmd];
1028 push @cmd, qw(-w %{http_code});
1029 my $json = cmdoutput @cmd;
1030 unless ($json =~ s/\d+\d+\d$//) {
1031 failedcmd_report_cmd undef, @cmd;
1032 fail "curl failed to print 3-digit HTTP code";
1035 return undef if $code eq '404' && $ok404;
1036 fail "fetch of $url gave HTTP code $code"
1037 unless $url =~ m#^file://# or $code =~ m/^2/;
1038 return decode_json($json);
1041 sub canonicalise_suite_ftpmasterapi {
1042 my ($proto,$data) = @_;
1043 my $suites = api_query($data, 'suites');
1045 foreach my $entry (@$suites) {
1047 my $v = $entry->{$_};
1048 defined $v && $v eq $isuite;
1049 } qw(codename name);
1050 push @matched, $entry;
1052 fail "unknown suite $isuite" unless @matched;
1055 @matched==1 or die "multiple matches for suite $isuite\n";
1056 $cn = "$matched[0]{codename}";
1057 defined $cn or die "suite $isuite info has no codename\n";
1058 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1060 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1065 sub archive_query_ftpmasterapi {
1066 my ($proto,$data) = @_;
1067 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1069 my $digester = Digest::SHA->new(256);
1070 foreach my $entry (@$info) {
1072 my $vsn = "$entry->{version}";
1073 my ($ok,$msg) = version_check $vsn;
1074 die "bad version: $msg\n" unless $ok;
1075 my $component = "$entry->{component}";
1076 $component =~ m/^$component_re$/ or die "bad component";
1077 my $filename = "$entry->{filename}";
1078 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1079 or die "bad filename";
1080 my $sha256sum = "$entry->{sha256sum}";
1081 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1082 push @rows, [ $vsn, "/pool/$component/$filename",
1083 $digester, $sha256sum ];
1085 die "bad ftpmaster api response: $@\n".Dumper($entry)
1088 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1092 sub file_in_archive_ftpmasterapi {
1093 my ($proto,$data,$filename) = @_;
1094 my $pat = $filename;
1097 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1098 my $info = api_query($data, "file_in_archive/$pat", 1);
1101 #---------- `dummyapicat' archive query method ----------
1103 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1104 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1106 sub file_in_archive_dummycatapi ($$$) {
1107 my ($proto,$data,$filename) = @_;
1108 my $mirror = access_cfg('mirror');
1109 $mirror =~ s#^file://#/# or die "$mirror ?";
1111 my @cmd = (qw(sh -ec), '
1113 find -name "$2" -print0 |
1115 ', qw(x), $mirror, $filename);
1116 debugcmd "-|", @cmd;
1117 open FIA, "-|", @cmd or die $!;
1120 printdebug "| $_\n";
1121 m/^(\w+) (\S+)$/ or die "$_ ?";
1122 push @out, { sha256sum => $1, filename => $2 };
1124 close FIA or die failedcmd @cmd;
1128 #---------- `madison' archive query method ----------
1130 sub archive_query_madison {
1131 return map { [ @$_[0..1] ] } madison_get_parse(@_);
1134 sub madison_get_parse {
1135 my ($proto,$data) = @_;
1136 die unless $proto eq 'madison';
1137 if (!length $data) {
1138 $data= access_cfg('madison-distro','RETURN-UNDEF');
1139 $data //= access_basedistro();
1141 $rmad{$proto,$data,$package} ||= cmdoutput
1142 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1143 my $rmad = $rmad{$proto,$data,$package};
1146 foreach my $l (split /\n/, $rmad) {
1147 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1148 \s*( [^ \t|]+ )\s* \|
1149 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1150 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1151 $1 eq $package or die "$rmad $package ?";
1158 $component = access_cfg('archive-query-default-component');
1160 $5 eq 'source' or die "$rmad ?";
1161 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1163 return sort { -version_compare($a->[0],$b->[0]); } @out;
1166 sub canonicalise_suite_madison {
1167 # madison canonicalises for us
1168 my @r = madison_get_parse(@_);
1170 "unable to canonicalise suite using package $package".
1171 " which does not appear to exist in suite $isuite;".
1172 " --existing-package may help";
1176 sub file_in_archive_madison { return undef; }
1178 #---------- `sshpsql' archive query method ----------
1181 my ($data,$runeinfo,$sql) = @_;
1182 if (!length $data) {
1183 $data= access_someuserhost('sshpsql').':'.
1184 access_cfg('sshpsql-dbname');
1186 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1187 my ($userhost,$dbname) = ($`,$'); #';
1189 my @cmd = (access_cfg_ssh, $userhost,
1190 access_runeinfo("ssh-psql $runeinfo").
1191 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1192 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1194 open P, "-|", @cmd or die $!;
1197 printdebug(">|$_|\n");
1200 $!=0; $?=0; close P or failedcmd @cmd;
1202 my $nrows = pop @rows;
1203 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1204 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1205 @rows = map { [ split /\|/, $_ ] } @rows;
1206 my $ncols = scalar @{ shift @rows };
1207 die if grep { scalar @$_ != $ncols } @rows;
1211 sub sql_injection_check {
1212 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1215 sub archive_query_sshpsql ($$) {
1216 my ($proto,$data) = @_;
1217 sql_injection_check $isuite, $package;
1218 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1219 SELECT source.version, component.name, files.filename, files.sha256sum
1221 JOIN src_associations ON source.id = src_associations.source
1222 JOIN suite ON suite.id = src_associations.suite
1223 JOIN dsc_files ON dsc_files.source = source.id
1224 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1225 JOIN component ON component.id = files_archive_map.component_id
1226 JOIN files ON files.id = dsc_files.file
1227 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1228 AND source.source='$package'
1229 AND files.filename LIKE '%.dsc';
1231 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1232 my $digester = Digest::SHA->new(256);
1234 my ($vsn,$component,$filename,$sha256sum) = @$_;
1235 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1240 sub canonicalise_suite_sshpsql ($$) {
1241 my ($proto,$data) = @_;
1242 sql_injection_check $isuite;
1243 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1244 SELECT suite.codename
1245 FROM suite where suite_name='$isuite' or codename='$isuite';
1247 @rows = map { $_->[0] } @rows;
1248 fail "unknown suite $isuite" unless @rows;
1249 die "ambiguous $isuite: @rows ?" if @rows>1;
1253 sub file_in_archive_sshpsql ($$$) { return undef; }
1255 #---------- `dummycat' archive query method ----------
1257 sub canonicalise_suite_dummycat ($$) {
1258 my ($proto,$data) = @_;
1259 my $dpath = "$data/suite.$isuite";
1260 if (!open C, "<", $dpath) {
1261 $!==ENOENT or die "$dpath: $!";
1262 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1266 chomp or die "$dpath: $!";
1268 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1272 sub archive_query_dummycat ($$) {
1273 my ($proto,$data) = @_;
1274 canonicalise_suite();
1275 my $dpath = "$data/package.$csuite.$package";
1276 if (!open C, "<", $dpath) {
1277 $!==ENOENT or die "$dpath: $!";
1278 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1286 printdebug "dummycat query $csuite $package $dpath | $_\n";
1287 my @row = split /\s+/, $_;
1288 @row==2 or die "$dpath: $_ ?";
1291 C->error and die "$dpath: $!";
1293 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1296 sub file_in_archive_dummycat () { return undef; }
1298 #---------- tag format handling ----------
1300 sub access_cfg_tagformats () {
1301 split /\,/, access_cfg('dgit-tag-format');
1304 sub need_tagformat ($$) {
1305 my ($fmt, $why) = @_;
1306 fail "need to use tag format $fmt ($why) but also need".
1307 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1308 " - no way to proceed"
1309 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1310 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1313 sub select_tagformat () {
1315 return if $tagformatfn && !$tagformat_want;
1316 die 'bug' if $tagformatfn && $tagformat_want;
1317 # ... $tagformat_want assigned after previous select_tagformat
1319 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1320 printdebug "select_tagformat supported @supported\n";
1322 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1323 printdebug "select_tagformat specified @$tagformat_want\n";
1325 my ($fmt,$why,$override) = @$tagformat_want;
1327 fail "target distro supports tag formats @supported".
1328 " but have to use $fmt ($why)"
1330 or grep { $_ eq $fmt } @supported;
1332 $tagformat_want = undef;
1334 $tagformatfn = ${*::}{"debiantag_$fmt"};
1336 fail "trying to use unknown tag format \`$fmt' ($why) !"
1337 unless $tagformatfn;
1340 #---------- archive query entrypoints and rest of program ----------
1342 sub canonicalise_suite () {
1343 return if defined $csuite;
1344 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1345 $csuite = archive_query('canonicalise_suite');
1346 if ($isuite ne $csuite) {
1347 progress "canonical suite name for $isuite is $csuite";
1351 sub get_archive_dsc () {
1352 canonicalise_suite();
1353 my @vsns = archive_query('archive_query');
1354 foreach my $vinfo (@vsns) {
1355 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1356 $dscurl = access_cfg('mirror').$subpath;
1357 $dscdata = url_get($dscurl);
1359 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1364 $digester->add($dscdata);
1365 my $got = $digester->hexdigest();
1367 fail "$dscurl has hash $got but".
1368 " archive told us to expect $digest";
1371 my $fmt = getfield $dsc, 'Format';
1372 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1373 "unsupported source format $fmt, sorry";
1375 $dsc_checked = !!$digester;
1376 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1380 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1383 sub check_for_git ();
1384 sub check_for_git () {
1386 my $how = access_cfg('git-check');
1387 if ($how eq 'ssh-cmd') {
1389 (access_cfg_ssh, access_gituserhost(),
1390 access_runeinfo("git-check $package").
1391 " set -e; cd ".access_cfg('git-path').";".
1392 " if test -d $package.git; then echo 1; else echo 0; fi");
1393 my $r= cmdoutput @cmd;
1394 if (defined $r and $r =~ m/^divert (\w+)$/) {
1396 my ($usedistro,) = access_distros();
1397 # NB that if we are pushing, $usedistro will be $distro/push
1398 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1399 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1400 progress "diverting to $divert (using config for $instead_distro)";
1401 return check_for_git();
1403 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1405 } elsif ($how eq 'url') {
1406 my $prefix = access_cfg('git-check-url','git-url');
1407 my $suffix = access_cfg('git-check-suffix','git-suffix',
1408 'RETURN-UNDEF') // '.git';
1409 my $url = "$prefix/$package$suffix";
1410 my @cmd = (@curl, qw(-sS -I), $url);
1411 my $result = cmdoutput @cmd;
1412 $result =~ s/^\S+ 200 .*\n\r?\n//;
1413 # curl -sS -I with https_proxy prints
1414 # HTTP/1.0 200 Connection established
1415 $result =~ m/^\S+ (404|200) /s or
1416 fail "unexpected results from git check query - ".
1417 Dumper($prefix, $result);
1419 if ($code eq '404') {
1421 } elsif ($code eq '200') {
1426 } elsif ($how eq 'true') {
1428 } elsif ($how eq 'false') {
1431 badcfg "unknown git-check \`$how'";
1435 sub create_remote_git_repo () {
1436 my $how = access_cfg('git-create');
1437 if ($how eq 'ssh-cmd') {
1439 (access_cfg_ssh, access_gituserhost(),
1440 access_runeinfo("git-create $package").
1441 "set -e; cd ".access_cfg('git-path').";".
1442 " cp -a _template $package.git");
1443 } elsif ($how eq 'true') {
1446 badcfg "unknown git-create \`$how'";
1450 our ($dsc_hash,$lastpush_mergeinput);
1452 our $ud = '.git/dgit/unpack';
1462 sub mktree_in_ud_here () {
1463 runcmd qw(git init -q);
1464 runcmd qw(git config gc.auto 0);
1465 rmtree('.git/objects');
1466 symlink '../../../../objects','.git/objects' or die $!;
1469 sub git_write_tree () {
1470 my $tree = cmdoutput @git, qw(write-tree);
1471 $tree =~ m/^\w+$/ or die "$tree ?";
1475 sub remove_stray_gits () {
1476 my @gitscmd = qw(find -name .git -prune -print0);
1477 debugcmd "|",@gitscmd;
1478 open GITS, "-|", @gitscmd or die $!;
1483 print STDERR "$us: warning: removing from source package: ",
1484 (messagequote $_), "\n";
1488 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1491 sub mktree_in_ud_from_only_subdir (;$) {
1494 # changes into the subdir
1496 die "expected one subdir but found @dirs ?" unless @dirs==1;
1497 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1501 remove_stray_gits();
1502 mktree_in_ud_here();
1504 my ($format, $fopts) = get_source_format();
1505 if (madformat($format)) {
1510 runcmd @git, qw(add -Af);
1511 my $tree=git_write_tree();
1512 return ($tree,$dir);
1515 our @files_csum_info_fields =
1516 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1517 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1518 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1520 sub dsc_files_info () {
1521 foreach my $csumi (@files_csum_info_fields) {
1522 my ($fname, $module, $method) = @$csumi;
1523 my $field = $dsc->{$fname};
1524 next unless defined $field;
1525 eval "use $module; 1;" or die $@;
1527 foreach (split /\n/, $field) {
1529 m/^(\w+) (\d+) (\S+)$/ or
1530 fail "could not parse .dsc $fname line \`$_'";
1531 my $digester = eval "$module"."->$method;" or die $@;
1536 Digester => $digester,
1541 fail "missing any supported Checksums-* or Files field in ".
1542 $dsc->get_option('name');
1546 map { $_->{Filename} } dsc_files_info();
1549 sub files_compare_inputs (@) {
1554 my $showinputs = sub {
1555 return join "; ", map { $_->get_option('name') } @$inputs;
1558 foreach my $in (@$inputs) {
1560 my $in_name = $in->get_option('name');
1562 printdebug "files_compare_inputs $in_name\n";
1564 foreach my $csumi (@files_csum_info_fields) {
1565 my ($fname) = @$csumi;
1566 printdebug "files_compare_inputs $in_name $fname\n";
1568 my $field = $in->{$fname};
1569 next unless defined $field;
1572 foreach (split /\n/, $field) {
1575 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1576 fail "could not parse $in_name $fname line \`$_'";
1578 printdebug "files_compare_inputs $in_name $fname $f\n";
1582 my $re = \ $record{$f}{$fname};
1584 $fchecked{$f}{$in_name} = 1;
1586 fail "hash or size of $f varies in $fname fields".
1587 " (between: ".$showinputs->().")";
1592 @files = sort @files;
1593 $expected_files //= \@files;
1594 "@$expected_files" eq "@files" or
1595 fail "file list in $in_name varies between hash fields!";
1598 fail "$in_name has no files list field(s)";
1600 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1603 grep { keys %$_ == @$inputs-1 } values %fchecked
1604 or fail "no file appears in all file lists".
1605 " (looked in: ".$showinputs->().")";
1608 sub is_orig_file_in_dsc ($$) {
1609 my ($f, $dsc_files_info) = @_;
1610 return 0 if @$dsc_files_info <= 1;
1611 # One file means no origs, and the filename doesn't have a "what
1612 # part of dsc" component. (Consider versions ending `.orig'.)
1613 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1617 sub is_orig_file_of_vsn ($$) {
1618 my ($f, $upstreamvsn) = @_;
1619 my $base = srcfn $upstreamvsn, '';
1620 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1624 sub changes_update_origs_from_dsc ($$$$) {
1625 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1627 printdebug "checking origs needed ($upstreamvsn)...\n";
1628 $_ = getfield $changes, 'Files';
1629 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1630 fail "cannot find section/priority from .changes Files field";
1631 my $placementinfo = $1;
1633 printdebug "checking origs needed placement '$placementinfo'...\n";
1634 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1635 $l =~ m/\S+$/ or next;
1637 printdebug "origs $file | $l\n";
1638 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1639 printdebug "origs $file is_orig\n";
1640 my $have = archive_query('file_in_archive', $file);
1641 if (!defined $have) {
1643 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1649 printdebug "origs $file \$#\$have=$#$have\n";
1650 foreach my $h (@$have) {
1653 foreach my $csumi (@files_csum_info_fields) {
1654 my ($fname, $module, $method, $archivefield) = @$csumi;
1655 next unless defined $h->{$archivefield};
1656 $_ = $dsc->{$fname};
1657 next unless defined;
1658 m/^(\w+) .* \Q$file\E$/m or
1659 fail ".dsc $fname missing entry for $file";
1660 if ($h->{$archivefield} eq $1) {
1664 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1667 die "$file ".Dumper($h)." ?!" if $same && @differ;
1670 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1673 print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
1674 if (@found_differ && !$found_same) {
1676 "archive contains $file with different checksum",
1679 # Now we edit the changes file to add or remove it
1680 foreach my $csumi (@files_csum_info_fields) {
1681 my ($fname, $module, $method, $archivefield) = @$csumi;
1682 next unless defined $changes->{$fname};
1684 # in archive, delete from .changes if it's there
1685 $changed{$file} = "removed" if
1686 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1687 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1688 # not in archive, but it's here in the .changes
1690 my $dsc_data = getfield $dsc, $fname;
1691 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1693 $extra =~ s/ \d+ /$&$placementinfo /
1694 or die "$fname $extra >$dsc_data< ?"
1695 if $fname eq 'Files';
1696 $changes->{$fname} .= "\n". $extra;
1697 $changed{$file} = "added";
1702 foreach my $file (keys %changed) {
1704 "edited .changes for archive .orig contents: %s %s",
1705 $changed{$file}, $file;
1707 my $chtmp = "$changesfile.tmp";
1708 $changes->save($chtmp);
1710 rename $chtmp,$changesfile or die "$changesfile $!";
1712 progress "[new .changes left in $changesfile]";
1715 progress "$changesfile already has appropriate .orig(s) (if any)";
1719 sub make_commit ($) {
1721 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1724 sub make_commit_text ($) {
1727 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1729 print Dumper($text) if $debuglevel > 1;
1730 my $child = open2($out, $in, @cmd) or die $!;
1733 print $in $text or die $!;
1734 close $in or die $!;
1736 $h =~ m/^\w+$/ or die;
1738 printdebug "=> $h\n";
1741 waitpid $child, 0 == $child or die "$child $!";
1742 $? and failedcmd @cmd;
1746 sub clogp_authline ($) {
1748 my $author = getfield $clogp, 'Maintainer';
1749 $author =~ s#,.*##ms;
1750 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1751 my $authline = "$author $date";
1752 $authline =~ m/$git_authline_re/o or
1753 fail "unexpected commit author line format \`$authline'".
1754 " (was generated from changelog Maintainer field)";
1755 return ($1,$2,$3) if wantarray;
1759 sub vendor_patches_distro ($$) {
1760 my ($checkdistro, $what) = @_;
1761 return unless defined $checkdistro;
1763 my $series = "debian/patches/\L$checkdistro\E.series";
1764 printdebug "checking for vendor-specific $series ($what)\n";
1766 if (!open SERIES, "<", $series) {
1767 die "$series $!" unless $!==ENOENT;
1776 Unfortunately, this source package uses a feature of dpkg-source where
1777 the same source package unpacks to different source code on different
1778 distros. dgit cannot safely operate on such packages on affected
1779 distros, because the meaning of source packages is not stable.
1781 Please ask the distro/maintainer to remove the distro-specific series
1782 files and use a different technique (if necessary, uploading actually
1783 different packages, if different distros are supposed to have
1787 fail "Found active distro-specific series file for".
1788 " $checkdistro ($what): $series, cannot continue";
1790 die "$series $!" if SERIES->error;
1794 sub check_for_vendor_patches () {
1795 # This dpkg-source feature doesn't seem to be documented anywhere!
1796 # But it can be found in the changelog (reformatted):
1798 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1799 # Author: Raphael Hertzog <hertzog@debian.org>
1800 # Date: Sun Oct 3 09:36:48 2010 +0200
1802 # dpkg-source: correctly create .pc/.quilt_series with alternate
1805 # If you have debian/patches/ubuntu.series and you were
1806 # unpacking the source package on ubuntu, quilt was still
1807 # directed to debian/patches/series instead of
1808 # debian/patches/ubuntu.series.
1810 # debian/changelog | 3 +++
1811 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1812 # 2 files changed, 6 insertions(+), 1 deletion(-)
1815 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1816 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1817 "Dpkg::Vendor \`current vendor'");
1818 vendor_patches_distro(access_basedistro(),
1819 "distro being accessed");
1822 sub generate_commits_from_dsc () {
1823 # See big comment in fetch_from_archive, below.
1824 # See also README.dsc-import.
1828 my @dfi = dsc_files_info();
1829 foreach my $fi (@dfi) {
1830 my $f = $fi->{Filename};
1831 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1833 printdebug "considering linking $f: ";
1835 link_ltarget "../../../../$f", $f
1836 or ((printdebug "($!) "), 0)
1840 printdebug "linked.\n";
1842 complete_file_from_dsc('.', $fi)
1845 if (is_orig_file_in_dsc($f, \@dfi)) {
1846 link $f, "../../../../$f"
1852 # We unpack and record the orig tarballs first, so that we only
1853 # need disk space for one private copy of the unpacked source.
1854 # But we can't make them into commits until we have the metadata
1855 # from the debian/changelog, so we record the tree objects now and
1856 # make them into commits later.
1858 my $upstreamv = $dsc->{version};
1859 $upstreamv =~ s/-[^-]+$//;
1860 my $orig_f_base = srcfn $upstreamv, '';
1862 foreach my $fi (@dfi) {
1863 # We actually import, and record as a commit, every tarball
1864 # (unless there is only one file, in which case there seems
1867 my $f = $fi->{Filename};
1868 printdebug "import considering $f ";
1869 (printdebug "only one dfi\n"), next if @dfi == 1;
1870 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1871 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1875 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1877 printdebug "Y ", (join ' ', map { $_//"(none)" }
1878 $compr_ext, $orig_f_part
1881 my $input = new IO::File $f, '<' or die "$f $!";
1885 if (defined $compr_ext) {
1887 Dpkg::Compression::compression_guess_from_filename $f;
1888 fail "Dpkg::Compression cannot handle file $f in source package"
1889 if defined $compr_ext && !defined $cname;
1891 new Dpkg::Compression::Process compression => $cname;
1892 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1893 my $compr_fh = new IO::Handle;
1894 my $compr_pid = open $compr_fh, "-|" // die $!;
1896 open STDIN, "<&", $input or die $!;
1898 die "dgit (child): exec $compr_cmd[0]: $!\n";
1903 rmtree "../unpack-tar";
1904 mkdir "../unpack-tar" or die $!;
1905 my @tarcmd = qw(tar -x -f -
1906 --no-same-owner --no-same-permissions
1907 --no-acls --no-xattrs --no-selinux);
1908 my $tar_pid = fork // die $!;
1910 chdir "../unpack-tar" or die $!;
1911 open STDIN, "<&", $input or die $!;
1913 die "dgit (child): exec $tarcmd[0]: $!";
1915 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1916 !$? or failedcmd @tarcmd;
1919 (@compr_cmd ? failedcmd @compr_cmd
1921 # finally, we have the results in "tarball", but maybe
1922 # with the wrong permissions
1924 runcmd qw(chmod -R +rwX ../unpack-tar);
1925 changedir "../unpack-tar";
1926 my ($tree) = mktree_in_ud_from_only_subdir(1);
1927 changedir "../../unpack";
1928 rmtree "../unpack-tar";
1930 my $ent = [ $f, $tree ];
1932 Orig => !!$orig_f_part,
1933 Sort => (!$orig_f_part ? 2 :
1934 $orig_f_part =~ m/-/g ? 1 :
1942 # put any without "_" first (spec is not clear whether files
1943 # are always in the usual order). Tarballs without "_" are
1944 # the main orig or the debian tarball.
1945 $a->{Sort} <=> $b->{Sort} or
1949 my $any_orig = grep { $_->{Orig} } @tartrees;
1951 my $dscfn = "$package.dsc";
1953 my $treeimporthow = 'package';
1955 open D, ">", $dscfn or die "$dscfn: $!";
1956 print D $dscdata or die "$dscfn: $!";
1957 close D or die "$dscfn: $!";
1958 my @cmd = qw(dpkg-source);
1959 push @cmd, '--no-check' if $dsc_checked;
1960 if (madformat $dsc->{format}) {
1961 push @cmd, '--skip-patches';
1962 $treeimporthow = 'unpatched';
1964 push @cmd, qw(-x --), $dscfn;
1967 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1968 if (madformat $dsc->{format}) {
1969 check_for_vendor_patches();
1973 if (madformat $dsc->{format}) {
1974 my @pcmd = qw(dpkg-source --before-build .);
1975 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1977 runcmd @git, qw(add -Af);
1978 $dappliedtree = git_write_tree();
1981 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1982 debugcmd "|",@clogcmd;
1983 open CLOGS, "-|", @clogcmd or die $!;
1988 printdebug "import clog search...\n";
1991 my $stanzatext = do { local $/=""; <CLOGS>; };
1992 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1993 last if !defined $stanzatext;
1995 my $desc = "package changelog, entry no.$.";
1996 open my $stanzafh, "<", \$stanzatext or die;
1997 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1998 $clogp //= $thisstanza;
2000 printdebug "import clog $thisstanza->{version} $desc...\n";
2002 last if !$any_orig; # we don't need $r1clogp
2004 # We look for the first (most recent) changelog entry whose
2005 # version number is lower than the upstream version of this
2006 # package. Then the last (least recent) previous changelog
2007 # entry is treated as the one which introduced this upstream
2008 # version and used for the synthetic commits for the upstream
2011 # One might think that a more sophisticated algorithm would be
2012 # necessary. But: we do not want to scan the whole changelog
2013 # file. Stopping when we see an earlier version, which
2014 # necessarily then is an earlier upstream version, is the only
2015 # realistic way to do that. Then, either the earliest
2016 # changelog entry we have seen so far is indeed the earliest
2017 # upload of this upstream version; or there are only changelog
2018 # entries relating to later upstream versions (which is not
2019 # possible unless the changelog and .dsc disagree about the
2020 # version). Then it remains to choose between the physically
2021 # last entry in the file, and the one with the lowest version
2022 # number. If these are not the same, we guess that the
2023 # versions were created in a non-monotic order rather than
2024 # that the changelog entries have been misordered.
2026 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2028 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2029 $r1clogp = $thisstanza;
2031 printdebug "import clog $r1clogp->{version} becomes r1\n";
2033 die $! if CLOGS->error;
2034 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2036 $clogp or fail "package changelog has no entries!";
2038 my $authline = clogp_authline $clogp;
2039 my $changes = getfield $clogp, 'Changes';
2040 my $cversion = getfield $clogp, 'Version';
2043 $r1clogp //= $clogp; # maybe there's only one entry;
2044 my $r1authline = clogp_authline $r1clogp;
2045 # Strictly, r1authline might now be wrong if it's going to be
2046 # unused because !$any_orig. Whatever.
2048 printdebug "import tartrees authline $authline\n";
2049 printdebug "import tartrees r1authline $r1authline\n";
2051 foreach my $tt (@tartrees) {
2052 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2054 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2057 committer $r1authline
2061 [dgit import orig $tt->{F}]
2069 [dgit import tarball $package $cversion $tt->{F}]
2074 printdebug "import main commit\n";
2076 open C, ">../commit.tmp" or die $!;
2077 print C <<END or die $!;
2080 print C <<END or die $! foreach @tartrees;
2083 print C <<END or die $!;
2089 [dgit import $treeimporthow $package $cversion]
2093 my $rawimport_hash = make_commit qw(../commit.tmp);
2095 if (madformat $dsc->{format}) {
2096 printdebug "import apply patches...\n";
2098 # regularise the state of the working tree so that
2099 # the checkout of $rawimport_hash works nicely.
2100 my $dappliedcommit = make_commit_text(<<END);
2107 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2109 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2111 # We need the answers to be reproducible
2112 my @authline = clogp_authline($clogp);
2113 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2114 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2115 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2116 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2117 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2118 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2120 my $path = $ENV{PATH} or die;
2122 foreach my $use_absurd (qw(0 1)) {
2123 local $ENV{PATH} = $path;
2126 progress "warning: $@";
2127 $path = "$absurdity:$path";
2128 progress "$us: trying slow absurd-git-apply...";
2129 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2134 die "forbid absurd git-apply\n" if $use_absurd
2135 && forceing [qw(import-gitapply-no-absurd)];
2136 die "only absurd git-apply!\n" if !$use_absurd
2137 && forceing [qw(import-gitapply-absurd)];
2139 local $ENV{PATH} = $path if $use_absurd;
2141 my @showcmd = (gbp_pq, qw(import));
2142 my @realcmd = shell_cmd
2143 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2144 debugcmd "+",@realcmd;
2145 if (system @realcmd) {
2146 die +(shellquote @showcmd).
2148 failedcmd_waitstatus()."\n";
2151 my $gapplied = git_rev_parse('HEAD');
2152 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2153 $gappliedtree eq $dappliedtree or
2155 gbp-pq import and dpkg-source disagree!
2156 gbp-pq import gave commit $gapplied
2157 gbp-pq import gave tree $gappliedtree
2158 dpkg-source --before-build gave tree $dappliedtree
2160 $rawimport_hash = $gapplied;
2165 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2170 progress "synthesised git commit from .dsc $cversion";
2172 my $rawimport_mergeinput = {
2173 Commit => $rawimport_hash,
2174 Info => "Import of source package",
2176 my @output = ($rawimport_mergeinput);
2178 if ($lastpush_mergeinput) {
2179 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2180 my $oversion = getfield $oldclogp, 'Version';
2182 version_compare($oversion, $cversion);
2184 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2185 { Message => <<END, ReverseParents => 1 });
2186 Record $package ($cversion) in archive suite $csuite
2188 } elsif ($vcmp > 0) {
2189 print STDERR <<END or die $!;
2191 Version actually in archive: $cversion (older)
2192 Last version pushed with dgit: $oversion (newer or same)
2195 @output = $lastpush_mergeinput;
2197 # Same version. Use what's in the server git branch,
2198 # discarding our own import. (This could happen if the
2199 # server automatically imports all packages into git.)
2200 @output = $lastpush_mergeinput;
2203 changedir '../../../..';
2208 sub complete_file_from_dsc ($$) {
2209 our ($dstdir, $fi) = @_;
2210 # Ensures that we have, in $dir, the file $fi, with the correct
2211 # contents. (Downloading it from alongside $dscurl if necessary.)
2213 my $f = $fi->{Filename};
2214 my $tf = "$dstdir/$f";
2217 if (stat_exists $tf) {
2218 progress "using existing $f";
2220 printdebug "$tf does not exist, need to fetch\n";
2222 $furl =~ s{/[^/]+$}{};
2224 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2225 die "$f ?" if $f =~ m#/#;
2226 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2227 return 0 if !act_local();
2231 open F, "<", "$tf" or die "$tf: $!";
2232 $fi->{Digester}->reset();
2233 $fi->{Digester}->addfile(*F);
2234 F->error and die $!;
2235 my $got = $fi->{Digester}->hexdigest();
2236 $got eq $fi->{Hash} or
2237 fail "file $f has hash $got but .dsc".
2238 " demands hash $fi->{Hash} ".
2239 ($downloaded ? "(got wrong file from archive!)"
2240 : "(perhaps you should delete this file?)");
2245 sub ensure_we_have_orig () {
2246 my @dfi = dsc_files_info();
2247 foreach my $fi (@dfi) {
2248 my $f = $fi->{Filename};
2249 next unless is_orig_file_in_dsc($f, \@dfi);
2250 complete_file_from_dsc('..', $fi)
2255 sub git_fetch_us () {
2256 # Want to fetch only what we are going to use, unless
2257 # deliberately-not-ff, in which case we must fetch everything.
2259 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2261 (quiltmode_splitbrain
2262 ? (map { $_->('*',access_basedistro) }
2263 \&debiantag_new, \&debiantag_maintview)
2264 : debiantags('*',access_basedistro));
2265 push @specs, server_branch($csuite);
2266 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2268 # This is rather miserable:
2269 # When git fetch --prune is passed a fetchspec ending with a *,
2270 # it does a plausible thing. If there is no * then:
2271 # - it matches subpaths too, even if the supplied refspec
2272 # starts refs, and behaves completely madly if the source
2273 # has refs/refs/something. (See, for example, Debian #NNNN.)
2274 # - if there is no matching remote ref, it bombs out the whole
2276 # We want to fetch a fixed ref, and we don't know in advance
2277 # if it exists, so this is not suitable.
2279 # Our workaround is to use git ls-remote. git ls-remote has its
2280 # own qairks. Notably, it has the absurd multi-tail-matching
2281 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2282 # refs/refs/foo etc.
2284 # Also, we want an idempotent snapshot, but we have to make two
2285 # calls to the remote: one to git ls-remote and to git fetch. The
2286 # solution is use git ls-remote to obtain a target state, and
2287 # git fetch to try to generate it. If we don't manage to generate
2288 # the target state, we try again.
2290 my $specre = join '|', map {
2296 printdebug "git_fetch_us specre=$specre\n";
2297 my $wanted_rref = sub {
2299 return m/^(?:$specre)$/o;
2302 my $fetch_iteration = 0;
2305 if (++$fetch_iteration > 10) {
2306 fail "too many iterations trying to get sane fetch!";
2309 my @look = map { "refs/$_" } @specs;
2310 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2314 open GITLS, "-|", @lcmd or die $!;
2316 printdebug "=> ", $_;
2317 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2318 my ($objid,$rrefname) = ($1,$2);
2319 if (!$wanted_rref->($rrefname)) {
2321 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2325 $wantr{$rrefname} = $objid;
2328 close GITLS or failedcmd @lcmd;
2330 # OK, now %want is exactly what we want for refs in @specs
2332 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2333 "+refs/$_:".lrfetchrefs."/$_";
2336 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2337 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2340 %lrfetchrefs_f = ();
2343 git_for_each_ref(lrfetchrefs, sub {
2344 my ($objid,$objtype,$lrefname,$reftail) = @_;
2345 $lrfetchrefs_f{$lrefname} = $objid;
2346 $objgot{$objid} = 1;
2349 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2350 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2351 if (!exists $wantr{$rrefname}) {
2352 if ($wanted_rref->($rrefname)) {
2354 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2358 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2361 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2362 delete $lrfetchrefs_f{$lrefname};
2366 foreach my $rrefname (sort keys %wantr) {
2367 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2368 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2369 my $want = $wantr{$rrefname};
2370 next if $got eq $want;
2371 if (!defined $objgot{$want}) {
2373 warning: git ls-remote suggests we want $lrefname
2374 warning: and it should refer to $want
2375 warning: but git fetch didn't fetch that object to any relevant ref.
2376 warning: This may be due to a race with someone updating the server.
2377 warning: Will try again...
2379 next FETCH_ITERATION;
2382 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2384 runcmd_ordryrun_local @git, qw(update-ref -m),
2385 "dgit fetch git fetch fixup", $lrefname, $want;
2386 $lrfetchrefs_f{$lrefname} = $want;
2390 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2391 Dumper(\%lrfetchrefs_f);
2394 my @tagpats = debiantags('*',access_basedistro);
2396 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2397 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2398 printdebug "currently $fullrefname=$objid\n";
2399 $here{$fullrefname} = $objid;
2401 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2402 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2403 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2404 printdebug "offered $lref=$objid\n";
2405 if (!defined $here{$lref}) {
2406 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2407 runcmd_ordryrun_local @upd;
2408 lrfetchref_used $fullrefname;
2409 } elsif ($here{$lref} eq $objid) {
2410 lrfetchref_used $fullrefname;
2413 "Not updateting $lref from $here{$lref} to $objid.\n";
2418 sub mergeinfo_getclogp ($) {
2419 # Ensures thit $mi->{Clogp} exists and returns it
2421 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2424 sub mergeinfo_version ($) {
2425 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2428 sub fetch_from_archive () {
2429 ensure_setup_existing_tree();
2431 # Ensures that lrref() is what is actually in the archive, one way
2432 # or another, according to us - ie this client's
2433 # appropritaely-updated archive view. Also returns the commit id.
2434 # If there is nothing in the archive, leaves lrref alone and
2435 # returns undef. git_fetch_us must have already been called.
2439 foreach my $field (@ourdscfield) {
2440 $dsc_hash = $dsc->{$field};
2441 last if defined $dsc_hash;
2443 if (defined $dsc_hash) {
2444 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2446 progress "last upload to archive specified git hash";
2448 progress "last upload to archive has NO git hash";
2451 progress "no version available from the archive";
2454 # If the archive's .dsc has a Dgit field, there are three
2455 # relevant git commitids we need to choose between and/or merge
2457 # 1. $dsc_hash: the Dgit field from the archive
2458 # 2. $lastpush_hash: the suite branch on the dgit git server
2459 # 3. $lastfetch_hash: our local tracking brach for the suite
2461 # These may all be distinct and need not be in any fast forward
2464 # If the dsc was pushed to this suite, then the server suite
2465 # branch will have been updated; but it might have been pushed to
2466 # a different suite and copied by the archive. Conversely a more
2467 # recent version may have been pushed with dgit but not appeared
2468 # in the archive (yet).
2470 # $lastfetch_hash may be awkward because archive imports
2471 # (particularly, imports of Dgit-less .dscs) are performed only as
2472 # needed on individual clients, so different clients may perform a
2473 # different subset of them - and these imports are only made
2474 # public during push. So $lastfetch_hash may represent a set of
2475 # imports different to a subsequent upload by a different dgit
2478 # Our approach is as follows:
2480 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2481 # descendant of $dsc_hash, then it was pushed by a dgit user who
2482 # had based their work on $dsc_hash, so we should prefer it.
2483 # Otherwise, $dsc_hash was installed into this suite in the
2484 # archive other than by a dgit push, and (necessarily) after the
2485 # last dgit push into that suite (since a dgit push would have
2486 # been descended from the dgit server git branch); thus, in that
2487 # case, we prefer the archive's version (and produce a
2488 # pseudo-merge to overwrite the dgit server git branch).
2490 # (If there is no Dgit field in the archive's .dsc then
2491 # generate_commit_from_dsc uses the version numbers to decide
2492 # whether the suite branch or the archive is newer. If the suite
2493 # branch is newer it ignores the archive's .dsc; otherwise it
2494 # generates an import of the .dsc, and produces a pseudo-merge to
2495 # overwrite the suite branch with the archive contents.)
2497 # The outcome of that part of the algorithm is the `public view',
2498 # and is same for all dgit clients: it does not depend on any
2499 # unpublished history in the local tracking branch.
2501 # As between the public view and the local tracking branch: The
2502 # local tracking branch is only updated by dgit fetch, and
2503 # whenever dgit fetch runs it includes the public view in the
2504 # local tracking branch. Therefore if the public view is not
2505 # descended from the local tracking branch, the local tracking
2506 # branch must contain history which was imported from the archive
2507 # but never pushed; and, its tip is now out of date. So, we make
2508 # a pseudo-merge to overwrite the old imports and stitch the old
2511 # Finally: we do not necessarily reify the public view (as
2512 # described above). This is so that we do not end up stacking two
2513 # pseudo-merges. So what we actually do is figure out the inputs
2514 # to any public view pseudo-merge and put them in @mergeinputs.
2517 # $mergeinputs[]{Commit}
2518 # $mergeinputs[]{Info}
2519 # $mergeinputs[0] is the one whose tree we use
2520 # @mergeinputs is in the order we use in the actual commit)
2523 # $mergeinputs[]{Message} is a commit message to use
2524 # $mergeinputs[]{ReverseParents} if def specifies that parent
2525 # list should be in opposite order
2526 # Such an entry has no Commit or Info. It applies only when found
2527 # in the last entry. (This ugliness is to support making
2528 # identical imports to previous dgit versions.)
2530 my $lastpush_hash = git_get_ref(lrfetchref());
2531 printdebug "previous reference hash=$lastpush_hash\n";
2532 $lastpush_mergeinput = $lastpush_hash && {
2533 Commit => $lastpush_hash,
2534 Info => "dgit suite branch on dgit git server",
2537 my $lastfetch_hash = git_get_ref(lrref());
2538 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2539 my $lastfetch_mergeinput = $lastfetch_hash && {
2540 Commit => $lastfetch_hash,
2541 Info => "dgit client's archive history view",
2544 my $dsc_mergeinput = $dsc_hash && {
2545 Commit => $dsc_hash,
2546 Info => "Dgit field in .dsc from archive",
2550 my $del_lrfetchrefs = sub {
2553 printdebug "del_lrfetchrefs...\n";
2554 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2555 my $objid = $lrfetchrefs_d{$fullrefname};
2556 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2558 $gur ||= new IO::Handle;
2559 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2561 printf $gur "delete %s %s\n", $fullrefname, $objid;
2564 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2568 if (defined $dsc_hash) {
2569 fail "missing remote git history even though dsc has hash -".
2570 " could not find ref ".rref()." at ".access_giturl()
2571 unless $lastpush_hash;
2572 ensure_we_have_orig();
2573 if ($dsc_hash eq $lastpush_hash) {
2574 @mergeinputs = $dsc_mergeinput
2575 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2576 print STDERR <<END or die $!;
2578 Git commit in archive is behind the last version allegedly pushed/uploaded.
2579 Commit referred to by archive: $dsc_hash
2580 Last version pushed with dgit: $lastpush_hash
2583 @mergeinputs = ($lastpush_mergeinput);
2585 # Archive has .dsc which is not a descendant of the last dgit
2586 # push. This can happen if the archive moves .dscs about.
2587 # Just follow its lead.
2588 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2589 progress "archive .dsc names newer git commit";
2590 @mergeinputs = ($dsc_mergeinput);
2592 progress "archive .dsc names other git commit, fixing up";
2593 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2597 @mergeinputs = generate_commits_from_dsc();
2598 # We have just done an import. Now, our import algorithm might
2599 # have been improved. But even so we do not want to generate
2600 # a new different import of the same package. So if the
2601 # version numbers are the same, just use our existing version.
2602 # If the version numbers are different, the archive has changed
2603 # (perhaps, rewound).
2604 if ($lastfetch_mergeinput &&
2605 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2606 (mergeinfo_version $mergeinputs[0]) )) {
2607 @mergeinputs = ($lastfetch_mergeinput);
2609 } elsif ($lastpush_hash) {
2610 # only in git, not in the archive yet
2611 @mergeinputs = ($lastpush_mergeinput);
2612 print STDERR <<END or die $!;
2614 Package not found in the archive, but has allegedly been pushed using dgit.
2618 printdebug "nothing found!\n";
2619 if (defined $skew_warning_vsn) {
2620 print STDERR <<END or die $!;
2622 Warning: relevant archive skew detected.
2623 Archive allegedly contains $skew_warning_vsn
2624 But we were not able to obtain any version from the archive or git.
2628 unshift @end, $del_lrfetchrefs;
2632 if ($lastfetch_hash &&
2634 my $h = $_->{Commit};
2635 $h and is_fast_fwd($lastfetch_hash, $h);
2636 # If true, one of the existing parents of this commit
2637 # is a descendant of the $lastfetch_hash, so we'll
2638 # be ff from that automatically.
2642 push @mergeinputs, $lastfetch_mergeinput;
2645 printdebug "fetch mergeinfos:\n";
2646 foreach my $mi (@mergeinputs) {
2648 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2650 printdebug sprintf " ReverseParents=%d Message=%s",
2651 $mi->{ReverseParents}, $mi->{Message};
2655 my $compat_info= pop @mergeinputs
2656 if $mergeinputs[$#mergeinputs]{Message};
2658 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2661 if (@mergeinputs > 1) {
2663 my $tree_commit = $mergeinputs[0]{Commit};
2665 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2666 $tree =~ m/\n\n/; $tree = $`;
2667 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2670 # We use the changelog author of the package in question the
2671 # author of this pseudo-merge. This is (roughly) correct if
2672 # this commit is simply representing aa non-dgit upload.
2673 # (Roughly because it does not record sponsorship - but we
2674 # don't have sponsorship info because that's in the .changes,
2675 # which isn't in the archivw.)
2677 # But, it might be that we are representing archive history
2678 # updates (including in-archive copies). These are not really
2679 # the responsibility of the person who created the .dsc, but
2680 # there is no-one whose name we should better use. (The
2681 # author of the .dsc-named commit is clearly worse.)
2683 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2684 my $author = clogp_authline $useclogp;
2685 my $cversion = getfield $useclogp, 'Version';
2687 my $mcf = ".git/dgit/mergecommit";
2688 open MC, ">", $mcf or die "$mcf $!";
2689 print MC <<END or die $!;
2693 my @parents = grep { $_->{Commit} } @mergeinputs;
2694 @parents = reverse @parents if $compat_info->{ReverseParents};
2695 print MC <<END or die $! foreach @parents;
2699 print MC <<END or die $!;
2705 if (defined $compat_info->{Message}) {
2706 print MC $compat_info->{Message} or die $!;
2708 print MC <<END or die $!;
2709 Record $package ($cversion) in archive suite $csuite
2713 my $message_add_info = sub {
2715 my $mversion = mergeinfo_version $mi;
2716 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2720 $message_add_info->($mergeinputs[0]);
2721 print MC <<END or die $!;
2722 should be treated as descended from
2724 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2728 $hash = make_commit $mcf;
2730 $hash = $mergeinputs[0]{Commit};
2732 printdebug "fetch hash=$hash\n";
2735 my ($lasth, $what) = @_;
2736 return unless $lasth;
2737 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2740 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2741 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2743 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2744 'DGIT_ARCHIVE', $hash;
2745 cmdoutput @git, qw(log -n2), $hash;
2746 # ... gives git a chance to complain if our commit is malformed
2748 if (defined $skew_warning_vsn) {
2750 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2751 my $gotclogp = commit_getclogp($hash);
2752 my $got_vsn = getfield $gotclogp, 'Version';
2753 printdebug "SKEW CHECK GOT $got_vsn\n";
2754 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2755 print STDERR <<END or die $!;
2757 Warning: archive skew detected. Using the available version:
2758 Archive allegedly contains $skew_warning_vsn
2759 We were able to obtain only $got_vsn
2765 if ($lastfetch_hash ne $hash) {
2766 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2770 dryrun_report @upd_cmd;
2774 lrfetchref_used lrfetchref();
2776 unshift @end, $del_lrfetchrefs;
2780 sub set_local_git_config ($$) {
2782 runcmd @git, qw(config), $k, $v;
2785 sub setup_mergechangelogs (;$) {
2787 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2789 my $driver = 'dpkg-mergechangelogs';
2790 my $cb = "merge.$driver";
2791 my $attrs = '.git/info/attributes';
2792 ensuredir '.git/info';
2794 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2795 if (!open ATTRS, "<", $attrs) {
2796 $!==ENOENT or die "$attrs: $!";
2800 next if m{^debian/changelog\s};
2801 print NATTRS $_, "\n" or die $!;
2803 ATTRS->error and die $!;
2806 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2809 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2810 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2812 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2815 sub setup_useremail (;$) {
2817 return unless $always || access_cfg_bool(1, 'setup-useremail');
2820 my ($k, $envvar) = @_;
2821 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2822 return unless defined $v;
2823 set_local_git_config "user.$k", $v;
2826 $setup->('email', 'DEBEMAIL');
2827 $setup->('name', 'DEBFULLNAME');
2830 sub ensure_setup_existing_tree () {
2831 my $k = "remote.$remotename.skipdefaultupdate";
2832 my $c = git_get_config $k;
2833 return if defined $c;
2834 set_local_git_config $k, 'true';
2837 sub setup_new_tree () {
2838 setup_mergechangelogs();
2844 canonicalise_suite();
2845 badusage "dry run makes no sense with clone" unless act_local();
2846 my $hasgit = check_for_git();
2847 mkdir $dstdir or fail "create \`$dstdir': $!";
2849 runcmd @git, qw(init -q);
2850 my $giturl = access_giturl(1);
2851 if (defined $giturl) {
2852 open H, "> .git/HEAD" or die $!;
2853 print H "ref: ".lref()."\n" or die $!;
2855 runcmd @git, qw(remote add), 'origin', $giturl;
2858 progress "fetching existing git history";
2860 runcmd_ordryrun_local @git, qw(fetch origin);
2862 progress "starting new git history";
2864 fetch_from_archive() or no_such_package;
2865 my $vcsgiturl = $dsc->{'Vcs-Git'};
2866 if (length $vcsgiturl) {
2867 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2868 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2871 runcmd @git, qw(reset --hard), lrref();
2872 printdone "ready for work in $dstdir";
2876 if (check_for_git()) {
2879 fetch_from_archive() or no_such_package();
2880 printdone "fetched into ".lrref();
2885 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2887 printdone "fetched to ".lrref()." and merged into HEAD";
2890 sub check_not_dirty () {
2891 foreach my $f (qw(local-options local-patch-header)) {
2892 if (stat_exists "debian/source/$f") {
2893 fail "git tree contains debian/source/$f";
2897 return if $ignoredirty;
2899 my @cmd = (@git, qw(diff --quiet HEAD));
2901 $!=0; $?=-1; system @cmd;
2904 fail "working tree is dirty (does not match HEAD)";
2910 sub commit_admin ($) {
2913 runcmd_ordryrun_local @git, qw(commit -m), $m;
2916 sub commit_quilty_patch () {
2917 my $output = cmdoutput @git, qw(status --porcelain);
2919 foreach my $l (split /\n/, $output) {
2920 next unless $l =~ m/\S/;
2921 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2925 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2927 progress "nothing quilty to commit, ok.";
2930 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2931 runcmd_ordryrun_local @git, qw(add -f), @adds;
2933 Commit Debian 3.0 (quilt) metadata
2935 [dgit ($our_version) quilt-fixup]
2939 sub get_source_format () {
2941 if (open F, "debian/source/options") {
2945 s/\s+$//; # ignore missing final newline
2947 my ($k, $v) = ($`, $'); #');
2948 $v =~ s/^"(.*)"$/$1/;
2954 F->error and die $!;
2957 die $! unless $!==&ENOENT;
2960 if (!open F, "debian/source/format") {
2961 die $! unless $!==&ENOENT;
2965 F->error and die $!;
2967 return ($_, \%options);
2970 sub madformat_wantfixup ($) {
2972 return 0 unless $format eq '3.0 (quilt)';
2973 our $quilt_mode_warned;
2974 if ($quilt_mode eq 'nocheck') {
2975 progress "Not doing any fixup of \`$format' due to".
2976 " ----no-quilt-fixup or --quilt=nocheck"
2977 unless $quilt_mode_warned++;
2980 progress "Format \`$format', need to check/update patch stack"
2981 unless $quilt_mode_warned++;
2985 sub maybe_split_brain_save ($$$) {
2986 my ($headref, $dgitview, $msg) = @_;
2987 # => message fragment "$saved" describing disposition of $dgitview
2988 return "commit id $dgitview" unless defined $split_brain_save;
2989 my @cmd = (shell_cmd "cd ../../../..",
2990 @git, qw(update-ref -m),
2991 "dgit --dgit-view-save $msg HEAD=$headref",
2992 $split_brain_save, $dgitview);
2994 return "and left in $split_brain_save";
2997 # An "infopair" is a tuple [ $thing, $what ]
2998 # (often $thing is a commit hash; $what is a description)
3000 sub infopair_cond_equal ($$) {
3002 $x->[0] eq $y->[0] or fail <<END;
3003 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3007 sub infopair_lrf_tag_lookup ($$) {
3008 my ($tagnames, $what) = @_;
3009 # $tagname may be an array ref
3010 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3011 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3012 foreach my $tagname (@tagnames) {
3013 my $lrefname = lrfetchrefs."/tags/$tagname";
3014 my $tagobj = $lrfetchrefs_f{$lrefname};
3015 next unless defined $tagobj;
3016 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3017 return [ git_rev_parse($tagobj), $what ];
3019 fail @tagnames==1 ? <<END : <<END;
3020 Wanted tag $what (@tagnames) on dgit server, but not found
3022 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3026 sub infopair_cond_ff ($$) {
3027 my ($anc,$desc) = @_;
3028 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3029 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3033 sub pseudomerge_version_check ($$) {
3034 my ($clogp, $archive_hash) = @_;
3036 my $arch_clogp = commit_getclogp $archive_hash;
3037 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3038 'version currently in archive' ];
3039 if (defined $overwrite_version) {
3040 if (length $overwrite_version) {
3041 infopair_cond_equal([ $overwrite_version,
3042 '--overwrite= version' ],
3045 my $v = $i_arch_v->[0];
3046 progress "Checking package changelog for archive version $v ...";
3048 my @xa = ("-f$v", "-t$v");
3049 my $vclogp = parsechangelog @xa;
3050 my $cv = [ (getfield $vclogp, 'Version'),
3051 "Version field from dpkg-parsechangelog @xa" ];
3052 infopair_cond_equal($i_arch_v, $cv);
3055 $@ =~ s/^dgit: //gm;
3057 "Perhaps debian/changelog does not mention $v ?";
3062 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3066 sub pseudomerge_make_commit ($$$$ $$) {
3067 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3068 $msg_cmd, $msg_msg) = @_;
3069 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3071 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3072 my $authline = clogp_authline $clogp;
3076 !defined $overwrite_version ? ""
3077 : !length $overwrite_version ? " --overwrite"
3078 : " --overwrite=".$overwrite_version;
3081 my $pmf = ".git/dgit/pseudomerge";
3082 open MC, ">", $pmf or die "$pmf $!";
3083 print MC <<END or die $!;
3086 parent $archive_hash
3096 return make_commit($pmf);
3099 sub splitbrain_pseudomerge ($$$$) {
3100 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3101 # => $merged_dgitview
3102 printdebug "splitbrain_pseudomerge...\n";
3104 # We: debian/PREVIOUS HEAD($maintview)
3105 # expect: o ----------------- o
3108 # a/d/PREVIOUS $dgitview
3111 # we do: `------------------ o
3115 return $dgitview unless defined $archive_hash;
3117 printdebug "splitbrain_pseudomerge...\n";
3119 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3121 if (!defined $overwrite_version) {
3122 progress "Checking that HEAD inciudes all changes in archive...";
3125 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3127 if (defined $overwrite_version) {
3129 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
3130 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3131 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
3132 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3133 my $i_archive = [ $archive_hash, "current archive contents" ];
3135 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3137 infopair_cond_equal($i_dgit, $i_archive);
3138 infopair_cond_ff($i_dep14, $i_dgit);
3139 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3143 $us: check failed (maybe --overwrite is needed, consult documentation)
3148 my $r = pseudomerge_make_commit
3149 $clogp, $dgitview, $archive_hash, $i_arch_v,
3150 "dgit --quilt=$quilt_mode",
3151 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3152 Declare fast forward from $i_arch_v->[0]
3154 Make fast forward from $i_arch_v->[0]
3157 maybe_split_brain_save $maintview, $r, "pseudomerge";
3159 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3163 sub plain_overwrite_pseudomerge ($$$) {
3164 my ($clogp, $head, $archive_hash) = @_;
3166 printdebug "plain_overwrite_pseudomerge...";
3168 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3170 return $head if is_fast_fwd $archive_hash, $head;
3172 my $m = "Declare fast forward from $i_arch_v->[0]";
3174 my $r = pseudomerge_make_commit
3175 $clogp, $head, $archive_hash, $i_arch_v,
3178 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3180 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3184 sub push_parse_changelog ($) {
3187 my $clogp = Dpkg::Control::Hash->new();
3188 $clogp->load($clogpfn) or die;
3190 $package = getfield $clogp, 'Source';
3191 my $cversion = getfield $clogp, 'Version';
3192 my $tag = debiantag($cversion, access_basedistro);
3193 runcmd @git, qw(check-ref-format), $tag;
3195 my $dscfn = dscfn($cversion);
3197 return ($clogp, $cversion, $dscfn);
3200 sub push_parse_dsc ($$$) {
3201 my ($dscfn,$dscfnwhat, $cversion) = @_;
3202 $dsc = parsecontrol($dscfn,$dscfnwhat);
3203 my $dversion = getfield $dsc, 'Version';
3204 my $dscpackage = getfield $dsc, 'Source';
3205 ($dscpackage eq $package && $dversion eq $cversion) or
3206 fail "$dscfn is for $dscpackage $dversion".
3207 " but debian/changelog is for $package $cversion";
3210 sub push_tagwants ($$$$) {
3211 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3214 TagFn => \&debiantag,
3219 if (defined $maintviewhead) {
3221 TagFn => \&debiantag_maintview,
3222 Objid => $maintviewhead,
3223 TfSuffix => '-maintview',
3227 foreach my $tw (@tagwants) {
3228 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
3229 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3231 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3235 sub push_mktags ($$ $$ $) {
3237 $changesfile,$changesfilewhat,
3240 die unless $tagwants->[0]{View} eq 'dgit';
3242 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3243 $dsc->save("$dscfn.tmp") or die $!;
3245 my $changes = parsecontrol($changesfile,$changesfilewhat);
3246 foreach my $field (qw(Source Distribution Version)) {
3247 $changes->{$field} eq $clogp->{$field} or
3248 fail "changes field $field \`$changes->{$field}'".
3249 " does not match changelog \`$clogp->{$field}'";
3252 my $cversion = getfield $clogp, 'Version';
3253 my $clogsuite = getfield $clogp, 'Distribution';
3255 # We make the git tag by hand because (a) that makes it easier
3256 # to control the "tagger" (b) we can do remote signing
3257 my $authline = clogp_authline $clogp;
3258 my $delibs = join(" ", "",@deliberatelies);
3259 my $declaredistro = access_basedistro();
3263 my $tfn = $tw->{Tfn};
3264 my $head = $tw->{Objid};
3265 my $tag = $tw->{Tag};
3267 open TO, '>', $tfn->('.tmp') or die $!;
3268 print TO <<END or die $!;
3275 if ($tw->{View} eq 'dgit') {
3276 print TO <<END or die $!;
3277 $package release $cversion for $clogsuite ($csuite) [dgit]
3278 [dgit distro=$declaredistro$delibs]
3280 foreach my $ref (sort keys %previously) {
3281 print TO <<END or die $!;
3282 [dgit previously:$ref=$previously{$ref}]
3285 } elsif ($tw->{View} eq 'maint') {
3286 print TO <<END or die $!;
3287 $package release $cversion for $clogsuite ($csuite)
3288 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3291 die Dumper($tw)."?";
3296 my $tagobjfn = $tfn->('.tmp');
3298 if (!defined $keyid) {
3299 $keyid = access_cfg('keyid','RETURN-UNDEF');
3301 if (!defined $keyid) {
3302 $keyid = getfield $clogp, 'Maintainer';
3304 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3305 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3306 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3307 push @sign_cmd, $tfn->('.tmp');
3308 runcmd_ordryrun @sign_cmd;
3310 $tagobjfn = $tfn->('.signed.tmp');
3311 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3312 $tfn->('.tmp'), $tfn->('.tmp.asc');
3318 my @r = map { $mktag->($_); } @$tagwants;
3322 sub sign_changes ($) {
3323 my ($changesfile) = @_;
3325 my @debsign_cmd = @debsign;
3326 push @debsign_cmd, "-k$keyid" if defined $keyid;
3327 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3328 push @debsign_cmd, $changesfile;
3329 runcmd_ordryrun @debsign_cmd;
3334 printdebug "actually entering push\n";
3336 supplementary_message(<<'END');
3337 Push failed, while checking state of the archive.
3338 You can retry the push, after fixing the problem, if you like.
3340 if (check_for_git()) {
3343 my $archive_hash = fetch_from_archive();
3344 if (!$archive_hash) {
3346 fail "package appears to be new in this suite;".
3347 " if this is intentional, use --new";
3350 supplementary_message(<<'END');
3351 Push failed, while preparing your push.
3352 You can retry the push, after fixing the problem, if you like.
3355 need_tagformat 'new', "quilt mode $quilt_mode"
3356 if quiltmode_splitbrain;
3360 access_giturl(); # check that success is vaguely likely
3363 my $clogpfn = ".git/dgit/changelog.822.tmp";
3364 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3366 responder_send_file('parsed-changelog', $clogpfn);
3368 my ($clogp, $cversion, $dscfn) =
3369 push_parse_changelog("$clogpfn");
3371 my $dscpath = "$buildproductsdir/$dscfn";
3372 stat_exists $dscpath or
3373 fail "looked for .dsc $dscfn, but $!;".
3374 " maybe you forgot to build";
3376 responder_send_file('dsc', $dscpath);
3378 push_parse_dsc($dscpath, $dscfn, $cversion);
3380 my $format = getfield $dsc, 'Format';
3381 printdebug "format $format\n";
3383 my $actualhead = git_rev_parse('HEAD');
3384 my $dgithead = $actualhead;
3385 my $maintviewhead = undef;
3387 my $upstreamversion = $clogp->{Version};
3388 $upstreamversion =~ s/-[^-]*$//;
3390 if (madformat_wantfixup($format)) {
3391 # user might have not used dgit build, so maybe do this now:
3392 if (quiltmode_splitbrain()) {
3394 quilt_make_fake_dsc($upstreamversion);
3396 ($dgithead, $cachekey) =
3397 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3399 "--quilt=$quilt_mode but no cached dgit view:
3400 perhaps tree changed since dgit build[-source] ?";
3402 $dgithead = splitbrain_pseudomerge($clogp,
3403 $actualhead, $dgithead,
3405 $maintviewhead = $actualhead;
3406 changedir '../../../..';
3407 prep_ud(); # so _only_subdir() works, below
3409 commit_quilty_patch();
3413 if (defined $overwrite_version && !defined $maintviewhead) {
3414 $dgithead = plain_overwrite_pseudomerge($clogp,
3422 if ($archive_hash) {
3423 if (is_fast_fwd($archive_hash, $dgithead)) {
3425 } elsif (deliberately_not_fast_forward) {
3428 fail "dgit push: HEAD is not a descendant".
3429 " of the archive's version.\n".
3430 "To overwrite the archive's contents,".
3431 " pass --overwrite[=VERSION].\n".
3432 "To rewind history, if permitted by the archive,".
3433 " use --deliberately-not-fast-forward.";
3438 progress "checking that $dscfn corresponds to HEAD";
3439 runcmd qw(dpkg-source -x --),
3440 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3441 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3442 check_for_vendor_patches() if madformat($dsc->{format});
3443 changedir '../../../..';
3444 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3445 debugcmd "+",@diffcmd;
3447 my $r = system @diffcmd;
3450 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3452 HEAD specifies a different tree to $dscfn:
3454 Perhaps you forgot to build. Or perhaps there is a problem with your
3455 source tree (see dgit(7) for some hints). To see a full diff, run
3462 if (!$changesfile) {
3463 my $pat = changespat $cversion;
3464 my @cs = glob "$buildproductsdir/$pat";
3465 fail "failed to find unique changes file".
3466 " (looked for $pat in $buildproductsdir);".
3467 " perhaps you need to use dgit -C"
3469 ($changesfile) = @cs;
3471 $changesfile = "$buildproductsdir/$changesfile";
3474 # Check that changes and .dsc agree enough
3475 $changesfile =~ m{[^/]*$};
3476 my $changes = parsecontrol($changesfile,$&);
3477 files_compare_inputs($dsc, $changes)
3478 unless forceing [qw(dsc-changes-mismatch)];
3480 # Perhaps adjust .dsc to contain right set of origs
3481 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3483 unless forceing [qw(changes-origs-exactly)];
3485 # Checks complete, we're going to try and go ahead:
3487 responder_send_file('changes',$changesfile);
3488 responder_send_command("param head $dgithead");
3489 responder_send_command("param csuite $csuite");
3490 responder_send_command("param tagformat $tagformat");
3491 if (defined $maintviewhead) {
3492 die unless ($protovsn//4) >= 4;
3493 responder_send_command("param maint-view $maintviewhead");
3496 if (deliberately_not_fast_forward) {
3497 git_for_each_ref(lrfetchrefs, sub {
3498 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3499 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3500 responder_send_command("previously $rrefname=$objid");
3501 $previously{$rrefname} = $objid;
3505 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3509 supplementary_message(<<'END');
3510 Push failed, while signing the tag.
3511 You can retry the push, after fixing the problem, if you like.
3513 # If we manage to sign but fail to record it anywhere, it's fine.
3514 if ($we_are_responder) {
3515 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3516 responder_receive_files('signed-tag', @tagobjfns);
3518 @tagobjfns = push_mktags($clogp,$dscpath,
3519 $changesfile,$changesfile,
3522 supplementary_message(<<'END');
3523 Push failed, *after* signing the tag.
3524 If you want to try again, you should use a new version number.
3527 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3529 foreach my $tw (@tagwants) {
3530 my $tag = $tw->{Tag};
3531 my $tagobjfn = $tw->{TagObjFn};
3533 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3534 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3535 runcmd_ordryrun_local
3536 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3539 supplementary_message(<<'END');
3540 Push failed, while updating the remote git repository - see messages above.
3541 If you want to try again, you should use a new version number.
3543 if (!check_for_git()) {
3544 create_remote_git_repo();
3547 my @pushrefs = $forceflag.$dgithead.":".rrref();
3548 foreach my $tw (@tagwants) {
3549 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3552 runcmd_ordryrun @git,
3553 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3554 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3556 supplementary_message(<<'END');
3557 Push failed, after updating the remote git repository.
3558 If you want to try again, you must use a new version number.
3560 if ($we_are_responder) {
3561 my $dryrunsuffix = act_local() ? "" : ".tmp";
3562 responder_receive_files('signed-dsc-changes',
3563 "$dscpath$dryrunsuffix",
3564 "$changesfile$dryrunsuffix");
3567 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3569 progress "[new .dsc left in $dscpath.tmp]";
3571 sign_changes $changesfile;
3574 supplementary_message(<<END);
3575 Push failed, while uploading package(s) to the archive server.
3576 You can retry the upload of exactly these same files with dput of:
3578 If that .changes file is broken, you will need to use a new version
3579 number for your next attempt at the upload.
3581 my $host = access_cfg('upload-host','RETURN-UNDEF');
3582 my @hostarg = defined($host) ? ($host,) : ();
3583 runcmd_ordryrun @dput, @hostarg, $changesfile;
3584 printdone "pushed and uploaded $cversion";
3586 supplementary_message('');
3587 responder_send_command("complete");
3594 badusage "-p is not allowed with clone; specify as argument instead"
3595 if defined $package;
3598 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3599 ($package,$isuite) = @ARGV;
3600 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3601 ($package,$dstdir) = @ARGV;
3602 } elsif (@ARGV==3) {
3603 ($package,$isuite,$dstdir) = @ARGV;
3605 badusage "incorrect arguments to dgit clone";
3607 $dstdir ||= "$package";
3609 if (stat_exists $dstdir) {
3610 fail "$dstdir already exists";
3614 if ($rmonerror && !$dryrun_level) {
3615 $cwd_remove= getcwd();
3617 return unless defined $cwd_remove;
3618 if (!chdir "$cwd_remove") {
3619 return if $!==&ENOENT;
3620 die "chdir $cwd_remove: $!";
3623 rmtree($dstdir) or die "remove $dstdir: $!\n";
3624 } elsif (grep { $! == $_ }
3625 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3627 print STDERR "check whether to remove $dstdir: $!\n";
3633 $cwd_remove = undef;
3636 sub branchsuite () {
3637 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3638 if ($branch =~ m#$lbranch_re#o) {
3645 sub fetchpullargs () {
3647 if (!defined $package) {
3648 my $sourcep = parsecontrol('debian/control','debian/control');
3649 $package = getfield $sourcep, 'Source';
3652 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3654 my $clogp = parsechangelog();
3655 $isuite = getfield $clogp, 'Distribution';
3657 canonicalise_suite();
3658 progress "fetching from suite $csuite";
3659 } elsif (@ARGV==1) {
3661 canonicalise_suite();
3663 badusage "incorrect arguments to dgit fetch or dgit pull";
3682 badusage "-p is not allowed with dgit push" if defined $package;
3684 my $clogp = parsechangelog();
3685 $package = getfield $clogp, 'Source';
3688 } elsif (@ARGV==1) {
3689 ($specsuite) = (@ARGV);
3691 badusage "incorrect arguments to dgit push";
3693 $isuite = getfield $clogp, 'Distribution';
3695 local ($package) = $existing_package; # this is a hack
3696 canonicalise_suite();
3698 canonicalise_suite();
3700 if (defined $specsuite &&
3701 $specsuite ne $isuite &&
3702 $specsuite ne $csuite) {
3703 fail "dgit push: changelog specifies $isuite ($csuite)".
3704 " but command line specifies $specsuite";
3709 #---------- remote commands' implementation ----------
3711 sub cmd_remote_push_build_host {
3712 my ($nrargs) = shift @ARGV;
3713 my (@rargs) = @ARGV[0..$nrargs-1];
3714 @ARGV = @ARGV[$nrargs..$#ARGV];
3716 my ($dir,$vsnwant) = @rargs;
3717 # vsnwant is a comma-separated list; we report which we have
3718 # chosen in our ready response (so other end can tell if they
3721 $we_are_responder = 1;
3722 $us .= " (build host)";
3726 open PI, "<&STDIN" or die $!;
3727 open STDIN, "/dev/null" or die $!;
3728 open PO, ">&STDOUT" or die $!;
3730 open STDOUT, ">&STDERR" or die $!;
3734 ($protovsn) = grep {
3735 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3736 } @rpushprotovsn_support;
3738 fail "build host has dgit rpush protocol versions ".
3739 (join ",", @rpushprotovsn_support).
3740 " but invocation host has $vsnwant"
3741 unless defined $protovsn;
3743 responder_send_command("dgit-remote-push-ready $protovsn");
3744 rpush_handle_protovsn_bothends();
3749 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3750 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3751 # a good error message)
3753 sub rpush_handle_protovsn_bothends () {
3754 if ($protovsn < 4) {
3755 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3764 my $report = i_child_report();
3765 if (defined $report) {
3766 printdebug "($report)\n";
3767 } elsif ($i_child_pid) {
3768 printdebug "(killing build host child $i_child_pid)\n";
3769 kill 15, $i_child_pid;
3771 if (defined $i_tmp && !defined $initiator_tempdir) {
3773 eval { rmtree $i_tmp; };
3777 END { i_cleanup(); }
3780 my ($base,$selector,@args) = @_;
3781 $selector =~ s/\-/_/g;
3782 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3789 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3797 push @rargs, join ",", @rpushprotovsn_support;
3800 push @rdgit, @ropts;
3801 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3803 my @cmd = (@ssh, $host, shellquote @rdgit);
3806 if (defined $initiator_tempdir) {
3807 rmtree $initiator_tempdir;
3808 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3809 $i_tmp = $initiator_tempdir;
3813 $i_child_pid = open2(\*RO, \*RI, @cmd);
3815 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3816 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3817 $supplementary_message = '' unless $protovsn >= 3;
3819 fail "rpush negotiated protocol version $protovsn".
3820 " which does not support quilt mode $quilt_mode"
3821 if quiltmode_splitbrain;
3823 rpush_handle_protovsn_bothends();
3825 my ($icmd,$iargs) = initiator_expect {
3826 m/^(\S+)(?: (.*))?$/;
3829 i_method "i_resp", $icmd, $iargs;
3833 sub i_resp_progress ($) {
3835 my $msg = protocol_read_bytes \*RO, $rhs;
3839 sub i_resp_supplementary_message ($) {
3841 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3844 sub i_resp_complete {
3845 my $pid = $i_child_pid;
3846 $i_child_pid = undef; # prevents killing some other process with same pid
3847 printdebug "waiting for build host child $pid...\n";
3848 my $got = waitpid $pid, 0;
3849 die $! unless $got == $pid;
3850 die "build host child failed $?" if $?;
3853 printdebug "all done\n";
3857 sub i_resp_file ($) {
3859 my $localname = i_method "i_localname", $keyword;
3860 my $localpath = "$i_tmp/$localname";
3861 stat_exists $localpath and
3862 badproto \*RO, "file $keyword ($localpath) twice";
3863 protocol_receive_file \*RO, $localpath;
3864 i_method "i_file", $keyword;
3869 sub i_resp_param ($) {
3870 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3874 sub i_resp_previously ($) {
3875 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3876 or badproto \*RO, "bad previously spec";
3877 my $r = system qw(git check-ref-format), $1;
3878 die "bad previously ref spec ($r)" if $r;
3879 $previously{$1} = $2;
3884 sub i_resp_want ($) {
3886 die "$keyword ?" if $i_wanted{$keyword}++;
3887 my @localpaths = i_method "i_want", $keyword;
3888 printdebug "[[ $keyword @localpaths\n";
3889 foreach my $localpath (@localpaths) {
3890 protocol_send_file \*RI, $localpath;
3892 print RI "files-end\n" or die $!;
3895 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3897 sub i_localname_parsed_changelog {
3898 return "remote-changelog.822";
3900 sub i_file_parsed_changelog {
3901 ($i_clogp, $i_version, $i_dscfn) =
3902 push_parse_changelog "$i_tmp/remote-changelog.822";
3903 die if $i_dscfn =~ m#/|^\W#;
3906 sub i_localname_dsc {
3907 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3912 sub i_localname_changes {
3913 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3914 $i_changesfn = $i_dscfn;
3915 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3916 return $i_changesfn;
3918 sub i_file_changes { }
3920 sub i_want_signed_tag {
3921 printdebug Dumper(\%i_param, $i_dscfn);
3922 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3923 && defined $i_param{'csuite'}
3924 or badproto \*RO, "premature desire for signed-tag";
3925 my $head = $i_param{'head'};
3926 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3928 my $maintview = $i_param{'maint-view'};
3929 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3932 if ($protovsn >= 4) {
3933 my $p = $i_param{'tagformat'} // '<undef>';
3935 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3938 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3940 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3942 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3945 push_mktags $i_clogp, $i_dscfn,
3946 $i_changesfn, 'remote changes',
3950 sub i_want_signed_dsc_changes {
3951 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3952 sign_changes $i_changesfn;
3953 return ($i_dscfn, $i_changesfn);
3956 #---------- building etc. ----------
3962 #----- `3.0 (quilt)' handling -----
3964 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3966 sub quiltify_dpkg_commit ($$$;$) {
3967 my ($patchname,$author,$msg, $xinfo) = @_;
3971 my $descfn = ".git/dgit/quilt-description.tmp";
3972 open O, '>', $descfn or die "$descfn: $!";
3973 $msg =~ s/\n+/\n\n/;
3974 print O <<END or die $!;
3976 ${xinfo}Subject: $msg
3983 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3984 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3985 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3986 runcmd @dpkgsource, qw(--commit .), $patchname;
3990 sub quiltify_trees_differ ($$;$$$) {
3991 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
3992 # returns true iff the two tree objects differ other than in debian/
3993 # with $finegrained,
3994 # returns bitmask 01 - differ in upstream files except .gitignore
3995 # 02 - differ in .gitignore
3996 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3997 # is set for each modified .gitignore filename $fn
3998 # if $unrepres is defined, array ref to which is appeneded
3999 # a list of unrepresentable changes (removals of upstream files
4002 my @cmd = (@git, qw(diff-tree -z));
4003 push @cmd, qw(--name-only) unless $unrepres;
4004 push @cmd, qw(-r) if $finegrained || $unrepres;
4006 my $diffs= cmdoutput @cmd;
4009 foreach my $f (split /\0/, $diffs) {
4010 if ($unrepres && !@lmodes) {
4011 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4014 my ($oldmode,$newmode) = @lmodes;
4017 next if $f =~ m#^debian(?:/.*)?$#s;
4021 die "deleted\n" unless $newmode =~ m/[^0]/;
4022 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4023 if ($oldmode =~ m/[^0]/) {
4024 die "mode changed\n" if $oldmode ne $newmode;
4026 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4030 local $/="\n"; chomp $@;
4031 push @$unrepres, [ $f, $@ ];
4035 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4036 $r |= $isignore ? 02 : 01;
4037 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4039 printdebug "quiltify_trees_differ $x $y => $r\n";
4043 sub quiltify_tree_sentinelfiles ($) {
4044 # lists the `sentinel' files present in the tree
4046 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4047 qw(-- debian/rules debian/control);
4052 sub quiltify_splitbrain_needed () {
4053 if (!$split_brain) {
4054 progress "dgit view: changes are required...";
4055 runcmd @git, qw(checkout -q -b dgit-view);
4060 sub quiltify_splitbrain ($$$$$$) {
4061 my ($clogp, $unapplied, $headref, $diffbits,
4062 $editedignores, $cachekey) = @_;
4063 if ($quilt_mode !~ m/gbp|dpm/) {
4064 # treat .gitignore just like any other upstream file
4065 $diffbits = { %$diffbits };
4066 $_ = !!$_ foreach values %$diffbits;
4068 # We would like any commits we generate to be reproducible
4069 my @authline = clogp_authline($clogp);
4070 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4071 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4072 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4073 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4074 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4075 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4077 if ($quilt_mode =~ m/gbp|unapplied/ &&
4078 ($diffbits->{O2H} & 01)) {
4080 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4081 " but git tree differs from orig in upstream files.";
4082 if (!stat_exists "debian/patches") {
4084 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4088 if ($quilt_mode =~ m/dpm/ &&
4089 ($diffbits->{H2A} & 01)) {
4091 --quilt=$quilt_mode specified, implying patches-applied git tree
4092 but git tree differs from result of applying debian/patches to upstream
4095 if ($quilt_mode =~ m/gbp|unapplied/ &&
4096 ($diffbits->{O2A} & 01)) { # some patches
4097 quiltify_splitbrain_needed();
4098 progress "dgit view: creating patches-applied version using gbp pq";
4099 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4100 # gbp pq import creates a fresh branch; push back to dgit-view
4101 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4102 runcmd @git, qw(checkout -q dgit-view);
4104 if ($quilt_mode =~ m/gbp|dpm/ &&
4105 ($diffbits->{O2A} & 02)) {
4107 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4108 tool which does not create patches for changes to upstream
4109 .gitignores: but, such patches exist in debian/patches.
4112 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4113 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4114 quiltify_splitbrain_needed();
4115 progress "dgit view: creating patch to represent .gitignore changes";
4116 ensuredir "debian/patches";
4117 my $gipatch = "debian/patches/auto-gitignore";
4118 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4119 stat GIPATCH or die "$gipatch: $!";
4120 fail "$gipatch already exists; but want to create it".
4121 " to record .gitignore changes" if (stat _)[7];
4122 print GIPATCH <<END or die "$gipatch: $!";
4123 Subject: Update .gitignore from Debian packaging branch
4125 The Debian packaging git branch contains these updates to the upstream
4126 .gitignore file(s). This patch is autogenerated, to provide these
4127 updates to users of the official Debian archive view of the package.
4129 [dgit ($our_version) update-gitignore]
4132 close GIPATCH or die "$gipatch: $!";
4133 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4134 $unapplied, $headref, "--", sort keys %$editedignores;
4135 open SERIES, "+>>", "debian/patches/series" or die $!;
4136 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4138 defined read SERIES, $newline, 1 or die $!;
4139 print SERIES "\n" or die $! unless $newline eq "\n";
4140 print SERIES "auto-gitignore\n" or die $!;
4141 close SERIES or die $!;
4142 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4144 Commit patch to update .gitignore
4146 [dgit ($our_version) update-gitignore-quilt-fixup]
4150 my $dgitview = git_rev_parse 'HEAD';
4152 changedir '../../../..';
4153 # When we no longer need to support squeeze, use --create-reflog
4155 ensuredir ".git/logs/refs/dgit-intern";
4156 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4159 my $oldcache = git_get_ref "refs/$splitbraincache";
4160 if ($oldcache eq $dgitview) {
4161 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4162 # git update-ref doesn't always update, in this case. *sigh*
4163 my $dummy = make_commit_text <<END;
4166 author Dgit <dgit\@example.com> 1000000000 +0000
4167 committer Dgit <dgit\@example.com> 1000000000 +0000
4169 Dummy commit - do not use
4171 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4172 "refs/$splitbraincache", $dummy;
4174 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4177 changedir '.git/dgit/unpack/work';
4179 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4180 progress "dgit view: created ($saved)";
4183 sub quiltify ($$$$) {
4184 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4186 # Quilt patchification algorithm
4188 # We search backwards through the history of the main tree's HEAD
4189 # (T) looking for a start commit S whose tree object is identical
4190 # to to the patch tip tree (ie the tree corresponding to the
4191 # current dpkg-committed patch series). For these purposes
4192 # `identical' disregards anything in debian/ - this wrinkle is
4193 # necessary because dpkg-source treates debian/ specially.
4195 # We can only traverse edges where at most one of the ancestors'
4196 # trees differs (in changes outside in debian/). And we cannot
4197 # handle edges which change .pc/ or debian/patches. To avoid
4198 # going down a rathole we avoid traversing edges which introduce
4199 # debian/rules or debian/control. And we set a limit on the
4200 # number of edges we are willing to look at.
4202 # If we succeed, we walk forwards again. For each traversed edge
4203 # PC (with P parent, C child) (starting with P=S and ending with
4204 # C=T) to we do this:
4206 # - dpkg-source --commit with a patch name and message derived from C
4207 # After traversing PT, we git commit the changes which
4208 # should be contained within debian/patches.
4210 # The search for the path S..T is breadth-first. We maintain a
4211 # todo list containing search nodes. A search node identifies a
4212 # commit, and looks something like this:
4214 # Commit => $git_commit_id,
4215 # Child => $c, # or undef if P=T
4216 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4217 # Nontrivial => true iff $p..$c has relevant changes
4224 my %considered; # saves being exponential on some weird graphs
4226 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4229 my ($search,$whynot) = @_;
4230 printdebug " search NOT $search->{Commit} $whynot\n";
4231 $search->{Whynot} = $whynot;
4232 push @nots, $search;
4233 no warnings qw(exiting);
4242 my $c = shift @todo;
4243 next if $considered{$c->{Commit}}++;
4245 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4247 printdebug "quiltify investigate $c->{Commit}\n";
4250 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4251 printdebug " search finished hooray!\n";
4256 if ($quilt_mode eq 'nofix') {
4257 fail "quilt fixup required but quilt mode is \`nofix'\n".
4258 "HEAD commit $c->{Commit} differs from tree implied by ".
4259 " debian/patches (tree object $oldtiptree)";
4261 if ($quilt_mode eq 'smash') {
4262 printdebug " search quitting smash\n";
4266 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4267 $not->($c, "has $c_sentinels not $t_sentinels")
4268 if $c_sentinels ne $t_sentinels;
4270 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4271 $commitdata =~ m/\n\n/;
4273 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4274 @parents = map { { Commit => $_, Child => $c } } @parents;
4276 $not->($c, "root commit") if !@parents;
4278 foreach my $p (@parents) {
4279 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4281 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4282 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4284 foreach my $p (@parents) {
4285 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4287 my @cmd= (@git, qw(diff-tree -r --name-only),
4288 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4289 my $patchstackchange = cmdoutput @cmd;
4290 if (length $patchstackchange) {
4291 $patchstackchange =~ s/\n/,/g;
4292 $not->($p, "changed $patchstackchange");
4295 printdebug " search queue P=$p->{Commit} ",
4296 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4302 printdebug "quiltify want to smash\n";
4305 my $x = $_[0]{Commit};
4306 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4309 my $reportnot = sub {
4311 my $s = $abbrev->($notp);
4312 my $c = $notp->{Child};
4313 $s .= "..".$abbrev->($c) if $c;
4314 $s .= ": ".$notp->{Whynot};
4317 if ($quilt_mode eq 'linear') {
4318 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4319 foreach my $notp (@nots) {
4320 print STDERR "$us: ", $reportnot->($notp), "\n";
4322 print STDERR "$us: $_\n" foreach @$failsuggestion;
4323 fail "quilt fixup naive history linearisation failed.\n".
4324 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4325 } elsif ($quilt_mode eq 'smash') {
4326 } elsif ($quilt_mode eq 'auto') {
4327 progress "quilt fixup cannot be linear, smashing...";
4329 die "$quilt_mode ?";
4332 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4333 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4335 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4337 quiltify_dpkg_commit "auto-$version-$target-$time",
4338 (getfield $clogp, 'Maintainer'),
4339 "Automatically generated patch ($clogp->{Version})\n".
4340 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4344 progress "quiltify linearisation planning successful, executing...";
4346 for (my $p = $sref_S;
4347 my $c = $p->{Child};
4349 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4350 next unless $p->{Nontrivial};
4352 my $cc = $c->{Commit};
4354 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4355 $commitdata =~ m/\n\n/ or die "$c ?";
4358 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4361 my $commitdate = cmdoutput
4362 @git, qw(log -n1 --pretty=format:%aD), $cc;
4364 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4366 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4373 my $gbp_check_suitable = sub {
4378 die "contains unexpected slashes\n" if m{//} || m{/$};
4379 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4380 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4381 die "too long" if length > 200;
4383 return $_ unless $@;
4384 print STDERR "quiltifying commit $cc:".
4385 " ignoring/dropping Gbp-Pq $what: $@";
4389 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4391 (\S+) \s* \n //ixm) {
4392 $patchname = $gbp_check_suitable->($1, 'Name');
4394 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4396 (\S+) \s* \n //ixm) {
4397 $patchdir = $gbp_check_suitable->($1, 'Topic');
4402 if (!defined $patchname) {
4403 $patchname = $title;
4404 $patchname =~ s/[.:]$//;
4407 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4408 my $translitname = $converter->convert($patchname);
4409 die unless defined $translitname;
4410 $patchname = $translitname;
4413 "dgit: patch title transliteration error: $@"
4415 $patchname =~ y/ A-Z/-a-z/;
4416 $patchname =~ y/-a-z0-9_.+=~//cd;
4417 $patchname =~ s/^\W/x-$&/;
4418 $patchname = substr($patchname,0,40);
4420 if (!defined $patchdir) {
4423 if (length $patchdir) {
4424 $patchname = "$patchdir/$patchname";
4426 if ($patchname =~ m{^(.*)/}) {
4427 mkpath "debian/patches/$1";
4432 stat "debian/patches/$patchname$index";
4434 $!==ENOENT or die "$patchname$index $!";
4436 runcmd @git, qw(checkout -q), $cc;
4438 # We use the tip's changelog so that dpkg-source doesn't
4439 # produce complaining messages from dpkg-parsechangelog. None
4440 # of the information dpkg-source gets from the changelog is
4441 # actually relevant - it gets put into the original message
4442 # which dpkg-source provides our stunt editor, and then
4444 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4446 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4447 "Date: $commitdate\n".
4448 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4450 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4453 runcmd @git, qw(checkout -q master);
4456 sub build_maybe_quilt_fixup () {
4457 my ($format,$fopts) = get_source_format;
4458 return unless madformat_wantfixup $format;
4461 check_for_vendor_patches();
4463 if (quiltmode_splitbrain) {
4464 foreach my $needtf (qw(new maint)) {
4465 next if grep { $_ eq $needtf } access_cfg_tagformats;
4467 quilt mode $quilt_mode requires split view so server needs to support
4468 both "new" and "maint" tag formats, but config says it doesn't.
4473 my $clogp = parsechangelog();
4474 my $headref = git_rev_parse('HEAD');
4479 my $upstreamversion=$version;
4480 $upstreamversion =~ s/-[^-]*$//;
4482 if ($fopts->{'single-debian-patch'}) {
4483 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4485 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4488 die 'bug' if $split_brain && !$need_split_build_invocation;
4490 changedir '../../../..';
4491 runcmd_ordryrun_local
4492 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4495 sub quilt_fixup_mkwork ($) {
4498 mkdir "work" or die $!;
4500 mktree_in_ud_here();
4501 runcmd @git, qw(reset -q --hard), $headref;
4504 sub quilt_fixup_linkorigs ($$) {
4505 my ($upstreamversion, $fn) = @_;
4506 # calls $fn->($leafname);
4508 foreach my $f (<../../../../*>) { #/){
4509 my $b=$f; $b =~ s{.*/}{};
4511 local ($debuglevel) = $debuglevel-1;
4512 printdebug "QF linkorigs $b, $f ?\n";
4514 next unless is_orig_file_of_vsn $b, $upstreamversion;
4515 printdebug "QF linkorigs $b, $f Y\n";
4516 link_ltarget $f, $b or die "$b $!";
4521 sub quilt_fixup_delete_pc () {
4522 runcmd @git, qw(rm -rqf .pc);
4524 Commit removal of .pc (quilt series tracking data)
4526 [dgit ($our_version) upgrade quilt-remove-pc]
4530 sub quilt_fixup_singlepatch ($$$) {
4531 my ($clogp, $headref, $upstreamversion) = @_;
4533 progress "starting quiltify (single-debian-patch)";
4535 # dpkg-source --commit generates new patches even if
4536 # single-debian-patch is in debian/source/options. In order to
4537 # get it to generate debian/patches/debian-changes, it is
4538 # necessary to build the source package.
4540 quilt_fixup_linkorigs($upstreamversion, sub { });
4541 quilt_fixup_mkwork($headref);
4543 rmtree("debian/patches");
4545 runcmd @dpkgsource, qw(-b .);
4547 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4548 rename srcfn("$upstreamversion", "/debian/patches"),
4549 "work/debian/patches";
4552 commit_quilty_patch();
4555 sub quilt_make_fake_dsc ($) {
4556 my ($upstreamversion) = @_;
4558 my $fakeversion="$upstreamversion-~~DGITFAKE";
4560 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4561 print $fakedsc <<END or die $!;
4564 Version: $fakeversion
4568 my $dscaddfile=sub {
4571 my $md = new Digest::MD5;
4573 my $fh = new IO::File $b, '<' or die "$b $!";
4578 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4581 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4583 my @files=qw(debian/source/format debian/rules
4584 debian/control debian/changelog);
4585 foreach my $maybe (qw(debian/patches debian/source/options
4586 debian/tests/control)) {
4587 next unless stat_exists "../../../$maybe";
4588 push @files, $maybe;
4591 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4592 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4594 $dscaddfile->($debtar);
4595 close $fakedsc or die $!;
4598 sub quilt_check_splitbrain_cache ($$) {
4599 my ($headref, $upstreamversion) = @_;
4600 # Called only if we are in (potentially) split brain mode.
4602 # Computes the cache key and looks in the cache.
4603 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4605 my $splitbrain_cachekey;
4608 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4609 # we look in the reflog of dgit-intern/quilt-cache
4610 # we look for an entry whose message is the key for the cache lookup
4611 my @cachekey = (qw(dgit), $our_version);
4612 push @cachekey, $upstreamversion;
4613 push @cachekey, $quilt_mode;
4614 push @cachekey, $headref;
4616 push @cachekey, hashfile('fake.dsc');
4618 my $srcshash = Digest::SHA->new(256);
4619 my %sfs = ( %INC, '$0(dgit)' => $0 );
4620 foreach my $sfk (sort keys %sfs) {
4621 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4622 $srcshash->add($sfk," ");
4623 $srcshash->add(hashfile($sfs{$sfk}));
4624 $srcshash->add("\n");
4626 push @cachekey, $srcshash->hexdigest();
4627 $splitbrain_cachekey = "@cachekey";
4629 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4631 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4632 debugcmd "|(probably)",@cmd;
4633 my $child = open GC, "-|"; defined $child or die $!;
4635 chdir '../../..' or die $!;
4636 if (!stat ".git/logs/refs/$splitbraincache") {
4637 $! == ENOENT or die $!;
4638 printdebug ">(no reflog)\n";
4645 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4646 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4649 quilt_fixup_mkwork($headref);
4650 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
4651 if ($cachehit ne $headref) {
4652 progress "dgit view: found cached ($saved)";
4653 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4655 return ($cachehit, $splitbrain_cachekey);
4657 progress "dgit view: found cached, no changes required";
4658 return ($headref, $splitbrain_cachekey);
4660 die $! if GC->error;
4661 failedcmd unless close GC;
4663 printdebug "splitbrain cache miss\n";
4664 return (undef, $splitbrain_cachekey);
4667 sub quilt_fixup_multipatch ($$$) {
4668 my ($clogp, $headref, $upstreamversion) = @_;
4670 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4673 # - honour any existing .pc in case it has any strangeness
4674 # - determine the git commit corresponding to the tip of
4675 # the patch stack (if there is one)
4676 # - if there is such a git commit, convert each subsequent
4677 # git commit into a quilt patch with dpkg-source --commit
4678 # - otherwise convert all the differences in the tree into
4679 # a single git commit
4683 # Our git tree doesn't necessarily contain .pc. (Some versions of
4684 # dgit would include the .pc in the git tree.) If there isn't
4685 # one, we need to generate one by unpacking the patches that we
4688 # We first look for a .pc in the git tree. If there is one, we
4689 # will use it. (This is not the normal case.)
4691 # Otherwise need to regenerate .pc so that dpkg-source --commit
4692 # can work. We do this as follows:
4693 # 1. Collect all relevant .orig from parent directory
4694 # 2. Generate a debian.tar.gz out of
4695 # debian/{patches,rules,source/format,source/options}
4696 # 3. Generate a fake .dsc containing just these fields:
4697 # Format Source Version Files
4698 # 4. Extract the fake .dsc
4699 # Now the fake .dsc has a .pc directory.
4700 # (In fact we do this in every case, because in future we will
4701 # want to search for a good base commit for generating patches.)
4703 # Then we can actually do the dpkg-source --commit
4704 # 1. Make a new working tree with the same object
4705 # store as our main tree and check out the main
4707 # 2. Copy .pc from the fake's extraction, if necessary
4708 # 3. Run dpkg-source --commit
4709 # 4. If the result has changes to debian/, then
4710 # - git add them them
4711 # - git add .pc if we had a .pc in-tree
4713 # 5. If we had a .pc in-tree, delete it, and git commit
4714 # 6. Back in the main tree, fast forward to the new HEAD
4716 # Another situation we may have to cope with is gbp-style
4717 # patches-unapplied trees.
4719 # We would want to detect these, so we know to escape into
4720 # quilt_fixup_gbp. However, this is in general not possible.
4721 # Consider a package with a one patch which the dgit user reverts
4722 # (with git revert or the moral equivalent).
4724 # That is indistinguishable in contents from a patches-unapplied
4725 # tree. And looking at the history to distinguish them is not
4726 # useful because the user might have made a confusing-looking git
4727 # history structure (which ought to produce an error if dgit can't
4728 # cope, not a silent reintroduction of an unwanted patch).
4730 # So gbp users will have to pass an option. But we can usually
4731 # detect their failure to do so: if the tree is not a clean
4732 # patches-applied tree, quilt linearisation fails, but the tree
4733 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4734 # they want --quilt=unapplied.
4736 # To help detect this, when we are extracting the fake dsc, we
4737 # first extract it with --skip-patches, and then apply the patches
4738 # afterwards with dpkg-source --before-build. That lets us save a
4739 # tree object corresponding to .origs.
4741 my $splitbrain_cachekey;
4743 quilt_make_fake_dsc($upstreamversion);
4745 if (quiltmode_splitbrain()) {
4747 ($cachehit, $splitbrain_cachekey) =
4748 quilt_check_splitbrain_cache($headref, $upstreamversion);
4749 return if $cachehit;
4753 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4755 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4756 rename $fakexdir, "fake" or die "$fakexdir $!";
4760 remove_stray_gits();
4761 mktree_in_ud_here();
4765 runcmd @git, qw(add -Af .);
4766 my $unapplied=git_write_tree();
4767 printdebug "fake orig tree object $unapplied\n";
4771 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4773 if (system @bbcmd) {
4774 failedcmd @bbcmd if $? < 0;
4776 failed to apply your git tree's patch stack (from debian/patches/) to
4777 the corresponding upstream tarball(s). Your source tree and .orig
4778 are probably too inconsistent. dgit can only fix up certain kinds of
4779 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
4785 quilt_fixup_mkwork($headref);
4788 if (stat_exists ".pc") {
4790 progress "Tree already contains .pc - will use it then delete it.";
4793 rename '../fake/.pc','.pc' or die $!;
4796 changedir '../fake';
4798 runcmd @git, qw(add -Af .);
4799 my $oldtiptree=git_write_tree();
4800 printdebug "fake o+d/p tree object $unapplied\n";
4801 changedir '../work';
4804 # We calculate some guesswork now about what kind of tree this might
4805 # be. This is mostly for error reporting.
4811 # O = orig, without patches applied
4812 # A = "applied", ie orig with H's debian/patches applied
4813 O2H => quiltify_trees_differ($unapplied,$headref, 1,
4814 \%editedignores, \@unrepres),
4815 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4816 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4820 foreach my $b (qw(01 02)) {
4821 foreach my $v (qw(O2H O2A H2A)) {
4822 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4825 printdebug "differences \@dl @dl.\n";
4828 "$us: base trees orig=%.20s o+d/p=%.20s",
4829 $unapplied, $oldtiptree;
4831 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4832 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4833 $dl[0], $dl[1], $dl[3], $dl[4],
4837 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
4839 forceable_fail [qw(unrepresentable)], <<END;
4840 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
4845 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
4846 push @failsuggestion, "This might be a patches-unapplied branch.";
4847 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4848 push @failsuggestion, "This might be a patches-applied branch.";
4850 push @failsuggestion, "Maybe you need to specify one of".
4851 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
4853 if (quiltmode_splitbrain()) {
4854 quiltify_splitbrain($clogp, $unapplied, $headref,
4855 $diffbits, \%editedignores,
4856 $splitbrain_cachekey);
4860 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4861 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4863 if (!open P, '>>', ".pc/applied-patches") {
4864 $!==&ENOENT or die $!;
4869 commit_quilty_patch();
4871 if ($mustdeletepc) {
4872 quilt_fixup_delete_pc();
4876 sub quilt_fixup_editor () {
4877 my $descfn = $ENV{$fakeeditorenv};
4878 my $editing = $ARGV[$#ARGV];
4879 open I1, '<', $descfn or die "$descfn: $!";
4880 open I2, '<', $editing or die "$editing: $!";
4881 unlink $editing or die "$editing: $!";
4882 open O, '>', $editing or die "$editing: $!";
4883 while (<I1>) { print O or die $!; } I1->error and die $!;
4886 $copying ||= m/^\-\-\- /;
4887 next unless $copying;
4890 I2->error and die $!;
4895 sub maybe_apply_patches_dirtily () {
4896 return unless $quilt_mode =~ m/gbp|unapplied/;
4897 print STDERR <<END or die $!;
4899 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4900 dgit: Have to apply the patches - making the tree dirty.
4901 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4904 $patches_applied_dirtily = 01;
4905 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4906 runcmd qw(dpkg-source --before-build .);
4909 sub maybe_unapply_patches_again () {
4910 progress "dgit: Unapplying patches again to tidy up the tree."
4911 if $patches_applied_dirtily;
4912 runcmd qw(dpkg-source --after-build .)
4913 if $patches_applied_dirtily & 01;
4915 if $patches_applied_dirtily & 02;
4916 $patches_applied_dirtily = 0;
4919 #----- other building -----
4921 our $clean_using_builder;
4922 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4923 # clean the tree before building (perhaps invoked indirectly by
4924 # whatever we are using to run the build), rather than separately
4925 # and explicitly by us.
4928 return if $clean_using_builder;
4929 if ($cleanmode eq 'dpkg-source') {
4930 maybe_apply_patches_dirtily();
4931 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4932 } elsif ($cleanmode eq 'dpkg-source-d') {
4933 maybe_apply_patches_dirtily();
4934 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4935 } elsif ($cleanmode eq 'git') {
4936 runcmd_ordryrun_local @git, qw(clean -xdf);
4937 } elsif ($cleanmode eq 'git-ff') {
4938 runcmd_ordryrun_local @git, qw(clean -xdff);
4939 } elsif ($cleanmode eq 'check') {
4940 my $leftovers = cmdoutput @git, qw(clean -xdn);
4941 if (length $leftovers) {
4942 print STDERR $leftovers, "\n" or die $!;
4943 fail "tree contains uncommitted files and --clean=check specified";
4945 } elsif ($cleanmode eq 'none') {
4952 badusage "clean takes no additional arguments" if @ARGV;
4955 maybe_unapply_patches_again();
4960 badusage "-p is not allowed when building" if defined $package;
4963 my $clogp = parsechangelog();
4964 $isuite = getfield $clogp, 'Distribution';
4965 $package = getfield $clogp, 'Source';
4966 $version = getfield $clogp, 'Version';
4967 build_maybe_quilt_fixup();
4969 my $pat = changespat $version;
4970 foreach my $f (glob "$buildproductsdir/$pat") {
4972 unlink $f or fail "remove old changes file $f: $!";
4974 progress "would remove $f";
4980 sub changesopts_initial () {
4981 my @opts =@changesopts[1..$#changesopts];
4984 sub changesopts_version () {
4985 if (!defined $changes_since_version) {
4986 my @vsns = archive_query('archive_query');
4987 my @quirk = access_quirk();
4988 if ($quirk[0] eq 'backports') {
4989 local $isuite = $quirk[2];
4991 canonicalise_suite();
4992 push @vsns, archive_query('archive_query');
4995 @vsns = map { $_->[0] } @vsns;
4996 @vsns = sort { -version_compare($a, $b) } @vsns;
4997 $changes_since_version = $vsns[0];
4998 progress "changelog will contain changes since $vsns[0]";
5000 $changes_since_version = '_';
5001 progress "package seems new, not specifying -v<version>";
5004 if ($changes_since_version ne '_') {
5005 return ("-v$changes_since_version");
5011 sub changesopts () {
5012 return (changesopts_initial(), changesopts_version());
5015 sub massage_dbp_args ($;$) {
5016 my ($cmd,$xargs) = @_;
5019 # - if we're going to split the source build out so we can
5020 # do strange things to it, massage the arguments to dpkg-buildpackage
5021 # so that the main build doessn't build source (or add an argument
5022 # to stop it building source by default).
5024 # - add -nc to stop dpkg-source cleaning the source tree,
5025 # unless we're not doing a split build and want dpkg-source
5026 # as cleanmode, in which case we can do nothing
5029 # 0 - source will NOT need to be built separately by caller
5030 # +1 - source will need to be built separately by caller
5031 # +2 - source will need to be built separately by caller AND
5032 # dpkg-buildpackage should not in fact be run at all!
5033 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5034 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5035 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5036 $clean_using_builder = 1;
5039 # -nc has the side effect of specifying -b if nothing else specified
5040 # and some combinations of -S, -b, et al, are errors, rather than
5041 # later simply overriding earlie. So we need to:
5042 # - search the command line for these options
5043 # - pick the last one
5044 # - perhaps add our own as a default
5045 # - perhaps adjust it to the corresponding non-source-building version
5047 foreach my $l ($cmd, $xargs) {
5049 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5052 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5054 if ($need_split_build_invocation) {
5055 printdebug "massage split $dmode.\n";
5056 $r = $dmode =~ m/[S]/ ? +2 :
5057 $dmode =~ y/gGF/ABb/ ? +1 :
5058 $dmode =~ m/[ABb]/ ? 0 :
5061 printdebug "massage done $r $dmode.\n";
5063 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5069 my $wasdir = must_getcwd();
5075 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5076 my ($msg_if_onlyone) = @_;
5077 # If there is only one .changes file, fail with $msg_if_onlyone,
5078 # or if that is undef, be a no-op.
5079 # Returns the changes file to report to the user.
5080 my $pat = changespat $version;
5081 my @changesfiles = glob $pat;
5082 @changesfiles = sort {
5083 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5087 if (@changesfiles==1) {
5088 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5089 only one changes file from build (@changesfiles)
5091 $result = $changesfiles[0];
5092 } elsif (@changesfiles==2) {
5093 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5094 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5095 fail "$l found in binaries changes file $binchanges"
5098 runcmd_ordryrun_local @mergechanges, @changesfiles;
5099 my $multichanges = changespat $version,'multi';
5101 stat_exists $multichanges or fail "$multichanges: $!";
5102 foreach my $cf (glob $pat) {
5103 next if $cf eq $multichanges;
5104 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5107 $result = $multichanges;
5109 fail "wrong number of different changes files (@changesfiles)";
5111 printdone "build successful, results in $result\n" or die $!;
5114 sub midbuild_checkchanges () {
5115 my $pat = changespat $version;
5116 return if $rmchanges;
5117 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5118 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5120 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5121 Suggest you delete @unwanted.
5126 sub midbuild_checkchanges_vanilla ($) {
5128 midbuild_checkchanges() if $wantsrc == 1;
5131 sub postbuild_mergechanges_vanilla ($) {
5133 if ($wantsrc == 1) {
5135 postbuild_mergechanges(undef);
5138 printdone "build successful\n";
5143 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5144 my $wantsrc = massage_dbp_args \@dbp;
5147 midbuild_checkchanges_vanilla $wantsrc;
5152 push @dbp, changesopts_version();
5153 maybe_apply_patches_dirtily();
5154 runcmd_ordryrun_local @dbp;
5156 maybe_unapply_patches_again();
5157 postbuild_mergechanges_vanilla $wantsrc;
5161 $quilt_mode //= 'gbp';
5165 my @dbp = @dpkgbuildpackage;
5167 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5169 if (!length $gbp_build[0]) {
5170 if (length executable_on_path('git-buildpackage')) {
5171 $gbp_build[0] = qw(git-buildpackage);
5173 $gbp_build[0] = 'gbp buildpackage';
5176 my @cmd = opts_opt_multi_cmd @gbp_build;
5178 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5182 midbuild_checkchanges_vanilla $wantsrc;
5184 if (!$clean_using_builder) {
5185 push @cmd, '--git-cleaner=true';
5189 maybe_unapply_patches_again();
5191 push @cmd, changesopts();
5192 runcmd_ordryrun_local @cmd, @ARGV;
5194 postbuild_mergechanges_vanilla $wantsrc;
5196 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5199 my $our_cleanmode = $cleanmode;
5200 if ($need_split_build_invocation) {
5201 # Pretend that clean is being done some other way. This
5202 # forces us not to try to use dpkg-buildpackage to clean and
5203 # build source all in one go; and instead we run dpkg-source
5204 # (and build_prep() will do the clean since $clean_using_builder
5206 $our_cleanmode = 'ELSEWHERE';
5208 if ($our_cleanmode =~ m/^dpkg-source/) {
5209 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5210 $clean_using_builder = 1;
5213 $sourcechanges = changespat $version,'source';
5215 unlink "../$sourcechanges" or $!==ENOENT
5216 or fail "remove $sourcechanges: $!";
5218 $dscfn = dscfn($version);
5219 if ($our_cleanmode eq 'dpkg-source') {
5220 maybe_apply_patches_dirtily();
5221 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5223 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5224 maybe_apply_patches_dirtily();
5225 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5228 my @cmd = (@dpkgsource, qw(-b --));
5231 runcmd_ordryrun_local @cmd, "work";
5232 my @udfiles = <${package}_*>;
5233 changedir "../../..";
5234 foreach my $f (@udfiles) {
5235 printdebug "source copy, found $f\n";
5238 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5239 $f eq srcfn($version, $&));
5240 printdebug "source copy, found $f - renaming\n";
5241 rename "$ud/$f", "../$f" or $!==ENOENT
5242 or fail "put in place new source file ($f): $!";
5245 my $pwd = must_getcwd();
5246 my $leafdir = basename $pwd;
5248 runcmd_ordryrun_local @cmd, $leafdir;
5251 runcmd_ordryrun_local qw(sh -ec),
5252 'exec >$1; shift; exec "$@"','x',
5253 "../$sourcechanges",
5254 @dpkggenchanges, qw(-S), changesopts();
5258 sub cmd_build_source {
5259 badusage "build-source takes no additional arguments" if @ARGV;
5261 maybe_unapply_patches_again();
5262 printdone "source built, results in $dscfn and $sourcechanges";
5267 midbuild_checkchanges();
5270 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5271 stat_exists $sourcechanges
5272 or fail "$sourcechanges (in parent directory): $!";
5274 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5276 maybe_unapply_patches_again();
5278 postbuild_mergechanges(<<END);
5279 perhaps you need to pass -A ? (sbuild's default is to build only
5280 arch-specific binaries; dgit 1.4 used to override that.)
5285 sub cmd_quilt_fixup {
5286 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5287 my $clogp = parsechangelog();
5288 $version = getfield $clogp, 'Version';
5289 $package = getfield $clogp, 'Source';
5292 build_maybe_quilt_fixup();
5295 sub cmd_import_dsc {
5299 last unless $ARGV[0] =~ m/^-/;
5302 if (m/^--require-valid-signature$/) {
5305 badusage "unknown dgit import-dsc sub-option \`$_'";
5309 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5310 my ($dscfn, $dstbranch) = @ARGV;
5312 badusage "dry run makes no sense with import-dsc" unless act_local();
5314 my $force = $dstbranch =~ s/^\+// ? +1 :
5315 $dstbranch =~ s/^\.\.// ? -1 :
5317 my $info = $force ? " $&" : '';
5318 $info = "$dscfn$info";
5320 my $specbranch = $dstbranch;
5321 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5322 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5324 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5325 my $chead = cmdoutput_errok @symcmd;
5326 defined $chead or $?==256 or failedcmd @symcmd;
5328 fail "$dstbranch is checked out - will not update it"
5329 if defined $chead and $chead eq $dstbranch;
5331 my $oldhash = git_get_ref $dstbranch;
5333 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5334 $dscdata = do { local $/ = undef; <D>; };
5335 D->error and fail "read $dscfn: $!";
5338 # we don't normally need this so import it here
5339 use Dpkg::Source::Package;
5340 my $dp = new Dpkg::Source::Package filename => $dscfn,
5341 require_valid_signature => $needsig;
5343 local $SIG{__WARN__} = sub {
5345 return unless $needsig;
5346 fail "import-dsc signature check failed";
5348 if (!$dp->is_signed()) {
5349 warn "$us: warning: importing unsigned .dsc\n";
5351 my $r = $dp->check_signature();
5352 die "->check_signature => $r" if $needsig && $r;
5358 my $dgit_commit = $dsc->{$ourdscfield[0]};
5359 if (defined $dgit_commit &&
5360 !forceing [qw(import-dsc-with-dgit-field)]) {
5361 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5362 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5363 my @cmd = (qw(sh -ec),
5364 "echo $dgit_commit | git cat-file --batch-check");
5365 my $objgot = cmdoutput @cmd;
5366 if ($objgot =~ m#^\w+ missing\b#) {
5368 .dsc contains Dgit field referring to object $dgit_commit
5369 Your git tree does not have that object. Try `git fetch' from a
5370 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5373 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5375 progress "Not fast forward, forced update.";
5377 fail "Not fast forward to $dgit_commit";
5380 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5381 $dstbranch, $dgit_commit);
5383 progress "dgit: import-dsc updated git ref $dstbranch";
5388 Branch $dstbranch already exists
5389 Specify ..$specbranch for a pseudo-merge, binding in existing history
5390 Specify +$specbranch to overwrite, discarding existing history
5392 if $oldhash && !$force;
5394 $package = getfield $dsc, 'Source';
5395 my @dfi = dsc_files_info();
5396 foreach my $fi (@dfi) {
5397 my $f = $fi->{Filename};
5399 next if lstat $here;
5400 fail "stat $here: $!" unless $! == ENOENT;
5402 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5404 } elsif ($dscfn =~ m#^/#) {
5407 fail "cannot import $dscfn which seems to be inside working tree!";
5409 $there =~ s#/+[^/]+$## or
5410 fail "cannot import $dscfn which seems to not have a basename";
5412 symlink $there, $here or fail "symlink $there to $here: $!";
5413 progress "made symlink $here -> $there";
5414 print STDERR Dumper($fi);
5416 my @mergeinputs = generate_commits_from_dsc();
5417 die unless @mergeinputs == 1;
5419 my $newhash = $mergeinputs[0]{Commit};
5423 progress "Import, forced update - synthetic orphan git history.";
5424 } elsif ($force < 0) {
5425 progress "Import, merging.";
5426 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5427 my $version = getfield $dsc, 'Version';
5428 $newhash = make_commit_text <<END;
5433 Merge $package ($version) import into $dstbranch
5436 die; # caught earlier
5440 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5441 $dstbranch, $newhash);
5443 progress "dgit: import-dsc results are in in git ref $dstbranch";
5446 sub cmd_archive_api_query {
5447 badusage "need only 1 subpath argument" unless @ARGV==1;
5448 my ($subpath) = @ARGV;
5449 my @cmd = archive_api_query_cmd($subpath);
5452 exec @cmd or fail "exec curl: $!\n";
5455 sub cmd_clone_dgit_repos_server {
5456 badusage "need destination argument" unless @ARGV==1;
5457 my ($destdir) = @ARGV;
5458 $package = '_dgit-repos-server';
5459 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5461 exec @cmd or fail "exec git clone: $!\n";
5464 sub cmd_setup_mergechangelogs {
5465 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5466 setup_mergechangelogs(1);
5469 sub cmd_setup_useremail {
5470 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5474 sub cmd_setup_new_tree {
5475 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5479 #---------- argument parsing and main program ----------
5482 print "dgit version $our_version\n" or die $!;
5486 our (%valopts_long, %valopts_short);
5489 sub defvalopt ($$$$) {
5490 my ($long,$short,$val_re,$how) = @_;
5491 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5492 $valopts_long{$long} = $oi;
5493 $valopts_short{$short} = $oi;
5494 # $how subref should:
5495 # do whatever assignemnt or thing it likes with $_[0]
5496 # if the option should not be passed on to remote, @rvalopts=()
5497 # or $how can be a scalar ref, meaning simply assign the value
5500 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5501 defvalopt '--distro', '-d', '.+', \$idistro;
5502 defvalopt '', '-k', '.+', \$keyid;
5503 defvalopt '--existing-package','', '.*', \$existing_package;
5504 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5505 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5506 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5508 defvalopt '', '-C', '.+', sub {
5509 ($changesfile) = (@_);
5510 if ($changesfile =~ s#^(.*)/##) {
5511 $buildproductsdir = $1;
5515 defvalopt '--initiator-tempdir','','.*', sub {
5516 ($initiator_tempdir) = (@_);
5517 $initiator_tempdir =~ m#^/# or
5518 badusage "--initiator-tempdir must be used specify an".
5519 " absolute, not relative, directory."
5525 if (defined $ENV{'DGIT_SSH'}) {
5526 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5527 } elsif (defined $ENV{'GIT_SSH'}) {
5528 @ssh = ($ENV{'GIT_SSH'});
5536 if (!defined $val) {
5537 badusage "$what needs a value" unless @ARGV;
5539 push @rvalopts, $val;
5541 badusage "bad value \`$val' for $what" unless
5542 $val =~ m/^$oi->{Re}$(?!\n)/s;
5543 my $how = $oi->{How};
5544 if (ref($how) eq 'SCALAR') {
5549 push @ropts, @rvalopts;
5553 last unless $ARGV[0] =~ m/^-/;
5557 if (m/^--dry-run$/) {
5560 } elsif (m/^--damp-run$/) {
5563 } elsif (m/^--no-sign$/) {
5566 } elsif (m/^--help$/) {
5568 } elsif (m/^--version$/) {
5570 } elsif (m/^--new$/) {
5573 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5574 ($om = $opts_opt_map{$1}) &&
5578 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5579 !$opts_opt_cmdonly{$1} &&
5580 ($om = $opts_opt_map{$1})) {
5583 } elsif (m/^--(gbp|dpm)$/s) {
5584 push @ropts, "--quilt=$1";
5586 } elsif (m/^--ignore-dirty$/s) {
5589 } elsif (m/^--no-quilt-fixup$/s) {
5591 $quilt_mode = 'nocheck';
5592 } elsif (m/^--no-rm-on-error$/s) {
5595 } elsif (m/^--overwrite$/s) {
5597 $overwrite_version = '';
5598 } elsif (m/^--overwrite=(.+)$/s) {
5600 $overwrite_version = $1;
5601 } elsif (m/^--dgit-view-save=(.+)$/s) {
5603 $split_brain_save = $1;
5604 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
5605 } elsif (m/^--(no-)?rm-old-changes$/s) {
5608 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5610 push @deliberatelies, $&;
5611 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5615 } elsif (m/^--force-/) {
5617 "$us: warning: ignoring unknown force option $_\n";
5619 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5620 # undocumented, for testing
5622 $tagformat_want = [ $1, 'command line', 1 ];
5623 # 1 menas overrides distro configuration
5624 } elsif (m/^--always-split-source-build$/s) {
5625 # undocumented, for testing
5627 $need_split_build_invocation = 1;
5628 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5629 $val = $2 ? $' : undef; #';
5630 $valopt->($oi->{Long});
5632 badusage "unknown long option \`$_'";
5639 } elsif (s/^-L/-/) {
5642 } elsif (s/^-h/-/) {
5644 } elsif (s/^-D/-/) {
5648 } elsif (s/^-N/-/) {
5653 push @changesopts, $_;
5655 } elsif (s/^-wn$//s) {
5657 $cleanmode = 'none';
5658 } elsif (s/^-wg$//s) {
5661 } elsif (s/^-wgf$//s) {
5663 $cleanmode = 'git-ff';
5664 } elsif (s/^-wd$//s) {
5666 $cleanmode = 'dpkg-source';
5667 } elsif (s/^-wdd$//s) {
5669 $cleanmode = 'dpkg-source-d';
5670 } elsif (s/^-wc$//s) {
5672 $cleanmode = 'check';
5673 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5674 push @git, '-c', $&;
5675 $gitcfgs{cmdline}{$1} = [ $2 ];
5676 } elsif (s/^-c([^=]+)$//s) {
5677 push @git, '-c', $&;
5678 $gitcfgs{cmdline}{$1} = [ 'true' ];
5679 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5681 $val = undef unless length $val;
5682 $valopt->($oi->{Short});
5685 badusage "unknown short option \`$_'";
5692 sub check_env_sanity () {
5693 my $blocked = new POSIX::SigSet;
5694 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5697 foreach my $name (qw(PIPE CHLD)) {
5698 my $signame = "SIG$name";
5699 my $signum = eval "POSIX::$signame" // die;
5700 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5701 die "$signame is set to something other than SIG_DFL\n";
5702 $blocked->ismember($signum) and
5703 die "$signame is blocked\n";
5709 On entry to dgit, $@
5710 This is a bug produced by something in in your execution environment.
5716 sub finalise_opts_opts () {
5717 foreach my $k (keys %opts_opt_map) {
5718 my $om = $opts_opt_map{$k};
5720 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5722 badcfg "cannot set command for $k"
5723 unless length $om->[0];
5727 foreach my $c (access_cfg_cfgs("opts-$k")) {
5729 map { $_ ? @$_ : () }
5730 map { $gitcfgs{$_}{$c} }
5731 reverse @gitcfgsources;
5732 printdebug "CL $c ", (join " ", map { shellquote } @vl),
5733 "\n" if $debuglevel >= 4;
5735 badcfg "cannot configure options for $k"
5736 if $opts_opt_cmdonly{$k};
5737 my $insertpos = $opts_cfg_insertpos{$k};
5738 @$om = ( @$om[0..$insertpos-1],
5740 @$om[$insertpos..$#$om] );
5745 if ($ENV{$fakeeditorenv}) {
5747 quilt_fixup_editor();
5754 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5755 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5756 if $dryrun_level == 1;
5758 print STDERR $helpmsg or die $!;
5761 my $cmd = shift @ARGV;
5764 my $pre_fn = ${*::}{"pre_$cmd"};
5765 $pre_fn->() if $pre_fn;
5767 if (!defined $rmchanges) {
5768 local $access_forpush;
5769 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5772 if (!defined $quilt_mode) {
5773 local $access_forpush;
5774 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5775 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5777 $quilt_mode =~ m/^($quilt_modes_re)$/
5778 or badcfg "unknown quilt-mode \`$quilt_mode'";
5782 $need_split_build_invocation ||= quiltmode_splitbrain();
5784 if (!defined $cleanmode) {
5785 local $access_forpush;
5786 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5787 $cleanmode //= 'dpkg-source';
5789 badcfg "unknown clean-mode \`$cleanmode'" unless
5790 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5793 my $fn = ${*::}{"cmd_$cmd"};
5794 $fn or badusage "unknown operation $cmd";