[PATCH 2 of 4] bisect: extract the 'reset' logic into its own function

Pierre-Yves David pierre-yves.david at ens-lyon.org
Mon Oct 3 10:37:18 EDT 2016


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1472004833 -7200
#      Wed Aug 24 04:13:53 2016 +0200
# Node ID efd8013b1521399d07ca956c1cba7bd9f7dfc6e0
# Parent  ec6cb977f8e62bf13f86c3a7ebbee182ae50422e
# EXP-Topic bisect
bisect: extract the 'reset' logic into its own function

This is part of small clean up movement. The bisect module seem more appropriate
to host the bisect logic. The cleanup itself is motivated by some higher level
cleanup around vfs and locking.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -902,8 +902,7 @@ def bisect(ui, repo, rev=None, extra=Non
     cmdutil.checkunfinished(repo)
 
     if reset:
-        if repo.vfs.exists("bisect.state"):
-            repo.vfs.unlink("bisect.state")
+        hbisect.resetstate(repo)
         return
 
     state = hbisect.load_state(repo)
diff --git a/mercurial/hbisect.py b/mercurial/hbisect.py
--- a/mercurial/hbisect.py
+++ b/mercurial/hbisect.py
@@ -159,6 +159,11 @@ def save_state(repo, state):
                 f.write("%s %s\n" % (kind, hex(node)))
         f.close()
 
+def resetstate(repo):
+    """remove any bisect state from the repository"""
+    if repo.vfs.exists("bisect.state"):
+        repo.vfs.unlink("bisect.state")
+
 def get(repo, status):
     """
     Return a list of revision(s) that match the given status:


More information about the Mercurial-devel mailing list