# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2016-06-30 16:49:37
# Node ID 897dca313dc9aff96dbf6d3d63b1f74ebb936626
# Parent  fdf03b789cf13e8cb686ac6bb162dbb2bcc83bbd
# Parent  368b34ff28030718afdc09105fcb4379c3891b54

release: Merge default into stable for release preparation

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.1.2
+current_version = 4.2.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:vcsserver/VERSION]
diff --git a/.release.cfg b/.release.cfg
--- a/.release.cfg
+++ b/.release.cfg
@@ -5,12 +5,10 @@ done = false
 done = true
 
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [release]
-state = prepared
-version = 4.1.2
+state = in_progress
+version = 4.2.0
 
diff --git a/default.nix b/default.nix
--- a/default.nix
+++ b/default.nix
@@ -72,6 +72,7 @@ let
         doCheck
         version;
       name = "rhodecode-vcsserver-${version}";
+      releaseName = "RhodeCodeVCSServer-${version}";
       src = rhodecode-vcsserver-src;
 
       propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -90,13 +90,13 @@
     };
   };
   dulwich = super.buildPythonPackage {
-    name = "dulwich-0.12.0";
+    name = "dulwich-0.13.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6f/04/fbe561b6d45c0ec758330d5b7f5ba4b6cb4f1ca1ab49859d2fc16320da75/dulwich-0.12.0.tar.gz";
-      md5 = "f3a8a12bd9f9dd8c233e18f3d49436fa";
+      url = "https://pypi.python.org/packages/84/95/732d280eee829dacc954e8109f97b47abcadcca472c2ab013e1635eb4792/dulwich-0.13.0.tar.gz";
+      md5 = "6dede0626657c2bd08f48ca1221eea91";
     };
   };
   greenlet = super.buildPythonPackage {
diff --git a/release.nix b/release.nix
--- a/release.nix
+++ b/release.nix
@@ -1,10 +1,12 @@
 { pkgs ? import <nixpkgs> {}
+, doCheck ? true
 }:
 
 let
 
   vcsserver = import ./default.nix {
     inherit
+      doCheck
       pkgs;
   };
 
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 Beaker==1.7.0
 configobj==5.0.6
-dulwich==0.12.0
+dulwich==0.13.0
 hgsubversion==1.8.6
 infrae.cache==1.0.1
 mercurial==3.8.3
diff --git a/shell.nix b/shell.nix
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,13 @@
-{ pkgs ? (import <nixpkgs> {})
+{ pkgs ? import <nixpkgs> {}
+,  doCheck ? false
 }:
 
 let
-  vcsserver = import ./default.nix {inherit pkgs;};
+  vcsserver = import ./default.nix {
+    inherit
+      doCheck
+      pkgs;
+  };
 
 in vcsserver.override (attrs: {
 
diff --git a/vcsserver/VERSION b/vcsserver/VERSION
--- a/vcsserver/VERSION
+++ b/vcsserver/VERSION
@@ -1,1 +1,1 @@
-4.1.2
\ No newline at end of file
+4.2.0
\ No newline at end of file
diff --git a/vcsserver/hg.py b/vcsserver/hg.py
--- a/vcsserver/hg.py
+++ b/vcsserver/hg.py
@@ -57,6 +57,14 @@ def make_ui_from_config(repo_config):
     # signal in a non-main thread, thus generating a ValueError.
     baseui.setconfig('worker', 'numcpus', 1)
 
+    # If there is no config for the largefiles extension, we explicitly disable
+    # it here. This overrides settings from repositories hgrc file. Recent
+    # mercurial versions enable largefiles in hgrc on clone from largefile
+    # repo.
+    if not baseui.hasconfig('extensions', 'largefiles'):
+        log.debug('Explicitly disable largefiles extension for repo.')
+        baseui.setconfig('extensions', 'largefiles', '!')
+
     return baseui
 
 
diff --git a/vcsserver/http_main.py b/vcsserver/http_main.py
--- a/vcsserver/http_main.py
+++ b/vcsserver/http_main.py
@@ -28,7 +28,7 @@ from beaker.util import parse_cache_conf
 from pyramid.config import Configurator
 from pyramid.wsgi import wsgiapp
 
-from vcsserver import remote_wsgi, scm_app, settings
+from vcsserver import remote_wsgi, scm_app, settings, hgpatches
 from vcsserver.echo_stub import remote_wsgi as remote_wsgi_stub
 from vcsserver.echo_stub.echo_app import EchoApp
 from vcsserver.server import VcsServer
@@ -331,5 +331,7 @@ class ResponseFilter(object):
 
 
 def main(global_config, **settings):
+    if MercurialFactory:
+        hgpatches.patch_largefiles_capabilities()
     app = HTTPApplication(settings=settings)
     return app.wsgi_app()