release: Merge default into stable for release preparation

.bumpversion.cfg

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

.hgignore

@@ -21,8 +21,7 b' syntax: regexp'
 ^\.cache.*$
 ^\.rhodecode$
 
-^_dev
-^._dev
+^.dev
 ^build/
 ^coverage\.xml$
 ^data$

.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.10.6
+state = in_progress
+version = 4.11.0
 

default.nix

@@ -137,6 +137,7 b' let'
         # We ensure that always the correct version is available as a symlink.
         # So that users calling them via the profile path will always use the
         # correct version.
+        ln -s ${self.python}/bin/python $out/bin
         ln -s ${pkgs.git}/bin/git $out/bin
         ln -s ${self.mercurial}/bin/hg $out/bin
         ln -s ${pkgs.subversion}/bin/svn* $out/bin

pkgs/python-packages-overrides.nix

@@ -24,6 +24,13 b' self: super: {'
     '';
   });
 
+  hgsubversion = super.hgsubversion.override (attrs: {
+    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      pkgs.sqlite
+      basePythonPackages.sqlite3
+    ];
+  });
+
   mercurial = super.mercurial.override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       self.python.modules.curses

pkgs/python-packages.nix

@@ -16,13 +16,13 b''
     };
   };
   Jinja2 = super.buildPythonPackage {
-    name = "Jinja2-2.8";
+    name = "Jinja2-2.9.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [MarkupSafe];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f2/2f/0b98b06a345a761bec91a079ccae392d282690c2d8272e708f4d10829e22/Jinja2-2.8.tar.gz";
-      md5 = "edb51693fe22c53cee5403775c71a99e";
+      url = "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+      md5 = "6411537324b4dba0956aaa8109f3c77b";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -42,13 +42,13 b''
     };
   };
   MarkupSafe = super.buildPythonPackage {
-    name = "MarkupSafe-0.23";
+    name = "MarkupSafe-1.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz";
-      md5 = "f5ab3deee4c37cd6a922fb81e730da6e";
+      url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+      md5 = "2fcedc9284d50e577b5192e8e3578355";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -81,13 +81,13 b''
     };
   };
   WebTest = super.buildPythonPackage {
-    name = "WebTest-2.0.27";
+    name = "WebTest-2.0.29";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six WebOb waitress beautifulsoup4];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/80/fa/ca3a759985c72e3a124cbca3e1f8a2e931a07ffd31fd45d8f7bf21cb95cf/WebTest-2.0.27.tar.gz";
-      md5 = "54e6515ac71c51b6fc90179483c749ad";
+      url = "https://pypi.python.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz";
+      md5 = "30b4cf0d340b9a5335fac4389e6f84fc";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -159,13 +159,13 b''
     };
   };
   decorator = super.buildPythonPackage {
-    name = "decorator-4.0.11";
+    name = "decorator-4.1.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cc/ac/5a16f1fc0506ff72fcc8fd4e858e3a1c231f224ab79bb7c4c9b2094cc570/decorator-4.0.11.tar.gz";
-      md5 = "73644c8f0bd4983d1b6a34b49adec0ae";
+      url = "https://pypi.python.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
+      md5 = "a0f7f4fe00ae2dde93494d90c192cf8c";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
@@ -224,16 +224,16 b''
     };
   };
   gprof2dot = super.buildPythonPackage {
-    name = "gprof2dot-2016.10.13";
+    name = "gprof2dot-2017.9.19";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a0/e0/73c71baed306f0402a00a94ffc7b2be94ad1296dfcb8b46912655b93154c/gprof2dot-2016.10.13.tar.gz";
-      md5 = "0125401f15fd2afe1df686a76c64a4fd";
+      url = "https://pypi.python.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
+      md5 = "cda2d552bb0d0b9f16e6824a9aabd225";
     };
     meta = {
-      license = [ { fullName = "LGPL"; } ];
+      license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
     };
   };
   greenlet = super.buildPythonPackage {
@@ -263,26 +263,26 b''
     };
   };
   hg-evolve = super.buildPythonPackage {
-    name = "hg-evolve-6.6.0";
+    name = "hg-evolve-7.0.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/c5/04/3557c97eaa320b5a6769edade64a299cd2710f5f3b818f64991ab6c8c08f/hg-evolve-6.6.0.tar.gz";
-      md5 = "06b9a9c8e8137bbf0c4fbf940c009725";
+      url = "https://pypi.python.org/packages/92/5c/4c216be1a08f326a12076b645f4892a2b0865810db1f4a0c9648f1f4c113/hg-evolve-7.0.1.tar.gz";
+      md5 = "2dfa926846ea873a8406bababb06b277";
     };
     meta = {
       license = [ { fullName = "GPLv2+"; } ];
     };
   };
   hgsubversion = super.buildPythonPackage {
-    name = "hgsubversion-1.8.7";
+    name = "hgsubversion-1.9";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [mercurial subvertpy];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/1c/b8/ff4d2e0ec486f9765b410f09728c02a010e7485d68d6154968074498a403/hgsubversion-1.8.7.tar.gz";
-      md5 = "289f1c36c13bd6a3435a9be390a77bdc";
+      url = "https://pypi.python.org/packages/db/26/7293a6c6b85e2a74ab452e9ba7f00b04ff0e440e6cd4f84131ac5d5e6b22/hgsubversion-1.9.tar.gz";
+      md5 = "0c6f93ef12cc2e7fe67286f16bcc7211";
     };
     meta = {
       license = [ pkgs.lib.licenses.gpl1 ];
@@ -354,13 +354,13 b''
     };
   };
   mercurial = super.buildPythonPackage {
-    name = "mercurial-4.2.3";
+    name = "mercurial-4.4.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://www.mercurial-scm.org/release/mercurial-4.2.3.tar.gz";
-      md5 = "a24a8fab7c2ad2c65e945b1b35d94e3b";
+      url = "https://pypi.python.org/packages/d0/83/92a5fa662ba277128db305e39e7ea5a638f2f1cbbc6dc5fbf4c14aefae22/mercurial-4.4.2.tar.gz";
+      md5 = "95769125cf7e9dbc341a983253acefcd";
     };
     meta = {
       license = [ pkgs.lib.licenses.gpl1 pkgs.lib.licenses.gpl2Plus ];
@@ -406,13 +406,13 b''
     };
   };
   pexpect = super.buildPythonPackage {
-    name = "pexpect-4.2.1";
+    name = "pexpect-4.3.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [ptyprocess];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/e8/13/d0b0599099d6cd23663043a2a0bb7c61e58c6ba359b2656e6fb000ef5b98/pexpect-4.2.1.tar.gz";
-      md5 = "3694410001a99dff83f0b500a1ca1c95";
+      url = "https://pypi.python.org/packages/f8/44/5466c30e49762bb92e442bbdf4472d6904608d211258eb3198a11f0309a4/pexpect-4.3.0.tar.gz";
+      md5 = "047a486dcd26134b74f2e67046bb61a0";
     };
     meta = {
       license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
@@ -432,26 +432,26 b''
     };
   };
   plaster = super.buildPythonPackage {
-    name = "plaster-0.5";
+    name = "plaster-1.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/99/b3/d7ca1fe31d2b56dba68a238721fda6820770f9c2a3de17a582d4b5b2edcc/plaster-0.5.tar.gz";
-      md5 = "c59345a67a860cfcaa1bd6a81451399d";
+      url = "https://pypi.python.org/packages/37/e1/56d04382d718d32751017d32f351214384e529b794084eee20bb52405563/plaster-1.0.tar.gz";
+      md5 = "80e6beb4760c16fea31754babcc0576e";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   plaster-pastedeploy = super.buildPythonPackage {
-    name = "plaster-pastedeploy-0.4.1";
+    name = "plaster-pastedeploy-0.4.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [PasteDeploy plaster];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9d/6e/f8be01ed41c94e6c54ac97cf2eb142a702aae0c8cce31c846f785e525b40/plaster_pastedeploy-0.4.1.tar.gz";
-      md5 = "f48d5344b922e56c4978eebf1cd2e0d3";
+      url = "https://pypi.python.org/packages/2c/62/0daf9c0be958e785023e583e51baac15863699e956bfb3d448898d80edd8/plaster_pastedeploy-0.4.2.tar.gz";
+      md5 = "58fd7852002909378e818c9d5b71e90a";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -484,13 +484,13 b''
     };
   };
   py = super.buildPythonPackage {
-    name = "py-1.4.34";
+    name = "py-1.5.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/68/35/58572278f1c097b403879c1e9369069633d1cbad5239b9057944bb764782/py-1.4.34.tar.gz";
-      md5 = "d9c3d8f734b0819ff48e355d77bf1730";
+      url = "https://pypi.python.org/packages/90/e3/e075127d39d35f09a500ebb4a90afd10f9ef0a1d28a6d09abeec0e444fdd/py-1.5.2.tar.gz";
+      md5 = "279ca69c632069e1b71e11b14641ca28";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -523,13 +523,13 b''
     };
   };
   pyramid-jinja2 = super.buildPythonPackage {
-    name = "pyramid-jinja2-2.5";
+    name = "pyramid-jinja2-2.7";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a1/80/595e26ffab7deba7208676b6936b7e5a721875710f982e59899013cae1ed/pyramid_jinja2-2.5.tar.gz";
-      md5 = "07cb6547204ac5e6f0b22a954ccee928";
+      url = "https://pypi.python.org/packages/d8/80/d60a7233823de22ce77bd864a8a83736a1fe8b49884b08303a2e68b2c853/pyramid_jinja2-2.7.tar.gz";
+      md5 = "c2f8b2cd7b73a6f1d9a311fcfaf4fb92";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -549,13 +549,13 b''
     };
   };
   pytest = super.buildPythonPackage {
-    name = "pytest-3.1.2";
+    name = "pytest-3.2.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [py setuptools];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/72/2b/2d3155e01f45a5a04427857352ee88220ee39550b2bc078f9db3190aea46/pytest-3.1.2.tar.gz";
-      md5 = "c4d179f89043cc925e1c169d03128e02";
+      url = "https://pypi.python.org/packages/1f/f8/8cd74c16952163ce0db0bd95fdd8810cbf093c08be00e6e665ebf0dc3138/pytest-3.2.5.tar.gz";
+      md5 = "6dbe9bb093883f75394a689a1426ac6f";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -588,39 +588,39 b''
     };
   };
   pytest-profiling = super.buildPythonPackage {
-    name = "pytest-profiling-1.2.6";
+    name = "pytest-profiling-1.2.11";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six pytest gprof2dot];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f9/0d/df67fb9ce16c2cef201693da956321b1bccfbf9a4ead39748b9f9d1d74cb/pytest-profiling-1.2.6.tar.gz";
-      md5 = "50eb4c66c3762a2f1a49669bedc0b894";
+      url = "https://pypi.python.org/packages/c0/4a/b4aa786e93c07a86f1f87c581a36bf355a9e06a9da7e00dbd05047626bd2/pytest-profiling-1.2.11.tar.gz";
+      md5 = "9ef6b60248731be5d44477980408e8f7";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   pytest-runner = super.buildPythonPackage {
-    name = "pytest-runner-2.11.1";
+    name = "pytest-runner-3.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/9e/4d/08889e5e27a9f5d6096b9ad257f4dea1faabb03c5ded8f665ead448f5d8a/pytest-runner-2.11.1.tar.gz";
-      md5 = "bdb73eb18eca2727944a2dcf963c5a81";
+      url = "https://pypi.python.org/packages/65/b4/ae89338cd2d81e2cc54bd6db2e962bfe948f612303610d68ab24539ac2d1/pytest-runner-3.0.tar.gz";
+      md5 = "8f8363a52bbabc4cedd5e239beb2ba11";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   pytest-sugar = super.buildPythonPackage {
-    name = "pytest-sugar-0.8.0";
+    name = "pytest-sugar-0.9.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pytest termcolor];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a5/b0/b2773dee078f17773a5bf2dfad49b0be57b6354bbd84bbefe4313e509d87/pytest-sugar-0.8.0.tar.gz";
-      md5 = "8cafbdad648068e0e44b8fc5f9faae42";
+      url = "https://pypi.python.org/packages/49/d8/c5ff6cca3ce2ebd8b73eec89779bf6b4a7737456a70e8ea4d44c1ff90f71/pytest-sugar-0.9.0.tar.gz";
+      md5 = "89fbff17277fa6a95a560a04b68cb9f9";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -640,20 +640,20 b''
     };
   };
   repoze.lru = super.buildPythonPackage {
-    name = "repoze.lru-0.6";
+    name = "repoze.lru-0.7";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/6e/1e/aa15cc90217e086dc8769872c8778b409812ff036bf021b15795638939e4/repoze.lru-0.6.tar.gz";
-      md5 = "2c3b64b17a8e18b405f55d46173e14dd";
+      url = "https://pypi.python.org/packages/12/bc/595a77c4b5e204847fdf19268314ef59c85193a9dc9f83630fc459c0fee5/repoze.lru-0.7.tar.gz";
+      md5 = "c08cc030387e0b1fc53c5c7d964b35e2";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
   rhodecode-vcsserver = super.buildPythonPackage {
-    name = "rhodecode-vcsserver-4.10.6";
+    name = "rhodecode-vcsserver-4.11.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 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];
@@ -663,13 +663,13 b''
     };
   };
   scandir = super.buildPythonPackage {
-    name = "scandir-1.5";
+    name = "scandir-1.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/bd/f4/3143e0289faf0883228017dbc6387a66d0b468df646645e29e1eb89ea10e/scandir-1.5.tar.gz";
-      md5 = "a2713043de681bba6b084be42e7a8a44";
+      url = "https://pypi.python.org/packages/77/3f/916f524f50ee65e3f465a280d2851bd63685250fddb3020c212b3977664d/scandir-1.6.tar.gz";
+      md5 = "0180ddb97c96cbb2d4f25d2ae11c64ac";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
@@ -715,13 +715,13 b''
     };
   };
   six = super.buildPythonPackage {
-    name = "six-1.9.0";
+    name = "six-1.11.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/16/64/1dc5e5976b17466fd7d712e59cbe9fb1e18bec153109e5ba3ed6c9102f1a/six-1.9.0.tar.gz";
-      md5 = "476881ef4012262dfc8adc645ee786c4";
+      url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+      md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -741,16 +741,16 b''
     };
   };
   subvertpy = super.buildPythonPackage {
-    name = "subvertpy-0.9.3";
+    name = "subvertpy-0.10.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/subvertpy/archive/subvertpy-0.9.3.tar.gz?md5=4e49da2fe07608239cc9a80a7bb8f33c";
-      md5 = "4e49da2fe07608239cc9a80a7bb8f33c";
+      url = "https://pypi.python.org/packages/9d/76/99fa82affce75f5ac0f7dbe513796c3f37311ace0c68e1b063683b4f9b99/subvertpy-0.10.1.tar.gz";
+      md5 = "a70e03579902d480f5e9f8c570f6536b";
     };
     meta = {
-      license = [ pkgs.lib.licenses.lgpl21Plus ];
+      license = [ pkgs.lib.licenses.lgpl21Plus pkgs.lib.licenses.gpl2Plus ];
     };
   };
   termcolor = super.buildPythonPackage {
@@ -806,13 +806,13 b''
     };
   };
   waitress = super.buildPythonPackage {
-    name = "waitress-1.0.2";
+    name = "waitress-1.1.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/cd/f4/400d00863afa1e03618e31fd7e2092479a71b8c9718b00eb1eeb603746c6/waitress-1.0.2.tar.gz";
-      md5 = "b968f39e95d609f6194c6e50425d4bb7";
+      url = "https://pypi.python.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
+      md5 = "0f1eb7fdfdbf2e6d18decbda1733045c";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpt21 ];

