X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=3469f33d0a0ef285e17d2a04ff34df4ec6fdff66;hb=9f13c444cdf81783a383787f3b8ae5deedbd59d7;hp=c386057270b46908b8c47441692bb0ec14fc9c12;hpb=3259a1544a034832c5cd981681ba7f166c203974;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index c3860572..3469f33d 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -63,7 +63,7 @@
 #             - no fast forward checks
 #  for now only explicit with commitids
 
-    # implicitly uses `upstream'
+#         implicitly uses `upstream'
 #                                     # (or multiple other branches)
 #       git-debrebase new-upstream \
 #             [<subdir>/]=<commitid>
@@ -87,6 +87,20 @@
 #  refs/ffqrebase-prev/BRANCH    BRANCH may be refs/...; if not it means
 #  refs/ffqrebase-base/BRANCH      refs/heads/BRANCH
 #                               zero, one, or both of these may exist
+#
+# git-debrebase without start, if already started, is willing
+# to strip pseudomerges provided that they overwrite exactly
+# the previous HEAD
+#  xxxx is this right ?  what matters is have we pushed
+#    I think in fact the right answer is:
+#       git-debrebase always strips out pseudomerges from its branch
+#       a pseudomerge is put in at the time we want to push
+#       at that time, we make a pseudomerge of the remote tracking
+#           branch (if raw git) or the dgit view (if dgit)
+#       for raw git git-ffqrebase, do want preciseley to record
+#           value of remote tracking branch or our branch, on start, so we
+#           overwrite only things we intend to
+#  the previous pseudomerge    check for tags and remote branches ?
 
 use strict;
 
@@ -286,14 +300,23 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub launder ($$$) {
-    my ($input, $pseudos_must_overwrite_this, $wantdebonly) = @_;
+sub walk ($$$;$$$) {
+    my ($input, $pseudos_must_overwrite_this, $wantdebonly,
+	$report, $depth, $report_anomaly, $report_only) = @_;
     # go through commits backwards
     # we generate two lists of commits to apply
+    # => ($tip, $breakwater_tip)
     my (@deb_cl, @ups_cl, @processed);
     my %found;
     my @pseudomerges;
 
+    $report //= sub { };
+    $report_anomaly //= sub {
+	my ($cl, $msg) = @_;
+	die "commit $cl: $msg\n";
+    };
+    $depth //= 0;
+
     my $cl;
     my $xmsg = sub {
 	my ($appendinfo) = @_;
@@ -312,7 +335,9 @@ sub launder ($$$) {
 	$cl = classify $cur;
 	my $ty = $cl->{Type};
 	my $st = $cl->{SubType};
+	$report->($cl);
 	$found{$ty. ( defined($st) ? "-$st" : '' )}++;
+	push @processed, $cl;
 	my $p0 = $cl->{Parents}[0]{CommitId};
 	if ($ty eq 'AddPatches') {
 	    $cur = $p0;
@@ -320,12 +345,10 @@ sub launder ($$$) {
 	    next;
 	} elsif ($ty eq 'Packaging') {
 	    push @deb_cl, $cl;
-	    push @processed, $cl;
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Upstream') {
 	    push @ups_cl, $cl;
-	    push @processed, $cl;
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Mixed') {
@@ -339,14 +362,15 @@ sub launder ($$$) {
 	    $rewrite_from_here->();
 	    next;
 	} elsif ($ty eq 'Pseudomerge') {
-	    if (defined $pseudos_must_overwrite_this) {
-		grep {
+	    if (defined $pseudos_must_overwrite_this &&
+		!grep {
 		    is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
 		},
-		    @{ $cl->{Overwritten} }
-		or
-		    die "Pseudomerge $cl->{CommitId} does not overwrite ".
-		        "$pseudos_must_overwrite_this as expected.";
+		@{ $cl->{Overwritten} }) {
+		$report_anomaly->($cl,
+				  "Pseudomerge should overwrite".
+				  " $pseudos_must_overwrite_this".
+				  " but does not do so");
 	    }
 	    push @pseudomerges, $cl;
 	    $rewrite_from_here->();
@@ -367,6 +391,7 @@ sub launder ($$$) {
 	    # precisely right.  Otherwise, it was a non-gitish upload
 	    # of a new upstream version.  We can tell these apart
 	    # by looking at the tree of the supposed upstream.
+	    my $differs = get_differs $previous_breakwater, $cl->{Tree};
 	    if ($differs & D_UPS) {
 		push @deb_cl, {
                     %r,
@@ -379,20 +404,23 @@ sub launder ($$$) {
 		SpecialMethod => 'DgitImportDebianUpdate',
                 $xmsg->("convert dgit import: upstream changes")
 	    };
-	    my $differs = get_differs $previous_breakwater, $cl->{Tree};
-	    $basis = launder $pseudomerges[0]{Overwritten}, undef, 1;
+	    $basis = launder $pseudomerges[0]{Overwritten}, undef, 1,
+		$report, $depth+1, $nogenerate;
 	    $rewrite_from_here->();
 	    last;
 	} else {
-	    die "Reached difficult commit $cur: ".Dumper($cl);
+	    $report_anomaly->($cl, "Cannot cope with this commit");
 	}
     }
     # Now we build it back up again
 
+    if ($nogenerate) {
+	return (undef, $basis);
+    }
+
     workarea_fresh();
-    in_workarea sub { xxx attributes xxx };
 
-    my $rewriting = 1;
+    my $rewriting = 0;
 
     my $build = $basis;
 
@@ -485,10 +513,15 @@ sub update_head ($$) {
     runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
 }
 
+sub cmd_analyse () {
+    
+
 sub cmd_launder () {
     my $old = get_head();
     my ($tip,$breakwater) = launder $old, 0, undef, 0;
-    update_head $old, $tip, 'launder'; # no tree changes! xxx debian/patches
+    update_head $old, $tip, 'launder';
+    # no tree changes except debian/patches
+    runcmd @git, qw(rm --quiet -rf debian/patches);
     printf "# breakwater tip:\n%s\n", $breakwater;
 }