Show More
@@ -290,26 +290,24 b' class localrepository(repo.repository):' | |||||
290 | globaltags[k] = an, ah |
|
290 | globaltags[k] = an, ah | |
291 | tagtypes[k] = tagtype |
|
291 | tagtypes[k] = tagtype | |
292 |
|
292 | |||
293 |
|
|
293 | seen = set() | |
294 |
|
|
294 | f = None | |
295 | f = None |
|
295 | ctxs = [] | |
296 | ret = [] |
|
296 | for node in self.heads(): | |
297 | for node in self.heads(): |
|
297 | try: | |
298 | try: |
|
298 | fnode = self[node].filenode('.hgtags') | |
299 | fnode = self[node].filenode('.hgtags') |
|
299 | except error.LookupError: | |
300 | except error.LookupError: |
|
300 | continue | |
301 | continue |
|
301 | if fnode not in seen: | |
302 |
|
|
302 | seen.add(fnode) | |
303 |
|
|
303 | if not f: | |
304 | if not f: |
|
304 | f = self.filectx('.hgtags', fileid=fnode) | |
305 | f = self.filectx('.hgtags', fileid=fnode) |
|
305 | else: | |
306 |
|
|
306 | f = f.filectx(fnode) | |
307 | f = f.filectx(fnode) |
|
307 | ctxs.append(f) | |
308 | ret.append(f) |
|
|||
309 | return reversed(ret) |
|
|||
310 |
|
308 | |||
311 | # read the tags file from each head, ending with the tip |
|
309 | # read the tags file from each head, ending with the tip | |
312 |
for f in |
|
310 | for f in reversed(ctxs): | |
313 | readtags(f.data().splitlines(), f, "global") |
|
311 | readtags(f.data().splitlines(), f, "global") | |
314 |
|
312 | |||
315 | try: |
|
313 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now