On Thu, May 27, 2010 at 02:14:47AM -0700, David Wilhelm wrote:
> +    def run_bisect_step(self, cmd):
> +        '''scroll to the rev of the working copy parent'''

Oops. Forgot to update the docstring after consolidating steps.

The attached makes more sense.
# HG changeset patch
# User David Wilhelm <d...@jumbledpile.com>
# Date 1274918958 25200
# Node ID 1b4f11dbd4c9ab191d103957a2bf7d3fcdabf4c1
# Parent  35821e37c0250337207875b391f8281b1917c87e
history: scroll to wc rev after a bisect mark

diff --git a/tortoisehg/hgtk/history.py b/tortoisehg/hgtk/history.py
--- a/tortoisehg/hgtk/history.py
+++ b/tortoisehg/hgtk/history.py
@@ -2524,20 +2524,26 @@
                         skip=False,
                         reset=True)
 
+    def run_bisect_step(self, cmd):
+        '''run one bisect step and scroll to the new working copy parent'''
+        self.execute_command(cmd, force=True)
+        self.refresh_model()
+        wcpar = [x.rev() for x in self.repo.parents()]
+        # unless something weird happened, wc has one parent
+        if len(wcpar) == 1:
+            self.graphview.scroll_to_revision(wcpar[0])
+
     def bisect_good(self, menuitem):
         cmd = ['hg', 'bisect', '--good', str(self.currevid)]
-        self.execute_command(cmd, force=True)
-        self.refresh_model()
+        self.run_bisect_step(cmd)
 
     def bisect_bad(self, menuitem):
         cmd = ['hg', 'bisect', '--bad', str(self.currevid)]
-        self.execute_command(cmd, force=True)
-        self.refresh_model()
+        self.run_bisect_step(cmd)
 
     def bisect_skip(self, menuitem):
         cmd = ['hg', 'bisect', '--skip', str(self.currevid)]
-        self.execute_command(cmd, force=True)
-        self.refresh_model()
+        self.run_bisect_step(cmd)
 
     def show_status(self, menuitem):
         rev = self.currevid
------------------------------------------------------------------------------

_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop

Reply via email to