X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=93bf46b4f57b87cca420a26308b07f36c9ec8e26;hb=a90cd66b7e31da80fc78134d39c143b3fa0106c8;hp=92fa86b7483ca92cea57de2bafb7835573068961;hpb=5958f33adfaa49981accb3cd4036916ac8daf64e;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 92fa86b7..93bf46b4 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -29,8 +29,8 @@
 #    git-debrebase [<options> --] [<git-rebase options...>]
 #    git-debrebase [<options>] analyse
 #    git-debrebase [<options>] breakwater      # prints breakwater tip only
-#    git-debrebase [<options>] launder         # prints breakwater tip etc.
 #    git-debrebase [<options>] stitch [--prose=<for commit message>]
+#    git-debrebase [<options>] launder-v0      # prints breakwater tip etc.
 #    git-debrebase [<options>] downstream-rebase-launder-v0  # experimental
 #
 #    git-debrebase [<options>] convert-from-gbp [<upstream-git-rev>]
@@ -412,7 +412,7 @@ sub classify ($) {
 
 	my $badanchor = sub { $unknown->("git-debrebase \`anchor' but @_"); };
 	@p == 2 or return $badanchor->("has other than two parents");
-	$haspatches and return $unknown->("contains debian/patches");
+	$haspatches and return $badanchor->("contains debian/patches");
 
 	# How to decide about l/r ordering of anchors ?  git
 	# --topo-order prefers to expand 2nd parent first.  There's
@@ -421,26 +421,14 @@ sub classify ($) {
 	# way also there's also an easy rune to look for the upstream
 	# patches (--topo-order).
 
-	# The above tells us which way *we* will generate them.  But we
-	# might encounter ad-hoc anchor merges generated manually,
-	# which might be the other way around.  In principle, in some odd
-	# situations, an anchor merge might have two identical parents.
-	# In that case we guess which way round it is (ie, which parent
-	# has the upstream history).  The order of the 2-iteration loop
-	# controls which guess we make.
-
-	# XXX we are going to desupport non-git-debrebase-generated anchors
-
-	foreach my $prevbrw (qw(0 1)) {
-	    if (!$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin
-		!($p[!$prevbrw]{Differs} & ~DS_DEB) && # no non-debian changess
-		!($p[$prevbrw]{Differs} & ~D_UPS)) { # no non-upstream changes
-		return $classify->(qw(Anchor),
-				   OrigParents => [ $p[!$prevbrw] ]);
-	    }
-	}
+	$p[0]{IsOrigin} and $badanchor->("is an origin commit");
+	$p[1]{Differs} & ~DS_DEB and
+	    $badanchor->("upstream files differ from left parent");
+	$p[0]{Differs} & ~D_UPS and
+	    $badanchor->("debian/ differs from right parent");
 
-	$badanchor->("violation");
+	return $classify->(qw(Anchor),
+			   OrigParents => [ $p[1] ]);
     }
 
     if (@p == 1) {
@@ -584,8 +572,9 @@ sub walk ($;$$) {
 	return (Msg => $ms);
     };
     my $rewrite_from_here = sub {
+	my ($cl) = @_;
 	my $sp_cl = { SpecialMethod => 'StartRewrite' };
-	push @brw_cl, $sp_cl;
+	push @$cl, $sp_cl;
 	push @processed, $sp_cl;
     };
     my $cur = $input;
@@ -635,7 +624,7 @@ sub walk ($;$$) {
 	my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;
 	if ($ty eq 'AddPatches') {
 	    $cur = $p0;
-	    $rewrite_from_here->();
+	    $rewrite_from_here->(\@upp_cl);
 	    next;
 	} elsif ($ty eq 'Packaging' or $ty eq 'Changelog') {
 	    push @brw_cl, $cl;
@@ -656,14 +645,14 @@ sub walk ($;$$) {
 	    };
 	    $queue->(\@brw_cl, "debian");
 	    $queue->(\@upp_cl, "upstream");
-	    $rewrite_from_here->();
+	    $rewrite_from_here->(\@brw_cl);
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Pseudomerge') {
 	    my $contrib = $cl->{Contributor}{CommitId};
 	    print $report " Contributor=$contrib" if $report;
 	    push @pseudomerges, $cl;
-	    $rewrite_from_here->();
+	    $rewrite_from_here->(\@upp_cl);
 	    $cur = $contrib;
 	    next;
 	} elsif ($ty eq 'Anchor') {
@@ -712,7 +701,7 @@ sub walk ($;$$) {
 			    " anchor")
 		};
 		$prline->(" Import");
-		$rewrite_from_here->();
+		$rewrite_from_here->(\@brw_cl);
 		$upp_limit //= $#upp_cl; # further, deeper, patches discarded
 		$cur = $ovwr;
 		next;
@@ -869,8 +858,8 @@ sub update_head_postlaunder ($$$) {
     runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
 }
 
-sub cmd_launder () {
-    badusage "no arguments to launder allowed" if @ARGV;
+sub cmd_launder_v0 () {
+    badusage "no arguments to launder-v0 allowed" if @ARGV;
     my $old = get_head();
     my ($tip,$breakwater,$last_anchor) = walk $old;
     update_head_postlaunder $old, $tip, 'launder';