equal
deleted
inserted
replaced
317 except StopIteration: |
317 except StopIteration: |
318 return baseset() |
318 return baseset() |
319 for r in reviter: |
319 for r in reviter: |
320 anc = anc.ancestor(repo[r]) |
320 anc = anc.ancestor(repo[r]) |
321 |
321 |
322 if anc.rev() in subset: |
322 r = scmutil.intrev(anc) |
323 return baseset([anc.rev()]) |
323 if r in subset: |
|
324 return baseset([r]) |
324 return baseset() |
325 return baseset() |
325 |
326 |
326 def _ancestors(repo, subset, x, followfirst=False, startdepth=None, |
327 def _ancestors(repo, subset, x, followfirst=False, startdepth=None, |
327 stopdepth=None): |
328 stopdepth=None): |
328 heads = getset(repo, fullreposet(repo), x) |
329 heads = getset(repo, fullreposet(repo), x) |