Show More
@@ -1231,13 +1231,12 b' def parents(repo, subset, x):' | |||||
1231 | The set of all parents for all changesets in set, or the working directory. |
|
1231 | The set of all parents for all changesets in set, or the working directory. | |
1232 | """ |
|
1232 | """ | |
1233 | if x is None: |
|
1233 | if x is None: | |
1234 |
ps = |
|
1234 | ps = set(p.rev() for p in repo[x].parents()) | |
1235 | return subset & ps |
|
1235 | else: | |
1236 |
|
1236 | ps = set() | ||
1237 | ps = set() |
|
1237 | cl = repo.changelog | |
1238 | cl = repo.changelog |
|
1238 | for r in getset(repo, spanset(repo), x): | |
1239 | for r in getset(repo, spanset(repo), x): |
|
1239 | ps.update(cl.parentrevs(r)) | |
1240 | ps.update(cl.parentrevs(r)) |
|
|||
1241 | return baseset(ps) & subset |
|
1240 | return baseset(ps) & subset | |
1242 |
|
1241 | |||
1243 | def parentspec(repo, subset, x, n): |
|
1242 | def parentspec(repo, subset, x, n): |
General Comments 0
You need to be logged in to leave comments.
Login now