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';
74 our (@dget) = qw(dget);
75 our (@curl) = qw(curl -f);
76 our (@dput) = qw(dput);
77 our (@debsign) = qw(debsign);
79 our (@sbuild) = qw(sbuild);
81 our (@dgit) = qw(dgit);
82 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
83 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
84 our (@dpkggenchanges) = qw(dpkg-genchanges);
85 our (@mergechanges) = qw(mergechanges -f);
86 our (@changesopts) = ('');
88 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
91 'debsign' => \@debsign,
97 'dpkg-source' => \@dpkgsource,
98 'dpkg-buildpackage' => \@dpkgbuildpackage,
99 'dpkg-genchanges' => \@dpkggenchanges,
100 'ch' => \@changesopts,
101 'mergechanges' => \@mergechanges);
103 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
104 our %opts_cfg_insertpos = map {
106 scalar @{ $opts_opt_map{$_} }
107 } keys %opts_opt_map;
109 sub finalise_opts_opts();
115 our $supplementary_message = '';
116 our $need_split_build_invocation = 0;
120 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
123 our $remotename = 'dgit';
124 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
128 sub lbranch () { return "$branchprefix/$csuite"; }
129 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
130 sub lref () { return "refs/heads/".lbranch(); }
131 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
132 sub rrref () { return server_ref($csuite); }
134 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
144 return "${package}_".(stripepoch $vsn).$sfx
149 return srcfn($vsn,".dsc");
152 sub changespat ($;$) {
153 my ($vsn, $arch) = @_;
154 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
163 foreach my $f (@end) {
165 print STDERR "$us: cleanup: $@" if length $@;
169 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
171 sub no_such_package () {
172 print STDERR "$us: package $package does not exist in suite $isuite\n";
178 return "+".rrref().":".lrref();
183 printdebug "CD $newdir\n";
184 chdir $newdir or die "chdir: $newdir: $!";
187 sub deliberately ($) {
189 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
192 sub deliberately_not_fast_forward () {
193 foreach (qw(not-fast-forward fresh-repo)) {
194 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
198 #---------- remote protocol support, common ----------
200 # remote push initiator/responder protocol:
201 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
202 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
203 # < dgit-remote-push-ready <actual-proto-vsn>
205 # > file parsed-changelog
206 # [indicates that output of dpkg-parsechangelog follows]
207 # > data-block NBYTES
208 # > [NBYTES bytes of data (no newline)]
209 # [maybe some more blocks]
221 # [indicates that signed tag is wanted]
222 # < data-block NBYTES
223 # < [NBYTES bytes of data (no newline)]
224 # [maybe some more blocks]
228 # > want signed-dsc-changes
229 # < data-block NBYTES [transfer of signed dsc]
231 # < data-block NBYTES [transfer of signed changes]
239 sub i_child_report () {
240 # Sees if our child has died, and reap it if so. Returns a string
241 # describing how it died if it failed, or undef otherwise.
242 return undef unless $i_child_pid;
243 my $got = waitpid $i_child_pid, WNOHANG;
244 return undef if $got <= 0;
245 die unless $got == $i_child_pid;
246 $i_child_pid = undef;
247 return undef unless $?;
248 return "build host child ".waitstatusmsg();
253 fail "connection lost: $!" if $fh->error;
254 fail "protocol violation; $m not expected";
257 sub badproto_badread ($$) {
259 fail "connection lost: $!" if $!;
260 my $report = i_child_report();
261 fail $report if defined $report;
262 badproto $fh, "eof (reading $wh)";
265 sub protocol_expect (&$) {
266 my ($match, $fh) = @_;
269 defined && chomp or badproto_badread $fh, "protocol message";
277 badproto $fh, "\`$_'";
280 sub protocol_send_file ($$) {
281 my ($fh, $ourfn) = @_;
282 open PF, "<", $ourfn or die "$ourfn: $!";
285 my $got = read PF, $d, 65536;
286 die "$ourfn: $!" unless defined $got;
288 print $fh "data-block ".length($d)."\n" or die $!;
289 print $fh $d or die $!;
291 PF->error and die "$ourfn $!";
292 print $fh "data-end\n" or die $!;
296 sub protocol_read_bytes ($$) {
297 my ($fh, $nbytes) = @_;
298 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
300 my $got = read $fh, $d, $nbytes;
301 $got==$nbytes or badproto_badread $fh, "data block";
305 sub protocol_receive_file ($$) {
306 my ($fh, $ourfn) = @_;
307 printdebug "() $ourfn\n";
308 open PF, ">", $ourfn or die "$ourfn: $!";
310 my ($y,$l) = protocol_expect {
311 m/^data-block (.*)$/ ? (1,$1) :
312 m/^data-end$/ ? (0,) :
316 my $d = protocol_read_bytes $fh, $l;
317 print PF $d or die $!;
322 #---------- remote protocol support, responder ----------
324 sub responder_send_command ($) {
326 return unless $we_are_responder;
327 # called even without $we_are_responder
328 printdebug ">> $command\n";
329 print PO $command, "\n" or die $!;
332 sub responder_send_file ($$) {
333 my ($keyword, $ourfn) = @_;
334 return unless $we_are_responder;
335 printdebug "]] $keyword $ourfn\n";
336 responder_send_command "file $keyword";
337 protocol_send_file \*PO, $ourfn;
340 sub responder_receive_files ($@) {
341 my ($keyword, @ourfns) = @_;
342 die unless $we_are_responder;
343 printdebug "[[ $keyword @ourfns\n";
344 responder_send_command "want $keyword";
345 foreach my $fn (@ourfns) {
346 protocol_receive_file \*PI, $fn;
349 protocol_expect { m/^files-end$/ } \*PI;
352 #---------- remote protocol support, initiator ----------
354 sub initiator_expect (&) {
356 protocol_expect { &$match } \*RO;
359 #---------- end remote code ----------
362 if ($we_are_responder) {
364 responder_send_command "progress ".length($m) or die $!;
365 print PO $m or die $!;
375 $ua = LWP::UserAgent->new();
379 progress "downloading $what...";
380 my $r = $ua->get(@_) or die $!;
381 return undef if $r->code == 404;
382 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
383 return $r->decoded_content(charset => 'none');
386 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
391 failedcmd @_ if system @_;
394 sub act_local () { return $dryrun_level <= 1; }
395 sub act_scary () { return !$dryrun_level; }
398 if (!$dryrun_level) {
399 progress "dgit ok: @_";
401 progress "would be ok: @_ (but dry run only)";
406 printcmd(\*STDERR,$debugprefix."#",@_);
409 sub runcmd_ordryrun {
417 sub runcmd_ordryrun_local {
426 my ($first_shell, @cmd) = @_;
427 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
430 our $helpmsg = <<END;
432 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
433 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
434 dgit [dgit-opts] build [dpkg-buildpackage-opts]
435 dgit [dgit-opts] sbuild [sbuild-opts]
436 dgit [dgit-opts] push [dgit-opts] [suite]
437 dgit [dgit-opts] rpush build-host:build-dir ...
438 important dgit options:
439 -k<keyid> sign tag and package with <keyid> instead of default
440 --dry-run -n do not change anything, but go through the motions
441 --damp-run -L like --dry-run but make local changes, without signing
442 --new -N allow introducing a new package
443 --debug -D increase debug level
444 -c<name>=<value> set git config option (used directly by dgit too)
447 our $later_warning_msg = <<END;
448 Perhaps the upload is stuck in incoming. Using the version from git.
452 print STDERR "$us: @_\n", $helpmsg or die $!;
457 @ARGV or badusage "too few arguments";
458 return scalar shift @ARGV;
462 print $helpmsg or die $!;
466 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
468 our %defcfg = ('dgit.default.distro' => 'debian',
469 'dgit.default.username' => '',
470 'dgit.default.archive-query-default-component' => 'main',
471 'dgit.default.ssh' => 'ssh',
472 'dgit.default.archive-query' => 'madison:',
473 'dgit.default.sshpsql-dbname' => 'service=projectb',
474 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
475 'dgit-distro.debian.git-check' => 'url',
476 'dgit-distro.debian.git-check-suffix' => '/info/refs',
477 'dgit-distro.debian.new-private-pushers' => 't',
478 'dgit-distro.debian/push.git-url' => '',
479 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
480 'dgit-distro.debian/push.git-user-force' => 'dgit',
481 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
482 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
483 'dgit-distro.debian/push.git-create' => 'true',
484 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
485 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
486 # 'dgit-distro.debian.archive-query-tls-key',
487 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
488 # ^ this does not work because curl is broken nowadays
489 # Fixing #790093 properly will involve providing providing the key
490 # in some pacagke and maybe updating these paths.
492 # 'dgit-distro.debian.archive-query-tls-curl-args',
493 # '--ca-path=/etc/ssl/ca-debian',
494 # ^ this is a workaround but works (only) on DSA-administered machines
495 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
496 'dgit-distro.debian.git-url-suffix' => '',
497 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
498 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
499 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
500 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
501 'dgit-distro.ubuntu.git-check' => 'false',
502 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
503 'dgit-distro.test-dummy.ssh' => "$td/ssh",
504 'dgit-distro.test-dummy.username' => "alice",
505 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
506 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
507 'dgit-distro.test-dummy.git-url' => "$td/git",
508 'dgit-distro.test-dummy.git-host' => "git",
509 'dgit-distro.test-dummy.git-path' => "$td/git",
510 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
511 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
512 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
513 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
518 sub git_slurp_config () {
519 local ($debuglevel) = $debuglevel-2;
522 my @cmd = (@git, qw(config -z --get-regexp .*));
525 open GITS, "-|", @cmd or failedcmd @cmd;
528 printdebug "=> ", (messagequote $_), "\n";
530 push @{ $gitcfg{$`} }, $'; #';
534 or ($!==0 && $?==256)
538 sub git_get_config ($) {
541 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
544 @$l==1 or badcfg "multiple values for $c" if @$l > 1;
550 return undef if $c =~ /RETURN-UNDEF/;
551 my $v = git_get_config($c);
552 return $v if defined $v;
553 my $dv = $defcfg{$c};
554 return $dv if defined $dv;
556 badcfg "need value for one of: @_\n".
557 "$us: distro or suite appears not to be (properly) supported";
560 sub access_basedistro () {
561 if (defined $idistro) {
564 return cfg("dgit-suite.$isuite.distro",
565 "dgit.default.distro");
569 sub access_quirk () {
570 # returns (quirk name, distro to use instead or undef, quirk-specific info)
571 my $basedistro = access_basedistro();
572 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
574 if (defined $backports_quirk) {
575 my $re = $backports_quirk;
576 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
578 $re =~ s/\%/([-0-9a-z_]+)/
579 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
580 if ($isuite =~ m/^$re$/) {
581 return ('backports',"$basedistro-backports",$1);
584 return ('none',undef);
589 sub parse_cfg_bool ($$$) {
590 my ($what,$def,$v) = @_;
593 $v =~ m/^[ty1]/ ? 1 :
594 $v =~ m/^[fn0]/ ? 0 :
595 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
598 sub access_forpush_config () {
599 my $d = access_basedistro();
603 parse_cfg_bool('new-private-pushers', 0,
604 cfg("dgit-distro.$d.new-private-pushers",
607 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
610 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
611 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
612 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
613 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
616 sub access_forpush () {
617 $access_forpush //= access_forpush_config();
618 return $access_forpush;
622 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
623 badcfg "pushing but distro is configured readonly"
624 if access_forpush_config() eq '0';
626 $supplementary_message = <<'END' unless $we_are_responder;
627 Push failed, before we got started.
628 You can retry the push, after fixing the problem, if you like.
630 finalise_opts_opts();
634 finalise_opts_opts();
637 sub supplementary_message ($) {
639 if (!$we_are_responder) {
640 $supplementary_message = $msg;
642 } elsif ($protovsn >= 3) {
643 responder_send_command "supplementary-message ".length($msg)
645 print PO $msg or die $!;
649 sub access_distros () {
650 # Returns list of distros to try, in order
653 # 0. `instead of' distro name(s) we have been pointed to
654 # 1. the access_quirk distro, if any
655 # 2a. the user's specified distro, or failing that } basedistro
656 # 2b. the distro calculated from the suite }
657 my @l = access_basedistro();
659 my (undef,$quirkdistro) = access_quirk();
660 unshift @l, $quirkdistro;
661 unshift @l, $instead_distro;
662 @l = grep { defined } @l;
664 if (access_forpush()) {
665 @l = map { ("$_/push", $_) } @l;
670 sub access_cfg_cfgs (@) {
673 # The nesting of these loops determines the search order. We put
674 # the key loop on the outside so that we search all the distros
675 # for each key, before going on to the next key. That means that
676 # if access_cfg is called with a more specific, and then a less
677 # specific, key, an earlier distro can override the less specific
678 # without necessarily overriding any more specific keys. (If the
679 # distro wants to override the more specific keys it can simply do
680 # so; whereas if we did the loop the other way around, it would be
681 # impossible to for an earlier distro to override a less specific
682 # key but not the more specific ones without restating the unknown
683 # values of the more specific keys.
686 # We have to deal with RETURN-UNDEF specially, so that we don't
687 # terminate the search prematurely.
689 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
692 foreach my $d (access_distros()) {
693 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
695 push @cfgs, map { "dgit.default.$_" } @realkeys;
702 my (@cfgs) = access_cfg_cfgs(@keys);
703 my $value = cfg(@cfgs);
707 sub access_cfg_bool ($$) {
708 my ($def, @keys) = @_;
709 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
712 sub string_to_ssh ($) {
714 if ($spec =~ m/\s/) {
715 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
721 sub access_cfg_ssh () {
722 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
723 if (!defined $gitssh) {
726 return string_to_ssh $gitssh;
730 sub access_runeinfo ($) {
732 return ": dgit ".access_basedistro()." $info ;";
735 sub access_someuserhost ($) {
737 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
738 defined($user) && length($user) or
739 $user = access_cfg("$some-user",'username');
740 my $host = access_cfg("$some-host");
741 return length($user) ? "$user\@$host" : $host;
744 sub access_gituserhost () {
745 return access_someuserhost('git');
748 sub access_giturl (;$) {
750 my $url = access_cfg('git-url','RETURN-UNDEF');
753 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
754 return undef unless defined $proto;
757 access_gituserhost().
758 access_cfg('git-path');
760 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
763 return "$url/$package$suffix";
766 sub parsecontrolfh ($$;$) {
767 my ($fh, $desc, $allowsigned) = @_;
768 our $dpkgcontrolhash_noissigned;
771 my %opts = ('name' => $desc);
772 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
773 $c = Dpkg::Control::Hash->new(%opts);
774 $c->parse($fh,$desc) or die "parsing of $desc failed";
775 last if $allowsigned;
776 last if $dpkgcontrolhash_noissigned;
777 my $issigned= $c->get_option('is_pgp_signed');
778 if (!defined $issigned) {
779 $dpkgcontrolhash_noissigned= 1;
780 seek $fh, 0,0 or die "seek $desc: $!";
781 } elsif ($issigned) {
782 fail "control file $desc is (already) PGP-signed. ".
783 " Note that dgit push needs to modify the .dsc and then".
784 " do the signature itself";
793 my ($file, $desc) = @_;
794 my $fh = new IO::Handle;
795 open $fh, '<', $file or die "$file: $!";
796 my $c = parsecontrolfh($fh,$desc);
797 $fh->error and die $!;
803 my ($dctrl,$field) = @_;
804 my $v = $dctrl->{$field};
805 return $v if defined $v;
806 fail "missing field $field in ".$v->get_option('name');
810 my $c = Dpkg::Control::Hash->new();
811 my $p = new IO::Handle;
812 my @cmd = (qw(dpkg-parsechangelog), @_);
813 open $p, '-|', @cmd or die $!;
815 $?=0; $!=0; close $p or failedcmd @cmd;
821 defined $d or fail "getcwd failed: $!";
827 sub archive_query ($) {
829 my $query = access_cfg('archive-query','RETURN-UNDEF');
830 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
833 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
836 sub pool_dsc_subpath ($$) {
837 my ($vsn,$component) = @_; # $package is implict arg
838 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
839 return "/pool/$component/$prefix/$package/".dscfn($vsn);
842 #---------- `ftpmasterapi' archive query method (nascent) ----------
844 sub archive_api_query_cmd ($) {
846 my @cmd = qw(curl -sS);
847 my $url = access_cfg('archive-query-url');
848 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
850 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
851 foreach my $key (split /\:/, $keys) {
852 $key =~ s/\%HOST\%/$host/g;
854 fail "for $url: stat $key: $!" unless $!==ENOENT;
857 fail "config requested specific TLS key but do not know".
858 " how to get curl to use exactly that EE key ($key)";
859 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
860 # # Sadly the above line does not work because of changes
861 # # to gnutls. The real fix for #790093 may involve
862 # # new curl options.
865 # Fixing #790093 properly will involve providing a value
866 # for this on clients.
867 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
868 push @cmd, split / /, $kargs if defined $kargs;
870 push @cmd, $url.$subpath;
876 my ($data, $subpath) = @_;
877 badcfg "ftpmasterapi archive query method takes no data part"
879 my @cmd = archive_api_query_cmd($subpath);
880 my $json = cmdoutput @cmd;
881 return decode_json($json);
884 sub canonicalise_suite_ftpmasterapi () {
885 my ($proto,$data) = @_;
886 my $suites = api_query($data, 'suites');
888 foreach my $entry (@$suites) {
890 my $v = $entry->{$_};
891 defined $v && $v eq $isuite;
893 push @matched, $entry;
895 fail "unknown suite $isuite" unless @matched;
898 @matched==1 or die "multiple matches for suite $isuite\n";
899 $cn = "$matched[0]{codename}";
900 defined $cn or die "suite $isuite info has no codename\n";
901 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
903 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
908 sub archive_query_ftpmasterapi () {
909 my ($proto,$data) = @_;
910 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
912 my $digester = Digest::SHA->new(256);
913 foreach my $entry (@$info) {
915 my $vsn = "$entry->{version}";
916 my ($ok,$msg) = version_check $vsn;
917 die "bad version: $msg\n" unless $ok;
918 my $component = "$entry->{component}";
919 $component =~ m/^$component_re$/ or die "bad component";
920 my $filename = "$entry->{filename}";
921 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
922 or die "bad filename";
923 my $sha256sum = "$entry->{sha256sum}";
924 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
925 push @rows, [ $vsn, "/pool/$component/$filename",
926 $digester, $sha256sum ];
928 die "bad ftpmaster api response: $@\n".Dumper($entry)
931 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
935 #---------- `madison' archive query method ----------
937 sub archive_query_madison {
938 return map { [ @$_[0..1] ] } madison_get_parse(@_);
941 sub madison_get_parse {
942 my ($proto,$data) = @_;
943 die unless $proto eq 'madison';
945 $data= access_cfg('madison-distro','RETURN-UNDEF');
946 $data //= access_basedistro();
948 $rmad{$proto,$data,$package} ||= cmdoutput
949 qw(rmadison -asource),"-s$isuite","-u$data",$package;
950 my $rmad = $rmad{$proto,$data,$package};
953 foreach my $l (split /\n/, $rmad) {
954 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
955 \s*( [^ \t|]+ )\s* \|
956 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
957 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
958 $1 eq $package or die "$rmad $package ?";
965 $component = access_cfg('archive-query-default-component');
967 $5 eq 'source' or die "$rmad ?";
968 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
970 return sort { -version_compare($a->[0],$b->[0]); } @out;
973 sub canonicalise_suite_madison {
974 # madison canonicalises for us
975 my @r = madison_get_parse(@_);
977 "unable to canonicalise suite using package $package".
978 " which does not appear to exist in suite $isuite;".
979 " --existing-package may help";
983 #---------- `sshpsql' archive query method ----------
986 my ($data,$runeinfo,$sql) = @_;
988 $data= access_someuserhost('sshpsql').':'.
989 access_cfg('sshpsql-dbname');
991 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
992 my ($userhost,$dbname) = ($`,$'); #';
994 my @cmd = (access_cfg_ssh, $userhost,
995 access_runeinfo("ssh-psql $runeinfo").
996 " export LC_MESSAGES=C; export LC_CTYPE=C;".
997 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
999 open P, "-|", @cmd or die $!;
1002 printdebug(">|$_|\n");
1005 $!=0; $?=0; close P or failedcmd @cmd;
1007 my $nrows = pop @rows;
1008 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1009 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1010 @rows = map { [ split /\|/, $_ ] } @rows;
1011 my $ncols = scalar @{ shift @rows };
1012 die if grep { scalar @$_ != $ncols } @rows;
1016 sub sql_injection_check {
1017 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1020 sub archive_query_sshpsql ($$) {
1021 my ($proto,$data) = @_;
1022 sql_injection_check $isuite, $package;
1023 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1024 SELECT source.version, component.name, files.filename, files.sha256sum
1026 JOIN src_associations ON source.id = src_associations.source
1027 JOIN suite ON suite.id = src_associations.suite
1028 JOIN dsc_files ON dsc_files.source = source.id
1029 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1030 JOIN component ON component.id = files_archive_map.component_id
1031 JOIN files ON files.id = dsc_files.file
1032 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1033 AND source.source='$package'
1034 AND files.filename LIKE '%.dsc';
1036 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1037 my $digester = Digest::SHA->new(256);
1039 my ($vsn,$component,$filename,$sha256sum) = @$_;
1040 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1045 sub canonicalise_suite_sshpsql ($$) {
1046 my ($proto,$data) = @_;
1047 sql_injection_check $isuite;
1048 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1049 SELECT suite.codename
1050 FROM suite where suite_name='$isuite' or codename='$isuite';
1052 @rows = map { $_->[0] } @rows;
1053 fail "unknown suite $isuite" unless @rows;
1054 die "ambiguous $isuite: @rows ?" if @rows>1;
1058 #---------- `dummycat' archive query method ----------
1060 sub canonicalise_suite_dummycat ($$) {
1061 my ($proto,$data) = @_;
1062 my $dpath = "$data/suite.$isuite";
1063 if (!open C, "<", $dpath) {
1064 $!==ENOENT or die "$dpath: $!";
1065 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1069 chomp or die "$dpath: $!";
1071 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1075 sub archive_query_dummycat ($$) {
1076 my ($proto,$data) = @_;
1077 canonicalise_suite();
1078 my $dpath = "$data/package.$csuite.$package";
1079 if (!open C, "<", $dpath) {
1080 $!==ENOENT or die "$dpath: $!";
1081 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1089 printdebug "dummycat query $csuite $package $dpath | $_\n";
1090 my @row = split /\s+/, $_;
1091 @row==2 or die "$dpath: $_ ?";
1094 C->error and die "$dpath: $!";
1096 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1099 #---------- archive query entrypoints and rest of program ----------
1101 sub canonicalise_suite () {
1102 return if defined $csuite;
1103 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1104 $csuite = archive_query('canonicalise_suite');
1105 if ($isuite ne $csuite) {
1106 progress "canonical suite name for $isuite is $csuite";
1110 sub get_archive_dsc () {
1111 canonicalise_suite();
1112 my @vsns = archive_query('archive_query');
1113 foreach my $vinfo (@vsns) {
1114 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1115 $dscurl = access_cfg('mirror').$subpath;
1116 $dscdata = url_get($dscurl);
1118 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1123 $digester->add($dscdata);
1124 my $got = $digester->hexdigest();
1126 fail "$dscurl has hash $got but".
1127 " archive told us to expect $digest";
1129 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1130 printdebug Dumper($dscdata) if $debuglevel>1;
1131 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1132 printdebug Dumper($dsc) if $debuglevel>1;
1133 my $fmt = getfield $dsc, 'Format';
1134 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
1135 $dsc_checked = !!$digester;
1141 sub check_for_git ();
1142 sub check_for_git () {
1144 my $how = access_cfg('git-check');
1145 if ($how eq 'ssh-cmd') {
1147 (access_cfg_ssh, access_gituserhost(),
1148 access_runeinfo("git-check $package").
1149 " set -e; cd ".access_cfg('git-path').";".
1150 " if test -d $package.git; then echo 1; else echo 0; fi");
1151 my $r= cmdoutput @cmd;
1152 if ($r =~ m/^divert (\w+)$/) {
1154 my ($usedistro,) = access_distros();
1155 # NB that if we are pushing, $usedistro will be $distro/push
1156 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1157 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1158 progress "diverting to $divert (using config for $instead_distro)";
1159 return check_for_git();
1161 failedcmd @cmd unless $r =~ m/^[01]$/;
1163 } elsif ($how eq 'url') {
1164 my $prefix = access_cfg('git-check-url','git-url');
1165 my $suffix = access_cfg('git-check-suffix','git-suffix',
1166 'RETURN-UNDEF') // '.git';
1167 my $url = "$prefix/$package$suffix";
1168 my @cmd = (qw(curl -sS -I), $url);
1169 my $result = cmdoutput @cmd;
1170 $result =~ s/^\S+ 200 .*\n\r?\n//;
1171 # curl -sS -I with https_proxy prints
1172 # HTTP/1.0 200 Connection established
1173 $result =~ m/^\S+ (404|200) /s or
1174 fail "unexpected results from git check query - ".
1175 Dumper($prefix, $result);
1177 if ($code eq '404') {
1179 } elsif ($code eq '200') {
1184 } elsif ($how eq 'true') {
1186 } elsif ($how eq 'false') {
1189 badcfg "unknown git-check \`$how'";
1193 sub create_remote_git_repo () {
1194 my $how = access_cfg('git-create');
1195 if ($how eq 'ssh-cmd') {
1197 (access_cfg_ssh, access_gituserhost(),
1198 access_runeinfo("git-create $package").
1199 "set -e; cd ".access_cfg('git-path').";".
1200 " cp -a _template $package.git");
1201 } elsif ($how eq 'true') {
1204 badcfg "unknown git-create \`$how'";
1208 our ($dsc_hash,$lastpush_hash);
1210 our $ud = '.git/dgit/unpack';
1220 sub mktree_in_ud_here () {
1221 runcmd qw(git init -q);
1222 rmtree('.git/objects');
1223 symlink '../../../../objects','.git/objects' or die $!;
1226 sub git_write_tree () {
1227 my $tree = cmdoutput @git, qw(write-tree);
1228 $tree =~ m/^\w+$/ or die "$tree ?";
1232 sub remove_stray_gits () {
1233 my @gitscmd = qw(find -name .git -prune -print0);
1234 debugcmd "|",@gitscmd;
1235 open GITS, "-|", @gitscmd or failedcmd @gitscmd;
1240 print STDERR "$us: warning: removing from source package: ",
1241 (messagequote $_), "\n";
1245 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1248 sub mktree_in_ud_from_only_subdir () {
1249 # changes into the subdir
1251 die unless @dirs==1;
1252 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1256 remove_stray_gits();
1257 mktree_in_ud_here();
1258 my ($format, $fopts) = get_source_format();
1259 if (madformat($format)) {
1262 runcmd @git, qw(add -Af);
1263 my $tree=git_write_tree();
1264 return ($tree,$dir);
1267 sub dsc_files_info () {
1268 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1269 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1270 ['Files', 'Digest::MD5', 'new()']) {
1271 my ($fname, $module, $method) = @$csumi;
1272 my $field = $dsc->{$fname};
1273 next unless defined $field;
1274 eval "use $module; 1;" or die $@;
1276 foreach (split /\n/, $field) {
1278 m/^(\w+) (\d+) (\S+)$/ or
1279 fail "could not parse .dsc $fname line \`$_'";
1280 my $digester = eval "$module"."->$method;" or die $@;
1285 Digester => $digester,
1290 fail "missing any supported Checksums-* or Files field in ".
1291 $dsc->get_option('name');
1295 map { $_->{Filename} } dsc_files_info();
1298 sub is_orig_file ($;$) {
1301 m/\.orig(?:-\w+)?\.tar\.\w+$/ or return 0;
1302 defined $base or return 1;
1306 sub make_commit ($) {
1308 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1311 sub clogp_authline ($) {
1313 my $author = getfield $clogp, 'Maintainer';
1314 $author =~ s#,.*##ms;
1315 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1316 my $authline = "$author $date";
1317 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
1318 fail "unexpected commit author line format \`$authline'".
1319 " (was generated from changelog Maintainer field)";
1323 sub vendor_patches_distro ($$) {
1324 my ($checkdistro, $what) = @_;
1325 return unless defined $checkdistro;
1327 my $series = "debian/patches/\L$checkdistro\E.series";
1328 printdebug "checking for vendor-specific $series ($what)\n";
1330 if (!open SERIES, "<", $series) {
1331 die "$series $!" unless $!==ENOENT;
1340 Unfortunately, this source package uses a feature of dpkg-source where
1341 the same source package unpacks to different source code on different
1342 distros. dgit cannot safely operate on such packages on affected
1343 distros, because the meaning of source packages is not stable.
1345 Please ask the distro/maintainer to remove the distro-specific series
1346 files and use a different technique (if necessary, uploading actually
1347 different packages, if different distros are supposed to have
1351 fail "Found active distro-specific series file for".
1352 " $checkdistro ($what): $series, cannot continue";
1354 die "$series $!" if SERIES->error;
1358 sub check_for_vendor_patches () {
1359 # This dpkg-source feature doesn't seem to be documented anywhere!
1360 # But it can be found in the changelog (reformatted):
1362 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1363 # Author: Raphael Hertzog <hertzog@debian.org>
1364 # Date: Sun Oct 3 09:36:48 2010 +0200
1366 # dpkg-source: correctly create .pc/.quilt_series with alternate
1369 # If you have debian/patches/ubuntu.series and you were
1370 # unpacking the source package on ubuntu, quilt was still
1371 # directed to debian/patches/series instead of
1372 # debian/patches/ubuntu.series.
1374 # debian/changelog | 3 +++
1375 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1376 # 2 files changed, 6 insertions(+), 1 deletion(-)
1379 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1380 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1381 "Dpkg::Vendor \`current vendor'");
1382 vendor_patches_distro(access_basedistro(),
1383 "distro being accessed");
1386 sub generate_commit_from_dsc () {
1390 foreach my $fi (dsc_files_info()) {
1391 my $f = $fi->{Filename};
1392 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1394 link_ltarget "../../../$f", $f
1398 complete_file_from_dsc('.', $fi)
1401 if (is_orig_file($f)) {
1402 link $f, "../../../../$f"
1408 my $dscfn = "$package.dsc";
1410 open D, ">", $dscfn or die "$dscfn: $!";
1411 print D $dscdata or die "$dscfn: $!";
1412 close D or die "$dscfn: $!";
1413 my @cmd = qw(dpkg-source);
1414 push @cmd, '--no-check' if $dsc_checked;
1415 push @cmd, qw(-x --), $dscfn;
1418 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1419 check_for_vendor_patches() if madformat($dsc->{format});
1420 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
1421 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
1422 my $authline = clogp_authline $clogp;
1423 my $changes = getfield $clogp, 'Changes';
1424 open C, ">../commit.tmp" or die $!;
1425 print C <<END or die $!;
1432 # imported from the archive
1435 my $outputhash = make_commit qw(../commit.tmp);
1436 my $cversion = getfield $clogp, 'Version';
1437 progress "synthesised git commit from .dsc $cversion";
1438 if ($lastpush_hash) {
1439 runcmd @git, qw(reset --hard), $lastpush_hash;
1440 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
1441 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
1442 my $oversion = getfield $oldclogp, 'Version';
1444 version_compare($oversion, $cversion);
1446 # git upload/ is earlier vsn than archive, use archive
1447 open C, ">../commit2.tmp" or die $!;
1448 print C <<END or die $!;
1450 parent $lastpush_hash
1455 Record $package ($cversion) in archive suite $csuite
1457 $outputhash = make_commit qw(../commit2.tmp);
1458 } elsif ($vcmp > 0) {
1459 print STDERR <<END or die $!;
1461 Version actually in archive: $cversion (older)
1462 Last allegedly pushed/uploaded: $oversion (newer or same)
1465 $outputhash = $lastpush_hash;
1467 $outputhash = $lastpush_hash;
1470 changedir '../../../..';
1471 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
1472 'DGIT_ARCHIVE', $outputhash;
1473 cmdoutput @git, qw(log -n2), $outputhash;
1474 # ... gives git a chance to complain if our commit is malformed
1479 sub complete_file_from_dsc ($$) {
1480 our ($dstdir, $fi) = @_;
1481 # Ensures that we have, in $dir, the file $fi, with the correct
1482 # contents. (Downloading it from alongside $dscurl if necessary.)
1484 my $f = $fi->{Filename};
1485 my $tf = "$dstdir/$f";
1488 if (stat_exists $tf) {
1489 progress "using existing $f";
1492 $furl =~ s{/[^/]+$}{};
1494 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
1495 die "$f ?" if $f =~ m#/#;
1496 runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
1497 return 0 if !act_local();
1501 open F, "<", "$tf" or die "$tf: $!";
1502 $fi->{Digester}->reset();
1503 $fi->{Digester}->addfile(*F);
1504 F->error and die $!;
1505 my $got = $fi->{Digester}->hexdigest();
1506 $got eq $fi->{Hash} or
1507 fail "file $f has hash $got but .dsc".
1508 " demands hash $fi->{Hash} ".
1509 ($downloaded ? "(got wrong file from archive!)"
1510 : "(perhaps you should delete this file?)");
1515 sub ensure_we_have_orig () {
1516 foreach my $fi (dsc_files_info()) {
1517 my $f = $fi->{Filename};
1518 next unless is_orig_file($f);
1519 complete_file_from_dsc('..', $fi)
1524 sub git_fetch_us () {
1525 my @specs = (fetchspec());
1527 map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
1529 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(), @specs;
1532 my $tagpat = debiantag('*',access_basedistro);
1534 git_for_each_ref("refs/tags/".$tagpat, sub {
1535 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1536 printdebug "currently $fullrefname=$objid\n";
1537 $here{$fullrefname} = $objid;
1539 git_for_each_ref(lrfetchrefs."/tags/".$tagpat, sub {
1540 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1541 my $lref = "refs".substr($fullrefname, length lrfetchrefs);
1542 printdebug "offered $lref=$objid\n";
1543 if (!defined $here{$lref}) {
1544 my @upd = (@git, qw(update-ref), $lref, $objid, '');
1545 runcmd_ordryrun_local @upd;
1546 } elsif ($here{$lref} eq $objid) {
1549 "Not updateting $lref from $here{$lref} to $objid.\n";
1554 sub fetch_from_archive () {
1555 # ensures that lrref() is what is actually in the archive,
1556 # one way or another
1560 foreach my $field (@ourdscfield) {
1561 $dsc_hash = $dsc->{$field};
1562 last if defined $dsc_hash;
1564 if (defined $dsc_hash) {
1565 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
1567 progress "last upload to archive specified git hash";
1569 progress "last upload to archive has NO git hash";
1572 progress "no version available from the archive";
1575 $lastpush_hash = git_get_ref(lrref());
1576 printdebug "previous reference hash=$lastpush_hash\n";
1578 if (defined $dsc_hash) {
1579 fail "missing remote git history even though dsc has hash -".
1580 " could not find ref ".lrref().
1581 " (should have been fetched from ".access_giturl()."#".rrref().")"
1582 unless $lastpush_hash;
1584 ensure_we_have_orig();
1585 if ($dsc_hash eq $lastpush_hash) {
1586 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
1587 print STDERR <<END or die $!;
1589 Git commit in archive is behind the last version allegedly pushed/uploaded.
1590 Commit referred to by archive: $dsc_hash
1591 Last allegedly pushed/uploaded: $lastpush_hash
1594 $hash = $lastpush_hash;
1596 fail "git head (".lrref()."=$lastpush_hash) is not a ".
1597 "descendant of archive's .dsc hash ($dsc_hash)";
1600 $hash = generate_commit_from_dsc();
1601 } elsif ($lastpush_hash) {
1602 # only in git, not in the archive yet
1603 $hash = $lastpush_hash;
1604 print STDERR <<END or die $!;
1606 Package not found in the archive, but has allegedly been pushed using dgit.
1610 printdebug "nothing found!\n";
1611 if (defined $skew_warning_vsn) {
1612 print STDERR <<END or die $!;
1614 Warning: relevant archive skew detected.
1615 Archive allegedly contains $skew_warning_vsn
1616 But we were not able to obtain any version from the archive or git.
1622 printdebug "current hash=$hash\n";
1623 if ($lastpush_hash) {
1624 fail "not fast forward on last upload branch!".
1625 " (archive's version left in DGIT_ARCHIVE)"
1626 unless is_fast_fwd($lastpush_hash, $hash);
1628 if (defined $skew_warning_vsn) {
1630 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
1631 my $clogf = ".git/dgit/changelog.tmp";
1632 runcmd shell_cmd "exec >$clogf",
1633 @git, qw(cat-file blob), "$hash:debian/changelog";
1634 my $gotclogp = parsechangelog("-l$clogf");
1635 my $got_vsn = getfield $gotclogp, 'Version';
1636 printdebug "SKEW CHECK GOT $got_vsn\n";
1637 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
1638 print STDERR <<END or die $!;
1640 Warning: archive skew detected. Using the available version:
1641 Archive allegedly contains $skew_warning_vsn
1642 We were able to obtain only $got_vsn
1647 if ($lastpush_hash ne $hash) {
1648 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
1652 dryrun_report @upd_cmd;
1658 sub set_local_git_config ($$) {
1660 runcmd @git, qw(config), $k, $v;
1663 sub setup_mergechangelogs (;$) {
1665 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
1667 my $driver = 'dpkg-mergechangelogs';
1668 my $cb = "merge.$driver";
1669 my $attrs = '.git/info/attributes';
1670 ensuredir '.git/info';
1672 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
1673 if (!open ATTRS, "<", $attrs) {
1674 $!==ENOENT or die "$attrs: $!";
1678 next if m{^debian/changelog\s};
1679 print NATTRS $_, "\n" or die $!;
1681 ATTRS->error and die $!;
1684 print NATTRS "debian/changelog merge=$driver\n" or die $!;
1687 set_local_git_config "$cb.name", 'debian/changelog merge driver';
1688 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
1690 rename "$attrs.new", "$attrs" or die "$attrs: $!";
1693 sub setup_useremail (;$) {
1695 return unless $always || access_cfg_bool(1, 'setup-useremail');
1698 my ($k, $envvar) = @_;
1699 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
1700 return unless defined $v;
1701 set_local_git_config "user.$k", $v;
1704 $setup->('email', 'DEBEMAIL');
1705 $setup->('name', 'DEBFULLNAME');
1708 sub setup_new_tree () {
1709 setup_mergechangelogs();
1715 canonicalise_suite();
1716 badusage "dry run makes no sense with clone" unless act_local();
1717 my $hasgit = check_for_git();
1718 mkdir $dstdir or fail "create \`$dstdir': $!";
1720 runcmd @git, qw(init -q);
1721 my $giturl = access_giturl(1);
1722 if (defined $giturl) {
1723 set_local_git_config "remote.$remotename.fetch", fetchspec();
1724 open H, "> .git/HEAD" or die $!;
1725 print H "ref: ".lref()."\n" or die $!;
1727 runcmd @git, qw(remote add), 'origin', $giturl;
1730 progress "fetching existing git history";
1732 runcmd_ordryrun_local @git, qw(fetch origin);
1734 progress "starting new git history";
1736 fetch_from_archive() or no_such_package;
1737 my $vcsgiturl = $dsc->{'Vcs-Git'};
1738 if (length $vcsgiturl) {
1739 $vcsgiturl =~ s/\s+-b\s+\S+//g;
1740 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
1743 runcmd @git, qw(reset --hard), lrref();
1744 printdone "ready for work in $dstdir";
1748 if (check_for_git()) {
1751 fetch_from_archive() or no_such_package();
1752 printdone "fetched into ".lrref();
1757 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
1759 printdone "fetched to ".lrref()." and merged into HEAD";
1762 sub check_not_dirty () {
1763 foreach my $f (qw(local-options local-patch-header)) {
1764 if (stat_exists "debian/source/$f") {
1765 fail "git tree contains debian/source/$f";
1769 return if $ignoredirty;
1771 my @cmd = (@git, qw(diff --quiet HEAD));
1773 $!=0; $?=0; system @cmd;
1774 return if !$! && !$?;
1775 if (!$! && $?==256) {
1776 fail "working tree is dirty (does not match HEAD)";
1782 sub commit_admin ($) {
1785 runcmd_ordryrun_local @git, qw(commit -m), $m;
1788 sub commit_quilty_patch () {
1789 my $output = cmdoutput @git, qw(status --porcelain);
1791 foreach my $l (split /\n/, $output) {
1792 next unless $l =~ m/\S/;
1793 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1797 delete $adds{'.pc'}; # if there wasn't one before, don't add it
1799 progress "nothing quilty to commit, ok.";
1802 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
1803 runcmd_ordryrun_local @git, qw(add -f), @adds;
1804 commit_admin "Commit Debian 3.0 (quilt) metadata";
1807 sub get_source_format () {
1809 if (open F, "debian/source/options") {
1813 s/\s+$//; # ignore missing final newline
1815 my ($k, $v) = ($`, $'); #');
1816 $v =~ s/^"(.*)"$/$1/;
1822 F->error and die $!;
1825 die $! unless $!==&ENOENT;
1828 if (!open F, "debian/source/format") {
1829 die $! unless $!==&ENOENT;
1833 F->error and die $!;
1835 return ($_, \%options);
1840 return 0 unless $format eq '3.0 (quilt)';
1841 if ($quilt_mode eq 'nocheck') {
1842 progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
1845 progress "Format \`$format', checking/updating patch stack";
1849 sub push_parse_changelog ($) {
1852 my $clogp = Dpkg::Control::Hash->new();
1853 $clogp->load($clogpfn) or die;
1855 $package = getfield $clogp, 'Source';
1856 my $cversion = getfield $clogp, 'Version';
1857 my $tag = debiantag($cversion, access_basedistro);
1858 runcmd @git, qw(check-ref-format), $tag;
1860 my $dscfn = dscfn($cversion);
1862 return ($clogp, $cversion, $tag, $dscfn);
1865 sub push_parse_dsc ($$$) {
1866 my ($dscfn,$dscfnwhat, $cversion) = @_;
1867 $dsc = parsecontrol($dscfn,$dscfnwhat);
1868 my $dversion = getfield $dsc, 'Version';
1869 my $dscpackage = getfield $dsc, 'Source';
1870 ($dscpackage eq $package && $dversion eq $cversion) or
1871 fail "$dscfn is for $dscpackage $dversion".
1872 " but debian/changelog is for $package $cversion";
1875 sub push_mktag ($$$$$$$) {
1876 my ($head,$clogp,$tag,
1878 $changesfile,$changesfilewhat,
1881 $dsc->{$ourdscfield[0]} = $head;
1882 $dsc->save("$dscfn.tmp") or die $!;
1884 my $changes = parsecontrol($changesfile,$changesfilewhat);
1885 foreach my $field (qw(Source Distribution Version)) {
1886 $changes->{$field} eq $clogp->{$field} or
1887 fail "changes field $field \`$changes->{$field}'".
1888 " does not match changelog \`$clogp->{$field}'";
1891 my $cversion = getfield $clogp, 'Version';
1892 my $clogsuite = getfield $clogp, 'Distribution';
1894 # We make the git tag by hand because (a) that makes it easier
1895 # to control the "tagger" (b) we can do remote signing
1896 my $authline = clogp_authline $clogp;
1897 my $delibs = join(" ", "",@deliberatelies);
1898 my $declaredistro = access_basedistro();
1899 open TO, '>', $tfn->('.tmp') or die $!;
1900 print TO <<END or die $!;
1906 $package release $cversion for $clogsuite ($csuite) [dgit]
1907 [dgit distro=$declaredistro$delibs]
1909 foreach my $ref (sort keys %previously) {
1910 print TO <<END or die $!;
1911 [dgit previously:$ref=$previously{$ref}]
1917 my $tagobjfn = $tfn->('.tmp');
1919 if (!defined $keyid) {
1920 $keyid = access_cfg('keyid','RETURN-UNDEF');
1922 if (!defined $keyid) {
1923 $keyid = getfield $clogp, 'Maintainer';
1925 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1926 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1927 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1928 push @sign_cmd, $tfn->('.tmp');
1929 runcmd_ordryrun @sign_cmd;
1931 $tagobjfn = $tfn->('.signed.tmp');
1932 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
1933 $tfn->('.tmp'), $tfn->('.tmp.asc');
1940 sub sign_changes ($) {
1941 my ($changesfile) = @_;
1943 my @debsign_cmd = @debsign;
1944 push @debsign_cmd, "-k$keyid" if defined $keyid;
1945 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
1946 push @debsign_cmd, $changesfile;
1947 runcmd_ordryrun @debsign_cmd;
1952 my ($forceflag) = @_;
1953 printdebug "actually entering push\n";
1954 supplementary_message(<<'END');
1955 Push failed, while preparing your push.
1956 You can retry the push, after fixing the problem, if you like.
1960 access_giturl(); # check that success is vaguely likely
1962 my $clogpfn = ".git/dgit/changelog.822.tmp";
1963 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
1965 responder_send_file('parsed-changelog', $clogpfn);
1967 my ($clogp, $cversion, $tag, $dscfn) =
1968 push_parse_changelog("$clogpfn");
1970 my $dscpath = "$buildproductsdir/$dscfn";
1971 stat_exists $dscpath or
1972 fail "looked for .dsc $dscfn, but $!;".
1973 " maybe you forgot to build";
1975 responder_send_file('dsc', $dscpath);
1977 push_parse_dsc($dscpath, $dscfn, $cversion);
1979 my $format = getfield $dsc, 'Format';
1980 printdebug "format $format\n";
1981 if (madformat($format)) {
1982 # user might have not used dgit build, so maybe do this now:
1983 commit_quilty_patch();
1987 progress "checking that $dscfn corresponds to HEAD";
1988 runcmd qw(dpkg-source -x --),
1989 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
1990 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1991 check_for_vendor_patches() if madformat($dsc->{format});
1992 changedir '../../../..';
1993 my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
1994 my @diffcmd = (@git, qw(diff), $diffopt, $tree);
1995 debugcmd "+",@diffcmd;
1997 my $r = system @diffcmd;
2000 fail "$dscfn specifies a different tree to your HEAD commit;".
2001 " perhaps you forgot to build".
2002 ($diffopt eq '--exit-code' ? "" :
2003 " (run with -D to see full diff output)");
2008 my $head = git_rev_parse('HEAD');
2009 if (!$changesfile) {
2010 my $pat = changespat $cversion;
2011 my @cs = glob "$buildproductsdir/$pat";
2012 fail "failed to find unique changes file".
2013 " (looked for $pat in $buildproductsdir);".
2014 " perhaps you need to use dgit -C"
2016 ($changesfile) = @cs;
2018 $changesfile = "$buildproductsdir/$changesfile";
2021 responder_send_file('changes',$changesfile);
2022 responder_send_command("param head $head");
2023 responder_send_command("param csuite $csuite");
2025 if (deliberately_not_fast_forward) {
2026 git_for_each_ref(lrfetchrefs, sub {
2027 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
2028 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
2029 responder_send_command("previously $rrefname=$objid");
2030 $previously{$rrefname} = $objid;
2034 my $tfn = sub { ".git/dgit/tag$_[0]"; };
2037 supplementary_message(<<'END');
2038 Push failed, while signing the tag.
2039 You can retry the push, after fixing the problem, if you like.
2041 # If we manage to sign but fail to record it anywhere, it's fine.
2042 if ($we_are_responder) {
2043 $tagobjfn = $tfn->('.signed.tmp');
2044 responder_receive_files('signed-tag', $tagobjfn);
2047 push_mktag($head,$clogp,$tag,
2049 $changesfile,$changesfile,
2052 supplementary_message(<<'END');
2053 Push failed, *after* signing the tag.
2054 If you want to try again, you should use a new version number.
2057 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
2058 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
2059 runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
2061 supplementary_message(<<'END');
2062 Push failed, while updating the remote git repository - see messages above.
2063 If you want to try again, you should use a new version number.
2065 if (!check_for_git()) {
2066 create_remote_git_repo();
2068 runcmd_ordryrun @git, qw(push),access_giturl(),
2069 $forceflag."HEAD:".rrref(), $forceflag."refs/tags/$tag";
2070 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
2072 supplementary_message(<<'END');
2073 Push failed, after updating the remote git repository.
2074 If you want to try again, you must use a new version number.
2076 if ($we_are_responder) {
2077 my $dryrunsuffix = act_local() ? "" : ".tmp";
2078 responder_receive_files('signed-dsc-changes',
2079 "$dscpath$dryrunsuffix",
2080 "$changesfile$dryrunsuffix");
2083 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
2085 progress "[new .dsc left in $dscpath.tmp]";
2087 sign_changes $changesfile;
2090 supplementary_message(<<END);
2091 Push failed, while uploading package(s) to the archive server.
2092 You can retry the upload of exactly these same files with dput of:
2094 If that .changes file is broken, you will need to use a new version
2095 number for your next attempt at the upload.
2097 my $host = access_cfg('upload-host','RETURN-UNDEF');
2098 my @hostarg = defined($host) ? ($host,) : ();
2099 runcmd_ordryrun @dput, @hostarg, $changesfile;
2100 printdone "pushed and uploaded $cversion";
2102 supplementary_message('');
2103 responder_send_command("complete");
2110 badusage "-p is not allowed with clone; specify as argument instead"
2111 if defined $package;
2114 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
2115 ($package,$isuite) = @ARGV;
2116 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
2117 ($package,$dstdir) = @ARGV;
2118 } elsif (@ARGV==3) {
2119 ($package,$isuite,$dstdir) = @ARGV;
2121 badusage "incorrect arguments to dgit clone";
2123 $dstdir ||= "$package";
2125 if (stat_exists $dstdir) {
2126 fail "$dstdir already exists";
2130 if ($rmonerror && !$dryrun_level) {
2131 $cwd_remove= getcwd();
2133 return unless defined $cwd_remove;
2134 if (!chdir "$cwd_remove") {
2135 return if $!==&ENOENT;
2136 die "chdir $cwd_remove: $!";
2139 rmtree($dstdir) or die "remove $dstdir: $!\n";
2140 } elsif (!grep { $! == $_ }
2141 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
2143 print STDERR "check whether to remove $dstdir: $!\n";
2149 $cwd_remove = undef;
2152 sub branchsuite () {
2153 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
2154 if ($branch =~ m#$lbranch_re#o) {
2161 sub fetchpullargs () {
2163 if (!defined $package) {
2164 my $sourcep = parsecontrol('debian/control','debian/control');
2165 $package = getfield $sourcep, 'Source';
2168 # $isuite = branchsuite(); # this doesn't work because dak hates canons
2170 my $clogp = parsechangelog();
2171 $isuite = getfield $clogp, 'Distribution';
2173 canonicalise_suite();
2174 progress "fetching from suite $csuite";
2175 } elsif (@ARGV==1) {
2177 canonicalise_suite();
2179 badusage "incorrect arguments to dgit fetch or dgit pull";
2198 badusage "-p is not allowed with dgit push" if defined $package;
2200 my $clogp = parsechangelog();
2201 $package = getfield $clogp, 'Source';
2204 } elsif (@ARGV==1) {
2205 ($specsuite) = (@ARGV);
2207 badusage "incorrect arguments to dgit push";
2209 $isuite = getfield $clogp, 'Distribution';
2211 local ($package) = $existing_package; # this is a hack
2212 canonicalise_suite();
2214 canonicalise_suite();
2216 if (defined $specsuite &&
2217 $specsuite ne $isuite &&
2218 $specsuite ne $csuite) {
2219 fail "dgit push: changelog specifies $isuite ($csuite)".
2220 " but command line specifies $specsuite";
2222 supplementary_message(<<'END');
2223 Push failed, while checking state of the archive.
2224 You can retry the push, after fixing the problem, if you like.
2226 if (check_for_git()) {
2230 if (fetch_from_archive()) {
2231 if (is_fast_fwd(lrref(), 'HEAD')) {
2233 } elsif (deliberately_not_fast_forward) {
2236 fail "dgit push: HEAD is not a descendant".
2237 " of the archive's version.\n".
2238 "dgit: To overwrite its contents,".
2239 " use git merge -s ours ".lrref().".\n".
2240 "dgit: To rewind history, if permitted by the archive,".
2241 " use --deliberately-not-fast-forward";
2245 fail "package appears to be new in this suite;".
2246 " if this is intentional, use --new";
2251 #---------- remote commands' implementation ----------
2253 sub cmd_remote_push_build_host {
2254 my ($nrargs) = shift @ARGV;
2255 my (@rargs) = @ARGV[0..$nrargs-1];
2256 @ARGV = @ARGV[$nrargs..$#ARGV];
2258 my ($dir,$vsnwant) = @rargs;
2259 # vsnwant is a comma-separated list; we report which we have
2260 # chosen in our ready response (so other end can tell if they
2263 $we_are_responder = 1;
2264 $us .= " (build host)";
2268 open PI, "<&STDIN" or die $!;
2269 open STDIN, "/dev/null" or die $!;
2270 open PO, ">&STDOUT" or die $!;
2272 open STDOUT, ">&STDERR" or die $!;
2276 ($protovsn) = grep {
2277 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
2278 } @rpushprotovsn_support;
2280 fail "build host has dgit rpush protocol versions ".
2281 (join ",", @rpushprotovsn_support).
2282 " but invocation host has $vsnwant"
2283 unless defined $protovsn;
2285 responder_send_command("dgit-remote-push-ready $protovsn");
2291 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
2292 # ... for compatibility with proto vsn.1 dgit (just so that user gets
2293 # a good error message)
2299 my $report = i_child_report();
2300 if (defined $report) {
2301 printdebug "($report)\n";
2302 } elsif ($i_child_pid) {
2303 printdebug "(killing build host child $i_child_pid)\n";
2304 kill 15, $i_child_pid;
2306 if (defined $i_tmp && !defined $initiator_tempdir) {
2308 eval { rmtree $i_tmp; };
2312 END { i_cleanup(); }
2315 my ($base,$selector,@args) = @_;
2316 $selector =~ s/\-/_/g;
2317 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
2324 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
2332 push @rargs, join ",", @rpushprotovsn_support;
2335 push @rdgit, @ropts;
2336 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
2338 my @cmd = (@ssh, $host, shellquote @rdgit);
2341 if (defined $initiator_tempdir) {
2342 rmtree $initiator_tempdir;
2343 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
2344 $i_tmp = $initiator_tempdir;
2348 $i_child_pid = open2(\*RO, \*RI, @cmd);
2350 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
2351 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
2352 $supplementary_message = '' unless $protovsn >= 3;
2354 my ($icmd,$iargs) = initiator_expect {
2355 m/^(\S+)(?: (.*))?$/;
2358 i_method "i_resp", $icmd, $iargs;
2362 sub i_resp_progress ($) {
2364 my $msg = protocol_read_bytes \*RO, $rhs;
2368 sub i_resp_supplementary_message ($) {
2370 $supplementary_message = protocol_read_bytes \*RO, $rhs;
2373 sub i_resp_complete {
2374 my $pid = $i_child_pid;
2375 $i_child_pid = undef; # prevents killing some other process with same pid
2376 printdebug "waiting for build host child $pid...\n";
2377 my $got = waitpid $pid, 0;
2378 die $! unless $got == $pid;
2379 die "build host child failed $?" if $?;
2382 printdebug "all done\n";
2386 sub i_resp_file ($) {
2388 my $localname = i_method "i_localname", $keyword;
2389 my $localpath = "$i_tmp/$localname";
2390 stat_exists $localpath and
2391 badproto \*RO, "file $keyword ($localpath) twice";
2392 protocol_receive_file \*RO, $localpath;
2393 i_method "i_file", $keyword;
2398 sub i_resp_param ($) {
2399 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
2403 sub i_resp_previously ($) {
2404 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
2405 or badproto \*RO, "bad previously spec";
2406 my $r = system qw(git check-ref-format), $1;
2407 die "bad previously ref spec ($r)" if $r;
2408 $previously{$1} = $2;
2413 sub i_resp_want ($) {
2415 die "$keyword ?" if $i_wanted{$keyword}++;
2416 my @localpaths = i_method "i_want", $keyword;
2417 printdebug "[[ $keyword @localpaths\n";
2418 foreach my $localpath (@localpaths) {
2419 protocol_send_file \*RI, $localpath;
2421 print RI "files-end\n" or die $!;
2424 our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn);
2426 sub i_localname_parsed_changelog {
2427 return "remote-changelog.822";
2429 sub i_file_parsed_changelog {
2430 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
2431 push_parse_changelog "$i_tmp/remote-changelog.822";
2432 die if $i_dscfn =~ m#/|^\W#;
2435 sub i_localname_dsc {
2436 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2441 sub i_localname_changes {
2442 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2443 $i_changesfn = $i_dscfn;
2444 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
2445 return $i_changesfn;
2447 sub i_file_changes { }
2449 sub i_want_signed_tag {
2450 printdebug Dumper(\%i_param, $i_dscfn);
2451 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
2452 && defined $i_param{'csuite'}
2453 or badproto \*RO, "premature desire for signed-tag";
2454 my $head = $i_param{'head'};
2455 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
2457 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
2459 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
2462 push_mktag $head, $i_clogp, $i_tag,
2464 $i_changesfn, 'remote changes',
2465 sub { "tag$_[0]"; };
2470 sub i_want_signed_dsc_changes {
2471 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
2472 sign_changes $i_changesfn;
2473 return ($i_dscfn, $i_changesfn);
2476 #---------- building etc. ----------
2482 #----- `3.0 (quilt)' handling -----
2484 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
2486 sub quiltify_dpkg_commit ($$$;$) {
2487 my ($patchname,$author,$msg, $xinfo) = @_;
2491 my $descfn = ".git/dgit/quilt-description.tmp";
2492 open O, '>', $descfn or die "$descfn: $!";
2495 $msg =~ s/^\s+$/ ./mg;
2496 print O <<END or die $!;
2506 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
2507 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
2508 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
2509 runcmd @dpkgsource, qw(--commit .), $patchname;
2513 sub quiltify_trees_differ ($$;$) {
2514 my ($x,$y,$finegrained) = @_;
2515 # returns true iff the two tree objects differ other than in debian/
2516 # with $finegrained,
2517 # returns bitmask 01 - differ in upstream files except .gitignore
2518 # 02 - differ in .gitignore
2520 my @cmd = (@git, qw(diff-tree --name-only -z));
2521 push @cmd, qw(-r) if $finegrained;
2523 my $diffs= cmdoutput @cmd;
2525 foreach my $f (split /\0/, $diffs) {
2526 next if $f =~ m#^debian(?:/.*)?$#s;
2527 $r |= ($f =~ m#^(?:.*/)?.gitignore$#s) ? 02 : 01;
2529 printdebug "quiltify_trees_differ $x $y => $r\n";
2533 sub quiltify_tree_sentinelfiles ($) {
2534 # lists the `sentinel' files present in the tree
2536 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
2537 qw(-- debian/rules debian/control);
2542 sub quiltify_splitbrain () {
2543 # memoisation via git-reflog
2544 my $may_apply = $quilt_mode =~ m/gbp|unapplied/;
2545 die "xxx not yet implemented";
2547 # quiltify_trees_differ($userhead,)) {}
2550 sub quiltify ($$$$) {
2551 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
2553 # Quilt patchification algorithm
2555 # We search backwards through the history of the main tree's HEAD
2556 # (T) looking for a start commit S whose tree object is identical
2557 # to to the patch tip tree (ie the tree corresponding to the
2558 # current dpkg-committed patch series). For these purposes
2559 # `identical' disregards anything in debian/ - this wrinkle is
2560 # necessary because dpkg-source treates debian/ specially.
2562 # We can only traverse edges where at most one of the ancestors'
2563 # trees differs (in changes outside in debian/). And we cannot
2564 # handle edges which change .pc/ or debian/patches. To avoid
2565 # going down a rathole we avoid traversing edges which introduce
2566 # debian/rules or debian/control. And we set a limit on the
2567 # number of edges we are willing to look at.
2569 # If we succeed, we walk forwards again. For each traversed edge
2570 # PC (with P parent, C child) (starting with P=S and ending with
2571 # C=T) to we do this:
2573 # - dpkg-source --commit with a patch name and message derived from C
2574 # After traversing PT, we git commit the changes which
2575 # should be contained within debian/patches.
2577 # The search for the path S..T is breadth-first. We maintain a
2578 # todo list containing search nodes. A search node identifies a
2579 # commit, and looks something like this:
2581 # Commit => $git_commit_id,
2582 # Child => $c, # or undef if P=T
2583 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
2584 # Nontrivial => true iff $p..$c has relevant changes
2591 my %considered; # saves being exponential on some weird graphs
2593 my $t_sentinels = quiltify_tree_sentinelfiles $target;
2596 my ($search,$whynot) = @_;
2597 printdebug " search NOT $search->{Commit} $whynot\n";
2598 $search->{Whynot} = $whynot;
2599 push @nots, $search;
2600 no warnings qw(exiting);
2609 my $c = shift @todo;
2610 next if $considered{$c->{Commit}}++;
2612 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
2614 printdebug "quiltify investigate $c->{Commit}\n";
2617 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
2618 printdebug " search finished hooray!\n";
2623 if ($quilt_mode eq 'nofix') {
2624 fail "quilt fixup required but quilt mode is \`nofix'\n".
2625 "HEAD commit $c->{Commit} differs from tree implied by ".
2626 " debian/patches (tree object $oldtiptree)";
2628 if ($quilt_mode eq 'smash') {
2629 printdebug " search quitting smash\n";
2633 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
2634 $not->($c, "has $c_sentinels not $t_sentinels")
2635 if $c_sentinels ne $t_sentinels;
2637 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
2638 $commitdata =~ m/\n\n/;
2640 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
2641 @parents = map { { Commit => $_, Child => $c } } @parents;
2643 $not->($c, "root commit") if !@parents;
2645 foreach my $p (@parents) {
2646 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
2648 my $ndiffers = grep { $_->{Nontrivial} } @parents;
2649 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
2651 foreach my $p (@parents) {
2652 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
2654 my @cmd= (@git, qw(diff-tree -r --name-only),
2655 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
2656 my $patchstackchange = cmdoutput @cmd;
2657 if (length $patchstackchange) {
2658 $patchstackchange =~ s/\n/,/g;
2659 $not->($p, "changed $patchstackchange");
2662 printdebug " search queue P=$p->{Commit} ",
2663 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
2669 printdebug "quiltify want to smash\n";
2672 my $x = $_[0]{Commit};
2673 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
2676 my $reportnot = sub {
2678 my $s = $abbrev->($notp);
2679 my $c = $notp->{Child};
2680 $s .= "..".$abbrev->($c) if $c;
2681 $s .= ": ".$notp->{Whynot};
2684 if ($quilt_mode eq 'linear') {
2685 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
2686 foreach my $notp (@nots) {
2687 print STDERR "$us: ", $reportnot->($notp), "\n";
2689 print STDERR "$us: $_\n" foreach @$failsuggestion;
2690 fail "quilt fixup naive history linearisation failed.\n".
2691 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
2692 } elsif ($quilt_mode eq 'smash') {
2693 } elsif ($quilt_mode eq 'auto') {
2694 progress "quilt fixup cannot be linear, smashing...";
2696 die "$quilt_mode ?";
2701 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
2703 quiltify_dpkg_commit "auto-$version-$target-$time",
2704 (getfield $clogp, 'Maintainer'),
2705 "Automatically generated patch ($clogp->{Version})\n".
2706 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
2710 progress "quiltify linearisation planning successful, executing...";
2712 for (my $p = $sref_S;
2713 my $c = $p->{Child};
2715 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
2716 next unless $p->{Nontrivial};
2718 my $cc = $c->{Commit};
2720 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
2721 $commitdata =~ m/\n\n/ or die "$c ?";
2724 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
2727 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
2730 my $patchname = $title;
2731 $patchname =~ s/[.:]$//;
2732 $patchname =~ y/ A-Z/-a-z/;
2733 $patchname =~ y/-a-z0-9_.+=~//cd;
2734 $patchname =~ s/^\W/x-$&/;
2735 $patchname = substr($patchname,0,40);
2738 stat "debian/patches/$patchname$index";
2740 $!==ENOENT or die "$patchname$index $!";
2742 runcmd @git, qw(checkout -q), $cc;
2744 # We use the tip's changelog so that dpkg-source doesn't
2745 # produce complaining messages from dpkg-parsechangelog. None
2746 # of the information dpkg-source gets from the changelog is
2747 # actually relevant - it gets put into the original message
2748 # which dpkg-source provides our stunt editor, and then
2750 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
2752 quiltify_dpkg_commit "$patchname$index", $author, $msg,
2753 "X-Dgit-Generated: $clogp->{Version} $cc\n";
2755 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
2758 runcmd @git, qw(checkout -q master);
2761 sub build_maybe_quilt_fixup () {
2762 my ($format,$fopts) = get_source_format;
2763 return unless madformat $format;
2766 check_for_vendor_patches();
2768 my $clogp = parsechangelog();
2769 my $headref = git_rev_parse('HEAD');
2774 my $upstreamversion=$version;
2775 $upstreamversion =~ s/-[^-]*$//;
2777 if ($fopts->{'single-debian-patch'}) {
2778 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
2780 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
2783 changedir '../../../..';
2784 runcmd_ordryrun_local
2785 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
2788 sub quilt_fixup_mkwork ($) {
2791 mkdir "work" or die $!;
2793 mktree_in_ud_here();
2794 runcmd @git, qw(reset -q --hard), $headref;
2797 sub quilt_fixup_linkorigs ($$) {
2798 my ($upstreamversion, $fn) = @_;
2799 # calls $fn->($leafname);
2801 foreach my $f (<../../../../*>) { #/){
2802 my $b=$f; $b =~ s{.*/}{};
2804 local ($debuglevel) = $debuglevel-1;
2805 printdebug "QF linkorigs $b, $f ?\n";
2807 next unless is_orig_file $b, srcfn $upstreamversion,'';
2808 printdebug "QF linkorigs $b, $f Y\n";
2809 link_ltarget $f, $b or die "$b $!";
2814 sub quilt_fixup_delete_pc () {
2815 runcmd @git, qw(rm -rqf .pc);
2816 commit_admin "Commit removal of .pc (quilt series tracking data)";
2819 sub quilt_fixup_singlepatch ($$$) {
2820 my ($clogp, $headref, $upstreamversion) = @_;
2822 progress "starting quiltify (single-debian-patch)";
2824 # dpkg-source --commit generates new patches even if
2825 # single-debian-patch is in debian/source/options. In order to
2826 # get it to generate debian/patches/debian-changes, it is
2827 # necessary to build the source package.
2829 quilt_fixup_linkorigs($upstreamversion, sub { });
2830 quilt_fixup_mkwork($headref);
2832 rmtree("debian/patches");
2834 runcmd @dpkgsource, qw(-b .);
2836 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
2837 rename srcfn("$upstreamversion", "/debian/patches"),
2838 "work/debian/patches";
2841 commit_quilty_patch();
2846 sub quilt_fixup_multipatch ($$$) {
2847 my ($clogp, $headref, $upstreamversion) = @_;
2849 progress "starting quiltify (multiple patches, $quilt_mode mode)";
2852 # - honour any existing .pc in case it has any strangeness
2853 # - determine the git commit corresponding to the tip of
2854 # the patch stack (if there is one)
2855 # - if there is such a git commit, convert each subsequent
2856 # git commit into a quilt patch with dpkg-source --commit
2857 # - otherwise convert all the differences in the tree into
2858 # a single git commit
2862 # Our git tree doesn't necessarily contain .pc. (Some versions of
2863 # dgit would include the .pc in the git tree.) If there isn't
2864 # one, we need to generate one by unpacking the patches that we
2867 # We first look for a .pc in the git tree. If there is one, we
2868 # will use it. (This is not the normal case.)
2870 # Otherwise need to regenerate .pc so that dpkg-source --commit
2871 # can work. We do this as follows:
2872 # 1. Collect all relevant .orig from parent directory
2873 # 2. Generate a debian.tar.gz out of
2874 # debian/{patches,rules,source/format,source/options}
2875 # 3. Generate a fake .dsc containing just these fields:
2876 # Format Source Version Files
2877 # 4. Extract the fake .dsc
2878 # Now the fake .dsc has a .pc directory.
2879 # (In fact we do this in every case, because in future we will
2880 # want to search for a good base commit for generating patches.)
2882 # Then we can actually do the dpkg-source --commit
2883 # 1. Make a new working tree with the same object
2884 # store as our main tree and check out the main
2886 # 2. Copy .pc from the fake's extraction, if necessary
2887 # 3. Run dpkg-source --commit
2888 # 4. If the result has changes to debian/, then
2889 # - git-add them them
2890 # - git-add .pc if we had a .pc in-tree
2892 # 5. If we had a .pc in-tree, delete it, and git-commit
2893 # 6. Back in the main tree, fast forward to the new HEAD
2895 # Another situation we may have to cope with is gbp-style
2896 # patches-unapplied trees.
2898 # We would want to detect these, so we know to escape into
2899 # quilt_fixup_gbp. However, this is in general not possible.
2900 # Consider a package with a one patch which the dgit user reverts
2901 # (with git-revert or the moral equivalent).
2903 # That is indistinguishable in contents from a patches-unapplied
2904 # tree. And looking at the history to distinguish them is not
2905 # useful because the user might have made a confusing-looking git
2906 # history structure (which ought to produce an error if dgit can't
2907 # cope, not a silent reintroduction of an unwanted patch).
2909 # So gbp users will have to pass an option. But we can usually
2910 # detect their failure to do so: if the tree is not a clean
2911 # patches-applied tree, quilt linearisation fails, but the tree
2912 # _is_ a clean patches-unapplied tree, we can suggest that maybe
2913 # they want --quilt=unapplied.
2915 # To help detect this, when we are extracting the fake dsc, we
2916 # first extract it with --skip-patches, and then apply the patches
2917 # afterwards with dpkg-source --before-build. That lets us save a
2918 # tree object corresponding to .origs.
2920 my $fakeversion="$upstreamversion-~~DGITFAKE";
2922 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
2923 print $fakedsc <<END or die $!;
2926 Version: $fakeversion
2930 my $dscaddfile=sub {
2933 my $md = new Digest::MD5;
2935 my $fh = new IO::File $b, '<' or die "$b $!";
2940 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
2943 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
2945 my @files=qw(debian/source/format debian/rules
2946 debian/control debian/changelog);
2947 foreach my $maybe (qw(debian/patches debian/source/options
2948 debian/tests/control)) {
2949 next unless stat_exists "../../../$maybe";
2950 push @files, $maybe;
2953 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
2954 runcmd qw(env GZIP=-1 tar -zcf), "./$debtar", qw(-C ../../..), @files;
2956 $dscaddfile->($debtar);
2957 close $fakedsc or die $!;
2960 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
2962 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
2963 rename $fakexdir, "fake" or die "$fakexdir $!";
2967 remove_stray_gits();
2968 mktree_in_ud_here();
2972 runcmd @git, qw(add -Af .);
2973 my $unapplied=git_write_tree();
2974 printdebug "fake orig tree object $unapplied\n";
2979 'exec dpkg-source --before-build . >/dev/null';
2983 quilt_fixup_mkwork($headref);
2986 if (stat_exists ".pc") {
2988 progress "Tree already contains .pc - will use it then delete it.";
2991 rename '../fake/.pc','.pc' or die $!;
2994 changedir '../fake';
2996 runcmd @git, qw(add -Af .);
2997 my $oldtiptree=git_write_tree();
2998 changedir '../work';
3001 # We calculate some guesswork now about what kind of tree this might
3002 # be. This is mostly for error reporting.
3004 my $user2unapplied = quiltify_trees_differ($headref, $unapplied, 1);
3005 my $user2applied = quiltify_trees_differ($headref, $oldtiptree,1);
3006 my $applied2unapplied = quiltify_trees_differ($oldtiptree,$unapplied, 1);
3009 foreach my $b (qw(01 02)) {
3010 foreach my $v ($user2unapplied, $applied2unapplied, $user2applied) {
3011 push @dl, ($v & $b) ? '##' : '==';
3014 printdebug "differences \@dl @dl.\n";
3017 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
3018 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
3019 $dl[0], $dl[1], $dl[3], $dl[4],
3023 if (!($user2unapplied & $applied2unapplied)) {
3024 push @failsuggestion, "This might be a patches-unapplied branch.";
3025 } elsif (!($user2applied & $applied2unapplied)) {
3026 push @failsuggestion, "This might be a patches-applied branch.";
3028 push @failsuggestion, "Maybe you need to specify one of".
3029 " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
3031 if ($quilt_mode =~ m/gbp|dpm|apply/) {
3032 quiltify_splitbrain();
3036 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
3038 if (!open P, '>>', ".pc/applied-patches") {
3039 $!==&ENOENT or die $!;
3044 commit_quilty_patch();
3046 if ($mustdeletepc) {
3047 quilt_fixup_delete_pc();
3051 sub quilt_fixup_editor () {
3052 my $descfn = $ENV{$fakeeditorenv};
3053 my $editing = $ARGV[$#ARGV];
3054 open I1, '<', $descfn or die "$descfn: $!";
3055 open I2, '<', $editing or die "$editing: $!";
3056 unlink $editing or die "$editing: $!";
3057 open O, '>', $editing or die "$editing: $!";
3058 while (<I1>) { print O or die $!; } I1->error and die $!;
3061 $copying ||= m/^\-\-\- /;
3062 next unless $copying;
3065 I2->error and die $!;
3070 #----- other building -----
3072 our $suppress_clean;
3075 return if $suppress_clean;
3076 if ($cleanmode eq 'dpkg-source') {
3077 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
3078 } elsif ($cleanmode eq 'dpkg-source-d') {
3079 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
3080 } elsif ($cleanmode eq 'git') {
3081 runcmd_ordryrun_local @git, qw(clean -xdf);
3082 } elsif ($cleanmode eq 'git-ff') {
3083 runcmd_ordryrun_local @git, qw(clean -xdff);
3084 } elsif ($cleanmode eq 'check') {
3085 my $leftovers = cmdoutput @git, qw(clean -xdn);
3086 if (length $leftovers) {
3087 print STDERR $leftovers, "\n" or die $!;
3088 fail "tree contains uncommitted files and --clean=check specified";
3090 } elsif ($cleanmode eq 'none') {
3097 badusage "clean takes no additional arguments" if @ARGV;
3104 badusage "-p is not allowed when building" if defined $package;
3107 my $clogp = parsechangelog();
3108 $isuite = getfield $clogp, 'Distribution';
3109 $package = getfield $clogp, 'Source';
3110 $version = getfield $clogp, 'Version';
3111 build_maybe_quilt_fixup();
3113 my $pat = changespat $version;
3114 foreach my $f (glob "$buildproductsdir/$pat") {
3116 unlink $f or fail "remove old changes file $f: $!";
3118 progress "would remove $f";
3124 sub changesopts_initial () {
3125 my @opts =@changesopts[1..$#changesopts];
3128 sub changesopts_version () {
3129 if (!defined $changes_since_version) {
3130 my @vsns = archive_query('archive_query');
3131 my @quirk = access_quirk();
3132 if ($quirk[0] eq 'backports') {
3133 local $isuite = $quirk[2];
3135 canonicalise_suite();
3136 push @vsns, archive_query('archive_query');
3139 @vsns = map { $_->[0] } @vsns;
3140 @vsns = sort { -version_compare($a, $b) } @vsns;
3141 $changes_since_version = $vsns[0];
3142 progress "changelog will contain changes since $vsns[0]";
3144 $changes_since_version = '_';
3145 progress "package seems new, not specifying -v<version>";
3148 if ($changes_since_version ne '_') {
3149 return ("-v$changes_since_version");
3155 sub changesopts () {
3156 return (changesopts_initial(), changesopts_version());
3159 sub massage_dbp_args ($;$) {
3160 my ($cmd,$xargs) = @_;
3163 # - if we're going to split the source build out so we can
3164 # do strange things to it, massage the arguments to dpkg-buildpackage
3165 # so that the main build doessn't build source (or add an argument
3166 # to stop it building source by default).
3168 # - add -nc to stop dpkg-source cleaning the source tree,
3169 # unless we're not doing a split build and want dpkg-source
3170 # as cleanmode, in which case we can do nothing
3173 # 0 - source will NOT need to be built separately by caller
3174 # +1 - source will need to be built separately by caller
3175 # +2 - source will need to be built separately by caller AND
3176 # dpkg-buildpackage should not in fact be run at all!
3177 debugcmd '#massaging#', @$cmd if $debuglevel>1;
3178 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
3179 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
3180 $suppress_clean = 1;
3183 # -nc has the side effect of specifying -b if nothing else specified
3184 # and some combinations of -S, -b, et al, are errors, rather than
3185 # later simply overriding earlie. So we need to:
3186 # - search the command line for these options
3187 # - pick the last one
3188 # - perhaps add our own as a default
3189 # - perhaps adjust it to the corresponding non-source-building version
3191 foreach my $l ($cmd, $xargs) {
3193 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
3196 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
3198 if ($need_split_build_invocation) {
3199 $r = $dmode =~ m/[S]/ ? +2 :
3200 $dmode =~ y/gGF/ABb/ ? +1 :
3201 $dmode =~ m/[ABb]/ ? 0 :
3205 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
3210 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
3211 my $wantsrc = massage_dbp_args \@dbp;
3218 push @dbp, changesopts_version();
3219 runcmd_ordryrun_local @dbp;
3221 printdone "build successful\n";
3225 my @dbp = @dpkgbuildpackage;
3227 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
3230 if (length executable_on_path('git-buildpackage')) {
3231 @cmd = qw(git-buildpackage);
3233 @cmd = qw(gbp buildpackage);
3235 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
3240 if (!$suppress_clean) {
3241 push @cmd, '--git-cleaner=true';
3246 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
3247 canonicalise_suite();
3248 push @cmd, "--git-debian-branch=".lbranch();
3250 push @cmd, changesopts();
3251 runcmd_ordryrun_local @cmd, @ARGV;
3253 printdone "build successful\n";
3255 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
3258 if ($cleanmode =~ m/^dpkg-source/) {
3259 # dpkg-source will clean, so we shouldn't
3260 $suppress_clean = 1;
3263 $sourcechanges = changespat $version,'source';
3265 unlink "../$sourcechanges" or $!==ENOENT
3266 or fail "remove $sourcechanges: $!";
3268 $dscfn = dscfn($version);
3269 if ($cleanmode eq 'dpkg-source') {
3270 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
3272 } elsif ($cleanmode eq 'dpkg-source-d') {
3273 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
3276 my $pwd = must_getcwd();
3277 my $leafdir = basename $pwd;
3279 runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
3281 runcmd_ordryrun_local qw(sh -ec),
3282 'exec >$1; shift; exec "$@"','x',
3283 "../$sourcechanges",
3284 @dpkggenchanges, qw(-S), changesopts();
3288 sub cmd_build_source {
3289 badusage "build-source takes no additional arguments" if @ARGV;
3291 printdone "source built, results in $dscfn and $sourcechanges";
3296 my $pat = changespat $version;
3298 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
3299 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
3300 fail "changes files other than source matching $pat".
3301 " already present (@unwanted);".
3302 " building would result in ambiguity about the intended results"
3307 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
3308 stat_exists $sourcechanges
3309 or fail "$sourcechanges (in parent directory): $!";
3311 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
3312 my @changesfiles = glob $pat;
3313 @changesfiles = sort {
3314 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
3317 fail "wrong number of different changes files (@changesfiles)"
3318 unless @changesfiles==2;
3319 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
3320 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
3321 fail "$l found in binaries changes file $binchanges"
3324 runcmd_ordryrun_local @mergechanges, @changesfiles;
3325 my $multichanges = changespat $version,'multi';
3327 stat_exists $multichanges or fail "$multichanges: $!";
3328 foreach my $cf (glob $pat) {
3329 next if $cf eq $multichanges;
3330 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
3333 printdone "build successful, results in $multichanges\n" or die $!;
3336 sub cmd_quilt_fixup {
3337 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
3338 my $clogp = parsechangelog();
3339 $version = getfield $clogp, 'Version';
3340 $package = getfield $clogp, 'Source';
3343 build_maybe_quilt_fixup();
3346 sub cmd_archive_api_query {
3347 badusage "need only 1 subpath argument" unless @ARGV==1;
3348 my ($subpath) = @ARGV;
3349 my @cmd = archive_api_query_cmd($subpath);
3351 exec @cmd or fail "exec curl: $!\n";
3354 sub cmd_clone_dgit_repos_server {
3355 badusage "need destination argument" unless @ARGV==1;
3356 my ($destdir) = @ARGV;
3357 $package = '_dgit-repos-server';
3358 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
3360 exec @cmd or fail "exec git clone: $!\n";
3363 sub cmd_setup_mergechangelogs {
3364 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3365 setup_mergechangelogs(1);
3368 sub cmd_setup_useremail {
3369 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3373 sub cmd_setup_new_tree {
3374 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
3378 #---------- argument parsing and main program ----------
3381 print "dgit version $our_version\n" or die $!;
3385 our (%valopts_long, %valopts_short);
3388 sub defvalopt ($$$$) {
3389 my ($long,$short,$val_re,$how) = @_;
3390 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
3391 $valopts_long{$long} = $oi;
3392 $valopts_short{$short} = $oi;
3393 # $how subref should:
3394 # do whatever assignemnt or thing it likes with $_[0]
3395 # if the option should not be passed on to remote, @rvalopts=()
3396 # or $how can be a scalar ref, meaning simply assign the value
3399 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
3400 defvalopt '--distro', '-d', '.+', \$idistro;
3401 defvalopt '', '-k', '.+', \$keyid;
3402 defvalopt '--existing-package','', '.*', \$existing_package;
3403 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
3404 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
3405 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
3407 defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
3409 defvalopt '', '-C', '.+', sub {
3410 ($changesfile) = (@_);
3411 if ($changesfile =~ s#^(.*)/##) {
3412 $buildproductsdir = $1;
3416 defvalopt '--initiator-tempdir','','.*', sub {
3417 ($initiator_tempdir) = (@_);
3418 $initiator_tempdir =~ m#^/# or
3419 badusage "--initiator-tempdir must be used specify an".
3420 " absolute, not relative, directory."
3426 if (defined $ENV{'DGIT_SSH'}) {
3427 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
3428 } elsif (defined $ENV{'GIT_SSH'}) {
3429 @ssh = ($ENV{'GIT_SSH'});
3437 if (!defined $val) {
3438 badusage "$what needs a value" unless @ARGV;
3440 push @rvalopts, $val;
3442 badusage "bad value \`$val' for $what" unless
3443 $val =~ m/^$oi->{Re}$(?!\n)/s;
3444 my $how = $oi->{How};
3445 if (ref($how) eq 'SCALAR') {
3450 push @ropts, @rvalopts;
3454 last unless $ARGV[0] =~ m/^-/;
3458 if (m/^--dry-run$/) {
3461 } elsif (m/^--damp-run$/) {
3464 } elsif (m/^--no-sign$/) {
3467 } elsif (m/^--help$/) {
3469 } elsif (m/^--version$/) {
3471 } elsif (m/^--new$/) {
3474 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
3475 ($om = $opts_opt_map{$1}) &&
3479 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
3480 !$opts_opt_cmdonly{$1} &&
3481 ($om = $opts_opt_map{$1})) {
3484 } elsif (m/^--ignore-dirty$/s) {
3487 } elsif (m/^--no-quilt-fixup$/s) {
3489 $quilt_mode = 'nocheck';
3490 } elsif (m/^--no-rm-on-error$/s) {
3493 } elsif (m/^--(no-)?rm-old-changes$/s) {
3496 } elsif (m/^--deliberately-($deliberately_re)$/s) {
3498 push @deliberatelies, $&;
3499 } elsif (m/^--always-split-source-build$/s) {
3500 # undocumented, for testing
3502 $need_split_build_invocation = 1;
3503 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
3504 $val = $2 ? $' : undef; #';
3505 $valopt->($oi->{Long});
3507 badusage "unknown long option \`$_'";
3514 } elsif (s/^-L/-/) {
3517 } elsif (s/^-h/-/) {
3519 } elsif (s/^-D/-/) {
3523 } elsif (s/^-N/-/) {
3528 push @changesopts, $_;
3530 } elsif (s/^-wn$//s) {
3532 $cleanmode = 'none';
3533 } elsif (s/^-wg$//s) {
3536 } elsif (s/^-wgf$//s) {
3538 $cleanmode = 'git-ff';
3539 } elsif (s/^-wd$//s) {
3541 $cleanmode = 'dpkg-source';
3542 } elsif (s/^-wdd$//s) {
3544 $cleanmode = 'dpkg-source-d';
3545 } elsif (s/^-wc$//s) {
3547 $cleanmode = 'check';
3548 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
3550 $val = undef unless length $val;
3551 $valopt->($oi->{Short});
3554 badusage "unknown short option \`$_'";
3561 sub finalise_opts_opts () {
3562 foreach my $k (keys %opts_opt_map) {
3563 my $om = $opts_opt_map{$k};
3565 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
3567 badcfg "cannot set command for $k"
3568 unless length $om->[0];
3572 foreach my $c (access_cfg_cfgs("opts-$k")) {
3573 my $vl = $gitcfg{$c};
3574 printdebug "CL $c ",
3575 ($vl ? join " ", map { shellquote } @$vl : ""),
3576 "\n" if $debuglevel >= 4;
3578 badcfg "cannot configure options for $k"
3579 if $opts_opt_cmdonly{$k};
3580 my $insertpos = $opts_cfg_insertpos{$k};
3581 @$om = ( @$om[0..$insertpos-1],
3583 @$om[$insertpos..$#$om] );
3588 if ($ENV{$fakeeditorenv}) {
3590 quilt_fixup_editor();
3596 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
3597 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
3598 if $dryrun_level == 1;
3600 print STDERR $helpmsg or die $!;
3603 my $cmd = shift @ARGV;
3606 if (!defined $rmchanges) {
3607 local $access_forpush;
3608 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
3611 if (!defined $quilt_mode) {
3612 local $access_forpush;
3613 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
3614 // access_cfg('quilt-mode', 'RETURN-UNDEF')
3616 $quilt_mode =~ m/^($quilt_modes_re)$/
3617 or badcfg "unknown quilt-mode \`$quilt_mode'";
3621 if (!defined $cleanmode) {
3622 local $access_forpush;
3623 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
3624 $cleanmode //= 'dpkg-source';
3626 badcfg "unknown clean-mode \`$cleanmode'" unless
3627 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
3630 my $fn = ${*::}{"cmd_$cmd"};
3631 $fn or badusage "unknown operation $cmd";