# HG changeset patch # User Augie Fackler # Date 2018-04-27 05:24:04 # Node ID fe148d7544a41b2fda2517a531372b6e194da67d # Parent a38ac7ec8e039b3283f7d7240f46f992a66fc640 cvsps: wrap cmp methods (deprecated) in functools.cmp_to_key Differential Revision: https://phab.mercurial-scm.org/D3484 diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py +++ b/hgext/convert/cvsps.py @@ -6,6 +6,7 @@ # GNU General Public License version 2 or any later version. from __future__ import absolute_import +import functools import os import re @@ -653,7 +654,7 @@ def createchangeset(ui, log, fuzz=60, me return 0 for c in changesets: - c.entries.sort(entitycompare) + c.entries.sort(key=functools.cmp_to_key(entitycompare)) # Sort changesets by date @@ -706,7 +707,7 @@ def createchangeset(ui, log, fuzz=60, me d = c(len(l.branchpoints), len(r.branchpoints)) return d - changesets.sort(cscmp) + changesets.sort(key=functools.cmp_to_key(cscmp)) # Collect tags