From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Jan 2018 19:08:05 +0000 (+0000)
Subject: git-debrebase: walk: print some more debug
X-Git-Tag: archive/debian/5.0~287
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f0882dcc88d1c1032084913576287e6e5616b868

git-debrebase: walk: print some more debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 13ff81f6..9cffa31c 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -476,6 +476,8 @@ sub walk ($;$$) {
     # => ($tip, $breakwater_tip, $last_upstream_merge_in_breakwater)
     # (or nothing, if $nogenerate)
 
+    printdebug "*** WALK $input ".($nogenerate//0)." ".($report//'-')."\n";
+
     # go through commits backwards
     # we generate two lists of commits to apply:
     # breakwater branch and upstream patches
@@ -590,6 +592,7 @@ sub walk ($;$$) {
 		printf $report " PM=%s \@Overwr:%d", $pm, (scalar @$ovwrs)
 		    if $report;
 		if (@$ovwrs != 1) {
+                    printdebug "*** WALK BOMB DgitImportUnpatched\n";
 		    return $bomb->();
 		}
 		my $ovwr = $ovwrs->[0]{CommitId};
@@ -642,10 +645,15 @@ sub walk ($;$$) {
 	    }
 	    die "$ty ?";
         } else {
+            printdebug "*** WALK BOMB unrecognised\n";
 	    return $bomb->();
 	}
     }
     $prprdelim->();
+
+    printdebug "*** WALK prep done cur=$cur".
+        " brw $#brw_cl upp $#upp_cl proc $#processed pm $#pseudomerges\n";
+
     return if $nogenerate;
 
     # Now we build it back up again
@@ -744,7 +752,9 @@ sub walk ($;$$) {
     die sprintf "internal error %#x %s %s", $final_check, $build, $input
 	if $final_check & ~D_PAT_ADD;
 
-    return ($build, $breakwater, $last_upstream_update);
+    my @r = ($build, $breakwater, $last_upstream_update);
+    printdebug "*** WALK RETURN @r\n";
+    return @r
 }
 
 sub get_head () { return git_rev_parse qw(HEAD); }