requirements.txt

@@ -3,24 +3,23 b' setuptools==30.1.0'
 
 Beaker==1.9.0
 configobj==5.0.6
-decorator==4.0.11
+decorator==4.1.2
 dulwich==0.13.0
-hgsubversion==1.8.7
-hg-evolve==6.6.0
+hgsubversion==1.9.0
+hg-evolve==7.0.1
 infrae.cache==1.0.1
-mercurial==4.2.3
+mercurial==4.4.2
 msgpack-python==0.4.8
-pyramid-jinja2==2.5
+pyramid-jinja2==2.7
 pyramid==1.9.1
 pyramid-mako==1.0.2
-repoze.lru==0.6
+repoze.lru==0.7
 simplejson==3.11.1
 subprocess32==3.2.7
 
-# Custom subvertpy that is not available on pypi.
-https://code.rhodecode.com/upstream/subvertpy/archive/subvertpy-0.9.3.tar.gz?md5=4e49da2fe07608239cc9a80a7bb8f33c#egg=subvertpy==0.9.3
+subvertpy==0.10.1
 
-six==1.9.0
+six==1.11.0
 translationstring==1.3
 WebOb==1.7.4
 wheel==0.29.0
@@ -31,7 +30,7 b' zope.interface==4.1.3'
 gevent==1.2.2
 greenlet==0.4.12
 gunicorn==19.7.1
-waitress==1.0.2
+waitress==1.1.0
 
 ## debug
 ipdb==0.10.3

requirements_test.txt

@@ -1,15 +1,15 b''
 # test related requirements
-pytest==3.1.2
-py==1.4.34
+pytest==3.2.5
+py==1.5.2
 pytest-cov==2.5.1
-pytest-sugar==0.8.0
-pytest-runner==2.11.1
+pytest-sugar==0.9.0
+pytest-runner==3.0.0
 pytest-catchlog==1.2.2
-pytest-profiling==1.2.6
-gprof2dot==2016.10.13
+pytest-profiling==1.2.11
+gprof2dot==2017.9.19
 pytest-timeout==1.2.0
 
 mock==1.0.1
-WebTest==2.0.27
+WebTest==2.0.29
 cov-core==1.15.0
 coverage==3.7.1

vcsserver/VERSION

@@ -1,1 +1,1 b''
-4.10.6
  No newline at end of file
+4.11.0
  No newline at end of file

vcsserver/__init__.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/base.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/exceptions.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/git.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 b' import os'
 import posixpath as vcspath
 import re
 import stat
+import traceback
 import urllib
 import urllib2
 from functools import wraps
@@ -124,11 +125,15 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def assert_correct_path(self, wire):
+        path = wire.get('path')
         try:
             self._factory.repo(wire)
         except NotGitRepository as e:
-            # Exception can contain unicode which we convert
-            raise exceptions.AbortException(repr(e))
+            tb = traceback.format_exc()
+            log.debug("Invalid Git path `%s`, tb: %s", path, tb)
+            return False
+
+        return True
 
     @reraise_safe_exceptions
     def bare(self, wire):
@@ -442,6 +447,14 b' class GitRemote(object):'
             return remote_refs
 
     @reraise_safe_exceptions
+    def sync_push(self, wire, url, refs=None):
+        if self.check_url(url, wire):
+            repo = self._factory.repo(wire)
+            self.run_git_command(
+                wire, ['push', url, '--mirror'], fail_on_stderr=False)
+
+
+    @reraise_safe_exceptions
     def get_remote_refs(self, wire, url):
         repo = Repo(url)
         return repo.get_refs()

vcsserver/git_lfs/__init__.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/git_lfs/app.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/git_lfs/lib.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/git_lfs/tests/__init__.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/git_lfs/tests/test_lfs_app.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/git_lfs/tests/test_lib.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/git_lfs/utils.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/hg.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 b' def make_ui_from_config(repo_config):'
     # make our hgweb quiet so it doesn't print output
     baseui.setconfig('ui', 'quiet', 'true')
 
+    baseui.setconfig('ui', 'paginate', 'never')
     # force mercurial to only use 1 thread, otherwise it may try to set a
     # signal in a non-main thread, thus generating a ValueError.
     baseui.setconfig('worker', 'numcpus', 1)
