# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-06-12 18:00:00
# Node ID a359c072337fdd8e1e71df72cc520b8a9b042f80
# Parent  966e8b79ee68128c6fcd691a27800ef9c588bcc5
# Parent  b958435657db2149109ac4a21d5fd5a64cf27f4d

Merge branch default into stable

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.0.1
+current_version = 4.1.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:vcsserver/VERSION]
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -2,8 +2,6 @@ syntax: glob
 *.orig
 *.pyc
 *.swp
-*.sqlite
-*.sqlite-journal
 *.tox
 *.egg-info
 *.egg
@@ -21,7 +19,6 @@ syntax: regexp
 ^\.cache.*$
 ^\.rhodecode$
 
-^rcextensions
 ^_dev
 ^._dev
 ^build/
@@ -35,16 +32,5 @@ syntax: regexp
 ^junit\.xml$
 ^node_modules/
 ^pylint.log$
-^rcextensions/
-^rhodecode/public/css/style.css$
-^rhodecode/public/js/scripts.js$
-^rhodecode\.db$
-^rhodecode\.log$
-^rhodecode_dev\.log$
-^test\.db$
 ^build$
-^coverage\.xml$
-^htmlcov
-^junit\.xml$
-^pylint.log$
 ^result$
diff --git a/development.ini b/configs/development.ini
rename from development.ini
rename to configs/development.ini
--- a/development.ini
+++ b/configs/development.ini
@@ -70,20 +70,6 @@ args = (sys.stderr,)
 level = DEBUG
 formatter = generic
 
-[handler_file]
-class = FileHandler
-args = ('vcsserver.log', 'a',)
-level = DEBUG
-formatter = generic
-
-[handler_file_rotating]
-class = logging.handlers.TimedRotatingFileHandler
-# 'D', 5 - rotate every 5days
-# you can set 'h', 'midnight'
-args = ('vcsserver.log', 'D', 5, 10,)
-level = DEBUG
-formatter = generic
-
 ################
 ## FORMATTERS ##
 ################
diff --git a/development_pyramid.ini b/configs/development_pyramid.ini
rename from development_pyramid.ini
rename to configs/development_pyramid.ini
--- a/development_pyramid.ini
+++ b/configs/development_pyramid.ini
@@ -1,8 +1,16 @@
+################################################################################
+# RhodeCode VCSServer - configuration                                          #
+#                                                                              #
+################################################################################
+
 [app:main]
 use = egg:rhodecode-vcsserver
-pyramid.reload_templates = true
+
 pyramid.default_locale_name = en
 pyramid.includes =
+
+locale = en_US.UTF-8
+
 # cache regions, please don't change
 beaker.cache.regions = repo_object
 beaker.cache.repo_object.type = memorylru
@@ -10,8 +18,6 @@ beaker.cache.repo_object.max_items = 100
 # cache auto-expires after N seconds
 beaker.cache.repo_object.expire = 300
 beaker.cache.repo_object.enabled = true
-locale = en_US.UTF-8
-
 
 [server:main]
 use = egg:waitress#main
@@ -23,7 +29,7 @@ port = %(http_port)s
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, vcsserver, beaker
+keys = root, vcsserver, pyro4, beaker
 
 [handlers]
 keys = console
@@ -50,6 +56,12 @@ handlers =
 qualname = beaker
 propagate = 1
 
+[logger_pyro4]
+level = DEBUG
+handlers =
+qualname = Pyro4
+propagate = 1
+
 
 ##############
 ## HANDLERS ##
diff --git a/production.ini b/configs/production.ini
rename from production.ini
rename to configs/production.ini
--- a/production.ini
+++ b/configs/production.ini
@@ -70,20 +70,6 @@ args = (sys.stderr,)
 level = DEBUG
 formatter = generic
 
-[handler_file]
-class = FileHandler
-args = ('vcsserver.log', 'a',)
-level = DEBUG
-formatter = generic
-
-[handler_file_rotating]
-class = logging.handlers.TimedRotatingFileHandler
-# 'D', 5 - rotate every 5days
-# you can set 'h', 'midnight'
-args = ('vcsserver.log', 'D', 5, 10,)
-level = DEBUG
-formatter = generic
-
 ################
 ## FORMATTERS ##
 ################
diff --git a/default.nix b/default.nix
--- a/default.nix
+++ b/default.nix
@@ -64,10 +64,15 @@ let
       pkgs;
   };
 
+  version = builtins.readFile ./vcsserver/VERSION;
+
   pythonLocalOverrides = self: super: {
     rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: {
+      inherit
+        doCheck
+        version;
+      name = "rhodecode-vcsserver-${version}";
       src = rhodecode-vcsserver-src;
-      inherit doCheck;
 
       propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
         pkgs.git
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -120,13 +120,13 @@
     };
   };
   hgsubversion = super.buildPythonPackage {
-    name = "hgsubversion-1.8.5";
+    name = "hgsubversion-1.8.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [mercurial subvertpy];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f7/8d/3e5719405d4b0b57db7faaf472fb836ed4c437a82bd124a2a37707c33bff/hgsubversion-1.8.5.tar.gz";
-      md5 = "afc3f096fb4dacf1d9210811f81313e0";
+      url = "https://pypi.python.org/packages/ce/97/032e5093ad250e9908cea04395cbddb6902d587f712a79b53b2d778bdfdd/hgsubversion-1.8.6.tar.gz";
+      md5 = "9310cb266031cf8d0779885782a84a5b";
     };
   };
   infrae.cache = super.buildPythonPackage {
@@ -140,13 +140,13 @@
     };
   };
   mercurial = super.buildPythonPackage {
-    name = "mercurial-3.7.3";
+    name = "mercurial-3.8.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e8/a0/fe6bf60a314a30299c58a5ed67de9fffeae04731201f10dc2822befb062d/mercurial-3.7.3.tar.gz";
-      md5 = "f47c9c76b7bf429dafecb71fa81c01b4";
+      url = "https://pypi.python.org/packages/56/bc/af1561195d43638d44bc3ac286c21f187430966234bee1f235711d80dfb6/mercurial-3.8.3.tar.gz";
+      md5 = "97aced7018614eeccc9621a3dea35fda";
     };
   };
   mock = super.buildPythonPackage {
@@ -230,7 +230,7 @@
     };
   };
   rhodecode-vcsserver = super.buildPythonPackage {
-    name = "rhodecode-vcsserver-4.0.0";
+    name = "rhodecode-vcsserver-4.1.0";
     buildInputs = with self; [mock pytest WebTest];
     doCheck = true;
     propagatedBuildInputs = with self; [configobj dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid Pyro4 simplejson subprocess32 waitress WebOb];
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 Beaker==1.7.0
 configobj==5.0.6
 dulwich==0.12.0
-hgsubversion==1.8.5
+hgsubversion==1.8.6
 infrae.cache==1.0.1
-mercurial==3.7.3
+mercurial==3.8.3
 msgpack-python==0.4.6
 py==1.4.29
 pyramid==1.6.1
diff --git a/vcsserver/VERSION b/vcsserver/VERSION
--- a/vcsserver/VERSION
+++ b/vcsserver/VERSION
@@ -1,1 +1,1 @@
-4.0.1
\ No newline at end of file
+4.1.0
\ No newline at end of file