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+)$';
76 our (@dget) = qw(dget);
77 our (@curl) = qw(curl -f);
78 our (@dput) = qw(dput);
79 our (@debsign) = qw(debsign);
81 our (@sbuild) = qw(sbuild);
83 our (@dgit) = qw(dgit);
84 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
85 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
86 our (@dpkggenchanges) = qw(dpkg-genchanges);
87 our (@mergechanges) = qw(mergechanges -f);
88 our (@gbppq) = qw(gbp-pq);
89 our (@changesopts) = ('');
91 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
94 'debsign' => \@debsign,
100 'dpkg-source' => \@dpkgsource,
101 'dpkg-buildpackage' => \@dpkgbuildpackage,
102 'dpkg-genchanges' => \@dpkggenchanges,
103 'ch' => \@changesopts,
104 'mergechanges' => \@mergechanges);
106 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
107 our %opts_cfg_insertpos = map {
109 scalar @{ $opts_opt_map{$_} }
110 } keys %opts_opt_map;
112 sub finalise_opts_opts();
118 our $supplementary_message = '';
119 our $need_split_build_invocation = 0;
120 our $split_brain = 0;
124 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
127 our $remotename = 'dgit';
128 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
132 sub lbranch () { return "$branchprefix/$csuite"; }
133 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
134 sub lref () { return "refs/heads/".lbranch(); }
135 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
136 sub rrref () { return server_ref($csuite); }
138 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
148 return "${package}_".(stripepoch $vsn).$sfx
153 return srcfn($vsn,".dsc");
156 sub changespat ($;$) {
157 my ($vsn, $arch) = @_;
158 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
167 foreach my $f (@end) {
169 print STDERR "$us: cleanup: $@" if length $@;
173 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
175 sub no_such_package () {
176 print STDERR "$us: package $package does not exist in suite $isuite\n";
182 return "+".rrref().":".lrref();
187 printdebug "CD $newdir\n";
188 chdir $newdir or die "chdir: $newdir: $!";
191 sub deliberately ($) {
193 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
196 sub deliberately_not_fast_forward () {
197 foreach (qw(not-fast-forward fresh-repo)) {
198 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
202 #---------- remote protocol support, common ----------
204 # remote push initiator/responder protocol:
205 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
206 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
207 # < dgit-remote-push-ready <actual-proto-vsn>
209 # > file parsed-changelog
210 # [indicates that output of dpkg-parsechangelog follows]
211 # > data-block NBYTES
212 # > [NBYTES bytes of data (no newline)]
213 # [maybe some more blocks]
225 # [indicates that signed tag is wanted]
226 # < data-block NBYTES
227 # < [NBYTES bytes of data (no newline)]
228 # [maybe some more blocks]
232 # > want signed-dsc-changes
233 # < data-block NBYTES [transfer of signed dsc]
235 # < data-block NBYTES [transfer of signed changes]
243 sub i_child_report () {
244 # Sees if our child has died, and reap it if so. Returns a string
245 # describing how it died if it failed, or undef otherwise.
246 return undef unless $i_child_pid;
247 my $got = waitpid $i_child_pid, WNOHANG;
248 return undef if $got <= 0;
249 die unless $got == $i_child_pid;
250 $i_child_pid = undef;
251 return undef unless $?;
252 return "build host child ".waitstatusmsg();
257 fail "connection lost: $!" if $fh->error;
258 fail "protocol violation; $m not expected";
261 sub badproto_badread ($$) {
263 fail "connection lost: $!" if $!;
264 my $report = i_child_report();
265 fail $report if defined $report;
266 badproto $fh, "eof (reading $wh)";
269 sub protocol_expect (&$) {
270 my ($match, $fh) = @_;
273 defined && chomp or badproto_badread $fh, "protocol message";
281 badproto $fh, "\`$_'";
284 sub protocol_send_file ($$) {
285 my ($fh, $ourfn) = @_;
286 open PF, "<", $ourfn or die "$ourfn: $!";
289 my $got = read PF, $d, 65536;
290 die "$ourfn: $!" unless defined $got;
292 print $fh "data-block ".length($d)."\n" or die $!;
293 print $fh $d or die $!;
295 PF->error and die "$ourfn $!";
296 print $fh "data-end\n" or die $!;
300 sub protocol_read_bytes ($$) {
301 my ($fh, $nbytes) = @_;
302 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
304 my $got = read $fh, $d, $nbytes;
305 $got==$nbytes or badproto_badread $fh, "data block";
309 sub protocol_receive_file ($$) {
310 my ($fh, $ourfn) = @_;
311 printdebug "() $ourfn\n";
312 open PF, ">", $ourfn or die "$ourfn: $!";
314 my ($y,$l) = protocol_expect {
315 m/^data-block (.*)$/ ? (1,$1) :
316 m/^data-end$/ ? (0,) :
320 my $d = protocol_read_bytes $fh, $l;
321 print PF $d or die $!;
326 #---------- remote protocol support, responder ----------
328 sub responder_send_command ($) {
330 return unless $we_are_responder;
331 # called even without $we_are_responder
332 printdebug ">> $command\n";
333 print PO $command, "\n" or die $!;
336 sub responder_send_file ($$) {
337 my ($keyword, $ourfn) = @_;
338 return unless $we_are_responder;
339 printdebug "]] $keyword $ourfn\n";
340 responder_send_command "file $keyword";
341 protocol_send_file \*PO, $ourfn;
344 sub responder_receive_files ($@) {
345 my ($keyword, @ourfns) = @_;
346 die unless $we_are_responder;
347 printdebug "[[ $keyword @ourfns\n";
348 responder_send_command "want $keyword";
349 foreach my $fn (@ourfns) {
350 protocol_receive_file \*PI, $fn;
353 protocol_expect { m/^files-end$/ } \*PI;
356 #---------- remote protocol support, initiator ----------
358 sub initiator_expect (&) {
360 protocol_expect { &$match } \*RO;
363 #---------- end remote code ----------
366 if ($we_are_responder) {
368 responder_send_command "progress ".length($m) or die $!;
369 print PO $m or die $!;
379 $ua = LWP::UserAgent->new();
383 progress "downloading $what...";
384 my $r = $ua->get(@_) or die $!;
385 return undef if $r->code == 404;
386 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
387 return $r->decoded_content(charset => 'none');
390 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
395 failedcmd @_ if system @_;
398 sub act_local () { return $dryrun_level <= 1; }
399 sub act_scary () { return !$dryrun_level; }
402 if (!$dryrun_level) {
403 progress "dgit ok: @_";
405 progress "would be ok: @_ (but dry run only)";
410 printcmd(\*STDERR,$debugprefix."#",@_);
413 sub runcmd_ordryrun {
421 sub runcmd_ordryrun_local {
430 my ($first_shell, @cmd) = @_;
431 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
434 our $helpmsg = <<END;
436 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
437 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
438 dgit [dgit-opts] build [dpkg-buildpackage-opts]
439 dgit [dgit-opts] sbuild [sbuild-opts]
440 dgit [dgit-opts] push [dgit-opts] [suite]
441 dgit [dgit-opts] rpush build-host:build-dir ...
442 important dgit options:
443 -k<keyid> sign tag and package with <keyid> instead of default
444 --dry-run -n do not change anything, but go through the motions
445 --damp-run -L like --dry-run but make local changes, without signing
446 --new -N allow introducing a new package
447 --debug -D increase debug level
448 -c<name>=<value> set git config option (used directly by dgit too)
451 our $later_warning_msg = <<END;
452 Perhaps the upload is stuck in incoming. Using the version from git.
456 print STDERR "$us: @_\n", $helpmsg or die $!;
461 @ARGV or badusage "too few arguments";
462 return scalar shift @ARGV;
466 print $helpmsg or die $!;
470 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
472 our %defcfg = ('dgit.default.distro' => 'debian',
473 'dgit.default.username' => '',
474 'dgit.default.archive-query-default-component' => 'main',
475 'dgit.default.ssh' => 'ssh',
476 'dgit.default.archive-query' => 'madison:',
477 'dgit.default.sshpsql-dbname' => 'service=projectb',
478 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
479 'dgit-distro.debian.git-check' => 'url',
480 'dgit-distro.debian.git-check-suffix' => '/info/refs',
481 'dgit-distro.debian.new-private-pushers' => 't',
482 'dgit-distro.debian/push.git-url' => '',
483 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
484 'dgit-distro.debian/push.git-user-force' => 'dgit',
485 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
486 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
487 'dgit-distro.debian/push.git-create' => 'true',
488 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
489 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
490 # 'dgit-distro.debian.archive-query-tls-key',
491 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
492 # ^ this does not work because curl is broken nowadays
493 # Fixing #790093 properly will involve providing providing the key
494 # in some pacagke and maybe updating these paths.
496 # 'dgit-distro.debian.archive-query-tls-curl-args',
497 # '--ca-path=/etc/ssl/ca-debian',
498 # ^ this is a workaround but works (only) on DSA-administered machines
499 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
500 'dgit-distro.debian.git-url-suffix' => '',
501 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
502 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
503 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
504 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
505 'dgit-distro.ubuntu.git-check' => 'false',
506 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
507 'dgit-distro.test-dummy.ssh' => "$td/ssh",
508 'dgit-distro.test-dummy.username' => "alice",
509 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
510 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
511 'dgit-distro.test-dummy.git-url' => "$td/git",
512 'dgit-distro.test-dummy.git-host' => "git",
513 'dgit-distro.test-dummy.git-path' => "$td/git",
514 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
515 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
516 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
517 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
522 sub git_slurp_config () {
523 local ($debuglevel) = $debuglevel-2;
526 my @cmd = (@git, qw(config -z --get-regexp .*));
529 open GITS, "-|", @cmd or failedcmd @cmd;
532 printdebug "=> ", (messagequote $_), "\n";
534 push @{ $gitcfg{$`} }, $'; #';
538 or ($!==0 && $?==256)
542 sub git_get_config ($) {
545 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
548 @$l==1 or badcfg "multiple values for $c" if @$l > 1;
554 return undef if $c =~ /RETURN-UNDEF/;
555 my $v = git_get_config($c);
556 return $v if defined $v;
557 my $dv = $defcfg{$c};
558 return $dv if defined $dv;
560 badcfg "need value for one of: @_\n".
561 "$us: distro or suite appears not to be (properly) supported";
564 sub access_basedistro () {
565 if (defined $idistro) {
568 return cfg("dgit-suite.$isuite.distro",
569 "dgit.default.distro");
573 sub access_quirk () {
574 # returns (quirk name, distro to use instead or undef, quirk-specific info)
575 my $basedistro = access_basedistro();
576 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
578 if (defined $backports_quirk) {
579 my $re = $backports_quirk;
580 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
582 $re =~ s/\%/([-0-9a-z_]+)/
583 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
584 if ($isuite =~ m/^$re$/) {
585 return ('backports',"$basedistro-backports",$1);
588 return ('none',undef);
593 sub parse_cfg_bool ($$$) {
594 my ($what,$def,$v) = @_;
597 $v =~ m/^[ty1]/ ? 1 :
598 $v =~ m/^[fn0]/ ? 0 :
599 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
602 sub access_forpush_config () {
603 my $d = access_basedistro();
607 parse_cfg_bool('new-private-pushers', 0,
608 cfg("dgit-distro.$d.new-private-pushers",
611 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
614 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
615 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
616 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
617 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
620 sub access_forpush () {
621 $access_forpush //= access_forpush_config();
622 return $access_forpush;
626 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
627 badcfg "pushing but distro is configured readonly"
628 if access_forpush_config() eq '0';
630 $supplementary_message = <<'END' unless $we_are_responder;
631 Push failed, before we got started.
632 You can retry the push, after fixing the problem, if you like.
634 finalise_opts_opts();
638 finalise_opts_opts();
641 sub supplementary_message ($) {
643 if (!$we_are_responder) {
644 $supplementary_message = $msg;
646 } elsif ($protovsn >= 3) {
647 responder_send_command "supplementary-message ".length($msg)
649 print PO $msg or die $!;
653 sub access_distros () {
654 # Returns list of distros to try, in order
657 # 0. `instead of' distro name(s) we have been pointed to
658 # 1. the access_quirk distro, if any
659 # 2a. the user's specified distro, or failing that } basedistro
660 # 2b. the distro calculated from the suite }
661 my @l = access_basedistro();
663 my (undef,$quirkdistro) = access_quirk();
664 unshift @l, $quirkdistro;
665 unshift @l, $instead_distro;
666 @l = grep { defined } @l;
668 if (access_forpush()) {
669 @l = map { ("$_/push", $_) } @l;
674 sub access_cfg_cfgs (@) {
677 # The nesting of these loops determines the search order. We put
678 # the key loop on the outside so that we search all the distros
679 # for each key, before going on to the next key. That means that
680 # if access_cfg is called with a more specific, and then a less
681 # specific, key, an earlier distro can override the less specific
682 # without necessarily overriding any more specific keys. (If the
683 # distro wants to override the more specific keys it can simply do
684 # so; whereas if we did the loop the other way around, it would be
685 # impossible to for an earlier distro to override a less specific
686 # key but not the more specific ones without restating the unknown
687 # values of the more specific keys.
690 # We have to deal with RETURN-UNDEF specially, so that we don't
691 # terminate the search prematurely.
693 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
696 foreach my $d (access_distros()) {
697 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
699 push @cfgs, map { "dgit.default.$_" } @realkeys;
706 my (@cfgs) = access_cfg_cfgs(@keys);
707 my $value = cfg(@cfgs);
711 sub access_cfg_bool ($$) {
712 my ($def, @keys) = @_;
713 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
716 sub string_to_ssh ($) {
718 if ($spec =~ m/\s/) {
719 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
725 sub access_cfg_ssh () {
726 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
727 if (!defined $gitssh) {
730 return string_to_ssh $gitssh;
734 sub access_runeinfo ($) {
736 return ": dgit ".access_basedistro()." $info ;";
739 sub access_someuserhost ($) {
741 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
742 defined($user) && length($user) or
743 $user = access_cfg("$some-user",'username');
744 my $host = access_cfg("$some-host");
745 return length($user) ? "$user\@$host" : $host;
748 sub access_gituserhost () {
749 return access_someuserhost('git');
752 sub access_giturl (;$) {
754 my $url = access_cfg('git-url','RETURN-UNDEF');
757 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
758 return undef unless defined $proto;
761 access_gituserhost().
762 access_cfg('git-path');
764 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
767 return "$url/$package$suffix";
770 sub parsecontrolfh ($$;$) {
771 my ($fh, $desc, $allowsigned) = @_;
772 our $dpkgcontrolhash_noissigned;
775 my %opts = ('name' => $desc);
776 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
777 $c = Dpkg::Control::Hash->new(%opts);
778 $c->parse($fh,$desc) or die "parsing of $desc failed";
779 last if $allowsigned;
780 last if $dpkgcontrolhash_noissigned;
781 my $issigned= $c->get_option('is_pgp_signed');
782 if (!defined $issigned) {
783 $dpkgcontrolhash_noissigned= 1;
784 seek $fh, 0,0 or die "seek $desc: $!";
785 } elsif ($issigned) {
786 fail "control file $desc is (already) PGP-signed. ".
787 " Note that dgit push needs to modify the .dsc and then".
788 " do the signature itself";
797 my ($file, $desc) = @_;
798 my $fh = new IO::Handle;
799 open $fh, '<', $file or die "$file: $!";
800 my $c = parsecontrolfh($fh,$desc);
801 $fh->error and die $!;
807 my ($dctrl,$field) = @_;
808 my $v = $dctrl->{$field};
809 return $v if defined $v;
810 fail "missing field $field in ".$v->get_option('name');
814 my $c = Dpkg::Control::Hash->new();
815 my $p = new IO::Handle;
816 my @cmd = (qw(dpkg-parsechangelog), @_);
817 open $p, '-|', @cmd or die $!;
819 $?=0; $!=0; close $p or failedcmd @cmd;
825 defined $d or fail "getcwd failed: $!";
831 sub archive_query ($) {
833 my $query = access_cfg('archive-query','RETURN-UNDEF');
834 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
837 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
840 sub pool_dsc_subpath ($$) {
841 my ($vsn,$component) = @_; # $package is implict arg
842 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
843 return "/pool/$component/$prefix/$package/".dscfn($vsn);
846 #---------- `ftpmasterapi' archive query method (nascent) ----------
848 sub archive_api_query_cmd ($) {
850 my @cmd = qw(curl -sS);
851 my $url = access_cfg('archive-query-url');
852 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
854 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
855 foreach my $key (split /\:/, $keys) {
856 $key =~ s/\%HOST\%/$host/g;
858 fail "for $url: stat $key: $!" unless $!==ENOENT;
861 fail "config requested specific TLS key but do not know".
862 " how to get curl to use exactly that EE key ($key)";
863 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
864 # # Sadly the above line does not work because of changes
865 # # to gnutls. The real fix for #790093 may involve
866 # # new curl options.
869 # Fixing #790093 properly will involve providing a value
870 # for this on clients.
871 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
872 push @cmd, split / /, $kargs if defined $kargs;
874 push @cmd, $url.$subpath;
880 my ($data, $subpath) = @_;
881 badcfg "ftpmasterapi archive query method takes no data part"
883 my @cmd = archive_api_query_cmd($subpath);
884 my $json = cmdoutput @cmd;
885 return decode_json($json);
888 sub canonicalise_suite_ftpmasterapi () {
889 my ($proto,$data) = @_;
890 my $suites = api_query($data, 'suites');
892 foreach my $entry (@$suites) {
894 my $v = $entry->{$_};
895 defined $v && $v eq $isuite;
897 push @matched, $entry;
899 fail "unknown suite $isuite" unless @matched;
902 @matched==1 or die "multiple matches for suite $isuite\n";
903 $cn = "$matched[0]{codename}";
904 defined $cn or die "suite $isuite info has no codename\n";
905 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
907 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
912 sub archive_query_ftpmasterapi () {
913 my ($proto,$data) = @_;
914 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
916 my $digester = Digest::SHA->new(256);
917 foreach my $entry (@$info) {
919 my $vsn = "$entry->{version}";
920 my ($ok,$msg) = version_check $vsn;
921 die "bad version: $msg\n" unless $ok;
922 my $component = "$entry->{component}";
923 $component =~ m/^$component_re$/ or die "bad component";
924 my $filename = "$entry->{filename}";
925 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
926 or die "bad filename";
927 my $sha256sum = "$entry->{sha256sum}";
928 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
929 push @rows, [ $vsn, "/pool/$component/$filename",
930 $digester, $sha256sum ];
932 die "bad ftpmaster api response: $@\n".Dumper($entry)
935 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
939 #---------- `madison' archive query method ----------
941 sub archive_query_madison {
942 return map { [ @$_[0..1] ] } madison_get_parse(@_);
945 sub madison_get_parse {
946 my ($proto,$data) = @_;
947 die unless $proto eq 'madison';
949 $data= access_cfg('madison-distro','RETURN-UNDEF');
950 $data //= access_basedistro();
952 $rmad{$proto,$data,$package} ||= cmdoutput
953 qw(rmadison -asource),"-s$isuite","-u$data",$package;
954 my $rmad = $rmad{$proto,$data,$package};
957 foreach my $l (split /\n/, $rmad) {
958 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
959 \s*( [^ \t|]+ )\s* \|
960 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
961 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
962 $1 eq $package or die "$rmad $package ?";
969 $component = access_cfg('archive-query-default-component');
971 $5 eq 'source' or die "$rmad ?";
972 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
974 return sort { -version_compare($a->[0],$b->[0]); } @out;
977 sub canonicalise_suite_madison {
978 # madison canonicalises for us
979 my @r = madison_get_parse(@_);
981 "unable to canonicalise suite using package $package".
982 " which does not appear to exist in suite $isuite;".
983 " --existing-package may help";
987 #---------- `sshpsql' archive query method ----------
990 my ($data,$runeinfo,$sql) = @_;
992 $data= access_someuserhost('sshpsql').':'.
993 access_cfg('sshpsql-dbname');
995 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
996 my ($userhost,$dbname) = ($`,$'); #';
998 my @cmd = (access_cfg_ssh, $userhost,
999 access_runeinfo("ssh-psql $runeinfo").
1000 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1001 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1003 open P, "-|", @cmd or die $!;
1006 printdebug(">|$_|\n");
1009 $!=0; $?=0; close P or failedcmd @cmd;
1011 my $nrows = pop @rows;
1012 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1013 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1014 @rows = map { [ split /\|/, $_ ] } @rows;
1015 my $ncols = scalar @{ shift @rows };
1016 die if grep { scalar @$_ != $ncols } @rows;
1020 sub sql_injection_check {
1021 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1024 sub archive_query_sshpsql ($$) {
1025 my ($proto,$data) = @_;
1026 sql_injection_check $isuite, $package;
1027 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1028 SELECT source.version, component.name, files.filename, files.sha256sum
1030 JOIN src_associations ON source.id = src_associations.source
1031 JOIN suite ON suite.id = src_associations.suite
1032 JOIN dsc_files ON dsc_files.source = source.id
1033 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1034 JOIN component ON component.id = files_archive_map.component_id
1035 JOIN files ON files.id = dsc_files.file
1036 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1037 AND source.source='$package'
1038 AND files.filename LIKE '%.dsc';
1040 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1041 my $digester = Digest::SHA->new(256);
1043 my ($vsn,$component,$filename,$sha256sum) = @$_;
1044 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1049 sub canonicalise_suite_sshpsql ($$) {
1050 my ($proto,$data) = @_;
1051 sql_injection_check $isuite;
1052 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1053 SELECT suite.codename
1054 FROM suite where suite_name='$isuite' or codename='$isuite';
1056 @rows = map { $_->[0] } @rows;
1057 fail "unknown suite $isuite" unless @rows;
1058 die "ambiguous $isuite: @rows ?" if @rows>1;
1062 #---------- `dummycat' archive query method ----------
1064 sub canonicalise_suite_dummycat ($$) {
1065 my ($proto,$data) = @_;
1066 my $dpath = "$data/suite.$isuite";
1067 if (!open C, "<", $dpath) {
1068 $!==ENOENT or die "$dpath: $!";
1069 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1073 chomp or die "$dpath: $!";
1075 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1079 sub archive_query_dummycat ($$) {
1080 my ($proto,$data) = @_;
1081 canonicalise_suite();
1082 my $dpath = "$data/package.$csuite.$package";
1083 if (!open C, "<", $dpath) {
1084 $!==ENOENT or die "$dpath: $!";
1085 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1093 printdebug "dummycat query $csuite $package $dpath | $_\n";
1094 my @row = split /\s+/, $_;
1095 @row==2 or die "$dpath: $_ ?";
1098 C->error and die "$dpath: $!";
1100 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1103 #---------- archive query entrypoints and rest of program ----------
1105 sub canonicalise_suite () {
1106 return if defined $csuite;
1107 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1108 $csuite = archive_query('canonicalise_suite');
1109 if ($isuite ne $csuite) {
1110 progress "canonical suite name for $isuite is $csuite";
1114 sub get_archive_dsc () {
1115 canonicalise_suite();
1116 my @vsns = archive_query('archive_query');
1117 foreach my $vinfo (@vsns) {
1118 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1119 $dscurl = access_cfg('mirror').$subpath;
1120 $dscdata = url_get($dscurl);
1122 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1127 $digester->add($dscdata);
1128 my $got = $digester->hexdigest();
1130 fail "$dscurl has hash $got but".
1131 " archive told us to expect $digest";
1133 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1134 printdebug Dumper($dscdata) if $debuglevel>1;
1135 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1136 printdebug Dumper($dsc) if $debuglevel>1;
1137 my $fmt = getfield $dsc, 'Format';
1138 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
1139 $dsc_checked = !!$digester;
1145 sub check_for_git ();
1146 sub check_for_git () {
1148 my $how = access_cfg('git-check');
1149 if ($how eq 'ssh-cmd') {
1151 (access_cfg_ssh, access_gituserhost(),
1152 access_runeinfo("git-check $package").
1153 " set -e; cd ".access_cfg('git-path').";".
1154 " if test -d $package.git; then echo 1; else echo 0; fi");
1155 my $r= cmdoutput @cmd;
1156 if ($r =~ m/^divert (\w+)$/) {
1158 my ($usedistro,) = access_distros();
1159 # NB that if we are pushing, $usedistro will be $distro/push
1160 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1161 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1162 progress "diverting to $divert (using config for $instead_distro)";
1163 return check_for_git();
1165 failedcmd @cmd unless $r =~ m/^[01]$/;
1167 } elsif ($how eq 'url') {
1168 my $prefix = access_cfg('git-check-url','git-url');
1169 my $suffix = access_cfg('git-check-suffix','git-suffix',
1170 'RETURN-UNDEF') // '.git';
1171 my $url = "$prefix/$package$suffix";
1172 my @cmd = (qw(curl -sS -I), $url);
1173 my $result = cmdoutput @cmd;
1174 $result =~ s/^\S+ 200 .*\n\r?\n//;
1175 # curl -sS -I with https_proxy prints
1176 # HTTP/1.0 200 Connection established
1177 $result =~ m/^\S+ (404|200) /s or
1178 fail "unexpected results from git check query - ".
1179 Dumper($prefix, $result);
1181 if ($code eq '404') {
1183 } elsif ($code eq '200') {
1188 } elsif ($how eq 'true') {
1190 } elsif ($how eq 'false') {
1193 badcfg "unknown git-check \`$how'";
1197 sub create_remote_git_repo () {
1198 my $how = access_cfg('git-create');
1199 if ($how eq 'ssh-cmd') {
1201 (access_cfg_ssh, access_gituserhost(),
1202 access_runeinfo("git-create $package").
1203 "set -e; cd ".access_cfg('git-path').";".
1204 " cp -a _template $package.git");
1205 } elsif ($how eq 'true') {
1208 badcfg "unknown git-create \`$how'";
1212 our ($dsc_hash,$lastpush_hash);
1214 our $ud = '.git/dgit/unpack';
1224 sub mktree_in_ud_here () {
1225 runcmd qw(git init -q);
1226 rmtree('.git/objects');
1227 symlink '../../../../objects','.git/objects' or die $!;
1230 sub git_write_tree () {
1231 my $tree = cmdoutput @git, qw(write-tree);
1232 $tree =~ m/^\w+$/ or die "$tree ?";
1236 sub remove_stray_gits () {
1237 my @gitscmd = qw(find -name .git -prune -print0);
1238 debugcmd "|",@gitscmd;
1239 open GITS, "-|", @gitscmd or failedcmd @gitscmd;
1244 print STDERR "$us: warning: removing from source package: ",
1245 (messagequote $_), "\n";
1249 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1252 sub mktree_in_ud_from_only_subdir () {
1253 # changes into the subdir
1255 die unless @dirs==1;
1256 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1260 remove_stray_gits();
1261 mktree_in_ud_here();
1262 my ($format, $fopts) = get_source_format();
1263 if (madformat($format)) {
1266 runcmd @git, qw(add -Af);
1267 my $tree=git_write_tree();
1268 return ($tree,$dir);
1271 sub dsc_files_info () {
1272 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1273 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1274 ['Files', 'Digest::MD5', 'new()']) {
1275 my ($fname, $module, $method) = @$csumi;
1276 my $field = $dsc->{$fname};
1277 next unless defined $field;
1278 eval "use $module; 1;" or die $@;
1280 foreach (split /\n/, $field) {
1282 m/^(\w+) (\d+) (\S+)$/ or
1283 fail "could not parse .dsc $fname line \`$_'";
1284 my $digester = eval "$module"."->$method;" or die $@;
1289 Digester => $digester,
1294 fail "missing any supported Checksums-* or Files field in ".
1295 $dsc->get_option('name');
1299 map { $_->{Filename} } dsc_files_info();
1302 sub is_orig_file ($;$) {
1305 m/\.orig(?:-\w+)?\.tar\.\w+$/ or return 0;
1306 defined $base or return 1;
1310 sub make_commit ($) {
1312 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1315 sub clogp_authline ($) {
1317 my $author = getfield $clogp, 'Maintainer';
1318 $author =~ s#,.*##ms;
1319 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1320 my $authline = "$author $date";
1321 $authline =~ m/$git_authline_re/o or
1322 fail "unexpected commit author line format \`$authline'".
1323 " (was generated from changelog Maintainer field)";
1324 return ($1,$2,$3) if wantarray;
1328 sub vendor_patches_distro ($$) {
1329 my ($checkdistro, $what) = @_;
1330 return unless defined $checkdistro;
1332 my $series = "debian/patches/\L$checkdistro\E.series";
1333 printdebug "checking for vendor-specific $series ($what)\n";
1335 if (!open SERIES, "<", $series) {
1336 die "$series $!" unless $!==ENOENT;
1345 Unfortunately, this source package uses a feature of dpkg-source where
1346 the same source package unpacks to different source code on different
1347 distros. dgit cannot safely operate on such packages on affected
1348 distros, because the meaning of source packages is not stable.
1350 Please ask the distro/maintainer to remove the distro-specific series
1351 files and use a different technique (if necessary, uploading actually
1352 different packages, if different distros are supposed to have
1356 fail "Found active distro-specific series file for".
1357 " $checkdistro ($what): $series, cannot continue";
1359 die "$series $!" if SERIES->error;
1363 sub check_for_vendor_patches () {
1364 # This dpkg-source feature doesn't seem to be documented anywhere!
1365 # But it can be found in the changelog (reformatted):
1367 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1368 # Author: Raphael Hertzog <hertzog@debian.org>
1369 # Date: Sun Oct 3 09:36:48 2010 +0200
1371 # dpkg-source: correctly create .pc/.quilt_series with alternate
1374 # If you have debian/patches/ubuntu.series and you were
1375 # unpacking the source package on ubuntu, quilt was still
1376 # directed to debian/patches/series instead of
1377 # debian/patches/ubuntu.series.
1379 # debian/changelog | 3 +++
1380 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1381 # 2 files changed, 6 insertions(+), 1 deletion(-)
1384 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1385 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1386 "Dpkg::Vendor \`current vendor'");
1387 vendor_patches_distro(access_basedistro(),
1388 "distro being accessed");
1391 sub generate_commit_from_dsc () {
1395 foreach my $fi (dsc_files_info()) {
1396 my $f = $fi->{Filename};
1397 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1399 link_ltarget "../../../$f", $f
1403 complete_file_from_dsc('.', $fi)
1406 if (is_orig_file($f)) {
1407 link $f, "../../../../$f"
1413 my $dscfn = "$package.dsc";
1415 open D, ">", $dscfn or die "$dscfn: $!";
1416 print D $dscdata or die "$dscfn: $!";
1417 close D or die "$dscfn: $!";
1418 my @cmd = qw(dpkg-source);
1419 push @cmd, '--no-check' if $dsc_checked;
1420 push @cmd, qw(-x --), $dscfn;
1423 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1424 check_for_vendor_patches() if madformat($dsc->{format});
1425 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
1426 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
1427 my $authline = clogp_authline $clogp;
1428 my $changes = getfield $clogp, 'Changes';
1429 open C, ">../commit.tmp" or die $!;
1430 print C <<END or die $!;
1437 # imported from the archive
1440 my $outputhash = make_commit qw(../commit.tmp);
1441 my $cversion = getfield $clogp, 'Version';
1442 progress "synthesised git commit from .dsc $cversion";
1443 if ($lastpush_hash) {
1444 runcmd @git, qw(reset --hard), $lastpush_hash;
1445 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
1446 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
1447 my $oversion = getfield $oldclogp, 'Version';
1449 version_compare($oversion, $cversion);
1451 # git upload/ is earlier vsn than archive, use archive
1452 open C, ">../commit2.tmp" or die $!;
1453 print C <<END or die $!;
1455 parent $lastpush_hash
1460 Record $package ($cversion) in archive suite $csuite
1462 $outputhash = make_commit qw(../commit2.tmp);
1463 } elsif ($vcmp > 0) {
1464 print STDERR <<END or die $!;
1466 Version actually in archive: $cversion (older)
1467 Last allegedly pushed/uploaded: $oversion (newer or same)
1470 $outputhash = $lastpush_hash;
1472 $outputhash = $lastpush_hash;
1475 changedir '../../../..';
1476 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
1477 'DGIT_ARCHIVE', $outputhash;
1478 cmdoutput @git, qw(log -n2), $outputhash;
1479 # ... gives git a chance to complain if our commit is malformed
1484 sub complete_file_from_dsc ($$) {
1485 our ($dstdir, $fi) = @_;
1486 # Ensures that we have, in $dir, the file $fi, with the correct
1487 # contents. (Downloading it from alongside $dscurl if necessary.)
1489 my $f = $fi->{Filename};
1490 my $tf = "$dstdir/$f";
1493 if (stat_exists $tf) {
1494 progress "using existing $f";
1497 $furl =~ s{/[^/]+$}{};
1499 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
1500 die "$f ?" if $f =~ m#/#;
1501 runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
1502 return 0 if !act_local();
1506 open F, "<", "$tf" or die "$tf: $!";
1507 $fi->{Digester}->reset();
1508 $fi->{Digester}->addfile(*F);
1509 F->error and die $!;
1510 my $got = $fi->{Digester}->hexdigest();
1511 $got eq $fi->{Hash} or
1512 fail "file $f has hash $got but .dsc".
1513 " demands hash $fi->{Hash} ".
1514 ($downloaded ? "(got wrong file from archive!)"
1515 : "(perhaps you should delete this file?)");
1520 sub ensure_we_have_orig () {
1521 foreach my $fi (dsc_files_info()) {
1522 my $f = $fi->{Filename};
1523 next unless is_orig_file($f);
1524 complete_file_from_dsc('..', $fi)
1529 sub git_fetch_us () {
1530 my @specs = (fetchspec());
1532 map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
1534 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(), @specs;
1537 my $tagpat = debiantag('*',access_basedistro);
1539 git_for_each_ref("refs/tags/".$tagpat, sub {
1540 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1541 printdebug "currently $fullrefname=$objid\n";
1542 $here{$fullrefname} = $objid;
1544 git_for_each_ref(lrfetchrefs."/tags/".$tagpat, sub {
1545 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1546 my $lref = "refs".substr($fullrefname, length lrfetchrefs);
1547 printdebug "offered $lref=$objid\n";
1548 if (!defined $here{$lref}) {
1549 my @upd = (@git, qw(update-ref), $lref, $objid, '');
1550 runcmd_ordryrun_local @upd;
1551 } elsif ($here{$lref} eq $objid) {
1554 "Not updateting $lref from $here{$lref} to $objid.\n";
1559 sub fetch_from_archive () {
1560 # ensures that lrref() is what is actually in the archive,
1561 # one way or another
1565 foreach my $field (@ourdscfield) {
1566 $dsc_hash = $dsc->{$field};
1567 last if defined $dsc_hash;
1569 if (defined $dsc_hash) {
1570 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
1572 progress "last upload to archive specified git hash";
1574 progress "last upload to archive has NO git hash";
1577 progress "no version available from the archive";
1580 $lastpush_hash = git_get_ref(lrref());
1581 printdebug "previous reference hash=$lastpush_hash\n";
1583 if (defined $dsc_hash) {
1584 fail "missing remote git history even though dsc has hash -".
1585 " could not find ref ".lrref().
1586 " (should have been fetched from ".access_giturl()."#".rrref().")"
1587 unless $lastpush_hash;
1589 ensure_we_have_orig();
1590 if ($dsc_hash eq $lastpush_hash) {
1591 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
1592 print STDERR <<END or die $!;
1594 Git commit in archive is behind the last version allegedly pushed/uploaded.
1595 Commit referred to by archive: $dsc_hash
1596 Last allegedly pushed/uploaded: $lastpush_hash
1599 $hash = $lastpush_hash;
1601 fail "git head (".lrref()."=$lastpush_hash) is not a ".
1602 "descendant of archive's .dsc hash ($dsc_hash)";
1605 $hash = generate_commit_from_dsc();
1606 } elsif ($lastpush_hash) {
1607 # only in git, not in the archive yet
1608 $hash = $lastpush_hash;
1609 print STDERR <<END or die $!;
1611 Package not found in the archive, but has allegedly been pushed using dgit.
1615 printdebug "nothing found!\n";
1616 if (defined $skew_warning_vsn) {
1617 print STDERR <<END or die $!;
1619 Warning: relevant archive skew detected.
1620 Archive allegedly contains $skew_warning_vsn
1621 But we were not able to obtain any version from the archive or git.
1627 printdebug "current hash=$hash\n";
1628 if ($lastpush_hash) {
1629 fail "not fast forward on last upload branch!".
1630 " (archive's version left in DGIT_ARCHIVE)"
1631 unless is_fast_fwd($lastpush_hash, $hash);
1633 if (defined $skew_warning_vsn) {
1635 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
1636 my $clogf = ".git/dgit/changelog.tmp";
1637 runcmd shell_cmd "exec >$clogf",
1638 @git, qw(cat-file blob), "$hash:debian/changelog";
1639 my $gotclogp = parsechangelog("-l$clogf");
1640 my $got_vsn = getfield $gotclogp, 'Version';
1641 printdebug "SKEW CHECK GOT $got_vsn\n";
1642 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
1643 print STDERR <<END or die $!;
1645 Warning: archive skew detected. Using the available version:
1646 Archive allegedly contains $skew_warning_vsn
1647 We were able to obtain only $got_vsn
1652 if ($lastpush_hash ne $hash) {
1653 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
1657 dryrun_report @upd_cmd;
1663 sub set_local_git_config ($$) {
1665 runcmd @git, qw(config), $k, $v;
1668 sub setup_mergechangelogs (;$) {
1670 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
1672 my $driver = 'dpkg-mergechangelogs';
1673 my $cb = "merge.$driver";
1674 my $attrs = '.git/info/attributes';
1675 ensuredir '.git/info';
1677 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
1678 if (!open ATTRS, "<", $attrs) {
1679 $!==ENOENT or die "$attrs: $!";
1683 next if m{^debian/changelog\s};
1684 print NATTRS $_, "\n" or die $!;
1686 ATTRS->error and die $!;
1689 print NATTRS "debian/changelog merge=$driver\n" or die $!;
1692 set_local_git_config "$cb.name", 'debian/changelog merge driver';
1693 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
1695 rename "$attrs.new", "$attrs" or die "$attrs: $!";
1698 sub setup_useremail (;$) {
1700 return unless $always || access_cfg_bool(1, 'setup-useremail');
1703 my ($k, $envvar) = @_;
1704 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
1705 return unless defined $v;
1706 set_local_git_config "user.$k", $v;
1709 $setup->('email', 'DEBEMAIL');
1710 $setup->('name', 'DEBFULLNAME');
1713 sub setup_new_tree () {
1714 setup_mergechangelogs();
1720 canonicalise_suite();
1721 badusage "dry run makes no sense with clone" unless act_local();
1722 my $hasgit = check_for_git();
1723 mkdir $dstdir or fail "create \`$dstdir': $!";
1725 runcmd @git, qw(init -q);
1726 my $giturl = access_giturl(1);
1727 if (defined $giturl) {
1728 set_local_git_config "remote.$remotename.fetch", fetchspec();
1729 open H, "> .git/HEAD" or die $!;
1730 print H "ref: ".lref()."\n" or die $!;
1732 runcmd @git, qw(remote add), 'origin', $giturl;
1735 progress "fetching existing git history";
1737 runcmd_ordryrun_local @git, qw(fetch origin);
1739 progress "starting new git history";
1741 fetch_from_archive() or no_such_package;
1742 my $vcsgiturl = $dsc->{'Vcs-Git'};
1743 if (length $vcsgiturl) {
1744 $vcsgiturl =~ s/\s+-b\s+\S+//g;
1745 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
1748 runcmd @git, qw(reset --hard), lrref();
1749 printdone "ready for work in $dstdir";
1753 if (check_for_git()) {
1756 fetch_from_archive() or no_such_package();
1757 printdone "fetched into ".lrref();
1762 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
1764 printdone "fetched to ".lrref()." and merged into HEAD";
1767 sub check_not_dirty () {
1768 foreach my $f (qw(local-options local-patch-header)) {
1769 if (stat_exists "debian/source/$f") {
1770 fail "git tree contains debian/source/$f";
1774 return if $ignoredirty;
1776 my @cmd = (@git, qw(diff --quiet HEAD));
1778 $!=0; $?=0; system @cmd;
1779 return if !$! && !$?;
1780 if (!$! && $?==256) {
1781 fail "working tree is dirty (does not match HEAD)";
1787 sub commit_admin ($) {
1790 runcmd_ordryrun_local @git, qw(commit -m), $m;
1793 sub commit_quilty_patch () {
1794 my $output = cmdoutput @git, qw(status --porcelain);
1796 foreach my $l (split /\n/, $output) {
1797 next unless $l =~ m/\S/;
1798 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1802 delete $adds{'.pc'}; # if there wasn't one before, don't add it
1804 progress "nothing quilty to commit, ok.";
1807 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
1808 runcmd_ordryrun_local @git, qw(add -f), @adds;
1809 commit_admin "Commit Debian 3.0 (quilt) metadata";
1812 sub get_source_format () {
1814 if (open F, "debian/source/options") {
1818 s/\s+$//; # ignore missing final newline
1820 my ($k, $v) = ($`, $'); #');
1821 $v =~ s/^"(.*)"$/$1/;
1827 F->error and die $!;
1830 die $! unless $!==&ENOENT;
1833 if (!open F, "debian/source/format") {
1834 die $! unless $!==&ENOENT;
1838 F->error and die $!;
1840 return ($_, \%options);
1845 return 0 unless $format eq '3.0 (quilt)';
1846 if ($quilt_mode eq 'nocheck') {
1847 progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
1850 progress "Format \`$format', checking/updating patch stack";
1854 sub push_parse_changelog ($) {
1857 my $clogp = Dpkg::Control::Hash->new();
1858 $clogp->load($clogpfn) or die;
1860 $package = getfield $clogp, 'Source';
1861 my $cversion = getfield $clogp, 'Version';
1862 my $tag = debiantag($cversion, access_basedistro);
1863 runcmd @git, qw(check-ref-format), $tag;
1865 my $dscfn = dscfn($cversion);
1867 return ($clogp, $cversion, $tag, $dscfn);
1870 sub push_parse_dsc ($$$) {
1871 my ($dscfn,$dscfnwhat, $cversion) = @_;
1872 $dsc = parsecontrol($dscfn,$dscfnwhat);
1873 my $dversion = getfield $dsc, 'Version';
1874 my $dscpackage = getfield $dsc, 'Source';
1875 ($dscpackage eq $package && $dversion eq $cversion) or
1876 fail "$dscfn is for $dscpackage $dversion".
1877 " but debian/changelog is for $package $cversion";
1880 sub push_mktag ($$$$$$$) {
1881 my ($head,$clogp,$tag,
1883 $changesfile,$changesfilewhat,
1886 $dsc->{$ourdscfield[0]} = $head;
1887 $dsc->save("$dscfn.tmp") or die $!;
1889 my $changes = parsecontrol($changesfile,$changesfilewhat);
1890 foreach my $field (qw(Source Distribution Version)) {
1891 $changes->{$field} eq $clogp->{$field} or
1892 fail "changes field $field \`$changes->{$field}'".
1893 " does not match changelog \`$clogp->{$field}'";
1896 my $cversion = getfield $clogp, 'Version';
1897 my $clogsuite = getfield $clogp, 'Distribution';
1899 # We make the git tag by hand because (a) that makes it easier
1900 # to control the "tagger" (b) we can do remote signing
1901 my $authline = clogp_authline $clogp;
1902 my $delibs = join(" ", "",@deliberatelies);
1903 my $declaredistro = access_basedistro();
1904 open TO, '>', $tfn->('.tmp') or die $!;
1905 print TO <<END or die $!;
1911 $package release $cversion for $clogsuite ($csuite) [dgit]
1912 [dgit distro=$declaredistro$delibs]
1914 foreach my $ref (sort keys %previously) {
1915 print TO <<END or die $!;
1916 [dgit previously:$ref=$previously{$ref}]
1922 my $tagobjfn = $tfn->('.tmp');
1924 if (!defined $keyid) {
1925 $keyid = access_cfg('keyid','RETURN-UNDEF');
1927 if (!defined $keyid) {
1928 $keyid = getfield $clogp, 'Maintainer';
1930 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1931 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1932 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1933 push @sign_cmd, $tfn->('.tmp');
1934 runcmd_ordryrun @sign_cmd;
1936 $tagobjfn = $tfn->('.signed.tmp');
1937 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
1938 $tfn->('.tmp'), $tfn->('.tmp.asc');
1945 sub sign_changes ($) {
1946 my ($changesfile) = @_;
1948 my @debsign_cmd = @debsign;
1949 push @debsign_cmd, "-k$keyid" if defined $keyid;
1950 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
1951 push @debsign_cmd, $changesfile;
1952 runcmd_ordryrun @debsign_cmd;
1957 my ($forceflag) = @_;
1958 printdebug "actually entering push\n";
1959 supplementary_message(<<'END');
1960 Push failed, while preparing your push.
1961 You can retry the push, after fixing the problem, if you like.
1965 access_giturl(); # check that success is vaguely likely
1967 my $clogpfn = ".git/dgit/changelog.822.tmp";
1968 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
1970 responder_send_file('parsed-changelog', $clogpfn);
1972 my ($clogp, $cversion, $tag, $dscfn) =
1973 push_parse_changelog("$clogpfn");
1975 my $dscpath = "$buildproductsdir/$dscfn";
1976 stat_exists $dscpath or
1977 fail "looked for .dsc $dscfn, but $!;".
1978 " maybe you forgot to build";
1980 responder_send_file('dsc', $dscpath);
1982 push_parse_dsc($dscpath, $dscfn, $cversion);
1984 my $format = getfield $dsc, 'Format';
1985 printdebug "format $format\n";
1986 if (madformat($format)) {
1987 # user might have not used dgit build, so maybe do this now:
1988 commit_quilty_patch();
1992 progress "checking that $dscfn corresponds to HEAD";
1993 runcmd qw(dpkg-source -x --),
1994 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
1995 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1996 check_for_vendor_patches() if madformat($dsc->{format});
1997 changedir '../../../..';
1998 my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
1999 my @diffcmd = (@git, qw(diff), $diffopt, $tree);
2000 debugcmd "+",@diffcmd;
2002 my $r = system @diffcmd;
2005 fail "$dscfn specifies a different tree to your HEAD commit;".
2006 " perhaps you forgot to build".
2007 ($diffopt eq '--exit-code' ? "" :
2008 " (run with -D to see full diff output)");
2013 my $head = git_rev_parse('HEAD');
2014 if (!$changesfile) {
2015 my $pat = changespat $cversion;
2016 my @cs = glob "$buildproductsdir/$pat";
2017 fail "failed to find unique changes file".
2018 " (looked for $pat in $buildproductsdir);".
2019 " perhaps you need to use dgit -C"
2021 ($changesfile) = @cs;
2023 $changesfile = "$buildproductsdir/$changesfile";
2026 responder_send_file('changes',$changesfile);
2027 responder_send_command("param head $head");
2028 responder_send_command("param csuite $csuite");
2030 if (deliberately_not_fast_forward) {
2031 git_for_each_ref(lrfetchrefs, sub {
2032 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
2033 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
2034 responder_send_command("previously $rrefname=$objid");
2035 $previously{$rrefname} = $objid;
2039 my $tfn = sub { ".git/dgit/tag$_[0]"; };
2042 supplementary_message(<<'END');
2043 Push failed, while signing the tag.
2044 You can retry the push, after fixing the problem, if you like.
2046 # If we manage to sign but fail to record it anywhere, it's fine.
2047 if ($we_are_responder) {
2048 $tagobjfn = $tfn->('.signed.tmp');
2049 responder_receive_files('signed-tag', $tagobjfn);
2052 push_mktag($head,$clogp,$tag,
2054 $changesfile,$changesfile,
2057 supplementary_message(<<'END');
2058 Push failed, *after* signing the tag.
2059 If you want to try again, you should use a new version number.
2062 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
2063 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
2064 runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
2066 supplementary_message(<<'END');
2067 Push failed, while updating the remote git repository - see messages above.
2068 If you want to try again, you should use a new version number.
2070 if (!check_for_git()) {
2071 create_remote_git_repo();
2073 runcmd_ordryrun @git, qw(push),access_giturl(),
2074 $forceflag."HEAD:".rrref(), $forceflag."refs/tags/$tag";
2075 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
2077 supplementary_message(<<'END');
2078 Push failed, after updating the remote git repository.
2079 If you want to try again, you must use a new version number.
2081 if ($we_are_responder) {
2082 my $dryrunsuffix = act_local() ? "" : ".tmp";
2083 responder_receive_files('signed-dsc-changes',
2084 "$dscpath$dryrunsuffix",
2085 "$changesfile$dryrunsuffix");
2088 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
2090 progress "[new .dsc left in $dscpath.tmp]";
2092 sign_changes $changesfile;
2095 supplementary_message(<<END);
2096 Push failed, while uploading package(s) to the archive server.
2097 You can retry the upload of exactly these same files with dput of:
2099 If that .changes file is broken, you will need to use a new version
2100 number for your next attempt at the upload.
2102 my $host = access_cfg('upload-host','RETURN-UNDEF');
2103 my @hostarg = defined($host) ? ($host,) : ();
2104 runcmd_ordryrun @dput, @hostarg, $changesfile;
2105 printdone "pushed and uploaded $cversion";
2107 supplementary_message('');
2108 responder_send_command("complete");
2115 badusage "-p is not allowed with clone; specify as argument instead"
2116 if defined $package;
2119 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
2120 ($package,$isuite) = @ARGV;
2121 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
2122 ($package,$dstdir) = @ARGV;
2123 } elsif (@ARGV==3) {
2124 ($package,$isuite,$dstdir) = @ARGV;
2126 badusage "incorrect arguments to dgit clone";
2128 $dstdir ||= "$package";
2130 if (stat_exists $dstdir) {
2131 fail "$dstdir already exists";
2135 if ($rmonerror && !$dryrun_level) {
2136 $cwd_remove= getcwd();
2138 return unless defined $cwd_remove;
2139 if (!chdir "$cwd_remove") {
2140 return if $!==&ENOENT;
2141 die "chdir $cwd_remove: $!";
2144 rmtree($dstdir) or die "remove $dstdir: $!\n";
2145 } elsif (!grep { $! == $_ }
2146 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
2148 print STDERR "check whether to remove $dstdir: $!\n";
2154 $cwd_remove = undef;
2157 sub branchsuite () {
2158 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
2159 if ($branch =~ m#$lbranch_re#o) {
2166 sub fetchpullargs () {
2168 if (!defined $package) {
2169 my $sourcep = parsecontrol('debian/control','debian/control');
2170 $package = getfield $sourcep, 'Source';
2173 # $isuite = branchsuite(); # this doesn't work because dak hates canons
2175 my $clogp = parsechangelog();
2176 $isuite = getfield $clogp, 'Distribution';
2178 canonicalise_suite();
2179 progress "fetching from suite $csuite";
2180 } elsif (@ARGV==1) {
2182 canonicalise_suite();
2184 badusage "incorrect arguments to dgit fetch or dgit pull";
2203 badusage "-p is not allowed with dgit push" if defined $package;
2205 my $clogp = parsechangelog();
2206 $package = getfield $clogp, 'Source';
2209 } elsif (@ARGV==1) {
2210 ($specsuite) = (@ARGV);
2212 badusage "incorrect arguments to dgit push";
2214 $isuite = getfield $clogp, 'Distribution';
2216 local ($package) = $existing_package; # this is a hack
2217 canonicalise_suite();
2219 canonicalise_suite();
2221 if (defined $specsuite &&
2222 $specsuite ne $isuite &&
2223 $specsuite ne $csuite) {
2224 fail "dgit push: changelog specifies $isuite ($csuite)".
2225 " but command line specifies $specsuite";
2227 supplementary_message(<<'END');
2228 Push failed, while checking state of the archive.
2229 You can retry the push, after fixing the problem, if you like.
2231 if (check_for_git()) {
2235 if (fetch_from_archive()) {
2236 if (is_fast_fwd(lrref(), 'HEAD')) {
2238 } elsif (deliberately_not_fast_forward) {
2241 fail "dgit push: HEAD is not a descendant".
2242 " of the archive's version.\n".
2243 "dgit: To overwrite its contents,".
2244 " use git merge -s ours ".lrref().".\n".
2245 "dgit: To rewind history, if permitted by the archive,".
2246 " use --deliberately-not-fast-forward";
2250 fail "package appears to be new in this suite;".
2251 " if this is intentional, use --new";
2256 #---------- remote commands' implementation ----------
2258 sub cmd_remote_push_build_host {
2259 my ($nrargs) = shift @ARGV;
2260 my (@rargs) = @ARGV[0..$nrargs-1];
2261 @ARGV = @ARGV[$nrargs..$#ARGV];
2263 my ($dir,$vsnwant) = @rargs;
2264 # vsnwant is a comma-separated list; we report which we have
2265 # chosen in our ready response (so other end can tell if they
2268 $we_are_responder = 1;
2269 $us .= " (build host)";
2273 open PI, "<&STDIN" or die $!;
2274 open STDIN, "/dev/null" or die $!;
2275 open PO, ">&STDOUT" or die $!;
2277 open STDOUT, ">&STDERR" or die $!;
2281 ($protovsn) = grep {
2282 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
2283 } @rpushprotovsn_support;
2285 fail "build host has dgit rpush protocol versions ".
2286 (join ",", @rpushprotovsn_support).
2287 " but invocation host has $vsnwant"
2288 unless defined $protovsn;
2290 responder_send_command("dgit-remote-push-ready $protovsn");
2296 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
2297 # ... for compatibility with proto vsn.1 dgit (just so that user gets
2298 # a good error message)
2304 my $report = i_child_report();
2305 if (defined $report) {
2306 printdebug "($report)\n";
2307 } elsif ($i_child_pid) {
2308 printdebug "(killing build host child $i_child_pid)\n";
2309 kill 15, $i_child_pid;
2311 if (defined $i_tmp && !defined $initiator_tempdir) {
2313 eval { rmtree $i_tmp; };
2317 END { i_cleanup(); }
2320 my ($base,$selector,@args) = @_;
2321 $selector =~ s/\-/_/g;
2322 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
2329 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
2337 push @rargs, join ",", @rpushprotovsn_support;
2340 push @rdgit, @ropts;
2341 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
2343 my @cmd = (@ssh, $host, shellquote @rdgit);
2346 if (defined $initiator_tempdir) {
2347 rmtree $initiator_tempdir;
2348 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
2349 $i_tmp = $initiator_tempdir;
2353 $i_child_pid = open2(\*RO, \*RI, @cmd);
2355 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
2356 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
2357 $supplementary_message = '' unless $protovsn >= 3;
2359 my ($icmd,$iargs) = initiator_expect {
2360 m/^(\S+)(?: (.*))?$/;
2363 i_method "i_resp", $icmd, $iargs;
2367 sub i_resp_progress ($) {
2369 my $msg = protocol_read_bytes \*RO, $rhs;
2373 sub i_resp_supplementary_message ($) {
2375 $supplementary_message = protocol_read_bytes \*RO, $rhs;
2378 sub i_resp_complete {
2379 my $pid = $i_child_pid;
2380 $i_child_pid = undef; # prevents killing some other process with same pid
2381 printdebug "waiting for build host child $pid...\n";
2382 my $got = waitpid $pid, 0;
2383 die $! unless $got == $pid;
2384 die "build host child failed $?" if $?;
2387 printdebug "all done\n";
2391 sub i_resp_file ($) {
2393 my $localname = i_method "i_localname", $keyword;
2394 my $localpath = "$i_tmp/$localname";
2395 stat_exists $localpath and
2396 badproto \*RO, "file $keyword ($localpath) twice";
2397 protocol_receive_file \*RO, $localpath;
2398 i_method "i_file", $keyword;
2403 sub i_resp_param ($) {
2404 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
2408 sub i_resp_previously ($) {
2409 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
2410 or badproto \*RO, "bad previously spec";
2411 my $r = system qw(git check-ref-format), $1;
2412 die "bad previously ref spec ($r)" if $r;
2413 $previously{$1} = $2;
2418 sub i_resp_want ($) {
2420 die "$keyword ?" if $i_wanted{$keyword}++;
2421 my @localpaths = i_method "i_want", $keyword;
2422 printdebug "[[ $keyword @localpaths\n";
2423 foreach my $localpath (@localpaths) {
2424 protocol_send_file \*RI, $localpath;
2426 print RI "files-end\n" or die $!;
2429 our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn);
2431 sub i_localname_parsed_changelog {
2432 return "remote-changelog.822";
2434 sub i_file_parsed_changelog {
2435 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
2436 push_parse_changelog "$i_tmp/remote-changelog.822";
2437 die if $i_dscfn =~ m#/|^\W#;
2440 sub i_localname_dsc {
2441 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2446 sub i_localname_changes {
2447 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2448 $i_changesfn = $i_dscfn;
2449 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
2450 return $i_changesfn;
2452 sub i_file_changes { }
2454 sub i_want_signed_tag {
2455 printdebug Dumper(\%i_param, $i_dscfn);
2456 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
2457 && defined $i_param{'csuite'}
2458 or badproto \*RO, "premature desire for signed-tag";
2459 my $head = $i_param{'head'};
2460 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
2462 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
2464 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
2467 push_mktag $head, $i_clogp, $i_tag,
2469 $i_changesfn, 'remote changes',
2470 sub { "tag$_[0]"; };
2475 sub i_want_signed_dsc_changes {
2476 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
2477 sign_changes $i_changesfn;
2478 return ($i_dscfn, $i_changesfn);
2481 #---------- building etc. ----------
2487 #----- `3.0 (quilt)' handling -----
2489 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
2491 sub quiltify_dpkg_commit ($$$;$) {
2492 my ($patchname,$author,$msg, $xinfo) = @_;
2496 my $descfn = ".git/dgit/quilt-description.tmp";
2497 open O, '>', $descfn or die "$descfn: $!";
2500 $msg =~ s/^\s+$/ ./mg;
2501 print O <<END or die $!;
2511 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
2512 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
2513 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
2514 runcmd @dpkgsource, qw(--commit .), $patchname;
2518 sub quiltify_trees_differ ($$;$) {
2519 my ($x,$y,$finegrained) = @_;
2520 # returns true iff the two tree objects differ other than in debian/
2521 # with $finegrained,
2522 # returns bitmask 01 - differ in upstream files except .gitignore
2523 # 02 - differ in .gitignore
2525 my @cmd = (@git, qw(diff-tree --name-only -z));
2526 push @cmd, qw(-r) if $finegrained;
2528 my $diffs= cmdoutput @cmd;
2530 foreach my $f (split /\0/, $diffs) {
2531 next if $f =~ m#^debian(?:/.*)?$#s;
2532 $r |= ($f =~ m#^(?:.*/)?.gitignore$#s) ? 02 : 01;
2534 printdebug "quiltify_trees_differ $x $y => $r\n";
2538 sub quiltify_tree_sentinelfiles ($) {
2539 # lists the `sentinel' files present in the tree
2541 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
2542 qw(-- debian/rules debian/control);
2547 sub quiltify_splitbrain_needed () {
2548 if (!$split_brain) {
2549 progress "creating dgit view";
2550 runcmd @git, qw(checkout -q -b dgit-view);
2555 sub quiltify_splitbrain ($$) {
2556 my ($clogp, $diffbits) = @_;
2557 if ($quilt_mode !~ m/gbp|dpm/) {
2558 # treat .gitignore just like any other upstream file
2559 $diffbits = { %$diffbits };
2560 $_ = !!$_ foreach values %$diffbits;
2562 # We would like any commits we generate to be reproducible
2563 my @authline = clogp_authline($clogp);
2564 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2565 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2566 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2567 if ($quilt_mode =~ m/gbp|unapplied/ &&
2568 ($diffbits->{O2A} & 01) && # some patches
2569 !($diffbits->{H2O} & 01)) { # but HEAD is like orig
2570 quiltify_splitbrain_needed();
2571 progress "creating patches-applied version using gbp-pq";
2572 open STDOUT, ">/dev/null" or die $!;
2573 runcmd shell_cmd 'exec >/dev/null', @gbppq, qw(import);
2575 if (($diffbits->{H2O} & 02) && # user has modified .gitignore
2576 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
2577 quiltify_splitbrain_needed();
2578 progress "creating patch to represent .gitignore changes";
2579 die 'xxx gitignore';
2582 die 'xxx memoisation via git-reflog';
2583 die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)';
2586 sub quiltify ($$$$) {
2587 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
2589 # Quilt patchification algorithm
2591 # We search backwards through the history of the main tree's HEAD
2592 # (T) looking for a start commit S whose tree object is identical
2593 # to to the patch tip tree (ie the tree corresponding to the
2594 # current dpkg-committed patch series). For these purposes
2595 # `identical' disregards anything in debian/ - this wrinkle is
2596 # necessary because dpkg-source treates debian/ specially.
2598 # We can only traverse edges where at most one of the ancestors'
2599 # trees differs (in changes outside in debian/). And we cannot
2600 # handle edges which change .pc/ or debian/patches. To avoid
2601 # going down a rathole we avoid traversing edges which introduce
2602 # debian/rules or debian/control. And we set a limit on the
2603 # number of edges we are willing to look at.
2605 # If we succeed, we walk forwards again. For each traversed edge
2606 # PC (with P parent, C child) (starting with P=S and ending with
2607 # C=T) to we do this:
2609 # - dpkg-source --commit with a patch name and message derived from C
2610 # After traversing PT, we git commit the changes which
2611 # should be contained within debian/patches.
2613 # The search for the path S..T is breadth-first. We maintain a
2614 # todo list containing search nodes. A search node identifies a
2615 # commit, and looks something like this:
2617 # Commit => $git_commit_id,
2618 # Child => $c, # or undef if P=T
2619 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
2620 # Nontrivial => true iff $p..$c has relevant changes
2627 my %considered; # saves being exponential on some weird graphs
2629 my $t_sentinels = quiltify_tree_sentinelfiles $target;
2632 my ($search,$whynot) = @_;
2633 printdebug " search NOT $search->{Commit} $whynot\n";
2634 $search->{Whynot} = $whynot;
2635 push @nots, $search;
2636 no warnings qw(exiting);
2645 my $c = shift @todo;
2646 next if $considered{$c->{Commit}}++;
2648 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
2650 printdebug "quiltify investigate $c->{Commit}\n";
2653 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
2654 printdebug " search finished hooray!\n";
2659 if ($quilt_mode eq 'nofix') {
2660 fail "quilt fixup required but quilt mode is \`nofix'\n".
2661 "HEAD commit $c->{Commit} differs from tree implied by ".
2662 " debian/patches (tree object $oldtiptree)";
2664 if ($quilt_mode eq 'smash') {
2665 printdebug " search quitting smash\n";
2669 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
2670 $not->($c, "has $c_sentinels not $t_sentinels")
2671 if $c_sentinels ne $t_sentinels;
2673 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
2674 $commitdata =~ m/\n\n/;
2676 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
2677 @parents = map { { Commit => $_, Child => $c } } @parents;
2679 $not->($c, "root commit") if !@parents;
2681 foreach my $p (@parents) {
2682 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
2684 my $ndiffers = grep { $_->{Nontrivial} } @parents;
2685 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
2687 foreach my $p (@parents) {
2688 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
2690 my @cmd= (@git, qw(diff-tree -r --name-only),
2691 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
2692 my $patchstackchange = cmdoutput @cmd;
2693 if (length $patchstackchange) {
2694 $patchstackchange =~ s/\n/,/g;
2695 $not->($p, "changed $patchstackchange");
2698 printdebug " search queue P=$p->{Commit} ",
2699 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
2705 printdebug "quiltify want to smash\n";
2708 my $x = $_[0]{Commit};
2709 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
2712 my $reportnot = sub {
2714 my $s = $abbrev->($notp);
2715 my $c = $notp->{Child};
2716 $s .= "..".$abbrev->($c) if $c;
2717 $s .= ": ".$notp->{Whynot};
2720 if ($quilt_mode eq 'linear') {
2721 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
2722 foreach my $notp (@nots) {
2723 print STDERR "$us: ", $reportnot->($notp), "\n";
2725 print STDERR "$us: $_\n" foreach @$failsuggestion;
2726 fail "quilt fixup naive history linearisation failed.\n".
2727 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
2728 } elsif ($quilt_mode eq 'smash') {
2729 } elsif ($quilt_mode eq 'auto') {
2730 progress "quilt fixup cannot be linear, smashing...";
2732 die "$quilt_mode ?";
2737 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
2739 quiltify_dpkg_commit "auto-$version-$target-$time",
2740 (getfield $clogp, 'Maintainer'),
2741 "Automatically generated patch ($clogp->{Version})\n".
2742 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
2746 progress "quiltify linearisation planning successful, executing...";
2748 for (my $p = $sref_S;
2749 my $c = $p->{Child};
2751 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
2752 next unless $p->{Nontrivial};
2754 my $cc = $c->{Commit};
2756 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
2757 $commitdata =~ m/\n\n/ or die "$c ?";
2760 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
2763 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
2766 my $patchname = $title;
2767 $patchname =~ s/[.:]$//;
2768 $patchname =~ y/ A-Z/-a-z/;
2769 $patchname =~ y/-a-z0-9_.+=~//cd;
2770 $patchname =~ s/^\W/x-$&/;
2771 $patchname = substr($patchname,0,40);
2774 stat "debian/patches/$patchname$index";
2776 $!==ENOENT or die "$patchname$index $!";
2778 runcmd @git, qw(checkout -q), $cc;
2780 # We use the tip's changelog so that dpkg-source doesn't
2781 # produce complaining messages from dpkg-parsechangelog. None
2782 # of the information dpkg-source gets from the changelog is
2783 # actually relevant - it gets put into the original message
2784 # which dpkg-source provides our stunt editor, and then
2786 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
2788 quiltify_dpkg_commit "$patchname$index", $author, $msg,
2789 "X-Dgit-Generated: $clogp->{Version} $cc\n";
2791 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
2794 runcmd @git, qw(checkout -q master);
2797 sub build_maybe_quilt_fixup () {
2798 my ($format,$fopts) = get_source_format;
2799 return unless madformat $format;
2802 check_for_vendor_patches();
2804 my $clogp = parsechangelog();
2805 my $headref = git_rev_parse('HEAD');
2810 my $upstreamversion=$version;
2811 $upstreamversion =~ s/-[^-]*$//;
2813 if ($fopts->{'single-debian-patch'}) {
2814 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
2816 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
2819 changedir '../../../..';
2820 runcmd_ordryrun_local
2821 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
2824 sub quilt_fixup_mkwork ($) {
2827 mkdir "work" or die $!;
2829 mktree_in_ud_here();
2830 runcmd @git, qw(reset -q --hard), $headref;
2833 sub quilt_fixup_linkorigs ($$) {
2834 my ($upstreamversion, $fn) = @_;
2835 # calls $fn->($leafname);
2837 foreach my $f (<../../../../*>) { #/){
2838 my $b=$f; $b =~ s{.*/}{};
2840 local ($debuglevel) = $debuglevel-1;
2841 printdebug "QF linkorigs $b, $f ?\n";
2843 next unless is_orig_file $b, srcfn $upstreamversion,'';
2844 printdebug "QF linkorigs $b, $f Y\n";
2845 link_ltarget $f, $b or die "$b $!";
2850 sub quilt_fixup_delete_pc () {
2851 runcmd @git, qw(rm -rqf .pc);
2852 commit_admin "Commit removal of .pc (quilt series tracking data)";
2855 sub quilt_fixup_singlepatch ($$$) {
2856 my ($clogp, $headref, $upstreamversion) = @_;
2858 progress "starting quiltify (single-debian-patch)";
2860 # dpkg-source --commit generates new patches even if
2861 # single-debian-patch is in debian/source/options. In order to
2862 # get it to generate debian/patches/debian-changes, it is
2863 # necessary to build the source package.
2865 quilt_fixup_linkorigs($upstreamversion, sub { });
2866 quilt_fixup_mkwork($headref);
2868 rmtree("debian/patches");
2870 runcmd @dpkgsource, qw(-b .);
2872 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
2873 rename srcfn("$upstreamversion", "/debian/patches"),
2874 "work/debian/patches";
2877 commit_quilty_patch();
2882 sub quilt_fixup_multipatch ($$$) {
2883 my ($clogp, $headref, $upstreamversion) = @_;
2885 progress "starting quiltify (multiple patches, $quilt_mode mode)";
2888 # - honour any existing .pc in case it has any strangeness
2889 # - determine the git commit corresponding to the tip of
2890 # the patch stack (if there is one)
2891 # - if there is such a git commit, convert each subsequent
2892 # git commit into a quilt patch with dpkg-source --commit
2893 # - otherwise convert all the differences in the tree into
2894 # a single git commit
2898 # Our git tree doesn't necessarily contain .pc. (Some versions of
2899 # dgit would include the .pc in the git tree.) If there isn't
2900 # one, we need to generate one by unpacking the patches that we
2903 # We first look for a .pc in the git tree. If there is one, we
2904 # will use it. (This is not the normal case.)
2906 # Otherwise need to regenerate .pc so that dpkg-source --commit
2907 # can work. We do this as follows:
2908 # 1. Collect all relevant .orig from parent directory
2909 # 2. Generate a debian.tar.gz out of
2910 # debian/{patches,rules,source/format,source/options}
2911 # 3. Generate a fake .dsc containing just these fields:
2912 # Format Source Version Files
2913 # 4. Extract the fake .dsc
2914 # Now the fake .dsc has a .pc directory.
2915 # (In fact we do this in every case, because in future we will
2916 # want to search for a good base commit for generating patches.)
2918 # Then we can actually do the dpkg-source --commit
2919 # 1. Make a new working tree with the same object
2920 # store as our main tree and check out the main
2922 # 2. Copy .pc from the fake's extraction, if necessary
2923 # 3. Run dpkg-source --commit
2924 # 4. If the result has changes to debian/, then
2925 # - git-add them them
2926 # - git-add .pc if we had a .pc in-tree
2928 # 5. If we had a .pc in-tree, delete it, and git-commit
2929 # 6. Back in the main tree, fast forward to the new HEAD
2931 # Another situation we may have to cope with is gbp-style
2932 # patches-unapplied trees.
2934 # We would want to detect these, so we know to escape into
2935 # quilt_fixup_gbp. However, this is in general not possible.
2936 # Consider a package with a one patch which the dgit user reverts
2937 # (with git-revert or the moral equivalent).
2939 # That is indistinguishable in contents from a patches-unapplied
2940 # tree. And looking at the history to distinguish them is not
2941 # useful because the user might have made a confusing-looking git
2942 # history structure (which ought to produce an error if dgit can't
2943 # cope, not a silent reintroduction of an unwanted patch).
2945 # So gbp users will have to pass an option. But we can usually
2946 # detect their failure to do so: if the tree is not a clean
2947 # patches-applied tree, quilt linearisation fails, but the tree
2948 # _is_ a clean patches-unapplied tree, we can suggest that maybe
2949 # they want --quilt=unapplied.
2951 # To help detect this, when we are extracting the fake dsc, we
2952 # first extract it with --skip-patches, and then apply the patches
2953 # afterwards with dpkg-source --before-build. That lets us save a
2954 # tree object corresponding to .origs.
2956 my $fakeversion="$upstreamversion-~~DGITFAKE";
2958 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
2959 print $fakedsc <<END or die $!;
2962 Version: $fakeversion
2966 my $dscaddfile=sub {
2969 my $md = new Digest::MD5;
2971 my $fh = new IO::File $b, '<' or die "$b $!";
2976 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
2979 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
2981 my @files=qw(debian/source/format debian/rules
2982 debian/control debian/changelog);
2983 foreach my $maybe (qw(debian/patches debian/source/options
2984 debian/tests/control)) {
2985 next unless stat_exists "../../../$maybe";
2986 push @files, $maybe;
2989 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
2990 runcmd qw(env GZIP=-1 tar -zcf), "./$debtar", qw(-C ../../..), @files;
2992 $dscaddfile->($debtar);
2993 close $fakedsc or die $!;
2996 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
2998 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
2999 rename $fakexdir, "fake" or die "$fakexdir $!";
3003 remove_stray_gits();
3004 mktree_in_ud_here();
3008 runcmd @git, qw(add -Af .);
3009 my $unapplied=git_write_tree();
3010 printdebug "fake orig tree object $unapplied\n";
3015 'exec dpkg-source --before-build . >/dev/null';
3019 quilt_fixup_mkwork($headref);
3022 if (stat_exists ".pc") {
3024 progress "Tree already contains .pc - will use it then delete it.";
3027 rename '../fake/.pc','.pc' or die $!;
3030 changedir '../fake';
3032 runcmd @git, qw(add -Af .);
3033 my $oldtiptree=git_write_tree();
3034 changedir '../work';
3037 # We calculate some guesswork now about what kind of tree this might
3038 # be. This is mostly for error reporting.
3042 # O = orig, without patches applied
3043 # A = "applied", ie orig with H's debian/patches applied
3044 H2O => quiltify_trees_differ($headref, $unapplied, 1),
3045 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
3046 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
3050 foreach my $b (qw(01 02)) {
3051 foreach my $v (qw(H2O O2A H2A)) {
3052 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
3055 printdebug "differences \@dl @dl.\n";
3058 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
3059 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
3060 $dl[0], $dl[1], $dl[3], $dl[4],
3064 if (!($diffbits->{H2O} & $diffbits->{O2A})) {
3065 push @failsuggestion, "This might be a patches-unapplied branch.";
3066 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
3067 push @failsuggestion, "This might be a patches-applied branch.";
3069 push @failsuggestion, "Maybe you need to specify one of".
3070 " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
3072 if ($quilt_mode =~ m/gbp|dpm|unapplied/) {
3073 quiltify_splitbrain($clogp, $diffbits);
3077 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
3079 if (!open P, '>>', ".pc/applied-patches") {
3080 $!==&ENOENT or die $!;
3085 commit_quilty_patch();
3087 if ($mustdeletepc) {
3088 quilt_fixup_delete_pc();
3092 sub quilt_fixup_editor () {
3093 my $descfn = $ENV{$fakeeditorenv};
3094 my $editing = $ARGV[$#ARGV];
3095 open I1, '<', $descfn or die "$descfn: $!";
3096 open I2, '<', $editing or die "$editing: $!";
3097 unlink $editing or die "$editing: $!";
3098 open O, '>', $editing or die "$editing: $!";
3099 while (<I1>) { print O or die $!; } I1->error and die $!;
3102 $copying ||= m/^\-\-\- /;
3103 next unless $copying;
3106 I2->error and die $!;
3111 #----- other building -----
3113 our $suppress_clean;
3116 return if $suppress_clean;
3117 if ($cleanmode eq 'dpkg-source') {
3118 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
3119 } elsif ($cleanmode eq 'dpkg-source-d') {
3120 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
3121 } elsif ($cleanmode eq 'git') {
3122 runcmd_ordryrun_local @git, qw(clean -xdf);
3123 } elsif ($cleanmode eq 'git-ff') {
3124 runcmd_ordryrun_local @git, qw(clean -xdff);
3125 } elsif ($cleanmode eq 'check') {
3126 my $leftovers = cmdoutput @git, qw(clean -xdn);
3127 if (length $leftovers) {
3128 print STDERR $leftovers, "\n" or die $!;
3129 fail "tree contains uncommitted files and --clean=check specified";
3131 } elsif ($cleanmode eq 'none') {
3138 badusage "clean takes no additional arguments" if @ARGV;
3145 badusage "-p is not allowed when building" if defined $package;
3148 my $clogp = parsechangelog();
3149 $isuite = getfield $clogp, 'Distribution';
3150 $package = getfield $clogp, 'Source';
3151 $version = getfield $clogp, 'Version';
3152 build_maybe_quilt_fixup();
3154 my $pat = changespat $version;
3155 foreach my $f (glob "$buildproductsdir/$pat") {
3157 unlink $f or fail "remove old changes file $f: $!";
3159 progress "would remove $f";
3165 sub changesopts_initial () {
3166 my @opts =@changesopts[1..$#changesopts];
3169 sub changesopts_version () {
3170 if (!defined $changes_since_version) {
3171 my @vsns = archive_query('archive_query');
3172 my @quirk = access_quirk();
3173 if ($quirk[0] eq 'backports') {
3174 local $isuite = $quirk[2];
3176 canonicalise_suite();
3177 push @vsns, archive_query('archive_query');
3180 @vsns = map { $_->[0] } @vsns;
3181 @vsns = sort { -version_compare($a, $b) } @vsns;
3182 $changes_since_version = $vsns[0];
3183 progress "changelog will contain changes since $vsns[0]";
3185 $changes_since_version = '_';
3186 progress "package seems new, not specifying -v<version>";
3189 if ($changes_since_version ne '_') {
3190 return ("-v$changes_since_version");
3196 sub changesopts () {
3197 return (changesopts_initial(), changesopts_version());
3200 sub massage_dbp_args ($;$) {
3201 my ($cmd,$xargs) = @_;
3204 # - if we're going to split the source build out so we can
3205 # do strange things to it, massage the arguments to dpkg-buildpackage
3206 # so that the main build doessn't build source (or add an argument
3207 # to stop it building source by default).
3209 # - add -nc to stop dpkg-source cleaning the source tree,
3210 # unless we're not doing a split build and want dpkg-source
3211 # as cleanmode, in which case we can do nothing
3214 # 0 - source will NOT need to be built separately by caller
3215 # +1 - source will need to be built separately by caller
3216 # +2 - source will need to be built separately by caller AND
3217 # dpkg-buildpackage should not in fact be run at all!
3218 debugcmd '#massaging#', @$cmd if $debuglevel>1;
3219 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
3220 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
3221 $suppress_clean = 1;
3224 # -nc has the side effect of specifying -b if nothing else specified
3225 # and some combinations of -S, -b, et al, are errors, rather than
3226 # later simply overriding earlie. So we need to:
3227 # - search the command line for these options
3228 # - pick the last one
3229 # - perhaps add our own as a default
3230 # - perhaps adjust it to the corresponding non-source-building version
3232 foreach my $l ($cmd, $xargs) {
3234 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
3237 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
3239 if ($need_split_build_invocation) {
3240 $r = $dmode =~ m/[S]/ ? +2 :
3241 $dmode =~ y/gGF/ABb/ ? +1 :
3242 $dmode =~ m/[ABb]/ ? 0 :
3246 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
3251 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
3252 my $wantsrc = massage_dbp_args \@dbp;
3259 push @dbp, changesopts_version();
3260 runcmd_ordryrun_local @dbp;
3262 printdone "build successful\n";
3266 my @dbp = @dpkgbuildpackage;
3268 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
3271 if (length executable_on_path('git-buildpackage')) {
3272 @cmd = qw(git-buildpackage);
3274 @cmd = qw(gbp buildpackage);
3276 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
3281 if (!$suppress_clean) {
3282 push @cmd, '--git-cleaner=true';
3287 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
3288 canonicalise_suite();
3289 push @cmd, "--git-debian-branch=".lbranch();
3291 push @cmd, changesopts();
3292 runcmd_ordryrun_local @cmd, @ARGV;
3294 printdone "build successful\n";
3296 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
3299 if ($cleanmode =~ m/^dpkg-source/) {
3300 # dpkg-source will clean, so we shouldn't
3301 $suppress_clean = 1;
3304 $sourcechanges = changespat $version,'source';
3306 unlink "../$sourcechanges" or $!==ENOENT
3307 or fail "remove $sourcechanges: $!";
3309 $dscfn = dscfn($version);
3310 if ($cleanmode eq 'dpkg-source') {
3311 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
3313 } elsif ($cleanmode eq 'dpkg-source-d') {
3314 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
3317 my $pwd = must_getcwd();
3318 my $leafdir = basename $pwd;
3320 runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
3322 runcmd_ordryrun_local qw(sh -ec),
3323 'exec >$1; shift; exec "$@"','x',
3324 "../$sourcechanges",
3325 @dpkggenchanges, qw(-S), changesopts();
3329 sub cmd_build_source {
3330 badusage "build-source takes no additional arguments" if @ARGV;
3332 printdone "source built, results in $dscfn and $sourcechanges";
3337 my $pat = changespat $version;
3339 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
3340 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
3341 fail "changes files other than source matching $pat".
3342 " already present (@unwanted);".
3343 " building would result in ambiguity about the intended results"
3348 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
3349 stat_exists $sourcechanges
3350 or fail "$sourcechanges (in parent directory): $!";
3352 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
3353 my @changesfiles = glob $pat;
3354 @changesfiles = sort {
3355 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
3358 fail "wrong number of different changes files (@changesfiles)"
3359 unless @changesfiles==2;
3360 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
3361 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
3362 fail "$l found in binaries changes file $binchanges"
3365 runcmd_ordryrun_local @mergechanges, @changesfiles;
3366 my $multichanges = changespat $version,'multi';
3368 stat_exists $multichanges or fail "$multichanges: $!";
3369 foreach my $cf (glob $pat) {
3370 next if $cf eq $multichanges;
3371 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
3374 printdone "build successful, results in $multichanges\n" or die $!;
3377 sub cmd_quilt_fixup {
3378 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
3379 my $clogp = parsechangelog();
3380 $version = getfield $clogp, 'Version';
3381 $package = getfield $clogp, 'Source';
3384 build_maybe_quilt_fixup();
3387 sub cmd_archive_api_query {
3388 badusage "need only 1 subpath argument" unless @ARGV==1;
3389 my ($subpath) = @ARGV;
3390 my @cmd = archive_api_query_cmd($subpath);
3392 exec @cmd or fail "exec curl: $!\n";
3395 sub cmd_clone_dgit_repos_server {
3396 badusage "need destination argument" unless @ARGV==1;
3397 my ($destdir) = @ARGV;
3398 $package = '_dgit-repos-server';
3399 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
3401 exec @cmd or fail "exec git clone: $!\n";
3404 sub cmd_setup_mergechangelogs {
3405 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3406 setup_mergechangelogs(1);
3409 sub cmd_setup_useremail {
3410 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3414 sub cmd_setup_new_tree {
3415 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
3419 #---------- argument parsing and main program ----------
3422 print "dgit version $our_version\n" or die $!;
3426 our (%valopts_long, %valopts_short);
3429 sub defvalopt ($$$$) {
3430 my ($long,$short,$val_re,$how) = @_;
3431 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
3432 $valopts_long{$long} = $oi;
3433 $valopts_short{$short} = $oi;
3434 # $how subref should:
3435 # do whatever assignemnt or thing it likes with $_[0]
3436 # if the option should not be passed on to remote, @rvalopts=()
3437 # or $how can be a scalar ref, meaning simply assign the value
3440 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
3441 defvalopt '--distro', '-d', '.+', \$idistro;
3442 defvalopt '', '-k', '.+', \$keyid;
3443 defvalopt '--existing-package','', '.*', \$existing_package;
3444 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
3445 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
3446 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
3448 defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
3450 defvalopt '', '-C', '.+', sub {
3451 ($changesfile) = (@_);
3452 if ($changesfile =~ s#^(.*)/##) {
3453 $buildproductsdir = $1;
3457 defvalopt '--initiator-tempdir','','.*', sub {
3458 ($initiator_tempdir) = (@_);
3459 $initiator_tempdir =~ m#^/# or
3460 badusage "--initiator-tempdir must be used specify an".
3461 " absolute, not relative, directory."
3467 if (defined $ENV{'DGIT_SSH'}) {
3468 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
3469 } elsif (defined $ENV{'GIT_SSH'}) {
3470 @ssh = ($ENV{'GIT_SSH'});
3478 if (!defined $val) {
3479 badusage "$what needs a value" unless @ARGV;
3481 push @rvalopts, $val;
3483 badusage "bad value \`$val' for $what" unless
3484 $val =~ m/^$oi->{Re}$(?!\n)/s;
3485 my $how = $oi->{How};
3486 if (ref($how) eq 'SCALAR') {
3491 push @ropts, @rvalopts;
3495 last unless $ARGV[0] =~ m/^-/;
3499 if (m/^--dry-run$/) {
3502 } elsif (m/^--damp-run$/) {
3505 } elsif (m/^--no-sign$/) {
3508 } elsif (m/^--help$/) {
3510 } elsif (m/^--version$/) {
3512 } elsif (m/^--new$/) {
3515 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
3516 ($om = $opts_opt_map{$1}) &&
3520 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
3521 !$opts_opt_cmdonly{$1} &&
3522 ($om = $opts_opt_map{$1})) {
3525 } elsif (m/^--ignore-dirty$/s) {
3528 } elsif (m/^--no-quilt-fixup$/s) {
3530 $quilt_mode = 'nocheck';
3531 } elsif (m/^--no-rm-on-error$/s) {
3534 } elsif (m/^--(no-)?rm-old-changes$/s) {
3537 } elsif (m/^--deliberately-($deliberately_re)$/s) {
3539 push @deliberatelies, $&;
3540 } elsif (m/^--always-split-source-build$/s) {
3541 # undocumented, for testing
3543 $need_split_build_invocation = 1;
3544 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
3545 $val = $2 ? $' : undef; #';
3546 $valopt->($oi->{Long});
3548 badusage "unknown long option \`$_'";
3555 } elsif (s/^-L/-/) {
3558 } elsif (s/^-h/-/) {
3560 } elsif (s/^-D/-/) {
3564 } elsif (s/^-N/-/) {
3569 push @changesopts, $_;
3571 } elsif (s/^-wn$//s) {
3573 $cleanmode = 'none';
3574 } elsif (s/^-wg$//s) {
3577 } elsif (s/^-wgf$//s) {
3579 $cleanmode = 'git-ff';
3580 } elsif (s/^-wd$//s) {
3582 $cleanmode = 'dpkg-source';
3583 } elsif (s/^-wdd$//s) {
3585 $cleanmode = 'dpkg-source-d';
3586 } elsif (s/^-wc$//s) {
3588 $cleanmode = 'check';
3589 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
3591 $val = undef unless length $val;
3592 $valopt->($oi->{Short});
3595 badusage "unknown short option \`$_'";
3602 sub finalise_opts_opts () {
3603 foreach my $k (keys %opts_opt_map) {
3604 my $om = $opts_opt_map{$k};
3606 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
3608 badcfg "cannot set command for $k"
3609 unless length $om->[0];
3613 foreach my $c (access_cfg_cfgs("opts-$k")) {
3614 my $vl = $gitcfg{$c};
3615 printdebug "CL $c ",
3616 ($vl ? join " ", map { shellquote } @$vl : ""),
3617 "\n" if $debuglevel >= 4;
3619 badcfg "cannot configure options for $k"
3620 if $opts_opt_cmdonly{$k};
3621 my $insertpos = $opts_cfg_insertpos{$k};
3622 @$om = ( @$om[0..$insertpos-1],
3624 @$om[$insertpos..$#$om] );
3629 if ($ENV{$fakeeditorenv}) {
3631 quilt_fixup_editor();
3637 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
3638 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
3639 if $dryrun_level == 1;
3641 print STDERR $helpmsg or die $!;
3644 my $cmd = shift @ARGV;
3647 if (!defined $rmchanges) {
3648 local $access_forpush;
3649 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
3652 if (!defined $quilt_mode) {
3653 local $access_forpush;
3654 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
3655 // access_cfg('quilt-mode', 'RETURN-UNDEF')
3657 $quilt_mode =~ m/^($quilt_modes_re)$/
3658 or badcfg "unknown quilt-mode \`$quilt_mode'";
3662 if (!defined $cleanmode) {
3663 local $access_forpush;
3664 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
3665 $cleanmode //= 'dpkg-source';
3667 badcfg "unknown clean-mode \`$cleanmode'" unless
3668 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
3671 my $fn = ${*::}{"cmd_$cmd"};
3672 $fn or badusage "unknown operation $cmd";