X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=bcf49de8baf5cd816bd76ea83642eb4066f9b32f;hp=e83822c27cfbaa88f1aa7afafe154bfbc91c2964;hb=53d9de19ced796dba94ae6a78cad54a7bbd039bf;hpb=c3d0030260d0afae7d375977bc36a1f8e7eab8cb

diff --git a/git-debrebase b/git-debrebase
index e83822c2..bcf49de8 100755
--- 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,44 @@ 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 --no-renames --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) {
+	$rundiff(':debian/patches', sub {
+            
+        });
+	
+    
+	
+	}
+	    $f eq '
+
 sub commit_pr_info ($) {
     my ($r) = @_;
     return Data::Dumper->dump([$r], [qw(commit)]);
@@ -315,7 +354,7 @@ sub classify ($) {
 }
 
 sub walk ($;$$);
-sub walk {
+sub walk ($;$$) {
     my ($input,
 	$nogenerate,$report) = @_;
     # => ($tip, $breakwater_tip)
@@ -353,13 +392,6 @@ sub walk {
 	$prdelim = "\n";
     };
 
-    my $build_start = sub {
-	my ($msg, $parent) = @_;
-	$prline->(" $msg");
-	$build = $parent;
-	no warnings qw(exiting); last;
-    };
-
     my $bomb = sub { # usage: return $bomb->();
 	print $report " Unprocessable" if $report;
 	$prprdelim->();
@@ -370,6 +402,14 @@ sub walk {
     };
 
     my $build;
+    my $breakwater;
+
+    my $build_start = sub {
+	my ($msg, $parent) = @_;
+	$prline->(" $msg");
+	$build = $parent;
+	no warnings qw(exiting); last;
+    };
 
     for (;;) {
 	$cl = classify $cur;
@@ -529,7 +569,6 @@ sub walk {
 		next;
 	    } elsif ($method eq 'RecordBreakwaterTip') {
 		$breakwater = $build;
-		last if $wantbrwonly;
 		next;
 	    } elsif ($method eq 'DgitImportDebianUpdate') {
 		$read_tree_debian->($cltree);
@@ -565,16 +604,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;
 }
@@ -603,7 +640,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;