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 ($) {
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) = @_;
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 fail "fetch of $url gave HTTP code $code"
1027 unless $url =~ m#^file://# or $code =~ m/^2/;
1028 return decode_json($json);
1031 sub canonicalise_suite_ftpmasterapi () {
1032 my ($proto,$data) = @_;
1033 my $suites = api_query($data, 'suites');
1035 foreach my $entry (@$suites) {
1037 my $v = $entry->{$_};
1038 defined $v && $v eq $isuite;
1039 } qw(codename name);
1040 push @matched, $entry;
1042 fail "unknown suite $isuite" unless @matched;
1045 @matched==1 or die "multiple matches for suite $isuite\n";
1046 $cn = "$matched[0]{codename}";
1047 defined $cn or die "suite $isuite info has no codename\n";
1048 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1050 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1055 sub archive_query_ftpmasterapi () {
1056 my ($proto,$data) = @_;
1057 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1059 my $digester = Digest::SHA->new(256);
1060 foreach my $entry (@$info) {
1062 my $vsn = "$entry->{version}";
1063 my ($ok,$msg) = version_check $vsn;
1064 die "bad version: $msg\n" unless $ok;
1065 my $component = "$entry->{component}";
1066 $component =~ m/^$component_re$/ or die "bad component";
1067 my $filename = "$entry->{filename}";
1068 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1069 or die "bad filename";
1070 my $sha256sum = "$entry->{sha256sum}";
1071 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1072 push @rows, [ $vsn, "/pool/$component/$filename",
1073 $digester, $sha256sum ];
1075 die "bad ftpmaster api response: $@\n".Dumper($entry)
1078 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1082 #---------- `madison' archive query method ----------
1084 sub archive_query_madison {
1085 return map { [ @$_[0..1] ] } madison_get_parse(@_);
1088 sub madison_get_parse {
1089 my ($proto,$data) = @_;
1090 die unless $proto eq 'madison';
1091 if (!length $data) {
1092 $data= access_cfg('madison-distro','RETURN-UNDEF');
1093 $data //= access_basedistro();
1095 $rmad{$proto,$data,$package} ||= cmdoutput
1096 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1097 my $rmad = $rmad{$proto,$data,$package};
1100 foreach my $l (split /\n/, $rmad) {
1101 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1102 \s*( [^ \t|]+ )\s* \|
1103 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1104 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1105 $1 eq $package or die "$rmad $package ?";
1112 $component = access_cfg('archive-query-default-component');
1114 $5 eq 'source' or die "$rmad ?";
1115 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1117 return sort { -version_compare($a->[0],$b->[0]); } @out;
1120 sub canonicalise_suite_madison {
1121 # madison canonicalises for us
1122 my @r = madison_get_parse(@_);
1124 "unable to canonicalise suite using package $package".
1125 " which does not appear to exist in suite $isuite;".
1126 " --existing-package may help";
1130 #---------- `sshpsql' archive query method ----------
1133 my ($data,$runeinfo,$sql) = @_;
1134 if (!length $data) {
1135 $data= access_someuserhost('sshpsql').':'.
1136 access_cfg('sshpsql-dbname');
1138 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1139 my ($userhost,$dbname) = ($`,$'); #';
1141 my @cmd = (access_cfg_ssh, $userhost,
1142 access_runeinfo("ssh-psql $runeinfo").
1143 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1144 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1146 open P, "-|", @cmd or die $!;
1149 printdebug(">|$_|\n");
1152 $!=0; $?=0; close P or failedcmd @cmd;
1154 my $nrows = pop @rows;
1155 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1156 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1157 @rows = map { [ split /\|/, $_ ] } @rows;
1158 my $ncols = scalar @{ shift @rows };
1159 die if grep { scalar @$_ != $ncols } @rows;
1163 sub sql_injection_check {
1164 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1167 sub archive_query_sshpsql ($$) {
1168 my ($proto,$data) = @_;
1169 sql_injection_check $isuite, $package;
1170 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1171 SELECT source.version, component.name, files.filename, files.sha256sum
1173 JOIN src_associations ON source.id = src_associations.source
1174 JOIN suite ON suite.id = src_associations.suite
1175 JOIN dsc_files ON dsc_files.source = source.id
1176 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1177 JOIN component ON component.id = files_archive_map.component_id
1178 JOIN files ON files.id = dsc_files.file
1179 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1180 AND source.source='$package'
1181 AND files.filename LIKE '%.dsc';
1183 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1184 my $digester = Digest::SHA->new(256);
1186 my ($vsn,$component,$filename,$sha256sum) = @$_;
1187 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1192 sub canonicalise_suite_sshpsql ($$) {
1193 my ($proto,$data) = @_;
1194 sql_injection_check $isuite;
1195 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1196 SELECT suite.codename
1197 FROM suite where suite_name='$isuite' or codename='$isuite';
1199 @rows = map { $_->[0] } @rows;
1200 fail "unknown suite $isuite" unless @rows;
1201 die "ambiguous $isuite: @rows ?" if @rows>1;
1205 #---------- `dummycat' archive query method ----------
1207 sub canonicalise_suite_dummycat ($$) {
1208 my ($proto,$data) = @_;
1209 my $dpath = "$data/suite.$isuite";
1210 if (!open C, "<", $dpath) {
1211 $!==ENOENT or die "$dpath: $!";
1212 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1216 chomp or die "$dpath: $!";
1218 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1222 sub archive_query_dummycat ($$) {
1223 my ($proto,$data) = @_;
1224 canonicalise_suite();
1225 my $dpath = "$data/package.$csuite.$package";
1226 if (!open C, "<", $dpath) {
1227 $!==ENOENT or die "$dpath: $!";
1228 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1236 printdebug "dummycat query $csuite $package $dpath | $_\n";
1237 my @row = split /\s+/, $_;
1238 @row==2 or die "$dpath: $_ ?";
1241 C->error and die "$dpath: $!";
1243 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1246 #---------- tag format handling ----------
1248 sub access_cfg_tagformats () {
1249 split /\,/, access_cfg('dgit-tag-format');
1252 sub need_tagformat ($$) {
1253 my ($fmt, $why) = @_;
1254 fail "need to use tag format $fmt ($why) but also need".
1255 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1256 " - no way to proceed"
1257 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1258 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1261 sub select_tagformat () {
1263 return if $tagformatfn && !$tagformat_want;
1264 die 'bug' if $tagformatfn && $tagformat_want;
1265 # ... $tagformat_want assigned after previous select_tagformat
1267 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1268 printdebug "select_tagformat supported @supported\n";
1270 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1271 printdebug "select_tagformat specified @$tagformat_want\n";
1273 my ($fmt,$why,$override) = @$tagformat_want;
1275 fail "target distro supports tag formats @supported".
1276 " but have to use $fmt ($why)"
1278 or grep { $_ eq $fmt } @supported;
1280 $tagformat_want = undef;
1282 $tagformatfn = ${*::}{"debiantag_$fmt"};
1284 fail "trying to use unknown tag format \`$fmt' ($why) !"
1285 unless $tagformatfn;
1288 #---------- archive query entrypoints and rest of program ----------
1290 sub canonicalise_suite () {
1291 return if defined $csuite;
1292 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1293 $csuite = archive_query('canonicalise_suite');
1294 if ($isuite ne $csuite) {
1295 progress "canonical suite name for $isuite is $csuite";
1299 sub get_archive_dsc () {
1300 canonicalise_suite();
1301 my @vsns = archive_query('archive_query');
1302 foreach my $vinfo (@vsns) {
1303 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1304 $dscurl = access_cfg('mirror').$subpath;
1305 $dscdata = url_get($dscurl);
1307 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1312 $digester->add($dscdata);
1313 my $got = $digester->hexdigest();
1315 fail "$dscurl has hash $got but".
1316 " archive told us to expect $digest";
1318 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1319 printdebug Dumper($dscdata) if $debuglevel>1;
1320 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1321 printdebug Dumper($dsc) if $debuglevel>1;
1322 my $fmt = getfield $dsc, 'Format';
1323 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1324 "unsupported source format $fmt, sorry";
1326 $dsc_checked = !!$digester;
1327 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1331 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1334 sub check_for_git ();
1335 sub check_for_git () {
1337 my $how = access_cfg('git-check');
1338 if ($how eq 'ssh-cmd') {
1340 (access_cfg_ssh, access_gituserhost(),
1341 access_runeinfo("git-check $package").
1342 " set -e; cd ".access_cfg('git-path').";".
1343 " if test -d $package.git; then echo 1; else echo 0; fi");
1344 my $r= cmdoutput @cmd;
1345 if (defined $r and $r =~ m/^divert (\w+)$/) {
1347 my ($usedistro,) = access_distros();
1348 # NB that if we are pushing, $usedistro will be $distro/push
1349 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1350 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1351 progress "diverting to $divert (using config for $instead_distro)";
1352 return check_for_git();
1354 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1356 } elsif ($how eq 'url') {
1357 my $prefix = access_cfg('git-check-url','git-url');
1358 my $suffix = access_cfg('git-check-suffix','git-suffix',
1359 'RETURN-UNDEF') // '.git';
1360 my $url = "$prefix/$package$suffix";
1361 my @cmd = (@curl, qw(-sS -I), $url);
1362 my $result = cmdoutput @cmd;
1363 $result =~ s/^\S+ 200 .*\n\r?\n//;
1364 # curl -sS -I with https_proxy prints
1365 # HTTP/1.0 200 Connection established
1366 $result =~ m/^\S+ (404|200) /s or
1367 fail "unexpected results from git check query - ".
1368 Dumper($prefix, $result);
1370 if ($code eq '404') {
1372 } elsif ($code eq '200') {
1377 } elsif ($how eq 'true') {
1379 } elsif ($how eq 'false') {
1382 badcfg "unknown git-check \`$how'";
1386 sub create_remote_git_repo () {
1387 my $how = access_cfg('git-create');
1388 if ($how eq 'ssh-cmd') {
1390 (access_cfg_ssh, access_gituserhost(),
1391 access_runeinfo("git-create $package").
1392 "set -e; cd ".access_cfg('git-path').";".
1393 " cp -a _template $package.git");
1394 } elsif ($how eq 'true') {
1397 badcfg "unknown git-create \`$how'";
1401 our ($dsc_hash,$lastpush_mergeinput);
1403 our $ud = '.git/dgit/unpack';
1413 sub mktree_in_ud_here () {
1414 runcmd qw(git init -q);
1415 runcmd qw(git config gc.auto 0);
1416 rmtree('.git/objects');
1417 symlink '../../../../objects','.git/objects' or die $!;
1420 sub git_write_tree () {
1421 my $tree = cmdoutput @git, qw(write-tree);
1422 $tree =~ m/^\w+$/ or die "$tree ?";
1426 sub remove_stray_gits () {
1427 my @gitscmd = qw(find -name .git -prune -print0);
1428 debugcmd "|",@gitscmd;
1429 open GITS, "-|", @gitscmd or die $!;
1434 print STDERR "$us: warning: removing from source package: ",
1435 (messagequote $_), "\n";
1439 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1442 sub mktree_in_ud_from_only_subdir (;$) {
1445 # changes into the subdir
1447 die "expected one subdir but found @dirs ?" unless @dirs==1;
1448 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1452 remove_stray_gits();
1453 mktree_in_ud_here();
1455 my ($format, $fopts) = get_source_format();
1456 if (madformat($format)) {
1461 runcmd @git, qw(add -Af);
1462 my $tree=git_write_tree();
1463 return ($tree,$dir);
1466 our @files_csum_info_fields =
1467 (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1468 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1469 ['Files', 'Digest::MD5', 'new()']);
1471 sub dsc_files_info () {
1472 foreach my $csumi (@files_csum_info_fields) {
1473 my ($fname, $module, $method) = @$csumi;
1474 my $field = $dsc->{$fname};
1475 next unless defined $field;
1476 eval "use $module; 1;" or die $@;
1478 foreach (split /\n/, $field) {
1480 m/^(\w+) (\d+) (\S+)$/ or
1481 fail "could not parse .dsc $fname line \`$_'";
1482 my $digester = eval "$module"."->$method;" or die $@;
1487 Digester => $digester,
1492 fail "missing any supported Checksums-* or Files field in ".
1493 $dsc->get_option('name');
1497 map { $_->{Filename} } dsc_files_info();
1500 sub files_compare_inputs (@) {
1505 my $showinputs = sub {
1506 return join "; ", map { $_->get_option('name') } @$inputs;
1509 foreach my $in (@$inputs) {
1511 my $in_name = $in->get_option('name');
1513 printdebug "files_compare_inputs $in_name\n";
1515 foreach my $csumi (@files_csum_info_fields) {
1516 my ($fname) = @$csumi;
1517 printdebug "files_compare_inputs $in_name $fname\n";
1519 my $field = $in->{$fname};
1520 next unless defined $field;
1523 foreach (split /\n/, $field) {
1526 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1527 fail "could not parse $in_name $fname line \`$_'";
1529 printdebug "files_compare_inputs $in_name $fname $f\n";
1533 my $re = \ $record{$f}{$fname};
1535 $fchecked{$f}{$in_name} = 1;
1537 fail "hash or size of $f varies in $fname fields".
1538 " (between: ".$showinputs->().")";
1543 @files = sort @files;
1544 $expected_files //= \@files;
1545 "@$expected_files" eq "@files" or
1546 fail "file list in $in_name varies between hash fields!";
1549 fail "$in_name has no files list field(s)";
1551 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1554 grep { keys %$_ == @$inputs-1 } values %fchecked
1555 or fail "no file appears in all file lists".
1556 " (looked in: ".$showinputs->().")";
1559 sub is_orig_file_in_dsc ($$) {
1560 my ($f, $dsc_files_info) = @_;
1561 return 0 if @$dsc_files_info <= 1;
1562 # One file means no origs, and the filename doesn't have a "what
1563 # part of dsc" component. (Consider versions ending `.orig'.)
1564 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1568 sub is_orig_file_of_vsn ($$) {
1569 my ($f, $upstreamvsn) = @_;
1570 my $base = srcfn $upstreamvsn, '';
1571 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1575 sub make_commit ($) {
1577 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1580 sub make_commit_text ($) {
1583 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1585 print Dumper($text) if $debuglevel > 1;
1586 my $child = open2($out, $in, @cmd) or die $!;
1589 print $in $text or die $!;
1590 close $in or die $!;
1592 $h =~ m/^\w+$/ or die;
1594 printdebug "=> $h\n";
1597 waitpid $child, 0 == $child or die "$child $!";
1598 $? and failedcmd @cmd;
1602 sub clogp_authline ($) {
1604 my $author = getfield $clogp, 'Maintainer';
1605 $author =~ s#,.*##ms;
1606 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1607 my $authline = "$author $date";
1608 $authline =~ m/$git_authline_re/o or
1609 fail "unexpected commit author line format \`$authline'".
1610 " (was generated from changelog Maintainer field)";
1611 return ($1,$2,$3) if wantarray;
1615 sub vendor_patches_distro ($$) {
1616 my ($checkdistro, $what) = @_;
1617 return unless defined $checkdistro;
1619 my $series = "debian/patches/\L$checkdistro\E.series";
1620 printdebug "checking for vendor-specific $series ($what)\n";
1622 if (!open SERIES, "<", $series) {
1623 die "$series $!" unless $!==ENOENT;
1632 Unfortunately, this source package uses a feature of dpkg-source where
1633 the same source package unpacks to different source code on different
1634 distros. dgit cannot safely operate on such packages on affected
1635 distros, because the meaning of source packages is not stable.
1637 Please ask the distro/maintainer to remove the distro-specific series
1638 files and use a different technique (if necessary, uploading actually
1639 different packages, if different distros are supposed to have
1643 fail "Found active distro-specific series file for".
1644 " $checkdistro ($what): $series, cannot continue";
1646 die "$series $!" if SERIES->error;
1650 sub check_for_vendor_patches () {
1651 # This dpkg-source feature doesn't seem to be documented anywhere!
1652 # But it can be found in the changelog (reformatted):
1654 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1655 # Author: Raphael Hertzog <hertzog@debian.org>
1656 # Date: Sun Oct 3 09:36:48 2010 +0200
1658 # dpkg-source: correctly create .pc/.quilt_series with alternate
1661 # If you have debian/patches/ubuntu.series and you were
1662 # unpacking the source package on ubuntu, quilt was still
1663 # directed to debian/patches/series instead of
1664 # debian/patches/ubuntu.series.
1666 # debian/changelog | 3 +++
1667 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1668 # 2 files changed, 6 insertions(+), 1 deletion(-)
1671 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1672 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1673 "Dpkg::Vendor \`current vendor'");
1674 vendor_patches_distro(access_basedistro(),
1675 "distro being accessed");
1678 sub generate_commits_from_dsc () {
1679 # See big comment in fetch_from_archive, below.
1680 # See also README.dsc-import.
1684 my @dfi = dsc_files_info();
1685 foreach my $fi (@dfi) {
1686 my $f = $fi->{Filename};
1687 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1689 link_ltarget "../../../$f", $f
1693 complete_file_from_dsc('.', $fi)
1696 if (is_orig_file_in_dsc($f, \@dfi)) {
1697 link $f, "../../../../$f"
1703 # We unpack and record the orig tarballs first, so that we only
1704 # need disk space for one private copy of the unpacked source.
1705 # But we can't make them into commits until we have the metadata
1706 # from the debian/changelog, so we record the tree objects now and
1707 # make them into commits later.
1709 my $upstreamv = $dsc->{version};
1710 $upstreamv =~ s/-[^-]+$//;
1711 my $orig_f_base = srcfn $upstreamv, '';
1713 foreach my $fi (@dfi) {
1714 # We actually import, and record as a commit, every tarball
1715 # (unless there is only one file, in which case there seems
1718 my $f = $fi->{Filename};
1719 printdebug "import considering $f ";
1720 (printdebug "only one dfi\n"), next if @dfi == 1;
1721 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1722 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1726 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1728 printdebug "Y ", (join ' ', map { $_//"(none)" }
1729 $compr_ext, $orig_f_part
1732 my $input = new IO::File $f, '<' or die "$f $!";
1736 if (defined $compr_ext) {
1738 Dpkg::Compression::compression_guess_from_filename $f;
1739 fail "Dpkg::Compression cannot handle file $f in source package"
1740 if defined $compr_ext && !defined $cname;
1742 new Dpkg::Compression::Process compression => $cname;
1743 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1744 my $compr_fh = new IO::Handle;
1745 my $compr_pid = open $compr_fh, "-|" // die $!;
1747 open STDIN, "<&", $input or die $!;
1749 die "dgit (child): exec $compr_cmd[0]: $!\n";
1754 rmtree "../unpack-tar";
1755 mkdir "../unpack-tar" or die $!;
1756 my @tarcmd = qw(tar -x -f -
1757 --no-same-owner --no-same-permissions
1758 --no-acls --no-xattrs --no-selinux);
1759 my $tar_pid = fork // die $!;
1761 chdir "../unpack-tar" or die $!;
1762 open STDIN, "<&", $input or die $!;
1764 die "dgit (child): exec $tarcmd[0]: $!";
1766 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1767 !$? or failedcmd @tarcmd;
1770 (@compr_cmd ? failedcmd @compr_cmd
1772 # finally, we have the results in "tarball", but maybe
1773 # with the wrong permissions
1775 runcmd qw(chmod -R +rwX ../unpack-tar);
1776 changedir "../unpack-tar";
1777 my ($tree) = mktree_in_ud_from_only_subdir(1);
1778 changedir "../../unpack";
1779 rmtree "../unpack-tar";
1781 my $ent = [ $f, $tree ];
1783 Orig => !!$orig_f_part,
1784 Sort => (!$orig_f_part ? 2 :
1785 $orig_f_part =~ m/-/g ? 1 :
1793 # put any without "_" first (spec is not clear whether files
1794 # are always in the usual order). Tarballs without "_" are
1795 # the main orig or the debian tarball.
1796 $a->{Sort} <=> $b->{Sort} or
1800 my $any_orig = grep { $_->{Orig} } @tartrees;
1802 my $dscfn = "$package.dsc";
1804 my $treeimporthow = 'package';
1806 open D, ">", $dscfn or die "$dscfn: $!";
1807 print D $dscdata or die "$dscfn: $!";
1808 close D or die "$dscfn: $!";
1809 my @cmd = qw(dpkg-source);
1810 push @cmd, '--no-check' if $dsc_checked;
1811 if (madformat $dsc->{format}) {
1812 push @cmd, '--skip-patches';
1813 $treeimporthow = 'unpatched';
1815 push @cmd, qw(-x --), $dscfn;
1818 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1819 if (madformat $dsc->{format}) {
1820 check_for_vendor_patches();
1824 if (madformat $dsc->{format}) {
1825 my @pcmd = qw(dpkg-source --before-build .);
1826 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1828 runcmd @git, qw(add -Af);
1829 $dappliedtree = git_write_tree();
1832 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1833 debugcmd "|",@clogcmd;
1834 open CLOGS, "-|", @clogcmd or die $!;
1839 printdebug "import clog search...\n";
1842 my $stanzatext = do { local $/=""; <CLOGS>; };
1843 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1844 last if !defined $stanzatext;
1846 my $desc = "package changelog, entry no.$.";
1847 open my $stanzafh, "<", \$stanzatext or die;
1848 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1849 $clogp //= $thisstanza;
1851 printdebug "import clog $thisstanza->{version} $desc...\n";
1853 last if !$any_orig; # we don't need $r1clogp
1855 # We look for the first (most recent) changelog entry whose
1856 # version number is lower than the upstream version of this
1857 # package. Then the last (least recent) previous changelog
1858 # entry is treated as the one which introduced this upstream
1859 # version and used for the synthetic commits for the upstream
1862 # One might think that a more sophisticated algorithm would be
1863 # necessary. But: we do not want to scan the whole changelog
1864 # file. Stopping when we see an earlier version, which
1865 # necessarily then is an earlier upstream version, is the only
1866 # realistic way to do that. Then, either the earliest
1867 # changelog entry we have seen so far is indeed the earliest
1868 # upload of this upstream version; or there are only changelog
1869 # entries relating to later upstream versions (which is not
1870 # possible unless the changelog and .dsc disagree about the
1871 # version). Then it remains to choose between the physically
1872 # last entry in the file, and the one with the lowest version
1873 # number. If these are not the same, we guess that the
1874 # versions were created in a non-monotic order rather than
1875 # that the changelog entries have been misordered.
1877 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
1879 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
1880 $r1clogp = $thisstanza;
1882 printdebug "import clog $r1clogp->{version} becomes r1\n";
1884 die $! if CLOGS->error;
1885 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
1887 $clogp or fail "package changelog has no entries!";
1889 my $authline = clogp_authline $clogp;
1890 my $changes = getfield $clogp, 'Changes';
1891 my $cversion = getfield $clogp, 'Version';
1894 $r1clogp //= $clogp; # maybe there's only one entry;
1895 my $r1authline = clogp_authline $r1clogp;
1896 # Strictly, r1authline might now be wrong if it's going to be
1897 # unused because !$any_orig. Whatever.
1899 printdebug "import tartrees authline $authline\n";
1900 printdebug "import tartrees r1authline $r1authline\n";
1902 foreach my $tt (@tartrees) {
1903 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
1905 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
1908 committer $r1authline
1912 [dgit import orig $tt->{F}]
1920 [dgit import tarball $package $cversion $tt->{F}]
1925 printdebug "import main commit\n";
1927 open C, ">../commit.tmp" or die $!;
1928 print C <<END or die $!;
1931 print C <<END or die $! foreach @tartrees;
1934 print C <<END or die $!;
1940 [dgit import $treeimporthow $package $cversion]
1944 my $rawimport_hash = make_commit qw(../commit.tmp);
1946 if (madformat $dsc->{format}) {
1947 printdebug "import apply patches...\n";
1949 # regularise the state of the working tree so that
1950 # the checkout of $rawimport_hash works nicely.
1951 my $dappliedcommit = make_commit_text(<<END);
1958 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
1960 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
1962 # We need the answers to be reproducible
1963 my @authline = clogp_authline($clogp);
1964 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
1965 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
1966 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
1967 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
1968 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
1969 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
1971 my $path = $ENV{PATH} or die;
1973 foreach my $use_absurd (qw(0 1)) {
1974 local $ENV{PATH} = $path;
1977 progress "warning: $@";
1978 $path = "$absurdity:$path";
1979 progress "$us: trying slow absurd-git-apply...";
1980 rename "../../gbp-pq-output","../../gbp-pq-output.0"
1985 die "forbid absurd git-apply\n" if $use_absurd
1986 && forceing [qw(import-gitapply-no-absurd)];
1987 die "only absurd git-apply!\n" if !$use_absurd
1988 && forceing [qw(import-gitapply-absurd)];
1990 local $ENV{PATH} = $path if $use_absurd;
1992 my @showcmd = (gbp_pq, qw(import));
1993 my @realcmd = shell_cmd
1994 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
1995 debugcmd "+",@realcmd;
1996 if (system @realcmd) {
1997 die +(shellquote @showcmd).
1999 failedcmd_waitstatus()."\n";
2002 my $gapplied = git_rev_parse('HEAD');
2003 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2004 $gappliedtree eq $dappliedtree or
2006 gbp-pq import and dpkg-source disagree!
2007 gbp-pq import gave commit $gapplied
2008 gbp-pq import gave tree $gappliedtree
2009 dpkg-source --before-build gave tree $dappliedtree
2011 $rawimport_hash = $gapplied;
2016 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2021 progress "synthesised git commit from .dsc $cversion";
2023 my $rawimport_mergeinput = {
2024 Commit => $rawimport_hash,
2025 Info => "Import of source package",
2027 my @output = ($rawimport_mergeinput);
2029 if ($lastpush_mergeinput) {
2030 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2031 my $oversion = getfield $oldclogp, 'Version';
2033 version_compare($oversion, $cversion);
2035 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2036 { Message => <<END, ReverseParents => 1 });
2037 Record $package ($cversion) in archive suite $csuite
2039 } elsif ($vcmp > 0) {
2040 print STDERR <<END or die $!;
2042 Version actually in archive: $cversion (older)
2043 Last version pushed with dgit: $oversion (newer or same)
2046 @output = $lastpush_mergeinput;
2048 # Same version. Use what's in the server git branch,
2049 # discarding our own import. (This could happen if the
2050 # server automatically imports all packages into git.)
2051 @output = $lastpush_mergeinput;
2054 changedir '../../../..';
2059 sub complete_file_from_dsc ($$) {
2060 our ($dstdir, $fi) = @_;
2061 # Ensures that we have, in $dir, the file $fi, with the correct
2062 # contents. (Downloading it from alongside $dscurl if necessary.)
2064 my $f = $fi->{Filename};
2065 my $tf = "$dstdir/$f";
2068 if (stat_exists $tf) {
2069 progress "using existing $f";
2072 $furl =~ s{/[^/]+$}{};
2074 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2075 die "$f ?" if $f =~ m#/#;
2076 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2077 return 0 if !act_local();
2081 open F, "<", "$tf" or die "$tf: $!";
2082 $fi->{Digester}->reset();
2083 $fi->{Digester}->addfile(*F);
2084 F->error and die $!;
2085 my $got = $fi->{Digester}->hexdigest();
2086 $got eq $fi->{Hash} or
2087 fail "file $f has hash $got but .dsc".
2088 " demands hash $fi->{Hash} ".
2089 ($downloaded ? "(got wrong file from archive!)"
2090 : "(perhaps you should delete this file?)");
2095 sub ensure_we_have_orig () {
2096 my @dfi = dsc_files_info();
2097 foreach my $fi (@dfi) {
2098 my $f = $fi->{Filename};
2099 next unless is_orig_file_in_dsc($f, \@dfi);
2100 complete_file_from_dsc('..', $fi)
2105 sub git_fetch_us () {
2106 # Want to fetch only what we are going to use, unless
2107 # deliberately-not-ff, in which case we must fetch everything.
2109 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2111 (quiltmode_splitbrain
2112 ? (map { $_->('*',access_basedistro) }
2113 \&debiantag_new, \&debiantag_maintview)
2114 : debiantags('*',access_basedistro));
2115 push @specs, server_branch($csuite);
2116 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2118 # This is rather miserable:
2119 # When git fetch --prune is passed a fetchspec ending with a *,
2120 # it does a plausible thing. If there is no * then:
2121 # - it matches subpaths too, even if the supplied refspec
2122 # starts refs, and behaves completely madly if the source
2123 # has refs/refs/something. (See, for example, Debian #NNNN.)
2124 # - if there is no matching remote ref, it bombs out the whole
2126 # We want to fetch a fixed ref, and we don't know in advance
2127 # if it exists, so this is not suitable.
2129 # Our workaround is to use git ls-remote. git ls-remote has its
2130 # own qairks. Notably, it has the absurd multi-tail-matching
2131 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2132 # refs/refs/foo etc.
2134 # Also, we want an idempotent snapshot, but we have to make two
2135 # calls to the remote: one to git ls-remote and to git fetch. The
2136 # solution is use git ls-remote to obtain a target state, and
2137 # git fetch to try to generate it. If we don't manage to generate
2138 # the target state, we try again.
2140 my $specre = join '|', map {
2146 printdebug "git_fetch_us specre=$specre\n";
2147 my $wanted_rref = sub {
2149 return m/^(?:$specre)$/o;
2152 my $fetch_iteration = 0;
2155 if (++$fetch_iteration > 10) {
2156 fail "too many iterations trying to get sane fetch!";
2159 my @look = map { "refs/$_" } @specs;
2160 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2164 open GITLS, "-|", @lcmd or die $!;
2166 printdebug "=> ", $_;
2167 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2168 my ($objid,$rrefname) = ($1,$2);
2169 if (!$wanted_rref->($rrefname)) {
2171 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2175 $wantr{$rrefname} = $objid;
2178 close GITLS or failedcmd @lcmd;
2180 # OK, now %want is exactly what we want for refs in @specs
2182 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2183 "+refs/$_:".lrfetchrefs."/$_";
2186 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2187 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2190 %lrfetchrefs_f = ();
2193 git_for_each_ref(lrfetchrefs, sub {
2194 my ($objid,$objtype,$lrefname,$reftail) = @_;
2195 $lrfetchrefs_f{$lrefname} = $objid;
2196 $objgot{$objid} = 1;
2199 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2200 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2201 if (!exists $wantr{$rrefname}) {
2202 if ($wanted_rref->($rrefname)) {
2204 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2208 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2211 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2212 delete $lrfetchrefs_f{$lrefname};
2216 foreach my $rrefname (sort keys %wantr) {
2217 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2218 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2219 my $want = $wantr{$rrefname};
2220 next if $got eq $want;
2221 if (!defined $objgot{$want}) {
2223 warning: git ls-remote suggests we want $lrefname
2224 warning: and it should refer to $want
2225 warning: but git fetch didn't fetch that object to any relevant ref.
2226 warning: This may be due to a race with someone updating the server.
2227 warning: Will try again...
2229 next FETCH_ITERATION;
2232 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2234 runcmd_ordryrun_local @git, qw(update-ref -m),
2235 "dgit fetch git fetch fixup", $lrefname, $want;
2236 $lrfetchrefs_f{$lrefname} = $want;
2240 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2241 Dumper(\%lrfetchrefs_f);
2244 my @tagpats = debiantags('*',access_basedistro);
2246 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2247 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2248 printdebug "currently $fullrefname=$objid\n";
2249 $here{$fullrefname} = $objid;
2251 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2252 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2253 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2254 printdebug "offered $lref=$objid\n";
2255 if (!defined $here{$lref}) {
2256 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2257 runcmd_ordryrun_local @upd;
2258 lrfetchref_used $fullrefname;
2259 } elsif ($here{$lref} eq $objid) {
2260 lrfetchref_used $fullrefname;
2263 "Not updateting $lref from $here{$lref} to $objid.\n";
2268 sub mergeinfo_getclogp ($) {
2269 # Ensures thit $mi->{Clogp} exists and returns it
2271 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2274 sub mergeinfo_version ($) {
2275 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2278 sub fetch_from_archive () {
2279 ensure_setup_existing_tree();
2281 # Ensures that lrref() is what is actually in the archive, one way
2282 # or another, according to us - ie this client's
2283 # appropritaely-updated archive view. Also returns the commit id.
2284 # If there is nothing in the archive, leaves lrref alone and
2285 # returns undef. git_fetch_us must have already been called.
2289 foreach my $field (@ourdscfield) {
2290 $dsc_hash = $dsc->{$field};
2291 last if defined $dsc_hash;
2293 if (defined $dsc_hash) {
2294 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2296 progress "last upload to archive specified git hash";
2298 progress "last upload to archive has NO git hash";
2301 progress "no version available from the archive";
2304 # If the archive's .dsc has a Dgit field, there are three
2305 # relevant git commitids we need to choose between and/or merge
2307 # 1. $dsc_hash: the Dgit field from the archive
2308 # 2. $lastpush_hash: the suite branch on the dgit git server
2309 # 3. $lastfetch_hash: our local tracking brach for the suite
2311 # These may all be distinct and need not be in any fast forward
2314 # If the dsc was pushed to this suite, then the server suite
2315 # branch will have been updated; but it might have been pushed to
2316 # a different suite and copied by the archive. Conversely a more
2317 # recent version may have been pushed with dgit but not appeared
2318 # in the archive (yet).
2320 # $lastfetch_hash may be awkward because archive imports
2321 # (particularly, imports of Dgit-less .dscs) are performed only as
2322 # needed on individual clients, so different clients may perform a
2323 # different subset of them - and these imports are only made
2324 # public during push. So $lastfetch_hash may represent a set of
2325 # imports different to a subsequent upload by a different dgit
2328 # Our approach is as follows:
2330 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2331 # descendant of $dsc_hash, then it was pushed by a dgit user who
2332 # had based their work on $dsc_hash, so we should prefer it.
2333 # Otherwise, $dsc_hash was installed into this suite in the
2334 # archive other than by a dgit push, and (necessarily) after the
2335 # last dgit push into that suite (since a dgit push would have
2336 # been descended from the dgit server git branch); thus, in that
2337 # case, we prefer the archive's version (and produce a
2338 # pseudo-merge to overwrite the dgit server git branch).
2340 # (If there is no Dgit field in the archive's .dsc then
2341 # generate_commit_from_dsc uses the version numbers to decide
2342 # whether the suite branch or the archive is newer. If the suite
2343 # branch is newer it ignores the archive's .dsc; otherwise it
2344 # generates an import of the .dsc, and produces a pseudo-merge to
2345 # overwrite the suite branch with the archive contents.)
2347 # The outcome of that part of the algorithm is the `public view',
2348 # and is same for all dgit clients: it does not depend on any
2349 # unpublished history in the local tracking branch.
2351 # As between the public view and the local tracking branch: The
2352 # local tracking branch is only updated by dgit fetch, and
2353 # whenever dgit fetch runs it includes the public view in the
2354 # local tracking branch. Therefore if the public view is not
2355 # descended from the local tracking branch, the local tracking
2356 # branch must contain history which was imported from the archive
2357 # but never pushed; and, its tip is now out of date. So, we make
2358 # a pseudo-merge to overwrite the old imports and stitch the old
2361 # Finally: we do not necessarily reify the public view (as
2362 # described above). This is so that we do not end up stacking two
2363 # pseudo-merges. So what we actually do is figure out the inputs
2364 # to any public view pseudo-merge and put them in @mergeinputs.
2367 # $mergeinputs[]{Commit}
2368 # $mergeinputs[]{Info}
2369 # $mergeinputs[0] is the one whose tree we use
2370 # @mergeinputs is in the order we use in the actual commit)
2373 # $mergeinputs[]{Message} is a commit message to use
2374 # $mergeinputs[]{ReverseParents} if def specifies that parent
2375 # list should be in opposite order
2376 # Such an entry has no Commit or Info. It applies only when found
2377 # in the last entry. (This ugliness is to support making
2378 # identical imports to previous dgit versions.)
2380 my $lastpush_hash = git_get_ref(lrfetchref());
2381 printdebug "previous reference hash=$lastpush_hash\n";
2382 $lastpush_mergeinput = $lastpush_hash && {
2383 Commit => $lastpush_hash,
2384 Info => "dgit suite branch on dgit git server",
2387 my $lastfetch_hash = git_get_ref(lrref());
2388 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2389 my $lastfetch_mergeinput = $lastfetch_hash && {
2390 Commit => $lastfetch_hash,
2391 Info => "dgit client's archive history view",
2394 my $dsc_mergeinput = $dsc_hash && {
2395 Commit => $dsc_hash,
2396 Info => "Dgit field in .dsc from archive",
2400 my $del_lrfetchrefs = sub {
2403 printdebug "del_lrfetchrefs...\n";
2404 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2405 my $objid = $lrfetchrefs_d{$fullrefname};
2406 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2408 $gur ||= new IO::Handle;
2409 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2411 printf $gur "delete %s %s\n", $fullrefname, $objid;
2414 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2418 if (defined $dsc_hash) {
2419 fail "missing remote git history even though dsc has hash -".
2420 " could not find ref ".rref()." at ".access_giturl()
2421 unless $lastpush_hash;
2422 ensure_we_have_orig();
2423 if ($dsc_hash eq $lastpush_hash) {
2424 @mergeinputs = $dsc_mergeinput
2425 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2426 print STDERR <<END or die $!;
2428 Git commit in archive is behind the last version allegedly pushed/uploaded.
2429 Commit referred to by archive: $dsc_hash
2430 Last version pushed with dgit: $lastpush_hash
2433 @mergeinputs = ($lastpush_mergeinput);
2435 # Archive has .dsc which is not a descendant of the last dgit
2436 # push. This can happen if the archive moves .dscs about.
2437 # Just follow its lead.
2438 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2439 progress "archive .dsc names newer git commit";
2440 @mergeinputs = ($dsc_mergeinput);
2442 progress "archive .dsc names other git commit, fixing up";
2443 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2447 @mergeinputs = generate_commits_from_dsc();
2448 # We have just done an import. Now, our import algorithm might
2449 # have been improved. But even so we do not want to generate
2450 # a new different import of the same package. So if the
2451 # version numbers are the same, just use our existing version.
2452 # If the version numbers are different, the archive has changed
2453 # (perhaps, rewound).
2454 if ($lastfetch_mergeinput &&
2455 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2456 (mergeinfo_version $mergeinputs[0]) )) {
2457 @mergeinputs = ($lastfetch_mergeinput);
2459 } elsif ($lastpush_hash) {
2460 # only in git, not in the archive yet
2461 @mergeinputs = ($lastpush_mergeinput);
2462 print STDERR <<END or die $!;
2464 Package not found in the archive, but has allegedly been pushed using dgit.
2468 printdebug "nothing found!\n";
2469 if (defined $skew_warning_vsn) {
2470 print STDERR <<END or die $!;
2472 Warning: relevant archive skew detected.
2473 Archive allegedly contains $skew_warning_vsn
2474 But we were not able to obtain any version from the archive or git.
2478 unshift @end, $del_lrfetchrefs;
2482 if ($lastfetch_hash &&
2484 my $h = $_->{Commit};
2485 $h and is_fast_fwd($lastfetch_hash, $h);
2486 # If true, one of the existing parents of this commit
2487 # is a descendant of the $lastfetch_hash, so we'll
2488 # be ff from that automatically.
2492 push @mergeinputs, $lastfetch_mergeinput;
2495 printdebug "fetch mergeinfos:\n";
2496 foreach my $mi (@mergeinputs) {
2498 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2500 printdebug sprintf " ReverseParents=%d Message=%s",
2501 $mi->{ReverseParents}, $mi->{Message};
2505 my $compat_info= pop @mergeinputs
2506 if $mergeinputs[$#mergeinputs]{Message};
2508 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2511 if (@mergeinputs > 1) {
2513 my $tree_commit = $mergeinputs[0]{Commit};
2515 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2516 $tree =~ m/\n\n/; $tree = $`;
2517 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2520 # We use the changelog author of the package in question the
2521 # author of this pseudo-merge. This is (roughly) correct if
2522 # this commit is simply representing aa non-dgit upload.
2523 # (Roughly because it does not record sponsorship - but we
2524 # don't have sponsorship info because that's in the .changes,
2525 # which isn't in the archivw.)
2527 # But, it might be that we are representing archive history
2528 # updates (including in-archive copies). These are not really
2529 # the responsibility of the person who created the .dsc, but
2530 # there is no-one whose name we should better use. (The
2531 # author of the .dsc-named commit is clearly worse.)
2533 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2534 my $author = clogp_authline $useclogp;
2535 my $cversion = getfield $useclogp, 'Version';
2537 my $mcf = ".git/dgit/mergecommit";
2538 open MC, ">", $mcf or die "$mcf $!";
2539 print MC <<END or die $!;
2543 my @parents = grep { $_->{Commit} } @mergeinputs;
2544 @parents = reverse @parents if $compat_info->{ReverseParents};
2545 print MC <<END or die $! foreach @parents;
2549 print MC <<END or die $!;
2555 if (defined $compat_info->{Message}) {
2556 print MC $compat_info->{Message} or die $!;
2558 print MC <<END or die $!;
2559 Record $package ($cversion) in archive suite $csuite
2563 my $message_add_info = sub {
2565 my $mversion = mergeinfo_version $mi;
2566 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2570 $message_add_info->($mergeinputs[0]);
2571 print MC <<END or die $!;
2572 should be treated as descended from
2574 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2578 $hash = make_commit $mcf;
2580 $hash = $mergeinputs[0]{Commit};
2582 printdebug "fetch hash=$hash\n";
2585 my ($lasth, $what) = @_;
2586 return unless $lasth;
2587 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2590 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2591 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2593 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2594 'DGIT_ARCHIVE', $hash;
2595 cmdoutput @git, qw(log -n2), $hash;
2596 # ... gives git a chance to complain if our commit is malformed
2598 if (defined $skew_warning_vsn) {
2600 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2601 my $gotclogp = commit_getclogp($hash);
2602 my $got_vsn = getfield $gotclogp, 'Version';
2603 printdebug "SKEW CHECK GOT $got_vsn\n";
2604 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2605 print STDERR <<END or die $!;
2607 Warning: archive skew detected. Using the available version:
2608 Archive allegedly contains $skew_warning_vsn
2609 We were able to obtain only $got_vsn
2615 if ($lastfetch_hash ne $hash) {
2616 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2620 dryrun_report @upd_cmd;
2624 lrfetchref_used lrfetchref();
2626 unshift @end, $del_lrfetchrefs;
2630 sub set_local_git_config ($$) {
2632 runcmd @git, qw(config), $k, $v;
2635 sub setup_mergechangelogs (;$) {
2637 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2639 my $driver = 'dpkg-mergechangelogs';
2640 my $cb = "merge.$driver";
2641 my $attrs = '.git/info/attributes';
2642 ensuredir '.git/info';
2644 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2645 if (!open ATTRS, "<", $attrs) {
2646 $!==ENOENT or die "$attrs: $!";
2650 next if m{^debian/changelog\s};
2651 print NATTRS $_, "\n" or die $!;
2653 ATTRS->error and die $!;
2656 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2659 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2660 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2662 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2665 sub setup_useremail (;$) {
2667 return unless $always || access_cfg_bool(1, 'setup-useremail');
2670 my ($k, $envvar) = @_;
2671 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2672 return unless defined $v;
2673 set_local_git_config "user.$k", $v;
2676 $setup->('email', 'DEBEMAIL');
2677 $setup->('name', 'DEBFULLNAME');
2680 sub ensure_setup_existing_tree () {
2681 my $k = "remote.$remotename.skipdefaultupdate";
2682 my $c = git_get_config $k;
2683 return if defined $c;
2684 set_local_git_config $k, 'true';
2687 sub setup_new_tree () {
2688 setup_mergechangelogs();
2694 canonicalise_suite();
2695 badusage "dry run makes no sense with clone" unless act_local();
2696 my $hasgit = check_for_git();
2697 mkdir $dstdir or fail "create \`$dstdir': $!";
2699 runcmd @git, qw(init -q);
2700 my $giturl = access_giturl(1);
2701 if (defined $giturl) {
2702 open H, "> .git/HEAD" or die $!;
2703 print H "ref: ".lref()."\n" or die $!;
2705 runcmd @git, qw(remote add), 'origin', $giturl;
2708 progress "fetching existing git history";
2710 runcmd_ordryrun_local @git, qw(fetch origin);
2712 progress "starting new git history";
2714 fetch_from_archive() or no_such_package;
2715 my $vcsgiturl = $dsc->{'Vcs-Git'};
2716 if (length $vcsgiturl) {
2717 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2718 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2721 runcmd @git, qw(reset --hard), lrref();
2722 printdone "ready for work in $dstdir";
2726 if (check_for_git()) {
2729 fetch_from_archive() or no_such_package();
2730 printdone "fetched into ".lrref();
2735 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2737 printdone "fetched to ".lrref()." and merged into HEAD";
2740 sub check_not_dirty () {
2741 foreach my $f (qw(local-options local-patch-header)) {
2742 if (stat_exists "debian/source/$f") {
2743 fail "git tree contains debian/source/$f";
2747 return if $ignoredirty;
2749 my @cmd = (@git, qw(diff --quiet HEAD));
2751 $!=0; $?=-1; system @cmd;
2754 fail "working tree is dirty (does not match HEAD)";
2760 sub commit_admin ($) {
2763 runcmd_ordryrun_local @git, qw(commit -m), $m;
2766 sub commit_quilty_patch () {
2767 my $output = cmdoutput @git, qw(status --porcelain);
2769 foreach my $l (split /\n/, $output) {
2770 next unless $l =~ m/\S/;
2771 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2775 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2777 progress "nothing quilty to commit, ok.";
2780 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2781 runcmd_ordryrun_local @git, qw(add -f), @adds;
2783 Commit Debian 3.0 (quilt) metadata
2785 [dgit ($our_version) quilt-fixup]
2789 sub get_source_format () {
2791 if (open F, "debian/source/options") {
2795 s/\s+$//; # ignore missing final newline
2797 my ($k, $v) = ($`, $'); #');
2798 $v =~ s/^"(.*)"$/$1/;
2804 F->error and die $!;
2807 die $! unless $!==&ENOENT;
2810 if (!open F, "debian/source/format") {
2811 die $! unless $!==&ENOENT;
2815 F->error and die $!;
2817 return ($_, \%options);
2820 sub madformat_wantfixup ($) {
2822 return 0 unless $format eq '3.0 (quilt)';
2823 our $quilt_mode_warned;
2824 if ($quilt_mode eq 'nocheck') {
2825 progress "Not doing any fixup of \`$format' due to".
2826 " ----no-quilt-fixup or --quilt=nocheck"
2827 unless $quilt_mode_warned++;
2830 progress "Format \`$format', need to check/update patch stack"
2831 unless $quilt_mode_warned++;
2835 # An "infopair" is a tuple [ $thing, $what ]
2836 # (often $thing is a commit hash; $what is a description)
2838 sub infopair_cond_equal ($$) {
2840 $x->[0] eq $y->[0] or fail <<END;
2841 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
2845 sub infopair_lrf_tag_lookup ($$) {
2846 my ($tagnames, $what) = @_;
2847 # $tagname may be an array ref
2848 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
2849 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
2850 foreach my $tagname (@tagnames) {
2851 my $lrefname = lrfetchrefs."/tags/$tagname";
2852 my $tagobj = $lrfetchrefs_f{$lrefname};
2853 next unless defined $tagobj;
2854 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
2855 return [ git_rev_parse($tagobj), $what ];
2857 fail @tagnames==1 ? <<END : <<END;
2858 Wanted tag $what (@tagnames) on dgit server, but not found
2860 Wanted tag $what (one of: @tagnames) on dgit server, but not found
2864 sub infopair_cond_ff ($$) {
2865 my ($anc,$desc) = @_;
2866 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
2867 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
2871 sub pseudomerge_version_check ($$) {
2872 my ($clogp, $archive_hash) = @_;
2874 my $arch_clogp = commit_getclogp $archive_hash;
2875 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
2876 'version currently in archive' ];
2877 if (defined $overwrite_version) {
2878 if (length $overwrite_version) {
2879 infopair_cond_equal([ $overwrite_version,
2880 '--overwrite= version' ],
2883 my $v = $i_arch_v->[0];
2884 progress "Checking package changelog for archive version $v ...";
2886 my @xa = ("-f$v", "-t$v");
2887 my $vclogp = parsechangelog @xa;
2888 my $cv = [ (getfield $vclogp, 'Version'),
2889 "Version field from dpkg-parsechangelog @xa" ];
2890 infopair_cond_equal($i_arch_v, $cv);
2893 $@ =~ s/^dgit: //gm;
2895 "Perhaps debian/changelog does not mention $v ?";
2900 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
2904 sub pseudomerge_make_commit ($$$$ $$) {
2905 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
2906 $msg_cmd, $msg_msg) = @_;
2907 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
2909 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
2910 my $authline = clogp_authline $clogp;
2914 !defined $overwrite_version ? ""
2915 : !length $overwrite_version ? " --overwrite"
2916 : " --overwrite=".$overwrite_version;
2919 my $pmf = ".git/dgit/pseudomerge";
2920 open MC, ">", $pmf or die "$pmf $!";
2921 print MC <<END or die $!;
2924 parent $archive_hash
2934 return make_commit($pmf);
2937 sub splitbrain_pseudomerge ($$$$) {
2938 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
2939 # => $merged_dgitview
2940 printdebug "splitbrain_pseudomerge...\n";
2942 # We: debian/PREVIOUS HEAD($maintview)
2943 # expect: o ----------------- o
2946 # a/d/PREVIOUS $dgitview
2949 # we do: `------------------ o
2953 printdebug "splitbrain_pseudomerge...\n";
2955 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
2957 return $dgitview unless defined $archive_hash;
2959 if (!defined $overwrite_version) {
2960 progress "Checking that HEAD inciudes all changes in archive...";
2963 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
2965 if (defined $overwrite_version) {
2967 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
2968 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
2969 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
2970 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
2971 my $i_archive = [ $archive_hash, "current archive contents" ];
2973 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
2975 infopair_cond_equal($i_dgit, $i_archive);
2976 infopair_cond_ff($i_dep14, $i_dgit);
2977 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
2981 $us: check failed (maybe --overwrite is needed, consult documentation)
2986 my $r = pseudomerge_make_commit
2987 $clogp, $dgitview, $archive_hash, $i_arch_v,
2988 "dgit --quilt=$quilt_mode",
2989 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
2990 Declare fast forward from $i_arch_v->[0]
2992 Make fast forward from $i_arch_v->[0]
2995 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
2999 sub plain_overwrite_pseudomerge ($$$) {
3000 my ($clogp, $head, $archive_hash) = @_;
3002 printdebug "plain_overwrite_pseudomerge...";
3004 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3006 return $head if is_fast_fwd $archive_hash, $head;
3008 my $m = "Declare fast forward from $i_arch_v->[0]";
3010 my $r = pseudomerge_make_commit
3011 $clogp, $head, $archive_hash, $i_arch_v,
3014 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3016 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3020 sub push_parse_changelog ($) {
3023 my $clogp = Dpkg::Control::Hash->new();
3024 $clogp->load($clogpfn) or die;
3026 $package = getfield $clogp, 'Source';
3027 my $cversion = getfield $clogp, 'Version';
3028 my $tag = debiantag($cversion, access_basedistro);
3029 runcmd @git, qw(check-ref-format), $tag;
3031 my $dscfn = dscfn($cversion);
3033 return ($clogp, $cversion, $dscfn);
3036 sub push_parse_dsc ($$$) {
3037 my ($dscfn,$dscfnwhat, $cversion) = @_;
3038 $dsc = parsecontrol($dscfn,$dscfnwhat);
3039 my $dversion = getfield $dsc, 'Version';
3040 my $dscpackage = getfield $dsc, 'Source';
3041 ($dscpackage eq $package && $dversion eq $cversion) or
3042 fail "$dscfn is for $dscpackage $dversion".
3043 " but debian/changelog is for $package $cversion";
3046 sub push_tagwants ($$$$) {
3047 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3050 TagFn => \&debiantag,
3055 if (defined $maintviewhead) {
3057 TagFn => \&debiantag_maintview,
3058 Objid => $maintviewhead,
3059 TfSuffix => '-maintview',
3063 foreach my $tw (@tagwants) {
3064 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
3065 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3067 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3071 sub push_mktags ($$ $$ $) {
3073 $changesfile,$changesfilewhat,
3076 die unless $tagwants->[0]{View} eq 'dgit';
3078 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3079 $dsc->save("$dscfn.tmp") or die $!;
3081 my $changes = parsecontrol($changesfile,$changesfilewhat);
3082 foreach my $field (qw(Source Distribution Version)) {
3083 $changes->{$field} eq $clogp->{$field} or
3084 fail "changes field $field \`$changes->{$field}'".
3085 " does not match changelog \`$clogp->{$field}'";
3088 my $cversion = getfield $clogp, 'Version';
3089 my $clogsuite = getfield $clogp, 'Distribution';
3091 # We make the git tag by hand because (a) that makes it easier
3092 # to control the "tagger" (b) we can do remote signing
3093 my $authline = clogp_authline $clogp;
3094 my $delibs = join(" ", "",@deliberatelies);
3095 my $declaredistro = access_basedistro();
3099 my $tfn = $tw->{Tfn};
3100 my $head = $tw->{Objid};
3101 my $tag = $tw->{Tag};
3103 open TO, '>', $tfn->('.tmp') or die $!;
3104 print TO <<END or die $!;
3111 if ($tw->{View} eq 'dgit') {
3112 print TO <<END or die $!;
3113 $package release $cversion for $clogsuite ($csuite) [dgit]
3114 [dgit distro=$declaredistro$delibs]
3116 foreach my $ref (sort keys %previously) {
3117 print TO <<END or die $!;
3118 [dgit previously:$ref=$previously{$ref}]
3121 } elsif ($tw->{View} eq 'maint') {
3122 print TO <<END or die $!;
3123 $package release $cversion for $clogsuite ($csuite)
3124 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3127 die Dumper($tw)."?";
3132 my $tagobjfn = $tfn->('.tmp');
3134 if (!defined $keyid) {
3135 $keyid = access_cfg('keyid','RETURN-UNDEF');
3137 if (!defined $keyid) {
3138 $keyid = getfield $clogp, 'Maintainer';
3140 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3141 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3142 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3143 push @sign_cmd, $tfn->('.tmp');
3144 runcmd_ordryrun @sign_cmd;
3146 $tagobjfn = $tfn->('.signed.tmp');
3147 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3148 $tfn->('.tmp'), $tfn->('.tmp.asc');
3154 my @r = map { $mktag->($_); } @$tagwants;
3158 sub sign_changes ($) {
3159 my ($changesfile) = @_;
3161 my @debsign_cmd = @debsign;
3162 push @debsign_cmd, "-k$keyid" if defined $keyid;
3163 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3164 push @debsign_cmd, $changesfile;
3165 runcmd_ordryrun @debsign_cmd;
3170 printdebug "actually entering push\n";
3172 supplementary_message(<<'END');
3173 Push failed, while checking state of the archive.
3174 You can retry the push, after fixing the problem, if you like.
3176 if (check_for_git()) {
3179 my $archive_hash = fetch_from_archive();
3180 if (!$archive_hash) {
3182 fail "package appears to be new in this suite;".
3183 " if this is intentional, use --new";
3186 supplementary_message(<<'END');
3187 Push failed, while preparing your push.
3188 You can retry the push, after fixing the problem, if you like.
3191 need_tagformat 'new', "quilt mode $quilt_mode"
3192 if quiltmode_splitbrain;
3196 access_giturl(); # check that success is vaguely likely
3199 my $clogpfn = ".git/dgit/changelog.822.tmp";
3200 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3202 responder_send_file('parsed-changelog', $clogpfn);
3204 my ($clogp, $cversion, $dscfn) =
3205 push_parse_changelog("$clogpfn");
3207 my $dscpath = "$buildproductsdir/$dscfn";
3208 stat_exists $dscpath or
3209 fail "looked for .dsc $dscfn, but $!;".
3210 " maybe you forgot to build";
3212 responder_send_file('dsc', $dscpath);
3214 push_parse_dsc($dscpath, $dscfn, $cversion);
3216 my $format = getfield $dsc, 'Format';
3217 printdebug "format $format\n";
3219 my $actualhead = git_rev_parse('HEAD');
3220 my $dgithead = $actualhead;
3221 my $maintviewhead = undef;
3223 if (madformat_wantfixup($format)) {
3224 # user might have not used dgit build, so maybe do this now:
3225 if (quiltmode_splitbrain()) {
3226 my $upstreamversion = $clogp->{Version};
3227 $upstreamversion =~ s/-[^-]*$//;
3229 quilt_make_fake_dsc($upstreamversion);
3231 ($dgithead, $cachekey) =
3232 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3234 "--quilt=$quilt_mode but no cached dgit view:
3235 perhaps tree changed since dgit build[-source] ?";
3237 $dgithead = splitbrain_pseudomerge($clogp,
3238 $actualhead, $dgithead,
3240 $maintviewhead = $actualhead;
3241 changedir '../../../..';
3242 prep_ud(); # so _only_subdir() works, below
3244 commit_quilty_patch();
3248 if (defined $overwrite_version && !defined $maintviewhead) {
3249 $dgithead = plain_overwrite_pseudomerge($clogp,
3257 if ($archive_hash) {
3258 if (is_fast_fwd($archive_hash, $dgithead)) {
3260 } elsif (deliberately_not_fast_forward) {
3263 fail "dgit push: HEAD is not a descendant".
3264 " of the archive's version.\n".
3265 "To overwrite the archive's contents,".
3266 " pass --overwrite[=VERSION].\n".
3267 "To rewind history, if permitted by the archive,".
3268 " use --deliberately-not-fast-forward.";
3273 progress "checking that $dscfn corresponds to HEAD";
3274 runcmd qw(dpkg-source -x --),
3275 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3276 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3277 check_for_vendor_patches() if madformat($dsc->{format});
3278 changedir '../../../..';
3279 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3280 debugcmd "+",@diffcmd;
3282 my $r = system @diffcmd;
3285 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3287 HEAD specifies a different tree to $dscfn:
3289 Perhaps you forgot to build. Or perhaps there is a problem with your
3290 source tree (see dgit(7) for some hints). To see a full diff, run
3297 if (!$changesfile) {
3298 my $pat = changespat $cversion;
3299 my @cs = glob "$buildproductsdir/$pat";
3300 fail "failed to find unique changes file".
3301 " (looked for $pat in $buildproductsdir);".
3302 " perhaps you need to use dgit -C"
3304 ($changesfile) = @cs;
3306 $changesfile = "$buildproductsdir/$changesfile";
3309 # Check that changes and .dsc agree enough
3310 $changesfile =~ m{[^/]*$};
3311 files_compare_inputs($dsc, parsecontrol($changesfile,$&))
3312 unless forceing [qw(dsc-changes-mismatch)];
3314 # Checks complete, we're going to try and go ahead:
3316 responder_send_file('changes',$changesfile);
3317 responder_send_command("param head $dgithead");
3318 responder_send_command("param csuite $csuite");
3319 responder_send_command("param tagformat $tagformat");
3320 if (defined $maintviewhead) {
3321 die unless ($protovsn//4) >= 4;
3322 responder_send_command("param maint-view $maintviewhead");
3325 if (deliberately_not_fast_forward) {
3326 git_for_each_ref(lrfetchrefs, sub {
3327 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3328 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3329 responder_send_command("previously $rrefname=$objid");
3330 $previously{$rrefname} = $objid;
3334 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3338 supplementary_message(<<'END');
3339 Push failed, while signing the tag.
3340 You can retry the push, after fixing the problem, if you like.
3342 # If we manage to sign but fail to record it anywhere, it's fine.
3343 if ($we_are_responder) {
3344 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3345 responder_receive_files('signed-tag', @tagobjfns);
3347 @tagobjfns = push_mktags($clogp,$dscpath,
3348 $changesfile,$changesfile,
3351 supplementary_message(<<'END');
3352 Push failed, *after* signing the tag.
3353 If you want to try again, you should use a new version number.
3356 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3358 foreach my $tw (@tagwants) {
3359 my $tag = $tw->{Tag};
3360 my $tagobjfn = $tw->{TagObjFn};
3362 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3363 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3364 runcmd_ordryrun_local
3365 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3368 supplementary_message(<<'END');
3369 Push failed, while updating the remote git repository - see messages above.
3370 If you want to try again, you should use a new version number.
3372 if (!check_for_git()) {
3373 create_remote_git_repo();
3376 my @pushrefs = $forceflag.$dgithead.":".rrref();
3377 foreach my $tw (@tagwants) {
3378 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3381 runcmd_ordryrun @git,
3382 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3383 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3385 supplementary_message(<<'END');
3386 Push failed, after updating the remote git repository.
3387 If you want to try again, you must use a new version number.
3389 if ($we_are_responder) {
3390 my $dryrunsuffix = act_local() ? "" : ".tmp";
3391 responder_receive_files('signed-dsc-changes',
3392 "$dscpath$dryrunsuffix",
3393 "$changesfile$dryrunsuffix");
3396 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3398 progress "[new .dsc left in $dscpath.tmp]";
3400 sign_changes $changesfile;
3403 supplementary_message(<<END);
3404 Push failed, while uploading package(s) to the archive server.
3405 You can retry the upload of exactly these same files with dput of:
3407 If that .changes file is broken, you will need to use a new version
3408 number for your next attempt at the upload.
3410 my $host = access_cfg('upload-host','RETURN-UNDEF');
3411 my @hostarg = defined($host) ? ($host,) : ();
3412 runcmd_ordryrun @dput, @hostarg, $changesfile;
3413 printdone "pushed and uploaded $cversion";
3415 supplementary_message('');
3416 responder_send_command("complete");
3423 badusage "-p is not allowed with clone; specify as argument instead"
3424 if defined $package;
3427 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3428 ($package,$isuite) = @ARGV;
3429 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3430 ($package,$dstdir) = @ARGV;
3431 } elsif (@ARGV==3) {
3432 ($package,$isuite,$dstdir) = @ARGV;
3434 badusage "incorrect arguments to dgit clone";
3436 $dstdir ||= "$package";
3438 if (stat_exists $dstdir) {
3439 fail "$dstdir already exists";
3443 if ($rmonerror && !$dryrun_level) {
3444 $cwd_remove= getcwd();
3446 return unless defined $cwd_remove;
3447 if (!chdir "$cwd_remove") {
3448 return if $!==&ENOENT;
3449 die "chdir $cwd_remove: $!";
3452 rmtree($dstdir) or die "remove $dstdir: $!\n";
3453 } elsif (grep { $! == $_ }
3454 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3456 print STDERR "check whether to remove $dstdir: $!\n";
3462 $cwd_remove = undef;
3465 sub branchsuite () {
3466 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3467 if ($branch =~ m#$lbranch_re#o) {
3474 sub fetchpullargs () {
3476 if (!defined $package) {
3477 my $sourcep = parsecontrol('debian/control','debian/control');
3478 $package = getfield $sourcep, 'Source';
3481 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3483 my $clogp = parsechangelog();
3484 $isuite = getfield $clogp, 'Distribution';
3486 canonicalise_suite();
3487 progress "fetching from suite $csuite";
3488 } elsif (@ARGV==1) {
3490 canonicalise_suite();
3492 badusage "incorrect arguments to dgit fetch or dgit pull";
3511 badusage "-p is not allowed with dgit push" if defined $package;
3513 my $clogp = parsechangelog();
3514 $package = getfield $clogp, 'Source';
3517 } elsif (@ARGV==1) {
3518 ($specsuite) = (@ARGV);
3520 badusage "incorrect arguments to dgit push";
3522 $isuite = getfield $clogp, 'Distribution';
3524 local ($package) = $existing_package; # this is a hack
3525 canonicalise_suite();
3527 canonicalise_suite();
3529 if (defined $specsuite &&
3530 $specsuite ne $isuite &&
3531 $specsuite ne $csuite) {
3532 fail "dgit push: changelog specifies $isuite ($csuite)".
3533 " but command line specifies $specsuite";
3538 #---------- remote commands' implementation ----------
3540 sub cmd_remote_push_build_host {
3541 my ($nrargs) = shift @ARGV;
3542 my (@rargs) = @ARGV[0..$nrargs-1];
3543 @ARGV = @ARGV[$nrargs..$#ARGV];
3545 my ($dir,$vsnwant) = @rargs;
3546 # vsnwant is a comma-separated list; we report which we have
3547 # chosen in our ready response (so other end can tell if they
3550 $we_are_responder = 1;
3551 $us .= " (build host)";
3555 open PI, "<&STDIN" or die $!;
3556 open STDIN, "/dev/null" or die $!;
3557 open PO, ">&STDOUT" or die $!;
3559 open STDOUT, ">&STDERR" or die $!;
3563 ($protovsn) = grep {
3564 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3565 } @rpushprotovsn_support;
3567 fail "build host has dgit rpush protocol versions ".
3568 (join ",", @rpushprotovsn_support).
3569 " but invocation host has $vsnwant"
3570 unless defined $protovsn;
3572 responder_send_command("dgit-remote-push-ready $protovsn");
3573 rpush_handle_protovsn_bothends();
3578 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3579 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3580 # a good error message)
3582 sub rpush_handle_protovsn_bothends () {
3583 if ($protovsn < 4) {
3584 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3593 my $report = i_child_report();
3594 if (defined $report) {
3595 printdebug "($report)\n";
3596 } elsif ($i_child_pid) {
3597 printdebug "(killing build host child $i_child_pid)\n";
3598 kill 15, $i_child_pid;
3600 if (defined $i_tmp && !defined $initiator_tempdir) {
3602 eval { rmtree $i_tmp; };
3606 END { i_cleanup(); }
3609 my ($base,$selector,@args) = @_;
3610 $selector =~ s/\-/_/g;
3611 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3618 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3626 push @rargs, join ",", @rpushprotovsn_support;
3629 push @rdgit, @ropts;
3630 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3632 my @cmd = (@ssh, $host, shellquote @rdgit);
3635 if (defined $initiator_tempdir) {
3636 rmtree $initiator_tempdir;
3637 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3638 $i_tmp = $initiator_tempdir;
3642 $i_child_pid = open2(\*RO, \*RI, @cmd);
3644 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3645 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3646 $supplementary_message = '' unless $protovsn >= 3;
3648 fail "rpush negotiated protocol version $protovsn".
3649 " which does not support quilt mode $quilt_mode"
3650 if quiltmode_splitbrain;
3652 rpush_handle_protovsn_bothends();
3654 my ($icmd,$iargs) = initiator_expect {
3655 m/^(\S+)(?: (.*))?$/;
3658 i_method "i_resp", $icmd, $iargs;
3662 sub i_resp_progress ($) {
3664 my $msg = protocol_read_bytes \*RO, $rhs;
3668 sub i_resp_supplementary_message ($) {
3670 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3673 sub i_resp_complete {
3674 my $pid = $i_child_pid;
3675 $i_child_pid = undef; # prevents killing some other process with same pid
3676 printdebug "waiting for build host child $pid...\n";
3677 my $got = waitpid $pid, 0;
3678 die $! unless $got == $pid;
3679 die "build host child failed $?" if $?;
3682 printdebug "all done\n";
3686 sub i_resp_file ($) {
3688 my $localname = i_method "i_localname", $keyword;
3689 my $localpath = "$i_tmp/$localname";
3690 stat_exists $localpath and
3691 badproto \*RO, "file $keyword ($localpath) twice";
3692 protocol_receive_file \*RO, $localpath;
3693 i_method "i_file", $keyword;
3698 sub i_resp_param ($) {
3699 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3703 sub i_resp_previously ($) {
3704 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3705 or badproto \*RO, "bad previously spec";
3706 my $r = system qw(git check-ref-format), $1;
3707 die "bad previously ref spec ($r)" if $r;
3708 $previously{$1} = $2;
3713 sub i_resp_want ($) {
3715 die "$keyword ?" if $i_wanted{$keyword}++;
3716 my @localpaths = i_method "i_want", $keyword;
3717 printdebug "[[ $keyword @localpaths\n";
3718 foreach my $localpath (@localpaths) {
3719 protocol_send_file \*RI, $localpath;
3721 print RI "files-end\n" or die $!;
3724 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3726 sub i_localname_parsed_changelog {
3727 return "remote-changelog.822";
3729 sub i_file_parsed_changelog {
3730 ($i_clogp, $i_version, $i_dscfn) =
3731 push_parse_changelog "$i_tmp/remote-changelog.822";
3732 die if $i_dscfn =~ m#/|^\W#;
3735 sub i_localname_dsc {
3736 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3741 sub i_localname_changes {
3742 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3743 $i_changesfn = $i_dscfn;
3744 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3745 return $i_changesfn;
3747 sub i_file_changes { }
3749 sub i_want_signed_tag {
3750 printdebug Dumper(\%i_param, $i_dscfn);
3751 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3752 && defined $i_param{'csuite'}
3753 or badproto \*RO, "premature desire for signed-tag";
3754 my $head = $i_param{'head'};
3755 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3757 my $maintview = $i_param{'maint-view'};
3758 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3761 if ($protovsn >= 4) {
3762 my $p = $i_param{'tagformat'} // '<undef>';
3764 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3767 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3769 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3771 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3774 push_mktags $i_clogp, $i_dscfn,
3775 $i_changesfn, 'remote changes',
3779 sub i_want_signed_dsc_changes {
3780 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3781 sign_changes $i_changesfn;
3782 return ($i_dscfn, $i_changesfn);
3785 #---------- building etc. ----------
3791 #----- `3.0 (quilt)' handling -----
3793 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3795 sub quiltify_dpkg_commit ($$$;$) {
3796 my ($patchname,$author,$msg, $xinfo) = @_;
3800 my $descfn = ".git/dgit/quilt-description.tmp";
3801 open O, '>', $descfn or die "$descfn: $!";
3802 $msg =~ s/\n+/\n\n/;
3803 print O <<END or die $!;
3805 ${xinfo}Subject: $msg
3812 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3813 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3814 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3815 runcmd @dpkgsource, qw(--commit .), $patchname;
3819 sub quiltify_trees_differ ($$;$$$) {
3820 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
3821 # returns true iff the two tree objects differ other than in debian/
3822 # with $finegrained,
3823 # returns bitmask 01 - differ in upstream files except .gitignore
3824 # 02 - differ in .gitignore
3825 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3826 # is set for each modified .gitignore filename $fn
3827 # if $unrepres is defined, array ref to which is appeneded
3828 # a list of unrepresentable changes (removals of upstream files
3831 my @cmd = (@git, qw(diff-tree -z));
3832 push @cmd, qw(--name-only) unless $unrepres;
3833 push @cmd, qw(-r) if $finegrained || $unrepres;
3835 my $diffs= cmdoutput @cmd;
3838 foreach my $f (split /\0/, $diffs) {
3839 if ($unrepres && !@lmodes) {
3840 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
3843 my ($oldmode,$newmode) = @lmodes;
3846 next if $f =~ m#^debian(?:/.*)?$#s;
3850 die "deleted\n" unless $newmode =~ m/[^0]/;
3851 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
3852 if ($oldmode =~ m/[^0]/) {
3853 die "mode changed\n" if $oldmode ne $newmode;
3855 die "non-default mode\n" unless $newmode =~ m/^100644$/;
3859 local $/="\n"; chomp $@;
3860 push @$unrepres, [ $f, $@ ];
3864 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
3865 $r |= $isignore ? 02 : 01;
3866 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
3868 printdebug "quiltify_trees_differ $x $y => $r\n";
3872 sub quiltify_tree_sentinelfiles ($) {
3873 # lists the `sentinel' files present in the tree
3875 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
3876 qw(-- debian/rules debian/control);
3881 sub quiltify_splitbrain_needed () {
3882 if (!$split_brain) {
3883 progress "dgit view: changes are required...";
3884 runcmd @git, qw(checkout -q -b dgit-view);
3889 sub quiltify_splitbrain ($$$$$$) {
3890 my ($clogp, $unapplied, $headref, $diffbits,
3891 $editedignores, $cachekey) = @_;
3892 if ($quilt_mode !~ m/gbp|dpm/) {
3893 # treat .gitignore just like any other upstream file
3894 $diffbits = { %$diffbits };
3895 $_ = !!$_ foreach values %$diffbits;
3897 # We would like any commits we generate to be reproducible
3898 my @authline = clogp_authline($clogp);
3899 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
3900 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
3901 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
3902 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
3903 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
3904 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
3906 if ($quilt_mode =~ m/gbp|unapplied/ &&
3907 ($diffbits->{O2H} & 01)) {
3909 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
3910 " but git tree differs from orig in upstream files.";
3911 if (!stat_exists "debian/patches") {
3913 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
3917 if ($quilt_mode =~ m/dpm/ &&
3918 ($diffbits->{H2A} & 01)) {
3920 --quilt=$quilt_mode specified, implying patches-applied git tree
3921 but git tree differs from result of applying debian/patches to upstream
3924 if ($quilt_mode =~ m/gbp|unapplied/ &&
3925 ($diffbits->{O2A} & 01)) { # some patches
3926 quiltify_splitbrain_needed();
3927 progress "dgit view: creating patches-applied version using gbp pq";
3928 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
3929 # gbp pq import creates a fresh branch; push back to dgit-view
3930 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
3931 runcmd @git, qw(checkout -q dgit-view);
3933 if ($quilt_mode =~ m/gbp|dpm/ &&
3934 ($diffbits->{O2A} & 02)) {
3936 --quilt=$quilt_mode specified, implying that HEAD is for use with a
3937 tool which does not create patches for changes to upstream
3938 .gitignores: but, such patches exist in debian/patches.
3941 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
3942 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
3943 quiltify_splitbrain_needed();
3944 progress "dgit view: creating patch to represent .gitignore changes";
3945 ensuredir "debian/patches";
3946 my $gipatch = "debian/patches/auto-gitignore";
3947 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
3948 stat GIPATCH or die "$gipatch: $!";
3949 fail "$gipatch already exists; but want to create it".
3950 " to record .gitignore changes" if (stat _)[7];
3951 print GIPATCH <<END or die "$gipatch: $!";
3952 Subject: Update .gitignore from Debian packaging branch
3954 The Debian packaging git branch contains these updates to the upstream
3955 .gitignore file(s). This patch is autogenerated, to provide these
3956 updates to users of the official Debian archive view of the package.
3958 [dgit ($our_version) update-gitignore]
3961 close GIPATCH or die "$gipatch: $!";
3962 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
3963 $unapplied, $headref, "--", sort keys %$editedignores;
3964 open SERIES, "+>>", "debian/patches/series" or die $!;
3965 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
3967 defined read SERIES, $newline, 1 or die $!;
3968 print SERIES "\n" or die $! unless $newline eq "\n";
3969 print SERIES "auto-gitignore\n" or die $!;
3970 close SERIES or die $!;
3971 runcmd @git, qw(add -- debian/patches/series), $gipatch;
3973 Commit patch to update .gitignore
3975 [dgit ($our_version) update-gitignore-quilt-fixup]
3979 my $dgitview = git_rev_parse 'HEAD';
3981 changedir '../../../..';
3982 # When we no longer need to support squeeze, use --create-reflog
3984 ensuredir ".git/logs/refs/dgit-intern";
3985 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
3988 my $oldcache = git_get_ref "refs/$splitbraincache";
3989 if ($oldcache eq $dgitview) {
3990 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
3991 # git update-ref doesn't always update, in this case. *sigh*
3992 my $dummy = make_commit_text <<END;
3995 author Dgit <dgit\@example.com> 1000000000 +0000
3996 committer Dgit <dgit\@example.com> 1000000000 +0000
3998 Dummy commit - do not use
4000 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4001 "refs/$splitbraincache", $dummy;
4003 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4006 progress "dgit view: created (commit id $dgitview)";
4008 changedir '.git/dgit/unpack/work';
4011 sub quiltify ($$$$) {
4012 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4014 # Quilt patchification algorithm
4016 # We search backwards through the history of the main tree's HEAD
4017 # (T) looking for a start commit S whose tree object is identical
4018 # to to the patch tip tree (ie the tree corresponding to the
4019 # current dpkg-committed patch series). For these purposes
4020 # `identical' disregards anything in debian/ - this wrinkle is
4021 # necessary because dpkg-source treates debian/ specially.
4023 # We can only traverse edges where at most one of the ancestors'
4024 # trees differs (in changes outside in debian/). And we cannot
4025 # handle edges which change .pc/ or debian/patches. To avoid
4026 # going down a rathole we avoid traversing edges which introduce
4027 # debian/rules or debian/control. And we set a limit on the
4028 # number of edges we are willing to look at.
4030 # If we succeed, we walk forwards again. For each traversed edge
4031 # PC (with P parent, C child) (starting with P=S and ending with
4032 # C=T) to we do this:
4034 # - dpkg-source --commit with a patch name and message derived from C
4035 # After traversing PT, we git commit the changes which
4036 # should be contained within debian/patches.
4038 # The search for the path S..T is breadth-first. We maintain a
4039 # todo list containing search nodes. A search node identifies a
4040 # commit, and looks something like this:
4042 # Commit => $git_commit_id,
4043 # Child => $c, # or undef if P=T
4044 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4045 # Nontrivial => true iff $p..$c has relevant changes
4052 my %considered; # saves being exponential on some weird graphs
4054 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4057 my ($search,$whynot) = @_;
4058 printdebug " search NOT $search->{Commit} $whynot\n";
4059 $search->{Whynot} = $whynot;
4060 push @nots, $search;
4061 no warnings qw(exiting);
4070 my $c = shift @todo;
4071 next if $considered{$c->{Commit}}++;
4073 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4075 printdebug "quiltify investigate $c->{Commit}\n";
4078 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4079 printdebug " search finished hooray!\n";
4084 if ($quilt_mode eq 'nofix') {
4085 fail "quilt fixup required but quilt mode is \`nofix'\n".
4086 "HEAD commit $c->{Commit} differs from tree implied by ".
4087 " debian/patches (tree object $oldtiptree)";
4089 if ($quilt_mode eq 'smash') {
4090 printdebug " search quitting smash\n";
4094 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4095 $not->($c, "has $c_sentinels not $t_sentinels")
4096 if $c_sentinels ne $t_sentinels;
4098 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4099 $commitdata =~ m/\n\n/;
4101 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4102 @parents = map { { Commit => $_, Child => $c } } @parents;
4104 $not->($c, "root commit") if !@parents;
4106 foreach my $p (@parents) {
4107 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4109 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4110 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4112 foreach my $p (@parents) {
4113 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4115 my @cmd= (@git, qw(diff-tree -r --name-only),
4116 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4117 my $patchstackchange = cmdoutput @cmd;
4118 if (length $patchstackchange) {
4119 $patchstackchange =~ s/\n/,/g;
4120 $not->($p, "changed $patchstackchange");
4123 printdebug " search queue P=$p->{Commit} ",
4124 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4130 printdebug "quiltify want to smash\n";
4133 my $x = $_[0]{Commit};
4134 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4137 my $reportnot = sub {
4139 my $s = $abbrev->($notp);
4140 my $c = $notp->{Child};
4141 $s .= "..".$abbrev->($c) if $c;
4142 $s .= ": ".$notp->{Whynot};
4145 if ($quilt_mode eq 'linear') {
4146 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4147 foreach my $notp (@nots) {
4148 print STDERR "$us: ", $reportnot->($notp), "\n";
4150 print STDERR "$us: $_\n" foreach @$failsuggestion;
4151 fail "quilt fixup naive history linearisation failed.\n".
4152 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4153 } elsif ($quilt_mode eq 'smash') {
4154 } elsif ($quilt_mode eq 'auto') {
4155 progress "quilt fixup cannot be linear, smashing...";
4157 die "$quilt_mode ?";
4160 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4161 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4163 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4165 quiltify_dpkg_commit "auto-$version-$target-$time",
4166 (getfield $clogp, 'Maintainer'),
4167 "Automatically generated patch ($clogp->{Version})\n".
4168 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4172 progress "quiltify linearisation planning successful, executing...";
4174 for (my $p = $sref_S;
4175 my $c = $p->{Child};
4177 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4178 next unless $p->{Nontrivial};
4180 my $cc = $c->{Commit};
4182 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4183 $commitdata =~ m/\n\n/ or die "$c ?";
4186 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4189 my $commitdate = cmdoutput
4190 @git, qw(log -n1 --pretty=format:%aD), $cc;
4192 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4194 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4201 my $gbp_check_suitable = sub {
4206 die "contains unexpected slashes\n" if m{//} || m{/$};
4207 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4208 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4209 die "too long" if length > 200;
4211 return $_ unless $@;
4212 print STDERR "quiltifying commit $cc:".
4213 " ignoring/dropping Gbp-Pq $what: $@";
4217 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4219 (\S+) \s* \n //ixm) {
4220 $patchname = $gbp_check_suitable->($1, 'Name');
4222 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4224 (\S+) \s* \n //ixm) {
4225 $patchdir = $gbp_check_suitable->($1, 'Topic');
4230 if (!defined $patchname) {
4231 $patchname = $title;
4232 $patchname =~ s/[.:]$//;
4235 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4236 my $translitname = $converter->convert($patchname);
4237 die unless defined $translitname;
4238 $patchname = $translitname;
4241 "dgit: patch title transliteration error: $@"
4243 $patchname =~ y/ A-Z/-a-z/;
4244 $patchname =~ y/-a-z0-9_.+=~//cd;
4245 $patchname =~ s/^\W/x-$&/;
4246 $patchname = substr($patchname,0,40);
4248 if (!defined $patchdir) {
4251 if (length $patchdir) {
4252 $patchname = "$patchdir/$patchname";
4254 if ($patchname =~ m{^(.*)/}) {
4255 mkpath "debian/patches/$1";
4260 stat "debian/patches/$patchname$index";
4262 $!==ENOENT or die "$patchname$index $!";
4264 runcmd @git, qw(checkout -q), $cc;
4266 # We use the tip's changelog so that dpkg-source doesn't
4267 # produce complaining messages from dpkg-parsechangelog. None
4268 # of the information dpkg-source gets from the changelog is
4269 # actually relevant - it gets put into the original message
4270 # which dpkg-source provides our stunt editor, and then
4272 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4274 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4275 "Date: $commitdate\n".
4276 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4278 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4281 runcmd @git, qw(checkout -q master);
4284 sub build_maybe_quilt_fixup () {
4285 my ($format,$fopts) = get_source_format;
4286 return unless madformat_wantfixup $format;
4289 check_for_vendor_patches();
4291 if (quiltmode_splitbrain) {
4292 foreach my $needtf (qw(new maint)) {
4293 next if grep { $_ eq $needtf } access_cfg_tagformats;
4295 quilt mode $quilt_mode requires split view so server needs to support
4296 both "new" and "maint" tag formats, but config says it doesn't.
4301 my $clogp = parsechangelog();
4302 my $headref = git_rev_parse('HEAD');
4307 my $upstreamversion=$version;
4308 $upstreamversion =~ s/-[^-]*$//;
4310 if ($fopts->{'single-debian-patch'}) {
4311 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4313 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4316 die 'bug' if $split_brain && !$need_split_build_invocation;
4318 changedir '../../../..';
4319 runcmd_ordryrun_local
4320 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4323 sub quilt_fixup_mkwork ($) {
4326 mkdir "work" or die $!;
4328 mktree_in_ud_here();
4329 runcmd @git, qw(reset -q --hard), $headref;
4332 sub quilt_fixup_linkorigs ($$) {
4333 my ($upstreamversion, $fn) = @_;
4334 # calls $fn->($leafname);
4336 foreach my $f (<../../../../*>) { #/){
4337 my $b=$f; $b =~ s{.*/}{};
4339 local ($debuglevel) = $debuglevel-1;
4340 printdebug "QF linkorigs $b, $f ?\n";
4342 next unless is_orig_file_of_vsn $b, $upstreamversion;
4343 printdebug "QF linkorigs $b, $f Y\n";
4344 link_ltarget $f, $b or die "$b $!";
4349 sub quilt_fixup_delete_pc () {
4350 runcmd @git, qw(rm -rqf .pc);
4352 Commit removal of .pc (quilt series tracking data)
4354 [dgit ($our_version) upgrade quilt-remove-pc]
4358 sub quilt_fixup_singlepatch ($$$) {
4359 my ($clogp, $headref, $upstreamversion) = @_;
4361 progress "starting quiltify (single-debian-patch)";
4363 # dpkg-source --commit generates new patches even if
4364 # single-debian-patch is in debian/source/options. In order to
4365 # get it to generate debian/patches/debian-changes, it is
4366 # necessary to build the source package.
4368 quilt_fixup_linkorigs($upstreamversion, sub { });
4369 quilt_fixup_mkwork($headref);
4371 rmtree("debian/patches");
4373 runcmd @dpkgsource, qw(-b .);
4375 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4376 rename srcfn("$upstreamversion", "/debian/patches"),
4377 "work/debian/patches";
4380 commit_quilty_patch();
4383 sub quilt_make_fake_dsc ($) {
4384 my ($upstreamversion) = @_;
4386 my $fakeversion="$upstreamversion-~~DGITFAKE";
4388 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4389 print $fakedsc <<END or die $!;
4392 Version: $fakeversion
4396 my $dscaddfile=sub {
4399 my $md = new Digest::MD5;
4401 my $fh = new IO::File $b, '<' or die "$b $!";
4406 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4409 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4411 my @files=qw(debian/source/format debian/rules
4412 debian/control debian/changelog);
4413 foreach my $maybe (qw(debian/patches debian/source/options
4414 debian/tests/control)) {
4415 next unless stat_exists "../../../$maybe";
4416 push @files, $maybe;
4419 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4420 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4422 $dscaddfile->($debtar);
4423 close $fakedsc or die $!;
4426 sub quilt_check_splitbrain_cache ($$) {
4427 my ($headref, $upstreamversion) = @_;
4428 # Called only if we are in (potentially) split brain mode.
4430 # Computes the cache key and looks in the cache.
4431 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4433 my $splitbrain_cachekey;
4436 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4437 # we look in the reflog of dgit-intern/quilt-cache
4438 # we look for an entry whose message is the key for the cache lookup
4439 my @cachekey = (qw(dgit), $our_version);
4440 push @cachekey, $upstreamversion;
4441 push @cachekey, $quilt_mode;
4442 push @cachekey, $headref;
4444 push @cachekey, hashfile('fake.dsc');
4446 my $srcshash = Digest::SHA->new(256);
4447 my %sfs = ( %INC, '$0(dgit)' => $0 );
4448 foreach my $sfk (sort keys %sfs) {
4449 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4450 $srcshash->add($sfk," ");
4451 $srcshash->add(hashfile($sfs{$sfk}));
4452 $srcshash->add("\n");
4454 push @cachekey, $srcshash->hexdigest();
4455 $splitbrain_cachekey = "@cachekey";
4457 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4459 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4460 debugcmd "|(probably)",@cmd;
4461 my $child = open GC, "-|"; defined $child or die $!;
4463 chdir '../../..' or die $!;
4464 if (!stat ".git/logs/refs/$splitbraincache") {
4465 $! == ENOENT or die $!;
4466 printdebug ">(no reflog)\n";
4473 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4474 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4477 quilt_fixup_mkwork($headref);
4478 if ($cachehit ne $headref) {
4479 progress "dgit view: found cached (commit id $cachehit)";
4480 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4482 return ($cachehit, $splitbrain_cachekey);
4484 progress "dgit view: found cached, no changes required";
4485 return ($headref, $splitbrain_cachekey);
4487 die $! if GC->error;
4488 failedcmd unless close GC;
4490 printdebug "splitbrain cache miss\n";
4491 return (undef, $splitbrain_cachekey);
4494 sub quilt_fixup_multipatch ($$$) {
4495 my ($clogp, $headref, $upstreamversion) = @_;
4497 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4500 # - honour any existing .pc in case it has any strangeness
4501 # - determine the git commit corresponding to the tip of
4502 # the patch stack (if there is one)
4503 # - if there is such a git commit, convert each subsequent
4504 # git commit into a quilt patch with dpkg-source --commit
4505 # - otherwise convert all the differences in the tree into
4506 # a single git commit
4510 # Our git tree doesn't necessarily contain .pc. (Some versions of
4511 # dgit would include the .pc in the git tree.) If there isn't
4512 # one, we need to generate one by unpacking the patches that we
4515 # We first look for a .pc in the git tree. If there is one, we
4516 # will use it. (This is not the normal case.)
4518 # Otherwise need to regenerate .pc so that dpkg-source --commit
4519 # can work. We do this as follows:
4520 # 1. Collect all relevant .orig from parent directory
4521 # 2. Generate a debian.tar.gz out of
4522 # debian/{patches,rules,source/format,source/options}
4523 # 3. Generate a fake .dsc containing just these fields:
4524 # Format Source Version Files
4525 # 4. Extract the fake .dsc
4526 # Now the fake .dsc has a .pc directory.
4527 # (In fact we do this in every case, because in future we will
4528 # want to search for a good base commit for generating patches.)
4530 # Then we can actually do the dpkg-source --commit
4531 # 1. Make a new working tree with the same object
4532 # store as our main tree and check out the main
4534 # 2. Copy .pc from the fake's extraction, if necessary
4535 # 3. Run dpkg-source --commit
4536 # 4. If the result has changes to debian/, then
4537 # - git add them them
4538 # - git add .pc if we had a .pc in-tree
4540 # 5. If we had a .pc in-tree, delete it, and git commit
4541 # 6. Back in the main tree, fast forward to the new HEAD
4543 # Another situation we may have to cope with is gbp-style
4544 # patches-unapplied trees.
4546 # We would want to detect these, so we know to escape into
4547 # quilt_fixup_gbp. However, this is in general not possible.
4548 # Consider a package with a one patch which the dgit user reverts
4549 # (with git revert or the moral equivalent).
4551 # That is indistinguishable in contents from a patches-unapplied
4552 # tree. And looking at the history to distinguish them is not
4553 # useful because the user might have made a confusing-looking git
4554 # history structure (which ought to produce an error if dgit can't
4555 # cope, not a silent reintroduction of an unwanted patch).
4557 # So gbp users will have to pass an option. But we can usually
4558 # detect their failure to do so: if the tree is not a clean
4559 # patches-applied tree, quilt linearisation fails, but the tree
4560 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4561 # they want --quilt=unapplied.
4563 # To help detect this, when we are extracting the fake dsc, we
4564 # first extract it with --skip-patches, and then apply the patches
4565 # afterwards with dpkg-source --before-build. That lets us save a
4566 # tree object corresponding to .origs.
4568 my $splitbrain_cachekey;
4570 quilt_make_fake_dsc($upstreamversion);
4572 if (quiltmode_splitbrain()) {
4574 ($cachehit, $splitbrain_cachekey) =
4575 quilt_check_splitbrain_cache($headref, $upstreamversion);
4576 return if $cachehit;
4580 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4582 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4583 rename $fakexdir, "fake" or die "$fakexdir $!";
4587 remove_stray_gits();
4588 mktree_in_ud_here();
4592 runcmd @git, qw(add -Af .);
4593 my $unapplied=git_write_tree();
4594 printdebug "fake orig tree object $unapplied\n";
4598 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4600 if (system @bbcmd) {
4601 failedcmd @bbcmd if $? < 0;
4603 failed to apply your git tree's patch stack (from debian/patches/) to
4604 the corresponding upstream tarball(s). Your source tree and .orig
4605 are probably too inconsistent. dgit can only fix up certain kinds of
4606 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
4612 quilt_fixup_mkwork($headref);
4615 if (stat_exists ".pc") {
4617 progress "Tree already contains .pc - will use it then delete it.";
4620 rename '../fake/.pc','.pc' or die $!;
4623 changedir '../fake';
4625 runcmd @git, qw(add -Af .);
4626 my $oldtiptree=git_write_tree();
4627 printdebug "fake o+d/p tree object $unapplied\n";
4628 changedir '../work';
4631 # We calculate some guesswork now about what kind of tree this might
4632 # be. This is mostly for error reporting.
4638 # O = orig, without patches applied
4639 # A = "applied", ie orig with H's debian/patches applied
4640 O2H => quiltify_trees_differ($unapplied,$headref, 1,
4641 \%editedignores, \@unrepres),
4642 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4643 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4647 foreach my $b (qw(01 02)) {
4648 foreach my $v (qw(O2H O2A H2A)) {
4649 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4652 printdebug "differences \@dl @dl.\n";
4655 "$us: base trees orig=%.20s o+d/p=%.20s",
4656 $unapplied, $oldtiptree;
4658 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4659 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4660 $dl[0], $dl[1], $dl[3], $dl[4],
4664 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
4666 forceable_fail [qw(unrepresentable)], <<END;
4667 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
4672 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
4673 push @failsuggestion, "This might be a patches-unapplied branch.";
4674 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4675 push @failsuggestion, "This might be a patches-applied branch.";
4677 push @failsuggestion, "Maybe you need to specify one of".
4678 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
4680 if (quiltmode_splitbrain()) {
4681 quiltify_splitbrain($clogp, $unapplied, $headref,
4682 $diffbits, \%editedignores,
4683 $splitbrain_cachekey);
4687 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4688 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4690 if (!open P, '>>', ".pc/applied-patches") {
4691 $!==&ENOENT or die $!;
4696 commit_quilty_patch();
4698 if ($mustdeletepc) {
4699 quilt_fixup_delete_pc();
4703 sub quilt_fixup_editor () {
4704 my $descfn = $ENV{$fakeeditorenv};
4705 my $editing = $ARGV[$#ARGV];
4706 open I1, '<', $descfn or die "$descfn: $!";
4707 open I2, '<', $editing or die "$editing: $!";
4708 unlink $editing or die "$editing: $!";
4709 open O, '>', $editing or die "$editing: $!";
4710 while (<I1>) { print O or die $!; } I1->error and die $!;
4713 $copying ||= m/^\-\-\- /;
4714 next unless $copying;
4717 I2->error and die $!;
4722 sub maybe_apply_patches_dirtily () {
4723 return unless $quilt_mode =~ m/gbp|unapplied/;
4724 print STDERR <<END or die $!;
4726 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4727 dgit: Have to apply the patches - making the tree dirty.
4728 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4731 $patches_applied_dirtily = 01;
4732 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4733 runcmd qw(dpkg-source --before-build .);
4736 sub maybe_unapply_patches_again () {
4737 progress "dgit: Unapplying patches again to tidy up the tree."
4738 if $patches_applied_dirtily;
4739 runcmd qw(dpkg-source --after-build .)
4740 if $patches_applied_dirtily & 01;
4742 if $patches_applied_dirtily & 02;
4743 $patches_applied_dirtily = 0;
4746 #----- other building -----
4748 our $clean_using_builder;
4749 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4750 # clean the tree before building (perhaps invoked indirectly by
4751 # whatever we are using to run the build), rather than separately
4752 # and explicitly by us.
4755 return if $clean_using_builder;
4756 if ($cleanmode eq 'dpkg-source') {
4757 maybe_apply_patches_dirtily();
4758 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4759 } elsif ($cleanmode eq 'dpkg-source-d') {
4760 maybe_apply_patches_dirtily();
4761 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4762 } elsif ($cleanmode eq 'git') {
4763 runcmd_ordryrun_local @git, qw(clean -xdf);
4764 } elsif ($cleanmode eq 'git-ff') {
4765 runcmd_ordryrun_local @git, qw(clean -xdff);
4766 } elsif ($cleanmode eq 'check') {
4767 my $leftovers = cmdoutput @git, qw(clean -xdn);
4768 if (length $leftovers) {
4769 print STDERR $leftovers, "\n" or die $!;
4770 fail "tree contains uncommitted files and --clean=check specified";
4772 } elsif ($cleanmode eq 'none') {
4779 badusage "clean takes no additional arguments" if @ARGV;
4782 maybe_unapply_patches_again();
4787 badusage "-p is not allowed when building" if defined $package;
4790 my $clogp = parsechangelog();
4791 $isuite = getfield $clogp, 'Distribution';
4792 $package = getfield $clogp, 'Source';
4793 $version = getfield $clogp, 'Version';
4794 build_maybe_quilt_fixup();
4796 my $pat = changespat $version;
4797 foreach my $f (glob "$buildproductsdir/$pat") {
4799 unlink $f or fail "remove old changes file $f: $!";
4801 progress "would remove $f";
4807 sub changesopts_initial () {
4808 my @opts =@changesopts[1..$#changesopts];
4811 sub changesopts_version () {
4812 if (!defined $changes_since_version) {
4813 my @vsns = archive_query('archive_query');
4814 my @quirk = access_quirk();
4815 if ($quirk[0] eq 'backports') {
4816 local $isuite = $quirk[2];
4818 canonicalise_suite();
4819 push @vsns, archive_query('archive_query');
4822 @vsns = map { $_->[0] } @vsns;
4823 @vsns = sort { -version_compare($a, $b) } @vsns;
4824 $changes_since_version = $vsns[0];
4825 progress "changelog will contain changes since $vsns[0]";
4827 $changes_since_version = '_';
4828 progress "package seems new, not specifying -v<version>";
4831 if ($changes_since_version ne '_') {
4832 return ("-v$changes_since_version");
4838 sub changesopts () {
4839 return (changesopts_initial(), changesopts_version());
4842 sub massage_dbp_args ($;$) {
4843 my ($cmd,$xargs) = @_;
4846 # - if we're going to split the source build out so we can
4847 # do strange things to it, massage the arguments to dpkg-buildpackage
4848 # so that the main build doessn't build source (or add an argument
4849 # to stop it building source by default).
4851 # - add -nc to stop dpkg-source cleaning the source tree,
4852 # unless we're not doing a split build and want dpkg-source
4853 # as cleanmode, in which case we can do nothing
4856 # 0 - source will NOT need to be built separately by caller
4857 # +1 - source will need to be built separately by caller
4858 # +2 - source will need to be built separately by caller AND
4859 # dpkg-buildpackage should not in fact be run at all!
4860 debugcmd '#massaging#', @$cmd if $debuglevel>1;
4861 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
4862 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
4863 $clean_using_builder = 1;
4866 # -nc has the side effect of specifying -b if nothing else specified
4867 # and some combinations of -S, -b, et al, are errors, rather than
4868 # later simply overriding earlie. So we need to:
4869 # - search the command line for these options
4870 # - pick the last one
4871 # - perhaps add our own as a default
4872 # - perhaps adjust it to the corresponding non-source-building version
4874 foreach my $l ($cmd, $xargs) {
4876 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
4879 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
4881 if ($need_split_build_invocation) {
4882 printdebug "massage split $dmode.\n";
4883 $r = $dmode =~ m/[S]/ ? +2 :
4884 $dmode =~ y/gGF/ABb/ ? +1 :
4885 $dmode =~ m/[ABb]/ ? 0 :
4888 printdebug "massage done $r $dmode.\n";
4890 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
4896 my $wasdir = must_getcwd();
4902 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
4903 my ($msg_if_onlyone) = @_;
4904 # If there is only one .changes file, fail with $msg_if_onlyone,
4905 # or if that is undef, be a no-op.
4906 # Returns the changes file to report to the user.
4907 my $pat = changespat $version;
4908 my @changesfiles = glob $pat;
4909 @changesfiles = sort {
4910 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
4914 if (@changesfiles==1) {
4915 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
4916 only one changes file from build (@changesfiles)
4918 $result = $changesfiles[0];
4919 } elsif (@changesfiles==2) {
4920 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
4921 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
4922 fail "$l found in binaries changes file $binchanges"
4925 runcmd_ordryrun_local @mergechanges, @changesfiles;
4926 my $multichanges = changespat $version,'multi';
4928 stat_exists $multichanges or fail "$multichanges: $!";
4929 foreach my $cf (glob $pat) {
4930 next if $cf eq $multichanges;
4931 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
4934 $result = $multichanges;
4936 fail "wrong number of different changes files (@changesfiles)";
4938 printdone "build successful, results in $result\n" or die $!;
4941 sub midbuild_checkchanges () {
4942 my $pat = changespat $version;
4943 return if $rmchanges;
4944 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
4945 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
4947 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
4948 Suggest you delete @unwanted.
4953 sub midbuild_checkchanges_vanilla ($) {
4955 midbuild_checkchanges() if $wantsrc == 1;
4958 sub postbuild_mergechanges_vanilla ($) {
4960 if ($wantsrc == 1) {
4962 postbuild_mergechanges(undef);
4965 printdone "build successful\n";
4970 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
4971 my $wantsrc = massage_dbp_args \@dbp;
4974 midbuild_checkchanges_vanilla $wantsrc;
4979 push @dbp, changesopts_version();
4980 maybe_apply_patches_dirtily();
4981 runcmd_ordryrun_local @dbp;
4983 maybe_unapply_patches_again();
4984 postbuild_mergechanges_vanilla $wantsrc;
4988 $quilt_mode //= 'gbp';
4992 my @dbp = @dpkgbuildpackage;
4994 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
4996 if (!length $gbp_build[0]) {
4997 if (length executable_on_path('git-buildpackage')) {
4998 $gbp_build[0] = qw(git-buildpackage);
5000 $gbp_build[0] = 'gbp buildpackage';
5003 my @cmd = opts_opt_multi_cmd @gbp_build;
5005 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5009 midbuild_checkchanges_vanilla $wantsrc;
5011 if (!$clean_using_builder) {
5012 push @cmd, '--git-cleaner=true';
5016 maybe_unapply_patches_again();
5018 push @cmd, changesopts();
5019 runcmd_ordryrun_local @cmd, @ARGV;
5021 postbuild_mergechanges_vanilla $wantsrc;
5023 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5026 my $our_cleanmode = $cleanmode;
5027 if ($need_split_build_invocation) {
5028 # Pretend that clean is being done some other way. This
5029 # forces us not to try to use dpkg-buildpackage to clean and
5030 # build source all in one go; and instead we run dpkg-source
5031 # (and build_prep() will do the clean since $clean_using_builder
5033 $our_cleanmode = 'ELSEWHERE';
5035 if ($our_cleanmode =~ m/^dpkg-source/) {
5036 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5037 $clean_using_builder = 1;
5040 $sourcechanges = changespat $version,'source';
5042 unlink "../$sourcechanges" or $!==ENOENT
5043 or fail "remove $sourcechanges: $!";
5045 $dscfn = dscfn($version);
5046 if ($our_cleanmode eq 'dpkg-source') {
5047 maybe_apply_patches_dirtily();
5048 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5050 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5051 maybe_apply_patches_dirtily();
5052 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5055 my @cmd = (@dpkgsource, qw(-b --));
5058 runcmd_ordryrun_local @cmd, "work";
5059 my @udfiles = <${package}_*>;
5060 changedir "../../..";
5061 foreach my $f (@udfiles) {
5062 printdebug "source copy, found $f\n";
5065 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5066 $f eq srcfn($version, $&));
5067 printdebug "source copy, found $f - renaming\n";
5068 rename "$ud/$f", "../$f" or $!==ENOENT
5069 or fail "put in place new source file ($f): $!";
5072 my $pwd = must_getcwd();
5073 my $leafdir = basename $pwd;
5075 runcmd_ordryrun_local @cmd, $leafdir;
5078 runcmd_ordryrun_local qw(sh -ec),
5079 'exec >$1; shift; exec "$@"','x',
5080 "../$sourcechanges",
5081 @dpkggenchanges, qw(-S), changesopts();
5085 sub cmd_build_source {
5086 badusage "build-source takes no additional arguments" if @ARGV;
5088 maybe_unapply_patches_again();
5089 printdone "source built, results in $dscfn and $sourcechanges";
5094 midbuild_checkchanges();
5097 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5098 stat_exists $sourcechanges
5099 or fail "$sourcechanges (in parent directory): $!";
5101 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5103 maybe_unapply_patches_again();
5105 postbuild_mergechanges(<<END);
5106 perhaps you need to pass -A ? (sbuild's default is to build only
5107 arch-specific binaries; dgit 1.4 used to override that.)
5112 sub cmd_quilt_fixup {
5113 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5114 my $clogp = parsechangelog();
5115 $version = getfield $clogp, 'Version';
5116 $package = getfield $clogp, 'Source';
5119 build_maybe_quilt_fixup();
5122 sub cmd_archive_api_query {
5123 badusage "need only 1 subpath argument" unless @ARGV==1;
5124 my ($subpath) = @ARGV;
5125 my @cmd = archive_api_query_cmd($subpath);
5128 exec @cmd or fail "exec curl: $!\n";
5131 sub cmd_clone_dgit_repos_server {
5132 badusage "need destination argument" unless @ARGV==1;
5133 my ($destdir) = @ARGV;
5134 $package = '_dgit-repos-server';
5135 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5137 exec @cmd or fail "exec git clone: $!\n";
5140 sub cmd_setup_mergechangelogs {
5141 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5142 setup_mergechangelogs(1);
5145 sub cmd_setup_useremail {
5146 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5150 sub cmd_setup_new_tree {
5151 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5155 #---------- argument parsing and main program ----------
5158 print "dgit version $our_version\n" or die $!;
5162 our (%valopts_long, %valopts_short);
5165 sub defvalopt ($$$$) {
5166 my ($long,$short,$val_re,$how) = @_;
5167 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5168 $valopts_long{$long} = $oi;
5169 $valopts_short{$short} = $oi;
5170 # $how subref should:
5171 # do whatever assignemnt or thing it likes with $_[0]
5172 # if the option should not be passed on to remote, @rvalopts=()
5173 # or $how can be a scalar ref, meaning simply assign the value
5176 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5177 defvalopt '--distro', '-d', '.+', \$idistro;
5178 defvalopt '', '-k', '.+', \$keyid;
5179 defvalopt '--existing-package','', '.*', \$existing_package;
5180 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5181 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5182 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5184 defvalopt '', '-C', '.+', sub {
5185 ($changesfile) = (@_);
5186 if ($changesfile =~ s#^(.*)/##) {
5187 $buildproductsdir = $1;
5191 defvalopt '--initiator-tempdir','','.*', sub {
5192 ($initiator_tempdir) = (@_);
5193 $initiator_tempdir =~ m#^/# or
5194 badusage "--initiator-tempdir must be used specify an".
5195 " absolute, not relative, directory."
5201 if (defined $ENV{'DGIT_SSH'}) {
5202 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5203 } elsif (defined $ENV{'GIT_SSH'}) {
5204 @ssh = ($ENV{'GIT_SSH'});
5212 if (!defined $val) {
5213 badusage "$what needs a value" unless @ARGV;
5215 push @rvalopts, $val;
5217 badusage "bad value \`$val' for $what" unless
5218 $val =~ m/^$oi->{Re}$(?!\n)/s;
5219 my $how = $oi->{How};
5220 if (ref($how) eq 'SCALAR') {
5225 push @ropts, @rvalopts;
5229 last unless $ARGV[0] =~ m/^-/;
5233 if (m/^--dry-run$/) {
5236 } elsif (m/^--damp-run$/) {
5239 } elsif (m/^--no-sign$/) {
5242 } elsif (m/^--help$/) {
5244 } elsif (m/^--version$/) {
5246 } elsif (m/^--new$/) {
5249 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5250 ($om = $opts_opt_map{$1}) &&
5254 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5255 !$opts_opt_cmdonly{$1} &&
5256 ($om = $opts_opt_map{$1})) {
5259 } elsif (m/^--(gbp|dpm)$/s) {
5260 push @ropts, "--quilt=$1";
5262 } elsif (m/^--ignore-dirty$/s) {
5265 } elsif (m/^--no-quilt-fixup$/s) {
5267 $quilt_mode = 'nocheck';
5268 } elsif (m/^--no-rm-on-error$/s) {
5271 } elsif (m/^--overwrite$/s) {
5273 $overwrite_version = '';
5274 } elsif (m/^--overwrite=(.+)$/s) {
5276 $overwrite_version = $1;
5277 } elsif (m/^--(no-)?rm-old-changes$/s) {
5280 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5282 push @deliberatelies, $&;
5283 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5287 } elsif (m/^--force-/) {
5289 "$us: warning: ignoring unknown force option $_\n";
5291 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5292 # undocumented, for testing
5294 $tagformat_want = [ $1, 'command line', 1 ];
5295 # 1 menas overrides distro configuration
5296 } elsif (m/^--always-split-source-build$/s) {
5297 # undocumented, for testing
5299 $need_split_build_invocation = 1;
5300 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5301 $val = $2 ? $' : undef; #';
5302 $valopt->($oi->{Long});
5304 badusage "unknown long option \`$_'";
5311 } elsif (s/^-L/-/) {
5314 } elsif (s/^-h/-/) {
5316 } elsif (s/^-D/-/) {
5320 } elsif (s/^-N/-/) {
5325 push @changesopts, $_;
5327 } elsif (s/^-wn$//s) {
5329 $cleanmode = 'none';
5330 } elsif (s/^-wg$//s) {
5333 } elsif (s/^-wgf$//s) {
5335 $cleanmode = 'git-ff';
5336 } elsif (s/^-wd$//s) {
5338 $cleanmode = 'dpkg-source';
5339 } elsif (s/^-wdd$//s) {
5341 $cleanmode = 'dpkg-source-d';
5342 } elsif (s/^-wc$//s) {
5344 $cleanmode = 'check';
5345 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5346 push @git, '-c', $&;
5347 $gitcfgs{cmdline}{$1} = [ $2 ];
5348 } elsif (s/^-c([^=]+)$//s) {
5349 push @git, '-c', $&;
5350 $gitcfgs{cmdline}{$1} = [ 'true' ];
5351 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5353 $val = undef unless length $val;
5354 $valopt->($oi->{Short});
5357 badusage "unknown short option \`$_'";
5364 sub check_env_sanity () {
5365 my $blocked = new POSIX::SigSet;
5366 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5369 foreach my $name (qw(PIPE CHLD)) {
5370 my $signame = "SIG$name";
5371 my $signum = eval "POSIX::$signame" // die;
5372 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5373 die "$signame is set to something other than SIG_DFL\n";
5374 $blocked->ismember($signum) and
5375 die "$signame is blocked\n";
5381 On entry to dgit, $@
5382 This is a bug produced by something in in your execution environment.
5388 sub finalise_opts_opts () {
5389 foreach my $k (keys %opts_opt_map) {
5390 my $om = $opts_opt_map{$k};
5392 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5394 badcfg "cannot set command for $k"
5395 unless length $om->[0];
5399 foreach my $c (access_cfg_cfgs("opts-$k")) {
5401 map { $_ ? @$_ : () }
5402 map { $gitcfgs{$_}{$c} }
5403 reverse @gitcfgsources;
5404 printdebug "CL $c ", (join " ", map { shellquote } @vl),
5405 "\n" if $debuglevel >= 4;
5407 badcfg "cannot configure options for $k"
5408 if $opts_opt_cmdonly{$k};
5409 my $insertpos = $opts_cfg_insertpos{$k};
5410 @$om = ( @$om[0..$insertpos-1],
5412 @$om[$insertpos..$#$om] );
5417 if ($ENV{$fakeeditorenv}) {
5419 quilt_fixup_editor();
5426 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5427 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5428 if $dryrun_level == 1;
5430 print STDERR $helpmsg or die $!;
5433 my $cmd = shift @ARGV;
5436 my $pre_fn = ${*::}{"pre_$cmd"};
5437 $pre_fn->() if $pre_fn;
5439 if (!defined $rmchanges) {
5440 local $access_forpush;
5441 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5444 if (!defined $quilt_mode) {
5445 local $access_forpush;
5446 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5447 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5449 $quilt_mode =~ m/^($quilt_modes_re)$/
5450 or badcfg "unknown quilt-mode \`$quilt_mode'";
5454 $need_split_build_invocation ||= quiltmode_splitbrain();
5456 if (!defined $cleanmode) {
5457 local $access_forpush;
5458 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5459 $cleanmode //= 'dpkg-source';
5461 badcfg "unknown clean-mode \`$cleanmode'" unless
5462 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5465 my $fn = ${*::}{"cmd_$cmd"};
5466 $fn or badusage "unknown operation $cmd";