# HG changeset patch # User Yuya Nishihara # Date 2018-07-08 08:17:54 # Node ID f8b46245b26a574095a881c69bccae460286da69 # Parent b263133eeb5a5db11706fd146ea68ea7ce6ca632 py3: make 'None in lazyancestors' not crash This looks somewhat weird, but we have callers like 'torev(n) in futurecommon' around where torev(n) is dictlike.get(n). I could fix callers, but that would be unnecessarily verbose. diff --git a/mercurial/ancestor.py b/mercurial/ancestor.py --- a/mercurial/ancestor.py +++ b/mercurial/ancestor.py @@ -339,6 +339,10 @@ class lazyancestors(object): seen = self._containsseen if target in seen: return True + # Only integer target is valid, but some callers expect 'None in self' + # to be False. So we explicitly allow it. + if target is None: + return False parentrevs = self._parentrevs visit = self._containsvisit