3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
43 our $our_version = 'UNRELEASED'; ###substituted###
44 our $absurdity = undef; ###substituted###
46 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
49 our $isuite = 'unstable';
55 our $dryrun_level = 0;
57 our $buildproductsdir = '..';
63 our $existing_package = 'dpkg';
65 our $changes_since_version;
67 our $overwrite_version; # undef: not specified; '': check changelog
69 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
70 our $we_are_responder;
71 our $initiator_tempdir;
72 our $patches_applied_dirtily = 00;
77 our %forceopts = map { $_=>0 }
78 qw(unrepresentable unsupported-source-format
80 import-gitapply-absurd
81 import-gitapply-no-absurd);
83 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
85 our $suite_re = '[-+.0-9a-z]+';
86 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
87 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
88 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
89 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
91 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
92 our $splitbraincache = 'dgit-intern/quilt-cache';
95 our (@dget) = qw(dget);
96 our (@curl) = qw(curl);
97 our (@dput) = qw(dput);
98 our (@debsign) = qw(debsign);
100 our (@sbuild) = qw(sbuild);
102 our (@dgit) = qw(dgit);
103 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
104 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
105 our (@dpkggenchanges) = qw(dpkg-genchanges);
106 our (@mergechanges) = qw(mergechanges -f);
107 our (@gbp_build) = ('');
108 our (@gbp_pq) = ('gbp pq');
109 our (@changesopts) = ('');
111 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
114 'debsign' => \@debsign,
116 'sbuild' => \@sbuild,
120 'dpkg-source' => \@dpkgsource,
121 'dpkg-buildpackage' => \@dpkgbuildpackage,
122 'dpkg-genchanges' => \@dpkggenchanges,
123 'gbp-build' => \@gbp_build,
124 'gbp-pq' => \@gbp_pq,
125 'ch' => \@changesopts,
126 'mergechanges' => \@mergechanges);
128 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
129 our %opts_cfg_insertpos = map {
131 scalar @{ $opts_opt_map{$_} }
132 } keys %opts_opt_map;
134 sub finalise_opts_opts();
140 our $supplementary_message = '';
141 our $need_split_build_invocation = 0;
142 our $split_brain = 0;
146 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
149 our $remotename = 'dgit';
150 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
154 if (!defined $absurdity) {
156 $absurdity =~ s{/[^/]+$}{/absurd} or die;
160 my ($v,$distro) = @_;
161 return $tagformatfn->($v, $distro);
164 sub debiantag_maintview ($$) {
165 my ($v,$distro) = @_;
170 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
172 sub lbranch () { return "$branchprefix/$csuite"; }
173 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
174 sub lref () { return "refs/heads/".lbranch(); }
175 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
176 sub rrref () { return server_ref($csuite); }
178 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
179 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
181 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
182 # locally fetched refs because they have unhelpful names and clutter
183 # up gitk etc. So we track whether we have "used up" head ref (ie,
184 # whether we have made another local ref which refers to this object).
186 # (If we deleted them unconditionally, then we might end up
187 # re-fetching the same git objects each time dgit fetch was run.)
189 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
190 # in git_fetch_us to fetch the refs in question, and possibly a call
191 # to lrfetchref_used.
193 our (%lrfetchrefs_f, %lrfetchrefs_d);
194 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
196 sub lrfetchref_used ($) {
197 my ($fullrefname) = @_;
198 my $objid = $lrfetchrefs_f{$fullrefname};
199 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
210 return "${package}_".(stripepoch $vsn).$sfx
215 return srcfn($vsn,".dsc");
218 sub changespat ($;$) {
219 my ($vsn, $arch) = @_;
220 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
229 foreach my $f (@end) {
231 print STDERR "$us: cleanup: $@" if length $@;
235 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
237 sub forceable_fail ($$) {
238 my ($forceoptsl, $msg) = @_;
239 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
240 print STDERR "warning: overriding problem due to --force:\n". $msg;
244 my ($forceoptsl) = @_;
245 my @got = grep { $forceopts{$_} } @$forceoptsl;
246 return 0 unless @got;
248 "warning: skipping checks or functionality due to --force-$got[0]\n";
251 sub no_such_package () {
252 print STDERR "$us: package $package does not exist in suite $isuite\n";
258 printdebug "CD $newdir\n";
259 chdir $newdir or confess "chdir: $newdir: $!";
262 sub deliberately ($) {
264 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
267 sub deliberately_not_fast_forward () {
268 foreach (qw(not-fast-forward fresh-repo)) {
269 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
273 sub quiltmode_splitbrain () {
274 $quilt_mode =~ m/gbp|dpm|unapplied/;
277 sub opts_opt_multi_cmd {
279 push @cmd, split /\s+/, shift @_;
285 return opts_opt_multi_cmd @gbp_pq;
288 #---------- remote protocol support, common ----------
290 # remote push initiator/responder protocol:
291 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
292 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
293 # < dgit-remote-push-ready <actual-proto-vsn>
300 # > supplementary-message NBYTES # $protovsn >= 3
305 # > file parsed-changelog
306 # [indicates that output of dpkg-parsechangelog follows]
307 # > data-block NBYTES
308 # > [NBYTES bytes of data (no newline)]
309 # [maybe some more blocks]
318 # > param head DGIT-VIEW-HEAD
319 # > param csuite SUITE
320 # > param tagformat old|new
321 # > param maint-view MAINT-VIEW-HEAD
323 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
324 # # goes into tag, for replay prevention
327 # [indicates that signed tag is wanted]
328 # < data-block NBYTES
329 # < [NBYTES bytes of data (no newline)]
330 # [maybe some more blocks]
334 # > want signed-dsc-changes
335 # < data-block NBYTES [transfer of signed dsc]
337 # < data-block NBYTES [transfer of signed changes]
345 sub i_child_report () {
346 # Sees if our child has died, and reap it if so. Returns a string
347 # describing how it died if it failed, or undef otherwise.
348 return undef unless $i_child_pid;
349 my $got = waitpid $i_child_pid, WNOHANG;
350 return undef if $got <= 0;
351 die unless $got == $i_child_pid;
352 $i_child_pid = undef;
353 return undef unless $?;
354 return "build host child ".waitstatusmsg();
359 fail "connection lost: $!" if $fh->error;
360 fail "protocol violation; $m not expected";
363 sub badproto_badread ($$) {
365 fail "connection lost: $!" if $!;
366 my $report = i_child_report();
367 fail $report if defined $report;
368 badproto $fh, "eof (reading $wh)";
371 sub protocol_expect (&$) {
372 my ($match, $fh) = @_;
375 defined && chomp or badproto_badread $fh, "protocol message";
383 badproto $fh, "\`$_'";
386 sub protocol_send_file ($$) {
387 my ($fh, $ourfn) = @_;
388 open PF, "<", $ourfn or die "$ourfn: $!";
391 my $got = read PF, $d, 65536;
392 die "$ourfn: $!" unless defined $got;
394 print $fh "data-block ".length($d)."\n" or die $!;
395 print $fh $d or die $!;
397 PF->error and die "$ourfn $!";
398 print $fh "data-end\n" or die $!;
402 sub protocol_read_bytes ($$) {
403 my ($fh, $nbytes) = @_;
404 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
406 my $got = read $fh, $d, $nbytes;
407 $got==$nbytes or badproto_badread $fh, "data block";
411 sub protocol_receive_file ($$) {
412 my ($fh, $ourfn) = @_;
413 printdebug "() $ourfn\n";
414 open PF, ">", $ourfn or die "$ourfn: $!";
416 my ($y,$l) = protocol_expect {
417 m/^data-block (.*)$/ ? (1,$1) :
418 m/^data-end$/ ? (0,) :
422 my $d = protocol_read_bytes $fh, $l;
423 print PF $d or die $!;
428 #---------- remote protocol support, responder ----------
430 sub responder_send_command ($) {
432 return unless $we_are_responder;
433 # called even without $we_are_responder
434 printdebug ">> $command\n";
435 print PO $command, "\n" or die $!;
438 sub responder_send_file ($$) {
439 my ($keyword, $ourfn) = @_;
440 return unless $we_are_responder;
441 printdebug "]] $keyword $ourfn\n";
442 responder_send_command "file $keyword";
443 protocol_send_file \*PO, $ourfn;
446 sub responder_receive_files ($@) {
447 my ($keyword, @ourfns) = @_;
448 die unless $we_are_responder;
449 printdebug "[[ $keyword @ourfns\n";
450 responder_send_command "want $keyword";
451 foreach my $fn (@ourfns) {
452 protocol_receive_file \*PI, $fn;
455 protocol_expect { m/^files-end$/ } \*PI;
458 #---------- remote protocol support, initiator ----------
460 sub initiator_expect (&) {
462 protocol_expect { &$match } \*RO;
465 #---------- end remote code ----------
468 if ($we_are_responder) {
470 responder_send_command "progress ".length($m) or die $!;
471 print PO $m or die $!;
481 $ua = LWP::UserAgent->new();
485 progress "downloading $what...";
486 my $r = $ua->get(@_) or die $!;
487 return undef if $r->code == 404;
488 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
489 return $r->decoded_content(charset => 'none');
492 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
497 failedcmd @_ if system @_;
500 sub act_local () { return $dryrun_level <= 1; }
501 sub act_scary () { return !$dryrun_level; }
504 if (!$dryrun_level) {
505 progress "dgit ok: @_";
507 progress "would be ok: @_ (but dry run only)";
512 printcmd(\*STDERR,$debugprefix."#",@_);
515 sub runcmd_ordryrun {
523 sub runcmd_ordryrun_local {
532 my ($first_shell, @cmd) = @_;
533 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
536 our $helpmsg = <<END;
538 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
539 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
540 dgit [dgit-opts] build [dpkg-buildpackage-opts]
541 dgit [dgit-opts] sbuild [sbuild-opts]
542 dgit [dgit-opts] push [dgit-opts] [suite]
543 dgit [dgit-opts] rpush build-host:build-dir ...
544 important dgit options:
545 -k<keyid> sign tag and package with <keyid> instead of default
546 --dry-run -n do not change anything, but go through the motions
547 --damp-run -L like --dry-run but make local changes, without signing
548 --new -N allow introducing a new package
549 --debug -D increase debug level
550 -c<name>=<value> set git config option (used directly by dgit too)
553 our $later_warning_msg = <<END;
554 Perhaps the upload is stuck in incoming. Using the version from git.
558 print STDERR "$us: @_\n", $helpmsg or die $!;
563 @ARGV or badusage "too few arguments";
564 return scalar shift @ARGV;
568 print $helpmsg or die $!;
572 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
574 our %defcfg = ('dgit.default.distro' => 'debian',
575 'dgit.default.username' => '',
576 'dgit.default.archive-query-default-component' => 'main',
577 'dgit.default.ssh' => 'ssh',
578 'dgit.default.archive-query' => 'madison:',
579 'dgit.default.sshpsql-dbname' => 'service=projectb',
580 'dgit.default.dgit-tag-format' => 'new,old,maint',
581 # old means "repo server accepts pushes with old dgit tags"
582 # new means "repo server accepts pushes with new dgit tags"
583 # maint means "repo server accepts split brain pushes"
584 # hist means "repo server may have old pushes without new tag"
585 # ("hist" is implied by "old")
586 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
587 'dgit-distro.debian.git-check' => 'url',
588 'dgit-distro.debian.git-check-suffix' => '/info/refs',
589 'dgit-distro.debian.new-private-pushers' => 't',
590 'dgit-distro.debian/push.git-url' => '',
591 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
592 'dgit-distro.debian/push.git-user-force' => 'dgit',
593 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
594 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
595 'dgit-distro.debian/push.git-create' => 'true',
596 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
597 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
598 # 'dgit-distro.debian.archive-query-tls-key',
599 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
600 # ^ this does not work because curl is broken nowadays
601 # Fixing #790093 properly will involve providing providing the key
602 # in some pacagke and maybe updating these paths.
604 # 'dgit-distro.debian.archive-query-tls-curl-args',
605 # '--ca-path=/etc/ssl/ca-debian',
606 # ^ this is a workaround but works (only) on DSA-administered machines
607 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
608 'dgit-distro.debian.git-url-suffix' => '',
609 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
610 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
611 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
612 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
613 'dgit-distro.ubuntu.git-check' => 'false',
614 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
615 'dgit-distro.test-dummy.ssh' => "$td/ssh",
616 'dgit-distro.test-dummy.username' => "alice",
617 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
618 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
619 'dgit-distro.test-dummy.git-url' => "$td/git",
620 'dgit-distro.test-dummy.git-host' => "git",
621 'dgit-distro.test-dummy.git-path' => "$td/git",
622 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
623 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
624 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
625 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
629 our @gitcfgsources = qw(cmdline local global system);
631 sub git_slurp_config () {
632 local ($debuglevel) = $debuglevel-2;
635 # This algoritm is a bit subtle, but this is needed so that for
636 # options which we want to be single-valued, we allow the
637 # different config sources to override properly. See #835858.
638 foreach my $src (@gitcfgsources) {
639 next if $src eq 'cmdline';
640 # we do this ourselves since git doesn't handle it
642 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
645 open GITS, "-|", @cmd or die $!;
648 printdebug "=> ", (messagequote $_), "\n";
650 push @{ $gitcfgs{$src}{$`} }, $'; #';
654 or ($!==0 && $?==256)
659 sub git_get_config ($) {
661 foreach my $src (@gitcfgsources) {
662 my $l = $gitcfgs{$src}{$c};
663 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
666 @$l==1 or badcfg "multiple values for $c".
667 " (in $src git config)" if @$l > 1;
675 return undef if $c =~ /RETURN-UNDEF/;
676 my $v = git_get_config($c);
677 return $v if defined $v;
678 my $dv = $defcfg{$c};
679 return $dv if defined $dv;
681 badcfg "need value for one of: @_\n".
682 "$us: distro or suite appears not to be (properly) supported";
685 sub access_basedistro () {
686 if (defined $idistro) {
689 return cfg("dgit-suite.$isuite.distro",
690 "dgit.default.distro");
694 sub access_quirk () {
695 # returns (quirk name, distro to use instead or undef, quirk-specific info)
696 my $basedistro = access_basedistro();
697 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
699 if (defined $backports_quirk) {
700 my $re = $backports_quirk;
701 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
703 $re =~ s/\%/([-0-9a-z_]+)/
704 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
705 if ($isuite =~ m/^$re$/) {
706 return ('backports',"$basedistro-backports",$1);
709 return ('none',undef);
714 sub parse_cfg_bool ($$$) {
715 my ($what,$def,$v) = @_;
718 $v =~ m/^[ty1]/ ? 1 :
719 $v =~ m/^[fn0]/ ? 0 :
720 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
723 sub access_forpush_config () {
724 my $d = access_basedistro();
728 parse_cfg_bool('new-private-pushers', 0,
729 cfg("dgit-distro.$d.new-private-pushers",
732 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
735 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
736 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
737 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
738 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
741 sub access_forpush () {
742 $access_forpush //= access_forpush_config();
743 return $access_forpush;
747 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
748 badcfg "pushing but distro is configured readonly"
749 if access_forpush_config() eq '0';
751 $supplementary_message = <<'END' unless $we_are_responder;
752 Push failed, before we got started.
753 You can retry the push, after fixing the problem, if you like.
755 finalise_opts_opts();
759 finalise_opts_opts();
762 sub supplementary_message ($) {
764 if (!$we_are_responder) {
765 $supplementary_message = $msg;
767 } elsif ($protovsn >= 3) {
768 responder_send_command "supplementary-message ".length($msg)
770 print PO $msg or die $!;
774 sub access_distros () {
775 # Returns list of distros to try, in order
778 # 0. `instead of' distro name(s) we have been pointed to
779 # 1. the access_quirk distro, if any
780 # 2a. the user's specified distro, or failing that } basedistro
781 # 2b. the distro calculated from the suite }
782 my @l = access_basedistro();
784 my (undef,$quirkdistro) = access_quirk();
785 unshift @l, $quirkdistro;
786 unshift @l, $instead_distro;
787 @l = grep { defined } @l;
789 if (access_forpush()) {
790 @l = map { ("$_/push", $_) } @l;
795 sub access_cfg_cfgs (@) {
798 # The nesting of these loops determines the search order. We put
799 # the key loop on the outside so that we search all the distros
800 # for each key, before going on to the next key. That means that
801 # if access_cfg is called with a more specific, and then a less
802 # specific, key, an earlier distro can override the less specific
803 # without necessarily overriding any more specific keys. (If the
804 # distro wants to override the more specific keys it can simply do
805 # so; whereas if we did the loop the other way around, it would be
806 # impossible to for an earlier distro to override a less specific
807 # key but not the more specific ones without restating the unknown
808 # values of the more specific keys.
811 # We have to deal with RETURN-UNDEF specially, so that we don't
812 # terminate the search prematurely.
814 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
817 foreach my $d (access_distros()) {
818 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
820 push @cfgs, map { "dgit.default.$_" } @realkeys;
827 my (@cfgs) = access_cfg_cfgs(@keys);
828 my $value = cfg(@cfgs);
832 sub access_cfg_bool ($$) {
833 my ($def, @keys) = @_;
834 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
837 sub string_to_ssh ($) {
839 if ($spec =~ m/\s/) {
840 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
846 sub access_cfg_ssh () {
847 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
848 if (!defined $gitssh) {
851 return string_to_ssh $gitssh;
855 sub access_runeinfo ($) {
857 return ": dgit ".access_basedistro()." $info ;";
860 sub access_someuserhost ($) {
862 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
863 defined($user) && length($user) or
864 $user = access_cfg("$some-user",'username');
865 my $host = access_cfg("$some-host");
866 return length($user) ? "$user\@$host" : $host;
869 sub access_gituserhost () {
870 return access_someuserhost('git');
873 sub access_giturl (;$) {
875 my $url = access_cfg('git-url','RETURN-UNDEF');
878 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
879 return undef unless defined $proto;
882 access_gituserhost().
883 access_cfg('git-path');
885 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
888 return "$url/$package$suffix";
891 sub parsecontrolfh ($$;$) {
892 my ($fh, $desc, $allowsigned) = @_;
893 our $dpkgcontrolhash_noissigned;
896 my %opts = ('name' => $desc);
897 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
898 $c = Dpkg::Control::Hash->new(%opts);
899 $c->parse($fh,$desc) or die "parsing of $desc failed";
900 last if $allowsigned;
901 last if $dpkgcontrolhash_noissigned;
902 my $issigned= $c->get_option('is_pgp_signed');
903 if (!defined $issigned) {
904 $dpkgcontrolhash_noissigned= 1;
905 seek $fh, 0,0 or die "seek $desc: $!";
906 } elsif ($issigned) {
907 fail "control file $desc is (already) PGP-signed. ".
908 " Note that dgit push needs to modify the .dsc and then".
909 " do the signature itself";
918 my ($file, $desc) = @_;
919 my $fh = new IO::Handle;
920 open $fh, '<', $file or die "$file: $!";
921 my $c = parsecontrolfh($fh,$desc);
922 $fh->error and die $!;
928 my ($dctrl,$field) = @_;
929 my $v = $dctrl->{$field};
930 return $v if defined $v;
931 fail "missing field $field in ".$dctrl->get_option('name');
935 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
936 my $p = new IO::Handle;
937 my @cmd = (qw(dpkg-parsechangelog), @_);
938 open $p, '-|', @cmd or die $!;
940 $?=0; $!=0; close $p or failedcmd @cmd;
944 sub commit_getclogp ($) {
945 # Returns the parsed changelog hashref for a particular commit
947 our %commit_getclogp_memo;
948 my $memo = $commit_getclogp_memo{$objid};
949 return $memo if $memo;
951 my $mclog = ".git/dgit/clog-$objid";
952 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
953 "$objid:debian/changelog";
954 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
959 defined $d or fail "getcwd failed: $!";
965 sub archive_query ($;@) {
966 my ($method) = shift @_;
967 my $query = access_cfg('archive-query','RETURN-UNDEF');
968 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
971 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
974 sub pool_dsc_subpath ($$) {
975 my ($vsn,$component) = @_; # $package is implict arg
976 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
977 return "/pool/$component/$prefix/$package/".dscfn($vsn);
980 #---------- `ftpmasterapi' archive query method (nascent) ----------
982 sub archive_api_query_cmd ($) {
984 my @cmd = (@curl, qw(-sS));
985 my $url = access_cfg('archive-query-url');
986 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
988 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
989 foreach my $key (split /\:/, $keys) {
990 $key =~ s/\%HOST\%/$host/g;
992 fail "for $url: stat $key: $!" unless $!==ENOENT;
995 fail "config requested specific TLS key but do not know".
996 " how to get curl to use exactly that EE key ($key)";
997 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
998 # # Sadly the above line does not work because of changes
999 # # to gnutls. The real fix for #790093 may involve
1000 # # new curl options.
1003 # Fixing #790093 properly will involve providing a value
1004 # for this on clients.
1005 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1006 push @cmd, split / /, $kargs if defined $kargs;
1008 push @cmd, $url.$subpath;
1012 sub api_query ($$;$) {
1014 my ($data, $subpath, $ok404) = @_;
1015 badcfg "ftpmasterapi archive query method takes no data part"
1017 my @cmd = archive_api_query_cmd($subpath);
1018 my $url = $cmd[$#cmd];
1019 push @cmd, qw(-w %{http_code});
1020 my $json = cmdoutput @cmd;
1021 unless ($json =~ s/\d+\d+\d$//) {
1022 failedcmd_report_cmd undef, @cmd;
1023 fail "curl failed to print 3-digit HTTP code";
1026 return undef if $code eq '404' && $ok404;
1027 fail "fetch of $url gave HTTP code $code"
1028 unless $url =~ m#^file://# or $code =~ m/^2/;
1029 return decode_json($json);
1032 sub canonicalise_suite_ftpmasterapi () {
1033 my ($proto,$data) = @_;
1034 my $suites = api_query($data, 'suites');
1036 foreach my $entry (@$suites) {
1038 my $v = $entry->{$_};
1039 defined $v && $v eq $isuite;
1040 } qw(codename name);
1041 push @matched, $entry;
1043 fail "unknown suite $isuite" unless @matched;
1046 @matched==1 or die "multiple matches for suite $isuite\n";
1047 $cn = "$matched[0]{codename}";
1048 defined $cn or die "suite $isuite info has no codename\n";
1049 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1051 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1056 sub archive_query_ftpmasterapi () {
1057 my ($proto,$data) = @_;
1058 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1060 my $digester = Digest::SHA->new(256);
1061 foreach my $entry (@$info) {
1063 my $vsn = "$entry->{version}";
1064 my ($ok,$msg) = version_check $vsn;
1065 die "bad version: $msg\n" unless $ok;
1066 my $component = "$entry->{component}";
1067 $component =~ m/^$component_re$/ or die "bad component";
1068 my $filename = "$entry->{filename}";
1069 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1070 or die "bad filename";
1071 my $sha256sum = "$entry->{sha256sum}";
1072 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1073 push @rows, [ $vsn, "/pool/$component/$filename",
1074 $digester, $sha256sum ];
1076 die "bad ftpmaster api response: $@\n".Dumper($entry)
1079 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1083 sub file_in_archive_ftpmasterapi {
1084 my ($proto,$data,$filename) = @_;
1085 my $pat = $filename;
1088 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1089 my $info = api_query($data, "file_in_archive/$pat", 1);
1092 #---------- `madison' archive query method ----------
1094 sub archive_query_madison {
1095 return map { [ @$_[0..1] ] } madison_get_parse(@_);
1098 sub madison_get_parse {
1099 my ($proto,$data) = @_;
1100 die unless $proto eq 'madison';
1101 if (!length $data) {
1102 $data= access_cfg('madison-distro','RETURN-UNDEF');
1103 $data //= access_basedistro();
1105 $rmad{$proto,$data,$package} ||= cmdoutput
1106 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1107 my $rmad = $rmad{$proto,$data,$package};
1110 foreach my $l (split /\n/, $rmad) {
1111 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1112 \s*( [^ \t|]+ )\s* \|
1113 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1114 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1115 $1 eq $package or die "$rmad $package ?";
1122 $component = access_cfg('archive-query-default-component');
1124 $5 eq 'source' or die "$rmad ?";
1125 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1127 return sort { -version_compare($a->[0],$b->[0]); } @out;
1130 sub canonicalise_suite_madison {
1131 # madison canonicalises for us
1132 my @r = madison_get_parse(@_);
1134 "unable to canonicalise suite using package $package".
1135 " which does not appear to exist in suite $isuite;".
1136 " --existing-package may help";
1140 sub file_in_archive_madison { return undef; }
1142 #---------- `sshpsql' archive query method ----------
1145 my ($data,$runeinfo,$sql) = @_;
1146 if (!length $data) {
1147 $data= access_someuserhost('sshpsql').':'.
1148 access_cfg('sshpsql-dbname');
1150 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1151 my ($userhost,$dbname) = ($`,$'); #';
1153 my @cmd = (access_cfg_ssh, $userhost,
1154 access_runeinfo("ssh-psql $runeinfo").
1155 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1156 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1158 open P, "-|", @cmd or die $!;
1161 printdebug(">|$_|\n");
1164 $!=0; $?=0; close P or failedcmd @cmd;
1166 my $nrows = pop @rows;
1167 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1168 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1169 @rows = map { [ split /\|/, $_ ] } @rows;
1170 my $ncols = scalar @{ shift @rows };
1171 die if grep { scalar @$_ != $ncols } @rows;
1175 sub sql_injection_check {
1176 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1179 sub archive_query_sshpsql ($$) {
1180 my ($proto,$data) = @_;
1181 sql_injection_check $isuite, $package;
1182 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1183 SELECT source.version, component.name, files.filename, files.sha256sum
1185 JOIN src_associations ON source.id = src_associations.source
1186 JOIN suite ON suite.id = src_associations.suite
1187 JOIN dsc_files ON dsc_files.source = source.id
1188 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1189 JOIN component ON component.id = files_archive_map.component_id
1190 JOIN files ON files.id = dsc_files.file
1191 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1192 AND source.source='$package'
1193 AND files.filename LIKE '%.dsc';
1195 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1196 my $digester = Digest::SHA->new(256);
1198 my ($vsn,$component,$filename,$sha256sum) = @$_;
1199 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1204 sub canonicalise_suite_sshpsql ($$) {
1205 my ($proto,$data) = @_;
1206 sql_injection_check $isuite;
1207 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1208 SELECT suite.codename
1209 FROM suite where suite_name='$isuite' or codename='$isuite';
1211 @rows = map { $_->[0] } @rows;
1212 fail "unknown suite $isuite" unless @rows;
1213 die "ambiguous $isuite: @rows ?" if @rows>1;
1217 sub file_in_archive_sshpsql ($$$) { return undef; }
1219 #---------- `dummycat' archive query method ----------
1221 sub canonicalise_suite_dummycat ($$) {
1222 my ($proto,$data) = @_;
1223 my $dpath = "$data/suite.$isuite";
1224 if (!open C, "<", $dpath) {
1225 $!==ENOENT or die "$dpath: $!";
1226 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1230 chomp or die "$dpath: $!";
1232 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1236 sub archive_query_dummycat ($$) {
1237 my ($proto,$data) = @_;
1238 canonicalise_suite();
1239 my $dpath = "$data/package.$csuite.$package";
1240 if (!open C, "<", $dpath) {
1241 $!==ENOENT or die "$dpath: $!";
1242 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1250 printdebug "dummycat query $csuite $package $dpath | $_\n";
1251 my @row = split /\s+/, $_;
1252 @row==2 or die "$dpath: $_ ?";
1255 C->error and die "$dpath: $!";
1257 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1260 sub file_in_archive_dummycat () { return undef; }
1262 #---------- tag format handling ----------
1264 sub access_cfg_tagformats () {
1265 split /\,/, access_cfg('dgit-tag-format');
1268 sub need_tagformat ($$) {
1269 my ($fmt, $why) = @_;
1270 fail "need to use tag format $fmt ($why) but also need".
1271 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1272 " - no way to proceed"
1273 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1274 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1277 sub select_tagformat () {
1279 return if $tagformatfn && !$tagformat_want;
1280 die 'bug' if $tagformatfn && $tagformat_want;
1281 # ... $tagformat_want assigned after previous select_tagformat
1283 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1284 printdebug "select_tagformat supported @supported\n";
1286 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1287 printdebug "select_tagformat specified @$tagformat_want\n";
1289 my ($fmt,$why,$override) = @$tagformat_want;
1291 fail "target distro supports tag formats @supported".
1292 " but have to use $fmt ($why)"
1294 or grep { $_ eq $fmt } @supported;
1296 $tagformat_want = undef;
1298 $tagformatfn = ${*::}{"debiantag_$fmt"};
1300 fail "trying to use unknown tag format \`$fmt' ($why) !"
1301 unless $tagformatfn;
1304 #---------- archive query entrypoints and rest of program ----------
1306 sub canonicalise_suite () {
1307 return if defined $csuite;
1308 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1309 $csuite = archive_query('canonicalise_suite');
1310 if ($isuite ne $csuite) {
1311 progress "canonical suite name for $isuite is $csuite";
1315 sub get_archive_dsc () {
1316 canonicalise_suite();
1317 my @vsns = archive_query('archive_query');
1318 foreach my $vinfo (@vsns) {
1319 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1320 $dscurl = access_cfg('mirror').$subpath;
1321 $dscdata = url_get($dscurl);
1323 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1328 $digester->add($dscdata);
1329 my $got = $digester->hexdigest();
1331 fail "$dscurl has hash $got but".
1332 " archive told us to expect $digest";
1334 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1335 printdebug Dumper($dscdata) if $debuglevel>1;
1336 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1337 printdebug Dumper($dsc) if $debuglevel>1;
1338 my $fmt = getfield $dsc, 'Format';
1339 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1340 "unsupported source format $fmt, sorry";
1342 $dsc_checked = !!$digester;
1343 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1347 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1350 sub check_for_git ();
1351 sub check_for_git () {
1353 my $how = access_cfg('git-check');
1354 if ($how eq 'ssh-cmd') {
1356 (access_cfg_ssh, access_gituserhost(),
1357 access_runeinfo("git-check $package").
1358 " set -e; cd ".access_cfg('git-path').";".
1359 " if test -d $package.git; then echo 1; else echo 0; fi");
1360 my $r= cmdoutput @cmd;
1361 if (defined $r and $r =~ m/^divert (\w+)$/) {
1363 my ($usedistro,) = access_distros();
1364 # NB that if we are pushing, $usedistro will be $distro/push
1365 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1366 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1367 progress "diverting to $divert (using config for $instead_distro)";
1368 return check_for_git();
1370 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1372 } elsif ($how eq 'url') {
1373 my $prefix = access_cfg('git-check-url','git-url');
1374 my $suffix = access_cfg('git-check-suffix','git-suffix',
1375 'RETURN-UNDEF') // '.git';
1376 my $url = "$prefix/$package$suffix";
1377 my @cmd = (@curl, qw(-sS -I), $url);
1378 my $result = cmdoutput @cmd;
1379 $result =~ s/^\S+ 200 .*\n\r?\n//;
1380 # curl -sS -I with https_proxy prints
1381 # HTTP/1.0 200 Connection established
1382 $result =~ m/^\S+ (404|200) /s or
1383 fail "unexpected results from git check query - ".
1384 Dumper($prefix, $result);
1386 if ($code eq '404') {
1388 } elsif ($code eq '200') {
1393 } elsif ($how eq 'true') {
1395 } elsif ($how eq 'false') {
1398 badcfg "unknown git-check \`$how'";
1402 sub create_remote_git_repo () {
1403 my $how = access_cfg('git-create');
1404 if ($how eq 'ssh-cmd') {
1406 (access_cfg_ssh, access_gituserhost(),
1407 access_runeinfo("git-create $package").
1408 "set -e; cd ".access_cfg('git-path').";".
1409 " cp -a _template $package.git");
1410 } elsif ($how eq 'true') {
1413 badcfg "unknown git-create \`$how'";
1417 our ($dsc_hash,$lastpush_mergeinput);
1419 our $ud = '.git/dgit/unpack';
1429 sub mktree_in_ud_here () {
1430 runcmd qw(git init -q);
1431 runcmd qw(git config gc.auto 0);
1432 rmtree('.git/objects');
1433 symlink '../../../../objects','.git/objects' or die $!;
1436 sub git_write_tree () {
1437 my $tree = cmdoutput @git, qw(write-tree);
1438 $tree =~ m/^\w+$/ or die "$tree ?";
1442 sub remove_stray_gits () {
1443 my @gitscmd = qw(find -name .git -prune -print0);
1444 debugcmd "|",@gitscmd;
1445 open GITS, "-|", @gitscmd or die $!;
1450 print STDERR "$us: warning: removing from source package: ",
1451 (messagequote $_), "\n";
1455 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1458 sub mktree_in_ud_from_only_subdir (;$) {
1461 # changes into the subdir
1463 die "expected one subdir but found @dirs ?" unless @dirs==1;
1464 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1468 remove_stray_gits();
1469 mktree_in_ud_here();
1471 my ($format, $fopts) = get_source_format();
1472 if (madformat($format)) {
1477 runcmd @git, qw(add -Af);
1478 my $tree=git_write_tree();
1479 return ($tree,$dir);
1482 our @files_csum_info_fields =
1483 (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1484 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1485 ['Files', 'Digest::MD5', 'new()']);
1487 sub dsc_files_info () {
1488 foreach my $csumi (@files_csum_info_fields) {
1489 my ($fname, $module, $method) = @$csumi;
1490 my $field = $dsc->{$fname};
1491 next unless defined $field;
1492 eval "use $module; 1;" or die $@;
1494 foreach (split /\n/, $field) {
1496 m/^(\w+) (\d+) (\S+)$/ or
1497 fail "could not parse .dsc $fname line \`$_'";
1498 my $digester = eval "$module"."->$method;" or die $@;
1503 Digester => $digester,
1508 fail "missing any supported Checksums-* or Files field in ".
1509 $dsc->get_option('name');
1513 map { $_->{Filename} } dsc_files_info();
1516 sub files_compare_inputs (@) {
1521 my $showinputs = sub {
1522 return join "; ", map { $_->get_option('name') } @$inputs;
1525 foreach my $in (@$inputs) {
1527 my $in_name = $in->get_option('name');
1529 printdebug "files_compare_inputs $in_name\n";
1531 foreach my $csumi (@files_csum_info_fields) {
1532 my ($fname) = @$csumi;
1533 printdebug "files_compare_inputs $in_name $fname\n";
1535 my $field = $in->{$fname};
1536 next unless defined $field;
1539 foreach (split /\n/, $field) {
1542 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1543 fail "could not parse $in_name $fname line \`$_'";
1545 printdebug "files_compare_inputs $in_name $fname $f\n";
1549 my $re = \ $record{$f}{$fname};
1551 $fchecked{$f}{$in_name} = 1;
1553 fail "hash or size of $f varies in $fname fields".
1554 " (between: ".$showinputs->().")";
1559 @files = sort @files;
1560 $expected_files //= \@files;
1561 "@$expected_files" eq "@files" or
1562 fail "file list in $in_name varies between hash fields!";
1565 fail "$in_name has no files list field(s)";
1567 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1570 grep { keys %$_ == @$inputs-1 } values %fchecked
1571 or fail "no file appears in all file lists".
1572 " (looked in: ".$showinputs->().")";
1575 sub is_orig_file_in_dsc ($$) {
1576 my ($f, $dsc_files_info) = @_;
1577 return 0 if @$dsc_files_info <= 1;
1578 # One file means no origs, and the filename doesn't have a "what
1579 # part of dsc" component. (Consider versions ending `.orig'.)
1580 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1584 sub is_orig_file_of_vsn ($$) {
1585 my ($f, $upstreamvsn) = @_;
1586 my $base = srcfn $upstreamvsn, '';
1587 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1591 sub make_commit ($) {
1593 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1596 sub make_commit_text ($) {
1599 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1601 print Dumper($text) if $debuglevel > 1;
1602 my $child = open2($out, $in, @cmd) or die $!;
1605 print $in $text or die $!;
1606 close $in or die $!;
1608 $h =~ m/^\w+$/ or die;
1610 printdebug "=> $h\n";
1613 waitpid $child, 0 == $child or die "$child $!";
1614 $? and failedcmd @cmd;
1618 sub clogp_authline ($) {
1620 my $author = getfield $clogp, 'Maintainer';
1621 $author =~ s#,.*##ms;
1622 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1623 my $authline = "$author $date";
1624 $authline =~ m/$git_authline_re/o or
1625 fail "unexpected commit author line format \`$authline'".
1626 " (was generated from changelog Maintainer field)";
1627 return ($1,$2,$3) if wantarray;
1631 sub vendor_patches_distro ($$) {
1632 my ($checkdistro, $what) = @_;
1633 return unless defined $checkdistro;
1635 my $series = "debian/patches/\L$checkdistro\E.series";
1636 printdebug "checking for vendor-specific $series ($what)\n";
1638 if (!open SERIES, "<", $series) {
1639 die "$series $!" unless $!==ENOENT;
1648 Unfortunately, this source package uses a feature of dpkg-source where
1649 the same source package unpacks to different source code on different
1650 distros. dgit cannot safely operate on such packages on affected
1651 distros, because the meaning of source packages is not stable.
1653 Please ask the distro/maintainer to remove the distro-specific series
1654 files and use a different technique (if necessary, uploading actually
1655 different packages, if different distros are supposed to have
1659 fail "Found active distro-specific series file for".
1660 " $checkdistro ($what): $series, cannot continue";
1662 die "$series $!" if SERIES->error;
1666 sub check_for_vendor_patches () {
1667 # This dpkg-source feature doesn't seem to be documented anywhere!
1668 # But it can be found in the changelog (reformatted):
1670 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1671 # Author: Raphael Hertzog <hertzog@debian.org>
1672 # Date: Sun Oct 3 09:36:48 2010 +0200
1674 # dpkg-source: correctly create .pc/.quilt_series with alternate
1677 # If you have debian/patches/ubuntu.series and you were
1678 # unpacking the source package on ubuntu, quilt was still
1679 # directed to debian/patches/series instead of
1680 # debian/patches/ubuntu.series.
1682 # debian/changelog | 3 +++
1683 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1684 # 2 files changed, 6 insertions(+), 1 deletion(-)
1687 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1688 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1689 "Dpkg::Vendor \`current vendor'");
1690 vendor_patches_distro(access_basedistro(),
1691 "distro being accessed");
1694 sub generate_commits_from_dsc () {
1695 # See big comment in fetch_from_archive, below.
1696 # See also README.dsc-import.
1700 my @dfi = dsc_files_info();
1701 foreach my $fi (@dfi) {
1702 my $f = $fi->{Filename};
1703 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1705 link_ltarget "../../../$f", $f
1709 complete_file_from_dsc('.', $fi)
1712 if (is_orig_file_in_dsc($f, \@dfi)) {
1713 link $f, "../../../../$f"
1719 # We unpack and record the orig tarballs first, so that we only
1720 # need disk space for one private copy of the unpacked source.
1721 # But we can't make them into commits until we have the metadata
1722 # from the debian/changelog, so we record the tree objects now and
1723 # make them into commits later.
1725 my $upstreamv = $dsc->{version};
1726 $upstreamv =~ s/-[^-]+$//;
1727 my $orig_f_base = srcfn $upstreamv, '';
1729 foreach my $fi (@dfi) {
1730 # We actually import, and record as a commit, every tarball
1731 # (unless there is only one file, in which case there seems
1734 my $f = $fi->{Filename};
1735 printdebug "import considering $f ";
1736 (printdebug "only one dfi\n"), next if @dfi == 1;
1737 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1738 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1742 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1744 printdebug "Y ", (join ' ', map { $_//"(none)" }
1745 $compr_ext, $orig_f_part
1748 my $input = new IO::File $f, '<' or die "$f $!";
1752 if (defined $compr_ext) {
1754 Dpkg::Compression::compression_guess_from_filename $f;
1755 fail "Dpkg::Compression cannot handle file $f in source package"
1756 if defined $compr_ext && !defined $cname;
1758 new Dpkg::Compression::Process compression => $cname;
1759 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1760 my $compr_fh = new IO::Handle;
1761 my $compr_pid = open $compr_fh, "-|" // die $!;
1763 open STDIN, "<&", $input or die $!;
1765 die "dgit (child): exec $compr_cmd[0]: $!\n";
1770 rmtree "../unpack-tar";
1771 mkdir "../unpack-tar" or die $!;
1772 my @tarcmd = qw(tar -x -f -
1773 --no-same-owner --no-same-permissions
1774 --no-acls --no-xattrs --no-selinux);
1775 my $tar_pid = fork // die $!;
1777 chdir "../unpack-tar" or die $!;
1778 open STDIN, "<&", $input or die $!;
1780 die "dgit (child): exec $tarcmd[0]: $!";
1782 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1783 !$? or failedcmd @tarcmd;
1786 (@compr_cmd ? failedcmd @compr_cmd
1788 # finally, we have the results in "tarball", but maybe
1789 # with the wrong permissions
1791 runcmd qw(chmod -R +rwX ../unpack-tar);
1792 changedir "../unpack-tar";
1793 my ($tree) = mktree_in_ud_from_only_subdir(1);
1794 changedir "../../unpack";
1795 rmtree "../unpack-tar";
1797 my $ent = [ $f, $tree ];
1799 Orig => !!$orig_f_part,
1800 Sort => (!$orig_f_part ? 2 :
1801 $orig_f_part =~ m/-/g ? 1 :
1809 # put any without "_" first (spec is not clear whether files
1810 # are always in the usual order). Tarballs without "_" are
1811 # the main orig or the debian tarball.
1812 $a->{Sort} <=> $b->{Sort} or
1816 my $any_orig = grep { $_->{Orig} } @tartrees;
1818 my $dscfn = "$package.dsc";
1820 my $treeimporthow = 'package';
1822 open D, ">", $dscfn or die "$dscfn: $!";
1823 print D $dscdata or die "$dscfn: $!";
1824 close D or die "$dscfn: $!";
1825 my @cmd = qw(dpkg-source);
1826 push @cmd, '--no-check' if $dsc_checked;
1827 if (madformat $dsc->{format}) {
1828 push @cmd, '--skip-patches';
1829 $treeimporthow = 'unpatched';
1831 push @cmd, qw(-x --), $dscfn;
1834 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1835 if (madformat $dsc->{format}) {
1836 check_for_vendor_patches();
1840 if (madformat $dsc->{format}) {
1841 my @pcmd = qw(dpkg-source --before-build .);
1842 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1844 runcmd @git, qw(add -Af);
1845 $dappliedtree = git_write_tree();
1848 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1849 debugcmd "|",@clogcmd;
1850 open CLOGS, "-|", @clogcmd or die $!;
1855 printdebug "import clog search...\n";
1858 my $stanzatext = do { local $/=""; <CLOGS>; };
1859 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1860 last if !defined $stanzatext;
1862 my $desc = "package changelog, entry no.$.";
1863 open my $stanzafh, "<", \$stanzatext or die;
1864 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1865 $clogp //= $thisstanza;
1867 printdebug "import clog $thisstanza->{version} $desc...\n";
1869 last if !$any_orig; # we don't need $r1clogp
1871 # We look for the first (most recent) changelog entry whose
1872 # version number is lower than the upstream version of this
1873 # package. Then the last (least recent) previous changelog
1874 # entry is treated as the one which introduced this upstream
1875 # version and used for the synthetic commits for the upstream
1878 # One might think that a more sophisticated algorithm would be
1879 # necessary. But: we do not want to scan the whole changelog
1880 # file. Stopping when we see an earlier version, which
1881 # necessarily then is an earlier upstream version, is the only
1882 # realistic way to do that. Then, either the earliest
1883 # changelog entry we have seen so far is indeed the earliest
1884 # upload of this upstream version; or there are only changelog
1885 # entries relating to later upstream versions (which is not
1886 # possible unless the changelog and .dsc disagree about the
1887 # version). Then it remains to choose between the physically
1888 # last entry in the file, and the one with the lowest version
1889 # number. If these are not the same, we guess that the
1890 # versions were created in a non-monotic order rather than
1891 # that the changelog entries have been misordered.
1893 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
1895 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
1896 $r1clogp = $thisstanza;
1898 printdebug "import clog $r1clogp->{version} becomes r1\n";
1900 die $! if CLOGS->error;
1901 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
1903 $clogp or fail "package changelog has no entries!";
1905 my $authline = clogp_authline $clogp;
1906 my $changes = getfield $clogp, 'Changes';
1907 my $cversion = getfield $clogp, 'Version';
1910 $r1clogp //= $clogp; # maybe there's only one entry;
1911 my $r1authline = clogp_authline $r1clogp;
1912 # Strictly, r1authline might now be wrong if it's going to be
1913 # unused because !$any_orig. Whatever.
1915 printdebug "import tartrees authline $authline\n";
1916 printdebug "import tartrees r1authline $r1authline\n";
1918 foreach my $tt (@tartrees) {
1919 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
1921 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
1924 committer $r1authline
1928 [dgit import orig $tt->{F}]
1936 [dgit import tarball $package $cversion $tt->{F}]
1941 printdebug "import main commit\n";
1943 open C, ">../commit.tmp" or die $!;
1944 print C <<END or die $!;
1947 print C <<END or die $! foreach @tartrees;
1950 print C <<END or die $!;
1956 [dgit import $treeimporthow $package $cversion]
1960 my $rawimport_hash = make_commit qw(../commit.tmp);
1962 if (madformat $dsc->{format}) {
1963 printdebug "import apply patches...\n";
1965 # regularise the state of the working tree so that
1966 # the checkout of $rawimport_hash works nicely.
1967 my $dappliedcommit = make_commit_text(<<END);
1974 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
1976 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
1978 # We need the answers to be reproducible
1979 my @authline = clogp_authline($clogp);
1980 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
1981 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
1982 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
1983 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
1984 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
1985 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
1987 my $path = $ENV{PATH} or die;
1989 foreach my $use_absurd (qw(0 1)) {
1990 local $ENV{PATH} = $path;
1993 progress "warning: $@";
1994 $path = "$absurdity:$path";
1995 progress "$us: trying slow absurd-git-apply...";
1996 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2001 die "forbid absurd git-apply\n" if $use_absurd
2002 && forceing [qw(import-gitapply-no-absurd)];
2003 die "only absurd git-apply!\n" if !$use_absurd
2004 && forceing [qw(import-gitapply-absurd)];
2006 local $ENV{PATH} = $path if $use_absurd;
2008 my @showcmd = (gbp_pq, qw(import));
2009 my @realcmd = shell_cmd
2010 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2011 debugcmd "+",@realcmd;
2012 if (system @realcmd) {
2013 die +(shellquote @showcmd).
2015 failedcmd_waitstatus()."\n";
2018 my $gapplied = git_rev_parse('HEAD');
2019 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2020 $gappliedtree eq $dappliedtree or
2022 gbp-pq import and dpkg-source disagree!
2023 gbp-pq import gave commit $gapplied
2024 gbp-pq import gave tree $gappliedtree
2025 dpkg-source --before-build gave tree $dappliedtree
2027 $rawimport_hash = $gapplied;
2032 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2037 progress "synthesised git commit from .dsc $cversion";
2039 my $rawimport_mergeinput = {
2040 Commit => $rawimport_hash,
2041 Info => "Import of source package",
2043 my @output = ($rawimport_mergeinput);
2045 if ($lastpush_mergeinput) {
2046 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2047 my $oversion = getfield $oldclogp, 'Version';
2049 version_compare($oversion, $cversion);
2051 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2052 { Message => <<END, ReverseParents => 1 });
2053 Record $package ($cversion) in archive suite $csuite
2055 } elsif ($vcmp > 0) {
2056 print STDERR <<END or die $!;
2058 Version actually in archive: $cversion (older)
2059 Last version pushed with dgit: $oversion (newer or same)
2062 @output = $lastpush_mergeinput;
2064 # Same version. Use what's in the server git branch,
2065 # discarding our own import. (This could happen if the
2066 # server automatically imports all packages into git.)
2067 @output = $lastpush_mergeinput;
2070 changedir '../../../..';
2075 sub complete_file_from_dsc ($$) {
2076 our ($dstdir, $fi) = @_;
2077 # Ensures that we have, in $dir, the file $fi, with the correct
2078 # contents. (Downloading it from alongside $dscurl if necessary.)
2080 my $f = $fi->{Filename};
2081 my $tf = "$dstdir/$f";
2084 if (stat_exists $tf) {
2085 progress "using existing $f";
2088 $furl =~ s{/[^/]+$}{};
2090 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2091 die "$f ?" if $f =~ m#/#;
2092 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2093 return 0 if !act_local();
2097 open F, "<", "$tf" or die "$tf: $!";
2098 $fi->{Digester}->reset();
2099 $fi->{Digester}->addfile(*F);
2100 F->error and die $!;
2101 my $got = $fi->{Digester}->hexdigest();
2102 $got eq $fi->{Hash} or
2103 fail "file $f has hash $got but .dsc".
2104 " demands hash $fi->{Hash} ".
2105 ($downloaded ? "(got wrong file from archive!)"
2106 : "(perhaps you should delete this file?)");
2111 sub ensure_we_have_orig () {
2112 my @dfi = dsc_files_info();
2113 foreach my $fi (@dfi) {
2114 my $f = $fi->{Filename};
2115 next unless is_orig_file_in_dsc($f, \@dfi);
2116 complete_file_from_dsc('..', $fi)
2121 sub git_fetch_us () {
2122 # Want to fetch only what we are going to use, unless
2123 # deliberately-not-ff, in which case we must fetch everything.
2125 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2127 (quiltmode_splitbrain
2128 ? (map { $_->('*',access_basedistro) }
2129 \&debiantag_new, \&debiantag_maintview)
2130 : debiantags('*',access_basedistro));
2131 push @specs, server_branch($csuite);
2132 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2134 # This is rather miserable:
2135 # When git fetch --prune is passed a fetchspec ending with a *,
2136 # it does a plausible thing. If there is no * then:
2137 # - it matches subpaths too, even if the supplied refspec
2138 # starts refs, and behaves completely madly if the source
2139 # has refs/refs/something. (See, for example, Debian #NNNN.)
2140 # - if there is no matching remote ref, it bombs out the whole
2142 # We want to fetch a fixed ref, and we don't know in advance
2143 # if it exists, so this is not suitable.
2145 # Our workaround is to use git ls-remote. git ls-remote has its
2146 # own qairks. Notably, it has the absurd multi-tail-matching
2147 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2148 # refs/refs/foo etc.
2150 # Also, we want an idempotent snapshot, but we have to make two
2151 # calls to the remote: one to git ls-remote and to git fetch. The
2152 # solution is use git ls-remote to obtain a target state, and
2153 # git fetch to try to generate it. If we don't manage to generate
2154 # the target state, we try again.
2156 my $specre = join '|', map {
2162 printdebug "git_fetch_us specre=$specre\n";
2163 my $wanted_rref = sub {
2165 return m/^(?:$specre)$/o;
2168 my $fetch_iteration = 0;
2171 if (++$fetch_iteration > 10) {
2172 fail "too many iterations trying to get sane fetch!";
2175 my @look = map { "refs/$_" } @specs;
2176 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2180 open GITLS, "-|", @lcmd or die $!;
2182 printdebug "=> ", $_;
2183 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2184 my ($objid,$rrefname) = ($1,$2);
2185 if (!$wanted_rref->($rrefname)) {
2187 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2191 $wantr{$rrefname} = $objid;
2194 close GITLS or failedcmd @lcmd;
2196 # OK, now %want is exactly what we want for refs in @specs
2198 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2199 "+refs/$_:".lrfetchrefs."/$_";
2202 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2203 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2206 %lrfetchrefs_f = ();
2209 git_for_each_ref(lrfetchrefs, sub {
2210 my ($objid,$objtype,$lrefname,$reftail) = @_;
2211 $lrfetchrefs_f{$lrefname} = $objid;
2212 $objgot{$objid} = 1;
2215 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2216 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2217 if (!exists $wantr{$rrefname}) {
2218 if ($wanted_rref->($rrefname)) {
2220 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2224 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2227 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2228 delete $lrfetchrefs_f{$lrefname};
2232 foreach my $rrefname (sort keys %wantr) {
2233 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2234 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2235 my $want = $wantr{$rrefname};
2236 next if $got eq $want;
2237 if (!defined $objgot{$want}) {
2239 warning: git ls-remote suggests we want $lrefname
2240 warning: and it should refer to $want
2241 warning: but git fetch didn't fetch that object to any relevant ref.
2242 warning: This may be due to a race with someone updating the server.
2243 warning: Will try again...
2245 next FETCH_ITERATION;
2248 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2250 runcmd_ordryrun_local @git, qw(update-ref -m),
2251 "dgit fetch git fetch fixup", $lrefname, $want;
2252 $lrfetchrefs_f{$lrefname} = $want;
2256 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2257 Dumper(\%lrfetchrefs_f);
2260 my @tagpats = debiantags('*',access_basedistro);
2262 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2263 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2264 printdebug "currently $fullrefname=$objid\n";
2265 $here{$fullrefname} = $objid;
2267 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2268 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2269 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2270 printdebug "offered $lref=$objid\n";
2271 if (!defined $here{$lref}) {
2272 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2273 runcmd_ordryrun_local @upd;
2274 lrfetchref_used $fullrefname;
2275 } elsif ($here{$lref} eq $objid) {
2276 lrfetchref_used $fullrefname;
2279 "Not updateting $lref from $here{$lref} to $objid.\n";
2284 sub mergeinfo_getclogp ($) {
2285 # Ensures thit $mi->{Clogp} exists and returns it
2287 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2290 sub mergeinfo_version ($) {
2291 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2294 sub fetch_from_archive () {
2295 ensure_setup_existing_tree();
2297 # Ensures that lrref() is what is actually in the archive, one way
2298 # or another, according to us - ie this client's
2299 # appropritaely-updated archive view. Also returns the commit id.
2300 # If there is nothing in the archive, leaves lrref alone and
2301 # returns undef. git_fetch_us must have already been called.
2305 foreach my $field (@ourdscfield) {
2306 $dsc_hash = $dsc->{$field};
2307 last if defined $dsc_hash;
2309 if (defined $dsc_hash) {
2310 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2312 progress "last upload to archive specified git hash";
2314 progress "last upload to archive has NO git hash";
2317 progress "no version available from the archive";
2320 # If the archive's .dsc has a Dgit field, there are three
2321 # relevant git commitids we need to choose between and/or merge
2323 # 1. $dsc_hash: the Dgit field from the archive
2324 # 2. $lastpush_hash: the suite branch on the dgit git server
2325 # 3. $lastfetch_hash: our local tracking brach for the suite
2327 # These may all be distinct and need not be in any fast forward
2330 # If the dsc was pushed to this suite, then the server suite
2331 # branch will have been updated; but it might have been pushed to
2332 # a different suite and copied by the archive. Conversely a more
2333 # recent version may have been pushed with dgit but not appeared
2334 # in the archive (yet).
2336 # $lastfetch_hash may be awkward because archive imports
2337 # (particularly, imports of Dgit-less .dscs) are performed only as
2338 # needed on individual clients, so different clients may perform a
2339 # different subset of them - and these imports are only made
2340 # public during push. So $lastfetch_hash may represent a set of
2341 # imports different to a subsequent upload by a different dgit
2344 # Our approach is as follows:
2346 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2347 # descendant of $dsc_hash, then it was pushed by a dgit user who
2348 # had based their work on $dsc_hash, so we should prefer it.
2349 # Otherwise, $dsc_hash was installed into this suite in the
2350 # archive other than by a dgit push, and (necessarily) after the
2351 # last dgit push into that suite (since a dgit push would have
2352 # been descended from the dgit server git branch); thus, in that
2353 # case, we prefer the archive's version (and produce a
2354 # pseudo-merge to overwrite the dgit server git branch).
2356 # (If there is no Dgit field in the archive's .dsc then
2357 # generate_commit_from_dsc uses the version numbers to decide
2358 # whether the suite branch or the archive is newer. If the suite
2359 # branch is newer it ignores the archive's .dsc; otherwise it
2360 # generates an import of the .dsc, and produces a pseudo-merge to
2361 # overwrite the suite branch with the archive contents.)
2363 # The outcome of that part of the algorithm is the `public view',
2364 # and is same for all dgit clients: it does not depend on any
2365 # unpublished history in the local tracking branch.
2367 # As between the public view and the local tracking branch: The
2368 # local tracking branch is only updated by dgit fetch, and
2369 # whenever dgit fetch runs it includes the public view in the
2370 # local tracking branch. Therefore if the public view is not
2371 # descended from the local tracking branch, the local tracking
2372 # branch must contain history which was imported from the archive
2373 # but never pushed; and, its tip is now out of date. So, we make
2374 # a pseudo-merge to overwrite the old imports and stitch the old
2377 # Finally: we do not necessarily reify the public view (as
2378 # described above). This is so that we do not end up stacking two
2379 # pseudo-merges. So what we actually do is figure out the inputs
2380 # to any public view pseudo-merge and put them in @mergeinputs.
2383 # $mergeinputs[]{Commit}
2384 # $mergeinputs[]{Info}
2385 # $mergeinputs[0] is the one whose tree we use
2386 # @mergeinputs is in the order we use in the actual commit)
2389 # $mergeinputs[]{Message} is a commit message to use
2390 # $mergeinputs[]{ReverseParents} if def specifies that parent
2391 # list should be in opposite order
2392 # Such an entry has no Commit or Info. It applies only when found
2393 # in the last entry. (This ugliness is to support making
2394 # identical imports to previous dgit versions.)
2396 my $lastpush_hash = git_get_ref(lrfetchref());
2397 printdebug "previous reference hash=$lastpush_hash\n";
2398 $lastpush_mergeinput = $lastpush_hash && {
2399 Commit => $lastpush_hash,
2400 Info => "dgit suite branch on dgit git server",
2403 my $lastfetch_hash = git_get_ref(lrref());
2404 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2405 my $lastfetch_mergeinput = $lastfetch_hash && {
2406 Commit => $lastfetch_hash,
2407 Info => "dgit client's archive history view",
2410 my $dsc_mergeinput = $dsc_hash && {
2411 Commit => $dsc_hash,
2412 Info => "Dgit field in .dsc from archive",
2416 my $del_lrfetchrefs = sub {
2419 printdebug "del_lrfetchrefs...\n";
2420 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2421 my $objid = $lrfetchrefs_d{$fullrefname};
2422 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2424 $gur ||= new IO::Handle;
2425 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2427 printf $gur "delete %s %s\n", $fullrefname, $objid;
2430 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2434 if (defined $dsc_hash) {
2435 fail "missing remote git history even though dsc has hash -".
2436 " could not find ref ".rref()." at ".access_giturl()
2437 unless $lastpush_hash;
2438 ensure_we_have_orig();
2439 if ($dsc_hash eq $lastpush_hash) {
2440 @mergeinputs = $dsc_mergeinput
2441 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2442 print STDERR <<END or die $!;
2444 Git commit in archive is behind the last version allegedly pushed/uploaded.
2445 Commit referred to by archive: $dsc_hash
2446 Last version pushed with dgit: $lastpush_hash
2449 @mergeinputs = ($lastpush_mergeinput);
2451 # Archive has .dsc which is not a descendant of the last dgit
2452 # push. This can happen if the archive moves .dscs about.
2453 # Just follow its lead.
2454 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2455 progress "archive .dsc names newer git commit";
2456 @mergeinputs = ($dsc_mergeinput);
2458 progress "archive .dsc names other git commit, fixing up";
2459 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2463 @mergeinputs = generate_commits_from_dsc();
2464 # We have just done an import. Now, our import algorithm might
2465 # have been improved. But even so we do not want to generate
2466 # a new different import of the same package. So if the
2467 # version numbers are the same, just use our existing version.
2468 # If the version numbers are different, the archive has changed
2469 # (perhaps, rewound).
2470 if ($lastfetch_mergeinput &&
2471 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2472 (mergeinfo_version $mergeinputs[0]) )) {
2473 @mergeinputs = ($lastfetch_mergeinput);
2475 } elsif ($lastpush_hash) {
2476 # only in git, not in the archive yet
2477 @mergeinputs = ($lastpush_mergeinput);
2478 print STDERR <<END or die $!;
2480 Package not found in the archive, but has allegedly been pushed using dgit.
2484 printdebug "nothing found!\n";
2485 if (defined $skew_warning_vsn) {
2486 print STDERR <<END or die $!;
2488 Warning: relevant archive skew detected.
2489 Archive allegedly contains $skew_warning_vsn
2490 But we were not able to obtain any version from the archive or git.
2494 unshift @end, $del_lrfetchrefs;
2498 if ($lastfetch_hash &&
2500 my $h = $_->{Commit};
2501 $h and is_fast_fwd($lastfetch_hash, $h);
2502 # If true, one of the existing parents of this commit
2503 # is a descendant of the $lastfetch_hash, so we'll
2504 # be ff from that automatically.
2508 push @mergeinputs, $lastfetch_mergeinput;
2511 printdebug "fetch mergeinfos:\n";
2512 foreach my $mi (@mergeinputs) {
2514 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2516 printdebug sprintf " ReverseParents=%d Message=%s",
2517 $mi->{ReverseParents}, $mi->{Message};
2521 my $compat_info= pop @mergeinputs
2522 if $mergeinputs[$#mergeinputs]{Message};
2524 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2527 if (@mergeinputs > 1) {
2529 my $tree_commit = $mergeinputs[0]{Commit};
2531 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2532 $tree =~ m/\n\n/; $tree = $`;
2533 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2536 # We use the changelog author of the package in question the
2537 # author of this pseudo-merge. This is (roughly) correct if
2538 # this commit is simply representing aa non-dgit upload.
2539 # (Roughly because it does not record sponsorship - but we
2540 # don't have sponsorship info because that's in the .changes,
2541 # which isn't in the archivw.)
2543 # But, it might be that we are representing archive history
2544 # updates (including in-archive copies). These are not really
2545 # the responsibility of the person who created the .dsc, but
2546 # there is no-one whose name we should better use. (The
2547 # author of the .dsc-named commit is clearly worse.)
2549 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2550 my $author = clogp_authline $useclogp;
2551 my $cversion = getfield $useclogp, 'Version';
2553 my $mcf = ".git/dgit/mergecommit";
2554 open MC, ">", $mcf or die "$mcf $!";
2555 print MC <<END or die $!;
2559 my @parents = grep { $_->{Commit} } @mergeinputs;
2560 @parents = reverse @parents if $compat_info->{ReverseParents};
2561 print MC <<END or die $! foreach @parents;
2565 print MC <<END or die $!;
2571 if (defined $compat_info->{Message}) {
2572 print MC $compat_info->{Message} or die $!;
2574 print MC <<END or die $!;
2575 Record $package ($cversion) in archive suite $csuite
2579 my $message_add_info = sub {
2581 my $mversion = mergeinfo_version $mi;
2582 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2586 $message_add_info->($mergeinputs[0]);
2587 print MC <<END or die $!;
2588 should be treated as descended from
2590 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2594 $hash = make_commit $mcf;
2596 $hash = $mergeinputs[0]{Commit};
2598 printdebug "fetch hash=$hash\n";
2601 my ($lasth, $what) = @_;
2602 return unless $lasth;
2603 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2606 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2607 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2609 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2610 'DGIT_ARCHIVE', $hash;
2611 cmdoutput @git, qw(log -n2), $hash;
2612 # ... gives git a chance to complain if our commit is malformed
2614 if (defined $skew_warning_vsn) {
2616 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2617 my $gotclogp = commit_getclogp($hash);
2618 my $got_vsn = getfield $gotclogp, 'Version';
2619 printdebug "SKEW CHECK GOT $got_vsn\n";
2620 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2621 print STDERR <<END or die $!;
2623 Warning: archive skew detected. Using the available version:
2624 Archive allegedly contains $skew_warning_vsn
2625 We were able to obtain only $got_vsn
2631 if ($lastfetch_hash ne $hash) {
2632 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2636 dryrun_report @upd_cmd;
2640 lrfetchref_used lrfetchref();
2642 unshift @end, $del_lrfetchrefs;
2646 sub set_local_git_config ($$) {
2648 runcmd @git, qw(config), $k, $v;
2651 sub setup_mergechangelogs (;$) {
2653 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2655 my $driver = 'dpkg-mergechangelogs';
2656 my $cb = "merge.$driver";
2657 my $attrs = '.git/info/attributes';
2658 ensuredir '.git/info';
2660 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2661 if (!open ATTRS, "<", $attrs) {
2662 $!==ENOENT or die "$attrs: $!";
2666 next if m{^debian/changelog\s};
2667 print NATTRS $_, "\n" or die $!;
2669 ATTRS->error and die $!;
2672 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2675 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2676 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2678 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2681 sub setup_useremail (;$) {
2683 return unless $always || access_cfg_bool(1, 'setup-useremail');
2686 my ($k, $envvar) = @_;
2687 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2688 return unless defined $v;
2689 set_local_git_config "user.$k", $v;
2692 $setup->('email', 'DEBEMAIL');
2693 $setup->('name', 'DEBFULLNAME');
2696 sub ensure_setup_existing_tree () {
2697 my $k = "remote.$remotename.skipdefaultupdate";
2698 my $c = git_get_config $k;
2699 return if defined $c;
2700 set_local_git_config $k, 'true';
2703 sub setup_new_tree () {
2704 setup_mergechangelogs();
2710 canonicalise_suite();
2711 badusage "dry run makes no sense with clone" unless act_local();
2712 my $hasgit = check_for_git();
2713 mkdir $dstdir or fail "create \`$dstdir': $!";
2715 runcmd @git, qw(init -q);
2716 my $giturl = access_giturl(1);
2717 if (defined $giturl) {
2718 open H, "> .git/HEAD" or die $!;
2719 print H "ref: ".lref()."\n" or die $!;
2721 runcmd @git, qw(remote add), 'origin', $giturl;
2724 progress "fetching existing git history";
2726 runcmd_ordryrun_local @git, qw(fetch origin);
2728 progress "starting new git history";
2730 fetch_from_archive() or no_such_package;
2731 my $vcsgiturl = $dsc->{'Vcs-Git'};
2732 if (length $vcsgiturl) {
2733 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2734 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2737 runcmd @git, qw(reset --hard), lrref();
2738 printdone "ready for work in $dstdir";
2742 if (check_for_git()) {
2745 fetch_from_archive() or no_such_package();
2746 printdone "fetched into ".lrref();
2751 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2753 printdone "fetched to ".lrref()." and merged into HEAD";
2756 sub check_not_dirty () {
2757 foreach my $f (qw(local-options local-patch-header)) {
2758 if (stat_exists "debian/source/$f") {
2759 fail "git tree contains debian/source/$f";
2763 return if $ignoredirty;
2765 my @cmd = (@git, qw(diff --quiet HEAD));
2767 $!=0; $?=-1; system @cmd;
2770 fail "working tree is dirty (does not match HEAD)";
2776 sub commit_admin ($) {
2779 runcmd_ordryrun_local @git, qw(commit -m), $m;
2782 sub commit_quilty_patch () {
2783 my $output = cmdoutput @git, qw(status --porcelain);
2785 foreach my $l (split /\n/, $output) {
2786 next unless $l =~ m/\S/;
2787 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2791 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2793 progress "nothing quilty to commit, ok.";
2796 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2797 runcmd_ordryrun_local @git, qw(add -f), @adds;
2799 Commit Debian 3.0 (quilt) metadata
2801 [dgit ($our_version) quilt-fixup]
2805 sub get_source_format () {
2807 if (open F, "debian/source/options") {
2811 s/\s+$//; # ignore missing final newline
2813 my ($k, $v) = ($`, $'); #');
2814 $v =~ s/^"(.*)"$/$1/;
2820 F->error and die $!;
2823 die $! unless $!==&ENOENT;
2826 if (!open F, "debian/source/format") {
2827 die $! unless $!==&ENOENT;
2831 F->error and die $!;
2833 return ($_, \%options);
2836 sub madformat_wantfixup ($) {
2838 return 0 unless $format eq '3.0 (quilt)';
2839 our $quilt_mode_warned;
2840 if ($quilt_mode eq 'nocheck') {
2841 progress "Not doing any fixup of \`$format' due to".
2842 " ----no-quilt-fixup or --quilt=nocheck"
2843 unless $quilt_mode_warned++;
2846 progress "Format \`$format', need to check/update patch stack"
2847 unless $quilt_mode_warned++;
2851 # An "infopair" is a tuple [ $thing, $what ]
2852 # (often $thing is a commit hash; $what is a description)
2854 sub infopair_cond_equal ($$) {
2856 $x->[0] eq $y->[0] or fail <<END;
2857 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
2861 sub infopair_lrf_tag_lookup ($$) {
2862 my ($tagnames, $what) = @_;
2863 # $tagname may be an array ref
2864 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
2865 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
2866 foreach my $tagname (@tagnames) {
2867 my $lrefname = lrfetchrefs."/tags/$tagname";
2868 my $tagobj = $lrfetchrefs_f{$lrefname};
2869 next unless defined $tagobj;
2870 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
2871 return [ git_rev_parse($tagobj), $what ];
2873 fail @tagnames==1 ? <<END : <<END;
2874 Wanted tag $what (@tagnames) on dgit server, but not found
2876 Wanted tag $what (one of: @tagnames) on dgit server, but not found
2880 sub infopair_cond_ff ($$) {
2881 my ($anc,$desc) = @_;
2882 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
2883 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
2887 sub pseudomerge_version_check ($$) {
2888 my ($clogp, $archive_hash) = @_;
2890 my $arch_clogp = commit_getclogp $archive_hash;
2891 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
2892 'version currently in archive' ];
2893 if (defined $overwrite_version) {
2894 if (length $overwrite_version) {
2895 infopair_cond_equal([ $overwrite_version,
2896 '--overwrite= version' ],
2899 my $v = $i_arch_v->[0];
2900 progress "Checking package changelog for archive version $v ...";
2902 my @xa = ("-f$v", "-t$v");
2903 my $vclogp = parsechangelog @xa;
2904 my $cv = [ (getfield $vclogp, 'Version'),
2905 "Version field from dpkg-parsechangelog @xa" ];
2906 infopair_cond_equal($i_arch_v, $cv);
2909 $@ =~ s/^dgit: //gm;
2911 "Perhaps debian/changelog does not mention $v ?";
2916 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
2920 sub pseudomerge_make_commit ($$$$ $$) {
2921 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
2922 $msg_cmd, $msg_msg) = @_;
2923 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
2925 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
2926 my $authline = clogp_authline $clogp;
2930 !defined $overwrite_version ? ""
2931 : !length $overwrite_version ? " --overwrite"
2932 : " --overwrite=".$overwrite_version;
2935 my $pmf = ".git/dgit/pseudomerge";
2936 open MC, ">", $pmf or die "$pmf $!";
2937 print MC <<END or die $!;
2940 parent $archive_hash
2950 return make_commit($pmf);
2953 sub splitbrain_pseudomerge ($$$$) {
2954 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
2955 # => $merged_dgitview
2956 printdebug "splitbrain_pseudomerge...\n";
2958 # We: debian/PREVIOUS HEAD($maintview)
2959 # expect: o ----------------- o
2962 # a/d/PREVIOUS $dgitview
2965 # we do: `------------------ o
2969 return $dgitview unless defined $archive_hash;
2971 printdebug "splitbrain_pseudomerge...\n";
2973 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
2975 if (!defined $overwrite_version) {
2976 progress "Checking that HEAD inciudes all changes in archive...";
2979 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
2981 if (defined $overwrite_version) {
2983 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
2984 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
2985 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
2986 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
2987 my $i_archive = [ $archive_hash, "current archive contents" ];
2989 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
2991 infopair_cond_equal($i_dgit, $i_archive);
2992 infopair_cond_ff($i_dep14, $i_dgit);
2993 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
2997 $us: check failed (maybe --overwrite is needed, consult documentation)
3002 my $r = pseudomerge_make_commit
3003 $clogp, $dgitview, $archive_hash, $i_arch_v,
3004 "dgit --quilt=$quilt_mode",
3005 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3006 Declare fast forward from $i_arch_v->[0]
3008 Make fast forward from $i_arch_v->[0]
3011 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3015 sub plain_overwrite_pseudomerge ($$$) {
3016 my ($clogp, $head, $archive_hash) = @_;
3018 printdebug "plain_overwrite_pseudomerge...";
3020 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3022 return $head if is_fast_fwd $archive_hash, $head;
3024 my $m = "Declare fast forward from $i_arch_v->[0]";
3026 my $r = pseudomerge_make_commit
3027 $clogp, $head, $archive_hash, $i_arch_v,
3030 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3032 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3036 sub push_parse_changelog ($) {
3039 my $clogp = Dpkg::Control::Hash->new();
3040 $clogp->load($clogpfn) or die;
3042 $package = getfield $clogp, 'Source';
3043 my $cversion = getfield $clogp, 'Version';
3044 my $tag = debiantag($cversion, access_basedistro);
3045 runcmd @git, qw(check-ref-format), $tag;
3047 my $dscfn = dscfn($cversion);
3049 return ($clogp, $cversion, $dscfn);
3052 sub push_parse_dsc ($$$) {
3053 my ($dscfn,$dscfnwhat, $cversion) = @_;
3054 $dsc = parsecontrol($dscfn,$dscfnwhat);
3055 my $dversion = getfield $dsc, 'Version';
3056 my $dscpackage = getfield $dsc, 'Source';
3057 ($dscpackage eq $package && $dversion eq $cversion) or
3058 fail "$dscfn is for $dscpackage $dversion".
3059 " but debian/changelog is for $package $cversion";
3062 sub push_tagwants ($$$$) {
3063 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3066 TagFn => \&debiantag,
3071 if (defined $maintviewhead) {
3073 TagFn => \&debiantag_maintview,
3074 Objid => $maintviewhead,
3075 TfSuffix => '-maintview',
3079 foreach my $tw (@tagwants) {
3080 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
3081 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3083 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3087 sub push_mktags ($$ $$ $) {
3089 $changesfile,$changesfilewhat,
3092 die unless $tagwants->[0]{View} eq 'dgit';
3094 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3095 $dsc->save("$dscfn.tmp") or die $!;
3097 my $changes = parsecontrol($changesfile,$changesfilewhat);
3098 foreach my $field (qw(Source Distribution Version)) {
3099 $changes->{$field} eq $clogp->{$field} or
3100 fail "changes field $field \`$changes->{$field}'".
3101 " does not match changelog \`$clogp->{$field}'";
3104 my $cversion = getfield $clogp, 'Version';
3105 my $clogsuite = getfield $clogp, 'Distribution';
3107 # We make the git tag by hand because (a) that makes it easier
3108 # to control the "tagger" (b) we can do remote signing
3109 my $authline = clogp_authline $clogp;
3110 my $delibs = join(" ", "",@deliberatelies);
3111 my $declaredistro = access_basedistro();
3115 my $tfn = $tw->{Tfn};
3116 my $head = $tw->{Objid};
3117 my $tag = $tw->{Tag};
3119 open TO, '>', $tfn->('.tmp') or die $!;
3120 print TO <<END or die $!;
3127 if ($tw->{View} eq 'dgit') {
3128 print TO <<END or die $!;
3129 $package release $cversion for $clogsuite ($csuite) [dgit]
3130 [dgit distro=$declaredistro$delibs]
3132 foreach my $ref (sort keys %previously) {
3133 print TO <<END or die $!;
3134 [dgit previously:$ref=$previously{$ref}]
3137 } elsif ($tw->{View} eq 'maint') {
3138 print TO <<END or die $!;
3139 $package release $cversion for $clogsuite ($csuite)
3140 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3143 die Dumper($tw)."?";
3148 my $tagobjfn = $tfn->('.tmp');
3150 if (!defined $keyid) {
3151 $keyid = access_cfg('keyid','RETURN-UNDEF');
3153 if (!defined $keyid) {
3154 $keyid = getfield $clogp, 'Maintainer';
3156 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3157 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3158 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3159 push @sign_cmd, $tfn->('.tmp');
3160 runcmd_ordryrun @sign_cmd;
3162 $tagobjfn = $tfn->('.signed.tmp');
3163 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3164 $tfn->('.tmp'), $tfn->('.tmp.asc');
3170 my @r = map { $mktag->($_); } @$tagwants;
3174 sub sign_changes ($) {
3175 my ($changesfile) = @_;
3177 my @debsign_cmd = @debsign;
3178 push @debsign_cmd, "-k$keyid" if defined $keyid;
3179 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3180 push @debsign_cmd, $changesfile;
3181 runcmd_ordryrun @debsign_cmd;
3186 printdebug "actually entering push\n";
3188 supplementary_message(<<'END');
3189 Push failed, while checking state of the archive.
3190 You can retry the push, after fixing the problem, if you like.
3192 if (check_for_git()) {
3195 my $archive_hash = fetch_from_archive();
3196 if (!$archive_hash) {
3198 fail "package appears to be new in this suite;".
3199 " if this is intentional, use --new";
3202 supplementary_message(<<'END');
3203 Push failed, while preparing your push.
3204 You can retry the push, after fixing the problem, if you like.
3207 need_tagformat 'new', "quilt mode $quilt_mode"
3208 if quiltmode_splitbrain;
3212 access_giturl(); # check that success is vaguely likely
3215 my $clogpfn = ".git/dgit/changelog.822.tmp";
3216 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3218 responder_send_file('parsed-changelog', $clogpfn);
3220 my ($clogp, $cversion, $dscfn) =
3221 push_parse_changelog("$clogpfn");
3223 my $dscpath = "$buildproductsdir/$dscfn";
3224 stat_exists $dscpath or
3225 fail "looked for .dsc $dscfn, but $!;".
3226 " maybe you forgot to build";
3228 responder_send_file('dsc', $dscpath);
3230 push_parse_dsc($dscpath, $dscfn, $cversion);
3232 my $format = getfield $dsc, 'Format';
3233 printdebug "format $format\n";
3235 my $actualhead = git_rev_parse('HEAD');
3236 my $dgithead = $actualhead;
3237 my $maintviewhead = undef;
3239 if (madformat_wantfixup($format)) {
3240 # user might have not used dgit build, so maybe do this now:
3241 if (quiltmode_splitbrain()) {
3242 my $upstreamversion = $clogp->{Version};
3243 $upstreamversion =~ s/-[^-]*$//;
3245 quilt_make_fake_dsc($upstreamversion);
3247 ($dgithead, $cachekey) =
3248 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3250 "--quilt=$quilt_mode but no cached dgit view:
3251 perhaps tree changed since dgit build[-source] ?";
3253 $dgithead = splitbrain_pseudomerge($clogp,
3254 $actualhead, $dgithead,
3256 $maintviewhead = $actualhead;
3257 changedir '../../../..';
3258 prep_ud(); # so _only_subdir() works, below
3260 commit_quilty_patch();
3264 if (defined $overwrite_version && !defined $maintviewhead) {
3265 $dgithead = plain_overwrite_pseudomerge($clogp,
3273 if ($archive_hash) {
3274 if (is_fast_fwd($archive_hash, $dgithead)) {
3276 } elsif (deliberately_not_fast_forward) {
3279 fail "dgit push: HEAD is not a descendant".
3280 " of the archive's version.\n".
3281 "To overwrite the archive's contents,".
3282 " pass --overwrite[=VERSION].\n".
3283 "To rewind history, if permitted by the archive,".
3284 " use --deliberately-not-fast-forward.";
3289 progress "checking that $dscfn corresponds to HEAD";
3290 runcmd qw(dpkg-source -x --),
3291 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3292 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3293 check_for_vendor_patches() if madformat($dsc->{format});
3294 changedir '../../../..';
3295 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3296 debugcmd "+",@diffcmd;
3298 my $r = system @diffcmd;
3301 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3303 HEAD specifies a different tree to $dscfn:
3305 Perhaps you forgot to build. Or perhaps there is a problem with your
3306 source tree (see dgit(7) for some hints). To see a full diff, run
3313 if (!$changesfile) {
3314 my $pat = changespat $cversion;
3315 my @cs = glob "$buildproductsdir/$pat";
3316 fail "failed to find unique changes file".
3317 " (looked for $pat in $buildproductsdir);".
3318 " perhaps you need to use dgit -C"
3320 ($changesfile) = @cs;
3322 $changesfile = "$buildproductsdir/$changesfile";
3325 # Check that changes and .dsc agree enough
3326 $changesfile =~ m{[^/]*$};
3327 files_compare_inputs($dsc, parsecontrol($changesfile,$&))
3328 unless forceing [qw(dsc-changes-mismatch)];
3330 # Checks complete, we're going to try and go ahead:
3332 responder_send_file('changes',$changesfile);
3333 responder_send_command("param head $dgithead");
3334 responder_send_command("param csuite $csuite");
3335 responder_send_command("param tagformat $tagformat");
3336 if (defined $maintviewhead) {
3337 die unless ($protovsn//4) >= 4;
3338 responder_send_command("param maint-view $maintviewhead");
3341 if (deliberately_not_fast_forward) {
3342 git_for_each_ref(lrfetchrefs, sub {
3343 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3344 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3345 responder_send_command("previously $rrefname=$objid");
3346 $previously{$rrefname} = $objid;
3350 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3354 supplementary_message(<<'END');
3355 Push failed, while signing the tag.
3356 You can retry the push, after fixing the problem, if you like.
3358 # If we manage to sign but fail to record it anywhere, it's fine.
3359 if ($we_are_responder) {
3360 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3361 responder_receive_files('signed-tag', @tagobjfns);
3363 @tagobjfns = push_mktags($clogp,$dscpath,
3364 $changesfile,$changesfile,
3367 supplementary_message(<<'END');
3368 Push failed, *after* signing the tag.
3369 If you want to try again, you should use a new version number.
3372 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3374 foreach my $tw (@tagwants) {
3375 my $tag = $tw->{Tag};
3376 my $tagobjfn = $tw->{TagObjFn};
3378 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3379 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3380 runcmd_ordryrun_local
3381 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3384 supplementary_message(<<'END');
3385 Push failed, while updating the remote git repository - see messages above.
3386 If you want to try again, you should use a new version number.
3388 if (!check_for_git()) {
3389 create_remote_git_repo();
3392 my @pushrefs = $forceflag.$dgithead.":".rrref();
3393 foreach my $tw (@tagwants) {
3394 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3397 runcmd_ordryrun @git,
3398 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3399 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3401 supplementary_message(<<'END');
3402 Push failed, after updating the remote git repository.
3403 If you want to try again, you must use a new version number.
3405 if ($we_are_responder) {
3406 my $dryrunsuffix = act_local() ? "" : ".tmp";
3407 responder_receive_files('signed-dsc-changes',
3408 "$dscpath$dryrunsuffix",
3409 "$changesfile$dryrunsuffix");
3412 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3414 progress "[new .dsc left in $dscpath.tmp]";
3416 sign_changes $changesfile;
3419 supplementary_message(<<END);
3420 Push failed, while uploading package(s) to the archive server.
3421 You can retry the upload of exactly these same files with dput of:
3423 If that .changes file is broken, you will need to use a new version
3424 number for your next attempt at the upload.
3426 my $host = access_cfg('upload-host','RETURN-UNDEF');
3427 my @hostarg = defined($host) ? ($host,) : ();
3428 runcmd_ordryrun @dput, @hostarg, $changesfile;
3429 printdone "pushed and uploaded $cversion";
3431 supplementary_message('');
3432 responder_send_command("complete");
3439 badusage "-p is not allowed with clone; specify as argument instead"
3440 if defined $package;
3443 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3444 ($package,$isuite) = @ARGV;
3445 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3446 ($package,$dstdir) = @ARGV;
3447 } elsif (@ARGV==3) {
3448 ($package,$isuite,$dstdir) = @ARGV;
3450 badusage "incorrect arguments to dgit clone";
3452 $dstdir ||= "$package";
3454 if (stat_exists $dstdir) {
3455 fail "$dstdir already exists";
3459 if ($rmonerror && !$dryrun_level) {
3460 $cwd_remove= getcwd();
3462 return unless defined $cwd_remove;
3463 if (!chdir "$cwd_remove") {
3464 return if $!==&ENOENT;
3465 die "chdir $cwd_remove: $!";
3468 rmtree($dstdir) or die "remove $dstdir: $!\n";
3469 } elsif (grep { $! == $_ }
3470 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3472 print STDERR "check whether to remove $dstdir: $!\n";
3478 $cwd_remove = undef;
3481 sub branchsuite () {
3482 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3483 if ($branch =~ m#$lbranch_re#o) {
3490 sub fetchpullargs () {
3492 if (!defined $package) {
3493 my $sourcep = parsecontrol('debian/control','debian/control');
3494 $package = getfield $sourcep, 'Source';
3497 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3499 my $clogp = parsechangelog();
3500 $isuite = getfield $clogp, 'Distribution';
3502 canonicalise_suite();
3503 progress "fetching from suite $csuite";
3504 } elsif (@ARGV==1) {
3506 canonicalise_suite();
3508 badusage "incorrect arguments to dgit fetch or dgit pull";
3527 badusage "-p is not allowed with dgit push" if defined $package;
3529 my $clogp = parsechangelog();
3530 $package = getfield $clogp, 'Source';
3533 } elsif (@ARGV==1) {
3534 ($specsuite) = (@ARGV);
3536 badusage "incorrect arguments to dgit push";
3538 $isuite = getfield $clogp, 'Distribution';
3540 local ($package) = $existing_package; # this is a hack
3541 canonicalise_suite();
3543 canonicalise_suite();
3545 if (defined $specsuite &&
3546 $specsuite ne $isuite &&
3547 $specsuite ne $csuite) {
3548 fail "dgit push: changelog specifies $isuite ($csuite)".
3549 " but command line specifies $specsuite";
3554 #---------- remote commands' implementation ----------
3556 sub cmd_remote_push_build_host {
3557 my ($nrargs) = shift @ARGV;
3558 my (@rargs) = @ARGV[0..$nrargs-1];
3559 @ARGV = @ARGV[$nrargs..$#ARGV];
3561 my ($dir,$vsnwant) = @rargs;
3562 # vsnwant is a comma-separated list; we report which we have
3563 # chosen in our ready response (so other end can tell if they
3566 $we_are_responder = 1;
3567 $us .= " (build host)";
3571 open PI, "<&STDIN" or die $!;
3572 open STDIN, "/dev/null" or die $!;
3573 open PO, ">&STDOUT" or die $!;
3575 open STDOUT, ">&STDERR" or die $!;
3579 ($protovsn) = grep {
3580 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3581 } @rpushprotovsn_support;
3583 fail "build host has dgit rpush protocol versions ".
3584 (join ",", @rpushprotovsn_support).
3585 " but invocation host has $vsnwant"
3586 unless defined $protovsn;
3588 responder_send_command("dgit-remote-push-ready $protovsn");
3589 rpush_handle_protovsn_bothends();
3594 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3595 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3596 # a good error message)
3598 sub rpush_handle_protovsn_bothends () {
3599 if ($protovsn < 4) {
3600 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3609 my $report = i_child_report();
3610 if (defined $report) {
3611 printdebug "($report)\n";
3612 } elsif ($i_child_pid) {
3613 printdebug "(killing build host child $i_child_pid)\n";
3614 kill 15, $i_child_pid;
3616 if (defined $i_tmp && !defined $initiator_tempdir) {
3618 eval { rmtree $i_tmp; };
3622 END { i_cleanup(); }
3625 my ($base,$selector,@args) = @_;
3626 $selector =~ s/\-/_/g;
3627 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3634 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3642 push @rargs, join ",", @rpushprotovsn_support;
3645 push @rdgit, @ropts;
3646 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3648 my @cmd = (@ssh, $host, shellquote @rdgit);
3651 if (defined $initiator_tempdir) {
3652 rmtree $initiator_tempdir;
3653 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3654 $i_tmp = $initiator_tempdir;
3658 $i_child_pid = open2(\*RO, \*RI, @cmd);
3660 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3661 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3662 $supplementary_message = '' unless $protovsn >= 3;
3664 fail "rpush negotiated protocol version $protovsn".
3665 " which does not support quilt mode $quilt_mode"
3666 if quiltmode_splitbrain;
3668 rpush_handle_protovsn_bothends();
3670 my ($icmd,$iargs) = initiator_expect {
3671 m/^(\S+)(?: (.*))?$/;
3674 i_method "i_resp", $icmd, $iargs;
3678 sub i_resp_progress ($) {
3680 my $msg = protocol_read_bytes \*RO, $rhs;
3684 sub i_resp_supplementary_message ($) {
3686 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3689 sub i_resp_complete {
3690 my $pid = $i_child_pid;
3691 $i_child_pid = undef; # prevents killing some other process with same pid
3692 printdebug "waiting for build host child $pid...\n";
3693 my $got = waitpid $pid, 0;
3694 die $! unless $got == $pid;
3695 die "build host child failed $?" if $?;
3698 printdebug "all done\n";
3702 sub i_resp_file ($) {
3704 my $localname = i_method "i_localname", $keyword;
3705 my $localpath = "$i_tmp/$localname";
3706 stat_exists $localpath and
3707 badproto \*RO, "file $keyword ($localpath) twice";
3708 protocol_receive_file \*RO, $localpath;
3709 i_method "i_file", $keyword;
3714 sub i_resp_param ($) {
3715 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3719 sub i_resp_previously ($) {
3720 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3721 or badproto \*RO, "bad previously spec";
3722 my $r = system qw(git check-ref-format), $1;
3723 die "bad previously ref spec ($r)" if $r;
3724 $previously{$1} = $2;
3729 sub i_resp_want ($) {
3731 die "$keyword ?" if $i_wanted{$keyword}++;
3732 my @localpaths = i_method "i_want", $keyword;
3733 printdebug "[[ $keyword @localpaths\n";
3734 foreach my $localpath (@localpaths) {
3735 protocol_send_file \*RI, $localpath;
3737 print RI "files-end\n" or die $!;
3740 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3742 sub i_localname_parsed_changelog {
3743 return "remote-changelog.822";
3745 sub i_file_parsed_changelog {
3746 ($i_clogp, $i_version, $i_dscfn) =
3747 push_parse_changelog "$i_tmp/remote-changelog.822";
3748 die if $i_dscfn =~ m#/|^\W#;
3751 sub i_localname_dsc {
3752 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3757 sub i_localname_changes {
3758 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3759 $i_changesfn = $i_dscfn;
3760 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3761 return $i_changesfn;
3763 sub i_file_changes { }
3765 sub i_want_signed_tag {
3766 printdebug Dumper(\%i_param, $i_dscfn);
3767 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3768 && defined $i_param{'csuite'}
3769 or badproto \*RO, "premature desire for signed-tag";
3770 my $head = $i_param{'head'};
3771 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3773 my $maintview = $i_param{'maint-view'};
3774 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3777 if ($protovsn >= 4) {
3778 my $p = $i_param{'tagformat'} // '<undef>';
3780 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3783 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3785 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3787 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3790 push_mktags $i_clogp, $i_dscfn,
3791 $i_changesfn, 'remote changes',
3795 sub i_want_signed_dsc_changes {
3796 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3797 sign_changes $i_changesfn;
3798 return ($i_dscfn, $i_changesfn);
3801 #---------- building etc. ----------
3807 #----- `3.0 (quilt)' handling -----
3809 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3811 sub quiltify_dpkg_commit ($$$;$) {
3812 my ($patchname,$author,$msg, $xinfo) = @_;
3816 my $descfn = ".git/dgit/quilt-description.tmp";
3817 open O, '>', $descfn or die "$descfn: $!";
3818 $msg =~ s/\n+/\n\n/;
3819 print O <<END or die $!;
3821 ${xinfo}Subject: $msg
3828 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3829 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3830 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3831 runcmd @dpkgsource, qw(--commit .), $patchname;
3835 sub quiltify_trees_differ ($$;$$$) {
3836 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
3837 # returns true iff the two tree objects differ other than in debian/
3838 # with $finegrained,
3839 # returns bitmask 01 - differ in upstream files except .gitignore
3840 # 02 - differ in .gitignore
3841 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3842 # is set for each modified .gitignore filename $fn
3843 # if $unrepres is defined, array ref to which is appeneded
3844 # a list of unrepresentable changes (removals of upstream files
3847 my @cmd = (@git, qw(diff-tree -z));
3848 push @cmd, qw(--name-only) unless $unrepres;
3849 push @cmd, qw(-r) if $finegrained || $unrepres;
3851 my $diffs= cmdoutput @cmd;
3854 foreach my $f (split /\0/, $diffs) {
3855 if ($unrepres && !@lmodes) {
3856 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
3859 my ($oldmode,$newmode) = @lmodes;
3862 next if $f =~ m#^debian(?:/.*)?$#s;
3866 die "deleted\n" unless $newmode =~ m/[^0]/;
3867 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
3868 if ($oldmode =~ m/[^0]/) {
3869 die "mode changed\n" if $oldmode ne $newmode;
3871 die "non-default mode\n" unless $newmode =~ m/^100644$/;
3875 local $/="\n"; chomp $@;
3876 push @$unrepres, [ $f, $@ ];
3880 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
3881 $r |= $isignore ? 02 : 01;
3882 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
3884 printdebug "quiltify_trees_differ $x $y => $r\n";
3888 sub quiltify_tree_sentinelfiles ($) {
3889 # lists the `sentinel' files present in the tree
3891 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
3892 qw(-- debian/rules debian/control);
3897 sub quiltify_splitbrain_needed () {
3898 if (!$split_brain) {
3899 progress "dgit view: changes are required...";
3900 runcmd @git, qw(checkout -q -b dgit-view);
3905 sub quiltify_splitbrain ($$$$$$) {
3906 my ($clogp, $unapplied, $headref, $diffbits,
3907 $editedignores, $cachekey) = @_;
3908 if ($quilt_mode !~ m/gbp|dpm/) {
3909 # treat .gitignore just like any other upstream file
3910 $diffbits = { %$diffbits };
3911 $_ = !!$_ foreach values %$diffbits;
3913 # We would like any commits we generate to be reproducible
3914 my @authline = clogp_authline($clogp);
3915 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
3916 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
3917 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
3918 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
3919 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
3920 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
3922 if ($quilt_mode =~ m/gbp|unapplied/ &&
3923 ($diffbits->{O2H} & 01)) {
3925 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
3926 " but git tree differs from orig in upstream files.";
3927 if (!stat_exists "debian/patches") {
3929 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
3933 if ($quilt_mode =~ m/dpm/ &&
3934 ($diffbits->{H2A} & 01)) {
3936 --quilt=$quilt_mode specified, implying patches-applied git tree
3937 but git tree differs from result of applying debian/patches to upstream
3940 if ($quilt_mode =~ m/gbp|unapplied/ &&
3941 ($diffbits->{O2A} & 01)) { # some patches
3942 quiltify_splitbrain_needed();
3943 progress "dgit view: creating patches-applied version using gbp pq";
3944 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
3945 # gbp pq import creates a fresh branch; push back to dgit-view
3946 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
3947 runcmd @git, qw(checkout -q dgit-view);
3949 if ($quilt_mode =~ m/gbp|dpm/ &&
3950 ($diffbits->{O2A} & 02)) {
3952 --quilt=$quilt_mode specified, implying that HEAD is for use with a
3953 tool which does not create patches for changes to upstream
3954 .gitignores: but, such patches exist in debian/patches.
3957 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
3958 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
3959 quiltify_splitbrain_needed();
3960 progress "dgit view: creating patch to represent .gitignore changes";
3961 ensuredir "debian/patches";
3962 my $gipatch = "debian/patches/auto-gitignore";
3963 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
3964 stat GIPATCH or die "$gipatch: $!";
3965 fail "$gipatch already exists; but want to create it".
3966 " to record .gitignore changes" if (stat _)[7];
3967 print GIPATCH <<END or die "$gipatch: $!";
3968 Subject: Update .gitignore from Debian packaging branch
3970 The Debian packaging git branch contains these updates to the upstream
3971 .gitignore file(s). This patch is autogenerated, to provide these
3972 updates to users of the official Debian archive view of the package.
3974 [dgit ($our_version) update-gitignore]
3977 close GIPATCH or die "$gipatch: $!";
3978 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
3979 $unapplied, $headref, "--", sort keys %$editedignores;
3980 open SERIES, "+>>", "debian/patches/series" or die $!;
3981 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
3983 defined read SERIES, $newline, 1 or die $!;
3984 print SERIES "\n" or die $! unless $newline eq "\n";
3985 print SERIES "auto-gitignore\n" or die $!;
3986 close SERIES or die $!;
3987 runcmd @git, qw(add -- debian/patches/series), $gipatch;
3989 Commit patch to update .gitignore
3991 [dgit ($our_version) update-gitignore-quilt-fixup]
3995 my $dgitview = git_rev_parse 'HEAD';
3997 changedir '../../../..';
3998 # When we no longer need to support squeeze, use --create-reflog
4000 ensuredir ".git/logs/refs/dgit-intern";
4001 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4004 my $oldcache = git_get_ref "refs/$splitbraincache";
4005 if ($oldcache eq $dgitview) {
4006 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4007 # git update-ref doesn't always update, in this case. *sigh*
4008 my $dummy = make_commit_text <<END;
4011 author Dgit <dgit\@example.com> 1000000000 +0000
4012 committer Dgit <dgit\@example.com> 1000000000 +0000
4014 Dummy commit - do not use
4016 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4017 "refs/$splitbraincache", $dummy;
4019 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4022 progress "dgit view: created (commit id $dgitview)";
4024 changedir '.git/dgit/unpack/work';
4027 sub quiltify ($$$$) {
4028 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4030 # Quilt patchification algorithm
4032 # We search backwards through the history of the main tree's HEAD
4033 # (T) looking for a start commit S whose tree object is identical
4034 # to to the patch tip tree (ie the tree corresponding to the
4035 # current dpkg-committed patch series). For these purposes
4036 # `identical' disregards anything in debian/ - this wrinkle is
4037 # necessary because dpkg-source treates debian/ specially.
4039 # We can only traverse edges where at most one of the ancestors'
4040 # trees differs (in changes outside in debian/). And we cannot
4041 # handle edges which change .pc/ or debian/patches. To avoid
4042 # going down a rathole we avoid traversing edges which introduce
4043 # debian/rules or debian/control. And we set a limit on the
4044 # number of edges we are willing to look at.
4046 # If we succeed, we walk forwards again. For each traversed edge
4047 # PC (with P parent, C child) (starting with P=S and ending with
4048 # C=T) to we do this:
4050 # - dpkg-source --commit with a patch name and message derived from C
4051 # After traversing PT, we git commit the changes which
4052 # should be contained within debian/patches.
4054 # The search for the path S..T is breadth-first. We maintain a
4055 # todo list containing search nodes. A search node identifies a
4056 # commit, and looks something like this:
4058 # Commit => $git_commit_id,
4059 # Child => $c, # or undef if P=T
4060 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4061 # Nontrivial => true iff $p..$c has relevant changes
4068 my %considered; # saves being exponential on some weird graphs
4070 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4073 my ($search,$whynot) = @_;
4074 printdebug " search NOT $search->{Commit} $whynot\n";
4075 $search->{Whynot} = $whynot;
4076 push @nots, $search;
4077 no warnings qw(exiting);
4086 my $c = shift @todo;
4087 next if $considered{$c->{Commit}}++;
4089 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4091 printdebug "quiltify investigate $c->{Commit}\n";
4094 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4095 printdebug " search finished hooray!\n";
4100 if ($quilt_mode eq 'nofix') {
4101 fail "quilt fixup required but quilt mode is \`nofix'\n".
4102 "HEAD commit $c->{Commit} differs from tree implied by ".
4103 " debian/patches (tree object $oldtiptree)";
4105 if ($quilt_mode eq 'smash') {
4106 printdebug " search quitting smash\n";
4110 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4111 $not->($c, "has $c_sentinels not $t_sentinels")
4112 if $c_sentinels ne $t_sentinels;
4114 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4115 $commitdata =~ m/\n\n/;
4117 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4118 @parents = map { { Commit => $_, Child => $c } } @parents;
4120 $not->($c, "root commit") if !@parents;
4122 foreach my $p (@parents) {
4123 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4125 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4126 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4128 foreach my $p (@parents) {
4129 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4131 my @cmd= (@git, qw(diff-tree -r --name-only),
4132 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4133 my $patchstackchange = cmdoutput @cmd;
4134 if (length $patchstackchange) {
4135 $patchstackchange =~ s/\n/,/g;
4136 $not->($p, "changed $patchstackchange");
4139 printdebug " search queue P=$p->{Commit} ",
4140 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4146 printdebug "quiltify want to smash\n";
4149 my $x = $_[0]{Commit};
4150 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4153 my $reportnot = sub {
4155 my $s = $abbrev->($notp);
4156 my $c = $notp->{Child};
4157 $s .= "..".$abbrev->($c) if $c;
4158 $s .= ": ".$notp->{Whynot};
4161 if ($quilt_mode eq 'linear') {
4162 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4163 foreach my $notp (@nots) {
4164 print STDERR "$us: ", $reportnot->($notp), "\n";
4166 print STDERR "$us: $_\n" foreach @$failsuggestion;
4167 fail "quilt fixup naive history linearisation failed.\n".
4168 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4169 } elsif ($quilt_mode eq 'smash') {
4170 } elsif ($quilt_mode eq 'auto') {
4171 progress "quilt fixup cannot be linear, smashing...";
4173 die "$quilt_mode ?";
4176 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4177 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4179 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4181 quiltify_dpkg_commit "auto-$version-$target-$time",
4182 (getfield $clogp, 'Maintainer'),
4183 "Automatically generated patch ($clogp->{Version})\n".
4184 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4188 progress "quiltify linearisation planning successful, executing...";
4190 for (my $p = $sref_S;
4191 my $c = $p->{Child};
4193 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4194 next unless $p->{Nontrivial};
4196 my $cc = $c->{Commit};
4198 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4199 $commitdata =~ m/\n\n/ or die "$c ?";
4202 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4205 my $commitdate = cmdoutput
4206 @git, qw(log -n1 --pretty=format:%aD), $cc;
4208 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4210 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4217 my $gbp_check_suitable = sub {
4222 die "contains unexpected slashes\n" if m{//} || m{/$};
4223 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4224 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4225 die "too long" if length > 200;
4227 return $_ unless $@;
4228 print STDERR "quiltifying commit $cc:".
4229 " ignoring/dropping Gbp-Pq $what: $@";
4233 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4235 (\S+) \s* \n //ixm) {
4236 $patchname = $gbp_check_suitable->($1, 'Name');
4238 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4240 (\S+) \s* \n //ixm) {
4241 $patchdir = $gbp_check_suitable->($1, 'Topic');
4246 if (!defined $patchname) {
4247 $patchname = $title;
4248 $patchname =~ s/[.:]$//;
4251 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4252 my $translitname = $converter->convert($patchname);
4253 die unless defined $translitname;
4254 $patchname = $translitname;
4257 "dgit: patch title transliteration error: $@"
4259 $patchname =~ y/ A-Z/-a-z/;
4260 $patchname =~ y/-a-z0-9_.+=~//cd;
4261 $patchname =~ s/^\W/x-$&/;
4262 $patchname = substr($patchname,0,40);
4264 if (!defined $patchdir) {
4267 if (length $patchdir) {
4268 $patchname = "$patchdir/$patchname";
4270 if ($patchname =~ m{^(.*)/}) {
4271 mkpath "debian/patches/$1";
4276 stat "debian/patches/$patchname$index";
4278 $!==ENOENT or die "$patchname$index $!";
4280 runcmd @git, qw(checkout -q), $cc;
4282 # We use the tip's changelog so that dpkg-source doesn't
4283 # produce complaining messages from dpkg-parsechangelog. None
4284 # of the information dpkg-source gets from the changelog is
4285 # actually relevant - it gets put into the original message
4286 # which dpkg-source provides our stunt editor, and then
4288 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4290 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4291 "Date: $commitdate\n".
4292 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4294 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4297 runcmd @git, qw(checkout -q master);
4300 sub build_maybe_quilt_fixup () {
4301 my ($format,$fopts) = get_source_format;
4302 return unless madformat_wantfixup $format;
4305 check_for_vendor_patches();
4307 if (quiltmode_splitbrain) {
4308 foreach my $needtf (qw(new maint)) {
4309 next if grep { $_ eq $needtf } access_cfg_tagformats;
4311 quilt mode $quilt_mode requires split view so server needs to support
4312 both "new" and "maint" tag formats, but config says it doesn't.
4317 my $clogp = parsechangelog();
4318 my $headref = git_rev_parse('HEAD');
4323 my $upstreamversion=$version;
4324 $upstreamversion =~ s/-[^-]*$//;
4326 if ($fopts->{'single-debian-patch'}) {
4327 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4329 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4332 die 'bug' if $split_brain && !$need_split_build_invocation;
4334 changedir '../../../..';
4335 runcmd_ordryrun_local
4336 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4339 sub quilt_fixup_mkwork ($) {
4342 mkdir "work" or die $!;
4344 mktree_in_ud_here();
4345 runcmd @git, qw(reset -q --hard), $headref;
4348 sub quilt_fixup_linkorigs ($$) {
4349 my ($upstreamversion, $fn) = @_;
4350 # calls $fn->($leafname);
4352 foreach my $f (<../../../../*>) { #/){
4353 my $b=$f; $b =~ s{.*/}{};
4355 local ($debuglevel) = $debuglevel-1;
4356 printdebug "QF linkorigs $b, $f ?\n";
4358 next unless is_orig_file_of_vsn $b, $upstreamversion;
4359 printdebug "QF linkorigs $b, $f Y\n";
4360 link_ltarget $f, $b or die "$b $!";
4365 sub quilt_fixup_delete_pc () {
4366 runcmd @git, qw(rm -rqf .pc);
4368 Commit removal of .pc (quilt series tracking data)
4370 [dgit ($our_version) upgrade quilt-remove-pc]
4374 sub quilt_fixup_singlepatch ($$$) {
4375 my ($clogp, $headref, $upstreamversion) = @_;
4377 progress "starting quiltify (single-debian-patch)";
4379 # dpkg-source --commit generates new patches even if
4380 # single-debian-patch is in debian/source/options. In order to
4381 # get it to generate debian/patches/debian-changes, it is
4382 # necessary to build the source package.
4384 quilt_fixup_linkorigs($upstreamversion, sub { });
4385 quilt_fixup_mkwork($headref);
4387 rmtree("debian/patches");
4389 runcmd @dpkgsource, qw(-b .);
4391 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4392 rename srcfn("$upstreamversion", "/debian/patches"),
4393 "work/debian/patches";
4396 commit_quilty_patch();
4399 sub quilt_make_fake_dsc ($) {
4400 my ($upstreamversion) = @_;
4402 my $fakeversion="$upstreamversion-~~DGITFAKE";
4404 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4405 print $fakedsc <<END or die $!;
4408 Version: $fakeversion
4412 my $dscaddfile=sub {
4415 my $md = new Digest::MD5;
4417 my $fh = new IO::File $b, '<' or die "$b $!";
4422 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4425 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4427 my @files=qw(debian/source/format debian/rules
4428 debian/control debian/changelog);
4429 foreach my $maybe (qw(debian/patches debian/source/options
4430 debian/tests/control)) {
4431 next unless stat_exists "../../../$maybe";
4432 push @files, $maybe;
4435 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4436 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4438 $dscaddfile->($debtar);
4439 close $fakedsc or die $!;
4442 sub quilt_check_splitbrain_cache ($$) {
4443 my ($headref, $upstreamversion) = @_;
4444 # Called only if we are in (potentially) split brain mode.
4446 # Computes the cache key and looks in the cache.
4447 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4449 my $splitbrain_cachekey;
4452 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4453 # we look in the reflog of dgit-intern/quilt-cache
4454 # we look for an entry whose message is the key for the cache lookup
4455 my @cachekey = (qw(dgit), $our_version);
4456 push @cachekey, $upstreamversion;
4457 push @cachekey, $quilt_mode;
4458 push @cachekey, $headref;
4460 push @cachekey, hashfile('fake.dsc');
4462 my $srcshash = Digest::SHA->new(256);
4463 my %sfs = ( %INC, '$0(dgit)' => $0 );
4464 foreach my $sfk (sort keys %sfs) {
4465 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4466 $srcshash->add($sfk," ");
4467 $srcshash->add(hashfile($sfs{$sfk}));
4468 $srcshash->add("\n");
4470 push @cachekey, $srcshash->hexdigest();
4471 $splitbrain_cachekey = "@cachekey";
4473 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4475 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4476 debugcmd "|(probably)",@cmd;
4477 my $child = open GC, "-|"; defined $child or die $!;
4479 chdir '../../..' or die $!;
4480 if (!stat ".git/logs/refs/$splitbraincache") {
4481 $! == ENOENT or die $!;
4482 printdebug ">(no reflog)\n";
4489 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4490 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4493 quilt_fixup_mkwork($headref);
4494 if ($cachehit ne $headref) {
4495 progress "dgit view: found cached (commit id $cachehit)";
4496 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4498 return ($cachehit, $splitbrain_cachekey);
4500 progress "dgit view: found cached, no changes required";
4501 return ($headref, $splitbrain_cachekey);
4503 die $! if GC->error;
4504 failedcmd unless close GC;
4506 printdebug "splitbrain cache miss\n";
4507 return (undef, $splitbrain_cachekey);
4510 sub quilt_fixup_multipatch ($$$) {
4511 my ($clogp, $headref, $upstreamversion) = @_;
4513 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4516 # - honour any existing .pc in case it has any strangeness
4517 # - determine the git commit corresponding to the tip of
4518 # the patch stack (if there is one)
4519 # - if there is such a git commit, convert each subsequent
4520 # git commit into a quilt patch with dpkg-source --commit
4521 # - otherwise convert all the differences in the tree into
4522 # a single git commit
4526 # Our git tree doesn't necessarily contain .pc. (Some versions of
4527 # dgit would include the .pc in the git tree.) If there isn't
4528 # one, we need to generate one by unpacking the patches that we
4531 # We first look for a .pc in the git tree. If there is one, we
4532 # will use it. (This is not the normal case.)
4534 # Otherwise need to regenerate .pc so that dpkg-source --commit
4535 # can work. We do this as follows:
4536 # 1. Collect all relevant .orig from parent directory
4537 # 2. Generate a debian.tar.gz out of
4538 # debian/{patches,rules,source/format,source/options}
4539 # 3. Generate a fake .dsc containing just these fields:
4540 # Format Source Version Files
4541 # 4. Extract the fake .dsc
4542 # Now the fake .dsc has a .pc directory.
4543 # (In fact we do this in every case, because in future we will
4544 # want to search for a good base commit for generating patches.)
4546 # Then we can actually do the dpkg-source --commit
4547 # 1. Make a new working tree with the same object
4548 # store as our main tree and check out the main
4550 # 2. Copy .pc from the fake's extraction, if necessary
4551 # 3. Run dpkg-source --commit
4552 # 4. If the result has changes to debian/, then
4553 # - git add them them
4554 # - git add .pc if we had a .pc in-tree
4556 # 5. If we had a .pc in-tree, delete it, and git commit
4557 # 6. Back in the main tree, fast forward to the new HEAD
4559 # Another situation we may have to cope with is gbp-style
4560 # patches-unapplied trees.
4562 # We would want to detect these, so we know to escape into
4563 # quilt_fixup_gbp. However, this is in general not possible.
4564 # Consider a package with a one patch which the dgit user reverts
4565 # (with git revert or the moral equivalent).
4567 # That is indistinguishable in contents from a patches-unapplied
4568 # tree. And looking at the history to distinguish them is not
4569 # useful because the user might have made a confusing-looking git
4570 # history structure (which ought to produce an error if dgit can't
4571 # cope, not a silent reintroduction of an unwanted patch).
4573 # So gbp users will have to pass an option. But we can usually
4574 # detect their failure to do so: if the tree is not a clean
4575 # patches-applied tree, quilt linearisation fails, but the tree
4576 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4577 # they want --quilt=unapplied.
4579 # To help detect this, when we are extracting the fake dsc, we
4580 # first extract it with --skip-patches, and then apply the patches
4581 # afterwards with dpkg-source --before-build. That lets us save a
4582 # tree object corresponding to .origs.
4584 my $splitbrain_cachekey;
4586 quilt_make_fake_dsc($upstreamversion);
4588 if (quiltmode_splitbrain()) {
4590 ($cachehit, $splitbrain_cachekey) =
4591 quilt_check_splitbrain_cache($headref, $upstreamversion);
4592 return if $cachehit;
4596 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4598 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4599 rename $fakexdir, "fake" or die "$fakexdir $!";
4603 remove_stray_gits();
4604 mktree_in_ud_here();
4608 runcmd @git, qw(add -Af .);
4609 my $unapplied=git_write_tree();
4610 printdebug "fake orig tree object $unapplied\n";
4614 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4616 if (system @bbcmd) {
4617 failedcmd @bbcmd if $? < 0;
4619 failed to apply your git tree's patch stack (from debian/patches/) to
4620 the corresponding upstream tarball(s). Your source tree and .orig
4621 are probably too inconsistent. dgit can only fix up certain kinds of
4622 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
4628 quilt_fixup_mkwork($headref);
4631 if (stat_exists ".pc") {
4633 progress "Tree already contains .pc - will use it then delete it.";
4636 rename '../fake/.pc','.pc' or die $!;
4639 changedir '../fake';
4641 runcmd @git, qw(add -Af .);
4642 my $oldtiptree=git_write_tree();
4643 printdebug "fake o+d/p tree object $unapplied\n";
4644 changedir '../work';
4647 # We calculate some guesswork now about what kind of tree this might
4648 # be. This is mostly for error reporting.
4654 # O = orig, without patches applied
4655 # A = "applied", ie orig with H's debian/patches applied
4656 O2H => quiltify_trees_differ($unapplied,$headref, 1,
4657 \%editedignores, \@unrepres),
4658 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4659 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4663 foreach my $b (qw(01 02)) {
4664 foreach my $v (qw(O2H O2A H2A)) {
4665 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4668 printdebug "differences \@dl @dl.\n";
4671 "$us: base trees orig=%.20s o+d/p=%.20s",
4672 $unapplied, $oldtiptree;
4674 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4675 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4676 $dl[0], $dl[1], $dl[3], $dl[4],
4680 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
4682 forceable_fail [qw(unrepresentable)], <<END;
4683 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
4688 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
4689 push @failsuggestion, "This might be a patches-unapplied branch.";
4690 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4691 push @failsuggestion, "This might be a patches-applied branch.";
4693 push @failsuggestion, "Maybe you need to specify one of".
4694 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
4696 if (quiltmode_splitbrain()) {
4697 quiltify_splitbrain($clogp, $unapplied, $headref,
4698 $diffbits, \%editedignores,
4699 $splitbrain_cachekey);
4703 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4704 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4706 if (!open P, '>>', ".pc/applied-patches") {
4707 $!==&ENOENT or die $!;
4712 commit_quilty_patch();
4714 if ($mustdeletepc) {
4715 quilt_fixup_delete_pc();
4719 sub quilt_fixup_editor () {
4720 my $descfn = $ENV{$fakeeditorenv};
4721 my $editing = $ARGV[$#ARGV];
4722 open I1, '<', $descfn or die "$descfn: $!";
4723 open I2, '<', $editing or die "$editing: $!";
4724 unlink $editing or die "$editing: $!";
4725 open O, '>', $editing or die "$editing: $!";
4726 while (<I1>) { print O or die $!; } I1->error and die $!;
4729 $copying ||= m/^\-\-\- /;
4730 next unless $copying;
4733 I2->error and die $!;
4738 sub maybe_apply_patches_dirtily () {
4739 return unless $quilt_mode =~ m/gbp|unapplied/;
4740 print STDERR <<END or die $!;
4742 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4743 dgit: Have to apply the patches - making the tree dirty.
4744 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4747 $patches_applied_dirtily = 01;
4748 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4749 runcmd qw(dpkg-source --before-build .);
4752 sub maybe_unapply_patches_again () {
4753 progress "dgit: Unapplying patches again to tidy up the tree."
4754 if $patches_applied_dirtily;
4755 runcmd qw(dpkg-source --after-build .)
4756 if $patches_applied_dirtily & 01;
4758 if $patches_applied_dirtily & 02;
4759 $patches_applied_dirtily = 0;
4762 #----- other building -----
4764 our $clean_using_builder;
4765 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4766 # clean the tree before building (perhaps invoked indirectly by
4767 # whatever we are using to run the build), rather than separately
4768 # and explicitly by us.
4771 return if $clean_using_builder;
4772 if ($cleanmode eq 'dpkg-source') {
4773 maybe_apply_patches_dirtily();
4774 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4775 } elsif ($cleanmode eq 'dpkg-source-d') {
4776 maybe_apply_patches_dirtily();
4777 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4778 } elsif ($cleanmode eq 'git') {
4779 runcmd_ordryrun_local @git, qw(clean -xdf);
4780 } elsif ($cleanmode eq 'git-ff') {
4781 runcmd_ordryrun_local @git, qw(clean -xdff);
4782 } elsif ($cleanmode eq 'check') {
4783 my $leftovers = cmdoutput @git, qw(clean -xdn);
4784 if (length $leftovers) {
4785 print STDERR $leftovers, "\n" or die $!;
4786 fail "tree contains uncommitted files and --clean=check specified";
4788 } elsif ($cleanmode eq 'none') {
4795 badusage "clean takes no additional arguments" if @ARGV;
4798 maybe_unapply_patches_again();
4803 badusage "-p is not allowed when building" if defined $package;
4806 my $clogp = parsechangelog();
4807 $isuite = getfield $clogp, 'Distribution';
4808 $package = getfield $clogp, 'Source';
4809 $version = getfield $clogp, 'Version';
4810 build_maybe_quilt_fixup();
4812 my $pat = changespat $version;
4813 foreach my $f (glob "$buildproductsdir/$pat") {
4815 unlink $f or fail "remove old changes file $f: $!";
4817 progress "would remove $f";
4823 sub changesopts_initial () {
4824 my @opts =@changesopts[1..$#changesopts];
4827 sub changesopts_version () {
4828 if (!defined $changes_since_version) {
4829 my @vsns = archive_query('archive_query');
4830 my @quirk = access_quirk();
4831 if ($quirk[0] eq 'backports') {
4832 local $isuite = $quirk[2];
4834 canonicalise_suite();
4835 push @vsns, archive_query('archive_query');
4838 @vsns = map { $_->[0] } @vsns;
4839 @vsns = sort { -version_compare($a, $b) } @vsns;
4840 $changes_since_version = $vsns[0];
4841 progress "changelog will contain changes since $vsns[0]";
4843 $changes_since_version = '_';
4844 progress "package seems new, not specifying -v<version>";
4847 if ($changes_since_version ne '_') {
4848 return ("-v$changes_since_version");
4854 sub changesopts () {
4855 return (changesopts_initial(), changesopts_version());
4858 sub massage_dbp_args ($;$) {
4859 my ($cmd,$xargs) = @_;
4862 # - if we're going to split the source build out so we can
4863 # do strange things to it, massage the arguments to dpkg-buildpackage
4864 # so that the main build doessn't build source (or add an argument
4865 # to stop it building source by default).
4867 # - add -nc to stop dpkg-source cleaning the source tree,
4868 # unless we're not doing a split build and want dpkg-source
4869 # as cleanmode, in which case we can do nothing
4872 # 0 - source will NOT need to be built separately by caller
4873 # +1 - source will need to be built separately by caller
4874 # +2 - source will need to be built separately by caller AND
4875 # dpkg-buildpackage should not in fact be run at all!
4876 debugcmd '#massaging#', @$cmd if $debuglevel>1;
4877 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
4878 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
4879 $clean_using_builder = 1;
4882 # -nc has the side effect of specifying -b if nothing else specified
4883 # and some combinations of -S, -b, et al, are errors, rather than
4884 # later simply overriding earlie. So we need to:
4885 # - search the command line for these options
4886 # - pick the last one
4887 # - perhaps add our own as a default
4888 # - perhaps adjust it to the corresponding non-source-building version
4890 foreach my $l ($cmd, $xargs) {
4892 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
4895 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
4897 if ($need_split_build_invocation) {
4898 printdebug "massage split $dmode.\n";
4899 $r = $dmode =~ m/[S]/ ? +2 :
4900 $dmode =~ y/gGF/ABb/ ? +1 :
4901 $dmode =~ m/[ABb]/ ? 0 :
4904 printdebug "massage done $r $dmode.\n";
4906 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
4912 my $wasdir = must_getcwd();
4918 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
4919 my ($msg_if_onlyone) = @_;
4920 # If there is only one .changes file, fail with $msg_if_onlyone,
4921 # or if that is undef, be a no-op.
4922 # Returns the changes file to report to the user.
4923 my $pat = changespat $version;
4924 my @changesfiles = glob $pat;
4925 @changesfiles = sort {
4926 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
4930 if (@changesfiles==1) {
4931 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
4932 only one changes file from build (@changesfiles)
4934 $result = $changesfiles[0];
4935 } elsif (@changesfiles==2) {
4936 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
4937 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
4938 fail "$l found in binaries changes file $binchanges"
4941 runcmd_ordryrun_local @mergechanges, @changesfiles;
4942 my $multichanges = changespat $version,'multi';
4944 stat_exists $multichanges or fail "$multichanges: $!";
4945 foreach my $cf (glob $pat) {
4946 next if $cf eq $multichanges;
4947 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
4950 $result = $multichanges;
4952 fail "wrong number of different changes files (@changesfiles)";
4954 printdone "build successful, results in $result\n" or die $!;
4957 sub midbuild_checkchanges () {
4958 my $pat = changespat $version;
4959 return if $rmchanges;
4960 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
4961 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
4963 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
4964 Suggest you delete @unwanted.
4969 sub midbuild_checkchanges_vanilla ($) {
4971 midbuild_checkchanges() if $wantsrc == 1;
4974 sub postbuild_mergechanges_vanilla ($) {
4976 if ($wantsrc == 1) {
4978 postbuild_mergechanges(undef);
4981 printdone "build successful\n";
4986 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
4987 my $wantsrc = massage_dbp_args \@dbp;
4990 midbuild_checkchanges_vanilla $wantsrc;
4995 push @dbp, changesopts_version();
4996 maybe_apply_patches_dirtily();
4997 runcmd_ordryrun_local @dbp;
4999 maybe_unapply_patches_again();
5000 postbuild_mergechanges_vanilla $wantsrc;
5004 $quilt_mode //= 'gbp';
5008 my @dbp = @dpkgbuildpackage;
5010 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5012 if (!length $gbp_build[0]) {
5013 if (length executable_on_path('git-buildpackage')) {
5014 $gbp_build[0] = qw(git-buildpackage);
5016 $gbp_build[0] = 'gbp buildpackage';
5019 my @cmd = opts_opt_multi_cmd @gbp_build;
5021 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5025 midbuild_checkchanges_vanilla $wantsrc;
5027 if (!$clean_using_builder) {
5028 push @cmd, '--git-cleaner=true';
5032 maybe_unapply_patches_again();
5034 push @cmd, changesopts();
5035 runcmd_ordryrun_local @cmd, @ARGV;
5037 postbuild_mergechanges_vanilla $wantsrc;
5039 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5042 my $our_cleanmode = $cleanmode;
5043 if ($need_split_build_invocation) {
5044 # Pretend that clean is being done some other way. This
5045 # forces us not to try to use dpkg-buildpackage to clean and
5046 # build source all in one go; and instead we run dpkg-source
5047 # (and build_prep() will do the clean since $clean_using_builder
5049 $our_cleanmode = 'ELSEWHERE';
5051 if ($our_cleanmode =~ m/^dpkg-source/) {
5052 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5053 $clean_using_builder = 1;
5056 $sourcechanges = changespat $version,'source';
5058 unlink "../$sourcechanges" or $!==ENOENT
5059 or fail "remove $sourcechanges: $!";
5061 $dscfn = dscfn($version);
5062 if ($our_cleanmode eq 'dpkg-source') {
5063 maybe_apply_patches_dirtily();
5064 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5066 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5067 maybe_apply_patches_dirtily();
5068 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5071 my @cmd = (@dpkgsource, qw(-b --));
5074 runcmd_ordryrun_local @cmd, "work";
5075 my @udfiles = <${package}_*>;
5076 changedir "../../..";
5077 foreach my $f (@udfiles) {
5078 printdebug "source copy, found $f\n";
5081 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5082 $f eq srcfn($version, $&));
5083 printdebug "source copy, found $f - renaming\n";
5084 rename "$ud/$f", "../$f" or $!==ENOENT
5085 or fail "put in place new source file ($f): $!";
5088 my $pwd = must_getcwd();
5089 my $leafdir = basename $pwd;
5091 runcmd_ordryrun_local @cmd, $leafdir;
5094 runcmd_ordryrun_local qw(sh -ec),
5095 'exec >$1; shift; exec "$@"','x',
5096 "../$sourcechanges",
5097 @dpkggenchanges, qw(-S), changesopts();
5101 sub cmd_build_source {
5102 badusage "build-source takes no additional arguments" if @ARGV;
5104 maybe_unapply_patches_again();
5105 printdone "source built, results in $dscfn and $sourcechanges";
5110 midbuild_checkchanges();
5113 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5114 stat_exists $sourcechanges
5115 or fail "$sourcechanges (in parent directory): $!";
5117 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5119 maybe_unapply_patches_again();
5121 postbuild_mergechanges(<<END);
5122 perhaps you need to pass -A ? (sbuild's default is to build only
5123 arch-specific binaries; dgit 1.4 used to override that.)
5128 sub cmd_quilt_fixup {
5129 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5130 my $clogp = parsechangelog();
5131 $version = getfield $clogp, 'Version';
5132 $package = getfield $clogp, 'Source';
5135 build_maybe_quilt_fixup();
5138 sub cmd_archive_api_query {
5139 badusage "need only 1 subpath argument" unless @ARGV==1;
5140 my ($subpath) = @ARGV;
5141 my @cmd = archive_api_query_cmd($subpath);
5144 exec @cmd or fail "exec curl: $!\n";
5147 sub cmd_clone_dgit_repos_server {
5148 badusage "need destination argument" unless @ARGV==1;
5149 my ($destdir) = @ARGV;
5150 $package = '_dgit-repos-server';
5151 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5153 exec @cmd or fail "exec git clone: $!\n";
5156 sub cmd_setup_mergechangelogs {
5157 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5158 setup_mergechangelogs(1);
5161 sub cmd_setup_useremail {
5162 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5166 sub cmd_setup_new_tree {
5167 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5171 #---------- argument parsing and main program ----------
5174 print "dgit version $our_version\n" or die $!;
5178 our (%valopts_long, %valopts_short);
5181 sub defvalopt ($$$$) {
5182 my ($long,$short,$val_re,$how) = @_;
5183 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5184 $valopts_long{$long} = $oi;
5185 $valopts_short{$short} = $oi;
5186 # $how subref should:
5187 # do whatever assignemnt or thing it likes with $_[0]
5188 # if the option should not be passed on to remote, @rvalopts=()
5189 # or $how can be a scalar ref, meaning simply assign the value
5192 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5193 defvalopt '--distro', '-d', '.+', \$idistro;
5194 defvalopt '', '-k', '.+', \$keyid;
5195 defvalopt '--existing-package','', '.*', \$existing_package;
5196 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5197 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5198 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5200 defvalopt '', '-C', '.+', sub {
5201 ($changesfile) = (@_);
5202 if ($changesfile =~ s#^(.*)/##) {
5203 $buildproductsdir = $1;
5207 defvalopt '--initiator-tempdir','','.*', sub {
5208 ($initiator_tempdir) = (@_);
5209 $initiator_tempdir =~ m#^/# or
5210 badusage "--initiator-tempdir must be used specify an".
5211 " absolute, not relative, directory."
5217 if (defined $ENV{'DGIT_SSH'}) {
5218 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5219 } elsif (defined $ENV{'GIT_SSH'}) {
5220 @ssh = ($ENV{'GIT_SSH'});
5228 if (!defined $val) {
5229 badusage "$what needs a value" unless @ARGV;
5231 push @rvalopts, $val;
5233 badusage "bad value \`$val' for $what" unless
5234 $val =~ m/^$oi->{Re}$(?!\n)/s;
5235 my $how = $oi->{How};
5236 if (ref($how) eq 'SCALAR') {
5241 push @ropts, @rvalopts;
5245 last unless $ARGV[0] =~ m/^-/;
5249 if (m/^--dry-run$/) {
5252 } elsif (m/^--damp-run$/) {
5255 } elsif (m/^--no-sign$/) {
5258 } elsif (m/^--help$/) {
5260 } elsif (m/^--version$/) {
5262 } elsif (m/^--new$/) {
5265 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5266 ($om = $opts_opt_map{$1}) &&
5270 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5271 !$opts_opt_cmdonly{$1} &&
5272 ($om = $opts_opt_map{$1})) {
5275 } elsif (m/^--(gbp|dpm)$/s) {
5276 push @ropts, "--quilt=$1";
5278 } elsif (m/^--ignore-dirty$/s) {
5281 } elsif (m/^--no-quilt-fixup$/s) {
5283 $quilt_mode = 'nocheck';
5284 } elsif (m/^--no-rm-on-error$/s) {
5287 } elsif (m/^--overwrite$/s) {
5289 $overwrite_version = '';
5290 } elsif (m/^--overwrite=(.+)$/s) {
5292 $overwrite_version = $1;
5293 } elsif (m/^--(no-)?rm-old-changes$/s) {
5296 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5298 push @deliberatelies, $&;
5299 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5303 } elsif (m/^--force-/) {
5305 "$us: warning: ignoring unknown force option $_\n";
5307 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5308 # undocumented, for testing
5310 $tagformat_want = [ $1, 'command line', 1 ];
5311 # 1 menas overrides distro configuration
5312 } elsif (m/^--always-split-source-build$/s) {
5313 # undocumented, for testing
5315 $need_split_build_invocation = 1;
5316 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5317 $val = $2 ? $' : undef; #';
5318 $valopt->($oi->{Long});
5320 badusage "unknown long option \`$_'";
5327 } elsif (s/^-L/-/) {
5330 } elsif (s/^-h/-/) {
5332 } elsif (s/^-D/-/) {
5336 } elsif (s/^-N/-/) {
5341 push @changesopts, $_;
5343 } elsif (s/^-wn$//s) {
5345 $cleanmode = 'none';
5346 } elsif (s/^-wg$//s) {
5349 } elsif (s/^-wgf$//s) {
5351 $cleanmode = 'git-ff';
5352 } elsif (s/^-wd$//s) {
5354 $cleanmode = 'dpkg-source';
5355 } elsif (s/^-wdd$//s) {
5357 $cleanmode = 'dpkg-source-d';
5358 } elsif (s/^-wc$//s) {
5360 $cleanmode = 'check';
5361 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5362 push @git, '-c', $&;
5363 $gitcfgs{cmdline}{$1} = [ $2 ];
5364 } elsif (s/^-c([^=]+)$//s) {
5365 push @git, '-c', $&;
5366 $gitcfgs{cmdline}{$1} = [ 'true' ];
5367 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5369 $val = undef unless length $val;
5370 $valopt->($oi->{Short});
5373 badusage "unknown short option \`$_'";
5380 sub check_env_sanity () {
5381 my $blocked = new POSIX::SigSet;
5382 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5385 foreach my $name (qw(PIPE CHLD)) {
5386 my $signame = "SIG$name";
5387 my $signum = eval "POSIX::$signame" // die;
5388 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5389 die "$signame is set to something other than SIG_DFL\n";
5390 $blocked->ismember($signum) and
5391 die "$signame is blocked\n";
5397 On entry to dgit, $@
5398 This is a bug produced by something in in your execution environment.
5404 sub finalise_opts_opts () {
5405 foreach my $k (keys %opts_opt_map) {
5406 my $om = $opts_opt_map{$k};
5408 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5410 badcfg "cannot set command for $k"
5411 unless length $om->[0];
5415 foreach my $c (access_cfg_cfgs("opts-$k")) {
5417 map { $_ ? @$_ : () }
5418 map { $gitcfgs{$_}{$c} }
5419 reverse @gitcfgsources;
5420 printdebug "CL $c ", (join " ", map { shellquote } @vl),
5421 "\n" if $debuglevel >= 4;
5423 badcfg "cannot configure options for $k"
5424 if $opts_opt_cmdonly{$k};
5425 my $insertpos = $opts_cfg_insertpos{$k};
5426 @$om = ( @$om[0..$insertpos-1],
5428 @$om[$insertpos..$#$om] );
5433 if ($ENV{$fakeeditorenv}) {
5435 quilt_fixup_editor();
5442 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5443 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5444 if $dryrun_level == 1;
5446 print STDERR $helpmsg or die $!;
5449 my $cmd = shift @ARGV;
5452 my $pre_fn = ${*::}{"pre_$cmd"};
5453 $pre_fn->() if $pre_fn;
5455 if (!defined $rmchanges) {
5456 local $access_forpush;
5457 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5460 if (!defined $quilt_mode) {
5461 local $access_forpush;
5462 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5463 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5465 $quilt_mode =~ m/^($quilt_modes_re)$/
5466 or badcfg "unknown quilt-mode \`$quilt_mode'";
5470 $need_split_build_invocation ||= quiltmode_splitbrain();
5472 if (!defined $cleanmode) {
5473 local $access_forpush;
5474 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5475 $cleanmode //= 'dpkg-source';
5477 badcfg "unknown clean-mode \`$cleanmode'" unless
5478 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5481 my $fn = ${*::}{"cmd_$cmd"};
5482 $fn or badusage "unknown operation $cmd";