This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3484

cvsps: wrap cmp methods (deprecated) in functools.cmp_to_key
ClosedPublic

Authored by durin42 on May 8 2018, 9:36 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGfe148d7544a4: cvsps: wrap cmp methods (deprecated) in functools.cmp_to_key
Summary

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

durin42 created this revision.May 8 2018, 9:36 AM
indygreg accepted this revision.May 8 2018, 2:20 PM
This revision is now accepted and ready to land.May 8 2018, 2:20 PM
Closed by commit rHGfe148d7544a4: cvsps: wrap cmp methods (deprecated) in functools.cmp_to_key (authored by durin42). · Explain WhyMay 8 2018, 2:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/cvsps.py (5 lines)

Diff 8559

hgext/convert/cvsps.py

# Mercurial built-in replacement for cvsps. # Mercurial built-in replacement for cvsps.
# #
# Copyright 2008, Frank Kingswood <frank@kingswood-consulting.co.uk> # Copyright 2008, Frank Kingswood <frank@kingswood-consulting.co.uk>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import functools
import os import os
import re import re
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
hook, hook,
return +1 return +1
elif l[i] < r[i]: elif l[i] < r[i]:
return -1 return -1
elif l[i] > r[i]: elif l[i] > r[i]:
return +1 return +1
return 0 return 0
for c in changesets: for c in changesets:
c.entries.sort(entitycompare) c.entries.sort(key=functools.cmp_to_key(entitycompare))
# Sort changesets by date # Sort changesets by date
odd = set() odd = set()
def cscmp(l, r): def cscmp(l, r):
d = sum(l.date) - sum(r.date) d = sum(l.date) - sum(r.date)
if d: if d:
return d return d
if not d: if not d:
d = c([e.file for e in l.entries], [e.file for e in r.entries]) d = c([e.file for e in l.entries], [e.file for e in r.entries])
# Try and put changes without a branch point before ones with # Try and put changes without a branch point before ones with
# a branch point. # a branch point.
if not d: if not d:
d = c(len(l.branchpoints), len(r.branchpoints)) d = c(len(l.branchpoints), len(r.branchpoints))
return d return d
changesets.sort(cscmp) changesets.sort(key=functools.cmp_to_key(cscmp))
# Collect tags # Collect tags
globaltags = {} globaltags = {}
for c in changesets: for c in changesets:
for e in c.entries: for e in c.entries:
for tag in e.tags: for tag in e.tags:
# remember which is the latest changeset to have this tag # remember which is the latest changeset to have this tag