release: version 5.4.0

docs/release-notes/release-notes-5.3.1.rst

@@ -0,0 +1,41
+|RCE| 5.3.1 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2024-09-21
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+- svn: small performance bump by restoring path cache in previous builds
+
+
+Fixes
+^^^^^
+
+- Fixed problems with incorrect version string
+- Fixed accidentally removed svn path check cache
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- RhodeCode 5.3.1 is unscheduled security release to address some build issues with 5.X images

docs/release-notes/release-notes-5.4.0.rst

@@ -0,0 +1,49
+|RCE| 5.4.0 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+
+
+
+New Features
+^^^^^^^^^^^^
+
+- RhodeCode and VcsServer operate now on bytestrings instead of strings for diffs and files. This allows a mixed or non-utf8
+  encoded files to be used.
+- Remap and rescan: added more resilient remap and removal option, and also split the logic to either add or cleanup.
+- Automatic merge of approved pull requests (available only for enterprise edition).
+- Basic implementation of security scan (secrets, keys, passwords, etc) for repositories (available only for enterprise edition).
+
+General
+^^^^^^^
+
+- Ported build system to use pyproject.toml.
+- Bumped version of mercurial and hg-evolve.
+
+
+Security
+^^^^^^^^
+
+- Multiple library bumps to fix security issues found in those python packages.
+
+
+Performance
+^^^^^^^^^^^
+
+- SVN: added same caches for stored file nodes as git and mercurial have for improved performance.
+- GIT: moved certain operations into vcsserver
+
+Fixes
+^^^^^
+
+- Fixed UI visualization issues with long commit messages
+- Fixed masking for some fields in admin settings
+- Fixed issues with caches calculations when passed search fields were empty
+- Fixed observer's ability to change a PR status
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+

pyproject.toml

@@ -0,0 +1,137
+[build-system]
+requires = ["setuptools>=61.0.0", "wheel", "pastescript"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "rhodecode-enterprise-ce"
+description = "Enterprise Source Code Management Platform"
+authors = [
+    {name = "RhodeCode GmbH", email = "[e-mail]"},
+]
+keywords = [
+    'rhodecode', 'mercurial', 'git', 'svn',
+    'code review',
+    'repo groups', 'ldap', 'repository management', 'hgweb',
+    'hgwebdir', 'gitweb', 'serving hgweb',
+]
+license = {text = "GPL V3"}
+requires-python = ">=3.10"
+dynamic = ["version", "readme", "dependencies", "optional-dependencies"]
+classifiers = [
+    'Development Status :: 6 - Mature',
+    'Intended Audience :: Developers',
+    'Operating System :: OS Independent',
+    'Topic :: Software Development :: Version Control',
+    'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+    'Programming Language :: Python :: 3.11',
+]
+
+[project.entry-points."paste.app_factory"]
+main = "rhodecode.config.middleware:make_pyramid_app"
+
+[project.entry-points."pyramid.pshell_runner"]
+ipython = "rhodecode.lib.pyramid_shell:ipython_shell_runner"
+
+[project.entry-points."beaker.backends"]
+memorylru_base="rhodecode.lib.memory_lru_dict:MemoryLRUNamespaceManagerBase"
+memorylru_debug="rhodecode.lib.memory_lru_dict:MemoryLRUNamespaceManagerDebug"
+
+[project.scripts]
+
+rc-setup-app = "rhodecode.lib.rc_commands.setup_rc:main"
+rc-upgrade-db = "rhodecode.lib.rc_commands.upgrade_db:main"
+rc-ishell = "rhodecode.lib.rc_commands.ishell:main"
+rc-add-artifact = "rhodecode.lib.rc_commands.add_artifact:main"
+rc-migrate-artifact = "rhodecode.lib.rc_commands.migrate_artifact:main"
+rc-ssh-wrapper = "rhodecode.apps.ssh_support.lib.ssh_wrapper_v1:main"
+rc-ssh-wrapper-v2 = "rhodecode.apps.ssh_support.lib.ssh_wrapper_v2:main"
+
+[tool.setuptools]
+packages = ["rhodecode"]
+include-package-data = true
+
+[tools.setuptools.package-data]
+"" = ['*.txt', '*.rst']
+"configs" = ['*.ini']
+"rhodecode" = ['VERSION', 'i18n/*/LC_MESSAGES/*.mo', ]
+
+[tool.setuptools.exclude-package-data]
+"rhodecode" = ["__pycache__"]
+
+[tool.setuptools.dynamic]
+readme = {file = ["README.rst"], content-type = "text/rst"}
+version = {file = "rhodecode/VERSION"}
+dependencies = {file = ["requirements.txt"]}
+optional-dependencies.tests = {file = ["requirements_test.txt"]}
+
+[tool.ruff]
+# Line length max same as Black.
+line-length = 120
+
+# Assume Python 3.11
+target-version = "py311"
+
+
+[tool.ruff.lint]
+select = [
+    # Pyflakes
+    "F",
+    # Pycodestyle
+    "E",
+    "W",
+    # isort
+    "I001"
+]
+
+ignore = [
+    "E501",  # line too long, handled by black
+]
+
+[tool.ruff.lint.isort]
+known-first-party = ["rhodecode"]
+
+[tool.ruff.format]
+# Like Black, use double quotes for strings.
+quote-style = "double"
+
+# Like Black, indent with spaces, rather than tabs.
+indent-style = "space"
+
+# Like Black, respect magic trailing commas.
+skip-magic-trailing-comma = false
+
+# Like Black, automatically detect the appropriate line ending.
+line-ending = "auto"
+
+
+[tool.bumpversion]
+current_version = "5.4.0"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
+serialize = ["{major}.{minor}.{patch}"]
+search = "{current_version}"
+replace = "{new_version}"
+regex = false
+ignore_missing_version = false
+ignore_missing_files = false
+tag = false
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "release(version-bump): {current_version} → {new_version}"
+allow_dirty = false
+commit = false
+message = "release(version-bump): {current_version} → {new_version}"
+commit_args = ""
+setup_hooks = []
+pre_commit_hooks = []
+post_commit_hooks = []
+
+
+#    message_extractors={
+#        'rhodecode': [
+#            ('**.py', 'python', None),
+#            ('**.js', 'javascript', None),
+#            ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),
+#            ('templates/**.html', 'mako', {'input_encoding': 'utf-8'}),
+#            ('public/**', 'ignore', None),
+#        ]
+#    },

rhodecode/api/tests/test_cleanup_repos.py

@@ -0,0 +1,44
+# Copyright (C) 2010-2024 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import mock
+import pytest
+
+from rhodecode.model.scm import ScmModel
+from rhodecode.api.tests.utils import (
+    build_data, api_call, assert_ok, assert_error, crash)
+
+
[e-mail]("testuser_api", "app")
+class TestCleanupRepos(object):
+    def test_api_cleanup_repos(self):
+        id_, params = build_data(self.apikey, 'cleanup_repos')
+        response = api_call(self.app, params)
+
+        expected = {'removed': [], 'errors': []}
+        assert_ok(id_, expected, given=response.body)
+
+    def test_api_cleanup_repos_error(self):
+
+        id_, params = build_data(self.apikey, 'cleanup_repos', )
+
+        with mock.patch('rhodecode.lib.utils.repo2db_cleanup', side_effect=crash):
+            response = api_call(self.app, params)
+
+        expected = 'Error occurred during repo storage cleanup action'
+        assert_error(id_, expected, given=response.body)

rhodecode/bootstrap.py

@@ -0,0 +1,41
+# Copyright (C) 2010-2024 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+# bootstrap data available for tests and setup clean install
+
+TEST_USER_ADMIN_LOGIN = 'test_admin'
+TEST_USER_ADMIN_PASS = 'test12'
+TEST_USER_ADMIN_EMAIL = '[e-mail]'
+
+TEST_USER_REGULAR_LOGIN = 'test_regular'
+TEST_USER_REGULAR_PASS = 'test12'
+TEST_USER_REGULAR_EMAIL = '[e-mail]'
+
+TEST_USER_REGULAR2_LOGIN = 'test_regular2'
+TEST_USER_REGULAR2_PASS = 'test12'
+TEST_USER_REGULAR2_EMAIL = '[e-mail]'
+
+HG_REPO = 'vcs_test_hg'
+GIT_REPO = 'vcs_test_git'
+SVN_REPO = 'vcs_test_svn'
+
+NEW_HG_REPO = 'vcs_test_hg_new'
+NEW_GIT_REPO = 'vcs_test_git_new'
+
+HG_FORK = 'vcs_test_hg_fork'
+GIT_FORK = 'vcs_test_git_fork'

Makefile

@@ -54,7 +54,7 clean:
 # test: run test-clean and tests
 test:
 	make test-clean
-	unset RC_SQLALCHEMY_DB1_URL && unset RC_DB_URL && make test-only
+	make test-only
 
 
 .PHONY: test-clean
@@ -71,7 +71,25 test-only:
 	PYTHONHASHSEED=random \
 	py.test -x -vv -r xw -p no:sugar \
 	--cov-report=term-missing --cov-report=html \
-	--cov=rhodecode rhodecode
+	--cov=rhodecode rhodecode \
+	--ignore=rhodecode/tests/vcs_operations \
+	--ignore=rhodecode/tests/database
+
+	PYTHONHASHSEED=random \
+		py.test -x -vv -r xw -p no:sugar \
+		rhodecode/tests/vcs_operations
+
+	PYTHONHASHSEED=random \
+		py.test -x -vv -r xw -p no:sugar \
+		rhodecode/tests/database
+
+.PHONY: test-simple
+# test-simple: Run tests only for main test suite witout coverage
+test-simple:
+	PYTHONHASHSEED=random \
+	py.test -x -vv -r xw -p no:sugar \
+	--ignore=rhodecode/tests/vcs_operations \
+	--ignore=rhodecode/tests/database
 
 # >>> Docs commands
 

configs/development.ini

@@ -485,6 +485,10 rc_cache.cache_general.expiration_time =
 ; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
 #rc_cache.cache_general.arguments.lock_auto_renewal = true
 
+; prefix for redis keys used for this cache backend, the final key is constructed using {custom-prefix}{key}
+#rc_cache.cache_general.arguments.key_prefix = custom-prefix-
+
+
 ; *************************************************
 ; `cache_perms` cache for permission tree, auth TTL
 ; for simplicity use rc.file_namespace backend,
@@ -512,6 +516,10 rc_cache.cache_perms.expiration_time = 3
 ; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
 #rc_cache.cache_perms.arguments.lock_auto_renewal = true
 
+; prefix for redis keys used for this cache backend, the final key is constructed using {custom-prefix}{key}
+#rc_cache.cache_perms.arguments.key_prefix = custom-prefix-
+
+
 ; ***************************************************
 ; `cache_repo` cache for file tree, Readme, RSS FEEDS
 ; for simplicity use rc.file_namespace backend,
@@ -539,6 +547,40 rc_cache.cache_repo.expiration_time = 25
 ; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
 #rc_cache.cache_repo.arguments.lock_auto_renewal = true
 
+; prefix for redis keys used for this cache backend, the final key is constructed using {custom-prefix}{key}
+#rc_cache.cache_repo.arguments.key_prefix = custom-prefix-
+
+; *********************************************
+; `cache_license` cache for storing license info
+; for simplicity use rc.file_namespace backend,
+; for performance and scale use rc.redis
+; *********************************************
+rc_cache.cache_license.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_license.expiration_time = 300
+; file cache store path. Defaults to `cache_dir =` value or tempdir if both values are not set
+#rc_cache.cache_license.arguments.filename = /tmp/cache_general_db
+
+; alternative `cache_license` redis backend with distributed lock
+#rc_cache.cache_license.backend = dogpile.cache.rc.redis
+#rc_cache.cache_license.expiration_time = 300
+
+; redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_license.arguments.redis_expiration_time = 360
+
+#rc_cache.cache_license.arguments.host = localhost
+#rc_cache.cache_license.arguments.port = 6379
+#rc_cache.cache_license.arguments.db = 0
+#rc_cache.cache_license.arguments.socket_timeout = 30
+; more Redis options: https://dogpilecache.sqlalchemy.org/en/latest/api.html#redis-backends
+#rc_cache.cache_license.arguments.distributed_lock = true
+
+; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
+#rc_cache.cache_license.arguments.lock_auto_renewal = true
+
+; prefix for redis keys used for this cache backend, the final key is constructed using {custom-prefix}{key}
+#rc_cache.cache_license.arguments.key_prefix = custom-prefix-
+
+
 ; ##############
 ; BEAKER SESSION
 ; ##############
@@ -547,7 +589,7 rc_cache.cache_repo.expiration_time = 25
 ; types are file, ext:redis, ext:database, ext:memcached
 ; Fastest ones are ext:redis and ext:database, DO NOT use memory type for session
 #beaker.session.type = file
-#beaker.session.data_dir = %(here)s/data/sessions
+#beaker.session.data_dir = /var/opt/rhodecode_data/sessions
 
 ; Redis based sessions
 beaker.session.type = ext:redis

configs/production.ini

@@ -453,6 +453,10 rc_cache.cache_general.expiration_time =
 ; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
 #rc_cache.cache_general.arguments.lock_auto_renewal = true
 
+; prefix for redis keys used for this cache backend, the final key is constructed using {custom-prefix}{key}
+#rc_cache.cache_general.arguments.key_prefix = custom-prefix-
+
+
 ; *************************************************
 ; `cache_perms` cache for permission tree, auth TTL
 ; for simplicity use rc.file_namespace backend,
@@ -480,6 +484,10 rc_cache.cache_perms.expiration_time = 3
 ; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
 #rc_cache.cache_perms.arguments.lock_auto_renewal = true
 
+; prefix for redis keys used for this cache backend, the final key is constructed using {custom-prefix}{key}
+#rc_cache.cache_perms.arguments.key_prefix = custom-prefix-
+
+
 ; ***************************************************
 ; `cache_repo` cache for file tree, Readme, RSS FEEDS
 ; for simplicity use rc.file_namespace backend,
@@ -507,6 +515,40 rc_cache.cache_repo.expiration_time = 25
 ; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
 #rc_cache.cache_repo.arguments.lock_auto_renewal = true
 
+; prefix for redis keys used for this cache backend, the final key is constructed using {custom-prefix}{key}
+#rc_cache.cache_repo.arguments.key_prefix = custom-prefix-
+
+; *********************************************
+; `cache_license` cache for storing license info
+; for simplicity use rc.file_namespace backend,
+; for performance and scale use rc.redis
+; *********************************************
+rc_cache.cache_license.backend = dogpile.cache.rc.file_namespace
+rc_cache.cache_license.expiration_time = 300
+; file cache store path. Defaults to `cache_dir =` value or tempdir if both values are not set
+#rc_cache.cache_license.arguments.filename = /tmp/cache_general_db
+
+; alternative `cache_license` redis backend with distributed lock
+#rc_cache.cache_license.backend = dogpile.cache.rc.redis
+#rc_cache.cache_license.expiration_time = 300
+
+; redis_expiration_time needs to be greater then expiration_time
+#rc_cache.cache_license.arguments.redis_expiration_time = 360
+
+#rc_cache.cache_license.arguments.host = localhost
+#rc_cache.cache_license.arguments.port = 6379
+#rc_cache.cache_license.arguments.db = 0
+#rc_cache.cache_license.arguments.socket_timeout = 30
+; more Redis options: https://dogpilecache.sqlalchemy.org/en/latest/api.html#redis-backends
+#rc_cache.cache_license.arguments.distributed_lock = true
+
+; auto-renew lock to prevent stale locks, slower but safer. Use only if problems happen
+#rc_cache.cache_license.arguments.lock_auto_renewal = true
+
+; prefix for redis keys used for this cache backend, the final key is constructed using {custom-prefix}{key}
+#rc_cache.cache_license.arguments.key_prefix = custom-prefix-
+
+
 ; ##############
 ; BEAKER SESSION
 ; ##############
@@ -515,7 +557,7 rc_cache.cache_repo.expiration_time = 25
 ; types are file, ext:redis, ext:database, ext:memcached
 ; Fastest ones are ext:redis and ext:database, DO NOT use memory type for session
 #beaker.session.type = file
-#beaker.session.data_dir = %(here)s/data/sessions
+#beaker.session.data_dir = /var/opt/rhodecode_data/sessions
 
 ; Redis based sessions
 beaker.session.type = ext:redis

conftest.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -27,8 +27,11 from rhodecode.tests.conftest_common imp
 
 
 pytest_plugins = [
-    "rhodecode.tests.fixture_mods.fixture_pyramid",
-    "rhodecode.tests.fixture_mods.fixture_utils",
+    "rhodecode.tests.fixtures.fixture_pyramid",
+    "rhodecode.tests.fixtures.fixture_utils",
+    "rhodecode.tests.fixtures.function_scoped_baseapp",
+    "rhodecode.tests.fixtures.module_scoped_baseapp",
+    "rhodecode.tests.fixtures.rcextensions_fixtures",
 ]
 
 

docs/.howto

@@ -3,4 +3,4
 # docker build --tag sphinx-doc-build-rc .
 
 # Build Docs
-# docker run --rm -v $(PWD):/project --workdir=/project/docs sphinx-doc-build-rc make clean html
  No newline at end of file
+# cd && docker run --rm -v $(pwd):/project --workdir=/project/docs sphinx-doc-build-rc make clean html

docs/install/migrate-repos.rst

@@ -2,22 +2,24
 
 Migrating |repos|
 -----------------
-
-If you have installed |RCE| and have |repos| that you wish to migrate into
-the system, use the following instructions.
+When you install |RCE| you will be presented with 2 choices:
 
-1. On the |RCE| interface, check your |repo| storage location under
-   :menuselection:`Admin --> Settings --> System Info`. For example,
-   Storage location: /home/{username}/repos.
+1. Mount existing folder on your local filesystem, and this is what |RCE| will use to store your repos. In this case |RCE| will automatically import repos present in that folder. You can also do :ref:`remap-rescan` from admin interface to force new repos discovery.
+2. Use docker named volume ``rc_reposvolume`` - in this case you can either set create new |repo| in |RCE| UI and set it as a remote for your local repo, and then push. If your repo is hosted somewhere else, click "Import Existing Repository ?" and provide url to it. |RCE| will attempt to pull it and import.
 
-2. Copy the |repos| that you want |RCE| to manage to this location.
-3. Remap and rescan the |repos|, see :ref:`remap-rescan`
 
 .. important::
+    Repo storage path inside docker is configurable in ``rhodecode.ini`` file:
+    ``repo_store.path = /var/opt/rhodecode_repo_store``
 
-   Directories create |repo| groups inside |RCE|.
+    Mounting of local filesystem folder is configurable in ``docker-compose-apps.override.yaml``
+
+    Importing adds |RCE| git hooks to your |repos|.
 
-   Importing adds |RCE| git hooks to your |repos|.
+    You should verify if custom ``.hg`` or ``.hgrc`` files inside
+    repositories should be adjusted since |RCE| reads the content of them.
 
-   You should verify if custom ``.hg`` or ``.hgrc`` files inside
-   repositories should be adjusted since |RCE| reads the content of them.
+.. note::
+    There's another override file for dev setup, which mounts default workspace folder as a repo storage by default.
+    you can configure this by changing ``docker-compose-apps.dev.yaml``
+    (and commenting out all lines ``$WORKSPACE_HOME:/var/opt/rhodecode_repo_store:delegated``)

docs/release-notes/release-notes.rst

@@ -9,6 +9,8 Release Notes
 .. toctree::
    :maxdepth: 1
 
+   release-notes-5.4.0.rst
+   release-notes-5.3.1.rst
    release-notes-5.3.0.rst
    release-notes-5.2.1.rst
    release-notes-5.2.0.rst

docs/requirements_docs.txt

@@ -8,4 +8,4 pygments==2.18.0
 
 docutils<0.19
 markupsafe==2.1.3
-jinja2==3.1.2
+jinja2==3.1.4

docs/tools/tools-cli.rst

@@ -12,6 +12,26 The commands available with |RCT| can be
 - Local configuration commands used to help set up your |RCT| configuration.
 
 
+.. _tools-rhodecode-list-instance:
+
+rhodecode-list-instances
+------------------------
+
+Use this command to list the instance details configured in the
+:file:`/etc/rhodecode/conf/.rhoderc` file.
+
+.. code-block:: bash
+
+   $ ./rcstack cli cmd rhodecode-list-instances --config=/etc/rhodecode/conf/.rhoderc
+   [instance:production] - Config only
+   API-HOST: https://some.url.com
+   API-KEY:  some.auth.token
+
+   [instance:development] - Config only
+   API-HOST: http://some.ip.address
+   API-KEY:  some.auth.token
+
+
 rhodecode-tools
 ---------------
 
@@ -163,6 +183,7 Example usage:
     removing gist /home/brian/repos/.rc_gist_store/5
     removing gist /home/brian/repos/.rc_gist_store/8FtCKdcbRKmEvRzTVsEt
 
+
 rhodecode-cleanup-repos
 -----------------------
 
@@ -201,30 +222,37 Example usage:
 
 .. code-block:: bash
 
-    # Cleaning up repos using tools installed with RCE 350 and above
-    $ ~/.rccontrol/enterprise-4/profile/bin/rhodecode-cleanup-repos \
-        --instance-name=enterprise-4 --older-than=1d
-    Scanning for repositories in /home/brian/repos...
-    preparing to remove [2] found repositories older than 1 day, 0:00:00 (1d)
+
+    # create a .rhoderc file in your host config directory (in :file:`config/_shared/.rhoderc`):
+
+    [instance:rcstack-instance]
+    api_host = http://rhodecode:10020
+    api_key = <API_KEY>
+    repo_dir = /var/opt/rhodecode_repo_store
+
+    # Run rcstack cli
+    ./rcstack cli cmd rhodecode-cleanup-repos --instance-name=rcstack-instance --config=/etc/rhodecode/conf/.rhoderc
+
+    checking if config files needs bootstrapping
+    Scanning for repositories in /var/opt/rhodecode_repo_store...
 
     the following repositories will be deleted completely:
-    * REMOVED: 2015-08-05 00:23:18 | /home/brian/repos/rm__20150805_002318_831
-    * REMOVED: 2015-08-04 01:22:10 | /home/brian/repos/rm__20150804_012210_336
+    * REMOVED: 2015-08-05 00:23:18 | /var/opt/rhodecode_repo_store/rm__20150805_002318_831
+    * REMOVED: 2015-08-04 01:22:10 | /var/opt/rhodecode_repo_store/rm__20150804_012210_336
     are you sure you want to remove them? [y/N]:
 
     # Clean up repos older than 1 year
-    # If using virtualenv and pre RCE 350 tools installation
-    (venv)$ rhodecode-cleanup-repos --instance-name=enterprise-1 \
-        --older-than=365d
+    ./rcstack cli cmd rhodecode-cleanup-repos --instance-name=rcstack-instance --config=/etc/rhodecode/conf/.rhoderc --older-than=365d
 
-    Scanning for repositories in /home/brian/repos...
+    checking if config files needs bootstrapping
+    Scanning for repositories in /var/opt/rhodecode_repo_store...
     preparing to remove [343] found repositories older than 365 days
 
     # clean up repos older than 3 days
-    # If using virtualenv and pre RCE 350 tools installation
-    (venv)$ rhodecode-cleanup-repos --instance-name=enterprise-1 \
-        --older-than=3d
-    Scanning for repositories in /home/brian/repos...
+    ./rcstack cli cmd rhodecode-cleanup-repos --instance-name=rcstack-instance --config=/etc/rhodecode/conf/.rhoderc --older-than=3d
+
+    checking if config files needs bootstrapping
+    Scanning for repositories in /var/opt/rhodecode_repo_store...
     preparing to remove [3] found repositories older than 3 days
 
 .. _tools-config:
@@ -420,9 +448,8 Example usage:
     }
 
     # Cat a file and pipe to gist
-    # in RCE 3.5.0 tools and above
-    $ cat ~/.rhoderc | ~/.rccontrol/{instance-id}/profile/bin/rhodecode-gist \
-       --instance-name=enterprise-4 -d '.rhoderc copy' create
+
+    $ cat ~/.rhoderc | ./rcstack cli cmd rhodecode-gist --instance-name=rcstack-instance --config=/etc/rhodecode/conf/.rhoderc -d '.rhoderc copy' create
     {
       "error": null,
       "id": 9253,
@@ -512,41 +539,18 Example usage:
 
 .. code-block:: bash
 
-    # Run the indexer
-    $ ~/.rccontrol/enterprise-4/profile/bin/rhodecode-index \
-        --instance-name=enterprise-4
+    # Create the indexing mapping file
+    $ ./rcstack cli cmd rhodecode-index --instance-name=rcstack-instance --config=/etc/rhodecode/conf/.rhoderc --create-mapping search_mapping.ini
 
-    # Run indexer based on search_mapping.ini file
-    # This is using pre-350 virtualenv
-    (venv)$ rhodecode-index --instance-name=enterprise-1
+    # Run the indexer
+    $ ./rcstack cli cmd rhodecode-index --instance-name=rcstack-instance --config=/etc/rhodecode/conf/.rhoderc
+
+    # Run indexer based on search_mapping.ini file using rhodecode-tools virtualenv
+    (venv)$ rhodecode-index --instance-name=rcstack-instance
 
     # Index from the command line without creating
     # the .rhoderc file
-    $ rhodecode-index --apikey=key --apihost=http://rhodecode.server \
-        --instance-name=enterprise-2 --save-config
-
-    # Create the indexing mapping file
-    $ ~/.rccontrol/enterprise-4/profile/bin/rhodecode-index \
-        --create-mapping search_mapping.ini --instance-name=enterprise-4
-
-.. _tools-rhodecode-list-instance:
-
-rhodecode-list-instances
-------------------------
-
-Use this command to list the instance details configured in the
-:file:`~/.rhoderc` file.
-
-.. code-block:: bash
-
-   $ .rccontrol/enterprise-1/profile/bin/rhodecode-list-instances
-   [instance:production] - Config only
-   API-HOST: https://some.url.com
-   API-KEY:  some.auth.token
-
-   [instance:development] - Config only
-   API-HOST: http://some.ip.address
-   API-KEY:  some.auth.token
+    $ rhodecode-index --apikey=key --apihost=http://rhodecode.server --instance-name=rcstack-instance --save-config
 
 
 .. _tools-setup-config:

pytest.ini

@@ -4,8 +4,10 norecursedirs = rhodecode/public rhodeco
 cache_dir = /tmp/.pytest_cache
 
 pyramid_config = rhodecode/tests/rhodecode.ini
-vcsserver_protocol = http
-vcsserver_config_http = rhodecode/tests/vcsserver_http.ini
+
+vcsserver_config = rhodecode/tests/vcsserver_http.ini
+rhodecode_config = rhodecode/tests/rhodecode.ini
+celery_config = rhodecode/tests/rhodecode.ini
 
 addopts =
   --pdbcls=IPython.terminal.debugger:TerminalPdb

requirements.txt

@@ -1,39 +1,39
 # deps, generated via pipdeptree --exclude setuptools,wheel,pipdeptree,pip -f | tr '[:upper:]' '[:lower:]'
 
 alembic==1.13.1
-  mako==1.2.4
-    markupsafe==2.1.2
+  mako==1.3.6
+    markupsafe==3.0.2
   sqlalchemy==1.4.52
-    greenlet==3.0.3
+    greenlet==3.1.1
   typing_extensions==4.12.2
 async-timeout==4.0.3
 babel==2.12.1
-beaker==1.12.1
-celery==5.3.6
-  billiard==4.2.0
-  click==8.1.3
-  click-didyoumean==0.3.0
-    click==8.1.3
+beaker==1.13.0
+celery==5.4.0
+  billiard==4.2.1
+  click==8.1.7
+  click-didyoumean==0.3.1
+    click==8.1.7
   click-plugins==1.1.1
-    click==8.1.3
-  click-repl==0.2.0
-    click==8.1.3
-    prompt_toolkit==3.0.47
+    click==8.1.7
+  click-repl==0.3.0
+    click==8.1.7
+    prompt_toolkit==3.0.48
       wcwidth==0.2.13
-    six==1.16.0
-  kombu==5.3.5
+  kombu==5.4.2
     amqp==5.2.0
       vine==5.1.0
+    tzdata==2024.2
     vine==5.1.0
-  python-dateutil==2.8.2
+  python-dateutil==2.9.0.post0
     six==1.16.0
-  tzdata==2024.1
+  tzdata==2024.2
   vine==5.1.0
 channelstream==0.7.1
-  gevent==24.2.1
-    greenlet==3.0.3
+  gevent==24.11.1
+    greenlet==3.1.1
     zope.event==5.0.0
-    zope.interface==7.0.3
+    zope.interface==7.1.1
   itsdangerous==1.1.0
   marshmallow==2.18.0
   pyramid==2.0.2
@@ -43,14 +43,14 channelstream==0.7.1
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
-    venusian==3.0.0
-    webob==1.8.7
+    venusian==3.1.0
+    webob==1.8.9
     zope.deprecation==5.0.0
-    zope.interface==7.0.3
+    zope.interface==7.1.1
   pyramid-jinja2==2.10
-    jinja2==3.1.2
-      markupsafe==2.1.2
-    markupsafe==2.1.2
+    jinja2==3.1.4
+      markupsafe==3.0.2
+    markupsafe==3.0.2
     pyramid==2.0.2
       hupper==1.12
       plaster==1.1.2
@@ -58,18 +58,18 channelstream==0.7.1
         pastedeploy==3.1.0
         plaster==1.1.2
       translationstring==1.4
-      venusian==3.0.0
-      webob==1.8.7
+      venusian==3.1.0
+      webob==1.8.9
       zope.deprecation==5.0.0
-      zope.interface==7.0.3
+      zope.interface==7.1.1
     zope.deprecation==5.0.0
-  python-dateutil==2.8.2
+  python-dateutil==2.9.0.post0
     six==1.16.0
-  requests==2.28.2
-    certifi==2022.12.7
-    charset-normalizer==3.1.0
-    idna==3.4
-    urllib3==1.26.14
+  requests==2.32.3
+    certifi==2024.8.30
+    charset-normalizer==3.4.0
+    idna==3.10
+    urllib3==1.26.20
   ws4py==0.5.1
 deform==2.0.15
   chameleon==3.10.2
@@ -87,13 +87,13 dogpile.cache==1.3.3
     pbr==5.11.1
 formencode==2.1.0
   six==1.16.0
-fsspec==2024.9.0
+fsspec==2024.10.0
 gunicorn==23.0.0
   packaging==24.1
-gevent==24.2.1
-  greenlet==3.0.3
+gevent==24.11.1
+  greenlet==3.1.1
   zope.event==5.0.0
-  zope.interface==7.0.3
+  zope.interface==7.1.1
 ipython==8.26.0
   decorator==5.1.1
   jedi==0.19.1
@@ -102,7 +102,7 ipython==8.26.0
     traitlets==5.14.3
   pexpect==4.9.0
     ptyprocess==0.7.0
-  prompt_toolkit==3.0.47
+  prompt_toolkit==3.0.48
     wcwidth==0.2.13
   pygments==2.18.0
   stack-data==0.6.3
@@ -113,7 +113,7 ipython==8.26.0
   traitlets==5.14.3
   typing_extensions==4.12.2
 markdown==3.4.3
-msgpack==1.0.8
+msgpack==1.1.0
 mysqlclient==2.1.1
 nbconvert==7.7.3
   beautifulsoup4==4.12.3
@@ -122,23 +122,23 nbconvert==7.7.3
     six==1.16.0
     webencodings==0.5.1
   defusedxml==0.7.1
-  jinja2==3.1.2
-    markupsafe==2.1.2
+  jinja2==3.1.4
+    markupsafe==3.0.2
   jupyter_core==5.3.1
     platformdirs==3.10.0
     traitlets==5.14.3
   jupyterlab-pygments==0.2.2
-  markupsafe==2.1.2
+  markupsafe==3.0.2
   mistune==2.0.5
   nbclient==0.8.0
     jupyter_client==8.3.0
       jupyter_core==5.3.1
         platformdirs==3.10.0
         traitlets==5.14.3
-      python-dateutil==2.8.2
+      python-dateutil==2.9.0.post0
         six==1.16.0
-      pyzmq==25.0.0
-      tornado==6.2
+      pyzmq==26.2.0
+      tornado==6.4.2
       traitlets==5.14.3
     jupyter_core==5.3.1
       platformdirs==3.10.0
@@ -146,7 +146,7 nbconvert==7.7.3
     nbformat==5.9.2
       fastjsonschema==2.18.0
       jsonschema==4.18.6
-        attrs==22.2.0
+        attrs==24.2.0
         pyrsistent==0.19.3
       jupyter_core==5.3.1
         platformdirs==3.10.0
@@ -156,7 +156,7 nbconvert==7.7.3
   nbformat==5.9.2
     fastjsonschema==2.18.0
     jsonschema==4.18.6
-      attrs==22.2.0
+      attrs==24.2.0
       pyrsistent==0.19.3
     jupyter_core==5.3.1
       platformdirs==3.10.0
@@ -174,20 +174,20 premailer==3.10.0
   cssselect==1.2.0
   cssutils==2.6.0
   lxml==5.3.0
-  requests==2.28.2
-    certifi==2022.12.7
-    charset-normalizer==3.1.0
-    idna==3.4
-    urllib3==1.26.14
+  requests==2.32.3
+    certifi==2024.8.30
+    charset-normalizer==3.4.0
+    idna==3.10
+    urllib3==1.26.20
 psutil==5.9.8
-psycopg2==2.9.9
+psycopg2==2.9.10
 py-bcrypt==0.4
 pycmarkgfm==1.2.0
-  cffi==1.16.0
-    pycparser==2.21
-pycryptodome==3.17
+  cffi==1.17.1
+    pycparser==2.22
+pycryptodome==3.21.0
 pycurl==7.45.3
-pymysql==1.0.3
+pymysql==1.1.1
 pyotp==2.8.0
 pyparsing==3.1.1
 pyramid-mailer==0.15.1
@@ -198,19 +198,19 pyramid-mailer==0.15.1
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
-    venusian==3.0.0
-    webob==1.8.7
+    venusian==3.1.0
+    webob==1.8.9
     zope.deprecation==5.0.0
-    zope.interface==7.0.3
+    zope.interface==7.1.1
   repoze.sendmail==4.4.1
     transaction==5.0.0
-      zope.interface==7.0.3
-    zope.interface==7.0.3
+      zope.interface==7.1.1
+    zope.interface==7.1.1
   transaction==5.0.0
-    zope.interface==7.0.3
+    zope.interface==7.1.1
 pyramid-mako==1.1.0
-  mako==1.2.4
-    markupsafe==2.1.2
+  mako==1.3.6
+    markupsafe==3.0.2
   pyramid==2.0.2
     hupper==1.12
     plaster==1.1.2
@@ -218,16 +218,15 pyramid-mako==1.1.0
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
-    venusian==3.0.0
-    webob==1.8.7
+    venusian==3.1.0
+    webob==1.8.9
     zope.deprecation==5.0.0
-    zope.interface==7.0.3
+    zope.interface==7.1.1
 python-ldap==3.4.3
   pyasn1==0.4.8
   pyasn1-modules==0.2.8
     pyasn1==0.4.8
-python-memcached==1.59
-  six==1.16.0
+python-memcached==1.62
 python-pam==2.0.2
 python3-saml==1.16.0
   isodate==0.6.1
@@ -236,60 +235,66 python3-saml==1.16.0
   xmlsec==1.3.14
     lxml==5.3.0
 pyyaml==6.0.1
-redis==5.1.0
+redis==5.2.0
   async-timeout==4.0.3
 regex==2022.10.31
 routes==2.5.1
   repoze.lru==0.7
   six==1.16.0
-s3fs==2024.9.0
-  aiobotocore==2.13.0
-    aiohttp==3.9.5
+s3fs==2024.10.0
+  aiobotocore==2.15.2
+    aiohttp==3.11.4
+      aiohappyeyeballs==2.4.3
       aiosignal==1.3.1
-        frozenlist==1.4.1
-      attrs==22.2.0
-      frozenlist==1.4.1
-      multidict==6.0.5
-      yarl==1.9.4
-        idna==3.4
-        multidict==6.0.5
-    aioitertools==0.11.0
-    botocore==1.34.106
+        frozenlist==1.5.0
+      attrs==24.2.0
+      frozenlist==1.5.0
+      multidict==6.1.0
+      propcache==0.2.0
+      yarl==1.17.2
+        idna==3.10
+        multidict==6.1.0
+        propcache==0.2.0
+    aioitertools==0.12.0
+    botocore==1.35.36
       jmespath==1.0.1
-      python-dateutil==2.8.2
+      python-dateutil==2.9.0.post0
         six==1.16.0
-      urllib3==1.26.14
+      urllib3==1.26.20
     wrapt==1.16.0
-  aiohttp==3.9.5
+  aiohttp==3.11.4
+    aiohappyeyeballs==2.4.3
     aiosignal==1.3.1
-      frozenlist==1.4.1
-    attrs==22.2.0
-    frozenlist==1.4.1
-    multidict==6.0.5
-    yarl==1.9.4
-      idna==3.4
-      multidict==6.0.5
-  fsspec==2024.9.0
+      frozenlist==1.5.0
+    attrs==24.2.0
+    frozenlist==1.5.0
+    multidict==6.1.0
+    propcache==0.2.0
+    yarl==1.17.2
+      idna==3.10
+      multidict==6.1.0
+      propcache==0.2.0
+  fsspec==2024.10.0
 simplejson==3.19.2
 sshpubkeys==3.3.1
-  cryptography==40.0.2
-    cffi==1.16.0
-      pycparser==2.21
-  ecdsa==0.18.0
+  cryptography==43.0.3
+    cffi==1.17.1
+      pycparser==2.22
+  ecdsa==0.19.0
     six==1.16.0
 sqlalchemy==1.4.52
-  greenlet==3.0.3
+  greenlet==3.1.1
   typing_extensions==4.12.2
 supervisor==4.2.5
 tzlocal==4.3
   pytz-deprecation-shim==0.1.0.post0
-    tzdata==2024.1
+    tzdata==2024.2
 tempita==0.5.2
-unidecode==1.3.6
+unidecode==1.3.8
 urlobject==2.4.3
-waitress==3.0.0
+waitress==3.0.1
 webhelpers2==2.1
-  markupsafe==2.1.2
+  markupsafe==3.0.2
   six==1.16.0
 whoosh==2.7.4
 zope.cachedescriptors==5.0.0

requirements_debug.txt

@@ -15,10 +15,8 pyramid-debugtoolbar
 flake8
 ruff
 
-pipdeptree==2.7.1
+pipdeptree
 invoke==2.0.0
-bumpversion==0.6.0
-bump2version==1.0.1
 
 docutils-stubs
 types-redis

requirements_rc_tools.txt

@@ -1,3 +1,3
 ## rhodecode-tools, special case, use file://PATH.tar.gz#egg=rhodecode-tools==X.Y.Z, to test local version
-rhodecode-tools @ https://code.rhodecode.com/_file_store/download/0-36d03a63-36f7-47af-a33c-d81c39f88251.0.0.tar.gz#egg=rhodecode-tools
-rhodecode-tools==3.0.0
+rhodecode-tools @ https://code.rhodecode.com/_file_store/download/0-51fb13c9-6175-480c-b9dc-630c7601d47c.1.0.tar.gz#egg=rhodecode-tools
+rhodecode-tools==4.1.0

requirements_test.txt

@@ -1,47 +1,54
 # test related requirements
+
 mock==5.1.0
-pytest-cov==4.1.0
-  coverage==7.4.3
-  pytest==8.1.1
-    iniconfig==2.0.0
-    packaging==24.1
-    pluggy==1.4.0
-pytest-env==1.1.3
-  pytest==8.1.1
+
+pytest==8.3.3
+  iniconfig==2.0.0
+  packaging==24.1
+  pluggy==1.5.0
+pytest-cov==5.0.0
+  coverage==7.6.4
+  pytest==8.3.3
     iniconfig==2.0.0
     packaging==24.1
-    pluggy==1.4.0
-pytest-profiling==1.7.0
-  gprof2dot==2022.7.29
-  pytest==8.1.1
+    pluggy==1.5.0
+pytest-env==1.1.5
+  pytest==8.3.3
     iniconfig==2.0.0
     packaging==24.1
-    pluggy==1.4.0
-  six==1.16.0
-pytest-rerunfailures==13.0
-  packaging==24.1
-  pytest==8.1.1
+    pluggy==1.5.0
+pytest-profiling==1.7.0
+  gprof2dot==2024.6.6
+  pytest==8.3.3
     iniconfig==2.0.0
     packaging==24.1
-    pluggy==1.4.0
+    pluggy==1.5.0
+  six==1.16.0
+pytest-rerunfailures==14.0
+  packaging==24.1
+  pytest==8.3.3
+    iniconfig==2.0.0
+    packaging==24.1
+    pluggy==1.5.0
 pytest-runner==6.0.1
 pytest-sugar==1.0.0
   packaging==24.1
-  pytest==8.1.1
+  pytest==8.3.3
     iniconfig==2.0.0
     packaging==24.1
-    pluggy==1.4.0
-  termcolor==2.4.0
+    pluggy==1.5.0
+  termcolor==2.5.0
 pytest-timeout==2.3.1
-  pytest==8.1.1
+  pytest==8.3.3
     iniconfig==2.0.0
     packaging==24.1
-    pluggy==1.4.0
-webtest==3.0.0
+    pluggy==1.5.0
+
+webtest==3.0.1
   beautifulsoup4==4.12.3
     soupsieve==2.5
-  waitress==3.0.0
-  webob==1.8.7
+  waitress==3.0.1
+  webob==1.8.9
 
 # RhodeCode test-data
 rc_testdata @ https://code.rhodecode.com/upstream/rc-testdata-dist/raw/77378e9097f700b4c1b9391b56199fe63566b5c9/rc_testdata-0.11.0.tar.gz#egg=rc_testdata

rhodecode/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -45,13 +45,20 CELERY_EAGER = False
 # link to config for pyramid
 CONFIG = {}
 
+class NotGivenMeta:
+
+    def __repr__(self):
+        return 'NotGivenObject()'
+    __str__ = __repr__
+
+NotGiven = NotGivenMeta()
 
 class ConfigGet:
-    NotGiven = object()
 
-    def _get_val_or_missing(self, key, missing):
+    @classmethod
+    def _get_val_or_missing(cls, key, missing):
         if key not in CONFIG:
-            if missing == self.NotGiven:
+            if missing != NotGiven:
                 return missing
             # we don't get key, we don't get missing value, return nothing similar as config.get(key)
             return None
@@ -74,6 +81,12 class ConfigGet:
         val = self._get_val_or_missing(key, missing)
         return str2bool(val)
 
+    def get_list(self, key, missing=NotGiven):
+        from rhodecode.lib.type_utils import aslist
+        val = self._get_val_or_missing(key, missing)
+        return aslist(val, sep=',')
+
+
 # Populated with the settings dictionary from application init in
 # rhodecode.conf.environment.load_pyramid_environment
 PYRAMID_SETTINGS = {}

rhodecode/api/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/exc.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/conftest.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -21,12 +21,12 import pytest
 from rhodecode.model.meta import Session
 from rhodecode.model.user import UserModel
 from rhodecode.model.auth_token import AuthTokenModel
-from rhodecode.tests import TEST_USER_ADMIN_LOGIN
 
 
 @pytest.fixture(scope="class")
 def testuser_api(request, baseapp):
     cls = request.cls
+    from rhodecode.tests import TEST_USER_ADMIN_LOGIN
 
     # ADMIN USER
     cls.usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)

