Patchwork D8118: mergestate: determine if active without looking for state files on disk

login
register
mail settings
Submitter phabricator
Date Feb. 27, 2020, 4:39 p.m.
Message ID <9f64d81a57db08a37ddf31ac4ed64ecc@localhost.localdomain>
Download mbox | patch
Permalink /patch/45366/
State Not Applicable
Headers show

Comments

phabricator - Feb. 27, 2020, 4:39 p.m.
martinvonz updated this revision to Diff 20360.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8118?vs=20212&id=20360

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8118/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8118

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: mjpieters, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -413,14 +413,7 @@ 
         Returns True if there appears to be mergestate. This is a rough proxy
         for "is a merge in progress."
         """
-        # Check local variables before looking at filesystem for performance
-        # reasons.
-        return (
-            bool(self._local)
-            or bool(self._state)
-            or self._repo.vfs.exists(self.statepathv1)
-            or self._repo.vfs.exists(self.statepathv2)
-        )
+        return bool(self._local) or bool(self._state)
 
     def commit(self):
         """Write current state on disk (if necessary)"""