Merge branch 'dev' into extension-settings-backup

1 files changed, 14 insertions, 6 deletions

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index af9e92cc..79ff2389 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -316,7 +316,7 @@ def normalize_git_url(url):
     return url

 

 

-def install_extension_from_url(dirname, url):

+def install_extension_from_url(dirname, url, branch_name=None):

     check_access()

 

     assert url, 'No URL specified'

@@ -337,10 +337,17 @@ def install_extension_from_url(dirname, url):
 

     try:

         shutil.rmtree(tmpdir, True)

-        with git.Repo.clone_from(url, tmpdir) as repo:

-            repo.remote().fetch()

-            for submodule in repo.submodules:

-                submodule.update()

+        if not branch_name:

+            # if no branch is specified, use the default branch

+            with git.Repo.clone_from(url, tmpdir) as repo:

+                repo.remote().fetch()

+                for submodule in repo.submodules:

+                    submodule.update()

+        else:

+            with git.Repo.clone_from(url, tmpdir, branch=branch_name) as repo:

+                repo.remote().fetch()

+                for submodule in repo.submodules:

+                    submodule.update()

         try:

             os.rename(tmpdir, target_dir)

         except OSError as err:

@@ -565,13 +572,14 @@ def create_ui():
 

             with gr.TabItem("Install from URL"):

                 install_url = gr.Text(label="URL for extension's git repository")

+                install_branch = gr.Text(label="Specific branch name", placeholder="Leave empty for default main branch")

                 install_dirname = gr.Text(label="Local directory name", placeholder="Leave empty for auto")

                 install_button = gr.Button(value="Install", variant="primary")

                 install_result = gr.HTML(elem_id="extension_install_result")

 

                 install_button.click(

                     fn=modules.ui.wrap_gradio_call(install_extension_from_url, extra_outputs=[gr.update()]),

-                    inputs=[install_dirname, install_url],

+                    inputs=[install_dirname, install_url, install_branch],

                     outputs=[extensions_table, install_result],

                 )