X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=d9bc9432cd423bc7ffcce120780aa750539cc7fb;hp=87d605b6e50e7d0a75ef9a0dc5fa74afd077aba0;hb=84c98f283cda92876a3522a5f541b745797415a8;hpb=1c679c975b3d6a040420e000705a62da4027ffd2

diff --git a/git-debrebase b/git-debrebase
index 87d605b6..d9bc9432 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -87,11 +87,19 @@
 #  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
-s
+#
 # 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;
@@ -292,9 +300,10 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub walk ($$$;$$$) {
-    my ($input, $pseudos_must_overwrite_this, $wantdebonly,
-	$report, $depth, $report_anomaly, $report_only) = @_;
+sub walk ($;$$$$) {
+    my ($input,
+	$nogenerate,$report,
+	$wantdebonly,$depth) = @_;
     # go through commits backwards
     # we generate two lists of commits to apply
     # => ($tip, $breakwater_tip)
@@ -302,11 +311,6 @@ sub walk ($$$;$$$) {
     my %found;
     my @pseudomerges;
 
-    $report //= sub { };
-    $report_anomaly //= sub {
-	my ($cl, $msg) = @_;
-	die "commit $cl: $msg\n";
-    };
     $depth //= 0;
 
     my $cl;
@@ -323,11 +327,17 @@ sub walk ($$$;$$$) {
 
     my $cur = $input;
 
+    my $prdelim = "";
+    my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; }
+
     for (;;) {
 	$cl = classify $cur;
 	my $ty = $cl->{Type};
 	my $st = $cl->{SubType};
-	$report->($cl);
+	if ($report) {
+	    print $report $prdelim, "$cl->{CommitId} $cl->{Type}";
+	    $prdelim = "\n";
+	}
 	$found{$ty. ( defined($st) ? "-$st" : '' )}++;
 	push @processed, $cl;
 	my $p0 = $cl->{Parents}[0]{CommitId};
@@ -354,16 +364,7 @@ sub walk ($$$;$$$) {
 	    $rewrite_from_here->();
 	    next;
 	} elsif ($ty eq 'Pseudomerge') {
-	    if (defined $pseudos_must_overwrite_this &&
-		!grep {
-		    is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
-		},
-		@{ $cl->{Overwritten} }) {
-		$report_anomaly->($cl,
-				  "Pseudomerge should overwrite".
-				  " $pseudos_must_overwrite_this".
-				  " but does not do so");
-	    }
+	    print $report " Contributor=$ty->{Contributor}" if $report;
 	    push @pseudomerges, $cl;
 	    $rewrite_from_here->();
 	    $cur = $ty->{Contributor};
@@ -384,7 +385,9 @@ sub walk ($$$;$$$) {
 	    # 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};
+	    printf $report " Differs=%#x", $differs if $report;
 	    if ($differs & D_UPS) {
+		printf $report " D_UPS" if $report;
 		push @deb_cl, {
                     %r,
                     SpecialMethod => 'DgitImportUpstreamUpdate',
@@ -396,20 +399,29 @@ sub walk ($$$;$$$) {
 		SpecialMethod => 'DgitImportDebianUpdate',
                 $xmsg->("convert dgit import: upstream changes")
 	    };
-	    $basis = launder $pseudomerges[0]{Overwritten}, undef, 1,
-		$report, $depth+1, $nogenerate;
+	    $prprdelim->();
+	    $basis = walk
+		$pseudomerges[0]{Overwritten},
+		$nogenerate, $report,
+		1, $depth+1;
 	    $rewrite_from_here->();
 	    last;
 	} else {
-	    $report_anomaly->($cl, "Cannot cope with this commit");
+	    print $report " Unprocessable" if $report;
+	    $prprdelim->();
+	    if ($nogenerate) {
+		return (undef,undef);
+	    }
+	    die "commit $cur: Cannot cope with this commit";
 	}
     }
-    # Now we build it back up again
-
+    $prprdelim->();
     if ($nogenerate) {
 	return (undef, $basis);
     }
 
+    # Now we build it back up again
+
     workarea_fresh();
 
     my $rewriting = 0;
@@ -505,16 +517,28 @@ sub update_head ($$) {
     runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
 }
 
-sub cmd_analyse () {
-    
-
 sub cmd_launder () {
+    badusage "no arguments to launder allowed";
     my $old = get_head();
-    my ($tip,$breakwater) = launder $old, 0, undef, 0;
+    my ($tip,$breakwater) = walk $old;
     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;
+    printf "# breakwater tip\n%s\n", $breakwater;
+}
+
+sub cmd_analyse () {
+    die if ($ARGV[0]//'') =~ m/^-/;
+    badusage "too many arguments to analyse" if @ARGV>1;
+    my ($old) = @ARGV;
+    if (defined $old) {
+	$old = git_rev_parse $old;
+    } else {
+	$old = get_head();
+    }
+    my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
+    print "$breakwater BREAKWATER\n";
+    STDOUT->error and die $!;
 }
 
 my $toplevel = runcmd @git, qw(rev-parse --show-toplevel);