# HG changeset patch # User Martin Geisler # Date 2009-04-21 22:56:06 # Node ID 127281884959297f9737e3b9cdea46b02685e434 # Parent bbc24c0753a043a5ee748a535b3b186acea8f6a9 util: use built-in set instead of util.unique diff --git a/hgext/convert/gnuarch.py b/hgext/convert/gnuarch.py --- a/hgext/convert/gnuarch.py +++ b/hgext/convert/gnuarch.py @@ -168,7 +168,7 @@ class gnuarch_source(converter_source, c copies.update(cps) self.lastrev = rev - return util.sort(util.unique(changes)), copies + return util.sort(set(changes)), copies def getcommit(self, rev): changes = self.changes[rev] diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -754,7 +754,7 @@ class svn_source(converter_source): copytopath = self.getrelpath(copytopath) copies[self.recode(copytopath)] = self.recode(entry, pmodule) - return (util.unique(entries), copies) + return (list(set(entries)), copies) def _fetch_revisions(self, from_revnum, to_revnum): if from_revnum < to_revnum: diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -204,7 +204,7 @@ class queue: bad = self.check_guard(guard) if bad: raise util.Abort(bad) - guards = util.sort(util.unique(guards)) + guards = util.sort(set(guards)) self.ui.debug(_('active guards: %s\n') % ' '.join(guards)) self.active_guards = guards self.guards_dirty = True @@ -1190,11 +1190,11 @@ class queue: del mm[mm.index(x)] dd.append(x) - m = util.unique(mm) - r = util.unique(dd) - a = util.unique(aa) + m = list(set(mm)) + r = list(set(dd)) + a = list(set(aa)) c = [filter(matchfn, l) for l in (m, a, r)] - match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2])) + match = cmdutil.matchfiles(repo, set(c[0] + c[1] + c[2])) chunks = patch.diff(repo, patchparent, match=match, changes=c, opts=self.diffopts()) for chunk in chunks: diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -734,7 +734,7 @@ class memctx(object): parents = [(p or nullid) for p in parents] p1, p2 = parents self._parents = [changectx(self._repo, p) for p in (p1, p2)] - files = util.sort(util.unique(files)) + files = util.sort(set(files)) self._status = [files, [], [], [], []] self._filectxfn = filectxfn diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -454,7 +454,7 @@ class dirstate(object): work = [] wadd = work.append - files = util.unique(match.files()) + files = set(match.files()) if not files or '.' in files: files = [''] results = {'.hg': None} diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -791,7 +791,7 @@ class localrepository(repo.repository): if extra.get("close"): force = True if files: - files = util.unique(files) + files = list(set(files)) try: wlock = self.wlock() lock = self.lock() diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -219,10 +219,6 @@ def binary(s): """return true if a string is binary data""" return bool(s and '\0' in s) -def unique(g): - """return the uniq elements of iterable g""" - return dict.fromkeys(g).keys() - def sort(l): if not isinstance(l, list): l = list(l) diff --git a/mercurial/verify.py b/mercurial/verify.py --- a/mercurial/verify.py +++ b/mercurial/verify.py @@ -171,7 +171,7 @@ def _verify(repo): elif size > 0: storefiles[f] = True - files = util.sort(util.unique(filenodes.keys() + filelinkrevs.keys())) + files = util.sort(set(filenodes.keys() + filelinkrevs.keys())) for f in files: lr = filelinkrevs[f][0] try: