release: Merge default into stable for release preparation

.bumpversion.cfg

@@ -1,5 +1,5 b''
 [bumpversion]
-current_version = 4.7.2
+current_version = 4.8.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:vcsserver/VERSION]

.release.cfg

@@ -5,12 +5,10 b' done = false'
 done = true
 
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [release]
-state = prepared
-version = 4.7.2
+state = in_progress
+version = 4.8.0
 

configs/development_http.ini

@@ -32,7 +32,7 b' use = egg:waitress#main'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, vcsserver, pyro4, beaker
+keys = root, vcsserver, beaker
 
 [handlers]
 keys = console
@@ -59,12 +59,6 b' handlers ='
 qualname = beaker
 propagate = 1
 
-[logger_pyro4]
-level = DEBUG
-handlers =
-qualname = Pyro4
-propagate = 1
-
 
 ##############
 ## HANDLERS ##

configs/production_http.ini

@@ -20,8 +20,7 b' use = egg:gunicorn#main'
 workers = 2
 ## process name
 proc_name = rhodecode_vcsserver
-## type of worker class, one of sync, gevent
-## recommended for bigger setup is using of of other than sync one
+## type of worker class, currently `sync` is the only option allowed.
 worker_class = sync
 ## The maximum number of simultaneous clients. Valid only for Gevent
 #worker_connections = 10
@@ -56,7 +55,7 b' beaker.cache.repo_object.enabled = true'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, vcsserver, pyro4, beaker
+keys = root, vcsserver, beaker
 
 [handlers]
 keys = console
@@ -83,12 +82,6 b' handlers ='
 qualname = beaker
 propagate = 1
 
-[logger_pyro4]
-level = DEBUG
-handlers =
-qualname = Pyro4
-propagate = 1
-
 
 ##############
 ## HANDLERS ##

default.nix

@@ -120,6 +120,7 b' let'
         cp -v vcsserver/VERSION $out/nix-support/rccontrol/version
         echo "DONE: Meta information for rccontrol written"
 
