X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=c353111249ee99edb70d069528e94da938fe8af5;hb=b9ef2453ea950bd60ddb52e2253cdf762f34534d;hp=af19583099526aa15a0042681753734639210d3f;hpb=f0345187fe63a3ef7dcb4ccb90f2b2dd2d384a17;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index af195830..c3531112 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -196,10 +196,12 @@ sub get_tree ($;$$) {
 	return () if $type eq 'missing';
     }
 
+    $recurse = !!$recurse;
+
     confess "get_tree needs object not $x ?" unless $x =~ m{^[0-9a-f]+\:};
 
     our (@get_tree_memo, %get_tree_memo);
-    my $memo = $get_tree_memo{$x};
+    my $memo = $get_tree_memo{$recurse,$x};
     return @$memo if $memo;
 
     local $Debian::Dgit::debugcmd_when_debuglevel = 3;
@@ -216,7 +218,7 @@ sub get_tree ($;$$) {
 	push @l, [ $n, $i ];
 	confess "$x need $last < $n ?" unless $last lt $n;
     }
-    $get_tree_memo{$x} = \@l;
+    $get_tree_memo{$recurse,$x} = \@l;
     push @get_tree_memo, $x;
     if (@get_tree_memo > 10) {
 	delete $get_tree_memo{ shift @get_tree_memo };
@@ -225,15 +227,18 @@ sub get_tree ($;$$) {
 }
 
 sub trees_diff_walk ($$$;$) {
-    # trees_diff_walk [$all,] $x, $y, sub {... }
-    # calls sub->($name, $ix, $iy) for each difference (with $all, each name)
+    # trees_diff_walk [{..opts...},] $x, $y, sub {... }
+    # calls sub->($name, $ix, $iy) for each difference
     # $x and $y are as for get_tree
     # where $name, $ix, $iy are $name and $info from get_tree
-    my $all = shift @_ if @_>=4;
+    # opts are   all       call even for names same in both
+    #            recurse   call even for names same in both
+    my $opts = shift @_ if @_>=4;
     my ($x,$y,$call) = @_;
+    my $all = $opts->{all};
     return if !$all and $x eq $y;
-    my @x = get_tree $x;
-    my @y = get_tree $y;
+    my @x = get_tree $x, 0, $opts->{recurse};
+    my @y = get_tree $y, 0, $opts->{recurse};
     printdebug "trees_diff_walk(..$x,$y..) ".Dumper(\@x,\@y)
 	if $debuglevel >= 3;
     while (@x || @y) {
@@ -305,13 +310,16 @@ sub get_differs ($$) {
 
 	    my $xp = $ix && "$xd/patches";
 	    my $yp = $iy && "$yd/patches";
-	    trees_diff_walk $xp, $yp, sub {
+	    trees_diff_walk { recurse=>1 }, $xp, $yp, sub {
 		my ($n,$ix,$iy) = @_;
 
 		# analyse difference in debian/patches
 
 		my $ok;
-		if ($n !~ m/\.series$/s && !$ix && $plain->($iy)) {
+		if ($n =~ m{/$}s) {
+		    # we are recursing; directories may appear and disappear
+		    $ok = 1;
+		} elsif ($n !~ m/\.series$/s && !$ix && $plain->($iy)) {
 		    $ok = 1;
 		} elsif ($n eq 'series' && $plain->($ix) && $plain->($iy)) {
 		    my $x_s = (git_cat_file "$xp/series", 'blob');
@@ -439,6 +447,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 +1104,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 +1229,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} }
@@ -2399,7 +2449,14 @@ sub check_series_has_all_patches ($) {
 	[qw(blob missing)];
     $series //= '';
     my %series;
+    our $comments_snagged;
     foreach my $f (grep /\S/, grep {!m/^\s\#/} split /\n/, $series) {
+	if ($f =~ m/^\s*\#/) {
+	    snag 'series-comments',
+		"$seriesfn contains comments, which will be discarded"
+		unless $comments_snagged++;
+	    next;
+	}
 	fail "patch $f repeated in $seriesfn !" if $series{$f}++;
     }
     foreach my $patchfile (get_tree "$head:debian/patches", 1,1) {
@@ -2421,12 +2478,14 @@ sub begin_convert_from () {
     snag 'already-converted',
 	"ahead of debrebase-last, this is already managed by git-debrebase!"
 	if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head;
-    return ($head, undef);
+    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;
 }
@@ -2779,6 +2838,18 @@ END
 	'convert-from-dgit-view';
 }
 
+sub cmd_forget_was_ever_debrebase () {
+    badusage "forget-was-ever-debrebase takes no further arguments" if @ARGV;
+    my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
+	ffq_prev_branchinfo();
+    fail "Not suitable for recording git-debrebaseness anyway: $ffq_msg"
+	if defined $ffq_msg;
+    push @deferred_updates, "delete $ffq_prev";
+    push @deferred_updates, "delete $gdrlast";
+    snags_maybe_bail();
+    run_deferred_updates "forget-was-ever-debrebase";
+}
+
 sub cmd_record_resolved_merge () {
     badusage "record-resolved-merge takes no further arguments" if @ARGV;
     # MERGE-TODO needs documentation