##// END OF EJS Templates
cvsps: avoid comparison between None and a tuple in date sorting...
Augie Fackler -
r38313:80f6e95f default
parent child Browse files
Show More
@@ -567,11 +567,15 b' def createchangeset(ui, log, fuzz=60, me'
567 mindate = {}
567 mindate = {}
568 for e in log:
568 for e in log:
569 if e.commitid:
569 if e.commitid:
570 mindate[e.commitid] = min(e.date, mindate.get(e.commitid))
570 if e.commitid not in mindate:
571 mindate[e.commitid] = e.date
572 else:
573 mindate[e.commitid] = min(e.date, mindate[e.commitid])
571
574
572 # Merge changesets
575 # Merge changesets
573 log.sort(key=lambda x: (mindate.get(x.commitid), x.commitid, x.comment,
576 log.sort(key=lambda x: (mindate.get(x.commitid, (-1, 0)),
574 x.author, x.branch, x.date, x.branchpoints))
577 x.commitid or '', x.comment,
578 x.author, x.branch or '', x.date, x.branchpoints))
575
579
576 changesets = []
580 changesets = []
577 files = set()
581 files = set()
General Comments 0
You need to be logged in to leave comments. Login now