X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=1f42dd3349bd7298b730b585ac90e98dd1cacbcd;hp=5e9d7114bd3b143c40d76aec609c0b3c52ad4923;hb=38310744b1522293aa0c95e6a6c34671d2f4dd44;hpb=b9ef2453ea950bd60ddb52e2253cdf762f34534d

diff --git a/dgit b/dgit
index 5e9d7114..1f42dd33 100755
--- a/dgit
+++ b/dgit
@@ -289,6 +289,14 @@ sub bpd_abs () {
     return $r;
 }
 
+sub get_tree_of_commit ($) {
+    my ($commitish) = @_;
+    my $cdata = cmdoutput @git, qw(cat-file commit), $commitish;
+    $cdata =~ m/\n\n/;  $cdata = $`;
+    $cdata =~ m/^tree (\w+)$/m or confess "cdata $cdata ?";
+    return $1;
+}
+
 sub branch_gdr_info ($$) {
     my ($symref, $head) = @_;
     my ($status, $msg, $current, $ffq_prev, $gdrlast) =
@@ -300,13 +308,6 @@ sub branch_gdr_info ($$) {
     return ($ffq_prev, $gdrlast);
 }
 
-sub branch_is_gdr ($$) {
-    my ($symref, $head) = @_;
-    my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
-    return 0 unless $ffq_prev || $gdrlast;
-    return 1;
-}
-
 sub branch_is_gdr_unstitched_ff ($$$) {
     my ($symref, $head, $ancestor) = @_;
     my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
@@ -315,6 +316,78 @@ sub branch_is_gdr_unstitched_ff ($$$) {
     return 1;
 }
 
+sub branch_is_gdr ($) {
+    my ($head) = @_;
+    # This is quite like git-debrebase's keycommits.
+    # We have our own implementation because:
+    #  - our algorighm can do fewer tests so is faster
+    #  - it saves testing to see if gdr is installed
+    my $walk = $head;
+    local $Debian::Dgit::debugcmd_when_debuglevel = 3;
+    printdebug "branch_is_gdr $head...\n";
+    my $get_patches = sub {
+	my $t = git_cat_file "$_[0]:debian/patches", [qw(missing tree)];
+	return $t // '';
+    };
+    my $tip_patches = $get_patches->($head);
+  WALK:
+    for (;;) {
+	my $cdata = git_cat_file $walk, 'commit';
+	my ($hdrs,$msg) = $cdata =~ m{\n\n} ? ($`,$') : ($cdata,'');
+	if ($msg =~ m{^\[git-debrebase\ (
+			  anchor | changelog | make-patches | 
+			  merged-breakwater | pseudomerge
+		      ) [: ] }mx) {
+	    # no need to analyse this - it's sufficient
+	    # (gdr classifications: Anchor, MergedBreakwaters)
+	    # (made by gdr: Pseudomerge, Changelog)
+	    printdebug "branch_is_gdr  $walk gdr $1 YES\n";
+	    return 1;
+	}
+	my @parents = ($hdrs =~ m/^parent (\w+)$/gm);
+	if (@parents==2) {
+	    my $walk_tree = get_tree_of_commit $walk;
+	    foreach my $p (@parents) {
+		my $p_tree = get_tree_of_commit $p;
+		if ($p_tree eq $walk_tree) { # pseudomerge contriburor
+		    # (gdr classification: Pseudomerge; not made by gdr)
+		    printdebug "branch_is_gdr  $walk unmarked pseudomerge\n"
+			if $debuglevel >= 2;
+		    $walk = $p;
+		    next WALK;
+		}
+	    }
+	    # some other non-gdr merge
+	    # (gdr classification: VanillaMerge, DgitImportUnpatched, ?)
+	    printdebug "branch_is_gdr  $walk ?-2-merge NO\n";
+	    return 0;
+	}
+	if (@parents>2) {
+	    # (gdr classification: ?)
+	    printdebug "branch_is_gdr  $walk ?-octopus NO\n";
+	    return 0;
+	}
+	if ($get_patches->($walk) ne $tip_patches) {
+	    # Our parent added, removed, or edited patches, and wasn't
+	    # a gdr make-patches commit.  gdr make-patches probably
+	    # won't do that well, then.
+	    # (gdr classification of parent: AddPatches or ?)
+	    printdebug "branch_is_gdr  $walk ?-patches NO\n";
+	    return 0;
+	}
+	if ($tip_patches eq '' and
+	    !defined git_cat_file "$walk:debian") {
+	    # (gdr classification of parent: BreakwaterStart
+	    printdebug "branch_is_gdr  $walk unmarked BreakwaterStart YES\n";
+	    return 1;
+	}
+	# (gdr classification: Upstream Packaging Mixed Changelog)
+	printdebug "branch_is_gdr  $walk plain\n"
+	    if $debuglevel >= 2;
+	$walk = $parents[0];
+    }
+}
+
 #---------- remote protocol support, common ----------
 
 # remote push initiator/responder protocol:
@@ -3164,10 +3237,7 @@ END
 	# here we go, then:
 	my $tree_commit = $mergeinputs[0]{Commit};
 
-	my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
-	$tree =~ m/\n\n/;  $tree = $`;
-	$tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
-	$tree = $1;
+	my $tree = get_tree_of_commit $tree_commit;;
 
 	# We use the changelog author of the package in question the
 	# author of this pseudo-merge.  This is (roughly) correct if
@@ -5381,7 +5451,7 @@ sub quiltify ($$$$) {
 		print STDERR "$us:  ", $reportnot->($notp), "\n";
 		$all_gdr &&= $notp->{Child} &&
 		    (git_cat_file $notp->{Child}{Commit}, 'commit')
-		    =~ m{^\[git-debrebase.*\]$}m;
+		    =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
 	    }
 	    print STDERR "\n";
 	    $failsuggestion =
@@ -5543,7 +5613,7 @@ END
 
     if ($quilt_mode eq 'linear'
 	&& !$fopts->{'single-debian-patch'}
-	&& branch_is_gdr($symref, $headref)) {
+	&& branch_is_gdr($headref)) {
 	# This is much faster.  It also makes patches that gdr
 	# likes better for future updates without laundering.
 	#