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

remove infer_client_from_cwd in lieu of require_checkout

Browse Source 
Summary:
`require_checkout` returns an EdenCheckout, so infer_client_from_cwd
is no longer required.

Reviewed By: wez

Differential Revision: D17485008

fbshipit-source-id: b6ff6d4b28a48b56bd56fe7116313d6a64642f1e
This commit is contained in:
Chad Austin 2019-09-19 18:15:27 -07:00 committed by Facebook Github Bot
parent 4bf7130c07
commit ba2b017fad
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
eden/cli/main.py
View File

@ -69,25 +69,6 @@ except AttributeError: # On a non-unix system
EX_OSFILE = 72
def infer_client_from_cwd(instance: EdenInstance, clientname: str) -> str:
if clientname:
return clientname
all_clients = instance.get_all_client_config_info()
path = normalize_path_arg(os.getcwd())
# Keep going while we're not in the root, as dirname(/) is /
# and we can keep iterating forever.
while len(path) > 1:
for _, info in all_clients.items():
if info["mount"] == path:
return typing.cast(str, info["mount"])
path = os.path.dirname(path)
print_stderr("cwd is not an eden mount point, and no checkout name was specified.")
sys.exit(2)
def do_version(args: argparse.Namespace) -> int:
instance = get_eden_instance(args)
print("Installed: %s" % version_mod.get_installed_eden_rpm_version())
@ -258,7 +239,7 @@ Legacy bind mount dirs listed above are unused and can be removed!
self.underlined(f"Mount: {mount}")
instance, checkout, _rel_path = require_checkout(args, mount)
info = instance.get_client_info(infer_client_from_cwd(instance, mount))
info = instance.get_client_info_from_checkout(checkout)
client_dir = info["client-dir"]
overlay_dir = os.path.join(client_dir, "local")