Mercurial > hg > mercurial-source
changeset 33395:a8262b7784f9
py3: replace None with -1 to sort an integer array
In Python 2:
>>> ls = [4, 2, None]
>>> sorted(ls)
[None, 2, 4]
In Python 3:
>>> ls = [4, 2, None]
>>> sorted(ls)
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
TypeError: unorderable types: NoneType() < int()
Therefore we replaced None with -1, and the safe part is that, None and -1 are
only the keys which are used for sorting so we don't need to convert the -1's
back to None.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 31 May 2017 23:48:52 +0530 |
parents | 954489932c4f |
children | e7eb7494e98d |
files | mercurial/merge.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -801,7 +801,7 @@ # manifests fetched in order are going to be faster, so prime the caches [x.manifest() for x in - sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev())] + sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev() or -1)] if followcopies: ret = copies.mergecopies(repo, wctx, p2, pa)