git-debrebase: introduce build_start

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 5be04b9be1fe1058c8a9f528745596f19e7e2fe0..7b64bf51f5cf65ff6957ecab6cd784ff24af8535 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -314,21 +314,21 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub walk ($;$$$$);
+sub walk ($;$$);
 sub walk {
     my ($input,
-       $nogenerate,$report,
-       $wantdebonly,$depth) = @_;
+       $nogenerate,$report) = @_;
     # => ($tip, $breakwater_tip)
+    # (or nothing, if $nogenerate)
 
     # go through commits backwards
-    # we generate two lists of commits to apply
-    my (@deb_cl, @ups_cl, @processed);
+    # 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) = @_;
@@ -338,7 +338,15 @@ sub walk {
        return (Msg => $ms);
     };
     my $rewrite_from_here = sub {
-       push @processed, { SpecialMethod => 'StartRewrite' };
+       my $sp_cl = { SpecialMethod => 'StartRewrite' };
+       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;
@@ -363,9 +371,7 @@ sub walk {
 
     for (;;) {
        if (!defined $cur) {
-           push @deb_cl, { ExactlyParents => [] };
-           $prline->("Origin");
-           last;
+           $build_start->('Origin', []);
        }
        $cl = classify $cur;
        my $ty = $cl->{Type};
@@ -379,15 +385,13 @@ sub walk {
            $rewrite_from_here->();
            next;
        } elsif ($ty eq 'Packaging') {
-           push @deb_cl, $cl;
-           $cur = $p0;
-           next;
-       } elsif ($ty eq 'Packaging') {
-           push @deb_cl, $cl;
+           push @brw_cl, $cl;
            $cur = $p0;
            next;
+       } elsif ($ty eq 'BreakwaterStart') {
+           $build_start('FirstPackaging',[$cur]};
        } elsif ($ty eq 'Upstream') {
-           push @ups_cl, $cl;
+           push @upp_cl, $cl;
            $cur = $p0;
            next;
        } elsif ($ty eq 'Mixed') {
@@ -396,9 +400,10 @@ sub walk {
                my $cls = { $cl, $xmsg->("split mixed commit: $wh part") };
                push @$q, $cls;
            };
-           $queue->(\@deb_cl, "debian");
-           $queue->(\@ups_cl, "upstream");
+           $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;
@@ -407,9 +412,7 @@ sub walk {
            $cur = $ty->{Contributor};
            next;
        } elsif ($ty eq 'BreakwaterUpstreamMerge') {
-           push @deb_cl, { ExactlyParents => [$cur] };
-           $prline->("PreviousBreakwater");
-           last;
+           $build_start->("PreviousBreakwater", [$cur]);
        } elsif ($ty eq 'DgitImportUnpatched') {
            my $pm = $pseudomerges[-1];
            if (defined $pm) {
@@ -440,7 +443,7 @@ sub walk {
                # right; or, 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.
-               push @deb_cl, {
+               push @brw_cl, {
                    %$cl,
                    SpecialMethod => 'DgitImportDebianUpdate',
                     $xmsg->("convert dgit import: debian changes")
@@ -453,32 +456,26 @@ sub walk {
                    # deleted .gitignore (which is a thing that some of
                    # the existing git tools do if the user doesn't
                    # somehow tell them not to).  Ah well.
-                   push @deb_cl, {
+                   push @brw_cl, {
                        %$cl,
                        SpecialMethod => 'DgitImportUpstreamUpdate',
                        $xmsg->("convert dgit import: upstream changes")
                    };
                }
-               $prline->("Import");
-               $prprdelim->();
-               my ($basis,$dummy) = walk
-                   $ovwr,
-                   $nogenerate, $report,
-                   1, $depth+1;
-               push @deb_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 @deb_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 {
@@ -486,9 +483,7 @@ sub walk {
        }
     }
     $prprdelim->();
-    if ($nogenerate) {
-       return (undef, $basis);
-    }
+    return if $nogenerate;
 
     # Now we build it back up again
 
@@ -518,9 +513,9 @@ sub walk {
     in_workarea sub {
        mkdir $rd or $!==EEXIST or die $!;
        my $current_method;
-       foreach my $cl (qw(Debian), (reverse @deb_cl),
+       foreach my $cl (qw(Debian), (reverse @brw_cl),
                        { SpecialMethod => 'RecordBreakwaterTip' },
-                       qw(Upstream), (reverse @ups_cl)) {
+                       qw(Upstream), (reverse @upp_cl)) {
            if (!ref $cl) {
                $current_method = $cl;
                next;
@@ -536,7 +531,7 @@ sub walk {
                $rewriting = 1;
                next;
            } elsif ($method eq 'RecordBreakwaterTip') {
-               last if $wantdebonly;
+               last if $wantbrwonly;
                $breakwater = $build;
                next;
            } elsif ($method eq 'DgitImportDebianUpdate') {