Mercurial > kallithea
changeset 8663:a3f649baa016
svn: drop it - hgsubversion doesn't support Python 3 and seems dead upstream
line wrap: on
line diff
--- a/README.rst Wed Oct 24 14:25:37 2018 +0200 +++ b/README.rst Sat Oct 10 13:45:52 2020 +0200 @@ -74,8 +74,8 @@ web interface using simple editor or upload binary files using simple form. - Powerful pull request driven review system with inline commenting, changeset statuses, and notification system. -- Importing and syncing repositories from remote locations for Git_, Mercurial_ - and Subversion. +- Importing and syncing repositories from remote locations for Git_ and + Mercurial_. - Mako templates let you customize the look and feel of the application. - Beautiful diffs, annotations and source code browsing all colored by pygments. Raw diffs are made in Git-diff format for both VCS systems, @@ -175,7 +175,6 @@ .. _Mercurial: http://mercurial.selenic.com/ .. _Bitbucket: http://bitbucket.org/ .. _GitHub: http://github.com/ -.. _Subversion: http://subversion.tigris.org/ .. _Git: http://git-scm.com/ .. _Celery: http://celeryproject.org/ .. _Software Freedom Conservancy: http://sfconservancy.org/
--- a/docs/index.rst Wed Oct 24 14:25:37 2018 +0200 +++ b/docs/index.rst Sat Oct 10 13:45:52 2020 +0200 @@ -81,7 +81,6 @@ .. _python: http://www.python.org/ .. _django: http://www.djangoproject.com/ .. _mercurial: https://www.mercurial-scm.org/ -.. _subversion: http://subversion.tigris.org/ .. _git: http://git-scm.com/ .. _celery: http://celeryproject.org/ .. _Sphinx: http://sphinx.pocoo.org/
--- a/docs/usage/general.rst Wed Oct 24 14:25:37 2018 +0200 +++ b/docs/usage/general.rst Sat Oct 10 13:45:52 2020 +0200 @@ -126,14 +126,6 @@ --------------------------- Kallithea has the ability to clone repositories from given remote locations. -Currently it supports the following options: - -- hg -> hg clone -- svn -> hg clone -- git -> git clone - -.. note:: svn -> hg cloning requires the ``hgsubversion`` library to be - installed. If you need to clone repositories that are protected via basic authentication, you can pass the credentials in the URL, e.g.
--- a/kallithea/controllers/admin/settings.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/controllers/admin/settings.py Sat Oct 10 13:45:52 2020 +0200 @@ -40,7 +40,6 @@ from kallithea.lib.auth import HasPermissionAnyDecorator, LoginRequired from kallithea.lib.base import BaseController, render from kallithea.lib.celerylib import tasks -from kallithea.lib.exceptions import HgsubversionImportError from kallithea.lib.utils import repo2db_mapper, set_app_settings from kallithea.lib.utils2 import safe_str from kallithea.lib.vcs import VCSError @@ -115,15 +114,6 @@ sett = Ui.get_or_create('extensions', 'largefiles') sett.ui_active = form_result['extensions_largefiles'] - sett = Ui.get_or_create('extensions', 'hgsubversion') - sett.ui_active = form_result['extensions_hgsubversion'] - if sett.ui_active: - try: - import hgsubversion # pragma: no cover - assert hgsubversion - except ImportError: - raise HgsubversionImportError - # sett = Ui.get_or_create('extensions', 'hggit') # sett.ui_active = form_result['extensions_hggit'] @@ -131,12 +121,6 @@ h.flash(_('Updated VCS settings'), category='success') - except HgsubversionImportError: - log.error(traceback.format_exc()) - h.flash(_('Unable to activate hgsubversion support. ' - 'The "hgsubversion" library is missing'), - category='error') - except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred while updating '
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -462,13 +462,6 @@ msgid "Updated VCS settings" msgstr "Абноўлены налады VCS" -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" -"Немагчыма ўключыць падтрымку hgsubversion. Бібліятэка hgsubversion " -"адсутнічае" - msgid "Error occurred while updating application settings" msgstr "Памылка пры абнаўленні наладаў праграмы" @@ -944,13 +937,6 @@ msgid "Invalid repository URL" msgstr "Няслушны URL рэпазітара" -msgid "" -"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " -"svn+https URL" -msgstr "" -"Няслушны URL рэпазітара. Ён мусіць быць карэктным URL http, https, ssh, " -"svn+http ці svn+https" - msgid "Fork has to be the same type as parent" msgstr "Тып форка будзе супадаць з бацькоўскім" @@ -1675,9 +1661,6 @@ msgid "Enable largefiles extension" msgstr "Уключыць падтрымку вялікіх файлаў" -msgid "Enable hgsubversion extension" -msgstr "Уключыць падтрымку hgsubversion" - msgid "Location of repositories" msgstr "Месцазнаходжанне рэпазітароў"
--- a/kallithea/i18n/da/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/da/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -495,13 +495,6 @@ msgid "Updated VCS settings" msgstr "Opdateret VCS-indstillinger" -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" -"Ude af stand til at aktivere hgsubversion understøttelse. \"hgsubversion" -"\" biblioteket mangler" - msgid "Error occurred while updating application settings" msgstr "Der opstod en fejl ved opdatering af applikationsindstillinger"
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -486,13 +486,6 @@ msgid "Updated VCS settings" msgstr "VCS-Einstellungen aktualisiert" -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" -"hgsubversion-Unterstützung konnte nicht aktiviert werden. Die " -"\"hgsubversion\"-Bibliothek fehlt" - msgid "Error occurred while updating application settings" msgstr "" "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen " @@ -1021,13 +1014,6 @@ msgid "Invalid repository URL" msgstr "Ungültige Repository-URL" -msgid "" -"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " -"svn+https URL" -msgstr "" -"Ungültige Repository-URL. Es muss eine gültige http, https, ssh, svn+http " -"oder svn+https URL sein" - msgid "Fork has to be the same type as parent" msgstr "Forke um den selben typ wie der Vorgesetze zu haben" @@ -2103,17 +2089,6 @@ msgid "Enable largefiles extension" msgstr "Erweiterung largefiles aktivieren" -msgid "Enable hgsubversion extension" -msgstr "Erweiterung hgsubversion aktivieren" - -msgid "" -"Requires hgsubversion library to be installed. Enables cloning of remote " -"Subversion repositories while converting them to Mercurial." -msgstr "" -"Erfordert die Installation der hgsubversion-Bibliothek. Ermöglicht das " -"Klonen von entfernten Subversion-Repositories während der Konvertierung " -"zu Mercurial." - msgid "Location of repositories" msgstr "Ort der Repositories"
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -540,13 +540,6 @@ msgid "Updated VCS settings" msgstr "Ενημερωμένες ρυθμίσεις VCS" -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" -"Δεν γίνεται να ενεργοποιηθεί υποστήριξη για το hgsubversion. Λείπει η " -"βιβλιοθήκη \"hgsubversion\"" - msgid "Error occurred while updating application settings" msgstr "Παρουσιάστηκε σφάλμα κατά την ενημέρωση των ρυθμίσεων της εφαρμογής" @@ -1131,13 +1124,6 @@ msgid "Invalid repository URL" msgstr "Μη έγκυρη διεύθυνση URL αποθετηρίου" -msgid "" -"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " -"svn+https URL" -msgstr "" -"Μη έγκυρη διεύθυνση URL του αποθετηρίου. Πρέπει να είναι μια έγκυρη http, " -"https, ssh, svn+http ή svn+https διεύθυνση URL" - msgid "You don't have permissions to create repository in this group" msgstr "Δεν έχετε δικαιώματα δημιουργίας αποθετηρίου σε αυτήν την ομάδα" @@ -2260,17 +2246,6 @@ msgid "Enable largefiles extension" msgstr "Ενεργοποίηση επέκτασης μεγάλων αρχείων" -msgid "Enable hgsubversion extension" -msgstr "Ενεργοποίηση επέκτασης hgsubversion" - -msgid "" -"Requires hgsubversion library to be installed. Enables cloning of remote " -"Subversion repositories while converting them to Mercurial." -msgstr "" -"Απαιτεί την εγκατάσταση της βιβλιοθήκης hgsubversion. Ενεργοποιεί την " -"κλωνοποίηση απομακρυσμένων Subversion αποθετηρίων και τη μετατροπή τους " -"σε Mercurial." - msgid "Location of repositories" msgstr "Τοποθεσία αποθετηρίων"
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -549,13 +549,6 @@ msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour" -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" -"Impossible d'activer la prise en charge de hgsubversion. La bibliothèque " -"« hgsubversion » est manquante" - msgid "Error occurred while updating application settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " @@ -1227,13 +1220,6 @@ msgid "Invalid repository URL" msgstr "URL de dépôt invalide" -msgid "" -"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " -"svn+https URL" -msgstr "" -"URL de dépôt invalide. Ce doit être une URL valide de type http, https, " -"ssh, svn+http ou svn+https" - msgid "Fork has to be the same type as parent" msgstr "Le fork doit être du même type que le parent" @@ -2390,16 +2376,6 @@ msgid "Enable largefiles extension" msgstr "Activer l'extension largefiles" -msgid "Enable hgsubversion extension" -msgstr "Activer l'extension hgsubversion" - -msgid "" -"Requires hgsubversion library to be installed. Enables cloning of remote " -"Subversion repositories while converting them to Mercurial." -msgstr "" -"La bibliothèque hgsubversion doit être installée. Elle permet de cloner " -"des dépôts SVN distants et de les migrer vers Mercurial." - msgid "Location of repositories" msgstr "Emplacement des dépôts"
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -435,13 +435,6 @@ msgid "Updated VCS settings" msgstr "VCS設定を更新しました" -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" -"\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に" -"出来ません" - msgid "Error occurred while updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" @@ -1811,16 +1804,6 @@ msgid "Enable largefiles extension" msgstr "largefilesエクステンションを有効にする" -msgid "Enable hgsubversion extension" -msgstr "hgsubversionエクステンションを有効にする" - -msgid "" -"Requires hgsubversion library to be installed. Enables cloning of remote " -"Subversion repositories while converting them to Mercurial." -msgstr "" -"hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリを" -"クローンしてMercurialリポジトリに変換するすることが可能です。" - msgid "Location of repositories" msgstr "リポジトリの場所"
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -1355,9 +1355,6 @@ msgid "Enable largefiles extension" msgstr "Rozszerzenia dużych plików" -msgid "Enable hgsubversion extension" -msgstr "Rozszerzenia hgsubversion" - msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect."
--- a/kallithea/i18n/pt/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/pt/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -1011,9 +1011,6 @@ msgid "Enable largefiles extension" msgstr "Ativar extensão largefiles" -msgid "Enable hgsubversion extension" -msgstr "Ativar extensão hgsubversion" - msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect."
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -1009,9 +1009,6 @@ msgid "Enable largefiles extension" msgstr "Habilitar extensão largefiles" -msgid "Enable hgsubversion extension" -msgstr "Habilitar extensão hgsubversion" - msgid "" "Click to unlock. You must restart Kallithea in order to make this setting " "take effect."
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -527,13 +527,6 @@ msgid "Updated VCS settings" msgstr "Обновлены настройки VCS" -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" -"Невозможно включить поддержку hgsubversion. Библиотека «hgsubversion» " -"отсутствует" - msgid "Error occurred while updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" @@ -1194,13 +1187,6 @@ msgid "Invalid repository URL" msgstr "Недопустимый URL репозитория" -msgid "" -"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " -"svn+https URL" -msgstr "" -"Недопустимый URL репозитория. Требуется корректный http, https, ssh, svn" -"+http или svn+https URL" - msgid "Fork has to be the same type as parent" msgstr "Форк будет иметь тот же тип, что и родительский" @@ -2342,16 +2328,6 @@ msgid "Enable largefiles extension" msgstr "Включить поддержку больших файлов" -msgid "Enable hgsubversion extension" -msgstr "Включить поддержку hgsubversion" - -msgid "" -"Requires hgsubversion library to be installed. Enables cloning of remote " -"Subversion repositories while converting them to Mercurial." -msgstr "" -"Требует наличия библиотеки hgsubversion. Включает клонирование удалённых " -"репозиториев Subversion с последующим конвертированием в Mercurial." - msgid "Location of repositories" msgstr "Местонахождение репозиториев"
--- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Sat Oct 10 13:45:52 2020 +0200 @@ -515,13 +515,6 @@ msgid "Updated VCS settings" msgstr "Оновлені налаштування VCS" -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" -"Не вдається активувати підтримку hgsubversion. Бібліотека \"hgsubversion" -"\" відсутня" - msgid "Error occurred while updating application settings" msgstr "Під час оновлення параметрів застосунку сталася помилка" @@ -1429,16 +1422,6 @@ msgid "Enable largefiles extension" msgstr "Увімкнути розширення largefiles" -msgid "Enable hgsubversion extension" -msgstr "Увімкнути розширення hgsubversion" - -msgid "" -"Requires hgsubversion library to be installed. Enables cloning of remote " -"Subversion repositories while converting them to Mercurial." -msgstr "" -"Потрібна установка бібліотеки hgsubversion. Дозволяє клонувати віддалені " -"сховища Subversion під час перетворення їх у Mercurial." - msgid "Location of repositories" msgstr "Розташування репозиторіїв"
--- a/kallithea/lib/db_manage.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/lib/db_manage.py Sat Oct 10 13:45:52 2020 +0200 @@ -267,7 +267,6 @@ ('hooks', Ui.HOOK_REPO_SIZE, 'python:kallithea.lib.hooks.repo_size', True), ('extensions', 'largefiles', '', True), ('largefiles', 'usercache', os.path.join(repo_root_path, '.cache', 'largefiles'), True), - ('extensions', 'hgsubversion', '', False), ('extensions', 'hggit', '', False), ] for ui_section, ui_key, ui_value, ui_active in ui_config:
--- a/kallithea/lib/exceptions.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/lib/exceptions.py Sat Oct 10 13:45:52 2020 +0200 @@ -74,8 +74,5 @@ pass -class HgsubversionImportError(Exception): - pass - class InvalidCloneUriException(Exception): pass
--- a/kallithea/lib/utils.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/lib/utils.py Sat Oct 10 13:45:52 2020 +0200 @@ -237,12 +237,6 @@ raise InvalidCloneUriException('URI %s URLError: %s' % (url, e)) except mercurial.error.RepoError as e: raise InvalidCloneUriException('Mercurial %s: %s' % (type(e).__name__, safe_str(bytes(e)))) - elif url.startswith('svn+http'): - try: - from hgsubversion.svnrepo import svnremoterepo - except ImportError: - raise InvalidCloneUriException('URI type %s not supported - hgsubversion is not available' % (url,)) - svnremoterepo(ui, url).svn.uuid elif url.startswith('git+http'): raise InvalidCloneUriException('URI type %s not implemented' % (url,)) else: @@ -256,8 +250,6 @@ GitRepository._check_url(url) except urllib.error.URLError as e: raise InvalidCloneUriException('URI %s URLError: %s' % (url, e)) - elif url.startswith('svn+http'): - raise InvalidCloneUriException('URI type %s not implemented' % (url,)) elif url.startswith('hg+http'): raise InvalidCloneUriException('URI type %s not implemented' % (url,)) else:
--- a/kallithea/lib/vcs/backends/base.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/lib/vcs/backends/base.py Sat Oct 10 13:45:52 2020 +0200 @@ -27,7 +27,7 @@ **Attributes** ``DEFAULT_BRANCH_NAME`` - name of default branch (i.e. "trunk" for svn, "master" for git etc. + name of default branch (i.e. "master" for git etc. ``scm`` alias of scm, i.e. *git* or *hg* @@ -324,8 +324,7 @@ ``short_id`` shortened (if apply) version of ``raw_id``; it would be simple - shortcut for ``raw_id[:12]`` for git/mercurial backends or same - as ``raw_id`` for subversion + shortcut for ``raw_id[:12]`` for git/mercurial backends ``revision`` revision number as integer
--- a/kallithea/lib/vcs/backends/hg/repository.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/lib/vcs/backends/hg/repository.py Sat Oct 10 13:45:52 2020 +0200 @@ -335,7 +335,7 @@ # means it cannot be cloned raise urllib.error.URLError("[%s] org_exc: %s" % (cleaned_uri, e)) - if not url_prefix: # skip svn+http://... (and git+... too) + if not url_prefix: # skip git+http://... etc # now check if it's a proper hg repo try: mercurial.httppeer.instance(repoui or mercurial.ui.ui(), url, False).lookup(b'tip')
--- a/kallithea/lib/vcs/nodes.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/lib/vcs/nodes.py Sat Oct 10 13:45:52 2020 +0200 @@ -587,7 +587,7 @@ self.path = name.rstrip('/') self.kind = NodeKind.SUBMODULE self.alias = alias - # we have to use emptyChangeset here since this can point to svn/git/hg + # we have to use emptyChangeset here since this can point to git/hg # submodules we cannot get from repository self.changeset = EmptyChangeset(changeset, alias=alias) self.url = url
--- a/kallithea/model/db.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/model/db.py Sat Oct 10 13:45:52 2020 +0200 @@ -46,8 +46,7 @@ import kallithea from kallithea.lib import ext_json, ssh from kallithea.lib.exceptions import DefaultUserException -from kallithea.lib.utils2 import (asbool, ascii_bytes, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_bytes, safe_int, safe_str, - urlreadable) +from kallithea.lib.utils2 import asbool, ascii_bytes, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_bytes, safe_int, safe_str, urlreadable from kallithea.lib.vcs import get_backend from kallithea.lib.vcs.backends.base import EmptyChangeset from kallithea.lib.vcs.utils.helpers import get_scm
--- a/kallithea/model/forms.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/model/forms.py Sat Oct 10 13:45:52 2020 +0200 @@ -388,7 +388,6 @@ hooks_changegroup_repo_size = v.StringBoolean(if_missing=False) extensions_largefiles = v.StringBoolean(if_missing=False) - extensions_hgsubversion = v.StringBoolean(if_missing=False) extensions_hggit = v.StringBoolean(if_missing=False) return _ApplicationUiSettingsForm
--- a/kallithea/model/validators.py Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/model/validators.py Sat Oct 10 13:45:52 2020 +0200 @@ -400,7 +400,7 @@ messages = { 'clone_uri': _('Invalid repository URL'), 'invalid_clone_uri': _('Invalid repository URL. It must be a ' - 'valid http, https, ssh, svn+http or svn+https URL'), + 'valid http, https, or ssh URL'), } def _validate_python(self, value, state):
--- a/kallithea/templates/admin/settings/settings_vcs.html Wed Oct 24 14:25:37 2018 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Sat Oct 10 13:45:52 2020 +0200 @@ -26,13 +26,6 @@ ${_('Enable largefiles extension')} </label> </div> - <div class="checkbox"> - <label> - ${h.checkbox('extensions_hgsubversion','True')} - ${_('Enable hgsubversion extension')} - </label> - </div> - <span class="help-block">${_('Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial.')}</span> ##<div class="checkbox"> ## <label> ## ${h.checkbox('extensions_hggit','True')}