##// END OF EJS Templates
util: use built-in set instead of util.unique
Martin Geisler -
r8151:12728188 default
parent child Browse files
Show More
@@ -168,7 +168,7 b' class gnuarch_source(converter_source, c'
168 copies.update(cps)
168 copies.update(cps)
169
169
170 self.lastrev = rev
170 self.lastrev = rev
171 return util.sort(util.unique(changes)), copies
171 return util.sort(set(changes)), copies
172
172
173 def getcommit(self, rev):
173 def getcommit(self, rev):
174 changes = self.changes[rev]
174 changes = self.changes[rev]
@@ -754,7 +754,7 b' class svn_source(converter_source):'
754 copytopath = self.getrelpath(copytopath)
754 copytopath = self.getrelpath(copytopath)
755 copies[self.recode(copytopath)] = self.recode(entry, pmodule)
755 copies[self.recode(copytopath)] = self.recode(entry, pmodule)
756
756
757 return (util.unique(entries), copies)
757 return (list(set(entries)), copies)
758
758
759 def _fetch_revisions(self, from_revnum, to_revnum):
759 def _fetch_revisions(self, from_revnum, to_revnum):
760 if from_revnum < to_revnum:
760 if from_revnum < to_revnum:
@@ -204,7 +204,7 b' class queue:'
204 bad = self.check_guard(guard)
204 bad = self.check_guard(guard)
205 if bad:
205 if bad:
206 raise util.Abort(bad)
206 raise util.Abort(bad)
207 guards = util.sort(util.unique(guards))
207 guards = util.sort(set(guards))
208 self.ui.debug(_('active guards: %s\n') % ' '.join(guards))
208 self.ui.debug(_('active guards: %s\n') % ' '.join(guards))
209 self.active_guards = guards
209 self.active_guards = guards
210 self.guards_dirty = True
210 self.guards_dirty = True
@@ -1190,11 +1190,11 b' class queue:'
1190 del mm[mm.index(x)]
1190 del mm[mm.index(x)]
1191 dd.append(x)
1191 dd.append(x)
1192
1192
1193 m = util.unique(mm)
1193 m = list(set(mm))
1194 r = util.unique(dd)
1194 r = list(set(dd))
1195 a = util.unique(aa)
1195 a = list(set(aa))
1196 c = [filter(matchfn, l) for l in (m, a, r)]
1196 c = [filter(matchfn, l) for l in (m, a, r)]
1197 match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2]))
1197 match = cmdutil.matchfiles(repo, set(c[0] + c[1] + c[2]))
1198 chunks = patch.diff(repo, patchparent, match=match,
1198 chunks = patch.diff(repo, patchparent, match=match,
1199 changes=c, opts=self.diffopts())
1199 changes=c, opts=self.diffopts())
1200 for chunk in chunks:
1200 for chunk in chunks:
@@ -734,7 +734,7 b' class memctx(object):'
734 parents = [(p or nullid) for p in parents]
734 parents = [(p or nullid) for p in parents]
735 p1, p2 = parents
735 p1, p2 = parents
736 self._parents = [changectx(self._repo, p) for p in (p1, p2)]
736 self._parents = [changectx(self._repo, p) for p in (p1, p2)]
737 files = util.sort(util.unique(files))
737 files = util.sort(set(files))
738 self._status = [files, [], [], [], []]
738 self._status = [files, [], [], [], []]
739 self._filectxfn = filectxfn
739 self._filectxfn = filectxfn
740
740
@@ -454,7 +454,7 b' class dirstate(object):'
454 work = []
454 work = []
455 wadd = work.append
455 wadd = work.append
456
456
457 files = util.unique(match.files())
457 files = set(match.files())
458 if not files or '.' in files:
458 if not files or '.' in files:
459 files = ['']
459 files = ['']
460 results = {'.hg': None}
460 results = {'.hg': None}
@@ -791,7 +791,7 b' class localrepository(repo.repository):'
791 if extra.get("close"):
791 if extra.get("close"):
792 force = True
792 force = True
793 if files:
793 if files:
794 files = util.unique(files)
794 files = list(set(files))
795 try:
795 try:
796 wlock = self.wlock()
796 wlock = self.wlock()
797 lock = self.lock()
797 lock = self.lock()
@@ -219,10 +219,6 b' def binary(s):'
219 """return true if a string is binary data"""
219 """return true if a string is binary data"""
220 return bool(s and '\0' in s)
220 return bool(s and '\0' in s)
221
221
222 def unique(g):
223 """return the uniq elements of iterable g"""
224 return dict.fromkeys(g).keys()
225
226 def sort(l):
222 def sort(l):
227 if not isinstance(l, list):
223 if not isinstance(l, list):
228 l = list(l)
224 l = list(l)
@@ -171,7 +171,7 b' def _verify(repo):'
171 elif size > 0:
171 elif size > 0:
172 storefiles[f] = True
172 storefiles[f] = True
173
173
174 files = util.sort(util.unique(filenodes.keys() + filelinkrevs.keys()))
174 files = util.sort(set(filenodes.keys() + filelinkrevs.keys()))
175 for f in files:
175 for f in files:
176 lr = filelinkrevs[f][0]
176 lr = filelinkrevs[f][0]
177 try:
177 try:
General Comments 0
You need to be logged in to leave comments. Login now