git-debrebase: finish get_differs ?

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index b3b5ea691e37cee8775134adefa4818ac4957996..a39699ae5dfd08cf7ff674999a1eee1148e826df 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -145,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)]);
@@ -316,7 +383,7 @@ sub classify ($) {
 }
 
 sub walk ($;$$);
-sub walk {
+sub walk ($;$$) {
     my ($input,
        $nogenerate,$report) = @_;
     # => ($tip, $breakwater_tip)
@@ -573,7 +640,7 @@ sub walk {
 
 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;
 }
@@ -602,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;