X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=bf0d6398431340e1ff53feea1e478e472f75bb39;hp=f46e55a4e10969f0604f6b22a01aeebe836285e3;hb=ee802f8a6760c88b641f05d4dee51439a9a42c96;hpb=c26f96c431c935b9cf8044fae9894bfdcadbbc97

diff --git a/dgit b/dgit
index f46e55a4..bf0d6398 100755
--- a/dgit
+++ b/dgit
@@ -39,7 +39,7 @@ use Debian::Dgit;
 
 our $our_version = 'UNRELEASED'; ###substituted###
 
-our @rpushprotovsn_support = qw(3 2);
+our @rpushprotovsn_support = qw(3 2); # 4 is new tag format
 our $protovsn;
 
 our $isuite = 'unstable';
@@ -65,6 +65,8 @@ our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|unapplied';
 our $we_are_responder;
 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
+our $tagformat;
+our $tagformatfn;
 
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
@@ -132,6 +134,11 @@ our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
 our $csuite;
 our $instead_distro;
 
+sub debiantag ($$) {
+    my ($v,$distro) = @_;
+    return $tagformatfn->($v, $distro);
+}
+
 sub lbranch () { return "$branchprefix/$csuite"; }
 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
 sub lref () { return "refs/heads/".lbranch(); }
