##// END OF EJS Templates
release: Merge default into stable for release preparation
marcink -
r37:897dca31 merge stable
parent child
Show More
@@ -1,5 +1,5
1 [bumpversion]
1 [bumpversion]
2 current_version = 4.1.2
2 current_version = 4.2.0
3 message = release: Bump version {current_version} to {new_version}
3 message = release: Bump version {current_version} to {new_version}
4
4
5 [bumpversion:file:vcsserver/VERSION]
5 [bumpversion:file:vcsserver/VERSION]
@@ -5,12 +5,10 done = false
5 done = true
5 done = true
6
6
7 [task:fixes_on_stable]
7 [task:fixes_on_stable]
8 done = true
9
8
10 [task:pip2nix_generated]
9 [task:pip2nix_generated]
11 done = true
12
10
13 [release]
11 [release]
14 state = prepared
12 state = in_progress
15 version = 4.1.2
13 version = 4.2.0
16
14
@@ -72,6 +72,7 let
72 doCheck
72 doCheck
73 version;
73 version;
74 name = "rhodecode-vcsserver-${version}";
74 name = "rhodecode-vcsserver-${version}";
75 releaseName = "RhodeCodeVCSServer-${version}";
75 src = rhodecode-vcsserver-src;
76 src = rhodecode-vcsserver-src;
76
77
77 propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
78 propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
@@ -90,13 +90,13
90 };
90 };
91 };
91 };
92 dulwich = super.buildPythonPackage {
92 dulwich = super.buildPythonPackage {
93 name = "dulwich-0.12.0";
93 name = "dulwich-0.13.0";
94 buildInputs = with self; [];
94 buildInputs = with self; [];
95 doCheck = false;
95 doCheck = false;
96 propagatedBuildInputs = with self; [];
96 propagatedBuildInputs = with self; [];
97 src = fetchurl {
97 src = fetchurl {
98 url = "https://pypi.python.org/packages/6f/04/fbe561b6d45c0ec758330d5b7f5ba4b6cb4f1ca1ab49859d2fc16320da75/dulwich-0.12.0.tar.gz";
98 url = "https://pypi.python.org/packages/84/95/732d280eee829dacc954e8109f97b47abcadcca472c2ab013e1635eb4792/dulwich-0.13.0.tar.gz";
99 md5 = "f3a8a12bd9f9dd8c233e18f3d49436fa";
99 md5 = "6dede0626657c2bd08f48ca1221eea91";
100 };
100 };
101 };
101 };
102 greenlet = super.buildPythonPackage {
102 greenlet = super.buildPythonPackage {
@@ -1,10 +1,12
1 { pkgs ? import <nixpkgs> {}
1 { pkgs ? import <nixpkgs> {}
2 , doCheck ? true
2 }:
3 }:
3
4
4 let
5 let
5
6
6 vcsserver = import ./default.nix {
7 vcsserver = import ./default.nix {
7 inherit
8 inherit
9 doCheck
8 pkgs;
10 pkgs;
9 };
11 };
10
12
@@ -1,6 +1,6
1 Beaker==1.7.0
1 Beaker==1.7.0
2 configobj==5.0.6
2 configobj==5.0.6
3 dulwich==0.12.0
3 dulwich==0.13.0
4 hgsubversion==1.8.6
4 hgsubversion==1.8.6
5 infrae.cache==1.0.1
5 infrae.cache==1.0.1
6 mercurial==3.8.3
6 mercurial==3.8.3
@@ -1,8 +1,13
1 { pkgs ? (import <nixpkgs> {})
1 { pkgs ? import <nixpkgs> {}
2 , doCheck ? false
2 }:
3 }:
3
4
4 let
5 let
5 vcsserver = import ./default.nix {inherit pkgs;};
6 vcsserver = import ./default.nix {
7 inherit
8 doCheck
9 pkgs;
10 };
6
11
7 in vcsserver.override (attrs: {
12 in vcsserver.override (attrs: {
8
13
@@ -1,1 +1,1
1 4.1.2 No newline at end of file
1 4.2.0 No newline at end of file
@@ -57,6 +57,14 def make_ui_from_config(repo_config):
57 # signal in a non-main thread, thus generating a ValueError.
57 # signal in a non-main thread, thus generating a ValueError.
58 baseui.setconfig('worker', 'numcpus', 1)
58 baseui.setconfig('worker', 'numcpus', 1)
59
59
60 # If there is no config for the largefiles extension, we explicitly disable
61 # it here. This overrides settings from repositories hgrc file. Recent
62 # mercurial versions enable largefiles in hgrc on clone from largefile
63 # repo.
64 if not baseui.hasconfig('extensions', 'largefiles'):
65 log.debug('Explicitly disable largefiles extension for repo.')
66 baseui.setconfig('extensions', 'largefiles', '!')
67
60 return baseui
68 return baseui
61
69
62
70
@@ -28,7 +28,7 from beaker.util import parse_cache_conf
28 from pyramid.config import Configurator
28 from pyramid.config import Configurator
29 from pyramid.wsgi import wsgiapp
29 from pyramid.wsgi import wsgiapp
30
30
31 from vcsserver import remote_wsgi, scm_app, settings
31 from vcsserver import remote_wsgi, scm_app, settings, hgpatches
32 from vcsserver.echo_stub import remote_wsgi as remote_wsgi_stub
32 from vcsserver.echo_stub import remote_wsgi as remote_wsgi_stub
33 from vcsserver.echo_stub.echo_app import EchoApp
33 from vcsserver.echo_stub.echo_app import EchoApp
34 from vcsserver.server import VcsServer
34 from vcsserver.server import VcsServer
@@ -331,5 +331,7 class ResponseFilter(object):
331
331
332
332
333 def main(global_config, **settings):
333 def main(global_config, **settings):
334 if MercurialFactory:
335 hgpatches.patch_largefiles_capabilities()
334 app = HTTPApplication(settings=settings)
336 app = HTTPApplication(settings=settings)
335 return app.wsgi_app()
337 return app.wsgi_app()
General Comments 0
You need to be logged in to leave comments. Login now