Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hookup branch

This commit is contained in:
svlandeg 2020-09-10 12:00:34 +02:00
parent 97d99f7efa
commit a36766d153
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spacy/cli/_util.py
View File

@ -337,7 +337,8 @@ def git_sparse_checkout(repo: str, subpath: str, dest: Path, *, branch: str = "m
missings = " ".join([x[1:] for x in ret.stdout.split() if x.startswith("?")]) missings = " ".join([x[1:] for x in ret.stdout.split() if x.startswith("?")])
if not missings: if not missings:
err = f"Could not find any relevant files for '{subpath}'. " \ err = f"Could not find any relevant files for '{subpath}'. " \
f"Did you specify a correct and complete path within repo '{repo}'?" f"Did you specify a correct and complete path within repo '{repo}' " \
f"and branch {branch}?"
msg.fail(err, exits=1) msg.fail(err, exits=1)
cmd = f"git -C {tmp_dir} fetch-pack {git_repo} {missings}" cmd = f"git -C {tmp_dir} fetch-pack {git_repo} {missings}"
_attempt_run_command(cmd) _attempt_run_command(cmd)

5
spacy/cli/project/clone.py
View File

@ -28,7 +28,7 @@ def project_clone_cli(
""" """
if dest is None: if dest is None:
dest = Path.cwd() / name dest = Path.cwd() / name
project_clone(name, dest, repo=repo) project_clone(name, dest, repo=repo, branch=branch)
def project_clone( def project_clone(
@ -43,13 +43,14 @@ def project_clone(
name (str): Name of subdirectory to clone. name (str): Name of subdirectory to clone.
dest (Path): Destination path of cloned project. dest (Path): Destination path of cloned project.
repo (str): URL of Git repo containing project templates. repo (str): URL of Git repo containing project templates.
branch (str): The branch to clone from
""" """
dest = ensure_path(dest) dest = ensure_path(dest)
check_clone(name, dest, repo) check_clone(name, dest, repo)
project_dir = dest.resolve() project_dir = dest.resolve()
repo_name = re.sub(r"(http(s?)):\/\/github.com/", "", repo) repo_name = re.sub(r"(http(s?)):\/\/github.com/", "", repo)
try: try:
git_sparse_checkout(repo, name, dest) git_sparse_checkout(repo, name, dest, branch=branch)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
err = f"Could not clone '{name}' from repo '{repo_name}'" err = f"Could not clone '{name}' from repo '{repo_name}'"
msg.fail(err, exits=1) msg.fail(err, exits=1)