X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=4bfe0952518214203c5e3ac397b27c53ceb93354;hb=52b97bd1b16a5db0b3b58e4864b5fdd6fc5e2689;hp=d80c8d35bb1875e509f658077eb3a1ed7cb7c69a;hpb=8f28dfa084b6d63e385d7fe538214eee2f90ea9e;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index d80c8d35..4bfe0952 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -439,6 +439,48 @@ sub record_gdrlast ($$;$) {
     push @deferred_updates, "update $gdrlast $newvalue $oldvalue";
 }
 
+sub fail_unprocessable ($) {
+    my ($msg) = @_;
+    changedir $maindir;
+    my ($ffqs, $ffqm, $symref, $ffq_prev, $gdrlast) = ffq_prev_branchinfo();
+
+    my $mangled = <<END;
+Branch/history seems mangled - no longer in gdr format.
+See ILLEGAL OPERATIONS in git-debrebase(5).
+END
+    chomp $mangled;
+
+    if (defined $ffqm) {
+	fail <<END;
+$msg
+Is this meant to be a gdr branch?  $ffqm
+END
+    } elsif (git_get_ref $ffq_prev) {
+	fail <<END;
+$msg
+$mangled
+Consider git-debrebase scrap, to throw away your recent work.
+END
+    } elsif (!git_get_ref $gdrlast) {
+	fail <<END;
+$msg
+Branch does not seem to be meant to be a git-debrebase branch?
+Wrong branch, or maybe you needed git-debrebase convert-from-*.
+END
+    } elsif (is_fast_fwd $gdrlast, git_rev_parse 'HEAD') {
+	fail <<END;
+$msg
+$mangled
+END
+    } else {
+	fail <<END;
+$msg
+Branch/history mangled, and diverged since last git-debrebase.
+Maybe you reset to, or rebased from, somewhere inappropriate.
+END
+    }
+};
+
 sub gbp_pq_export ($$$) {
     my ($bname, $base, $tip) = @_;
     # must be run in a workarea.  $bname and patch-queue/$bname
@@ -1054,7 +1096,7 @@ sub keycommits ($;$$$$$) {
     my $clogonly;
     my $cl;
     my $found_pm;
-    $fatal //= sub { fail $_[1]; };
+    $fatal //= sub { fail_unprocessable $_[1]; };
     my $x = sub {
 	my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
 	my $why = $mainwhy.$xwhy;
@@ -1179,7 +1221,7 @@ sub walk ($;$$$) {
 	if ($nogenerate) {
 	    return (undef,undef);
 	}
-	fail "found unprocessable commit, cannot cope".
+	fail_unprocessable "found unprocessable commit, cannot cope".
 	    (defined $cl->{Why} ? "; $cl->{Why}:": ':').
 	    " (commit $cur) (d.".
 	    (join ' ', map { sprintf "%#x", $_->{Differs} }
@@ -2416,15 +2458,19 @@ sub begin_convert_from () {
 
     fail "ffq-prev exists, this is already managed by git-debrebase!"
 	if $ffq_prev && git_get_ref $ffq_prev;
+
+    my $gdrlast_obj = $gdrlast && git_get_ref $gdrlast;
     snag 'already-converted',
 	"ahead of debrebase-last, this is already managed by git-debrebase!"
-	if $gdrlast && git_get_ref $gdrlast && is_fast_fwd $gdrlast, $head;
-    return ($head, undef);
+	if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head;
+    return ($head, { LastRef => $gdrlast, LastObj => $gdrlast_obj });
 }
 
 sub complete_convert_from ($$$$) {
     my ($old_head, $new_head, $gi, $mrest) = @_;
     ffq_check $new_head;
+    record_gdrlast $gi->{LastRef}, $new_head, $gi->{LastObj}
+	if $gi->{LastRef};
     snags_maybe_bail();
     update_head_checkout $old_head, $new_head, $mrest;
 }