attempt to fix workspace status when doing git clone (2f1d5b6b) · Commits · github_fork / Stable Diffusion Webui

modules/launch_utils.py

+23 −1

Original line number	Diff line number	Diff line
		@@ -139,6 +139,12 @@ def check_run_python(code: str) -> bool:
		return result.returncode == 0


		def git_fix_workspace(dir):
		run(f'"{git}" -C "{dir}" fetch --refetch --no-auto-gc', f"Fetching all contents for {name}", f"Couldn't fetch {name}", live=True)
		run(f'"{git}" -C "{dir}" gc --aggressive --prune=now', f"Pruning {name}", f"Couldn't prune {name}", live=True)
		return


		def git_clone(url, dir, name, commithash=None):
		# TODO clone into temporary dir and move if successful

		@@ -151,7 +157,23 @@ def git_clone(url, dir, name, commithash=None):
		return

		run(f'"{git}" -C "{dir}" fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}")

		if commithash is not None:
		try:
		run(f'"{git}" -C "{dir}" checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)
		except RuntimeError:
		print(f"Unable to checkout {name} with hash {commithash}, attempting autofix...")
		git_fix_workspace(dir)
		run(f'"{git}" -C "{dir}" checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)
		else:
		try:
		run(f'"{git}" -C "{dir}" reset --hard FETCH_HEAD', f"Checking out latest commit for {name}...", f"Couldn't checkout latest commit for {name}", live=True)
		except RuntimeError:
		print(f"Unable to checkout {name}, attempting autofix...")
		git_fix_workspace(dir)
		run(f'"{git}" -C "{dir}" reset --hard FETCH_HEAD', f"Checking out latest commit for {name}...", f"Couldn't checkout latest commit for {name}", live=True)


		return

		run(f'"{git}" clone "{url}" "{dir}"', f"Cloning {name} into {dir}...", f"Couldn't clone {name}", live=True)

Admin message