middleware: fix url_scheme_variable 070b8c39736f accidentally introduced a wrong assumption that url_scheme_variable is a bool. Fix to only check whether it has been set to something non-empty.

middleware: use config consistently in https_fixup 070b8c39736f did for unknown reasons introduce a use of the global kallithea.CONFIG . Instead, consistently use the application config object that has been passed.

html: align formatting of edit_perms templates

html: clarify type of button elements - make it clear if we really want "submit" This might fix some real problems.

usergroup: fix adding permission Clicking "Add new" on /_admin/user_groups/1/edit/perms would flicker the input fields, and then show "User group permissions updated". That turns out to be because HTML button tags default to 'submit' inside forms, and in this place (but not for user or repo group permissions) we didn't specify the button type as 'button'. There might be other similar problems.

repo_groups: fix deletion of subgroups Deletion of a repository group that has a parent group (i.e. is not at the root of the repository group tree) failed as follows: Traceback (most recent call last): [...] File ".../lib/python3.9/site-packages/tg/configurator/components/dispatch.py", line 114, in _call_controller return controller(*remainder, **params) File "<decorator-gen-5>", line 2, in delete File "/home/tdescham/repo/contrib/kallithea/kallithea-release/kallithea/lib/auth.py", line 572, in __wrapper return func(*fargs, **fkwargs) File "/home/tdescham/repo/contrib/kallithea/kallithea-release/kallithea/controllers/admin/repo_groups.py", line 271, in delete if gr.parent_group: File ".../lib/python3.9/site-packages/sqlalchemy/orm/attributes.py", line 294, in __get__ return self.impl.get(instance_state(instance), dict_) File ".../lib/python3.9/site-packages/sqlalchemy/orm/attributes.py", line 730, in get value = self.callable_(state, passive) File ".../lib/python3.9/site-packages/sqlalchemy/orm/strategies.py", line 717, in _load_for_state raise orm_exc.DetachedInstanceError( sqlalchemy.orm.exc.DetachedInstanceError: Parent instance <RepoGroup at 0x7f1f2664f4c0> is not bound to a Session; lazy load operation of attribute 'parent_group' cannot proceed (Background on this error at: http://sqlalche.me/e/13/bhk3) In the reference 'gr.parent_group', 'gr' is an SQLAlchemy object referring to the group being deleted, and 'gr.parent_group' is a lazy reference to its parent group. The 'lazy' means that the parent group object is not loaded automatically when 'gr' is assigned, but instead will be loaded on-the-fly when the parent group is actually accessed. See [1] and [2] for more information. The problem was that the lazy 'parent_group' attribute was accessed _after_ deleting the database object it was part of. Fix this by obtaining a handle to the parent group _before_ deleting the subgroup. Reported-by: André Klitzing (via mailing list) [1] https://docs.sqlalchemy.org/en/13/errors.html#error-bhk3 [2] https://docs.sqlalchemy.org/en/13/orm/loading_relationships.html

tests: merge test_repo_groups.py into test_admin_repo_groups.py Two files testing the same underlying code. As this code is really in the 'admin' section, merge into test_admin_repo_groups.py.

tests: cleanup selective 'base' imports of test_admin_repo_groups.py It is considered cleaner to have more top-level imports rather than selecting specific names.

meta: update copyrights

vcs: use correct name of parameter “reverse” in docstring of get_changesets()

controllers: don’t pass start=0 to BaseRepository.get_changesets() MercurialRepository.get_changesets() can fail if passing start=0 if the revision 0 is not in self.revisions. That can happen if revision 0 is not in the visible subset of the revisions in the repository. Before Kallithea changeset 7c43e15fb8bc7a73f17f577e59a4698589b6809d, it was working by chance because start=0 was treated like start=None in the relevant places (GitRepository.get_changesets still does that). The intention of passing start=0 was seemingly to not limit the start. Therefore passing start=None (or nothing, as it’s the default value) should be correct. I got the following traceback before this change: Traceback (most recent call last): File "~/vcs/kallithea/kallithea/controllers/changelog.py", line 117, in index collection = c.db_repo_scm_instance.get_changesets(start=0, end=revision, File "~/vcs/kallithea/kallithea/lib/vcs/backends/hg/repository.py", line 529, in get_changesets start_pos = None if start is None else self.revisions.index(start_raw_id) ValueError: '4257f758b3eaacaebb6956d1aefc019afab956b8' is not in list

setup: support Mercurial 6.1 for continuously improved Python 3 support

hg: support Mercurial 6.1 without util.url

setup: support Mercurial 5.9 for continuously improved Python 3 support

hg: use mercurial.node.nullid directly - needed for 5.9 mercurial.commands.nullid was removed in d55b71393907.

webutils: monkeypatch to make webhelpers2 work with Python 3.10 Webhelpers2 is apparently a dead project and is using collections.Sequence directly.

setup: support Pytest 6.2 for Python 3.10 support https://github.com/pytest-dev/pytest/issues/8539

setup: support Bleach 4.2 for Python 3.10 support Changelog shows no significant API changes. Bleach 3.2 and later are however even more unreasonably paranoid than 3.1, and the test thus has to be updated and we stop supporting 3.1 .

setup: support FormEncode 2.0.0 for Python 3.10 support Changelog shows no problematic changes.

front-end: update package-lock.json Running "kallithea-cli front-end-build" with npm 7.21.1 gave: npm WARN old lockfile The package-lock.json file was created with an old version of npm, npm WARN old lockfile so supplemental metadata must be fetched from the registry. npm WARN old lockfile npm WARN old lockfile This is a one-time fix-up, please be patient... and modified this file. Let's hope that change is stable.