From patchwork Wed Aug  7 18:13:14 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [14,of,36] context: move __contains__ from changectx
From: Sean Farley <sean.michael.farley@gmail.com>
X-Patchwork-Id: 2031
Message-Id: <20ff662fb116f1965d7f.1375899194@laptop.local>
To: mercurial-devel@selenic.com
Date: Wed, 07 Aug 2013 13:13:14 -0500

# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1375741298 18000
#      Mon Aug 05 17:21:38 2013 -0500
# Node ID 20ff662fb116f1965d7fbd708720e2c23d5d9ace
# Parent  9aa65e66eb781a4d9ac54fc6ec7d889dfef2cb72
context: move __contains__ from changectx

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):
@@ -189,13 +192,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):