Merge branch 'dev' into report-error

This commit is contained in:
AUTOMATIC1111
2023-05-31 19:15:21 +03:00
committed by GitHub
17 changed files with 656 additions and 22 deletions

View File

@@ -1,10 +1,9 @@
import os
import threading
import git
from modules import shared
from modules.errors import print_error
from modules.gitpython_hack import Repo
from modules.paths_internal import extensions_dir, extensions_builtin_dir, script_path # noqa: F401
extensions = []
@@ -53,7 +52,7 @@ class Extension:
repo = None
try:
if os.path.exists(os.path.join(self.path, ".git")):
repo = git.Repo(self.path)
repo = Repo(self.path)
except Exception:
print_error(f"Error reading github repository info from {self.path}", exc_info=True)
@@ -92,7 +91,7 @@ class Extension:
return res
def check_updates(self):
repo = git.Repo(self.path)
repo = Repo(self.path)
for fetch in repo.remote().fetch(dry_run=True):
if fetch.flags != fetch.HEAD_UPTODATE:
self.can_update = True
@@ -114,7 +113,7 @@ class Extension:
self.status = "latest"
def fetch_and_reset_hard(self, commit='origin'):
repo = git.Repo(self.path)
repo = Repo(self.path)
# Fix: `error: Your local changes to the following files would be overwritten by merge`,
# because WSL2 Docker set 755 file permissions instead of 644, this results to the error.
repo.git.fetch(all=True)