Merge branch 'dev' into sync-req

1 files changed, 8 insertions, 11 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index 624832a0..92f93ad9 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -1,11 +1,9 @@
 import os

-import sys

 import threading

-import traceback

-

-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 = []

@@ -54,10 +52,9 @@ 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(f"Error reading github repository info from {self.path}:", file=sys.stderr)

-            print(traceback.format_exc(), file=sys.stderr)

+            print_error(f"Error reading github repository info from {self.path}", exc_info=True)

 

         if repo is None or repo.bare:

             self.remote = None

@@ -72,8 +69,8 @@ class Extension:
                 self.commit_hash = commit.hexsha

                 self.version = self.commit_hash[:8]

 

-            except Exception as ex:

-                print(f"Failed reading extension data from Git repository ({self.name}): {ex}", file=sys.stderr)

+            except Exception:

+                print_error(f"Failed reading extension data from Git repository ({self.name})", exc_info=True)

                 self.remote = None

 

         self.have_info_from_repo = True

@@ -94,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

@@ -116,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)