Show More
@@ -295,9 +295,24 b' def _lfconvert_addchangeset(rsrc, rdst, ' | |||||
295 | if f == '.hgtags': |
|
295 | if f == '.hgtags': | |
296 | newdata = [] |
|
296 | newdata = [] | |
297 | for line in data.splitlines(): |
|
297 | for line in data.splitlines(): | |
298 | id, name = line.split(' ', 1) |
|
298 | try: | |
299 | newdata.append('%s %s\n' % (node.hex(revmap[node.bin(id)]), |
|
299 | id, name = line.split(' ', 1) | |
300 |
|
|
300 | except ValueError: | |
|
301 | repo.ui.warn(_('skipping incorrectly formatted tag %s\n' | |||
|
302 | % line)) | |||
|
303 | continue | |||
|
304 | try: | |||
|
305 | newid = node.bin(id) | |||
|
306 | except TypeError: | |||
|
307 | repo.ui.warn(_('skipping incorrectly formatted id %s\n' | |||
|
308 | % id)) | |||
|
309 | continue | |||
|
310 | try: | |||
|
311 | newdata.append('%s %s\n' % (node.hex(revmap[newid]), | |||
|
312 | name)) | |||
|
313 | except KeyError: | |||
|
314 | repo.ui.warn(_('no mapping for id %s\n' % id)) | |||
|
315 | continue | |||
301 | data = ''.join(newdata) |
|
316 | data = ''.join(newdata) | |
302 | return context.memfilectx(f, data, 'l' in fctx.flags(), |
|
317 | return context.memfilectx(f, data, 'l' in fctx.flags(), | |
303 | 'x' in fctx.flags(), renamed) |
|
318 | 'x' in fctx.flags(), renamed) |
General Comments 0
You need to be logged in to leave comments.
Login now