@@ -453,10 +454,9 b' class HgRemote(object):'
         fctx = ctx.filectx(path)
 
         result = []
-        for i, annotate_data in enumerate(fctx.annotate()):
+        for i, (a_line, content) in enumerate(fctx.annotate()):
             ln_no = i + 1
-            node_info, content = annotate_data
-            sha = hex(node_info[0].node())
+            sha = hex(a_line.fctx.node())
             result.append((ln_no, sha, content))
         return result
 
@@ -561,6 +561,15 b' class HgRemote(object):'
             repo, remote, heads=commit_ids, force=None).cgresult
 
     @reraise_safe_exceptions
+    def sync_push(self, wire, url):
+        if self.check_url(url, wire['config']):
+            repo = self._factory.repo(wire)
+            bookmarks = dict(repo._bookmarks).keys()
+            remote = peer(repo, {}, url)
+            return exchange.push(
+                repo, remote, newbranch=True, bookmarks=bookmarks).cgresult
+
+    @reraise_safe_exceptions
     def revision(self, wire, rev):
         repo = self._factory.repo(wire)
         ctx = repo[rev]

vcsserver/hgcompat.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 b' Mercurial libs compatibility'
 """
 
 import mercurial
-import mercurial.demandimport
+from mercurial import demandimport
 # patch demandimport, due to bug in mercurial when it always triggers
 # demandimport.enable()
-mercurial.demandimport.enable = lambda *args, **kwargs: 1
+demandimport.enable = lambda *args, **kwargs: 1
 
 from mercurial import ui
 from mercurial import patch

vcsserver/hgpatches.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/hooks.py

@@ -1,7 +1,7 b''
 # -*- coding: utf-8 -*-
 
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/http_main.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -331,6 +331,8 b' class HTTPApplication(object):'
         username = dict_conf.get('username')
         if username:
             environ['REMOTE_USER'] = username
+            # mercurial specific, some extension api rely on this
+            environ['HGUSER'] = username
 
         ip = dict_conf.get('ip')
         if ip:

vcsserver/pygrack.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/remote_wsgi.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/scm_app.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/server.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/settings.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/subprocessio.py

@@ -45,7 +45,7 b' class StreamFeeder(Thread):'
             self.bytes = bytes(source)
         else:  # can be either file pointer or file-like
             if type(source) in (int, long):  # file pointer it is
-                ## converting file descriptor (int) stdin into file-like
+                # converting file descriptor (int) stdin into file-like
                 try:
                     source = os.fdopen(source, 'rb', 16384)
                 except Exception:
@@ -118,7 +118,7 b' class InputStreamChunker(Thread):'
         t = self.target
         cs = self.chunk_size
         ccm = self.chunk_count_max
-        kr = self.keep_reading
+        keep_reading = self.keep_reading
         da = self.data_added
         go = self.go
 
@@ -129,15 +129,13 b' class InputStreamChunker(Thread):'
 
         while b and go.is_set():
             if len(t) > ccm:
-                kr.clear()
-                kr.wait(2)
-                # # this only works on 2.7.x and up
-                # if not kr.wait(10):
-                #     raise Exception("Timed out while waiting for input to be read.")
-                # instead we'll use this
-                if len(t) > ccm + 3:
-                    raise IOError(
-                        "Timed out while waiting for input from subprocess.")
+                keep_reading.clear()
+                keep_reading.wait(2)
+
+                if not keep_reading.wait(10):
+                    raise Exception(
+                        "Timed out while waiting for input to be read.")
+
             t.append(b)
             da.set()
             b = s.read(cs)
@@ -159,7 +157,8 b' class BufferedGenerator(object):'
     """
 
     def __init__(self, source, buffer_size=65536, chunk_size=4096,
-                 starting_values=[], bottomless=False):
+                 starting_values=None, bottomless=False):
+        starting_values = starting_values or []
 
         if bottomless:
             maxlen = int(buffer_size / chunk_size)
