git-debrebase: wip, found

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 1c902a262266db30d864c2e10d79c6180e692947..2a3804f39c2706f7d1f27a0633a75661185325f5 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -279,20 +279,30 @@ sub classify ($) {
        !($p[0]{Differs} & ~D_DEB) &&
        !($p[1]{Differs} & ~D_UPS)) {
        return $classify->(qw(BreakwaterUpstreamMerge),
-                          Upstream => $p[1]);
+                          OrigParents => [ $p[1] ]);
     }
+    # xxx multi-.orig upstreams
 
     return $unknown->("complex merge");
 }
 
-sub launder ($$$) {
-    my ($input, $pseudos_must_overwrite_this, $wantdebonly) = @_;
+sub launder ($$$;$$$) {
+    my ($input, $pseudos_must_overwrite_this, $wantdebonly,
+       $report, $depth, $report_anomaly, $nogenerate) = @_;
     # 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) = @_;
@@ -311,6 +321,7 @@ sub launder ($$$) {
        $cl = classify $cur;
        my $ty = $cl->{Type};
        my $st = $cl->{SubType};
+       $report->($cl);
        $found{$ty. ( defined($st) ? "-$st" : '' )}++;
        my $p0 = $cl->{Parents}[0]{CommitId};
        if ($ty eq 'AddPatches') {
@@ -338,8 +349,15 @@ sub launder ($$$) {
            $rewrite_from_here->();
            next;
        } elsif ($ty eq 'Pseudomerge') {
-           if (defined $pseudos_must_overwrite_this) {
-               confess 'xxx actually check this';
+           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");
            }
            push @pseudomerges, $cl;
            $rewrite_from_here->();
@@ -373,17 +391,19 @@ sub launder ($$$) {
                 $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
 
+    
+
     workarea_fresh();
-    in_workarea sub { xxx attributes xxx };
 
     my $rewriting = 1;
 
@@ -478,10 +498,14 @@ 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;
 }