facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Removing read to .eden/symlinks on Eden Windows Thrift client

Browse Source 
Summary: We don't have the .eden/symlinks on Windows right now. Will enable this code when we have them or something equivalent working. This change would help make the hg commands that don't need to talk to Eden work. In the next diff, will teach the Thrift client how to talk to Eden and will start sending status and other requests to it.

Reviewed By: quark-zju

Differential Revision: D15341528

fbshipit-source-id: f0a6fb092f6873002f8db119f07ab884399c9bf6
This commit is contained in:
Puneet Kaushik 2019-05-15 09:19:30 -07:00 committed by Facebook Github Bot
parent 7e4907ef7c
commit 9dbbb1be80
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
edenscm/mercurial/EdenThriftClient.py
View File

@ -17,7 +17,7 @@ import random
import sys
import time
from . import demandimport, node
from . import demandimport, node, pycompat
if sys.version_info < (2, 7, 6):
@ -81,18 +81,25 @@ class EdenThriftClient(object):
def __init__(self, repo):
self._repo = repo
self._root = repo.root
if pycompat.iswindows:
# We don't have the .eden/symlinks on Windows right now
# will enable this code when we have them or something equivalent working.
self._socket_path = None
self._socket_path = readlink_retry_estale(
os.path.join(self._root, ".eden", "socket")
)
# Read the .eden/root symlink to see what eden thinks the name of this
# mount point is. This might not match self._root in some cases. In
# particular, a parent directory of the eden mount might be bind
# mounted somewhere else, resulting in it appearing at multiple
# separate locations.
self._eden_root = readlink_retry_estale(
os.path.join(self._root, ".eden", "root")
)
# On Windows, Repo root will be mount root.
self._eden_root = self._root
else:
self._socket_path = readlink_retry_estale(
os.path.join(self._root, ".eden", "socket")
)
# Read the .eden/root symlink to see what eden thinks the name of this
# mount point is. This might not match self._root in some cases. In
# particular, a parent directory of the eden mount might be bind
# mounted somewhere else, resulting in it appearing at multiple
# separate locations.
self._eden_root = readlink_retry_estale(
os.path.join(self._root, ".eden", "root")
)
def _get_client(self):
"""