X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=4667e8b1b8b408b8245e634f597adca7e78a12f3;hb=b5cd66f2a318d196e4497bd428567826f5c2b5d6;hp=54431a7731a4718a4cb57d85a80ffb445fa724af;hpb=58cd6d7cf9c2e0c5faba010744079881da008fea;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 54431a77..4667e8b1 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -494,41 +494,81 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub breakwater_of ($) {
-    my ($head) = @_; # must be laundered
-    my $breakwater;
-    my $unclean = sub {
-	my ($why) = @_;
-	fail "branch needs laundering (run git-debrebase): $why";
+sub keycommits ($;$$$) {
+    my ($head, $furniture, $unclean, $trouble) = @_;
+    # => ($anchor, $breakwater)
+
+    # $unclean->("unclean-$tagsfx", $msg)
+    # $furniture->("unclean-$tagsfx", $msg)
+    # $dgitimport->("unclean-$tagsfx", $msg)
+    #   is callled for each situation or commit that
+    #   wouldn't be found in a laundered branch
+    # $furniture is forfurniture commits such as might be found on an
+    #   interchange branch (pseudomerge, d/patches, changelog)
+    # $trouble is for things whnich prevent the return of
+    #   anchor and breakwater information; if that is ignored,
+    #   then keycommits returns (undef, undef) instead.
+    #
+    # If a callback is undef, fail is called instead.
+    # If a callback is defined but false, the situation is ignored.
+    # Callbacks may say:
+    #   no warnings qw(exiting); last;
+    # if the answer is no longer wanted.
+
+    my ($anchor, $breakwater);
+    my $clogonly;
+    my $x = sub {
+	my ($cb, $tagsfx, $why) = @_;
+	my $m = "branch needs laundering (run git-debrebase): $why";
+	fail $m unless defined $cb;
+	return unless $cb;
+	$cb->("unclean-$tagsfx", $why);
     };
     for (;;) {
 	my $cl = classify $head;
 	my $ty = $cl->{Type};
-	if ($ty eq 'Packaging' or
-	    $ty eq 'Changelog') {
+	if ($ty eq 'Packaging') {
+	    $breakwater //= $clogonly;
 	    $breakwater //= $head;
+	} elsif ($ty eq 'Changelog') {
+	    # this is going to count as the tip of the breakwater
+	    # only if it has no upstream stuff before it
+	    $clogonly //= $head;
 	} elsif ($ty eq 'Anchor' or
 		 $ty eq 'TreatAsAnchor' or
 		 $ty eq 'BreakwaterStart') {
+	    $anchor = $head;
+	    $breakwater //= $clogonly;
 	    $breakwater //= $head;
 	    last;
 	} elsif ($ty eq 'Upstream') {
-	    $unclean->("packaging change ($breakwater)".
-		       " follows upstream change (eg $head)")
+	    $x->($unclean, 'ordering',
+ "packaging change ($breakwater) follows upstream change (eg $head)")
 		if defined $breakwater;
+	    $clogonly = undef;
+	    $breakwater = undef;
 	} elsif ($ty eq 'Mixed') {
-	    $unclean->('found mixed upstream/packaging commit ($head)');
+	    $x->($unclean, 'mixed',
+		 'found mixed upstream/packaging commit ($head)');
+	    $clogonly = undef;
+	    $breakwater = undef;
 	} elsif ($ty eq 'Pseudomerge' or
 		 $ty eq 'AddPatches') {
-	    $unclean->("found interchange conversion commit ($ty, $head)");
+	    $x->($furniture, (lc $ty),
+		 "found interchange bureaucracy commit ($ty, $head)");
 	} elsif ($ty eq 'DgitImportUnpatched') {
-	    $unclean->("found dgit dsc import ($head)");
+	    $x->($trouble, 'dgitimport',
+		 "found dgit dsc import ($head)");
+	    $breakwater = undef;
+	    $anchor = undef;
+	    no warnings qw(exiting);
+	    last;
 	} else {
 	    fail "found unprocessable commit, cannot cope: $head; $cl->{Why}";
 	}
 	$head = $cl->{Parents}[0]{CommitId};
     }
-    return $breakwater;
+    return ($anchor, $breakwater);
 }
 
 sub walk ($;$$);
@@ -1186,7 +1226,7 @@ sub cmd_record_ffq_prev () {
 
 sub cmd_breakwater () {
     badusage "no arguments allowed" if @ARGV;
-    my $bw = breakwater_of git_rev_parse 'HEAD';
+    my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
     print "$bw\n" or die $!;
 }
 
@@ -1203,10 +1243,14 @@ sub cmd_stitch () {
     my $prev = $ffq_prev && git_get_ref $ffq_prev;
     if (!$prev) {
 	fail "No ffq-prev to stitch." unless $opt_noop_ok;
+	return;
     }
+    my $old_head = get_head();
+
+    keycommits $old_head, \&fproblem, \&fproblem, \&fproblem;
+
     push @deferred_updates, "delete $ffq_prev $prev";
 
-    my $old_head = get_head();
     if (is_fast_fwd $old_head, $prev) {
 	my $differs = get_differs $old_head, $prev;
 	unless ($differs & ~D_PAT_ADD) {
@@ -1300,7 +1344,7 @@ sub cmd_convert_to_gbp () {
     badusage "no arguments allowed" if @ARGV;
     my $head = get_head();
     my (undef, undef, undef, $ffq, $drlast) = ffq_prev_branchinfo();
-    my $bw = breakwater_of $head;
+    my ($anchor, $bw) = keycommits $head, 0;
     fresh_workarea();
     my $out;
     in_workarea sub {