+        # python based programs need to be wrapped
         ln -s ${self.pyramid}/bin/* $out/bin/
         ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
 
@@ -132,12 +133,14 b' let'
         ln -s ${self.mercurial}/bin/hg $out/bin
         ln -s ${pkgs.subversion}/bin/svn* $out/bin
 
-        for file in $out/bin/*; do
+        for file in $out/bin/*;
+        do
           wrapProgram $file \
             --set PATH $PATH \
             --set PYTHONPATH $PYTHONPATH \
             --set PYTHONHASHSEED random
         done
+
       '';
 
     });

pkgs/python-packages.nix

@@ -67,19 +67,6 b''
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Pyro4 = super.buildPythonPackage {
-    name = "Pyro4-4.41";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [serpent];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/56/2b/89b566b4bf3e7f8ba790db2d1223852f8cb454c52cab7693dd41f608ca2a/Pyro4-4.41.tar.gz";
-      md5 = "ed69e9bfafa9c06c049a87cb0c4c2b6c";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
   WebOb = super.buildPythonPackage {
     name = "WebOb-1.3.1";
     buildInputs = with self; [];
@@ -249,6 +236,19 b''
       license = [ pkgs.lib.licenses.mit ];
     };
   };
+  hg-evolve = super.buildPythonPackage {
+    name = "hg-evolve-6.0.1";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/c4/31/0673a5657c201ebb46e63c4bba8668f96cf5d7a8a0f8a91892d022ccc32b/hg-evolve-6.0.1.tar.gz";
+      md5 = "9c1ce7ac24792abc0eedee09a3344d06";
+    };
+    meta = {
+      license = [ { fullName = "GPLv2+"; } ];
+    };
+  };
   hgsubversion = super.buildPythonPackage {
     name = "hgsubversion-1.8.6";
     buildInputs = with self; [];
@@ -302,13 +302,13 b''
     };
   };
   ipython-genutils = super.buildPythonPackage {
-    name = "ipython-genutils-0.1.0";
+    name = "ipython-genutils-0.2.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/71/b7/a64c71578521606edbbce15151358598f3dfb72a3431763edc2baf19e71f/ipython_genutils-0.1.0.tar.gz";
-      md5 = "9a8afbe0978adbcbfcb3b35b2d015a56";
+      url = "https://pypi.python.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
+      md5 = "5a4f9781f78466da0ea1a648f3e1f79f";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -393,13 +393,13 b''
     };
   };
   prompt-toolkit = super.buildPythonPackage {
-    name = "prompt-toolkit-1.0.9";
+    name = "prompt-toolkit-1.0.14";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six wcwidth];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/83/14/5ac258da6c530eca02852ee25c7a9ff3ca78287bb4c198d0d0055845d856/prompt_toolkit-1.0.9.tar.gz";
-      md5 = "a39f91a54308fb7446b1a421c11f227c";
+      url = "https://pypi.python.org/packages/55/56/8c39509b614bda53e638b7500f12577d663ac1b868aef53426fc6a26c3f5/prompt_toolkit-1.0.14.tar.gz";
+      md5 = "f24061ae133ed32c6b764e92bd48c496";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -588,28 +588,15 b''
     };
   };
   rhodecode-vcsserver = super.buildPythonPackage {
-    name = "rhodecode-vcsserver-4.7.2";
+    name = "rhodecode-vcsserver-4.8.0";
     buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj];
     doCheck = true;
-    propagatedBuildInputs = with self; [Beaker configobj decorator dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid pyramid-jinja2 pyramid-mako repoze.lru simplejson subprocess32 subvertpy six translationstring WebOb wheel zope.deprecation zope.interface ipdb ipython gevent greenlet gunicorn waitress Pyro4 serpent pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
+    propagatedBuildInputs = with self; [Beaker configobj decorator dulwich hgsubversion hg-evolve infrae.cache mercurial msgpack-python pyramid pyramid-jinja2 pyramid-mako repoze.lru simplejson subprocess32 subvertpy six translationstring WebOb wheel zope.deprecation zope.interface ipdb ipython gevent greenlet gunicorn waitress pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
     src = ./.;
     meta = {
       license = [ { fullName = "GPL V3"; } { fullName = "GNU General Public License v3 or later (GPLv3+)"; } ];
     };
   };
-  serpent = super.buildPythonPackage {
-    name = "serpent-1.15";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/7b/38/b2b27673a882ff2ea5871bb3e3e6b496ebbaafd1612e51990ffb158b9254/serpent-1.15.tar.gz";
-      md5 = "e27b1aad5c218e16442f52abb7c7053a";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
   setuptools = super.buildPythonPackage {
     name = "setuptools-30.1.0";
     buildInputs = with self; [];
@@ -702,13 +689,13 b''
     };
   };
   traitlets = super.buildPythonPackage {
-    name = "traitlets-4.3.1";
+    name = "traitlets-4.3.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [ipython-genutils six decorator enum34];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b1/d6/5b5aa6d5c474691909b91493da1e8972e309c9f01ecfe4aeafd272eb3234/traitlets-4.3.1.tar.gz";
-      md5 = "dd0b1b6e5d31ce446d55a4b5e5083c98";
+      url = "https://pypi.python.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069/traitlets-4.3.2.tar.gz";
+      md5 = "3068663f2f38fd939a9eb3a500ccc154";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];

requirements.txt

@@ -6,6 +6,7 b' configobj==5.0.6'
 decorator==4.0.11
 dulwich==0.13.0
 hgsubversion==1.8.6
+hg-evolve==6.0.1
 infrae.cache==1.0.1
 mercurial==4.1.2
 msgpack-python==0.4.8
@@ -35,9 +36,5 b' greenlet==0.4.10'
 gunicorn==19.6.0
 waitress==1.0.1
 
-# Pyro/Deprecated TODO(Marcink): remove in 4.7 release.
-Pyro4==4.41
-serpent==1.15
-
 ## test related requirements
 -r requirements_test.txt

test.ini

@@ -26,7 +26,7 b' beaker.cache.repo_object.enabled = true'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, vcsserver, pyro4, beaker
+keys = root, vcsserver, beaker
 
 [handlers]
 keys = console
@@ -53,12 +53,6 b' handlers ='
 qualname = beaker
 propagate = 1
 
-[logger_pyro4]
-level = DEBUG
-handlers =
-qualname = Pyro4
-propagate = 1
-
 
 ##############
 ## HANDLERS ##

vcsserver/VERSION

@@ -1,1 +1,1 b''
-4.7.2
  No newline at end of file
+4.8.0
  No newline at end of file

vcsserver/hg.py

@@ -287,6 +287,25 b' class HgRemote(object):'
         return [parent.rev() for parent in ctx.parents()]
 
     @reraise_safe_exceptions
+    def ctx_phase(self, wire, revision):
+        repo = self._factory.repo(wire)
+        ctx = repo[revision]
+        # public=0, draft=1, secret=3
+        return ctx.phase()
+
+    @reraise_safe_exceptions
+    def ctx_obsolete(self, wire, revision):
+        repo = self._factory.repo(wire)
+        ctx = repo[revision]
+        return ctx.obsolete()
+
+    @reraise_safe_exceptions
+    def ctx_hidden(self, wire, revision):
+        repo = self._factory.repo(wire)
+        ctx = repo[revision]
+        return ctx.hidden()
+
+    @reraise_safe_exceptions
     def ctx_substate(self, wire, revision):
         repo = self._factory.repo(wire)
         ctx = repo[revision]
@@ -298,7 +317,7 b' class HgRemote(object):'
         ctx = repo[revision]
         status = repo[ctx.p1().node()].status(other=ctx.node())
         # object of status (odd, custom named tuple in mercurial) is not
-        # correctly serializable via Pyro, we make it a list, as the underling
+        # correctly serializable, we make it a list, as the underling
         # API expects this to be a list
         return list(status)
 

vcsserver/hooks.py

@@ -30,7 +30,6 b' from httplib import HTTPConnection'
 
 import mercurial.scmutil
 import mercurial.node
-import Pyro4
 import simplejson as json
 
 from vcsserver import exceptions
@@ -68,18 +67,9 b' class HooksDummyClient(object):'
             return getattr(hooks, hook_name)(extras)
 
 
-class HooksPyro4Client(object):
-    def __init__(self, hooks_uri):
-        self.hooks_uri = hooks_uri
-
-    def __call__(self, hook_name, extras):
-        with Pyro4.Proxy(self.hooks_uri) as hooks:
-            return getattr(hooks, hook_name)(extras)
-
-
 class RemoteMessageWriter(object):
     """Writer base class."""
-    def write(message):
+    def write(self, message):
         raise NotImplementedError()
 
 
@@ -126,11 +116,7 b' def _handle_exception(result):'
 def _get_hooks_client(extras):
     if 'hooks_uri' in extras:
         protocol = extras.get('hooks_protocol')
-        return (
-            HooksHttpClient(extras['hooks_uri'])
-            if protocol == 'http'
-            else HooksPyro4Client(extras['hooks_uri'])
-        )
+        return HooksHttpClient(extras['hooks_uri'])
     else:
         return HooksDummyClient(extras['hooks_module'])
 
@@ -161,13 +147,25 b' def post_pull(ui, repo, **kwargs):'
     return _call_hook('post_pull', _extras_from_ui(ui), HgMessageWriter(ui))
 
 
+def _rev_range_hash(repo, node):
+
+    commits = []
+    for rev in xrange(repo[node], len(repo)):
+        ctx = repo[rev]
+        commit_id = mercurial.node.hex(ctx.node())
+        branch = ctx.branch()
+        commits.append((commit_id, branch))
+
+    return commits
+
+
 def pre_push(ui, repo, node=None, **kwargs):
     extras = _extras_from_ui(ui)
 
     rev_data = []
     if node and kwargs.get('hooktype') == 'pretxnchangegroup':
         branches = collections.defaultdict(list)
-        for commit_id, branch in _rev_range_hash(repo, node, with_branch=True):
+        for commit_id, branch in _rev_range_hash(repo, node):
             branches[branch].append(commit_id)
 
         for branch, commits in branches.iteritems():
@@ -184,30 +182,38 b' def pre_push(ui, repo, node=None, **kwar'
     return _call_hook('pre_push', extras, HgMessageWriter(ui))
 
 
-def _rev_range_hash(repo, node, with_branch=False):
+def post_push(ui, repo, node, **kwargs):
+    extras = _extras_from_ui(ui)
+
+    commit_ids = []
+    branches = []
+    bookmarks = []
+    tags = []
 
-    commits = []
-    for rev in xrange(repo[node], len(repo)):
-        ctx = repo[rev]
-        commit_id = mercurial.node.hex(ctx.node())
-        branch = ctx.branch()
-        if with_branch:
-            commits.append((commit_id, branch))
-        else:
-            commits.append(commit_id)
+    for commit_id, branch in _rev_range_hash(repo, node):
+        commit_ids.append(commit_id)
+        if branch not in branches:
+            branches.append(branch)
 
-    return commits
-
+    if hasattr(ui, '_rc_pushkey_branches'):
+        bookmarks = ui._rc_pushkey_branches
 
-def post_push(ui, repo, node, **kwargs):
-    commit_ids = _rev_range_hash(repo, node)
-
-    extras = _extras_from_ui(ui)
     extras['commit_ids'] = commit_ids
+    extras['new_refs'] = {
+        'branches': branches,
+        'bookmarks': bookmarks,
+        'tags': tags
+    }
 
     return _call_hook('post_push', extras, HgMessageWriter(ui))
 
 
+def key_push(ui, repo, **kwargs):
+    if kwargs['new'] != '0' and kwargs['namespace'] == 'bookmarks':
+        # store new bookmarks in our UI object propagated later to post_push
+        ui._rc_pushkey_branches = repo[kwargs['key']].bookmarks()
+    return
+
 # backward compat
 log_pull_action = post_pull
 
@@ -327,12 +333,12 b' def _run_command(arguments):'
     # Probably this should be using subprocessio.
     process = subprocess.Popen(
         arguments, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, _ = process.communicate()
+    stdout, stderr = process.communicate()
 
     if process.returncode != 0:
         raise Exception(
-            'Command %s exited with exit code %s' % (arguments,
-                                                     process.returncode))
+            'Command %s exited with exit code %s: stderr:%s' % (
+                arguments, process.returncode, stderr))
 
     return stdout
 
@@ -359,10 +365,16 b' def git_post_receive(unused_repo_path, r'
     # subcommand sets the PATH environment variable so that it point to the
     # correct version of the git executable.
     empty_commit_id = '0' * 40
+    branches = []
+    tags = []
     for push_ref in rev_data:
         type_ = push_ref['type']
+
         if type_ == 'heads':
             if push_ref['old_rev'] == empty_commit_id:
+                # starting new branch case
+                if push_ref['name'] not in branches:
+                    branches.append(push_ref['name'])
 
                 # Fix up head revision if needed
                 cmd = ['git', 'show', 'HEAD']
@@ -386,14 +398,24 b' def git_post_receive(unused_repo_path, r'
                 # delete branch case
                 git_revs.append('delete_branch=>%s' % push_ref['name'])
             else:
+                if push_ref['name'] not in branches:
+                    branches.append(push_ref['name'])
+
                 cmd = ['git', 'log',
                        '{old_rev}..{new_rev}'.format(**push_ref),
                        '--reverse', '--pretty=format:%H']
                 git_revs.extend(_run_command(cmd).splitlines())
         elif type_ == 'tags':
+            if push_ref['name'] not in tags:
+                tags.append(push_ref['name'])
             git_revs.append('tag=>%s' % push_ref['name'])
 
     extras['commit_ids'] = git_revs
+    extras['new_refs'] = {
+        'branches': branches,
+        'bookmarks': [],
+        'tags': tags,
+    }
 
     if 'repo_size' in extras['hooks']:
         try:

vcsserver/pygrack.py

@@ -95,7 +95,13 b' class GitRepository(object):'
 
         :param path:
         """
-        return path.split(self.repo_name, 1)[-1].strip('/')
+        path = path.split(self.repo_name, 1)[-1]
+        if path.startswith('.git'):
+            # for bare repos we still get the .git prefix inside, we skip it
+            # here, and remove from the service command
+            path = path[4:]
+
+        return path.strip('/')
 
     def inforefs(self, request, unused_environ):
         """

vcsserver/settings.py

@@ -15,16 +15,5 b''
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
-
-PYRO_PORT = 9900
-
-PYRO_GIT = 'git_remote'
-PYRO_HG = 'hg_remote'
-PYRO_SVN = 'svn_remote'
-PYRO_VCSSERVER = 'vcs_server'
-PYRO_GIT_REMOTE_WSGI = 'git_remote_wsgi'
-PYRO_HG_REMOTE_WSGI = 'hg_remote_wsgi'
-
 WIRE_ENCODING = 'UTF-8'
-
 GIT_EXECUTABLE = 'git'

vcsserver/svn.py

@@ -23,6 +23,7 b' import posixpath as vcspath'
 import StringIO
 import subprocess
 import urllib
+import traceback
 
 import svn.client
 import svn.core
@@ -46,8 +47,17 b' svn_compatible_versions = set(['
     'pre-1.5-compatible',
     'pre-1.6-compatible',
     'pre-1.8-compatible',
+    'pre-1.9-compatible',
 ])
 
+svn_compatible_versions_map = {
+    'pre-1.4-compatible': '1.3',
+    'pre-1.5-compatible': '1.4',
+    'pre-1.6-compatible': '1.5',
+    'pre-1.8-compatible': '1.7',
+    'pre-1.9-compatible': '1.8',
+}
+
 
 def reraise_safe_exceptions(func):
     """Decorator for converting svn exceptions to something neutral."""
@@ -67,14 +77,15 b' class SubversionFactory(RepoFactory):'
     def _create_repo(self, wire, create, compatible_version):
         path = svn.core.svn_path_canonicalize(wire['path'])
         if create:
-            fs_config = {}
+            fs_config = {'compatible-version': '1.9'}
             if compatible_version:
                 if compatible_version not in svn_compatible_versions:
                     raise Exception('Unknown SVN compatible version "{}"'
                                     .format(compatible_version))
-                log.debug('Create SVN repo with compatible version "%s"',
-                          compatible_version)
-                fs_config[compatible_version] = '1'
+                fs_config['compatible-version'] = \
+                    svn_compatible_versions_map[compatible_version]
+
+            log.debug('Create SVN repo with config "%s"', fs_config)
             repo = svn.repos.create(path, "", "", None, fs_config)
         else:
             repo = svn.repos.open(path)
@@ -87,7 +98,6 b' class SubversionFactory(RepoFactory):'
         return self._repo(wire, create_new_repo)
 
 
-
 NODE_TYPE_MAPPING = {
     svn.core.svn_node_file: 'file',
     svn.core.svn_node_dir: 'dir',
@@ -120,8 +130,9 b' class SvnRemote(object):'
         # throws exception
         try:
             svnrepo.svnremoterepo(baseui, url).svn.uuid
-        except:
-            log.debug("Invalid svn url: %s", url)
+        except Exception:
+            tb = traceback.format_exc()
+            log.debug("Invalid Subversion url: `%s`, tb: %s", url, tb)
             raise URLError(
                 '"%s" is not a valid Subversion source url.' % (url, ))
         return True
@@ -130,10 +141,23 b' class SvnRemote(object):'
         try:
             svn.repos.open(path)
         except svn.core.SubversionException:
-            log.debug("Invalid Subversion path %s", path)
+            tb = traceback.format_exc()
+            log.debug("Invalid Subversion path `%s`, tb: %s", path, tb)
             return False
         return True
 
+    @reraise_safe_exceptions
+    def verify(self, wire,):
+        repo_path = wire['path']
+        if not self.is_path_valid_repository(wire, repo_path):
+            raise Exception(
+                "Path %s is not a valid Subversion repository." % repo_path)
+
+        load = subprocess.Popen(
+            ['svnadmin', 'info', repo_path],
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        return ''.join(load.stdout)
+
     def lookup(self, wire, revision):
         if revision not in [-1, None, 'HEAD']:
             raise NotImplementedError

vcsserver/tests/test_hooks.py

@@ -29,46 +29,6 b' import simplejson as json'
 from vcsserver import hooks
 
 
-class HooksStub(object):
-    """
-    Simulates a Proy4.Proxy object.
-
-    Will always return `result`, no matter which hook has been called on it.
-    """
-
-    def __init__(self, result):
-        self._result = result
-
-    def __call__(self, hooks_uri):
-        return self
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        pass
-
-    def __getattr__(self, name):
-        return mock.Mock(return_value=self._result)
-
-
[e-mail]
-def mock_hook_response(
-        status=0, output='', exception=None, exception_args=None):
-    response = {
-        'status': status,
-        'output': output,
-    }
-    if exception:
-        response.update({
-            'exception': exception,
-            'exception_args': exception_args,
-        })
-
-    with mock.patch('Pyro4.Proxy', HooksStub(response)):
-        yield
-
-
 def get_hg_ui(extras=None):
     """Create a Config object with a valid RC_SCM_DATA entry."""
     extras = extras or {}
@@ -89,126 +49,6 b' def get_hg_ui(extras=None):'
     return hg_ui
 
 
-def test_call_hook_no_error(capsys):
-    extras = {
-        'hooks_uri': 'fake_hook_uri',
-    }
-    expected_output = 'My mock outptut'
-    writer = mock.Mock()
-
-    with mock_hook_response(status=1, output=expected_output):
-        hooks._call_hook('hook_name', extras, writer)
-
-    out, err = capsys.readouterr()
-
-    writer.write.assert_called_with(expected_output)
-    assert err == ''
-
-
-def test_call_hook_with_exception(capsys):
-    extras = {
-        'hooks_uri': 'fake_hook_uri',
-    }
-    expected_output = 'My mock outptut'
-    writer = mock.Mock()
-
-    with mock_hook_response(status=1, output=expected_output,
-                            exception='TypeError',
-                            exception_args=('Mock exception', )):
-        with pytest.raises(Exception) as excinfo:
-            hooks._call_hook('hook_name', extras, writer)
-
-    assert excinfo.type == Exception
-    assert 'Mock exception' in str(excinfo.value)
-
-    out, err = capsys.readouterr()
-
-    writer.write.assert_called_with(expected_output)
-    assert err == ''
-
-
-def test_call_hook_with_locked_exception(capsys):
-    extras = {
-        'hooks_uri': 'fake_hook_uri',
-    }
-    expected_output = 'My mock outptut'
-    writer = mock.Mock()
-
-    with mock_hook_response(status=1, output=expected_output,
-                            exception='HTTPLockedRC',
-                            exception_args=('message',)):
-        with pytest.raises(Exception) as excinfo:
-            hooks._call_hook('hook_name', extras, writer)
-
-    assert excinfo.value._vcs_kind == 'repo_locked'
-    assert 'message' == str(excinfo.value)
-
-    out, err = capsys.readouterr()
-
-    writer.write.assert_called_with(expected_output)
-    assert err == ''
-
-
-def test_call_hook_with_stdout():
-    extras = {
-        'hooks_uri': 'fake_hook_uri',
-    }
-    expected_output = 'My mock outptut'
-
-    stdout = io.BytesIO()
-    with mock_hook_response(status=1, output=expected_output):
-        hooks._call_hook('hook_name', extras, stdout)
-
-    assert stdout.getvalue() == expected_output
-
-
-def test_repo_size():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        assert hooks.repo_size(hg_ui, None) == 1
-
-
-def test_pre_pull():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        assert hooks.pre_pull(hg_ui, None) == 1
-
-
-def test_post_pull():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        assert hooks.post_pull(hg_ui, None) == 1
-
-
-def test_pre_push():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        assert hooks.pre_push(hg_ui, None) == 1
-
-
-def test_post_push():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        with mock.patch('vcsserver.hooks._rev_range_hash', return_value=[]):
-            assert hooks.post_push(hg_ui, None, None) == 1
-
-
-def test_git_pre_receive():
-    extras = {
-        'hooks': ['push'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=1):
-        response = hooks.git_pre_receive(None, None,
-                                         {'RC_SCM_DATA': json.dumps(extras)})
-        assert response == 1
-
-
 def test_git_pre_receive_is_disabled():
     extras = {'hooks': ['pull']}
     response = hooks.git_pre_receive(None, None,
@@ -217,18 +57,6 b' def test_git_pre_receive_is_disabled():'
     assert response == 0
 
 
-def test_git_post_receive_no_subprocess_call():
-    extras = {
-        'hooks': ['push'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    # Setting revision_lines to '' avoid all subprocess_calls
-    with mock_hook_response(status=1):
-        response = hooks.git_post_receive(None, '',
-                                          {'RC_SCM_DATA': json.dumps(extras)})
-        assert response == 1
-
-
 def test_git_post_receive_is_disabled():
     extras = {'hooks': ['pull']}
     response = hooks.git_post_receive(None, '',
@@ -242,7 +70,8 b' def test_git_post_receive_calls_repo_siz'
     with mock.patch.object(hooks, '_call_hook') as call_hook_mock:
         hooks.git_post_receive(
             None, '', {'RC_SCM_DATA': json.dumps(extras)})
-    extras.update({'commit_ids': []})
+    extras.update({'commit_ids': [],
+                   'new_refs': {'bookmarks': [], 'branches': [], 'tags': []}})
     expected_calls = [
         mock.call('repo_size', extras, mock.ANY),
         mock.call('post_push', extras, mock.ANY),
@@ -255,7 +84,8 b' def test_git_post_receive_does_not_call_'
     with mock.patch.object(hooks, '_call_hook') as call_hook_mock:
         hooks.git_post_receive(
             None, '', {'RC_SCM_DATA': json.dumps(extras)})
-    extras.update({'commit_ids': []})
+    extras.update({'commit_ids': [],
+                   'new_refs': {'bookmarks': [], 'branches': [], 'tags': []}})
     expected_calls = [
         mock.call('post_push', extras, mock.ANY)
     ]
@@ -279,122 +109,16 b' def test_repo_size_exception_does_not_af'
     assert result == status
 
 
[e-mail]('vcsserver.hooks._run_command')
-def test_git_post_receive_first_commit_sub_branch(cmd_mock):
-    def cmd_mock_returns(args):
-        if args == ['git', 'show', 'HEAD']:
-            raise
-        if args == ['git', 'for-each-ref', '--format=%(refname)',
-                    'refs/heads/*']:
-            return 'refs/heads/test-branch2/sub-branch'
-        if args == ['git', 'log', '--reverse', '--pretty=format:%H', '--',
-                    '9695eef57205c17566a3ae543be187759b310bb7', '--not',
-                    'refs/heads/test-branch2/sub-branch']:
-            return ''
-
-    cmd_mock.side_effect = cmd_mock_returns
-
-    extras = {
-        'hooks': ['push'],
-        'hooks_uri': 'fake_hook_uri'
-    }
-    rev_lines = ['0000000000000000000000000000000000000000 '
-                 '9695eef57205c17566a3ae543be187759b310bb7 '
-                 'refs/heads/feature/sub-branch\n']
-    with mock_hook_response(status=0):
-        response = hooks.git_post_receive(None, rev_lines,
-                                          {'RC_SCM_DATA': json.dumps(extras)})
-
-    calls = [
-        mock.call(['git', 'show', 'HEAD']),
-        mock.call(['git', 'symbolic-ref', 'HEAD',
-                   'refs/heads/feature/sub-branch']),
-    ]
-    cmd_mock.assert_has_calls(calls, any_order=True)
-    assert response == 0
-
-
[e-mail]('vcsserver.hooks._run_command')
-def test_git_post_receive_first_commit_revs(cmd_mock):
-    extras = {
-        'hooks': ['push'],
-        'hooks_uri': 'fake_hook_uri'
-    }
-    rev_lines = [
-        '0000000000000000000000000000000000000000 '
-        '9695eef57205c17566a3ae543be187759b310bb7 refs/heads/master\n']
-    with mock_hook_response(status=0):
-        response = hooks.git_post_receive(
-            None, rev_lines, {'RC_SCM_DATA': json.dumps(extras)})
-
-    calls = [
-        mock.call(['git', 'show', 'HEAD']),
-        mock.call(['git', 'for-each-ref', '--format=%(refname)',
-                   'refs/heads/*']),
-        mock.call(['git', 'log', '--reverse', '--pretty=format:%H',
-                   '--', '9695eef57205c17566a3ae543be187759b310bb7', '--not',
-                   ''])
-    ]
-    cmd_mock.assert_has_calls(calls, any_order=True)
-
-    assert response == 0
-
-
-def test_git_pre_pull():
-    extras = {
-        'hooks': ['pull'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=1, output='foo'):
-        assert hooks.git_pre_pull(extras) == hooks.HookResponse(1, 'foo')
-
-
-def test_git_pre_pull_exception_is_caught():
-    extras = {
-        'hooks': ['pull'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=2, exception=Exception('foo')):
-        assert hooks.git_pre_pull(extras).status == 128
-
-
 def test_git_pre_pull_is_disabled():
     assert hooks.git_pre_pull({'hooks': ['push']}) == hooks.HookResponse(0, '')
 
 
-def test_git_post_pull():
-    extras = {
-        'hooks': ['pull'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=1, output='foo'):
-        assert hooks.git_post_pull(extras) == hooks.HookResponse(1, 'foo')
-
-
-def test_git_post_pull_exception_is_caught():
-    extras = {
-        'hooks': ['pull'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=2, exception='Exception',
-                            exception_args=('foo',)):
-        assert hooks.git_post_pull(extras).status == 128
-
-
 def test_git_post_pull_is_disabled():
     assert (
         hooks.git_post_pull({'hooks': ['push']}) == hooks.HookResponse(0, ''))
 
 
 class TestGetHooksClient(object):
-    def test_returns_pyro_client_when_protocol_matches(self):
-        hooks_uri = 'localhost:8000'
-        result = hooks._get_hooks_client({
-            'hooks_uri': hooks_uri,
-            'hooks_protocol': 'pyro4'
-        })
-        assert isinstance(result, hooks.HooksPyro4Client)
-        assert result.hooks_uri == hooks_uri
 
     def test_returns_http_client_when_protocol_matches(self):
         hooks_uri = 'localhost:8000'
@@ -405,14 +129,6 b' class TestGetHooksClient(object):'
         assert isinstance(result, hooks.HooksHttpClient)
         assert result.hooks_uri == hooks_uri
 
-    def test_returns_pyro4_client_when_no_protocol_is_specified(self):
-        hooks_uri = 'localhost:8000'
-        result = hooks._get_hooks_client({
-            'hooks_uri': hooks_uri
-        })
-        assert isinstance(result, hooks.HooksPyro4Client)
-        assert result.hooks_uri == hooks_uri
-
     def test_returns_dummy_client_when_hooks_uri_not_specified(self):
         fake_module = mock.Mock()
         import_patcher = mock.patch.object(
@@ -487,30 +203,6 b' class TestHooksDummyClient(object):'
         assert result == hooks_module.Hooks().__enter__().post_push()
 
 
-class TestHooksPyro4Client(object):
-    def test_init_sets_hooks_uri(self):
-        uri = 'localhost:3000'
-        client = hooks.HooksPyro4Client(uri)
-        assert client.hooks_uri == uri
-
-    def test_call_returns_hook_value(self):
-        hooks_uri = 'localhost:3000'
-        client = hooks.HooksPyro4Client(hooks_uri)
-        hooks_module = mock.Mock()
-        context_manager = mock.MagicMock()
-        context_manager.__enter__.return_value = hooks_module
-        pyro4_patcher = mock.patch.object(
-            hooks.Pyro4, 'Proxy', return_value=context_manager)
-        extras = {
-            'test': 'test'
-        }
-        with pyro4_patcher as pyro4_mock:
-            result = client('post_push', extras)
-        pyro4_mock.assert_called_once_with(hooks_uri)
-        hooks_module.post_push.assert_called_once_with(extras)
-        assert result == hooks_module.post_push.return_value
-
-
 @pytest.fixture
 def http_mirror(request):
     server = MirrorHttpServer()

vcsserver/tests/test_main_http.py

@@ -18,24 +18,24 b''
 import mock
 import pytest
 
-from vcsserver import main
+from vcsserver import http_main
 from vcsserver.base import obfuscate_qs
 
 
[e-mail]('vcsserver.main.VcsServerCommand', mock.Mock())
[e-mail]('vcsserver.http_main.VCS', mock.Mock())
 @mock.patch('vcsserver.hgpatches.patch_largefiles_capabilities')
 def test_applies_largefiles_patch(patch_largefiles_capabilities):
-    main.main([])
+    http_main.main([])
     patch_largefiles_capabilities.assert_called_once_with()
 
 
[e-mail]('vcsserver.main.VcsServerCommand', mock.Mock())
[e-mail]('vcsserver.main.MercurialFactory', None)
[e-mail]('vcsserver.http_main.VCS', mock.Mock())
[e-mail]('vcsserver.http_main.MercurialFactory', None)
 @mock.patch(
     'vcsserver.hgpatches.patch_largefiles_capabilities',
     mock.Mock(side_effect=Exception("Must not be called")))
 def test_applies_largefiles_patch_only_if_mercurial_is_available():
-    main.main([])
+    http_main.main([])
 
 
 @pytest.mark.parametrize('given, expected', [

vcsserver/tweens.py

@@ -46,7 +46,7 b' class RequestWrapperTween(object):'
         finally:
             end = time.time()
 
-            log.info('IP: %s Request to %s time: %.3fs' % (
+            log.info('IP: %s Request to path: `%s` time: %.3fs' % (
                 '127.0.0.1',
                 safe_str(get_access_path(request)), end - start)
             )