This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3219

py3: workaround comparing NoneType and integers
ClosedPublic

Authored by pulkit on Apr 10 2018, 10:15 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa7de62adcf03: py3: workaround comparing NoneType and integers
Summary

Comparing None with integers was fine in Python 2 but returns error in Python 3
which is nice. This patch replaces None with -1 where sorting is done and some
related logic.

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.Apr 10 2018, 10:15 AM
Closed by commit rHGa7de62adcf03: py3: workaround comparing NoneType and integers (authored by pulkit). · Explain WhyApr 11 2018, 8:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7971

hgext/mq.py

qfinished = [] qfinished = []
if numrevs: if numrevs:
qfinished = self.applied[:numrevs] qfinished = self.applied[:numrevs]
del self.applied[:numrevs] del self.applied[:numrevs]
self.applieddirty = True self.applieddirty = True
unknown = [] unknown = []
for (i, p) in sorted([(self.findseries(p), p) for p in patches], sortedseries = []
reverse=True): for p in patches:
if i is not None: idx = self.findseries(p)
if idx is None:
sortedseries.append((-1, p))
else:
sortedseries.append((idx, p))
sortedseries.sort(reverse=True)
for (i, p) in sortedseries:
if i != -1:
del self.fullseries[i] del self.fullseries[i]
else: else:
unknown.append(p) unknown.append(p)
if unknown: if unknown:
if numrevs: if numrevs:
rev = dict((entry.name, entry.node) for entry in qfinished) rev = dict((entry.name, entry.node) for entry in qfinished)
for p in unknown: for p in unknown: