git-debrebase: move --name-only

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 2a6aea7a85d671fc01299a330e1e98aeab632bb7..5fa62b55b848e927556717379897f27df1401edd 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -106,6 +106,7 @@ use strict;
 
 use Memoize;
 use Carp;
+use POSIX;
 use Data::Dumper;
 
 use Debian::Dgit qw(:DEFAULT $wa);
@@ -144,6 +145,46 @@ our $rd = ".git/git-debrebase";
 our $ud = "$rd/work";
 our @git = qw(git);
 
+sub get_differs ($$) {
+    my ($x,$y) = @_;
+    # This resembles quiltify_trees_differ, in dgit, a bit.  But: we
+    # don't care about modes, or dpkg-source-unrepresentable changes,
+    # and we don't need the plethora of different modes.
+
+    my $differs = 0;
+
+    my $f;
+    my $rundiff = sub {
+       my ($opts, $sfx, $fn) = @_;
+       $opts //= [qw(--name-only)];
+       my @cmd = (@git, qw(diff-tree -z --no-renames));
+       push @cmd, @$opts;
+       push @cmd, "$_:$sfx" foreach $x, $y;
+       my $diffs = cmdoutput @bcmd, $x, $y;
+       foreach $f (split /\0/, $diffs) { $fn->(); }
+    };
+
+    $rundiff(undef, '', sub {
+        $differs |= $f eq 'debian' ? D_DEB : D_UPS;
+    });
+
+    if ($differs & D_DEB) {
+       $differs &= ~D_DEB;
+       $rundiff(undef, ':debian', sub {
+            $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB;
+       });
+    }
+
+    if ($differs & D_PAT_OTH) {
+       $rundiff([qw(--name-status)], ':debian/patches', sub {
+            
+        });
+       
+    
+       
+       }
+           $f eq '
+
 sub commit_pr_info ($) {
     my ($r) = @_;
     return Data::Dumper->dump([$r], [qw(commit)]);
@@ -314,22 +355,21 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub walk ($;$$$$);
-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) = @_;
@@ -339,9 +379,10 @@ 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 $cur = $input;
 
     my $prdelim = "";
@@ -362,12 +403,17 @@ sub walk {
        die "commit $cur: Cannot cope with this commit";
     };
 
+    my $build;
+    my $breakwater;
+
+    my $build_start = sub {
+       my ($msg, $parent) = @_;
+       $prline->(" $msg");
+       $build = $parent;
+       no warnings qw(exiting); last;
+    };
+
     for (;;) {
-       if (!defined $cur) {
-           push @brw_cl, { ExactlyParents => [] };
-           $prline->("Origin");
-           last;
-       }
        $cl = classify $cur;
        my $ty = $cl->{Type};
        my $st = $cl->{SubType};
@@ -383,10 +429,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;
@@ -400,6 +444,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;
@@ -408,9 +453,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) {
@@ -460,26 +503,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_cl; # 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 {
@@ -487,7 +524,7 @@ sub walk {
        }
     }
     $prprdelim->();
-    return () if $nogenerate;
+    return if $nogenerate;
 
     # Now we build it back up again
 
@@ -495,8 +532,6 @@ sub walk {
 
     my $rewriting = 0;
 
-    my $build = $basis;
-
     my $rm_tree_cached = sub {
        my ($subdir) = @_;
        runcmd @git, qw(rm --quiet -rf --cached), $subdir;
@@ -535,7 +570,6 @@ sub walk {
                $rewriting = 1;
                next;
            } elsif ($method eq 'RecordBreakwaterTip') {
-               last if $wantbrwonly;
                $breakwater = $build;
                next;
            } elsif ($method eq 'DgitImportDebianUpdate') {
@@ -572,16 +606,14 @@ sub walk {
        }
     };
 
-    runcmd @git, qw(diff-tree --quiet),
-       map { $wantdebonly ? "$_:debian" : $_ }
-       $input, $build;
+    runcmd @git, qw(diff-tree --quiet), $input, $build;
 
     return ($build, $breakwater);
 }
 
 sub get_head () { return git_rev_parse qw(HEAD); }
 
-sub update_head ($$) {
+sub update_head ($$$) {
     my ($old, $new, $mrest) = @_;
     runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
 }
@@ -610,7 +642,7 @@ sub cmd_analyse () {
     STDOUT->error and die $!;
 }
 
-my $toplevel = runcmd @git, qw(rev-parse --show-toplevel);
+my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
 chdir $toplevel or die "chdir $toplevel: $!";
 
 my $cmd = shift @ARGV;