From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 7 Jul 2017 10:49:22 +0000 (+0100)
Subject: git-debrebase: wip
X-Git-Tag: archive/debian/5.0~340
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=966d36a2520eb2c117d05e7a8cda8865fd46d2d2

git-debrebase: wip
---

diff --git a/git-debrebase b/git-debrebase
index e3835e3d..b2839d59 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -145,6 +145,42 @@ 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 ($sfx, $fn) = @_;
+	my @cmd = (@git, qw(diff-tree -z --name-only));
+	push @cmd "$_:$sfx" foreach $x, $y;
+	my $diffs = cmdoutput @bcmd, $x, $y;
+	foreach $f (split /\0/, $diffs) { $fn->(); }
+    };
+
+    $rundiff('', sub {
+        $differs |= $f eq 'debian' ? D_DEB : D_UPS;
+    });
+
+    if ($differs & D_DEB) {
+	$differs &= ~D_DEB;
+	$rundiff(':debian', sub {
+            $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB;
+	});
+    }
+
+    if ($differs & D_PAT_OTH) {
+	
+	
+    
+	
+	}
+	    $f eq '
+
 sub commit_pr_info ($) {
     my ($r) = @_;
     return Data::Dumper->dump([$r], [qw(commit)]);