mirror of
https://github.com/Sygil-Dev/sygil-webui.git
synced 2024-12-14 22:13:41 +03:00
Don't ask about restoring stash if nothing was stashed (#1533)
# Description Minor quality of life update. Recently launching the webui.bat became a bit more annoying, as it always asks about restoring changes, even if I have none, and then it needs another interaction for no reason (pause>nul). This change makes sure the interaction is only needed when there were changes stashed, and removes the second pause. Yesterday I double clicked the shortcut to start the Stable Horde worker overnight, and even noticed the "Y/N" prompt, but went to bed not realizing it also does the (pause>nul) after that... No reason to be this intrusive. Closes: #1532 # Checklist: - [X] I have changed the base branch to `dev` - [X] I have performed a self-review of my own code - [X] I have commented my code in hard-to-understand areas - [X] I have made corresponding changes to the documentation
This commit is contained in:
parent
7acc2456f8
commit
468d468fbb
@ -58,20 +58,23 @@ IF "%v_conda_path%"=="" (
|
||||
|
||||
:CONDA_FOUND
|
||||
echo Stashing local changes and pulling latest update...
|
||||
git status --porcelain=1 -uno | findstr . && set "HasChanges=1" || set "HasChanges=0"
|
||||
call git stash
|
||||
call git pull
|
||||
IF "%HasChanges%" == "0" GOTO SKIP_RESTORE
|
||||
|
||||
set /P restore="Do you want to restore changes you made before updating? (Y/N): "
|
||||
IF /I "%restore%" == "N" (
|
||||
echo Removing changes please wait...
|
||||
echo Removing changes...
|
||||
call git stash drop
|
||||
echo Changes removed, press any key to continue...
|
||||
pause >nul
|
||||
echo "Changes removed"
|
||||
) ELSE IF /I "%restore%" == "Y" (
|
||||
echo Restoring changes, please wait...
|
||||
echo Restoring changes...
|
||||
call git stash pop --quiet
|
||||
echo Changes restored, press any key to continue...
|
||||
pause >nul
|
||||
echo "Changes restored"
|
||||
)
|
||||
|
||||
:SKIP_RESTORE
|
||||
call "%v_conda_path%\Scripts\activate.bat"
|
||||
|
||||
for /f "delims=" %%a in ('git log -1 --format^="%%H" -- environment.yaml') DO set v_cur_hash=%%a
|
||||
|
@ -58,20 +58,23 @@ IF "%v_conda_path%"=="" (
|
||||
|
||||
:CONDA_FOUND
|
||||
echo Stashing local changes and pulling latest update...
|
||||
git status --porcelain=1 -uno | findstr . && set "HasChanges=1" || set "HasChanges=0"
|
||||
call git stash
|
||||
call git pull
|
||||
IF "%HasChanges%" == "0" GOTO SKIP_RESTORE
|
||||
|
||||
set /P restore="Do you want to restore changes you made before updating? (Y/N): "
|
||||
IF /I "%restore%" == "N" (
|
||||
echo Removing changes please wait...
|
||||
echo Removing changes...
|
||||
call git stash drop
|
||||
echo Changes removed, press any key to continue...
|
||||
pause >nul
|
||||
echo Changes removed
|
||||
) ELSE IF /I "%restore%" == "Y" (
|
||||
echo Restoring changes, please wait...
|
||||
echo Restoring changes...
|
||||
call git stash pop --quiet
|
||||
echo Changes restored, press any key to continue...
|
||||
pause >nul
|
||||
echo Changes restored
|
||||
)
|
||||
|
||||
:SKIP_RESTORE
|
||||
call "%v_conda_path%\Scripts\activate.bat"
|
||||
|
||||
for /f "delims=" %%a in ('git log -1 --format^="%%H" -- environment.yaml') DO set v_cur_hash=%%a
|
||||
|
15
webui.cmd
15
webui.cmd
@ -58,20 +58,23 @@ IF "%v_conda_path%"=="" (
|
||||
|
||||
:CONDA_FOUND
|
||||
echo Stashing local changes and pulling latest update...
|
||||
git status --porcelain=1 -uno | findstr . && set "HasChanges=1" || set "HasChanges=0"
|
||||
call git stash
|
||||
call git pull
|
||||
IF "%HasChanges%" == "0" GOTO SKIP_RESTORE
|
||||
|
||||
set /P restore="Do you want to restore changes you made before updating? (Y/N): "
|
||||
IF /I "%restore%" == "N" (
|
||||
echo Removing changes please wait...
|
||||
echo Removing changes...
|
||||
call git stash drop
|
||||
echo Changes removed, press any key to continue...
|
||||
pause >nul
|
||||
echo Changes removed
|
||||
) ELSE IF /I "%restore%" == "Y" (
|
||||
echo Restoring changes, please wait...
|
||||
echo Restoring changes...
|
||||
call git stash pop --quiet
|
||||
echo Changes restored, press any key to continue...
|
||||
pause >nul
|
||||
echo Changes restored
|
||||
)
|
||||
|
||||
:SKIP_RESTORE
|
||||
call "%v_conda_path%\Scripts\activate.bat"
|
||||
|
||||
for /f "delims=" %%a in ('git log -1 --format^="%%H" -- environment.yaml') DO set v_cur_hash=%%a
|
||||
|
Loading…
Reference in New Issue
Block a user