git-debrebase: introduce build_start

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 7eefe72a5698703d1256f11056d595676d525444..7b64bf51f5cf65ff6957ecab6cd784ff24af8535 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -314,22 +314,21 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub walk ($;$$$$);
+sub walk ($;$$);
 sub walk {
     my ($input,
-       $nogenerate,$report,
-       $wantbrwonly,$depth) = @_;
+       $nogenerate,$report) = @_;
     # => ($tip, $breakwater_tip)
+    # (or nothing, if $nogenerate)
 
     # go through commits backwards
     # we generate two lists of commits to apply:
     # breakwater branch and upstream patches
     my (@brw_cl, @upp_cl, @processed);
     my %found;
+    my $upp_limit;
     my @pseudomerges;
 
-    $depth //= 0;
-
     my $cl;
     my $xmsg = sub {
        my ($appendinfo) = @_;
@@ -343,6 +342,12 @@ sub walk {
        push @brw_cl, $sp_cl;
        push @processed, $sp_cl;
     };
+    my $build_start = sub {
+       my ($msg, $parents) = @_;
+       $prline->(" $msg");
+       push @brw_cl, { ExactlyParents => $parents };
+       no qw(exiting); last;
+    };
 
     my $cur = $input;
 
@@ -366,9 +371,7 @@ sub walk {
 
     for (;;) {
        if (!defined $cur) {
-           push @brw_cl, { ExactlyParents => [] };
-           $prline->("Origin");
-           last;
+           $build_start->('Origin', []);
        }
        $cl = classify $cur;
        my $ty = $cl->{Type};
@@ -385,10 +388,8 @@ sub walk {
            push @brw_cl, $cl;
            $cur = $p0;
            next;
-       } elsif ($ty eq 'Packaging') {
-           push @brw_cl, $cl;
-           $cur = $p0;
-           next;
+       } elsif ($ty eq 'BreakwaterStart') {
+           $build_start('FirstPackaging',[$cur]};
        } elsif ($ty eq 'Upstream') {
            push @upp_cl, $cl;
            $cur = $p0;
@@ -402,6 +403,7 @@ sub walk {
            $queue->(\@brw_cl, "debian");
            $queue->(\@upp_cl, "upstream");
            $rewrite_from_here->();
+           $cur = $p0;
            next;
        } elsif ($ty eq 'Pseudomerge') {
            print $report " Contributor=$ty->{Contributor}" if $report;
@@ -410,9 +412,7 @@ sub walk {
            $cur = $ty->{Contributor};
            next;
        } elsif ($ty eq 'BreakwaterUpstreamMerge') {
-           push @brw_cl, { ExactlyParents => [$cur] };
-           $prline->("PreviousBreakwater");
-           last;
+           $build_start->("PreviousBreakwater", [$cur]);
        } elsif ($ty eq 'DgitImportUnpatched') {
            my $pm = $pseudomerges[-1];
            if (defined $pm) {
@@ -462,26 +462,20 @@ sub walk {
                        $xmsg->("convert dgit import: upstream changes")
                    };
                }
-               $prline->("Import");
-               $prprdelim->();
-               my ($dummy,$basis) = walk
-                   $ovwr,
-                   $nogenerate, $report,
-                   1, $depth+1;
-               push @brw_cl, { ExactlyParents => [$basis] };
+               $prline->(" Import");
                $rewrite_from_here->();
-               last;
+               $upp_limit //= $#upp; # further, deeper, patches discarded
+               $cur = $ovwr;
+               next;
            } else {
                # Everything is from this import.  This kind of import
                # is already in valid breakwater format, with the
                # patches as commits.
                printf $report " NoPM" if $report;
-               push @brw_cl, { ExactlyParents => [$cur] };
                # last thing we processed will have been the first patch,
                # if there is one; which is fine, so no need to rewrite
                # on account of this import
-               $prline->("ImportOrigin");
-               last;
+               $build_start->("ImportOrigin",[$cur]);
            }
            die "$ty ?";
         } else {
@@ -489,7 +483,7 @@ sub walk {
        }
     }
     $prprdelim->();
-    return () if $nogenerate;
+    return if $nogenerate;
 
     # Now we build it back up again