Patchwork D3723: cvsps: avoid comparison between None and a tuple in date sorting

login
register
mail settings
Submitter phabricator
Date June 13, 2018, 12:37 p.m.
Message ID <26aab91fbe3e8ac477dddc34a8f36373@localhost.localdomain>
Download mbox | patch
Permalink /patch/32108/
State Not Applicable
Headers show

Comments

phabricator - June 13, 2018, 12:37 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG80f6e95fac2d: cvsps: avoid comparison between None and a tuple in date sorting (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3723?vs=9035&id=9044

REVISION DETAIL
  https://phab.mercurial-scm.org/D3723

AFFECTED FILES
  hgext/convert/cvsps.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

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()