Patchwork [14,of,35,V2] context: move __contains__ from changectx

login
register
mail settings
Submitter Sean Farley
Date Aug. 7, 2013, 11:51 p.m.
Message ID <394cacdf7f4fd1123604.1375919488@laptop.local>
Download mbox | patch
Permalink /patch/2067/
State Accepted
Headers show

Comments

Sean Farley - Aug. 7, 2013, 11:51 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1375741298 18000
#      Mon Aug 05 17:21:38 2013 -0500
# Node ID 394cacdf7f4fd11236044e94d847ccd82101efda
# Parent  a25bb9e926abaa5c787d27aa2671589a2f9f4fd2
context: move __contains__ from changectx

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -51,10 +51,13 @@ 
             return False
 
     def __ne__(self, other):
         return not (self == other)
 
+    def __contains__(self, key):
+        return key in self._manifest
+
     @propertycache
     def substate(self):
         return subrepo.state(self, self._repo.ui)
 
     def rev(self):
@@ -195,13 +198,10 @@ 
         p = self._repo.changelog.parentrevs(self._rev)
         if p[1] == nullrev:
             p = p[:-1]
         return [changectx(self._repo, x) for x in p]
 
-    def __contains__(self, key):
-        return key in self._manifest
-
     def __getitem__(self, key):
         return self.filectx(key)
 
     def __iter__(self):
         for f in sorted(self._manifest):