git-debrebase: wip, found

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index ad26d909170387b3f63137531cd3e3d496ec168d..2a3804f39c2706f7d1f27a0633a75661185325f5 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -286,14 +286,23 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
     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
     # 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;
 
     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) = @_;
     my $cl;
     my $xmsg = sub {
        my ($appendinfo) = @_;


@@ -312,6 +321,7 @@ sub launder ($$$) {
        $cl = classify $cur;
        my $ty = $cl->{Type};
        my $st = $cl->{SubType};
        $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') {
        $found{$ty. ( defined($st) ? "-$st" : '' )}++;
        my $p0 = $cl->{Parents}[0]{CommitId};
        if ($ty eq 'AddPatches') {


@@ -339,14 +349,15 @@ sub launder ($$$) {
            $rewrite_from_here->();
            next;
        } elsif ($ty eq 'Pseudomerge') {
            $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}
                },
                    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->();
            }
            push @pseudomerges, $cl;
            $rewrite_from_here->();


@@ -380,15 +391,18 @@ sub launder ($$$) {
                 $xmsg->("convert dgit import: upstream changes")
            };
            my $differs = get_differs $previous_breakwater, $cl->{Tree};
                 $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 {
            $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
 
        }
     }
     # Now we build it back up again
 

+    
+

     workarea_fresh();
 
     my $rewriting = 1;
     workarea_fresh();
 
     my $rewriting = 1;


@@ -484,6 +498,8 @@ sub update_head ($$) {
     runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
 }
 
     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;
 sub cmd_launder () {
     my $old = get_head();
     my ($tip,$breakwater) = launder $old, 0, undef, 0;