From patchwork Thu Feb 27 18:30:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D8118: mergestate: determine if active without looking for state files on disk From: phabricator X-Patchwork-Id: 45369 Message-Id: <822407cdbef9044a287098805dce180f@localhost.localdomain> To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Thu, 27 Feb 2020 18:30:40 +0000 Closed by commit rHG5e3402a0b868: mergestate: determine if active without looking for state files on disk (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8118?vs=20360&id=20362 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 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)"""