3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2015 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
43 our $our_version = 'UNRELEASED'; ###substituted###
45 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
48 our $isuite = 'unstable';
54 our $dryrun_level = 0;
56 our $buildproductsdir = '..';
62 our $existing_package = 'dpkg';
64 our $changes_since_version;
66 our $overwrite_version; # undef: not specified; '': check changelog
68 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
69 our $we_are_responder;
70 our $initiator_tempdir;
71 our $patches_applied_dirtily = 00;
76 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
78 our $suite_re = '[-+.0-9a-z]+';
79 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
80 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
81 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
82 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
84 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
85 our $splitbraincache = 'dgit-intern/quilt-cache';
88 our (@dget) = qw(dget);
89 our (@curl) = qw(curl -f);
90 our (@dput) = qw(dput);
91 our (@debsign) = qw(debsign);
93 our (@sbuild) = qw(sbuild);
95 our (@dgit) = qw(dgit);
96 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
97 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
98 our (@dpkggenchanges) = qw(dpkg-genchanges);
99 our (@mergechanges) = qw(mergechanges -f);
100 our (@gbp) = qw(gbp);
101 our (@changesopts) = ('');
103 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
106 'debsign' => \@debsign,
108 'sbuild' => \@sbuild,
112 'dpkg-source' => \@dpkgsource,
113 'dpkg-buildpackage' => \@dpkgbuildpackage,
114 'dpkg-genchanges' => \@dpkggenchanges,
116 'ch' => \@changesopts,
117 'mergechanges' => \@mergechanges);
119 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
120 our %opts_cfg_insertpos = map {
122 scalar @{ $opts_opt_map{$_} }
123 } keys %opts_opt_map;
125 sub finalise_opts_opts();
131 our $supplementary_message = '';
132 our $need_split_build_invocation = 0;
133 our $split_brain = 0;
137 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
140 our $remotename = 'dgit';
141 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
146 my ($v,$distro) = @_;
147 return $tagformatfn->($v, $distro);
150 sub debiantag_maintview ($$) {
151 my ($v,$distro) = @_;
156 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
158 sub lbranch () { return "$branchprefix/$csuite"; }
159 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
160 sub lref () { return "refs/heads/".lbranch(); }
161 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
162 sub rrref () { return server_ref($csuite); }
164 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
165 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
167 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
168 # locally fetched refs because they have unhelpful names and clutter
169 # up gitk etc. So we track whether we have "used up" head ref (ie,
170 # whether we have made another local ref which refers to this object).
172 # (If we deleted them unconditionally, then we might end up
173 # re-fetching the same git objects each time dgit fetch was run.)
175 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
176 # in git_fetch_us to fetch the refs in question, and possibly a call
177 # to lrfetchref_used.
179 our (%lrfetchrefs_f, %lrfetchrefs_d);
180 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
182 sub lrfetchref_used ($) {
183 my ($fullrefname) = @_;
184 my $objid = $lrfetchrefs_f{$fullrefname};
185 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
196 return "${package}_".(stripepoch $vsn).$sfx
201 return srcfn($vsn,".dsc");
204 sub changespat ($;$) {
205 my ($vsn, $arch) = @_;
206 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
215 foreach my $f (@end) {
217 print STDERR "$us: cleanup: $@" if length $@;
221 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
223 sub no_such_package () {
224 print STDERR "$us: package $package does not exist in suite $isuite\n";
230 printdebug "CD $newdir\n";
231 chdir $newdir or confess "chdir: $newdir: $!";
234 sub deliberately ($) {
236 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
239 sub deliberately_not_fast_forward () {
240 foreach (qw(not-fast-forward fresh-repo)) {
241 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
245 sub quiltmode_splitbrain () {
246 $quilt_mode =~ m/gbp|dpm|unapplied/;
249 #---------- remote protocol support, common ----------
251 # remote push initiator/responder protocol:
252 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
253 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
254 # < dgit-remote-push-ready <actual-proto-vsn>
261 # > supplementary-message NBYTES # $protovsn >= 3
266 # > file parsed-changelog
267 # [indicates that output of dpkg-parsechangelog follows]
268 # > data-block NBYTES
269 # > [NBYTES bytes of data (no newline)]
270 # [maybe some more blocks]
279 # > param head DGIT-VIEW-HEAD
280 # > param csuite SUITE
281 # > param tagformat old|new
282 # > param maint-view MAINT-VIEW-HEAD
284 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
285 # # goes into tag, for replay prevention
288 # [indicates that signed tag is wanted]
289 # < data-block NBYTES
290 # < [NBYTES bytes of data (no newline)]
291 # [maybe some more blocks]
295 # > want signed-dsc-changes
296 # < data-block NBYTES [transfer of signed dsc]
298 # < data-block NBYTES [transfer of signed changes]
306 sub i_child_report () {
307 # Sees if our child has died, and reap it if so. Returns a string
308 # describing how it died if it failed, or undef otherwise.
309 return undef unless $i_child_pid;
310 my $got = waitpid $i_child_pid, WNOHANG;
311 return undef if $got <= 0;
312 die unless $got == $i_child_pid;
313 $i_child_pid = undef;
314 return undef unless $?;
315 return "build host child ".waitstatusmsg();
320 fail "connection lost: $!" if $fh->error;
321 fail "protocol violation; $m not expected";
324 sub badproto_badread ($$) {
326 fail "connection lost: $!" if $!;
327 my $report = i_child_report();
328 fail $report if defined $report;
329 badproto $fh, "eof (reading $wh)";
332 sub protocol_expect (&$) {
333 my ($match, $fh) = @_;
336 defined && chomp or badproto_badread $fh, "protocol message";
344 badproto $fh, "\`$_'";
347 sub protocol_send_file ($$) {
348 my ($fh, $ourfn) = @_;
349 open PF, "<", $ourfn or die "$ourfn: $!";
352 my $got = read PF, $d, 65536;
353 die "$ourfn: $!" unless defined $got;
355 print $fh "data-block ".length($d)."\n" or die $!;
356 print $fh $d or die $!;
358 PF->error and die "$ourfn $!";
359 print $fh "data-end\n" or die $!;
363 sub protocol_read_bytes ($$) {
364 my ($fh, $nbytes) = @_;
365 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
367 my $got = read $fh, $d, $nbytes;
368 $got==$nbytes or badproto_badread $fh, "data block";
372 sub protocol_receive_file ($$) {
373 my ($fh, $ourfn) = @_;
374 printdebug "() $ourfn\n";
375 open PF, ">", $ourfn or die "$ourfn: $!";
377 my ($y,$l) = protocol_expect {
378 m/^data-block (.*)$/ ? (1,$1) :
379 m/^data-end$/ ? (0,) :
383 my $d = protocol_read_bytes $fh, $l;
384 print PF $d or die $!;
389 #---------- remote protocol support, responder ----------
391 sub responder_send_command ($) {
393 return unless $we_are_responder;
394 # called even without $we_are_responder
395 printdebug ">> $command\n";
396 print PO $command, "\n" or die $!;
399 sub responder_send_file ($$) {
400 my ($keyword, $ourfn) = @_;
401 return unless $we_are_responder;
402 printdebug "]] $keyword $ourfn\n";
403 responder_send_command "file $keyword";
404 protocol_send_file \*PO, $ourfn;
407 sub responder_receive_files ($@) {
408 my ($keyword, @ourfns) = @_;
409 die unless $we_are_responder;
410 printdebug "[[ $keyword @ourfns\n";
411 responder_send_command "want $keyword";
412 foreach my $fn (@ourfns) {
413 protocol_receive_file \*PI, $fn;
416 protocol_expect { m/^files-end$/ } \*PI;
419 #---------- remote protocol support, initiator ----------
421 sub initiator_expect (&) {
423 protocol_expect { &$match } \*RO;
426 #---------- end remote code ----------
429 if ($we_are_responder) {
431 responder_send_command "progress ".length($m) or die $!;
432 print PO $m or die $!;
442 $ua = LWP::UserAgent->new();
446 progress "downloading $what...";
447 my $r = $ua->get(@_) or die $!;
448 return undef if $r->code == 404;
449 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
450 return $r->decoded_content(charset => 'none');
453 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
458 failedcmd @_ if system @_;
461 sub act_local () { return $dryrun_level <= 1; }
462 sub act_scary () { return !$dryrun_level; }
465 if (!$dryrun_level) {
466 progress "dgit ok: @_";
468 progress "would be ok: @_ (but dry run only)";
473 printcmd(\*STDERR,$debugprefix."#",@_);
476 sub runcmd_ordryrun {
484 sub runcmd_ordryrun_local {
493 my ($first_shell, @cmd) = @_;
494 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
497 our $helpmsg = <<END;
499 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
500 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
501 dgit [dgit-opts] build [dpkg-buildpackage-opts]
502 dgit [dgit-opts] sbuild [sbuild-opts]
503 dgit [dgit-opts] push [dgit-opts] [suite]
504 dgit [dgit-opts] rpush build-host:build-dir ...
505 important dgit options:
506 -k<keyid> sign tag and package with <keyid> instead of default
507 --dry-run -n do not change anything, but go through the motions
508 --damp-run -L like --dry-run but make local changes, without signing
509 --new -N allow introducing a new package
510 --debug -D increase debug level
511 -c<name>=<value> set git config option (used directly by dgit too)
514 our $later_warning_msg = <<END;
515 Perhaps the upload is stuck in incoming. Using the version from git.
519 print STDERR "$us: @_\n", $helpmsg or die $!;
524 @ARGV or badusage "too few arguments";
525 return scalar shift @ARGV;
529 print $helpmsg or die $!;
533 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
535 our %defcfg = ('dgit.default.distro' => 'debian',
536 'dgit.default.username' => '',
537 'dgit.default.archive-query-default-component' => 'main',
538 'dgit.default.ssh' => 'ssh',
539 'dgit.default.archive-query' => 'madison:',
540 'dgit.default.sshpsql-dbname' => 'service=projectb',
541 'dgit.default.dgit-tag-format' => 'old,new,maint',
542 # old means "repo server accepts pushes with old dgit tags"
543 # new means "repo server accepts pushes with new dgit tags"
544 # maint means "repo server accepts split brain pushes"
545 # hist means "repo server may have old pushes without new tag"
546 # ("hist" is implied by "old")
547 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
548 'dgit-distro.debian.git-check' => 'url',
549 'dgit-distro.debian.git-check-suffix' => '/info/refs',
550 'dgit-distro.debian.new-private-pushers' => 't',
551 'dgit-distro.debian.dgit-tag-format' => 'new',
552 'dgit-distro.debian/push.git-url' => '',
553 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
554 'dgit-distro.debian/push.git-user-force' => 'dgit',
555 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
556 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
557 'dgit-distro.debian/push.git-create' => 'true',
558 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
559 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
560 # 'dgit-distro.debian.archive-query-tls-key',
561 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
562 # ^ this does not work because curl is broken nowadays
563 # Fixing #790093 properly will involve providing providing the key
564 # in some pacagke and maybe updating these paths.
566 # 'dgit-distro.debian.archive-query-tls-curl-args',
567 # '--ca-path=/etc/ssl/ca-debian',
568 # ^ this is a workaround but works (only) on DSA-administered machines
569 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
570 'dgit-distro.debian.git-url-suffix' => '',
571 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
572 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
573 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
574 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
575 'dgit-distro.ubuntu.git-check' => 'false',
576 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
577 'dgit-distro.test-dummy.ssh' => "$td/ssh",
578 'dgit-distro.test-dummy.username' => "alice",
579 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
580 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
581 'dgit-distro.test-dummy.git-url' => "$td/git",
582 'dgit-distro.test-dummy.git-host' => "git",
583 'dgit-distro.test-dummy.git-path' => "$td/git",
584 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
585 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
586 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
587 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
592 sub git_slurp_config () {
593 local ($debuglevel) = $debuglevel-2;
596 my @cmd = (@git, qw(config -z --get-regexp .*));
599 open GITS, "-|", @cmd or die $!;
602 printdebug "=> ", (messagequote $_), "\n";
604 push @{ $gitcfg{$`} }, $'; #';
608 or ($!==0 && $?==256)
612 sub git_get_config ($) {
615 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
618 @$l==1 or badcfg "multiple values for $c" if @$l > 1;
624 return undef if $c =~ /RETURN-UNDEF/;
625 my $v = git_get_config($c);
626 return $v if defined $v;
627 my $dv = $defcfg{$c};
628 return $dv if defined $dv;
630 badcfg "need value for one of: @_\n".
631 "$us: distro or suite appears not to be (properly) supported";
634 sub access_basedistro () {
635 if (defined $idistro) {
638 return cfg("dgit-suite.$isuite.distro",
639 "dgit.default.distro");
643 sub access_quirk () {
644 # returns (quirk name, distro to use instead or undef, quirk-specific info)
645 my $basedistro = access_basedistro();
646 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
648 if (defined $backports_quirk) {
649 my $re = $backports_quirk;
650 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
652 $re =~ s/\%/([-0-9a-z_]+)/
653 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
654 if ($isuite =~ m/^$re$/) {
655 return ('backports',"$basedistro-backports",$1);
658 return ('none',undef);
663 sub parse_cfg_bool ($$$) {
664 my ($what,$def,$v) = @_;
667 $v =~ m/^[ty1]/ ? 1 :
668 $v =~ m/^[fn0]/ ? 0 :
669 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
672 sub access_forpush_config () {
673 my $d = access_basedistro();
677 parse_cfg_bool('new-private-pushers', 0,
678 cfg("dgit-distro.$d.new-private-pushers",
681 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
684 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
685 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
686 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
687 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
690 sub access_forpush () {
691 $access_forpush //= access_forpush_config();
692 return $access_forpush;
696 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
697 badcfg "pushing but distro is configured readonly"
698 if access_forpush_config() eq '0';
700 $supplementary_message = <<'END' unless $we_are_responder;
701 Push failed, before we got started.
702 You can retry the push, after fixing the problem, if you like.
704 finalise_opts_opts();
708 finalise_opts_opts();
711 sub supplementary_message ($) {
713 if (!$we_are_responder) {
714 $supplementary_message = $msg;
716 } elsif ($protovsn >= 3) {
717 responder_send_command "supplementary-message ".length($msg)
719 print PO $msg or die $!;
723 sub access_distros () {
724 # Returns list of distros to try, in order
727 # 0. `instead of' distro name(s) we have been pointed to
728 # 1. the access_quirk distro, if any
729 # 2a. the user's specified distro, or failing that } basedistro
730 # 2b. the distro calculated from the suite }
731 my @l = access_basedistro();
733 my (undef,$quirkdistro) = access_quirk();
734 unshift @l, $quirkdistro;
735 unshift @l, $instead_distro;
736 @l = grep { defined } @l;
738 if (access_forpush()) {
739 @l = map { ("$_/push", $_) } @l;
744 sub access_cfg_cfgs (@) {
747 # The nesting of these loops determines the search order. We put
748 # the key loop on the outside so that we search all the distros
749 # for each key, before going on to the next key. That means that
750 # if access_cfg is called with a more specific, and then a less
751 # specific, key, an earlier distro can override the less specific
752 # without necessarily overriding any more specific keys. (If the
753 # distro wants to override the more specific keys it can simply do
754 # so; whereas if we did the loop the other way around, it would be
755 # impossible to for an earlier distro to override a less specific
756 # key but not the more specific ones without restating the unknown
757 # values of the more specific keys.
760 # We have to deal with RETURN-UNDEF specially, so that we don't
761 # terminate the search prematurely.
763 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
766 foreach my $d (access_distros()) {
767 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
769 push @cfgs, map { "dgit.default.$_" } @realkeys;
776 my (@cfgs) = access_cfg_cfgs(@keys);
777 my $value = cfg(@cfgs);
781 sub access_cfg_bool ($$) {
782 my ($def, @keys) = @_;
783 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
786 sub string_to_ssh ($) {
788 if ($spec =~ m/\s/) {
789 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
795 sub access_cfg_ssh () {
796 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
797 if (!defined $gitssh) {
800 return string_to_ssh $gitssh;
804 sub access_runeinfo ($) {
806 return ": dgit ".access_basedistro()." $info ;";
809 sub access_someuserhost ($) {
811 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
812 defined($user) && length($user) or
813 $user = access_cfg("$some-user",'username');
814 my $host = access_cfg("$some-host");
815 return length($user) ? "$user\@$host" : $host;
818 sub access_gituserhost () {
819 return access_someuserhost('git');
822 sub access_giturl (;$) {
824 my $url = access_cfg('git-url','RETURN-UNDEF');
827 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
828 return undef unless defined $proto;
831 access_gituserhost().
832 access_cfg('git-path');
834 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
837 return "$url/$package$suffix";
840 sub parsecontrolfh ($$;$) {
841 my ($fh, $desc, $allowsigned) = @_;
842 our $dpkgcontrolhash_noissigned;
845 my %opts = ('name' => $desc);
846 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
847 $c = Dpkg::Control::Hash->new(%opts);
848 $c->parse($fh,$desc) or die "parsing of $desc failed";
849 last if $allowsigned;
850 last if $dpkgcontrolhash_noissigned;
851 my $issigned= $c->get_option('is_pgp_signed');
852 if (!defined $issigned) {
853 $dpkgcontrolhash_noissigned= 1;
854 seek $fh, 0,0 or die "seek $desc: $!";
855 } elsif ($issigned) {
856 fail "control file $desc is (already) PGP-signed. ".
857 " Note that dgit push needs to modify the .dsc and then".
858 " do the signature itself";
867 my ($file, $desc) = @_;
868 my $fh = new IO::Handle;
869 open $fh, '<', $file or die "$file: $!";
870 my $c = parsecontrolfh($fh,$desc);
871 $fh->error and die $!;
877 my ($dctrl,$field) = @_;
878 my $v = $dctrl->{$field};
879 return $v if defined $v;
880 fail "missing field $field in ".$dctrl->get_option('name');
884 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
885 my $p = new IO::Handle;
886 my @cmd = (qw(dpkg-parsechangelog), @_);
887 open $p, '-|', @cmd or die $!;
889 $?=0; $!=0; close $p or failedcmd @cmd;
893 sub commit_getclogp ($) {
894 # Returns the parsed changelog hashref for a particular commit
896 our %commit_getclogp_memo;
897 my $memo = $commit_getclogp_memo{$objid};
898 return $memo if $memo;
900 my $mclog = ".git/dgit/clog-$objid";
901 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
902 "$objid:debian/changelog";
903 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
908 defined $d or fail "getcwd failed: $!";
914 sub archive_query ($) {
916 my $query = access_cfg('archive-query','RETURN-UNDEF');
917 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
920 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
923 sub pool_dsc_subpath ($$) {
924 my ($vsn,$component) = @_; # $package is implict arg
925 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
926 return "/pool/$component/$prefix/$package/".dscfn($vsn);
929 #---------- `ftpmasterapi' archive query method (nascent) ----------
931 sub archive_api_query_cmd ($) {
933 my @cmd = qw(curl -sS);
934 my $url = access_cfg('archive-query-url');
935 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
937 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
938 foreach my $key (split /\:/, $keys) {
939 $key =~ s/\%HOST\%/$host/g;
941 fail "for $url: stat $key: $!" unless $!==ENOENT;
944 fail "config requested specific TLS key but do not know".
945 " how to get curl to use exactly that EE key ($key)";
946 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
947 # # Sadly the above line does not work because of changes
948 # # to gnutls. The real fix for #790093 may involve
949 # # new curl options.
952 # Fixing #790093 properly will involve providing a value
953 # for this on clients.
954 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
955 push @cmd, split / /, $kargs if defined $kargs;
957 push @cmd, $url.$subpath;
963 my ($data, $subpath) = @_;
964 badcfg "ftpmasterapi archive query method takes no data part"
966 my @cmd = archive_api_query_cmd($subpath);
967 my $json = cmdoutput @cmd;
968 return decode_json($json);
971 sub canonicalise_suite_ftpmasterapi () {
972 my ($proto,$data) = @_;
973 my $suites = api_query($data, 'suites');
975 foreach my $entry (@$suites) {
977 my $v = $entry->{$_};
978 defined $v && $v eq $isuite;
980 push @matched, $entry;
982 fail "unknown suite $isuite" unless @matched;
985 @matched==1 or die "multiple matches for suite $isuite\n";
986 $cn = "$matched[0]{codename}";
987 defined $cn or die "suite $isuite info has no codename\n";
988 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
990 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
995 sub archive_query_ftpmasterapi () {
996 my ($proto,$data) = @_;
997 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
999 my $digester = Digest::SHA->new(256);
1000 foreach my $entry (@$info) {
1002 my $vsn = "$entry->{version}";
1003 my ($ok,$msg) = version_check $vsn;
1004 die "bad version: $msg\n" unless $ok;
1005 my $component = "$entry->{component}";
1006 $component =~ m/^$component_re$/ or die "bad component";
1007 my $filename = "$entry->{filename}";
1008 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1009 or die "bad filename";
1010 my $sha256sum = "$entry->{sha256sum}";
1011 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1012 push @rows, [ $vsn, "/pool/$component/$filename",
1013 $digester, $sha256sum ];
1015 die "bad ftpmaster api response: $@\n".Dumper($entry)
1018 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1022 #---------- `madison' archive query method ----------
1024 sub archive_query_madison {
1025 return map { [ @$_[0..1] ] } madison_get_parse(@_);
1028 sub madison_get_parse {
1029 my ($proto,$data) = @_;
1030 die unless $proto eq 'madison';
1031 if (!length $data) {
1032 $data= access_cfg('madison-distro','RETURN-UNDEF');
1033 $data //= access_basedistro();
1035 $rmad{$proto,$data,$package} ||= cmdoutput
1036 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1037 my $rmad = $rmad{$proto,$data,$package};
1040 foreach my $l (split /\n/, $rmad) {
1041 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1042 \s*( [^ \t|]+ )\s* \|
1043 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1044 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1045 $1 eq $package or die "$rmad $package ?";
1052 $component = access_cfg('archive-query-default-component');
1054 $5 eq 'source' or die "$rmad ?";
1055 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1057 return sort { -version_compare($a->[0],$b->[0]); } @out;
1060 sub canonicalise_suite_madison {
1061 # madison canonicalises for us
1062 my @r = madison_get_parse(@_);
1064 "unable to canonicalise suite using package $package".
1065 " which does not appear to exist in suite $isuite;".
1066 " --existing-package may help";
1070 #---------- `sshpsql' archive query method ----------
1073 my ($data,$runeinfo,$sql) = @_;
1074 if (!length $data) {
1075 $data= access_someuserhost('sshpsql').':'.
1076 access_cfg('sshpsql-dbname');
1078 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1079 my ($userhost,$dbname) = ($`,$'); #';
1081 my @cmd = (access_cfg_ssh, $userhost,
1082 access_runeinfo("ssh-psql $runeinfo").
1083 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1084 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1086 open P, "-|", @cmd or die $!;
1089 printdebug(">|$_|\n");
1092 $!=0; $?=0; close P or failedcmd @cmd;
1094 my $nrows = pop @rows;
1095 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1096 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1097 @rows = map { [ split /\|/, $_ ] } @rows;
1098 my $ncols = scalar @{ shift @rows };
1099 die if grep { scalar @$_ != $ncols } @rows;
1103 sub sql_injection_check {
1104 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1107 sub archive_query_sshpsql ($$) {
1108 my ($proto,$data) = @_;
1109 sql_injection_check $isuite, $package;
1110 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1111 SELECT source.version, component.name, files.filename, files.sha256sum
1113 JOIN src_associations ON source.id = src_associations.source
1114 JOIN suite ON suite.id = src_associations.suite
1115 JOIN dsc_files ON dsc_files.source = source.id
1116 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1117 JOIN component ON component.id = files_archive_map.component_id
1118 JOIN files ON files.id = dsc_files.file
1119 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1120 AND source.source='$package'
1121 AND files.filename LIKE '%.dsc';
1123 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1124 my $digester = Digest::SHA->new(256);
1126 my ($vsn,$component,$filename,$sha256sum) = @$_;
1127 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1132 sub canonicalise_suite_sshpsql ($$) {
1133 my ($proto,$data) = @_;
1134 sql_injection_check $isuite;
1135 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1136 SELECT suite.codename
1137 FROM suite where suite_name='$isuite' or codename='$isuite';
1139 @rows = map { $_->[0] } @rows;
1140 fail "unknown suite $isuite" unless @rows;
1141 die "ambiguous $isuite: @rows ?" if @rows>1;
1145 #---------- `dummycat' archive query method ----------
1147 sub canonicalise_suite_dummycat ($$) {
1148 my ($proto,$data) = @_;
1149 my $dpath = "$data/suite.$isuite";
1150 if (!open C, "<", $dpath) {
1151 $!==ENOENT or die "$dpath: $!";
1152 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1156 chomp or die "$dpath: $!";
1158 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1162 sub archive_query_dummycat ($$) {
1163 my ($proto,$data) = @_;
1164 canonicalise_suite();
1165 my $dpath = "$data/package.$csuite.$package";
1166 if (!open C, "<", $dpath) {
1167 $!==ENOENT or die "$dpath: $!";
1168 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1176 printdebug "dummycat query $csuite $package $dpath | $_\n";
1177 my @row = split /\s+/, $_;
1178 @row==2 or die "$dpath: $_ ?";
1181 C->error and die "$dpath: $!";
1183 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1186 #---------- tag format handling ----------
1188 sub access_cfg_tagformats () {
1189 split /\,/, access_cfg('dgit-tag-format');
1192 sub need_tagformat ($$) {
1193 my ($fmt, $why) = @_;
1194 fail "need to use tag format $fmt ($why) but also need".
1195 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1196 " - no way to proceed"
1197 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1198 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1201 sub select_tagformat () {
1203 return if $tagformatfn && !$tagformat_want;
1204 die 'bug' if $tagformatfn && $tagformat_want;
1205 # ... $tagformat_want assigned after previous select_tagformat
1207 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1208 printdebug "select_tagformat supported @supported\n";
1210 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1211 printdebug "select_tagformat specified @$tagformat_want\n";
1213 my ($fmt,$why,$override) = @$tagformat_want;
1215 fail "target distro supports tag formats @supported".
1216 " but have to use $fmt ($why)"
1218 or grep { $_ eq $fmt } @supported;
1220 $tagformat_want = undef;
1222 $tagformatfn = ${*::}{"debiantag_$fmt"};
1224 fail "trying to use unknown tag format \`$fmt' ($why) !"
1225 unless $tagformatfn;
1228 #---------- archive query entrypoints and rest of program ----------
1230 sub canonicalise_suite () {
1231 return if defined $csuite;
1232 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1233 $csuite = archive_query('canonicalise_suite');
1234 if ($isuite ne $csuite) {
1235 progress "canonical suite name for $isuite is $csuite";
1239 sub get_archive_dsc () {
1240 canonicalise_suite();
1241 my @vsns = archive_query('archive_query');
1242 foreach my $vinfo (@vsns) {
1243 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1244 $dscurl = access_cfg('mirror').$subpath;
1245 $dscdata = url_get($dscurl);
1247 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1252 $digester->add($dscdata);
1253 my $got = $digester->hexdigest();
1255 fail "$dscurl has hash $got but".
1256 " archive told us to expect $digest";
1258 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1259 printdebug Dumper($dscdata) if $debuglevel>1;
1260 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1261 printdebug Dumper($dsc) if $debuglevel>1;
1262 my $fmt = getfield $dsc, 'Format';
1263 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
1264 $dsc_checked = !!$digester;
1265 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1269 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1272 sub check_for_git ();
1273 sub check_for_git () {
1275 my $how = access_cfg('git-check');
1276 if ($how eq 'ssh-cmd') {
1278 (access_cfg_ssh, access_gituserhost(),
1279 access_runeinfo("git-check $package").
1280 " set -e; cd ".access_cfg('git-path').";".
1281 " if test -d $package.git; then echo 1; else echo 0; fi");
1282 my $r= cmdoutput @cmd;
1283 if (defined $r and $r =~ m/^divert (\w+)$/) {
1285 my ($usedistro,) = access_distros();
1286 # NB that if we are pushing, $usedistro will be $distro/push
1287 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1288 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1289 progress "diverting to $divert (using config for $instead_distro)";
1290 return check_for_git();
1292 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1294 } elsif ($how eq 'url') {
1295 my $prefix = access_cfg('git-check-url','git-url');
1296 my $suffix = access_cfg('git-check-suffix','git-suffix',
1297 'RETURN-UNDEF') // '.git';
1298 my $url = "$prefix/$package$suffix";
1299 my @cmd = (qw(curl -sS -I), $url);
1300 my $result = cmdoutput @cmd;
1301 $result =~ s/^\S+ 200 .*\n\r?\n//;
1302 # curl -sS -I with https_proxy prints
1303 # HTTP/1.0 200 Connection established
1304 $result =~ m/^\S+ (404|200) /s or
1305 fail "unexpected results from git check query - ".
1306 Dumper($prefix, $result);
1308 if ($code eq '404') {
1310 } elsif ($code eq '200') {
1315 } elsif ($how eq 'true') {
1317 } elsif ($how eq 'false') {
1320 badcfg "unknown git-check \`$how'";
1324 sub create_remote_git_repo () {
1325 my $how = access_cfg('git-create');
1326 if ($how eq 'ssh-cmd') {
1328 (access_cfg_ssh, access_gituserhost(),
1329 access_runeinfo("git-create $package").
1330 "set -e; cd ".access_cfg('git-path').";".
1331 " cp -a _template $package.git");
1332 } elsif ($how eq 'true') {
1335 badcfg "unknown git-create \`$how'";
1339 our ($dsc_hash,$lastpush_mergeinput);
1341 our $ud = '.git/dgit/unpack';
1351 sub mktree_in_ud_here () {
1352 runcmd qw(git init -q);
1353 runcmd qw(git config gc.auto 0);
1354 rmtree('.git/objects');
1355 symlink '../../../../objects','.git/objects' or die $!;
1358 sub git_write_tree () {
1359 my $tree = cmdoutput @git, qw(write-tree);
1360 $tree =~ m/^\w+$/ or die "$tree ?";
1364 sub remove_stray_gits () {
1365 my @gitscmd = qw(find -name .git -prune -print0);
1366 debugcmd "|",@gitscmd;
1367 open GITS, "-|", @gitscmd or die $!;
1372 print STDERR "$us: warning: removing from source package: ",
1373 (messagequote $_), "\n";
1377 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1380 sub mktree_in_ud_from_only_subdir (;$) {
1383 # changes into the subdir
1385 die "expected one subdir but found @dirs ?" unless @dirs==1;
1386 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1390 remove_stray_gits();
1391 mktree_in_ud_here();
1393 my ($format, $fopts) = get_source_format();
1394 if (madformat($format)) {
1399 runcmd @git, qw(add -Af);
1400 my $tree=git_write_tree();
1401 return ($tree,$dir);
1404 sub dsc_files_info () {
1405 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1406 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1407 ['Files', 'Digest::MD5', 'new()']) {
1408 my ($fname, $module, $method) = @$csumi;
1409 my $field = $dsc->{$fname};
1410 next unless defined $field;
1411 eval "use $module; 1;" or die $@;
1413 foreach (split /\n/, $field) {
1415 m/^(\w+) (\d+) (\S+)$/ or
1416 fail "could not parse .dsc $fname line \`$_'";
1417 my $digester = eval "$module"."->$method;" or die $@;
1422 Digester => $digester,
1427 fail "missing any supported Checksums-* or Files field in ".
1428 $dsc->get_option('name');
1432 map { $_->{Filename} } dsc_files_info();
1435 sub is_orig_file_in_dsc ($$) {
1436 my ($f, $dsc_files_info) = @_;
1437 return 0 if @$dsc_files_info <= 1;
1438 # One file means no origs, and the filename doesn't have a "what
1439 # part of dsc" component. (Consider versions ending `.orig'.)
1440 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1444 sub is_orig_file_of_vsn ($$) {
1445 my ($f, $upstreamvsn) = @_;
1446 my $base = srcfn $upstreamvsn, '';
1447 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1451 sub make_commit ($) {
1453 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1456 sub make_commit_text ($) {
1459 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1461 print Dumper($text) if $debuglevel > 1;
1462 my $child = open2($out, $in, @cmd) or die $!;
1465 print $in $text or die $!;
1466 close $in or die $!;
1468 $h =~ m/^\w+$/ or die;
1470 printdebug "=> $h\n";
1473 waitpid $child, 0 == $child or die "$child $!";
1474 $? and failedcmd @cmd;
1478 sub clogp_authline ($) {
1480 my $author = getfield $clogp, 'Maintainer';
1481 $author =~ s#,.*##ms;
1482 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1483 my $authline = "$author $date";
1484 $authline =~ m/$git_authline_re/o or
1485 fail "unexpected commit author line format \`$authline'".
1486 " (was generated from changelog Maintainer field)";
1487 return ($1,$2,$3) if wantarray;
1491 sub vendor_patches_distro ($$) {
1492 my ($checkdistro, $what) = @_;
1493 return unless defined $checkdistro;
1495 my $series = "debian/patches/\L$checkdistro\E.series";
1496 printdebug "checking for vendor-specific $series ($what)\n";
1498 if (!open SERIES, "<", $series) {
1499 die "$series $!" unless $!==ENOENT;
1508 Unfortunately, this source package uses a feature of dpkg-source where
1509 the same source package unpacks to different source code on different
1510 distros. dgit cannot safely operate on such packages on affected
1511 distros, because the meaning of source packages is not stable.
1513 Please ask the distro/maintainer to remove the distro-specific series
1514 files and use a different technique (if necessary, uploading actually
1515 different packages, if different distros are supposed to have
1519 fail "Found active distro-specific series file for".
1520 " $checkdistro ($what): $series, cannot continue";
1522 die "$series $!" if SERIES->error;
1526 sub check_for_vendor_patches () {
1527 # This dpkg-source feature doesn't seem to be documented anywhere!
1528 # But it can be found in the changelog (reformatted):
1530 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1531 # Author: Raphael Hertzog <hertzog@debian.org>
1532 # Date: Sun Oct 3 09:36:48 2010 +0200
1534 # dpkg-source: correctly create .pc/.quilt_series with alternate
1537 # If you have debian/patches/ubuntu.series and you were
1538 # unpacking the source package on ubuntu, quilt was still
1539 # directed to debian/patches/series instead of
1540 # debian/patches/ubuntu.series.
1542 # debian/changelog | 3 +++
1543 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1544 # 2 files changed, 6 insertions(+), 1 deletion(-)
1547 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1548 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1549 "Dpkg::Vendor \`current vendor'");
1550 vendor_patches_distro(access_basedistro(),
1551 "distro being accessed");
1554 sub generate_commits_from_dsc () {
1555 # See big comment in fetch_from_archive, below.
1559 my @dfi = dsc_files_info();
1560 foreach my $fi (@dfi) {
1561 my $f = $fi->{Filename};
1562 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1564 link_ltarget "../../../$f", $f
1568 complete_file_from_dsc('.', $fi)
1571 if (is_orig_file_in_dsc($f, \@dfi)) {
1572 link $f, "../../../../$f"
1578 # We unpack and record the orig tarballs first, so that we only
1579 # need disk space for one private copy of the unpacked source.
1580 # But we can't make them into commits until we have the metadata
1581 # from the debian/changelog, so we record the tree objects now and
1582 # make them into commits later.
1584 my $upstreamv = $dsc->{version};
1585 $upstreamv =~ s/-[^-]+$//;
1586 my $orig_f_base = srcfn $upstreamv, '';
1588 foreach my $fi (@dfi) {
1589 # We actually import, and record as a commit, every tarball
1590 # (unless there is only one file, in which case there seems
1593 my $f = $fi->{Filename};
1594 printdebug "import considering $f ";
1595 (printdebug "only one dfi\n"), next if @dfi == 1;
1596 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1597 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1601 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1603 printdebug "Y ", (join ' ', map { $_//"(none)" }
1604 $compr_ext, $orig_f_part
1607 my $input = new IO::File $f, '<' or die "$f $!";
1611 if (defined $compr_ext) {
1613 Dpkg::Compression::compression_guess_from_filename $f;
1614 fail "Dpkg::Compression cannot handle file $f in source package"
1615 if defined $compr_ext && !defined $cname;
1617 new Dpkg::Compression::Process compression => $cname;
1618 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1619 my $compr_fh = new IO::Handle;
1620 my $compr_pid = open $compr_fh, "-|" // die $!;
1622 open STDIN, "<&", $input or die $!;
1624 die "dgit (child): exec $compr_cmd[0]: $!\n";
1629 rmtree "../unpack-tar";
1630 mkdir "../unpack-tar" or die $!;
1631 my @tarcmd = qw(tar -x -f -
1632 --no-same-owner --no-same-permissions
1633 --no-acls --no-xattrs --no-selinux);
1634 my $tar_pid = fork // die $!;
1636 chdir "../unpack-tar" or die $!;
1637 open STDIN, "<&", $input or die $!;
1639 die "dgit (child): exec $tarcmd[0]: $!";
1641 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1642 !$? or failedcmd @tarcmd;
1645 (@compr_cmd ? failedcmd @compr_cmd
1647 # finally, we have the results in "tarball", but maybe
1648 # with the wrong permissions
1650 runcmd qw(chmod -R +rwX ../unpack-tar);
1651 changedir "../unpack-tar";
1652 my ($tree) = mktree_in_ud_from_only_subdir(1);
1653 changedir "../../unpack";
1654 rmtree "../unpack-tar";
1656 my $ent = [ $f, $tree ];
1658 Orig => !!$orig_f_part,
1659 Sort => (!$orig_f_part ? 2 :
1660 $orig_f_part =~ m/-/g ? 1 :
1668 # put any without "_" first (spec is not clear whether files
1669 # are always in the usual order). Tarballs without "_" are
1670 # the main orig or the debian tarball.
1671 $a->{Sort} <=> $b->{Sort} or
1675 my $any_orig = grep { $_->{Orig} } @tartrees;
1677 my $dscfn = "$package.dsc";
1679 my $treeimporthow = 'package';
1681 open D, ">", $dscfn or die "$dscfn: $!";
1682 print D $dscdata or die "$dscfn: $!";
1683 close D or die "$dscfn: $!";
1684 my @cmd = qw(dpkg-source);
1685 push @cmd, '--no-check' if $dsc_checked;
1686 if (madformat $dsc->{format}) {
1687 push @cmd, '--skip-patches';
1688 $treeimporthow = 'unpatched';
1690 push @cmd, qw(-x --), $dscfn;
1693 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1694 if (madformat $dsc->{format}) {
1695 check_for_vendor_patches();
1699 if (madformat $dsc->{format}) {
1700 my @pcmd = qw(dpkg-source --before-build .);
1701 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1703 runcmd @git, qw(add -Af);
1704 $dappliedtree = git_write_tree();
1707 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1708 debugcmd "|",@clogcmd;
1709 open CLOGS, "-|", @clogcmd or die $!;
1714 printdebug "import clog search...\n";
1717 my $stanzatext = do { local $/=""; <CLOGS>; };
1718 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1719 last if !defined $stanzatext;
1721 my $desc = "package changelog, entry no.$.";
1722 open my $stanzafh, "<", \$stanzatext or die;
1723 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1724 $clogp //= $thisstanza;
1726 printdebug "import clog $thisstanza->{version} $desc...\n";
1728 last if !$any_orig; # we don't need $r1clogp
1730 # We look for the first (most recent) changelog entry whose
1731 # version number is lower than the upstream version of this
1732 # package. Then the last (least recent) previous changelog
1733 # entry is treated as the one which introduced this upstream
1734 # version and used for the synthetic commits for the upstream
1737 # One might think that a more sophisticated algorithm would be
1738 # necessary. But: we do not want to scan the whole changelog
1739 # file. Stopping when we see an earlier version, which
1740 # necessarily then is an earlier upstream version, is the only
1741 # realistic way to do that. Then, either the earliest
1742 # changelog entry we have seen so far is indeed the earliest
1743 # upload of this upstream version; or there are only changelog
1744 # entries relating to later upstream versions (which is not
1745 # possible unless the changelog and .dsc disagree about the
1746 # version). Then it remains to choose between the physically
1747 # last entry in the file, and the one with the lowest version
1748 # number. If these are not the same, we guess that the
1749 # versions were created in a non-monotic order rather than
1750 # that the changelog entries have been misordered.
1752 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
1754 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
1755 $r1clogp = $thisstanza;
1757 printdebug "import clog $r1clogp->{version} becomes r1\n";
1759 die $! if CLOGS->error;
1760 close CLOGS or $?==(SIGPIPE<<8) or failedcmd @clogcmd;
1762 $clogp or fail "package changelog has no entries!";
1764 my $authline = clogp_authline $clogp;
1765 my $changes = getfield $clogp, 'Changes';
1766 my $cversion = getfield $clogp, 'Version';
1769 $r1clogp //= $clogp; # maybe there's only one entry;
1770 my $r1authline = clogp_authline $r1clogp;
1771 # Strictly, r1authline might now be wrong if it's going to be
1772 # unused because !$any_orig. Whatever.
1774 printdebug "import tartrees authline $authline\n";
1775 printdebug "import tartrees r1authline $r1authline\n";
1777 foreach my $tt (@tartrees) {
1778 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
1780 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
1783 committer $r1authline
1787 [dgit import orig $tt->{F}]
1795 [dgit import tarball $package $cversion $tt->{F}]
1800 printdebug "import main commit\n";
1802 open C, ">../commit.tmp" or die $!;
1803 print C <<END or die $!;
1806 print C <<END or die $! foreach @tartrees;
1809 print C <<END or die $!;
1815 [dgit import $treeimporthow $package $cversion]
1819 my $rawimport_hash = make_commit qw(../commit.tmp);
1821 if (madformat $dsc->{format}) {
1822 printdebug "import apply patches...\n";
1824 # regularise the state of the working tree so that
1825 # the checkout of $rawimport_hash works nicely.
1826 my $dappliedcommit = make_commit_text(<<END);
1833 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
1835 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
1837 # We need the answers to be reproducible
1838 my @authline = clogp_authline($clogp);
1839 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
1840 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
1841 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
1842 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
1843 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
1844 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
1847 runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
1848 @gbp, qw(pq import);
1851 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
1855 my $gapplied = git_rev_parse('HEAD');
1856 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
1857 $gappliedtree eq $dappliedtree or
1859 gbp-pq import and dpkg-source disagree!
1860 gbp-pq import gave commit $gapplied
1861 gbp-pq import gave tree $gappliedtree
1862 dpkg-source --before-build gave tree $dappliedtree
1864 $rawimport_hash = $gapplied;
1867 progress "synthesised git commit from .dsc $cversion";
1869 my $rawimport_mergeinput = {
1870 Commit => $rawimport_hash,
1871 Info => "Import of source package",
1873 my @output = ($rawimport_mergeinput);
1875 if ($lastpush_mergeinput) {
1876 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
1877 my $oversion = getfield $oldclogp, 'Version';
1879 version_compare($oversion, $cversion);
1881 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
1882 { Message => <<END, ReverseParents => 1 });
1883 Record $package ($cversion) in archive suite $csuite
1885 } elsif ($vcmp > 0) {
1886 print STDERR <<END or die $!;
1888 Version actually in archive: $cversion (older)
1889 Last version pushed with dgit: $oversion (newer or same)
1892 @output = $lastpush_mergeinput;
1894 # Same version. Use what's in the server git branch,
1895 # discarding our own import. (This could happen if the
1896 # server automatically imports all packages into git.)
1897 @output = $lastpush_mergeinput;
1900 changedir '../../../..';
1905 sub complete_file_from_dsc ($$) {
1906 our ($dstdir, $fi) = @_;
1907 # Ensures that we have, in $dir, the file $fi, with the correct
1908 # contents. (Downloading it from alongside $dscurl if necessary.)
1910 my $f = $fi->{Filename};
1911 my $tf = "$dstdir/$f";
1914 if (stat_exists $tf) {
1915 progress "using existing $f";
1918 $furl =~ s{/[^/]+$}{};
1920 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
1921 die "$f ?" if $f =~ m#/#;
1922 runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
1923 return 0 if !act_local();
1927 open F, "<", "$tf" or die "$tf: $!";
1928 $fi->{Digester}->reset();
1929 $fi->{Digester}->addfile(*F);
1930 F->error and die $!;
1931 my $got = $fi->{Digester}->hexdigest();
1932 $got eq $fi->{Hash} or
1933 fail "file $f has hash $got but .dsc".
1934 " demands hash $fi->{Hash} ".
1935 ($downloaded ? "(got wrong file from archive!)"
1936 : "(perhaps you should delete this file?)");
1941 sub ensure_we_have_orig () {
1942 my @dfi = dsc_files_info();
1943 foreach my $fi (@dfi) {
1944 my $f = $fi->{Filename};
1945 next unless is_orig_file_in_dsc($f, \@dfi);
1946 complete_file_from_dsc('..', $fi)
1951 sub git_fetch_us () {
1952 # Want to fetch only what we are going to use, unless
1953 # deliberately-not-ff, in which case we must fetch everything.
1955 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
1957 (quiltmode_splitbrain
1958 ? (map { $_->('*',access_basedistro) }
1959 \&debiantag_new, \&debiantag_maintview)
1960 : debiantags('*',access_basedistro));
1961 push @specs, server_branch($csuite);
1962 push @specs, qw(heads/*) if deliberately_not_fast_forward;
1964 # This is rather miserable:
1965 # When git-fetch --prune is passed a fetchspec ending with a *,
1966 # it does a plausible thing. If there is no * then:
1967 # - it matches subpaths too, even if the supplied refspec
1968 # starts refs, and behaves completely madly if the source
1969 # has refs/refs/something. (See, for example, Debian #NNNN.)
1970 # - if there is no matching remote ref, it bombs out the whole
1972 # We want to fetch a fixed ref, and we don't know in advance
1973 # if it exists, so this is not suitable.
1975 # Our workaround is to use git-ls-remote. git-ls-remote has its
1976 # own qairks. Notably, it has the absurd multi-tail-matching
1977 # behaviour: git-ls-remote R refs/foo can report refs/foo AND
1978 # refs/refs/foo etc.
1980 # Also, we want an idempotent snapshot, but we have to make two
1981 # calls to the remote: one to git-ls-remote and to git-fetch. The
1982 # solution is use git-ls-remote to obtain a target state, and
1983 # git-fetch to try to generate it. If we don't manage to generate
1984 # the target state, we try again.
1986 my $specre = join '|', map {
1992 printdebug "git_fetch_us specre=$specre\n";
1993 my $wanted_rref = sub {
1995 return m/^(?:$specre)$/o;
1998 my $fetch_iteration = 0;
2001 if (++$fetch_iteration > 10) {
2002 fail "too many iterations trying to get sane fetch!";
2005 my @look = map { "refs/$_" } @specs;
2006 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2010 open GITLS, "-|", @lcmd or die $!;
2012 printdebug "=> ", $_;
2013 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2014 my ($objid,$rrefname) = ($1,$2);
2015 if (!$wanted_rref->($rrefname)) {
2017 warning: git-ls-remote @look reported $rrefname; this is silly, ignoring it.
2021 $wantr{$rrefname} = $objid;
2024 close GITLS or failedcmd @lcmd;
2026 # OK, now %want is exactly what we want for refs in @specs
2028 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2029 "+refs/$_:".lrfetchrefs."/$_";
2032 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2033 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2036 %lrfetchrefs_f = ();
2039 git_for_each_ref(lrfetchrefs, sub {
2040 my ($objid,$objtype,$lrefname,$reftail) = @_;
2041 $lrfetchrefs_f{$lrefname} = $objid;
2042 $objgot{$objid} = 1;
2045 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2046 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2047 if (!exists $wantr{$rrefname}) {
2048 if ($wanted_rref->($rrefname)) {
2050 git-fetch @fspecs created $lrefname which git-ls-remote @look didn't list.
2054 warning: git-fetch @fspecs created $lrefname; this is silly, deleting it.
2057 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2058 delete $lrfetchrefs_f{$lrefname};
2062 foreach my $rrefname (sort keys %wantr) {
2063 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2064 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2065 my $want = $wantr{$rrefname};
2066 next if $got eq $want;
2067 if (!defined $objgot{$want}) {
2069 warning: git-ls-remote suggests we want $lrefname
2070 warning: and it should refer to $want
2071 warning: but git-fetch didn't fetch that object to any relevant ref.
2072 warning: This may be due to a race with someone updating the server.
2073 warning: Will try again...
2075 next FETCH_ITERATION;
2078 git-fetch @fspecs made $lrefname=$got but want git-ls-remote @look says $want
2080 runcmd_ordryrun_local @git, qw(update-ref -m),
2081 "dgit fetch git-fetch fixup", $lrefname, $want;
2082 $lrfetchrefs_f{$lrefname} = $want;
2086 printdebug "git_fetch_us: git-fetch --no-insane emulation complete\n",
2087 Dumper(\%lrfetchrefs_f);
2090 my @tagpats = debiantags('*',access_basedistro);
2092 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2093 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2094 printdebug "currently $fullrefname=$objid\n";
2095 $here{$fullrefname} = $objid;
2097 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2098 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2099 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2100 printdebug "offered $lref=$objid\n";
2101 if (!defined $here{$lref}) {
2102 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2103 runcmd_ordryrun_local @upd;
2104 lrfetchref_used $fullrefname;
2105 } elsif ($here{$lref} eq $objid) {
2106 lrfetchref_used $fullrefname;
2109 "Not updateting $lref from $here{$lref} to $objid.\n";
2114 sub mergeinfo_getclogp ($) {
2115 # Ensures thit $mi->{Clogp} exists and returns it
2117 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2120 sub mergeinfo_version ($) {
2121 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2124 sub fetch_from_archive () {
2125 # Ensures that lrref() is what is actually in the archive, one way
2126 # or another, according to us - ie this client's
2127 # appropritaely-updated archive view. Also returns the commit id.
2128 # If there is nothing in the archive, leaves lrref alone and
2129 # returns undef. git_fetch_us must have already been called.
2133 foreach my $field (@ourdscfield) {
2134 $dsc_hash = $dsc->{$field};
2135 last if defined $dsc_hash;
2137 if (defined $dsc_hash) {
2138 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2140 progress "last upload to archive specified git hash";
2142 progress "last upload to archive has NO git hash";
2145 progress "no version available from the archive";
2148 # If the archive's .dsc has a Dgit field, there are three
2149 # relevant git commitids we need to choose between and/or merge
2151 # 1. $dsc_hash: the Dgit field from the archive
2152 # 2. $lastpush_hash: the suite branch on the dgit git server
2153 # 3. $lastfetch_hash: our local tracking brach for the suite
2155 # These may all be distinct and need not be in any fast forward
2158 # If the dsc was pushed to this suite, then the server suite
2159 # branch will have been updated; but it might have been pushed to
2160 # a different suite and copied by the archive. Conversely a more
2161 # recent version may have been pushed with dgit but not appeared
2162 # in the archive (yet).
2164 # $lastfetch_hash may be awkward because archive imports
2165 # (particularly, imports of Dgit-less .dscs) are performed only as
2166 # needed on individual clients, so different clients may perform a
2167 # different subset of them - and these imports are only made
2168 # public during push. So $lastfetch_hash may represent a set of
2169 # imports different to a subsequent upload by a different dgit
2172 # Our approach is as follows:
2174 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2175 # descendant of $dsc_hash, then it was pushed by a dgit user who
2176 # had based their work on $dsc_hash, so we should prefer it.
2177 # Otherwise, $dsc_hash was installed into this suite in the
2178 # archive other than by a dgit push, and (necessarily) after the
2179 # last dgit push into that suite (since a dgit push would have
2180 # been descended from the dgit server git branch); thus, in that
2181 # case, we prefer the archive's version (and produce a
2182 # pseudo-merge to overwrite the dgit server git branch).
2184 # (If there is no Dgit field in the archive's .dsc then
2185 # generate_commit_from_dsc uses the version numbers to decide
2186 # whether the suite branch or the archive is newer. If the suite
2187 # branch is newer it ignores the archive's .dsc; otherwise it
2188 # generates an import of the .dsc, and produces a pseudo-merge to
2189 # overwrite the suite branch with the archive contents.)
2191 # The outcome of that part of the algorithm is the `public view',
2192 # and is same for all dgit clients: it does not depend on any
2193 # unpublished history in the local tracking branch.
2195 # As between the public view and the local tracking branch: The
2196 # local tracking branch is only updated by dgit fetch, and
2197 # whenever dgit fetch runs it includes the public view in the
2198 # local tracking branch. Therefore if the public view is not
2199 # descended from the local tracking branch, the local tracking
2200 # branch must contain history which was imported from the archive
2201 # but never pushed; and, its tip is now out of date. So, we make
2202 # a pseudo-merge to overwrite the old imports and stitch the old
2205 # Finally: we do not necessarily reify the public view (as
2206 # described above). This is so that we do not end up stacking two
2207 # pseudo-merges. So what we actually do is figure out the inputs
2208 # to any public view pseudo-merge and put them in @mergeinputs.
2211 # $mergeinputs[]{Commit}
2212 # $mergeinputs[]{Info}
2213 # $mergeinputs[0] is the one whose tree we use
2214 # @mergeinputs is in the order we use in the actual commit)
2217 # $mergeinputs[]{Message} is a commit message to use
2218 # $mergeinputs[]{ReverseParents} if def specifies that parent
2219 # list should be in opposite order
2220 # Such an entry has no Commit or Info. It applies only when found
2221 # in the last entry. (This ugliness is to support making
2222 # identical imports to previous dgit versions.)
2224 my $lastpush_hash = git_get_ref(lrfetchref());
2225 printdebug "previous reference hash=$lastpush_hash\n";
2226 $lastpush_mergeinput = $lastpush_hash && {
2227 Commit => $lastpush_hash,
2228 Info => "dgit suite branch on dgit git server",
2231 my $lastfetch_hash = git_get_ref(lrref());
2232 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2233 my $lastfetch_mergeinput = $lastfetch_hash && {
2234 Commit => $lastfetch_hash,
2235 Info => "dgit client's archive history view",
2238 my $dsc_mergeinput = $dsc_hash && {
2239 Commit => $dsc_hash,
2240 Info => "Dgit field in .dsc from archive",
2244 my $del_lrfetchrefs = sub {
2247 printdebug "del_lrfetchrefs...\n";
2248 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2249 my $objid = $lrfetchrefs_d{$fullrefname};
2250 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2252 $gur ||= new IO::Handle;
2253 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2255 printf $gur "delete %s %s\n", $fullrefname, $objid;
2258 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2262 if (defined $dsc_hash) {
2263 fail "missing remote git history even though dsc has hash -".
2264 " could not find ref ".rref()." at ".access_giturl()
2265 unless $lastpush_hash;
2266 ensure_we_have_orig();
2267 if ($dsc_hash eq $lastpush_hash) {
2268 @mergeinputs = $dsc_mergeinput
2269 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2270 print STDERR <<END or die $!;
2272 Git commit in archive is behind the last version allegedly pushed/uploaded.
2273 Commit referred to by archive: $dsc_hash
2274 Last version pushed with dgit: $lastpush_hash
2277 @mergeinputs = ($lastpush_mergeinput);
2279 # Archive has .dsc which is not a descendant of the last dgit
2280 # push. This can happen if the archive moves .dscs about.
2281 # Just follow its lead.
2282 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2283 progress "archive .dsc names newer git commit";
2284 @mergeinputs = ($dsc_mergeinput);
2286 progress "archive .dsc names other git commit, fixing up";
2287 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2291 @mergeinputs = generate_commits_from_dsc();
2292 # We have just done an import. Now, our import algorithm might
2293 # have been improved. But even so we do not want to generate
2294 # a new different import of the same package. So if the
2295 # version numbers are the same, just use our existing version.
2296 # If the version numbers are different, the archive has changed
2297 # (perhaps, rewound).
2298 if ($lastfetch_mergeinput &&
2299 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2300 (mergeinfo_version $mergeinputs[0]) )) {
2301 @mergeinputs = ($lastfetch_mergeinput);
2303 } elsif ($lastpush_hash) {
2304 # only in git, not in the archive yet
2305 @mergeinputs = ($lastpush_mergeinput);
2306 print STDERR <<END or die $!;
2308 Package not found in the archive, but has allegedly been pushed using dgit.
2312 printdebug "nothing found!\n";
2313 if (defined $skew_warning_vsn) {
2314 print STDERR <<END or die $!;
2316 Warning: relevant archive skew detected.
2317 Archive allegedly contains $skew_warning_vsn
2318 But we were not able to obtain any version from the archive or git.
2322 unshift @end, $del_lrfetchrefs;
2326 if ($lastfetch_hash &&
2328 my $h = $_->{Commit};
2329 $h and is_fast_fwd($lastfetch_hash, $h);
2330 # If true, one of the existing parents of this commit
2331 # is a descendant of the $lastfetch_hash, so we'll
2332 # be ff from that automatically.
2336 push @mergeinputs, $lastfetch_mergeinput;
2339 printdebug "fetch mergeinfos:\n";
2340 foreach my $mi (@mergeinputs) {
2342 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2344 printdebug sprintf " ReverseParents=%d Message=%s",
2345 $mi->{ReverseParents}, $mi->{Message};
2349 my $compat_info= pop @mergeinputs
2350 if $mergeinputs[$#mergeinputs]{Message};
2352 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2355 if (@mergeinputs > 1) {
2357 my $tree_commit = $mergeinputs[0]{Commit};
2359 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2360 $tree =~ m/\n\n/; $tree = $`;
2361 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2364 # We use the changelog author of the package in question the
2365 # author of this pseudo-merge. This is (roughly) correct if
2366 # this commit is simply representing aa non-dgit upload.
2367 # (Roughly because it does not record sponsorship - but we
2368 # don't have sponsorship info because that's in the .changes,
2369 # which isn't in the archivw.)
2371 # But, it might be that we are representing archive history
2372 # updates (including in-archive copies). These are not really
2373 # the responsibility of the person who created the .dsc, but
2374 # there is no-one whose name we should better use. (The
2375 # author of the .dsc-named commit is clearly worse.)
2377 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2378 my $author = clogp_authline $useclogp;
2379 my $cversion = getfield $useclogp, 'Version';
2381 my $mcf = ".git/dgit/mergecommit";
2382 open MC, ">", $mcf or die "$mcf $!";
2383 print MC <<END or die $!;
2387 my @parents = grep { $_->{Commit} } @mergeinputs;
2388 @parents = reverse @parents if $compat_info->{ReverseParents};
2389 print MC <<END or die $! foreach @parents;
2393 print MC <<END or die $!;
2399 if (defined $compat_info->{Message}) {
2400 print MC $compat_info->{Message} or die $!;
2402 print MC <<END or die $!;
2403 Record $package ($cversion) in archive suite $csuite
2407 my $message_add_info = sub {
2409 my $mversion = mergeinfo_version $mi;
2410 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2414 $message_add_info->($mergeinputs[0]);
2415 print MC <<END or die $!;
2416 should be treated as descended from
2418 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2422 $hash = make_commit $mcf;
2424 $hash = $mergeinputs[0]{Commit};
2426 printdebug "fetch hash=$hash\n";
2429 my ($lasth, $what) = @_;
2430 return unless $lasth;
2431 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2434 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2435 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2437 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2438 'DGIT_ARCHIVE', $hash;
2439 cmdoutput @git, qw(log -n2), $hash;
2440 # ... gives git a chance to complain if our commit is malformed
2442 if (defined $skew_warning_vsn) {
2444 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2445 my $gotclogp = commit_getclogp($hash);
2446 my $got_vsn = getfield $gotclogp, 'Version';
2447 printdebug "SKEW CHECK GOT $got_vsn\n";
2448 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2449 print STDERR <<END or die $!;
2451 Warning: archive skew detected. Using the available version:
2452 Archive allegedly contains $skew_warning_vsn
2453 We were able to obtain only $got_vsn
2459 if ($lastfetch_hash ne $hash) {
2460 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2464 dryrun_report @upd_cmd;
2468 lrfetchref_used lrfetchref();
2470 unshift @end, $del_lrfetchrefs;
2474 sub set_local_git_config ($$) {
2476 runcmd @git, qw(config), $k, $v;
2479 sub setup_mergechangelogs (;$) {
2481 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2483 my $driver = 'dpkg-mergechangelogs';
2484 my $cb = "merge.$driver";
2485 my $attrs = '.git/info/attributes';
2486 ensuredir '.git/info';
2488 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2489 if (!open ATTRS, "<", $attrs) {
2490 $!==ENOENT or die "$attrs: $!";
2494 next if m{^debian/changelog\s};
2495 print NATTRS $_, "\n" or die $!;
2497 ATTRS->error and die $!;
2500 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2503 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2504 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2506 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2509 sub setup_useremail (;$) {
2511 return unless $always || access_cfg_bool(1, 'setup-useremail');
2514 my ($k, $envvar) = @_;
2515 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2516 return unless defined $v;
2517 set_local_git_config "user.$k", $v;
2520 $setup->('email', 'DEBEMAIL');
2521 $setup->('name', 'DEBFULLNAME');
2524 sub setup_new_tree () {
2525 setup_mergechangelogs();
2531 canonicalise_suite();
2532 badusage "dry run makes no sense with clone" unless act_local();
2533 my $hasgit = check_for_git();
2534 mkdir $dstdir or fail "create \`$dstdir': $!";
2536 runcmd @git, qw(init -q);
2537 my $giturl = access_giturl(1);
2538 if (defined $giturl) {
2539 open H, "> .git/HEAD" or die $!;
2540 print H "ref: ".lref()."\n" or die $!;
2542 runcmd @git, qw(remote add), 'origin', $giturl;
2545 progress "fetching existing git history";
2547 runcmd_ordryrun_local @git, qw(fetch origin);
2549 progress "starting new git history";
2551 fetch_from_archive() or no_such_package;
2552 my $vcsgiturl = $dsc->{'Vcs-Git'};
2553 if (length $vcsgiturl) {
2554 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2555 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2558 runcmd @git, qw(reset --hard), lrref();
2559 printdone "ready for work in $dstdir";
2563 if (check_for_git()) {
2566 fetch_from_archive() or no_such_package();
2567 printdone "fetched into ".lrref();
2572 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2574 printdone "fetched to ".lrref()." and merged into HEAD";
2577 sub check_not_dirty () {
2578 foreach my $f (qw(local-options local-patch-header)) {
2579 if (stat_exists "debian/source/$f") {
2580 fail "git tree contains debian/source/$f";
2584 return if $ignoredirty;
2586 my @cmd = (@git, qw(diff --quiet HEAD));
2588 $!=0; $?=-1; system @cmd;
2591 fail "working tree is dirty (does not match HEAD)";
2597 sub commit_admin ($) {
2600 runcmd_ordryrun_local @git, qw(commit -m), $m;
2603 sub commit_quilty_patch () {
2604 my $output = cmdoutput @git, qw(status --porcelain);
2606 foreach my $l (split /\n/, $output) {
2607 next unless $l =~ m/\S/;
2608 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2612 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2614 progress "nothing quilty to commit, ok.";
2617 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2618 runcmd_ordryrun_local @git, qw(add -f), @adds;
2619 commit_admin "Commit Debian 3.0 (quilt) metadata";
2622 sub get_source_format () {
2624 if (open F, "debian/source/options") {
2628 s/\s+$//; # ignore missing final newline
2630 my ($k, $v) = ($`, $'); #');
2631 $v =~ s/^"(.*)"$/$1/;
2637 F->error and die $!;
2640 die $! unless $!==&ENOENT;
2643 if (!open F, "debian/source/format") {
2644 die $! unless $!==&ENOENT;
2648 F->error and die $!;
2650 return ($_, \%options);
2653 sub madformat_wantfixup ($) {
2655 return 0 unless $format eq '3.0 (quilt)';
2656 our $quilt_mode_warned;
2657 if ($quilt_mode eq 'nocheck') {
2658 progress "Not doing any fixup of \`$format' due to".
2659 " ----no-quilt-fixup or --quilt=nocheck"
2660 unless $quilt_mode_warned++;
2663 progress "Format \`$format', need to check/update patch stack"
2664 unless $quilt_mode_warned++;
2668 # An "infopair" is a tuple [ $thing, $what ]
2669 # (often $thing is a commit hash; $what is a description)
2671 sub infopair_cond_equal ($$) {
2673 $x->[0] eq $y->[0] or fail <<END;
2674 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
2678 sub infopair_lrf_tag_lookup ($$) {
2679 my ($tagnames, $what) = @_;
2680 # $tagname may be an array ref
2681 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
2682 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
2683 foreach my $tagname (@tagnames) {
2684 my $lrefname = lrfetchrefs."/tags/$tagname";
2685 my $tagobj = $lrfetchrefs_f{$lrefname};
2686 next unless defined $tagobj;
2687 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
2688 return [ git_rev_parse($tagobj), $what ];
2690 fail @tagnames==1 ? <<END : <<END;
2691 Wanted tag $what (@tagnames) on dgit server, but not found
2693 Wanted tag $what (one of: @tagnames) on dgit server, but not found
2697 sub infopair_cond_ff ($$) {
2698 my ($anc,$desc) = @_;
2699 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
2700 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
2704 sub pseudomerge_version_check ($$) {
2705 my ($clogp, $archive_hash) = @_;
2707 my $arch_clogp = commit_getclogp $archive_hash;
2708 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
2709 'version currently in archive' ];
2710 if (defined $overwrite_version) {
2711 if (length $overwrite_version) {
2712 infopair_cond_equal([ $overwrite_version,
2713 '--overwrite= version' ],
2716 my $v = $i_arch_v->[0];
2717 progress "Checking package changelog for archive version $v ...";
2719 my @xa = ("-f$v", "-t$v");
2720 my $vclogp = parsechangelog @xa;
2721 my $cv = [ (getfield $vclogp, 'Version'),
2722 "Version field from dpkg-parsechangelog @xa" ];
2723 infopair_cond_equal($i_arch_v, $cv);
2726 $@ =~ s/^dgit: //gm;
2728 "Perhaps debian/changelog does not mention $v ?";
2733 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
2737 sub pseudomerge_make_commit ($$$$ $$) {
2738 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
2739 $msg_cmd, $msg_msg) = @_;
2740 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
2742 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
2743 my $authline = clogp_authline $clogp;
2747 !defined $overwrite_version ? ""
2748 : !length $overwrite_version ? " --overwrite"
2749 : " --overwrite=".$overwrite_version;
2752 my $pmf = ".git/dgit/pseudomerge";
2753 open MC, ">", $pmf or die "$pmf $!";
2754 print MC <<END or die $!;
2757 parent $archive_hash
2767 return make_commit($pmf);
2770 sub splitbrain_pseudomerge ($$$$) {
2771 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
2772 # => $merged_dgitview
2773 printdebug "splitbrain_pseudomerge...\n";
2775 # We: debian/PREVIOUS HEAD($maintview)
2776 # expect: o ----------------- o
2779 # a/d/PREVIOUS $dgitview
2782 # we do: `------------------ o
2786 printdebug "splitbrain_pseudomerge...\n";
2788 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
2790 return $dgitview unless defined $archive_hash;
2792 if (!defined $overwrite_version) {
2793 progress "Checking that HEAD inciudes all changes in archive...";
2796 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
2798 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
2799 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
2800 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
2801 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
2802 my $i_archive = [ $archive_hash, "current archive contents" ];
2804 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
2806 infopair_cond_equal($i_dgit, $i_archive);
2807 infopair_cond_ff($i_dep14, $i_dgit);
2808 $overwrite_version // infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
2810 my $r = pseudomerge_make_commit
2811 $clogp, $dgitview, $archive_hash, $i_arch_v,
2812 "dgit --quilt=$quilt_mode",
2813 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
2814 Declare fast forward from $overwrite_version
2816 Make fast forward from $i_arch_v->[0]
2819 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
2823 sub plain_overwrite_pseudomerge ($$$) {
2824 my ($clogp, $head, $archive_hash) = @_;
2826 printdebug "plain_overwrite_pseudomerge...";
2828 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
2830 my @tagformats = access_cfg_tagformats();
2832 map { $_->($i_arch_v->[0], access_basedistro) }
2833 (grep { m/^(?:old|hist)$/ } @tagformats)
2834 ? \&debiantags : \&debiantag_new;
2835 my $i_overwr = infopair_lrf_tag_lookup \@t_overwr, "previous version tag";
2836 my $i_archive = [ $archive_hash, "current archive contents" ];
2838 infopair_cond_equal($i_overwr, $i_archive);
2840 return $head if is_fast_fwd $archive_hash, $head;
2842 my $m = "Declare fast forward from $i_arch_v->[0]";
2844 my $r = pseudomerge_make_commit
2845 $clogp, $head, $archive_hash, $i_arch_v,
2848 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
2850 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
2854 sub push_parse_changelog ($) {
2857 my $clogp = Dpkg::Control::Hash->new();
2858 $clogp->load($clogpfn) or die;
2860 $package = getfield $clogp, 'Source';
2861 my $cversion = getfield $clogp, 'Version';
2862 my $tag = debiantag($cversion, access_basedistro);
2863 runcmd @git, qw(check-ref-format), $tag;
2865 my $dscfn = dscfn($cversion);
2867 return ($clogp, $cversion, $dscfn);
2870 sub push_parse_dsc ($$$) {
2871 my ($dscfn,$dscfnwhat, $cversion) = @_;
2872 $dsc = parsecontrol($dscfn,$dscfnwhat);
2873 my $dversion = getfield $dsc, 'Version';
2874 my $dscpackage = getfield $dsc, 'Source';
2875 ($dscpackage eq $package && $dversion eq $cversion) or
2876 fail "$dscfn is for $dscpackage $dversion".
2877 " but debian/changelog is for $package $cversion";
2880 sub push_tagwants ($$$$) {
2881 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
2884 TagFn => \&debiantag,
2889 if (defined $maintviewhead) {
2891 TagFn => \&debiantag_maintview,
2892 Objid => $maintviewhead,
2893 TfSuffix => '-maintview',
2897 foreach my $tw (@tagwants) {
2898 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
2899 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
2901 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
2905 sub push_mktags ($$ $$ $) {
2907 $changesfile,$changesfilewhat,
2910 die unless $tagwants->[0]{View} eq 'dgit';
2912 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
2913 $dsc->save("$dscfn.tmp") or die $!;
2915 my $changes = parsecontrol($changesfile,$changesfilewhat);
2916 foreach my $field (qw(Source Distribution Version)) {
2917 $changes->{$field} eq $clogp->{$field} or
2918 fail "changes field $field \`$changes->{$field}'".
2919 " does not match changelog \`$clogp->{$field}'";
2922 my $cversion = getfield $clogp, 'Version';
2923 my $clogsuite = getfield $clogp, 'Distribution';
2925 # We make the git tag by hand because (a) that makes it easier
2926 # to control the "tagger" (b) we can do remote signing
2927 my $authline = clogp_authline $clogp;
2928 my $delibs = join(" ", "",@deliberatelies);
2929 my $declaredistro = access_basedistro();
2933 my $tfn = $tw->{Tfn};
2934 my $head = $tw->{Objid};
2935 my $tag = $tw->{Tag};
2937 open TO, '>', $tfn->('.tmp') or die $!;
2938 print TO <<END or die $!;
2945 if ($tw->{View} eq 'dgit') {
2946 print TO <<END or die $!;
2947 $package release $cversion for $clogsuite ($csuite) [dgit]
2948 [dgit distro=$declaredistro$delibs]
2950 foreach my $ref (sort keys %previously) {
2951 print TO <<END or die $!;
2952 [dgit previously:$ref=$previously{$ref}]
2955 } elsif ($tw->{View} eq 'maint') {
2956 print TO <<END or die $!;
2957 $package release $cversion for $clogsuite ($csuite)
2958 (maintainer view tag generated by dgit --quilt=$quilt_mode)
2961 die Dumper($tw)."?";
2966 my $tagobjfn = $tfn->('.tmp');
2968 if (!defined $keyid) {
2969 $keyid = access_cfg('keyid','RETURN-UNDEF');
2971 if (!defined $keyid) {
2972 $keyid = getfield $clogp, 'Maintainer';
2974 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
2975 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
2976 push @sign_cmd, qw(-u),$keyid if defined $keyid;
2977 push @sign_cmd, $tfn->('.tmp');
2978 runcmd_ordryrun @sign_cmd;
2980 $tagobjfn = $tfn->('.signed.tmp');
2981 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
2982 $tfn->('.tmp'), $tfn->('.tmp.asc');
2988 my @r = map { $mktag->($_); } @$tagwants;
2992 sub sign_changes ($) {
2993 my ($changesfile) = @_;
2995 my @debsign_cmd = @debsign;
2996 push @debsign_cmd, "-k$keyid" if defined $keyid;
2997 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
2998 push @debsign_cmd, $changesfile;
2999 runcmd_ordryrun @debsign_cmd;
3004 printdebug "actually entering push\n";
3006 supplementary_message(<<'END');
3007 Push failed, while checking state of the archive.
3008 You can retry the push, after fixing the problem, if you like.
3010 if (check_for_git()) {
3013 my $archive_hash = fetch_from_archive();
3014 if (!$archive_hash) {
3016 fail "package appears to be new in this suite;".
3017 " if this is intentional, use --new";
3020 supplementary_message(<<'END');
3021 Push failed, while preparing your push.
3022 You can retry the push, after fixing the problem, if you like.
3025 need_tagformat 'new', "quilt mode $quilt_mode"
3026 if quiltmode_splitbrain;
3030 access_giturl(); # check that success is vaguely likely
3033 my $clogpfn = ".git/dgit/changelog.822.tmp";
3034 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3036 responder_send_file('parsed-changelog', $clogpfn);
3038 my ($clogp, $cversion, $dscfn) =
3039 push_parse_changelog("$clogpfn");
3041 my $dscpath = "$buildproductsdir/$dscfn";
3042 stat_exists $dscpath or
3043 fail "looked for .dsc $dscfn, but $!;".
3044 " maybe you forgot to build";
3046 responder_send_file('dsc', $dscpath);
3048 push_parse_dsc($dscpath, $dscfn, $cversion);
3050 my $format = getfield $dsc, 'Format';
3051 printdebug "format $format\n";
3053 my $actualhead = git_rev_parse('HEAD');
3054 my $dgithead = $actualhead;
3055 my $maintviewhead = undef;
3057 if (madformat_wantfixup($format)) {
3058 # user might have not used dgit build, so maybe do this now:
3059 if (quiltmode_splitbrain()) {
3060 my $upstreamversion = $clogp->{Version};
3061 $upstreamversion =~ s/-[^-]*$//;
3063 quilt_make_fake_dsc($upstreamversion);
3064 my ($dgitview, $cachekey) =
3065 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3067 "--quilt=$quilt_mode but no cached dgit view:
3068 perhaps tree changed since dgit build[-source] ?";
3070 $dgithead = splitbrain_pseudomerge($clogp,
3071 $actualhead, $dgitview,
3073 $maintviewhead = $actualhead;
3074 changedir '../../../..';
3075 prep_ud(); # so _only_subdir() works, below
3077 commit_quilty_patch();
3081 if (defined $overwrite_version && !defined $maintviewhead) {
3082 $dgithead = plain_overwrite_pseudomerge($clogp,
3090 if ($archive_hash) {
3091 if (is_fast_fwd($archive_hash, $dgithead)) {
3093 } elsif (deliberately_not_fast_forward) {
3096 fail "dgit push: HEAD is not a descendant".
3097 " of the archive's version.\n".
3098 "To overwrite the archive's contents,".
3099 " pass --overwrite[=VERSION].\n".
3100 "To rewind history, if permitted by the archive,".
3101 " use --deliberately-not-fast-forward.";
3106 progress "checking that $dscfn corresponds to HEAD";
3107 runcmd qw(dpkg-source -x --),
3108 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3109 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3110 check_for_vendor_patches() if madformat($dsc->{format});
3111 changedir '../../../..';
3112 my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
3113 my @diffcmd = (@git, qw(diff), $diffopt, $tree, $dgithead);
3114 debugcmd "+",@diffcmd;
3116 my $r = system @diffcmd;
3119 fail "$dscfn specifies a different tree to your HEAD commit;".
3120 " perhaps you forgot to build".
3121 ($diffopt eq '--exit-code' ? "" :
3122 " (run with -D to see full diff output)");
3127 if (!$changesfile) {
3128 my $pat = changespat $cversion;
3129 my @cs = glob "$buildproductsdir/$pat";
3130 fail "failed to find unique changes file".
3131 " (looked for $pat in $buildproductsdir);".
3132 " perhaps you need to use dgit -C"
3134 ($changesfile) = @cs;
3136 $changesfile = "$buildproductsdir/$changesfile";
3139 # Checks complete, we're going to try and go ahead:
3141 responder_send_file('changes',$changesfile);
3142 responder_send_command("param head $dgithead");
3143 responder_send_command("param csuite $csuite");
3144 responder_send_command("param tagformat $tagformat");
3145 if (defined $maintviewhead) {
3146 die unless ($protovsn//4) >= 4;
3147 responder_send_command("param maint-view $maintviewhead");
3150 if (deliberately_not_fast_forward) {
3151 git_for_each_ref(lrfetchrefs, sub {
3152 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3153 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3154 responder_send_command("previously $rrefname=$objid");
3155 $previously{$rrefname} = $objid;
3159 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3163 supplementary_message(<<'END');
3164 Push failed, while signing the tag.
3165 You can retry the push, after fixing the problem, if you like.
3167 # If we manage to sign but fail to record it anywhere, it's fine.
3168 if ($we_are_responder) {
3169 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3170 responder_receive_files('signed-tag', @tagobjfns);
3172 @tagobjfns = push_mktags($clogp,$dscpath,
3173 $changesfile,$changesfile,
3176 supplementary_message(<<'END');
3177 Push failed, *after* signing the tag.
3178 If you want to try again, you should use a new version number.
3181 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3183 foreach my $tw (@tagwants) {
3184 my $tag = $tw->{Tag};
3185 my $tagobjfn = $tw->{TagObjFn};
3187 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3188 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3189 runcmd_ordryrun_local
3190 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3193 supplementary_message(<<'END');
3194 Push failed, while updating the remote git repository - see messages above.
3195 If you want to try again, you should use a new version number.
3197 if (!check_for_git()) {
3198 create_remote_git_repo();
3201 my @pushrefs = $forceflag.$dgithead.":".rrref();
3202 foreach my $tw (@tagwants) {
3203 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3206 runcmd_ordryrun @git, qw(push),access_giturl(), @pushrefs;
3207 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3209 supplementary_message(<<'END');
3210 Push failed, after updating the remote git repository.
3211 If you want to try again, you must use a new version number.
3213 if ($we_are_responder) {
3214 my $dryrunsuffix = act_local() ? "" : ".tmp";
3215 responder_receive_files('signed-dsc-changes',
3216 "$dscpath$dryrunsuffix",
3217 "$changesfile$dryrunsuffix");
3220 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3222 progress "[new .dsc left in $dscpath.tmp]";
3224 sign_changes $changesfile;
3227 supplementary_message(<<END);
3228 Push failed, while uploading package(s) to the archive server.
3229 You can retry the upload of exactly these same files with dput of:
3231 If that .changes file is broken, you will need to use a new version
3232 number for your next attempt at the upload.
3234 my $host = access_cfg('upload-host','RETURN-UNDEF');
3235 my @hostarg = defined($host) ? ($host,) : ();
3236 runcmd_ordryrun @dput, @hostarg, $changesfile;
3237 printdone "pushed and uploaded $cversion";
3239 supplementary_message('');
3240 responder_send_command("complete");
3247 badusage "-p is not allowed with clone; specify as argument instead"
3248 if defined $package;
3251 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3252 ($package,$isuite) = @ARGV;
3253 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3254 ($package,$dstdir) = @ARGV;
3255 } elsif (@ARGV==3) {
3256 ($package,$isuite,$dstdir) = @ARGV;
3258 badusage "incorrect arguments to dgit clone";
3260 $dstdir ||= "$package";
3262 if (stat_exists $dstdir) {
3263 fail "$dstdir already exists";
3267 if ($rmonerror && !$dryrun_level) {
3268 $cwd_remove= getcwd();
3270 return unless defined $cwd_remove;
3271 if (!chdir "$cwd_remove") {
3272 return if $!==&ENOENT;
3273 die "chdir $cwd_remove: $!";
3276 rmtree($dstdir) or die "remove $dstdir: $!\n";
3277 } elsif (!grep { $! == $_ }
3278 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3280 print STDERR "check whether to remove $dstdir: $!\n";
3286 $cwd_remove = undef;
3289 sub branchsuite () {
3290 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3291 if ($branch =~ m#$lbranch_re#o) {
3298 sub fetchpullargs () {
3300 if (!defined $package) {
3301 my $sourcep = parsecontrol('debian/control','debian/control');
3302 $package = getfield $sourcep, 'Source';
3305 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3307 my $clogp = parsechangelog();
3308 $isuite = getfield $clogp, 'Distribution';
3310 canonicalise_suite();
3311 progress "fetching from suite $csuite";
3312 } elsif (@ARGV==1) {
3314 canonicalise_suite();
3316 badusage "incorrect arguments to dgit fetch or dgit pull";
3335 badusage "-p is not allowed with dgit push" if defined $package;
3337 my $clogp = parsechangelog();
3338 $package = getfield $clogp, 'Source';
3341 } elsif (@ARGV==1) {
3342 ($specsuite) = (@ARGV);
3344 badusage "incorrect arguments to dgit push";
3346 $isuite = getfield $clogp, 'Distribution';
3348 local ($package) = $existing_package; # this is a hack
3349 canonicalise_suite();
3351 canonicalise_suite();
3353 if (defined $specsuite &&
3354 $specsuite ne $isuite &&
3355 $specsuite ne $csuite) {
3356 fail "dgit push: changelog specifies $isuite ($csuite)".
3357 " but command line specifies $specsuite";
3362 #---------- remote commands' implementation ----------
3364 sub cmd_remote_push_build_host {
3365 my ($nrargs) = shift @ARGV;
3366 my (@rargs) = @ARGV[0..$nrargs-1];
3367 @ARGV = @ARGV[$nrargs..$#ARGV];
3369 my ($dir,$vsnwant) = @rargs;
3370 # vsnwant is a comma-separated list; we report which we have
3371 # chosen in our ready response (so other end can tell if they
3374 $we_are_responder = 1;
3375 $us .= " (build host)";
3379 open PI, "<&STDIN" or die $!;
3380 open STDIN, "/dev/null" or die $!;
3381 open PO, ">&STDOUT" or die $!;
3383 open STDOUT, ">&STDERR" or die $!;
3387 ($protovsn) = grep {
3388 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3389 } @rpushprotovsn_support;
3391 fail "build host has dgit rpush protocol versions ".
3392 (join ",", @rpushprotovsn_support).
3393 " but invocation host has $vsnwant"
3394 unless defined $protovsn;
3396 responder_send_command("dgit-remote-push-ready $protovsn");
3397 rpush_handle_protovsn_bothends();
3402 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3403 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3404 # a good error message)
3406 sub rpush_handle_protovsn_bothends () {
3407 if ($protovsn < 4) {
3408 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3417 my $report = i_child_report();
3418 if (defined $report) {
3419 printdebug "($report)\n";
3420 } elsif ($i_child_pid) {
3421 printdebug "(killing build host child $i_child_pid)\n";
3422 kill 15, $i_child_pid;
3424 if (defined $i_tmp && !defined $initiator_tempdir) {
3426 eval { rmtree $i_tmp; };
3430 END { i_cleanup(); }
3433 my ($base,$selector,@args) = @_;
3434 $selector =~ s/\-/_/g;
3435 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3442 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3450 push @rargs, join ",", @rpushprotovsn_support;
3453 push @rdgit, @ropts;
3454 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3456 my @cmd = (@ssh, $host, shellquote @rdgit);
3459 if (defined $initiator_tempdir) {
3460 rmtree $initiator_tempdir;
3461 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3462 $i_tmp = $initiator_tempdir;
3466 $i_child_pid = open2(\*RO, \*RI, @cmd);
3468 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3469 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3470 $supplementary_message = '' unless $protovsn >= 3;
3472 fail "rpush negotiated protocol version $protovsn".
3473 " which does not support quilt mode $quilt_mode"
3474 if quiltmode_splitbrain;
3476 rpush_handle_protovsn_bothends();
3478 my ($icmd,$iargs) = initiator_expect {
3479 m/^(\S+)(?: (.*))?$/;
3482 i_method "i_resp", $icmd, $iargs;
3486 sub i_resp_progress ($) {
3488 my $msg = protocol_read_bytes \*RO, $rhs;
3492 sub i_resp_supplementary_message ($) {
3494 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3497 sub i_resp_complete {
3498 my $pid = $i_child_pid;
3499 $i_child_pid = undef; # prevents killing some other process with same pid
3500 printdebug "waiting for build host child $pid...\n";
3501 my $got = waitpid $pid, 0;
3502 die $! unless $got == $pid;
3503 die "build host child failed $?" if $?;
3506 printdebug "all done\n";
3510 sub i_resp_file ($) {
3512 my $localname = i_method "i_localname", $keyword;
3513 my $localpath = "$i_tmp/$localname";
3514 stat_exists $localpath and
3515 badproto \*RO, "file $keyword ($localpath) twice";
3516 protocol_receive_file \*RO, $localpath;
3517 i_method "i_file", $keyword;
3522 sub i_resp_param ($) {
3523 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3527 sub i_resp_previously ($) {
3528 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3529 or badproto \*RO, "bad previously spec";
3530 my $r = system qw(git check-ref-format), $1;
3531 die "bad previously ref spec ($r)" if $r;
3532 $previously{$1} = $2;
3537 sub i_resp_want ($) {
3539 die "$keyword ?" if $i_wanted{$keyword}++;
3540 my @localpaths = i_method "i_want", $keyword;
3541 printdebug "[[ $keyword @localpaths\n";
3542 foreach my $localpath (@localpaths) {
3543 protocol_send_file \*RI, $localpath;
3545 print RI "files-end\n" or die $!;
3548 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3550 sub i_localname_parsed_changelog {
3551 return "remote-changelog.822";
3553 sub i_file_parsed_changelog {
3554 ($i_clogp, $i_version, $i_dscfn) =
3555 push_parse_changelog "$i_tmp/remote-changelog.822";
3556 die if $i_dscfn =~ m#/|^\W#;
3559 sub i_localname_dsc {
3560 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3565 sub i_localname_changes {
3566 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3567 $i_changesfn = $i_dscfn;
3568 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3569 return $i_changesfn;
3571 sub i_file_changes { }
3573 sub i_want_signed_tag {
3574 printdebug Dumper(\%i_param, $i_dscfn);
3575 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3576 && defined $i_param{'csuite'}
3577 or badproto \*RO, "premature desire for signed-tag";
3578 my $head = $i_param{'head'};
3579 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3581 my $maintview = $i_param{'maint-view'};
3582 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3585 if ($protovsn >= 4) {
3586 my $p = $i_param{'tagformat'} // '<undef>';
3588 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3591 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3593 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3595 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3598 push_mktags $i_clogp, $i_dscfn,
3599 $i_changesfn, 'remote changes',
3603 sub i_want_signed_dsc_changes {
3604 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3605 sign_changes $i_changesfn;
3606 return ($i_dscfn, $i_changesfn);
3609 #---------- building etc. ----------
3615 #----- `3.0 (quilt)' handling -----
3617 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3619 sub quiltify_dpkg_commit ($$$;$) {
3620 my ($patchname,$author,$msg, $xinfo) = @_;
3624 my $descfn = ".git/dgit/quilt-description.tmp";
3625 open O, '>', $descfn or die "$descfn: $!";
3628 $msg =~ s/^\s+$/ ./mg;
3629 print O <<END or die $!;
3639 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3640 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3641 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3642 runcmd @dpkgsource, qw(--commit .), $patchname;
3646 sub quiltify_trees_differ ($$;$$) {
3647 my ($x,$y,$finegrained,$ignorenamesr) = @_;
3648 # returns true iff the two tree objects differ other than in debian/
3649 # with $finegrained,
3650 # returns bitmask 01 - differ in upstream files except .gitignore
3651 # 02 - differ in .gitignore
3652 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3653 # is set for each modified .gitignore filename $fn
3655 my @cmd = (@git, qw(diff-tree --name-only -z));
3656 push @cmd, qw(-r) if $finegrained;
3658 my $diffs= cmdoutput @cmd;
3660 foreach my $f (split /\0/, $diffs) {
3661 next if $f =~ m#^debian(?:/.*)?$#s;
3662 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
3663 $r |= $isignore ? 02 : 01;
3664 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
3666 printdebug "quiltify_trees_differ $x $y => $r\n";
3670 sub quiltify_tree_sentinelfiles ($) {
3671 # lists the `sentinel' files present in the tree
3673 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
3674 qw(-- debian/rules debian/control);
3679 sub quiltify_splitbrain_needed () {
3680 if (!$split_brain) {
3681 progress "dgit view: changes are required...";
3682 runcmd @git, qw(checkout -q -b dgit-view);
3687 sub quiltify_splitbrain ($$$$$$) {
3688 my ($clogp, $unapplied, $headref, $diffbits,
3689 $editedignores, $cachekey) = @_;
3690 if ($quilt_mode !~ m/gbp|dpm/) {
3691 # treat .gitignore just like any other upstream file
3692 $diffbits = { %$diffbits };
3693 $_ = !!$_ foreach values %$diffbits;
3695 # We would like any commits we generate to be reproducible
3696 my @authline = clogp_authline($clogp);
3697 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
3698 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
3699 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
3700 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
3701 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
3702 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
3704 if ($quilt_mode =~ m/gbp|unapplied/ &&
3705 ($diffbits->{H2O} & 01)) {
3707 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
3708 " but git tree differs from orig in upstream files.";
3709 if (!stat_exists "debian/patches") {
3711 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
3715 if ($quilt_mode =~ m/dpm/ &&
3716 ($diffbits->{H2A} & 01)) {
3718 --quilt=$quilt_mode specified, implying patches-applied git tree
3719 but git tree differs from result of applying debian/patches to upstream
3722 if ($quilt_mode =~ m/gbp|unapplied/ &&
3723 ($diffbits->{O2A} & 01)) { # some patches
3724 quiltify_splitbrain_needed();
3725 progress "dgit view: creating patches-applied version using gbp pq";
3726 runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
3727 # gbp pq import creates a fresh branch; push back to dgit-view
3728 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
3729 runcmd @git, qw(checkout -q dgit-view);
3731 if ($quilt_mode =~ m/gbp|dpm/ &&
3732 ($diffbits->{O2A} & 02)) {
3734 --quilt=$quilt_mode specified, implying that HEAD is for use with a
3735 tool which does not create patches for changes to upstream
3736 .gitignores: but, such patches exist in debian/patches.
3739 if (($diffbits->{H2O} & 02) && # user has modified .gitignore
3740 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
3741 quiltify_splitbrain_needed();
3742 progress "dgit view: creating patch to represent .gitignore changes";
3743 ensuredir "debian/patches";
3744 my $gipatch = "debian/patches/auto-gitignore";
3745 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
3746 stat GIPATCH or die "$gipatch: $!";
3747 fail "$gipatch already exists; but want to create it".
3748 " to record .gitignore changes" if (stat _)[7];
3749 print GIPATCH <<END or die "$gipatch: $!";
3750 Subject: Update .gitignore from Debian packaging branch
3752 The Debian packaging git branch contains these updates to the upstream
3753 .gitignore file(s). This patch is autogenerated, to provide these
3754 updates to users of the official Debian archive view of the package.
3756 [dgit ($our_version) update-gitignore]
3759 close GIPATCH or die "$gipatch: $!";
3760 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
3761 $unapplied, $headref, "--", sort keys %$editedignores;
3762 open SERIES, "+>>", "debian/patches/series" or die $!;
3763 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
3765 defined read SERIES, $newline, 1 or die $!;
3766 print SERIES "\n" or die $! unless $newline eq "\n";
3767 print SERIES "auto-gitignore\n" or die $!;
3768 close SERIES or die $!;
3769 runcmd @git, qw(add -- debian/patches/series), $gipatch;
3770 commit_admin "Commit patch to update .gitignore";
3773 my $dgitview = git_rev_parse 'refs/heads/dgit-view';
3775 changedir '../../../..';
3776 ensuredir ".git/logs/refs/dgit-intern";
3777 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
3779 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
3782 progress "dgit view: created (commit id $dgitview)";
3784 changedir '.git/dgit/unpack/work';
3787 sub quiltify ($$$$) {
3788 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
3790 # Quilt patchification algorithm
3792 # We search backwards through the history of the main tree's HEAD
3793 # (T) looking for a start commit S whose tree object is identical
3794 # to to the patch tip tree (ie the tree corresponding to the
3795 # current dpkg-committed patch series). For these purposes
3796 # `identical' disregards anything in debian/ - this wrinkle is
3797 # necessary because dpkg-source treates debian/ specially.
3799 # We can only traverse edges where at most one of the ancestors'
3800 # trees differs (in changes outside in debian/). And we cannot
3801 # handle edges which change .pc/ or debian/patches. To avoid
3802 # going down a rathole we avoid traversing edges which introduce
3803 # debian/rules or debian/control. And we set a limit on the
3804 # number of edges we are willing to look at.
3806 # If we succeed, we walk forwards again. For each traversed edge
3807 # PC (with P parent, C child) (starting with P=S and ending with
3808 # C=T) to we do this:
3810 # - dpkg-source --commit with a patch name and message derived from C
3811 # After traversing PT, we git commit the changes which
3812 # should be contained within debian/patches.
3814 # The search for the path S..T is breadth-first. We maintain a
3815 # todo list containing search nodes. A search node identifies a
3816 # commit, and looks something like this:
3818 # Commit => $git_commit_id,
3819 # Child => $c, # or undef if P=T
3820 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
3821 # Nontrivial => true iff $p..$c has relevant changes
3828 my %considered; # saves being exponential on some weird graphs
3830 my $t_sentinels = quiltify_tree_sentinelfiles $target;
3833 my ($search,$whynot) = @_;
3834 printdebug " search NOT $search->{Commit} $whynot\n";
3835 $search->{Whynot} = $whynot;
3836 push @nots, $search;
3837 no warnings qw(exiting);
3846 my $c = shift @todo;
3847 next if $considered{$c->{Commit}}++;
3849 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
3851 printdebug "quiltify investigate $c->{Commit}\n";
3854 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
3855 printdebug " search finished hooray!\n";
3860 if ($quilt_mode eq 'nofix') {
3861 fail "quilt fixup required but quilt mode is \`nofix'\n".
3862 "HEAD commit $c->{Commit} differs from tree implied by ".
3863 " debian/patches (tree object $oldtiptree)";
3865 if ($quilt_mode eq 'smash') {
3866 printdebug " search quitting smash\n";
3870 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
3871 $not->($c, "has $c_sentinels not $t_sentinels")
3872 if $c_sentinels ne $t_sentinels;
3874 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
3875 $commitdata =~ m/\n\n/;
3877 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
3878 @parents = map { { Commit => $_, Child => $c } } @parents;
3880 $not->($c, "root commit") if !@parents;
3882 foreach my $p (@parents) {
3883 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
3885 my $ndiffers = grep { $_->{Nontrivial} } @parents;
3886 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
3888 foreach my $p (@parents) {
3889 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
3891 my @cmd= (@git, qw(diff-tree -r --name-only),
3892 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
3893 my $patchstackchange = cmdoutput @cmd;
3894 if (length $patchstackchange) {
3895 $patchstackchange =~ s/\n/,/g;
3896 $not->($p, "changed $patchstackchange");
3899 printdebug " search queue P=$p->{Commit} ",
3900 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
3906 printdebug "quiltify want to smash\n";
3909 my $x = $_[0]{Commit};
3910 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
3913 my $reportnot = sub {
3915 my $s = $abbrev->($notp);
3916 my $c = $notp->{Child};
3917 $s .= "..".$abbrev->($c) if $c;
3918 $s .= ": ".$notp->{Whynot};
3921 if ($quilt_mode eq 'linear') {
3922 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
3923 foreach my $notp (@nots) {
3924 print STDERR "$us: ", $reportnot->($notp), "\n";
3926 print STDERR "$us: $_\n" foreach @$failsuggestion;
3927 fail "quilt fixup naive history linearisation failed.\n".
3928 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
3929 } elsif ($quilt_mode eq 'smash') {
3930 } elsif ($quilt_mode eq 'auto') {
3931 progress "quilt fixup cannot be linear, smashing...";
3933 die "$quilt_mode ?";
3936 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
3937 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
3939 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
3941 quiltify_dpkg_commit "auto-$version-$target-$time",
3942 (getfield $clogp, 'Maintainer'),
3943 "Automatically generated patch ($clogp->{Version})\n".
3944 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
3948 progress "quiltify linearisation planning successful, executing...";
3950 for (my $p = $sref_S;
3951 my $c = $p->{Child};
3953 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
3954 next unless $p->{Nontrivial};
3956 my $cc = $c->{Commit};
3958 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
3959 $commitdata =~ m/\n\n/ or die "$c ?";
3962 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
3965 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
3968 my $patchname = $title;
3969 $patchname =~ s/[.:]$//;
3970 $patchname =~ y/ A-Z/-a-z/;
3971 $patchname =~ y/-a-z0-9_.+=~//cd;
3972 $patchname =~ s/^\W/x-$&/;
3973 $patchname = substr($patchname,0,40);
3976 stat "debian/patches/$patchname$index";
3978 $!==ENOENT or die "$patchname$index $!";
3980 runcmd @git, qw(checkout -q), $cc;
3982 # We use the tip's changelog so that dpkg-source doesn't
3983 # produce complaining messages from dpkg-parsechangelog. None
3984 # of the information dpkg-source gets from the changelog is
3985 # actually relevant - it gets put into the original message
3986 # which dpkg-source provides our stunt editor, and then
3988 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
3990 quiltify_dpkg_commit "$patchname$index", $author, $msg,
3991 "X-Dgit-Generated: $clogp->{Version} $cc\n";
3993 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
3996 runcmd @git, qw(checkout -q master);
3999 sub build_maybe_quilt_fixup () {
4000 my ($format,$fopts) = get_source_format;
4001 return unless madformat_wantfixup $format;
4004 check_for_vendor_patches();
4006 if (quiltmode_splitbrain) {
4007 foreach my $needtf (qw(new maint)) {
4008 next if grep { $_ eq $needtf } access_cfg_tagformats;
4010 quilt mode $quilt_mode requires split view so server needs to support
4011 both "new" and "maint" tag formats, but config says it doesn't.
4016 my $clogp = parsechangelog();
4017 my $headref = git_rev_parse('HEAD');
4022 my $upstreamversion=$version;
4023 $upstreamversion =~ s/-[^-]*$//;
4025 if ($fopts->{'single-debian-patch'}) {
4026 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4028 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4031 die 'bug' if $split_brain && !$need_split_build_invocation;
4033 changedir '../../../..';
4034 runcmd_ordryrun_local
4035 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4038 sub quilt_fixup_mkwork ($) {
4041 mkdir "work" or die $!;
4043 mktree_in_ud_here();
4044 runcmd @git, qw(reset -q --hard), $headref;
4047 sub quilt_fixup_linkorigs ($$) {
4048 my ($upstreamversion, $fn) = @_;
4049 # calls $fn->($leafname);
4051 foreach my $f (<../../../../*>) { #/){
4052 my $b=$f; $b =~ s{.*/}{};
4054 local ($debuglevel) = $debuglevel-1;
4055 printdebug "QF linkorigs $b, $f ?\n";
4057 next unless is_orig_file_of_vsn $b, $upstreamversion;
4058 printdebug "QF linkorigs $b, $f Y\n";
4059 link_ltarget $f, $b or die "$b $!";
4064 sub quilt_fixup_delete_pc () {
4065 runcmd @git, qw(rm -rqf .pc);
4066 commit_admin "Commit removal of .pc (quilt series tracking data)";
4069 sub quilt_fixup_singlepatch ($$$) {
4070 my ($clogp, $headref, $upstreamversion) = @_;
4072 progress "starting quiltify (single-debian-patch)";
4074 # dpkg-source --commit generates new patches even if
4075 # single-debian-patch is in debian/source/options. In order to
4076 # get it to generate debian/patches/debian-changes, it is
4077 # necessary to build the source package.
4079 quilt_fixup_linkorigs($upstreamversion, sub { });
4080 quilt_fixup_mkwork($headref);
4082 rmtree("debian/patches");
4084 runcmd @dpkgsource, qw(-b .);
4086 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4087 rename srcfn("$upstreamversion", "/debian/patches"),
4088 "work/debian/patches";
4091 commit_quilty_patch();
4094 sub quilt_make_fake_dsc ($) {
4095 my ($upstreamversion) = @_;
4097 my $fakeversion="$upstreamversion-~~DGITFAKE";
4099 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4100 print $fakedsc <<END or die $!;
4103 Version: $fakeversion
4107 my $dscaddfile=sub {
4110 my $md = new Digest::MD5;
4112 my $fh = new IO::File $b, '<' or die "$b $!";
4117 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4120 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4122 my @files=qw(debian/source/format debian/rules
4123 debian/control debian/changelog);
4124 foreach my $maybe (qw(debian/patches debian/source/options
4125 debian/tests/control)) {
4126 next unless stat_exists "../../../$maybe";
4127 push @files, $maybe;
4130 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4131 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4133 $dscaddfile->($debtar);
4134 close $fakedsc or die $!;
4137 sub quilt_check_splitbrain_cache ($$) {
4138 my ($headref, $upstreamversion) = @_;
4139 # Called only if we are in (potentially) split brain mode.
4141 # Computes the cache key and looks in the cache.
4142 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4144 my $splitbrain_cachekey;
4147 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4148 # we look in the reflog of dgit-intern/quilt-cache
4149 # we look for an entry whose message is the key for the cache lookup
4150 my @cachekey = (qw(dgit), $our_version);
4151 push @cachekey, $upstreamversion;
4152 push @cachekey, $quilt_mode;
4153 push @cachekey, $headref;
4155 push @cachekey, hashfile('fake.dsc');
4157 my $srcshash = Digest::SHA->new(256);
4158 my %sfs = ( %INC, '$0(dgit)' => $0 );
4159 foreach my $sfk (sort keys %sfs) {
4160 next unless m/^\$0\b/ || m{^Debian/Dgit\b};
4161 $srcshash->add($sfk," ");
4162 $srcshash->add(hashfile($sfs{$sfk}));
4163 $srcshash->add("\n");
4165 push @cachekey, $srcshash->hexdigest();
4166 $splitbrain_cachekey = "@cachekey";
4168 my @cmd = (@git, qw(reflog), '--pretty=format:%H %gs',
4170 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4171 debugcmd "|(probably)",@cmd;
4172 my $child = open GC, "-|"; defined $child or die $!;
4174 chdir '../../..' or die $!;
4175 if (!stat ".git/logs/refs/$splitbraincache") {
4176 $! == ENOENT or die $!;
4177 printdebug ">(no reflog)\n";
4184 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4185 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4188 quilt_fixup_mkwork($headref);
4189 if ($cachehit ne $headref) {
4190 progress "dgit view: found cached (commit id $cachehit)";
4191 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4193 return ($cachehit, $splitbrain_cachekey);
4195 progress "dgit view: found cached, no changes required";
4196 return ($headref, $splitbrain_cachekey);
4198 die $! if GC->error;
4199 failedcmd unless close GC;
4201 printdebug "splitbrain cache miss\n";
4202 return (undef, $splitbrain_cachekey);
4205 sub quilt_fixup_multipatch ($$$) {
4206 my ($clogp, $headref, $upstreamversion) = @_;
4208 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4211 # - honour any existing .pc in case it has any strangeness
4212 # - determine the git commit corresponding to the tip of
4213 # the patch stack (if there is one)
4214 # - if there is such a git commit, convert each subsequent
4215 # git commit into a quilt patch with dpkg-source --commit
4216 # - otherwise convert all the differences in the tree into
4217 # a single git commit
4221 # Our git tree doesn't necessarily contain .pc. (Some versions of
4222 # dgit would include the .pc in the git tree.) If there isn't
4223 # one, we need to generate one by unpacking the patches that we
4226 # We first look for a .pc in the git tree. If there is one, we
4227 # will use it. (This is not the normal case.)
4229 # Otherwise need to regenerate .pc so that dpkg-source --commit
4230 # can work. We do this as follows:
4231 # 1. Collect all relevant .orig from parent directory
4232 # 2. Generate a debian.tar.gz out of
4233 # debian/{patches,rules,source/format,source/options}
4234 # 3. Generate a fake .dsc containing just these fields:
4235 # Format Source Version Files
4236 # 4. Extract the fake .dsc
4237 # Now the fake .dsc has a .pc directory.
4238 # (In fact we do this in every case, because in future we will
4239 # want to search for a good base commit for generating patches.)
4241 # Then we can actually do the dpkg-source --commit
4242 # 1. Make a new working tree with the same object
4243 # store as our main tree and check out the main
4245 # 2. Copy .pc from the fake's extraction, if necessary
4246 # 3. Run dpkg-source --commit
4247 # 4. If the result has changes to debian/, then
4248 # - git-add them them
4249 # - git-add .pc if we had a .pc in-tree
4251 # 5. If we had a .pc in-tree, delete it, and git-commit
4252 # 6. Back in the main tree, fast forward to the new HEAD
4254 # Another situation we may have to cope with is gbp-style
4255 # patches-unapplied trees.
4257 # We would want to detect these, so we know to escape into
4258 # quilt_fixup_gbp. However, this is in general not possible.
4259 # Consider a package with a one patch which the dgit user reverts
4260 # (with git-revert or the moral equivalent).
4262 # That is indistinguishable in contents from a patches-unapplied
4263 # tree. And looking at the history to distinguish them is not
4264 # useful because the user might have made a confusing-looking git
4265 # history structure (which ought to produce an error if dgit can't
4266 # cope, not a silent reintroduction of an unwanted patch).
4268 # So gbp users will have to pass an option. But we can usually
4269 # detect their failure to do so: if the tree is not a clean
4270 # patches-applied tree, quilt linearisation fails, but the tree
4271 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4272 # they want --quilt=unapplied.
4274 # To help detect this, when we are extracting the fake dsc, we
4275 # first extract it with --skip-patches, and then apply the patches
4276 # afterwards with dpkg-source --before-build. That lets us save a
4277 # tree object corresponding to .origs.
4279 my $splitbrain_cachekey;
4281 quilt_make_fake_dsc($upstreamversion);
4283 if (quiltmode_splitbrain()) {
4285 ($cachehit, $splitbrain_cachekey) =
4286 quilt_check_splitbrain_cache($headref, $upstreamversion);
4287 return if $cachehit;
4291 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4293 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4294 rename $fakexdir, "fake" or die "$fakexdir $!";
4298 remove_stray_gits();
4299 mktree_in_ud_here();
4303 runcmd @git, qw(add -Af .);
4304 my $unapplied=git_write_tree();
4305 printdebug "fake orig tree object $unapplied\n";
4310 'exec dpkg-source --before-build . >/dev/null';
4314 quilt_fixup_mkwork($headref);
4317 if (stat_exists ".pc") {
4319 progress "Tree already contains .pc - will use it then delete it.";
4322 rename '../fake/.pc','.pc' or die $!;
4325 changedir '../fake';
4327 runcmd @git, qw(add -Af .);
4328 my $oldtiptree=git_write_tree();
4329 printdebug "fake o+d/p tree object $unapplied\n";
4330 changedir '../work';
4333 # We calculate some guesswork now about what kind of tree this might
4334 # be. This is mostly for error reporting.
4339 # O = orig, without patches applied
4340 # A = "applied", ie orig with H's debian/patches applied
4341 H2O => quiltify_trees_differ($headref, $unapplied, 1,\%editedignores),
4342 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4343 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4347 foreach my $b (qw(01 02)) {
4348 foreach my $v (qw(H2O O2A H2A)) {
4349 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4352 printdebug "differences \@dl @dl.\n";
4355 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4356 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4357 $dl[0], $dl[1], $dl[3], $dl[4],
4361 if (!($diffbits->{H2O} & $diffbits->{O2A})) {
4362 push @failsuggestion, "This might be a patches-unapplied branch.";
4363 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4364 push @failsuggestion, "This might be a patches-applied branch.";
4366 push @failsuggestion, "Maybe you need to specify one of".
4367 " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
4369 if (quiltmode_splitbrain()) {
4370 quiltify_splitbrain($clogp, $unapplied, $headref,
4371 $diffbits, \%editedignores,
4372 $splitbrain_cachekey);
4376 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4377 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4379 if (!open P, '>>', ".pc/applied-patches") {
4380 $!==&ENOENT or die $!;
4385 commit_quilty_patch();
4387 if ($mustdeletepc) {
4388 quilt_fixup_delete_pc();
4392 sub quilt_fixup_editor () {
4393 my $descfn = $ENV{$fakeeditorenv};
4394 my $editing = $ARGV[$#ARGV];
4395 open I1, '<', $descfn or die "$descfn: $!";
4396 open I2, '<', $editing or die "$editing: $!";
4397 unlink $editing or die "$editing: $!";
4398 open O, '>', $editing or die "$editing: $!";
4399 while (<I1>) { print O or die $!; } I1->error and die $!;
4402 $copying ||= m/^\-\-\- /;
4403 next unless $copying;
4406 I2->error and die $!;
4411 sub maybe_apply_patches_dirtily () {
4412 return unless $quilt_mode =~ m/gbp|unapplied/;
4413 print STDERR <<END or die $!;
4415 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4416 dgit: Have to apply the patches - making the tree dirty.
4417 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4420 $patches_applied_dirtily = 01;
4421 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4422 runcmd qw(dpkg-source --before-build .);
4425 sub maybe_unapply_patches_again () {
4426 progress "dgit: Unapplying patches again to tidy up the tree."
4427 if $patches_applied_dirtily;
4428 runcmd qw(dpkg-source --after-build .)
4429 if $patches_applied_dirtily & 01;
4431 if $patches_applied_dirtily & 02;
4432 $patches_applied_dirtily = 0;
4435 #----- other building -----
4437 our $clean_using_builder;
4438 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4439 # clean the tree before building (perhaps invoked indirectly by
4440 # whatever we are using to run the build), rather than separately
4441 # and explicitly by us.
4444 return if $clean_using_builder;
4445 if ($cleanmode eq 'dpkg-source') {
4446 maybe_apply_patches_dirtily();
4447 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4448 } elsif ($cleanmode eq 'dpkg-source-d') {
4449 maybe_apply_patches_dirtily();
4450 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4451 } elsif ($cleanmode eq 'git') {
4452 runcmd_ordryrun_local @git, qw(clean -xdf);
4453 } elsif ($cleanmode eq 'git-ff') {
4454 runcmd_ordryrun_local @git, qw(clean -xdff);
4455 } elsif ($cleanmode eq 'check') {
4456 my $leftovers = cmdoutput @git, qw(clean -xdn);
4457 if (length $leftovers) {
4458 print STDERR $leftovers, "\n" or die $!;
4459 fail "tree contains uncommitted files and --clean=check specified";
4461 } elsif ($cleanmode eq 'none') {
4468 badusage "clean takes no additional arguments" if @ARGV;
4471 maybe_unapply_patches_again();
4476 badusage "-p is not allowed when building" if defined $package;
4479 my $clogp = parsechangelog();
4480 $isuite = getfield $clogp, 'Distribution';
4481 $package = getfield $clogp, 'Source';
4482 $version = getfield $clogp, 'Version';
4483 build_maybe_quilt_fixup();
4485 my $pat = changespat $version;
4486 foreach my $f (glob "$buildproductsdir/$pat") {
4488 unlink $f or fail "remove old changes file $f: $!";
4490 progress "would remove $f";
4496 sub changesopts_initial () {
4497 my @opts =@changesopts[1..$#changesopts];
4500 sub changesopts_version () {
4501 if (!defined $changes_since_version) {
4502 my @vsns = archive_query('archive_query');
4503 my @quirk = access_quirk();
4504 if ($quirk[0] eq 'backports') {
4505 local $isuite = $quirk[2];
4507 canonicalise_suite();
4508 push @vsns, archive_query('archive_query');
4511 @vsns = map { $_->[0] } @vsns;
4512 @vsns = sort { -version_compare($a, $b) } @vsns;
4513 $changes_since_version = $vsns[0];
4514 progress "changelog will contain changes since $vsns[0]";
4516 $changes_since_version = '_';
4517 progress "package seems new, not specifying -v<version>";
4520 if ($changes_since_version ne '_') {
4521 return ("-v$changes_since_version");
4527 sub changesopts () {
4528 return (changesopts_initial(), changesopts_version());
4531 sub massage_dbp_args ($;$) {
4532 my ($cmd,$xargs) = @_;
4535 # - if we're going to split the source build out so we can
4536 # do strange things to it, massage the arguments to dpkg-buildpackage
4537 # so that the main build doessn't build source (or add an argument
4538 # to stop it building source by default).
4540 # - add -nc to stop dpkg-source cleaning the source tree,
4541 # unless we're not doing a split build and want dpkg-source
4542 # as cleanmode, in which case we can do nothing
4545 # 0 - source will NOT need to be built separately by caller
4546 # +1 - source will need to be built separately by caller
4547 # +2 - source will need to be built separately by caller AND
4548 # dpkg-buildpackage should not in fact be run at all!
4549 debugcmd '#massaging#', @$cmd if $debuglevel>1;
4550 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
4551 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
4552 $clean_using_builder = 1;
4555 # -nc has the side effect of specifying -b if nothing else specified
4556 # and some combinations of -S, -b, et al, are errors, rather than
4557 # later simply overriding earlie. So we need to:
4558 # - search the command line for these options
4559 # - pick the last one
4560 # - perhaps add our own as a default
4561 # - perhaps adjust it to the corresponding non-source-building version
4563 foreach my $l ($cmd, $xargs) {
4565 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
4568 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
4570 if ($need_split_build_invocation) {
4571 printdebug "massage split $dmode.\n";
4572 $r = $dmode =~ m/[S]/ ? +2 :
4573 $dmode =~ y/gGF/ABb/ ? +1 :
4574 $dmode =~ m/[ABb]/ ? 0 :
4577 printdebug "massage done $r $dmode.\n";
4579 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
4584 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
4585 my $wantsrc = massage_dbp_args \@dbp;
4592 push @dbp, changesopts_version();
4593 maybe_apply_patches_dirtily();
4594 runcmd_ordryrun_local @dbp;
4596 maybe_unapply_patches_again();
4597 printdone "build successful\n";
4601 my @dbp = @dpkgbuildpackage;
4603 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
4606 if (length executable_on_path('git-buildpackage')) {
4607 @cmd = qw(git-buildpackage);
4609 @cmd = qw(gbp buildpackage);
4611 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
4616 if (!$clean_using_builder) {
4617 push @cmd, '--git-cleaner=true';
4621 maybe_unapply_patches_again();
4623 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
4624 canonicalise_suite();
4625 push @cmd, "--git-debian-branch=".lbranch();
4627 push @cmd, changesopts();
4628 runcmd_ordryrun_local @cmd, @ARGV;
4630 printdone "build successful\n";
4632 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
4635 my $our_cleanmode = $cleanmode;
4636 if ($need_split_build_invocation) {
4637 # Pretend that clean is being done some other way. This
4638 # forces us not to try to use dpkg-buildpackage to clean and
4639 # build source all in one go; and instead we run dpkg-source
4640 # (and build_prep() will do the clean since $clean_using_builder
4642 $our_cleanmode = 'ELSEWHERE';
4644 if ($our_cleanmode =~ m/^dpkg-source/) {
4645 # dpkg-source invocation (below) will clean, so build_prep shouldn't
4646 $clean_using_builder = 1;
4649 $sourcechanges = changespat $version,'source';
4651 unlink "../$sourcechanges" or $!==ENOENT
4652 or fail "remove $sourcechanges: $!";
4654 $dscfn = dscfn($version);
4655 if ($our_cleanmode eq 'dpkg-source') {
4656 maybe_apply_patches_dirtily();
4657 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
4659 } elsif ($our_cleanmode eq 'dpkg-source-d') {
4660 maybe_apply_patches_dirtily();
4661 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
4664 my @cmd = (@dpkgsource, qw(-b --));
4667 runcmd_ordryrun_local @cmd, "work";
4668 my @udfiles = <${package}_*>;
4669 changedir "../../..";
4670 foreach my $f (@udfiles) {
4671 printdebug "source copy, found $f\n";
4674 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
4675 $f eq srcfn($version, $&));
4676 printdebug "source copy, found $f - renaming\n";
4677 rename "$ud/$f", "../$f" or $!==ENOENT
4678 or fail "put in place new source file ($f): $!";
4681 my $pwd = must_getcwd();
4682 my $leafdir = basename $pwd;
4684 runcmd_ordryrun_local @cmd, $leafdir;
4687 runcmd_ordryrun_local qw(sh -ec),
4688 'exec >$1; shift; exec "$@"','x',
4689 "../$sourcechanges",
4690 @dpkggenchanges, qw(-S), changesopts();
4694 sub cmd_build_source {
4695 badusage "build-source takes no additional arguments" if @ARGV;
4697 maybe_unapply_patches_again();
4698 printdone "source built, results in $dscfn and $sourcechanges";
4703 my $pat = changespat $version;
4705 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
4706 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
4707 fail "changes files other than source matching $pat".
4708 " already present (@unwanted);".
4709 " building would result in ambiguity about the intended results"
4712 my $wasdir = must_getcwd();
4715 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
4716 stat_exists $sourcechanges
4717 or fail "$sourcechanges (in parent directory): $!";
4719 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
4720 my @changesfiles = glob $pat;
4721 @changesfiles = sort {
4722 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
4725 fail "wrong number of different changes files (@changesfiles)"
4726 unless @changesfiles==2;
4727 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
4728 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
4729 fail "$l found in binaries changes file $binchanges"
4732 runcmd_ordryrun_local @mergechanges, @changesfiles;
4733 my $multichanges = changespat $version,'multi';
4735 stat_exists $multichanges or fail "$multichanges: $!";
4736 foreach my $cf (glob $pat) {
4737 next if $cf eq $multichanges;
4738 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
4742 maybe_unapply_patches_again();
4743 printdone "build successful, results in $multichanges\n" or die $!;
4746 sub cmd_quilt_fixup {
4747 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
4748 my $clogp = parsechangelog();
4749 $version = getfield $clogp, 'Version';
4750 $package = getfield $clogp, 'Source';
4753 build_maybe_quilt_fixup();
4756 sub cmd_archive_api_query {
4757 badusage "need only 1 subpath argument" unless @ARGV==1;
4758 my ($subpath) = @ARGV;
4759 my @cmd = archive_api_query_cmd($subpath);
4761 exec @cmd or fail "exec curl: $!\n";
4764 sub cmd_clone_dgit_repos_server {
4765 badusage "need destination argument" unless @ARGV==1;
4766 my ($destdir) = @ARGV;
4767 $package = '_dgit-repos-server';
4768 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
4770 exec @cmd or fail "exec git clone: $!\n";
4773 sub cmd_setup_mergechangelogs {
4774 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
4775 setup_mergechangelogs(1);
4778 sub cmd_setup_useremail {
4779 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
4783 sub cmd_setup_new_tree {
4784 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
4788 #---------- argument parsing and main program ----------
4791 print "dgit version $our_version\n" or die $!;
4795 our (%valopts_long, %valopts_short);
4798 sub defvalopt ($$$$) {
4799 my ($long,$short,$val_re,$how) = @_;
4800 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
4801 $valopts_long{$long} = $oi;
4802 $valopts_short{$short} = $oi;
4803 # $how subref should:
4804 # do whatever assignemnt or thing it likes with $_[0]
4805 # if the option should not be passed on to remote, @rvalopts=()
4806 # or $how can be a scalar ref, meaning simply assign the value
4809 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
4810 defvalopt '--distro', '-d', '.+', \$idistro;
4811 defvalopt '', '-k', '.+', \$keyid;
4812 defvalopt '--existing-package','', '.*', \$existing_package;
4813 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
4814 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
4815 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
4817 defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
4819 defvalopt '', '-C', '.+', sub {
4820 ($changesfile) = (@_);
4821 if ($changesfile =~ s#^(.*)/##) {
4822 $buildproductsdir = $1;
4826 defvalopt '--initiator-tempdir','','.*', sub {
4827 ($initiator_tempdir) = (@_);
4828 $initiator_tempdir =~ m#^/# or
4829 badusage "--initiator-tempdir must be used specify an".
4830 " absolute, not relative, directory."
4836 if (defined $ENV{'DGIT_SSH'}) {
4837 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
4838 } elsif (defined $ENV{'GIT_SSH'}) {
4839 @ssh = ($ENV{'GIT_SSH'});
4847 if (!defined $val) {
4848 badusage "$what needs a value" unless @ARGV;
4850 push @rvalopts, $val;
4852 badusage "bad value \`$val' for $what" unless
4853 $val =~ m/^$oi->{Re}$(?!\n)/s;
4854 my $how = $oi->{How};
4855 if (ref($how) eq 'SCALAR') {
4860 push @ropts, @rvalopts;
4864 last unless $ARGV[0] =~ m/^-/;
4868 if (m/^--dry-run$/) {
4871 } elsif (m/^--damp-run$/) {
4874 } elsif (m/^--no-sign$/) {
4877 } elsif (m/^--help$/) {
4879 } elsif (m/^--version$/) {
4881 } elsif (m/^--new$/) {
4884 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
4885 ($om = $opts_opt_map{$1}) &&
4889 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
4890 !$opts_opt_cmdonly{$1} &&
4891 ($om = $opts_opt_map{$1})) {
4894 } elsif (m/^--ignore-dirty$/s) {
4897 } elsif (m/^--no-quilt-fixup$/s) {
4899 $quilt_mode = 'nocheck';
4900 } elsif (m/^--no-rm-on-error$/s) {
4903 } elsif (m/^--overwrite$/s) {
4905 $overwrite_version = '';
4906 } elsif (m/^--overwrite=(.+)$/s) {
4908 $overwrite_version = $1;
4909 } elsif (m/^--(no-)?rm-old-changes$/s) {
4912 } elsif (m/^--deliberately-($deliberately_re)$/s) {
4914 push @deliberatelies, $&;
4915 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
4916 # undocumented, for testing
4918 $tagformat_want = [ $1, 'command line', 1 ];
4919 # 1 menas overrides distro configuration
4920 } elsif (m/^--always-split-source-build$/s) {
4921 # undocumented, for testing
4923 $need_split_build_invocation = 1;
4924 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
4925 $val = $2 ? $' : undef; #';
4926 $valopt->($oi->{Long});
4928 badusage "unknown long option \`$_'";
4935 } elsif (s/^-L/-/) {
4938 } elsif (s/^-h/-/) {
4940 } elsif (s/^-D/-/) {
4944 } elsif (s/^-N/-/) {
4949 push @changesopts, $_;
4951 } elsif (s/^-wn$//s) {
4953 $cleanmode = 'none';
4954 } elsif (s/^-wg$//s) {
4957 } elsif (s/^-wgf$//s) {
4959 $cleanmode = 'git-ff';
4960 } elsif (s/^-wd$//s) {
4962 $cleanmode = 'dpkg-source';
4963 } elsif (s/^-wdd$//s) {
4965 $cleanmode = 'dpkg-source-d';
4966 } elsif (s/^-wc$//s) {
4968 $cleanmode = 'check';
4969 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
4971 $val = undef unless length $val;
4972 $valopt->($oi->{Short});
4975 badusage "unknown short option \`$_'";
4982 sub finalise_opts_opts () {
4983 foreach my $k (keys %opts_opt_map) {
4984 my $om = $opts_opt_map{$k};
4986 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
4988 badcfg "cannot set command for $k"
4989 unless length $om->[0];
4993 foreach my $c (access_cfg_cfgs("opts-$k")) {
4994 my $vl = $gitcfg{$c};
4995 printdebug "CL $c ",
4996 ($vl ? join " ", map { shellquote } @$vl : ""),
4997 "\n" if $debuglevel >= 4;
4999 badcfg "cannot configure options for $k"
5000 if $opts_opt_cmdonly{$k};
5001 my $insertpos = $opts_cfg_insertpos{$k};
5002 @$om = ( @$om[0..$insertpos-1],
5004 @$om[$insertpos..$#$om] );
5009 if ($ENV{$fakeeditorenv}) {
5011 quilt_fixup_editor();
5017 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5018 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5019 if $dryrun_level == 1;
5021 print STDERR $helpmsg or die $!;
5024 my $cmd = shift @ARGV;
5027 if (!defined $rmchanges) {
5028 local $access_forpush;
5029 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5032 if (!defined $quilt_mode) {
5033 local $access_forpush;
5034 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5035 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5037 $quilt_mode =~ m/^($quilt_modes_re)$/
5038 or badcfg "unknown quilt-mode \`$quilt_mode'";
5042 $need_split_build_invocation ||= quiltmode_splitbrain();
5044 if (!defined $cleanmode) {
5045 local $access_forpush;
5046 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5047 $cleanmode //= 'dpkg-source';
5049 badcfg "unknown clean-mode \`$cleanmode'" unless
5050 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5053 my $fn = ${*::}{"cmd_$cmd"};
5054 $fn or badusage "unknown operation $cmd";