From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 14 Nov 2010 03:47:02 +0000 (-0500)
Subject: Instrumentation for branch debugging.
X-Git-Tag: 0.1~18
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=5f1ac162a02b067771a98cf143ebf73d4aa1bae6;p=rcs-fast-import.git

Instrumentation for branch debugging.
---

diff --git a/rcs-fast-import b/rcs-fast-import
index cdde124..0762826 100755
--- a/rcs-fast-import
+++ b/rcs-fast-import
@@ -677,8 +677,6 @@ class RCS(Generic):
     def checkin(self, commit, comment, op, path):
         "Check in a new revision - also used to create new masters."
         # This is the only manipulation of the branch structure there is.
-        if verbose >= DEBUG_BRANCHING:
-            print "commit", commit.branch
         if not os.path.exists(self.master(path)):
             myrev = "1.1"
         else:
@@ -772,7 +770,14 @@ if __name__ == '__main__':
                 except OSError:
                     raise FatalException("Couldn't create working directory.")
                 repo.fast_import(sys.stdin, progress=verbose>0)
+                lastcommit = None
                 for event in repo.commits():
+                    if verbose >= DEBUG_BRANCHING:
+                        if not lastcommit or lastcommit.branch != event.branch:
+                            print "commit", event.branch
+                        else:
+                            print "commit"
+                    lastcommit = event
                     vcs.precommit(event)
                     for op in event.fileops:
                         if op.op == "M":