X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=e3835e3d0d796442dc1bb9ba849e0d8b66fb80a2;hb=842f62c97bc4d78cfda3ed76d3335bafd20e9fd0;hp=3578715679cb78b69feabed9841ba4e824ab7036;hpb=6751d0fc1a0a3228fb62ef65206aebcc57b2acdf;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 35787156..e3835e3d 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);
@@ -315,7 +316,7 @@ sub classify ($) {
 }
 
 sub walk ($;$$);
-sub walk {
+sub walk ($;$$) {
     my ($input,
 	$nogenerate,$report) = @_;
     # => ($tip, $breakwater_tip)
@@ -342,7 +343,6 @@ sub walk {
 	push @brw_cl, $sp_cl;
 	push @processed, $sp_cl;
     };
-
     my $cur = $input;
 
     my $prdelim = "";
@@ -363,12 +363,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) {
-	    push @brw_cl, { ExactlyParents => [] };
-	    $prline->("Origin");
-	    last;
-	}
 	$cl = classify $cur;
 	my $ty = $cl->{Type};
 	my $st = $cl->{SubType};
@@ -385,8 +390,7 @@ sub walk {
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'BreakwaterStart') {
-	    push @brw_cl, { ExactlyParents => [$cur] };
-	    last;
+	    $build_start->('FirstPackaging', $cur);
 	} elsif ($ty eq 'Upstream') {
 	    push @upp_cl, $cl;
 	    $cur = $p0;
@@ -409,9 +413,7 @@ sub walk {
 	    $cur = $ty->{Contributor};
 	    next;
 	} elsif ($ty eq 'BreakwaterUpstreamMerge') {
-	    push @brw_cl, { ExactlyParents => [$cur] };
-	    $prline->("PreviousBreakwater");
-	    last;
+	    $build_start->("PreviousBreakwater", $cur);
 	} elsif ($ty eq 'DgitImportUnpatched') {
 	    my $pm = $pseudomerges[-1];
 	    if (defined $pm) {
@@ -463,7 +465,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 {
@@ -471,12 +473,10 @@ sub walk {
 		# is already in valid breakwater format, with the
 		# patches as commits.
 		printf $report " NoPM" if $report;
-		$prline->(" ImportOrigin");
 		# 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
-		push @brw_cl, { ExactlyParents => [$cur] };
-		last;
+		$build_start->("ImportOrigin", $cur);
 	    }
 	    die "$ty ?";
         } else {
@@ -492,8 +492,6 @@ sub walk {
 
     my $rewriting = 0;
 
-    my $build = $basis;
-
     my $rm_tree_cached = sub {
 	my ($subdir) = @_;
 	runcmd @git, qw(rm --quiet -rf --cached), $subdir;
@@ -532,7 +530,6 @@ sub walk {
 		$rewriting = 1;
 		next;
 	    } elsif ($method eq 'RecordBreakwaterTip') {
-		last if $wantbrwonly;
 		$breakwater = $build;
 		next;
 	    } elsif ($method eq 'DgitImportDebianUpdate') {
@@ -569,16 +566,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;
 }
@@ -607,7 +602,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;