rhodecode/api/tests/test_add_field_to_repo.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_add_user_to_user_group.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_api.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_cleanup_sessions.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_close_pull_request.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_comment_commit.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_comment_pull_request.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_create_gist.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -24,7 +23,7 from rhodecode.model.db import Gist
 from rhodecode.model.gist import GistModel
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok, crash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 
 
 @pytest.mark.usefixtures("testuser_api", "app")

rhodecode/api/tests/test_create_pull_request.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_create_repo.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -27,7 +26,7 from rhodecode.model.user import UserMod
 from rhodecode.tests import TEST_USER_ADMIN_LOGIN
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_ok, assert_error, crash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.str_utils import safe_str
 

rhodecode/api/tests/test_create_repo_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -26,7 +25,7 from rhodecode.model.user import UserMod
 from rhodecode.tests import TEST_USER_ADMIN_LOGIN
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_ok, assert_error, crash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 
 
 fixture = Fixture()

rhodecode/api/tests/test_create_user.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -26,7 +25,7 from rhodecode.tests import (
     TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_EMAIL)
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_ok, assert_error, jsonify, crash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.model.db import RepoGroup
 
 

rhodecode/api/tests/test_create_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -25,7 +24,7 from rhodecode.model.user import UserMod
 from rhodecode.model.user_group import UserGroupModel
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok, crash, jsonify)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 
 
 @pytest.mark.usefixtures("testuser_api", "app")

rhodecode/api/tests/test_delete_gist.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_repo.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_repo_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_user.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_deprecated_api.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_fork_repo.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -28,7 +27,7 from rhodecode.model.user import UserMod
 from rhodecode.tests import TEST_USER_ADMIN_LOGIN
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok, crash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 
 
 fixture = Fixture()

rhodecode/api/tests/test_fts_search.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_gist.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_gists.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_ip.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_locks.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_method.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_pull_request.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_pull_request_comments.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_pull_requests.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_changeset.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_comments.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,6 +19,7
 
 import pytest
 
+from rhodecode.lib.str_utils import safe_str
 from rhodecode.model.db import User, ChangesetComment
 from rhodecode.model.meta import Session
 from rhodecode.model.comment import CommentsModel
@@ -37,7 +37,7 def make_repo_comments_factory(request):
             commit = repo.scm_instance()[0]
 
             commit_id = commit.raw_id
-            file_0 = commit.affected_files[0]
+            file_0 = safe_str(commit.affected_files[0])
             comments = []
 
             # general

rhodecode/api/tests/test_get_repo_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_groups.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_nodes.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_refs.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repos.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_server_info.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_user.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_user_groups.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_users.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_group_permission.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_group_permission_to_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_permission.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_permission_to_repo_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_permission_to_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_invalidate_cache.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_merge_pull_request.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_pull.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_remove_field_from_repo.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_remove_user_from_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_repo_locking.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_rescan_repos.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,7 +19,6
 import mock
 import pytest
 
-from rhodecode.model.scm import ScmModel
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_ok, assert_error, crash)
 
@@ -31,13 +29,14 class TestRescanRepos(object):
         id_, params = build_data(self.apikey, 'rescan_repos')
         response = api_call(self.app, params)
 
-        expected = {'added': [], 'removed': []}
+        expected = {'added': [], 'errors': []}
         assert_ok(id_, expected, given=response.body)
 
-    @mock.patch.object(ScmModel, 'repo_scan', crash)
-    def test_api_rescann_error(self):
+    def test_api_rescan_repos_error(self):
         id_, params = build_data(self.apikey, 'rescan_repos', )
-        response = api_call(self.app, params)
+
+        with mock.patch('rhodecode.lib.utils.repo2db_mapper', side_effect=crash):
+            response = api_call(self.app, params)
 
         expected = 'Error occurred during rescan repositories action'
         assert_error(id_, expected, given=response.body)

rhodecode/api/tests/test_revoke_user_group_permission.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_group_permission_from_repo_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_group_permission_from_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_permission.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_permission_from_repo_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_permission_from_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_service_api.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_store_exception.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_pull_request.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_repo.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -25,8 +24,8 from rhodecode.model.scm import ScmModel
 from rhodecode.tests import TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok, crash, jsonify)
-from rhodecode.tests.fixture import Fixture
-from rhodecode.tests.fixture_mods.fixture_utils import plain_http_host_only_stub
+from rhodecode.tests.fixtures.rc_fixture import Fixture
+from rhodecode.tests.fixtures.fixture_utils import plain_http_host_only_stub
 
 fixture = Fixture()
 

rhodecode/api/tests/test_update_repo_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_user.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_user_group.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_utils.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/utils.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2014-2023 RhodeCode GmbH
+# Copyright (C) 2014-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2015-2023 RhodeCode GmbH
+# Copyright (C) 2015-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/deprecated_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/gist_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/pull_request_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/repo_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -317,8 +317,7 def get_repo_changeset(request, apiuser,
                 ','.join(_changes_details_types)))
 
     vcs_repo = repo.scm_instance()
-    pre_load = ['author', 'branch', 'date', 'message', 'parents',
-                'status', '_commit', '_file_paths']
+    pre_load = ['author', 'branch', 'date', 'message', 'parents', 'status', '_commit']
 
     try:
         commit = repo.get_commit(commit_id=revision, pre_load=pre_load)
@@ -376,8 +375,7 def get_repo_changesets(request, apiuser
                 ','.join(_changes_details_types)))
 
     limit = int(limit)
-    pre_load = ['author', 'branch', 'date', 'message', 'parents',
-                'status', '_commit', '_file_paths']
+    pre_load = ['author', 'branch', 'date', 'message', 'parents', 'status', '_commit']
 
     vcs_repo = repo.scm_instance()
     # SVN needs a special case to distinguish its index and commit id

rhodecode/api/views/repo_group_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/search_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/server_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -18,14 +18,13
 
 import logging
 import itertools
-import base64
 
 from rhodecode.api import (
     jsonrpc_method, JSONRPCError, JSONRPCForbidden, find_methods)
 
 from rhodecode.api.utils import (
     Optional, OAttr, has_superadmin_permission, get_user_or_error)
-from rhodecode.lib.utils import repo2db_mapper, get_rhodecode_repo_store_path
+from rhodecode.lib.utils import get_rhodecode_repo_store_path
 from rhodecode.lib import system_info
 from rhodecode.lib import user_sessions
 from rhodecode.lib import exc_tracking
@@ -33,9 +32,7 from rhodecode.lib.ext_json import json
 from rhodecode.lib.utils2 import safe_int
 from rhodecode.model.db import UserIpMap
 from rhodecode.model.scm import ScmModel
-from rhodecode.apps.file_store import utils as store_utils
-from rhodecode.apps.file_store.exceptions import FileNotAllowedException, \
-    FileOverSizeException
+
 
 log = logging.getLogger(__name__)
 
@@ -158,13 +155,10 def get_ip(request, apiuser, userid=Opti
 
 
 @jsonrpc_method()
-def rescan_repos(request, apiuser, remove_obsolete=Optional(False)):
+def rescan_repos(request, apiuser):
     """
     Triggers a rescan of the specified repositories.
-
-    * If the ``remove_obsolete`` option is set, it also deletes repositories
-      that are found in the database but not on the file system, so called
-      "clean zombies".
+    It returns list of added repositories, and errors during scan.
 
     This command can only be run using an |authtoken| with admin rights to
     the specified repository.
@@ -173,9 +167,6 def rescan_repos(request, apiuser, remov
 
     :param apiuser: This is filled automatically from the |authtoken|.
     :type apiuser: AuthUser
-    :param remove_obsolete: Deletes repositories from the database that
-        are not found on the filesystem.
-    :type remove_obsolete: Optional(``True`` | ``False``)
 
     Example output:
 
@@ -184,7 +175,7 def rescan_repos(request, apiuser, remov
       id : <id_given_in_input>
       result : {
         'added': [<added repository name>,...]
-        'removed': [<removed repository name>,...]
+        'errors': [<error_list>,...]
       }
       error :  null
 
@@ -199,20 +190,69 def rescan_repos(request, apiuser, remov
       }
 
     """
+    from rhodecode.lib.utils import repo2db_mapper # re-import for testing patches
+
     if not has_superadmin_permission(apiuser):
         raise JSONRPCForbidden()
 
     try:
-        rm_obsolete = Optional.extract(remove_obsolete)
-        added, removed = repo2db_mapper(ScmModel().repo_scan(),
-                                        remove_obsolete=rm_obsolete, force_hooks_rebuild=True)
-        return {'added': added, 'removed': removed}
+        added, errors = repo2db_mapper(ScmModel().repo_scan(), force_hooks_rebuild=True)
+        return {'added': added, 'errors': errors}
     except Exception:
-        log.exception('Failed to run repo rescann')
+        log.exception('Failed to run repo rescan')
         raise JSONRPCError(
             'Error occurred during rescan repositories action'
         )
 
+@jsonrpc_method()
+def cleanup_repos(request, apiuser):
+    """
+    Triggers a cleanup of non-existing repositories or repository groups in filesystem.
+
+    This command can only be run using an |authtoken| with admin rights to
+    the specified repository.
+
+    This command takes the following options:
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+
+    Example output:
+
+    .. code-block:: bash
+
+      id : <id_given_in_input>
+      result : {
+        'removed': [<removed repository name or repository group name>,...]
+        'errors': [<error list of failures to remove>,...]
+      }
+      error :  null
+
+    Example error output:
+
+    .. code-block:: bash
+
+      id : <id_given_in_input>
+      result : null
+      error :  {
+        'Error occurred during repo storage cleanup action'
+      }
+
+    """
+    from rhodecode.lib.utils import repo2db_cleanup  # re-import for testing patches
+
+    if not has_superadmin_permission(apiuser):
+        raise JSONRPCForbidden()
+
+    try:
+        removed, errors = repo2db_cleanup()
+        return {'removed': removed, 'errors': errors}
+    except Exception:
+        log.exception('Failed to run repo storage cleanup')
+        raise JSONRPCError(
+            'Error occurred during repo storage cleanup action'
+        )
+
 
 @jsonrpc_method()
 def cleanup_sessions(request, apiuser, older_then=Optional(60)):

rhodecode/api/views/service_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/testing_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/user_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/user_group_api.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/_base/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -395,7 +395,7 class RepoAppView(BaseAppView):
         settings = settings_model.get_repo_settings_inherited()
         return settings.get(settings_key, default)
 
-    def _get_readme_data(self, db_repo, renderer_type, commit_id=None, path="/"):
+    def _get_readme_data(self, db_repo, renderer_type, commit_id=None, path="/", nodes=None):
         log.debug("Looking for README file at path %s", path)
         if commit_id:
             landing_commit_id = commit_id
@@ -413,16 +413,14 class RepoAppView(BaseAppView):
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
         def generate_repo_readme(
-            repo_id, _commit_id, _repo_name, _readme_search_path, _renderer_type
+            _repo_id, _commit_id, _repo_name, _readme_search_path, _renderer_type
         ):
-            readme_data = None
-            readme_filename = None
+            _readme_data = None
+            _readme_filename = None
 
             commit = db_repo.get_commit(_commit_id)
             log.debug("Searching for a README file at commit %s.", _commit_id)
-            readme_node = ReadmeFinder(_renderer_type).search(
-                commit, path=_readme_search_path
-            )
+            readme_node = ReadmeFinder(_renderer_type).search(commit, path=_readme_search_path, nodes=nodes)
 
             if readme_node:
                 log.debug("Found README node: %s", readme_node)
@@ -442,19 +440,19 class RepoAppView(BaseAppView):
                     ),
                 }
 
-                readme_data = self._render_readme_or_none(
+                _readme_data = self._render_readme_or_none(
                     commit, readme_node, relative_urls
                 )
-                readme_filename = readme_node.str_path
+                _readme_filename = readme_node.str_path
 
-            return readme_data, readme_filename
+            return _readme_data, _readme_filename
 
         readme_data, readme_filename = generate_repo_readme(
             db_repo.repo_id,
             landing_commit_id,
             db_repo.repo_name,
             path,
-            renderer_type,
+            renderer_type
         )
 
         compute_time = time.time() - start

rhodecode/apps/_base/interfaces.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/_base/navigation.py

@@ -1,6 +1,5
 
-import dataclasses
-# Copyright (C) 2016-2023 RhodeCode GmbH
+import dataclasses# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/_base/subscribers.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -361,12 +361,21 def admin_routes(config):
         renderer='rhodecode:templates/admin/settings/settings.mako')
 
     config.add_route(
-        name='admin_settings_mapping_update',
-        pattern='/settings/mapping/update')
+        name='admin_settings_mapping_create',
+        pattern='/settings/mapping/create')
     config.add_view(
         AdminSettingsView,
-        attr='settings_mapping_update',
-        route_name='admin_settings_mapping_update', request_method='POST',
+        attr='settings_mapping_create',
+        route_name='admin_settings_mapping_create', request_method='POST',
+        renderer='rhodecode:templates/admin/settings/settings.mako')
+
+    config.add_route(
+        name='admin_settings_mapping_cleanup',
+        pattern='/settings/mapping/cleanup')
+    config.add_view(
+        AdminSettingsView,
+        attr='settings_mapping_cleanup',
+        route_name='admin_settings_mapping_cleanup', request_method='POST',
         renderer='rhodecode:templates/admin/settings/settings.mako')
 
     config.add_route(

rhodecode/apps/admin/tests/test_admin_audit_logs.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -26,7 +25,7 import pytest
 from rhodecode.lib.str_utils import safe_str
 from rhodecode.tests import *
 from rhodecode.tests.routes import route_path
-from rhodecode.tests.fixture import FIXTURES
+from rhodecode.tests.fixtures.rc_fixture import FIXTURES
 from rhodecode.model.db import UserLog
 from rhodecode.model.meta import Session
 

rhodecode/apps/admin/tests/test_admin_auth_settings.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_defaults.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_main_views.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,7 +19,7
 import pytest
 
 from rhodecode.tests import TestController
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/admin/tests/test_admin_permissions.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_repos.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -37,7 +36,7 from rhodecode.model.user import UserMod
 from rhodecode.tests import (
     login_user_session, assert_session_flash, TEST_USER_ADMIN_LOGIN,
     TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
-from rhodecode.tests.fixture import Fixture, error_function
+from rhodecode.tests.fixtures.rc_fixture import Fixture, error_function
 from rhodecode.tests.utils import repo_on_filesystem
 from rhodecode.tests.routes import route_path
 
@@ -111,9 +110,11 class TestAdminRepos(object):
                 repo_type=backend.alias,
                 repo_description=description,
                 csrf_token=csrf_token))
-
-        self.assert_repository_is_created_correctly(
-            repo_name, description, backend)
+        try:
+            self.assert_repository_is_created_correctly(repo_name, description, backend)
+        finally:
+            RepoModel().delete(numeric_repo)
+            Session().commit()
 
     @pytest.mark.parametrize("suffix", ['', '_ąćę'], ids=['', 'non-ascii'])
     def test_create_in_group(

rhodecode/apps/admin/tests/test_admin_repository_groups.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -27,7 +26,7 from rhodecode.model.meta import Session
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.tests import (
     assert_session_flash, TEST_USER_REGULAR_LOGIN, TESTS_TMP_PATH)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_user_groups.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -24,7 +23,7 from rhodecode.model.meta import Session
 
 from rhodecode.tests import (
     TestController, assert_session_flash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/admin/tests/test_admin_users.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -28,7 +27,7 from rhodecode.model.user import UserMod
 
 from rhodecode.tests import (
     TestController, TEST_USER_REGULAR_LOGIN, assert_session_flash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,7 +21,7 import pytest
 from rhodecode.model.db import User, UserSshKeys
 
 from rhodecode.tests import TestController, assert_session_flash
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/admin/views/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/artifacts.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/audit_logs.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/automation.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/defaults.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/exception_tracker.py

@@ -1,4 +1,4
-# Copyright (C) 2018-2023 RhodeCode GmbH
+# Copyright (C) 2018-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/main_views.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/open_source_licenses.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/permissions.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/process_management.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/repo_groups.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/repositories.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/scheduler.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/sessions.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/settings.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -38,7 +38,7 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
 from rhodecode.lib.celerylib import tasks, run_task
 from rhodecode.lib.str_utils import safe_str
-from rhodecode.lib.utils import repo2db_mapper, get_rhodecode_repo_store_path
+from rhodecode.lib.utils import repo2db_mapper, get_rhodecode_repo_store_path, repo2db_cleanup
 from rhodecode.lib.utils2 import str2bool, AttributeDict
 from rhodecode.lib.index import searcher_from_config
 
@@ -77,13 +77,16 class AdminSettingsView(BaseAppView):
             raise Exception('Could not get application ui settings !')
         settings = {
             # legacy param that needs to be kept
-            'web_push_ssl': False
+            'web_push_ssl': False,
+            'extensions_hgsubversion': False
         }
         for each in ret:
             k = each.ui_key
             v = each.ui_value
+            section = each.ui_section
+
             # skip some options if they are defined
-            if k in ['push_ssl']:
+            if f"{section}_{k}" in ['web_push_ssl', 'extensions_hgsubversion']:
                 continue
 
             if k == '/':
@@ -98,7 +101,7 class AdminSettingsView(BaseAppView):
             if each.ui_section in ['hooks', 'extensions']:
                 v = each.ui_active
 
-            settings[each.ui_section + '_' + k] = v
+            settings[section + '_' + k] = v
 
         return settings
 
@@ -125,8 +128,6 class AdminSettingsView(BaseAppView):
         c.svn_config_path = rhodecode.ConfigGet().get_str(config_keys.config_file_path)
         defaults = self._form_defaults()
 
-        model.create_largeobjects_dirs_if_needed(defaults['paths_root_path'])
-
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
@@ -232,13 +233,12 class AdminSettingsView(BaseAppView):
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
-    def settings_mapping_update(self):
+    def settings_mapping_create(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'mapping'
-        rm_obsolete = self.request.POST.get('destroy', False)
         invalidate_cache = self.request.POST.get('invalidate', False)
-        log.debug('rescanning repo location with destroy obsolete=%s', rm_obsolete)
+        log.debug('rescanning repo location')
 
         if invalidate_cache:
             log.debug('invalidating all repositories cache')
@@ -246,16 +246,34 class AdminSettingsView(BaseAppView):
                 ScmModel().mark_for_invalidation(repo.repo_name, delete=True)
 
         filesystem_repos = ScmModel().repo_scan()
-        added, removed = repo2db_mapper(filesystem_repos, rm_obsolete, force_hooks_rebuild=True)
+        added, errors = repo2db_mapper(filesystem_repos, force_hooks_rebuild=True)
         PermissionModel().trigger_permission_flush()
 
         def _repr(rm_repo):
             return ', '.join(map(safe_str, rm_repo)) or '-'
 
-        h.flash(_('Repositories successfully '
-                  'rescanned added: %s ; removed: %s') %
-                (_repr(added), _repr(removed)),
-                category='success')
+        if errors:
+            h.flash(_('Errors during scan: {}').format(_repr(errors), ), category='error')
+
+        h.flash(_('Repositories successfully scanned: Added: {}').format(_repr(added)), category='success')
+        raise HTTPFound(h.route_path('admin_settings_mapping'))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    def settings_mapping_cleanup(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'mapping'
+        log.debug('rescanning repo location')
+
+        removed, errors = repo2db_cleanup()
+        PermissionModel().trigger_permission_flush()
+
+        def _repr(rm_repo):
+            return ', '.join(map(safe_str, rm_repo)) or '-'
+
+        h.flash(_('Repositories successfully scanned: Errors: {}, Added: {}').format(errors, _repr(removed)), category='success')
         raise HTTPFound(h.route_path('admin_settings_mapping'))
 
     @LoginRequired()

rhodecode/apps/admin/views/svn_config.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/system_info.py

@@ -1,6 +1,4
-
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/user_groups.py

@@ -1,6 +1,4
-
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/users.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/channelstream/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/channelstream/views.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/debug_style/__init__.py

@@ -1,6 +1,4
-
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/debug_style/views.py

@@ -1,6 +1,4
-
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/backends/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/backends/base.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/backends/filesystem.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/backends/filesystem_legacy.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/backends/objectstore.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/config_keys.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/exceptions.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/extensions.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/test_filestore_backends.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/test_filestore_filesystem_backend.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/test_filestore_legacy_and_v2_compatability.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/test_filestore_legacy_backend.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/test_filestore_objectstore_backend.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/test_upload_file.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/views.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/gist/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/gist/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/gist/tests/test_admin_gists.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/gist/views.py

@@ -1,4 +1,4
-# Copyright (C) 2013-2023 RhodeCode GmbH
+# Copyright (C) 2013-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/tests/test_get_goto_switched_data.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -27,7 +27,7 from rhodecode.model.repo_group import R
 from rhodecode.model.db import Session, Repository, RepoGroup
 
 from rhodecode.tests import TestController, TEST_USER_ADMIN_LOGIN
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/home/tests/test_get_repo_list_data.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,7 +22,7 from rhodecode.model.db import Repositor
 from rhodecode.lib.ext_json import json
 
 from rhodecode.tests import TestController
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/home/tests/test_get_user_data.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,7 +20,7 import pytest
 from rhodecode.lib.ext_json import json
 
 from rhodecode.tests import TestController
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/home/tests/test_get_user_group_data.py

@@ -1,23 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License, version 3
-# (only), as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This program is dual-licensed. If you wish to learn more about the
-# RhodeCode Enterprise Edition, including its added features, Support services,
-# and proprietary license terms, please see https://rhodecode.com/licenses/
-
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -40,7 +21,7 import pytest
 from rhodecode.lib.ext_json import json
 
 from rhodecode.tests import TestController
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/home/tests/test_home.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -24,7 +24,7 from rhodecode.model.db import Repositor
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel
 from rhodecode.tests import TestController
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 

rhodecode/apps/home/views.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/hovercards/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2018-2023 RhodeCode GmbH
+# Copyright (C) 2018-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/hovercards/views.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/journal/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/journal/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/journal/tests/test_journal.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/journal/views.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/login/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/login/tests/test_2fa.py

@@ -3,7 +3,7 import mock
 
 from rhodecode.lib.type_utils import AttributeDict
 from rhodecode.model.meta import Session
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 from rhodecode.model.settings import SettingsModel
 

rhodecode/apps/login/tests/test_login.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -31,7 +31,7 from rhodecode.model.meta import Session
 from rhodecode.tests import (
     assert_session_flash, HG_REPO, TEST_USER_ADMIN_LOGIN,
     no_newline_id_generator)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/login/tests/test_password_reset.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,7 +22,7 from rhodecode.lib import helpers as h
 from rhodecode.tests import (
     TestController, clear_cache_regions,
     TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.utils import AssertResponse
 from rhodecode.tests.routes import route_path
 

rhodecode/apps/login/tests/test_register_captcha.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/login/views.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,7 +22,7 from rhodecode.apps._base import ADMIN_P
 from rhodecode.model.db import User
 from rhodecode.tests import (
     TestController, assert_session_flash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 

rhodecode/apps/my_account/tests/test_my_account_edit.py

@@ -1,23 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License, version 3
-# (only), as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This program is dual-licensed. If you wish to learn more about the
-# RhodeCode Enterprise Edition, including its added features, Support services,
-# and proprietary license terms, please see https://rhodecode.com/licenses/
-
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_emails.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -23,7 +23,7 from rhodecode.model.db import User, Use
 from rhodecode.tests import (
     TestController, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_EMAIL,
     assert_session_flash, TEST_USER_REGULAR_PASS)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 

rhodecode/apps/my_account/tests/test_my_account_notifications.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -21,7 +21,7 import pytest
 from rhodecode.tests import (
     TestController, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS,
     TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 from rhodecode.model.db import Notification, User

rhodecode/apps/my_account/tests/test_my_account_password.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -24,7 +23,7 from rhodecode.lib.auth import check_pas
 from rhodecode.model.meta import Session
 from rhodecode.model.user import UserModel
 from rhodecode.tests import assert_session_flash, TestController
-from rhodecode.tests.fixture import Fixture, error_function
+from rhodecode.tests.fixtures.rc_fixture import Fixture, error_function
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/my_account/tests/test_my_account_profile.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,7 +19,7
 from rhodecode.tests import (
     TestController, TEST_USER_ADMIN_LOGIN,
     TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/my_account/tests/test_my_account_simple_views.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -19,7 +18,7
 
 from rhodecode.model.db import User, Repository, UserFollowing
 from rhodecode.tests import TestController, TEST_USER_ADMIN_LOGIN
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -21,7 +20,7
 from rhodecode.model.db import User, UserSshKeys
 
 from rhodecode.tests import TestController, assert_session_flash
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/my_account/views/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/views/my_account.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/views/my_account_notifications.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/views/my_account_ssh_keys.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ops/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ops/views.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/tests/test_repo_groups_settings.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/views/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/views/repo_group_advanced.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/views/repo_group_permissions.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/views/repo_group_settings.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_pull_requests_list.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_bookmarks.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_branches.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_changelog.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_commit_comments.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_commits.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_compare.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_compare_local.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,7 +21,7 import pytest
 from rhodecode.apps.repository.tests.test_repo_compare import ComparePage
 from rhodecode.lib.vcs import nodes
 from rhodecode.lib.vcs.backends.base import EmptyCommit
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.utils import commit_change
 from rhodecode.tests.routes import route_path
 
@@ -166,14 +165,15 class TestSideBySideDiff(object):
         response.mustcontain('Collapse 2 commits')
         response.mustcontain('123 file changed')
 
-        response.mustcontain(
-            'r%s:%s...r%s:%s' % (
-                commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
+        response.mustcontain(f'r{commit1.idx}:{commit1.short_id}...r{commit2.idx}:{commit2.short_id}')
 
         response.mustcontain(f_path)
 
-    @pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
+    #@pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
     def test_diff_side_by_side_from_0_commit_with_file_filter(self, app, backend, backend_stub):
+        if backend.alias == 'git':
+            pytest.skip('GIT does not handle empty commit compare correct (missing 1 commit)')
+
         f_path = b'test_sidebyside_file.py'
         commit1_content = b'content-25d7e49c18b159446c\n'
         commit2_content = b'content-603d6c72c46d953420\n'
@@ -200,9 +200,7 class TestSideBySideDiff(object):
         response.mustcontain('Collapse 2 commits')
         response.mustcontain('1 file changed')
 
-        response.mustcontain(
-            'r%s:%s...r%s:%s' % (
-                commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
+        response.mustcontain(f'r{commit1.idx}:{commit1.short_id}...r{commit2.idx}:{commit2.short_id}')
 
         response.mustcontain(f_path)
 

rhodecode/apps/repository/tests/test_repo_feed.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_files.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -33,7 +32,7 from rhodecode.lib.vcs.conf import setti
 from rhodecode.model.db import Session, Repository
 
 from rhodecode.tests import assert_session_flash
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 
@@ -42,207 +41,171 fixture = Fixture()
 
 def get_node_history(backend_type):
     return {
-        'hg': json.loads(fixture.load_resource('hg_node_history_response.json')),
-        'git': json.loads(fixture.load_resource('git_node_history_response.json')),
-        'svn': json.loads(fixture.load_resource('svn_node_history_response.json')),
+        "hg": json.loads(fixture.load_resource("hg_node_history_response.json")),
+        "git": json.loads(fixture.load_resource("git_node_history_response.json")),
+        "svn": json.loads(fixture.load_resource("svn_node_history_response.json")),
     }[backend_type]
 
 
 def assert_files_in_response(response, files, params):
-    template = (
-        'href="/%(repo_name)s/files/%(commit_id)s/%(name)s"')
+    template = 'href="/%(repo_name)s/files/%(commit_id)s/%(name)s"'
     _assert_items_in_response(response, files, template, params)
 
 
 def assert_dirs_in_response(response, dirs, params):
-    template = (
-        'href="/%(repo_name)s/files/%(commit_id)s/%(name)s"')
+    template = 'href="/%(repo_name)s/files/%(commit_id)s/%(name)s"'
     _assert_items_in_response(response, dirs, template, params)
 
 
 def _assert_items_in_response(response, items, template, params):
     for item in items:
-        item_params = {'name': item}
+        item_params = {"name": item}
         item_params.update(params)
         response.mustcontain(template % item_params)
 
 
 def assert_timeago_in_response(response, items, params):
     for item in items:
-        response.mustcontain(h.age_component(params['date']))
+        response.mustcontain(h.age_component(params["date"]))
 
 
 @pytest.mark.usefixtures("app")
 class TestFilesViews(object):
-
     def test_show_files(self, backend):
-        response = self.app.get(
-            route_path('repo_files',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'))
+        response = self.app.get(route_path("repo_files", repo_name=backend.repo_name, commit_id="tip", f_path=""))
         commit = backend.repo.get_commit()
 
-        params = {
-            'repo_name': backend.repo_name,
-            'commit_id': commit.raw_id,
-            'date': commit.date
-        }
-        assert_dirs_in_response(response, ['docs', 'vcs'], params)
+        params = {"repo_name": backend.repo_name, "commit_id": commit.raw_id, "date": commit.date}
+        assert_dirs_in_response(response, ["docs", "vcs"], params)
         files = [
-            '.gitignore',
-            '.hgignore',
-            '.hgtags',
+            ".gitignore",
+            ".hgignore",
+            ".hgtags",
             # TODO: missing in Git
             # '.travis.yml',
-            'MANIFEST.in',
-            'README.rst',
+            "MANIFEST.in",
+            "README.rst",
             # TODO: File is missing in svn repository
             # 'run_test_and_report.sh',
-            'setup.cfg',
-            'setup.py',
-            'test_and_report.sh',
-            'tox.ini',
+            "setup.cfg",
+            "setup.py",
+            "test_and_report.sh",
+            "tox.ini",
         ]
         assert_files_in_response(response, files, params)
         assert_timeago_in_response(response, files, params)
 
     def test_show_files_links_submodules_with_absolute_url(self, backend_hg):
-        repo = backend_hg['subrepos']
-        response = self.app.get(
-            route_path('repo_files',
-                       repo_name=repo.repo_name,
-                       commit_id='tip', f_path='/'))
+        repo = backend_hg["subrepos"]
+        response = self.app.get(route_path("repo_files", repo_name=repo.repo_name, commit_id="tip", f_path=""))
         assert_response = response.assert_response()
-        assert_response.contains_one_link(
-            'absolute-path @ 000000000000', 'http://example.com/absolute-path')
+        assert_response.contains_one_link("absolute-path @ 000000000000", "http://example.com/absolute-path")
 
-    def test_show_files_links_submodules_with_absolute_url_subpaths(
-            self, backend_hg):
-        repo = backend_hg['subrepos']
-        response = self.app.get(
-            route_path('repo_files',
-                       repo_name=repo.repo_name,
-                       commit_id='tip', f_path='/'))
+    def test_show_files_links_submodules_with_absolute_url_subpaths(self, backend_hg):
+        repo = backend_hg["subrepos"]
+        response = self.app.get(route_path("repo_files", repo_name=repo.repo_name, commit_id="tip", f_path=""))
         assert_response = response.assert_response()
-        assert_response.contains_one_link(
-            'subpaths-path @ 000000000000',
-            'http://sub-base.example.com/subpaths-path')
+        assert_response.contains_one_link("subpaths-path @ 000000000000", "http://sub-base.example.com/subpaths-path")
 
     @pytest.mark.xfail_backends("svn", reason="Depends on branch support")
     def test_files_menu(self, backend):
         new_branch = "temp_branch_name"
-        commits = [
-            {'message': 'a'},
-            {'message': 'b', 'branch': new_branch}
-        ]
+        commits = [{"message": "a"}, {"message": "b", "branch": new_branch}]
         backend.create_repo(commits)
         backend.repo.landing_rev = f"branch:{new_branch}"
         Session().commit()
 
         # get response based on tip and not new commit
-        response = self.app.get(
-            route_path('repo_files',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'))
+        response = self.app.get(route_path("repo_files", repo_name=backend.repo_name, commit_id="tip", f_path=""))
 
         # make sure Files menu url is not tip but new commit
         landing_rev = backend.repo.landing_ref_name
-        files_url = route_path('repo_files:default_path',
-                               repo_name=backend.repo_name,
-                               commit_id=landing_rev, params={'at': landing_rev})
+        files_url = route_path(
+            "repo_files:default_path", repo_name=backend.repo_name, commit_id=landing_rev, params={"at": landing_rev}
+        )
 
-        assert landing_rev != 'tip'
+        assert landing_rev != "tip"
         response.mustcontain(f'<li class="active"><a class="menulink" href="{files_url}">')
 
     def test_show_files_commit(self, backend):
         commit = backend.repo.get_commit(commit_idx=32)
 
         response = self.app.get(
-            route_path('repo_files',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='/'))
+            route_path("repo_files", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="")
+        )
 
-        dirs = ['docs', 'tests']
-        files = ['README.rst']
+        dirs = ["docs", "tests"]
+        files = ["README.rst"]
         params = {
-            'repo_name': backend.repo_name,
-            'commit_id': commit.raw_id,
+            "repo_name": backend.repo_name,
+            "commit_id": commit.raw_id,
         }
         assert_dirs_in_response(response, dirs, params)
         assert_files_in_response(response, files, params)
 
     def test_show_files_different_branch(self, backend):
         branches = dict(
-            hg=(150, ['git']),
+            hg=(150, ["git"]),
             # TODO: Git test repository does not contain other branches
-            git=(633, ['master']),
+            git=(633, ["master"]),
             # TODO: Branch support in Subversion
-            svn=(150, [])
+            svn=(150, []),
         )
         idx, branches = branches[backend.alias]
         commit = backend.repo.get_commit(commit_idx=idx)
         response = self.app.get(
-            route_path('repo_files',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='/'))
+            route_path("repo_files", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="")
+        )
 
         assert_response = response.assert_response()
         for branch in branches:
-            assert_response.element_contains('.tags .branchtag', branch)
+            assert_response.element_contains(".tags .branchtag", branch)
 
     def test_show_files_paging(self, backend):
         repo = backend.repo
         indexes = [73, 92, 109, 1, 0]
-        idx_map = [(rev, repo.get_commit(commit_idx=rev).raw_id)
-                   for rev in indexes]
+        idx_map = [(rev, repo.get_commit(commit_idx=rev).raw_id) for rev in indexes]
 
         for idx in idx_map:
-            response = self.app.get(
-            route_path('repo_files',
-                       repo_name=backend.repo_name,
-                       commit_id=idx[1], f_path='/'))
+            response = self.app.get(route_path("repo_files", repo_name=backend.repo_name, commit_id=idx[1], f_path=""))
 
             response.mustcontain("""r%s:%s""" % (idx[0], idx[1][:8]))
 
     def test_file_source(self, backend):
         commit = backend.repo.get_commit(commit_idx=167)
         response = self.app.get(
-            route_path('repo_files',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='vcs/nodes.py'))
+            route_path("repo_files", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="vcs/nodes.py")
+        )
 
         msgbox = """<div class="commit">%s</div>"""
-        response.mustcontain(msgbox % (commit.message, ))
+        response.mustcontain(msgbox % (commit.message,))
 
         assert_response = response.assert_response()
         if commit.branch:
-            assert_response.element_contains(
-                '.tags.tags-main .branchtag', commit.branch)
+            assert_response.element_contains(".tags.tags-main .branchtag", commit.branch)
         if commit.tags:
             for tag in commit.tags:
-                assert_response.element_contains('.tags.tags-main .tagtag', tag)
+                assert_response.element_contains(".tags.tags-main .tagtag", tag)
 
     def test_file_source_annotated(self, backend):
         response = self.app.get(
-            route_path('repo_files:annotated',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='vcs/nodes.py'))
+            route_path("repo_files:annotated", repo_name=backend.repo_name, commit_id="tip", f_path="vcs/nodes.py")
+        )
         expected_commits = {
-            'hg': 'r356',
-            'git': 'r345',
-            'svn': 'r208',
+            "hg": "r356",
+            "git": "r345",
+            "svn": "r208",
         }
         response.mustcontain(expected_commits[backend.alias])
 
     def test_file_source_authors(self, backend):
         response = self.app.get(
-            route_path('repo_file_authors',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='vcs/nodes.py'))
+            route_path("repo_file_authors", repo_name=backend.repo_name, commit_id="tip", f_path="vcs/nodes.py")
+        )
         expected_authors = {
-            'hg': ('Marcin Kuzminski', 'Lukasz Balcerzak'),
-            'git': ('Marcin Kuzminski', 'Lukasz Balcerzak'),
-            'svn': ('marcin', 'lukasz'),
+            "hg": ("Marcin Kuzminski", "Lukasz Balcerzak"),
+            "git": ("Marcin Kuzminski", "Lukasz Balcerzak"),
+            "svn": ("marcin", "lukasz"),
         }
 
         for author in expected_authors[backend.alias]:
@@ -250,14 +213,18 class TestFilesViews(object):
 
     def test_file_source_authors_with_annotation(self, backend):
         response = self.app.get(
-            route_path('repo_file_authors',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='vcs/nodes.py',
-                       params=dict(annotate=1)))
+            route_path(
+                "repo_file_authors",
+                repo_name=backend.repo_name,
+                commit_id="tip",
+                f_path="vcs/nodes.py",
+                params=dict(annotate=1),
+            )
+        )
         expected_authors = {
-            'hg': ('Marcin Kuzminski', 'Lukasz Balcerzak'),
-            'git': ('Marcin Kuzminski', 'Lukasz Balcerzak'),
-            'svn': ('marcin', 'lukasz'),
+            "hg": ("Marcin Kuzminski", "Lukasz Balcerzak"),
+            "git": ("Marcin Kuzminski", "Lukasz Balcerzak"),
+            "svn": ("marcin", "lukasz"),
         }
 
         for author in expected_authors[backend.alias]:
@@ -265,94 +232,88 class TestFilesViews(object):
 
     def test_file_source_history(self, backend, xhr_header):
         response = self.app.get(
-            route_path('repo_file_history',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='vcs/nodes.py'),
-            extra_environ=xhr_header)
+            route_path("repo_file_history", repo_name=backend.repo_name, commit_id="tip", f_path="vcs/nodes.py"),
+            extra_environ=xhr_header,
+        )
         assert get_node_history(backend.alias) == json.loads(response.body)
 
     def test_file_source_history_svn(self, backend_svn, xhr_header):
-        simple_repo = backend_svn['svn-simple-layout']
+        simple_repo = backend_svn["svn-simple-layout"]
         response = self.app.get(
-            route_path('repo_file_history',
-                       repo_name=simple_repo.repo_name,
-                       commit_id='tip', f_path='trunk/example.py'),
-            extra_environ=xhr_header)
+            route_path(
+                "repo_file_history", repo_name=simple_repo.repo_name, commit_id="tip", f_path="trunk/example.py"
+            ),
+            extra_environ=xhr_header,
+        )
 
-        expected_data = json.loads(
-            fixture.load_resource('svn_node_history_branches.json'))
+        expected_data = json.loads(fixture.load_resource("svn_node_history_branches.json"))
 
         assert expected_data == response.json
 
     def test_file_source_history_with_annotation(self, backend, xhr_header):
         response = self.app.get(
-            route_path('repo_file_history',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='vcs/nodes.py',
-                       params=dict(annotate=1)),
-
-            extra_environ=xhr_header)
+            route_path(
+                "repo_file_history",
+                repo_name=backend.repo_name,
+                commit_id="tip",
+                f_path="vcs/nodes.py",
+                params=dict(annotate=1),
+            ),
+            extra_environ=xhr_header,
+        )
         assert get_node_history(backend.alias) == json.loads(response.body)
 
     def test_tree_search_top_level(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            route_path('repo_files_nodelist',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='/'),
-            extra_environ=xhr_header)
-        assert 'nodes' in response.json
-        assert {'name': 'docs', 'type': 'dir'} in response.json['nodes']
+            route_path("repo_files_nodelist", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path=""),
+            extra_environ=xhr_header,
+        )
+        assert "nodes" in response.json
+        assert {"name": "docs", "type": "dir"} in response.json["nodes"]
 
     def test_tree_search_missing_xhr(self, backend):
         self.app.get(
-            route_path('repo_files_nodelist',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'),
-            status=404)
+            route_path("repo_files_nodelist", repo_name=backend.repo_name, commit_id="tip", f_path=""), status=404
+        )
 
     def test_tree_search_at_path(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            route_path('repo_files_nodelist',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='/docs'),
-            extra_environ=xhr_header)
-        assert 'nodes' in response.json
-        nodes = response.json['nodes']
-        assert {'name': 'docs/api', 'type': 'dir'} in nodes
-        assert {'name': 'docs/index.rst', 'type': 'file'} in nodes
+            route_path("repo_files_nodelist", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="/docs"),
+            extra_environ=xhr_header,
+        )
+        assert "nodes" in response.json
+        nodes = response.json["nodes"]
+        assert {"name": "docs/api", "type": "dir"} in nodes
+        assert {"name": "docs/index.rst", "type": "file"} in nodes
 
     def test_tree_search_at_path_2nd_level(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            route_path('repo_files_nodelist',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='/docs/api'),
-            extra_environ=xhr_header)
-        assert 'nodes' in response.json
-        nodes = response.json['nodes']
-        assert {'name': 'docs/api/index.rst', 'type': 'file'} in nodes
+            route_path("repo_files_nodelist", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="/docs/api"),
+            extra_environ=xhr_header,
+        )
+        assert "nodes" in response.json
+        nodes = response.json["nodes"]
+        assert {"name": "docs/api/index.rst", "type": "file"} in nodes
 
     def test_tree_search_at_path_missing_xhr(self, backend):
         self.app.get(
-            route_path('repo_files_nodelist',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/docs'),
-            status=404)
+            route_path("repo_files_nodelist", repo_name=backend.repo_name, commit_id="tip", f_path="/docs"), status=404
+        )
 
     def test_nodetree(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            route_path('repo_nodetree_full',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='/'),
-            extra_environ=xhr_header)
+            route_path("repo_nodetree_full", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path=""),
+            extra_environ=xhr_header,
+        )
 
         assert_response = response.assert_response()
 
-        for attr in ['data-commit-id', 'data-date', 'data-author']:
-            elements = assert_response.get_elements('[{}]'.format(attr))
+        for attr in ["data-commit-id", "data-date", "data-author"]:
+            elements = assert_response.get_elements("[{}]".format(attr))
             assert len(elements) > 1
 
             for element in elements:
@@ -361,124 +322,113 class TestFilesViews(object):
     def test_nodetree_if_file(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            route_path('repo_nodetree_full',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='README.rst'),
-            extra_environ=xhr_header)
-        assert response.text == ''
+            route_path("repo_nodetree_full", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="README.rst"),
+            extra_environ=xhr_header,
+        )
+        assert response.text == ""
 
     def test_nodetree_wrong_path(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            route_path('repo_nodetree_full',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='/dont-exist'),
-            extra_environ=xhr_header)
+            route_path(
+                "repo_nodetree_full", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="/dont-exist"
+            ),
+            extra_environ=xhr_header,
+        )
 
-        err = 'error: There is no file nor ' \
-              'directory at the given path'
+        err = "error: There is no file nor " "directory at the given path"
         assert err in response.text
 
     def test_nodetree_missing_xhr(self, backend):
         self.app.get(
-            route_path('repo_nodetree_full',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'),
-            status=404)
+            route_path("repo_nodetree_full", repo_name=backend.repo_name, commit_id="tip", f_path=""), status=404
+        )
 
 
 @pytest.mark.usefixtures("app", "autologin_user")
 class TestRawFileHandling(object):
-
     def test_download_file(self, backend):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            route_path('repo_file_download',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='vcs/nodes.py'),)
+            route_path(
+                "repo_file_download", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="vcs/nodes.py"
+            ),
+        )
 
-        assert response.content_disposition == 'attachment; filename="nodes.py"; filename*=UTF-8\'\'nodes.py'
+        assert response.content_disposition == "attachment; filename=\"nodes.py\"; filename*=UTF-8''nodes.py"
         assert response.content_type == "text/x-python"
 
     def test_download_file_wrong_cs(self, backend):
-        raw_id = u'ERRORce30c96924232dffcd24178a07ffeb5dfc'
+        raw_id = "ERRORce30c96924232dffcd24178a07ffeb5dfc"
 
         response = self.app.get(
-            route_path('repo_file_download',
-                       repo_name=backend.repo_name,
-                       commit_id=raw_id, f_path='vcs/nodes.svg'),
-            status=404)
+            route_path("repo_file_download", repo_name=backend.repo_name, commit_id=raw_id, f_path="vcs/nodes.svg"),
+            status=404,
+        )
 
         msg = """No such commit exists for this repository"""
         response.mustcontain(msg)
 
     def test_download_file_wrong_f_path(self, backend):
         commit = backend.repo.get_commit(commit_idx=173)
-        f_path = 'vcs/ERRORnodes.py'
+        f_path = "vcs/ERRORnodes.py"
 
         response = self.app.get(
-            route_path('repo_file_download',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path=f_path),
-            status=404)
+            route_path("repo_file_download", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path=f_path),
+            status=404,
+        )
 
-        msg = (
-            "There is no file nor directory at the given path: "
-            "`%s` at commit %s" % (f_path, commit.short_id))
+        msg = "There is no file nor directory at the given path: " "`%s` at commit %s" % (f_path, commit.short_id)
         response.mustcontain(msg)
 
     def test_file_raw(self, backend):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            route_path('repo_file_raw',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path='vcs/nodes.py'),)
+            route_path("repo_file_raw", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path="vcs/nodes.py"),
+        )
 
         assert response.content_type == "text/plain"
 
     def test_file_raw_binary(self, backend):
         commit = backend.repo.get_commit()
         response = self.app.get(
-            route_path('repo_file_raw',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id,
-                       f_path='docs/theme/ADC/static/breadcrumb_background.png'),)
+            route_path(
+                "repo_file_raw",
+                repo_name=backend.repo_name,
+                commit_id=commit.raw_id,
+                f_path="docs/theme/ADC/static/breadcrumb_background.png",
+            ),
+        )
 
-        assert response.content_disposition == 'inline'
+        assert response.content_disposition == "inline"
 
     def test_raw_file_wrong_cs(self, backend):
-        raw_id = u'ERRORcce30c96924232dffcd24178a07ffeb5dfc'
+        raw_id = "ERRORcce30c96924232dffcd24178a07ffeb5dfc"
 
         response = self.app.get(
-            route_path('repo_file_raw',
-                       repo_name=backend.repo_name,
-                       commit_id=raw_id, f_path='vcs/nodes.svg'),
-            status=404)
+            route_path("repo_file_raw", repo_name=backend.repo_name, commit_id=raw_id, f_path="vcs/nodes.svg"),
+            status=404,
+        )
 
         msg = """No such commit exists for this repository"""
         response.mustcontain(msg)
 
     def test_raw_wrong_f_path(self, backend):
         commit = backend.repo.get_commit(commit_idx=173)
-        f_path = 'vcs/ERRORnodes.py'
+        f_path = "vcs/ERRORnodes.py"
         response = self.app.get(
-            route_path('repo_file_raw',
-                       repo_name=backend.repo_name,
-                       commit_id=commit.raw_id, f_path=f_path),
-            status=404)
+            route_path("repo_file_raw", repo_name=backend.repo_name, commit_id=commit.raw_id, f_path=f_path), status=404
+        )
 
-        msg = (
-            "There is no file nor directory at the given path: "
-            "`%s` at commit %s" % (f_path, commit.short_id))
+        msg = "There is no file nor directory at the given path: " "`%s` at commit %s" % (f_path, commit.short_id)
         response.mustcontain(msg)
 
     def test_raw_svg_should_not_be_rendered(self, backend):
         backend.create_repo()
         backend.ensure_file(b"xss.svg")
         response = self.app.get(
-            route_path('repo_file_raw',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='xss.svg'),)
+            route_path("repo_file_raw", repo_name=backend.repo_name, commit_id="tip", f_path="xss.svg"),
+        )
         # If the content type is image/svg+xml then it allows to render HTML
         # and malicious SVG.
         assert response.content_type == "text/plain"
@@ -486,25 +436,23 class TestRawFileHandling(object):
 
 @pytest.mark.usefixtures("app")
 class TestRepositoryArchival(object):
-
     def test_archival(self, backend):
         backend.enable_downloads()
         commit = backend.repo.get_commit(commit_idx=173)
 
         for a_type, content_type, extension in settings.ARCHIVE_SPECS:
-            path_sha = get_path_sha('/')
-            filename = get_archive_name(backend.repo_id, backend.repo_name, commit_sha=commit.short_id, ext=extension, path_sha=path_sha)
+            path_sha = get_path_sha("/")
+            filename = get_archive_name(
+                backend.repo_id, backend.repo_name, commit_sha=commit.short_id, ext=extension, path_sha=path_sha
+            )
 
             fname = commit.raw_id + extension
-            response = self.app.get(
-                route_path('repo_archivefile',
-                           repo_name=backend.repo_name,
-                           fname=fname))
+            response = self.app.get(route_path("repo_archivefile", repo_name=backend.repo_name, fname=fname))
 
-            assert response.status == '200 OK'
+            assert response.status == "200 OK"
             headers = [
-                ('Content-Disposition', f'attachment; filename={filename}'),
-                ('Content-Type', content_type),
+                ("Content-Disposition", f"attachment; filename={filename}"),
+                ("Content-Type", content_type),
             ]
 
             for header in headers:
@@ -514,19 +462,25 class TestRepositoryArchival(object):
         backend.enable_downloads()
         commit = backend.repo.get_commit(commit_idx=173)
         for a_type, content_type, extension in settings.ARCHIVE_SPECS:
-            path_sha = get_path_sha('/')
-            filename = get_archive_name(backend.repo_id, backend.repo_name, commit_sha=commit.short_id, ext=extension, path_sha=path_sha, with_hash=False)
+            path_sha = get_path_sha("/")
+            filename = get_archive_name(
+                backend.repo_id,
+                backend.repo_name,
+                commit_sha=commit.short_id,
+                ext=extension,
+                path_sha=path_sha,
+                with_hash=False,
+            )
 
             fname = commit.raw_id + extension
             response = self.app.get(
-                route_path('repo_archivefile',
-                           repo_name=backend.repo_name,
-                           fname=fname, params={'with_hash': 0}))
+                route_path("repo_archivefile", repo_name=backend.repo_name, fname=fname, params={"with_hash": 0})
+            )
 
-            assert response.status == '200 OK'
+            assert response.status == "200 OK"
             headers = [
-                ('Content-Disposition', f'attachment; filename={filename}'),
-                ('Content-Type', content_type),
+                ("Content-Disposition", f"attachment; filename={filename}"),
+                ("Content-Type", content_type),
             ]
 
             for header in headers:
@@ -535,359 +489,332 class TestRepositoryArchival(object):
     def test_archival_at_path(self, backend):
         backend.enable_downloads()
         commit = backend.repo.get_commit(commit_idx=190)
-        at_path = 'vcs'
+        at_path = "vcs"
 
         for a_type, content_type, extension in settings.ARCHIVE_SPECS:
             path_sha = get_path_sha(at_path)
-            filename = get_archive_name(backend.repo_id, backend.repo_name, commit_sha=commit.short_id, ext=extension, path_sha=path_sha)
+            filename = get_archive_name(
+                backend.repo_id, backend.repo_name, commit_sha=commit.short_id, ext=extension, path_sha=path_sha
+            )
 
             fname = commit.raw_id + extension
             response = self.app.get(
-                route_path('repo_archivefile',
-                           repo_name=backend.repo_name,
-                           fname=fname, params={'at_path': at_path}))
+                route_path("repo_archivefile", repo_name=backend.repo_name, fname=fname, params={"at_path": at_path})
+            )
 
-            assert response.status == '200 OK'
+            assert response.status == "200 OK"
             headers = [
-                ('Content-Disposition', f'attachment; filename={filename}'),
-                ('Content-Type', content_type),
+                ("Content-Disposition", f"attachment; filename={filename}"),
+                ("Content-Type", content_type),
             ]
 
             for header in headers:
                 assert header in list(response.headers.items())
 
-    @pytest.mark.parametrize('arch_ext',[
-        'tar', 'rar', 'x', '..ax', '.zipz', 'tar.gz.tar'])
+    @pytest.mark.parametrize("arch_ext", ["tar", "rar", "x", "..ax", ".zipz", "tar.gz.tar"])
     def test_archival_wrong_ext(self, backend, arch_ext):
         backend.enable_downloads()
         commit = backend.repo.get_commit(commit_idx=173)
 
-        fname = commit.raw_id + '.' + arch_ext
+        fname = commit.raw_id + "." + arch_ext
 
-        response = self.app.get(
-            route_path('repo_archivefile',
-                       repo_name=backend.repo_name,
-                       fname=fname))
-        response.mustcontain(
-            'Unknown archive type for: `{}`'.format(fname))
+        response = self.app.get(route_path("repo_archivefile", repo_name=backend.repo_name, fname=fname))
+        response.mustcontain("Unknown archive type for: `{}`".format(fname))
 
-    @pytest.mark.parametrize('commit_id', [
-        '00x000000', 'tar', 'wrong', '@$@$42413232', '232dffcd'])
+    @pytest.mark.parametrize("commit_id", ["00x000000", "tar", "wrong", "@$@$42413232", "232dffcd"])
     def test_archival_wrong_commit_id(self, backend, commit_id):
         backend.enable_downloads()
-        fname = f'{commit_id}.zip'
+        fname = f"{commit_id}.zip"
 
-        response = self.app.get(
-            route_path('repo_archivefile',
-                       repo_name=backend.repo_name,
-                       fname=fname))
-        response.mustcontain('Unknown commit_id')
+        response = self.app.get(route_path("repo_archivefile", repo_name=backend.repo_name, fname=fname))
+        response.mustcontain("Unknown commit_id")
 
 
 @pytest.mark.usefixtures("app")
 class TestFilesDiff(object):
-
-    @pytest.mark.parametrize("diff", ['diff', 'download', 'raw'])
+    @pytest.mark.parametrize("diff", ["diff", "download", "raw"])
     def test_file_full_diff(self, backend, diff):
         commit1 = backend.repo.get_commit(commit_idx=-1)
         commit2 = backend.repo.get_commit(commit_idx=-2)
 
         response = self.app.get(
-            route_path('repo_files_diff',
-                       repo_name=backend.repo_name,
-                       f_path='README'),
+            route_path("repo_files_diff", repo_name=backend.repo_name, f_path="README"),
             params={
-                'diff1': commit2.raw_id,
-                'diff2': commit1.raw_id,
-                'fulldiff': '1',
-                'diff': diff,
-            })
+                "diff1": commit2.raw_id,
+                "diff2": commit1.raw_id,
+                "fulldiff": "1",
+                "diff": diff,
+            },
+        )
 
-        if diff == 'diff':
+        if diff == "diff":
             # use redirect since this is OLD view redirecting to compare page
             response = response.follow()
 
         # It's a symlink to README.rst
-        response.mustcontain('README.rst')
-        response.mustcontain('No newline at end of file')
+        response.mustcontain("README.rst")
+        response.mustcontain("No newline at end of file")
 
     def test_file_binary_diff(self, backend):
         commits = [
-            {'message': 'First commit'},
-            {'message': 'Commit with binary',
-             'added': [nodes.FileNode(b'file.bin', content='\0BINARY\0')]},
+            {"message": "First commit"},
+            {"message": "Commit with binary", "added": [nodes.FileNode(b"file.bin", content="\0BINARY\0")]},
         ]
         repo = backend.create_repo(commits=commits)
 
         response = self.app.get(
-            route_path('repo_files_diff',
-                       repo_name=backend.repo_name,
-                       f_path='file.bin'),
+            route_path("repo_files_diff", repo_name=backend.repo_name, f_path="file.bin"),
             params={
-                'diff1': repo.get_commit(commit_idx=0).raw_id,
-                'diff2': repo.get_commit(commit_idx=1).raw_id,
-                'fulldiff': '1',
-                'diff': 'diff',
-            })
+                "diff1": repo.get_commit(commit_idx=0).raw_id,
+                "diff2": repo.get_commit(commit_idx=1).raw_id,
+                "fulldiff": "1",
+                "diff": "diff",
+            },
+        )
         # use redirect since this is OLD view redirecting to compare page
         response = response.follow()
-        response.mustcontain('Collapse 1 commit')
+        response.mustcontain("Collapse 1 commit")
         file_changes = (1, 0, 0)
 
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(*file_changes)
 
-        if backend.alias == 'svn':
-            response.mustcontain('new file 10644')
+        if backend.alias == "svn":
+            response.mustcontain("new file 10644")
             # TODO(marcink): SVN doesn't yet detect binary changes
         else:
-            response.mustcontain('new file 100644')
-            response.mustcontain('binary diff hidden')
+            response.mustcontain("new file 100644")
+            response.mustcontain("binary diff hidden")
 
     def test_diff_2way(self, backend):
         commit1 = backend.repo.get_commit(commit_idx=-1)
         commit2 = backend.repo.get_commit(commit_idx=-2)
         response = self.app.get(
-            route_path('repo_files_diff_2way_redirect',
-                       repo_name=backend.repo_name,
-                       f_path='README'),
+            route_path("repo_files_diff_2way_redirect", repo_name=backend.repo_name, f_path="README"),
             params={
-                'diff1': commit2.raw_id,
-                'diff2': commit1.raw_id,
-            })
+                "diff1": commit2.raw_id,
+                "diff2": commit1.raw_id,
+            },
+        )
         # use redirect since this is OLD view redirecting to compare page
         response = response.follow()
 
         # It's a symlink to README.rst
-        response.mustcontain('README.rst')
-        response.mustcontain('No newline at end of file')
+        response.mustcontain("README.rst")
+        response.mustcontain("No newline at end of file")
 
     def test_requires_one_commit_id(self, backend, autologin_user):
         response = self.app.get(
-            route_path('repo_files_diff',
-                       repo_name=backend.repo_name,
-                       f_path='README.rst'),
-            status=400)
-        response.mustcontain(
-            'Need query parameter', 'diff1', 'diff2', 'to generate a diff.')
+            route_path("repo_files_diff", repo_name=backend.repo_name, f_path="README.rst"), status=400
+        )
+        response.mustcontain("Need query parameter", "diff1", "diff2", "to generate a diff.")
 
     def test_returns_no_files_if_file_does_not_exist(self, vcsbackend):
         repo = vcsbackend.repo
         response = self.app.get(
-            route_path('repo_files_diff',
-                       repo_name=repo.name,
-                       f_path='does-not-exist-in-any-commit'),
-            params={
-                'diff1': repo[0].raw_id,
-                'diff2': repo[1].raw_id
-            })
+            route_path("repo_files_diff", repo_name=repo.name, f_path="does-not-exist-in-any-commit"),
+            params={"diff1": repo[0].raw_id, "diff2": repo[1].raw_id},
+        )
 
         response = response.follow()
-        response.mustcontain('No files')
+        response.mustcontain("No files")
 
     def test_returns_redirect_if_file_not_changed(self, backend):
         commit = backend.repo.get_commit(commit_idx=-1)
         response = self.app.get(
-            route_path('repo_files_diff_2way_redirect',
-                       repo_name=backend.repo_name,
-                       f_path='README'),
+            route_path("repo_files_diff_2way_redirect", repo_name=backend.repo_name, f_path="README"),
             params={
-                'diff1': commit.raw_id,
-                'diff2': commit.raw_id,
-            })
+                "diff1": commit.raw_id,
+                "diff2": commit.raw_id,
+            },
+        )
 
         response = response.follow()
-        response.mustcontain('No files')
-        response.mustcontain('No commits in this compare')
+        response.mustcontain("No files")
+        response.mustcontain("No commits in this compare")
 
     def test_supports_diff_to_different_path_svn(self, backend_svn):
-        #TODO: check this case
+        # TODO: check this case
         return
 
-        repo = backend_svn['svn-simple-layout'].scm_instance()
-        commit_id_1 = '24'
-        commit_id_2 = '26'
+        repo = backend_svn["svn-simple-layout"].scm_instance()
+        commit_id_1 = "24"
+        commit_id_2 = "26"
 
         response = self.app.get(
-            route_path('repo_files_diff',
-                       repo_name=backend_svn.repo_name,
-                       f_path='trunk/example.py'),
+            route_path("repo_files_diff", repo_name=backend_svn.repo_name, f_path="trunk/example.py"),
             params={
-                'diff1': 'tags/v0.2/example.py@' + commit_id_1,
-                'diff2': commit_id_2,
-            })
+                "diff1": "tags/v0.2/example.py@" + commit_id_1,
+                "diff2": commit_id_2,
+            },
+        )
 
         response = response.follow()
         response.mustcontain(
             # diff contains this
-            "Will print out a useful message on invocation.")
+            "Will print out a useful message on invocation."
+        )
 
         # Note: Expecting that we indicate the user what's being compared
         response.mustcontain("trunk/example.py")
         response.mustcontain("tags/v0.2/example.py")
 
     def test_show_rev_redirects_to_svn_path(self, backend_svn):
-        #TODO: check this case
+        # TODO: check this case
         return
 
-        repo = backend_svn['svn-simple-layout'].scm_instance()
+        repo = backend_svn["svn-simple-layout"].scm_instance()
         commit_id = repo[-1].raw_id
 
         response = self.app.get(
-            route_path('repo_files_diff',
-                       repo_name=backend_svn.repo_name,
-                       f_path='trunk/example.py'),
+            route_path("repo_files_diff", repo_name=backend_svn.repo_name, f_path="trunk/example.py"),
             params={
-                'diff1': 'branches/argparse/example.py@' + commit_id,
-                'diff2': commit_id,
+                "diff1": "branches/argparse/example.py@" + commit_id,
+                "diff2": commit_id,
             },
-            status=302)
+            status=302,
+        )
         response = response.follow()
-        assert response.headers['Location'].endswith(
-            'svn-svn-simple-layout/files/26/branches/argparse/example.py')
+        assert response.headers["Location"].endswith("svn-svn-simple-layout/files/26/branches/argparse/example.py")
 
     def test_show_rev_and_annotate_redirects_to_svn_path(self, backend_svn):
-        #TODO: check this case
+        # TODO: check this case
         return
 
-        repo = backend_svn['svn-simple-layout'].scm_instance()
+        repo = backend_svn["svn-simple-layout"].scm_instance()
         commit_id = repo[-1].raw_id
         response = self.app.get(
-            route_path('repo_files_diff',
-                       repo_name=backend_svn.repo_name,
-                       f_path='trunk/example.py'),
+            route_path("repo_files_diff", repo_name=backend_svn.repo_name, f_path="trunk/example.py"),
             params={
-                'diff1': 'branches/argparse/example.py@' + commit_id,
-                'diff2': commit_id,
-                'show_rev': 'Show at Revision',
-                'annotate': 'true',
+                "diff1": "branches/argparse/example.py@" + commit_id,
+                "diff2": commit_id,
+                "show_rev": "Show at Revision",
+                "annotate": "true",
             },
-            status=302)
+            status=302,
+        )
         response = response.follow()
-        assert response.headers['Location'].endswith(
-            'svn-svn-simple-layout/annotate/26/branches/argparse/example.py')
+        assert response.headers["Location"].endswith("svn-svn-simple-layout/annotate/26/branches/argparse/example.py")
 
 
 @pytest.mark.usefixtures("app", "autologin_user")
 class TestModifyFilesWithWebInterface(object):
-
     def test_add_file_view(self, backend):
-        self.app.get(
-            route_path('repo_files_add_file',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/')
-            )
+        self.app.get(route_path("repo_files_add_file", repo_name=backend.repo_name, commit_id="tip", f_path=""))
 
     @pytest.mark.xfail_backends("svn", reason="Depends on online editing")
     def test_add_file_into_repo_missing_content(self, backend, csrf_token):
         backend.create_repo()
-        filename = 'init.py'
+        filename = "init.py"
         response = self.app.post(
-            route_path('repo_files_create_file',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'),
+            route_path("repo_files_create_file", repo_name=backend.repo_name, commit_id="tip", f_path=""),
             params={
-                'content': "",
-                'filename': filename,
-                'csrf_token': csrf_token,
+                "content": "",
+                "filename": filename,
+                "csrf_token": csrf_token,
             },
-            status=302)
-        expected_msg = 'Successfully committed new file `{}`'.format(os.path.join(filename))
+            status=302,
+        )
+        expected_msg = "Successfully committed new file `{}`".format(os.path.join(filename))
         assert_session_flash(response, expected_msg)
 
     def test_add_file_into_repo_missing_filename(self, backend, csrf_token):
         commit_id = backend.repo.get_commit().raw_id
         response = self.app.post(
-            route_path('repo_files_create_file',
-                       repo_name=backend.repo_name,
-                       commit_id=commit_id, f_path='/'),
+            route_path("repo_files_create_file", repo_name=backend.repo_name, commit_id=commit_id, f_path=""),
             params={
-                'content': "foo",
-                'csrf_token': csrf_token,
+                "content": "foo",
+                "csrf_token": csrf_token,
             },
-            status=302)
+            status=302,
+        )
 
-        assert_session_flash(response, 'No filename specified')
+        assert_session_flash(response, "No filename specified")
 
-    def test_add_file_into_repo_errors_and_no_commits(
-            self, backend, csrf_token):
+    def test_add_file_into_repo_errors_and_no_commits(self, backend, csrf_token):
         repo = backend.create_repo()
         # Create a file with no filename, it will display an error but
         # the repo has no commits yet
         response = self.app.post(
-            route_path('repo_files_create_file',
-                       repo_name=repo.repo_name,
-                       commit_id='tip', f_path='/'),
+            route_path("repo_files_create_file", repo_name=repo.repo_name, commit_id="tip", f_path=""),
             params={
-                'content': "foo",
-                'csrf_token': csrf_token,
+                "content": "foo",
+                "csrf_token": csrf_token,
             },
-            status=302)
+            status=302,
+        )
 
-        assert_session_flash(response, 'No filename specified')
+        assert_session_flash(response, "No filename specified")
 
         # Not allowed, redirect to the summary
         redirected = response.follow()
-        summary_url = h.route_path('repo_summary', repo_name=repo.repo_name)
+        summary_url = h.route_path("repo_summary", repo_name=repo.repo_name)
 
         # As there are no commits, displays the summary page with the error of
         # creating a file with no filename
 
         assert redirected.request.path == summary_url
 
-    @pytest.mark.parametrize("filename, clean_filename", [
-        ('/abs/foo', 'abs/foo'),
-        ('../rel/foo', 'rel/foo'),
-        ('file/../foo/foo', 'file/foo/foo'),
-    ])
+    @pytest.mark.parametrize(
+        "filename, clean_filename",
+        [
+            ("/abs/foo", "abs/foo"),
+            ("../rel/foo", "rel/foo"),
+            ("file/../foo/foo", "file/foo/foo"),
+        ],
+    )
     def test_add_file_into_repo_bad_filenames(self, filename, clean_filename, backend, csrf_token):
         repo = backend.create_repo()
         commit_id = repo.get_commit().raw_id
 
         response = self.app.post(
-            route_path('repo_files_create_file',
-                       repo_name=repo.repo_name,
-                       commit_id=commit_id, f_path='/'),
+            route_path("repo_files_create_file", repo_name=repo.repo_name, commit_id=commit_id, f_path=""),
             params={
-                'content': "foo",
-                'filename': filename,
-                'csrf_token': csrf_token,
+                "content": "foo",
+                "filename": filename,
+                "csrf_token": csrf_token,
             },
-            status=302)
+            status=302,
+        )
 
-        expected_msg = 'Successfully committed new file `{}`'.format(clean_filename)
+        expected_msg = "Successfully committed new file `{}`".format(clean_filename)
         assert_session_flash(response, expected_msg)
 
-    @pytest.mark.parametrize("cnt, filename, content", [
-        (1, 'foo.txt', "Content"),
-        (2, 'dir/foo.rst', "Content"),
-        (3, 'dir/foo-second.rst', "Content"),
-        (4, 'rel/dir/foo.bar', "Content"),
-    ])
+    @pytest.mark.parametrize(
+        "cnt, filename, content",
+        [
+            (1, "foo.txt", "Content"),
+            (2, "dir/foo.rst", "Content"),
+            (3, "dir/foo-second.rst", "Content"),
+            (4, "rel/dir/foo.bar", "Content"),
+        ],
+    )
     def test_add_file_into_empty_repo(self, cnt, filename, content, backend, csrf_token):
         repo = backend.create_repo()
         commit_id = repo.get_commit().raw_id
         response = self.app.post(
-            route_path('repo_files_create_file',
-                       repo_name=repo.repo_name,
-                       commit_id=commit_id, f_path='/'),
+            route_path("repo_files_create_file", repo_name=repo.repo_name, commit_id=commit_id, f_path=""),
             params={
-                'content': content,
-                'filename': filename,
-                'csrf_token': csrf_token,
+                "content": content,
+                "filename": filename,
+                "csrf_token": csrf_token,
             },
-            status=302)
+            status=302,
+        )
 
-        expected_msg = 'Successfully committed new file `{}`'.format(filename)
+        expected_msg = "Successfully committed new file `{}`".format(filename)
         assert_session_flash(response, expected_msg)
 
     def test_edit_file_view(self, backend):
         response = self.app.get(
-            route_path('repo_files_edit_file',
-                       repo_name=backend.repo_name,
-                       commit_id=backend.default_head_id,
-                       f_path='vcs/nodes.py'),
-            status=200)
+            route_path(
+                "repo_files_edit_file",
+                repo_name=backend.repo_name,
+                commit_id=backend.default_head_id,
+                f_path="vcs/nodes.py",
+            ),
+            status=200,
+        )
         response.mustcontain("Module holding everything related to vcs nodes.")
 
     def test_edit_file_view_not_on_branch(self, backend):
@@ -895,229 +822,221 class TestModifyFilesWithWebInterface(ob
         backend.ensure_file(b"vcs/nodes.py")
 
         response = self.app.get(
-            route_path('repo_files_edit_file',
-                       repo_name=repo.repo_name,
-                       commit_id='tip',
-                       f_path='vcs/nodes.py'),
-            status=302)
-        assert_session_flash(
-            response, 'Cannot modify file. Given commit `tip` is not head of a branch.')
+            route_path("repo_files_edit_file", repo_name=repo.repo_name, commit_id="tip", f_path="vcs/nodes.py"),
+            status=302,
+        )
+        assert_session_flash(response, "Cannot modify file. Given commit `tip` is not head of a branch.")
 
     def test_edit_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
         backend.ensure_file(b"vcs/nodes.py", content=b"print 'hello'")
 
         response = self.app.post(
-            route_path('repo_files_update_file',
-                       repo_name=repo.repo_name,
-                       commit_id=backend.default_head_id,
-                       f_path='vcs/nodes.py'),
+            route_path(
+                "repo_files_update_file",
+                repo_name=repo.repo_name,
+                commit_id=backend.default_head_id,
+                f_path="vcs/nodes.py",
+            ),
             params={
-                'content': "print 'hello world'",
-                'message': 'I committed',
-                'filename': "vcs/nodes.py",
-                'csrf_token': csrf_token,
+                "content": "print 'hello world'",
+                "message": "I committed",
+                "filename": "vcs/nodes.py",
+                "csrf_token": csrf_token,
             },
-            status=302)
-        assert_session_flash(
-            response, 'Successfully committed changes to file `vcs/nodes.py`')
+            status=302,
+        )
+        assert_session_flash(response, "Successfully committed changes to file `vcs/nodes.py`")
         tip = repo.get_commit(commit_idx=-1)
-        assert tip.message == 'I committed'
+        assert tip.message == "I committed"
 
     def test_replace_binary_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
         backend.ensure_file(b"vcs/nodes.docx", content=b"PREVIOUS CONTENT'")
 
         response = self.app.post(
-            route_path('repo_files_replace_binary',
-                       repo_name=repo.repo_name,
-                       commit_id=backend.default_head_id,
-                       f_path='vcs/nodes.docx'),
+            route_path(
+                "repo_files_replace_binary",
+                repo_name=repo.repo_name,
+                commit_id=backend.default_head_id,
+                f_path="vcs/nodes.docx",
+            ),
             params={
-                'message': 'I committed',
-                'csrf_token': csrf_token,
+                "message": "I committed",
+                "csrf_token": csrf_token,
             },
-            upload_files=[('files_upload', 'vcs/nodes.docx', b'SOME CONTENT')],
-            status=200)
-        assert_session_flash(
-            response, 'Successfully committed 1 new file')
+            upload_files=[("files_upload", "vcs/nodes.docx", b"SOME CONTENT")],
+            status=200,
+        )
+        assert_session_flash(response, "Successfully committed 1 new file")
         tip = repo.get_commit(commit_idx=-1)
-        assert tip.message == 'I committed'
+        assert tip.message == "I committed"
 
-    def test_edit_file_view_commit_changes_default_message(self, backend,
-                                                           csrf_token):
+    def test_edit_file_view_commit_changes_default_message(self, backend, csrf_token):
         repo = backend.create_repo()
         backend.ensure_file(b"vcs/nodes.py", content=b"print 'hello'")
 
-        commit_id = (
-            backend.default_branch_name or
-            backend.repo.scm_instance().commit_ids[-1])
+        commit_id = backend.default_branch_name or backend.repo.scm_instance().commit_ids[-1]
 
         response = self.app.post(
-            route_path('repo_files_update_file',
-                       repo_name=repo.repo_name,
-                       commit_id=commit_id,
-                       f_path='vcs/nodes.py'),
+            route_path("repo_files_update_file", repo_name=repo.repo_name, commit_id=commit_id, f_path="vcs/nodes.py"),
             params={
-                'content': "print 'hello world'",
-                'message': '',
-                'filename': "vcs/nodes.py",
-                'csrf_token': csrf_token,
+                "content": "print 'hello world'",
+                "message": "",
+                "filename": "vcs/nodes.py",
+                "csrf_token": csrf_token,
             },
-            status=302)
-        assert_session_flash(
-            response, 'Successfully committed changes to file `vcs/nodes.py`')
+            status=302,
+        )
+        assert_session_flash(response, "Successfully committed changes to file `vcs/nodes.py`")
         tip = repo.get_commit(commit_idx=-1)
-        assert tip.message == 'Edited file vcs/nodes.py via RhodeCode Enterprise'
+        assert tip.message == "Edited file vcs/nodes.py via RhodeCode Enterprise"
 
     def test_replace_binary_file_content_with_content_that_not_belong_to_original_type(self, backend, csrf_token):
         repo = backend.create_repo()
         backend.ensure_file(b"vcs/sheet.xlsx", content=b"PREVIOUS CONTENT'")
 
         response = self.app.post(
-            route_path('repo_files_replace_binary',
-                       repo_name=repo.repo_name,
-                       commit_id=backend.default_head_id,
-                       f_path='vcs/sheet.xlsx'),
+            route_path(
+                "repo_files_replace_binary",
+                repo_name=repo.repo_name,
+                commit_id=backend.default_head_id,
+                f_path="vcs/sheet.xlsx",
+            ),
             params={
-                'message': 'I committed',
-                'csrf_token': csrf_token,
+                "message": "I committed",
+                "csrf_token": csrf_token,
             },
-            upload_files=[('files_upload', 'vcs/sheet.docx', b'SOME CONTENT')],
-            status=200)
-        assert response.json['error'] == "file extension of uploaded file doesn't match an original file's extension"
+            upload_files=[("files_upload", "vcs/sheet.docx", b"SOME CONTENT")],
+            status=200,
+        )
+        assert response.json["error"] == "file extension of uploaded file doesn't match an original file's extension"
 
-    @pytest.mark.parametrize("replacement_files, expected_error", [
-        ([], 'missing files'),
-        (
-                [('files_upload', 'vcs/node1.docx', b'SOME CONTENT'),
-                 ('files_upload', 'vcs/node2.docx', b'SOME CONTENT')],
-                'too many files for replacement'),
-    ])
-    def test_replace_binary_with_wrong_amount_of_content_sources(self, replacement_files, expected_error, backend,
-                                                                 csrf_token):
+    @pytest.mark.parametrize(
+        "replacement_files, expected_error",
+        [
+            ([], "missing files"),
+            (
+                [
+                    ("files_upload", "vcs/node1.docx", b"SOME CONTENT"),
+                    ("files_upload", "vcs/node2.docx", b"SOME CONTENT"),
+                ],
+                "too many files for replacement",
+            ),
+        ],
+    )
+    def test_replace_binary_with_wrong_amount_of_content_sources(
+        self, replacement_files, expected_error, backend, csrf_token
+    ):
         repo = backend.create_repo()
         backend.ensure_file(b"vcs/node.docx", content=b"PREVIOUS CONTENT'")
 
         response = self.app.post(
-            route_path('repo_files_replace_binary',
-                       repo_name=repo.repo_name,
-                       commit_id=backend.default_head_id,
-                       f_path='vcs/node.docx'),
+            route_path(
+                "repo_files_replace_binary",
+                repo_name=repo.repo_name,
+                commit_id=backend.default_head_id,
+                f_path="vcs/node.docx",
+            ),
             params={
-                'message': 'I committed',
-                'csrf_token': csrf_token,
+                "message": "I committed",
+                "csrf_token": csrf_token,
             },
             upload_files=replacement_files,
-            status=200)
-        assert response.json['error'] == expected_error
+            status=200,
+        )
+        assert response.json["error"] == expected_error
 
     def test_delete_file_view(self, backend):
         self.app.get(
-            route_path('repo_files_remove_file',
-                       repo_name=backend.repo_name,
-                       commit_id=backend.default_head_id,
-                       f_path='vcs/nodes.py'),
-            status=200)
+            route_path(
+                "repo_files_remove_file",
+                repo_name=backend.repo_name,
+                commit_id=backend.default_head_id,
+                f_path="vcs/nodes.py",
+            ),
+            status=200,
+        )
 
     def test_delete_file_view_not_on_branch(self, backend):
         repo = backend.create_repo()
-        backend.ensure_file(b'vcs/nodes.py')
+        backend.ensure_file(b"vcs/nodes.py")
 
         response = self.app.get(
-            route_path('repo_files_remove_file',
-                       repo_name=repo.repo_name,
-                       commit_id='tip',
-                       f_path='vcs/nodes.py'),
-            status=302)
-        assert_session_flash(
-            response, 'Cannot modify file. Given commit `tip` is not head of a branch.')
+            route_path("repo_files_remove_file", repo_name=repo.repo_name, commit_id="tip", f_path="vcs/nodes.py"),
+            status=302,
+        )
+        assert_session_flash(response, "Cannot modify file. Given commit `tip` is not head of a branch.")
 
     def test_delete_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
         backend.ensure_file(b"vcs/nodes.py")
 
         response = self.app.post(
-            route_path('repo_files_delete_file',
-                       repo_name=repo.repo_name,
-                       commit_id=backend.default_head_id,
-                       f_path='vcs/nodes.py'),
+            route_path(
+                "repo_files_delete_file",
+                repo_name=repo.repo_name,
+                commit_id=backend.default_head_id,
+                f_path="vcs/nodes.py",
+            ),
             params={
-                'message': 'i committed',
-                'csrf_token': csrf_token,
+                "message": "i committed",
+                "csrf_token": csrf_token,
             },
-            status=302)
-        assert_session_flash(
-            response, 'Successfully deleted file `vcs/nodes.py`')
+            status=302,
+        )
+        assert_session_flash(response, "Successfully deleted file `vcs/nodes.py`")
 
 
 @pytest.mark.usefixtures("app")
 class TestFilesViewOtherCases(object):
-
     def test_access_empty_repo_redirect_to_summary_with_alert_write_perms(
-            self, backend_stub, autologin_regular_user, user_regular,
-            user_util):
-
+        self, backend_stub, autologin_regular_user, user_regular, user_util
+    ):
         repo = backend_stub.create_repo()
-        user_util.grant_user_permission_to_repo(
-            repo, user_regular, 'repository.write')
-        response = self.app.get(
-            route_path('repo_files',
-                       repo_name=repo.repo_name,
-                       commit_id='tip', f_path='/'))
+        user_util.grant_user_permission_to_repo(repo, user_regular, "repository.write")
+        response = self.app.get(route_path("repo_files", repo_name=repo.repo_name, commit_id="tip", f_path=""))
 
-        repo_file_add_url = route_path(
-            'repo_files_add_file',
-            repo_name=repo.repo_name,
-            commit_id=0, f_path='')
+        repo_file_add_url = route_path("repo_files_add_file", repo_name=repo.repo_name, commit_id=0, f_path="")
         add_new = f'<a class="alert-link" href="{repo_file_add_url}">add a new file</a>'
 
-        repo_file_upload_url = route_path(
-            'repo_files_upload_file',
-            repo_name=repo.repo_name,
-            commit_id=0, f_path='')
+        repo_file_upload_url = route_path("repo_files_upload_file", repo_name=repo.repo_name, commit_id=0, f_path="")
         upload_new = f'<a class="alert-link" href="{repo_file_upload_url}">upload a new file</a>'
 
-        assert_session_flash(
-            response,
-            'There are no files yet. Click here to %s or %s.' % (add_new, upload_new)
-            )
+        assert_session_flash(response, "There are no files yet. Click here to %s or %s." % (add_new, upload_new))
 
     def test_access_empty_repo_redirect_to_summary_with_alert_no_write_perms(
-            self, backend_stub, autologin_regular_user):
+        self, backend_stub, autologin_regular_user
+    ):
         repo = backend_stub.create_repo()
         # init session for anon user
-        route_path('repo_summary', repo_name=repo.repo_name)
+        route_path("repo_summary", repo_name=repo.repo_name)
 
-        repo_file_add_url = route_path(
-            'repo_files_add_file',
-            repo_name=repo.repo_name,
-            commit_id=0, f_path='')
+        repo_file_add_url = route_path("repo_files_add_file", repo_name=repo.repo_name, commit_id=0, f_path="")
 
-        response = self.app.get(
-            route_path('repo_files',
-                       repo_name=repo.repo_name,
-                       commit_id='tip', f_path='/'))
+        response = self.app.get(route_path("repo_files", repo_name=repo.repo_name, commit_id="tip", f_path=""))
 
         assert_session_flash(response, no_=repo_file_add_url)
 
-    @pytest.mark.parametrize('file_node', [
-        b'archive/file.zip',
-        b'diff/my-file.txt',
-        b'render.py',
-        b'render',
-        b'remove_file',
-        b'remove_file/to-delete.txt',
-    ])
+    @pytest.mark.parametrize(
+        "file_node",
+        [
+            b"archive/file.zip",
+            b"diff/my-file.txt",
+            b"render.py",
+            b"render",
+            b"remove_file",
+            b"remove_file/to-delete.txt",
+        ],
+    )
     def test_file_names_equal_to_routes_parts(self, backend, file_node):
         backend.create_repo()
         backend.ensure_file(file_node)
 
         self.app.get(
-            route_path('repo_files',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path=safe_str(file_node)),
-            status=200)
+            route_path("repo_files", repo_name=backend.repo_name, commit_id="tip", f_path=safe_str(file_node)),
+            status=200,
+        )
 
 
 class TestAdjustFilePathForSvn(object):
@@ -1126,20 +1045,20 class TestAdjustFilePathForSvn(object):
     """
 
     def test_returns_path_relative_to_matched_reference(self):
-        repo = self._repo(branches=['trunk'])
-        self.assert_file_adjustment('trunk/file', 'file', repo)
+        repo = self._repo(branches=["trunk"])
+        self.assert_file_adjustment("trunk/file", "file", repo)
 
     def test_does_not_modify_file_if_no_reference_matches(self):
-        repo = self._repo(branches=['trunk'])
-        self.assert_file_adjustment('notes/file', 'notes/file', repo)
+        repo = self._repo(branches=["trunk"])
+        self.assert_file_adjustment("notes/file", "notes/file", repo)
 
     def test_does_not_adjust_partial_directory_names(self):
-        repo = self._repo(branches=['trun'])
-        self.assert_file_adjustment('trunk/file', 'trunk/file', repo)
+        repo = self._repo(branches=["trun"])
+        self.assert_file_adjustment("trunk/file", "trunk/file", repo)
 
     def test_is_robust_to_patterns_which_prefix_other_patterns(self):
-        repo = self._repo(branches=['trunk', 'trunk/new', 'trunk/old'])
-        self.assert_file_adjustment('trunk/new/file', 'file', repo)
+        repo = self._repo(branches=["trunk", "trunk/new", "trunk/old"])
+        self.assert_file_adjustment("trunk/new/file", "file", repo)
 
     def assert_file_adjustment(self, f_path, expected, repo):
         result = RepoFilesView.adjust_file_path_for_svn(f_path, repo)
@@ -1147,6 +1066,6 class TestAdjustFilePathForSvn(object):
 
     def _repo(self, branches=None):
         repo = mock.Mock()
-        repo.branches = OrderedDict((name, '0') for name in branches or [])
+        repo.branches = OrderedDict((name, "0") for name in branches or [])
         repo.tags = {}
         return repo

rhodecode/apps/repository/tests/test_repo_forks.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -21,7 +20,7 import pytest
 
 from rhodecode.tests import TestController, assert_session_flash, HG_FORK, GIT_FORK
 
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.lib import helpers as h
 
 from rhodecode.model.db import Repository

rhodecode/apps/repository/tests/test_repo_issue_tracker.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_maintainance.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -21,7 +20,7 import pytest
 
 from rhodecode.model.db import Repository, UserRepoToPerm, Permission, User
 
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/repository/tests/test_repo_permissions.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -15,6 +15,9
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
+import logging
+import os
+
 import mock
 import pytest
 
@@ -41,7 +44,7 from rhodecode.tests import (
     TEST_USER_ADMIN_LOGIN,
     TEST_USER_REGULAR_LOGIN,
 )
-from rhodecode.tests.fixture_mods.fixture_utils import PRTestUtility
+from rhodecode.tests.fixtures.fixture_utils import PRTestUtility
 from rhodecode.tests.routes import route_path
 
 
@@ -1050,7 +1053,6 class TestPullrequestsView(object):
         )
         assert len(notifications.all()) == 2
 
-    @pytest.mark.xfail(reason="unable to fix this test after python3 migration")
     def test_create_pull_request_stores_ancestor_commit_id(self, backend, csrf_token):
         commits = [
             {
@@ -1125,20 +1127,38 class TestPullrequestsView(object):
         response.mustcontain(no=["content_of_ancestor-child"])
         response.mustcontain("content_of_change")
 
-    def test_merge_pull_request_enabled(self, pr_util, csrf_token):
-        # Clear any previous calls to rcextensions
-        rhodecode.EXTENSIONS.calls.clear()
+    def test_merge_pull_request_enabled(self, pr_util, csrf_token, rcextensions_modification):
 
         pull_request = pr_util.create_pull_request(approved=True, mergeable=True)
         pull_request_id = pull_request.pull_request_id
-        repo_name = (pull_request.target_repo.scm_instance().name,)
+        repo_name = pull_request.target_repo.scm_instance().name
 
         url = route_path(
             "pullrequest_merge",
-            repo_name=str(repo_name[0]),
+            repo_name=repo_name,
             pull_request_id=pull_request_id,
         )
-        response = self.app.post(url, params={"csrf_token": csrf_token}).follow()
+
+        rcstack_location = os.path.dirname(self.app._pyramid_registry.settings['__file__'])
+        rc_ext_location = os.path.join(rcstack_location, 'rcextension-output.txt')
+
+
+        mods = [
+            ('_push_hook',
+             f"""
+             import os
+             action = kwargs['action']
+             commit_ids = kwargs['commit_ids']
+             with open('{rc_ext_location}', 'w') as f:
+                 f.write('test-execution'+os.linesep)
+                 f.write(f'{{action}}'+os.linesep)
+                 f.write(f'{{commit_ids}}'+os.linesep)
+             return HookResponse(0, 'HOOK_TEST')
+            """)
+        ]
+        # Add the hook
+        with rcextensions_modification(rcstack_location, mods, create_if_missing=True, force_create=True):
+            response = self.app.post(url, params={"csrf_token": csrf_token}).follow()
 
         pull_request = PullRequest.get(pull_request_id)
 
@@ -1162,12 +1182,39 class TestPullrequestsView(object):
         assert actions[-1].action == "user.push"
         assert actions[-1].action_data["commit_ids"] == pr_commit_ids
 
-        # Check post_push rcextension was really executed
-        push_calls = rhodecode.EXTENSIONS.calls["_push_hook"]
-        assert len(push_calls) == 1
-        unused_last_call_args, last_call_kwargs = push_calls[0]
-        assert last_call_kwargs["action"] == "push"
-        assert last_call_kwargs["commit_ids"] == pr_commit_ids
+        with open(rc_ext_location) as f:
+            f_data = f.read()
+            assert 'test-execution' in f_data
+            for commit_id in pr_commit_ids:
+                assert f'{commit_id}' in f_data
+
+    def test_merge_pull_request_forbidden_by_pre_push_hook(self, pr_util, csrf_token, rcextensions_modification, caplog):
+        caplog.set_level(logging.WARNING, logger="rhodecode.model.pull_request")
+
+        pull_request = pr_util.create_pull_request(approved=True, mergeable=True)
+        pull_request_id = pull_request.pull_request_id
+        repo_name = pull_request.target_repo.scm_instance().name
+
+        url = route_path(
+            "pullrequest_merge",
+            repo_name=repo_name,
+            pull_request_id=pull_request_id,
+        )
+
+        rcstack_location = os.path.dirname(self.app._pyramid_registry.settings['__file__'])
+
+        mods = [
+            ('_pre_push_hook',
+             f"""
+             return HookResponse(1, 'HOOK_TEST_FORBIDDEN')
+            """)
+        ]
+        # Add the hook
+        with rcextensions_modification(rcstack_location, mods, create_if_missing=True, force_create=True):
+            self.app.post(url, params={"csrf_token": csrf_token})
+
+        assert 'Merge failed, not updating the pull request.' in [r[2] for r in caplog.record_tuples]
+
 
     def test_merge_pull_request_disabled(self, pr_util, csrf_token):
         pull_request = pr_util.create_pull_request(mergeable=False)
@@ -1523,7 +1570,6 class TestPullrequestsView(object):
 
         assert pull_request.revisions == [commit_ids["change-rebased"]]
 
-
     def test_remove_pull_request_branch(self, backend_git, csrf_token):
         branch_name = "development"
         commits = [

rhodecode/apps/repository/tests/test_repo_settings.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -26,7 +25,7 from rhodecode.model.db import Repositor
 from rhodecode.model.meta import Session
 from rhodecode.tests import (
     TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN, assert_session_flash)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/repository/tests/test_repo_settings_advanced.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -24,7 +23,7 from rhodecode.model.db import Repositor
 from rhodecode.model.repo import RepoModel
 from rhodecode.tests import (
     HG_REPO, GIT_REPO, assert_session_flash, no_newline_id_generator)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.utils import repo_on_filesystem
 from rhodecode.tests.routes import route_path
 

rhodecode/apps/repository/tests/test_repo_summary.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -31,7 +31,7 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.tests import assert_session_flash
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.utils import AssertResponse, repo_on_filesystem
 from rhodecode.tests.routes import route_path
 

rhodecode/apps/repository/tests/test_repo_tags.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_vcs_settings.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -30,7 +29,7 from rhodecode.model.user import UserMod
 from rhodecode.tests import (
     login_user_session, logout_user_session,
     TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.utils import AssertResponse
 from rhodecode.tests.routes import route_path
 
@@ -48,6 +47,7 class TestVcsSettings(object):
         'extensions_evolve': False,
         'phases_publish': 'False',
         'rhodecode_pr_merge_enabled': False,
+        'rhodecode_auto_merge_enabled': False,
         'rhodecode_use_outdated_comments': False,
         'new_svn_branch': '',
         'new_svn_tag': ''
@@ -59,7 +59,7 class TestVcsSettings(object):
         response = self.app.get(route_path('edit_repo_vcs', repo_name=repo_name))
 
         expected_settings = (
-            'rhodecode_use_outdated_comments', 'rhodecode_pr_merge_enabled',
+            'rhodecode_use_outdated_comments', 'rhodecode_pr_merge_enabled', 'rhodecode_auto_merge_enabled',
             'hooks_changegroup_repo_size', 'hooks_changegroup_push_logger',
             'hooks_outgoing_pull_logger'
         )

rhodecode/apps/repository/tests/test_vcs_settings.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -32,16 +31,13 class TestAdminRepoVcsSettings(object):
     @pytest.mark.parametrize('setting_name, setting_backends', [
         ('hg_use_rebase_for_merging', ['hg']),
     ])
-    def test_labs_settings_visible_if_enabled(
-            self, setting_name, setting_backends, backend):
+    def test_labs_settings_visible_if_enabled(self, setting_name, setting_backends, backend):
         if backend.alias not in setting_backends:
             pytest.skip('Setting not available for backend {}'.format(backend))
 
-        vcs_settings_url = route_path(
-            'edit_repo_vcs', repo_name=backend.repo.repo_name)
+        vcs_settings_url = route_path('edit_repo_vcs', repo_name=backend.repo.repo_name)
 
-        with mock.patch.dict(
-                rhodecode.CONFIG, {'labs_settings_active': 'true'}):
+        with mock.patch.dict(rhodecode.CONFIG, {'labs_settings_active': 'true'}):
             response = self.app.get(vcs_settings_url)
 
         assertr = response.assert_response()

rhodecode/apps/repository/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_artifacts.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_audit_logs.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_automation.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_bookmarks.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_branch_permissions.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_branches.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_caches.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_changelog.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -33,7 +33,7 from rhodecode.lib.auth import (
 from rhodecode.lib.graphmod import _colored, _dagwalker
 from rhodecode.lib.helpers import RepoPage
 from rhodecode.lib.utils2 import str2bool
-from rhodecode.lib.str_utils import safe_int, safe_str
+from rhodecode.lib.str_utils import safe_int, safe_str, safe_bytes
 from rhodecode.lib.vcs.exceptions import (
     RepositoryError, CommitDoesNotExistError,
     CommitError, NodeDoesNotExistError, EmptyRepositoryError)
@@ -204,10 +204,9 class RepoChangelogView(RepoAppView):
                 log.debug('generating changelog for path %s', f_path)
                 # get the history for the file !
                 base_commit = self.rhodecode_vcs_repo.get_commit(commit_id)
-
+                bytes_path = safe_bytes(f_path)
                 try:
-                    collection = base_commit.get_path_history(
-                        f_path, limit=hist_limit, pre_load=pre_load)
+                    collection = base_commit.get_path_history(bytes_path, limit=hist_limit, pre_load=pre_load)
                     if collection and partial_xhr:
                         # for ajax call we remove first one since we're looking
                         # at it right now in the context of a file commit
@@ -216,7 +215,7 class RepoChangelogView(RepoAppView):
                     # this node is not present at tip!
                     try:
                         commit = self._get_commit_or_redirect(commit_id)
-                        collection = commit.get_path_history(f_path)
+                        collection = commit.get_path_history(bytes_path)
                     except RepositoryError as e:
                         h.flash(safe_str(e), category='warning')
                         redirect_url = h.route_path(
@@ -310,9 +309,8 class RepoChangelogView(RepoAppView):
                 log.exception(safe_str(e))
                 raise HTTPFound(
                     h.route_path('repo_commits', repo_name=self.db_repo_name))
-
-            collection = base_commit.get_path_history(
-                f_path, limit=hist_limit, pre_load=pre_load)
+            bytes_path = safe_bytes(f_path)
+            collection = base_commit.get_path_history(bytes_path, limit=hist_limit, pre_load=pre_load)
             collection = list(reversed(collection))
         else:
             collection = self.rhodecode_vcs_repo.get_commits(

rhodecode/apps/repository/views/repo_checks.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_commits.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -89,8 +89,7 class RepoCommitsView(RepoAppView):
         commit_range = commit_id_range.split('...')[:2]
 
         try:
-            pre_load = ['affected_files', 'author', 'branch', 'date',
-                        'message', 'parents']
+            pre_load = ['author', 'branch', 'date', 'message', 'parents']
             if self.rhodecode_vcs_repo.alias == 'hg':
                 pre_load += ['hidden', 'obsolete', 'phase']
 
@@ -100,8 +99,7 class RepoCommitsView(RepoAppView):
                     pre_load=pre_load, translate_tags=False)
                 commits = list(commits)
             else:
-                commits = [self.rhodecode_vcs_repo.get_commit(
-                    commit_id=commit_id_range, pre_load=pre_load)]
+                commits = [self.rhodecode_vcs_repo.get_commit(commit_id=commit_id_range, pre_load=pre_load)]
 
             c.commit_ranges = commits
             if not c.commit_ranges:

rhodecode/apps/repository/views/repo_compare.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_feed.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_files.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -40,25 +40,34 from rhodecode.lib import diffs, helpers
 from rhodecode.lib import audit_logger
 from rhodecode.lib.hash_utils import sha1_safe
 from rhodecode.lib.archive_cache import (
-    get_archival_cache_store, get_archival_config, ArchiveCacheGenerationLock, archive_iterator)
+    get_archival_cache_store,
+    get_archival_config,
+    ArchiveCacheGenerationLock,
+    archive_iterator,
+)
 from rhodecode.lib.str_utils import safe_bytes, convert_special_chars
 from rhodecode.lib.view_utils import parse_path_ref
 from rhodecode.lib.exceptions import NonRelativePathError
-from rhodecode.lib.codeblocks import (
-    filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
+from rhodecode.lib.codeblocks import filenode_as_lines_tokens, filenode_as_annotated_lines_tokens
 from rhodecode.lib.utils2 import convert_line_endings, detect_mode
 from rhodecode.lib.type_utils import str2bool
 from rhodecode.lib.str_utils import safe_str, safe_int, header_safe_str
-from rhodecode.lib.auth import (
-    LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired
 from rhodecode.lib.vcs import path as vcspath
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.conf import settings
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.lib.vcs.exceptions import (
-    RepositoryError, CommitDoesNotExistError, EmptyRepositoryError,
-    ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,
-    NodeDoesNotExistError, CommitError, NodeError)
+    RepositoryError,
+    CommitDoesNotExistError,
+    EmptyRepositoryError,
+    ImproperArchiveTypeError,
+    VCSError,
+    NodeAlreadyExistsError,
+    NodeDoesNotExistError,
+    CommitError,
+    NodeError,
+)
 
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import Repository
@@ -66,17 +75,17 from rhodecode.model.db import Repositor
 log = logging.getLogger(__name__)
 
 
-def get_archive_name(db_repo_id, db_repo_name, commit_sha, ext, subrepos=False, path_sha='', with_hash=True):
+def get_archive_name(db_repo_id, db_repo_name, commit_sha, ext, subrepos=False, path_sha="", with_hash=True):
     # original backward compat name of archive
-    clean_name = safe_str(convert_special_chars(db_repo_name).replace('/', '_'))
+    clean_name = safe_str(convert_special_chars(db_repo_name).replace("/", "_"))
 
     # e.g vcsserver-id-abcd-sub-1-abcfdef-archive-all.zip
     # vcsserver-id-abcd-sub-0-abcfdef-COMMIT_SHA-PATH_SHA.zip
     id_sha = sha1_safe(str(db_repo_id))[:4]
-    sub_repo = 'sub-1' if subrepos else 'sub-0'
-    commit = commit_sha if with_hash else 'archive'
-    path_marker = (path_sha if with_hash else '') or 'all'
-    archive_name = f'{clean_name}-id-{id_sha}-{sub_repo}-{commit}-{path_marker}{ext}'
+    sub_repo = "sub-1" if subrepos else "sub-0"
+    commit = commit_sha if with_hash else "archive"
+    path_marker = (path_sha if with_hash else "") or "all"
+    archive_name = f"{clean_name}-id-{id_sha}-{sub_repo}-{commit}-{path_marker}{ext}"
 
     return archive_name
 
@@ -86,16 +95,15 def get_path_sha(at_path):
 
 
 def _get_archive_spec(fname):
-    log.debug('Detecting archive spec for: `%s`', fname)
+    log.debug("Detecting archive spec for: `%s`", fname)
 
     fileformat = None
     ext = None
     content_type = None
     for a_type, content_type, extension in settings.ARCHIVE_SPECS:
-
         if fname.endswith(extension):
             fileformat = a_type
-            log.debug('archive is of type: %s', fileformat)
+            log.debug("archive is of type: %s", fileformat)
             ext = extension
             break
 
@@ -103,13 +111,12 def _get_archive_spec(fname):
         raise ValueError()
 
     # left over part of whole fname is the commit
-    commit_id = fname[:-len(ext)]
+    commit_id = fname[: -len(ext)]
 
     return commit_id, ext, fileformat, content_type
 
 
 class RepoFilesView(RepoAppView):
-
     @staticmethod
     def adjust_file_path_for_svn(f_path, repo):
         """
@@ -118,13 +125,11 class RepoFilesView(RepoAppView):
         This is mainly based on prefix matching of the recognized tags and
         branches in the underlying repository.
         """
-        tags_and_branches = itertools.chain(
-            repo.branches.keys(),
-            repo.tags.keys())
+        tags_and_branches = itertools.chain(repo.branches.keys(), repo.tags.keys())
         tags_and_branches = sorted(tags_and_branches, key=len, reverse=True)
 
         for name in tags_and_branches:
-            if f_path.startswith(f'{name}/'):
+            if f_path.startswith(f"{name}/"):
                 f_path = vcspath.relpath(f_path, name)
                 break
         return f_path
@@ -135,66 +140,61 class RepoFilesView(RepoAppView):
         c.enable_downloads = self.db_repo.enable_downloads
         return c
 
-    def _ensure_not_locked(self, commit_id='tip'):
+    def _ensure_not_locked(self, commit_id="tip"):
         _ = self.request.translate
 
         repo = self.db_repo
         if repo.enable_locking and repo.locked[0]:
-            h.flash(_('This repository has been locked by %s on %s')
-                    % (h.person_by_id(repo.locked[0]),
-                    h.format_date(h.time_to_datetime(repo.locked[1]))),
-                    'warning')
-            files_url = h.route_path(
-                'repo_files:default_path',
-                repo_name=self.db_repo_name, commit_id=commit_id)
+            h.flash(
+                _("This repository has been locked by %s on %s")
+                % (h.person_by_id(repo.locked[0]), h.format_date(h.time_to_datetime(repo.locked[1]))),
+                "warning",
+            )
+            files_url = h.route_path("repo_files:default_path", repo_name=self.db_repo_name, commit_id=commit_id)
             raise HTTPFound(files_url)
 
-    def forbid_non_head(self, is_head, f_path, commit_id='tip', json_mode=False):
+    def forbid_non_head(self, is_head, f_path, commit_id="tip", json_mode=False):
         _ = self.request.translate
 
         if not is_head:
-            message = _('Cannot modify file. '
-                        'Given commit `{}` is not head of a branch.').format(commit_id)
-            h.flash(message, category='warning')
+            message = _("Cannot modify file. " "Given commit `{}` is not head of a branch.").format(commit_id)
+            h.flash(message, category="warning")
 
             if json_mode:
                 return message
 
-            files_url = h.route_path(
-                'repo_files', repo_name=self.db_repo_name, commit_id=commit_id,
-                f_path=f_path)
+            files_url = h.route_path("repo_files", repo_name=self.db_repo_name, commit_id=commit_id, f_path=f_path)
             raise HTTPFound(files_url)
 
-    def check_branch_permission(self, branch_name, commit_id='tip', json_mode=False):
+    def check_branch_permission(self, branch_name, commit_id="tip", json_mode=False):
         _ = self.request.translate
 
-        rule, branch_perm = self._rhodecode_user.get_rule_and_branch_permission(
-            self.db_repo_name, branch_name)
-        if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']:
-            message = _('Branch `{}` changes forbidden by rule {}.').format(
-                h.escape(branch_name), h.escape(rule))
-            h.flash(message, 'warning')
+        rule, branch_perm = self._rhodecode_user.get_rule_and_branch_permission(self.db_repo_name, branch_name)
+        if branch_perm and branch_perm not in ["branch.push", "branch.push_force"]:
+            message = _("Branch `{}` changes forbidden by rule {}.").format(h.escape(branch_name), h.escape(rule))
+            h.flash(message, "warning")
 
             if json_mode:
                 return message
 
-            files_url = h.route_path(
-                'repo_files:default_path', repo_name=self.db_repo_name, commit_id=commit_id)
+            files_url = h.route_path("repo_files:default_path", repo_name=self.db_repo_name, commit_id=commit_id)
 
             raise HTTPFound(files_url)
 
     def _get_commit_and_path(self):
         default_commit_id = self.db_repo.landing_ref_name
-        default_f_path = '/'
+        default_f_path = "/"
 
-        commit_id = self.request.matchdict.get(
-            'commit_id', default_commit_id)
+        commit_id = self.request.matchdict.get("commit_id", default_commit_id)
         f_path = self._get_f_path(self.request.matchdict, default_f_path)
-        return commit_id, f_path
+
+        bytes_path = safe_bytes(f_path)
+        return commit_id, f_path, bytes_path
 
-    def _get_default_encoding(self, c):
-        enc_list = getattr(c, 'default_encodings', [])
-        return enc_list[0] if enc_list else 'UTF-8'
+    @classmethod
+    def _get_default_encoding(cls, c):
+        enc_list = getattr(c, "default_encodings", [])
+        return enc_list[0] if enc_list else "UTF-8"
 
     def _get_commit_or_redirect(self, commit_id, redirect_after=True):
         """
@@ -213,31 +213,25 class RepoFilesView(RepoAppView):
                 return None
 
             add_new = upload_new = ""
-            if h.HasRepoPermissionAny(
-                    'repository.write', 'repository.admin')(self.db_repo_name):
-                _url = h.route_path(
-                    'repo_files_add_file',
-                    repo_name=self.db_repo_name, commit_id=0, f_path='')
-                add_new = h.link_to(
-                    _('add a new file'), _url, class_="alert-link")
+            if h.HasRepoPermissionAny("repository.write", "repository.admin")(self.db_repo_name):
+                _url = h.route_path("repo_files_add_file", repo_name=self.db_repo_name, commit_id=0, f_path="")
+                add_new = h.link_to(_("add a new file"), _url, class_="alert-link")
 
-                _url_upld = h.route_path(
-                    'repo_files_upload_file',
-                    repo_name=self.db_repo_name, commit_id=0, f_path='')
-                upload_new = h.link_to(
-                    _('upload a new file'), _url_upld, class_="alert-link")
+                _url_upld = h.route_path("repo_files_upload_file", repo_name=self.db_repo_name, commit_id=0, f_path="")
+                upload_new = h.link_to(_("upload a new file"), _url_upld, class_="alert-link")
 
-            h.flash(h.literal(
-                _('There are no files yet. Click here to %s or %s.') % (add_new, upload_new)), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_summary', repo_name=self.db_repo_name))
+            h.flash(
+                h.literal(_("There are no files yet. Click here to %s or %s.") % (add_new, upload_new)),
+                category="warning",
+            )
+            raise HTTPFound(h.route_path("repo_summary", repo_name=self.db_repo_name))
 
         except (CommitDoesNotExistError, LookupError) as e:
-            msg = _('No such commit exists for this repository. Commit: {}').format(commit_id)
-            h.flash(msg, category='error')
+            msg = _("No such commit exists for this repository. Commit: {}").format(commit_id)
+            h.flash(msg, category="error")
             raise HTTPNotFound()
         except RepositoryError as e:
-            h.flash(h.escape(safe_str(e)), category='error')
+            h.flash(h.escape(safe_str(e)), category="error")
             raise HTTPNotFound()
 
     def _get_filenode_or_redirect(self, commit_obj, path, pre_load=None):
@@ -250,22 +244,22 class RepoFilesView(RepoAppView):
         try:
             file_node = commit_obj.get_node(path, pre_load=pre_load)
             if file_node.is_dir():
-                raise RepositoryError('The given path is a directory')
+                raise RepositoryError("The given path is a directory")
         except CommitDoesNotExistError:
-            log.exception('No such commit exists for this repository')
-            h.flash(_('No such commit exists for this repository'), category='error')
+            log.exception("No such commit exists for this repository")
+            h.flash(_("No such commit exists for this repository"), category="error")
             raise HTTPNotFound()
         except RepositoryError as e:
-            log.warning('Repository error while fetching filenode `%s`. Err:%s', path, e)
-            h.flash(h.escape(safe_str(e)), category='error')
+            log.warning("Repository error while fetching filenode `%s`. Err:%s", path, e)
+            h.flash(h.escape(safe_str(e)), category="error")
             raise HTTPNotFound()
 
         return file_node
 
     def _is_valid_head(self, commit_id, repo, landing_ref):
-        branch_name = sha_commit_id = ''
+        branch_name = sha_commit_id = ""
         is_head = False
-        log.debug('Checking if commit_id `%s` is a head for %s.', commit_id, repo)
+        log.debug("Checking if commit_id `%s` is a head for %s.", commit_id, repo)
 
         for _branch_name, branch_commit_id in repo.branches.items():
             # simple case we pass in branch name, it's a HEAD
@@ -301,39 +295,39 class RepoFilesView(RepoAppView):
         return branch_name, sha_commit_id, is_head
 
     def _get_tree_at_commit(self, c, commit_id, f_path, full_load=False, at_rev=None):
-
         repo_id = self.db_repo.repo_id
         force_recache = self.get_recache_flag()
 
-        cache_seconds = safe_int(
-            rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
+        cache_seconds = rhodecode.ConfigGet().get_int("rc_cache.cache_repo.expiration_time")
         cache_on = not force_recache and cache_seconds > 0
+
         log.debug(
-            'Computing FILE TREE for repo_id %s commit_id `%s` and path `%s`'
-            'with caching: %s[TTL: %ss]' % (
-                repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
+            "Computing FILE TREE for repo_id %s commit_id `%s` and path `%s`"
+            "with caching: %s[TTL: %ss]" % (repo_id, commit_id, f_path, cache_on, cache_seconds or 0)
+        )
 
-        cache_namespace_uid = f'repo.{rc_cache.FILE_TREE_CACHE_VER}.{repo_id}'
-        region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+        cache_namespace_uid = f"repo.{rc_cache.FILE_TREE_CACHE_VER}.{repo_id}"
+        region = rc_cache.get_or_create_region("cache_repo", cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache_on)
         def compute_file_tree(_name_hash, _repo_id, _commit_id, _f_path, _full_load, _at_rev):
-            log.debug('Generating cached file tree at for repo_id: %s, %s, %s',
-                      _repo_id, _commit_id, _f_path)
+            log.debug("Generating cached file tree at for repo_id: %s, %s, %s", _repo_id, _commit_id, _f_path)
 
             c.full_load = _full_load
             return render(
-                'rhodecode:templates/files/files_browser_tree.mako',
-                self._get_template_context(c), self.request, _at_rev)
+                "rhodecode:templates/files/files_browser_tree.mako",
+                self._get_template_context(c),
+                self.request,
+                _at_rev,
+            )
 
         return compute_file_tree(
-            self.db_repo.repo_name_hash, self.db_repo.repo_id, commit_id, f_path, full_load, at_rev)
+            self.db_repo.repo_name_hash, self.db_repo.repo_id, commit_id, f_path, full_load, at_rev
+        )
 
     def create_pure_path(self, *parts):
         # Split paths and sanitize them, removing any ../ etc
-        sanitized_path = [
-            x for x in pathlib.PurePath(*parts).parts
-            if x not in ['.', '..']]
+        sanitized_path = [x for x in pathlib.PurePath(*parts).parts if x not in [".", ".."]]
 
         pure_path = pathlib.PurePath(*sanitized_path)
         return pure_path
@@ -341,10 +335,7 class RepoFilesView(RepoAppView):
     def _is_lf_enabled(self, target_repo):
         lf_enabled = False
 
-        lf_key_for_vcs_map = {
-            'hg': 'extensions_largefiles',
-            'git': 'vcs_git_lfs_enabled'
-        }
+        lf_key_for_vcs_map = {"hg": "extensions_largefiles", "git": "vcs_git_lfs_enabled"}
 
         lf_key_for_vcs = lf_key_for_vcs_map.get(target_repo.repo_type)
 
@@ -354,66 +345,77 class RepoFilesView(RepoAppView):
         return lf_enabled
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_archivefile(self):
         # archive cache config
         from rhodecode import CONFIG
+
         _ = self.request.translate
         self.load_default_context()
-        default_at_path = '/'
-        fname = self.request.matchdict['fname']
-        subrepos = self.request.GET.get('subrepos') == 'true'
-        with_hash = str2bool(self.request.GET.get('with_hash', '1'))
-        at_path = self.request.GET.get('at_path') or default_at_path
+
+        subrepos = self.request.GET.get("subrepos") == "true"
+        with_hash = str2bool(self.request.GET.get("with_hash", "1"))
+
+        default_at_path = "/"
+        fname = self.request.matchdict["fname"]
+        at_path = self.request.GET.get("at_path") or default_at_path
 
         if not self.db_repo.enable_downloads:
-            return Response(_('Downloads disabled'))
+            return Response(_("Downloads disabled"))
 
         try:
-            commit_id, ext, fileformat, content_type = \
-                _get_archive_spec(fname)
+            commit_id, ext, file_format, content_type = _get_archive_spec(fname)
         except ValueError:
-            return Response(_('Unknown archive type for: `{}`').format(
-                h.escape(fname)))
+            return Response(_("Unknown archive type for: `{}`").format(h.escape(fname)))
 
         try:
             commit = self.rhodecode_vcs_repo.get_commit(commit_id)
         except CommitDoesNotExistError:
-            return Response(_('Unknown commit_id {}').format(
-                h.escape(commit_id)))
+            return Response(_("Unknown commit_id {}").format(h.escape(commit_id)))
         except EmptyRepositoryError:
-            return Response(_('Empty repository'))
+            return Response(_("Empty repository"))
 
         # we used a ref, or a shorter version, lets redirect client ot use explicit hash
         if commit_id != commit.raw_id:
-            fname=f'{commit.raw_id}{ext}'
+            fname = f"{commit.raw_id}{ext}"
             raise HTTPFound(self.request.current_route_path(fname=fname))
 
         try:
-            at_path = commit.get_node(at_path).path or default_at_path
+            at_path = commit.get_node(safe_bytes(at_path)).path or default_at_path
         except Exception:
-            return Response(_('No node at path {} for this repository').format(h.escape(at_path)))
+            return Response(_("No node at path {} for this repository").format(h.escape(at_path)))
 
         path_sha = get_path_sha(at_path)
 
         # used for cache etc, consistent unique archive name
         archive_name_key = get_archive_name(
-            self.db_repo.repo_id, self.db_repo_name, commit_sha=commit.short_id, ext=ext, subrepos=subrepos,
-            path_sha=path_sha, with_hash=True)
+            self.db_repo.repo_id,
+            self.db_repo_name,
+            commit_sha=commit.short_id,
+            ext=ext,
+            subrepos=subrepos,
+            path_sha=path_sha,
+            with_hash=True,
+        )
 
         if not with_hash:
-            path_sha = ''
+            path_sha = ""
 
         # what end client gets served
         response_archive_name = get_archive_name(
-            self.db_repo.repo_id, self.db_repo_name, commit_sha=commit.short_id, ext=ext, subrepos=subrepos,
-            path_sha=path_sha, with_hash=with_hash)
+            self.db_repo.repo_id,
+            self.db_repo_name,
+            commit_sha=commit.short_id,
+            ext=ext,
+            subrepos=subrepos,
+            path_sha=path_sha,
+            with_hash=with_hash,
+        )
 
         # remove extension from our archive directory name
-        archive_dir_name = response_archive_name[:-len(ext)]
+        archive_dir_name = response_archive_name[: -len(ext)]
 
-        archive_cache_disable = self.request.GET.get('no_cache')
+        archive_cache_disable = self.request.GET.get("no_cache")
 
         d_cache = get_archival_cache_store(config=CONFIG)
 
@@ -421,29 +423,38 class RepoFilesView(RepoAppView):
         d_cache_conf = get_archival_config(config=CONFIG)
 
         # This is also a cache key, and lock key
-        reentrant_lock_key = archive_name_key + '.lock'
+        reentrant_lock_key = archive_name_key + ".lock"
 
         use_cached_archive = False
         if not archive_cache_disable and archive_name_key in d_cache:
             reader, metadata = d_cache.fetch(archive_name_key)
 
             use_cached_archive = True
-            log.debug('Found cached archive as key=%s tag=%s, serving archive from cache reader=%s',
-                      archive_name_key, metadata, reader.name)
+            log.debug(
+                "Found cached archive as key=%s tag=%s, serving archive from cache reader=%s",
+                archive_name_key,
+                metadata,
+                reader.name,
+            )
         else:
             reader = None
-            log.debug('Archive with key=%s is not yet cached, creating one now...', archive_name_key)
+            log.debug("Archive with key=%s is not yet cached, creating one now...", archive_name_key)
 
         if not reader:
             # generate new archive, as previous was not found in the cache
             try:
                 with d_cache.get_lock(reentrant_lock_key):
                     try:
-                        commit.archive_repo(archive_name_key, archive_dir_name=archive_dir_name,
-                                            kind=fileformat, subrepos=subrepos,
-                                            archive_at_path=at_path, cache_config=d_cache_conf)
+                        commit.archive_repo(
+                            archive_name_key,
+                            archive_dir_name=archive_dir_name,
+                            kind=file_format,
+                            subrepos=subrepos,
+                            archive_at_path=at_path,
+                            cache_config=d_cache_conf,
+                        )
                     except ImproperArchiveTypeError:
-                        return _('Unknown archive type')
+                        return _("Unknown archive type")
 
             except ArchiveCacheGenerationLock:
                 retry_after = round(random.uniform(0.3, 3.0), 1)
@@ -462,7 +473,7 class RepoFilesView(RepoAppView):
             reader, metadata = d_cache.fetch(archive_name_key, retry=True, retry_attempts=30)
 
         response = Response(app_iter=archive_iterator(reader))
-        response.content_disposition = f'attachment; filename={response_archive_name}'
+        response.content_disposition = f"attachment; filename={response_archive_name}"
         response.content_type = str(content_type)
 
         try:
@@ -470,23 +481,25 class RepoFilesView(RepoAppView):
         finally:
             # store download action
             audit_logger.store_web(
-                'repo.archive.download', action_data={
-                    'user_agent': self.request.user_agent,
-                    'archive_name': archive_name_key,
-                    'archive_spec': fname,
-                    'archive_cached': use_cached_archive},
+                "repo.archive.download",
+                action_data={
+                    "user_agent": self.request.user_agent,
+                    "archive_name": archive_name_key,
+                    "archive_spec": fname,
+                    "archive_cached": use_cached_archive,
+                },
                 user=self._rhodecode_user,
                 repo=self.db_repo,
-                commit=True
+                commit=True,
             )
 
     def _get_file_node(self, commit_id, f_path):
-        if commit_id not in ['', None, 'None', '0' * 12, '0' * 40]:
+        if commit_id not in ["", None, "None", "0" * 12, "0" * 40]:
             commit = self.rhodecode_vcs_repo.get_commit(commit_id=commit_id)
             try:
-                node = commit.get_node(f_path)
+                node = commit.get_node(safe_bytes(f_path))
                 if node.is_dir():
-                    raise NodeError(f'{node} path is a {type(node)} not a file')
+                    raise NodeError(f"{node} path is a {type(node)} not a file")
             except NodeDoesNotExistError:
                 commit = EmptyCommit(
                     commit_id=commit_id,
@@ -495,46 +508,43 class RepoFilesView(RepoAppView):
                     alias=commit.repository.alias,
                     message=commit.message,
                     author=commit.author,
-                    date=commit.date)
-                node = FileNode(safe_bytes(f_path), b'', commit=commit)
+                    date=commit.date,
+                )
+                node = FileNode(safe_bytes(f_path), b"", commit=commit)
         else:
-            commit = EmptyCommit(
-                repo=self.rhodecode_vcs_repo,
-                alias=self.rhodecode_vcs_repo.alias)
-            node = FileNode(safe_bytes(f_path), b'', commit=commit)
+            commit = EmptyCommit(repo=self.rhodecode_vcs_repo, alias=self.rhodecode_vcs_repo.alias)
+            node = FileNode(safe_bytes(f_path), b"", commit=commit)
         return node
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_files_diff(self):
         c = self.load_default_context()
         f_path = self._get_f_path(self.request.matchdict)
-        diff1 = self.request.GET.get('diff1', '')
-        diff2 = self.request.GET.get('diff2', '')
+        diff1 = self.request.GET.get("diff1", "")
+        diff2 = self.request.GET.get("diff2", "")
 
         path1, diff1 = parse_path_ref(diff1, default_path=f_path)
 
-        ignore_whitespace = str2bool(self.request.GET.get('ignorews'))
-        line_context = self.request.GET.get('context', 3)
+        ignore_whitespace = str2bool(self.request.GET.get("ignorews"))
+        line_context = self.request.GET.get("context", 3)
 
         if not any((diff1, diff2)):
-            h.flash(
-                'Need query parameter "diff1" or "diff2" to generate a diff.',
-                category='error')
+            h.flash('Need query parameter "diff1" or "diff2" to generate a diff.', category="error")
             raise HTTPBadRequest()
 
-        c.action = self.request.GET.get('diff')
-        if c.action not in ['download', 'raw']:
+        c.action = self.request.GET.get("diff")
+        if c.action not in ["download", "raw"]:
             compare_url = h.route_path(
-                'repo_compare',
+                "repo_compare",
                 repo_name=self.db_repo_name,
-                source_ref_type='rev',
+                source_ref_type="rev",
                 source_ref=diff1,
                 target_repo=self.db_repo_name,
-                target_ref_type='rev',
+                target_ref_type="rev",
                 target_ref=diff2,
-                _query=dict(f_path=f_path))
+                _query=dict(f_path=f_path),
+            )
             # redirect to new view if we render diff
             raise HTTPFound(compare_url)
 
@@ -543,43 +553,34 class RepoFilesView(RepoAppView):
             node2 = self._get_file_node(diff2, f_path)
         except (RepositoryError, NodeError):
             log.exception("Exception while trying to get node from repository")
-            raise HTTPFound(
-                h.route_path('repo_files', repo_name=self.db_repo_name,
-                             commit_id='tip', f_path=f_path))
+            raise HTTPFound(h.route_path("repo_files", repo_name=self.db_repo_name, commit_id="tip", f_path=f_path))
 
-        if all(isinstance(node.commit, EmptyCommit)
-               for node in (node1, node2)):
+        if all(isinstance(node.commit, EmptyCommit) for node in (node1, node2)):
             raise HTTPNotFound()
 
         c.commit_1 = node1.commit
         c.commit_2 = node2.commit
 
-        if c.action == 'download':
-            _diff = diffs.get_gitdiff(node1, node2,
-                                      ignore_whitespace=ignore_whitespace,
-                                      context=line_context)
+        if c.action == "download":
+            _diff = diffs.get_gitdiff(node1, node2, ignore_whitespace=ignore_whitespace, context=line_context)
             # NOTE: this was using diff_format='gitdiff'
-            diff = diffs.DiffProcessor(_diff, diff_format='newdiff')
+            diff = diffs.DiffProcessor(_diff, diff_format="newdiff")
 
             response = Response(self.path_filter.get_raw_patch(diff))
-            response.content_type = 'text/plain'
-            response.content_disposition = (
-                f'attachment; filename={f_path}_{diff1}_vs_{diff2}.diff'
-            )
+            response.content_type = "text/plain"
+            response.content_disposition = f"attachment; filename={f_path}_{diff1}_vs_{diff2}.diff"
             charset = self._get_default_encoding(c)
             if charset:
                 response.charset = charset
             return response
 
-        elif c.action == 'raw':
-            _diff = diffs.get_gitdiff(node1, node2,
-                                      ignore_whitespace=ignore_whitespace,
-                                      context=line_context)
+        elif c.action == "raw":
+            _diff = diffs.get_gitdiff(node1, node2, ignore_whitespace=ignore_whitespace, context=line_context)
             # NOTE: this was using diff_format='gitdiff'
-            diff = diffs.DiffProcessor(_diff, diff_format='newdiff')
+            diff = diffs.DiffProcessor(_diff, diff_format="newdiff")
 
             response = Response(self.path_filter.get_raw_patch(diff))
-            response.content_type = 'text/plain'
+            response.content_type = "text/plain"
             charset = self._get_default_encoding(c)
             if charset:
                 response.charset = charset
@@ -589,31 +590,32 class RepoFilesView(RepoAppView):
         raise HTTPNotFound()
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_files_diff_2way_redirect(self):
         """
         Kept only to make OLD links work
         """
         f_path = self._get_f_path_unchecked(self.request.matchdict)
-        diff1 = self.request.GET.get('diff1', '')
-        diff2 = self.request.GET.get('diff2', '')
+        diff1 = self.request.GET.get("diff1", "")
+        diff2 = self.request.GET.get("diff2", "")
 
         if not any((diff1, diff2)):
-            h.flash(
-                'Need query parameter "diff1" or "diff2" to generate a diff.',
-                category='error')
+            h.flash('Need query parameter "diff1" or "diff2" to generate a diff.', category="error")
             raise HTTPBadRequest()
 
         compare_url = h.route_path(
-            'repo_compare',
+            "repo_compare",
             repo_name=self.db_repo_name,
-            source_ref_type='rev',
+            source_ref_type="rev",
             source_ref=diff1,
-            target_ref_type='rev',
+            target_ref_type="rev",
             target_ref=diff2,
-            _query=dict(f_path=f_path, diffmode='sideside',
-                        target_repo=self.db_repo_name,))
+            _query=dict(
+                f_path=f_path,
+                diffmode="sideside",
+                target_repo=self.db_repo_name,
+            ),
+        )
         raise HTTPFound(compare_url)
 
     @LoginRequired()
@@ -627,52 +629,51 class RepoFilesView(RepoAppView):
         landing_url = h.repo_files_by_ref_url(
             c.rhodecode_db_repo.repo_name,
             c.rhodecode_db_repo.repo_type,
-            f_path='',
+            f_path="",
             ref_name=ref_name,
-            commit_id='tip',
-            query=dict(at=ref_name)
+            commit_id="tip",
+            query=dict(at=ref_name),
         )
 
         raise HTTPFound(landing_url)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_files(self):
         c = self.load_default_context()
 
-        view_name = getattr(self.request.matched_route, 'name', None)
+        view_name = getattr(self.request.matched_route, "name", None)
 
-        c.annotate = view_name == 'repo_files:annotated'
+        c.annotate = view_name == "repo_files:annotated"
         # default is false, but .rst/.md files later are auto rendered, we can
         # overwrite auto rendering by setting this GET flag
-        c.renderer = view_name == 'repo_files:rendered' or not self.request.GET.get('no-render', False)
+        c.renderer = view_name == "repo_files:rendered" or not self.request.GET.get("no-render", False)
 
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         c.commit = self._get_commit_or_redirect(commit_id)
-        c.branch = self.request.GET.get('branch', None)
+        c.branch = self.request.GET.get("branch", None)
         c.f_path = f_path
-        at_rev = self.request.GET.get('at')
+        at_rev = self.request.GET.get("at")
 
         # files or dirs
         try:
-            c.file = c.commit.get_node(f_path, pre_load=['is_binary', 'size', 'data'])
+            c.file = c.commit.get_node(bytes_path, pre_load=["is_binary", "size", "data"])
 
             c.file_author = True
-            c.file_tree = ''
+            c.file_tree = ""
 
             # prev link
             try:
                 prev_commit = c.commit.prev(c.branch)
                 c.prev_commit = prev_commit
                 c.url_prev = h.route_path(
-                    'repo_files', repo_name=self.db_repo_name,
-                    commit_id=prev_commit.raw_id, f_path=f_path)
+                    "repo_files", repo_name=self.db_repo_name, commit_id=prev_commit.raw_id, f_path=f_path
+                )
                 if c.branch:
-                    c.url_prev += '?branch=%s' % c.branch
+                    c.url_prev += f"?branch={c.branch}"
             except (CommitDoesNotExistError, VCSError):
-                c.url_prev = '#'
+                c.url_prev = "#"
                 c.prev_commit = EmptyCommit()
 
             # next link
@@ -680,110 +681,101 class RepoFilesView(RepoAppView):
                 next_commit = c.commit.next(c.branch)
                 c.next_commit = next_commit
                 c.url_next = h.route_path(
-                    'repo_files', repo_name=self.db_repo_name,
-                    commit_id=next_commit.raw_id, f_path=f_path)
+                    "repo_files", repo_name=self.db_repo_name, commit_id=next_commit.raw_id, f_path=f_path
+                )
                 if c.branch:
-                    c.url_next += '?branch=%s' % c.branch
+                    c.url_next += f"?branch={c.branch}"
             except (CommitDoesNotExistError, VCSError):
-                c.url_next = '#'
+                c.url_next = "#"
                 c.next_commit = EmptyCommit()
 
             # load file content
             if c.file.is_file():
-
                 c.lf_node = {}
 
                 has_lf_enabled = self._is_lf_enabled(self.db_repo)
                 if has_lf_enabled:
                     c.lf_node = c.file.get_largefile_node()
 
-                c.file_source_page = 'true'
+                c.file_source_page = "true"
                 c.file_last_commit = c.file.last_commit
 
                 c.file_size_too_big = c.file.size > c.visual.cut_off_limit_file
 
                 if not (c.file_size_too_big or c.file.is_binary):
                     if c.annotate:  # annotation has precedence over renderer
-                        c.annotated_lines = filenode_as_annotated_lines_tokens(
-                            c.file
-                        )
+                        c.annotated_lines = filenode_as_annotated_lines_tokens(c.file)
                     else:
-                        c.renderer = (
-                            c.renderer and h.renderer_from_filename(c.file.path)
-                        )
+                        c.renderer = c.renderer and h.renderer_from_filename(c.file.path)
                         if not c.renderer:
                             c.lines = filenode_as_lines_tokens(c.file)
 
-                _branch_name, _sha_commit_id, is_head = \
-                    self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                        landing_ref=self.db_repo.landing_ref_name)
+                _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+                    commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+                )
                 c.on_branch_head = is_head
 
-                branch = c.commit.branch if (
-                    c.commit.branch and '/' not in c.commit.branch) else None
+                branch = c.commit.branch if (c.commit.branch and "/" not in c.commit.branch) else None
                 c.branch_or_raw_id = branch or c.commit.raw_id
                 c.branch_name = c.commit.branch or h.short_id(c.commit.raw_id)
 
                 author = c.file_last_commit.author
-                c.authors = [[
-                    h.email(author),
-                    h.person(author, 'username_or_name_or_email'),
-                    1
-                ]]
+                c.authors = [[h.email(author), h.person(author, "username_or_name_or_email"), 1]]
 
-            else:  # load tree content at path
-                c.file_source_page = 'false'
+            else:  # load tree content (dir content) at path
+                c.file_source_page = "false"
                 c.authors = []
+
+                dir_node = c.file
+                c.file_nodes = dir_node.commit.get_nodes(dir_node.bytes_path, pre_load=dir_node.default_pre_load)
                 # this loads a simple tree without metadata to speed things up
                 # later via ajax we call repo_nodetree_full and fetch whole
                 c.file_tree = self._get_tree_at_commit(c, c.commit.raw_id, f_path, at_rev=at_rev)
 
-                c.readme_data, c.readme_file = \
-                    self._get_readme_data(self.db_repo, c.visual.default_renderer,
-                                          c.commit.raw_id, f_path)
+                c.readme_data, c.readme_file = self._get_readme_data(
+                    self.db_repo, c.visual.default_renderer, c.commit.raw_id, bytes_path, nodes=c.file_nodes
+                )
 
         except RepositoryError as e:
-            h.flash(h.escape(safe_str(e)), category='error')
+            h.flash(h.escape(safe_str(e)), category="error")
             raise HTTPNotFound()
 
-        if self.request.environ.get('HTTP_X_PJAX'):
-            html = render('rhodecode:templates/files/files_pjax.mako',
-                          self._get_template_context(c), self.request)
+        if self.request.environ.get("HTTP_X_PJAX"):
+            html = render("rhodecode:templates/files/files_pjax.mako", self._get_template_context(c), self.request)
         else:
-            html = render('rhodecode:templates/files/files.mako',
-                          self._get_template_context(c), self.request)
+            html = render("rhodecode:templates/files/files.mako", self._get_template_context(c), self.request)
         return Response(html)
 
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_files_annotated_previous(self):
         self.load_default_context()
 
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, bytes_path, bytes_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         prev_commit_id = commit.raw_id
-        line_anchor = self.request.GET.get('line_anchor')
+        line_anchor = self.request.GET.get("line_anchor")
         is_file = False
         try:
-            _file = commit.get_node(f_path)
+            _file = commit.get_node(bytes_path)
             is_file = _file.is_file()
         except (NodeDoesNotExistError, CommitDoesNotExistError, VCSError):
             pass
 
         if is_file:
-            history = commit.get_path_history(f_path)
-            prev_commit_id = history[1].raw_id \
-                if len(history) > 1 else prev_commit_id
+            history = commit.get_path_history(bytes_path)
+            prev_commit_id = history[1].raw_id if len(history) > 1 else prev_commit_id
         prev_url = h.route_path(
-            'repo_files:annotated', repo_name=self.db_repo_name,
-            commit_id=prev_commit_id, f_path=f_path,
-            _anchor=f'L{line_anchor}')
+            "repo_files:annotated",
+            repo_name=self.db_repo_name,
+            commit_id=prev_commit_id,
+            f_path=bytes_path,
+            _anchor=f"L{line_anchor}",
+        )
 
         raise HTTPFound(prev_url)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_nodetree_full(self):
         """
         Returns rendered html of file tree that contains commit date,
@@ -792,22 +784,22 class RepoFilesView(RepoAppView):
         """
         c = self.load_default_context()
 
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         try:
-            dir_node = commit.get_node(f_path)
+            dir_node = commit.get_node(bytes_path)
         except RepositoryError as e:
-            return Response(f'error: {h.escape(safe_str(e))}')
+            return Response(f"error: {h.escape(safe_str(e))}")
 
         if dir_node.is_file():
-            return Response('')
+            return Response("")
 
         c.file = dir_node
+        c.file_nodes = dir_node.commit.get_nodes(dir_node.bytes_path, pre_load=dir_node.default_pre_load)
         c.commit = commit
-        at_rev = self.request.GET.get('at')
+        at_rev = self.request.GET.get("at")
 
-        html = self._get_tree_at_commit(
-            c, commit.raw_id, dir_node.path, full_load=True, at_rev=at_rev)
+        html = self._get_tree_at_commit(c, commit.raw_id, dir_node.path, full_load=True, at_rev=at_rev)
 
         return Response(html)
 
@@ -816,15 +808,12 class RepoFilesView(RepoAppView):
         safe_path = f_name.replace('"', '\\"')
         encoded_path = urllib.parse.quote(f_name)
 
-        headers = "attachment; " \
-                  "filename=\"{}\"; " \
-                  "filename*=UTF-8\'\'{}".format(safe_path, encoded_path)
+        headers = f"attachment; " f'filename="{safe_path}"; ' f"filename*=UTF-8''{encoded_path}"
 
         return header_safe_str(headers)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_file_raw(self):
         """
         Action for show as raw, some mimetypes are "rendered",
@@ -832,25 +821,24 class RepoFilesView(RepoAppView):
         """
         c = self.load_default_context()
 
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
-        file_node = self._get_filenode_or_redirect(commit, f_path)
+        file_node = self._get_filenode_or_redirect(commit, bytes_path)
 
         raw_mimetype_mapping = {
             # map original mimetype to a mimetype used for "show as raw"
             # you can also provide a content-disposition to override the
             # default "attachment" disposition.
             # orig_type: (new_type, new_dispo)
-
             # show images inline:
             # Do not re-add SVG: it is unsafe and permits XSS attacks. One can
             # for example render an SVG with javascript inside or even render
             # HTML.
-            'image/x-icon': ('image/x-icon', 'inline'),
-            'image/png': ('image/png', 'inline'),
-            'image/gif': ('image/gif', 'inline'),
-            'image/jpeg': ('image/jpeg', 'inline'),
-            'application/pdf': ('application/pdf', 'inline'),
+            "image/x-icon": ("image/x-icon", "inline"),
+            "image/png": ("image/png", "inline"),
+            "image/gif": ("image/gif", "inline"),
+            "image/jpeg": ("image/jpeg", "inline"),
+            "application/pdf": ("application/pdf", "inline"),
         }
 
         mimetype = file_node.mimetype
@@ -860,7 +848,7 class RepoFilesView(RepoAppView):
             # we don't know anything special about this, handle it safely
             if file_node.is_binary:
                 # do same as download raw for binary files
-                mimetype, disposition = 'application/octet-stream', 'attachment'
+                mimetype, disposition = "application/octet-stream", "attachment"
             else:
                 # do not just use the original mimetype, but force text/plain,
                 # otherwise it would serve text/html and that might be unsafe.
@@ -869,9 +857,9 class RepoFilesView(RepoAppView):
                 # binary.This might lead to erroneous text display in some
                 # cases, but helps in other cases, like with text files
                 # without extension.
-                mimetype, disposition = 'text/plain', 'inline'
+                mimetype, disposition = "text/plain", "inline"
 
-        if disposition == 'attachment':
+        if disposition == "attachment":
             disposition = self._get_attachement_headers(f_path)
 
         stream_content = file_node.stream_bytes()
@@ -887,16 +875,15 class RepoFilesView(RepoAppView):
         return response
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_file_download(self):
         c = self.load_default_context()
 
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
-        file_node = self._get_filenode_or_redirect(commit, f_path)
+        file_node = self._get_filenode_or_redirect(commit, bytes_path)
 
-        if self.request.GET.get('lf'):
+        if self.request.GET.get("lf"):
             # only if lf get flag is passed, we download this file
             # as LFS/Largefile
             lf_node = file_node.get_largefile_node()
@@ -919,49 +906,41 class RepoFilesView(RepoAppView):
         return response
 
     def _get_nodelist_at_commit(self, repo_name, repo_id, commit_id, f_path):
-
-        cache_seconds = safe_int(
-            rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
+        cache_seconds = rhodecode.ConfigGet().get_int("rc_cache.cache_repo.expiration_time")
         cache_on = cache_seconds > 0
         log.debug(
-            'Computing FILE SEARCH for repo_id %s commit_id `%s` and path `%s`'
-            'with caching: %s[TTL: %ss]' % (
-                repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
+            "Computing FILE SEARCH for repo_id %s commit_id `%s` and path `%s`"
+            "with caching: %s[TTL: %ss]" % (repo_id, commit_id, f_path, cache_on, cache_seconds or 0)
+        )
 
-        cache_namespace_uid = f'repo.{repo_id}'
-        region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+        cache_namespace_uid = f"repo.{repo_id}"
+        region = rc_cache.get_or_create_region("cache_repo", cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache_on)
         def compute_file_search(_name_hash, _repo_id, _commit_id, _f_path):
-            log.debug('Generating cached nodelist for repo_id:%s, %s, %s',
-                      _repo_id, commit_id, f_path)
+            log.debug("Generating cached nodelist for repo_id:%s, %s, %s", _repo_id, commit_id, f_path)
             try:
                 _d, _f = ScmModel().get_quick_filter_nodes(repo_name, _commit_id, _f_path)
             except (RepositoryError, CommitDoesNotExistError, Exception) as e:
                 log.exception(safe_str(e))
-                h.flash(h.escape(safe_str(e)), category='error')
-                raise HTTPFound(h.route_path(
-                    'repo_files', repo_name=self.db_repo_name,
-                    commit_id='tip', f_path='/'))
+                h.flash(h.escape(safe_str(e)), category="error")
+                raise HTTPFound(h.route_path("repo_files", repo_name=self.db_repo_name, commit_id="tip", f_path="/"))
 
             return _d + _f
 
-        result = compute_file_search(self.db_repo.repo_name_hash, self.db_repo.repo_id,
-                                     commit_id, f_path)
-        return filter(lambda n: self.path_filter.path_access_allowed(n['name']), result)
+        result = compute_file_search(self.db_repo.repo_name_hash, self.db_repo.repo_id, commit_id, f_path)
+        return filter(lambda n: self.path_filter.path_access_allowed(n["name"]), result)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_nodelist(self):
         self.load_default_context()
 
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
 
-        metadata = self._get_nodelist_at_commit(
-            self.db_repo_name, self.db_repo.repo_id, commit.raw_id, f_path)
-        return {'nodes': [x for x in metadata]}
+        metadata = self._get_nodelist_at_commit(self.db_repo_name, self.db_repo.repo_id, commit.raw_id, f_path)
+        return {"nodes": [x for x in metadata]}
 
     def _create_references(self, branches_or_tags, symbolic_reference, f_path, ref_type):
         items = []
@@ -978,7 +957,7 class RepoFilesView(RepoAppView):
 
         # NOTE(dan): old code we used in "diff" mode compare
         new_f_path = vcspath.join(name, f_path)
-        return f'{new_f_path}@{commit_id}'
+        return f"{new_f_path}@{commit_id}"
 
     def _get_node_history(self, commit_obj, f_path, commits=None):
         """
@@ -996,37 +975,34 class RepoFilesView(RepoAppView):
         if commits is None:
             pre_load = ["author", "branch"]
             try:
-                commits = tip.get_path_history(f_path, pre_load=pre_load)
+                commits = tip.get_path_history(safe_bytes(f_path), pre_load=pre_load)
             except (NodeDoesNotExistError, CommitError):
                 # this node is not present at tip!
-                commits = commit_obj.get_path_history(f_path, pre_load=pre_load)
+                commits = commit_obj.get_path_history(safe_bytes(f_path), pre_load=pre_load)
 
         history = []
         commits_group = ([], _("Changesets"))
         for commit in commits:
-            branch = ' (%s)' % commit.branch if commit.branch else ''
-            n_desc = f'r{commit.idx}:{commit.short_id}{branch}'
-            commits_group[0].append((commit.raw_id, n_desc, 'sha'))
+            branch = " (%s)" % commit.branch if commit.branch else ""
+            n_desc = f"r{commit.idx}:{commit.short_id}{branch}"
+            commits_group[0].append((commit.raw_id, n_desc, "sha"))
         history.append(commits_group)
 
         symbolic_reference = self._symbolic_reference
 
-        if self.rhodecode_vcs_repo.alias == 'svn':
-            adjusted_f_path = RepoFilesView.adjust_file_path_for_svn(
-                f_path, self.rhodecode_vcs_repo)
+        if self.rhodecode_vcs_repo.alias == "svn":
+            adjusted_f_path = RepoFilesView.adjust_file_path_for_svn(f_path, self.rhodecode_vcs_repo)
             if adjusted_f_path != f_path:
                 log.debug(
-                    'Recognized svn tag or branch in file "%s", using svn '
-                    'specific symbolic references', f_path)
+                    'Recognized svn tag or branch in file "%s", using svn ' "specific symbolic references", f_path
+                )
                 f_path = adjusted_f_path
                 symbolic_reference = self._symbolic_reference_svn
 
-        branches = self._create_references(
-            self.rhodecode_vcs_repo.branches, symbolic_reference, f_path, 'branch')
+        branches = self._create_references(self.rhodecode_vcs_repo.branches, symbolic_reference, f_path, "branch")
         branches_group = (branches, _("Branches"))
 
-        tags = self._create_references(
-            self.rhodecode_vcs_repo.tags, symbolic_reference, f_path, 'tag')
+        tags = self._create_references(self.rhodecode_vcs_repo.tags, symbolic_reference, f_path, "tag")
         tags_group = (tags, _("Tags"))
 
         history.append(branches_group)
@@ -1035,14 +1011,13 class RepoFilesView(RepoAppView):
         return history, commits
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_file_history(self):
         self.load_default_context()
 
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
-        file_node = self._get_filenode_or_redirect(commit, f_path)
+        file_node = self._get_filenode_or_redirect(commit, bytes_path)
 
         if file_node.is_file():
             file_history, _hist = self._get_node_history(commit, f_path)
@@ -1051,52 +1026,38 class RepoFilesView(RepoAppView):
             for section_items, section in file_history:
                 items = []
                 for obj_id, obj_text, obj_type in section_items:
-                    at_rev = ''
-                    if obj_type in ['branch', 'bookmark', 'tag']:
+                    at_rev = ""
+                    if obj_type in ["branch", "bookmark", "tag"]:
                         at_rev = obj_text
-                    entry = {
-                        'id': obj_id,
-                        'text': obj_text,
-                        'type': obj_type,
-                        'at_rev': at_rev
-                    }
+                    entry = {"id": obj_id, "text": obj_text, "type": obj_type, "at_rev": at_rev}
 
                     items.append(entry)
 
-                res.append({
-                    'text': section,
-                    'children': items
-                })
+                res.append({"text": section, "children": items})
 
-            data = {
-                'more': False,
-                'results': res
-            }
+            data = {"more": False, "results": res}
             return data
 
-        log.warning('Cannot fetch history for directory')
+        log.warning("Cannot fetch history for directory")
         raise HTTPBadRequest()
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator(
-        'repository.read', 'repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.read", "repository.write", "repository.admin")
     def repo_file_authors(self):
         c = self.load_default_context()
 
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
-        file_node = self._get_filenode_or_redirect(commit, f_path)
+        file_node = self._get_filenode_or_redirect(commit, bytes_path)
 
         if not file_node.is_file():
             raise HTTPBadRequest()
 
         c.file_last_commit = file_node.last_commit
-        if self.request.GET.get('annotate') == '1':
+        if self.request.GET.get("annotate") == "1":
             # use _hist from annotation if annotation mode is on
             commit_ids = {x[1] for x in file_node.annotate}
-            _hist = (
-                self.rhodecode_vcs_repo.get_commit(commit_id)
-                for commit_id in commit_ids)
+            _hist = (self.rhodecode_vcs_repo.get_commit(commit_id) for commit_id in commit_ids)
         else:
             _f_history, _hist = self._get_node_history(commit, f_path)
         c.file_author = False
@@ -1107,8 +1068,8 class RepoFilesView(RepoAppView):
             if author not in unique:
                 unique[commit.author] = [
                     h.email(author),
-                    h.person(author, 'username_or_name_or_email'),
-                    1  # counter
+                    h.person(author, "username_or_name_or_email"),
+                    1,  # counter
                 ]
 
             else:
@@ -1120,204 +1081,186 class RepoFilesView(RepoAppView):
         return self._get_template_context(c)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     def repo_files_check_head(self):
         self.load_default_context()
 
-        commit_id, f_path = self._get_commit_and_path()
-        _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                landing_ref=self.db_repo.landing_ref_name)
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
+        _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+            commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+        )
 
-        new_path = self.request.POST.get('path')
-        operation = self.request.POST.get('operation')
-        path_exist = ''
+        new_path = self.request.POST.get("path")
+        operation = self.request.POST.get("operation")
+        path_exist = ""
 
-        if new_path and operation in ['create', 'upload']:
-            new_f_path = os.path.join(f_path.lstrip('/'), new_path)
+        if new_path and operation in ["create", "upload"]:
+            new_f_path = os.path.join(f_path.lstrip("/"), new_path)
             try:
                 commit_obj = self.rhodecode_vcs_repo.get_commit(commit_id)
                 # NOTE(dan): construct whole path without leading /
-                file_node = commit_obj.get_node(new_f_path)
-                if file_node is not None:
+                file_node = commit_obj.get_node(safe_bytes(new_f_path))
+                if file_node:
                     path_exist = new_f_path
-            except EmptyRepositoryError:
-                pass
-            except Exception:
+            except (EmptyRepositoryError, NodeDoesNotExistError):
                 pass
 
-        return {
-            'branch': _branch_name,
-            'sha': _sha_commit_id,
-            'is_head': is_head,
-            'path_exists': path_exist
-        }
+        return {"branch": _branch_name, "sha": _sha_commit_id, "is_head": is_head, "path_exists": path_exist}
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     def repo_files_remove_file(self):
         _ = self.request.translate
         c = self.load_default_context()
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
-        _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                landing_ref=self.db_repo.landing_ref_name)
+        _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+            commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+        )
 
         self.forbid_non_head(is_head, f_path)
         self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
-        c.file = self._get_filenode_or_redirect(c.commit, f_path)
+        c.file = self._get_filenode_or_redirect(c.commit, bytes_path)
 
-        c.default_message = _(
-            'Deleted file {} via RhodeCode Enterprise').format(f_path)
+        c.default_message = _("Deleted file {} via RhodeCode Enterprise").format(f_path)
         c.f_path = f_path
 
         return self._get_template_context(c)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     @CSRFRequired()
     def repo_files_delete_file(self):
         _ = self.request.translate
 
         c = self.load_default_context()
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
-        _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                landing_ref=self.db_repo.landing_ref_name)
+        _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+            commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+        )
 
         self.forbid_non_head(is_head, f_path)
         self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
-        c.file = self._get_filenode_or_redirect(c.commit, f_path)
+        c.file = self._get_filenode_or_redirect(c.commit, bytes_path)
 
-        c.default_message = _(
-            'Deleted file {} via RhodeCode Enterprise').format(f_path)
+        c.default_message = _("Deleted file {} via RhodeCode Enterprise").format(f_path)
         c.f_path = f_path
         node_path = f_path
         author = self._rhodecode_db_user.full_contact
-        message = self.request.POST.get('message') or c.default_message
+        message = self.request.POST.get("message") or c.default_message
         try:
-            nodes = {
-                safe_bytes(node_path): {
-                    'content': b''
-                }
-            }
+            nodes = {safe_bytes(node_path): {"content": b""}}
             ScmModel().delete_nodes(
-                user=self._rhodecode_db_user.user_id, repo=self.db_repo,
+                user=self._rhodecode_db_user.user_id,
+                repo=self.db_repo,
                 message=message,
                 nodes=nodes,
                 parent_commit=c.commit,
                 author=author,
             )
 
-            h.flash(
-                _('Successfully deleted file `{}`').format(
-                    h.escape(f_path)), category='success')
+            h.flash(_("Successfully deleted file `{}`").format(h.escape(f_path)), category="success")
         except Exception:
-            log.exception('Error during commit operation')
-            h.flash(_('Error occurred during commit'), category='error')
-        raise HTTPFound(
-            h.route_path('repo_commit', repo_name=self.db_repo_name,
-                         commit_id='tip'))
+            log.exception("Error during commit operation")
+            h.flash(_("Error occurred during commit"), category="error")
+        raise HTTPFound(h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id="tip"))
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     def repo_files_edit_file(self):
         _ = self.request.translate
         c = self.load_default_context()
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
-        _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                landing_ref=self.db_repo.landing_ref_name)
+        _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+            commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+        )
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.commit = self._get_commit_or_redirect(commit_id)
-        c.file = self._get_filenode_or_redirect(c.commit, f_path)
+        c.file = self._get_filenode_or_redirect(c.commit, bytes_path)
 
         if c.file.is_binary:
             files_url = h.route_path(
-                'repo_files',
-                repo_name=self.db_repo_name,
-                commit_id=c.commit.raw_id, f_path=f_path)
+                "repo_files", repo_name=self.db_repo_name, commit_id=c.commit.raw_id, f_path=f_path
+            )
             raise HTTPFound(files_url)
 
-        c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
+        c.default_message = _("Edited file {} via RhodeCode Enterprise").format(f_path)
         c.f_path = f_path
 
         return self._get_template_context(c)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     @CSRFRequired()
     def repo_files_update_file(self):
         _ = self.request.translate
         c = self.load_default_context()
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id)
-        c.file = self._get_filenode_or_redirect(c.commit, f_path)
+        c.file = self._get_filenode_or_redirect(c.commit, bytes_path)
 
         if c.file.is_binary:
-            raise HTTPFound(h.route_path('repo_files', repo_name=self.db_repo_name,
-                                         commit_id=c.commit.raw_id, f_path=f_path))
+            raise HTTPFound(
+                h.route_path("repo_files", repo_name=self.db_repo_name, commit_id=c.commit.raw_id, f_path=f_path)
+            )
 
-        _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                landing_ref=self.db_repo.landing_ref_name)
+        _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+            commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+        )
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
-        c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
+        c.default_message = _("Edited file {} via RhodeCode Enterprise").format(f_path)
         c.f_path = f_path
 
         old_content = c.file.str_content
         sl = old_content.splitlines(1)
-        first_line = sl[0] if sl else ''
+        first_line = sl[0] if sl else ""
 
         r_post = self.request.POST
         # line endings:  0 - Unix, 1 - Mac, 2 - DOS
         line_ending_mode = detect_mode(first_line, 0)
-        content = convert_line_endings(r_post.get('content', ''), line_ending_mode)
+        content = convert_line_endings(r_post.get("content", ""), line_ending_mode)
 
-        message = r_post.get('message') or c.default_message
+        message = r_post.get("message") or c.default_message
 
         org_node_path = c.file.str_path
-        filename = r_post['filename']
+        filename = r_post["filename"]
 
         root_path = c.file.dir_path
         pure_path = self.create_pure_path(root_path, filename)
         node_path = pure_path.as_posix()
 
-        default_redirect_url = h.route_path('repo_commit', repo_name=self.db_repo_name,
-                                            commit_id=commit_id)
+        default_redirect_url = h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id=commit_id)
         if content == old_content and node_path == org_node_path:
-            h.flash(_('No changes detected on {}').format(h.escape(org_node_path)),
-                    category='warning')
+            h.flash(_("No changes detected on {}").format(h.escape(org_node_path)), category="warning")
             raise HTTPFound(default_redirect_url)
 
         try:
             mapping = {
                 c.file.bytes_path: {
-                    'org_filename': org_node_path,
-                    'filename': safe_bytes(node_path),
-                    'content': safe_bytes(content),
-                    'lexer': '',
-                    'op': 'mod',
-                    'mode': c.file.mode
+                    "org_filename": org_node_path,
+                    "filename": safe_bytes(node_path),
+                    "content": safe_bytes(content),
+                    "lexer": "",
+                    "op": "mod",
+                    "mode": c.file.mode,
                 }
             }
 
@@ -1329,28 +1272,26 class RepoFilesView(RepoAppView):
                 parent_commit=c.commit,
             )
 
-            h.flash(_('Successfully committed changes to file `{}`').format(
-                    h.escape(f_path)), category='success')
-            default_redirect_url = h.route_path(
-                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+            h.flash(_("Successfully committed changes to file `{}`").format(h.escape(f_path)), category="success")
+            default_redirect_url = h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except Exception:
-            log.exception('Error occurred during commit')
-            h.flash(_('Error occurred during commit'), category='error')
+            log.exception("Error occurred during commit")
+            h.flash(_("Error occurred during commit"), category="error")
 
         raise HTTPFound(default_redirect_url)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     def repo_files_add_file(self):
         _ = self.request.translate
         c = self.load_default_context()
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         # Check if we need to use this page to upload binary
-        upload_binary = str2bool(self.request.params.get('upload_binary', False))
+        upload_binary = str2bool(self.request.params.get("upload_binary", False))
 
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
@@ -1359,29 +1300,32 class RepoFilesView(RepoAppView):
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
-            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, "", True
         else:
-            _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                    landing_ref=self.db_repo.landing_ref_name)
+            _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+                commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+            )
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
-        c.default_message = (_('Added file via RhodeCode Enterprise')) \
-            if not upload_binary else (_('Edited file {} via RhodeCode Enterprise').format(f_path))
-        c.f_path = f_path.lstrip('/')  # ensure not relative path
+        c.default_message = (
+            (_("Added file via RhodeCode Enterprise"))
+            if not upload_binary
+            else (_("Edited file {} via RhodeCode Enterprise").format(f_path))
+        )
+        c.f_path = f_path.lstrip("/")  # ensure not relative path
         c.replace_binary = upload_binary
 
         return self._get_template_context(c)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     @CSRFRequired()
     def repo_files_create_file(self):
         _ = self.request.translate
         c = self.load_default_context()
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
@@ -1391,56 +1335,48 class RepoFilesView(RepoAppView):
 
         # calculate redirect URL
         if self.rhodecode_vcs_repo.is_empty():
-            default_redirect_url = h.route_path(
-                'repo_summary', repo_name=self.db_repo_name)
+            default_redirect_url = h.route_path("repo_summary", repo_name=self.db_repo_name)
         else:
-            default_redirect_url = h.route_path(
-                'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
+            default_redirect_url = h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id="tip")
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
-            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, "", True
         else:
-            _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                    landing_ref=self.db_repo.landing_ref_name)
+            _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+                commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+            )
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
-        c.default_message = (_('Added file via RhodeCode Enterprise'))
+        c.default_message = _("Added file via RhodeCode Enterprise")
         c.f_path = f_path
 
         r_post = self.request.POST
-        message = r_post.get('message') or c.default_message
-        filename = r_post.get('filename')
+        message = r_post.get("message") or c.default_message
+        filename = r_post.get("filename")
         unix_mode = 0
 
         if not filename:
             # If there's no commit, redirect to repo summary
             if type(c.commit) is EmptyCommit:
-                redirect_url = h.route_path(
-                    'repo_summary', repo_name=self.db_repo_name)
+                redirect_url = h.route_path("repo_summary", repo_name=self.db_repo_name)
             else:
                 redirect_url = default_redirect_url
-            h.flash(_('No filename specified'), category='warning')
+            h.flash(_("No filename specified"), category="warning")
             raise HTTPFound(redirect_url)
 
         root_path = f_path
         pure_path = self.create_pure_path(root_path, filename)
-        node_path = pure_path.as_posix().lstrip('/')
+        node_path = pure_path.as_posix().lstrip("/")
 
         author = self._rhodecode_db_user.full_contact
-        content = convert_line_endings(r_post.get('content', ''), unix_mode)
-        nodes = {
-            safe_bytes(node_path): {
-                'content': safe_bytes(content)
-            }
-        }
+        content = convert_line_endings(r_post.get("content", ""), unix_mode)
+        nodes = {safe_bytes(node_path): {"content": safe_bytes(content)}}
 
         try:
-
             commit = ScmModel().create_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
@@ -1450,32 +1386,32 class RepoFilesView(RepoAppView):
                 author=author,
             )
 
-            h.flash(_('Successfully committed new file `{}`').format(
-                    h.escape(node_path)), category='success')
+            h.flash(_("Successfully committed new file `{}`").format(h.escape(node_path)), category="success")
 
-            default_redirect_url = h.route_path(
-                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+            default_redirect_url = h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except NonRelativePathError:
-            log.exception('Non Relative path found')
-            h.flash(_('The location specified must be a relative path and must not '
-                      'contain .. in the path'), category='warning')
+            log.exception("Non Relative path found")
+            h.flash(
+                _("The location specified must be a relative path and must not " "contain .. in the path"),
+                category="warning",
+            )
             raise HTTPFound(default_redirect_url)
         except (NodeError, NodeAlreadyExistsError) as e:
-            h.flash(h.escape(safe_str(e)), category='error')
+            h.flash(h.escape(safe_str(e)), category="error")
         except Exception:
-            log.exception('Error occurred during commit')
-            h.flash(_('Error occurred during commit'), category='error')
+            log.exception("Error occurred during commit")
+            h.flash(_("Error occurred during commit"), category="error")
 
         raise HTTPFound(default_redirect_url)
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     @CSRFRequired()
     def repo_files_upload_file(self):
         _ = self.request.translate
         c = self.load_default_context()
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
@@ -1485,65 +1421,52 class RepoFilesView(RepoAppView):
 
         # calculate redirect URL
         if self.rhodecode_vcs_repo.is_empty():
-            default_redirect_url = h.route_path(
-                'repo_summary', repo_name=self.db_repo_name)
+            default_redirect_url = h.route_path("repo_summary", repo_name=self.db_repo_name)
         else:
-            default_redirect_url = h.route_path(
-                'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
+            default_redirect_url = h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id="tip")
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
-            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, "", True
         else:
-            _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                    landing_ref=self.db_repo.landing_ref_name)
+            _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+                commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+            )
 
         error = self.forbid_non_head(is_head, f_path, json_mode=True)
         if error:
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            return {"error": error, "redirect_url": default_redirect_url}
         error = self.check_branch_permission(_branch_name, json_mode=True)
         if error:
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            return {"error": error, "redirect_url": default_redirect_url}
 
-        c.default_message = (_('Added file via RhodeCode Enterprise'))
+        c.default_message = _("Added file via RhodeCode Enterprise")
         c.f_path = f_path
 
         r_post = self.request.POST
 
         message = c.default_message
-        user_message = r_post.getall('message')
+        user_message = r_post.getall("message")
         if isinstance(user_message, list) and user_message:
             # we take the first from duplicated results if it's not empty
             message = user_message[0] if user_message[0] else message
 
         nodes = {}
 
-        for file_obj in r_post.getall('files_upload') or []:
+        for file_obj in r_post.getall("files_upload") or []:
             content = file_obj.file
             filename = file_obj.filename
 
             root_path = f_path
             pure_path = self.create_pure_path(root_path, filename)
-            node_path = pure_path.as_posix().lstrip('/')
+            node_path = pure_path.as_posix().lstrip("/")
 
-            nodes[safe_bytes(node_path)] = {
-                'content': content
-            }
+            nodes[safe_bytes(node_path)] = {"content": content}
 
         if not nodes:
-            error = 'missing files'
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            error = "missing files"
+            return {"error": error, "redirect_url": default_redirect_url}
 
         author = self._rhodecode_db_user.full_contact
 
@@ -1557,54 +1480,40 class RepoFilesView(RepoAppView):
                 author=author,
             )
             if len(nodes) == 1:
-                flash_message = _('Successfully committed {} new files').format(len(nodes))
+                flash_message = _("Successfully committed {} new files").format(len(nodes))
             else:
-                flash_message = _('Successfully committed 1 new file')
+                flash_message = _("Successfully committed 1 new file")
 
-            h.flash(flash_message, category='success')
+            h.flash(flash_message, category="success")
 
-            default_redirect_url = h.route_path(
-                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+            default_redirect_url = h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except NonRelativePathError:
-            log.exception('Non Relative path found')
-            error = _('The location specified must be a relative path and must not '
-                      'contain .. in the path')
-            h.flash(error, category='warning')
+            log.exception("Non Relative path found")
+            error = _("The location specified must be a relative path and must not " "contain .. in the path")
+            h.flash(error, category="warning")
 
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            return {"error": error, "redirect_url": default_redirect_url}
         except (NodeError, NodeAlreadyExistsError) as e:
             error = h.escape(e)
-            h.flash(error, category='error')
+            h.flash(error, category="error")
 
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            return {"error": error, "redirect_url": default_redirect_url}
         except Exception:
-            log.exception('Error occurred during commit')
-            error = _('Error occurred during commit')
-            h.flash(error, category='error')
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            log.exception("Error occurred during commit")
+            error = _("Error occurred during commit")
+            h.flash(error, category="error")
+            return {"error": error, "redirect_url": default_redirect_url}
 
-        return {
-            'error': None,
-            'redirect_url': default_redirect_url
-        }
+        return {"error": None, "redirect_url": default_redirect_url}
 
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @HasRepoPermissionAnyDecorator("repository.write", "repository.admin")
     @CSRFRequired()
     def repo_files_replace_file(self):
         _ = self.request.translate
         c = self.load_default_context()
-        commit_id, f_path = self._get_commit_and_path()
+        commit_id, f_path, bytes_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
@@ -1613,64 +1522,50 class RepoFilesView(RepoAppView):
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
         if self.rhodecode_vcs_repo.is_empty():
-            default_redirect_url = h.route_path(
-                'repo_summary', repo_name=self.db_repo_name)
+            default_redirect_url = h.route_path("repo_summary", repo_name=self.db_repo_name)
         else:
-            default_redirect_url = h.route_path(
-                'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
+            default_redirect_url = h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id="tip")
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
-            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, "", True
         else:
-            _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
-                                    landing_ref=self.db_repo.landing_ref_name)
+            _branch_name, _sha_commit_id, is_head = self._is_valid_head(
+                commit_id, self.rhodecode_vcs_repo, landing_ref=self.db_repo.landing_ref_name
+            )
 
         error = self.forbid_non_head(is_head, f_path, json_mode=True)
         if error:
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            return {"error": error, "redirect_url": default_redirect_url}
         error = self.check_branch_permission(_branch_name, json_mode=True)
         if error:
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            return {"error": error, "redirect_url": default_redirect_url}
 
-        c.default_message = (_('Edited file {} via RhodeCode Enterprise').format(f_path))
+        c.default_message = _("Edited file {} via RhodeCode Enterprise").format(f_path)
         c.f_path = f_path
 
         r_post = self.request.POST
 
         message = c.default_message
-        user_message = r_post.getall('message')
+        user_message = r_post.getall("message")
         if isinstance(user_message, list) and user_message:
             # we take the first from duplicated results if it's not empty
             message = user_message[0] if user_message[0] else message
 
-        data_for_replacement = r_post.getall('files_upload') or []
+        data_for_replacement = r_post.getall("files_upload") or []
         if (objects_count := len(data_for_replacement)) > 1:
-            return {
-                'error': 'too many files for replacement',
-                'redirect_url': default_redirect_url
-            }
+            return {"error": "too many files for replacement", "redirect_url": default_redirect_url}
         elif not objects_count:
-            return {
-                'error': 'missing files',
-                'redirect_url': default_redirect_url
-            }
+            return {"error": "missing files", "redirect_url": default_redirect_url}
 
         content = data_for_replacement[0].file
         retrieved_filename = data_for_replacement[0].filename
 
-        if retrieved_filename.split('.')[-1] != f_path.split('.')[-1]:
+        if retrieved_filename.split(".")[-1] != f_path.split(".")[-1]:
             return {
-                'error': 'file extension of uploaded file doesn\'t match an original file\'s extension',
-                'redirect_url': default_redirect_url
+                "error": "file extension of uploaded file doesn't match an original file's extension",
+                "redirect_url": default_redirect_url,
             }
 
         author = self._rhodecode_db_user.full_contact
@@ -1681,36 +1576,26 class RepoFilesView(RepoAppView):
                 repo=self.db_repo,
                 message=message,
                 node={
-                    'content': content,
-                    'file_path': f_path.encode(),
+                    "content": content,
+                    "file_path": f_path.encode(),
                 },
                 parent_commit=c.commit,
                 author=author,
             )
 
-            h.flash(_('Successfully committed 1 new file'), category='success')
+            h.flash(_("Successfully committed 1 new file"), category="success")
 
-            default_redirect_url = h.route_path(
-                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+            default_redirect_url = h.route_path("repo_commit", repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except (NodeError, NodeAlreadyExistsError) as e:
             error = h.escape(e)
-            h.flash(error, category='error')
+            h.flash(error, category="error")
 
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            return {"error": error, "redirect_url": default_redirect_url}
         except Exception:
-            log.exception('Error occurred during commit')
-            error = _('Error occurred during commit')
-            h.flash(error, category='error')
-            return {
-                'error': error,
-                'redirect_url': default_redirect_url
-            }
+            log.exception("Error occurred during commit")
+            error = _("Error occurred during commit")
+            h.flash(error, category="error")
+            return {"error": error, "redirect_url": default_redirect_url}
 
-        return {
-            'error': None,
-            'redirect_url': default_redirect_url
-        }
+        return {"error": None, "redirect_url": default_redirect_url}

rhodecode/apps/repository/views/repo_forks.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_maintainance.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_permissions.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_pull_requests.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -487,7 +487,9 class RepoPullRequestsView(RepoAppView,
         c.pull_request_set_reviewers_data_json = ext_json.str_json(c.pull_request_set_reviewers_data_json)
 
         # observers
+        observer_ids = []
         for observer_obj, member in pull_request_at_ver.observers():
+            observer_ids.append(observer_obj.user_id)
             member_observer = h.reviewer_as_json(
                 member, reasons=[], mandatory=False,
                 role=observer_obj.role,
@@ -497,6 +499,7 class RepoPullRequestsView(RepoAppView,
             c.pull_request_set_observers_data_json['observers'].append(member_observer)
 
         c.pull_request_set_observers_data_json = ext_json.str_json(c.pull_request_set_observers_data_json)
+        c.status_change_disabled = self._rhodecode_user.user_id in observer_ids
 
         general_comments, inline_comments = \
             self.register_comments_vars(c, pull_request_latest, versions)

rhodecode/apps/repository/views/repo_review_rules.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_advanced.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_fields.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_issue_trackers.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_remote.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_vcs.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_strip.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_summary.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_tags.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/search/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/search/tests/test_search.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/search/views.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/config_keys.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/events.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/lib/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/lib/backends/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/lib/backends/base.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,7 +20,7 import os
 import sys
 import logging
 
-from rhodecode.lib.hook_daemon.base import prepare_callback_daemon
+from rhodecode.lib.hook_daemon.utils import prepare_callback_daemon
 from rhodecode.lib.ext_json import sjson as json
 from rhodecode.lib.vcs.conf import settings as vcs_settings
 from rhodecode.lib.api_utils import call_service_api
@@ -162,9 +162,7 class SshVcsServer(object):
         extras = {}
         extras.update(tunnel_extras)
 
-        callback_daemon, extras = prepare_callback_daemon(
-            extras, protocol=self.hooks_protocol,
-            host=vcs_settings.HOOKS_HOST)
+        callback_daemon, extras = prepare_callback_daemon(extras, protocol=self.hooks_protocol)
 
         with callback_daemon:
             try:

rhodecode/apps/ssh_support/lib/backends/git.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/lib/backends/hg.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/lib/backends/svn.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -25,7 +25,7 import tempfile
 from subprocess import Popen, PIPE
 import urllib.parse
 
-from rhodecode_tools.lib.utils import safe_str
+from rhodecode.lib.str_utils import safe_str
 from .base import SshVcsServer
 
 log = logging.getLogger(__name__)

rhodecode/apps/ssh_support/lib/ssh_wrapper_v1.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/lib/ssh_wrapper_v2.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/lib/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/subscribers.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/conftest.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/test_server_git.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -33,19 +33,24 class GitServerCreator(object):
         'app:main': {
             'ssh.executable.git': git_path,
             'vcs.hooks.protocol.v2': 'celery',
+            'app.service_api.host': 'http://localhost',
+            'app.service_api.token': 'secret4',
+            'rhodecode.api.url': '/_admin/api',
         }
     }
     repo_name = 'test_git'
     repo_mode = 'receive-pack'
     user = plain_dummy_user()
 
-    def __init__(self):
-        pass
+    def __init__(self, service_api_url, ini_file):
+        self.service_api_url = service_api_url
+        self.ini_file = ini_file
 
     def create(self, **kwargs):
+        self.config_data['app:main']['app.service_api.host'] = self.service_api_url
         parameters = {
             'store': self.root,
-            'ini_path': '',
+            'ini_path': self.ini_file,
             'user': self.user,
             'repo_name': self.repo_name,
             'repo_mode': self.repo_mode,
@@ -60,12 +65,30 class GitServerCreator(object):
         return server
 
 
[e-mail]()
-def git_server(app):
-    return GitServerCreator()
[e-mail](scope='module')
+def git_server(request, module_app, rhodecode_factory, available_port_factory):
+    ini_file = module_app._pyramid_settings['__file__']
+    vcsserver_host = module_app._pyramid_settings['vcs.server']
+
+    store_dir = os.path.dirname(ini_file)
+
+    # start rhodecode for service API
+    rc = rhodecode_factory(
+        request,
+        store_dir=store_dir,
+        port=available_port_factory(),
+        overrides=(
+            {'handler_console': {'level': 'DEBUG'}},
+            {'app:main': {'vcs.server': vcsserver_host}},
+            {'app:main': {'repo_store.path': store_dir}}
+        ))
+
+    service_api_url = f'http://{rc.bind_addr}'
+
+    return GitServerCreator(service_api_url, ini_file)
 
 
-class TestGitServer(object):
+class TestGitServer:
 
     def test_command(self, git_server):
         server = git_server.create()
@@ -102,14 +125,14 class TestGitServer(object):
         assert result is value
 
     def test_run_returns_executes_command(self, git_server):
+        from rhodecode.apps.ssh_support.lib.backends.git import GitTunnelWrapper
         server = git_server.create()
-        from rhodecode.apps.ssh_support.lib.backends.git import GitTunnelWrapper
 
         os.environ['SSH_CLIENT'] = '127.0.0.1'
         with mock.patch.object(GitTunnelWrapper, 'create_hooks_env') as _patch:
             _patch.return_value = 0
             with mock.patch.object(GitTunnelWrapper, 'command', return_value='date'):
-                exit_code = server.run()
+                exit_code = server.run(tunnel_extras={'config': server.ini_path})
 
         assert exit_code == (0, False)
 
@@ -135,7 +158,7 class TestGitServer(object):
             'action': action,
             'ip': '10.10.10.10',
             'locked_by': [None, None],
-            'config': '',
+            'config': git_server.ini_file,
             'repo_store': store,
             'server_url': None,
             'hooks': ['push', 'pull'],

rhodecode/apps/ssh_support/tests/test_server_hg.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -17,6 +17,7
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
+
 import mock
 import pytest
 
@@ -32,22 +33,27 class MercurialServerCreator(object):
         'app:main': {
             'ssh.executable.hg': hg_path,
             'vcs.hooks.protocol.v2': 'celery',
+            'app.service_api.host': 'http://localhost',
+            'app.service_api.token': 'secret4',
+            'rhodecode.api.url': '/_admin/api',
         }
     }
     repo_name = 'test_hg'
     user = plain_dummy_user()
 
-    def __init__(self):
-        pass
+    def __init__(self, service_api_url, ini_file):
+        self.service_api_url = service_api_url
+        self.ini_file = ini_file
 
     def create(self, **kwargs):
+        self.config_data['app:main']['app.service_api.host'] = self.service_api_url
         parameters = {
             'store': self.root,
-            'ini_path': '',
+            'ini_path': self.ini_file,
             'user': self.user,
             'repo_name': self.repo_name,
             'user_permissions': {
-                'test_hg': 'repository.admin'
+                self.repo_name: 'repository.admin'
             },
             'settings': self.config_data['app:main'],
             'env': plain_dummy_env()
@@ -57,12 +63,30 class MercurialServerCreator(object):
         return server
 
 
[e-mail]()
-def hg_server(app):
-    return MercurialServerCreator()
[e-mail](scope='module')
+def hg_server(request, module_app, rhodecode_factory, available_port_factory):
+    ini_file = module_app._pyramid_settings['__file__']
+    vcsserver_host = module_app._pyramid_settings['vcs.server']
+
+    store_dir = os.path.dirname(ini_file)
+
+    # start rhodecode for service API
+    rc = rhodecode_factory(
+        request,
+        store_dir=store_dir,
+        port=available_port_factory(),
+        overrides=(
+            {'handler_console': {'level': 'DEBUG'}},
+            {'app:main': {'vcs.server': vcsserver_host}},
+            {'app:main': {'repo_store.path': store_dir}}
+        ))
+
+    service_api_url = f'http://{rc.bind_addr}'
+
+    return MercurialServerCreator(service_api_url, ini_file)
 
 
-class TestMercurialServer(object):
+class TestMercurialServer:
 
     def test_command(self, hg_server, tmpdir):
         server = hg_server.create()
@@ -107,7 +131,7 class TestMercurialServer(object):
         with mock.patch.object(MercurialTunnelWrapper, 'create_hooks_env') as _patch:
             _patch.return_value = 0
             with mock.patch.object(MercurialTunnelWrapper, 'command', return_value='date'):
-                exit_code = server.run()
+                exit_code = server.run(tunnel_extras={'config': server.ini_path})
 
         assert exit_code == (0, False)
 

rhodecode/apps/ssh_support/tests/test_server_svn.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -15,7 +15,9
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
+
 import os
+
 import mock
 import pytest
 
@@ -26,39 +28,62 from rhodecode.apps.ssh_support.tests.co
 class SubversionServerCreator(object):
     root = '/tmp/repo/path/'
     svn_path = '/usr/local/bin/svnserve'
+
     config_data = {
         'app:main': {
             'ssh.executable.svn': svn_path,
             'vcs.hooks.protocol.v2': 'celery',
+            'app.service_api.host': 'http://localhost',
+            'app.service_api.token': 'secret4',
+            'rhodecode.api.url': '/_admin/api',
         }
     }
     repo_name = 'test-svn'
     user = plain_dummy_user()
 
-    def __init__(self):
-        pass
+    def __init__(self, service_api_url, ini_file):
+        self.service_api_url = service_api_url
+        self.ini_file = ini_file
 
     def create(self, **kwargs):
+        self.config_data['app:main']['app.service_api.host'] = self.service_api_url
         parameters = {
             'store': self.root,
+            'ini_path': self.ini_file,
+            'user': self.user,
             'repo_name': self.repo_name,
-            'ini_path': '',
-            'user': self.user,
             'user_permissions': {
                 self.repo_name: 'repository.admin'
             },
             'settings': self.config_data['app:main'],
             'env': plain_dummy_env()
         }
-
         parameters.update(kwargs)
         server = SubversionServer(**parameters)
         return server
 
 
[e-mail]()
-def svn_server(app):
-    return SubversionServerCreator()
[e-mail](scope='module')
+def svn_server(request, module_app, rhodecode_factory, available_port_factory):
+    ini_file = module_app._pyramid_settings['__file__']
+    vcsserver_host = module_app._pyramid_settings['vcs.server']
+
+    store_dir = os.path.dirname(ini_file)
+
+    # start rhodecode for service API
+    rc = rhodecode_factory(
+        request,
+        store_dir=store_dir,
+        port=available_port_factory(),
+        overrides=(
+            {'handler_console': {'level': 'DEBUG'}},
+            {'app:main': {'vcs.server': vcsserver_host}},
+            {'app:main': {'repo_store.path': store_dir}}
+        ))
+
+    service_api_url = f'http://{rc.bind_addr}'
+
+    return SubversionServerCreator(service_api_url, ini_file)
 
 
 class TestSubversionServer(object):
@@ -168,8 +193,9 class TestSubversionServer(object):
             assert repo_name == expected_match
 
     def test_run_returns_executes_command(self, svn_server):
+        from rhodecode.apps.ssh_support.lib.backends.svn import SubversionTunnelWrapper
+
         server = svn_server.create()
-        from rhodecode.apps.ssh_support.lib.backends.svn import SubversionTunnelWrapper
         os.environ['SSH_CLIENT'] = '127.0.0.1'
         with mock.patch.object(
                 SubversionTunnelWrapper, 'get_first_client_response',
@@ -184,20 +210,18 class TestSubversionServer(object):
                             SubversionTunnelWrapper, 'command',
                             return_value=['date']):
 
-                        exit_code = server.run()
+                        exit_code = server.run(tunnel_extras={'config': server.ini_path})
         # SVN has this differently configured, and we get in our mock env
         # None as return code
         assert exit_code == (None, False)
 
     def test_run_returns_executes_command_that_cannot_extract_repo_name(self, svn_server):
+        from rhodecode.apps.ssh_support.lib.backends.svn import SubversionTunnelWrapper
+
         server = svn_server.create()
-        from rhodecode.apps.ssh_support.lib.backends.svn import SubversionTunnelWrapper
-        with mock.patch.object(
-                SubversionTunnelWrapper, 'command',
-                return_value=['date']):
-            with mock.patch.object(
-                    SubversionTunnelWrapper, 'get_first_client_response',
+        with mock.patch.object(SubversionTunnelWrapper, 'command', return_value=['date']):
+            with mock.patch.object(SubversionTunnelWrapper, 'get_first_client_response',
                     return_value=None):
-                    exit_code = server.run()
+                    exit_code = server.run(tunnel_extras={'config': server.ini_path})
 
         assert exit_code == (1, False)

rhodecode/apps/ssh_support/tests/test_ssh_authorized_keys_gen.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/config_keys.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/events.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/subscribers.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group/tests/test_user_groups.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,7 +22,7 from rhodecode.tests import (
     TestController, assert_session_flash, TEST_USER_ADMIN_LOGIN)
 from rhodecode.model.db import UserGroup
 from rhodecode.model.meta import Session
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/user_group/tests/test_user_groups_permissions.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group/views/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group_profile/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group_profile/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group_profile/tests/test_user_group.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -18,7 +18,7
 from rhodecode.model.user_group import UserGroupModel
 from rhodecode.tests import (
     TestController, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.routes import route_path
 
 fixture = Fixture()

rhodecode/apps/user_group_profile/views.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_profile/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_profile/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_profile/tests/test_users.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,7 +22,7 from rhodecode.model.db import User
 from rhodecode.tests import (
     TestController, TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS,
     TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
-from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.fixtures.rc_fixture import Fixture
 from rhodecode.tests.utils import AssertResponse
 from rhodecode.tests.routes import route_path
 

rhodecode/apps/user_profile/views.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/base.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/interface.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_crowd.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_headers.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_jasig_cas.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_ldap.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_pam.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_rhodecode.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_token.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/registry.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/routes.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/schema.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/tests/conftest.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/tests/functional/test_settings.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/views.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/conf.py

@@ -1,4 +1,4
-# Copyright (C) 2013-2023 RhodeCode GmbH
+# Copyright (C) 2013-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/config_maker.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -122,9 +122,12 def sanitize_settings_and_apply_defaults
     settings_maker.make_setting('vcs.start_server', 'false', parser='bool')
     settings_maker.make_setting('vcs.backends', 'hg, git, svn', parser='list')
     settings_maker.make_setting('vcs.connection_timeout', 3600, parser='int')
-    settings_maker.make_setting('vcs.git.lfs.storage_location', '/var/opt/rhodecode_repo_store/.cache/git_lfs_store')
+    settings_maker.make_setting('vcs.git.lfs.storage_location',
+                                '/var/opt/rhodecode_repo_store/.cache/git_lfs_store',
+                                parser='dir:ensured', default_when_empty=True)
     settings_maker.make_setting('vcs.hg.largefiles.storage_location',
-                                '/var/opt/rhodecode_repo_store/.cache/hg_largefiles_store')
+                                '/var/opt/rhodecode_repo_store/.cache/hg_largefiles_store',
+                                parser='dir:ensured', default_when_empty=True)
 
     settings_maker.make_setting('vcs.methods.cache', True, parser='bool')
 
@@ -162,7 +165,7 def sanitize_settings_and_apply_defaults
     )
 
     # celery
-    broker_url = settings_maker.make_setting('celery.broker_url', 'redis://redis:6379/8')
+    broker_url = settings_maker.make_setting('celery.broker_url', 'redis://redis:6379/8', default_when_empty=True)
     settings_maker.make_setting('celery.result_backend', broker_url)
 
     settings_maker.make_setting('exception_tracker.send_email', False, parser='bool')

rhodecode/config/environment.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -30,7 +30,7 from rhodecode.lib.vcs import connect_vc
 log = logging.getLogger(__name__)
 
 
-def propagate_rhodecode_config(global_config, settings, config):
+def propagate_rhodecode_config(global_config, settings, config, full=True):
     # Store the settings to make them available to other modules.
     settings_merged = global_config.copy()
     settings_merged.update(settings)
@@ -40,7 +40,7 def propagate_rhodecode_config(global_co
     rhodecode.PYRAMID_SETTINGS = settings_merged
     rhodecode.CONFIG = settings_merged
 
-    if 'default_user_id' not in rhodecode.CONFIG:
+    if full and 'default_user_id' not in rhodecode.CONFIG:
         rhodecode.CONFIG['default_user_id'] = utils.get_default_user_id()
     log.debug('set rhodecode.CONFIG data')
 
@@ -93,6 +93,7 def load_pyramid_environment(global_conf
     # first run, to store data...
     propagate_rhodecode_config(global_config, settings, {})
 
+
     if vcs_server_enabled:
         connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings))
     else:

rhodecode/config/jsroutes.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/middleware.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -49,7 +49,7 from rhodecode.lib.plugins.utils import
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.lib.exc_tracking import store_exception, format_exc
 from rhodecode.subscribers import (
-    scan_repositories_if_enabled, write_js_routes_if_enabled,
+    auto_merge_pr_if_needed, scan_repositories_if_enabled, write_js_routes_if_enabled,
     write_metadata_if_needed, write_usage_data, import_license_if_present)
 from rhodecode.lib.statsd_client import StatsdClient
 
@@ -101,6 +101,9 def make_pyramid_app(global_config, **se
     patches.inspect_getargspec()
     patches.repoze_sendmail_lf_fix()
 
+    # first init, so load_pyramid_enviroment, can access some critical data, like __file__
+    propagate_rhodecode_config(global_config, {}, {}, full=False)
+
     load_pyramid_environment(global_config, settings)
 
     # Static file view comes first
@@ -392,6 +395,7 def includeme(config, auth_resources=Non
     # Add subscribers.
     if load_all:
         log.debug('Adding subscribers...')
+        config.add_subscriber(auto_merge_pr_if_needed, rhodecode.events.PullRequestReviewEvent)
         config.add_subscriber(scan_repositories_if_enabled,
                               pyramid.events.ApplicationCreated)
         config.add_subscriber(write_metadata_if_needed,

rhodecode/config/patches.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -17,7 +17,7
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
-rcextensions module, please edit `hooks.py` to over write hooks logic
+rcextensions module, please edit `hooks.py` to over-write hooks logic
 """
 
 from .hooks import (

rhodecode/config/rcextensions/examples/validate_pushed_files_name_and_size.py

@@ -85,7 +85,7 def _pre_push_hook(*args, **kwargs):
 
         # check files names
         if forbidden_files:
-            reason = 'File {} is forbidden to be pushed'.format(file_name)
+            reason = f'File {file_name} is forbidden to be pushed'
             for forbidden_pattern in forbid_files:
                 # here we can also filter for operation, e.g if check for only ADDED files
                 # if operation == 'A':

rhodecode/config/rcextensions/helpers/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/helpers/extra_fields.py

@@ -1,5 +1,4
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -55,7 +54,7 def run(*args, **kwargs):
     return fields
 
 
-class _Undefined(object):
+class _Undefined:
     pass
 
 
@@ -67,7 +66,7 def get_field(extra_fields_data, key, de
 
     if key not in extra_fields_data:
         if isinstance(default, _Undefined):
-            raise ValueError('key {} not present in extra_fields'.format(key))
+            raise ValueError(f'key {key} not present in extra_fields')
         return default
 
     # NOTE(dan): from metadata we get field_label, field_value, field_desc, field_type

rhodecode/config/rcextensions/helpers/extract_post_commits.py

@@ -1,5 +1,4
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/helpers/extract_pre_commits.py

@@ -1,5 +1,4
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -52,7 +51,7 def get_git_commits(repo, refs):
         cmd = [
             'log',
             '--pretty=format:{"commit_id": "%H",  "author": "%aN <%aE>",  "date": "%ad",  "message": "%s"}',
-            '{}...{}'.format(old_rev, new_rev)
+            f'{old_rev}...{new_rev}'
         ]
 
         stdout, stderr = repo.run_git_command(cmd, extra_env=git_env)
@@ -80,12 +79,12 def run(*args, **kwargs):
 
     if vcs_type == 'git':
         for rev_data in kwargs['commit_ids']:
-            new_environ = dict((k, v) for k, v in rev_data['git_env'])
+            new_environ = {k: v for k, v in rev_data['git_env']}
         commits = get_git_commits(vcs_repo, kwargs['commit_ids'])
 
     if vcs_type == 'hg':
         for rev_data in kwargs['commit_ids']:
-            new_environ = dict((k, v) for k, v in rev_data['hg_env'])
+            new_environ = {k: v for k, v in rev_data['hg_env']}
         commits = get_hg_commits(vcs_repo, kwargs['commit_ids'])
 
     return commits

rhodecode/config/rcextensions/helpers/extract_pre_files.py

@@ -1,5 +1,4
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -133,12 +132,12 def run(*args, **kwargs):
 
     if vcs_type == 'git':
         for rev_data in kwargs['commit_ids']:
-            new_environ = dict((k, v) for k, v in rev_data['git_env'])
+            new_environ = {k: v for k, v in rev_data['git_env']}
         files = get_git_files(repo, vcs_repo, kwargs['commit_ids'])
 
     if vcs_type == 'hg':
         for rev_data in kwargs['commit_ids']:
-            new_environ = dict((k, v) for k, v in rev_data['hg_env'])
+            new_environ = {k: v for k, v in rev_data['hg_env']}
         files = get_hg_files(repo, vcs_repo, kwargs['commit_ids'])
 
     if vcs_type == 'svn':

rhodecode/config/rcextensions/helpers/http_call.py

@@ -1,5 +1,4
-
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/hooks.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -28,7 +28,7 import urllib.error
 log = logging.getLogger('rhodecode.' + __name__)
 
 
-class HookResponse(object):
+class HookResponse:
     def __init__(self, status, output):
         self.status = status
         self.output = output
@@ -44,6 +44,11 class HookResponse(object):
     def __bool__(self):
         return self.status == 0
 
+    def to_json(self):
+        return {'status': self.status, 'output': self.output}
+
+    def __repr__(self):
+        return self.to_json().__repr__()
 
 class DotDict(dict):
 
@@ -91,8 +96,8 class DotDict(dict):
     def __repr__(self):
         keys = list(self.keys())
         keys.sort()
-        args = ', '.join(['%s=%r' % (key, self[key]) for key in keys])
-        return '%s(%s)' % (self.__class__.__name__, args)
+        args = ', '.join(['{}={!r}'.format(key, self[key]) for key in keys])
+        return '{}({})'.format(self.__class__.__name__, args)
 
     @staticmethod
     def fromDict(d):
@@ -110,7 +115,7 def serialize(x):
 
 def unserialize(x):
     if isinstance(x, dict):
-        return dict((k, unserialize(v)) for k, v in x.items())
+        return {k: unserialize(v) for k, v in x.items()}
     elif isinstance(x, (list, tuple)):
         return type(x)(unserialize(v) for v in x)
     else:
@@ -161,7 +166,8 def str2bool(_str) -> bool:
     string into boolean
 
     :param _str: string value to translate into boolean
-    :returns: bool from given string
+    :rtype: boolean
+    :returns: boolean from given string
     """
     if _str is None:
         return False

rhodecode/config/routing_links.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -49,22 +48,22 link_config = [
     {
         "name": "enterprise_docs",
         "target": "https://rhodecode.com/r1/enterprise/docs/",
-        "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/",
+        "external_target": "https://docs.rhodecode.com/4.x/rce/index.html",
     },
     {
         "name": "enterprise_log_file_locations",
         "target": "https://rhodecode.com/r1/enterprise/docs/admin-system-overview/",
-        "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/admin/system-overview.html#log-files",
+        "external_target": "https://docs.rhodecode.com/4.x/rce/admin/system-overview.html#log-files",
     },
     {
         "name": "enterprise_issue_tracker_settings",
         "target": "https://rhodecode.com/r1/enterprise/docs/issue-trackers-overview/",
-        "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/issue-trackers/issue-trackers.html",
+        "external_target": "https://docs.rhodecode.com/4.x/rce/issue-trackers/issue-trackers.html",
     },
     {
         "name": "enterprise_svn_setup",
         "target": "https://rhodecode.com/r1/enterprise/docs/svn-setup/",
-        "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/admin/svn-http.html",
+        "external_target": "https://docs.rhodecode.com/4.x/rce/admin/svn-http.html",
     },
     {
         "name": "enterprise_license_convert_from_old",

rhodecode/config/settings_maker.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -19,6 +19,8
 import os
 import platform
 
+from rhodecode.lib.type_utils import str2bool
+
 DEFAULT_USER = 'default'
 
 
@@ -37,7 +39,6 def configure_vcs(config):
 
     conf.settings.HOOKS_PROTOCOL = config['vcs.hooks.protocol.v2']
     conf.settings.HOOKS_HOST = config['vcs.hooks.host']
-    conf.settings.DEFAULT_ENCODINGS = config['default_encoding']
     conf.settings.ALIASES[:] = config['vcs.backends']
     conf.settings.SVN_COMPATIBLE_VERSION = config['vcs.svn.compatible_version']
 
@@ -48,28 +49,23 def initialize_database(config):
     engine = engine_from_config(config, 'sqlalchemy.db1.')
     init_model(engine, encryption_key=get_encryption_key(config))
 
+def initialize_test_environment(settings):
+    skip_test_env = str2bool(os.environ.get('RC_NO_TEST_ENV'))
+    if skip_test_env:
+        return
 
-def initialize_test_environment(settings, test_env=None):
-    if test_env is None:
-        test_env = not int(os.environ.get('RC_NO_TMP_PATH', 0))
+    repo_store_path = os.environ.get('RC_TEST_ENV_REPO_STORE') or settings['repo_store.path']
 
     from rhodecode.lib.utils import (
         create_test_directory, create_test_database, create_test_repositories,
         create_test_index)
-    from rhodecode.tests import TESTS_TMP_PATH
-    from rhodecode.lib.vcs.backends.hg import largefiles_store
-    from rhodecode.lib.vcs.backends.git import lfs_store
 
+    create_test_directory(repo_store_path)
+
+    create_test_database(repo_store_path, settings)
     # test repos
-    if test_env:
-        create_test_directory(TESTS_TMP_PATH)
-        # large object stores
-        create_test_directory(largefiles_store(TESTS_TMP_PATH))
-        create_test_directory(lfs_store(TESTS_TMP_PATH))
-
-        create_test_database(TESTS_TMP_PATH, settings)
-        create_test_repositories(TESTS_TMP_PATH, settings)
-        create_test_index(TESTS_TMP_PATH, settings)
+    create_test_repositories(repo_store_path, settings)
+    create_test_index(repo_store_path, settings)
 
 
 def get_vcs_server_protocol(config):

rhodecode/events/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -18,13 +18,10
 
 import logging
 
-from rhodecode.events.base import (
-    RhodeCodeIntegrationEvent,
-    RhodecodeEvent
-)
+from rhodecode.events.base import RhodeCodeIntegrationEvent, RhodecodeEvent
 
 from rhodecode.events.base import (  # pragma: no cover
-    FtsBuild
+    FtsBuild,
 )
 
 from rhodecode.events.user import (  # pragma: no cover
@@ -37,11 +34,16 from rhodecode.events.user import ( # p
 
 from rhodecode.events.repo import (  # pragma: no cover
     RepoEvent,
-    RepoCommitCommentEvent, RepoCommitCommentEditEvent,
-    RepoPreCreateEvent, RepoCreateEvent,
-    RepoPreDeleteEvent, RepoDeleteEvent,
-    RepoPrePushEvent,   RepoPushEvent,
-    RepoPrePullEvent,   RepoPullEvent,
+    RepoCommitCommentEvent,
+    RepoCommitCommentEditEvent,
+    RepoPreCreateEvent,
+    RepoCreateEvent,
+    RepoPreDeleteEvent,
+    RepoDeleteEvent,
+    RepoPrePushEvent,
+    RepoPushEvent,
+    RepoPrePullEvent,
+    RepoPullEvent,
 )
 
 from rhodecode.events.repo_group import (  # pragma: no cover
@@ -77,12 +79,13 def trigger(event, registry=None):
     from pyramid.threadlocal import get_current_registry
 
     event_name = event.__class__
-    log.debug('event %s sent for execution', event_name)
+    log.debug("event %s sent for execution", event_name)
     registry = registry or get_current_registry()
     registry.notify(event)
-    log.debug('event %s triggered using registry %s', event_name, registry)
+    log.debug("event %s triggered using registry %s", event_name, registry)
 
     # Send the events to integrations directly
     from rhodecode.integrations import integrations_event_handler
+
     if isinstance(event, RhodeCodeIntegrationEvent):
         integrations_event_handler(event)

rhodecode/events/base.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -26,10 +26,7 from rhodecode.lib.utils2 import Attribu
 
 
 # this is a user object to be used for events caused by the system (eg. shell)
-SYSTEM_USER = AttributeDict(dict(
-    username='__SYSTEM__',
-    user_id='__SYSTEM_ID__'
-))
+SYSTEM_USER = AttributeDict(dict(username="__SYSTEM__", user_id="__SYSTEM_ID__"))
 
 log = logging.getLogger(__name__)
 
@@ -38,16 +35,18 class RhodecodeEvent(object):
     """
     Base event class for all RhodeCode events
     """
+
     name = "RhodeCodeEvent"
-    no_url_set = '<no server_url available>'
+    no_url_set = "<no server_url available>"
 
-    def __init__(self, request=None, actor=None):
+    def __init__(self, request=None, actor=None, context=None):
         self._request = request
         self._actor = actor
+        self._context = context
         self.utc_timestamp = datetime.datetime.utcnow()
 
     def __repr__(self):
-        return '<{}:({})>'.format(self.__class__.__name__, self.name)
+        return f"<{self.__class__.__name__}:(name={self.name}, context={self._context})>"
 
     def get_request(self):
         if self._request:
@@ -63,11 +62,11 class RhodecodeEvent(object):
         if not self.request:
             return
 
-        user = getattr(self.request, 'user', None)
+        user = getattr(self.request, "user", None)
         if user:
             return user
 
-        api_user = getattr(self.request, 'rpc_user', None)
+        api_user = getattr(self.request, "rpc_user", None)
         if api_user:
             return api_user
 
@@ -80,15 +79,17 class RhodecodeEvent(object):
             return self._actor
 
         auth_user = self.auth_user
-        log.debug('Got integration actor: %s', auth_user)
+        log.debug("Got integration actor: %s", auth_user)
         if isinstance(auth_user, AuthUser):
             instance = auth_user.get_instance()
             # we can't find this DB user...
             if not instance:
-                return AttributeDict(dict(
-                    username=auth_user.username,
-                    user_id=auth_user.user_id,
-                ))
+                return AttributeDict(
+                    dict(
+                        username=auth_user.username,
+                        user_id=auth_user.user_id,
+                    )
+                )
         elif auth_user:
             return auth_user
         return SYSTEM_USER
@@ -98,29 +99,26 class RhodecodeEvent(object):
         auth_user = self.auth_user
         if auth_user:
             return auth_user.ip_addr
-        return '<no ip available>'
+        return "<no ip available>"
 
     @property
     def server_url(self):
         if self.request:
             try:
-                return self.request.route_url('home')
+                return self.request.route_url("home")
             except Exception:
-                log.exception('Failed to fetch URL for server')
+                log.exception("Failed to fetch URL for server")
                 return self.no_url_set
 
         return self.no_url_set
 
     def as_dict(self):
         data = {
-            'name': self.name,
-            'utc_timestamp': self.utc_timestamp,
-            'actor_ip': self.actor_ip,
-            'actor': {
-                'username': self.actor.username,
-                'user_id': self.actor.user_id
-            },
-            'server_url': self.server_url
+            "name": self.name,
+            "utc_timestamp": self.utc_timestamp,
+            "actor_ip": self.actor_ip,
+            "actor": {"username": self.actor.username, "user_id": self.actor.user_id},
+            "server_url": self.server_url,
         }
         return data
 
@@ -129,13 +127,14 class RhodeCodeIntegrationEvent(Rhodecod
     """
     Special subclass for Integration events
     """
-    description = ''
+
+    description = ""
 
 
 class FtsBuild(RhodecodeEvent):
     """
     This event will be triggered when FTS Build is triggered
     """
-    name = 'fts-build'
-    display_name = 'Start FTS Build'
 
+    name = "fts-build"
+    display_name = "Start FTS Build"

rhodecode/events/interfaces.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -24,20 +24,23 class IUserRegistered(Interface):
     An event type that is emitted whenever a new user registers a user
     account.
     """
-    user = Attribute('The user object.')
-    session = Attribute('The session while processing the register form post.')
+
+    user = Attribute("The user object.")
+    session = Attribute("The session while processing the register form post.")
 
 
 class IUserPreCreate(Interface):
     """
     An event type that is emitted before a new user object is created.
     """
-    user_data = Attribute('Data used to create the new user')
+
+    user_data = Attribute("Data used to create the new user")
 
 
 class IUserPreUpdate(Interface):
     """
     An event type that is emitted before a user object is updated.
     """
-    user = Attribute('The not yet updated user object')
-    user_data = Attribute('Data used to update the user')
+
+    user = Attribute("The not yet updated user object")
+    user_data = Attribute("Data used to update the user")

rhodecode/events/pullrequest.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -19,7 +19,7
 import logging
 
 from rhodecode.translation import lazy_ugettext
-from rhodecode.events.repo import (RepoEvent, _commits_as_dict, _issues_as_dict)
+from rhodecode.events.repo import RepoEvent, _commits_as_dict, _issues_as_dict
 
 log = logging.getLogger(__name__)
 
@@ -30,45 +30,44 class PullRequestEvent(RepoEvent):
 
     :param pullrequest: a :class:`PullRequest` instance
     """
-    name = 'pullrequest-event'
-    display_name = lazy_ugettext('pullrequest generic event')
-    description = lazy_ugettext('All events within a context of a pull request')
+
+    name = "pullrequest-event"
+    display_name = lazy_ugettext("pullrequest generic event")
+    description = lazy_ugettext("All events within a context of a pull request")
 
-    def __init__(self, pullrequest):
-        super().__init__(pullrequest.target_repo)
+    def __init__(self, pullrequest, context=None):
+        super().__init__(pullrequest.target_repo, context=context)
         self.pullrequest = pullrequest
+        self.context = self._context
 
     def as_dict(self):
         from rhodecode.lib.utils2 import md5_safe
         from rhodecode.model.pull_request import PullRequestModel
+
         data = super().as_dict()
 
-        commits = _commits_as_dict(
-            self,
-            commit_ids=self.pullrequest.revisions,
-            repos=[self.pullrequest.source_repo]
-        )
+        commits = _commits_as_dict(self, commit_ids=self.pullrequest.revisions, repos=[self.pullrequest.source_repo])
         issues = _issues_as_dict(commits)
         # calculate hashes of all commits for unique identifier of commits
         # inside that pull request
-        commits_hash = md5_safe(':'.join(x.get('raw_id', '') for x in commits))
+        commits_hash = md5_safe(":".join(x.get("raw_id", "") for x in commits))
 
-        data.update({
-            'pullrequest': {
-                'title': self.pullrequest.title,
-                'issues': issues,
-                'pull_request_id': self.pullrequest.pull_request_id,
-                'url': PullRequestModel().get_url(
-                    self.pullrequest, request=self.request),
-                'permalink_url': PullRequestModel().get_url(
-                    self.pullrequest, request=self.request, permalink=True),
-                'shadow_url': PullRequestModel().get_shadow_clone_url(
-                    self.pullrequest, request=self.request),
-                'status': self.pullrequest.calculated_review_status(),
-                'commits_uid': commits_hash,
-                'commits': commits,
+        data.update(
+            {
+                "pullrequest": {
+                    "title": self.pullrequest.title,
+                    "issues": issues,
+                    "pull_request_id": self.pullrequest.pull_request_id,
+                    "url": PullRequestModel().get_url(self.pullrequest, request=self.request),
+                    "permalink_url": PullRequestModel().get_url(self.pullrequest, request=self.request, permalink=True),
+                    "shadow_url": PullRequestModel().get_shadow_clone_url(self.pullrequest, request=self.request),
+                    "status": self.pullrequest.calculated_review_status(),
+                    "commits_uid": commits_hash,
+                    "commits": commits,
+                },
+                "context": self.context,
             }
-        })
+        )
         return data
 
 
@@ -77,9 +76,10 class PullRequestCreateEvent(PullRequest
     An instance of this class is emitted as an :term:`event` after a pull
     request is created.
     """
-    name = 'pullrequest-create'
-    display_name = lazy_ugettext('pullrequest created')
-    description = lazy_ugettext('Event triggered after pull request was created')
+
+    name = "pullrequest-create"
+    display_name = lazy_ugettext("pullrequest created")
+    description = lazy_ugettext("Event triggered after pull request was created")
 
 
 class PullRequestCloseEvent(PullRequestEvent):
@@ -87,9 +87,10 class PullRequestCloseEvent(PullRequestE
     An instance of this class is emitted as an :term:`event` after a pull
     request is closed.
     """
-    name = 'pullrequest-close'
-    display_name = lazy_ugettext('pullrequest closed')
-    description = lazy_ugettext('Event triggered after pull request was closed')
+
+    name = "pullrequest-close"
+    display_name = lazy_ugettext("pullrequest closed")
+    description = lazy_ugettext("Event triggered after pull request was closed")
 
 
 class PullRequestUpdateEvent(PullRequestEvent):
@@ -97,9 +98,10 class PullRequestUpdateEvent(PullRequest
     An instance of this class is emitted as an :term:`event` after a pull
     request's commits have been updated.
     """
-    name = 'pullrequest-update'
-    display_name = lazy_ugettext('pullrequest commits updated')
-    description = lazy_ugettext('Event triggered after pull requests was updated')
+
+    name = "pullrequest-update"
+    display_name = lazy_ugettext("pullrequest commits updated")
+    description = lazy_ugettext("Event triggered after pull requests was updated")
 
 
 class PullRequestReviewEvent(PullRequestEvent):
@@ -107,13 +109,13 class PullRequestReviewEvent(PullRequest
     An instance of this class is emitted as an :term:`event` after a pull
     request review has changed. A status defines new status of review.
     """
-    name = 'pullrequest-review'
-    display_name = lazy_ugettext('pullrequest review changed')
-    description = lazy_ugettext('Event triggered after a review status of a '
-                                'pull requests has changed to other.')
 
-    def __init__(self, pullrequest, status):
-        super().__init__(pullrequest)
+    name = "pullrequest-review"
+    display_name = lazy_ugettext("pullrequest review changed")
+    description = lazy_ugettext("Event triggered after a review status of a pull requests has changed to other.")
+
+    def __init__(self, pullrequest, status, context=None):
+        super().__init__(pullrequest, context=context)
         self.status = status
 
 
@@ -122,10 +124,10 class PullRequestMergeEvent(PullRequestE
     An instance of this class is emitted as an :term:`event` after a pull
     request is merged.
     """
-    name = 'pullrequest-merge'
-    display_name = lazy_ugettext('pullrequest merged')
-    description = lazy_ugettext('Event triggered after a successful merge operation '
-                                'was executed on a pull request')
+
+    name = "pullrequest-merge"
+    display_name = lazy_ugettext("pullrequest merged")
+    description = lazy_ugettext("Event triggered after a successful merge operation was executed on a pull request")
 
 
 class PullRequestCommentEvent(PullRequestEvent):
@@ -133,37 +135,39 class PullRequestCommentEvent(PullReques
     An instance of this class is emitted as an :term:`event` after a pull
     request comment is created.
     """
-    name = 'pullrequest-comment'
-    display_name = lazy_ugettext('pullrequest commented')
-    description = lazy_ugettext('Event triggered after a comment was made on a code '
-                                'in the pull request')
 
-    def __init__(self, pullrequest, comment):
-        super().__init__(pullrequest)
+    name = "pullrequest-comment"
+    display_name = lazy_ugettext("pullrequest commented")
+    description = lazy_ugettext("Event triggered after a comment was made on a code in the pull request")
+
+    def __init__(self, pullrequest, comment, context=None):
+        super().__init__(pullrequest, context=context)
         self.comment = comment
 
     def as_dict(self):
         from rhodecode.model.comment import CommentsModel
+
         data = super().as_dict()
 
         status = None
         if self.comment.status_change:
             status = self.comment.review_status
 
-        data.update({
-            'comment': {
-                'status': status,
-                'text': self.comment.text,
-                'type': self.comment.comment_type,
-                'file': self.comment.f_path,
-                'line': self.comment.line_no,
-                'version': self.comment.last_version,
-                'url': CommentsModel().get_url(
-                    self.comment, request=self.request),
-                'permalink_url': CommentsModel().get_url(
-                    self.comment, request=self.request, permalink=True),
+        data.update(
+            {
+                "comment": {
+                    "status": status,
+                    "text": self.comment.text,
+                    "type": self.comment.comment_type,
+                    "file": self.comment.f_path,
+                    "line": self.comment.line_no,
+                    "version": self.comment.last_version,
+                    "url": CommentsModel().get_url(self.comment, request=self.request),
+                    "permalink_url": CommentsModel().get_url(self.comment, request=self.request, permalink=True),
+                },
+                "context": self.context,
             }
-        })
+        )
         return data
 
 
@@ -172,10 +176,10 class PullRequestCommentEditEvent(PullRe
     An instance of this class is emitted as an :term:`event` after a pull
     request comment is edited.
     """
-    name = 'pullrequest-comment-edit'
-    display_name = lazy_ugettext('pullrequest comment edited')
-    description = lazy_ugettext('Event triggered after a comment was edited on a code '
-                                'in the pull request')
+
+    name = "pullrequest-comment-edit"
+    display_name = lazy_ugettext("pullrequest comment edited")
+    description = lazy_ugettext("Event triggered after a comment was edited on a code in the pull request")
 
     def __init__(self, pullrequest, comment):
         super().__init__(pullrequest)
@@ -183,24 +187,26 class PullRequestCommentEditEvent(PullRe
 
     def as_dict(self):
         from rhodecode.model.comment import CommentsModel
+
         data = super().as_dict()
 
         status = None
         if self.comment.status_change:
             status = self.comment.review_status
 
-        data.update({
-            'comment': {
-                'status': status,
-                'text': self.comment.text,
-                'type': self.comment.comment_type,
-                'file': self.comment.f_path,
-                'line': self.comment.line_no,
-                'version': self.comment.last_version,
-                'url': CommentsModel().get_url(
-                    self.comment, request=self.request),
-                'permalink_url': CommentsModel().get_url(
-                    self.comment, request=self.request, permalink=True),
+        data.update(
+            {
+                "comment": {
+                    "status": status,
+                    "text": self.comment.text,
+                    "type": self.comment.comment_type,
+                    "file": self.comment.f_path,
+                    "line": self.comment.line_no,
+                    "version": self.comment.last_version,
+                    "url": CommentsModel().get_url(self.comment, request=self.request),
+                    "permalink_url": CommentsModel().get_url(self.comment, request=self.request, permalink=True),
+                },
+                "context": self.context
             }
-        })
+        )
         return data

rhodecode/events/repo.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -37,12 +37,11 def _commits_as_dict(event, commit_ids,
     :param repos: a list of repos to check
     """
     from rhodecode.lib.utils2 import extract_mentioned_users
-    from rhodecode.lib.helpers import (
-        urlify_commit_message, process_patterns, chop_at_smart)
+    from rhodecode.lib.helpers import urlify_commit_message, process_patterns, chop_at_smart
     from rhodecode.model.repo import RepoModel
 
     if not repos:
-        raise Exception('no repo defined')
+        raise Exception("no repo defined")
 
     if not isinstance(repos, (tuple, list)):
         repos = [repos]
@@ -63,37 +62,31 def _commits_as_dict(event, commit_ids,
         try:
             # use copy of needed_commits since we modify it while iterating
             for commit_id in list(needed_commits):
-                if commit_id.startswith('tag=>'):
+                if commit_id.startswith("tag=>"):
                     raw_id = commit_id[5:]
                     cs_data = {
-                        'raw_id': commit_id, 'short_id': commit_id,
-                        'branch': None,
-                        'git_ref_change': 'tag_add',
-                        'message': f'Added new tag {raw_id}',
-                        'author': event.actor.full_contact,
-                        'date': datetime.datetime.now(),
-                        'refs': {
-                            'branches': [],
-                            'bookmarks': [],
-                            'tags': []
-                        }
+                        "raw_id": commit_id,
+                        "short_id": commit_id,
+                        "branch": None,
+                        "git_ref_change": "tag_add",
+                        "message": f"Added new tag {raw_id}",
+                        "author": event.actor.full_contact,
+                        "date": datetime.datetime.now(),
+                        "refs": {"branches": [], "bookmarks": [], "tags": []},
                     }
                     commits.append(cs_data)
 
-                elif commit_id.startswith('delete_branch=>'):
+                elif commit_id.startswith("delete_branch=>"):
                     raw_id = commit_id[15:]
                     cs_data = {
-                        'raw_id': commit_id, 'short_id': commit_id,
-                        'branch': None,
-                        'git_ref_change': 'branch_delete',
-                        'message': f'Deleted branch {raw_id}',
-                        'author': event.actor.full_contact,
-                        'date': datetime.datetime.now(),
-                        'refs': {
-                            'branches': [],
-                            'bookmarks': [],
-                            'tags': []
-                        }
+                        "raw_id": commit_id,
+                        "short_id": commit_id,
+                        "branch": None,
+                        "git_ref_change": "branch_delete",
+                        "message": f"Deleted branch {raw_id}",
+                        "author": event.actor.full_contact,
+                        "date": datetime.datetime.now(),
+                        "refs": {"branches": [], "bookmarks": [], "tags": []},
                     }
                     commits.append(cs_data)
 
@@ -104,50 +97,45 def _commits_as_dict(event, commit_ids,
                         continue  # maybe its in next repo
 
                     cs_data = cs.__json__()
-                    cs_data['refs'] = cs._get_refs()
+                    cs_data["refs"] = cs._get_refs()
 
-                cs_data['mentions'] = extract_mentioned_users(cs_data['message'])
-                cs_data['reviewers'] = reviewers
-                cs_data['url'] = RepoModel().get_commit_url(
-                    repo, cs_data['raw_id'], request=event.request)
-                cs_data['permalink_url'] = RepoModel().get_commit_url(
-                    repo, cs_data['raw_id'], request=event.request,
-                    permalink=True)
-                urlified_message, issues_data, errors = process_patterns(
-                    cs_data['message'], repo.repo_name)
-                cs_data['issues'] = issues_data
-                cs_data['message_html'] = urlify_commit_message(
-                    cs_data['message'], repo.repo_name)
-                cs_data['message_html_title'] = chop_at_smart(
-                    cs_data['message'], '\n', suffix_if_chopped='...')
+                cs_data["mentions"] = extract_mentioned_users(cs_data["message"])
+                cs_data["reviewers"] = reviewers
+                cs_data["url"] = RepoModel().get_commit_url(repo, cs_data["raw_id"], request=event.request)
+                cs_data["permalink_url"] = RepoModel().get_commit_url(
+                    repo, cs_data["raw_id"], request=event.request, permalink=True
+                )
+                urlified_message, issues_data, errors = process_patterns(cs_data["message"], repo.repo_name)
+                cs_data["issues"] = issues_data
+                cs_data["message_html"] = urlify_commit_message(cs_data["message"], repo.repo_name)
+                cs_data["message_html_title"] = chop_at_smart(cs_data["message"], "\n", suffix_if_chopped="...")
                 commits.append(cs_data)
 
                 needed_commits.remove(commit_id)
 
         except Exception:
-            log.exception('Failed to extract commits data')
+            log.exception("Failed to extract commits data")
             # we don't send any commits when crash happens, only full list
             # matters we short circuit then.
             return []
 
     # we failed to remove all needed_commits from all repositories
     if needed_commits:
-        raise ValueError(f'Unexpectedly not found {needed_commits} in all available repos {repos}')
+        raise ValueError(f"Unexpectedly not found {needed_commits} in all available repos {repos}")
 
-    missing_commits = set(commit_ids) - set(c['raw_id'] for c in commits)
+    missing_commits = set(commit_ids) - set(c["raw_id"] for c in commits)
     if missing_commits:
-        log.error('Inconsistent repository state. '
-                  'Missing commits: %s', ', '.join(missing_commits))
+        log.error("Inconsistent repository state. " "Missing commits: %s", ", ".join(missing_commits))
 
     return commits
 
 
 def _issues_as_dict(commits):
-    """ Helper function to serialize issues from commits """
+    """Helper function to serialize issues from commits"""
     issues = {}
     for commit in commits:
-        for issue in commit['issues']:
-            issues[issue['id']] = issue
+        for issue in commit["issues"]:
+            issues[issue["id"]] = issue
     return issues
 
 
@@ -156,33 +144,36 class RepoEvent(RhodeCodeIntegrationEven
     Base class for events acting on a repository.
     """
 
-    def __init__(self, repo, actor=None):
+    def __init__(self, repo, actor=None, context=None):
         """
         :param repo: a :class:`Repository` instance
         """
-        super().__init__(actor=actor)
+        super().__init__(actor=actor, context=context)
         self.repo = repo
+        self.context = self._context
 
     def as_dict(self):
         from rhodecode.model.repo import RepoModel
+
         data = super().as_dict()
 
         extra_fields = collections.OrderedDict()
         for field in self.repo.extra_fields:
             extra_fields[field.field_key] = field.field_value
 
-        data.update({
-            'repo': {
-                'repo_id': self.repo.repo_id,
-                'repo_name': self.repo.repo_name,
-                'repo_type': self.repo.repo_type,
-                'url': RepoModel().get_url(
-                    self.repo, request=self.request),
-                'permalink_url': RepoModel().get_url(
-                    self.repo, request=self.request, permalink=True),
-                'extra_fields': extra_fields
+        data.update(
+            {
+                "repo": {
+                    "repo_id": self.repo.repo_id,
+                    "repo_name": self.repo.repo_name,
+                    "repo_type": self.repo.repo_type,
+                    "url": RepoModel().get_url(self.repo, request=self.request),
+                    "permalink_url": RepoModel().get_url(self.repo, request=self.request, permalink=True),
+                    "extra_fields": extra_fields,
+                },
+                "context": self.context,
             }
-        })
+        )
         return data
 
 
@@ -192,32 +183,32 class RepoCommitCommentEvent(RepoEvent):
     on repository commit.
     """
 
-    name = 'repo-commit-comment'
-    display_name = lazy_ugettext('repository commit comment')
-    description = lazy_ugettext('Event triggered after a comment was made '
-                                'on commit inside a repository')
+    name = "repo-commit-comment"
+    display_name = lazy_ugettext("repository commit comment")
+    description = lazy_ugettext("Event triggered after a comment was made on commit inside a repository")
 
-    def __init__(self, repo, commit, comment):
-        super().__init__(repo)
+    def __init__(self, repo, commit, comment, context=None):
+        super().__init__(repo, context=context)
         self.commit = commit
         self.comment = comment
 
     def as_dict(self):
         data = super().as_dict()
-        data['commit'] = {
-            'commit_id': self.commit.raw_id,
-            'commit_message': self.commit.message,
-            'commit_branch': self.commit.branch,
+        data["commit"] = {
+            "commit_id": self.commit.raw_id,
+            "commit_message": self.commit.message,
+            "commit_branch": self.commit.branch,
         }
 
-        data['comment'] = {
-            'comment_id': self.comment.comment_id,
-            'comment_text': self.comment.text,
-            'comment_type': self.comment.comment_type,
-            'comment_f_path': self.comment.f_path,
-            'comment_line_no': self.comment.line_no,
-            'comment_version': self.comment.last_version,
+        data["comment"] = {
+            "comment_id": self.comment.comment_id,
+            "comment_text": self.comment.text,
+            "comment_type": self.comment.comment_type,
+            "comment_f_path": self.comment.f_path,
+            "comment_line_no": self.comment.line_no,
+            "comment_version": self.comment.last_version,
         }
+        data["contex"] = self.context
         return data
 
 
@@ -227,32 +218,32 class RepoCommitCommentEditEvent(RepoEve
     on repository commit.
     """
 
-    name = 'repo-commit-edit-comment'
-    display_name = lazy_ugettext('repository commit edit comment')
-    description = lazy_ugettext('Event triggered after a comment was edited '
-                                'on commit inside a repository')
+    name = "repo-commit-edit-comment"
+    display_name = lazy_ugettext("repository commit edit comment")
+    description = lazy_ugettext("Event triggered after a comment was edited on commit inside a repository")
 
-    def __init__(self, repo, commit, comment):
-        super().__init__(repo)
+    def __init__(self, repo, commit, comment, context=None):
+        super().__init__(repo, context=context)
         self.commit = commit
         self.comment = comment
 
     def as_dict(self):
         data = super().as_dict()
-        data['commit'] = {
-            'commit_id': self.commit.raw_id,
-            'commit_message': self.commit.message,
-            'commit_branch': self.commit.branch,
+        data["commit"] = {
+            "commit_id": self.commit.raw_id,
+            "commit_message": self.commit.message,
+            "commit_branch": self.commit.branch,
         }
 
-        data['comment'] = {
-            'comment_id': self.comment.comment_id,
-            'comment_text': self.comment.text,
-            'comment_type': self.comment.comment_type,
-            'comment_f_path': self.comment.f_path,
-            'comment_line_no': self.comment.line_no,
-            'comment_version': self.comment.last_version,
+        data["comment"] = {
+            "comment_id": self.comment.comment_id,
+            "comment_text": self.comment.text,
+            "comment_type": self.comment.comment_type,
+            "comment_f_path": self.comment.f_path,
+            "comment_line_no": self.comment.line_no,
+            "comment_version": self.comment.last_version,
         }
+        data["context"] = "context"
         return data
 
 
@@ -261,9 +252,10 class RepoPreCreateEvent(RepoEvent):
     An instance of this class is emitted as an :term:`event` before a repo is
     created.
     """
-    name = 'repo-pre-create'
-    display_name = lazy_ugettext('repository pre create')
-    description = lazy_ugettext('Event triggered before repository is created')
+
+    name = "repo-pre-create"
+    display_name = lazy_ugettext("repository pre create")
+    description = lazy_ugettext("Event triggered before repository is created")
 
 
 class RepoCreateEvent(RepoEvent):
@@ -271,9 +263,10 class RepoCreateEvent(RepoEvent):
     An instance of this class is emitted as an :term:`event` whenever a repo is
     created.
     """
-    name = 'repo-create'
-    display_name = lazy_ugettext('repository created')
-    description = lazy_ugettext('Event triggered after repository was created')
+
+    name = "repo-create"
+    display_name = lazy_ugettext("repository created")
+    description = lazy_ugettext("Event triggered after repository was created")
 
 
 class RepoPreDeleteEvent(RepoEvent):
@@ -281,9 +274,10 class RepoPreDeleteEvent(RepoEvent):
     An instance of this class is emitted as an :term:`event` whenever a repo is
     created.
     """
-    name = 'repo-pre-delete'
-    display_name = lazy_ugettext('repository pre delete')
-    description = lazy_ugettext('Event triggered before a repository is deleted')
+
+    name = "repo-pre-delete"
+    display_name = lazy_ugettext("repository pre delete")
+    description = lazy_ugettext("Event triggered before a repository is deleted")
 
 
 class RepoDeleteEvent(RepoEvent):
@@ -291,43 +285,45 class RepoDeleteEvent(RepoEvent):
     An instance of this class is emitted as an :term:`event` whenever a repo is
     created.
     """
-    name = 'repo-delete'
-    display_name = lazy_ugettext('repository deleted')
-    description = lazy_ugettext('Event triggered after repository was deleted')
+
+    name = "repo-delete"
+    display_name = lazy_ugettext("repository deleted")
+    description = lazy_ugettext("Event triggered after repository was deleted")
 
 
 class RepoVCSEvent(RepoEvent):
     """
     Base class for events triggered by the VCS
     """
-    name = ''
-    display_name = 'generic_vcs_event'
 
-    def __init__(self, repo_name, extras):
+    name = ""
+    display_name = "generic_vcs_event"
+
+    def __init__(self, repo_name, extras, context=None):
         self.repo = Repository.get_by_repo_name(repo_name)
         if not self.repo:
-            raise Exception(f'repo by this name {repo_name} does not exist')
+            raise Exception(f"repo by this name {repo_name} does not exist")
         self.extras = extras
-        super().__init__(self.repo)
+        super().__init__(self.repo, context=context)
 
     @property
     def actor(self):
-        if self.extras.get('username'):
-            return User.get_by_username(self.extras['username'])
+        if self.extras.get("username"):
+            return User.get_by_username(self.extras["username"])
 
     @property
     def actor_ip(self):
-        if self.extras.get('ip'):
-            return self.extras['ip']
+        if self.extras.get("ip"):
+            return self.extras["ip"]
 
     @property
     def server_url(self):
-        if self.extras.get('server_url'):
-            return self.extras['server_url']
+        if self.extras.get("server_url"):
+            return self.extras["server_url"]
 
     @property
     def request(self):
-        return self.extras.get('request') or self.get_request()
+        return self.extras.get("request") or self.get_request()
 
 
 class RepoPrePullEvent(RepoVCSEvent):
@@ -335,9 +331,10 class RepoPrePullEvent(RepoVCSEvent):
     An instance of this class is emitted as an :term:`event` before commits
     are pulled from a repo.
     """
-    name = 'repo-pre-pull'
-    display_name = lazy_ugettext('repository pre pull')
-    description = lazy_ugettext('Event triggered before repository code is pulled')
+
+    name = "repo-pre-pull"
+    display_name = lazy_ugettext("repository pre pull")
+    description = lazy_ugettext("Event triggered before repository code is pulled")
 
 
 class RepoPullEvent(RepoVCSEvent):
@@ -345,9 +342,10 class RepoPullEvent(RepoVCSEvent):
     An instance of this class is emitted as an :term:`event` after commits
     are pulled from a repo.
     """
-    name = 'repo-pull'
-    display_name = lazy_ugettext('repository pull')
-    description = lazy_ugettext('Event triggered after repository code was pulled')
+
+    name = "repo-pull"
+    display_name = lazy_ugettext("repository pull")
+    description = lazy_ugettext("Event triggered after repository code was pulled")
 
 
 class RepoPrePushEvent(RepoVCSEvent):
@@ -355,10 +353,10 class RepoPrePushEvent(RepoVCSEvent):
     An instance of this class is emitted as an :term:`event` before commits
     are pushed to a repo.
     """
-    name = 'repo-pre-push'
-    display_name = lazy_ugettext('repository pre push')
-    description = lazy_ugettext('Event triggered before the code is '
-                                'pushed to a repository')
+
+    name = "repo-pre-push"
+    display_name = lazy_ugettext("repository pre push")
+    description = lazy_ugettext("Event triggered before the code is pushed to a repository")
 
 
 class RepoPushEvent(RepoVCSEvent):
@@ -368,13 +366,13 class RepoPushEvent(RepoVCSEvent):
 
     :param extras: (optional) dict of data from proxied VCS actions
     """
-    name = 'repo-push'
-    display_name = lazy_ugettext('repository push')
-    description = lazy_ugettext('Event triggered after the code was '
-                                'pushed to a repository')
 
-    def __init__(self, repo_name, pushed_commit_ids, extras):
-        super().__init__(repo_name, extras)
+    name = "repo-push"
+    display_name = lazy_ugettext("repository push")
+    description = lazy_ugettext("Event triggered after the code was pushed to a repository")
+
+    def __init__(self, repo_name, pushed_commit_ids, extras, context=None):
+        super().__init__(repo_name, extras, context=context)
         self.pushed_commit_ids = pushed_commit_ids
         self.new_refs = extras.new_refs
 
@@ -382,63 +380,48 class RepoPushEvent(RepoVCSEvent):
         data = super().as_dict()
 
         def branch_url(branch_name):
-            return '{}/changelog?branch={}'.format(
-                data['repo']['url'], branch_name)
+            return "{}/changelog?branch={}".format(data["repo"]["url"], branch_name)
 
         def tag_url(tag_name):
-            return '{}/files/{}/'.format(
-                data['repo']['url'], tag_name)
+            return "{}/files/{}/".format(data["repo"]["url"], tag_name)
 
-        commits = _commits_as_dict(
-            self, commit_ids=self.pushed_commit_ids, repos=[self.repo])
+        commits = _commits_as_dict(self, commit_ids=self.pushed_commit_ids, repos=[self.repo])
 
         last_branch = None
         for commit in reversed(commits):
-            commit['branch'] = commit['branch'] or last_branch
-            last_branch = commit['branch']
+            commit["branch"] = commit["branch"] or last_branch
+            last_branch = commit["branch"]
         issues = _issues_as_dict(commits)
 
         branches = set()
         tags = set()
         for commit in commits:
-            if commit['refs']['tags']:
-                for tag in commit['refs']['tags']:
+            if commit["refs"]["tags"]:
+                for tag in commit["refs"]["tags"]:
                     tags.add(tag)
-            if commit['branch']:
-                branches.add(commit['branch'])
+            if commit["branch"]:
+                branches.add(commit["branch"])
 
         # maybe we have branches in new_refs ?
         try:
-            branches = branches.union(set(self.new_refs['branches']))
+            branches = branches.union(set(self.new_refs["branches"]))
         except Exception:
             pass
 
-        branches = [
-            {
-                'name': branch,
-                'url': branch_url(branch)
-            }
-            for branch in branches
-        ]
+        branches = [{"name": branch, "url": branch_url(branch)} for branch in branches]
 
         # maybe we have branches in new_refs ?
         try:
-            tags = tags.union(set(self.new_refs['tags']))
+            tags = tags.union(set(self.new_refs["tags"]))
         except Exception:
             pass
 
-        tags = [
-            {
-                'name': tag,
-                'url': tag_url(tag)
-            }
-            for tag in tags
-        ]
+        tags = [{"name": tag, "url": tag_url(tag)} for tag in tags]
 
-        data['push'] = {
-            'commits': commits,
-            'issues': issues,
-            'branches': branches,
-            'tags': tags,
+        data["push"] = {
+            "commits": commits,
+            "issues": issues,
+            "branches": branches,
+            "tags": tags,
         }
         return data

rhodecode/events/repo_group.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -29,27 +29,31 class RepoGroupEvent(RhodeCodeIntegratio
     """
     Base class for events acting on a repository group.
 
-    :param repo: a :class:`RepositoryGroup` instance
+    :param repo_group: a :class:`RepositoryGroup` instance
     """
 
-    def __init__(self, repo_group):
-        super().__init__()
+    def __init__(self, repo_group, context=None):
+        super().__init__(context=context)
         self.repo_group = repo_group
+        self.context = self._context
 
     def as_dict(self):
         data = super().as_dict()
-        data.update({
-            'repo_group': {
-                'group_id': self.repo_group.group_id,
-                'group_name': self.repo_group.group_name,
-                'group_parent_id': self.repo_group.group_parent_id,
-                'group_description': self.repo_group.group_description,
-                'user_id': self.repo_group.user_id,
-                'created_by': self.repo_group.user.username,
-                'created_on': self.repo_group.created_on,
-                'enable_locking': self.repo_group.enable_locking,
+        data.update(
+            {
+                "repo_group": {
+                    "group_id": self.repo_group.group_id,
+                    "group_name": self.repo_group.group_name,
+                    "group_parent_id": self.repo_group.group_parent_id,
+                    "group_description": self.repo_group.group_description,
+                    "user_id": self.repo_group.user_id,
+                    "created_by": self.repo_group.user.username,
+                    "created_on": self.repo_group.created_on,
+                    "enable_locking": self.repo_group.enable_locking,
+                },
+                "context": self.context
             }
-        })
+        )
         return data
 
 
@@ -58,9 +62,10 class RepoGroupCreateEvent(RepoGroupEven
     An instance of this class is emitted as an :term:`event` whenever a
     repository group is created.
     """
-    name = 'repo-group-create'
-    display_name = lazy_ugettext('repository group created')
-    description = lazy_ugettext('Event triggered after a repository group was created')
+
+    name = "repo-group-create"
+    display_name = lazy_ugettext("repository group created")
+    description = lazy_ugettext("Event triggered after a repository group was created")
 
 
 class RepoGroupDeleteEvent(RepoGroupEvent):
@@ -68,9 +73,10 class RepoGroupDeleteEvent(RepoGroupEven
     An instance of this class is emitted as an :term:`event` whenever a
     repository group is deleted.
     """
-    name = 'repo-group-delete'
-    display_name = lazy_ugettext('repository group deleted')
-    description = lazy_ugettext('Event triggered after a repository group was deleted')
+
+    name = "repo-group-delete"
+    display_name = lazy_ugettext("repository group deleted")
+    description = lazy_ugettext("Event triggered after a repository group was deleted")
 
 
 class RepoGroupUpdateEvent(RepoGroupEvent):
@@ -78,6 +84,7 class RepoGroupUpdateEvent(RepoGroupEven
     An instance of this class is emitted as an :term:`event` whenever a
     repository group is updated.
     """
-    name = 'repo-group-update'
-    display_name = lazy_ugettext('repository group update')
-    description = lazy_ugettext('Event triggered after a repository group was updated')
+
+    name = "repo-group-update"
+    display_name = lazy_ugettext("repository group update")
+    description = lazy_ugettext("Event triggered after a repository group was updated")

rhodecode/events/user.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -21,8 +21,7 from zope.interface import implementer
 
 from rhodecode.translation import lazy_ugettext
 from rhodecode.events.base import RhodecodeEvent, RhodeCodeIntegrationEvent
-from rhodecode.events.interfaces import (
-    IUserRegistered, IUserPreCreate, IUserPreUpdate)
+from rhodecode.events.interfaces import IUserRegistered, IUserPreCreate, IUserPreUpdate
 
 log = logging.getLogger(__name__)
 
@@ -33,8 +32,9 class UserRegistered(RhodeCodeIntegratio
     An instance of this class is emitted as an :term:`event` whenever a user
     account is registered.
     """
-    name = 'user-register'
-    display_name = lazy_ugettext('user registered')
+
+    name = "user-register"
+    display_name = lazy_ugettext("user registered")
 
     def __init__(self, user, session):
         super().__init__()
@@ -48,8 +48,9 class UserPreCreate(RhodeCodeIntegration
     An instance of this class is emitted as an :term:`event` before a new user
     object is created.
     """
-    name = 'user-pre-create'
-    display_name = lazy_ugettext('user pre create')
+
+    name = "user-pre-create"
+    display_name = lazy_ugettext("user pre create")
 
     def __init__(self, user_data):
         super().__init__()
@@ -62,8 +63,9 class UserPostCreate(RhodeCodeIntegratio
     An instance of this class is emitted as an :term:`event` after a new user
     object is created.
     """
-    name = 'user-post-create'
-    display_name = lazy_ugettext('user post create')
+
+    name = "user-post-create"
+    display_name = lazy_ugettext("user post create")
 
     def __init__(self, user_data):
         super().__init__()
@@ -76,8 +78,9 class UserPreUpdate(RhodeCodeIntegration
     An instance of this class is emitted as an :term:`event` before a user
     object is updated.
     """
-    name = 'user-pre-update'
-    display_name = lazy_ugettext('user pre update')
+
+    name = "user-pre-update"
+    display_name = lazy_ugettext("user pre update")
 
     def __init__(self, user, user_data):
         super().__init__()
@@ -87,8 +90,8 class UserPreUpdate(RhodeCodeIntegration
 
 class UserPermissionsChange(RhodecodeEvent):
     """
-    This event should be triggered on an event that permissions of user might changed.
-    Currently this should be triggered on:
+    This event should be triggered on an event that permissions of user might be changed.
+    Currently, this should be triggered on:
 
       - user added/removed from user group
       - repo permissions changed
@@ -96,9 +99,11 class UserPermissionsChange(RhodecodeEve
       - user group permissions changed
 
     """
-    name = 'user-permissions-change'
-    display_name = lazy_ugettext('user permissions change')
+
+    name = "user-permissions-change"
+    display_name = lazy_ugettext("user permissions change")
 
-    def __init__(self, user_ids):
-        super().__init__()
+    def __init__(self, user_ids, context=None):
+        super().__init__(context=context)
         self.user_ids = user_ids
+        self.context = self._context

rhodecode/forms/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/registry.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/routes.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/schema.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/tests/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/tests/test_integrations.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/base.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/email.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/handlers/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/handlers/slack.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/handlers/webhook.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/slack.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/webhook.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/views.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/_vendor/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/_vendor/authomatic/six.py

@@ -1,7 +1,5
 
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-# Copyright (c) 2010-2015 Benjamin Peterson
+"""Utilities for writing code that runs on Python 2 and 3"""# Copyright (C) 2010-2015 Benjamin Peterson
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

rhodecode/lib/action_parser.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/api_utils.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/audit_logger.py

@@ -1,4 +1,4
-# Copyright (C) 2017-2023 RhodeCode GmbH
+# Copyright (C) 2017-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/auth.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/base.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/caching_query.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/celerylib/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/celerylib/loader.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/celerylib/scheduler.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/celerylib/utils.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/channelstream.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/codeblocks.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -478,7 +478,9 class DiffSet(object):
         log.debug('rendering diff for %r', patch['filename'])
 
         source_filename = patch['original_filename']
+        source_filename_bytes = patch['original_filename_bytes']
         target_filename = patch['filename']
+        target_filename_bytes = patch['filename_bytes']
 
         source_lexer = plain_text_lexer
         target_lexer = plain_text_lexer
@@ -491,12 +493,12 class DiffSet(object):
                 if (source_filename and patch['operation'] in ('D', 'M')
                     and source_filename not in self.source_nodes):
                         self.source_nodes[source_filename] = (
-                            self.source_node_getter(source_filename))
+                            self.source_node_getter(source_filename_bytes))
 
                 if (target_filename and patch['operation'] in ('A', 'M')
                     and target_filename not in self.target_nodes):
                         self.target_nodes[target_filename] = (
-                            self.target_node_getter(target_filename))
+                            self.target_node_getter(target_filename_bytes))
 
             elif hl_mode == self.HL_FAST:
                 source_lexer = self._get_lexer_for_filename(source_filename)
@@ -558,6 +560,7 class DiffSet(object):
         })
 
         file_chunks = patch['chunks'][1:]
+
         for i, hunk in enumerate(file_chunks, 1):
             hunkbit = self.parse_hunk(hunk, source_file, target_file)
             hunkbit.source_file_path = source_file_path
@@ -593,12 +596,13 class DiffSet(object):
         return filediff
 
     def parse_hunk(self, hunk, source_file, target_file):
+
         result = AttributeDict(dict(
             source_start=hunk['source_start'],
             source_length=hunk['source_length'],
             target_start=hunk['target_start'],
             target_length=hunk['target_length'],
-            section_header=hunk['section_header'],
+            section_header=safe_str(hunk['section_header']),
             lines=[],
         ))
         before, after = [], []

rhodecode/lib/colander_utils.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/colored_formatter.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/config_utils.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/datelib.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/db_manage.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -307,7 +307,7 class DbManage(object):
 
     def create_test_admin_and_users(self):
         log.info('creating admin and regular test users')
-        from rhodecode.tests import TEST_USER_ADMIN_LOGIN, \
+        from rhodecode.bootstrap import TEST_USER_ADMIN_LOGIN, \
             TEST_USER_ADMIN_PASS, TEST_USER_ADMIN_EMAIL, \
             TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS, \
             TEST_USER_REGULAR_EMAIL, TEST_USER_REGULAR2_LOGIN, \
@@ -328,8 +328,6 class DbManage(object):
         and disables dotencode
         """
         settings_model = SettingsModel(sa=self.sa)
-        from rhodecode.lib.vcs.backends.hg import largefiles_store
-        from rhodecode.lib.vcs.backends.git import lfs_store
 
         # Build HOOKS
         hooks = [
@@ -360,24 +358,6 class DbManage(object):
         largefiles.ui_value = ''
         self.sa.add(largefiles)
 
-        # set default largefiles cache dir, defaults to
-        # /repo_store_location/.cache/largefiles
-        largefiles = RhodeCodeUi()
-        largefiles.ui_section = 'largefiles'
-        largefiles.ui_key = 'usercache'
-        largefiles.ui_value = largefiles_store(repo_store_path)
-
-        self.sa.add(largefiles)
-
-        # set default lfs cache dir, defaults to
-        # /repo_store_location/.cache/lfs_store
-        lfsstore = RhodeCodeUi()
-        lfsstore.ui_section = 'vcs_git_lfs'
-        lfsstore.ui_key = 'store_location'
-        lfsstore.ui_value = lfs_store(repo_store_path)
-
-        self.sa.add(lfsstore)
-
         # enable hgevolve disabled by default
         hgevolve = RhodeCodeUi()
         hgevolve.ui_section = 'extensions'

rhodecode/lib/dbmigrate/__init__.py

@@ -1,6 +1,4
-
-
-# Copyright (C) 2012-2023 RhodeCode GmbH
+# Copyright (C) 2012-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/__init__.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_1_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_2_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_3_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_4_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_5_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_5_2.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_6_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_7_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_8_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_0_1.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_0_2.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_1_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_2_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_2_3.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/utils.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/versions/__init__.py

@@ -1,5 +1,4
-
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/diffs.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -455,7 +455,9 class DiffProcessor(object):
             return arg
 
         for chunk in self._diff.chunks():
+            bytes_head = chunk.header
             head = chunk.header_as_str
+
             log.debug('parsing diff chunk %r', chunk)
 
             raw_diff = chunk.raw
@@ -598,10 +600,17 class DiffProcessor(object):
 
             chunks.insert(0, frag)
 
-            original_filename = safe_str(head['a_path'])
+            original_filename = head['a_path']
+            original_filename_bytes = bytes_head['a_path']
+
+            filename = head['b_path']
+            filename_bytes = bytes_head['b_path']
+
             _files.append({
                 'original_filename': original_filename,
-                'filename': safe_str(head['b_path']),
+                'original_filename_bytes': original_filename_bytes,
+                'filename': filename,
+                'filename_bytes': filename_bytes,
                 'old_revision': head['a_blob_id'],
                 'new_revision': head['b_blob_id'],
                 'chunks': chunks,

rhodecode/lib/enc_utils.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/encrypt.py

@@ -1,4 +1,4
-# Copyright (C) 2014-2023 RhodeCode GmbH
+# Copyright (C) 2014-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/exc_tracking.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/exceptions.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,8 +20,7
 Set of custom exceptions used in RhodeCode
 """
 
-from webob.exc import HTTPClientError
-from pyramid.httpexceptions import HTTPBadGateway
+from pyramid.httpexceptions import HTTPBadGateway, HTTPClientError
 
 
 class LdapUsernameError(Exception):
@@ -102,12 +101,7 class HTTPRequirementError(HTTPClientErr
         self.args = (message, )
 
 
-class ClientNotSupportedError(HTTPRequirementError):
-    title = explanation = 'Client Not Supported'
-    reason = None
-
-
-class HTTPLockedRC(HTTPClientError):
+class HTTPLockedRepo(HTTPClientError):
     """
     Special Exception For locked Repos in RhodeCode, the return code can
     be overwritten by _code keyword argument passed into constructors
@@ -131,14 +125,13 class HTTPBranchProtected(HTTPClientErro
     Special Exception For Indicating that branch is protected in RhodeCode, the
     return code can be overwritten by _code keyword argument passed into constructors
     """
-    code = 403
     title = explanation = 'Branch Protected'
     reason = None
 
-    def __init__(self, message, *args, **kwargs):
-        self.title = self.explanation = message
-        super().__init__(*args, **kwargs)
-        self.args = (message, )
+
+class ClientNotSupported(HTTPRequirementError):
+    title = explanation = 'Client Not Supported'
+    reason = None
 
 
 class IMCCommitError(Exception):

rhodecode/lib/ext_json_renderer.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/feedgenerator/__init__.py

@@ -1,4 +1,4
-# Copyright (C) 2016-2023 RhodeCode GmbH
+# Copyright (C) 2016-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/graphmod.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/hash_utils.py

@@ -1,4 +1,4
-# Copyright (C) 2011-2023 RhodeCode GmbH
+# Copyright (C) 2011-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/helpers.py

@@ -1,4 +1,4
-# Copyright (C) 2010-2023 RhodeCode GmbH
+# Copyright (C) 2010-2024 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -51,7 +51,6 from pygments.formatters.html import Htm
 from pygments.lexers import (
     get_lexer_by_name, get_lexer_for_filename, get_lexer_for_mimetype)
 
-from pyramid.threadlocal import get_current_request
 from tempita import looper
 from webhelpers2.html import literal, HTML, escape
 from webhelpers2.html._autolink import _auto_link_urls
@@ -89,6 +88,7 from rhodecode.lib.utils2 import (
     str2bool,
     get_commit_safe, datetime_to_time, time_to_datetime, time_to_utcdatetime,
     AttributeDict, safe_int, md5, md5_safe, get_host_info)
+from rhodecode.lib.pyramid_utils import get_current_request
 from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
 from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
 from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyCommit