Merge branch 'main' into fix/suppress-deprecation-warning

docs/admin/repo_admin/repo-extra-fields.rst

@@ -31,11 +31,12 @@ To configure extra fields per repository, use the following steps:
 
 .. image:: ../../images/extra-repo-fields.png
 
-The most important is the `New field key` variable which under the value will
+3. The most important is the `New field key` variable which under the value will
 be stored. It needs to be unique for each repository. The label and description
 will be generated in repository settings where users can actually save some
 values inside generated extra fields.
 
+.. image:: ../../images/extra-repo-fields-set-value.png
 
 Example Usage in extensions
 ---------------------------

docs/tools/tools-cli.rst

@@ -117,7 +117,8 @@ Options:
         Set the API key value.
 
     \ - -instance-name <instance-id>
-        Set the instance name
+        Specify which instance configuration to use from your :file:`~/.rhoderc` file.
+        Must match an existing instance name from the config.
 
     \-I, - -install-dir <DIR>
         Location of application instances
@@ -155,7 +156,8 @@ Use this to delete gists within |RCE|. Options:
         Show help messages. current configuration values.
 
     \ - -instance-name <instance-id>
-        Set the instance name.
+        Specify which instance configuration to use from your :file:`~/.rhoderc` file.
+        Must match an existing instance name from the config.
 
     \-R, - -repo-dir
         Set the repository file path.
@@ -205,7 +207,8 @@ Use this to manage |repos| and |repo| groups within |RCE|. Options:
         Remove repository groups.
 
     \ - -instance-name <instance-id>
-        Set the instance name.
+        Specify which instance configuration to use from your :file:`~/.rhoderc` file.
+        Must match an existing instance name from the config.
 
     \ - -list-only
         Display repositories selected for deletion.
@@ -359,7 +362,8 @@ Use this to create, list, show, or delete gists within |RCE|. Options:
         Location of application instances
 
     \ - -instance-name <instance-id>
-        Set the instance name.
+        Specify which instance configuration to use from your :file:`~/.rhoderc` file.
+        Must match an existing instance name from the config.
 
     \ - -list
         Display instance gists.
@@ -514,7 +518,8 @@ the :ref:`indexing-ref` section. Options:
          Show help messages.
 
     \ - -instance-name <instance-id>
-        Set the instance name
+        Specify which instance configuration to use from your :file:`~/.rhoderc` file.
+        Must match an existing instance name from the config.
 
     \-I, - -install-dir <DIR>
         Location of application instances
@@ -569,7 +574,8 @@ remote instances.
 .. rst-class:: dl-horizontal
 
     \- -instance-name <name>
-        Specify the instance name in the :file:`~/.rhoderc`
+        Set the instance name to create in the :file:`~/.rhoderc` file. 
+        This is a string you create to identify your RhodeCode instance configuration.
 
     \api_host <hostname>
         Create a configuration file. The default file is created

pyproject.toml

@@ -117,7 +117,7 @@ line-ending = "auto"
 
 
 [tool.bumpversion]
-current_version = "5.6.1"
+current_version = "5.7.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

rhodecode/VERSION

@@ -1 +1 @@
-5.6.1
+5.7.0

rhodecode/config/settings_maker.py

@@ -46,6 +46,14 @@ def initialize_ini_config_default_values_if_not_present(
         log.warning("Config file %s not found.", ini_path)
         return
 
+    if not os.access(ini_path, os.W_OK):
+        log.warning(
+            "Cannot save value for %s, reason: cannot write to config file '%s' due to lack of permissions.",
+            option,
+            ini_path,
+        )
+        return
+
     updater = ConfigUpdater()
     updater.read(ini_path)
 

rhodecode/templates/admin/repos/repo_edit_fields.mako

@@ -61,6 +61,12 @@
                         </div>
                      </div>
 
+                    <div class="field">
+                        <p class="alert-warning" style="display:inline-block;padding:8px 12px;">
+                            <strong>${_("Note")}:</strong> ${_("You can set values for your custom fields in")} <strong>${_("Repository Settings")}</strong> ${_("(bottom of the page)")}
+                        </p>
+                    </div>
+
                     <div class="buttons">
                       ${h.submit('save',_('Add'),class_="btn")}
                       ${h.reset('reset',_('Reset'),class_="btn")}