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);
40 our $our_version = 'UNRELEASED'; ###substituted###
42 our @rpushprotovsn_support = qw(3 2);
45 our $isuite = 'unstable';
51 our $dryrun_level = 0;
53 our $buildproductsdir = '..';
59 our $existing_package = 'dpkg';
61 our $changes_since_version;
64 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|unapplied';
65 our $we_are_responder;
66 our $initiator_tempdir;
68 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
70 our $suite_re = '[-+.0-9a-z]+';
71 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
73 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
74 our $splitbraincache = 'dgit-intern/quilt-cache';
77 our (@dget) = qw(dget);
78 our (@curl) = qw(curl -f);
79 our (@dput) = qw(dput);
80 our (@debsign) = qw(debsign);
82 our (@sbuild) = qw(sbuild);
84 our (@dgit) = qw(dgit);
85 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
86 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
87 our (@dpkggenchanges) = qw(dpkg-genchanges);
88 our (@mergechanges) = qw(mergechanges -f);
89 our (@gbppq) = qw(gbp-pq);
90 our (@changesopts) = ('');
92 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
95 'debsign' => \@debsign,
101 'dpkg-source' => \@dpkgsource,
102 'dpkg-buildpackage' => \@dpkgbuildpackage,
103 'dpkg-genchanges' => \@dpkggenchanges,
104 'ch' => \@changesopts,
105 'mergechanges' => \@mergechanges);
107 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
108 our %opts_cfg_insertpos = map {
110 scalar @{ $opts_opt_map{$_} }
111 } keys %opts_opt_map;
113 sub finalise_opts_opts();
119 our $supplementary_message = '';
120 our $need_split_build_invocation = 0;
121 our $split_brain = 0;
125 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
128 our $remotename = 'dgit';
129 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
133 sub lbranch () { return "$branchprefix/$csuite"; }
134 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
135 sub lref () { return "refs/heads/".lbranch(); }
136 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
137 sub rrref () { return server_ref($csuite); }
139 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
149 return "${package}_".(stripepoch $vsn).$sfx
154 return srcfn($vsn,".dsc");
157 sub changespat ($;$) {
158 my ($vsn, $arch) = @_;
159 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
168 foreach my $f (@end) {
170 print STDERR "$us: cleanup: $@" if length $@;
174 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
176 sub no_such_package () {
177 print STDERR "$us: package $package does not exist in suite $isuite\n";
183 return "+".rrref().":".lrref();
188 printdebug "CD $newdir\n";
189 chdir $newdir or die "chdir: $newdir: $!";
192 sub deliberately ($) {
194 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
197 sub deliberately_not_fast_forward () {
198 foreach (qw(not-fast-forward fresh-repo)) {
199 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
203 sub quiltmode_splitbrain () {
204 $quilt_mode =~ m/gbp|dpm|unapplied/;
207 #---------- remote protocol support, common ----------
209 # remote push initiator/responder protocol:
210 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
211 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
212 # < dgit-remote-push-ready <actual-proto-vsn>
214 # > file parsed-changelog
215 # [indicates that output of dpkg-parsechangelog follows]
216 # > data-block NBYTES
217 # > [NBYTES bytes of data (no newline)]
218 # [maybe some more blocks]
230 # [indicates that signed tag is wanted]
231 # < data-block NBYTES
232 # < [NBYTES bytes of data (no newline)]
233 # [maybe some more blocks]
237 # > want signed-dsc-changes
238 # < data-block NBYTES [transfer of signed dsc]
240 # < data-block NBYTES [transfer of signed changes]
248 sub i_child_report () {
249 # Sees if our child has died, and reap it if so. Returns a string
250 # describing how it died if it failed, or undef otherwise.
251 return undef unless $i_child_pid;
252 my $got = waitpid $i_child_pid, WNOHANG;
253 return undef if $got <= 0;
254 die unless $got == $i_child_pid;
255 $i_child_pid = undef;
256 return undef unless $?;
257 return "build host child ".waitstatusmsg();
262 fail "connection lost: $!" if $fh->error;
263 fail "protocol violation; $m not expected";
266 sub badproto_badread ($$) {
268 fail "connection lost: $!" if $!;
269 my $report = i_child_report();
270 fail $report if defined $report;
271 badproto $fh, "eof (reading $wh)";
274 sub protocol_expect (&$) {
275 my ($match, $fh) = @_;
278 defined && chomp or badproto_badread $fh, "protocol message";
286 badproto $fh, "\`$_'";
289 sub protocol_send_file ($$) {
290 my ($fh, $ourfn) = @_;
291 open PF, "<", $ourfn or die "$ourfn: $!";
294 my $got = read PF, $d, 65536;
295 die "$ourfn: $!" unless defined $got;
297 print $fh "data-block ".length($d)."\n" or die $!;
298 print $fh $d or die $!;
300 PF->error and die "$ourfn $!";
301 print $fh "data-end\n" or die $!;
305 sub protocol_read_bytes ($$) {
306 my ($fh, $nbytes) = @_;
307 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
309 my $got = read $fh, $d, $nbytes;
310 $got==$nbytes or badproto_badread $fh, "data block";
314 sub protocol_receive_file ($$) {
315 my ($fh, $ourfn) = @_;
316 printdebug "() $ourfn\n";
317 open PF, ">", $ourfn or die "$ourfn: $!";
319 my ($y,$l) = protocol_expect {
320 m/^data-block (.*)$/ ? (1,$1) :
321 m/^data-end$/ ? (0,) :
325 my $d = protocol_read_bytes $fh, $l;
326 print PF $d or die $!;
331 #---------- remote protocol support, responder ----------
333 sub responder_send_command ($) {
335 return unless $we_are_responder;
336 # called even without $we_are_responder
337 printdebug ">> $command\n";
338 print PO $command, "\n" or die $!;
341 sub responder_send_file ($$) {
342 my ($keyword, $ourfn) = @_;
343 return unless $we_are_responder;
344 printdebug "]] $keyword $ourfn\n";
345 responder_send_command "file $keyword";
346 protocol_send_file \*PO, $ourfn;
349 sub responder_receive_files ($@) {
350 my ($keyword, @ourfns) = @_;
351 die unless $we_are_responder;
352 printdebug "[[ $keyword @ourfns\n";
353 responder_send_command "want $keyword";
354 foreach my $fn (@ourfns) {
355 protocol_receive_file \*PI, $fn;
358 protocol_expect { m/^files-end$/ } \*PI;
361 #---------- remote protocol support, initiator ----------
363 sub initiator_expect (&) {
365 protocol_expect { &$match } \*RO;
368 #---------- end remote code ----------
371 if ($we_are_responder) {
373 responder_send_command "progress ".length($m) or die $!;
374 print PO $m or die $!;
384 $ua = LWP::UserAgent->new();
388 progress "downloading $what...";
389 my $r = $ua->get(@_) or die $!;
390 return undef if $r->code == 404;
391 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
392 return $r->decoded_content(charset => 'none');
395 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
400 failedcmd @_ if system @_;
403 sub act_local () { return $dryrun_level <= 1; }
404 sub act_scary () { return !$dryrun_level; }
407 if (!$dryrun_level) {
408 progress "dgit ok: @_";
410 progress "would be ok: @_ (but dry run only)";
415 printcmd(\*STDERR,$debugprefix."#",@_);
418 sub runcmd_ordryrun {
426 sub runcmd_ordryrun_local {
435 my ($first_shell, @cmd) = @_;
436 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
439 our $helpmsg = <<END;
441 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
442 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
443 dgit [dgit-opts] build [dpkg-buildpackage-opts]
444 dgit [dgit-opts] sbuild [sbuild-opts]
445 dgit [dgit-opts] push [dgit-opts] [suite]
446 dgit [dgit-opts] rpush build-host:build-dir ...
447 important dgit options:
448 -k<keyid> sign tag and package with <keyid> instead of default
449 --dry-run -n do not change anything, but go through the motions
450 --damp-run -L like --dry-run but make local changes, without signing
451 --new -N allow introducing a new package
452 --debug -D increase debug level
453 -c<name>=<value> set git config option (used directly by dgit too)
456 our $later_warning_msg = <<END;
457 Perhaps the upload is stuck in incoming. Using the version from git.
461 print STDERR "$us: @_\n", $helpmsg or die $!;
466 @ARGV or badusage "too few arguments";
467 return scalar shift @ARGV;
471 print $helpmsg or die $!;
475 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
477 our %defcfg = ('dgit.default.distro' => 'debian',
478 'dgit.default.username' => '',
479 'dgit.default.archive-query-default-component' => 'main',
480 'dgit.default.ssh' => 'ssh',
481 'dgit.default.archive-query' => 'madison:',
482 'dgit.default.sshpsql-dbname' => 'service=projectb',
483 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
484 'dgit-distro.debian.git-check' => 'url',
485 'dgit-distro.debian.git-check-suffix' => '/info/refs',
486 'dgit-distro.debian.new-private-pushers' => 't',
487 'dgit-distro.debian/push.git-url' => '',
488 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
489 'dgit-distro.debian/push.git-user-force' => 'dgit',
490 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
491 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
492 'dgit-distro.debian/push.git-create' => 'true',
493 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
494 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
495 # 'dgit-distro.debian.archive-query-tls-key',
496 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
497 # ^ this does not work because curl is broken nowadays
498 # Fixing #790093 properly will involve providing providing the key
499 # in some pacagke and maybe updating these paths.
501 # 'dgit-distro.debian.archive-query-tls-curl-args',
502 # '--ca-path=/etc/ssl/ca-debian',
503 # ^ this is a workaround but works (only) on DSA-administered machines
504 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
505 'dgit-distro.debian.git-url-suffix' => '',
506 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
507 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
508 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
509 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
510 'dgit-distro.ubuntu.git-check' => 'false',
511 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
512 'dgit-distro.test-dummy.ssh' => "$td/ssh",
513 'dgit-distro.test-dummy.username' => "alice",
514 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
515 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
516 'dgit-distro.test-dummy.git-url' => "$td/git",
517 'dgit-distro.test-dummy.git-host' => "git",
518 'dgit-distro.test-dummy.git-path' => "$td/git",
519 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
520 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
521 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
522 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
527 sub git_slurp_config () {
528 local ($debuglevel) = $debuglevel-2;
531 my @cmd = (@git, qw(config -z --get-regexp .*));
534 open GITS, "-|", @cmd or failedcmd @cmd;
537 printdebug "=> ", (messagequote $_), "\n";
539 push @{ $gitcfg{$`} }, $'; #';
543 or ($!==0 && $?==256)
547 sub git_get_config ($) {
550 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
553 @$l==1 or badcfg "multiple values for $c" if @$l > 1;
559 return undef if $c =~ /RETURN-UNDEF/;
560 my $v = git_get_config($c);
561 return $v if defined $v;
562 my $dv = $defcfg{$c};
563 return $dv if defined $dv;
565 badcfg "need value for one of: @_\n".
566 "$us: distro or suite appears not to be (properly) supported";
569 sub access_basedistro () {
570 if (defined $idistro) {
573 return cfg("dgit-suite.$isuite.distro",
574 "dgit.default.distro");
578 sub access_quirk () {
579 # returns (quirk name, distro to use instead or undef, quirk-specific info)
580 my $basedistro = access_basedistro();
581 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
583 if (defined $backports_quirk) {
584 my $re = $backports_quirk;
585 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
587 $re =~ s/\%/([-0-9a-z_]+)/
588 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
589 if ($isuite =~ m/^$re$/) {
590 return ('backports',"$basedistro-backports",$1);
593 return ('none',undef);
598 sub parse_cfg_bool ($$$) {
599 my ($what,$def,$v) = @_;
602 $v =~ m/^[ty1]/ ? 1 :
603 $v =~ m/^[fn0]/ ? 0 :
604 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
607 sub access_forpush_config () {
608 my $d = access_basedistro();
612 parse_cfg_bool('new-private-pushers', 0,
613 cfg("dgit-distro.$d.new-private-pushers",
616 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
619 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
620 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
621 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
622 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
625 sub access_forpush () {
626 $access_forpush //= access_forpush_config();
627 return $access_forpush;
631 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
632 badcfg "pushing but distro is configured readonly"
633 if access_forpush_config() eq '0';
635 $supplementary_message = <<'END' unless $we_are_responder;
636 Push failed, before we got started.
637 You can retry the push, after fixing the problem, if you like.
639 finalise_opts_opts();
643 finalise_opts_opts();
646 sub supplementary_message ($) {
648 if (!$we_are_responder) {
649 $supplementary_message = $msg;
651 } elsif ($protovsn >= 3) {
652 responder_send_command "supplementary-message ".length($msg)
654 print PO $msg or die $!;
658 sub access_distros () {
659 # Returns list of distros to try, in order
662 # 0. `instead of' distro name(s) we have been pointed to
663 # 1. the access_quirk distro, if any
664 # 2a. the user's specified distro, or failing that } basedistro
665 # 2b. the distro calculated from the suite }
666 my @l = access_basedistro();
668 my (undef,$quirkdistro) = access_quirk();
669 unshift @l, $quirkdistro;
670 unshift @l, $instead_distro;
671 @l = grep { defined } @l;
673 if (access_forpush()) {
674 @l = map { ("$_/push", $_) } @l;
679 sub access_cfg_cfgs (@) {
682 # The nesting of these loops determines the search order. We put
683 # the key loop on the outside so that we search all the distros
684 # for each key, before going on to the next key. That means that
685 # if access_cfg is called with a more specific, and then a less
686 # specific, key, an earlier distro can override the less specific
687 # without necessarily overriding any more specific keys. (If the
688 # distro wants to override the more specific keys it can simply do
689 # so; whereas if we did the loop the other way around, it would be
690 # impossible to for an earlier distro to override a less specific
691 # key but not the more specific ones without restating the unknown
692 # values of the more specific keys.
695 # We have to deal with RETURN-UNDEF specially, so that we don't
696 # terminate the search prematurely.
698 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
701 foreach my $d (access_distros()) {
702 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
704 push @cfgs, map { "dgit.default.$_" } @realkeys;
711 my (@cfgs) = access_cfg_cfgs(@keys);
712 my $value = cfg(@cfgs);
716 sub access_cfg_bool ($$) {
717 my ($def, @keys) = @_;
718 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
721 sub string_to_ssh ($) {
723 if ($spec =~ m/\s/) {
724 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
730 sub access_cfg_ssh () {
731 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
732 if (!defined $gitssh) {
735 return string_to_ssh $gitssh;
739 sub access_runeinfo ($) {
741 return ": dgit ".access_basedistro()." $info ;";
744 sub access_someuserhost ($) {
746 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
747 defined($user) && length($user) or
748 $user = access_cfg("$some-user",'username');
749 my $host = access_cfg("$some-host");
750 return length($user) ? "$user\@$host" : $host;
753 sub access_gituserhost () {
754 return access_someuserhost('git');
757 sub access_giturl (;$) {
759 my $url = access_cfg('git-url','RETURN-UNDEF');
762 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
763 return undef unless defined $proto;
766 access_gituserhost().
767 access_cfg('git-path');
769 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
772 return "$url/$package$suffix";
775 sub parsecontrolfh ($$;$) {
776 my ($fh, $desc, $allowsigned) = @_;
777 our $dpkgcontrolhash_noissigned;
780 my %opts = ('name' => $desc);
781 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
782 $c = Dpkg::Control::Hash->new(%opts);
783 $c->parse($fh,$desc) or die "parsing of $desc failed";
784 last if $allowsigned;
785 last if $dpkgcontrolhash_noissigned;
786 my $issigned= $c->get_option('is_pgp_signed');
787 if (!defined $issigned) {
788 $dpkgcontrolhash_noissigned= 1;
789 seek $fh, 0,0 or die "seek $desc: $!";
790 } elsif ($issigned) {
791 fail "control file $desc is (already) PGP-signed. ".
792 " Note that dgit push needs to modify the .dsc and then".
793 " do the signature itself";
802 my ($file, $desc) = @_;
803 my $fh = new IO::Handle;
804 open $fh, '<', $file or die "$file: $!";
805 my $c = parsecontrolfh($fh,$desc);
806 $fh->error and die $!;
812 my ($dctrl,$field) = @_;
813 my $v = $dctrl->{$field};
814 return $v if defined $v;
815 fail "missing field $field in ".$v->get_option('name');
819 my $c = Dpkg::Control::Hash->new();
820 my $p = new IO::Handle;
821 my @cmd = (qw(dpkg-parsechangelog), @_);
822 open $p, '-|', @cmd or die $!;
824 $?=0; $!=0; close $p or failedcmd @cmd;
830 defined $d or fail "getcwd failed: $!";
836 sub archive_query ($) {
838 my $query = access_cfg('archive-query','RETURN-UNDEF');
839 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
842 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
845 sub pool_dsc_subpath ($$) {
846 my ($vsn,$component) = @_; # $package is implict arg
847 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
848 return "/pool/$component/$prefix/$package/".dscfn($vsn);
851 #---------- `ftpmasterapi' archive query method (nascent) ----------
853 sub archive_api_query_cmd ($) {
855 my @cmd = qw(curl -sS);
856 my $url = access_cfg('archive-query-url');
857 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
859 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
860 foreach my $key (split /\:/, $keys) {
861 $key =~ s/\%HOST\%/$host/g;
863 fail "for $url: stat $key: $!" unless $!==ENOENT;
866 fail "config requested specific TLS key but do not know".
867 " how to get curl to use exactly that EE key ($key)";
868 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
869 # # Sadly the above line does not work because of changes
870 # # to gnutls. The real fix for #790093 may involve
871 # # new curl options.
874 # Fixing #790093 properly will involve providing a value
875 # for this on clients.
876 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
877 push @cmd, split / /, $kargs if defined $kargs;
879 push @cmd, $url.$subpath;
885 my ($data, $subpath) = @_;
886 badcfg "ftpmasterapi archive query method takes no data part"
888 my @cmd = archive_api_query_cmd($subpath);
889 my $json = cmdoutput @cmd;
890 return decode_json($json);
893 sub canonicalise_suite_ftpmasterapi () {
894 my ($proto,$data) = @_;
895 my $suites = api_query($data, 'suites');
897 foreach my $entry (@$suites) {
899 my $v = $entry->{$_};
900 defined $v && $v eq $isuite;
902 push @matched, $entry;
904 fail "unknown suite $isuite" unless @matched;
907 @matched==1 or die "multiple matches for suite $isuite\n";
908 $cn = "$matched[0]{codename}";
909 defined $cn or die "suite $isuite info has no codename\n";
910 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
912 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
917 sub archive_query_ftpmasterapi () {
918 my ($proto,$data) = @_;
919 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
921 my $digester = Digest::SHA->new(256);
922 foreach my $entry (@$info) {
924 my $vsn = "$entry->{version}";
925 my ($ok,$msg) = version_check $vsn;
926 die "bad version: $msg\n" unless $ok;
927 my $component = "$entry->{component}";
928 $component =~ m/^$component_re$/ or die "bad component";
929 my $filename = "$entry->{filename}";
930 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
931 or die "bad filename";
932 my $sha256sum = "$entry->{sha256sum}";
933 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
934 push @rows, [ $vsn, "/pool/$component/$filename",
935 $digester, $sha256sum ];
937 die "bad ftpmaster api response: $@\n".Dumper($entry)
940 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
944 #---------- `madison' archive query method ----------
946 sub archive_query_madison {
947 return map { [ @$_[0..1] ] } madison_get_parse(@_);
950 sub madison_get_parse {
951 my ($proto,$data) = @_;
952 die unless $proto eq 'madison';
954 $data= access_cfg('madison-distro','RETURN-UNDEF');
955 $data //= access_basedistro();
957 $rmad{$proto,$data,$package} ||= cmdoutput
958 qw(rmadison -asource),"-s$isuite","-u$data",$package;
959 my $rmad = $rmad{$proto,$data,$package};
962 foreach my $l (split /\n/, $rmad) {
963 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
964 \s*( [^ \t|]+ )\s* \|
965 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
966 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
967 $1 eq $package or die "$rmad $package ?";
974 $component = access_cfg('archive-query-default-component');
976 $5 eq 'source' or die "$rmad ?";
977 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
979 return sort { -version_compare($a->[0],$b->[0]); } @out;
982 sub canonicalise_suite_madison {
983 # madison canonicalises for us
984 my @r = madison_get_parse(@_);
986 "unable to canonicalise suite using package $package".
987 " which does not appear to exist in suite $isuite;".
988 " --existing-package may help";
992 #---------- `sshpsql' archive query method ----------
995 my ($data,$runeinfo,$sql) = @_;
997 $data= access_someuserhost('sshpsql').':'.
998 access_cfg('sshpsql-dbname');
1000 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1001 my ($userhost,$dbname) = ($`,$'); #';
1003 my @cmd = (access_cfg_ssh, $userhost,
1004 access_runeinfo("ssh-psql $runeinfo").
1005 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1006 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1008 open P, "-|", @cmd or die $!;
1011 printdebug(">|$_|\n");
1014 $!=0; $?=0; close P or failedcmd @cmd;
1016 my $nrows = pop @rows;
1017 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1018 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1019 @rows = map { [ split /\|/, $_ ] } @rows;
1020 my $ncols = scalar @{ shift @rows };
1021 die if grep { scalar @$_ != $ncols } @rows;
1025 sub sql_injection_check {
1026 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1029 sub archive_query_sshpsql ($$) {
1030 my ($proto,$data) = @_;
1031 sql_injection_check $isuite, $package;
1032 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1033 SELECT source.version, component.name, files.filename, files.sha256sum
1035 JOIN src_associations ON source.id = src_associations.source
1036 JOIN suite ON suite.id = src_associations.suite
1037 JOIN dsc_files ON dsc_files.source = source.id
1038 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1039 JOIN component ON component.id = files_archive_map.component_id
1040 JOIN files ON files.id = dsc_files.file
1041 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1042 AND source.source='$package'
1043 AND files.filename LIKE '%.dsc';
1045 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1046 my $digester = Digest::SHA->new(256);
1048 my ($vsn,$component,$filename,$sha256sum) = @$_;
1049 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1054 sub canonicalise_suite_sshpsql ($$) {
1055 my ($proto,$data) = @_;
1056 sql_injection_check $isuite;
1057 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1058 SELECT suite.codename
1059 FROM suite where suite_name='$isuite' or codename='$isuite';
1061 @rows = map { $_->[0] } @rows;
1062 fail "unknown suite $isuite" unless @rows;
1063 die "ambiguous $isuite: @rows ?" if @rows>1;
1067 #---------- `dummycat' archive query method ----------
1069 sub canonicalise_suite_dummycat ($$) {
1070 my ($proto,$data) = @_;
1071 my $dpath = "$data/suite.$isuite";
1072 if (!open C, "<", $dpath) {
1073 $!==ENOENT or die "$dpath: $!";
1074 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1078 chomp or die "$dpath: $!";
1080 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1084 sub archive_query_dummycat ($$) {
1085 my ($proto,$data) = @_;
1086 canonicalise_suite();
1087 my $dpath = "$data/package.$csuite.$package";
1088 if (!open C, "<", $dpath) {
1089 $!==ENOENT or die "$dpath: $!";
1090 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1098 printdebug "dummycat query $csuite $package $dpath | $_\n";
1099 my @row = split /\s+/, $_;
1100 @row==2 or die "$dpath: $_ ?";
1103 C->error and die "$dpath: $!";
1105 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1108 #---------- archive query entrypoints and rest of program ----------
1110 sub canonicalise_suite () {
1111 return if defined $csuite;
1112 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1113 $csuite = archive_query('canonicalise_suite');
1114 if ($isuite ne $csuite) {
1115 progress "canonical suite name for $isuite is $csuite";
1119 sub get_archive_dsc () {
1120 canonicalise_suite();
1121 my @vsns = archive_query('archive_query');
1122 foreach my $vinfo (@vsns) {
1123 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1124 $dscurl = access_cfg('mirror').$subpath;
1125 $dscdata = url_get($dscurl);
1127 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1132 $digester->add($dscdata);
1133 my $got = $digester->hexdigest();
1135 fail "$dscurl has hash $got but".
1136 " archive told us to expect $digest";
1138 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1139 printdebug Dumper($dscdata) if $debuglevel>1;
1140 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1141 printdebug Dumper($dsc) if $debuglevel>1;
1142 my $fmt = getfield $dsc, 'Format';
1143 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
1144 $dsc_checked = !!$digester;
1150 sub check_for_git ();
1151 sub check_for_git () {
1153 my $how = access_cfg('git-check');
1154 if ($how eq 'ssh-cmd') {
1156 (access_cfg_ssh, access_gituserhost(),
1157 access_runeinfo("git-check $package").
1158 " set -e; cd ".access_cfg('git-path').";".
1159 " if test -d $package.git; then echo 1; else echo 0; fi");
1160 my $r= cmdoutput @cmd;
1161 if ($r =~ m/^divert (\w+)$/) {
1163 my ($usedistro,) = access_distros();
1164 # NB that if we are pushing, $usedistro will be $distro/push
1165 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1166 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1167 progress "diverting to $divert (using config for $instead_distro)";
1168 return check_for_git();
1170 failedcmd @cmd unless $r =~ m/^[01]$/;
1172 } elsif ($how eq 'url') {
1173 my $prefix = access_cfg('git-check-url','git-url');
1174 my $suffix = access_cfg('git-check-suffix','git-suffix',
1175 'RETURN-UNDEF') // '.git';
1176 my $url = "$prefix/$package$suffix";
1177 my @cmd = (qw(curl -sS -I), $url);
1178 my $result = cmdoutput @cmd;
1179 $result =~ s/^\S+ 200 .*\n\r?\n//;
1180 # curl -sS -I with https_proxy prints
1181 # HTTP/1.0 200 Connection established
1182 $result =~ m/^\S+ (404|200) /s or
1183 fail "unexpected results from git check query - ".
1184 Dumper($prefix, $result);
1186 if ($code eq '404') {
1188 } elsif ($code eq '200') {
1193 } elsif ($how eq 'true') {
1195 } elsif ($how eq 'false') {
1198 badcfg "unknown git-check \`$how'";
1202 sub create_remote_git_repo () {
1203 my $how = access_cfg('git-create');
1204 if ($how eq 'ssh-cmd') {
1206 (access_cfg_ssh, access_gituserhost(),
1207 access_runeinfo("git-create $package").
1208 "set -e; cd ".access_cfg('git-path').";".
1209 " cp -a _template $package.git");
1210 } elsif ($how eq 'true') {
1213 badcfg "unknown git-create \`$how'";
1217 our ($dsc_hash,$lastpush_hash);
1219 our $ud = '.git/dgit/unpack';
1229 sub mktree_in_ud_here () {
1230 runcmd qw(git init -q);
1231 rmtree('.git/objects');
1232 symlink '../../../../objects','.git/objects' or die $!;
1235 sub git_write_tree () {
1236 my $tree = cmdoutput @git, qw(write-tree);
1237 $tree =~ m/^\w+$/ or die "$tree ?";
1241 sub remove_stray_gits () {
1242 my @gitscmd = qw(find -name .git -prune -print0);
1243 debugcmd "|",@gitscmd;
1244 open GITS, "-|", @gitscmd or failedcmd @gitscmd;
1249 print STDERR "$us: warning: removing from source package: ",
1250 (messagequote $_), "\n";
1254 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1257 sub mktree_in_ud_from_only_subdir () {
1258 # changes into the subdir
1260 die unless @dirs==1;
1261 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1265 remove_stray_gits();
1266 mktree_in_ud_here();
1267 my ($format, $fopts) = get_source_format();
1268 if (madformat($format)) {
1271 runcmd @git, qw(add -Af);
1272 my $tree=git_write_tree();
1273 return ($tree,$dir);
1276 sub dsc_files_info () {
1277 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1278 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1279 ['Files', 'Digest::MD5', 'new()']) {
1280 my ($fname, $module, $method) = @$csumi;
1281 my $field = $dsc->{$fname};
1282 next unless defined $field;
1283 eval "use $module; 1;" or die $@;
1285 foreach (split /\n/, $field) {
1287 m/^(\w+) (\d+) (\S+)$/ or
1288 fail "could not parse .dsc $fname line \`$_'";
1289 my $digester = eval "$module"."->$method;" or die $@;
1294 Digester => $digester,
1299 fail "missing any supported Checksums-* or Files field in ".
1300 $dsc->get_option('name');
1304 map { $_->{Filename} } dsc_files_info();
1307 sub is_orig_file ($;$) {
1310 m/\.orig(?:-\w+)?\.tar\.\w+$/ or return 0;
1311 defined $base or return 1;
1315 sub make_commit ($) {
1317 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1320 sub clogp_authline ($) {
1322 my $author = getfield $clogp, 'Maintainer';
1323 $author =~ s#,.*##ms;
1324 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1325 my $authline = "$author $date";
1326 $authline =~ m/$git_authline_re/o or
1327 fail "unexpected commit author line format \`$authline'".
1328 " (was generated from changelog Maintainer field)";
1329 return ($1,$2,$3) if wantarray;
1333 sub vendor_patches_distro ($$) {
1334 my ($checkdistro, $what) = @_;
1335 return unless defined $checkdistro;
1337 my $series = "debian/patches/\L$checkdistro\E.series";
1338 printdebug "checking for vendor-specific $series ($what)\n";
1340 if (!open SERIES, "<", $series) {
1341 die "$series $!" unless $!==ENOENT;
1350 Unfortunately, this source package uses a feature of dpkg-source where
1351 the same source package unpacks to different source code on different
1352 distros. dgit cannot safely operate on such packages on affected
1353 distros, because the meaning of source packages is not stable.
1355 Please ask the distro/maintainer to remove the distro-specific series
1356 files and use a different technique (if necessary, uploading actually
1357 different packages, if different distros are supposed to have
1361 fail "Found active distro-specific series file for".
1362 " $checkdistro ($what): $series, cannot continue";
1364 die "$series $!" if SERIES->error;
1368 sub check_for_vendor_patches () {
1369 # This dpkg-source feature doesn't seem to be documented anywhere!
1370 # But it can be found in the changelog (reformatted):
1372 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1373 # Author: Raphael Hertzog <hertzog@debian.org>
1374 # Date: Sun Oct 3 09:36:48 2010 +0200
1376 # dpkg-source: correctly create .pc/.quilt_series with alternate
1379 # If you have debian/patches/ubuntu.series and you were
1380 # unpacking the source package on ubuntu, quilt was still
1381 # directed to debian/patches/series instead of
1382 # debian/patches/ubuntu.series.
1384 # debian/changelog | 3 +++
1385 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1386 # 2 files changed, 6 insertions(+), 1 deletion(-)
1389 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1390 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1391 "Dpkg::Vendor \`current vendor'");
1392 vendor_patches_distro(access_basedistro(),
1393 "distro being accessed");
1396 sub generate_commit_from_dsc () {
1400 foreach my $fi (dsc_files_info()) {
1401 my $f = $fi->{Filename};
1402 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1404 link_ltarget "../../../$f", $f
1408 complete_file_from_dsc('.', $fi)
1411 if (is_orig_file($f)) {
1412 link $f, "../../../../$f"
1418 my $dscfn = "$package.dsc";
1420 open D, ">", $dscfn or die "$dscfn: $!";
1421 print D $dscdata or die "$dscfn: $!";
1422 close D or die "$dscfn: $!";
1423 my @cmd = qw(dpkg-source);
1424 push @cmd, '--no-check' if $dsc_checked;
1425 push @cmd, qw(-x --), $dscfn;
1428 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1429 check_for_vendor_patches() if madformat($dsc->{format});
1430 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
1431 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
1432 my $authline = clogp_authline $clogp;
1433 my $changes = getfield $clogp, 'Changes';
1434 open C, ">../commit.tmp" or die $!;
1435 print C <<END or die $!;
1442 # imported from the archive
1445 my $outputhash = make_commit qw(../commit.tmp);
1446 my $cversion = getfield $clogp, 'Version';
1447 progress "synthesised git commit from .dsc $cversion";
1448 if ($lastpush_hash) {
1449 runcmd @git, qw(reset --hard), $lastpush_hash;
1450 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
1451 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
1452 my $oversion = getfield $oldclogp, 'Version';
1454 version_compare($oversion, $cversion);
1456 # git upload/ is earlier vsn than archive, use archive
1457 open C, ">../commit2.tmp" or die $!;
1458 print C <<END or die $!;
1460 parent $lastpush_hash
1465 Record $package ($cversion) in archive suite $csuite
1467 $outputhash = make_commit qw(../commit2.tmp);
1468 } elsif ($vcmp > 0) {
1469 print STDERR <<END or die $!;
1471 Version actually in archive: $cversion (older)
1472 Last allegedly pushed/uploaded: $oversion (newer or same)
1475 $outputhash = $lastpush_hash;
1477 $outputhash = $lastpush_hash;
1480 changedir '../../../..';
1481 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
1482 'DGIT_ARCHIVE', $outputhash;
1483 cmdoutput @git, qw(log -n2), $outputhash;
1484 # ... gives git a chance to complain if our commit is malformed
1489 sub complete_file_from_dsc ($$) {
1490 our ($dstdir, $fi) = @_;
1491 # Ensures that we have, in $dir, the file $fi, with the correct
1492 # contents. (Downloading it from alongside $dscurl if necessary.)
1494 my $f = $fi->{Filename};
1495 my $tf = "$dstdir/$f";
1498 if (stat_exists $tf) {
1499 progress "using existing $f";
1502 $furl =~ s{/[^/]+$}{};
1504 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
1505 die "$f ?" if $f =~ m#/#;
1506 runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
1507 return 0 if !act_local();
1511 open F, "<", "$tf" or die "$tf: $!";
1512 $fi->{Digester}->reset();
1513 $fi->{Digester}->addfile(*F);
1514 F->error and die $!;
1515 my $got = $fi->{Digester}->hexdigest();
1516 $got eq $fi->{Hash} or
1517 fail "file $f has hash $got but .dsc".
1518 " demands hash $fi->{Hash} ".
1519 ($downloaded ? "(got wrong file from archive!)"
1520 : "(perhaps you should delete this file?)");
1525 sub ensure_we_have_orig () {
1526 foreach my $fi (dsc_files_info()) {
1527 my $f = $fi->{Filename};
1528 next unless is_orig_file($f);
1529 complete_file_from_dsc('..', $fi)
1534 sub git_fetch_us () {
1535 my @specs = (fetchspec());
1537 map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
1539 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(), @specs;
1542 my $tagpat = debiantag('*',access_basedistro);
1544 git_for_each_ref("refs/tags/".$tagpat, sub {
1545 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1546 printdebug "currently $fullrefname=$objid\n";
1547 $here{$fullrefname} = $objid;
1549 git_for_each_ref(lrfetchrefs."/tags/".$tagpat, sub {
1550 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1551 my $lref = "refs".substr($fullrefname, length lrfetchrefs);
1552 printdebug "offered $lref=$objid\n";
1553 if (!defined $here{$lref}) {
1554 my @upd = (@git, qw(update-ref), $lref, $objid, '');
1555 runcmd_ordryrun_local @upd;
1556 } elsif ($here{$lref} eq $objid) {
1559 "Not updateting $lref from $here{$lref} to $objid.\n";
1564 sub fetch_from_archive () {
1565 # ensures that lrref() is what is actually in the archive,
1566 # one way or another
1570 foreach my $field (@ourdscfield) {
1571 $dsc_hash = $dsc->{$field};
1572 last if defined $dsc_hash;
1574 if (defined $dsc_hash) {
1575 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
1577 progress "last upload to archive specified git hash";
1579 progress "last upload to archive has NO git hash";
1582 progress "no version available from the archive";
1585 $lastpush_hash = git_get_ref(lrref());
1586 printdebug "previous reference hash=$lastpush_hash\n";
1588 if (defined $dsc_hash) {
1589 fail "missing remote git history even though dsc has hash -".
1590 " could not find ref ".lrref().
1591 " (should have been fetched from ".access_giturl()."#".rrref().")"
1592 unless $lastpush_hash;
1594 ensure_we_have_orig();
1595 if ($dsc_hash eq $lastpush_hash) {
1596 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
1597 print STDERR <<END or die $!;
1599 Git commit in archive is behind the last version allegedly pushed/uploaded.
1600 Commit referred to by archive: $dsc_hash
1601 Last allegedly pushed/uploaded: $lastpush_hash
1604 $hash = $lastpush_hash;
1606 fail "git head (".lrref()."=$lastpush_hash) is not a ".
1607 "descendant of archive's .dsc hash ($dsc_hash)";
1610 $hash = generate_commit_from_dsc();
1611 } elsif ($lastpush_hash) {
1612 # only in git, not in the archive yet
1613 $hash = $lastpush_hash;
1614 print STDERR <<END or die $!;
1616 Package not found in the archive, but has allegedly been pushed using dgit.
1620 printdebug "nothing found!\n";
1621 if (defined $skew_warning_vsn) {
1622 print STDERR <<END or die $!;
1624 Warning: relevant archive skew detected.
1625 Archive allegedly contains $skew_warning_vsn
1626 But we were not able to obtain any version from the archive or git.
1632 printdebug "current hash=$hash\n";
1633 if ($lastpush_hash) {
1634 fail "not fast forward on last upload branch!".
1635 " (archive's version left in DGIT_ARCHIVE)"
1636 unless is_fast_fwd($lastpush_hash, $hash);
1638 if (defined $skew_warning_vsn) {
1640 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
1641 my $clogf = ".git/dgit/changelog.tmp";
1642 runcmd shell_cmd "exec >$clogf",
1643 @git, qw(cat-file blob), "$hash:debian/changelog";
1644 my $gotclogp = parsechangelog("-l$clogf");
1645 my $got_vsn = getfield $gotclogp, 'Version';
1646 printdebug "SKEW CHECK GOT $got_vsn\n";
1647 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
1648 print STDERR <<END or die $!;
1650 Warning: archive skew detected. Using the available version:
1651 Archive allegedly contains $skew_warning_vsn
1652 We were able to obtain only $got_vsn
1657 if ($lastpush_hash ne $hash) {
1658 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
1662 dryrun_report @upd_cmd;
1668 sub set_local_git_config ($$) {
1670 runcmd @git, qw(config), $k, $v;
1673 sub setup_mergechangelogs (;$) {
1675 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
1677 my $driver = 'dpkg-mergechangelogs';
1678 my $cb = "merge.$driver";
1679 my $attrs = '.git/info/attributes';
1680 ensuredir '.git/info';
1682 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
1683 if (!open ATTRS, "<", $attrs) {
1684 $!==ENOENT or die "$attrs: $!";
1688 next if m{^debian/changelog\s};
1689 print NATTRS $_, "\n" or die $!;
1691 ATTRS->error and die $!;
1694 print NATTRS "debian/changelog merge=$driver\n" or die $!;
1697 set_local_git_config "$cb.name", 'debian/changelog merge driver';
1698 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
1700 rename "$attrs.new", "$attrs" or die "$attrs: $!";
1703 sub setup_useremail (;$) {
1705 return unless $always || access_cfg_bool(1, 'setup-useremail');
1708 my ($k, $envvar) = @_;
1709 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
1710 return unless defined $v;
1711 set_local_git_config "user.$k", $v;
1714 $setup->('email', 'DEBEMAIL');
1715 $setup->('name', 'DEBFULLNAME');
1718 sub setup_new_tree () {
1719 setup_mergechangelogs();
1725 canonicalise_suite();
1726 badusage "dry run makes no sense with clone" unless act_local();
1727 my $hasgit = check_for_git();
1728 mkdir $dstdir or fail "create \`$dstdir': $!";
1730 runcmd @git, qw(init -q);
1731 my $giturl = access_giturl(1);
1732 if (defined $giturl) {
1733 set_local_git_config "remote.$remotename.fetch", fetchspec();
1734 open H, "> .git/HEAD" or die $!;
1735 print H "ref: ".lref()."\n" or die $!;
1737 runcmd @git, qw(remote add), 'origin', $giturl;
1740 progress "fetching existing git history";
1742 runcmd_ordryrun_local @git, qw(fetch origin);
1744 progress "starting new git history";
1746 fetch_from_archive() or no_such_package;
1747 my $vcsgiturl = $dsc->{'Vcs-Git'};
1748 if (length $vcsgiturl) {
1749 $vcsgiturl =~ s/\s+-b\s+\S+//g;
1750 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
1753 runcmd @git, qw(reset --hard), lrref();
1754 printdone "ready for work in $dstdir";
1758 if (check_for_git()) {
1761 fetch_from_archive() or no_such_package();
1762 printdone "fetched into ".lrref();
1767 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
1769 printdone "fetched to ".lrref()." and merged into HEAD";
1772 sub check_not_dirty () {
1773 foreach my $f (qw(local-options local-patch-header)) {
1774 if (stat_exists "debian/source/$f") {
1775 fail "git tree contains debian/source/$f";
1779 return if $ignoredirty;
1781 my @cmd = (@git, qw(diff --quiet HEAD));
1783 $!=0; $?=0; system @cmd;
1784 return if !$! && !$?;
1785 if (!$! && $?==256) {
1786 fail "working tree is dirty (does not match HEAD)";
1792 sub commit_admin ($) {
1795 runcmd_ordryrun_local @git, qw(commit -m), $m;
1798 sub commit_quilty_patch () {
1799 my $output = cmdoutput @git, qw(status --porcelain);
1801 foreach my $l (split /\n/, $output) {
1802 next unless $l =~ m/\S/;
1803 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1807 delete $adds{'.pc'}; # if there wasn't one before, don't add it
1809 progress "nothing quilty to commit, ok.";
1812 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
1813 runcmd_ordryrun_local @git, qw(add -f), @adds;
1814 commit_admin "Commit Debian 3.0 (quilt) metadata";
1817 sub get_source_format () {
1819 if (open F, "debian/source/options") {
1823 s/\s+$//; # ignore missing final newline
1825 my ($k, $v) = ($`, $'); #');
1826 $v =~ s/^"(.*)"$/$1/;
1832 F->error and die $!;
1835 die $! unless $!==&ENOENT;
1838 if (!open F, "debian/source/format") {
1839 die $! unless $!==&ENOENT;
1843 F->error and die $!;
1845 return ($_, \%options);
1850 return 0 unless $format eq '3.0 (quilt)';
1851 if ($quilt_mode eq 'nocheck') {
1852 progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
1855 progress "Format \`$format', checking/updating patch stack";
1859 sub push_parse_changelog ($) {
1862 my $clogp = Dpkg::Control::Hash->new();
1863 $clogp->load($clogpfn) or die;
1865 $package = getfield $clogp, 'Source';
1866 my $cversion = getfield $clogp, 'Version';
1867 my $tag = debiantag($cversion, access_basedistro);
1868 runcmd @git, qw(check-ref-format), $tag;
1870 my $dscfn = dscfn($cversion);
1872 return ($clogp, $cversion, $tag, $dscfn);
1875 sub push_parse_dsc ($$$) {
1876 my ($dscfn,$dscfnwhat, $cversion) = @_;
1877 $dsc = parsecontrol($dscfn,$dscfnwhat);
1878 my $dversion = getfield $dsc, 'Version';
1879 my $dscpackage = getfield $dsc, 'Source';
1880 ($dscpackage eq $package && $dversion eq $cversion) or
1881 fail "$dscfn is for $dscpackage $dversion".
1882 " but debian/changelog is for $package $cversion";
1885 sub push_mktag ($$$$$$$) {
1886 my ($head,$clogp,$tag,
1888 $changesfile,$changesfilewhat,
1891 $dsc->{$ourdscfield[0]} = $head;
1892 $dsc->save("$dscfn.tmp") or die $!;
1894 my $changes = parsecontrol($changesfile,$changesfilewhat);
1895 foreach my $field (qw(Source Distribution Version)) {
1896 $changes->{$field} eq $clogp->{$field} or
1897 fail "changes field $field \`$changes->{$field}'".
1898 " does not match changelog \`$clogp->{$field}'";
1901 my $cversion = getfield $clogp, 'Version';
1902 my $clogsuite = getfield $clogp, 'Distribution';
1904 # We make the git tag by hand because (a) that makes it easier
1905 # to control the "tagger" (b) we can do remote signing
1906 my $authline = clogp_authline $clogp;
1907 my $delibs = join(" ", "",@deliberatelies);
1908 my $declaredistro = access_basedistro();
1909 open TO, '>', $tfn->('.tmp') or die $!;
1910 print TO <<END or die $!;
1916 $package release $cversion for $clogsuite ($csuite) [dgit]
1917 [dgit distro=$declaredistro$delibs]
1919 foreach my $ref (sort keys %previously) {
1920 print TO <<END or die $!;
1921 [dgit previously:$ref=$previously{$ref}]
1927 my $tagobjfn = $tfn->('.tmp');
1929 if (!defined $keyid) {
1930 $keyid = access_cfg('keyid','RETURN-UNDEF');
1932 if (!defined $keyid) {
1933 $keyid = getfield $clogp, 'Maintainer';
1935 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1936 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1937 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1938 push @sign_cmd, $tfn->('.tmp');
1939 runcmd_ordryrun @sign_cmd;
1941 $tagobjfn = $tfn->('.signed.tmp');
1942 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
1943 $tfn->('.tmp'), $tfn->('.tmp.asc');
1950 sub sign_changes ($) {
1951 my ($changesfile) = @_;
1953 my @debsign_cmd = @debsign;
1954 push @debsign_cmd, "-k$keyid" if defined $keyid;
1955 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
1956 push @debsign_cmd, $changesfile;
1957 runcmd_ordryrun @debsign_cmd;
1962 my ($forceflag) = @_;
1963 printdebug "actually entering push\n";
1964 supplementary_message(<<'END');
1965 Push failed, while preparing your push.
1966 You can retry the push, after fixing the problem, if you like.
1970 access_giturl(); # check that success is vaguely likely
1972 my $clogpfn = ".git/dgit/changelog.822.tmp";
1973 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
1975 responder_send_file('parsed-changelog', $clogpfn);
1977 my ($clogp, $cversion, $tag, $dscfn) =
1978 push_parse_changelog("$clogpfn");
1980 my $dscpath = "$buildproductsdir/$dscfn";
1981 stat_exists $dscpath or
1982 fail "looked for .dsc $dscfn, but $!;".
1983 " maybe you forgot to build";
1985 responder_send_file('dsc', $dscpath);
1987 push_parse_dsc($dscpath, $dscfn, $cversion);
1989 my $format = getfield $dsc, 'Format';
1990 printdebug "format $format\n";
1991 if (madformat($format)) {
1992 # user might have not used dgit build, so maybe do this now:
1993 commit_quilty_patch();
1997 progress "checking that $dscfn corresponds to HEAD";
1998 runcmd qw(dpkg-source -x --),
1999 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
2000 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2001 check_for_vendor_patches() if madformat($dsc->{format});
2002 changedir '../../../..';
2003 my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
2004 my @diffcmd = (@git, qw(diff), $diffopt, $tree);
2005 debugcmd "+",@diffcmd;
2007 my $r = system @diffcmd;
2010 fail "$dscfn specifies a different tree to your HEAD commit;".
2011 " perhaps you forgot to build".
2012 ($diffopt eq '--exit-code' ? "" :
2013 " (run with -D to see full diff output)");
2018 my $head = git_rev_parse('HEAD');
2019 if (!$changesfile) {
2020 my $pat = changespat $cversion;
2021 my @cs = glob "$buildproductsdir/$pat";
2022 fail "failed to find unique changes file".
2023 " (looked for $pat in $buildproductsdir);".
2024 " perhaps you need to use dgit -C"
2026 ($changesfile) = @cs;
2028 $changesfile = "$buildproductsdir/$changesfile";
2031 responder_send_file('changes',$changesfile);
2032 responder_send_command("param head $head");
2033 responder_send_command("param csuite $csuite");
2035 if (deliberately_not_fast_forward) {
2036 git_for_each_ref(lrfetchrefs, sub {
2037 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
2038 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
2039 responder_send_command("previously $rrefname=$objid");
2040 $previously{$rrefname} = $objid;
2044 my $tfn = sub { ".git/dgit/tag$_[0]"; };
2047 supplementary_message(<<'END');
2048 Push failed, while signing the tag.
2049 You can retry the push, after fixing the problem, if you like.
2051 # If we manage to sign but fail to record it anywhere, it's fine.
2052 if ($we_are_responder) {
2053 $tagobjfn = $tfn->('.signed.tmp');
2054 responder_receive_files('signed-tag', $tagobjfn);
2057 push_mktag($head,$clogp,$tag,
2059 $changesfile,$changesfile,
2062 supplementary_message(<<'END');
2063 Push failed, *after* signing the tag.
2064 If you want to try again, you should use a new version number.
2067 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
2068 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
2069 runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
2071 supplementary_message(<<'END');
2072 Push failed, while updating the remote git repository - see messages above.
2073 If you want to try again, you should use a new version number.
2075 if (!check_for_git()) {
2076 create_remote_git_repo();
2078 runcmd_ordryrun @git, qw(push),access_giturl(),
2079 $forceflag."HEAD:".rrref(), $forceflag."refs/tags/$tag";
2080 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
2082 supplementary_message(<<'END');
2083 Push failed, after updating the remote git repository.
2084 If you want to try again, you must use a new version number.
2086 if ($we_are_responder) {
2087 my $dryrunsuffix = act_local() ? "" : ".tmp";
2088 responder_receive_files('signed-dsc-changes',
2089 "$dscpath$dryrunsuffix",
2090 "$changesfile$dryrunsuffix");
2093 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
2095 progress "[new .dsc left in $dscpath.tmp]";
2097 sign_changes $changesfile;
2100 supplementary_message(<<END);
2101 Push failed, while uploading package(s) to the archive server.
2102 You can retry the upload of exactly these same files with dput of:
2104 If that .changes file is broken, you will need to use a new version
2105 number for your next attempt at the upload.
2107 my $host = access_cfg('upload-host','RETURN-UNDEF');
2108 my @hostarg = defined($host) ? ($host,) : ();
2109 runcmd_ordryrun @dput, @hostarg, $changesfile;
2110 printdone "pushed and uploaded $cversion";
2112 supplementary_message('');
2113 responder_send_command("complete");
2120 badusage "-p is not allowed with clone; specify as argument instead"
2121 if defined $package;
2124 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
2125 ($package,$isuite) = @ARGV;
2126 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
2127 ($package,$dstdir) = @ARGV;
2128 } elsif (@ARGV==3) {
2129 ($package,$isuite,$dstdir) = @ARGV;
2131 badusage "incorrect arguments to dgit clone";
2133 $dstdir ||= "$package";
2135 if (stat_exists $dstdir) {
2136 fail "$dstdir already exists";
2140 if ($rmonerror && !$dryrun_level) {
2141 $cwd_remove= getcwd();
2143 return unless defined $cwd_remove;
2144 if (!chdir "$cwd_remove") {
2145 return if $!==&ENOENT;
2146 die "chdir $cwd_remove: $!";
2149 rmtree($dstdir) or die "remove $dstdir: $!\n";
2150 } elsif (!grep { $! == $_ }
2151 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
2153 print STDERR "check whether to remove $dstdir: $!\n";
2159 $cwd_remove = undef;
2162 sub branchsuite () {
2163 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
2164 if ($branch =~ m#$lbranch_re#o) {
2171 sub fetchpullargs () {
2173 if (!defined $package) {
2174 my $sourcep = parsecontrol('debian/control','debian/control');
2175 $package = getfield $sourcep, 'Source';
2178 # $isuite = branchsuite(); # this doesn't work because dak hates canons
2180 my $clogp = parsechangelog();
2181 $isuite = getfield $clogp, 'Distribution';
2183 canonicalise_suite();
2184 progress "fetching from suite $csuite";
2185 } elsif (@ARGV==1) {
2187 canonicalise_suite();
2189 badusage "incorrect arguments to dgit fetch or dgit pull";
2208 badusage "-p is not allowed with dgit push" if defined $package;
2210 my $clogp = parsechangelog();
2211 $package = getfield $clogp, 'Source';
2214 } elsif (@ARGV==1) {
2215 ($specsuite) = (@ARGV);
2217 badusage "incorrect arguments to dgit push";
2219 $isuite = getfield $clogp, 'Distribution';
2221 local ($package) = $existing_package; # this is a hack
2222 canonicalise_suite();
2224 canonicalise_suite();
2226 if (defined $specsuite &&
2227 $specsuite ne $isuite &&
2228 $specsuite ne $csuite) {
2229 fail "dgit push: changelog specifies $isuite ($csuite)".
2230 " but command line specifies $specsuite";
2232 supplementary_message(<<'END');
2233 Push failed, while checking state of the archive.
2234 You can retry the push, after fixing the problem, if you like.
2236 if (check_for_git()) {
2240 if (fetch_from_archive()) {
2241 if (is_fast_fwd(lrref(), 'HEAD')) {
2243 } elsif (deliberately_not_fast_forward) {
2246 fail "dgit push: HEAD is not a descendant".
2247 " of the archive's version.\n".
2248 "dgit: To overwrite its contents,".
2249 " use git merge -s ours ".lrref().".\n".
2250 "dgit: To rewind history, if permitted by the archive,".
2251 " use --deliberately-not-fast-forward";
2255 fail "package appears to be new in this suite;".
2256 " if this is intentional, use --new";
2261 #---------- remote commands' implementation ----------
2263 sub cmd_remote_push_build_host {
2264 my ($nrargs) = shift @ARGV;
2265 my (@rargs) = @ARGV[0..$nrargs-1];
2266 @ARGV = @ARGV[$nrargs..$#ARGV];
2268 my ($dir,$vsnwant) = @rargs;
2269 # vsnwant is a comma-separated list; we report which we have
2270 # chosen in our ready response (so other end can tell if they
2273 $we_are_responder = 1;
2274 $us .= " (build host)";
2278 open PI, "<&STDIN" or die $!;
2279 open STDIN, "/dev/null" or die $!;
2280 open PO, ">&STDOUT" or die $!;
2282 open STDOUT, ">&STDERR" or die $!;
2286 ($protovsn) = grep {
2287 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
2288 } @rpushprotovsn_support;
2290 fail "build host has dgit rpush protocol versions ".
2291 (join ",", @rpushprotovsn_support).
2292 " but invocation host has $vsnwant"
2293 unless defined $protovsn;
2295 responder_send_command("dgit-remote-push-ready $protovsn");
2301 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
2302 # ... for compatibility with proto vsn.1 dgit (just so that user gets
2303 # a good error message)
2309 my $report = i_child_report();
2310 if (defined $report) {
2311 printdebug "($report)\n";
2312 } elsif ($i_child_pid) {
2313 printdebug "(killing build host child $i_child_pid)\n";
2314 kill 15, $i_child_pid;
2316 if (defined $i_tmp && !defined $initiator_tempdir) {
2318 eval { rmtree $i_tmp; };
2322 END { i_cleanup(); }
2325 my ($base,$selector,@args) = @_;
2326 $selector =~ s/\-/_/g;
2327 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
2334 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
2342 push @rargs, join ",", @rpushprotovsn_support;
2345 push @rdgit, @ropts;
2346 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
2348 my @cmd = (@ssh, $host, shellquote @rdgit);
2351 if (defined $initiator_tempdir) {
2352 rmtree $initiator_tempdir;
2353 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
2354 $i_tmp = $initiator_tempdir;
2358 $i_child_pid = open2(\*RO, \*RI, @cmd);
2360 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
2361 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
2362 $supplementary_message = '' unless $protovsn >= 3;
2364 my ($icmd,$iargs) = initiator_expect {
2365 m/^(\S+)(?: (.*))?$/;
2368 i_method "i_resp", $icmd, $iargs;
2372 sub i_resp_progress ($) {
2374 my $msg = protocol_read_bytes \*RO, $rhs;
2378 sub i_resp_supplementary_message ($) {
2380 $supplementary_message = protocol_read_bytes \*RO, $rhs;
2383 sub i_resp_complete {
2384 my $pid = $i_child_pid;
2385 $i_child_pid = undef; # prevents killing some other process with same pid
2386 printdebug "waiting for build host child $pid...\n";
2387 my $got = waitpid $pid, 0;
2388 die $! unless $got == $pid;
2389 die "build host child failed $?" if $?;
2392 printdebug "all done\n";
2396 sub i_resp_file ($) {
2398 my $localname = i_method "i_localname", $keyword;
2399 my $localpath = "$i_tmp/$localname";
2400 stat_exists $localpath and
2401 badproto \*RO, "file $keyword ($localpath) twice";
2402 protocol_receive_file \*RO, $localpath;
2403 i_method "i_file", $keyword;
2408 sub i_resp_param ($) {
2409 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
2413 sub i_resp_previously ($) {
2414 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
2415 or badproto \*RO, "bad previously spec";
2416 my $r = system qw(git check-ref-format), $1;
2417 die "bad previously ref spec ($r)" if $r;
2418 $previously{$1} = $2;
2423 sub i_resp_want ($) {
2425 die "$keyword ?" if $i_wanted{$keyword}++;
2426 my @localpaths = i_method "i_want", $keyword;
2427 printdebug "[[ $keyword @localpaths\n";
2428 foreach my $localpath (@localpaths) {
2429 protocol_send_file \*RI, $localpath;
2431 print RI "files-end\n" or die $!;
2434 our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn);
2436 sub i_localname_parsed_changelog {
2437 return "remote-changelog.822";
2439 sub i_file_parsed_changelog {
2440 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
2441 push_parse_changelog "$i_tmp/remote-changelog.822";
2442 die if $i_dscfn =~ m#/|^\W#;
2445 sub i_localname_dsc {
2446 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2451 sub i_localname_changes {
2452 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2453 $i_changesfn = $i_dscfn;
2454 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
2455 return $i_changesfn;
2457 sub i_file_changes { }
2459 sub i_want_signed_tag {
2460 printdebug Dumper(\%i_param, $i_dscfn);
2461 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
2462 && defined $i_param{'csuite'}
2463 or badproto \*RO, "premature desire for signed-tag";
2464 my $head = $i_param{'head'};
2465 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
2467 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
2469 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
2472 push_mktag $head, $i_clogp, $i_tag,
2474 $i_changesfn, 'remote changes',
2475 sub { "tag$_[0]"; };
2480 sub i_want_signed_dsc_changes {
2481 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
2482 sign_changes $i_changesfn;
2483 return ($i_dscfn, $i_changesfn);
2486 #---------- building etc. ----------
2492 #----- `3.0 (quilt)' handling -----
2494 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
2496 sub quiltify_dpkg_commit ($$$;$) {
2497 my ($patchname,$author,$msg, $xinfo) = @_;
2501 my $descfn = ".git/dgit/quilt-description.tmp";
2502 open O, '>', $descfn or die "$descfn: $!";
2505 $msg =~ s/^\s+$/ ./mg;
2506 print O <<END or die $!;
2516 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
2517 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
2518 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
2519 runcmd @dpkgsource, qw(--commit .), $patchname;
2523 sub quiltify_trees_differ ($$;$$) {
2524 my ($x,$y,$finegrained,$ignorenamesr) = @_;
2525 # returns true iff the two tree objects differ other than in debian/
2526 # with $finegrained,
2527 # returns bitmask 01 - differ in upstream files except .gitignore
2528 # 02 - differ in .gitignore
2529 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
2530 # is set for each modified .gitignore filename $fn
2532 my @cmd = (@git, qw(diff-tree --name-only -z));
2533 push @cmd, qw(-r) if $finegrained;
2535 my $diffs= cmdoutput @cmd;
2537 foreach my $f (split /\0/, $diffs) {
2538 next if $f =~ m#^debian(?:/.*)?$#s;
2539 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
2540 $r |= $isignore ? 02 : 01;
2541 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
2543 printdebug "quiltify_trees_differ $x $y => $r\n";
2547 sub quiltify_tree_sentinelfiles ($) {
2548 # lists the `sentinel' files present in the tree
2550 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
2551 qw(-- debian/rules debian/control);
2556 sub quiltify_splitbrain_needed () {
2557 if (!$split_brain) {
2558 progress "creating dgit view";
2559 runcmd @git, qw(checkout -q -b dgit-view);
2564 sub quiltify_splitbrain ($$$$$$) {
2565 my ($clogp, $unapplied, $headref, $diffbits,
2566 $editedignores, $cachekey) = @_;
2567 if ($quilt_mode !~ m/gbp|dpm/) {
2568 # treat .gitignore just like any other upstream file
2569 $diffbits = { %$diffbits };
2570 $_ = !!$_ foreach values %$diffbits;
2572 # We would like any commits we generate to be reproducible
2573 my @authline = clogp_authline($clogp);
2574 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2575 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2576 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2577 if ($quilt_mode =~ m/gbp|unapplied/ &&
2578 ($diffbits->{O2A} & 01) && # some patches
2579 !($diffbits->{H2O} & 01)) { # but HEAD is like orig
2580 quiltify_splitbrain_needed();
2581 progress "creating patches-applied version using gbp-pq";
2582 open STDOUT, ">/dev/null" or die $!;
2583 runcmd shell_cmd 'exec >/dev/null', @gbppq, qw(import);
2584 # gbp-pq import creates a fresh branch; push back to dgit-view
2585 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
2586 runcmd @git, qw(checkout -q dgit-view);
2588 if (($diffbits->{H2O} & 02) && # user has modified .gitignore
2589 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
2590 quiltify_splitbrain_needed();
2591 progress "creating patch to represent .gitignore changes";
2592 ensuredir "debian/patches";
2593 my $gipatch = "debian/patches/auto-gitignore";
2594 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
2595 stat GIPATCH or die "$gipatch: $!";
2596 fail "$gipatch already exists; but want to create it".
2597 " to record .gitignore changes" if (stat _)[7];
2598 print GIPATCH <<END or die "$gipatch: $!";
2599 Subject: Update .gitignore from Debian packaging branch
2601 The Debian packaging git branch contains these updates to the upstream
2602 .gitignore file(s). This patch is autogenerated, to provide these
2603 updates to users of the official Debian archive view of the package.
2605 [dgit version $our_version]
2608 close GIPATCH or die "$gipatch: $!";
2609 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
2610 $unapplied, $headref, "--", sort keys %$editedignores;
2611 open SERIES, "+>>", "debian/patches/series" or die $!;
2612 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
2614 defined read SERIES, $newline, 1 or die $!;
2615 print SERIES "\n" or die $! unless $newline eq "\n";
2616 print SERIES "auto-gitignore\n" or die $!;
2617 close SERIES or die $!;
2618 runcmd @git, qw(add -- debian/patches/series), $gipatch;
2619 commit_admin "Commit patch to update .gitignore";
2622 my $dgitview = git_rev_parse 'refs/heads/dgit-view';
2624 changedir '../../../..';
2625 ensuredir ".git/logs/refs/dgit-intern";
2626 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
2628 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
2631 die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)';
2632 changedir '.git/dgit/unpack/work';
2635 sub quiltify ($$$$) {
2636 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
2638 # Quilt patchification algorithm
2640 # We search backwards through the history of the main tree's HEAD
2641 # (T) looking for a start commit S whose tree object is identical
2642 # to to the patch tip tree (ie the tree corresponding to the
2643 # current dpkg-committed patch series). For these purposes
2644 # `identical' disregards anything in debian/ - this wrinkle is
2645 # necessary because dpkg-source treates debian/ specially.
2647 # We can only traverse edges where at most one of the ancestors'
2648 # trees differs (in changes outside in debian/). And we cannot
2649 # handle edges which change .pc/ or debian/patches. To avoid
2650 # going down a rathole we avoid traversing edges which introduce
2651 # debian/rules or debian/control. And we set a limit on the
2652 # number of edges we are willing to look at.
2654 # If we succeed, we walk forwards again. For each traversed edge
2655 # PC (with P parent, C child) (starting with P=S and ending with
2656 # C=T) to we do this:
2658 # - dpkg-source --commit with a patch name and message derived from C
2659 # After traversing PT, we git commit the changes which
2660 # should be contained within debian/patches.
2662 # The search for the path S..T is breadth-first. We maintain a
2663 # todo list containing search nodes. A search node identifies a
2664 # commit, and looks something like this:
2666 # Commit => $git_commit_id,
2667 # Child => $c, # or undef if P=T
2668 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
2669 # Nontrivial => true iff $p..$c has relevant changes
2676 my %considered; # saves being exponential on some weird graphs
2678 my $t_sentinels = quiltify_tree_sentinelfiles $target;
2681 my ($search,$whynot) = @_;
2682 printdebug " search NOT $search->{Commit} $whynot\n";
2683 $search->{Whynot} = $whynot;
2684 push @nots, $search;
2685 no warnings qw(exiting);
2694 my $c = shift @todo;
2695 next if $considered{$c->{Commit}}++;
2697 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
2699 printdebug "quiltify investigate $c->{Commit}\n";
2702 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
2703 printdebug " search finished hooray!\n";
2708 if ($quilt_mode eq 'nofix') {
2709 fail "quilt fixup required but quilt mode is \`nofix'\n".
2710 "HEAD commit $c->{Commit} differs from tree implied by ".
2711 " debian/patches (tree object $oldtiptree)";
2713 if ($quilt_mode eq 'smash') {
2714 printdebug " search quitting smash\n";
2718 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
2719 $not->($c, "has $c_sentinels not $t_sentinels")
2720 if $c_sentinels ne $t_sentinels;
2722 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
2723 $commitdata =~ m/\n\n/;
2725 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
2726 @parents = map { { Commit => $_, Child => $c } } @parents;
2728 $not->($c, "root commit") if !@parents;
2730 foreach my $p (@parents) {
2731 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
2733 my $ndiffers = grep { $_->{Nontrivial} } @parents;
2734 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
2736 foreach my $p (@parents) {
2737 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
2739 my @cmd= (@git, qw(diff-tree -r --name-only),
2740 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
2741 my $patchstackchange = cmdoutput @cmd;
2742 if (length $patchstackchange) {
2743 $patchstackchange =~ s/\n/,/g;
2744 $not->($p, "changed $patchstackchange");
2747 printdebug " search queue P=$p->{Commit} ",
2748 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
2754 printdebug "quiltify want to smash\n";
2757 my $x = $_[0]{Commit};
2758 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
2761 my $reportnot = sub {
2763 my $s = $abbrev->($notp);
2764 my $c = $notp->{Child};
2765 $s .= "..".$abbrev->($c) if $c;
2766 $s .= ": ".$notp->{Whynot};
2769 if ($quilt_mode eq 'linear') {
2770 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
2771 foreach my $notp (@nots) {
2772 print STDERR "$us: ", $reportnot->($notp), "\n";
2774 print STDERR "$us: $_\n" foreach @$failsuggestion;
2775 fail "quilt fixup naive history linearisation failed.\n".
2776 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
2777 } elsif ($quilt_mode eq 'smash') {
2778 } elsif ($quilt_mode eq 'auto') {
2779 progress "quilt fixup cannot be linear, smashing...";
2781 die "$quilt_mode ?";
2786 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
2788 quiltify_dpkg_commit "auto-$version-$target-$time",
2789 (getfield $clogp, 'Maintainer'),
2790 "Automatically generated patch ($clogp->{Version})\n".
2791 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
2795 progress "quiltify linearisation planning successful, executing...";
2797 for (my $p = $sref_S;
2798 my $c = $p->{Child};
2800 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
2801 next unless $p->{Nontrivial};
2803 my $cc = $c->{Commit};
2805 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
2806 $commitdata =~ m/\n\n/ or die "$c ?";
2809 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
2812 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
2815 my $patchname = $title;
2816 $patchname =~ s/[.:]$//;
2817 $patchname =~ y/ A-Z/-a-z/;
2818 $patchname =~ y/-a-z0-9_.+=~//cd;
2819 $patchname =~ s/^\W/x-$&/;
2820 $patchname = substr($patchname,0,40);
2823 stat "debian/patches/$patchname$index";
2825 $!==ENOENT or die "$patchname$index $!";
2827 runcmd @git, qw(checkout -q), $cc;
2829 # We use the tip's changelog so that dpkg-source doesn't
2830 # produce complaining messages from dpkg-parsechangelog. None
2831 # of the information dpkg-source gets from the changelog is
2832 # actually relevant - it gets put into the original message
2833 # which dpkg-source provides our stunt editor, and then
2835 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
2837 quiltify_dpkg_commit "$patchname$index", $author, $msg,
2838 "X-Dgit-Generated: $clogp->{Version} $cc\n";
2840 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
2843 runcmd @git, qw(checkout -q master);
2846 sub build_maybe_quilt_fixup () {
2847 my ($format,$fopts) = get_source_format;
2848 return unless madformat $format;
2851 check_for_vendor_patches();
2853 my $clogp = parsechangelog();
2854 my $headref = git_rev_parse('HEAD');
2859 my $upstreamversion=$version;
2860 $upstreamversion =~ s/-[^-]*$//;
2862 if ($fopts->{'single-debian-patch'}) {
2863 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
2865 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
2868 changedir '../../../..';
2869 runcmd_ordryrun_local
2870 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
2873 sub quilt_fixup_mkwork ($) {
2876 mkdir "work" or die $!;
2878 mktree_in_ud_here();
2879 runcmd @git, qw(reset -q --hard), $headref;
2882 sub quilt_fixup_linkorigs ($$) {
2883 my ($upstreamversion, $fn) = @_;
2884 # calls $fn->($leafname);
2886 foreach my $f (<../../../../*>) { #/){
2887 my $b=$f; $b =~ s{.*/}{};
2889 local ($debuglevel) = $debuglevel-1;
2890 printdebug "QF linkorigs $b, $f ?\n";
2892 next unless is_orig_file $b, srcfn $upstreamversion,'';
2893 printdebug "QF linkorigs $b, $f Y\n";
2894 link_ltarget $f, $b or die "$b $!";
2899 sub quilt_fixup_delete_pc () {
2900 runcmd @git, qw(rm -rqf .pc);
2901 commit_admin "Commit removal of .pc (quilt series tracking data)";
2904 sub quilt_fixup_singlepatch ($$$) {
2905 my ($clogp, $headref, $upstreamversion) = @_;
2907 progress "starting quiltify (single-debian-patch)";
2909 # dpkg-source --commit generates new patches even if
2910 # single-debian-patch is in debian/source/options. In order to
2911 # get it to generate debian/patches/debian-changes, it is
2912 # necessary to build the source package.
2914 quilt_fixup_linkorigs($upstreamversion, sub { });
2915 quilt_fixup_mkwork($headref);
2917 rmtree("debian/patches");
2919 runcmd @dpkgsource, qw(-b .);
2921 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
2922 rename srcfn("$upstreamversion", "/debian/patches"),
2923 "work/debian/patches";
2926 commit_quilty_patch();
2931 sub quilt_fixup_multipatch ($$$) {
2932 my ($clogp, $headref, $upstreamversion) = @_;
2934 progress "starting quiltify (multiple patches, $quilt_mode mode)";
2937 # - honour any existing .pc in case it has any strangeness
2938 # - determine the git commit corresponding to the tip of
2939 # the patch stack (if there is one)
2940 # - if there is such a git commit, convert each subsequent
2941 # git commit into a quilt patch with dpkg-source --commit
2942 # - otherwise convert all the differences in the tree into
2943 # a single git commit
2947 # Our git tree doesn't necessarily contain .pc. (Some versions of
2948 # dgit would include the .pc in the git tree.) If there isn't
2949 # one, we need to generate one by unpacking the patches that we
2952 # We first look for a .pc in the git tree. If there is one, we
2953 # will use it. (This is not the normal case.)
2955 # Otherwise need to regenerate .pc so that dpkg-source --commit
2956 # can work. We do this as follows:
2957 # 1. Collect all relevant .orig from parent directory
2958 # 2. Generate a debian.tar.gz out of
2959 # debian/{patches,rules,source/format,source/options}
2960 # 3. Generate a fake .dsc containing just these fields:
2961 # Format Source Version Files
2962 # 4. Extract the fake .dsc
2963 # Now the fake .dsc has a .pc directory.
2964 # (In fact we do this in every case, because in future we will
2965 # want to search for a good base commit for generating patches.)
2967 # Then we can actually do the dpkg-source --commit
2968 # 1. Make a new working tree with the same object
2969 # store as our main tree and check out the main
2971 # 2. Copy .pc from the fake's extraction, if necessary
2972 # 3. Run dpkg-source --commit
2973 # 4. If the result has changes to debian/, then
2974 # - git-add them them
2975 # - git-add .pc if we had a .pc in-tree
2977 # 5. If we had a .pc in-tree, delete it, and git-commit
2978 # 6. Back in the main tree, fast forward to the new HEAD
2980 # Another situation we may have to cope with is gbp-style
2981 # patches-unapplied trees.
2983 # We would want to detect these, so we know to escape into
2984 # quilt_fixup_gbp. However, this is in general not possible.
2985 # Consider a package with a one patch which the dgit user reverts
2986 # (with git-revert or the moral equivalent).
2988 # That is indistinguishable in contents from a patches-unapplied
2989 # tree. And looking at the history to distinguish them is not
2990 # useful because the user might have made a confusing-looking git
2991 # history structure (which ought to produce an error if dgit can't
2992 # cope, not a silent reintroduction of an unwanted patch).
2994 # So gbp users will have to pass an option. But we can usually
2995 # detect their failure to do so: if the tree is not a clean
2996 # patches-applied tree, quilt linearisation fails, but the tree
2997 # _is_ a clean patches-unapplied tree, we can suggest that maybe
2998 # they want --quilt=unapplied.
3000 # To help detect this, when we are extracting the fake dsc, we
3001 # first extract it with --skip-patches, and then apply the patches
3002 # afterwards with dpkg-source --before-build. That lets us save a
3003 # tree object corresponding to .origs.
3005 my $fakeversion="$upstreamversion-~~DGITFAKE";
3007 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
3008 print $fakedsc <<END or die $!;
3011 Version: $fakeversion
3015 my $dscaddfile=sub {
3018 my $md = new Digest::MD5;
3020 my $fh = new IO::File $b, '<' or die "$b $!";
3025 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
3028 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
3030 my @files=qw(debian/source/format debian/rules
3031 debian/control debian/changelog);
3032 foreach my $maybe (qw(debian/patches debian/source/options
3033 debian/tests/control)) {
3034 next unless stat_exists "../../../$maybe";
3035 push @files, $maybe;
3038 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
3039 runcmd qw(env GZIP=-1 tar -zcf), "./$debtar", qw(-C ../../..), @files;
3041 $dscaddfile->($debtar);
3042 close $fakedsc or die $!;
3044 my $splitbrain_cachekey;
3045 if (quiltmode_splitbrain()) {
3046 # we look in the reflog of dgit-intern/quilt-cache
3047 # we look for an entry whose message is the key for the cache lookup
3048 my @cachekey = (qw(dgit), $our_version);
3049 push @cachekey, $upstreamversion;
3050 push @cachekey, $headref;
3052 push @cachekey, hashfile('fake.dsc');
3054 my $srcshash = Digest::SHA->new(256);
3055 my %sfs = ( %INC, '$0(dgit)' => $0 );
3056 foreach my $sfk (sort keys %sfs) {
3057 $srcshash->add($sfk," ");
3058 $srcshash->add(hashfile($sfs{$sfk}));
3059 $srcshash->add("\n");
3061 push @cachekey, $srcshash->hexdigest();
3062 $splitbrain_cachekey = "@cachekey";
3064 my @cmd = (@git, qw(reflog), '--pretty=format:%H %gs',
3066 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
3067 debugcmd "|(probably)",@cmd;
3068 my $child = open GC, "-|"; defined $child or die $!;
3070 chdir '../../..' or die $!;
3071 if (!stat ".git/logs/refs/$splitbraincache") {
3072 $! == ENOENT or die $!;
3073 printdebug ">(no reflog)\n";
3080 printdebug ">| ", $_, "\n" if $debuglevel > 1;
3081 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
3084 quilt_fixup_mkwork($headref);
3085 if ($cachehit ne $headref) {
3086 progress "quilt fixup ($quilt_mode mode) found cached tree";
3087 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
3091 progress "quilt fixup ($quilt_mode mode)".
3092 " found cached indication that no changes needed";
3095 die $! if GC->error;
3096 failedcmd unless close GC;
3098 printdebug "splitbrain cache miss\n";
3102 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
3104 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
3105 rename $fakexdir, "fake" or die "$fakexdir $!";
3109 remove_stray_gits();
3110 mktree_in_ud_here();
3114 runcmd @git, qw(add -Af .);
3115 my $unapplied=git_write_tree();
3116 printdebug "fake orig tree object $unapplied\n";
3121 'exec dpkg-source --before-build . >/dev/null';
3125 quilt_fixup_mkwork($headref);
3128 if (stat_exists ".pc") {
3130 progress "Tree already contains .pc - will use it then delete it.";
3133 rename '../fake/.pc','.pc' or die $!;
3136 changedir '../fake';
3138 runcmd @git, qw(add -Af .);
3139 my $oldtiptree=git_write_tree();
3140 printdebug "fake o+d/p tree object $unapplied\n";
3141 changedir '../work';
3144 # We calculate some guesswork now about what kind of tree this might
3145 # be. This is mostly for error reporting.
3150 # O = orig, without patches applied
3151 # A = "applied", ie orig with H's debian/patches applied
3152 H2O => quiltify_trees_differ($headref, $unapplied, 1,\%editedignores),
3153 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
3154 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
3158 foreach my $b (qw(01 02)) {
3159 foreach my $v (qw(H2O O2A H2A)) {
3160 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
3163 printdebug "differences \@dl @dl.\n";
3166 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
3167 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
3168 $dl[0], $dl[1], $dl[3], $dl[4],
3172 if (!($diffbits->{H2O} & $diffbits->{O2A})) {
3173 push @failsuggestion, "This might be a patches-unapplied branch.";
3174 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
3175 push @failsuggestion, "This might be a patches-applied branch.";
3177 push @failsuggestion, "Maybe you need to specify one of".
3178 " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
3180 if (quiltmode_splitbrain()) {
3181 quiltify_splitbrain($clogp, $unapplied, $headref,
3182 $diffbits, \%editedignores,
3183 $splitbrain_cachekey);
3187 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
3189 if (!open P, '>>', ".pc/applied-patches") {
3190 $!==&ENOENT or die $!;
3195 commit_quilty_patch();
3197 if ($mustdeletepc) {
3198 quilt_fixup_delete_pc();
3202 sub quilt_fixup_editor () {
3203 my $descfn = $ENV{$fakeeditorenv};
3204 my $editing = $ARGV[$#ARGV];
3205 open I1, '<', $descfn or die "$descfn: $!";
3206 open I2, '<', $editing or die "$editing: $!";
3207 unlink $editing or die "$editing: $!";
3208 open O, '>', $editing or die "$editing: $!";
3209 while (<I1>) { print O or die $!; } I1->error and die $!;
3212 $copying ||= m/^\-\-\- /;
3213 next unless $copying;
3216 I2->error and die $!;
3221 #----- other building -----
3223 our $clean_using_builder;
3224 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
3225 # clean the tree before building (perhaps invoked indirectly by
3226 # whatever we are using to run the build), rather than separately
3227 # and explicitly by us.
3230 return if $clean_using_builder;
3231 if ($cleanmode eq 'dpkg-source') {
3232 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
3233 } elsif ($cleanmode eq 'dpkg-source-d') {
3234 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
3235 } elsif ($cleanmode eq 'git') {
3236 runcmd_ordryrun_local @git, qw(clean -xdf);
3237 } elsif ($cleanmode eq 'git-ff') {
3238 runcmd_ordryrun_local @git, qw(clean -xdff);
3239 } elsif ($cleanmode eq 'check') {
3240 my $leftovers = cmdoutput @git, qw(clean -xdn);
3241 if (length $leftovers) {
3242 print STDERR $leftovers, "\n" or die $!;
3243 fail "tree contains uncommitted files and --clean=check specified";
3245 } elsif ($cleanmode eq 'none') {
3252 badusage "clean takes no additional arguments" if @ARGV;
3259 badusage "-p is not allowed when building" if defined $package;
3262 my $clogp = parsechangelog();
3263 $isuite = getfield $clogp, 'Distribution';
3264 $package = getfield $clogp, 'Source';
3265 $version = getfield $clogp, 'Version';
3266 build_maybe_quilt_fixup();
3268 my $pat = changespat $version;
3269 foreach my $f (glob "$buildproductsdir/$pat") {
3271 unlink $f or fail "remove old changes file $f: $!";
3273 progress "would remove $f";
3279 sub changesopts_initial () {
3280 my @opts =@changesopts[1..$#changesopts];
3283 sub changesopts_version () {
3284 if (!defined $changes_since_version) {
3285 my @vsns = archive_query('archive_query');
3286 my @quirk = access_quirk();
3287 if ($quirk[0] eq 'backports') {
3288 local $isuite = $quirk[2];
3290 canonicalise_suite();
3291 push @vsns, archive_query('archive_query');
3294 @vsns = map { $_->[0] } @vsns;
3295 @vsns = sort { -version_compare($a, $b) } @vsns;
3296 $changes_since_version = $vsns[0];
3297 progress "changelog will contain changes since $vsns[0]";
3299 $changes_since_version = '_';
3300 progress "package seems new, not specifying -v<version>";
3303 if ($changes_since_version ne '_') {
3304 return ("-v$changes_since_version");
3310 sub changesopts () {
3311 return (changesopts_initial(), changesopts_version());
3314 sub massage_dbp_args ($;$) {
3315 my ($cmd,$xargs) = @_;
3318 # - if we're going to split the source build out so we can
3319 # do strange things to it, massage the arguments to dpkg-buildpackage
3320 # so that the main build doessn't build source (or add an argument
3321 # to stop it building source by default).
3323 # - add -nc to stop dpkg-source cleaning the source tree,
3324 # unless we're not doing a split build and want dpkg-source
3325 # as cleanmode, in which case we can do nothing
3328 # 0 - source will NOT need to be built separately by caller
3329 # +1 - source will need to be built separately by caller
3330 # +2 - source will need to be built separately by caller AND
3331 # dpkg-buildpackage should not in fact be run at all!
3332 debugcmd '#massaging#', @$cmd if $debuglevel>1;
3333 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
3334 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
3335 $clean_using_builder = 1;
3338 # -nc has the side effect of specifying -b if nothing else specified
3339 # and some combinations of -S, -b, et al, are errors, rather than
3340 # later simply overriding earlie. So we need to:
3341 # - search the command line for these options
3342 # - pick the last one
3343 # - perhaps add our own as a default
3344 # - perhaps adjust it to the corresponding non-source-building version
3346 foreach my $l ($cmd, $xargs) {
3348 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
3351 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
3353 if ($need_split_build_invocation) {
3354 $r = $dmode =~ m/[S]/ ? +2 :
3355 $dmode =~ y/gGF/ABb/ ? +1 :
3356 $dmode =~ m/[ABb]/ ? 0 :
3360 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
3365 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
3366 my $wantsrc = massage_dbp_args \@dbp;
3373 push @dbp, changesopts_version();
3374 runcmd_ordryrun_local @dbp;
3376 printdone "build successful\n";
3380 my @dbp = @dpkgbuildpackage;
3382 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
3385 if (length executable_on_path('git-buildpackage')) {
3386 @cmd = qw(git-buildpackage);
3388 @cmd = qw(gbp buildpackage);
3390 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
3395 if (!$clean_using_builder) {
3396 push @cmd, '--git-cleaner=true';
3401 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
3402 canonicalise_suite();
3403 push @cmd, "--git-debian-branch=".lbranch();
3405 push @cmd, changesopts();
3406 runcmd_ordryrun_local @cmd, @ARGV;
3408 printdone "build successful\n";
3410 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
3413 if ($cleanmode =~ m/^dpkg-source/) {
3414 # dpkg-source will clean, so we shouldn't
3415 $clean_using_builder = 1;
3418 $sourcechanges = changespat $version,'source';
3420 unlink "../$sourcechanges" or $!==ENOENT
3421 or fail "remove $sourcechanges: $!";
3423 $dscfn = dscfn($version);
3424 if ($cleanmode eq 'dpkg-source') {
3425 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
3427 } elsif ($cleanmode eq 'dpkg-source-d') {
3428 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
3431 my $pwd = must_getcwd();
3432 my $leafdir = basename $pwd;
3434 runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
3436 runcmd_ordryrun_local qw(sh -ec),
3437 'exec >$1; shift; exec "$@"','x',
3438 "../$sourcechanges",
3439 @dpkggenchanges, qw(-S), changesopts();
3443 sub cmd_build_source {
3444 badusage "build-source takes no additional arguments" if @ARGV;
3446 printdone "source built, results in $dscfn and $sourcechanges";
3451 my $pat = changespat $version;
3453 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
3454 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
3455 fail "changes files other than source matching $pat".
3456 " already present (@unwanted);".
3457 " building would result in ambiguity about the intended results"
3462 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
3463 stat_exists $sourcechanges
3464 or fail "$sourcechanges (in parent directory): $!";
3466 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
3467 my @changesfiles = glob $pat;
3468 @changesfiles = sort {
3469 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
3472 fail "wrong number of different changes files (@changesfiles)"
3473 unless @changesfiles==2;
3474 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
3475 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
3476 fail "$l found in binaries changes file $binchanges"
3479 runcmd_ordryrun_local @mergechanges, @changesfiles;
3480 my $multichanges = changespat $version,'multi';
3482 stat_exists $multichanges or fail "$multichanges: $!";
3483 foreach my $cf (glob $pat) {
3484 next if $cf eq $multichanges;
3485 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
3488 printdone "build successful, results in $multichanges\n" or die $!;
3491 sub cmd_quilt_fixup {
3492 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
3493 my $clogp = parsechangelog();
3494 $version = getfield $clogp, 'Version';
3495 $package = getfield $clogp, 'Source';
3498 build_maybe_quilt_fixup();
3501 sub cmd_archive_api_query {
3502 badusage "need only 1 subpath argument" unless @ARGV==1;
3503 my ($subpath) = @ARGV;
3504 my @cmd = archive_api_query_cmd($subpath);
3506 exec @cmd or fail "exec curl: $!\n";
3509 sub cmd_clone_dgit_repos_server {
3510 badusage "need destination argument" unless @ARGV==1;
3511 my ($destdir) = @ARGV;
3512 $package = '_dgit-repos-server';
3513 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
3515 exec @cmd or fail "exec git clone: $!\n";
3518 sub cmd_setup_mergechangelogs {
3519 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3520 setup_mergechangelogs(1);
3523 sub cmd_setup_useremail {
3524 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3528 sub cmd_setup_new_tree {
3529 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
3533 #---------- argument parsing and main program ----------
3536 print "dgit version $our_version\n" or die $!;
3540 our (%valopts_long, %valopts_short);
3543 sub defvalopt ($$$$) {
3544 my ($long,$short,$val_re,$how) = @_;
3545 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
3546 $valopts_long{$long} = $oi;
3547 $valopts_short{$short} = $oi;
3548 # $how subref should:
3549 # do whatever assignemnt or thing it likes with $_[0]
3550 # if the option should not be passed on to remote, @rvalopts=()
3551 # or $how can be a scalar ref, meaning simply assign the value
3554 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
3555 defvalopt '--distro', '-d', '.+', \$idistro;
3556 defvalopt '', '-k', '.+', \$keyid;
3557 defvalopt '--existing-package','', '.*', \$existing_package;
3558 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
3559 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
3560 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
3562 defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
3564 defvalopt '', '-C', '.+', sub {
3565 ($changesfile) = (@_);
3566 if ($changesfile =~ s#^(.*)/##) {
3567 $buildproductsdir = $1;
3571 defvalopt '--initiator-tempdir','','.*', sub {
3572 ($initiator_tempdir) = (@_);
3573 $initiator_tempdir =~ m#^/# or
3574 badusage "--initiator-tempdir must be used specify an".
3575 " absolute, not relative, directory."
3581 if (defined $ENV{'DGIT_SSH'}) {
3582 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
3583 } elsif (defined $ENV{'GIT_SSH'}) {
3584 @ssh = ($ENV{'GIT_SSH'});
3592 if (!defined $val) {
3593 badusage "$what needs a value" unless @ARGV;
3595 push @rvalopts, $val;
3597 badusage "bad value \`$val' for $what" unless
3598 $val =~ m/^$oi->{Re}$(?!\n)/s;
3599 my $how = $oi->{How};
3600 if (ref($how) eq 'SCALAR') {
3605 push @ropts, @rvalopts;
3609 last unless $ARGV[0] =~ m/^-/;
3613 if (m/^--dry-run$/) {
3616 } elsif (m/^--damp-run$/) {
3619 } elsif (m/^--no-sign$/) {
3622 } elsif (m/^--help$/) {
3624 } elsif (m/^--version$/) {
3626 } elsif (m/^--new$/) {
3629 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
3630 ($om = $opts_opt_map{$1}) &&
3634 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
3635 !$opts_opt_cmdonly{$1} &&
3636 ($om = $opts_opt_map{$1})) {
3639 } elsif (m/^--ignore-dirty$/s) {
3642 } elsif (m/^--no-quilt-fixup$/s) {
3644 $quilt_mode = 'nocheck';
3645 } elsif (m/^--no-rm-on-error$/s) {
3648 } elsif (m/^--(no-)?rm-old-changes$/s) {
3651 } elsif (m/^--deliberately-($deliberately_re)$/s) {
3653 push @deliberatelies, $&;
3654 } elsif (m/^--always-split-source-build$/s) {
3655 # undocumented, for testing
3657 $need_split_build_invocation = 1;
3658 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
3659 $val = $2 ? $' : undef; #';
3660 $valopt->($oi->{Long});
3662 badusage "unknown long option \`$_'";
3669 } elsif (s/^-L/-/) {
3672 } elsif (s/^-h/-/) {
3674 } elsif (s/^-D/-/) {
3678 } elsif (s/^-N/-/) {
3683 push @changesopts, $_;
3685 } elsif (s/^-wn$//s) {
3687 $cleanmode = 'none';
3688 } elsif (s/^-wg$//s) {
3691 } elsif (s/^-wgf$//s) {
3693 $cleanmode = 'git-ff';
3694 } elsif (s/^-wd$//s) {
3696 $cleanmode = 'dpkg-source';
3697 } elsif (s/^-wdd$//s) {
3699 $cleanmode = 'dpkg-source-d';
3700 } elsif (s/^-wc$//s) {
3702 $cleanmode = 'check';
3703 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
3705 $val = undef unless length $val;
3706 $valopt->($oi->{Short});
3709 badusage "unknown short option \`$_'";
3716 sub finalise_opts_opts () {
3717 foreach my $k (keys %opts_opt_map) {
3718 my $om = $opts_opt_map{$k};
3720 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
3722 badcfg "cannot set command for $k"
3723 unless length $om->[0];
3727 foreach my $c (access_cfg_cfgs("opts-$k")) {
3728 my $vl = $gitcfg{$c};
3729 printdebug "CL $c ",
3730 ($vl ? join " ", map { shellquote } @$vl : ""),
3731 "\n" if $debuglevel >= 4;
3733 badcfg "cannot configure options for $k"
3734 if $opts_opt_cmdonly{$k};
3735 my $insertpos = $opts_cfg_insertpos{$k};
3736 @$om = ( @$om[0..$insertpos-1],
3738 @$om[$insertpos..$#$om] );
3743 if ($ENV{$fakeeditorenv}) {
3745 quilt_fixup_editor();
3751 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
3752 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
3753 if $dryrun_level == 1;
3755 print STDERR $helpmsg or die $!;
3758 my $cmd = shift @ARGV;
3761 if (!defined $rmchanges) {
3762 local $access_forpush;
3763 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
3766 if (!defined $quilt_mode) {
3767 local $access_forpush;
3768 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
3769 // access_cfg('quilt-mode', 'RETURN-UNDEF')
3771 $quilt_mode =~ m/^($quilt_modes_re)$/
3772 or badcfg "unknown quilt-mode \`$quilt_mode'";
3776 if (!defined $cleanmode) {
3777 local $access_forpush;
3778 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
3779 $cleanmode //= 'dpkg-source';
3781 badcfg "unknown clean-mode \`$cleanmode'" unless
3782 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
3785 my $fn = ${*::}{"cmd_$cmd"};
3786 $fn or badusage "unknown operation $cmd";