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