From 49d414e316753377623e913e4576384986c108b8 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 12 Aug 2018 19:04:20 +0100
Subject: [PATCH] git-debrebase: walk: Introduce $read_tree_debian

We are going to make these do something more efficient, sometimes.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index 24aefbe5..1e205c60 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1441,6 +1441,11 @@ sub walk ($;$$$) {
 	    read_tree_upstream $treeish, 0, $build;
 	};
 
+	my $read_tree_debian = sub {
+	    my ($treeish) = @_;
+	    read_tree_debian($treeish);
+	};
+
 	foreach my $cl (qw(Debian), (reverse @brw_cl),
 			{ SpecialMethod => 'RecordBreakwaterTip' },
 			qw(Upstream), (reverse @upp_cl)) {
@@ -1454,7 +1459,7 @@ sub walk ($;$$$) {
 	    printdebug "WALK BUILD ".($cltree//'undef').
 		" $method (rewriting=$rewriting)\n";
 	    if ($method eq 'Debian') {
-		read_tree_debian($cltree);
+		$read_tree_debian->($cltree);
 	    } elsif ($method eq 'Upstream') {
 		$read_tree_upstream->($cltree);
 	    } elsif ($method eq 'StartRewrite') {
@@ -1464,7 +1469,7 @@ sub walk ($;$$$) {
 		$breakwater = $build;
 		next;
 	    } elsif ($method eq 'DgitImportDebianUpdate') {
-		read_tree_debian($cltree);
+		$read_tree_debian->($cltree);
 	    } elsif ($method eq 'DgitImportUpstreamUpdate') {
  		confess unless $rewriting;
 		my $differs = (get_differs $build, $cltree);
@@ -1475,7 +1480,7 @@ sub walk ($;$$$) {
 		print "Found a general merge, will try to tidy it up.\n";
 		$rewriting = 1;
 		$read_tree_upstream->($cl->{MergeBestAnchor});
-		read_tree_debian($cltree);
+		$read_tree_debian->($cltree);
 		@parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
 	    } elsif ($method eq 'MergeMergeSeries') {
 		my $cachehit = reflog_cache_lookup
-- 
2.30.2