release: Merge default into stable for release preparation

.bumpversion.cfg

@@ -1,5 +1,5 b''
 [bumpversion]
-current_version = 4.1.2
+current_version = 4.2.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.1.2
+state = in_progress
+version = 4.2.0
 

default.nix

@@ -72,6 +72,7 b' let'
         doCheck
         version;
       name = "rhodecode-vcsserver-${version}";
+      releaseName = "RhodeCodeVCSServer-${version}";
       src = rhodecode-vcsserver-src;
 
       propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([

pkgs/python-packages.nix

@@ -90,13 +90,13 b''
     };
   };
   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 {

release.nix

@@ -1,10 +1,12 b''
 { pkgs ? import <nixpkgs> {}
+, doCheck ? true
 }:
 
 let
 
   vcsserver = import ./default.nix {
     inherit
+      doCheck
       pkgs;
   };
 

requirements.txt

@@ -1,6 +1,6 b''
 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

shell.nix

@@ -1,8 +1,13 b''
-{ 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: {
 

vcsserver/VERSION

@@ -1,1 +1,1 b''
-4.1.2
  No newline at end of file
+4.2.0
  No newline at end of file

vcsserver/hg.py

@@ -57,6 +57,14 b' 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
 
 

vcsserver/http_main.py

@@ -28,7 +28,7 b' 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 b' class ResponseFilter(object):'
 
 
 def main(global_config, **settings):
+    if MercurialFactory:
+        hgpatches.patch_largefiles_capabilities()
     app = HTTPApplication(settings=settings)
     return app.wsgi_app()