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); # 4 is new tag format
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;
67 our $patches_applied_dirtily = 00;
72 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
74 our $suite_re = '[-+.0-9a-z]+';
75 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
77 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
78 our $splitbraincache = 'dgit-intern/quilt-cache';
81 our (@dget) = qw(dget);
82 our (@curl) = qw(curl -f);
83 our (@dput) = qw(dput);
84 our (@debsign) = qw(debsign);
86 our (@sbuild) = qw(sbuild);
88 our (@dgit) = qw(dgit);
89 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
90 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
91 our (@dpkggenchanges) = qw(dpkg-genchanges);
92 our (@mergechanges) = qw(mergechanges -f);
94 our (@changesopts) = ('');
96 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
99 'debsign' => \@debsign,
101 'sbuild' => \@sbuild,
105 'dpkg-source' => \@dpkgsource,
106 'dpkg-buildpackage' => \@dpkgbuildpackage,
107 'dpkg-genchanges' => \@dpkggenchanges,
109 'ch' => \@changesopts,
110 'mergechanges' => \@mergechanges);
112 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
113 our %opts_cfg_insertpos = map {
115 scalar @{ $opts_opt_map{$_} }
116 } keys %opts_opt_map;
118 sub finalise_opts_opts();
124 our $supplementary_message = '';
125 our $need_split_build_invocation = 0;
126 our $split_brain = 0;
130 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
133 our $remotename = 'dgit';
134 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
139 my ($v,$distro) = @_;
140 return $tagformatfn->($v, $distro);
143 sub lbranch () { return "$branchprefix/$csuite"; }
144 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
145 sub lref () { return "refs/heads/".lbranch(); }
146 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
147 sub rrref () { return server_ref($csuite); }
149 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
159 return "${package}_".(stripepoch $vsn).$sfx
164 return srcfn($vsn,".dsc");
167 sub changespat ($;$) {
168 my ($vsn, $arch) = @_;
169 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
178 foreach my $f (@end) {
180 print STDERR "$us: cleanup: $@" if length $@;
184 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
186 sub no_such_package () {
187 print STDERR "$us: package $package does not exist in suite $isuite\n";
193 return "+".rrref().":".lrref();
198 printdebug "CD $newdir\n";
199 chdir $newdir or die "chdir: $newdir: $!";
202 sub deliberately ($) {
204 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
207 sub deliberately_not_fast_forward () {
208 foreach (qw(not-fast-forward fresh-repo)) {
209 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
213 sub quiltmode_splitbrain () {
214 $quilt_mode =~ m/gbp|dpm|unapplied/;
217 #---------- remote protocol support, common ----------
219 # remote push initiator/responder protocol:
220 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
221 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
222 # < dgit-remote-push-ready <actual-proto-vsn>
229 # > supplementary-message NBYTES # $protovsn >= 3
234 # > file parsed-changelog
235 # [indicates that output of dpkg-parsechangelog follows]
236 # > data-block NBYTES
237 # > [NBYTES bytes of data (no newline)]
238 # [maybe some more blocks]
248 # > param csuite SUITE
249 # > param tagformat old|new
251 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
252 # # goes into tag, for replay prevention
255 # [indicates that signed tag is wanted]
256 # < data-block NBYTES
257 # < [NBYTES bytes of data (no newline)]
258 # [maybe some more blocks]
262 # > want signed-dsc-changes
263 # < data-block NBYTES [transfer of signed dsc]
265 # < data-block NBYTES [transfer of signed changes]
273 sub i_child_report () {
274 # Sees if our child has died, and reap it if so. Returns a string
275 # describing how it died if it failed, or undef otherwise.
276 return undef unless $i_child_pid;
277 my $got = waitpid $i_child_pid, WNOHANG;
278 return undef if $got <= 0;
279 die unless $got == $i_child_pid;
280 $i_child_pid = undef;
281 return undef unless $?;
282 return "build host child ".waitstatusmsg();
287 fail "connection lost: $!" if $fh->error;
288 fail "protocol violation; $m not expected";
291 sub badproto_badread ($$) {
293 fail "connection lost: $!" if $!;
294 my $report = i_child_report();
295 fail $report if defined $report;
296 badproto $fh, "eof (reading $wh)";
299 sub protocol_expect (&$) {
300 my ($match, $fh) = @_;
303 defined && chomp or badproto_badread $fh, "protocol message";
311 badproto $fh, "\`$_'";
314 sub protocol_send_file ($$) {
315 my ($fh, $ourfn) = @_;
316 open PF, "<", $ourfn or die "$ourfn: $!";
319 my $got = read PF, $d, 65536;
320 die "$ourfn: $!" unless defined $got;
322 print $fh "data-block ".length($d)."\n" or die $!;
323 print $fh $d or die $!;
325 PF->error and die "$ourfn $!";
326 print $fh "data-end\n" or die $!;
330 sub protocol_read_bytes ($$) {
331 my ($fh, $nbytes) = @_;
332 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
334 my $got = read $fh, $d, $nbytes;
335 $got==$nbytes or badproto_badread $fh, "data block";
339 sub protocol_receive_file ($$) {
340 my ($fh, $ourfn) = @_;
341 printdebug "() $ourfn\n";
342 open PF, ">", $ourfn or die "$ourfn: $!";
344 my ($y,$l) = protocol_expect {
345 m/^data-block (.*)$/ ? (1,$1) :
346 m/^data-end$/ ? (0,) :
350 my $d = protocol_read_bytes $fh, $l;
351 print PF $d or die $!;
356 #---------- remote protocol support, responder ----------
358 sub responder_send_command ($) {
360 return unless $we_are_responder;
361 # called even without $we_are_responder
362 printdebug ">> $command\n";
363 print PO $command, "\n" or die $!;
366 sub responder_send_file ($$) {
367 my ($keyword, $ourfn) = @_;
368 return unless $we_are_responder;
369 printdebug "]] $keyword $ourfn\n";
370 responder_send_command "file $keyword";
371 protocol_send_file \*PO, $ourfn;
374 sub responder_receive_files ($@) {
375 my ($keyword, @ourfns) = @_;
376 die unless $we_are_responder;
377 printdebug "[[ $keyword @ourfns\n";
378 responder_send_command "want $keyword";
379 foreach my $fn (@ourfns) {
380 protocol_receive_file \*PI, $fn;
383 protocol_expect { m/^files-end$/ } \*PI;
386 #---------- remote protocol support, initiator ----------
388 sub initiator_expect (&) {
390 protocol_expect { &$match } \*RO;
393 #---------- end remote code ----------
396 if ($we_are_responder) {
398 responder_send_command "progress ".length($m) or die $!;
399 print PO $m or die $!;
409 $ua = LWP::UserAgent->new();
413 progress "downloading $what...";
414 my $r = $ua->get(@_) or die $!;
415 return undef if $r->code == 404;
416 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
417 return $r->decoded_content(charset => 'none');
420 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
425 failedcmd @_ if system @_;
428 sub act_local () { return $dryrun_level <= 1; }
429 sub act_scary () { return !$dryrun_level; }
432 if (!$dryrun_level) {
433 progress "dgit ok: @_";
435 progress "would be ok: @_ (but dry run only)";
440 printcmd(\*STDERR,$debugprefix."#",@_);
443 sub runcmd_ordryrun {
451 sub runcmd_ordryrun_local {
460 my ($first_shell, @cmd) = @_;
461 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
464 our $helpmsg = <<END;
466 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
467 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
468 dgit [dgit-opts] build [dpkg-buildpackage-opts]
469 dgit [dgit-opts] sbuild [sbuild-opts]
470 dgit [dgit-opts] push [dgit-opts] [suite]
471 dgit [dgit-opts] rpush build-host:build-dir ...
472 important dgit options:
473 -k<keyid> sign tag and package with <keyid> instead of default
474 --dry-run -n do not change anything, but go through the motions
475 --damp-run -L like --dry-run but make local changes, without signing
476 --new -N allow introducing a new package
477 --debug -D increase debug level
478 -c<name>=<value> set git config option (used directly by dgit too)
481 our $later_warning_msg = <<END;
482 Perhaps the upload is stuck in incoming. Using the version from git.
486 print STDERR "$us: @_\n", $helpmsg or die $!;
491 @ARGV or badusage "too few arguments";
492 return scalar shift @ARGV;
496 print $helpmsg or die $!;
500 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
502 our %defcfg = ('dgit.default.distro' => 'debian',
503 'dgit.default.username' => '',
504 'dgit.default.archive-query-default-component' => 'main',
505 'dgit.default.ssh' => 'ssh',
506 'dgit.default.archive-query' => 'madison:',
507 'dgit.default.sshpsql-dbname' => 'service=projectb',
508 'dgit.default.dgit-tag-format' => 'old,new',
509 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
510 'dgit-distro.debian.git-check' => 'url',
511 'dgit-distro.debian.git-check-suffix' => '/info/refs',
512 'dgit-distro.debian.new-private-pushers' => 't',
513 'dgit-distro.debian.dgit-tag-format' => 'old',
514 'dgit-distro.debian/push.git-url' => '',
515 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
516 'dgit-distro.debian/push.git-user-force' => 'dgit',
517 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
518 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
519 'dgit-distro.debian/push.git-create' => 'true',
520 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
521 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
522 # 'dgit-distro.debian.archive-query-tls-key',
523 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
524 # ^ this does not work because curl is broken nowadays
525 # Fixing #790093 properly will involve providing providing the key
526 # in some pacagke and maybe updating these paths.
528 # 'dgit-distro.debian.archive-query-tls-curl-args',
529 # '--ca-path=/etc/ssl/ca-debian',
530 # ^ this is a workaround but works (only) on DSA-administered machines
531 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
532 'dgit-distro.debian.git-url-suffix' => '',
533 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
534 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
535 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
536 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
537 'dgit-distro.ubuntu.git-check' => 'false',
538 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
539 'dgit-distro.test-dummy.ssh' => "$td/ssh",
540 'dgit-distro.test-dummy.username' => "alice",
541 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
542 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
543 'dgit-distro.test-dummy.git-url' => "$td/git",
544 'dgit-distro.test-dummy.git-host' => "git",
545 'dgit-distro.test-dummy.git-path' => "$td/git",
546 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
547 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
548 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
549 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
554 sub git_slurp_config () {
555 local ($debuglevel) = $debuglevel-2;
558 my @cmd = (@git, qw(config -z --get-regexp .*));
561 open GITS, "-|", @cmd or die $!;
564 printdebug "=> ", (messagequote $_), "\n";
566 push @{ $gitcfg{$`} }, $'; #';
570 or ($!==0 && $?==256)
574 sub git_get_config ($) {
577 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
580 @$l==1 or badcfg "multiple values for $c" if @$l > 1;
586 return undef if $c =~ /RETURN-UNDEF/;
587 my $v = git_get_config($c);
588 return $v if defined $v;
589 my $dv = $defcfg{$c};
590 return $dv if defined $dv;
592 badcfg "need value for one of: @_\n".
593 "$us: distro or suite appears not to be (properly) supported";
596 sub access_basedistro () {
597 if (defined $idistro) {
600 return cfg("dgit-suite.$isuite.distro",
601 "dgit.default.distro");
605 sub access_quirk () {
606 # returns (quirk name, distro to use instead or undef, quirk-specific info)
607 my $basedistro = access_basedistro();
608 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
610 if (defined $backports_quirk) {
611 my $re = $backports_quirk;
612 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
614 $re =~ s/\%/([-0-9a-z_]+)/
615 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
616 if ($isuite =~ m/^$re$/) {
617 return ('backports',"$basedistro-backports",$1);
620 return ('none',undef);
625 sub parse_cfg_bool ($$$) {
626 my ($what,$def,$v) = @_;
629 $v =~ m/^[ty1]/ ? 1 :
630 $v =~ m/^[fn0]/ ? 0 :
631 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
634 sub access_forpush_config () {
635 my $d = access_basedistro();
639 parse_cfg_bool('new-private-pushers', 0,
640 cfg("dgit-distro.$d.new-private-pushers",
643 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
646 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
647 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
648 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
649 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
652 sub access_forpush () {
653 $access_forpush //= access_forpush_config();
654 return $access_forpush;
658 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
659 badcfg "pushing but distro is configured readonly"
660 if access_forpush_config() eq '0';
662 $supplementary_message = <<'END' unless $we_are_responder;
663 Push failed, before we got started.
664 You can retry the push, after fixing the problem, if you like.
666 finalise_opts_opts();
670 finalise_opts_opts();
673 sub supplementary_message ($) {
675 if (!$we_are_responder) {
676 $supplementary_message = $msg;
678 } elsif ($protovsn >= 3) {
679 responder_send_command "supplementary-message ".length($msg)
681 print PO $msg or die $!;
685 sub access_distros () {
686 # Returns list of distros to try, in order
689 # 0. `instead of' distro name(s) we have been pointed to
690 # 1. the access_quirk distro, if any
691 # 2a. the user's specified distro, or failing that } basedistro
692 # 2b. the distro calculated from the suite }
693 my @l = access_basedistro();
695 my (undef,$quirkdistro) = access_quirk();
696 unshift @l, $quirkdistro;
697 unshift @l, $instead_distro;
698 @l = grep { defined } @l;
700 if (access_forpush()) {
701 @l = map { ("$_/push", $_) } @l;
706 sub access_cfg_cfgs (@) {
709 # The nesting of these loops determines the search order. We put
710 # the key loop on the outside so that we search all the distros
711 # for each key, before going on to the next key. That means that
712 # if access_cfg is called with a more specific, and then a less
713 # specific, key, an earlier distro can override the less specific
714 # without necessarily overriding any more specific keys. (If the
715 # distro wants to override the more specific keys it can simply do
716 # so; whereas if we did the loop the other way around, it would be
717 # impossible to for an earlier distro to override a less specific
718 # key but not the more specific ones without restating the unknown
719 # values of the more specific keys.
722 # We have to deal with RETURN-UNDEF specially, so that we don't
723 # terminate the search prematurely.
725 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
728 foreach my $d (access_distros()) {
729 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
731 push @cfgs, map { "dgit.default.$_" } @realkeys;
738 my (@cfgs) = access_cfg_cfgs(@keys);
739 my $value = cfg(@cfgs);
743 sub access_cfg_bool ($$) {
744 my ($def, @keys) = @_;
745 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
748 sub string_to_ssh ($) {
750 if ($spec =~ m/\s/) {
751 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
757 sub access_cfg_ssh () {
758 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
759 if (!defined $gitssh) {
762 return string_to_ssh $gitssh;
766 sub access_runeinfo ($) {
768 return ": dgit ".access_basedistro()." $info ;";
771 sub access_someuserhost ($) {
773 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
774 defined($user) && length($user) or
775 $user = access_cfg("$some-user",'username');
776 my $host = access_cfg("$some-host");
777 return length($user) ? "$user\@$host" : $host;
780 sub access_gituserhost () {
781 return access_someuserhost('git');
784 sub access_giturl (;$) {
786 my $url = access_cfg('git-url','RETURN-UNDEF');
789 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
790 return undef unless defined $proto;
793 access_gituserhost().
794 access_cfg('git-path');
796 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
799 return "$url/$package$suffix";
802 sub parsecontrolfh ($$;$) {
803 my ($fh, $desc, $allowsigned) = @_;
804 our $dpkgcontrolhash_noissigned;
807 my %opts = ('name' => $desc);
808 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
809 $c = Dpkg::Control::Hash->new(%opts);
810 $c->parse($fh,$desc) or die "parsing of $desc failed";
811 last if $allowsigned;
812 last if $dpkgcontrolhash_noissigned;
813 my $issigned= $c->get_option('is_pgp_signed');
814 if (!defined $issigned) {
815 $dpkgcontrolhash_noissigned= 1;
816 seek $fh, 0,0 or die "seek $desc: $!";
817 } elsif ($issigned) {
818 fail "control file $desc is (already) PGP-signed. ".
819 " Note that dgit push needs to modify the .dsc and then".
820 " do the signature itself";
829 my ($file, $desc) = @_;
830 my $fh = new IO::Handle;
831 open $fh, '<', $file or die "$file: $!";
832 my $c = parsecontrolfh($fh,$desc);
833 $fh->error and die $!;
839 my ($dctrl,$field) = @_;
840 my $v = $dctrl->{$field};
841 return $v if defined $v;
842 fail "missing field $field in ".$v->get_option('name');
846 my $c = Dpkg::Control::Hash->new();
847 my $p = new IO::Handle;
848 my @cmd = (qw(dpkg-parsechangelog), @_);
849 open $p, '-|', @cmd or die $!;
851 $?=0; $!=0; close $p or failedcmd @cmd;
857 defined $d or fail "getcwd failed: $!";
863 sub archive_query ($) {
865 my $query = access_cfg('archive-query','RETURN-UNDEF');
866 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
869 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
872 sub pool_dsc_subpath ($$) {
873 my ($vsn,$component) = @_; # $package is implict arg
874 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
875 return "/pool/$component/$prefix/$package/".dscfn($vsn);
878 #---------- `ftpmasterapi' archive query method (nascent) ----------
880 sub archive_api_query_cmd ($) {
882 my @cmd = qw(curl -sS);
883 my $url = access_cfg('archive-query-url');
884 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
886 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
887 foreach my $key (split /\:/, $keys) {
888 $key =~ s/\%HOST\%/$host/g;
890 fail "for $url: stat $key: $!" unless $!==ENOENT;
893 fail "config requested specific TLS key but do not know".
894 " how to get curl to use exactly that EE key ($key)";
895 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
896 # # Sadly the above line does not work because of changes
897 # # to gnutls. The real fix for #790093 may involve
898 # # new curl options.
901 # Fixing #790093 properly will involve providing a value
902 # for this on clients.
903 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
904 push @cmd, split / /, $kargs if defined $kargs;
906 push @cmd, $url.$subpath;
912 my ($data, $subpath) = @_;
913 badcfg "ftpmasterapi archive query method takes no data part"
915 my @cmd = archive_api_query_cmd($subpath);
916 my $json = cmdoutput @cmd;
917 return decode_json($json);
920 sub canonicalise_suite_ftpmasterapi () {
921 my ($proto,$data) = @_;
922 my $suites = api_query($data, 'suites');
924 foreach my $entry (@$suites) {
926 my $v = $entry->{$_};
927 defined $v && $v eq $isuite;
929 push @matched, $entry;
931 fail "unknown suite $isuite" unless @matched;
934 @matched==1 or die "multiple matches for suite $isuite\n";
935 $cn = "$matched[0]{codename}";
936 defined $cn or die "suite $isuite info has no codename\n";
937 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
939 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
944 sub archive_query_ftpmasterapi () {
945 my ($proto,$data) = @_;
946 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
948 my $digester = Digest::SHA->new(256);
949 foreach my $entry (@$info) {
951 my $vsn = "$entry->{version}";
952 my ($ok,$msg) = version_check $vsn;
953 die "bad version: $msg\n" unless $ok;
954 my $component = "$entry->{component}";
955 $component =~ m/^$component_re$/ or die "bad component";
956 my $filename = "$entry->{filename}";
957 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
958 or die "bad filename";
959 my $sha256sum = "$entry->{sha256sum}";
960 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
961 push @rows, [ $vsn, "/pool/$component/$filename",
962 $digester, $sha256sum ];
964 die "bad ftpmaster api response: $@\n".Dumper($entry)
967 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
971 #---------- `madison' archive query method ----------
973 sub archive_query_madison {
974 return map { [ @$_[0..1] ] } madison_get_parse(@_);
977 sub madison_get_parse {
978 my ($proto,$data) = @_;
979 die unless $proto eq 'madison';
981 $data= access_cfg('madison-distro','RETURN-UNDEF');
982 $data //= access_basedistro();
984 $rmad{$proto,$data,$package} ||= cmdoutput
985 qw(rmadison -asource),"-s$isuite","-u$data",$package;
986 my $rmad = $rmad{$proto,$data,$package};
989 foreach my $l (split /\n/, $rmad) {
990 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
991 \s*( [^ \t|]+ )\s* \|
992 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
993 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
994 $1 eq $package or die "$rmad $package ?";
1001 $component = access_cfg('archive-query-default-component');
1003 $5 eq 'source' or die "$rmad ?";
1004 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1006 return sort { -version_compare($a->[0],$b->[0]); } @out;
1009 sub canonicalise_suite_madison {
1010 # madison canonicalises for us
1011 my @r = madison_get_parse(@_);
1013 "unable to canonicalise suite using package $package".
1014 " which does not appear to exist in suite $isuite;".
1015 " --existing-package may help";
1019 #---------- `sshpsql' archive query method ----------
1022 my ($data,$runeinfo,$sql) = @_;
1023 if (!length $data) {
1024 $data= access_someuserhost('sshpsql').':'.
1025 access_cfg('sshpsql-dbname');
1027 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1028 my ($userhost,$dbname) = ($`,$'); #';
1030 my @cmd = (access_cfg_ssh, $userhost,
1031 access_runeinfo("ssh-psql $runeinfo").
1032 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1033 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1035 open P, "-|", @cmd or die $!;
1038 printdebug(">|$_|\n");
1041 $!=0; $?=0; close P or failedcmd @cmd;
1043 my $nrows = pop @rows;
1044 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1045 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1046 @rows = map { [ split /\|/, $_ ] } @rows;
1047 my $ncols = scalar @{ shift @rows };
1048 die if grep { scalar @$_ != $ncols } @rows;
1052 sub sql_injection_check {
1053 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1056 sub archive_query_sshpsql ($$) {
1057 my ($proto,$data) = @_;
1058 sql_injection_check $isuite, $package;
1059 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1060 SELECT source.version, component.name, files.filename, files.sha256sum
1062 JOIN src_associations ON source.id = src_associations.source
1063 JOIN suite ON suite.id = src_associations.suite
1064 JOIN dsc_files ON dsc_files.source = source.id
1065 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1066 JOIN component ON component.id = files_archive_map.component_id
1067 JOIN files ON files.id = dsc_files.file
1068 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1069 AND source.source='$package'
1070 AND files.filename LIKE '%.dsc';
1072 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1073 my $digester = Digest::SHA->new(256);
1075 my ($vsn,$component,$filename,$sha256sum) = @$_;
1076 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1081 sub canonicalise_suite_sshpsql ($$) {
1082 my ($proto,$data) = @_;
1083 sql_injection_check $isuite;
1084 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1085 SELECT suite.codename
1086 FROM suite where suite_name='$isuite' or codename='$isuite';
1088 @rows = map { $_->[0] } @rows;
1089 fail "unknown suite $isuite" unless @rows;
1090 die "ambiguous $isuite: @rows ?" if @rows>1;
1094 #---------- `dummycat' archive query method ----------
1096 sub canonicalise_suite_dummycat ($$) {
1097 my ($proto,$data) = @_;
1098 my $dpath = "$data/suite.$isuite";
1099 if (!open C, "<", $dpath) {
1100 $!==ENOENT or die "$dpath: $!";
1101 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1105 chomp or die "$dpath: $!";
1107 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1111 sub archive_query_dummycat ($$) {
1112 my ($proto,$data) = @_;
1113 canonicalise_suite();
1114 my $dpath = "$data/package.$csuite.$package";
1115 if (!open C, "<", $dpath) {
1116 $!==ENOENT or die "$dpath: $!";
1117 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1125 printdebug "dummycat query $csuite $package $dpath | $_\n";
1126 my @row = split /\s+/, $_;
1127 @row==2 or die "$dpath: $_ ?";
1130 C->error and die "$dpath: $!";
1132 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1135 #---------- archive query entrypoints and rest of program ----------
1137 sub canonicalise_suite () {
1138 return if defined $csuite;
1139 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1140 $csuite = archive_query('canonicalise_suite');
1141 if ($isuite ne $csuite) {
1142 progress "canonical suite name for $isuite is $csuite";
1146 sub get_archive_dsc () {
1147 canonicalise_suite();
1148 my @vsns = archive_query('archive_query');
1149 foreach my $vinfo (@vsns) {
1150 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1151 $dscurl = access_cfg('mirror').$subpath;
1152 $dscdata = url_get($dscurl);
1154 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1159 $digester->add($dscdata);
1160 my $got = $digester->hexdigest();
1162 fail "$dscurl has hash $got but".
1163 " archive told us to expect $digest";
1165 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1166 printdebug Dumper($dscdata) if $debuglevel>1;
1167 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1168 printdebug Dumper($dsc) if $debuglevel>1;
1169 my $fmt = getfield $dsc, 'Format';
1170 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
1171 $dsc_checked = !!$digester;
1177 sub check_for_git ();
1178 sub check_for_git () {
1180 my $how = access_cfg('git-check');
1181 if ($how eq 'ssh-cmd') {
1183 (access_cfg_ssh, access_gituserhost(),
1184 access_runeinfo("git-check $package").
1185 " set -e; cd ".access_cfg('git-path').";".
1186 " if test -d $package.git; then echo 1; else echo 0; fi");
1187 my $r= cmdoutput @cmd;
1188 if (defined $r and $r =~ m/^divert (\w+)$/) {
1190 my ($usedistro,) = access_distros();
1191 # NB that if we are pushing, $usedistro will be $distro/push
1192 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1193 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1194 progress "diverting to $divert (using config for $instead_distro)";
1195 return check_for_git();
1197 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1199 } elsif ($how eq 'url') {
1200 my $prefix = access_cfg('git-check-url','git-url');
1201 my $suffix = access_cfg('git-check-suffix','git-suffix',
1202 'RETURN-UNDEF') // '.git';
1203 my $url = "$prefix/$package$suffix";
1204 my @cmd = (qw(curl -sS -I), $url);
1205 my $result = cmdoutput @cmd;
1206 $result =~ s/^\S+ 200 .*\n\r?\n//;
1207 # curl -sS -I with https_proxy prints
1208 # HTTP/1.0 200 Connection established
1209 $result =~ m/^\S+ (404|200) /s or
1210 fail "unexpected results from git check query - ".
1211 Dumper($prefix, $result);
1213 if ($code eq '404') {
1215 } elsif ($code eq '200') {
1220 } elsif ($how eq 'true') {
1222 } elsif ($how eq 'false') {
1225 badcfg "unknown git-check \`$how'";
1229 sub create_remote_git_repo () {
1230 my $how = access_cfg('git-create');
1231 if ($how eq 'ssh-cmd') {
1233 (access_cfg_ssh, access_gituserhost(),
1234 access_runeinfo("git-create $package").
1235 "set -e; cd ".access_cfg('git-path').";".
1236 " cp -a _template $package.git");
1237 } elsif ($how eq 'true') {
1240 badcfg "unknown git-create \`$how'";
1244 sub select_tagformat () {
1246 return if $tagformatfn && !$tagformat_want;
1247 die 'bug' if $tagformatfn && $tagformat_want;
1248 # ... $tagformat_want assigned after previous select_tagformat
1250 my (@supported) = split /\,/, access_cfg('dgit-tag-format');
1251 printdebug "select_tagformat supported @supported\n";
1253 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1254 printdebug "select_tagformat specified @$tagformat_want\n";
1256 my ($fmt,$why,$override) = @$tagformat_want;
1258 fail "target distro supports tag formats @supported".
1259 " but have to use $fmt ($why)"
1261 or grep { $_ eq $fmt } @supported;
1263 $tagformat_want = undef;
1265 $tagformatfn = ${*::}{"debiantag_$fmt"};
1267 fail "trying to use unknown tag format \`$fmt' ($why) !"
1268 unless $tagformatfn;
1271 our ($dsc_hash,$lastpush_hash);
1273 our $ud = '.git/dgit/unpack';
1283 sub mktree_in_ud_here () {
1284 runcmd qw(git init -q);
1285 rmtree('.git/objects');
1286 symlink '../../../../objects','.git/objects' or die $!;
1289 sub git_write_tree () {
1290 my $tree = cmdoutput @git, qw(write-tree);
1291 $tree =~ m/^\w+$/ or die "$tree ?";
1295 sub remove_stray_gits () {
1296 my @gitscmd = qw(find -name .git -prune -print0);
1297 debugcmd "|",@gitscmd;
1298 open GITS, "-|", @gitscmd or die $!;
1303 print STDERR "$us: warning: removing from source package: ",
1304 (messagequote $_), "\n";
1308 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1311 sub mktree_in_ud_from_only_subdir () {
1312 # changes into the subdir
1314 die "@dirs ?" unless @dirs==1;
1315 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1319 remove_stray_gits();
1320 mktree_in_ud_here();
1321 my ($format, $fopts) = get_source_format();
1322 if (madformat($format)) {
1325 runcmd @git, qw(add -Af);
1326 my $tree=git_write_tree();
1327 return ($tree,$dir);
1330 sub dsc_files_info () {
1331 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1332 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1333 ['Files', 'Digest::MD5', 'new()']) {
1334 my ($fname, $module, $method) = @$csumi;
1335 my $field = $dsc->{$fname};
1336 next unless defined $field;
1337 eval "use $module; 1;" or die $@;
1339 foreach (split /\n/, $field) {
1341 m/^(\w+) (\d+) (\S+)$/ or
1342 fail "could not parse .dsc $fname line \`$_'";
1343 my $digester = eval "$module"."->$method;" or die $@;
1348 Digester => $digester,
1353 fail "missing any supported Checksums-* or Files field in ".
1354 $dsc->get_option('name');
1358 map { $_->{Filename} } dsc_files_info();
1361 sub is_orig_file ($;$) {
1364 m/\.orig(?:-\w+)?\.tar\.\w+$/ or return 0;
1365 defined $base or return 1;
1369 sub make_commit ($) {
1371 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1374 sub clogp_authline ($) {
1376 my $author = getfield $clogp, 'Maintainer';
1377 $author =~ s#,.*##ms;
1378 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1379 my $authline = "$author $date";
1380 $authline =~ m/$git_authline_re/o or
1381 fail "unexpected commit author line format \`$authline'".
1382 " (was generated from changelog Maintainer field)";
1383 return ($1,$2,$3) if wantarray;
1387 sub vendor_patches_distro ($$) {
1388 my ($checkdistro, $what) = @_;
1389 return unless defined $checkdistro;
1391 my $series = "debian/patches/\L$checkdistro\E.series";
1392 printdebug "checking for vendor-specific $series ($what)\n";
1394 if (!open SERIES, "<", $series) {
1395 die "$series $!" unless $!==ENOENT;
1404 Unfortunately, this source package uses a feature of dpkg-source where
1405 the same source package unpacks to different source code on different
1406 distros. dgit cannot safely operate on such packages on affected
1407 distros, because the meaning of source packages is not stable.
1409 Please ask the distro/maintainer to remove the distro-specific series
1410 files and use a different technique (if necessary, uploading actually
1411 different packages, if different distros are supposed to have
1415 fail "Found active distro-specific series file for".
1416 " $checkdistro ($what): $series, cannot continue";
1418 die "$series $!" if SERIES->error;
1422 sub check_for_vendor_patches () {
1423 # This dpkg-source feature doesn't seem to be documented anywhere!
1424 # But it can be found in the changelog (reformatted):
1426 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1427 # Author: Raphael Hertzog <hertzog@debian.org>
1428 # Date: Sun Oct 3 09:36:48 2010 +0200
1430 # dpkg-source: correctly create .pc/.quilt_series with alternate
1433 # If you have debian/patches/ubuntu.series and you were
1434 # unpacking the source package on ubuntu, quilt was still
1435 # directed to debian/patches/series instead of
1436 # debian/patches/ubuntu.series.
1438 # debian/changelog | 3 +++
1439 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1440 # 2 files changed, 6 insertions(+), 1 deletion(-)
1443 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1444 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1445 "Dpkg::Vendor \`current vendor'");
1446 vendor_patches_distro(access_basedistro(),
1447 "distro being accessed");
1450 sub generate_commit_from_dsc () {
1454 foreach my $fi (dsc_files_info()) {
1455 my $f = $fi->{Filename};
1456 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1458 link_ltarget "../../../$f", $f
1462 complete_file_from_dsc('.', $fi)
1465 if (is_orig_file($f)) {
1466 link $f, "../../../../$f"
1472 my $dscfn = "$package.dsc";
1474 open D, ">", $dscfn or die "$dscfn: $!";
1475 print D $dscdata or die "$dscfn: $!";
1476 close D or die "$dscfn: $!";
1477 my @cmd = qw(dpkg-source);
1478 push @cmd, '--no-check' if $dsc_checked;
1479 push @cmd, qw(-x --), $dscfn;
1482 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1483 check_for_vendor_patches() if madformat($dsc->{format});
1484 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
1485 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
1486 my $authline = clogp_authline $clogp;
1487 my $changes = getfield $clogp, 'Changes';
1488 open C, ">../commit.tmp" or die $!;
1489 print C <<END or die $!;
1496 # imported from the archive
1499 my $outputhash = make_commit qw(../commit.tmp);
1500 my $cversion = getfield $clogp, 'Version';
1501 progress "synthesised git commit from .dsc $cversion";
1502 if ($lastpush_hash) {
1503 runcmd @git, qw(reset -q --hard), $lastpush_hash;
1504 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
1505 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
1506 my $oversion = getfield $oldclogp, 'Version';
1508 version_compare($oversion, $cversion);
1510 # git upload/ is earlier vsn than archive, use archive
1511 open C, ">../commit2.tmp" or die $!;
1512 print C <<END or die $!;
1514 parent $lastpush_hash
1519 Record $package ($cversion) in archive suite $csuite
1521 $outputhash = make_commit qw(../commit2.tmp);
1522 } elsif ($vcmp > 0) {
1523 print STDERR <<END or die $!;
1525 Version actually in archive: $cversion (older)
1526 Last allegedly pushed/uploaded: $oversion (newer or same)
1529 $outputhash = $lastpush_hash;
1531 $outputhash = $lastpush_hash;
1534 changedir '../../../..';
1535 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
1536 'DGIT_ARCHIVE', $outputhash;
1537 cmdoutput @git, qw(log -n2), $outputhash;
1538 # ... gives git a chance to complain if our commit is malformed
1543 sub complete_file_from_dsc ($$) {
1544 our ($dstdir, $fi) = @_;
1545 # Ensures that we have, in $dir, the file $fi, with the correct
1546 # contents. (Downloading it from alongside $dscurl if necessary.)
1548 my $f = $fi->{Filename};
1549 my $tf = "$dstdir/$f";
1552 if (stat_exists $tf) {
1553 progress "using existing $f";
1556 $furl =~ s{/[^/]+$}{};
1558 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
1559 die "$f ?" if $f =~ m#/#;
1560 runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
1561 return 0 if !act_local();
1565 open F, "<", "$tf" or die "$tf: $!";
1566 $fi->{Digester}->reset();
1567 $fi->{Digester}->addfile(*F);
1568 F->error and die $!;
1569 my $got = $fi->{Digester}->hexdigest();
1570 $got eq $fi->{Hash} or
1571 fail "file $f has hash $got but .dsc".
1572 " demands hash $fi->{Hash} ".
1573 ($downloaded ? "(got wrong file from archive!)"
1574 : "(perhaps you should delete this file?)");
1579 sub ensure_we_have_orig () {
1580 foreach my $fi (dsc_files_info()) {
1581 my $f = $fi->{Filename};
1582 next unless is_orig_file($f);
1583 complete_file_from_dsc('..', $fi)
1588 sub git_fetch_us () {
1589 my @specs = (fetchspec());
1591 map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
1593 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(), @specs;
1596 my @tagpats = debiantags('*',access_basedistro);
1598 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
1599 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1600 printdebug "currently $fullrefname=$objid\n";
1601 $here{$fullrefname} = $objid;
1603 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
1604 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1605 my $lref = "refs".substr($fullrefname, length lrfetchrefs);
1606 printdebug "offered $lref=$objid\n";
1607 if (!defined $here{$lref}) {
1608 my @upd = (@git, qw(update-ref), $lref, $objid, '');
1609 runcmd_ordryrun_local @upd;
1610 } elsif ($here{$lref} eq $objid) {
1613 "Not updateting $lref from $here{$lref} to $objid.\n";
1618 sub fetch_from_archive () {
1619 # ensures that lrref() is what is actually in the archive,
1620 # one way or another
1624 foreach my $field (@ourdscfield) {
1625 $dsc_hash = $dsc->{$field};
1626 last if defined $dsc_hash;
1628 if (defined $dsc_hash) {
1629 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
1631 progress "last upload to archive specified git hash";
1633 progress "last upload to archive has NO git hash";
1636 progress "no version available from the archive";
1639 $lastpush_hash = git_get_ref(lrref());
1640 printdebug "previous reference hash=$lastpush_hash\n";
1642 if (defined $dsc_hash) {
1643 fail "missing remote git history even though dsc has hash -".
1644 " could not find ref ".lrref().
1645 " (should have been fetched from ".access_giturl()."#".rrref().")"
1646 unless $lastpush_hash;
1648 ensure_we_have_orig();
1649 if ($dsc_hash eq $lastpush_hash) {
1650 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
1651 print STDERR <<END or die $!;
1653 Git commit in archive is behind the last version allegedly pushed/uploaded.
1654 Commit referred to by archive: $dsc_hash
1655 Last allegedly pushed/uploaded: $lastpush_hash
1658 $hash = $lastpush_hash;
1660 fail "git head (".lrref()."=$lastpush_hash) is not a ".
1661 "descendant of archive's .dsc hash ($dsc_hash)";
1664 $hash = generate_commit_from_dsc();
1665 } elsif ($lastpush_hash) {
1666 # only in git, not in the archive yet
1667 $hash = $lastpush_hash;
1668 print STDERR <<END or die $!;
1670 Package not found in the archive, but has allegedly been pushed using dgit.
1674 printdebug "nothing found!\n";
1675 if (defined $skew_warning_vsn) {
1676 print STDERR <<END or die $!;
1678 Warning: relevant archive skew detected.
1679 Archive allegedly contains $skew_warning_vsn
1680 But we were not able to obtain any version from the archive or git.
1686 printdebug "current hash=$hash\n";
1687 if ($lastpush_hash) {
1688 fail "not fast forward on last upload branch!".
1689 " (archive's version left in DGIT_ARCHIVE)"
1690 unless is_fast_fwd($lastpush_hash, $hash);
1692 if (defined $skew_warning_vsn) {
1694 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
1695 my $clogf = ".git/dgit/changelog.tmp";
1696 runcmd shell_cmd "exec >$clogf",
1697 @git, qw(cat-file blob), "$hash:debian/changelog";
1698 my $gotclogp = parsechangelog("-l$clogf");
1699 my $got_vsn = getfield $gotclogp, 'Version';
1700 printdebug "SKEW CHECK GOT $got_vsn\n";
1701 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
1702 print STDERR <<END or die $!;
1704 Warning: archive skew detected. Using the available version:
1705 Archive allegedly contains $skew_warning_vsn
1706 We were able to obtain only $got_vsn
1711 if ($lastpush_hash ne $hash) {
1712 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
1716 dryrun_report @upd_cmd;
1722 sub set_local_git_config ($$) {
1724 runcmd @git, qw(config), $k, $v;
1727 sub setup_mergechangelogs (;$) {
1729 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
1731 my $driver = 'dpkg-mergechangelogs';
1732 my $cb = "merge.$driver";
1733 my $attrs = '.git/info/attributes';
1734 ensuredir '.git/info';
1736 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
1737 if (!open ATTRS, "<", $attrs) {
1738 $!==ENOENT or die "$attrs: $!";
1742 next if m{^debian/changelog\s};
1743 print NATTRS $_, "\n" or die $!;
1745 ATTRS->error and die $!;
1748 print NATTRS "debian/changelog merge=$driver\n" or die $!;
1751 set_local_git_config "$cb.name", 'debian/changelog merge driver';
1752 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
1754 rename "$attrs.new", "$attrs" or die "$attrs: $!";
1757 sub setup_useremail (;$) {
1759 return unless $always || access_cfg_bool(1, 'setup-useremail');
1762 my ($k, $envvar) = @_;
1763 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
1764 return unless defined $v;
1765 set_local_git_config "user.$k", $v;
1768 $setup->('email', 'DEBEMAIL');
1769 $setup->('name', 'DEBFULLNAME');
1772 sub setup_new_tree () {
1773 setup_mergechangelogs();
1779 canonicalise_suite();
1780 badusage "dry run makes no sense with clone" unless act_local();
1781 my $hasgit = check_for_git();
1782 mkdir $dstdir or fail "create \`$dstdir': $!";
1784 runcmd @git, qw(init -q);
1785 my $giturl = access_giturl(1);
1786 if (defined $giturl) {
1787 set_local_git_config "remote.$remotename.fetch", fetchspec();
1788 open H, "> .git/HEAD" or die $!;
1789 print H "ref: ".lref()."\n" or die $!;
1791 runcmd @git, qw(remote add), 'origin', $giturl;
1794 progress "fetching existing git history";
1796 runcmd_ordryrun_local @git, qw(fetch origin);
1798 progress "starting new git history";
1800 fetch_from_archive() or no_such_package;
1801 my $vcsgiturl = $dsc->{'Vcs-Git'};
1802 if (length $vcsgiturl) {
1803 $vcsgiturl =~ s/\s+-b\s+\S+//g;
1804 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
1807 runcmd @git, qw(reset --hard), lrref();
1808 printdone "ready for work in $dstdir";
1812 if (check_for_git()) {
1815 fetch_from_archive() or no_such_package();
1816 printdone "fetched into ".lrref();
1821 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
1823 printdone "fetched to ".lrref()." and merged into HEAD";
1826 sub check_not_dirty () {
1827 foreach my $f (qw(local-options local-patch-header)) {
1828 if (stat_exists "debian/source/$f") {
1829 fail "git tree contains debian/source/$f";
1833 return if $ignoredirty;
1835 my @cmd = (@git, qw(diff --quiet HEAD));
1837 $!=0; $?=-1; system @cmd;
1840 fail "working tree is dirty (does not match HEAD)";
1846 sub commit_admin ($) {
1849 runcmd_ordryrun_local @git, qw(commit -m), $m;
1852 sub commit_quilty_patch () {
1853 my $output = cmdoutput @git, qw(status --porcelain);
1855 foreach my $l (split /\n/, $output) {
1856 next unless $l =~ m/\S/;
1857 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1861 delete $adds{'.pc'}; # if there wasn't one before, don't add it
1863 progress "nothing quilty to commit, ok.";
1866 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
1867 runcmd_ordryrun_local @git, qw(add -f), @adds;
1868 commit_admin "Commit Debian 3.0 (quilt) metadata";
1871 sub get_source_format () {
1873 if (open F, "debian/source/options") {
1877 s/\s+$//; # ignore missing final newline
1879 my ($k, $v) = ($`, $'); #');
1880 $v =~ s/^"(.*)"$/$1/;
1886 F->error and die $!;
1889 die $! unless $!==&ENOENT;
1892 if (!open F, "debian/source/format") {
1893 die $! unless $!==&ENOENT;
1897 F->error and die $!;
1899 return ($_, \%options);
1904 return 0 unless $format eq '3.0 (quilt)';
1905 our $quilt_mode_warned;
1906 if ($quilt_mode eq 'nocheck') {
1907 progress "Not doing any fixup of \`$format' due to".
1908 " ----no-quilt-fixup or --quilt=nocheck"
1909 unless $quilt_mode_warned++;
1912 progress "Format \`$format', need to check/update patch stack"
1913 unless $quilt_mode_warned++;
1917 sub push_parse_changelog ($) {
1920 my $clogp = Dpkg::Control::Hash->new();
1921 $clogp->load($clogpfn) or die;
1923 $package = getfield $clogp, 'Source';
1924 my $cversion = getfield $clogp, 'Version';
1925 my $tag = debiantag($cversion, access_basedistro);
1926 runcmd @git, qw(check-ref-format), $tag;
1928 my $dscfn = dscfn($cversion);
1930 return ($clogp, $cversion, $tag, $dscfn);
1933 sub push_parse_dsc ($$$) {
1934 my ($dscfn,$dscfnwhat, $cversion) = @_;
1935 $dsc = parsecontrol($dscfn,$dscfnwhat);
1936 my $dversion = getfield $dsc, 'Version';
1937 my $dscpackage = getfield $dsc, 'Source';
1938 ($dscpackage eq $package && $dversion eq $cversion) or
1939 fail "$dscfn is for $dscpackage $dversion".
1940 " but debian/changelog is for $package $cversion";
1943 sub push_mktag ($$$$$$$) {
1944 my ($head,$clogp,$tag,
1946 $changesfile,$changesfilewhat,
1949 $dsc->{$ourdscfield[0]} = $head;
1950 $dsc->save("$dscfn.tmp") or die $!;
1952 my $changes = parsecontrol($changesfile,$changesfilewhat);
1953 foreach my $field (qw(Source Distribution Version)) {
1954 $changes->{$field} eq $clogp->{$field} or
1955 fail "changes field $field \`$changes->{$field}'".
1956 " does not match changelog \`$clogp->{$field}'";
1959 my $cversion = getfield $clogp, 'Version';
1960 my $clogsuite = getfield $clogp, 'Distribution';
1962 # We make the git tag by hand because (a) that makes it easier
1963 # to control the "tagger" (b) we can do remote signing
1964 my $authline = clogp_authline $clogp;
1965 my $delibs = join(" ", "",@deliberatelies);
1966 my $declaredistro = access_basedistro();
1967 open TO, '>', $tfn->('.tmp') or die $!;
1968 print TO <<END or die $!;
1974 $package release $cversion for $clogsuite ($csuite) [dgit]
1975 [dgit distro=$declaredistro$delibs]
1977 foreach my $ref (sort keys %previously) {
1978 print TO <<END or die $!;
1979 [dgit previously:$ref=$previously{$ref}]
1985 my $tagobjfn = $tfn->('.tmp');
1987 if (!defined $keyid) {
1988 $keyid = access_cfg('keyid','RETURN-UNDEF');
1990 if (!defined $keyid) {
1991 $keyid = getfield $clogp, 'Maintainer';
1993 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1994 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1995 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1996 push @sign_cmd, $tfn->('.tmp');
1997 runcmd_ordryrun @sign_cmd;
1999 $tagobjfn = $tfn->('.signed.tmp');
2000 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
2001 $tfn->('.tmp'), $tfn->('.tmp.asc');
2008 sub sign_changes ($) {
2009 my ($changesfile) = @_;
2011 my @debsign_cmd = @debsign;
2012 push @debsign_cmd, "-k$keyid" if defined $keyid;
2013 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
2014 push @debsign_cmd, $changesfile;
2015 runcmd_ordryrun @debsign_cmd;
2020 my ($forceflag) = @_;
2021 printdebug "actually entering push\n";
2022 supplementary_message(<<'END');
2023 Push failed, while preparing your push.
2024 You can retry the push, after fixing the problem, if you like.
2028 access_giturl(); # check that success is vaguely likely
2031 my $clogpfn = ".git/dgit/changelog.822.tmp";
2032 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
2034 responder_send_file('parsed-changelog', $clogpfn);
2036 my ($clogp, $cversion, $tag, $dscfn) =
2037 push_parse_changelog("$clogpfn");
2039 my $dscpath = "$buildproductsdir/$dscfn";
2040 stat_exists $dscpath or
2041 fail "looked for .dsc $dscfn, but $!;".
2042 " maybe you forgot to build";
2044 responder_send_file('dsc', $dscpath);
2046 push_parse_dsc($dscpath, $dscfn, $cversion);
2048 my $format = getfield $dsc, 'Format';
2049 printdebug "format $format\n";
2051 my $head = git_rev_parse('HEAD');
2053 if (madformat($format)) {
2054 # user might have not used dgit build, so maybe do this now:
2055 if (quiltmode_splitbrain()) {
2056 my $upstreamversion = $clogp->{Version};
2057 $upstreamversion =~ s/-[^-]*$//;
2059 quilt_make_fake_dsc($upstreamversion);
2060 my ($dgitview, $cachekey) =
2061 quilt_check_splitbrain_cache($head, $upstreamversion);
2063 "--quilt=$quilt_mode but no cached dgit view:
2064 perhaps tree changed since dgit build[-source] ?";
2066 changedir '../../../..';
2067 prep_ud(); # so _only_subdir() works, below
2069 commit_quilty_patch();
2073 die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)' if $split_brain;
2077 progress "checking that $dscfn corresponds to HEAD";
2078 runcmd qw(dpkg-source -x --),
2079 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
2080 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2081 check_for_vendor_patches() if madformat($dsc->{format});
2082 changedir '../../../..';
2083 my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
2084 my @diffcmd = (@git, qw(diff), $diffopt, $tree);
2085 debugcmd "+",@diffcmd;
2087 my $r = system @diffcmd;
2090 fail "$dscfn specifies a different tree to your HEAD commit;".
2091 " perhaps you forgot to build".
2092 ($diffopt eq '--exit-code' ? "" :
2093 " (run with -D to see full diff output)");
2098 if (!$changesfile) {
2099 my $pat = changespat $cversion;
2100 my @cs = glob "$buildproductsdir/$pat";
2101 fail "failed to find unique changes file".
2102 " (looked for $pat in $buildproductsdir);".
2103 " perhaps you need to use dgit -C"
2105 ($changesfile) = @cs;
2107 $changesfile = "$buildproductsdir/$changesfile";
2110 responder_send_file('changes',$changesfile);
2111 responder_send_command("param head $head");
2112 responder_send_command("param csuite $csuite");
2113 responder_send_command("param tagformat $tagformat");
2115 if (deliberately_not_fast_forward) {
2116 git_for_each_ref(lrfetchrefs, sub {
2117 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
2118 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
2119 responder_send_command("previously $rrefname=$objid");
2120 $previously{$rrefname} = $objid;
2124 my $tfn = sub { ".git/dgit/tag$_[0]"; };
2127 supplementary_message(<<'END');
2128 Push failed, while signing the tag.
2129 You can retry the push, after fixing the problem, if you like.
2131 # If we manage to sign but fail to record it anywhere, it's fine.
2132 if ($we_are_responder) {
2133 $tagobjfn = $tfn->('.signed.tmp');
2134 responder_receive_files('signed-tag', $tagobjfn);
2137 push_mktag($head,$clogp,$tag,
2139 $changesfile,$changesfile,
2142 supplementary_message(<<'END');
2143 Push failed, *after* signing the tag.
2144 If you want to try again, you should use a new version number.
2147 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
2148 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
2149 runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
2151 supplementary_message(<<'END');
2152 Push failed, while updating the remote git repository - see messages above.
2153 If you want to try again, you should use a new version number.
2155 if (!check_for_git()) {
2156 create_remote_git_repo();
2158 runcmd_ordryrun @git, qw(push),access_giturl(),
2159 $forceflag."HEAD:".rrref(), $forceflag."refs/tags/$tag";
2160 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
2162 supplementary_message(<<'END');
2163 Push failed, after updating the remote git repository.
2164 If you want to try again, you must use a new version number.
2166 if ($we_are_responder) {
2167 my $dryrunsuffix = act_local() ? "" : ".tmp";
2168 responder_receive_files('signed-dsc-changes',
2169 "$dscpath$dryrunsuffix",
2170 "$changesfile$dryrunsuffix");
2173 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
2175 progress "[new .dsc left in $dscpath.tmp]";
2177 sign_changes $changesfile;
2180 supplementary_message(<<END);
2181 Push failed, while uploading package(s) to the archive server.
2182 You can retry the upload of exactly these same files with dput of:
2184 If that .changes file is broken, you will need to use a new version
2185 number for your next attempt at the upload.
2187 my $host = access_cfg('upload-host','RETURN-UNDEF');
2188 my @hostarg = defined($host) ? ($host,) : ();
2189 runcmd_ordryrun @dput, @hostarg, $changesfile;
2190 printdone "pushed and uploaded $cversion";
2192 supplementary_message('');
2193 responder_send_command("complete");
2200 badusage "-p is not allowed with clone; specify as argument instead"
2201 if defined $package;
2204 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
2205 ($package,$isuite) = @ARGV;
2206 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
2207 ($package,$dstdir) = @ARGV;
2208 } elsif (@ARGV==3) {
2209 ($package,$isuite,$dstdir) = @ARGV;
2211 badusage "incorrect arguments to dgit clone";
2213 $dstdir ||= "$package";
2215 if (stat_exists $dstdir) {
2216 fail "$dstdir already exists";
2220 if ($rmonerror && !$dryrun_level) {
2221 $cwd_remove= getcwd();
2223 return unless defined $cwd_remove;
2224 if (!chdir "$cwd_remove") {
2225 return if $!==&ENOENT;
2226 die "chdir $cwd_remove: $!";
2229 rmtree($dstdir) or die "remove $dstdir: $!\n";
2230 } elsif (!grep { $! == $_ }
2231 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
2233 print STDERR "check whether to remove $dstdir: $!\n";
2239 $cwd_remove = undef;
2242 sub branchsuite () {
2243 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
2244 if ($branch =~ m#$lbranch_re#o) {
2251 sub fetchpullargs () {
2253 if (!defined $package) {
2254 my $sourcep = parsecontrol('debian/control','debian/control');
2255 $package = getfield $sourcep, 'Source';
2258 # $isuite = branchsuite(); # this doesn't work because dak hates canons
2260 my $clogp = parsechangelog();
2261 $isuite = getfield $clogp, 'Distribution';
2263 canonicalise_suite();
2264 progress "fetching from suite $csuite";
2265 } elsif (@ARGV==1) {
2267 canonicalise_suite();
2269 badusage "incorrect arguments to dgit fetch or dgit pull";
2288 badusage "-p is not allowed with dgit push" if defined $package;
2290 my $clogp = parsechangelog();
2291 $package = getfield $clogp, 'Source';
2294 } elsif (@ARGV==1) {
2295 ($specsuite) = (@ARGV);
2297 badusage "incorrect arguments to dgit push";
2299 $isuite = getfield $clogp, 'Distribution';
2301 local ($package) = $existing_package; # this is a hack
2302 canonicalise_suite();
2304 canonicalise_suite();
2306 if (defined $specsuite &&
2307 $specsuite ne $isuite &&
2308 $specsuite ne $csuite) {
2309 fail "dgit push: changelog specifies $isuite ($csuite)".
2310 " but command line specifies $specsuite";
2312 supplementary_message(<<'END');
2313 Push failed, while checking state of the archive.
2314 You can retry the push, after fixing the problem, if you like.
2316 if (check_for_git()) {
2320 if (fetch_from_archive()) {
2321 if (is_fast_fwd(lrref(), 'HEAD')) {
2323 } elsif (deliberately_not_fast_forward) {
2326 fail "dgit push: HEAD is not a descendant".
2327 " of the archive's version.\n".
2328 "dgit: To overwrite its contents,".
2329 " use git merge -s ours ".lrref().".\n".
2330 "dgit: To rewind history, if permitted by the archive,".
2331 " use --deliberately-not-fast-forward";
2335 fail "package appears to be new in this suite;".
2336 " if this is intentional, use --new";
2341 #---------- remote commands' implementation ----------
2343 sub cmd_remote_push_build_host {
2344 my ($nrargs) = shift @ARGV;
2345 my (@rargs) = @ARGV[0..$nrargs-1];
2346 @ARGV = @ARGV[$nrargs..$#ARGV];
2348 my ($dir,$vsnwant) = @rargs;
2349 # vsnwant is a comma-separated list; we report which we have
2350 # chosen in our ready response (so other end can tell if they
2353 $we_are_responder = 1;
2354 $us .= " (build host)";
2358 open PI, "<&STDIN" or die $!;
2359 open STDIN, "/dev/null" or die $!;
2360 open PO, ">&STDOUT" or die $!;
2362 open STDOUT, ">&STDERR" or die $!;
2366 ($protovsn) = grep {
2367 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
2368 } @rpushprotovsn_support;
2370 fail "build host has dgit rpush protocol versions ".
2371 (join ",", @rpushprotovsn_support).
2372 " but invocation host has $vsnwant"
2373 unless defined $protovsn;
2375 responder_send_command("dgit-remote-push-ready $protovsn");
2376 rpush_handle_protovsn_bothends();
2381 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
2382 # ... for compatibility with proto vsn.1 dgit (just so that user gets
2383 # a good error message)
2385 sub rpush_handle_protovsn_bothends () {
2386 if ($protovsn < 4) {
2387 fail "rpush negotiated protocol version $protovsn".
2388 " which supports old tag format only".
2389 " but trying to use new format (".$tagformat_want->[1].")"
2390 if $tagformat_want && $tagformat_want->[0] ne 'old';
2391 $tagformat_want = ['old', "rpush negotiated protocol $protovsn", 0];
2400 my $report = i_child_report();
2401 if (defined $report) {
2402 printdebug "($report)\n";
2403 } elsif ($i_child_pid) {
2404 printdebug "(killing build host child $i_child_pid)\n";
2405 kill 15, $i_child_pid;
2407 if (defined $i_tmp && !defined $initiator_tempdir) {
2409 eval { rmtree $i_tmp; };
2413 END { i_cleanup(); }
2416 my ($base,$selector,@args) = @_;
2417 $selector =~ s/\-/_/g;
2418 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
2425 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
2433 push @rargs, join ",", @rpushprotovsn_support;
2436 push @rdgit, @ropts;
2437 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
2439 my @cmd = (@ssh, $host, shellquote @rdgit);
2442 if (defined $initiator_tempdir) {
2443 rmtree $initiator_tempdir;
2444 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
2445 $i_tmp = $initiator_tempdir;
2449 $i_child_pid = open2(\*RO, \*RI, @cmd);
2451 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
2452 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
2453 $supplementary_message = '' unless $protovsn >= 3;
2454 rpush_handle_protovsn_bothends();
2456 my ($icmd,$iargs) = initiator_expect {
2457 m/^(\S+)(?: (.*))?$/;
2460 i_method "i_resp", $icmd, $iargs;
2464 sub i_resp_progress ($) {
2466 my $msg = protocol_read_bytes \*RO, $rhs;
2470 sub i_resp_supplementary_message ($) {
2472 $supplementary_message = protocol_read_bytes \*RO, $rhs;
2475 sub i_resp_complete {
2476 my $pid = $i_child_pid;
2477 $i_child_pid = undef; # prevents killing some other process with same pid
2478 printdebug "waiting for build host child $pid...\n";
2479 my $got = waitpid $pid, 0;
2480 die $! unless $got == $pid;
2481 die "build host child failed $?" if $?;
2484 printdebug "all done\n";
2488 sub i_resp_file ($) {
2490 my $localname = i_method "i_localname", $keyword;
2491 my $localpath = "$i_tmp/$localname";
2492 stat_exists $localpath and
2493 badproto \*RO, "file $keyword ($localpath) twice";
2494 protocol_receive_file \*RO, $localpath;
2495 i_method "i_file", $keyword;
2500 sub i_resp_param ($) {
2501 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
2505 sub i_resp_previously ($) {
2506 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
2507 or badproto \*RO, "bad previously spec";
2508 my $r = system qw(git check-ref-format), $1;
2509 die "bad previously ref spec ($r)" if $r;
2510 $previously{$1} = $2;
2515 sub i_resp_want ($) {
2517 die "$keyword ?" if $i_wanted{$keyword}++;
2518 my @localpaths = i_method "i_want", $keyword;
2519 printdebug "[[ $keyword @localpaths\n";
2520 foreach my $localpath (@localpaths) {
2521 protocol_send_file \*RI, $localpath;
2523 print RI "files-end\n" or die $!;
2526 our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn);
2528 sub i_localname_parsed_changelog {
2529 return "remote-changelog.822";
2531 sub i_file_parsed_changelog {
2532 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
2533 push_parse_changelog "$i_tmp/remote-changelog.822";
2534 die if $i_dscfn =~ m#/|^\W#;
2537 sub i_localname_dsc {
2538 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2543 sub i_localname_changes {
2544 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2545 $i_changesfn = $i_dscfn;
2546 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
2547 return $i_changesfn;
2549 sub i_file_changes { }
2551 sub i_want_signed_tag {
2552 printdebug Dumper(\%i_param, $i_dscfn);
2553 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
2554 && defined $i_param{'csuite'}
2555 or badproto \*RO, "premature desire for signed-tag";
2556 my $head = $i_param{'head'};
2557 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
2560 if ($protovsn >= 4) {
2561 my $p = $i_param{'tagformat'} // '<undef>';
2563 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
2566 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
2568 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
2571 push_mktag $head, $i_clogp, $i_tag,
2573 $i_changesfn, 'remote changes',
2574 sub { "tag$_[0]"; };
2579 sub i_want_signed_dsc_changes {
2580 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
2581 sign_changes $i_changesfn;
2582 return ($i_dscfn, $i_changesfn);
2585 #---------- building etc. ----------
2591 #----- `3.0 (quilt)' handling -----
2593 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
2595 sub quiltify_dpkg_commit ($$$;$) {
2596 my ($patchname,$author,$msg, $xinfo) = @_;
2600 my $descfn = ".git/dgit/quilt-description.tmp";
2601 open O, '>', $descfn or die "$descfn: $!";
2604 $msg =~ s/^\s+$/ ./mg;
2605 print O <<END or die $!;
2615 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
2616 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
2617 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
2618 runcmd @dpkgsource, qw(--commit .), $patchname;
2622 sub quiltify_trees_differ ($$;$$) {
2623 my ($x,$y,$finegrained,$ignorenamesr) = @_;
2624 # returns true iff the two tree objects differ other than in debian/
2625 # with $finegrained,
2626 # returns bitmask 01 - differ in upstream files except .gitignore
2627 # 02 - differ in .gitignore
2628 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
2629 # is set for each modified .gitignore filename $fn
2631 my @cmd = (@git, qw(diff-tree --name-only -z));
2632 push @cmd, qw(-r) if $finegrained;
2634 my $diffs= cmdoutput @cmd;
2636 foreach my $f (split /\0/, $diffs) {
2637 next if $f =~ m#^debian(?:/.*)?$#s;
2638 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
2639 $r |= $isignore ? 02 : 01;
2640 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
2642 printdebug "quiltify_trees_differ $x $y => $r\n";
2646 sub quiltify_tree_sentinelfiles ($) {
2647 # lists the `sentinel' files present in the tree
2649 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
2650 qw(-- debian/rules debian/control);
2655 sub quiltify_splitbrain_needed () {
2656 if (!$split_brain) {
2657 progress "dgit view: changes are required...";
2658 runcmd @git, qw(checkout -q -b dgit-view);
2663 sub quiltify_splitbrain ($$$$$$) {
2664 my ($clogp, $unapplied, $headref, $diffbits,
2665 $editedignores, $cachekey) = @_;
2666 if ($quilt_mode !~ m/gbp|dpm/) {
2667 # treat .gitignore just like any other upstream file
2668 $diffbits = { %$diffbits };
2669 $_ = !!$_ foreach values %$diffbits;
2671 # We would like any commits we generate to be reproducible
2672 my @authline = clogp_authline($clogp);
2673 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2674 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2675 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2677 if ($quilt_mode =~ m/gbp|unapplied/ &&
2678 ($diffbits->{H2O} & 01)) {
2680 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
2681 " but git tree differs from orig in upstream files.";
2682 if (!stat_exists "debian/patches") {
2684 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
2688 if ($quilt_mode =~ m/gbp|unapplied/ &&
2689 ($diffbits->{O2A} & 01)) { # some patches
2690 quiltify_splitbrain_needed();
2691 progress "dgit view: creating patches-applied version using gbp pq";
2692 runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
2693 # gbp pq import creates a fresh branch; push back to dgit-view
2694 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
2695 runcmd @git, qw(checkout -q dgit-view);
2697 if (($diffbits->{H2O} & 02) && # user has modified .gitignore
2698 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
2699 quiltify_splitbrain_needed();
2700 progress "dgit view: creating patch to represent .gitignore changes";
2701 ensuredir "debian/patches";
2702 my $gipatch = "debian/patches/auto-gitignore";
2703 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
2704 stat GIPATCH or die "$gipatch: $!";
2705 fail "$gipatch already exists; but want to create it".
2706 " to record .gitignore changes" if (stat _)[7];
2707 print GIPATCH <<END or die "$gipatch: $!";
2708 Subject: Update .gitignore from Debian packaging branch
2710 The Debian packaging git branch contains these updates to the upstream
2711 .gitignore file(s). This patch is autogenerated, to provide these
2712 updates to users of the official Debian archive view of the package.
2714 [dgit version $our_version]
2717 close GIPATCH or die "$gipatch: $!";
2718 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
2719 $unapplied, $headref, "--", sort keys %$editedignores;
2720 open SERIES, "+>>", "debian/patches/series" or die $!;
2721 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
2723 defined read SERIES, $newline, 1 or die $!;
2724 print SERIES "\n" or die $! unless $newline eq "\n";
2725 print SERIES "auto-gitignore\n" or die $!;
2726 close SERIES or die $!;
2727 runcmd @git, qw(add -- debian/patches/series), $gipatch;
2728 commit_admin "Commit patch to update .gitignore";
2731 my $dgitview = git_rev_parse 'refs/heads/dgit-view';
2733 changedir '../../../..';
2734 ensuredir ".git/logs/refs/dgit-intern";
2735 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
2737 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
2740 progress "dgit view: created (commit id $dgitview)";
2742 changedir '.git/dgit/unpack/work';
2745 sub quiltify ($$$$) {
2746 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
2748 # Quilt patchification algorithm
2750 # We search backwards through the history of the main tree's HEAD
2751 # (T) looking for a start commit S whose tree object is identical
2752 # to to the patch tip tree (ie the tree corresponding to the
2753 # current dpkg-committed patch series). For these purposes
2754 # `identical' disregards anything in debian/ - this wrinkle is
2755 # necessary because dpkg-source treates debian/ specially.
2757 # We can only traverse edges where at most one of the ancestors'
2758 # trees differs (in changes outside in debian/). And we cannot
2759 # handle edges which change .pc/ or debian/patches. To avoid
2760 # going down a rathole we avoid traversing edges which introduce
2761 # debian/rules or debian/control. And we set a limit on the
2762 # number of edges we are willing to look at.
2764 # If we succeed, we walk forwards again. For each traversed edge
2765 # PC (with P parent, C child) (starting with P=S and ending with
2766 # C=T) to we do this:
2768 # - dpkg-source --commit with a patch name and message derived from C
2769 # After traversing PT, we git commit the changes which
2770 # should be contained within debian/patches.
2772 # The search for the path S..T is breadth-first. We maintain a
2773 # todo list containing search nodes. A search node identifies a
2774 # commit, and looks something like this:
2776 # Commit => $git_commit_id,
2777 # Child => $c, # or undef if P=T
2778 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
2779 # Nontrivial => true iff $p..$c has relevant changes
2786 my %considered; # saves being exponential on some weird graphs
2788 my $t_sentinels = quiltify_tree_sentinelfiles $target;
2791 my ($search,$whynot) = @_;
2792 printdebug " search NOT $search->{Commit} $whynot\n";
2793 $search->{Whynot} = $whynot;
2794 push @nots, $search;
2795 no warnings qw(exiting);
2804 my $c = shift @todo;
2805 next if $considered{$c->{Commit}}++;
2807 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
2809 printdebug "quiltify investigate $c->{Commit}\n";
2812 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
2813 printdebug " search finished hooray!\n";
2818 if ($quilt_mode eq 'nofix') {
2819 fail "quilt fixup required but quilt mode is \`nofix'\n".
2820 "HEAD commit $c->{Commit} differs from tree implied by ".
2821 " debian/patches (tree object $oldtiptree)";
2823 if ($quilt_mode eq 'smash') {
2824 printdebug " search quitting smash\n";
2828 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
2829 $not->($c, "has $c_sentinels not $t_sentinels")
2830 if $c_sentinels ne $t_sentinels;
2832 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
2833 $commitdata =~ m/\n\n/;
2835 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
2836 @parents = map { { Commit => $_, Child => $c } } @parents;
2838 $not->($c, "root commit") if !@parents;
2840 foreach my $p (@parents) {
2841 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
2843 my $ndiffers = grep { $_->{Nontrivial} } @parents;
2844 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
2846 foreach my $p (@parents) {
2847 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
2849 my @cmd= (@git, qw(diff-tree -r --name-only),
2850 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
2851 my $patchstackchange = cmdoutput @cmd;
2852 if (length $patchstackchange) {
2853 $patchstackchange =~ s/\n/,/g;
2854 $not->($p, "changed $patchstackchange");
2857 printdebug " search queue P=$p->{Commit} ",
2858 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
2864 printdebug "quiltify want to smash\n";
2867 my $x = $_[0]{Commit};
2868 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
2871 my $reportnot = sub {
2873 my $s = $abbrev->($notp);
2874 my $c = $notp->{Child};
2875 $s .= "..".$abbrev->($c) if $c;
2876 $s .= ": ".$notp->{Whynot};
2879 if ($quilt_mode eq 'linear') {
2880 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
2881 foreach my $notp (@nots) {
2882 print STDERR "$us: ", $reportnot->($notp), "\n";
2884 print STDERR "$us: $_\n" foreach @$failsuggestion;
2885 fail "quilt fixup naive history linearisation failed.\n".
2886 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
2887 } elsif ($quilt_mode eq 'smash') {
2888 } elsif ($quilt_mode eq 'auto') {
2889 progress "quilt fixup cannot be linear, smashing...";
2891 die "$quilt_mode ?";
2894 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
2895 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
2897 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
2899 quiltify_dpkg_commit "auto-$version-$target-$time",
2900 (getfield $clogp, 'Maintainer'),
2901 "Automatically generated patch ($clogp->{Version})\n".
2902 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
2906 progress "quiltify linearisation planning successful, executing...";
2908 for (my $p = $sref_S;
2909 my $c = $p->{Child};
2911 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
2912 next unless $p->{Nontrivial};
2914 my $cc = $c->{Commit};
2916 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
2917 $commitdata =~ m/\n\n/ or die "$c ?";
2920 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
2923 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
2926 my $patchname = $title;
2927 $patchname =~ s/[.:]$//;
2928 $patchname =~ y/ A-Z/-a-z/;
2929 $patchname =~ y/-a-z0-9_.+=~//cd;
2930 $patchname =~ s/^\W/x-$&/;
2931 $patchname = substr($patchname,0,40);
2934 stat "debian/patches/$patchname$index";
2936 $!==ENOENT or die "$patchname$index $!";
2938 runcmd @git, qw(checkout -q), $cc;
2940 # We use the tip's changelog so that dpkg-source doesn't
2941 # produce complaining messages from dpkg-parsechangelog. None
2942 # of the information dpkg-source gets from the changelog is
2943 # actually relevant - it gets put into the original message
2944 # which dpkg-source provides our stunt editor, and then
2946 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
2948 quiltify_dpkg_commit "$patchname$index", $author, $msg,
2949 "X-Dgit-Generated: $clogp->{Version} $cc\n";
2951 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
2954 runcmd @git, qw(checkout -q master);
2957 sub build_maybe_quilt_fixup () {
2958 my ($format,$fopts) = get_source_format;
2959 return unless madformat $format;
2962 check_for_vendor_patches();
2964 my $clogp = parsechangelog();
2965 my $headref = git_rev_parse('HEAD');
2970 my $upstreamversion=$version;
2971 $upstreamversion =~ s/-[^-]*$//;
2973 if ($fopts->{'single-debian-patch'}) {
2974 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
2976 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
2979 die 'bug' if $split_brain && !$need_split_build_invocation;
2981 changedir '../../../..';
2982 runcmd_ordryrun_local
2983 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
2986 sub quilt_fixup_mkwork ($) {
2989 mkdir "work" or die $!;
2991 mktree_in_ud_here();
2992 runcmd @git, qw(reset -q --hard), $headref;
2995 sub quilt_fixup_linkorigs ($$) {
2996 my ($upstreamversion, $fn) = @_;
2997 # calls $fn->($leafname);
2999 foreach my $f (<../../../../*>) { #/){
3000 my $b=$f; $b =~ s{.*/}{};
3002 local ($debuglevel) = $debuglevel-1;
3003 printdebug "QF linkorigs $b, $f ?\n";
3005 next unless is_orig_file $b, srcfn $upstreamversion,'';
3006 printdebug "QF linkorigs $b, $f Y\n";
3007 link_ltarget $f, $b or die "$b $!";
3012 sub quilt_fixup_delete_pc () {
3013 runcmd @git, qw(rm -rqf .pc);
3014 commit_admin "Commit removal of .pc (quilt series tracking data)";
3017 sub quilt_fixup_singlepatch ($$$) {
3018 my ($clogp, $headref, $upstreamversion) = @_;
3020 progress "starting quiltify (single-debian-patch)";
3022 # dpkg-source --commit generates new patches even if
3023 # single-debian-patch is in debian/source/options. In order to
3024 # get it to generate debian/patches/debian-changes, it is
3025 # necessary to build the source package.
3027 quilt_fixup_linkorigs($upstreamversion, sub { });
3028 quilt_fixup_mkwork($headref);
3030 rmtree("debian/patches");
3032 runcmd @dpkgsource, qw(-b .);
3034 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
3035 rename srcfn("$upstreamversion", "/debian/patches"),
3036 "work/debian/patches";
3039 commit_quilty_patch();
3042 sub quilt_make_fake_dsc ($) {
3043 my ($upstreamversion) = @_;
3045 my $fakeversion="$upstreamversion-~~DGITFAKE";
3047 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
3048 print $fakedsc <<END or die $!;
3051 Version: $fakeversion
3055 my $dscaddfile=sub {
3058 my $md = new Digest::MD5;
3060 my $fh = new IO::File $b, '<' or die "$b $!";
3065 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
3068 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
3070 my @files=qw(debian/source/format debian/rules
3071 debian/control debian/changelog);
3072 foreach my $maybe (qw(debian/patches debian/source/options
3073 debian/tests/control)) {
3074 next unless stat_exists "../../../$maybe";
3075 push @files, $maybe;
3078 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
3079 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
3081 $dscaddfile->($debtar);
3082 close $fakedsc or die $!;
3085 sub quilt_check_splitbrain_cache ($$) {
3086 my ($headref, $upstreamversion) = @_;
3087 # Called only if we are in (potentially) split brain mode.
3089 # Computes the cache key and looks in the cache.
3090 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
3092 my $splitbrain_cachekey;
3095 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
3096 # we look in the reflog of dgit-intern/quilt-cache
3097 # we look for an entry whose message is the key for the cache lookup
3098 my @cachekey = (qw(dgit), $our_version);
3099 push @cachekey, $upstreamversion;
3100 push @cachekey, $quilt_mode;
3101 push @cachekey, $headref;
3103 push @cachekey, hashfile('fake.dsc');
3105 my $srcshash = Digest::SHA->new(256);
3106 my %sfs = ( %INC, '$0(dgit)' => $0 );
3107 foreach my $sfk (sort keys %sfs) {
3108 next unless m/^\$0\b/ || m{^Debian/Dgit\b};
3109 $srcshash->add($sfk," ");
3110 $srcshash->add(hashfile($sfs{$sfk}));
3111 $srcshash->add("\n");
3113 push @cachekey, $srcshash->hexdigest();
3114 $splitbrain_cachekey = "@cachekey";
3116 my @cmd = (@git, qw(reflog), '--pretty=format:%H %gs',
3118 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
3119 debugcmd "|(probably)",@cmd;
3120 my $child = open GC, "-|"; defined $child or die $!;
3122 chdir '../../..' or die $!;
3123 if (!stat ".git/logs/refs/$splitbraincache") {
3124 $! == ENOENT or die $!;
3125 printdebug ">(no reflog)\n";
3132 printdebug ">| ", $_, "\n" if $debuglevel > 1;
3133 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
3136 quilt_fixup_mkwork($headref);
3137 if ($cachehit ne $headref) {
3138 progress "dgit view: found cached (commit id $cachehit)";
3139 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
3141 return ($cachehit, $splitbrain_cachekey);
3143 progress "dgit view: found cached, no changes required";
3144 return ($headref, $splitbrain_cachekey);
3146 die $! if GC->error;
3147 failedcmd unless close GC;
3149 printdebug "splitbrain cache miss\n";
3150 return (undef, $splitbrain_cachekey);
3153 sub quilt_fixup_multipatch ($$$) {
3154 my ($clogp, $headref, $upstreamversion) = @_;
3156 progress "examining quilt state (multiple patches, $quilt_mode mode)";
3159 # - honour any existing .pc in case it has any strangeness
3160 # - determine the git commit corresponding to the tip of
3161 # the patch stack (if there is one)
3162 # - if there is such a git commit, convert each subsequent
3163 # git commit into a quilt patch with dpkg-source --commit
3164 # - otherwise convert all the differences in the tree into
3165 # a single git commit
3169 # Our git tree doesn't necessarily contain .pc. (Some versions of
3170 # dgit would include the .pc in the git tree.) If there isn't
3171 # one, we need to generate one by unpacking the patches that we
3174 # We first look for a .pc in the git tree. If there is one, we
3175 # will use it. (This is not the normal case.)
3177 # Otherwise need to regenerate .pc so that dpkg-source --commit
3178 # can work. We do this as follows:
3179 # 1. Collect all relevant .orig from parent directory
3180 # 2. Generate a debian.tar.gz out of
3181 # debian/{patches,rules,source/format,source/options}
3182 # 3. Generate a fake .dsc containing just these fields:
3183 # Format Source Version Files
3184 # 4. Extract the fake .dsc
3185 # Now the fake .dsc has a .pc directory.
3186 # (In fact we do this in every case, because in future we will
3187 # want to search for a good base commit for generating patches.)
3189 # Then we can actually do the dpkg-source --commit
3190 # 1. Make a new working tree with the same object
3191 # store as our main tree and check out the main
3193 # 2. Copy .pc from the fake's extraction, if necessary
3194 # 3. Run dpkg-source --commit
3195 # 4. If the result has changes to debian/, then
3196 # - git-add them them
3197 # - git-add .pc if we had a .pc in-tree
3199 # 5. If we had a .pc in-tree, delete it, and git-commit
3200 # 6. Back in the main tree, fast forward to the new HEAD
3202 # Another situation we may have to cope with is gbp-style
3203 # patches-unapplied trees.
3205 # We would want to detect these, so we know to escape into
3206 # quilt_fixup_gbp. However, this is in general not possible.
3207 # Consider a package with a one patch which the dgit user reverts
3208 # (with git-revert or the moral equivalent).
3210 # That is indistinguishable in contents from a patches-unapplied
3211 # tree. And looking at the history to distinguish them is not
3212 # useful because the user might have made a confusing-looking git
3213 # history structure (which ought to produce an error if dgit can't
3214 # cope, not a silent reintroduction of an unwanted patch).
3216 # So gbp users will have to pass an option. But we can usually
3217 # detect their failure to do so: if the tree is not a clean
3218 # patches-applied tree, quilt linearisation fails, but the tree
3219 # _is_ a clean patches-unapplied tree, we can suggest that maybe
3220 # they want --quilt=unapplied.
3222 # To help detect this, when we are extracting the fake dsc, we
3223 # first extract it with --skip-patches, and then apply the patches
3224 # afterwards with dpkg-source --before-build. That lets us save a
3225 # tree object corresponding to .origs.
3227 my $splitbrain_cachekey;
3229 quilt_make_fake_dsc($upstreamversion);
3231 if (quiltmode_splitbrain()) {
3233 ($cachehit, $splitbrain_cachekey) =
3234 quilt_check_splitbrain_cache($headref, $upstreamversion);
3235 return if $cachehit;
3239 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
3241 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
3242 rename $fakexdir, "fake" or die "$fakexdir $!";
3246 remove_stray_gits();
3247 mktree_in_ud_here();
3251 runcmd @git, qw(add -Af .);
3252 my $unapplied=git_write_tree();
3253 printdebug "fake orig tree object $unapplied\n";
3258 'exec dpkg-source --before-build . >/dev/null';
3262 quilt_fixup_mkwork($headref);
3265 if (stat_exists ".pc") {
3267 progress "Tree already contains .pc - will use it then delete it.";
3270 rename '../fake/.pc','.pc' or die $!;
3273 changedir '../fake';
3275 runcmd @git, qw(add -Af .);
3276 my $oldtiptree=git_write_tree();
3277 printdebug "fake o+d/p tree object $unapplied\n";
3278 changedir '../work';
3281 # We calculate some guesswork now about what kind of tree this might
3282 # be. This is mostly for error reporting.
3287 # O = orig, without patches applied
3288 # A = "applied", ie orig with H's debian/patches applied
3289 H2O => quiltify_trees_differ($headref, $unapplied, 1,\%editedignores),
3290 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
3291 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
3295 foreach my $b (qw(01 02)) {
3296 foreach my $v (qw(H2O O2A H2A)) {
3297 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
3300 printdebug "differences \@dl @dl.\n";
3303 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
3304 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
3305 $dl[0], $dl[1], $dl[3], $dl[4],
3309 if (!($diffbits->{H2O} & $diffbits->{O2A})) {
3310 push @failsuggestion, "This might be a patches-unapplied branch.";
3311 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
3312 push @failsuggestion, "This might be a patches-applied branch.";
3314 push @failsuggestion, "Maybe you need to specify one of".
3315 " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
3317 if (quiltmode_splitbrain()) {
3318 quiltify_splitbrain($clogp, $unapplied, $headref,
3319 $diffbits, \%editedignores,
3320 $splitbrain_cachekey);
3324 progress "starting quiltify (multiple patches, $quilt_mode mode)";
3325 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
3327 if (!open P, '>>', ".pc/applied-patches") {
3328 $!==&ENOENT or die $!;
3333 commit_quilty_patch();
3335 if ($mustdeletepc) {
3336 quilt_fixup_delete_pc();
3340 sub quilt_fixup_editor () {
3341 my $descfn = $ENV{$fakeeditorenv};
3342 my $editing = $ARGV[$#ARGV];
3343 open I1, '<', $descfn or die "$descfn: $!";
3344 open I2, '<', $editing or die "$editing: $!";
3345 unlink $editing or die "$editing: $!";
3346 open O, '>', $editing or die "$editing: $!";
3347 while (<I1>) { print O or die $!; } I1->error and die $!;
3350 $copying ||= m/^\-\-\- /;
3351 next unless $copying;
3354 I2->error and die $!;
3359 sub maybe_apply_patches_dirtily () {
3360 return unless $quilt_mode =~ m/gbp|unapplied/;
3361 print STDERR <<END or die $!;
3363 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
3364 dgit: Have to apply the patches - making the tree dirty.
3365 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
3368 $patches_applied_dirtily = 01;
3369 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
3370 runcmd qw(dpkg-source --before-build .);
3373 sub maybe_unapply_patches_again () {
3374 progress "dgit: Unapplying patches again to tidy up the tree."
3375 if $patches_applied_dirtily;
3376 runcmd qw(dpkg-source --after-build .)
3377 if $patches_applied_dirtily & 01;
3379 if $patches_applied_dirtily & 02;
3382 #----- other building -----
3384 our $clean_using_builder;
3385 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
3386 # clean the tree before building (perhaps invoked indirectly by
3387 # whatever we are using to run the build), rather than separately
3388 # and explicitly by us.
3391 return if $clean_using_builder;
3392 if ($cleanmode eq 'dpkg-source') {
3393 maybe_apply_patches_dirtily();
3394 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
3395 } elsif ($cleanmode eq 'dpkg-source-d') {
3396 maybe_apply_patches_dirtily();
3397 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
3398 } elsif ($cleanmode eq 'git') {
3399 runcmd_ordryrun_local @git, qw(clean -xdf);
3400 } elsif ($cleanmode eq 'git-ff') {
3401 runcmd_ordryrun_local @git, qw(clean -xdff);
3402 } elsif ($cleanmode eq 'check') {
3403 my $leftovers = cmdoutput @git, qw(clean -xdn);
3404 if (length $leftovers) {
3405 print STDERR $leftovers, "\n" or die $!;
3406 fail "tree contains uncommitted files and --clean=check specified";
3408 } elsif ($cleanmode eq 'none') {
3415 badusage "clean takes no additional arguments" if @ARGV;
3418 maybe_unapply_patches_again();
3423 badusage "-p is not allowed when building" if defined $package;
3426 my $clogp = parsechangelog();
3427 $isuite = getfield $clogp, 'Distribution';
3428 $package = getfield $clogp, 'Source';
3429 $version = getfield $clogp, 'Version';
3430 build_maybe_quilt_fixup();
3432 my $pat = changespat $version;
3433 foreach my $f (glob "$buildproductsdir/$pat") {
3435 unlink $f or fail "remove old changes file $f: $!";
3437 progress "would remove $f";
3443 sub changesopts_initial () {
3444 my @opts =@changesopts[1..$#changesopts];
3447 sub changesopts_version () {
3448 if (!defined $changes_since_version) {
3449 my @vsns = archive_query('archive_query');
3450 my @quirk = access_quirk();
3451 if ($quirk[0] eq 'backports') {
3452 local $isuite = $quirk[2];
3454 canonicalise_suite();
3455 push @vsns, archive_query('archive_query');
3458 @vsns = map { $_->[0] } @vsns;
3459 @vsns = sort { -version_compare($a, $b) } @vsns;
3460 $changes_since_version = $vsns[0];
3461 progress "changelog will contain changes since $vsns[0]";
3463 $changes_since_version = '_';
3464 progress "package seems new, not specifying -v<version>";
3467 if ($changes_since_version ne '_') {
3468 return ("-v$changes_since_version");
3474 sub changesopts () {
3475 return (changesopts_initial(), changesopts_version());
3478 sub massage_dbp_args ($;$) {
3479 my ($cmd,$xargs) = @_;
3482 # - if we're going to split the source build out so we can
3483 # do strange things to it, massage the arguments to dpkg-buildpackage
3484 # so that the main build doessn't build source (or add an argument
3485 # to stop it building source by default).
3487 # - add -nc to stop dpkg-source cleaning the source tree,
3488 # unless we're not doing a split build and want dpkg-source
3489 # as cleanmode, in which case we can do nothing
3492 # 0 - source will NOT need to be built separately by caller
3493 # +1 - source will need to be built separately by caller
3494 # +2 - source will need to be built separately by caller AND
3495 # dpkg-buildpackage should not in fact be run at all!
3496 debugcmd '#massaging#', @$cmd if $debuglevel>1;
3497 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
3498 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
3499 $clean_using_builder = 1;
3502 # -nc has the side effect of specifying -b if nothing else specified
3503 # and some combinations of -S, -b, et al, are errors, rather than
3504 # later simply overriding earlie. So we need to:
3505 # - search the command line for these options
3506 # - pick the last one
3507 # - perhaps add our own as a default
3508 # - perhaps adjust it to the corresponding non-source-building version
3510 foreach my $l ($cmd, $xargs) {
3512 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
3515 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
3517 if ($need_split_build_invocation) {
3518 printdebug "massage split $dmode.\n";
3519 $r = $dmode =~ m/[S]/ ? +2 :
3520 $dmode =~ y/gGF/ABb/ ? +1 :
3521 $dmode =~ m/[ABb]/ ? 0 :
3524 printdebug "massage done $r $dmode.\n";
3526 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
3531 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
3532 my $wantsrc = massage_dbp_args \@dbp;
3539 push @dbp, changesopts_version();
3540 maybe_apply_patches_dirtily();
3541 runcmd_ordryrun_local @dbp;
3543 maybe_unapply_patches_again();
3544 printdone "build successful\n";
3548 my @dbp = @dpkgbuildpackage;
3550 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
3553 if (length executable_on_path('git-buildpackage')) {
3554 @cmd = qw(git-buildpackage);
3556 @cmd = qw(gbp buildpackage);
3558 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
3563 if (!$clean_using_builder) {
3564 push @cmd, '--git-cleaner=true';
3569 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
3570 canonicalise_suite();
3571 push @cmd, "--git-debian-branch=".lbranch();
3573 push @cmd, changesopts();
3574 maybe_apply_patches_dirtily();
3575 runcmd_ordryrun_local @cmd, @ARGV;
3577 maybe_unapply_patches_again();
3578 printdone "build successful\n";
3580 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
3583 my $our_cleanmode = $cleanmode;
3584 if ($need_split_build_invocation) {
3585 # Pretend that clean is being done some other way. This
3586 # forces us not to try to use dpkg-buildpackage to clean and
3587 # build source all in one go; and instead we run dpkg-source
3588 # (and build_prep() will do the clean since $clean_using_builder
3590 $our_cleanmode = 'ELSEWHERE';
3592 if ($our_cleanmode =~ m/^dpkg-source/) {
3593 # dpkg-source invocation (below) will clean, so build_prep shouldn't
3594 $clean_using_builder = 1;
3597 $sourcechanges = changespat $version,'source';
3599 unlink "../$sourcechanges" or $!==ENOENT
3600 or fail "remove $sourcechanges: $!";
3602 $dscfn = dscfn($version);
3603 if ($our_cleanmode eq 'dpkg-source') {
3604 maybe_apply_patches_dirtily();
3605 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
3607 } elsif ($our_cleanmode eq 'dpkg-source-d') {
3608 maybe_apply_patches_dirtily();
3609 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
3612 my @cmd = (@dpkgsource, qw(-b --));
3615 runcmd_ordryrun_local @cmd, "work";
3616 my @udfiles = <${package}_*>;
3617 changedir "../../..";
3618 foreach my $f (@udfiles) {
3619 printdebug "source copy, found $f\n";
3622 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
3623 $f eq srcfn($version, $&));
3624 printdebug "source copy, found $f - renaming\n";
3625 rename "$ud/$f", "../$f" or $!==ENOENT
3626 or fail "put in place new source file ($f): $!";
3629 my $pwd = must_getcwd();
3630 my $leafdir = basename $pwd;
3632 runcmd_ordryrun_local @cmd, $leafdir;
3635 runcmd_ordryrun_local qw(sh -ec),
3636 'exec >$1; shift; exec "$@"','x',
3637 "../$sourcechanges",
3638 @dpkggenchanges, qw(-S), changesopts();
3642 sub cmd_build_source {
3643 badusage "build-source takes no additional arguments" if @ARGV;
3645 maybe_unapply_patches_again();
3646 printdone "source built, results in $dscfn and $sourcechanges";
3651 my $pat = changespat $version;
3653 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
3654 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
3655 fail "changes files other than source matching $pat".
3656 " already present (@unwanted);".
3657 " building would result in ambiguity about the intended results"
3662 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
3663 stat_exists $sourcechanges
3664 or fail "$sourcechanges (in parent directory): $!";
3666 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
3667 my @changesfiles = glob $pat;
3668 @changesfiles = sort {
3669 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
3672 fail "wrong number of different changes files (@changesfiles)"
3673 unless @changesfiles==2;
3674 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
3675 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
3676 fail "$l found in binaries changes file $binchanges"
3679 runcmd_ordryrun_local @mergechanges, @changesfiles;
3680 my $multichanges = changespat $version,'multi';
3682 stat_exists $multichanges or fail "$multichanges: $!";
3683 foreach my $cf (glob $pat) {
3684 next if $cf eq $multichanges;
3685 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
3688 maybe_unapply_patches_again();
3689 printdone "build successful, results in $multichanges\n" or die $!;
3692 sub cmd_quilt_fixup {
3693 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
3694 my $clogp = parsechangelog();
3695 $version = getfield $clogp, 'Version';
3696 $package = getfield $clogp, 'Source';
3699 build_maybe_quilt_fixup();
3702 sub cmd_archive_api_query {
3703 badusage "need only 1 subpath argument" unless @ARGV==1;
3704 my ($subpath) = @ARGV;
3705 my @cmd = archive_api_query_cmd($subpath);
3707 exec @cmd or fail "exec curl: $!\n";
3710 sub cmd_clone_dgit_repos_server {
3711 badusage "need destination argument" unless @ARGV==1;
3712 my ($destdir) = @ARGV;
3713 $package = '_dgit-repos-server';
3714 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
3716 exec @cmd or fail "exec git clone: $!\n";
3719 sub cmd_setup_mergechangelogs {
3720 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3721 setup_mergechangelogs(1);
3724 sub cmd_setup_useremail {
3725 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3729 sub cmd_setup_new_tree {
3730 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
3734 #---------- argument parsing and main program ----------
3737 print "dgit version $our_version\n" or die $!;
3741 our (%valopts_long, %valopts_short);
3744 sub defvalopt ($$$$) {
3745 my ($long,$short,$val_re,$how) = @_;
3746 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
3747 $valopts_long{$long} = $oi;
3748 $valopts_short{$short} = $oi;
3749 # $how subref should:
3750 # do whatever assignemnt or thing it likes with $_[0]
3751 # if the option should not be passed on to remote, @rvalopts=()
3752 # or $how can be a scalar ref, meaning simply assign the value
3755 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
3756 defvalopt '--distro', '-d', '.+', \$idistro;
3757 defvalopt '', '-k', '.+', \$keyid;
3758 defvalopt '--existing-package','', '.*', \$existing_package;
3759 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
3760 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
3761 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
3763 defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
3765 defvalopt '', '-C', '.+', sub {
3766 ($changesfile) = (@_);
3767 if ($changesfile =~ s#^(.*)/##) {
3768 $buildproductsdir = $1;
3772 defvalopt '--initiator-tempdir','','.*', sub {
3773 ($initiator_tempdir) = (@_);
3774 $initiator_tempdir =~ m#^/# or
3775 badusage "--initiator-tempdir must be used specify an".
3776 " absolute, not relative, directory."
3782 if (defined $ENV{'DGIT_SSH'}) {
3783 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
3784 } elsif (defined $ENV{'GIT_SSH'}) {
3785 @ssh = ($ENV{'GIT_SSH'});
3793 if (!defined $val) {
3794 badusage "$what needs a value" unless @ARGV;
3796 push @rvalopts, $val;
3798 badusage "bad value \`$val' for $what" unless
3799 $val =~ m/^$oi->{Re}$(?!\n)/s;
3800 my $how = $oi->{How};
3801 if (ref($how) eq 'SCALAR') {
3806 push @ropts, @rvalopts;
3810 last unless $ARGV[0] =~ m/^-/;
3814 if (m/^--dry-run$/) {
3817 } elsif (m/^--damp-run$/) {
3820 } elsif (m/^--no-sign$/) {
3823 } elsif (m/^--help$/) {
3825 } elsif (m/^--version$/) {
3827 } elsif (m/^--new$/) {
3830 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
3831 ($om = $opts_opt_map{$1}) &&
3835 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
3836 !$opts_opt_cmdonly{$1} &&
3837 ($om = $opts_opt_map{$1})) {
3840 } elsif (m/^--ignore-dirty$/s) {
3843 } elsif (m/^--no-quilt-fixup$/s) {
3845 $quilt_mode = 'nocheck';
3846 } elsif (m/^--no-rm-on-error$/s) {
3849 } elsif (m/^--(no-)?rm-old-changes$/s) {
3852 } elsif (m/^--deliberately-($deliberately_re)$/s) {
3854 push @deliberatelies, $&;
3855 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
3856 # undocumented, for testing
3858 $tagformat_want = [ $1, 'command line', 1 ];
3859 # 1 menas overrides distro configuration
3860 } elsif (m/^--always-split-source-build$/s) {
3861 # undocumented, for testing
3863 $need_split_build_invocation = 1;
3864 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
3865 $val = $2 ? $' : undef; #';
3866 $valopt->($oi->{Long});
3868 badusage "unknown long option \`$_'";
3875 } elsif (s/^-L/-/) {
3878 } elsif (s/^-h/-/) {
3880 } elsif (s/^-D/-/) {
3884 } elsif (s/^-N/-/) {
3889 push @changesopts, $_;
3891 } elsif (s/^-wn$//s) {
3893 $cleanmode = 'none';
3894 } elsif (s/^-wg$//s) {
3897 } elsif (s/^-wgf$//s) {
3899 $cleanmode = 'git-ff';
3900 } elsif (s/^-wd$//s) {
3902 $cleanmode = 'dpkg-source';
3903 } elsif (s/^-wdd$//s) {
3905 $cleanmode = 'dpkg-source-d';
3906 } elsif (s/^-wc$//s) {
3908 $cleanmode = 'check';
3909 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
3911 $val = undef unless length $val;
3912 $valopt->($oi->{Short});
3915 badusage "unknown short option \`$_'";
3922 sub finalise_opts_opts () {
3923 foreach my $k (keys %opts_opt_map) {
3924 my $om = $opts_opt_map{$k};
3926 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
3928 badcfg "cannot set command for $k"
3929 unless length $om->[0];
3933 foreach my $c (access_cfg_cfgs("opts-$k")) {
3934 my $vl = $gitcfg{$c};
3935 printdebug "CL $c ",
3936 ($vl ? join " ", map { shellquote } @$vl : ""),
3937 "\n" if $debuglevel >= 4;
3939 badcfg "cannot configure options for $k"
3940 if $opts_opt_cmdonly{$k};
3941 my $insertpos = $opts_cfg_insertpos{$k};
3942 @$om = ( @$om[0..$insertpos-1],
3944 @$om[$insertpos..$#$om] );
3949 if ($ENV{$fakeeditorenv}) {
3951 quilt_fixup_editor();
3957 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
3958 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
3959 if $dryrun_level == 1;
3961 print STDERR $helpmsg or die $!;
3964 my $cmd = shift @ARGV;
3967 if (!defined $rmchanges) {
3968 local $access_forpush;
3969 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
3972 if (!defined $quilt_mode) {
3973 local $access_forpush;
3974 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
3975 // access_cfg('quilt-mode', 'RETURN-UNDEF')
3977 $quilt_mode =~ m/^($quilt_modes_re)$/
3978 or badcfg "unknown quilt-mode \`$quilt_mode'";
3982 $need_split_build_invocation ||= quiltmode_splitbrain();
3984 if (!defined $cleanmode) {
3985 local $access_forpush;
3986 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
3987 $cleanmode //= 'dpkg-source';
3989 badcfg "unknown clean-mode \`$cleanmode'" unless
3990 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
3993 my $fn = ${*::}{"cmd_$cmd"};
3994 $fn or badusage "unknown operation $cmd";