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 $we_are_responder;
71 our $initiator_tempdir;
72 our $patches_applied_dirtily = 00;
77 our %forceopts = map { $_=>0 }
78 qw(unrepresentable unsupported-source-format
80 import-gitapply-absurd
81 import-gitapply-no-absurd);
83 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
85 our $suite_re = '[-+.0-9a-z]+';
86 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
87 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
88 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
89 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
91 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
92 our $splitbraincache = 'dgit-intern/quilt-cache';
95 our (@dget) = qw(dget);
96 our (@curl) = qw(curl);
97 our (@dput) = qw(dput);
98 our (@debsign) = qw(debsign);
100 our (@sbuild) = qw(sbuild);
102 our (@dgit) = qw(dgit);
103 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
104 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
105 our (@dpkggenchanges) = qw(dpkg-genchanges);
106 our (@mergechanges) = qw(mergechanges -f);
107 our (@gbp_build) = ('');
108 our (@gbp_pq) = ('gbp pq');
109 our (@changesopts) = ('');
111 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
114 'debsign' => \@debsign,
116 'sbuild' => \@sbuild,
120 'dpkg-source' => \@dpkgsource,
121 'dpkg-buildpackage' => \@dpkgbuildpackage,
122 'dpkg-genchanges' => \@dpkggenchanges,
123 'gbp-build' => \@gbp_build,
124 'gbp-pq' => \@gbp_pq,
125 'ch' => \@changesopts,
126 'mergechanges' => \@mergechanges);
128 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
129 our %opts_cfg_insertpos = map {
131 scalar @{ $opts_opt_map{$_} }
132 } keys %opts_opt_map;
134 sub finalise_opts_opts();
140 our $supplementary_message = '';
141 our $need_split_build_invocation = 0;
142 our $split_brain = 0;
146 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
149 our $remotename = 'dgit';
150 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
154 if (!defined $absurdity) {
156 $absurdity =~ s{/[^/]+$}{/absurd} or die;
160 my ($v,$distro) = @_;
161 return $tagformatfn->($v, $distro);
164 sub debiantag_maintview ($$) {
165 my ($v,$distro) = @_;
170 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
172 sub lbranch () { return "$branchprefix/$csuite"; }
173 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
174 sub lref () { return "refs/heads/".lbranch(); }
175 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
176 sub rrref () { return server_ref($csuite); }
178 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
179 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
181 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
182 # locally fetched refs because they have unhelpful names and clutter
183 # up gitk etc. So we track whether we have "used up" head ref (ie,
184 # whether we have made another local ref which refers to this object).
186 # (If we deleted them unconditionally, then we might end up
187 # re-fetching the same git objects each time dgit fetch was run.)
189 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
190 # in git_fetch_us to fetch the refs in question, and possibly a call
191 # to lrfetchref_used.
193 our (%lrfetchrefs_f, %lrfetchrefs_d);
194 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
196 sub lrfetchref_used ($) {
197 my ($fullrefname) = @_;
198 my $objid = $lrfetchrefs_f{$fullrefname};
199 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
210 return "${package}_".(stripepoch $vsn).$sfx
215 return srcfn($vsn,".dsc");
218 sub changespat ($;$) {
219 my ($vsn, $arch) = @_;
220 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
229 foreach my $f (@end) {
231 print STDERR "$us: cleanup: $@" if length $@;
235 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
237 sub forceable_fail ($$) {
238 my ($forceoptsl, $msg) = @_;
239 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
240 print STDERR "warning: overriding problem due to --force:\n". $msg;
244 my ($forceoptsl) = @_;
245 my @got = grep { $forceopts{$_} } @$forceoptsl;
246 return 0 unless @got;
248 "warning: skipping checks or functionality due to --force-$got[0]\n";
251 sub no_such_package () {
252 print STDERR "$us: package $package does not exist in suite $isuite\n";
258 printdebug "CD $newdir\n";
259 chdir $newdir or confess "chdir: $newdir: $!";
262 sub deliberately ($) {
264 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
267 sub deliberately_not_fast_forward () {
268 foreach (qw(not-fast-forward fresh-repo)) {
269 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
273 sub quiltmode_splitbrain () {
274 $quilt_mode =~ m/gbp|dpm|unapplied/;
277 sub opts_opt_multi_cmd {
279 push @cmd, split /\s+/, shift @_;
285 return opts_opt_multi_cmd @gbp_pq;
288 #---------- remote protocol support, common ----------
290 # remote push initiator/responder protocol:
291 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
292 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
293 # < dgit-remote-push-ready <actual-proto-vsn>
300 # > supplementary-message NBYTES # $protovsn >= 3
305 # > file parsed-changelog
306 # [indicates that output of dpkg-parsechangelog follows]
307 # > data-block NBYTES
308 # > [NBYTES bytes of data (no newline)]
309 # [maybe some more blocks]
318 # > param head DGIT-VIEW-HEAD
319 # > param csuite SUITE
320 # > param tagformat old|new
321 # > param maint-view MAINT-VIEW-HEAD
323 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
324 # # goes into tag, for replay prevention
327 # [indicates that signed tag is wanted]
328 # < data-block NBYTES
329 # < [NBYTES bytes of data (no newline)]
330 # [maybe some more blocks]
334 # > want signed-dsc-changes
335 # < data-block NBYTES [transfer of signed dsc]
337 # < data-block NBYTES [transfer of signed changes]
345 sub i_child_report () {
346 # Sees if our child has died, and reap it if so. Returns a string
347 # describing how it died if it failed, or undef otherwise.
348 return undef unless $i_child_pid;
349 my $got = waitpid $i_child_pid, WNOHANG;
350 return undef if $got <= 0;
351 die unless $got == $i_child_pid;
352 $i_child_pid = undef;
353 return undef unless $?;
354 return "build host child ".waitstatusmsg();
359 fail "connection lost: $!" if $fh->error;
360 fail "protocol violation; $m not expected";
363 sub badproto_badread ($$) {
365 fail "connection lost: $!" if $!;
366 my $report = i_child_report();
367 fail $report if defined $report;
368 badproto $fh, "eof (reading $wh)";
371 sub protocol_expect (&$) {
372 my ($match, $fh) = @_;
375 defined && chomp or badproto_badread $fh, "protocol message";
383 badproto $fh, "\`$_'";
386 sub protocol_send_file ($$) {
387 my ($fh, $ourfn) = @_;
388 open PF, "<", $ourfn or die "$ourfn: $!";
391 my $got = read PF, $d, 65536;
392 die "$ourfn: $!" unless defined $got;
394 print $fh "data-block ".length($d)."\n" or die $!;
395 print $fh $d or die $!;
397 PF->error and die "$ourfn $!";
398 print $fh "data-end\n" or die $!;
402 sub protocol_read_bytes ($$) {
403 my ($fh, $nbytes) = @_;
404 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
406 my $got = read $fh, $d, $nbytes;
407 $got==$nbytes or badproto_badread $fh, "data block";
411 sub protocol_receive_file ($$) {
412 my ($fh, $ourfn) = @_;
413 printdebug "() $ourfn\n";
414 open PF, ">", $ourfn or die "$ourfn: $!";
416 my ($y,$l) = protocol_expect {
417 m/^data-block (.*)$/ ? (1,$1) :
418 m/^data-end$/ ? (0,) :
422 my $d = protocol_read_bytes $fh, $l;
423 print PF $d or die $!;
428 #---------- remote protocol support, responder ----------
430 sub responder_send_command ($) {
432 return unless $we_are_responder;
433 # called even without $we_are_responder
434 printdebug ">> $command\n";
435 print PO $command, "\n" or die $!;
438 sub responder_send_file ($$) {
439 my ($keyword, $ourfn) = @_;
440 return unless $we_are_responder;
441 printdebug "]] $keyword $ourfn\n";
442 responder_send_command "file $keyword";
443 protocol_send_file \*PO, $ourfn;
446 sub responder_receive_files ($@) {
447 my ($keyword, @ourfns) = @_;
448 die unless $we_are_responder;
449 printdebug "[[ $keyword @ourfns\n";
450 responder_send_command "want $keyword";
451 foreach my $fn (@ourfns) {
452 protocol_receive_file \*PI, $fn;
455 protocol_expect { m/^files-end$/ } \*PI;
458 #---------- remote protocol support, initiator ----------
460 sub initiator_expect (&) {
462 protocol_expect { &$match } \*RO;
465 #---------- end remote code ----------
468 if ($we_are_responder) {
470 responder_send_command "progress ".length($m) or die $!;
471 print PO $m or die $!;
481 $ua = LWP::UserAgent->new();
485 progress "downloading $what...";
486 my $r = $ua->get(@_) or die $!;
487 return undef if $r->code == 404;
488 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
489 return $r->decoded_content(charset => 'none');
492 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
497 failedcmd @_ if system @_;
500 sub act_local () { return $dryrun_level <= 1; }
501 sub act_scary () { return !$dryrun_level; }
504 if (!$dryrun_level) {
505 progress "dgit ok: @_";
507 progress "would be ok: @_ (but dry run only)";
512 printcmd(\*STDERR,$debugprefix."#",@_);
515 sub runcmd_ordryrun {
523 sub runcmd_ordryrun_local {
532 my ($first_shell, @cmd) = @_;
533 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
536 our $helpmsg = <<END;
538 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
539 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
540 dgit [dgit-opts] build [dpkg-buildpackage-opts]
541 dgit [dgit-opts] sbuild [sbuild-opts]
542 dgit [dgit-opts] push [dgit-opts] [suite]
543 dgit [dgit-opts] rpush build-host:build-dir ...
544 important dgit options:
545 -k<keyid> sign tag and package with <keyid> instead of default
546 --dry-run -n do not change anything, but go through the motions
547 --damp-run -L like --dry-run but make local changes, without signing
548 --new -N allow introducing a new package
549 --debug -D increase debug level
550 -c<name>=<value> set git config option (used directly by dgit too)
553 our $later_warning_msg = <<END;
554 Perhaps the upload is stuck in incoming. Using the version from git.
558 print STDERR "$us: @_\n", $helpmsg or die $!;
563 @ARGV or badusage "too few arguments";
564 return scalar shift @ARGV;
568 print $helpmsg or die $!;
572 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
574 our %defcfg = ('dgit.default.distro' => 'debian',
575 'dgit.default.username' => '',
576 'dgit.default.archive-query-default-component' => 'main',
577 'dgit.default.ssh' => 'ssh',
578 'dgit.default.archive-query' => 'madison:',
579 'dgit.default.sshpsql-dbname' => 'service=projectb',
580 'dgit.default.dgit-tag-format' => 'new,old,maint',
581 # old means "repo server accepts pushes with old dgit tags"
582 # new means "repo server accepts pushes with new dgit tags"
583 # maint means "repo server accepts split brain pushes"
584 # hist means "repo server may have old pushes without new tag"
585 # ("hist" is implied by "old")
586 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
587 'dgit-distro.debian.git-check' => 'url',
588 'dgit-distro.debian.git-check-suffix' => '/info/refs',
589 'dgit-distro.debian.new-private-pushers' => 't',
590 'dgit-distro.debian/push.git-url' => '',
591 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
592 'dgit-distro.debian/push.git-user-force' => 'dgit',
593 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
594 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
595 'dgit-distro.debian/push.git-create' => 'true',
596 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
597 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
598 # 'dgit-distro.debian.archive-query-tls-key',
599 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
600 # ^ this does not work because curl is broken nowadays
601 # Fixing #790093 properly will involve providing providing the key
602 # in some pacagke and maybe updating these paths.
604 # 'dgit-distro.debian.archive-query-tls-curl-args',
605 # '--ca-path=/etc/ssl/ca-debian',
606 # ^ this is a workaround but works (only) on DSA-administered machines
607 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
608 'dgit-distro.debian.git-url-suffix' => '',
609 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
610 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
611 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
612 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
613 'dgit-distro.ubuntu.git-check' => 'false',
614 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
615 'dgit-distro.test-dummy.ssh' => "$td/ssh",
616 'dgit-distro.test-dummy.username' => "alice",
617 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
618 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
619 'dgit-distro.test-dummy.git-url' => "$td/git",
620 'dgit-distro.test-dummy.git-host' => "git",
621 'dgit-distro.test-dummy.git-path' => "$td/git",
622 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
623 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
624 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
625 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
629 our @gitcfgsources = qw(cmdline local global system);
631 sub git_slurp_config () {
632 local ($debuglevel) = $debuglevel-2;
635 # This algoritm is a bit subtle, but this is needed so that for
636 # options which we want to be single-valued, we allow the
637 # different config sources to override properly. See #835858.
638 foreach my $src (@gitcfgsources) {
639 next if $src eq 'cmdline';
640 # we do this ourselves since git doesn't handle it
642 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
645 open GITS, "-|", @cmd or die $!;
648 printdebug "=> ", (messagequote $_), "\n";
650 push @{ $gitcfgs{$src}{$`} }, $'; #';
654 or ($!==0 && $?==256)
659 sub git_get_config ($) {
661 foreach my $src (@gitcfgsources) {
662 my $l = $gitcfgs{$src}{$c};
663 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
666 @$l==1 or badcfg "multiple values for $c".
667 " (in $src git config)" if @$l > 1;
675 return undef if $c =~ /RETURN-UNDEF/;
676 my $v = git_get_config($c);
677 return $v if defined $v;
678 my $dv = $defcfg{$c};
679 return $dv if defined $dv;
681 badcfg "need value for one of: @_\n".
682 "$us: distro or suite appears not to be (properly) supported";
685 sub access_basedistro () {
686 if (defined $idistro) {
689 return cfg("dgit-suite.$isuite.distro",
690 "dgit.default.distro");
694 sub access_quirk () {
695 # returns (quirk name, distro to use instead or undef, quirk-specific info)
696 my $basedistro = access_basedistro();
697 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
699 if (defined $backports_quirk) {
700 my $re = $backports_quirk;
701 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
703 $re =~ s/\%/([-0-9a-z_]+)/
704 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
705 if ($isuite =~ m/^$re$/) {
706 return ('backports',"$basedistro-backports",$1);
709 return ('none',undef);
714 sub parse_cfg_bool ($$$) {
715 my ($what,$def,$v) = @_;
718 $v =~ m/^[ty1]/ ? 1 :
719 $v =~ m/^[fn0]/ ? 0 :
720 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
723 sub access_forpush_config () {
724 my $d = access_basedistro();
728 parse_cfg_bool('new-private-pushers', 0,
729 cfg("dgit-distro.$d.new-private-pushers",
732 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
735 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
736 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
737 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
738 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
741 sub access_forpush () {
742 $access_forpush //= access_forpush_config();
743 return $access_forpush;
747 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
748 badcfg "pushing but distro is configured readonly"
749 if access_forpush_config() eq '0';
751 $supplementary_message = <<'END' unless $we_are_responder;
752 Push failed, before we got started.
753 You can retry the push, after fixing the problem, if you like.
755 finalise_opts_opts();
759 finalise_opts_opts();
762 sub supplementary_message ($) {
764 if (!$we_are_responder) {
765 $supplementary_message = $msg;
767 } elsif ($protovsn >= 3) {
768 responder_send_command "supplementary-message ".length($msg)
770 print PO $msg or die $!;
774 sub access_distros () {
775 # Returns list of distros to try, in order
778 # 0. `instead of' distro name(s) we have been pointed to
779 # 1. the access_quirk distro, if any
780 # 2a. the user's specified distro, or failing that } basedistro
781 # 2b. the distro calculated from the suite }
782 my @l = access_basedistro();
784 my (undef,$quirkdistro) = access_quirk();
785 unshift @l, $quirkdistro;
786 unshift @l, $instead_distro;
787 @l = grep { defined } @l;
789 if (access_forpush()) {
790 @l = map { ("$_/push", $_) } @l;
795 sub access_cfg_cfgs (@) {
798 # The nesting of these loops determines the search order. We put
799 # the key loop on the outside so that we search all the distros
800 # for each key, before going on to the next key. That means that
801 # if access_cfg is called with a more specific, and then a less
802 # specific, key, an earlier distro can override the less specific
803 # without necessarily overriding any more specific keys. (If the
804 # distro wants to override the more specific keys it can simply do
805 # so; whereas if we did the loop the other way around, it would be
806 # impossible to for an earlier distro to override a less specific
807 # key but not the more specific ones without restating the unknown
808 # values of the more specific keys.
811 # We have to deal with RETURN-UNDEF specially, so that we don't
812 # terminate the search prematurely.
814 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
817 foreach my $d (access_distros()) {
818 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
820 push @cfgs, map { "dgit.default.$_" } @realkeys;
827 my (@cfgs) = access_cfg_cfgs(@keys);
828 my $value = cfg(@cfgs);
832 sub access_cfg_bool ($$) {
833 my ($def, @keys) = @_;
834 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
837 sub string_to_ssh ($) {
839 if ($spec =~ m/\s/) {
840 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
846 sub access_cfg_ssh () {
847 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
848 if (!defined $gitssh) {
851 return string_to_ssh $gitssh;
855 sub access_runeinfo ($) {
857 return ": dgit ".access_basedistro()." $info ;";
860 sub access_someuserhost ($) {
862 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
863 defined($user) && length($user) or
864 $user = access_cfg("$some-user",'username');
865 my $host = access_cfg("$some-host");
866 return length($user) ? "$user\@$host" : $host;
869 sub access_gituserhost () {
870 return access_someuserhost('git');
873 sub access_giturl (;$) {
875 my $url = access_cfg('git-url','RETURN-UNDEF');
878 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
879 return undef unless defined $proto;
882 access_gituserhost().
883 access_cfg('git-path');
885 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
888 return "$url/$package$suffix";
891 sub parsecontrolfh ($$;$) {
892 my ($fh, $desc, $allowsigned) = @_;
893 our $dpkgcontrolhash_noissigned;
896 my %opts = ('name' => $desc);
897 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
898 $c = Dpkg::Control::Hash->new(%opts);
899 $c->parse($fh,$desc) or die "parsing of $desc failed";
900 last if $allowsigned;
901 last if $dpkgcontrolhash_noissigned;
902 my $issigned= $c->get_option('is_pgp_signed');
903 if (!defined $issigned) {
904 $dpkgcontrolhash_noissigned= 1;
905 seek $fh, 0,0 or die "seek $desc: $!";
906 } elsif ($issigned) {
907 fail "control file $desc is (already) PGP-signed. ".
908 " Note that dgit push needs to modify the .dsc and then".
909 " do the signature itself";
918 my ($file, $desc) = @_;
919 my $fh = new IO::Handle;
920 open $fh, '<', $file or die "$file: $!";
921 my $c = parsecontrolfh($fh,$desc);
922 $fh->error and die $!;
928 my ($dctrl,$field) = @_;
929 my $v = $dctrl->{$field};
930 return $v if defined $v;
931 fail "missing field $field in ".$dctrl->get_option('name');
935 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
936 my $p = new IO::Handle;
937 my @cmd = (qw(dpkg-parsechangelog), @_);
938 open $p, '-|', @cmd or die $!;
940 $?=0; $!=0; close $p or failedcmd @cmd;
944 sub commit_getclogp ($) {
945 # Returns the parsed changelog hashref for a particular commit
947 our %commit_getclogp_memo;
948 my $memo = $commit_getclogp_memo{$objid};
949 return $memo if $memo;
951 my $mclog = ".git/dgit/clog-$objid";
952 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
953 "$objid:debian/changelog";
954 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
959 defined $d or fail "getcwd failed: $!";
965 sub archive_query ($;@) {
966 my ($method) = shift @_;
967 my $query = access_cfg('archive-query','RETURN-UNDEF');
968 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
971 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
974 sub pool_dsc_subpath ($$) {
975 my ($vsn,$component) = @_; # $package is implict arg
976 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
977 return "/pool/$component/$prefix/$package/".dscfn($vsn);
980 #---------- `ftpmasterapi' archive query method (nascent) ----------
982 sub archive_api_query_cmd ($) {
984 my @cmd = (@curl, qw(-sS));
985 my $url = access_cfg('archive-query-url');
986 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
988 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
989 foreach my $key (split /\:/, $keys) {
990 $key =~ s/\%HOST\%/$host/g;
992 fail "for $url: stat $key: $!" unless $!==ENOENT;
995 fail "config requested specific TLS key but do not know".
996 " how to get curl to use exactly that EE key ($key)";
997 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
998 # # Sadly the above line does not work because of changes
999 # # to gnutls. The real fix for #790093 may involve
1000 # # new curl options.
1003 # Fixing #790093 properly will involve providing a value
1004 # for this on clients.
1005 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1006 push @cmd, split / /, $kargs if defined $kargs;
1008 push @cmd, $url.$subpath;
1012 sub api_query ($$;$) {
1014 my ($data, $subpath, $ok404) = @_;
1015 badcfg "ftpmasterapi archive query method takes no data part"
1017 my @cmd = archive_api_query_cmd($subpath);
1018 my $url = $cmd[$#cmd];
1019 push @cmd, qw(-w %{http_code});
1020 my $json = cmdoutput @cmd;
1021 unless ($json =~ s/\d+\d+\d$//) {
1022 failedcmd_report_cmd undef, @cmd;
1023 fail "curl failed to print 3-digit HTTP code";
1026 return undef if $code eq '404' && $ok404;
1027 fail "fetch of $url gave HTTP code $code"
1028 unless $url =~ m#^file://# or $code =~ m/^2/;
1029 return decode_json($json);
1032 sub canonicalise_suite_ftpmasterapi () {
1033 my ($proto,$data) = @_;
1034 my $suites = api_query($data, 'suites');
1036 foreach my $entry (@$suites) {
1038 my $v = $entry->{$_};
1039 defined $v && $v eq $isuite;
1040 } qw(codename name);
1041 push @matched, $entry;
1043 fail "unknown suite $isuite" unless @matched;
1046 @matched==1 or die "multiple matches for suite $isuite\n";
1047 $cn = "$matched[0]{codename}";
1048 defined $cn or die "suite $isuite info has no codename\n";
1049 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1051 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1056 sub archive_query_ftpmasterapi () {
1057 my ($proto,$data) = @_;
1058 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1060 my $digester = Digest::SHA->new(256);
1061 foreach my $entry (@$info) {
1063 my $vsn = "$entry->{version}";
1064 my ($ok,$msg) = version_check $vsn;
1065 die "bad version: $msg\n" unless $ok;
1066 my $component = "$entry->{component}";
1067 $component =~ m/^$component_re$/ or die "bad component";
1068 my $filename = "$entry->{filename}";
1069 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1070 or die "bad filename";
1071 my $sha256sum = "$entry->{sha256sum}";
1072 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1073 push @rows, [ $vsn, "/pool/$component/$filename",
1074 $digester, $sha256sum ];
1076 die "bad ftpmaster api response: $@\n".Dumper($entry)
1079 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1083 #---------- `madison' archive query method ----------
1085 sub archive_query_madison {
1086 return map { [ @$_[0..1] ] } madison_get_parse(@_);
1089 sub madison_get_parse {
1090 my ($proto,$data) = @_;
1091 die unless $proto eq 'madison';
1092 if (!length $data) {
1093 $data= access_cfg('madison-distro','RETURN-UNDEF');
1094 $data //= access_basedistro();
1096 $rmad{$proto,$data,$package} ||= cmdoutput
1097 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1098 my $rmad = $rmad{$proto,$data,$package};
1101 foreach my $l (split /\n/, $rmad) {
1102 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1103 \s*( [^ \t|]+ )\s* \|
1104 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1105 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1106 $1 eq $package or die "$rmad $package ?";
1113 $component = access_cfg('archive-query-default-component');
1115 $5 eq 'source' or die "$rmad ?";
1116 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1118 return sort { -version_compare($a->[0],$b->[0]); } @out;
1121 sub canonicalise_suite_madison {
1122 # madison canonicalises for us
1123 my @r = madison_get_parse(@_);
1125 "unable to canonicalise suite using package $package".
1126 " which does not appear to exist in suite $isuite;".
1127 " --existing-package may help";
1131 #---------- `sshpsql' archive query method ----------
1134 my ($data,$runeinfo,$sql) = @_;
1135 if (!length $data) {
1136 $data= access_someuserhost('sshpsql').':'.
1137 access_cfg('sshpsql-dbname');
1139 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1140 my ($userhost,$dbname) = ($`,$'); #';
1142 my @cmd = (access_cfg_ssh, $userhost,
1143 access_runeinfo("ssh-psql $runeinfo").
1144 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1145 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1147 open P, "-|", @cmd or die $!;
1150 printdebug(">|$_|\n");
1153 $!=0; $?=0; close P or failedcmd @cmd;
1155 my $nrows = pop @rows;
1156 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1157 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1158 @rows = map { [ split /\|/, $_ ] } @rows;
1159 my $ncols = scalar @{ shift @rows };
1160 die if grep { scalar @$_ != $ncols } @rows;
1164 sub sql_injection_check {
1165 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1168 sub archive_query_sshpsql ($$) {
1169 my ($proto,$data) = @_;
1170 sql_injection_check $isuite, $package;
1171 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1172 SELECT source.version, component.name, files.filename, files.sha256sum
1174 JOIN src_associations ON source.id = src_associations.source
1175 JOIN suite ON suite.id = src_associations.suite
1176 JOIN dsc_files ON dsc_files.source = source.id
1177 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1178 JOIN component ON component.id = files_archive_map.component_id
1179 JOIN files ON files.id = dsc_files.file
1180 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1181 AND source.source='$package'
1182 AND files.filename LIKE '%.dsc';
1184 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1185 my $digester = Digest::SHA->new(256);
1187 my ($vsn,$component,$filename,$sha256sum) = @$_;
1188 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1193 sub canonicalise_suite_sshpsql ($$) {
1194 my ($proto,$data) = @_;
1195 sql_injection_check $isuite;
1196 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1197 SELECT suite.codename
1198 FROM suite where suite_name='$isuite' or codename='$isuite';
1200 @rows = map { $_->[0] } @rows;
1201 fail "unknown suite $isuite" unless @rows;
1202 die "ambiguous $isuite: @rows ?" if @rows>1;
1206 #---------- `dummycat' archive query method ----------
1208 sub canonicalise_suite_dummycat ($$) {
1209 my ($proto,$data) = @_;
1210 my $dpath = "$data/suite.$isuite";
1211 if (!open C, "<", $dpath) {
1212 $!==ENOENT or die "$dpath: $!";
1213 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1217 chomp or die "$dpath: $!";
1219 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1223 sub archive_query_dummycat ($$) {
1224 my ($proto,$data) = @_;
1225 canonicalise_suite();
1226 my $dpath = "$data/package.$csuite.$package";
1227 if (!open C, "<", $dpath) {
1228 $!==ENOENT or die "$dpath: $!";
1229 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1237 printdebug "dummycat query $csuite $package $dpath | $_\n";
1238 my @row = split /\s+/, $_;
1239 @row==2 or die "$dpath: $_ ?";
1242 C->error and die "$dpath: $!";
1244 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1247 #---------- tag format handling ----------
1249 sub access_cfg_tagformats () {
1250 split /\,/, access_cfg('dgit-tag-format');
1253 sub need_tagformat ($$) {
1254 my ($fmt, $why) = @_;
1255 fail "need to use tag format $fmt ($why) but also need".
1256 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1257 " - no way to proceed"
1258 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1259 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1262 sub select_tagformat () {
1264 return if $tagformatfn && !$tagformat_want;
1265 die 'bug' if $tagformatfn && $tagformat_want;
1266 # ... $tagformat_want assigned after previous select_tagformat
1268 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1269 printdebug "select_tagformat supported @supported\n";
1271 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1272 printdebug "select_tagformat specified @$tagformat_want\n";
1274 my ($fmt,$why,$override) = @$tagformat_want;
1276 fail "target distro supports tag formats @supported".
1277 " but have to use $fmt ($why)"
1279 or grep { $_ eq $fmt } @supported;
1281 $tagformat_want = undef;
1283 $tagformatfn = ${*::}{"debiantag_$fmt"};
1285 fail "trying to use unknown tag format \`$fmt' ($why) !"
1286 unless $tagformatfn;
1289 #---------- archive query entrypoints and rest of program ----------
1291 sub canonicalise_suite () {
1292 return if defined $csuite;
1293 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1294 $csuite = archive_query('canonicalise_suite');
1295 if ($isuite ne $csuite) {
1296 progress "canonical suite name for $isuite is $csuite";
1300 sub get_archive_dsc () {
1301 canonicalise_suite();
1302 my @vsns = archive_query('archive_query');
1303 foreach my $vinfo (@vsns) {
1304 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1305 $dscurl = access_cfg('mirror').$subpath;
1306 $dscdata = url_get($dscurl);
1308 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1313 $digester->add($dscdata);
1314 my $got = $digester->hexdigest();
1316 fail "$dscurl has hash $got but".
1317 " archive told us to expect $digest";
1319 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1320 printdebug Dumper($dscdata) if $debuglevel>1;
1321 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1322 printdebug Dumper($dsc) if $debuglevel>1;
1323 my $fmt = getfield $dsc, 'Format';
1324 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1325 "unsupported source format $fmt, sorry";
1327 $dsc_checked = !!$digester;
1328 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1332 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1335 sub check_for_git ();
1336 sub check_for_git () {
1338 my $how = access_cfg('git-check');
1339 if ($how eq 'ssh-cmd') {
1341 (access_cfg_ssh, access_gituserhost(),
1342 access_runeinfo("git-check $package").
1343 " set -e; cd ".access_cfg('git-path').";".
1344 " if test -d $package.git; then echo 1; else echo 0; fi");
1345 my $r= cmdoutput @cmd;
1346 if (defined $r and $r =~ m/^divert (\w+)$/) {
1348 my ($usedistro,) = access_distros();
1349 # NB that if we are pushing, $usedistro will be $distro/push
1350 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1351 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1352 progress "diverting to $divert (using config for $instead_distro)";
1353 return check_for_git();
1355 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1357 } elsif ($how eq 'url') {
1358 my $prefix = access_cfg('git-check-url','git-url');
1359 my $suffix = access_cfg('git-check-suffix','git-suffix',
1360 'RETURN-UNDEF') // '.git';
1361 my $url = "$prefix/$package$suffix";
1362 my @cmd = (@curl, qw(-sS -I), $url);
1363 my $result = cmdoutput @cmd;
1364 $result =~ s/^\S+ 200 .*\n\r?\n//;
1365 # curl -sS -I with https_proxy prints
1366 # HTTP/1.0 200 Connection established
1367 $result =~ m/^\S+ (404|200) /s or
1368 fail "unexpected results from git check query - ".
1369 Dumper($prefix, $result);
1371 if ($code eq '404') {
1373 } elsif ($code eq '200') {
1378 } elsif ($how eq 'true') {
1380 } elsif ($how eq 'false') {
1383 badcfg "unknown git-check \`$how'";
1387 sub create_remote_git_repo () {
1388 my $how = access_cfg('git-create');
1389 if ($how eq 'ssh-cmd') {
1391 (access_cfg_ssh, access_gituserhost(),
1392 access_runeinfo("git-create $package").
1393 "set -e; cd ".access_cfg('git-path').";".
1394 " cp -a _template $package.git");
1395 } elsif ($how eq 'true') {
1398 badcfg "unknown git-create \`$how'";
1402 our ($dsc_hash,$lastpush_mergeinput);
1404 our $ud = '.git/dgit/unpack';
1414 sub mktree_in_ud_here () {
1415 runcmd qw(git init -q);
1416 runcmd qw(git config gc.auto 0);
1417 rmtree('.git/objects');
1418 symlink '../../../../objects','.git/objects' or die $!;
1421 sub git_write_tree () {
1422 my $tree = cmdoutput @git, qw(write-tree);
1423 $tree =~ m/^\w+$/ or die "$tree ?";
1427 sub remove_stray_gits () {
1428 my @gitscmd = qw(find -name .git -prune -print0);
1429 debugcmd "|",@gitscmd;
1430 open GITS, "-|", @gitscmd or die $!;
1435 print STDERR "$us: warning: removing from source package: ",
1436 (messagequote $_), "\n";
1440 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1443 sub mktree_in_ud_from_only_subdir (;$) {
1446 # changes into the subdir
1448 die "expected one subdir but found @dirs ?" unless @dirs==1;
1449 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1453 remove_stray_gits();
1454 mktree_in_ud_here();
1456 my ($format, $fopts) = get_source_format();
1457 if (madformat($format)) {
1462 runcmd @git, qw(add -Af);
1463 my $tree=git_write_tree();
1464 return ($tree,$dir);
1467 our @files_csum_info_fields =
1468 (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1469 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1470 ['Files', 'Digest::MD5', 'new()']);
1472 sub dsc_files_info () {
1473 foreach my $csumi (@files_csum_info_fields) {
1474 my ($fname, $module, $method) = @$csumi;
1475 my $field = $dsc->{$fname};
1476 next unless defined $field;
1477 eval "use $module; 1;" or die $@;
1479 foreach (split /\n/, $field) {
1481 m/^(\w+) (\d+) (\S+)$/ or
1482 fail "could not parse .dsc $fname line \`$_'";
1483 my $digester = eval "$module"."->$method;" or die $@;
1488 Digester => $digester,
1493 fail "missing any supported Checksums-* or Files field in ".
1494 $dsc->get_option('name');
1498 map { $_->{Filename} } dsc_files_info();
1501 sub files_compare_inputs (@) {
1506 my $showinputs = sub {
1507 return join "; ", map { $_->get_option('name') } @$inputs;
1510 foreach my $in (@$inputs) {
1512 my $in_name = $in->get_option('name');
1514 printdebug "files_compare_inputs $in_name\n";
1516 foreach my $csumi (@files_csum_info_fields) {
1517 my ($fname) = @$csumi;
1518 printdebug "files_compare_inputs $in_name $fname\n";
1520 my $field = $in->{$fname};
1521 next unless defined $field;
1524 foreach (split /\n/, $field) {
1527 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1528 fail "could not parse $in_name $fname line \`$_'";
1530 printdebug "files_compare_inputs $in_name $fname $f\n";
1534 my $re = \ $record{$f}{$fname};
1536 $fchecked{$f}{$in_name} = 1;
1538 fail "hash or size of $f varies in $fname fields".
1539 " (between: ".$showinputs->().")";
1544 @files = sort @files;
1545 $expected_files //= \@files;
1546 "@$expected_files" eq "@files" or
1547 fail "file list in $in_name varies between hash fields!";
1550 fail "$in_name has no files list field(s)";
1552 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1555 grep { keys %$_ == @$inputs-1 } values %fchecked
1556 or fail "no file appears in all file lists".
1557 " (looked in: ".$showinputs->().")";
1560 sub is_orig_file_in_dsc ($$) {
1561 my ($f, $dsc_files_info) = @_;
1562 return 0 if @$dsc_files_info <= 1;
1563 # One file means no origs, and the filename doesn't have a "what
1564 # part of dsc" component. (Consider versions ending `.orig'.)
1565 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1569 sub is_orig_file_of_vsn ($$) {
1570 my ($f, $upstreamvsn) = @_;
1571 my $base = srcfn $upstreamvsn, '';
1572 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1576 sub make_commit ($) {
1578 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1581 sub make_commit_text ($) {
1584 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1586 print Dumper($text) if $debuglevel > 1;
1587 my $child = open2($out, $in, @cmd) or die $!;
1590 print $in $text or die $!;
1591 close $in or die $!;
1593 $h =~ m/^\w+$/ or die;
1595 printdebug "=> $h\n";
1598 waitpid $child, 0 == $child or die "$child $!";
1599 $? and failedcmd @cmd;
1603 sub clogp_authline ($) {
1605 my $author = getfield $clogp, 'Maintainer';
1606 $author =~ s#,.*##ms;
1607 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1608 my $authline = "$author $date";
1609 $authline =~ m/$git_authline_re/o or
1610 fail "unexpected commit author line format \`$authline'".
1611 " (was generated from changelog Maintainer field)";
1612 return ($1,$2,$3) if wantarray;
1616 sub vendor_patches_distro ($$) {
1617 my ($checkdistro, $what) = @_;
1618 return unless defined $checkdistro;
1620 my $series = "debian/patches/\L$checkdistro\E.series";
1621 printdebug "checking for vendor-specific $series ($what)\n";
1623 if (!open SERIES, "<", $series) {
1624 die "$series $!" unless $!==ENOENT;
1633 Unfortunately, this source package uses a feature of dpkg-source where
1634 the same source package unpacks to different source code on different
1635 distros. dgit cannot safely operate on such packages on affected
1636 distros, because the meaning of source packages is not stable.
1638 Please ask the distro/maintainer to remove the distro-specific series
1639 files and use a different technique (if necessary, uploading actually
1640 different packages, if different distros are supposed to have
1644 fail "Found active distro-specific series file for".
1645 " $checkdistro ($what): $series, cannot continue";
1647 die "$series $!" if SERIES->error;
1651 sub check_for_vendor_patches () {
1652 # This dpkg-source feature doesn't seem to be documented anywhere!
1653 # But it can be found in the changelog (reformatted):
1655 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1656 # Author: Raphael Hertzog <hertzog@debian.org>
1657 # Date: Sun Oct 3 09:36:48 2010 +0200
1659 # dpkg-source: correctly create .pc/.quilt_series with alternate
1662 # If you have debian/patches/ubuntu.series and you were
1663 # unpacking the source package on ubuntu, quilt was still
1664 # directed to debian/patches/series instead of
1665 # debian/patches/ubuntu.series.
1667 # debian/changelog | 3 +++
1668 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1669 # 2 files changed, 6 insertions(+), 1 deletion(-)
1672 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1673 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1674 "Dpkg::Vendor \`current vendor'");
1675 vendor_patches_distro(access_basedistro(),
1676 "distro being accessed");
1679 sub generate_commits_from_dsc () {
1680 # See big comment in fetch_from_archive, below.
1681 # See also README.dsc-import.
1685 my @dfi = dsc_files_info();
1686 foreach my $fi (@dfi) {
1687 my $f = $fi->{Filename};
1688 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1690 link_ltarget "../../../$f", $f
1694 complete_file_from_dsc('.', $fi)
1697 if (is_orig_file_in_dsc($f, \@dfi)) {
1698 link $f, "../../../../$f"
1704 # We unpack and record the orig tarballs first, so that we only
1705 # need disk space for one private copy of the unpacked source.
1706 # But we can't make them into commits until we have the metadata
1707 # from the debian/changelog, so we record the tree objects now and
1708 # make them into commits later.
1710 my $upstreamv = $dsc->{version};
1711 $upstreamv =~ s/-[^-]+$//;
1712 my $orig_f_base = srcfn $upstreamv, '';
1714 foreach my $fi (@dfi) {
1715 # We actually import, and record as a commit, every tarball
1716 # (unless there is only one file, in which case there seems
1719 my $f = $fi->{Filename};
1720 printdebug "import considering $f ";
1721 (printdebug "only one dfi\n"), next if @dfi == 1;
1722 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1723 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1727 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1729 printdebug "Y ", (join ' ', map { $_//"(none)" }
1730 $compr_ext, $orig_f_part
1733 my $input = new IO::File $f, '<' or die "$f $!";
1737 if (defined $compr_ext) {
1739 Dpkg::Compression::compression_guess_from_filename $f;
1740 fail "Dpkg::Compression cannot handle file $f in source package"
1741 if defined $compr_ext && !defined $cname;
1743 new Dpkg::Compression::Process compression => $cname;
1744 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1745 my $compr_fh = new IO::Handle;
1746 my $compr_pid = open $compr_fh, "-|" // die $!;
1748 open STDIN, "<&", $input or die $!;
1750 die "dgit (child): exec $compr_cmd[0]: $!\n";
1755 rmtree "../unpack-tar";
1756 mkdir "../unpack-tar" or die $!;
1757 my @tarcmd = qw(tar -x -f -
1758 --no-same-owner --no-same-permissions
1759 --no-acls --no-xattrs --no-selinux);
1760 my $tar_pid = fork // die $!;
1762 chdir "../unpack-tar" or die $!;
1763 open STDIN, "<&", $input or die $!;
1765 die "dgit (child): exec $tarcmd[0]: $!";
1767 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1768 !$? or failedcmd @tarcmd;
1771 (@compr_cmd ? failedcmd @compr_cmd
1773 # finally, we have the results in "tarball", but maybe
1774 # with the wrong permissions
1776 runcmd qw(chmod -R +rwX ../unpack-tar);
1777 changedir "../unpack-tar";
1778 my ($tree) = mktree_in_ud_from_only_subdir(1);
1779 changedir "../../unpack";
1780 rmtree "../unpack-tar";
1782 my $ent = [ $f, $tree ];
1784 Orig => !!$orig_f_part,
1785 Sort => (!$orig_f_part ? 2 :
1786 $orig_f_part =~ m/-/g ? 1 :
1794 # put any without "_" first (spec is not clear whether files
1795 # are always in the usual order). Tarballs without "_" are
1796 # the main orig or the debian tarball.
1797 $a->{Sort} <=> $b->{Sort} or
1801 my $any_orig = grep { $_->{Orig} } @tartrees;
1803 my $dscfn = "$package.dsc";
1805 my $treeimporthow = 'package';
1807 open D, ">", $dscfn or die "$dscfn: $!";
1808 print D $dscdata or die "$dscfn: $!";
1809 close D or die "$dscfn: $!";
1810 my @cmd = qw(dpkg-source);
1811 push @cmd, '--no-check' if $dsc_checked;
1812 if (madformat $dsc->{format}) {
1813 push @cmd, '--skip-patches';
1814 $treeimporthow = 'unpatched';
1816 push @cmd, qw(-x --), $dscfn;
1819 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1820 if (madformat $dsc->{format}) {
1821 check_for_vendor_patches();
1825 if (madformat $dsc->{format}) {
1826 my @pcmd = qw(dpkg-source --before-build .);
1827 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1829 runcmd @git, qw(add -Af);
1830 $dappliedtree = git_write_tree();
1833 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1834 debugcmd "|",@clogcmd;
1835 open CLOGS, "-|", @clogcmd or die $!;
1840 printdebug "import clog search...\n";
1843 my $stanzatext = do { local $/=""; <CLOGS>; };
1844 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1845 last if !defined $stanzatext;
1847 my $desc = "package changelog, entry no.$.";
1848 open my $stanzafh, "<", \$stanzatext or die;
1849 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1850 $clogp //= $thisstanza;
1852 printdebug "import clog $thisstanza->{version} $desc...\n";
1854 last if !$any_orig; # we don't need $r1clogp
1856 # We look for the first (most recent) changelog entry whose
1857 # version number is lower than the upstream version of this
1858 # package. Then the last (least recent) previous changelog
1859 # entry is treated as the one which introduced this upstream
1860 # version and used for the synthetic commits for the upstream
1863 # One might think that a more sophisticated algorithm would be
1864 # necessary. But: we do not want to scan the whole changelog
1865 # file. Stopping when we see an earlier version, which
1866 # necessarily then is an earlier upstream version, is the only
1867 # realistic way to do that. Then, either the earliest
1868 # changelog entry we have seen so far is indeed the earliest
1869 # upload of this upstream version; or there are only changelog
1870 # entries relating to later upstream versions (which is not
1871 # possible unless the changelog and .dsc disagree about the
1872 # version). Then it remains to choose between the physically
1873 # last entry in the file, and the one with the lowest version
1874 # number. If these are not the same, we guess that the
1875 # versions were created in a non-monotic order rather than
1876 # that the changelog entries have been misordered.
1878 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
1880 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
1881 $r1clogp = $thisstanza;
1883 printdebug "import clog $r1clogp->{version} becomes r1\n";
1885 die $! if CLOGS->error;
1886 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
1888 $clogp or fail "package changelog has no entries!";
1890 my $authline = clogp_authline $clogp;
1891 my $changes = getfield $clogp, 'Changes';
1892 my $cversion = getfield $clogp, 'Version';
1895 $r1clogp //= $clogp; # maybe there's only one entry;
1896 my $r1authline = clogp_authline $r1clogp;
1897 # Strictly, r1authline might now be wrong if it's going to be
1898 # unused because !$any_orig. Whatever.
1900 printdebug "import tartrees authline $authline\n";
1901 printdebug "import tartrees r1authline $r1authline\n";
1903 foreach my $tt (@tartrees) {
1904 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
1906 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
1909 committer $r1authline
1913 [dgit import orig $tt->{F}]
1921 [dgit import tarball $package $cversion $tt->{F}]
1926 printdebug "import main commit\n";
1928 open C, ">../commit.tmp" or die $!;
1929 print C <<END or die $!;
1932 print C <<END or die $! foreach @tartrees;
1935 print C <<END or die $!;
1941 [dgit import $treeimporthow $package $cversion]
1945 my $rawimport_hash = make_commit qw(../commit.tmp);
1947 if (madformat $dsc->{format}) {
1948 printdebug "import apply patches...\n";
1950 # regularise the state of the working tree so that
1951 # the checkout of $rawimport_hash works nicely.
1952 my $dappliedcommit = make_commit_text(<<END);
1959 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
1961 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
1963 # We need the answers to be reproducible
1964 my @authline = clogp_authline($clogp);
1965 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
1966 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
1967 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
1968 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
1969 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
1970 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
1972 my $path = $ENV{PATH} or die;
1974 foreach my $use_absurd (qw(0 1)) {
1975 local $ENV{PATH} = $path;
1978 progress "warning: $@";
1979 $path = "$absurdity:$path";
1980 progress "$us: trying slow absurd-git-apply...";
1981 rename "../../gbp-pq-output","../../gbp-pq-output.0"
1986 die "forbid absurd git-apply\n" if $use_absurd
1987 && forceing [qw(import-gitapply-no-absurd)];
1988 die "only absurd git-apply!\n" if !$use_absurd
1989 && forceing [qw(import-gitapply-absurd)];
1991 local $ENV{PATH} = $path if $use_absurd;
1993 my @showcmd = (gbp_pq, qw(import));
1994 my @realcmd = shell_cmd
1995 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
1996 debugcmd "+",@realcmd;
1997 if (system @realcmd) {
1998 die +(shellquote @showcmd).
2000 failedcmd_waitstatus()."\n";
2003 my $gapplied = git_rev_parse('HEAD');
2004 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2005 $gappliedtree eq $dappliedtree or
2007 gbp-pq import and dpkg-source disagree!
2008 gbp-pq import gave commit $gapplied
2009 gbp-pq import gave tree $gappliedtree
2010 dpkg-source --before-build gave tree $dappliedtree
2012 $rawimport_hash = $gapplied;
2017 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2022 progress "synthesised git commit from .dsc $cversion";
2024 my $rawimport_mergeinput = {
2025 Commit => $rawimport_hash,
2026 Info => "Import of source package",
2028 my @output = ($rawimport_mergeinput);
2030 if ($lastpush_mergeinput) {
2031 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2032 my $oversion = getfield $oldclogp, 'Version';
2034 version_compare($oversion, $cversion);
2036 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2037 { Message => <<END, ReverseParents => 1 });
2038 Record $package ($cversion) in archive suite $csuite
2040 } elsif ($vcmp > 0) {
2041 print STDERR <<END or die $!;
2043 Version actually in archive: $cversion (older)
2044 Last version pushed with dgit: $oversion (newer or same)
2047 @output = $lastpush_mergeinput;
2049 # Same version. Use what's in the server git branch,
2050 # discarding our own import. (This could happen if the
2051 # server automatically imports all packages into git.)
2052 @output = $lastpush_mergeinput;
2055 changedir '../../../..';
2060 sub complete_file_from_dsc ($$) {
2061 our ($dstdir, $fi) = @_;
2062 # Ensures that we have, in $dir, the file $fi, with the correct
2063 # contents. (Downloading it from alongside $dscurl if necessary.)
2065 my $f = $fi->{Filename};
2066 my $tf = "$dstdir/$f";
2069 if (stat_exists $tf) {
2070 progress "using existing $f";
2073 $furl =~ s{/[^/]+$}{};
2075 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2076 die "$f ?" if $f =~ m#/#;
2077 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2078 return 0 if !act_local();
2082 open F, "<", "$tf" or die "$tf: $!";
2083 $fi->{Digester}->reset();
2084 $fi->{Digester}->addfile(*F);
2085 F->error and die $!;
2086 my $got = $fi->{Digester}->hexdigest();
2087 $got eq $fi->{Hash} or
2088 fail "file $f has hash $got but .dsc".
2089 " demands hash $fi->{Hash} ".
2090 ($downloaded ? "(got wrong file from archive!)"
2091 : "(perhaps you should delete this file?)");
2096 sub ensure_we_have_orig () {
2097 my @dfi = dsc_files_info();
2098 foreach my $fi (@dfi) {
2099 my $f = $fi->{Filename};
2100 next unless is_orig_file_in_dsc($f, \@dfi);
2101 complete_file_from_dsc('..', $fi)
2106 sub git_fetch_us () {
2107 # Want to fetch only what we are going to use, unless
2108 # deliberately-not-ff, in which case we must fetch everything.
2110 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2112 (quiltmode_splitbrain
2113 ? (map { $_->('*',access_basedistro) }
2114 \&debiantag_new, \&debiantag_maintview)
2115 : debiantags('*',access_basedistro));
2116 push @specs, server_branch($csuite);
2117 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2119 # This is rather miserable:
2120 # When git fetch --prune is passed a fetchspec ending with a *,
2121 # it does a plausible thing. If there is no * then:
2122 # - it matches subpaths too, even if the supplied refspec
2123 # starts refs, and behaves completely madly if the source
2124 # has refs/refs/something. (See, for example, Debian #NNNN.)
2125 # - if there is no matching remote ref, it bombs out the whole
2127 # We want to fetch a fixed ref, and we don't know in advance
2128 # if it exists, so this is not suitable.
2130 # Our workaround is to use git ls-remote. git ls-remote has its
2131 # own qairks. Notably, it has the absurd multi-tail-matching
2132 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2133 # refs/refs/foo etc.
2135 # Also, we want an idempotent snapshot, but we have to make two
2136 # calls to the remote: one to git ls-remote and to git fetch. The
2137 # solution is use git ls-remote to obtain a target state, and
2138 # git fetch to try to generate it. If we don't manage to generate
2139 # the target state, we try again.
2141 my $specre = join '|', map {
2147 printdebug "git_fetch_us specre=$specre\n";
2148 my $wanted_rref = sub {
2150 return m/^(?:$specre)$/o;
2153 my $fetch_iteration = 0;
2156 if (++$fetch_iteration > 10) {
2157 fail "too many iterations trying to get sane fetch!";
2160 my @look = map { "refs/$_" } @specs;
2161 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2165 open GITLS, "-|", @lcmd or die $!;
2167 printdebug "=> ", $_;
2168 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2169 my ($objid,$rrefname) = ($1,$2);
2170 if (!$wanted_rref->($rrefname)) {
2172 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2176 $wantr{$rrefname} = $objid;
2179 close GITLS or failedcmd @lcmd;
2181 # OK, now %want is exactly what we want for refs in @specs
2183 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2184 "+refs/$_:".lrfetchrefs."/$_";
2187 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2188 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2191 %lrfetchrefs_f = ();
2194 git_for_each_ref(lrfetchrefs, sub {
2195 my ($objid,$objtype,$lrefname,$reftail) = @_;
2196 $lrfetchrefs_f{$lrefname} = $objid;
2197 $objgot{$objid} = 1;
2200 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2201 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2202 if (!exists $wantr{$rrefname}) {
2203 if ($wanted_rref->($rrefname)) {
2205 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2209 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2212 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2213 delete $lrfetchrefs_f{$lrefname};
2217 foreach my $rrefname (sort keys %wantr) {
2218 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2219 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2220 my $want = $wantr{$rrefname};
2221 next if $got eq $want;
2222 if (!defined $objgot{$want}) {
2224 warning: git ls-remote suggests we want $lrefname
2225 warning: and it should refer to $want
2226 warning: but git fetch didn't fetch that object to any relevant ref.
2227 warning: This may be due to a race with someone updating the server.
2228 warning: Will try again...
2230 next FETCH_ITERATION;
2233 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2235 runcmd_ordryrun_local @git, qw(update-ref -m),
2236 "dgit fetch git fetch fixup", $lrefname, $want;
2237 $lrfetchrefs_f{$lrefname} = $want;
2241 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2242 Dumper(\%lrfetchrefs_f);
2245 my @tagpats = debiantags('*',access_basedistro);
2247 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2248 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2249 printdebug "currently $fullrefname=$objid\n";
2250 $here{$fullrefname} = $objid;
2252 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2253 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2254 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2255 printdebug "offered $lref=$objid\n";
2256 if (!defined $here{$lref}) {
2257 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2258 runcmd_ordryrun_local @upd;
2259 lrfetchref_used $fullrefname;
2260 } elsif ($here{$lref} eq $objid) {
2261 lrfetchref_used $fullrefname;
2264 "Not updateting $lref from $here{$lref} to $objid.\n";
2269 sub mergeinfo_getclogp ($) {
2270 # Ensures thit $mi->{Clogp} exists and returns it
2272 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2275 sub mergeinfo_version ($) {
2276 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2279 sub fetch_from_archive () {
2280 ensure_setup_existing_tree();
2282 # Ensures that lrref() is what is actually in the archive, one way
2283 # or another, according to us - ie this client's
2284 # appropritaely-updated archive view. Also returns the commit id.
2285 # If there is nothing in the archive, leaves lrref alone and
2286 # returns undef. git_fetch_us must have already been called.
2290 foreach my $field (@ourdscfield) {
2291 $dsc_hash = $dsc->{$field};
2292 last if defined $dsc_hash;
2294 if (defined $dsc_hash) {
2295 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2297 progress "last upload to archive specified git hash";
2299 progress "last upload to archive has NO git hash";
2302 progress "no version available from the archive";
2305 # If the archive's .dsc has a Dgit field, there are three
2306 # relevant git commitids we need to choose between and/or merge
2308 # 1. $dsc_hash: the Dgit field from the archive
2309 # 2. $lastpush_hash: the suite branch on the dgit git server
2310 # 3. $lastfetch_hash: our local tracking brach for the suite
2312 # These may all be distinct and need not be in any fast forward
2315 # If the dsc was pushed to this suite, then the server suite
2316 # branch will have been updated; but it might have been pushed to
2317 # a different suite and copied by the archive. Conversely a more
2318 # recent version may have been pushed with dgit but not appeared
2319 # in the archive (yet).
2321 # $lastfetch_hash may be awkward because archive imports
2322 # (particularly, imports of Dgit-less .dscs) are performed only as
2323 # needed on individual clients, so different clients may perform a
2324 # different subset of them - and these imports are only made
2325 # public during push. So $lastfetch_hash may represent a set of
2326 # imports different to a subsequent upload by a different dgit
2329 # Our approach is as follows:
2331 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2332 # descendant of $dsc_hash, then it was pushed by a dgit user who
2333 # had based their work on $dsc_hash, so we should prefer it.
2334 # Otherwise, $dsc_hash was installed into this suite in the
2335 # archive other than by a dgit push, and (necessarily) after the
2336 # last dgit push into that suite (since a dgit push would have
2337 # been descended from the dgit server git branch); thus, in that
2338 # case, we prefer the archive's version (and produce a
2339 # pseudo-merge to overwrite the dgit server git branch).
2341 # (If there is no Dgit field in the archive's .dsc then
2342 # generate_commit_from_dsc uses the version numbers to decide
2343 # whether the suite branch or the archive is newer. If the suite
2344 # branch is newer it ignores the archive's .dsc; otherwise it
2345 # generates an import of the .dsc, and produces a pseudo-merge to
2346 # overwrite the suite branch with the archive contents.)
2348 # The outcome of that part of the algorithm is the `public view',
2349 # and is same for all dgit clients: it does not depend on any
2350 # unpublished history in the local tracking branch.
2352 # As between the public view and the local tracking branch: The
2353 # local tracking branch is only updated by dgit fetch, and
2354 # whenever dgit fetch runs it includes the public view in the
2355 # local tracking branch. Therefore if the public view is not
2356 # descended from the local tracking branch, the local tracking
2357 # branch must contain history which was imported from the archive
2358 # but never pushed; and, its tip is now out of date. So, we make
2359 # a pseudo-merge to overwrite the old imports and stitch the old
2362 # Finally: we do not necessarily reify the public view (as
2363 # described above). This is so that we do not end up stacking two
2364 # pseudo-merges. So what we actually do is figure out the inputs
2365 # to any public view pseudo-merge and put them in @mergeinputs.
2368 # $mergeinputs[]{Commit}
2369 # $mergeinputs[]{Info}
2370 # $mergeinputs[0] is the one whose tree we use
2371 # @mergeinputs is in the order we use in the actual commit)
2374 # $mergeinputs[]{Message} is a commit message to use
2375 # $mergeinputs[]{ReverseParents} if def specifies that parent
2376 # list should be in opposite order
2377 # Such an entry has no Commit or Info. It applies only when found
2378 # in the last entry. (This ugliness is to support making
2379 # identical imports to previous dgit versions.)
2381 my $lastpush_hash = git_get_ref(lrfetchref());
2382 printdebug "previous reference hash=$lastpush_hash\n";
2383 $lastpush_mergeinput = $lastpush_hash && {
2384 Commit => $lastpush_hash,
2385 Info => "dgit suite branch on dgit git server",
2388 my $lastfetch_hash = git_get_ref(lrref());
2389 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2390 my $lastfetch_mergeinput = $lastfetch_hash && {
2391 Commit => $lastfetch_hash,
2392 Info => "dgit client's archive history view",
2395 my $dsc_mergeinput = $dsc_hash && {
2396 Commit => $dsc_hash,
2397 Info => "Dgit field in .dsc from archive",
2401 my $del_lrfetchrefs = sub {
2404 printdebug "del_lrfetchrefs...\n";
2405 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2406 my $objid = $lrfetchrefs_d{$fullrefname};
2407 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2409 $gur ||= new IO::Handle;
2410 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2412 printf $gur "delete %s %s\n", $fullrefname, $objid;
2415 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2419 if (defined $dsc_hash) {
2420 fail "missing remote git history even though dsc has hash -".
2421 " could not find ref ".rref()." at ".access_giturl()
2422 unless $lastpush_hash;
2423 ensure_we_have_orig();
2424 if ($dsc_hash eq $lastpush_hash) {
2425 @mergeinputs = $dsc_mergeinput
2426 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2427 print STDERR <<END or die $!;
2429 Git commit in archive is behind the last version allegedly pushed/uploaded.
2430 Commit referred to by archive: $dsc_hash
2431 Last version pushed with dgit: $lastpush_hash
2434 @mergeinputs = ($lastpush_mergeinput);
2436 # Archive has .dsc which is not a descendant of the last dgit
2437 # push. This can happen if the archive moves .dscs about.
2438 # Just follow its lead.
2439 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2440 progress "archive .dsc names newer git commit";
2441 @mergeinputs = ($dsc_mergeinput);
2443 progress "archive .dsc names other git commit, fixing up";
2444 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2448 @mergeinputs = generate_commits_from_dsc();
2449 # We have just done an import. Now, our import algorithm might
2450 # have been improved. But even so we do not want to generate
2451 # a new different import of the same package. So if the
2452 # version numbers are the same, just use our existing version.
2453 # If the version numbers are different, the archive has changed
2454 # (perhaps, rewound).
2455 if ($lastfetch_mergeinput &&
2456 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2457 (mergeinfo_version $mergeinputs[0]) )) {
2458 @mergeinputs = ($lastfetch_mergeinput);
2460 } elsif ($lastpush_hash) {
2461 # only in git, not in the archive yet
2462 @mergeinputs = ($lastpush_mergeinput);
2463 print STDERR <<END or die $!;
2465 Package not found in the archive, but has allegedly been pushed using dgit.
2469 printdebug "nothing found!\n";
2470 if (defined $skew_warning_vsn) {
2471 print STDERR <<END or die $!;
2473 Warning: relevant archive skew detected.
2474 Archive allegedly contains $skew_warning_vsn
2475 But we were not able to obtain any version from the archive or git.
2479 unshift @end, $del_lrfetchrefs;
2483 if ($lastfetch_hash &&
2485 my $h = $_->{Commit};
2486 $h and is_fast_fwd($lastfetch_hash, $h);
2487 # If true, one of the existing parents of this commit
2488 # is a descendant of the $lastfetch_hash, so we'll
2489 # be ff from that automatically.
2493 push @mergeinputs, $lastfetch_mergeinput;
2496 printdebug "fetch mergeinfos:\n";
2497 foreach my $mi (@mergeinputs) {
2499 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2501 printdebug sprintf " ReverseParents=%d Message=%s",
2502 $mi->{ReverseParents}, $mi->{Message};
2506 my $compat_info= pop @mergeinputs
2507 if $mergeinputs[$#mergeinputs]{Message};
2509 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2512 if (@mergeinputs > 1) {
2514 my $tree_commit = $mergeinputs[0]{Commit};
2516 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2517 $tree =~ m/\n\n/; $tree = $`;
2518 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2521 # We use the changelog author of the package in question the
2522 # author of this pseudo-merge. This is (roughly) correct if
2523 # this commit is simply representing aa non-dgit upload.
2524 # (Roughly because it does not record sponsorship - but we
2525 # don't have sponsorship info because that's in the .changes,
2526 # which isn't in the archivw.)
2528 # But, it might be that we are representing archive history
2529 # updates (including in-archive copies). These are not really
2530 # the responsibility of the person who created the .dsc, but
2531 # there is no-one whose name we should better use. (The
2532 # author of the .dsc-named commit is clearly worse.)
2534 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2535 my $author = clogp_authline $useclogp;
2536 my $cversion = getfield $useclogp, 'Version';
2538 my $mcf = ".git/dgit/mergecommit";
2539 open MC, ">", $mcf or die "$mcf $!";
2540 print MC <<END or die $!;
2544 my @parents = grep { $_->{Commit} } @mergeinputs;
2545 @parents = reverse @parents if $compat_info->{ReverseParents};
2546 print MC <<END or die $! foreach @parents;
2550 print MC <<END or die $!;
2556 if (defined $compat_info->{Message}) {
2557 print MC $compat_info->{Message} or die $!;
2559 print MC <<END or die $!;
2560 Record $package ($cversion) in archive suite $csuite
2564 my $message_add_info = sub {
2566 my $mversion = mergeinfo_version $mi;
2567 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2571 $message_add_info->($mergeinputs[0]);
2572 print MC <<END or die $!;
2573 should be treated as descended from
2575 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2579 $hash = make_commit $mcf;
2581 $hash = $mergeinputs[0]{Commit};
2583 printdebug "fetch hash=$hash\n";
2586 my ($lasth, $what) = @_;
2587 return unless $lasth;
2588 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2591 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2592 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2594 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2595 'DGIT_ARCHIVE', $hash;
2596 cmdoutput @git, qw(log -n2), $hash;
2597 # ... gives git a chance to complain if our commit is malformed
2599 if (defined $skew_warning_vsn) {
2601 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2602 my $gotclogp = commit_getclogp($hash);
2603 my $got_vsn = getfield $gotclogp, 'Version';
2604 printdebug "SKEW CHECK GOT $got_vsn\n";
2605 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2606 print STDERR <<END or die $!;
2608 Warning: archive skew detected. Using the available version:
2609 Archive allegedly contains $skew_warning_vsn
2610 We were able to obtain only $got_vsn
2616 if ($lastfetch_hash ne $hash) {
2617 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2621 dryrun_report @upd_cmd;
2625 lrfetchref_used lrfetchref();
2627 unshift @end, $del_lrfetchrefs;
2631 sub set_local_git_config ($$) {
2633 runcmd @git, qw(config), $k, $v;
2636 sub setup_mergechangelogs (;$) {
2638 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2640 my $driver = 'dpkg-mergechangelogs';
2641 my $cb = "merge.$driver";
2642 my $attrs = '.git/info/attributes';
2643 ensuredir '.git/info';
2645 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2646 if (!open ATTRS, "<", $attrs) {
2647 $!==ENOENT or die "$attrs: $!";
2651 next if m{^debian/changelog\s};
2652 print NATTRS $_, "\n" or die $!;
2654 ATTRS->error and die $!;
2657 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2660 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2661 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2663 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2666 sub setup_useremail (;$) {
2668 return unless $always || access_cfg_bool(1, 'setup-useremail');
2671 my ($k, $envvar) = @_;
2672 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2673 return unless defined $v;
2674 set_local_git_config "user.$k", $v;
2677 $setup->('email', 'DEBEMAIL');
2678 $setup->('name', 'DEBFULLNAME');
2681 sub ensure_setup_existing_tree () {
2682 my $k = "remote.$remotename.skipdefaultupdate";
2683 my $c = git_get_config $k;
2684 return if defined $c;
2685 set_local_git_config $k, 'true';
2688 sub setup_new_tree () {
2689 setup_mergechangelogs();
2695 canonicalise_suite();
2696 badusage "dry run makes no sense with clone" unless act_local();
2697 my $hasgit = check_for_git();
2698 mkdir $dstdir or fail "create \`$dstdir': $!";
2700 runcmd @git, qw(init -q);
2701 my $giturl = access_giturl(1);
2702 if (defined $giturl) {
2703 open H, "> .git/HEAD" or die $!;
2704 print H "ref: ".lref()."\n" or die $!;
2706 runcmd @git, qw(remote add), 'origin', $giturl;
2709 progress "fetching existing git history";
2711 runcmd_ordryrun_local @git, qw(fetch origin);
2713 progress "starting new git history";
2715 fetch_from_archive() or no_such_package;
2716 my $vcsgiturl = $dsc->{'Vcs-Git'};
2717 if (length $vcsgiturl) {
2718 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2719 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2722 runcmd @git, qw(reset --hard), lrref();
2723 printdone "ready for work in $dstdir";
2727 if (check_for_git()) {
2730 fetch_from_archive() or no_such_package();
2731 printdone "fetched into ".lrref();
2736 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2738 printdone "fetched to ".lrref()." and merged into HEAD";
2741 sub check_not_dirty () {
2742 foreach my $f (qw(local-options local-patch-header)) {
2743 if (stat_exists "debian/source/$f") {
2744 fail "git tree contains debian/source/$f";
2748 return if $ignoredirty;
2750 my @cmd = (@git, qw(diff --quiet HEAD));
2752 $!=0; $?=-1; system @cmd;
2755 fail "working tree is dirty (does not match HEAD)";
2761 sub commit_admin ($) {
2764 runcmd_ordryrun_local @git, qw(commit -m), $m;
2767 sub commit_quilty_patch () {
2768 my $output = cmdoutput @git, qw(status --porcelain);
2770 foreach my $l (split /\n/, $output) {
2771 next unless $l =~ m/\S/;
2772 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2776 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2778 progress "nothing quilty to commit, ok.";
2781 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2782 runcmd_ordryrun_local @git, qw(add -f), @adds;
2784 Commit Debian 3.0 (quilt) metadata
2786 [dgit ($our_version) quilt-fixup]
2790 sub get_source_format () {
2792 if (open F, "debian/source/options") {
2796 s/\s+$//; # ignore missing final newline
2798 my ($k, $v) = ($`, $'); #');
2799 $v =~ s/^"(.*)"$/$1/;
2805 F->error and die $!;
2808 die $! unless $!==&ENOENT;
2811 if (!open F, "debian/source/format") {
2812 die $! unless $!==&ENOENT;
2816 F->error and die $!;
2818 return ($_, \%options);
2821 sub madformat_wantfixup ($) {
2823 return 0 unless $format eq '3.0 (quilt)';
2824 our $quilt_mode_warned;
2825 if ($quilt_mode eq 'nocheck') {
2826 progress "Not doing any fixup of \`$format' due to".
2827 " ----no-quilt-fixup or --quilt=nocheck"
2828 unless $quilt_mode_warned++;
2831 progress "Format \`$format', need to check/update patch stack"
2832 unless $quilt_mode_warned++;
2836 # An "infopair" is a tuple [ $thing, $what ]
2837 # (often $thing is a commit hash; $what is a description)
2839 sub infopair_cond_equal ($$) {
2841 $x->[0] eq $y->[0] or fail <<END;
2842 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
2846 sub infopair_lrf_tag_lookup ($$) {
2847 my ($tagnames, $what) = @_;
2848 # $tagname may be an array ref
2849 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
2850 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
2851 foreach my $tagname (@tagnames) {
2852 my $lrefname = lrfetchrefs."/tags/$tagname";
2853 my $tagobj = $lrfetchrefs_f{$lrefname};
2854 next unless defined $tagobj;
2855 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
2856 return [ git_rev_parse($tagobj), $what ];
2858 fail @tagnames==1 ? <<END : <<END;
2859 Wanted tag $what (@tagnames) on dgit server, but not found
2861 Wanted tag $what (one of: @tagnames) on dgit server, but not found
2865 sub infopair_cond_ff ($$) {
2866 my ($anc,$desc) = @_;
2867 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
2868 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
2872 sub pseudomerge_version_check ($$) {
2873 my ($clogp, $archive_hash) = @_;
2875 my $arch_clogp = commit_getclogp $archive_hash;
2876 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
2877 'version currently in archive' ];
2878 if (defined $overwrite_version) {
2879 if (length $overwrite_version) {
2880 infopair_cond_equal([ $overwrite_version,
2881 '--overwrite= version' ],
2884 my $v = $i_arch_v->[0];
2885 progress "Checking package changelog for archive version $v ...";
2887 my @xa = ("-f$v", "-t$v");
2888 my $vclogp = parsechangelog @xa;
2889 my $cv = [ (getfield $vclogp, 'Version'),
2890 "Version field from dpkg-parsechangelog @xa" ];
2891 infopair_cond_equal($i_arch_v, $cv);
2894 $@ =~ s/^dgit: //gm;
2896 "Perhaps debian/changelog does not mention $v ?";
2901 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
2905 sub pseudomerge_make_commit ($$$$ $$) {
2906 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
2907 $msg_cmd, $msg_msg) = @_;
2908 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
2910 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
2911 my $authline = clogp_authline $clogp;
2915 !defined $overwrite_version ? ""
2916 : !length $overwrite_version ? " --overwrite"
2917 : " --overwrite=".$overwrite_version;
2920 my $pmf = ".git/dgit/pseudomerge";
2921 open MC, ">", $pmf or die "$pmf $!";
2922 print MC <<END or die $!;
2925 parent $archive_hash
2935 return make_commit($pmf);
2938 sub splitbrain_pseudomerge ($$$$) {
2939 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
2940 # => $merged_dgitview
2941 printdebug "splitbrain_pseudomerge...\n";
2943 # We: debian/PREVIOUS HEAD($maintview)
2944 # expect: o ----------------- o
2947 # a/d/PREVIOUS $dgitview
2950 # we do: `------------------ o
2954 return $dgitview unless defined $archive_hash;
2956 printdebug "splitbrain_pseudomerge...\n";
2958 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
2960 if (!defined $overwrite_version) {
2961 progress "Checking that HEAD inciudes all changes in archive...";
2964 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
2966 if (defined $overwrite_version) {
2968 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
2969 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
2970 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
2971 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
2972 my $i_archive = [ $archive_hash, "current archive contents" ];
2974 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
2976 infopair_cond_equal($i_dgit, $i_archive);
2977 infopair_cond_ff($i_dep14, $i_dgit);
2978 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
2982 $us: check failed (maybe --overwrite is needed, consult documentation)
2987 my $r = pseudomerge_make_commit
2988 $clogp, $dgitview, $archive_hash, $i_arch_v,
2989 "dgit --quilt=$quilt_mode",
2990 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
2991 Declare fast forward from $i_arch_v->[0]
2993 Make fast forward from $i_arch_v->[0]
2996 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3000 sub plain_overwrite_pseudomerge ($$$) {
3001 my ($clogp, $head, $archive_hash) = @_;
3003 printdebug "plain_overwrite_pseudomerge...";
3005 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3007 return $head if is_fast_fwd $archive_hash, $head;
3009 my $m = "Declare fast forward from $i_arch_v->[0]";
3011 my $r = pseudomerge_make_commit
3012 $clogp, $head, $archive_hash, $i_arch_v,
3015 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3017 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3021 sub push_parse_changelog ($) {
3024 my $clogp = Dpkg::Control::Hash->new();
3025 $clogp->load($clogpfn) or die;
3027 $package = getfield $clogp, 'Source';
3028 my $cversion = getfield $clogp, 'Version';
3029 my $tag = debiantag($cversion, access_basedistro);
3030 runcmd @git, qw(check-ref-format), $tag;
3032 my $dscfn = dscfn($cversion);
3034 return ($clogp, $cversion, $dscfn);
3037 sub push_parse_dsc ($$$) {
3038 my ($dscfn,$dscfnwhat, $cversion) = @_;
3039 $dsc = parsecontrol($dscfn,$dscfnwhat);
3040 my $dversion = getfield $dsc, 'Version';
3041 my $dscpackage = getfield $dsc, 'Source';
3042 ($dscpackage eq $package && $dversion eq $cversion) or
3043 fail "$dscfn is for $dscpackage $dversion".
3044 " but debian/changelog is for $package $cversion";
3047 sub push_tagwants ($$$$) {
3048 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3051 TagFn => \&debiantag,
3056 if (defined $maintviewhead) {
3058 TagFn => \&debiantag_maintview,
3059 Objid => $maintviewhead,
3060 TfSuffix => '-maintview',
3064 foreach my $tw (@tagwants) {
3065 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
3066 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3068 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3072 sub push_mktags ($$ $$ $) {
3074 $changesfile,$changesfilewhat,
3077 die unless $tagwants->[0]{View} eq 'dgit';
3079 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3080 $dsc->save("$dscfn.tmp") or die $!;
3082 my $changes = parsecontrol($changesfile,$changesfilewhat);
3083 foreach my $field (qw(Source Distribution Version)) {
3084 $changes->{$field} eq $clogp->{$field} or
3085 fail "changes field $field \`$changes->{$field}'".
3086 " does not match changelog \`$clogp->{$field}'";
3089 my $cversion = getfield $clogp, 'Version';
3090 my $clogsuite = getfield $clogp, 'Distribution';
3092 # We make the git tag by hand because (a) that makes it easier
3093 # to control the "tagger" (b) we can do remote signing
3094 my $authline = clogp_authline $clogp;
3095 my $delibs = join(" ", "",@deliberatelies);
3096 my $declaredistro = access_basedistro();
3100 my $tfn = $tw->{Tfn};
3101 my $head = $tw->{Objid};
3102 my $tag = $tw->{Tag};
3104 open TO, '>', $tfn->('.tmp') or die $!;
3105 print TO <<END or die $!;
3112 if ($tw->{View} eq 'dgit') {
3113 print TO <<END or die $!;
3114 $package release $cversion for $clogsuite ($csuite) [dgit]
3115 [dgit distro=$declaredistro$delibs]
3117 foreach my $ref (sort keys %previously) {
3118 print TO <<END or die $!;
3119 [dgit previously:$ref=$previously{$ref}]
3122 } elsif ($tw->{View} eq 'maint') {
3123 print TO <<END or die $!;
3124 $package release $cversion for $clogsuite ($csuite)
3125 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3128 die Dumper($tw)."?";
3133 my $tagobjfn = $tfn->('.tmp');
3135 if (!defined $keyid) {
3136 $keyid = access_cfg('keyid','RETURN-UNDEF');
3138 if (!defined $keyid) {
3139 $keyid = getfield $clogp, 'Maintainer';
3141 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3142 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3143 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3144 push @sign_cmd, $tfn->('.tmp');
3145 runcmd_ordryrun @sign_cmd;
3147 $tagobjfn = $tfn->('.signed.tmp');
3148 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3149 $tfn->('.tmp'), $tfn->('.tmp.asc');
3155 my @r = map { $mktag->($_); } @$tagwants;
3159 sub sign_changes ($) {
3160 my ($changesfile) = @_;
3162 my @debsign_cmd = @debsign;
3163 push @debsign_cmd, "-k$keyid" if defined $keyid;
3164 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3165 push @debsign_cmd, $changesfile;
3166 runcmd_ordryrun @debsign_cmd;
3171 printdebug "actually entering push\n";
3173 supplementary_message(<<'END');
3174 Push failed, while checking state of the archive.
3175 You can retry the push, after fixing the problem, if you like.
3177 if (check_for_git()) {
3180 my $archive_hash = fetch_from_archive();
3181 if (!$archive_hash) {
3183 fail "package appears to be new in this suite;".
3184 " if this is intentional, use --new";
3187 supplementary_message(<<'END');
3188 Push failed, while preparing your push.
3189 You can retry the push, after fixing the problem, if you like.
3192 need_tagformat 'new', "quilt mode $quilt_mode"
3193 if quiltmode_splitbrain;
3197 access_giturl(); # check that success is vaguely likely
3200 my $clogpfn = ".git/dgit/changelog.822.tmp";
3201 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3203 responder_send_file('parsed-changelog', $clogpfn);
3205 my ($clogp, $cversion, $dscfn) =
3206 push_parse_changelog("$clogpfn");
3208 my $dscpath = "$buildproductsdir/$dscfn";
3209 stat_exists $dscpath or
3210 fail "looked for .dsc $dscfn, but $!;".
3211 " maybe you forgot to build";
3213 responder_send_file('dsc', $dscpath);
3215 push_parse_dsc($dscpath, $dscfn, $cversion);
3217 my $format = getfield $dsc, 'Format';
3218 printdebug "format $format\n";
3220 my $actualhead = git_rev_parse('HEAD');
3221 my $dgithead = $actualhead;
3222 my $maintviewhead = undef;
3224 if (madformat_wantfixup($format)) {
3225 # user might have not used dgit build, so maybe do this now:
3226 if (quiltmode_splitbrain()) {
3227 my $upstreamversion = $clogp->{Version};
3228 $upstreamversion =~ s/-[^-]*$//;
3230 quilt_make_fake_dsc($upstreamversion);
3232 ($dgithead, $cachekey) =
3233 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3235 "--quilt=$quilt_mode but no cached dgit view:
3236 perhaps tree changed since dgit build[-source] ?";
3238 $dgithead = splitbrain_pseudomerge($clogp,
3239 $actualhead, $dgithead,
3241 $maintviewhead = $actualhead;
3242 changedir '../../../..';
3243 prep_ud(); # so _only_subdir() works, below
3245 commit_quilty_patch();
3249 if (defined $overwrite_version && !defined $maintviewhead) {
3250 $dgithead = plain_overwrite_pseudomerge($clogp,
3258 if ($archive_hash) {
3259 if (is_fast_fwd($archive_hash, $dgithead)) {
3261 } elsif (deliberately_not_fast_forward) {
3264 fail "dgit push: HEAD is not a descendant".
3265 " of the archive's version.\n".
3266 "To overwrite the archive's contents,".
3267 " pass --overwrite[=VERSION].\n".
3268 "To rewind history, if permitted by the archive,".
3269 " use --deliberately-not-fast-forward.";
3274 progress "checking that $dscfn corresponds to HEAD";
3275 runcmd qw(dpkg-source -x --),
3276 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3277 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3278 check_for_vendor_patches() if madformat($dsc->{format});
3279 changedir '../../../..';
3280 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3281 debugcmd "+",@diffcmd;
3283 my $r = system @diffcmd;
3286 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3288 HEAD specifies a different tree to $dscfn:
3290 Perhaps you forgot to build. Or perhaps there is a problem with your
3291 source tree (see dgit(7) for some hints). To see a full diff, run
3298 if (!$changesfile) {
3299 my $pat = changespat $cversion;
3300 my @cs = glob "$buildproductsdir/$pat";
3301 fail "failed to find unique changes file".
3302 " (looked for $pat in $buildproductsdir);".
3303 " perhaps you need to use dgit -C"
3305 ($changesfile) = @cs;
3307 $changesfile = "$buildproductsdir/$changesfile";
3310 # Check that changes and .dsc agree enough
3311 $changesfile =~ m{[^/]*$};
3312 files_compare_inputs($dsc, parsecontrol($changesfile,$&))
3313 unless forceing [qw(dsc-changes-mismatch)];
3315 # Checks complete, we're going to try and go ahead:
3317 responder_send_file('changes',$changesfile);
3318 responder_send_command("param head $dgithead");
3319 responder_send_command("param csuite $csuite");
3320 responder_send_command("param tagformat $tagformat");
3321 if (defined $maintviewhead) {
3322 die unless ($protovsn//4) >= 4;
3323 responder_send_command("param maint-view $maintviewhead");
3326 if (deliberately_not_fast_forward) {
3327 git_for_each_ref(lrfetchrefs, sub {
3328 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3329 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3330 responder_send_command("previously $rrefname=$objid");
3331 $previously{$rrefname} = $objid;
3335 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3339 supplementary_message(<<'END');
3340 Push failed, while signing the tag.
3341 You can retry the push, after fixing the problem, if you like.
3343 # If we manage to sign but fail to record it anywhere, it's fine.
3344 if ($we_are_responder) {
3345 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3346 responder_receive_files('signed-tag', @tagobjfns);
3348 @tagobjfns = push_mktags($clogp,$dscpath,
3349 $changesfile,$changesfile,
3352 supplementary_message(<<'END');
3353 Push failed, *after* signing the tag.
3354 If you want to try again, you should use a new version number.
3357 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3359 foreach my $tw (@tagwants) {
3360 my $tag = $tw->{Tag};
3361 my $tagobjfn = $tw->{TagObjFn};
3363 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3364 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3365 runcmd_ordryrun_local
3366 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3369 supplementary_message(<<'END');
3370 Push failed, while updating the remote git repository - see messages above.
3371 If you want to try again, you should use a new version number.
3373 if (!check_for_git()) {
3374 create_remote_git_repo();
3377 my @pushrefs = $forceflag.$dgithead.":".rrref();
3378 foreach my $tw (@tagwants) {
3379 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3382 runcmd_ordryrun @git,
3383 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3384 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3386 supplementary_message(<<'END');
3387 Push failed, after updating the remote git repository.
3388 If you want to try again, you must use a new version number.
3390 if ($we_are_responder) {
3391 my $dryrunsuffix = act_local() ? "" : ".tmp";
3392 responder_receive_files('signed-dsc-changes',
3393 "$dscpath$dryrunsuffix",
3394 "$changesfile$dryrunsuffix");
3397 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3399 progress "[new .dsc left in $dscpath.tmp]";
3401 sign_changes $changesfile;
3404 supplementary_message(<<END);
3405 Push failed, while uploading package(s) to the archive server.
3406 You can retry the upload of exactly these same files with dput of:
3408 If that .changes file is broken, you will need to use a new version
3409 number for your next attempt at the upload.
3411 my $host = access_cfg('upload-host','RETURN-UNDEF');
3412 my @hostarg = defined($host) ? ($host,) : ();
3413 runcmd_ordryrun @dput, @hostarg, $changesfile;
3414 printdone "pushed and uploaded $cversion";
3416 supplementary_message('');
3417 responder_send_command("complete");
3424 badusage "-p is not allowed with clone; specify as argument instead"
3425 if defined $package;
3428 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3429 ($package,$isuite) = @ARGV;
3430 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3431 ($package,$dstdir) = @ARGV;
3432 } elsif (@ARGV==3) {
3433 ($package,$isuite,$dstdir) = @ARGV;
3435 badusage "incorrect arguments to dgit clone";
3437 $dstdir ||= "$package";
3439 if (stat_exists $dstdir) {
3440 fail "$dstdir already exists";
3444 if ($rmonerror && !$dryrun_level) {
3445 $cwd_remove= getcwd();
3447 return unless defined $cwd_remove;
3448 if (!chdir "$cwd_remove") {
3449 return if $!==&ENOENT;
3450 die "chdir $cwd_remove: $!";
3453 rmtree($dstdir) or die "remove $dstdir: $!\n";
3454 } elsif (grep { $! == $_ }
3455 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3457 print STDERR "check whether to remove $dstdir: $!\n";
3463 $cwd_remove = undef;
3466 sub branchsuite () {
3467 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3468 if ($branch =~ m#$lbranch_re#o) {
3475 sub fetchpullargs () {
3477 if (!defined $package) {
3478 my $sourcep = parsecontrol('debian/control','debian/control');
3479 $package = getfield $sourcep, 'Source';
3482 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3484 my $clogp = parsechangelog();
3485 $isuite = getfield $clogp, 'Distribution';
3487 canonicalise_suite();
3488 progress "fetching from suite $csuite";
3489 } elsif (@ARGV==1) {
3491 canonicalise_suite();
3493 badusage "incorrect arguments to dgit fetch or dgit pull";
3512 badusage "-p is not allowed with dgit push" if defined $package;
3514 my $clogp = parsechangelog();
3515 $package = getfield $clogp, 'Source';
3518 } elsif (@ARGV==1) {
3519 ($specsuite) = (@ARGV);
3521 badusage "incorrect arguments to dgit push";
3523 $isuite = getfield $clogp, 'Distribution';
3525 local ($package) = $existing_package; # this is a hack
3526 canonicalise_suite();
3528 canonicalise_suite();
3530 if (defined $specsuite &&
3531 $specsuite ne $isuite &&
3532 $specsuite ne $csuite) {
3533 fail "dgit push: changelog specifies $isuite ($csuite)".
3534 " but command line specifies $specsuite";
3539 #---------- remote commands' implementation ----------
3541 sub cmd_remote_push_build_host {
3542 my ($nrargs) = shift @ARGV;
3543 my (@rargs) = @ARGV[0..$nrargs-1];
3544 @ARGV = @ARGV[$nrargs..$#ARGV];
3546 my ($dir,$vsnwant) = @rargs;
3547 # vsnwant is a comma-separated list; we report which we have
3548 # chosen in our ready response (so other end can tell if they
3551 $we_are_responder = 1;
3552 $us .= " (build host)";
3556 open PI, "<&STDIN" or die $!;
3557 open STDIN, "/dev/null" or die $!;
3558 open PO, ">&STDOUT" or die $!;
3560 open STDOUT, ">&STDERR" or die $!;
3564 ($protovsn) = grep {
3565 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3566 } @rpushprotovsn_support;
3568 fail "build host has dgit rpush protocol versions ".
3569 (join ",", @rpushprotovsn_support).
3570 " but invocation host has $vsnwant"
3571 unless defined $protovsn;
3573 responder_send_command("dgit-remote-push-ready $protovsn");
3574 rpush_handle_protovsn_bothends();
3579 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3580 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3581 # a good error message)
3583 sub rpush_handle_protovsn_bothends () {
3584 if ($protovsn < 4) {
3585 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3594 my $report = i_child_report();
3595 if (defined $report) {
3596 printdebug "($report)\n";
3597 } elsif ($i_child_pid) {
3598 printdebug "(killing build host child $i_child_pid)\n";
3599 kill 15, $i_child_pid;
3601 if (defined $i_tmp && !defined $initiator_tempdir) {
3603 eval { rmtree $i_tmp; };
3607 END { i_cleanup(); }
3610 my ($base,$selector,@args) = @_;
3611 $selector =~ s/\-/_/g;
3612 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3619 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3627 push @rargs, join ",", @rpushprotovsn_support;
3630 push @rdgit, @ropts;
3631 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3633 my @cmd = (@ssh, $host, shellquote @rdgit);
3636 if (defined $initiator_tempdir) {
3637 rmtree $initiator_tempdir;
3638 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3639 $i_tmp = $initiator_tempdir;
3643 $i_child_pid = open2(\*RO, \*RI, @cmd);
3645 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3646 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3647 $supplementary_message = '' unless $protovsn >= 3;
3649 fail "rpush negotiated protocol version $protovsn".
3650 " which does not support quilt mode $quilt_mode"
3651 if quiltmode_splitbrain;
3653 rpush_handle_protovsn_bothends();
3655 my ($icmd,$iargs) = initiator_expect {
3656 m/^(\S+)(?: (.*))?$/;
3659 i_method "i_resp", $icmd, $iargs;
3663 sub i_resp_progress ($) {
3665 my $msg = protocol_read_bytes \*RO, $rhs;
3669 sub i_resp_supplementary_message ($) {
3671 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3674 sub i_resp_complete {
3675 my $pid = $i_child_pid;
3676 $i_child_pid = undef; # prevents killing some other process with same pid
3677 printdebug "waiting for build host child $pid...\n";
3678 my $got = waitpid $pid, 0;
3679 die $! unless $got == $pid;
3680 die "build host child failed $?" if $?;
3683 printdebug "all done\n";
3687 sub i_resp_file ($) {
3689 my $localname = i_method "i_localname", $keyword;
3690 my $localpath = "$i_tmp/$localname";
3691 stat_exists $localpath and
3692 badproto \*RO, "file $keyword ($localpath) twice";
3693 protocol_receive_file \*RO, $localpath;
3694 i_method "i_file", $keyword;
3699 sub i_resp_param ($) {
3700 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3704 sub i_resp_previously ($) {
3705 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3706 or badproto \*RO, "bad previously spec";
3707 my $r = system qw(git check-ref-format), $1;
3708 die "bad previously ref spec ($r)" if $r;
3709 $previously{$1} = $2;
3714 sub i_resp_want ($) {
3716 die "$keyword ?" if $i_wanted{$keyword}++;
3717 my @localpaths = i_method "i_want", $keyword;
3718 printdebug "[[ $keyword @localpaths\n";
3719 foreach my $localpath (@localpaths) {
3720 protocol_send_file \*RI, $localpath;
3722 print RI "files-end\n" or die $!;
3725 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3727 sub i_localname_parsed_changelog {
3728 return "remote-changelog.822";
3730 sub i_file_parsed_changelog {
3731 ($i_clogp, $i_version, $i_dscfn) =
3732 push_parse_changelog "$i_tmp/remote-changelog.822";
3733 die if $i_dscfn =~ m#/|^\W#;
3736 sub i_localname_dsc {
3737 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3742 sub i_localname_changes {
3743 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3744 $i_changesfn = $i_dscfn;
3745 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3746 return $i_changesfn;
3748 sub i_file_changes { }
3750 sub i_want_signed_tag {
3751 printdebug Dumper(\%i_param, $i_dscfn);
3752 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3753 && defined $i_param{'csuite'}
3754 or badproto \*RO, "premature desire for signed-tag";
3755 my $head = $i_param{'head'};
3756 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3758 my $maintview = $i_param{'maint-view'};
3759 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3762 if ($protovsn >= 4) {
3763 my $p = $i_param{'tagformat'} // '<undef>';
3765 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3768 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3770 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3772 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3775 push_mktags $i_clogp, $i_dscfn,
3776 $i_changesfn, 'remote changes',
3780 sub i_want_signed_dsc_changes {
3781 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3782 sign_changes $i_changesfn;
3783 return ($i_dscfn, $i_changesfn);
3786 #---------- building etc. ----------
3792 #----- `3.0 (quilt)' handling -----
3794 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3796 sub quiltify_dpkg_commit ($$$;$) {
3797 my ($patchname,$author,$msg, $xinfo) = @_;
3801 my $descfn = ".git/dgit/quilt-description.tmp";
3802 open O, '>', $descfn or die "$descfn: $!";
3803 $msg =~ s/\n+/\n\n/;
3804 print O <<END or die $!;
3806 ${xinfo}Subject: $msg
3813 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3814 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3815 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3816 runcmd @dpkgsource, qw(--commit .), $patchname;
3820 sub quiltify_trees_differ ($$;$$$) {
3821 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
3822 # returns true iff the two tree objects differ other than in debian/
3823 # with $finegrained,
3824 # returns bitmask 01 - differ in upstream files except .gitignore
3825 # 02 - differ in .gitignore
3826 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3827 # is set for each modified .gitignore filename $fn
3828 # if $unrepres is defined, array ref to which is appeneded
3829 # a list of unrepresentable changes (removals of upstream files
3832 my @cmd = (@git, qw(diff-tree -z));
3833 push @cmd, qw(--name-only) unless $unrepres;
3834 push @cmd, qw(-r) if $finegrained || $unrepres;
3836 my $diffs= cmdoutput @cmd;
3839 foreach my $f (split /\0/, $diffs) {
3840 if ($unrepres && !@lmodes) {
3841 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
3844 my ($oldmode,$newmode) = @lmodes;
3847 next if $f =~ m#^debian(?:/.*)?$#s;
3851 die "deleted\n" unless $newmode =~ m/[^0]/;
3852 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
3853 if ($oldmode =~ m/[^0]/) {
3854 die "mode changed\n" if $oldmode ne $newmode;
3856 die "non-default mode\n" unless $newmode =~ m/^100644$/;
3860 local $/="\n"; chomp $@;
3861 push @$unrepres, [ $f, $@ ];
3865 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
3866 $r |= $isignore ? 02 : 01;
3867 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
3869 printdebug "quiltify_trees_differ $x $y => $r\n";
3873 sub quiltify_tree_sentinelfiles ($) {
3874 # lists the `sentinel' files present in the tree
3876 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
3877 qw(-- debian/rules debian/control);
3882 sub quiltify_splitbrain_needed () {
3883 if (!$split_brain) {
3884 progress "dgit view: changes are required...";
3885 runcmd @git, qw(checkout -q -b dgit-view);
3890 sub quiltify_splitbrain ($$$$$$) {
3891 my ($clogp, $unapplied, $headref, $diffbits,
3892 $editedignores, $cachekey) = @_;
3893 if ($quilt_mode !~ m/gbp|dpm/) {
3894 # treat .gitignore just like any other upstream file
3895 $diffbits = { %$diffbits };
3896 $_ = !!$_ foreach values %$diffbits;
3898 # We would like any commits we generate to be reproducible
3899 my @authline = clogp_authline($clogp);
3900 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
3901 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
3902 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
3903 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
3904 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
3905 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
3907 if ($quilt_mode =~ m/gbp|unapplied/ &&
3908 ($diffbits->{O2H} & 01)) {
3910 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
3911 " but git tree differs from orig in upstream files.";
3912 if (!stat_exists "debian/patches") {
3914 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
3918 if ($quilt_mode =~ m/dpm/ &&
3919 ($diffbits->{H2A} & 01)) {
3921 --quilt=$quilt_mode specified, implying patches-applied git tree
3922 but git tree differs from result of applying debian/patches to upstream
3925 if ($quilt_mode =~ m/gbp|unapplied/ &&
3926 ($diffbits->{O2A} & 01)) { # some patches
3927 quiltify_splitbrain_needed();
3928 progress "dgit view: creating patches-applied version using gbp pq";
3929 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
3930 # gbp pq import creates a fresh branch; push back to dgit-view
3931 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
3932 runcmd @git, qw(checkout -q dgit-view);
3934 if ($quilt_mode =~ m/gbp|dpm/ &&
3935 ($diffbits->{O2A} & 02)) {
3937 --quilt=$quilt_mode specified, implying that HEAD is for use with a
3938 tool which does not create patches for changes to upstream
3939 .gitignores: but, such patches exist in debian/patches.
3942 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
3943 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
3944 quiltify_splitbrain_needed();
3945 progress "dgit view: creating patch to represent .gitignore changes";
3946 ensuredir "debian/patches";
3947 my $gipatch = "debian/patches/auto-gitignore";
3948 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
3949 stat GIPATCH or die "$gipatch: $!";
3950 fail "$gipatch already exists; but want to create it".
3951 " to record .gitignore changes" if (stat _)[7];
3952 print GIPATCH <<END or die "$gipatch: $!";
3953 Subject: Update .gitignore from Debian packaging branch
3955 The Debian packaging git branch contains these updates to the upstream
3956 .gitignore file(s). This patch is autogenerated, to provide these
3957 updates to users of the official Debian archive view of the package.
3959 [dgit ($our_version) update-gitignore]
3962 close GIPATCH or die "$gipatch: $!";
3963 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
3964 $unapplied, $headref, "--", sort keys %$editedignores;
3965 open SERIES, "+>>", "debian/patches/series" or die $!;
3966 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
3968 defined read SERIES, $newline, 1 or die $!;
3969 print SERIES "\n" or die $! unless $newline eq "\n";
3970 print SERIES "auto-gitignore\n" or die $!;
3971 close SERIES or die $!;
3972 runcmd @git, qw(add -- debian/patches/series), $gipatch;
3974 Commit patch to update .gitignore
3976 [dgit ($our_version) update-gitignore-quilt-fixup]
3980 my $dgitview = git_rev_parse 'HEAD';
3982 changedir '../../../..';
3983 # When we no longer need to support squeeze, use --create-reflog
3985 ensuredir ".git/logs/refs/dgit-intern";
3986 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
3989 my $oldcache = git_get_ref "refs/$splitbraincache";
3990 if ($oldcache eq $dgitview) {
3991 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
3992 # git update-ref doesn't always update, in this case. *sigh*
3993 my $dummy = make_commit_text <<END;
3996 author Dgit <dgit\@example.com> 1000000000 +0000
3997 committer Dgit <dgit\@example.com> 1000000000 +0000
3999 Dummy commit - do not use
4001 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4002 "refs/$splitbraincache", $dummy;
4004 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4007 progress "dgit view: created (commit id $dgitview)";
4009 changedir '.git/dgit/unpack/work';
4012 sub quiltify ($$$$) {
4013 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4015 # Quilt patchification algorithm
4017 # We search backwards through the history of the main tree's HEAD
4018 # (T) looking for a start commit S whose tree object is identical
4019 # to to the patch tip tree (ie the tree corresponding to the
4020 # current dpkg-committed patch series). For these purposes
4021 # `identical' disregards anything in debian/ - this wrinkle is
4022 # necessary because dpkg-source treates debian/ specially.
4024 # We can only traverse edges where at most one of the ancestors'
4025 # trees differs (in changes outside in debian/). And we cannot
4026 # handle edges which change .pc/ or debian/patches. To avoid
4027 # going down a rathole we avoid traversing edges which introduce
4028 # debian/rules or debian/control. And we set a limit on the
4029 # number of edges we are willing to look at.
4031 # If we succeed, we walk forwards again. For each traversed edge
4032 # PC (with P parent, C child) (starting with P=S and ending with
4033 # C=T) to we do this:
4035 # - dpkg-source --commit with a patch name and message derived from C
4036 # After traversing PT, we git commit the changes which
4037 # should be contained within debian/patches.
4039 # The search for the path S..T is breadth-first. We maintain a
4040 # todo list containing search nodes. A search node identifies a
4041 # commit, and looks something like this:
4043 # Commit => $git_commit_id,
4044 # Child => $c, # or undef if P=T
4045 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4046 # Nontrivial => true iff $p..$c has relevant changes
4053 my %considered; # saves being exponential on some weird graphs
4055 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4058 my ($search,$whynot) = @_;
4059 printdebug " search NOT $search->{Commit} $whynot\n";
4060 $search->{Whynot} = $whynot;
4061 push @nots, $search;
4062 no warnings qw(exiting);
4071 my $c = shift @todo;
4072 next if $considered{$c->{Commit}}++;
4074 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4076 printdebug "quiltify investigate $c->{Commit}\n";
4079 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4080 printdebug " search finished hooray!\n";
4085 if ($quilt_mode eq 'nofix') {
4086 fail "quilt fixup required but quilt mode is \`nofix'\n".
4087 "HEAD commit $c->{Commit} differs from tree implied by ".
4088 " debian/patches (tree object $oldtiptree)";
4090 if ($quilt_mode eq 'smash') {
4091 printdebug " search quitting smash\n";
4095 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4096 $not->($c, "has $c_sentinels not $t_sentinels")
4097 if $c_sentinels ne $t_sentinels;
4099 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4100 $commitdata =~ m/\n\n/;
4102 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4103 @parents = map { { Commit => $_, Child => $c } } @parents;
4105 $not->($c, "root commit") if !@parents;
4107 foreach my $p (@parents) {
4108 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4110 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4111 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4113 foreach my $p (@parents) {
4114 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4116 my @cmd= (@git, qw(diff-tree -r --name-only),
4117 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4118 my $patchstackchange = cmdoutput @cmd;
4119 if (length $patchstackchange) {
4120 $patchstackchange =~ s/\n/,/g;
4121 $not->($p, "changed $patchstackchange");
4124 printdebug " search queue P=$p->{Commit} ",
4125 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4131 printdebug "quiltify want to smash\n";
4134 my $x = $_[0]{Commit};
4135 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4138 my $reportnot = sub {
4140 my $s = $abbrev->($notp);
4141 my $c = $notp->{Child};
4142 $s .= "..".$abbrev->($c) if $c;
4143 $s .= ": ".$notp->{Whynot};
4146 if ($quilt_mode eq 'linear') {
4147 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4148 foreach my $notp (@nots) {
4149 print STDERR "$us: ", $reportnot->($notp), "\n";
4151 print STDERR "$us: $_\n" foreach @$failsuggestion;
4152 fail "quilt fixup naive history linearisation failed.\n".
4153 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4154 } elsif ($quilt_mode eq 'smash') {
4155 } elsif ($quilt_mode eq 'auto') {
4156 progress "quilt fixup cannot be linear, smashing...";
4158 die "$quilt_mode ?";
4161 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4162 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4164 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4166 quiltify_dpkg_commit "auto-$version-$target-$time",
4167 (getfield $clogp, 'Maintainer'),
4168 "Automatically generated patch ($clogp->{Version})\n".
4169 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4173 progress "quiltify linearisation planning successful, executing...";
4175 for (my $p = $sref_S;
4176 my $c = $p->{Child};
4178 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4179 next unless $p->{Nontrivial};
4181 my $cc = $c->{Commit};
4183 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4184 $commitdata =~ m/\n\n/ or die "$c ?";
4187 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4190 my $commitdate = cmdoutput
4191 @git, qw(log -n1 --pretty=format:%aD), $cc;
4193 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4195 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4202 my $gbp_check_suitable = sub {
4207 die "contains unexpected slashes\n" if m{//} || m{/$};
4208 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4209 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4210 die "too long" if length > 200;
4212 return $_ unless $@;
4213 print STDERR "quiltifying commit $cc:".
4214 " ignoring/dropping Gbp-Pq $what: $@";
4218 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4220 (\S+) \s* \n //ixm) {
4221 $patchname = $gbp_check_suitable->($1, 'Name');
4223 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4225 (\S+) \s* \n //ixm) {
4226 $patchdir = $gbp_check_suitable->($1, 'Topic');
4231 if (!defined $patchname) {
4232 $patchname = $title;
4233 $patchname =~ s/[.:]$//;
4236 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4237 my $translitname = $converter->convert($patchname);
4238 die unless defined $translitname;
4239 $patchname = $translitname;
4242 "dgit: patch title transliteration error: $@"
4244 $patchname =~ y/ A-Z/-a-z/;
4245 $patchname =~ y/-a-z0-9_.+=~//cd;
4246 $patchname =~ s/^\W/x-$&/;
4247 $patchname = substr($patchname,0,40);
4249 if (!defined $patchdir) {
4252 if (length $patchdir) {
4253 $patchname = "$patchdir/$patchname";
4255 if ($patchname =~ m{^(.*)/}) {
4256 mkpath "debian/patches/$1";
4261 stat "debian/patches/$patchname$index";
4263 $!==ENOENT or die "$patchname$index $!";
4265 runcmd @git, qw(checkout -q), $cc;
4267 # We use the tip's changelog so that dpkg-source doesn't
4268 # produce complaining messages from dpkg-parsechangelog. None
4269 # of the information dpkg-source gets from the changelog is
4270 # actually relevant - it gets put into the original message
4271 # which dpkg-source provides our stunt editor, and then
4273 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4275 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4276 "Date: $commitdate\n".
4277 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4279 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4282 runcmd @git, qw(checkout -q master);
4285 sub build_maybe_quilt_fixup () {
4286 my ($format,$fopts) = get_source_format;
4287 return unless madformat_wantfixup $format;
4290 check_for_vendor_patches();
4292 if (quiltmode_splitbrain) {
4293 foreach my $needtf (qw(new maint)) {
4294 next if grep { $_ eq $needtf } access_cfg_tagformats;
4296 quilt mode $quilt_mode requires split view so server needs to support
4297 both "new" and "maint" tag formats, but config says it doesn't.
4302 my $clogp = parsechangelog();
4303 my $headref = git_rev_parse('HEAD');
4308 my $upstreamversion=$version;
4309 $upstreamversion =~ s/-[^-]*$//;
4311 if ($fopts->{'single-debian-patch'}) {
4312 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4314 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4317 die 'bug' if $split_brain && !$need_split_build_invocation;
4319 changedir '../../../..';
4320 runcmd_ordryrun_local
4321 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4324 sub quilt_fixup_mkwork ($) {
4327 mkdir "work" or die $!;
4329 mktree_in_ud_here();
4330 runcmd @git, qw(reset -q --hard), $headref;
4333 sub quilt_fixup_linkorigs ($$) {
4334 my ($upstreamversion, $fn) = @_;
4335 # calls $fn->($leafname);
4337 foreach my $f (<../../../../*>) { #/){
4338 my $b=$f; $b =~ s{.*/}{};
4340 local ($debuglevel) = $debuglevel-1;
4341 printdebug "QF linkorigs $b, $f ?\n";
4343 next unless is_orig_file_of_vsn $b, $upstreamversion;
4344 printdebug "QF linkorigs $b, $f Y\n";
4345 link_ltarget $f, $b or die "$b $!";
4350 sub quilt_fixup_delete_pc () {
4351 runcmd @git, qw(rm -rqf .pc);
4353 Commit removal of .pc (quilt series tracking data)
4355 [dgit ($our_version) upgrade quilt-remove-pc]
4359 sub quilt_fixup_singlepatch ($$$) {
4360 my ($clogp, $headref, $upstreamversion) = @_;
4362 progress "starting quiltify (single-debian-patch)";
4364 # dpkg-source --commit generates new patches even if
4365 # single-debian-patch is in debian/source/options. In order to
4366 # get it to generate debian/patches/debian-changes, it is
4367 # necessary to build the source package.
4369 quilt_fixup_linkorigs($upstreamversion, sub { });
4370 quilt_fixup_mkwork($headref);
4372 rmtree("debian/patches");
4374 runcmd @dpkgsource, qw(-b .);
4376 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4377 rename srcfn("$upstreamversion", "/debian/patches"),
4378 "work/debian/patches";
4381 commit_quilty_patch();
4384 sub quilt_make_fake_dsc ($) {
4385 my ($upstreamversion) = @_;
4387 my $fakeversion="$upstreamversion-~~DGITFAKE";
4389 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4390 print $fakedsc <<END or die $!;
4393 Version: $fakeversion
4397 my $dscaddfile=sub {
4400 my $md = new Digest::MD5;
4402 my $fh = new IO::File $b, '<' or die "$b $!";
4407 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4410 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4412 my @files=qw(debian/source/format debian/rules
4413 debian/control debian/changelog);
4414 foreach my $maybe (qw(debian/patches debian/source/options
4415 debian/tests/control)) {
4416 next unless stat_exists "../../../$maybe";
4417 push @files, $maybe;
4420 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4421 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4423 $dscaddfile->($debtar);
4424 close $fakedsc or die $!;
4427 sub quilt_check_splitbrain_cache ($$) {
4428 my ($headref, $upstreamversion) = @_;
4429 # Called only if we are in (potentially) split brain mode.
4431 # Computes the cache key and looks in the cache.
4432 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4434 my $splitbrain_cachekey;
4437 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4438 # we look in the reflog of dgit-intern/quilt-cache
4439 # we look for an entry whose message is the key for the cache lookup
4440 my @cachekey = (qw(dgit), $our_version);
4441 push @cachekey, $upstreamversion;
4442 push @cachekey, $quilt_mode;
4443 push @cachekey, $headref;
4445 push @cachekey, hashfile('fake.dsc');
4447 my $srcshash = Digest::SHA->new(256);
4448 my %sfs = ( %INC, '$0(dgit)' => $0 );
4449 foreach my $sfk (sort keys %sfs) {
4450 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4451 $srcshash->add($sfk," ");
4452 $srcshash->add(hashfile($sfs{$sfk}));
4453 $srcshash->add("\n");
4455 push @cachekey, $srcshash->hexdigest();
4456 $splitbrain_cachekey = "@cachekey";
4458 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4460 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4461 debugcmd "|(probably)",@cmd;
4462 my $child = open GC, "-|"; defined $child or die $!;
4464 chdir '../../..' or die $!;
4465 if (!stat ".git/logs/refs/$splitbraincache") {
4466 $! == ENOENT or die $!;
4467 printdebug ">(no reflog)\n";
4474 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4475 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4478 quilt_fixup_mkwork($headref);
4479 if ($cachehit ne $headref) {
4480 progress "dgit view: found cached (commit id $cachehit)";
4481 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4483 return ($cachehit, $splitbrain_cachekey);
4485 progress "dgit view: found cached, no changes required";
4486 return ($headref, $splitbrain_cachekey);
4488 die $! if GC->error;
4489 failedcmd unless close GC;
4491 printdebug "splitbrain cache miss\n";
4492 return (undef, $splitbrain_cachekey);
4495 sub quilt_fixup_multipatch ($$$) {
4496 my ($clogp, $headref, $upstreamversion) = @_;
4498 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4501 # - honour any existing .pc in case it has any strangeness
4502 # - determine the git commit corresponding to the tip of
4503 # the patch stack (if there is one)
4504 # - if there is such a git commit, convert each subsequent
4505 # git commit into a quilt patch with dpkg-source --commit
4506 # - otherwise convert all the differences in the tree into
4507 # a single git commit
4511 # Our git tree doesn't necessarily contain .pc. (Some versions of
4512 # dgit would include the .pc in the git tree.) If there isn't
4513 # one, we need to generate one by unpacking the patches that we
4516 # We first look for a .pc in the git tree. If there is one, we
4517 # will use it. (This is not the normal case.)
4519 # Otherwise need to regenerate .pc so that dpkg-source --commit
4520 # can work. We do this as follows:
4521 # 1. Collect all relevant .orig from parent directory
4522 # 2. Generate a debian.tar.gz out of
4523 # debian/{patches,rules,source/format,source/options}
4524 # 3. Generate a fake .dsc containing just these fields:
4525 # Format Source Version Files
4526 # 4. Extract the fake .dsc
4527 # Now the fake .dsc has a .pc directory.
4528 # (In fact we do this in every case, because in future we will
4529 # want to search for a good base commit for generating patches.)
4531 # Then we can actually do the dpkg-source --commit
4532 # 1. Make a new working tree with the same object
4533 # store as our main tree and check out the main
4535 # 2. Copy .pc from the fake's extraction, if necessary
4536 # 3. Run dpkg-source --commit
4537 # 4. If the result has changes to debian/, then
4538 # - git add them them
4539 # - git add .pc if we had a .pc in-tree
4541 # 5. If we had a .pc in-tree, delete it, and git commit
4542 # 6. Back in the main tree, fast forward to the new HEAD
4544 # Another situation we may have to cope with is gbp-style
4545 # patches-unapplied trees.
4547 # We would want to detect these, so we know to escape into
4548 # quilt_fixup_gbp. However, this is in general not possible.
4549 # Consider a package with a one patch which the dgit user reverts
4550 # (with git revert or the moral equivalent).
4552 # That is indistinguishable in contents from a patches-unapplied
4553 # tree. And looking at the history to distinguish them is not
4554 # useful because the user might have made a confusing-looking git
4555 # history structure (which ought to produce an error if dgit can't
4556 # cope, not a silent reintroduction of an unwanted patch).
4558 # So gbp users will have to pass an option. But we can usually
4559 # detect their failure to do so: if the tree is not a clean
4560 # patches-applied tree, quilt linearisation fails, but the tree
4561 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4562 # they want --quilt=unapplied.
4564 # To help detect this, when we are extracting the fake dsc, we
4565 # first extract it with --skip-patches, and then apply the patches
4566 # afterwards with dpkg-source --before-build. That lets us save a
4567 # tree object corresponding to .origs.
4569 my $splitbrain_cachekey;
4571 quilt_make_fake_dsc($upstreamversion);
4573 if (quiltmode_splitbrain()) {
4575 ($cachehit, $splitbrain_cachekey) =
4576 quilt_check_splitbrain_cache($headref, $upstreamversion);
4577 return if $cachehit;
4581 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4583 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4584 rename $fakexdir, "fake" or die "$fakexdir $!";
4588 remove_stray_gits();
4589 mktree_in_ud_here();
4593 runcmd @git, qw(add -Af .);
4594 my $unapplied=git_write_tree();
4595 printdebug "fake orig tree object $unapplied\n";
4599 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4601 if (system @bbcmd) {
4602 failedcmd @bbcmd if $? < 0;
4604 failed to apply your git tree's patch stack (from debian/patches/) to
4605 the corresponding upstream tarball(s). Your source tree and .orig
4606 are probably too inconsistent. dgit can only fix up certain kinds of
4607 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
4613 quilt_fixup_mkwork($headref);
4616 if (stat_exists ".pc") {
4618 progress "Tree already contains .pc - will use it then delete it.";
4621 rename '../fake/.pc','.pc' or die $!;
4624 changedir '../fake';
4626 runcmd @git, qw(add -Af .);
4627 my $oldtiptree=git_write_tree();
4628 printdebug "fake o+d/p tree object $unapplied\n";
4629 changedir '../work';
4632 # We calculate some guesswork now about what kind of tree this might
4633 # be. This is mostly for error reporting.
4639 # O = orig, without patches applied
4640 # A = "applied", ie orig with H's debian/patches applied
4641 O2H => quiltify_trees_differ($unapplied,$headref, 1,
4642 \%editedignores, \@unrepres),
4643 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4644 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4648 foreach my $b (qw(01 02)) {
4649 foreach my $v (qw(O2H O2A H2A)) {
4650 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4653 printdebug "differences \@dl @dl.\n";
4656 "$us: base trees orig=%.20s o+d/p=%.20s",
4657 $unapplied, $oldtiptree;
4659 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4660 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4661 $dl[0], $dl[1], $dl[3], $dl[4],
4665 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
4667 forceable_fail [qw(unrepresentable)], <<END;
4668 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
4673 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
4674 push @failsuggestion, "This might be a patches-unapplied branch.";
4675 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4676 push @failsuggestion, "This might be a patches-applied branch.";
4678 push @failsuggestion, "Maybe you need to specify one of".
4679 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
4681 if (quiltmode_splitbrain()) {
4682 quiltify_splitbrain($clogp, $unapplied, $headref,
4683 $diffbits, \%editedignores,
4684 $splitbrain_cachekey);
4688 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4689 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4691 if (!open P, '>>', ".pc/applied-patches") {
4692 $!==&ENOENT or die $!;
4697 commit_quilty_patch();
4699 if ($mustdeletepc) {
4700 quilt_fixup_delete_pc();
4704 sub quilt_fixup_editor () {
4705 my $descfn = $ENV{$fakeeditorenv};
4706 my $editing = $ARGV[$#ARGV];
4707 open I1, '<', $descfn or die "$descfn: $!";
4708 open I2, '<', $editing or die "$editing: $!";
4709 unlink $editing or die "$editing: $!";
4710 open O, '>', $editing or die "$editing: $!";
4711 while (<I1>) { print O or die $!; } I1->error and die $!;
4714 $copying ||= m/^\-\-\- /;
4715 next unless $copying;
4718 I2->error and die $!;
4723 sub maybe_apply_patches_dirtily () {
4724 return unless $quilt_mode =~ m/gbp|unapplied/;
4725 print STDERR <<END or die $!;
4727 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4728 dgit: Have to apply the patches - making the tree dirty.
4729 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4732 $patches_applied_dirtily = 01;
4733 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4734 runcmd qw(dpkg-source --before-build .);
4737 sub maybe_unapply_patches_again () {
4738 progress "dgit: Unapplying patches again to tidy up the tree."
4739 if $patches_applied_dirtily;
4740 runcmd qw(dpkg-source --after-build .)
4741 if $patches_applied_dirtily & 01;
4743 if $patches_applied_dirtily & 02;
4744 $patches_applied_dirtily = 0;
4747 #----- other building -----
4749 our $clean_using_builder;
4750 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4751 # clean the tree before building (perhaps invoked indirectly by
4752 # whatever we are using to run the build), rather than separately
4753 # and explicitly by us.
4756 return if $clean_using_builder;
4757 if ($cleanmode eq 'dpkg-source') {
4758 maybe_apply_patches_dirtily();
4759 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4760 } elsif ($cleanmode eq 'dpkg-source-d') {
4761 maybe_apply_patches_dirtily();
4762 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4763 } elsif ($cleanmode eq 'git') {
4764 runcmd_ordryrun_local @git, qw(clean -xdf);
4765 } elsif ($cleanmode eq 'git-ff') {
4766 runcmd_ordryrun_local @git, qw(clean -xdff);
4767 } elsif ($cleanmode eq 'check') {
4768 my $leftovers = cmdoutput @git, qw(clean -xdn);
4769 if (length $leftovers) {
4770 print STDERR $leftovers, "\n" or die $!;
4771 fail "tree contains uncommitted files and --clean=check specified";
4773 } elsif ($cleanmode eq 'none') {
4780 badusage "clean takes no additional arguments" if @ARGV;
4783 maybe_unapply_patches_again();
4788 badusage "-p is not allowed when building" if defined $package;
4791 my $clogp = parsechangelog();
4792 $isuite = getfield $clogp, 'Distribution';
4793 $package = getfield $clogp, 'Source';
4794 $version = getfield $clogp, 'Version';
4795 build_maybe_quilt_fixup();
4797 my $pat = changespat $version;
4798 foreach my $f (glob "$buildproductsdir/$pat") {
4800 unlink $f or fail "remove old changes file $f: $!";
4802 progress "would remove $f";
4808 sub changesopts_initial () {
4809 my @opts =@changesopts[1..$#changesopts];
4812 sub changesopts_version () {
4813 if (!defined $changes_since_version) {
4814 my @vsns = archive_query('archive_query');
4815 my @quirk = access_quirk();
4816 if ($quirk[0] eq 'backports') {
4817 local $isuite = $quirk[2];
4819 canonicalise_suite();
4820 push @vsns, archive_query('archive_query');
4823 @vsns = map { $_->[0] } @vsns;
4824 @vsns = sort { -version_compare($a, $b) } @vsns;
4825 $changes_since_version = $vsns[0];
4826 progress "changelog will contain changes since $vsns[0]";
4828 $changes_since_version = '_';
4829 progress "package seems new, not specifying -v<version>";
4832 if ($changes_since_version ne '_') {
4833 return ("-v$changes_since_version");
4839 sub changesopts () {
4840 return (changesopts_initial(), changesopts_version());
4843 sub massage_dbp_args ($;$) {
4844 my ($cmd,$xargs) = @_;
4847 # - if we're going to split the source build out so we can
4848 # do strange things to it, massage the arguments to dpkg-buildpackage
4849 # so that the main build doessn't build source (or add an argument
4850 # to stop it building source by default).
4852 # - add -nc to stop dpkg-source cleaning the source tree,
4853 # unless we're not doing a split build and want dpkg-source
4854 # as cleanmode, in which case we can do nothing
4857 # 0 - source will NOT need to be built separately by caller
4858 # +1 - source will need to be built separately by caller
4859 # +2 - source will need to be built separately by caller AND
4860 # dpkg-buildpackage should not in fact be run at all!
4861 debugcmd '#massaging#', @$cmd if $debuglevel>1;
4862 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
4863 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
4864 $clean_using_builder = 1;
4867 # -nc has the side effect of specifying -b if nothing else specified
4868 # and some combinations of -S, -b, et al, are errors, rather than
4869 # later simply overriding earlie. So we need to:
4870 # - search the command line for these options
4871 # - pick the last one
4872 # - perhaps add our own as a default
4873 # - perhaps adjust it to the corresponding non-source-building version
4875 foreach my $l ($cmd, $xargs) {
4877 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
4880 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
4882 if ($need_split_build_invocation) {
4883 printdebug "massage split $dmode.\n";
4884 $r = $dmode =~ m/[S]/ ? +2 :
4885 $dmode =~ y/gGF/ABb/ ? +1 :
4886 $dmode =~ m/[ABb]/ ? 0 :
4889 printdebug "massage done $r $dmode.\n";
4891 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
4897 my $wasdir = must_getcwd();
4903 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
4904 my ($msg_if_onlyone) = @_;
4905 # If there is only one .changes file, fail with $msg_if_onlyone,
4906 # or if that is undef, be a no-op.
4907 # Returns the changes file to report to the user.
4908 my $pat = changespat $version;
4909 my @changesfiles = glob $pat;
4910 @changesfiles = sort {
4911 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
4915 if (@changesfiles==1) {
4916 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
4917 only one changes file from build (@changesfiles)
4919 $result = $changesfiles[0];
4920 } elsif (@changesfiles==2) {
4921 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
4922 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
4923 fail "$l found in binaries changes file $binchanges"
4926 runcmd_ordryrun_local @mergechanges, @changesfiles;
4927 my $multichanges = changespat $version,'multi';
4929 stat_exists $multichanges or fail "$multichanges: $!";
4930 foreach my $cf (glob $pat) {
4931 next if $cf eq $multichanges;
4932 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
4935 $result = $multichanges;
4937 fail "wrong number of different changes files (@changesfiles)";
4939 printdone "build successful, results in $result\n" or die $!;
4942 sub midbuild_checkchanges () {
4943 my $pat = changespat $version;
4944 return if $rmchanges;
4945 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
4946 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
4948 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
4949 Suggest you delete @unwanted.
4954 sub midbuild_checkchanges_vanilla ($) {
4956 midbuild_checkchanges() if $wantsrc == 1;
4959 sub postbuild_mergechanges_vanilla ($) {
4961 if ($wantsrc == 1) {
4963 postbuild_mergechanges(undef);
4966 printdone "build successful\n";
4971 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
4972 my $wantsrc = massage_dbp_args \@dbp;
4975 midbuild_checkchanges_vanilla $wantsrc;
4980 push @dbp, changesopts_version();
4981 maybe_apply_patches_dirtily();
4982 runcmd_ordryrun_local @dbp;
4984 maybe_unapply_patches_again();
4985 postbuild_mergechanges_vanilla $wantsrc;
4989 $quilt_mode //= 'gbp';
4993 my @dbp = @dpkgbuildpackage;
4995 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
4997 if (!length $gbp_build[0]) {
4998 if (length executable_on_path('git-buildpackage')) {
4999 $gbp_build[0] = qw(git-buildpackage);
5001 $gbp_build[0] = 'gbp buildpackage';
5004 my @cmd = opts_opt_multi_cmd @gbp_build;
5006 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5010 midbuild_checkchanges_vanilla $wantsrc;
5012 if (!$clean_using_builder) {
5013 push @cmd, '--git-cleaner=true';
5017 maybe_unapply_patches_again();
5019 push @cmd, changesopts();
5020 runcmd_ordryrun_local @cmd, @ARGV;
5022 postbuild_mergechanges_vanilla $wantsrc;
5024 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5027 my $our_cleanmode = $cleanmode;
5028 if ($need_split_build_invocation) {
5029 # Pretend that clean is being done some other way. This
5030 # forces us not to try to use dpkg-buildpackage to clean and
5031 # build source all in one go; and instead we run dpkg-source
5032 # (and build_prep() will do the clean since $clean_using_builder
5034 $our_cleanmode = 'ELSEWHERE';
5036 if ($our_cleanmode =~ m/^dpkg-source/) {
5037 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5038 $clean_using_builder = 1;
5041 $sourcechanges = changespat $version,'source';
5043 unlink "../$sourcechanges" or $!==ENOENT
5044 or fail "remove $sourcechanges: $!";
5046 $dscfn = dscfn($version);
5047 if ($our_cleanmode eq 'dpkg-source') {
5048 maybe_apply_patches_dirtily();
5049 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5051 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5052 maybe_apply_patches_dirtily();
5053 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5056 my @cmd = (@dpkgsource, qw(-b --));
5059 runcmd_ordryrun_local @cmd, "work";
5060 my @udfiles = <${package}_*>;
5061 changedir "../../..";
5062 foreach my $f (@udfiles) {
5063 printdebug "source copy, found $f\n";
5066 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5067 $f eq srcfn($version, $&));
5068 printdebug "source copy, found $f - renaming\n";
5069 rename "$ud/$f", "../$f" or $!==ENOENT
5070 or fail "put in place new source file ($f): $!";
5073 my $pwd = must_getcwd();
5074 my $leafdir = basename $pwd;
5076 runcmd_ordryrun_local @cmd, $leafdir;
5079 runcmd_ordryrun_local qw(sh -ec),
5080 'exec >$1; shift; exec "$@"','x',
5081 "../$sourcechanges",
5082 @dpkggenchanges, qw(-S), changesopts();
5086 sub cmd_build_source {
5087 badusage "build-source takes no additional arguments" if @ARGV;
5089 maybe_unapply_patches_again();
5090 printdone "source built, results in $dscfn and $sourcechanges";
5095 midbuild_checkchanges();
5098 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5099 stat_exists $sourcechanges
5100 or fail "$sourcechanges (in parent directory): $!";
5102 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5104 maybe_unapply_patches_again();
5106 postbuild_mergechanges(<<END);
5107 perhaps you need to pass -A ? (sbuild's default is to build only
5108 arch-specific binaries; dgit 1.4 used to override that.)
5113 sub cmd_quilt_fixup {
5114 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5115 my $clogp = parsechangelog();
5116 $version = getfield $clogp, 'Version';
5117 $package = getfield $clogp, 'Source';
5120 build_maybe_quilt_fixup();
5123 sub cmd_archive_api_query {
5124 badusage "need only 1 subpath argument" unless @ARGV==1;
5125 my ($subpath) = @ARGV;
5126 my @cmd = archive_api_query_cmd($subpath);
5129 exec @cmd or fail "exec curl: $!\n";
5132 sub cmd_clone_dgit_repos_server {
5133 badusage "need destination argument" unless @ARGV==1;
5134 my ($destdir) = @ARGV;
5135 $package = '_dgit-repos-server';
5136 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5138 exec @cmd or fail "exec git clone: $!\n";
5141 sub cmd_setup_mergechangelogs {
5142 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5143 setup_mergechangelogs(1);
5146 sub cmd_setup_useremail {
5147 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5151 sub cmd_setup_new_tree {
5152 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5156 #---------- argument parsing and main program ----------
5159 print "dgit version $our_version\n" or die $!;
5163 our (%valopts_long, %valopts_short);
5166 sub defvalopt ($$$$) {
5167 my ($long,$short,$val_re,$how) = @_;
5168 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5169 $valopts_long{$long} = $oi;
5170 $valopts_short{$short} = $oi;
5171 # $how subref should:
5172 # do whatever assignemnt or thing it likes with $_[0]
5173 # if the option should not be passed on to remote, @rvalopts=()
5174 # or $how can be a scalar ref, meaning simply assign the value
5177 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5178 defvalopt '--distro', '-d', '.+', \$idistro;
5179 defvalopt '', '-k', '.+', \$keyid;
5180 defvalopt '--existing-package','', '.*', \$existing_package;
5181 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5182 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5183 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5185 defvalopt '', '-C', '.+', sub {
5186 ($changesfile) = (@_);
5187 if ($changesfile =~ s#^(.*)/##) {
5188 $buildproductsdir = $1;
5192 defvalopt '--initiator-tempdir','','.*', sub {
5193 ($initiator_tempdir) = (@_);
5194 $initiator_tempdir =~ m#^/# or
5195 badusage "--initiator-tempdir must be used specify an".
5196 " absolute, not relative, directory."
5202 if (defined $ENV{'DGIT_SSH'}) {
5203 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5204 } elsif (defined $ENV{'GIT_SSH'}) {
5205 @ssh = ($ENV{'GIT_SSH'});
5213 if (!defined $val) {
5214 badusage "$what needs a value" unless @ARGV;
5216 push @rvalopts, $val;
5218 badusage "bad value \`$val' for $what" unless
5219 $val =~ m/^$oi->{Re}$(?!\n)/s;
5220 my $how = $oi->{How};
5221 if (ref($how) eq 'SCALAR') {
5226 push @ropts, @rvalopts;
5230 last unless $ARGV[0] =~ m/^-/;
5234 if (m/^--dry-run$/) {
5237 } elsif (m/^--damp-run$/) {
5240 } elsif (m/^--no-sign$/) {
5243 } elsif (m/^--help$/) {
5245 } elsif (m/^--version$/) {
5247 } elsif (m/^--new$/) {
5250 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5251 ($om = $opts_opt_map{$1}) &&
5255 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5256 !$opts_opt_cmdonly{$1} &&
5257 ($om = $opts_opt_map{$1})) {
5260 } elsif (m/^--(gbp|dpm)$/s) {
5261 push @ropts, "--quilt=$1";
5263 } elsif (m/^--ignore-dirty$/s) {
5266 } elsif (m/^--no-quilt-fixup$/s) {
5268 $quilt_mode = 'nocheck';
5269 } elsif (m/^--no-rm-on-error$/s) {
5272 } elsif (m/^--overwrite$/s) {
5274 $overwrite_version = '';
5275 } elsif (m/^--overwrite=(.+)$/s) {
5277 $overwrite_version = $1;
5278 } elsif (m/^--(no-)?rm-old-changes$/s) {
5281 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5283 push @deliberatelies, $&;
5284 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5288 } elsif (m/^--force-/) {
5290 "$us: warning: ignoring unknown force option $_\n";
5292 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5293 # undocumented, for testing
5295 $tagformat_want = [ $1, 'command line', 1 ];
5296 # 1 menas overrides distro configuration
5297 } elsif (m/^--always-split-source-build$/s) {
5298 # undocumented, for testing
5300 $need_split_build_invocation = 1;
5301 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5302 $val = $2 ? $' : undef; #';
5303 $valopt->($oi->{Long});
5305 badusage "unknown long option \`$_'";
5312 } elsif (s/^-L/-/) {
5315 } elsif (s/^-h/-/) {
5317 } elsif (s/^-D/-/) {
5321 } elsif (s/^-N/-/) {
5326 push @changesopts, $_;
5328 } elsif (s/^-wn$//s) {
5330 $cleanmode = 'none';
5331 } elsif (s/^-wg$//s) {
5334 } elsif (s/^-wgf$//s) {
5336 $cleanmode = 'git-ff';
5337 } elsif (s/^-wd$//s) {
5339 $cleanmode = 'dpkg-source';
5340 } elsif (s/^-wdd$//s) {
5342 $cleanmode = 'dpkg-source-d';
5343 } elsif (s/^-wc$//s) {
5345 $cleanmode = 'check';
5346 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5347 push @git, '-c', $&;
5348 $gitcfgs{cmdline}{$1} = [ $2 ];
5349 } elsif (s/^-c([^=]+)$//s) {
5350 push @git, '-c', $&;
5351 $gitcfgs{cmdline}{$1} = [ 'true' ];
5352 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5354 $val = undef unless length $val;
5355 $valopt->($oi->{Short});
5358 badusage "unknown short option \`$_'";
5365 sub check_env_sanity () {
5366 my $blocked = new POSIX::SigSet;
5367 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5370 foreach my $name (qw(PIPE CHLD)) {
5371 my $signame = "SIG$name";
5372 my $signum = eval "POSIX::$signame" // die;
5373 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5374 die "$signame is set to something other than SIG_DFL\n";
5375 $blocked->ismember($signum) and
5376 die "$signame is blocked\n";
5382 On entry to dgit, $@
5383 This is a bug produced by something in in your execution environment.
5389 sub finalise_opts_opts () {
5390 foreach my $k (keys %opts_opt_map) {
5391 my $om = $opts_opt_map{$k};
5393 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5395 badcfg "cannot set command for $k"
5396 unless length $om->[0];
5400 foreach my $c (access_cfg_cfgs("opts-$k")) {
5402 map { $_ ? @$_ : () }
5403 map { $gitcfgs{$_}{$c} }
5404 reverse @gitcfgsources;
5405 printdebug "CL $c ", (join " ", map { shellquote } @vl),
5406 "\n" if $debuglevel >= 4;
5408 badcfg "cannot configure options for $k"
5409 if $opts_opt_cmdonly{$k};
5410 my $insertpos = $opts_cfg_insertpos{$k};
5411 @$om = ( @$om[0..$insertpos-1],
5413 @$om[$insertpos..$#$om] );
5418 if ($ENV{$fakeeditorenv}) {
5420 quilt_fixup_editor();
5427 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5428 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5429 if $dryrun_level == 1;
5431 print STDERR $helpmsg or die $!;
5434 my $cmd = shift @ARGV;
5437 my $pre_fn = ${*::}{"pre_$cmd"};
5438 $pre_fn->() if $pre_fn;
5440 if (!defined $rmchanges) {
5441 local $access_forpush;
5442 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5445 if (!defined $quilt_mode) {
5446 local $access_forpush;
5447 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5448 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5450 $quilt_mode =~ m/^($quilt_modes_re)$/
5451 or badcfg "unknown quilt-mode \`$quilt_mode'";
5455 $need_split_build_invocation ||= quiltmode_splitbrain();
5457 if (!defined $cleanmode) {
5458 local $access_forpush;
5459 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5460 $cleanmode //= 'dpkg-source';
5462 badcfg "unknown clean-mode \`$cleanmode'" unless
5463 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5466 my $fn = ${*::}{"cmd_$cmd"};
5467 $fn or badusage "unknown operation $cmd";