Mercurial > hg-stable

changeset 21845:04f5b5e3792e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
committablectx: move __contains__ into workingctx This was mistakenly moved from workingctx to committablectx in 9d56a3359011. Since the method is querying the dirstate, the only logical place is for it to reside is in workingctx.
author Sean Farley <sean.michael.farley@gmail.com>
date Thu, 03 Jul 2014 23:01:37 -0500
parents 7cfd94ec5d30
children 8f23f8096606
files mercurial/context.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Wed Jul 02 15:24:43 2014 -0500
+++ b/mercurial/context.py	Thu Jul 03 23:01:37 2014 -0500
@@ -976,9 +976,6 @@
     def __nonzero__(self):
         return True
 
-    def __contains__(self, key):
-        return self._repo.dirstate[key] not in "?r"
-
     def _buildflagfunc(self):
         # Create a fallback function for getting file flags when the
         # filesystem doesn't support them
@@ -1179,6 +1176,9 @@
             if d[f] != 'r':
                 yield f
 
+    def __contains__(self, key):
+        return self._repo.dirstate[key] not in "?r"
+
     @propertycache
     def _parents(self):
         p = self._repo.dirstate.parents()