Merge branch 'dev' into ui-config-tabs

1 files changed, 30 insertions, 9 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index 3a7a0372..34d9d654 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -3,10 +3,11 @@ import sys
 import traceback

 

 import time

+from datetime import datetime

 import git

 

 from modules import shared

-from modules.paths_internal import extensions_dir, extensions_builtin_dir

+from modules.paths_internal import extensions_dir, extensions_builtin_dir, script_path

 

 extensions = []

 

@@ -31,12 +32,15 @@ class Extension:
         self.status = ''

         self.can_update = False

         self.is_builtin = is_builtin

+        self.commit_hash = ''

+        self.commit_date = None

         self.version = ''

+        self.branch = None

         self.remote = None

         self.have_info_from_repo = False

 

     def read_info_from_repo(self):

-        if self.have_info_from_repo:

+        if self.is_builtin or self.have_info_from_repo:

             return

 

         self.have_info_from_repo = True

@@ -56,10 +60,15 @@ class Extension:
                 self.status = 'unknown'

                 self.remote = next(repo.remote().urls, None)

                 head = repo.head.commit

-                ts = time.asctime(time.gmtime(repo.head.commit.committed_date))

-                self.version = f'{head.hexsha[:8]} ({ts})'

-

-            except Exception:

+                self.commit_date = repo.head.commit.committed_date

+                ts = time.asctime(time.gmtime(self.commit_date))

+                if repo.active_branch:

+                    self.branch = repo.active_branch.name

+                self.commit_hash = head.hexsha

+                self.version = f'{self.commit_hash[:8]} ({ts})'

+

+            except Exception as ex:

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

                 self.remote = None

 

     def list_files(self, subdir, extension):

@@ -82,18 +91,30 @@ class Extension:
         for fetch in repo.remote().fetch(dry_run=True):

             if fetch.flags != fetch.HEAD_UPTODATE:

                 self.can_update = True

-                self.status = "behind"

+                self.status = "new commits"

+                return

+

+        try:

+            origin = repo.rev_parse('origin')

+            if repo.head.commit != origin:

+                self.can_update = True

+                self.status = "behind HEAD"

                 return

+        except Exception:

+            self.can_update = False

+            self.status = "unknown (remote error)"

+            return

 

         self.can_update = False

         self.status = "latest"

 

-    def fetch_and_reset_hard(self):

+    def fetch_and_reset_hard(self, commit='origin'):

         repo = git.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)

-        repo.git.reset('origin', hard=True)

+        repo.git.reset(commit, hard=True)

+        self.have_info_from_repo = False

 

 

 def list_extensions():