git-debrebase: introduce build_start

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index cbf7e91ea12ec5ab5ec6aad1881fcb8bf3c1fc0b..7b64bf51f5cf65ff6957ecab6cd784ff24af8535 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -236,9 +236,14 @@ sub classify ($) {
        } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
            return $unknown->("edits debian/patches");
        } elsif ($d == D_DEB) {
        } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
            return $unknown->("edits debian/patches");
        } elsif ($d == D_DEB) {

-           check if there were any deb before, is not this is
-               a packaging introduction (ie breakwater root)
-           return $classify->(qw(Packaging));
+           my ($ty,$dummy) = git_cat_file "$ph[0]:debian";
+           if ($ty eq 'tree') {
+               return $classify->(qw(Packaging));
+           } elsif ($ty eq 'missing') {
+               return $classify->(qw(BreakwaterStart));
+           } else {
+               return $unknown->("parent's debian is not a directory");
+           }

        } elsif ($d == D_UPS) {
            return $classify->(qw(Upstream));
        } elsif ($d == (D_DEB|D_UPS)) {
        } elsif ($d == D_UPS) {
            return $classify->(qw(Upstream));
        } elsif ($d == (D_DEB|D_UPS)) {


@@ -309,21 +314,21 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
     return $unknown->("complex merge");
 }
 

