mercurial/commands.py
changeset 32245 3a755652ce3a
parent 32221 9dc36df78403
parent 32205 b4e1e30528c7
child 32337 46ba2cdda476
equal deleted inserted replaced
32244:3de4c61b5087 32245:3a755652ce3a
  2306                 ids[n] = ctx.rev()
  2306                 ids[n] = ctx.rev()
  2307 
  2307 
  2308         # check ancestors for earlier grafts
  2308         # check ancestors for earlier grafts
  2309         ui.debug('scanning for duplicate grafts\n')
  2309         ui.debug('scanning for duplicate grafts\n')
  2310 
  2310 
  2311         for rev in repo.changelog.findmissingrevs(revs, [crev]):
  2311         # The only changesets we can be sure doesn't contain grafts of any
       
  2312         # revs, are the ones that are common ancestors of *all* revs:
       
  2313         for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
  2312             ctx = repo[rev]
  2314             ctx = repo[rev]
  2313             n = ctx.extra().get('source')
  2315             n = ctx.extra().get('source')
  2314             if n in ids:
  2316             if n in ids:
  2315                 try:
  2317                 try:
  2316                     r = repo[n].rev()
  2318                     r = repo[n].rev()