From 619204c5cce3f7629c51af512c711aa5d5a237db Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 14 Jun 2017 23:38:01 +0100
Subject: [PATCH] git-debrebase: rename @upp_cl @brw_cl $wantbrwonly

---
 git-debrebase | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index 5be04b9b..2a6aea7a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -318,12 +318,13 @@ sub walk ($;$$$$);
 sub walk {
     my ($input,
 	$nogenerate,$report,
-	$wantdebonly,$depth) = @_;
+	$wantbrwonly,$depth) = @_;
     # => ($tip, $breakwater_tip)
 
     # go through commits backwards
-    # we generate two lists of commits to apply
-    my (@deb_cl, @ups_cl, @processed);
+    # we generate two lists of commits to apply:
+    # breakwater branch and upstream patches
+    my (@brw_cl, @upp_cl, @processed);
     my %found;
     my @pseudomerges;
 
@@ -363,7 +364,7 @@ sub walk {
 
     for (;;) {
 	if (!defined $cur) {
-	    push @deb_cl, { ExactlyParents => [] };
+	    push @brw_cl, { ExactlyParents => [] };
 	    $prline->("Origin");
 	    last;
 	}
@@ -379,15 +380,15 @@ sub walk {
 	    $rewrite_from_here->();
 	    next;
 	} elsif ($ty eq 'Packaging') {
-	    push @deb_cl, $cl;
+	    push @brw_cl, $cl;
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Packaging') {
-	    push @deb_cl, $cl;
+	    push @brw_cl, $cl;
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Upstream') {
-	    push @ups_cl, $cl;
+	    push @upp_cl, $cl;
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Mixed') {
@@ -396,8 +397,8 @@ sub walk {
 		my $cls = { $cl, $xmsg->("split mixed commit: $wh part") };
 		push @$q, $cls;
 	    };
-	    $queue->(\@deb_cl, "debian");
-	    $queue->(\@ups_cl, "upstream");
+	    $queue->(\@brw_cl, "debian");
+	    $queue->(\@upp_cl, "upstream");
 	    $rewrite_from_here->();
 	    next;
 	} elsif ($ty eq 'Pseudomerge') {
@@ -407,7 +408,7 @@ sub walk {
 	    $cur = $ty->{Contributor};
 	    next;
 	} elsif ($ty eq 'BreakwaterUpstreamMerge') {
-	    push @deb_cl, { ExactlyParents => [$cur] };
+	    push @brw_cl, { ExactlyParents => [$cur] };
 	    $prline->("PreviousBreakwater");
 	    last;
 	} elsif ($ty eq 'DgitImportUnpatched') {
@@ -440,7 +441,7 @@ sub walk {
 		# right; or, otherwise, it was a non-gitish upload of a
 		# new upstream version.  We can tell these apart by
 		# looking at the tree of the supposed upstream.
-		push @deb_cl, {
+		push @brw_cl, {
 		    %$cl,
 		    SpecialMethod => 'DgitImportDebianUpdate',
                     $xmsg->("convert dgit import: debian changes")
@@ -453,7 +454,7 @@ sub walk {
 		    # deleted .gitignore (which is a thing that some of
 		    # the existing git tools do if the user doesn't
 		    # somehow tell them not to).  Ah well.
-		    push @deb_cl, {
+		    push @brw_cl, {
 			%$cl,
 			SpecialMethod => 'DgitImportUpstreamUpdate',
 		        $xmsg->("convert dgit import: upstream changes")
@@ -461,11 +462,11 @@ sub walk {
 		}
 		$prline->("Import");
 		$prprdelim->();
-		my ($basis,$dummy) = walk
+		my ($dummy,$basis) = walk
 		    $ovwr,
 		    $nogenerate, $report,
 		    1, $depth+1;
-		push @deb_cl, { ExactlyParents => [$basis] };
+		push @brw_cl, { ExactlyParents => [$basis] };
 		$rewrite_from_here->();
 		last;
 	    } else {
@@ -473,7 +474,7 @@ sub walk {
 		# is already in valid breakwater format, with the
 		# patches as commits.
 		printf $report " NoPM" if $report;
-		push @deb_cl, { ExactlyParents => [$cur] };
+		push @brw_cl, { ExactlyParents => [$cur] };
 		# 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
@@ -486,9 +487,7 @@ sub walk {
 	}
     }
     $prprdelim->();
-    if ($nogenerate) {
-	return (undef, $basis);
-    }
+    return () if $nogenerate;
 
     # Now we build it back up again
 
@@ -518,9 +517,9 @@ sub walk {
     in_workarea sub {
 	mkdir $rd or $!==EEXIST or die $!;
 	my $current_method;
-	foreach my $cl (qw(Debian), (reverse @deb_cl),
+	foreach my $cl (qw(Debian), (reverse @brw_cl),
 			{ SpecialMethod => 'RecordBreakwaterTip' },
-			qw(Upstream), (reverse @ups_cl)) {
+			qw(Upstream), (reverse @upp_cl)) {
 	    if (!ref $cl) {
 		$current_method = $cl;
 		next;
@@ -536,7 +535,7 @@ sub walk {
 		$rewriting = 1;
 		next;
 	    } elsif ($method eq 'RecordBreakwaterTip') {
-		last if $wantdebonly;
+		last if $wantbrwonly;
 		$breakwater = $build;
 		next;
 	    } elsif ($method eq 'DgitImportDebianUpdate') {
-- 
2.30.2