Merge stable

CONTRIBUTORS

@@ -13,9 +13,11 b' List of contributors to Kallithea projec'
     Søren Løvborg <[e-mail]> 2015-2016
     Angel Ezquerra <[e-mail]> 2016
     Asterios Dimitriou <[e-mail]> 2016
+    Kateryna Musina <[e-mail]> 2016
     Konstantin Veretennicov <[e-mail]> 2016
     Oscar Curero <[e-mail]> 2016
     Robert James Dennington <[e-mail]> 2016
+    [e-mail] 2016
     YFdyh000 <[e-mail]> 2016
     Aras Pranckevičius <[e-mail]> 2012-2013 2015
     Sean Farley <[e-mail]> 2013-2015

kallithea/lib/base.py

@@ -202,7 +202,7 b' class BaseVCSController(object):'
             from kallithea.lib.utils import get_repo_by_id
             by_id_match = get_repo_by_id(repo_name)
             if by_id_match:
-                data[1] = by_id_match
+                data[1] = safe_str(by_id_match)
 
         return '/'.join(data)
 

kallithea/lib/middleware/simplehg.py

@@ -84,7 +84,7 b' class SimpleHg(BaseVCSController):'
         #======================================================================
         try:
             str_repo_name = environ['REPO_NAME'] = self.__get_repository(environ)
-            assert isinstance(str_repo_name, str)
+            assert isinstance(str_repo_name, str), str_repo_name
             repo_name = safe_unicode(str_repo_name)
             assert safe_str(repo_name) == str_repo_name, (str_repo_name, repo_name)
             log.debug('Extracted repo name is %s', repo_name)

kallithea/templates/about.html

@@ -40,9 +40,11 b''
   <li>Copyright &copy; 2015&ndash;2016, Søren Løvborg</li>
   <li>Copyright &copy; 2016, Angel Ezquerra</li>
   <li>Copyright &copy; 2016, Asterios Dimitriou</li>
+  <li>Copyright &copy; 2016, Kateryna Musina</li>
   <li>Copyright &copy; 2016, Konstantin Veretennicov</li>
   <li>Copyright &copy; 2016, Oscar Curero</li>
   <li>Copyright &copy; 2016, Robert James Dennington</li>
+  <li>Copyright &copy; 2016, [e-mail]</li>
   <li>Copyright &copy; 2016, YFdyh000</li>
   <li>Copyright &copy; 2012&ndash;2013, 2015, Aras Pranckevičius</li>
   <li>Copyright &copy; 2014&ndash;2015, Christian Oyarzun</li>

kallithea/tests/functional/test_admin_repos.py

@@ -4,6 +4,8 b' import os'
 import mock
 import urllib
 
+import pytest
+
 from kallithea.lib import vcs
 from kallithea.lib.utils2 import safe_str, safe_unicode
 from kallithea.model.db import Repository, RepoGroup, UserRepoToPerm, User, \
@@ -594,6 +596,7 b' class _BaseTestCase(TestController):'
         # repo must not be in filesystem !
         assert not os.path.isdir(os.path.join(Ui.get_by_key('paths', '/').ui_value, repo_name))
 
+
 class TestAdminReposControllerGIT(_BaseTestCase):
     REPO = GIT_REPO
     REPO_TYPE = 'git'
@@ -608,3 +611,8 b' class TestAdminReposControllerHG(_BaseTe'
     NEW_REPO = NEW_HG_REPO
     OTHER_TYPE_REPO = GIT_REPO
     OTHER_TYPE = 'git'
+
+    def test_permanent_url_protocol_access(self):
+        with pytest.raises(Exception) as e:
+            self.app.get(url('summary_home', repo_name='_1'), extra_environ={'HTTP_ACCEPT': 'application/mercurial'})
+        assert 'Unable to detect pull/push action' in str(e)