-sub walk ($;$$$$);
+sub walk ($;$$);

 sub walk {
     my ($input,
 sub walk {
     my ($input,

-       $nogenerate,$report,
-       $wantdebonly,$depth) = @_;
+       $nogenerate,$report) = @_;

     # => ($tip, $breakwater_tip)
     # => ($tip, $breakwater_tip)

+    # (or nothing, if $nogenerate)

 
     # go through commits backwards
 
     # 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 %found;

+    my $upp_limit;

     my @pseudomerges;
 
     my @pseudomerges;
 

-    $depth //= 0;
-

     my $cl;
     my $xmsg = sub {
        my ($appendinfo) = @_;
     my $cl;
     my $xmsg = sub {
        my ($appendinfo) = @_;


@@ -333,15 +338,15 @@ sub walk {
        return (Msg => $ms);
     };
     my $rewrite_from_here = sub {
        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 $bomb = sub { # usage: return $bomb->();
-           print $report " Unprocessable" if $report;
-           $prprdelim->();
-           if ($nogenerate) {
-               return (undef,undef);
-           }
-           die "commit $cur: Cannot cope with this commit";
+    my $build_start = sub {
+       my ($msg, $parents) = @_;
+       $prline->(" $msg");
+       push @brw_cl, { ExactlyParents => $parents };
+       no qw(exiting); last;

     };
 
     my $cur = $input;
     };
 
     my $cur = $input;


@@ -355,11 +360,18 @@ sub walk {
        $prdelim = "\n";
     };
 
        $prdelim = "\n";
     };
 

+    my $bomb = sub { # usage: return $bomb->();
+       print $report " Unprocessable" if $report;
+       $prprdelim->();
+       if ($nogenerate) {
+           return (undef,undef);
+       }
+       die "commit $cur: Cannot cope with this commit";
+    };
+

     for (;;) {
        if (!defined $cur) {
     for (;;) {
        if (!defined $cur) {

-           push @deb_cl, { ExactlyParents => [] };
-           $prline->("Origin");
-           last;
+           $build_start->('Origin', []);

        }
        $cl = classify $cur;
        my $ty = $cl->{Type};
        }
        $cl = classify $cur;
        my $ty = $cl->{Type};


@@ -367,17 +379,19 @@ sub walk {
        $prline->("$cl->{CommitId} $cl->{Type}");
        $found{$ty. ( defined($st) ? "-$st" : '' )}++;
        push @processed, $cl;
        $prline->("$cl->{CommitId} $cl->{Type}");
        $found{$ty. ( defined($st) ? "-$st" : '' )}++;
        push @processed, $cl;

-       my $p0 = @[ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;
+       my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;

        if ($ty eq 'AddPatches') {
            $cur = $p0;
            $rewrite_from_here->();
            next;
        } elsif ($ty eq 'Packaging') {
        if ($ty eq 'AddPatches') {
            $cur = $p0;
            $rewrite_from_here->();
            next;
        } elsif ($ty eq 'Packaging') {

-           push @deb_cl, $cl;
+           push @brw_cl, $cl;

            $cur = $p0;
            next;
            $cur = $p0;
            next;

+       } elsif ($ty eq 'BreakwaterStart') {
+           $build_start('FirstPackaging',[$cur]};

        } elsif ($ty eq 'Upstream') {
        } elsif ($ty eq 'Upstream') {

-           push @ups_cl, $cl;
+           push @upp_cl, $cl;

            $cur = $p0;
            next;
        } elsif ($ty eq 'Mixed') {
            $cur = $p0;
            next;
        } elsif ($ty eq 'Mixed') {


@@ -386,9 +400,10 @@ sub walk {
                my $cls = { $cl, $xmsg->("split mixed commit: $wh part") };
                push @$q, $cls;
            };
                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->();
            $rewrite_from_here->();

+           $cur = $p0;

            next;
        } elsif ($ty eq 'Pseudomerge') {
            print $report " Contributor=$ty->{Contributor}" if $report;
            next;
        } elsif ($ty eq 'Pseudomerge') {
            print $report " Contributor=$ty->{Contributor}" if $report;


@@ -397,17 +412,15 @@ sub walk {
            $cur = $ty->{Contributor};
            next;
        } elsif ($ty eq 'BreakwaterUpstreamMerge') {
            $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) {
        } elsif ($ty eq 'DgitImportUnpatched') {
            my $pm = $pseudomerges[-1];
            if (defined $pm) {

-               # To an extent, this is heurstic.  Imports don't have
+               # To an extent, this is heuristic.  Imports don't have

                # a useful history of the debian/ branch.  We assume
                # that the first pseudomerge after an import has a
                # a useful history of the debian/ branch.  We assume
                # that the first pseudomerge after an import has a

-               # useful history or debian/, and ignore the histories
-               # from later pseudomerge.  Often the first pseudomerge
+               # useful history of debian/, and ignore the histories
+               # from later pseudomerges.  Often the first pseudomerge

                # will be the dgit import of the upload to the actual
                # suite intended by the non-dgit NMUer, and later
                # pseudomerges may represent in-archive copies.
                # will be the dgit import of the upload to the actual
                # suite intended by the non-dgit NMUer, and later
                # pseudomerges may represent in-archive copies.


@@ -417,7 +430,7 @@ sub walk {
                if (@$ovwrs != 1) {
                    return $bomb->();
                }
                if (@$ovwrs != 1) {
                    return $bomb->();
                }

-               my $ovwr = $ovwr->[0]{CommitId};
+               my $ovwr = $ovwrs->[0]{CommitId};

                printf $report " Overwr=%s", $ovwr if $report;
                # This import has a tree which is just like a
                # breakwater tree, but it has the wrong history.  It
                printf $report " Overwr=%s", $ovwr if $report;
                # This import has a tree which is just like a
                # breakwater tree, but it has the wrong history.  It


@@ -430,12 +443,12 @@ 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.
                # 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")
                };
                    %$cl,
                    SpecialMethod => 'DgitImportDebianUpdate',
                     $xmsg->("convert dgit import: debian changes")
                };

-               my $differs = get_differs $ovwr, $cl->{Tree};
+               my $differs = (get_differs $ovwr, $cl->{Tree});

                printf $report " Differs=%#x", $differs if $report;
                if ($differs & D_UPS) {
                    printf $report " D_UPS" if $report;
                printf $report " Differs=%#x", $differs if $report;
                if ($differs & D_UPS) {
                    printf $report " D_UPS" if $report;


@@ -443,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.
                    # 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")
                    };
                }
                        %$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->();
                $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;
            } 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
                # 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 {
            }
            die "$ty ?";
         } else {


@@ -476,9 +483,7 @@ sub walk {
        }
     }
     $prprdelim->();
        }
     }
     $prprdelim->();

-    if ($nogenerate) {
-       return (undef, $basis);
-    }
+    return if $nogenerate;

 
     # Now we build it back up again
 
 
     # Now we build it back up again
 


@@ -508,9 +513,9 @@ sub walk {
     in_workarea sub {
        mkdir $rd or $!==EEXIST or die $!;
        my $current_method;
     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' },
                        { SpecialMethod => 'RecordBreakwaterTip' },

-                       qw(Upstream), (reverse @ups_cl)) {
+                       qw(Upstream), (reverse @upp_cl)) {

            if (!ref $cl) {
                $current_method = $cl;
                next;
            if (!ref $cl) {
                $current_method = $cl;
                next;


@@ -526,7 +531,7 @@ sub walk {
                $rewriting = 1;
                next;
            } elsif ($method eq 'RecordBreakwaterTip') {
                $rewriting = 1;
                next;
            } elsif ($method eq 'RecordBreakwaterTip') {

-               last if $wantdebonly;
+               last if $wantbrwonly;

                $breakwater = $build;
                next;
            } elsif ($method eq 'DgitImportDebianUpdate') {
                $breakwater = $build;
                next;
            } elsif ($method eq 'DgitImportDebianUpdate') {