D5592: copies: use node.wdirrev instead of inventing another constant for it
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Jan 16 03:07:33 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe3e1b0639375: copies: use node.wdirrev instead of inventing another constant for it (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5592?vs=13230&id=13241
REVISION DETAIL
https://phab.mercurial-scm.org/D5592
AFFECTED FILES
mercurial/copies.py
CHANGE DETAILS
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -46,22 +46,21 @@
# - quit when interesting revs is zero
cl = repo.changelog
- working = len(cl) # pseudo rev for the working directory
if a is None:
- a = working
+ a = node.wdirrev
if b is None:
- b = working
+ b = node.wdirrev
side = {a: -1, b: 1}
visit = [-a, -b]
heapq.heapify(visit)
interesting = len(visit)
hascommonancestor = False
- limit = working
+ limit = node.wdirrev
while interesting:
r = -heapq.heappop(visit)
- if r == working:
+ if r == node.wdirrev:
parents = [cl.rev(p) for p in repo.dirstate.parents()]
else:
parents = cl.parentrevs(r)
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list