@@ -213,6 +220,16 @@ sub quiltmode_splitbrain () {
 #  where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
 #  < dgit-remote-push-ready <actual-proto-vsn>
 #
+# occasionally:
+#
+#  > progress NBYTES
+#  [NBYTES message]
+#
+#  > supplementary-message NBYTES          # $protovsn >= 3
+#  [NBYTES message]
+#
+# main sequence:
+#
 #  > file parsed-changelog
 #  [indicates that output of dpkg-parsechangelog follows]
 #  > data-block NBYTES
@@ -227,6 +244,10 @@ sub quiltmode_splitbrain () {
 #  [etc]
 #
 #  > param head HEAD
+#  > param csuite SUITE
+#
+#  > previously REFNAME=OBJNAME       # if --deliberately-not-fast-forward
+#                                     # goes into tag, for replay prevention
 #
 #  > want signed-tag
 #  [indicates that signed tag is wanted]
@@ -482,10 +503,12 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit.default.ssh' => 'ssh',
 	       'dgit.default.archive-query' => 'madison:',
 	       'dgit.default.sshpsql-dbname' => 'service=projectb',
+	       'dgit.default.dgit-tag-format' => 'old,new',
 	       'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
 	       'dgit-distro.debian.git-check' => 'url',
 	       'dgit-distro.debian.git-check-suffix' => '/info/refs',
 	       'dgit-distro.debian.new-private-pushers' => 't',
+	       'dgit-distro.debian.dgit-tag-format' => 'old',
 	       'dgit-distro.debian/push.git-url' => '',
 	       'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
 	       'dgit-distro.debian/push.git-user-force' => 'dgit',
@@ -1216,6 +1239,32 @@ sub create_remote_git_repo () {
     }
 }
 
+sub select_tagformat () {
+    # sets $tagformatfn
+    return if $tagformatfn && !$tagformat;
+    die 'bug' if $tagformatfn && $tagformat;
+    # ... $tagformat assigned after previous select_tagformat
+
+    my (@supported) = split /\,/, access_cfg('dgit-tag-format');
+    printdebug "select_tagformat supported @supported\n";
+
+    $tagformat //= [ $supported[0], "distro access configuration", 0 ];
+    printdebug "select_tagformat specified @$tagformat\n";
+
+    my ($fmt,$why,$override) = @$tagformat;
+
+    fail "target distro supports tag formats @supported".
+	" but have to use $fmt ($why)"
+	unless $override
+	    or grep { $_ eq $fmt } @supported;
+
+    $tagformat = undef;
+    $tagformatfn = ${*::}{"debiantag_$fmt"};
+
+    fail "trying to use unknown tag format \`$fmt' ($why) !"
+	unless $tagformatfn;
+}
+
 our ($dsc_hash,$lastpush_hash);
 
 our $ud = '.git/dgit/unpack';
@@ -1541,14 +1590,14 @@ sub git_fetch_us () {
     runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(), @specs;
 
     my %here;
-    my $tagpat = debiantag('*',access_basedistro);
+    my @tagpats = debiantags('*',access_basedistro);
 
-    git_for_each_ref("refs/tags/".$tagpat, sub {
+    git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
 	my ($objid,$objtype,$fullrefname,$reftail) = @_;
 	printdebug "currently $fullrefname=$objid\n";
 	$here{$fullrefname} = $objid;
     });
-    git_for_each_ref(lrfetchrefs."/tags/".$tagpat, sub {
+    git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
 	my ($objid,$objtype,$fullrefname,$reftail) = @_;
 	my $lref = "refs".substr($fullrefname, length lrfetchrefs);
 	printdebug "offered $lref=$objid\n";
@@ -1974,6 +2023,7 @@ END
     prep_ud();
 
     access_giturl(); # check that success is vaguely likely
+    select_tagformat();
 
     my $clogpfn = ".git/dgit/changelog.822.tmp";
     runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
@@ -1999,7 +2049,22 @@ END
 
     if (madformat($format)) {
 	# user might have not used dgit build, so maybe do this now:
-	commit_quilty_patch();
+	if (quiltmode_splitbrain()) {
+	    my $upstreamversion = $clogp->{Version};
+	    $upstreamversion =~ s/-[^-]*$//;
+	    changedir $ud;
+	    quilt_make_fake_dsc($upstreamversion);
+	    my ($dgitview, $cachekey) =
+		quilt_check_splitbrain_cache($head, $upstreamversion);
+	    $dgitview or fail
+ "--quilt=$quilt_mode but no cached dgit view:
+ perhaps tree changed since dgit build[-source] ?";
+	    $split_brain = 1;
+	    changedir '../../../..';
+	    prep_ud(); # so _only_subdir() works, below
+	} else {
+	    commit_quilty_patch();
+	}
     }
 
     die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)' if $split_brain;
@@ -2304,7 +2369,7 @@ sub cmd_remote_push_build_host {
 	unless defined $protovsn;
 
     responder_send_command("dgit-remote-push-ready $protovsn");
-
+    rpush_handle_protovsn_bothends();
     changedir $dir;
     &cmd_push;
 }
@@ -2313,6 +2378,17 @@ sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
 # ... for compatibility with proto vsn.1 dgit (just so that user gets
 #     a good error message)
 
+sub rpush_handle_protovsn_bothends () {
+    if ($protovsn < 4) {
+	fail "rpush negotiated protocol version $protovsn".
+	    " which supports old tag format only".
+	    " but trying to use new format (".$tagformat->[1].")"
+	    if $tagformat && $tagformat->[0] ne 'old';
+	$tagformat = ['old', "rpush negotiated protocol $protovsn", 0];
+    }
+    select_tagformat();
+}
+
 our $i_tmp;
 
 sub i_cleanup {
@@ -2371,6 +2447,7 @@ sub cmd_rpush {
     ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
     die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
     $supplementary_message = '' unless $protovsn >= 3;
+    rpush_handle_protovsn_bothends();
     for (;;) {
 	my ($icmd,$iargs) = initiator_expect {
 	    m/^(\S+)(?: (.*))?$/;
@@ -2803,7 +2880,8 @@ sub quiltify ($$$$) {
 	    die "$quilt_mode ?";
 	}
 
-	my $time = time;
+	my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
+	$time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
 	my $ncommits = 3;
 	my $msg = cmdoutput @git, qw(log), "-n$ncommits";
 
@@ -3763,6 +3841,11 @@ sub parseopts () {
 	    } elsif (m/^--deliberately-($deliberately_re)$/s) {
 		push @ropts, $_;
 		push @deliberatelies, $&;
+	    } elsif (m/^--dgit-tag-format=(old|new)$/s) {
+		# undocumented, for testing
+		push @ropts, $_;
+		$tagformat = [ $1, 'command line', 1 ];
+		# 1 menas overrides distro configuration
 	    } elsif (m/^--always-split-source-build$/s) {
 		# undocumented, for testing
 		push @ropts, $_;