This is an archive of the discontinued Mercurial Phabricator instance.

Differential D852

py3: return False early while checking whether None is a key in lazymanifest
ClosedPublic

Authored by pulkit on Sep 30 2017, 8:50 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG05167447f90d: py3: return False early while checking whether None is a key in lazymanifest
Summary

In this patch we returns False early if we are trying to check whether None is a
key in lazymanifest. The reason I added a diff is that on Python 3, it goes into
the lazy manifest code an returns a TypeError. I checked with Durham that
whether None can be a possible key in lazymanifest and he said "no". So it's
safe to have this if statement.

This fixes hg merge on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Sep 30 2017, 8:50 AM
durin42 accepted this revision.Sep 30 2017, 9:03 AM
This revision is now accepted and ready to land.Sep 30 2017, 9:03 AM
Closed by commit rHG05167447f90d: py3: return False early while checking whether None is a key in lazymanifest (authored by pulkit). · Explain WhySep 30 2017, 9:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2187

mercurial/manifest.py

return len(self._lm) != 0 return len(self._lm) != 0
__bool__ = __nonzero__ __bool__ = __nonzero__
def __setitem__(self, key, node): def __setitem__(self, key, node):
self._lm[key] = node, self.flags(key, '') self._lm[key] = node, self.flags(key, '')
def __contains__(self, key): def __contains__(self, key):
if key is None:
return False
return key in self._lm return key in self._lm
def __delitem__(self, key): def __delitem__(self, key):
del self._lm[key] del self._lm[key]
def __iter__(self): def __iter__(self):
return self._lm.__iter__() return self._lm.__iter__()