facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

remotefilelog: allow linkrev to be valid for any passed rev

Browse Source 
Summary:
Sometimes we pass in two revs because we're creating a merge commit.
Let's handle that case better.

Test Plan: tests still pass

Reviewers: #mercurial, durham

Reviewed By: durham

Subscribers: mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D4528594

Signature: t1:4528594:1486576897:6bd80017dfe2933e4c1a9685ba35bb1af0440eb0
This commit is contained in:
Ryan McElroy 2017-02-09 03:35:58 -08:00
parent 8d8edfb6e0
commit 36860751ce
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
remotefilelog/remotefilectx.py
View File

@ -265,21 +265,20 @@ class remotefilectx(context.filectx):
"""
Check if a linknode is correct one for the current history.
That is, return True if the linkrev is the ancestor of the first of the
passed in revs (if any), otherwise return False.
TODO: We may want to consider linkrev being an ancestor of any of the
passed-in revs as sufficient, not just the first.
That is, return True if the linkrev is the ancestor of any of the
passed in revs, otherwise return False.
`revs` is a list that usually has one element -- usually the wdir parent
or the user-passed rev we're looking back from. It may contain two revs
when there is a merge going on, or zero revs when a root node with no
parents is being created.
"""
if not revs:
return False
try:
# Use the C fastpath to check if the given linknode is correct.
cl = self._repo.changelog
return revs and cl.isancestor(linknode, cl.node(revs[0]))
return any(cl.isancestor(linknode, cl.node(r)) for r in revs)
except error.LookupError:
# The linknode read from the blob may have been stripped or
# otherwise not present in the repository anymore. Do not fail hard