Show More
@@ -311,14 +311,15 b' def ancestor(repo, subset, x):' | |||
|
311 | 311 | Will return empty list when passed no args. |
|
312 | 312 | Greatest common ancestor of a single changeset is that changeset. |
|
313 | 313 | """ |
|
314 | anc = None | |
|
315 | for r in orset(repo, fullreposet(repo), x, order=anyorder): | |
|
316 | if anc is None: | |
|
317 | anc = repo[r] | |
|
318 | else: | |
|
314 | reviter = iter(orset(repo, fullreposet(repo), x, order=anyorder)) | |
|
315 | try: | |
|
316 | anc = repo[next(reviter)] | |
|
317 | except StopIteration: | |
|
318 | return baseset() | |
|
319 | for r in reviter: | |
|
319 | 320 |
|
|
320 | 321 | |
|
321 |
if |
|
|
322 | if anc.rev() in subset: | |
|
322 | 323 | return baseset([anc.rev()]) |
|
323 | 324 | return baseset() |
|
324 | 325 |
General Comments 0
You need to be logged in to leave comments.
Login now