equal
deleted
inserted
replaced
301 newdata = [] |
301 newdata = [] |
302 for line in data.splitlines(): |
302 for line in data.splitlines(): |
303 try: |
303 try: |
304 id, name = line.split(' ', 1) |
304 id, name = line.split(' ', 1) |
305 except ValueError: |
305 except ValueError: |
306 ui.warn(_('skipping incorrectly formatted tag %s\n' |
306 ui.warn(_('skipping incorrectly formatted tag %s\n') |
307 % line)) |
307 % line) |
308 continue |
308 continue |
309 try: |
309 try: |
310 newid = node.bin(id) |
310 newid = node.bin(id) |
311 except TypeError: |
311 except TypeError: |
312 ui.warn(_('skipping incorrectly formatted id %s\n' |
312 ui.warn(_('skipping incorrectly formatted id %s\n') |
313 % id)) |
313 % id) |
314 continue |
314 continue |
315 try: |
315 try: |
316 newdata.append('%s %s\n' % (node.hex(revmap[newid]), |
316 newdata.append('%s %s\n' % (node.hex(revmap[newid]), |
317 name)) |
317 name)) |
318 except KeyError: |
318 except KeyError: |