mercurial-scm/hg: mercurial/context.py comparison

context: add a fast-comparision for arbitraryfilectx and workingfilectx Differential Revision: https://phab.mercurial-scm.org/D1056

comparison

equal deleted inserted replaced

-:5d98674df18a
+:6036e6e205ca
 # GNU General Public License version 2 or any later version.
 from __future__ import absolute_import
 import errno
+import filecmp
 import os
 import re
 import stat
 from .i18n import _
 class arbitraryfilectx(object):
 """Allows you to use filectx-like functions on a file in an arbitrary
 location on disk, possibly not in the working directory.
 """
-def __init__(self, path):
+def __init__(self, path, repo=None):
+# Repo is optional because contrib/simplemerge uses this class.
+self._repo = repo
 self._path = path
-def cmp(self, otherfilectx):
+def cmp(self, fctx):
-return self.data() != otherfilectx.data()
+if isinstance(fctx, workingfilectx) and self._repo:
+# Add a fast-path for merge if both sides are disk-backed.
+# Note that filecmp uses the opposite return values as cmp.
+return not filecmp.cmp(self.path(), self._repo.wjoin(fctx.path()))
+return self.data() != fctx.data()
 def path(self):
 return self._path
 def flags(self):

Mercurial > public > mercurial-scm > hg