D3723: cvsps: avoid comparison between None and a tuple in date sorting
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Wed Jun 13 01:09:07 UTC 2018
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Avoids badness on Python 3. I had to figure out which entries in this
object *could* be None experimentally, but I think I've got them all
now.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3723
AFFECTED FILES
hgext/convert/cvsps.py
CHANGE DETAILS
diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -567,11 +567,15 @@
mindate = {}
for e in log:
if e.commitid:
- mindate[e.commitid] = min(e.date, mindate.get(e.commitid))
+ if e.commitid not in mindate:
+ mindate[e.commitid] = e.date
+ else:
+ mindate[e.commitid] = min(e.date, mindate[e.commitid])
# Merge changesets
- log.sort(key=lambda x: (mindate.get(x.commitid), x.commitid, x.comment,
- x.author, x.branch, x.date, x.branchpoints))
+ log.sort(key=lambda x: (mindate.get(x.commitid, (-1, 0)),
+ x.commitid or '', x.comment,
+ x.author, x.branch or '', x.date, x.branchpoints))
changesets = []
files = set()
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list