Show More
@@ -46,22 +46,21 b' def _findlimit(repo, a, b):' | |||||
46 | # - quit when interesting revs is zero |
|
46 | # - quit when interesting revs is zero | |
47 |
|
47 | |||
48 | cl = repo.changelog |
|
48 | cl = repo.changelog | |
49 | working = len(cl) # pseudo rev for the working directory |
|
|||
50 | if a is None: |
|
49 | if a is None: | |
51 |
a = |
|
50 | a = node.wdirrev | |
52 | if b is None: |
|
51 | if b is None: | |
53 |
b = |
|
52 | b = node.wdirrev | |
54 |
|
53 | |||
55 | side = {a: -1, b: 1} |
|
54 | side = {a: -1, b: 1} | |
56 | visit = [-a, -b] |
|
55 | visit = [-a, -b] | |
57 | heapq.heapify(visit) |
|
56 | heapq.heapify(visit) | |
58 | interesting = len(visit) |
|
57 | interesting = len(visit) | |
59 | hascommonancestor = False |
|
58 | hascommonancestor = False | |
60 |
limit = |
|
59 | limit = node.wdirrev | |
61 |
|
60 | |||
62 | while interesting: |
|
61 | while interesting: | |
63 | r = -heapq.heappop(visit) |
|
62 | r = -heapq.heappop(visit) | |
64 |
if r == |
|
63 | if r == node.wdirrev: | |
65 | parents = [cl.rev(p) for p in repo.dirstate.parents()] |
|
64 | parents = [cl.rev(p) for p in repo.dirstate.parents()] | |
66 | else: |
|
65 | else: | |
67 | parents = cl.parentrevs(r) |
|
66 | parents = cl.parentrevs(r) |
General Comments 0
You need to be logged in to leave comments.
Login now