Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
5ab7d08a
Commit
5ab7d08a
authored
May 15, 2024
by
w-e-w
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix extention update when not on main branch
parent
ddb28b33
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
modules/extensions.py
modules/extensions.py
+6
-3
No files found.
modules/extensions.py
View file @
5ab7d08a
...
@@ -191,8 +191,9 @@ class Extension:
...
@@ -191,8 +191,9 @@ class Extension:
def
check_updates
(
self
):
def
check_updates
(
self
):
repo
=
Repo
(
self
.
path
)
repo
=
Repo
(
self
.
path
)
branch_name
=
f
'{repo.remote().name}/{self.branch}'
for
fetch
in
repo
.
remote
()
.
fetch
(
dry_run
=
True
):
for
fetch
in
repo
.
remote
()
.
fetch
(
dry_run
=
True
):
if
self
.
branch
and
fetch
.
name
!=
f
'{repo.remote().name}/{self.branch}'
:
if
self
.
branch
and
fetch
.
name
!=
branch_name
:
continue
continue
if
fetch
.
flags
!=
fetch
.
HEAD_UPTODATE
:
if
fetch
.
flags
!=
fetch
.
HEAD_UPTODATE
:
self
.
can_update
=
True
self
.
can_update
=
True
...
@@ -200,7 +201,7 @@ class Extension:
...
@@ -200,7 +201,7 @@ class Extension:
return
return
try
:
try
:
origin
=
repo
.
rev_parse
(
'origin'
)
origin
=
repo
.
rev_parse
(
branch_name
)
if
repo
.
head
.
commit
!=
origin
:
if
repo
.
head
.
commit
!=
origin
:
self
.
can_update
=
True
self
.
can_update
=
True
self
.
status
=
"behind HEAD"
self
.
status
=
"behind HEAD"
...
@@ -213,8 +214,10 @@ class Extension:
...
@@ -213,8 +214,10 @@ class Extension:
self
.
can_update
=
False
self
.
can_update
=
False
self
.
status
=
"latest"
self
.
status
=
"latest"
def
fetch_and_reset_hard
(
self
,
commit
=
'origin'
):
def
fetch_and_reset_hard
(
self
,
commit
=
None
):
repo
=
Repo
(
self
.
path
)
repo
=
Repo
(
self
.
path
)
if
commit
is
None
:
commit
=
f
'{repo.remote().name}/{self.branch}'
# Fix: `error: Your local changes to the following files would be overwritten by merge`,
# 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.
# because WSL2 Docker set 755 file permissions instead of 644, this results to the error.
repo
.
git
.
fetch
(
all
=
True
)
repo
.
git
.
fetch
(
all
=
True
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment