git-debrebase: finish get_differs ?

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 7b64bf51f5cf65ff6957ecab6cd784ff24af8535..a39699ae5dfd08cf7ff674999a1eee1148e826df 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,73 @@ 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.
+    # Conversely we need to distinguish different kinds of changes to
+    # debian/ and debian/patches/.
+
+    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;
+       });
+       die "mysterious debian changes $x..$y"
+           unless $differs & (D_PAT_OTH|D_DEB);
+    }
+
+    if ($differs & D_PAT_OTH) {
+       my $mode;
+       $differs &= ~D_PAT_OTH;
+       my $pat_oth = sub {
+           $differs |= D_PAT_OTH;
+           no qw(exiting);  last;
+       };
+       $rundiff([qw(--name-status)], ':debian/patches', sub {
+            no warnings qw(exiting);
+            if (!defined $mode) {
+               $mode = $f;  next;
+           }
+           my $ok;
+           if ($mode eq 'A' && $f !~ m/(?:^|\.)series$/s) {
+               $ok = 1;
+           } elsif ($mode eq 'M' && $f eq 'series') {
+               my $x_s = git_cat_file "$x:debian/patches/series", 'blob';
+               my $y_s = git_cat_file "$y:debian/patches/series", 'blob';
+               chomp $x_s;  $x_s .= "\n";
+               $ok = $x_s eq substr($y_s, 0, length $x_s);
+           } else {
+               # nope
+           }
+           $mode = undef;
+           $differs |= $ok ? D_PAT_ADD : D_PAT_OTH;
+        });
+       die "mysterious debian/patches changes $x..$y"
+           unless $differs & (D_PAT_ADD|D_PAT_OTH);
+    }
+
+    return $differs;
+}
+
 sub commit_pr_info ($) {
     my ($r) = @_;
     return Data::Dumper->dump([$r], [qw(commit)]);
@@ -315,7 +383,7 @@ sub classify ($) {
 }
 
 sub walk ($;$$);
-sub walk {
+sub walk ($;$$) {
     my ($input,
        $nogenerate,$report) = @_;
     # => ($tip, $breakwater_tip)
@@ -342,13 +410,6 @@ 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;
 
     my $prdelim = "";
@@ -369,10 +430,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) {
-           $build_start->('Origin', []);
-       }
        $cl = classify $cur;
        my $ty = $cl->{Type};
        my $st = $cl->{SubType};
@@ -389,7 +457,7 @@ sub walk {
            $cur = $p0;
            next;
        } elsif ($ty eq 'BreakwaterStart') {
-           $build_start('FirstPackaging',[$cur]};
+           $build_start->('FirstPackaging', $cur);
        } elsif ($ty eq 'Upstream') {
            push @upp_cl, $cl;
            $cur = $p0;
@@ -412,7 +480,7 @@ sub walk {
            $cur = $ty->{Contributor};
            next;
        } elsif ($ty eq 'BreakwaterUpstreamMerge') {
-           $build_start->("PreviousBreakwater", [$cur]);
+           $build_start->("PreviousBreakwater", $cur);
        } elsif ($ty eq 'DgitImportUnpatched') {
            my $pm = $pseudomerges[-1];
            if (defined $pm) {
@@ -464,7 +532,7 @@ sub walk {
                }
                $prline->(" Import");
                $rewrite_from_here->();
-               $upp_limit //= $#upp; # further, deeper, patches discarded
+               $upp_limit //= $#upp_cl; # further, deeper, patches discarded
                $cur = $ovwr;
                next;
            } else {
@@ -475,7 +543,7 @@ sub walk {
                # 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
-               $build_start->("ImportOrigin",[$cur]);
+               $build_start->("ImportOrigin", $cur);
            }
            die "$ty ?";
         } else {
@@ -491,8 +559,6 @@ sub walk {
 
     my $rewriting = 0;
 
-    my $build = $basis;
-
     my $rm_tree_cached = sub {
        my ($subdir) = @_;
        runcmd @git, qw(rm --quiet -rf --cached), $subdir;
@@ -531,7 +597,6 @@ sub walk {
                $rewriting = 1;
                next;
            } elsif ($method eq 'RecordBreakwaterTip') {
-               last if $wantbrwonly;
                $breakwater = $build;
                next;
            } elsif ($method eq 'DgitImportDebianUpdate') {
@@ -568,16 +633,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;
 }
@@ -606,7 +669,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;