Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 15360:73628b32d0c0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: fix duplicate filter logic
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Oct 2011 16:57:14 -0500
parents a5a8adf95e51
children 9a2582e325a5
comparison
equal deleted inserted replaced
15359:a5a8adf95e51 15360:73628b32d0c0
2551 ui.debug('scanning for duplicate grafts\n') 2551 ui.debug('scanning for duplicate grafts\n')
2552 for ctx in repo.set("::. - ::%ld", revs): 2552 for ctx in repo.set("::. - ::%ld", revs):
2553 n = ctx.extra().get('source') 2553 n = ctx.extra().get('source')
2554 if n and n in repo: 2554 if n and n in repo:
2555 r = repo[n].rev() 2555 r = repo[n].rev()
2556 ui.warn(_('skipping already grafted revision %s\n') % r) 2556 if r in revs:
2557 revs.remove(r) 2557 ui.warn(_('skipping already grafted revision %s\n') % r)
2558 revs.remove(r)
2558 if not revs: 2559 if not revs:
2559 return -1 2560 return -1
2560 2561
2561 for pos, ctx in enumerate(repo.set("%ld", revs)): 2562 for pos, ctx in enumerate(repo.set("%ld", revs)):
2562 current = repo['.'] 2563 current = repo['.']