##// END OF EJS Templates
svn: drop it - hgsubversion doesn't support Python 3 and seems dead upstream
Mads Kiilerich -
r8429:a3f649ba default
parent child Browse files
Show More
@@ -74,8 +74,8 b' Kallithea features'
74 web interface using simple editor or upload binary files using simple form.
74 web interface using simple editor or upload binary files using simple form.
75 - Powerful pull request driven review system with inline commenting, changeset
75 - Powerful pull request driven review system with inline commenting, changeset
76 statuses, and notification system.
76 statuses, and notification system.
77 - Importing and syncing repositories from remote locations for Git_, Mercurial_
77 - Importing and syncing repositories from remote locations for Git_ and
78 and Subversion.
78 Mercurial_.
79 - Mako templates let you customize the look and feel of the application.
79 - Mako templates let you customize the look and feel of the application.
80 - Beautiful diffs, annotations and source code browsing all colored by
80 - Beautiful diffs, annotations and source code browsing all colored by
81 pygments. Raw diffs are made in Git-diff format for both VCS systems,
81 pygments. Raw diffs are made in Git-diff format for both VCS systems,
@@ -175,7 +175,6 b' of Kallithea.'
175 .. _Mercurial: http://mercurial.selenic.com/
175 .. _Mercurial: http://mercurial.selenic.com/
176 .. _Bitbucket: http://bitbucket.org/
176 .. _Bitbucket: http://bitbucket.org/
177 .. _GitHub: http://github.com/
177 .. _GitHub: http://github.com/
178 .. _Subversion: http://subversion.tigris.org/
179 .. _Git: http://git-scm.com/
178 .. _Git: http://git-scm.com/
180 .. _Celery: http://celeryproject.org/
179 .. _Celery: http://celeryproject.org/
181 .. _Software Freedom Conservancy: http://sfconservancy.org/
180 .. _Software Freedom Conservancy: http://sfconservancy.org/
@@ -81,7 +81,6 b' Developer guide'
81 .. _python: http://www.python.org/
81 .. _python: http://www.python.org/
82 .. _django: http://www.djangoproject.com/
82 .. _django: http://www.djangoproject.com/
83 .. _mercurial: https://www.mercurial-scm.org/
83 .. _mercurial: https://www.mercurial-scm.org/
84 .. _subversion: http://subversion.tigris.org/
85 .. _git: http://git-scm.com/
84 .. _git: http://git-scm.com/
86 .. _celery: http://celeryproject.org/
85 .. _celery: http://celeryproject.org/
87 .. _Sphinx: http://sphinx.pocoo.org/
86 .. _Sphinx: http://sphinx.pocoo.org/
@@ -126,14 +126,6 b' Cloning remote repositories'
126 ---------------------------
126 ---------------------------
127
127
128 Kallithea has the ability to clone repositories from given remote locations.
128 Kallithea has the ability to clone repositories from given remote locations.
129 Currently it supports the following options:
130
131 - hg -> hg clone
132 - svn -> hg clone
133 - git -> git clone
134
135 .. note:: svn -> hg cloning requires the ``hgsubversion`` library to be
136 installed.
137
129
138 If you need to clone repositories that are protected via basic authentication,
130 If you need to clone repositories that are protected via basic authentication,
139 you can pass the credentials in the URL, e.g.
131 you can pass the credentials in the URL, e.g.
@@ -40,7 +40,6 b' from kallithea.lib import helpers as h'
40 from kallithea.lib.auth import HasPermissionAnyDecorator, LoginRequired
40 from kallithea.lib.auth import HasPermissionAnyDecorator, LoginRequired
41 from kallithea.lib.base import BaseController, render
41 from kallithea.lib.base import BaseController, render
42 from kallithea.lib.celerylib import tasks
42 from kallithea.lib.celerylib import tasks
43 from kallithea.lib.exceptions import HgsubversionImportError
44 from kallithea.lib.utils import repo2db_mapper, set_app_settings
43 from kallithea.lib.utils import repo2db_mapper, set_app_settings
45 from kallithea.lib.utils2 import safe_str
44 from kallithea.lib.utils2 import safe_str
46 from kallithea.lib.vcs import VCSError
45 from kallithea.lib.vcs import VCSError
@@ -115,15 +114,6 b' class SettingsController(BaseController)'
115 sett = Ui.get_or_create('extensions', 'largefiles')
114 sett = Ui.get_or_create('extensions', 'largefiles')
116 sett.ui_active = form_result['extensions_largefiles']
115 sett.ui_active = form_result['extensions_largefiles']
117
116
118 sett = Ui.get_or_create('extensions', 'hgsubversion')
119 sett.ui_active = form_result['extensions_hgsubversion']
120 if sett.ui_active:
121 try:
122 import hgsubversion # pragma: no cover
123 assert hgsubversion
124 except ImportError:
125 raise HgsubversionImportError
126
127 # sett = Ui.get_or_create('extensions', 'hggit')
117 # sett = Ui.get_or_create('extensions', 'hggit')
128 # sett.ui_active = form_result['extensions_hggit']
118 # sett.ui_active = form_result['extensions_hggit']
129
119
@@ -131,12 +121,6 b' class SettingsController(BaseController)'
131
121
132 h.flash(_('Updated VCS settings'), category='success')
122 h.flash(_('Updated VCS settings'), category='success')
133
123
134 except HgsubversionImportError:
135 log.error(traceback.format_exc())
136 h.flash(_('Unable to activate hgsubversion support. '
137 'The "hgsubversion" library is missing'),
138 category='error')
139
140 except Exception:
124 except Exception:
141 log.error(traceback.format_exc())
125 log.error(traceback.format_exc())
142 h.flash(_('Error occurred while updating '
126 h.flash(_('Error occurred while updating '
@@ -462,13 +462,6 b' msgstr "\xd0\x90\xd0\xb4\xd0\xb1\xd1\x8b\xd0\xbb\xd0\xb0\xd1\x81\xd1\x8f \xd0\xbf\xd0\xb0\xd0\xbc\xd1\x8b\xd0\xbb\xd0\xba\xd0\xb0 \xd0\xbf\xd1\x80\xd1\x8b \xd0\xb2\xd1\x8b\xd0\xb4\xd0\xb0\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xbd\xd1\x96 \xd1\x81\xd1\x82\xd0\xb0\xd1\x82\xd1\x8b\xd1\x81\xd1\x82\xd1\x8b\xd0\xba\xd1\x96 \xd1\x80\xd1\x8d\xd0\xbf\xd0\xb0\xd0\xb7\xd1\x96\xd1\x82\xd0\xb0\xd1\x80\xd0\xb0"'
462 msgid "Updated VCS settings"
462 msgid "Updated VCS settings"
463 msgstr "Абноўлены налады VCS"
463 msgstr "Абноўлены налады VCS"
464
464
465 msgid ""
466 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
467 "missing"
468 msgstr ""
469 "Немагчыма ўключыць падтрымку hgsubversion. Бібліятэка hgsubversion "
470 "адсутнічае"
471
472 msgid "Error occurred while updating application settings"
465 msgid "Error occurred while updating application settings"
473 msgstr "Памылка пры абнаўленні наладаў праграмы"
466 msgstr "Памылка пры абнаўленні наладаў праграмы"
474
467
@@ -944,13 +937,6 b' msgstr "\xd0\x93\xd1\x80\xd1\x83\xd0\xbf\xd0\xb0 \xd1\x80\xd1\x8d\xd0\xbf\xd0\xb0\xd0\xb7\xd1\x96\xd1\x82\xd0\xb0\xd1\x80\xd0\xbe\xd1\x9e \\"%(repo)s\\" \xd1\x83\xd0\xb6\xd0\xbe \xd1\x96\xd1\x81\xd0\xbd\xd1\x83\xd0\xb5"'
944 msgid "Invalid repository URL"
937 msgid "Invalid repository URL"
945 msgstr "Няслушны URL рэпазітара"
938 msgstr "Няслушны URL рэпазітара"
946
939
947 msgid ""
948 "Invalid repository URL. It must be a valid http, https, ssh, svn+http or "
949 "svn+https URL"
950 msgstr ""
951 "Няслушны URL рэпазітара. Ён мусіць быць карэктным URL http, https, ssh, "
952 "svn+http ці svn+https"
953
954 msgid "Fork has to be the same type as parent"
940 msgid "Fork has to be the same type as parent"
955 msgstr "Тып форка будзе супадаць з бацькоўскім"
941 msgstr "Тып форка будзе супадаць з бацькоўскім"
956
942
@@ -1675,9 +1661,6 b' msgstr "\xd0\x9f\xd0\xb0\xd1\x88\xd1\x8b\xd1\x80\xd1\x8d\xd0\xbd\xd0\xbd\xd1\x96 Mercurial"'
1675 msgid "Enable largefiles extension"
1661 msgid "Enable largefiles extension"
1676 msgstr "Уключыць падтрымку вялікіх файлаў"
1662 msgstr "Уключыць падтрымку вялікіх файлаў"
1677
1663
1678 msgid "Enable hgsubversion extension"
1679 msgstr "Уключыць падтрымку hgsubversion"
1680
1681 msgid "Location of repositories"
1664 msgid "Location of repositories"
1682 msgstr "Месцазнаходжанне рэпазітароў"
1665 msgstr "Месцазнаходжанне рэпазітароў"
1683
1666
@@ -495,13 +495,6 b' msgstr "Der opstod en fejl under sletnin'
495 msgid "Updated VCS settings"
495 msgid "Updated VCS settings"
496 msgstr "Opdateret VCS-indstillinger"
496 msgstr "Opdateret VCS-indstillinger"
497
497
498 msgid ""
499 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
500 "missing"
501 msgstr ""
502 "Ude af stand til at aktivere hgsubversion understøttelse. \"hgsubversion"
503 "\" biblioteket mangler"
504
505 msgid "Error occurred while updating application settings"
498 msgid "Error occurred while updating application settings"
506 msgstr "Der opstod en fejl ved opdatering af applikationsindstillinger"
499 msgstr "Der opstod en fejl ved opdatering af applikationsindstillinger"
507
500
@@ -486,13 +486,6 b' msgstr "W\xc3\xa4hrend des l\xc3\xb6schens der Repository Statistiken trat ein Fehler auf"'
486 msgid "Updated VCS settings"
486 msgid "Updated VCS settings"
487 msgstr "VCS-Einstellungen aktualisiert"
487 msgstr "VCS-Einstellungen aktualisiert"
488
488
489 msgid ""
490 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
491 "missing"
492 msgstr ""
493 "hgsubversion-Unterstützung konnte nicht aktiviert werden. Die "
494 "\"hgsubversion\"-Bibliothek fehlt"
495
496 msgid "Error occurred while updating application settings"
489 msgid "Error occurred while updating application settings"
497 msgstr ""
490 msgstr ""
498 "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen "
491 "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen "
@@ -1021,13 +1014,6 b' msgstr "Eine Repositorygruppe mit dem Na'
1021 msgid "Invalid repository URL"
1014 msgid "Invalid repository URL"
1022 msgstr "Ungültige Repository-URL"
1015 msgstr "Ungültige Repository-URL"
1023
1016
1024 msgid ""
1025 "Invalid repository URL. It must be a valid http, https, ssh, svn+http or "
1026 "svn+https URL"
1027 msgstr ""
1028 "Ungültige Repository-URL. Es muss eine gültige http, https, ssh, svn+http "
1029 "oder svn+https URL sein"
1030
1031 msgid "Fork has to be the same type as parent"
1017 msgid "Fork has to be the same type as parent"
1032 msgstr "Forke um den selben typ wie der Vorgesetze zu haben"
1018 msgstr "Forke um den selben typ wie der Vorgesetze zu haben"
1033
1019
@@ -2103,17 +2089,6 b' msgstr "Mercurial-Erweiterungen"'
2103 msgid "Enable largefiles extension"
2089 msgid "Enable largefiles extension"
2104 msgstr "Erweiterung largefiles aktivieren"
2090 msgstr "Erweiterung largefiles aktivieren"
2105
2091
2106 msgid "Enable hgsubversion extension"
2107 msgstr "Erweiterung hgsubversion aktivieren"
2108
2109 msgid ""
2110 "Requires hgsubversion library to be installed. Enables cloning of remote "
2111 "Subversion repositories while converting them to Mercurial."
2112 msgstr ""
2113 "Erfordert die Installation der hgsubversion-Bibliothek. Ermöglicht das "
2114 "Klonen von entfernten Subversion-Repositories während der Konvertierung "
2115 "zu Mercurial."
2116
2117 msgid "Location of repositories"
2092 msgid "Location of repositories"
2118 msgstr "Ort der Repositories"
2093 msgstr "Ort der Repositories"
2119
2094
@@ -540,13 +540,6 b' msgstr ""'
540 msgid "Updated VCS settings"
540 msgid "Updated VCS settings"
541 msgstr "Ενημερωμένες ρυθμίσεις VCS"
541 msgstr "Ενημερωμένες ρυθμίσεις VCS"
542
542
543 msgid ""
544 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
545 "missing"
546 msgstr ""
547 "Δεν γίνεται να ενεργοποιηθεί υποστήριξη για το hgsubversion. Λείπει η "
548 "βιβλιοθήκη \"hgsubversion\""
549
550 msgid "Error occurred while updating application settings"
543 msgid "Error occurred while updating application settings"
551 msgstr "Παρουσιάστηκε σφάλμα κατά την ενημέρωση των ρυθμίσεων της εφαρμογής"
544 msgstr "Παρουσιάστηκε σφάλμα κατά την ενημέρωση των ρυθμίσεων της εφαρμογής"
552
545
@@ -1131,13 +1124,6 b' msgstr "\xce\x97 \xce\xbf\xce\xbc\xce\xac\xce\xb4\xce\xb1 \xce\xb1\xcf\x80\xce\xbf\xce\xb8\xce\xb5\xcf\x84\xce\xb7\xcf\x81\xce\xaf\xce\xbf\xcf\x85 \xce\xbc\xce\xb5 \xcf\x84\xce\xbf \xcf\x8c\xce\xbd\xce\xbf\xce\xbc\xce\xb1 \\"%(repo)s\\" \xcf\x85\xcf\x80\xce\xac\xcf\x81\xcf\x87\xce\xb5\xce\xb9 \xce\xae\xce\xb4\xce\xb7"'
1131 msgid "Invalid repository URL"
1124 msgid "Invalid repository URL"
1132 msgstr "Μη έγκυρη διεύθυνση URL αποθετηρίου"
1125 msgstr "Μη έγκυρη διεύθυνση URL αποθετηρίου"
1133
1126
1134 msgid ""
1135 "Invalid repository URL. It must be a valid http, https, ssh, svn+http or "
1136 "svn+https URL"
1137 msgstr ""
1138 "Μη έγκυρη διεύθυνση URL του αποθετηρίου. Πρέπει να είναι μια έγκυρη http, "
1139 "https, ssh, svn+http ή svn+https διεύθυνση URL"
1140
1141 msgid "You don't have permissions to create repository in this group"
1127 msgid "You don't have permissions to create repository in this group"
1142 msgstr "Δεν έχετε δικαιώματα δημιουργίας αποθετηρίου σε αυτήν την ομάδα"
1128 msgstr "Δεν έχετε δικαιώματα δημιουργίας αποθετηρίου σε αυτήν την ομάδα"
1143
1129
@@ -2260,17 +2246,6 b' msgstr "\xce\x95\xcf\x80\xce\xb5\xce\xba\xcf\x84\xce\xac\xcf\x83\xce\xb5\xce\xb9\xcf\x82 Mercurial"'
2260 msgid "Enable largefiles extension"
2246 msgid "Enable largefiles extension"
2261 msgstr "Ενεργοποίηση επέκτασης μεγάλων αρχείων"
2247 msgstr "Ενεργοποίηση επέκτασης μεγάλων αρχείων"
2262
2248
2263 msgid "Enable hgsubversion extension"
2264 msgstr "Ενεργοποίηση επέκτασης hgsubversion"
2265
2266 msgid ""
2267 "Requires hgsubversion library to be installed. Enables cloning of remote "
2268 "Subversion repositories while converting them to Mercurial."
2269 msgstr ""
2270 "Απαιτεί την εγκατάσταση της βιβλιοθήκης hgsubversion. Ενεργοποιεί την "
2271 "κλωνοποίηση απομακρυσμένων Subversion αποθετηρίων και τη μετατροπή τους "
2272 "σε Mercurial."
2273
2274 msgid "Location of repositories"
2249 msgid "Location of repositories"
2275 msgstr "Τοποθεσία αποθετηρίων"
2250 msgstr "Τοποθεσία αποθετηρίων"
2276
2251
@@ -549,13 +549,6 b' msgstr ""'
549 msgid "Updated VCS settings"
549 msgid "Updated VCS settings"
550 msgstr "Réglages des gestionnaires de versions mis à jour"
550 msgstr "Réglages des gestionnaires de versions mis à jour"
551
551
552 msgid ""
553 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
554 "missing"
555 msgstr ""
556 "Impossible d'activer la prise en charge de hgsubversion. La bibliothèque "
557 "« hgsubversion » est manquante"
558
559 msgid "Error occurred while updating application settings"
552 msgid "Error occurred while updating application settings"
560 msgstr ""
553 msgstr ""
561 "Une erreur est survenue durant la mise à jour des réglages de "
554 "Une erreur est survenue durant la mise à jour des réglages de "
@@ -1227,13 +1220,6 b' msgstr "Un groupe de d\xc3\xa9p\xc3\xb4ts avec le nom \xc2\xab\xe2\x80\xaf%(repo)s\xe2\x80\xaf\xc2\xbb existe d\xc3\xa9j\xc3\xa0"'
1227 msgid "Invalid repository URL"
1220 msgid "Invalid repository URL"
1228 msgstr "URL de dépôt invalide"
1221 msgstr "URL de dépôt invalide"
1229
1222
1230 msgid ""
1231 "Invalid repository URL. It must be a valid http, https, ssh, svn+http or "
1232 "svn+https URL"
1233 msgstr ""
1234 "URL de dépôt invalide. Ce doit être une URL valide de type http, https, "
1235 "ssh, svn+http ou svn+https"
1236
1237 msgid "Fork has to be the same type as parent"
1223 msgid "Fork has to be the same type as parent"
1238 msgstr "Le fork doit être du même type que le parent"
1224 msgstr "Le fork doit être du même type que le parent"
1239
1225
@@ -2390,16 +2376,6 b' msgstr "Extensions Mercurial"'
2390 msgid "Enable largefiles extension"
2376 msgid "Enable largefiles extension"
2391 msgstr "Activer l'extension largefiles"
2377 msgstr "Activer l'extension largefiles"
2392
2378
2393 msgid "Enable hgsubversion extension"
2394 msgstr "Activer l'extension hgsubversion"
2395
2396 msgid ""
2397 "Requires hgsubversion library to be installed. Enables cloning of remote "
2398 "Subversion repositories while converting them to Mercurial."
2399 msgstr ""
2400 "La bibliothèque hgsubversion doit être installée. Elle permet de cloner "
2401 "des dépôts SVN distants et de les migrer vers Mercurial."
2402
2403 msgid "Location of repositories"
2379 msgid "Location of repositories"
2404 msgstr "Emplacement des dépôts"
2380 msgstr "Emplacement des dépôts"
2405
2381
@@ -435,13 +435,6 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\xb9\xe3\x83\x86\xe3\x83\xbc\xe3\x83\x88\xe3\x81\xae\xe5\x89\x8a\xe9\x99\xa4\xe4\xb8\xad\xe3\x81\xab\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc\xe3\x81\x8c\xe7\x99\xba\xe7\x94\x9f\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
435 msgid "Updated VCS settings"
435 msgid "Updated VCS settings"
436 msgstr "VCS設定を更新しました"
436 msgstr "VCS設定を更新しました"
437
437
438 msgid ""
439 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
440 "missing"
441 msgstr ""
442 "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に"
443 "出来ません"
444
445 msgid "Error occurred while updating application settings"
438 msgid "Error occurred while updating application settings"
446 msgstr "アプリケーション設定の更新中にエラーが発生しました"
439 msgstr "アプリケーション設定の更新中にエラーが発生しました"
447
440
@@ -1811,16 +1804,6 b' msgstr "Mercurial\xe3\x82\xa8\xe3\x82\xaf\xe3\x82\xb9\xe3\x83\x86\xe3\x83\xb3\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3"'
1811 msgid "Enable largefiles extension"
1804 msgid "Enable largefiles extension"
1812 msgstr "largefilesエクステンションを有効にする"
1805 msgstr "largefilesエクステンションを有効にする"
1813
1806
1814 msgid "Enable hgsubversion extension"
1815 msgstr "hgsubversionエクステンションを有効にする"
1816
1817 msgid ""
1818 "Requires hgsubversion library to be installed. Enables cloning of remote "
1819 "Subversion repositories while converting them to Mercurial."
1820 msgstr ""
1821 "hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリを"
1822 "クローンしてMercurialリポジトリに変換するすることが可能です。"
1823
1824 msgid "Location of repositories"
1807 msgid "Location of repositories"
1825 msgstr "リポジトリの場所"
1808 msgstr "リポジトリの場所"
1826
1809
@@ -1355,9 +1355,6 b' msgstr "Aktualizacja repozytorium po wys\xc5\x82aniu zmian (aktualizacja hg)"'
1355 msgid "Enable largefiles extension"
1355 msgid "Enable largefiles extension"
1356 msgstr "Rozszerzenia dużych plików"
1356 msgstr "Rozszerzenia dużych plików"
1357
1357
1358 msgid "Enable hgsubversion extension"
1359 msgstr "Rozszerzenia hgsubversion"
1360
1361 msgid ""
1358 msgid ""
1362 "Click to unlock. You must restart Kallithea in order to make this setting "
1359 "Click to unlock. You must restart Kallithea in order to make this setting "
1363 "take effect."
1360 "take effect."
@@ -1011,9 +1011,6 b' msgstr "Atualizar reposit\xc3\xb3rio ap\xc3\xb3s realizar push (hg update)"'
1011 msgid "Enable largefiles extension"
1011 msgid "Enable largefiles extension"
1012 msgstr "Ativar extensão largefiles"
1012 msgstr "Ativar extensão largefiles"
1013
1013
1014 msgid "Enable hgsubversion extension"
1015 msgstr "Ativar extensão hgsubversion"
1016
1017 msgid ""
1014 msgid ""
1018 "Click to unlock. You must restart Kallithea in order to make this setting "
1015 "Click to unlock. You must restart Kallithea in order to make this setting "
1019 "take effect."
1016 "take effect."
@@ -1009,9 +1009,6 b' msgstr "Atualizar reposit\xc3\xb3rio ap\xc3\xb3s realizar push (hg update)"'
1009 msgid "Enable largefiles extension"
1009 msgid "Enable largefiles extension"
1010 msgstr "Habilitar extensão largefiles"
1010 msgstr "Habilitar extensão largefiles"
1011
1011
1012 msgid "Enable hgsubversion extension"
1013 msgstr "Habilitar extensão hgsubversion"
1014
1015 msgid ""
1012 msgid ""
1016 "Click to unlock. You must restart Kallithea in order to make this setting "
1013 "Click to unlock. You must restart Kallithea in order to make this setting "
1017 "take effect."
1014 "take effect."
@@ -527,13 +527,6 b' msgstr "\xd0\x9f\xd1\x80\xd0\xbe\xd0\xb8\xd0\xb7\xd0\xbe\xd1\x88\xd0\xbb\xd0\xb0 \xd0\xbe\xd1\x88\xd0\xb8\xd0\xb1\xd0\xba\xd0\xb0 \xd0\xbf\xd1\x80\xd0\xb8 \xd1\x83\xd0\xb4\xd0\xb0\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb8 \xd1\x81\xd1\x82\xd0\xb0\xd1\x82\xd0\xb8\xd1\x81\xd1\x82\xd0\xb8\xd0\xba\xd0\xb8 \xd1\x80\xd0\xb5\xd0\xbf\xd0\xbe\xd0\xb7\xd0\xb8\xd1\x82\xd0\xbe\xd1\x80\xd0\xb8\xd1\x8f"'
527 msgid "Updated VCS settings"
527 msgid "Updated VCS settings"
528 msgstr "Обновлены настройки VCS"
528 msgstr "Обновлены настройки VCS"
529
529
530 msgid ""
531 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
532 "missing"
533 msgstr ""
534 "Невозможно включить поддержку hgsubversion. Библиотека «hgsubversion» "
535 "отсутствует"
536
537 msgid "Error occurred while updating application settings"
530 msgid "Error occurred while updating application settings"
538 msgstr "Произошла ошибка при обновлении настроек приложения"
531 msgstr "Произошла ошибка при обновлении настроек приложения"
539
532
@@ -1194,13 +1187,6 b' msgstr "\xd0\x93\xd1\x80\xd1\x83\xd0\xbf\xd0\xbf\xd0\xb0 \xd1\x80\xd0\xb5\xd0\xbf\xd0\xbe\xd0\xb7\xd0\xb8\xd1\x82\xd0\xbe\xd1\x80\xd0\xb8\xd0\xb5\xd0\xb2 \\"%(repo)s\\" \xd1\x83\xd0\xb6\xd0\xb5 \xd1\x81\xd1\x83\xd1\x89\xd0\xb5\xd1\x81\xd1\x82\xd0\xb2\xd1\x83\xd0\xb5\xd1\x82"'
1194 msgid "Invalid repository URL"
1187 msgid "Invalid repository URL"
1195 msgstr "Недопустимый URL репозитория"
1188 msgstr "Недопустимый URL репозитория"
1196
1189
1197 msgid ""
1198 "Invalid repository URL. It must be a valid http, https, ssh, svn+http or "
1199 "svn+https URL"
1200 msgstr ""
1201 "Недопустимый URL репозитория. Требуется корректный http, https, ssh, svn"
1202 "+http или svn+https URL"
1203
1204 msgid "Fork has to be the same type as parent"
1190 msgid "Fork has to be the same type as parent"
1205 msgstr "Форк будет иметь тот же тип, что и родительский"
1191 msgstr "Форк будет иметь тот же тип, что и родительский"
1206
1192
@@ -2342,16 +2328,6 b' msgstr "\xd0\xa0\xd0\xb0\xd1\x81\xd1\x88\xd0\xb8\xd1\x80\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x8f Mercurial"'
2342 msgid "Enable largefiles extension"
2328 msgid "Enable largefiles extension"
2343 msgstr "Включить поддержку больших файлов"
2329 msgstr "Включить поддержку больших файлов"
2344
2330
2345 msgid "Enable hgsubversion extension"
2346 msgstr "Включить поддержку hgsubversion"
2347
2348 msgid ""
2349 "Requires hgsubversion library to be installed. Enables cloning of remote "
2350 "Subversion repositories while converting them to Mercurial."
2351 msgstr ""
2352 "Требует наличия библиотеки hgsubversion. Включает клонирование удалённых "
2353 "репозиториев Subversion с последующим конвертированием в Mercurial."
2354
2355 msgid "Location of repositories"
2331 msgid "Location of repositories"
2356 msgstr "Местонахождение репозиториев"
2332 msgstr "Местонахождение репозиториев"
2357
2333
@@ -515,13 +515,6 b' msgstr "\xd0\x9f\xd1\x96\xd0\xb4 \xd1\x87\xd0\xb0\xd1\x81 \xd0\xb2\xd0\xb8\xd0\xb4\xd0\xb0\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xbd\xd1\x8f \xd1\x81\xd1\x82\xd0\xb0\xd1\x82\xd0\xb8\xd1\x81\xd1\x82\xd0\xb8\xd0\xba\xd0\xb8 \xd1\x80\xd0\xb5\xd0\xbf\xd0\xbe\xd0\xb7\xd0\xb8\xd1\x82\xd0\xbe\xd1\x80\xd1\x96\xd1\x8e \xd1\x81\xd1\x82\xd0\xb0\xd0\xbb\xd0\xb0\xd1\x81\xd1\x8f \xd0\xbf\xd0\xbe\xd0\xbc\xd0\xb8\xd0\xbb\xd0\xba\xd0\xb0"'
515 msgid "Updated VCS settings"
515 msgid "Updated VCS settings"
516 msgstr "Оновлені налаштування VCS"
516 msgstr "Оновлені налаштування VCS"
517
517
518 msgid ""
519 "Unable to activate hgsubversion support. The \"hgsubversion\" library is "
520 "missing"
521 msgstr ""
522 "Не вдається активувати підтримку hgsubversion. Бібліотека \"hgsubversion"
523 "\" відсутня"
524
525 msgid "Error occurred while updating application settings"
518 msgid "Error occurred while updating application settings"
526 msgstr "Під час оновлення параметрів застосунку сталася помилка"
519 msgstr "Під час оновлення параметрів застосунку сталася помилка"
527
520
@@ -1429,16 +1422,6 b' msgstr "Mercurial \xd1\x80\xd0\xbe\xd0\xb7\xd1\x88\xd0\xb8\xd1\x80\xd0\xb5\xd0\xbd\xd0\xbd\xd1\x8f"'
1429 msgid "Enable largefiles extension"
1422 msgid "Enable largefiles extension"
1430 msgstr "Увімкнути розширення largefiles"
1423 msgstr "Увімкнути розширення largefiles"
1431
1424
1432 msgid "Enable hgsubversion extension"
1433 msgstr "Увімкнути розширення hgsubversion"
1434
1435 msgid ""
1436 "Requires hgsubversion library to be installed. Enables cloning of remote "
1437 "Subversion repositories while converting them to Mercurial."
1438 msgstr ""
1439 "Потрібна установка бібліотеки hgsubversion. Дозволяє клонувати віддалені "
1440 "сховища Subversion під час перетворення їх у Mercurial."
1441
1442 msgid "Location of repositories"
1425 msgid "Location of repositories"
1443 msgstr "Розташування репозиторіїв"
1426 msgstr "Розташування репозиторіїв"
1444
1427
@@ -267,7 +267,6 b' class DbManage(object):'
267 ('hooks', Ui.HOOK_REPO_SIZE, 'python:kallithea.lib.hooks.repo_size', True),
267 ('hooks', Ui.HOOK_REPO_SIZE, 'python:kallithea.lib.hooks.repo_size', True),
268 ('extensions', 'largefiles', '', True),
268 ('extensions', 'largefiles', '', True),
269 ('largefiles', 'usercache', os.path.join(repo_root_path, '.cache', 'largefiles'), True),
269 ('largefiles', 'usercache', os.path.join(repo_root_path, '.cache', 'largefiles'), True),
270 ('extensions', 'hgsubversion', '', False),
271 ('extensions', 'hggit', '', False),
270 ('extensions', 'hggit', '', False),
272 ]
271 ]
273 for ui_section, ui_key, ui_value, ui_active in ui_config:
272 for ui_section, ui_key, ui_value, ui_active in ui_config:
@@ -74,8 +74,5 b' class UserCreationError(Exception):'
74 pass
74 pass
75
75
76
76
77 class HgsubversionImportError(Exception):
78 pass
79
80 class InvalidCloneUriException(Exception):
77 class InvalidCloneUriException(Exception):
81 pass
78 pass
@@ -237,12 +237,6 b' def is_valid_repo_uri(repo_type, url, ui'
237 raise InvalidCloneUriException('URI %s URLError: %s' % (url, e))
237 raise InvalidCloneUriException('URI %s URLError: %s' % (url, e))
238 except mercurial.error.RepoError as e:
238 except mercurial.error.RepoError as e:
239 raise InvalidCloneUriException('Mercurial %s: %s' % (type(e).__name__, safe_str(bytes(e))))
239 raise InvalidCloneUriException('Mercurial %s: %s' % (type(e).__name__, safe_str(bytes(e))))
240 elif url.startswith('svn+http'):
241 try:
242 from hgsubversion.svnrepo import svnremoterepo
243 except ImportError:
244 raise InvalidCloneUriException('URI type %s not supported - hgsubversion is not available' % (url,))
245 svnremoterepo(ui, url).svn.uuid
246 elif url.startswith('git+http'):
240 elif url.startswith('git+http'):
247 raise InvalidCloneUriException('URI type %s not implemented' % (url,))
241 raise InvalidCloneUriException('URI type %s not implemented' % (url,))
248 else:
242 else:
@@ -256,8 +250,6 b' def is_valid_repo_uri(repo_type, url, ui'
256 GitRepository._check_url(url)
250 GitRepository._check_url(url)
257 except urllib.error.URLError as e:
251 except urllib.error.URLError as e:
258 raise InvalidCloneUriException('URI %s URLError: %s' % (url, e))
252 raise InvalidCloneUriException('URI %s URLError: %s' % (url, e))
259 elif url.startswith('svn+http'):
260 raise InvalidCloneUriException('URI type %s not implemented' % (url,))
261 elif url.startswith('hg+http'):
253 elif url.startswith('hg+http'):
262 raise InvalidCloneUriException('URI type %s not implemented' % (url,))
254 raise InvalidCloneUriException('URI type %s not implemented' % (url,))
263 else:
255 else:
@@ -27,7 +27,7 b' class BaseRepository(object):'
27 **Attributes**
27 **Attributes**
28
28
29 ``DEFAULT_BRANCH_NAME``
29 ``DEFAULT_BRANCH_NAME``
30 name of default branch (i.e. "trunk" for svn, "master" for git etc.
30 name of default branch (i.e. "master" for git etc.
31
31
32 ``scm``
32 ``scm``
33 alias of scm, i.e. *git* or *hg*
33 alias of scm, i.e. *git* or *hg*
@@ -324,8 +324,7 b' class BaseChangeset(object):'
324
324
325 ``short_id``
325 ``short_id``
326 shortened (if apply) version of ``raw_id``; it would be simple
326 shortened (if apply) version of ``raw_id``; it would be simple
327 shortcut for ``raw_id[:12]`` for git/mercurial backends or same
327 shortcut for ``raw_id[:12]`` for git/mercurial backends
328 as ``raw_id`` for subversion
329
328
330 ``revision``
329 ``revision``
331 revision number as integer
330 revision number as integer
@@ -335,7 +335,7 b' class MercurialRepository(BaseRepository'
335 # means it cannot be cloned
335 # means it cannot be cloned
336 raise urllib.error.URLError("[%s] org_exc: %s" % (cleaned_uri, e))
336 raise urllib.error.URLError("[%s] org_exc: %s" % (cleaned_uri, e))
337
337
338 if not url_prefix: # skip svn+http://... (and git+... too)
338 if not url_prefix: # skip git+http://... etc
339 # now check if it's a proper hg repo
339 # now check if it's a proper hg repo
340 try:
340 try:
341 mercurial.httppeer.instance(repoui or mercurial.ui.ui(), url, False).lookup(b'tip')
341 mercurial.httppeer.instance(repoui or mercurial.ui.ui(), url, False).lookup(b'tip')
@@ -587,7 +587,7 b' class SubModuleNode(Node):'
587 self.path = name.rstrip('/')
587 self.path = name.rstrip('/')
588 self.kind = NodeKind.SUBMODULE
588 self.kind = NodeKind.SUBMODULE
589 self.alias = alias
589 self.alias = alias
590 # we have to use emptyChangeset here since this can point to svn/git/hg
590 # we have to use emptyChangeset here since this can point to git/hg
591 # submodules we cannot get from repository
591 # submodules we cannot get from repository
592 self.changeset = EmptyChangeset(changeset, alias=alias)
592 self.changeset = EmptyChangeset(changeset, alias=alias)
593 self.url = url
593 self.url = url
@@ -46,8 +46,7 b' from webob.exc import HTTPNotFound'
46 import kallithea
46 import kallithea
47 from kallithea.lib import ext_json, ssh
47 from kallithea.lib import ext_json, ssh
48 from kallithea.lib.exceptions import DefaultUserException
48 from kallithea.lib.exceptions import DefaultUserException
49 from kallithea.lib.utils2 import (asbool, ascii_bytes, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_bytes, safe_int, safe_str,
49 from kallithea.lib.utils2 import asbool, ascii_bytes, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_bytes, safe_int, safe_str, urlreadable
50 urlreadable)
51 from kallithea.lib.vcs import get_backend
50 from kallithea.lib.vcs import get_backend
52 from kallithea.lib.vcs.backends.base import EmptyChangeset
51 from kallithea.lib.vcs.backends.base import EmptyChangeset
53 from kallithea.lib.vcs.utils.helpers import get_scm
52 from kallithea.lib.vcs.utils.helpers import get_scm
@@ -388,7 +388,6 b' def ApplicationUiSettingsForm():'
388 hooks_changegroup_repo_size = v.StringBoolean(if_missing=False)
388 hooks_changegroup_repo_size = v.StringBoolean(if_missing=False)
389
389
390 extensions_largefiles = v.StringBoolean(if_missing=False)
390 extensions_largefiles = v.StringBoolean(if_missing=False)
391 extensions_hgsubversion = v.StringBoolean(if_missing=False)
392 extensions_hggit = v.StringBoolean(if_missing=False)
391 extensions_hggit = v.StringBoolean(if_missing=False)
393
392
394 return _ApplicationUiSettingsForm
393 return _ApplicationUiSettingsForm
@@ -400,7 +400,7 b' def ValidCloneUri():'
400 messages = {
400 messages = {
401 'clone_uri': _('Invalid repository URL'),
401 'clone_uri': _('Invalid repository URL'),
402 'invalid_clone_uri': _('Invalid repository URL. It must be a '
402 'invalid_clone_uri': _('Invalid repository URL. It must be a '
403 'valid http, https, ssh, svn+http or svn+https URL'),
403 'valid http, https, or ssh URL'),
404 }
404 }
405
405
406 def _validate_python(self, value, state):
406 def _validate_python(self, value, state):
@@ -26,13 +26,6 b''
26 ${_('Enable largefiles extension')}
26 ${_('Enable largefiles extension')}
27 </label>
27 </label>
28 </div>
28 </div>
29 <div class="checkbox">
30 <label>
31 ${h.checkbox('extensions_hgsubversion','True')}
32 ${_('Enable hgsubversion extension')}
33 </label>
34 </div>
35 <span class="help-block">${_('Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial.')}</span>
36 ##<div class="checkbox">
29 ##<div class="checkbox">
37 ## <label>
30 ## <label>
38 ## ${h.checkbox('extensions_hggit','True')}
31 ## ${h.checkbox('extensions_hggit','True')}
General Comments 0
You need to be logged in to leave comments. Login now