@@ -190,9 +189,9 b' class BufferedGenerator(object):'
         elif self.worker.EOF.is_set():
             raise StopIteration
 
-    def throw(self, type, value=None, traceback=None):
+    def throw(self, exc_type, value=None, traceback=None):
         if not self.worker.EOF.is_set():
-            raise type(value)
+            raise exc_type(value)
 
     def start(self):
         self.worker.start()
@@ -354,7 +353,7 b' class SubprocessIOChunker(object):'
     _closed = False
 
     def __init__(self, cmd, inputstream=None, buffer_size=65536,
-                 chunk_size=4096, starting_values=[], fail_on_stderr=True,
+                 chunk_size=4096, starting_values=None, fail_on_stderr=True,
                  fail_on_return_code=True, **kwargs):
         """
         Initializes SubprocessIOChunker
@@ -370,6 +369,7 b' class SubprocessIOChunker(object):'
                                     exception if the return code is not 0.
         """
 
+        starting_values = starting_values or []
         if inputstream:
             input_streamer = StreamFeeder(inputstream)
             input_streamer.start()
@@ -417,6 +417,10 b' class SubprocessIOChunker(object):'
                     "Subprocess exited due to an error:\n" + err)
             if _returncode and fail_on_return_code:
                 err = ''.join(bg_err)
+                if not err:
+                    # maybe get empty stderr, try stdout instead
+                    # in many cases git reports the errors on stdout too
+                    err = ''.join(bg_out)
                 raise EnvironmentError(
                     "Subprocess exited with non 0 ret code:%s: stderr:%s" % (
                         _returncode, err))
@@ -434,6 +438,7 b' class SubprocessIOChunker(object):'
         # are doing some magic in between closing stdout and terminating the
         # process and, as a result,  we are not getting return code on "slow"
         # systems.
+        result = None
         stop_iteration = None
         try:
             result = self.output.next()

vcsserver/svn.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/conftest.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/fixture.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_git.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_hg.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_hgpatches.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -83,6 +83,11 b' def test_dynamic_capabilities_uses_large'
     assert LARGEFILES_CAPABILITY in caps
 
 
+def test_hgsubversion_import():
+    from hgsubversion import svnrepo
+    assert svnrepo
+
+
 @pytest.fixture
 def patched_capabilities(request):
     """

vcsserver/tests/test_hooks.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_main_http.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_pygrack.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_scm_app.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_server.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_subprocessio.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_svn.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tests/test_wsgi_app_caller.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/tweens.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/utils.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

vcsserver/wsgi_app_caller.py

@@ -1,5 +1,5 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
-# Copyright (C) 2014-2017 RodeCode GmbH
+# Copyright (C) 2014-2018 RhodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by