Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 22 insertions, 9 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index 8e0977fd..b522125c 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -6,9 +6,9 @@ import git
 

 from modules import paths, shared

 

-

 extensions = []

 extensions_dir = os.path.join(paths.script_path, "extensions")

+extensions_builtin_dir = os.path.join(paths.script_path, "extensions-builtin")

 

 

 def active():

@@ -16,12 +16,13 @@ def active():
 

 

 class Extension:

-    def __init__(self, name, path, enabled=True):

+    def __init__(self, name, path, enabled=True, is_builtin=False):

         self.name = name

         self.path = path

         self.enabled = enabled

         self.status = ''

         self.can_update = False

+        self.is_builtin = is_builtin

 

         repo = None

         try:

@@ -66,9 +67,12 @@ class Extension:
         self.can_update = False

         self.status = "latest"

 

-    def pull(self):

+    def fetch_and_reset_hard(self):

         repo = git.Repo(self.path)

-        repo.remotes.origin.pull()

+        # 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')

+        repo.git.reset('--hard', 'origin')

 

 

 def list_extensions():

@@ -77,10 +81,19 @@ def list_extensions():
     if not os.path.isdir(extensions_dir):

         return

 

-    for dirname in sorted(os.listdir(extensions_dir)):

-        path = os.path.join(extensions_dir, dirname)

-        if not os.path.isdir(path):

-            continue

+    paths = []

+    for dirname in [extensions_dir, extensions_builtin_dir]:

+        if not os.path.isdir(dirname):

+            return

+

+        for extension_dirname in sorted(os.listdir(dirname)):

+            path = os.path.join(dirname, extension_dirname)

+            if not os.path.isdir(path):

+                continue

 

-        extension = Extension(name=dirname, path=path, enabled=dirname not in shared.opts.disabled_extensions)

+            paths.append((extension_dirname, path, dirname == extensions_builtin_dir))

+

+    for dirname, path, is_builtin in paths:

+        extension = Extension(name=dirname, path=path, enabled=dirname not in shared.opts.disabled_extensions, is_builtin=is_builtin)

         extensions.append(extension)

+