Mercurial > kallithea
changeset 2058:fb51a6fc10ae beta
updated CONTRIBUTORS
- code garden
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 28 Feb 2012 05:25:16 +0200 |
| parents | 766696ee9487 |
| children | d7f1fe9cb146 |
| files | CONTRIBUTORS docs/changelog.rst docs/theme/nature/layout.html rhodecode/lib/__init__.py rhodecode/lib/middleware/simplegit.py rhodecode/model/db.py rhodecode/model/forms.py |
| diffstat | 7 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/CONTRIBUTORS Mon Feb 27 18:15:39 2012 -0800 +++ b/CONTRIBUTORS Tue Feb 28 05:25:16 2012 +0200 @@ -15,4 +15,5 @@ Les Peabody <lpeabody@gmail.com> Jonas Oberschweiber <jonas.oberschweiber@d-velop.de> Matt Zuba <matt.zuba@goodwillaz.org> - Aras Pranckevicius <aras@unity3d.com> \ No newline at end of file + Aras Pranckevicius <aras@unity3d.com> + Tony Bussieres <t.bussieres@gmail.com>
--- a/docs/changelog.rst Mon Feb 27 18:15:39 2012 -0800 +++ b/docs/changelog.rst Tue Feb 28 05:25:16 2012 +0200 @@ -20,6 +20,7 @@ - fixed git protocol issues with repos-groups - fixed git remote repos validator that prevented from cloning remote git repos - fixes #370 ending slashes fixes for repo and groups +- fixes #368 improved git-protocol detection to handle other clients 1.3.1 (**2012-02-27**) ----------------------
--- a/docs/theme/nature/layout.html Mon Feb 27 18:15:39 2012 -0800 +++ b/docs/theme/nature/layout.html Tue Feb 28 05:25:16 2012 +0200 @@ -13,6 +13,6 @@ <div style="padding:5px"> <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank"> <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a> - </div> + </div> </div> {% endblock %}}
--- a/rhodecode/lib/__init__.py Mon Feb 27 18:15:39 2012 -0800 +++ b/rhodecode/lib/__init__.py Tue Feb 28 05:25:16 2012 +0200 @@ -231,7 +231,7 @@ :rtype: str :returns: str object """ - + # if it's not basestr cast to str if not isinstance(unicode_, basestring): return str(unicode_)
--- a/rhodecode/lib/middleware/simplegit.py Mon Feb 27 18:15:39 2012 -0800 +++ b/rhodecode/lib/middleware/simplegit.py Tue Feb 28 05:25:16 2012 +0200 @@ -82,9 +82,11 @@ GIT_PROTO_PAT = re.compile(r'git-upload-pack|git-receive-pack|info\/refs') + def is_git(action): return action in ['pull','push'] + class SimpleGit(BaseVCSController): def _handle_request(self, environ, start_response): @@ -230,16 +232,18 @@ return User.get_by_username(username) def __get_action(self, environ): - """Maps git request commands into a pull or push command. + """ + Maps git request commands into a pull or push command. :param environ: """ service = environ['QUERY_STRING'].split('=') if len(service) > 1: service_cmd = service[1] - mapping = {'git-receive-pack': 'push', - 'git-upload-pack': 'pull', - } + mapping = { + 'git-receive-pack': 'push', + 'git-upload-pack': 'pull', + } return mapping.get(service_cmd, service_cmd if service_cmd else 'other')
--- a/rhodecode/model/db.py Mon Feb 27 18:15:39 2012 -0800 +++ b/rhodecode/model/db.py Tue Feb 28 05:25:16 2012 +0200 @@ -1038,7 +1038,7 @@ prefix = '' iid = rhodecode.CONFIG.get('instance_id') if iid: - prefix = iid + prefix = iid return "%s%s" % (prefix, key) @classmethod
--- a/rhodecode/model/forms.py Mon Feb 27 18:15:39 2012 -0800 +++ b/rhodecode/model/forms.py Tue Feb 28 05:25:16 2012 +0200 @@ -672,7 +672,7 @@ user = All(UnicodeString(not_empty=True), ValidRepoUser) chained_validators = [ValidCloneUri()(), - ValidRepoName(edit, old_data), + ValidRepoName(edit, old_data), ValidPerms()] return _RepoForm