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

diff --git a/git-debrebase b/git-debrebase
index 7b64bf51..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)
@@ -342,13 +381,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 +401,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 +428,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 +451,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 +503,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 +514,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 +530,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 +568,6 @@ sub walk {
 		$rewriting = 1;
 		next;
 	    } elsif ($method eq 'RecordBreakwaterTip') {
-		last if $wantbrwonly;
 		$breakwater = $build;
 		next;
 	    } elsif ($method eq 'DgitImportDebianUpdate') {
@@ -568,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;
 }
@@ -606,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;