release: Merge default into stable for release preparation

.babelrc

@@ -0,0 +1,10 b''
+{
+  "presets": [
+    ["env", {
+      "targets": {
+        "browsers": ["last 2 versions"]
+      }
+    }]
+  ],
+  "plugins": ["transform-object-rest-spread"]
+}

docs/integrations/integrations-rcextensions.rst

@@ -0,0 +1,44 b''
+.. _integrations-rcextensions:
+
+
+rcextensions integrations
+=========================
+
+
+Since RhodeCode 4.14 release rcextensions aren't part of rhodecode-tools, and instead
+they are shipped with the new or upgraded installations.
+
+The rcextensions template `rcextensions.tmpl` is created in the `etc/` directory
+of enterprise or community installation. It's always re-created and updated on upgrades.
+
+
+Activating rcextensions
++++++++++++++++++++++++
+
+To activate rcextensions simply copy or rename the created template rcextensions
+into the path where the rhodecode.ini file is located::
+
+    pushd ~/rccontrol/enterprise-1/
+    or
+    pushd ~/rccontrol/community-1/
+
+    mv etc/rcextensions.tmpl rcextensions
+
+
+rcextensions are loaded when |RCE| starts. So a restart is required after activation or
+change of code in rcextensions.
+
+Simply restart only the enterprise/community instance::
+
+    rccontrol restart enterprise-1
+    or
+    rccontrol restart community-1
+
+
+Example usage
++++++++++++++
+
+
+To see examples of usage please check the examples directory under:
+
+https://code.rhodecode.com/rhodecode-enterprise-ce/files/stable/rhodecode/config/rcextensions/examples

docs/release-notes/release-notes-4.14.0.rst

@@ -0,0 +1,114 b''
+|RCE| 4.14.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2018-11-02
+
+
+New Features
+^^^^^^^^^^^^
+
+- Diffs: expose range diff inside the PR view. It's now possible to show
+  commit-per-commit view of changes in pull request.
+- Diffs: new sticky context bar.
+  When browsing diffs we show file path of the current diff so users are aware all the time
+  what file they are reviewing.
+- Diffs: added quick file selector in diffs views. Now it's possible to select a file
+  in large diffs from the sticky header for quicker access to certain interesting files
+  in diffs.
+- Diffs: introducing diff menu for whitespace toggle and context changes.
+  It's now possible to show/hide whitespace changes and toggle the file context in
+  all diff places including pull requests.
+- Comments: allow commenting on empty files without content.
+- Repositories: added option to archive repositories instead of deleting them.
+  Archived repositories are useful for future auditing, but they are read-only.
+- rcextensions: new rcextensions. We're introducing new `rcextensions` that will be base
+  for future low-level integrations. It's now possible to expose nice messages back
+  to the users when using `rcextensions`.
+- Summary page: slightly re-organize summary page for better user experience.
+
+
+General
+^^^^^^^
+
+- Mailing: switched from custom library to pyramid_mailer with python3 compatibility.
+- Frontend: Switched to Polymer 3.0.
+- Frontend: fixed problems with IE11 and brought back support for that browser.
+- Git: use a fetch_sync based creation of remote repositories.
+  This fixes problems with importing from Bitbucket.
+- Comments: update comments email templates.
+- Packaging: only wrap external dependency scripts. This makes execution of scripts
+  roughly 5x faster due to much smaller PATH tree.
+- HTTP: use application wide detection of invalid bytes sent via URL/GET/POST data.
+- Fonts/UI: use consistent fonts across the whole application.
+  Few places had non-standard custom fonts.
+- Google: updated google auth plugin with latest API changes.
+- Core: handle edge case requesting matched routes but with hg/svn/git or api context.
+- Dependencies: bumped rhodecode-tools to 1.0.0 release using Apache2 license.
+- Dependencies: atomicwrites==1.2.1
+- Dependencies: attrs==18.2.0
+- Dependencies: dogpile.cache==0.6.7
+- Dependencies: psutil==5.4.7
+- Dependencies: pathlib2==2.3.2
+- Dependencies: subprocess32==3.5.2
+- Dependencies: gevent==1.3.6
+- Dependencies: greenlet==0.4.15
+- Dependencies: pytest==3.8.2
+- Dependencies: py==1.6.0
+- Dependencies: pytest-cov==2.6.0
+- Dependencies: pytest-timeout==1.3.2
+- Dependencies: coverage==4.5.1
+- Dependencies: psycopg2==2.7.5
+
+
+Security
+^^^^^^^^
+
+- RST: improve Javascript RST sandbox.
+- Jupyter: sanitize markdown cells similar as we do for our own markdown cleanup.
+
+
+Performance
+^^^^^^^^^^^
+
+- SSH: improved SSH wrapper execution speed by using optimized binary script wrapping.
+- Core: reduced font and JavaScript load times.
+
+
+Fixes
+^^^^^
+
+- Comments: ensure we always display unmatched comments.
+- Branch Permissions: fixed changing rule order for branch permissions.
+- Users: ensure get_first_superadmin actually gets the 1st created super-admin.
+- Users: when deleting users ensure we also clear personal flag.
+  This fixes some problems with multiple personal groups.
+- Diffs: disable the error border on highlight errors.
+- Integrations: implement retry to HTTP[S] calls for integrations.
+  Web parts will do a 3x retry call in case service is not reachable or
+  responds with 5XX codes.
+- Git: fixed pull-request updates in case branch names are the same as the file names.
+- Supervisor: add patch for older kernel support.
+- Compare: fixed file after/before links in compare view for cross repo compare.
+- Emails: improve fonts and rendering of email HTML.
+- Permissions: flush members of user groups permissions to clear caches.
+- Repository: add check preventing of removal of repo with attached pull requests. Users
+  should use the new archive repo function instead.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- In this release, we're shipping a new `rcextensions`. The changes made are
+  backward incompatible. An update of `rcextensions` is required
+  prior to using them again. Please check the new `rcextensions.tmpl` directory
+  located in `etc/rcextensions.tmpl` in your instance installation path.
+  Old code should be 100% portable by just copy&paste to the right function.
+
+- Mailing: We introduced a new mailing library. The older options should be compatible and
+  generally, old configuration doesn't need any changes in order to send emails.
+  We, however, encourage users to re-check mailing setup in case of some more
+  sophisticated email setups.
+  There's a possibility to send a test email from admin > settings > email section.

pkgs/overlays.nix

@@ -0,0 +1,3 b''
+self: super: {
+
+}

pkgs/patches/supervisor/patch-rlimits-old-kernel.diff

@@ -0,0 +1,16 b''
+diff -rup supervisor-3.3.4-orig/supervisor/options.py supervisor-3.3.4/supervisor/options.py
+--- supervisor-3.3.4-orig/supervisor/options.py	1970-01-01 01:00:01.000000000 +0100
++++ supervisor-3.3.4/supervisor-new/options.py	2018-10-24 10:53:19.368503735 +0200
+@@ -1395,7 +1395,11 @@ class ServerOptions(Options):
+             name = limit['name']
+             name = name # name is used below by locals()
+
+-            soft, hard = resource.getrlimit(res)
++            try:
++                soft, hard = resource.getrlimit(res)
++            except Exception:
++                # handle old kernel problems, this is not critical to execute
++                soft, hard = -1, -1
+
+             if (soft < min) and (soft != -1): # -1 means unlimited
+                 if (hard < min) and (hard != -1):

requirements_debug.txt

@@ -0,0 +1,3 b''
+## special libraries we could extend the requirements.txt file with to add some
+## custom libraries usefull for debug and memory tracing
+objgraph==3.1.1

.bumpversion.cfg

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

.hgignore

@@ -24,7 +24,6 b' syntax: regexp'
 ^.dev
 ^._dev
 ^build/
-^bower_components/
 ^coverage\.xml$
 ^data$
 ^\.eggs/
@@ -36,14 +35,15 b' syntax: regexp'
 ^htmlcov
 ^junit\.xml$
 ^node_modules/
+^node_binaries/
 ^pylint.log$
 ^rcextensions/
 ^result$
 ^rhodecode/public/css/style.css$
 ^rhodecode/public/css/style-polymer.css$
 ^rhodecode/public/js/rhodecode-components.html$
+^rhodecode/public/js/rhodecode-components.js$
 ^rhodecode/public/js/scripts.js$
-^rhodecode/public/js/rhodecode-components.js$
 ^rhodecode/public/js/src/components/root-styles.gen.html$
 ^rhodecode/public/js/vendors/webcomponentsjs/
 ^rhodecode\.db$

.release.cfg

@@ -5,25 +5,20 b' done = false'
 done = true
 
 [task:rc_tools_pinned]
-done = true
 
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [task:changelog_updated]
-done = true
 
 [task:generate_api_docs]
-done = true
+
+[task:updated_translation]
 
 [release]
-state = prepared
-version = 4.13.3
-
-[task:updated_translation]
+state = in_progress
+version = 4.14.0
 
 [task:generate_js_routes]
 

Gruntfile.js

@@ -1,4 +1,12 b''
 var gruntConfig = require('./grunt_config.json');
+var webpackConfig = require('./webpack.config');
+gruntConfig["webpack"] = {
+    options: {
+        stats: !process.env.NODE_ENV || process.env.NODE_ENV === 'development'
+    },
+    prod: webpackConfig,
+    dev: Object.assign({ watch: false }, webpackConfig)
+};
 
 module.exports = function(grunt) {
   grunt.initConfig(gruntConfig);
@@ -7,9 +15,7 b' module.exports = function(grunt) {'
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-vulcanize');
-  grunt.loadNpmTasks('grunt-crisper');
   grunt.loadNpmTasks('grunt-contrib-copy');
-
-  grunt.registerTask('default', ['less:production', 'less:components', 'concat:polymercss', 'copy', 'concat:dist', 'vulcanize', 'crisper']);
+  grunt.loadNpmTasks('grunt-webpack');
+  grunt.registerTask('default', ['less:production', 'less:components', 'copy', 'webpack', 'concat:dist']);
 };

MANIFEST.in

@@ -39,7 +39,6 b' include rhodecode/public/sounds/*.mp3'
 include rhodecode/public/sounds/*.wav
 
 # fonts
-recursive-include rhodecode/public/fonts/ProximaNova *
 recursive-include rhodecode/public/fonts/RCIcons *
 
 # js

Makefile

@@ -1,9 +1,9 b''
 
 .PHONY: clean docs docs-clean docs-cleanup test test-clean test-only test-only-postgres test-only-mysql web-build
 
-WEBPACK=./node_modules/webpack/bin/webpack.js
-GRUNT=grunt
 NODE_PATH=./node_modules
+WEBPACK=./node_binaries/webpack
+GRUNT=./node_binaries/grunt
 
 
 clean:

configs/development.ini

@@ -26,8 +26,6 b' debug = true'
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
-## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
-#smtp_auth =
 
 [server:main]
 ## COMMON ##
@@ -281,8 +279,10 b' supervisor.group_id = dev'
 ## Display extended labs settings
 labs_settings_active = true
 
-## custom exception store path, defaults to TMPDIR
-exception_tracker.store_path =
+## Custom exception store path, defaults to TMPDIR
+## This is used to store exception from RhodeCode in shared directory
+#exception_tracker.store_path =
+
 
 ####################################
 ###        CELERY CONFIG        ####
@@ -506,7 +506,7 b' debug_style = true'
 ###########################################
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
-#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode?charset=utf8
 # pymysql is an alternative driver for MySQL, use in case of problems with default one
 #sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
 

configs/production.ini

@@ -26,8 +26,6 b' debug = true'
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
-## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
-#smtp_auth =
 
 [server:main]
 ## COMMON ##
@@ -256,8 +254,9 b' supervisor.group_id = prod'
 ## Display extended labs settings
 labs_settings_active = true
 
-## custom exception store path, defaults to TMPDIR
-exception_tracker.store_path =
+## Custom exception store path, defaults to TMPDIR
+## This is used to store exception from RhodeCode in shared directory
+#exception_tracker.store_path =
 
 
 ####################################
@@ -480,7 +479,7 b' set debug = false'
 ###########################################
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
-#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode?charset=utf8
 # pymysql is an alternative driver for MySQL, use in case of problems with default one
 #sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
 

default.nix

@@ -9,7 +9,7 b''
 #  {
 #    # Thoughts on how to configure the dev environment
 #    rc = {
-#      codeInternalUrl = "https://usr:[e-mail]";
+#      codeInternalUrl = "https://usr:[e-mail]/internal";
 #      sources = {
 #        rhodecode-vcsserver = "/home/user/work/rhodecode-vcsserver";
 #        rhodecode-enterprise-ce = "/home/user/work/rhodecode-enterprise-ce";
@@ -26,10 +26,18 b' args@'
 }:
 
 let
-  # Use nixpkgs from args or import them. We use this indirect approach
-  # through args to be able to use the name `pkgs` for our customized packages.
-  # Otherwise we will end up with an infinite recursion.
-  pkgs = args.pkgs or (import <nixpkgs> { });
+  pkgs_ = (import <nixpkgs> {});
+in
+
+let
+  pkgs = import <nixpkgs> {
+    overlays = [
+      (import ./pkgs/overlays.nix)
+    ];
+    inherit
+      (pkgs_)
+      system;
+  };
 
   # Works with the new python-packages, still can fallback to the old
   # variant.
@@ -46,7 +54,7 b' let'
     in
       !builtins.elem (basename path) [
         ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev"
-        "bower_components" "node_modules"
+        "node_modules" "node_binaries"
         "build" "data" "result" "tmp"] &&
       !builtins.elem ext ["egg-info" "pyc"] &&
       # TODO: johbo: This check is wrong, since "path" contains an absolute path,
@@ -55,7 +63,11 b' let'
 
   sources =
     let
-      inherit (pkgs.lib) all isString attrValues;
+      inherit
+        (pkgs.lib)
+        all
+        isString
+        attrValues;
       sourcesConfig = pkgs.config.rc.sources or {};
     in
       # Ensure that sources are configured as strings. Using a path
@@ -66,18 +78,12 b' let'
   version = builtins.readFile "${rhodecode-enterprise-ce-src}/rhodecode/VERSION";
   rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.;
 
-  buildBowerComponents = pkgs.buildBowerComponents;
   nodeEnv = import ./pkgs/node-default.nix {
-    inherit pkgs;
+    inherit
+      pkgs;
   };
   nodeDependencies = nodeEnv.shell.nodeDependencies;
 
-  bowerComponents = buildBowerComponents {
-    name = "enterprise-ce-${version}";
-    generated = ./pkgs/bower-packages.nix;
-    src = rhodecode-enterprise-ce-src;
-  };
-
   rhodecode-testdata-src = sources.rhodecode-testdata or (
     pkgs.fetchhg {
       url = "https://code.rhodecode.com/upstream/rc_testdata";
@@ -95,23 +101,22 b' let'
   pythonLocalOverrides = self: super: {
     rhodecode-enterprise-ce =
       let
-        linkNodeAndBowerPackages = ''
+        linkNodePackages = ''
           export RHODECODE_CE_PATH=${rhodecode-enterprise-ce-src}
 
-          echo "[BEGIN]: Link node packages"
-          rm -fr node_modules
-          mkdir node_modules
+          echo "[BEGIN]: Link node packages and binaries"
           # johbo: Linking individual packages allows us to run "npm install"
           # inside of a shell to try things out. Re-entering the shell will
           # restore a clean environment.
+          rm -fr node_modules
+          mkdir node_modules
           ln -s ${nodeDependencies}/lib/node_modules/* node_modules/
-          echo "[DONE]: Link node packages"
+          export NODE_PATH=./node_modules
 
-          echo "[BEGIN]: Link bower packages"
-          rm -fr bower_components
-          mkdir bower_components
-          ln -s ${bowerComponents}/bower_components/* bower_components/
-          echo "[DONE]: Link bower packages"
+          rm -fr node_binaries
+          mkdir node_binaries
+          ln -s ${nodeDependencies}/bin/* node_binaries/
+          echo "[DONE ]: Link node packages and binaries"
         '';
 
         releaseName = "RhodeCodeEnterpriseCE-${version}";
@@ -129,8 +134,7 b' let'
       passthru = {
         inherit
           rhodecode-testdata
-          bowerComponents
-          linkNodeAndBowerPackages
+          linkNodePackages
           myPythonPackagesUnfix
           pythonLocalOverrides
           pythonCommunityOverrides;
@@ -141,8 +145,6 b' let'
       buildInputs =
         attrs.buildInputs or [] ++ [
           rhodecode-testdata
-          pkgs.nodePackages.bower
-          pkgs.nodePackages.grunt-cli
         ];
 
       #NOTE: option to inject additional propagatedBuildInputs
@@ -175,39 +177,66 b' let'
       '';
 
       preBuild = ''
-
-        echo "Building frontend assets"
-        ${linkNodeAndBowerPackages}
-        grunt
+        echo "[BEGIN]: Building frontend assets"
+        ${linkNodePackages}
+        make web-build
         rm -fr node_modules
+        rm -fr node_binaries
+        echo "[DONE ]: Building frontend assets"
       '';
 
       postInstall = ''
+        # check required files
+        STATIC_CHECK="/robots.txt /502.html
+                      /js/scripts.js /js/rhodecode-components.js
+                      /css/style.css /css/style-polymer.css"
+
+        for file in $STATIC_CHECK;
+        do
+            if [ ! -f rhodecode/public/$file ]; then
+              echo "Missing $file"
+              exit 1
+            fi
+        done
+
         echo "Writing enterprise-ce meta information for rccontrol to nix-support/rccontrol"
         mkdir -p $out/nix-support/rccontrol
         cp -v rhodecode/VERSION $out/nix-support/rccontrol/version
-        echo "[DONE]: enterprise-ce meta information for rccontrol written"
+        echo "[DONE ]: enterprise-ce meta information for rccontrol written"
 
         mkdir -p $out/etc
         cp configs/production.ini $out/etc
-        echo "[DONE]: saved enterprise-ce production.ini into $out/etc"
+        echo "[DONE ]: saved enterprise-ce production.ini into $out/etc"
+
+        cp -Rf rhodecode/config/rcextensions $out/etc/rcextensions.tmpl
+        echo "[DONE ]: saved enterprise-ce rcextensions into $out/etc/rcextensions.tmpl"
 
         # python based programs need to be wrapped
         mkdir -p $out/bin
-        # rhodecode-tools
-        ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
 
         # required binaries from dependencies
-        #ln -s ${self.python}/bin/python $out/bin
-        ln -s ${self.pyramid}/bin/* $out/bin/
-        ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
-        ln -s ${self.supervisor}/bin/supervisor* $out/bin/
+        ln -s ${self.supervisor}/bin/supervisorctl $out/bin/
+        ln -s ${self.supervisor}/bin/supervisord $out/bin/
         ln -s ${self.pastescript}/bin/paster $out/bin/
         ln -s ${self.channelstream}/bin/channelstream $out/bin/
         ln -s ${self.celery}/bin/celery $out/bin/
-        echo "[DONE]: created symlinks into $out/bin"
+        ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
+        ln -s ${self.pyramid}/bin/prequest $out/bin/
+        ln -s ${self.pyramid}/bin/pserve $out/bin/
 
-        for file in $out/bin/*;
+        echo "[DONE ]: created symlinks into $out/bin"
+        DEPS="$out/bin/supervisorctl \
+              $out/bin/supervisord \
+              $out/bin/paster \
+              $out/bin/channelstream \
+              $out/bin/celery \
+              $out/bin/gunicorn \
+              $out/bin/prequest \
+              $out/bin/pserve"
+
+        # wrap only dependency scripts, they require to have full PYTHONPATH set
+        # to be able to import all packages
+        for file in $DEPS;
         do
           wrapProgram $file \
             --prefix PATH : $PATH \
@@ -215,16 +244,18 b' let'
             --set PYTHONHASHSEED random
         done
 
-        echo "[DONE]: enterprise-ce binary wrapping"
+        echo "[DONE ]: enterprise-ce binary wrapping"
+
+        # rhodecode-tools don't need wrapping
+        ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
 
-        if [ ! -f rhodecode/public/js/scripts.js ]; then
-          echo "Missing scripts.js"
-          exit 1
-        fi
-        if [ ! -f rhodecode/public/css/style.css ]; then
-          echo "Missing style.css"
-          exit 1
-        fi
+        # expose sources of CE
+        ln -s $out $out/etc/rhodecode_enterprise_ce_source
+
+        # expose static files folder
+        cp -Rf $out/lib/${self.python.libPrefix}/site-packages/rhodecode/public/ $out/etc/static
+        chmod 755 -R $out/etc/static
+
       '';
     });
 
@@ -237,8 +268,13 b' let'
       getAttr pythonPackages pkgs;
 
   pythonGeneratedPackages = import ./pkgs/python-packages.nix {
-    inherit pkgs;
-    inherit (pkgs) fetchurl fetchgit fetchhg;
+    inherit
+      pkgs;
+    inherit
+      (pkgs)
+      fetchurl
+      fetchgit
+      fetchhg;
   };
 
   pythonCommunityOverrides = import ./pkgs/python-packages-overrides.nix {

docs/admin/admin-tricks.rst

@@ -162,7 +162,8 b' To add custom hooks to your instance, us'
 
 1. Open :menuselection:`Admin --> Settings --> Hooks`
 2. Add your custom hook details, you can use a file path to specify custom
-   hook scripts, for example: ``python:/path/to/custom_hook.py``
+   hook scripts, for example:
+   ``pretxnchangegroup.example`` with value ``python:/path/to/custom_hook.py:my_func_name``
 3. Select :guilabel:`Save`
 
 Also, see the |RC| Extensions section of the :ref:`rc-tools` guide. |RC|

docs/admin/svn-http.rst

@@ -18,8 +18,8 b' Prerequisites'
 .. tip::
 
    We recommend using Wandisco repositories which provide latest SVN versions
-   for most platforms. Below is example how to add the wandisco repositories
-   for Ubuntu.
+   for most platforms.
+   Here is an example how to add the Wandisco repositories for Ubuntu.
 
     .. code-block:: bash
 
@@ -27,15 +27,28 b' Prerequisites'
         $ sudo wget -q http://opensource.wandisco.com/wandisco-debian.gpg -O- | sudo apt-key add -
         $ sudo apt-get update
 
+    Here is an example how to add the Wandisco repositories for Centos/Redhat. Using
+    a yum config
 
-Using Ubuntu 14.04/16.04 Distribution as an example execute the following to
-install required components:
+    .. code-block:: bash
+
+        [wandisco-Git]
+        name=CentOS-6 - Wandisco Git
+        baseurl=http://opensource.wandisco.com/centos/6/git/$basearch/
+        enabled=1
+        gpgcheck=1
+        gpgkey=http://opensource.wandisco.com/RPM-GPG-KEY-WANdisco
+
+
+
+Example installation of required components for Ubuntu platform:
 
 .. code-block:: bash
 
-    $ sudo apt-get install apache2 libapache2-mod-svn
+    $ sudo apt-get install apache2
+    $ sudo apt-get install libapache2-mod-svn
 
-Once installed you need to enable ``dav_svn``:
+Once installed you need to enable ``dav_svn`` on Ubuntu:
 
 .. code-block:: bash
 
@@ -44,6 +57,26 b' Once installed you need to enable ``dav_'
     $ sudo a2enmod authn_anon
 
 
+Example installation of required components for RedHat/CentOS platform:
+
+.. code-block:: bash
+
+    $ sudo yum install httpd
+    $ sudo yum install subversion mod_dav_svn
+
+
+Once installed you need to enable ``dav_svn`` on RedHat/CentOS:
+
+.. code-block:: bash
+
+    sudo vi /etc/httpd/conf.modules.d/10-subversion.conf
+    ## The file should read:
+
+    LoadModule dav_svn_module     modules/mod_dav_svn.so
+    LoadModule headers_module     modules/mod_headers.so
+    LoadModule authn_anon_module  modules/mod_authn_anon.so
+
+
 Configuring Apache Setup
 ========================
 

docs/contributing/dependencies.rst

@@ -13,48 +13,4 b' dependencies for Python and JavaScript w'
 this section to generate the needed Nix derivations.
 
 
-Python dependencies
-===================
-
-We use the tool `pip2nix` to generate the Nix derivations for our Python
-dependencies.
-
-Generating the dependencies should be done with the following command:
-
-.. code:: shell
-
-   pip2nix generate --license
-
-
-.. note::
-
-   License extraction support is still experimental, use the version from the
-   following pull request: https://github.com/ktosiek/pip2nix/pull/30
-
-
-
-Node dependencies
-=================
-
-After adding new dependencies via ``npm install --save``, use `node2nix` to
-update the corresponding Nix derivations:
-
-.. code:: shell
-
-   cd pkgs
-   node2nix --input ../package.json \
-            -o node-packages.nix \
-            -e node-env.nix \
-            -c node-default.nix \
-            -d --flatten
-
-
-Bower dependencies
-==================
-
-Frontend dependencies are managed based on `bower`, with `bower2nix` a tool
-exists which can generate the needed Nix derivations:
-
-.. code:: shell
-
-   bower2nix bower.json pkgs/bower-packages.nix
+Please check pkgs/README.rst file for mor information on how to build the packages.

docs/extensions/extensions-hooks.rst

@@ -14,12 +14,23 b' so to clarify what is meant each time, r'
   between software components and can be used to trigger plugins, or their
   extensions.
 
-.. toctree::
+
+Hooks
+-----
+
+Within |RCM| there are two types of supported hooks.
 
-   rcx
-   install-ext
-   config-ext
-   extensions
-   hooks
-   full-blown-example
-   int-slack
+* **Internal built-in hooks**: The internal |hg|, |git| or |svn| hooks are
+  triggered by different VCS operations, like push, pull,
+  or clone and are non-configurable, but you can add your own VCS hooks,
+  see :ref:`custom-hooks`.
+* **Custom rcextensions hooks**: User defined hooks centre around the lifecycle of
+  certain actions such are |repo| creation, user creation etc. The actions
+  these hooks trigger can be rejected based on the API permissions of the
+  user calling them.
+
+On instructions how to use the custom `rcextensions`
+see :ref:`integrations-rcextensions` section.
+
+
+

docs/install/setup-email.rst

@@ -19,9 +19,7 b' Once configured you can check the settin'
     ## Additionally these settings will be used by the RhodeCode mailing system   ##
     ################################################################################
     #email_to = admin@localhost
-    #error_email_from = paste_error@localhost
     #app_email_from = rhodecode-noreply@localhost
-    #error_message =
     #email_prefix = [RhodeCode]
 
     #smtp_server = mail.server.com
@@ -30,5 +28,3 b' Once configured you can check the settin'
     #smtp_port =
     #smtp_use_tls = false
     #smtp_use_ssl = true
-    ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
-    #smtp_auth =

docs/integrations/integrations.rst

@@ -3,7 +3,7 b''
 Integrations
 ------------
 
-Rhodecode supports integrations with external services for various events,
+|RCE| supports integrations with external services for various events,
 such as commit pushes and pull requests. Multiple integrations of the same type
 can be added at the same time; this is useful for posting different events to
 different Slack channels, for example.
@@ -11,18 +11,20 b' different Slack channels, for example.'
 Supported integrations
 ^^^^^^^^^^^^^^^^^^^^^^
 
-============================    ============    =====================================
-Type/Name                       |RC| Edition    Description
-============================    ============    =====================================
-:ref:`integrations-slack`       |RCCEshort|     https://slack.com/
-:ref:`integrations-hipchat`     |RCCEshort|     https://www.hipchat.com/
-:ref:`integrations-webhook`     |RCCEshort|     POST events as `json` to a custom url
-:ref:`integrations-ci`          |RCCEshort|     Trigger Builds for Common CI Systems
-:ref:`integrations-email`       |RCCEshort|     Send repo push commits by email
-:ref:`integrations-jenkins`     |RCEEshort|     Trigger Builds for Jenkins CI System
-:ref:`integrations-redmine`     |RCEEshort|     Close/Resolve/Reference Redmine issues
-:ref:`integrations-jira`        |RCEEshort|     Close/Resolve/Reference JIRA issues
-============================    ============    =====================================
+================================    ============    ========================================
+Type/Name                           |RC| Edition    Description
+================================    ============    ========================================
+:ref:`integrations-webhook`         |RCCEshort|     Trigger events as `json` to a custom url
+:ref:`integrations-slack`           |RCCEshort|     Integrate with https://slack.com/
+:ref:`integrations-hipchat`         |RCCEshort|     Integrate with https://www.hipchat.com/
+:ref:`integrations-email`           |RCCEshort|     Send repo push commits by email
+:ref:`integrations-ci`              |RCCEshort|     Trigger Builds for Common CI Systems
+:ref:`integrations-rcextensions`    |RCCEshort|     Advanced low-level integration framework
+
+:ref:`integrations-jenkins`         |RCEEshort|     Trigger Builds for Jenkins CI System
+:ref:`integrations-redmine`         |RCEEshort|     Close/Resolve/Reference Redmine issues
+:ref:`integrations-jira`            |RCEEshort|     Close/Resolve/Reference JIRA issues
+================================    ============    ========================================
 
 .. _creating-integrations:
 
@@ -55,3 +57,4 b' See pages specific to each type of integ'
    email
    ci
    jenkins
+   integrations-rcextensions

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.14.0.rst
    release-notes-4.13.3.rst
    release-notes-4.13.2.rst
    release-notes-4.13.1.rst

docs/static/css/add.css

@@ -1,13 +1,13 b''
 .menuselection, .guilabel {
     font-size: .90em;
-    font-family: "proximanovaregular", "Proxima Nova Regular", "Proxima Nova", sans-serif;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     font-style: oblique;
 }
 
-.version{
+.version {
     display: none;
-    }
+}
 
-.pre{
-    color:#000
-    }
+.pre {
+    color: #000
+}

docs/tools/tools-cli.rst

@@ -273,107 +273,8 b' Use this to create or update a |RCE| con'
 rhodecode-extensions
 --------------------
 
-|RCT| adds additional mapping for :ref:`indexing-ref`, statistics, and adds
-additional code for push/pull/create/delete |repo| hooks. These hooks can be
-used to send signals to build-bots such as jenkins. Options:
-
-.. rst-class:: dl-horizontal
-
-    \-c, - -config <config_file>
-        Create a configuration file. The default file is created
-        in ``~/.rhoderc``
-
-    \-h, - -help
-         Show help messages.
-
-    \-F, - -format {json,pretty}
-        Set the formatted representation.
-
-    \-I, - -install-dir <str>
-        Set the location of the |RCE| installation. The default location is
-        :file:`/home/{user}/.rccontrol/`.
-
-    \ - -ini-file <str>
-        Path to the :file:`rhodecode.ini` file for that instance.
-
-    \ - -instance-name <instance-id>
-        Set the instance name.
-
-    \ - -plugins
-         Add plugins to your |RCE| installation. See the
-         :ref:`extensions-hooks-ref` section for more details.
-
-    \ - -version
-         Display your |RCT| version.
-
-
-Once installed, you will see a :file:`rcextensions` folder in the instance
-directory, for example :file:`home/{user}/.rccontrol/{instance-id}/rcextensions`
-
-To install ``rcextensions``, use the following example:
-
-.. code-block:: bash
-
-    # install extensions on the given instance
-    # If using virtualenv prior to RCE 350
-    (venv)$ rhodecode-extensions --instance-name=enterprise-1 \
-        --ini-file=rhodecode.ini
-    Writen new extensions file to rcextensions
-
-    # install extensions with additional plugins on the given instance
-    (venv)$ rhodecode-extensions --instance-name=enterprise-1 \
-        --ini-file=rhodecode.ini --plugins
-    Writen new extensions file to rcextensions
-
-    # installing extensions from 350 onwards
-    # as they are packaged with RCE
-    $ .rccontrol/enterprise-4/profile/bin/rhodecode-extensions --plugins \
-      --instance-name=enterprise-4 --ini-file=rhodecode.ini
-
-    Writen new extensions file to rcextensions
-
-See the new extensions inside this directory for more details about the
-additional hooks available, for example see the ``push_post.py`` file.
-
-.. code-block:: python
-
-    import urllib
-    import urllib2
-
-    def run(*args, **kwargs):
-        """
-        Extra params
-
-        :param URL: url to send the data to
-        """
-
-        url = kwargs.pop('URL', None)
-        if url:
-            from rhodecode.lib.compat import json
-            from rhodecode.model.db import Repository
-
-            repo = Repository.get_by_repo_name(kwargs['repository'])
-            changesets = []
-            vcs_repo = repo.scm_instance_no_cache()
-            for r in kwargs['pushed_revs']:
-                cs = vcs_repo.get_changeset(r)
-                changesets.append(json.dumps(cs))
-
-            kwargs['pushed_revs'] = changesets
-            headers = {
-                'User-Agent': 'RhodeCode-SCM web hook',
-                'Content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
-                'Accept': 'text/javascript, text/html, application/xml, '
-                          'text/xml, */*',
-                'Accept-Encoding': 'gzip,deflate,sdch',
-            }
-
-            data = kwargs
-            data = urllib.urlencode(data)
-            req = urllib2.Request(url, data, headers)
-            response = urllib2.urlopen(req)
-            response.read()
-            return 0
+The `rcextensions` since version 4.14 are now shipped together with |RCE| please check
+the using :ref:`integrations-rcextensions` section.
 
 
 rhodecode-gist

docs/tools/tools-overview.rst

@@ -54,23 +54,13 b' packaged with |RCE| by default.'
 
 .. code-block:: bash
 
-    $ .rccontrol/enterprise-4/profile/bin/rhodecode-extensions --plugins \
-        --instance-name=enterprise-4 --ini-file=rhodecode.ini
+    $ .rccontrol/enterprise-4/profile/bin/rhodecode-api --instance-name=enterprise-4 get_ip                                                                                                                                                                                                                                                                                                                                                                     [11:56:57 on 05/10/2018]
 
-    Writen new extensions file to rcextensions
-    Copied hipchat_push_notify.py plugin to rcextensions
-    Copied jira_pr_flow.py plugin to rcextensions
-    Copied default_reviewers.py plugin to rcextensions
-    Copied extract_commits.py plugin to rcextensions
-    Copied extract_issues.py plugin to rcextensions
-    Copied redmine_pr_flow.py plugin to rcextensions
-    Copied extra_fields.py plugin to rcextensions
-    Copied jira_smart_commits.py plugin to rcextensions
-    Copied http_notify.py plugin to rcextensions
-    Copied slack_push_notify.py plugin to rcextensions
-    Copied slack_message.py plugin to rcextensions
-    Copied extract_jira_issues.py plugin to rcextensions
-    Copied extract_redmine_issues.py plugin to rcextensions
-    Copied redmine_smart_commits.py plugin to rcextensions
-    Copied send_mail.py plugin to rcextensions
-
+    {
+      "error": null,
+      "id": 1000,
+      "result": {
+        "server_ip_addr": "1.2.3.4",
+        "user_ips": []
+      }
+    }

grunt_config.json

@@ -1,35 +1,33 b''
 {
   "dirs": {
     "css": {
-      "src":"rhodecode/public/css",
-      "dest":"rhodecode/public/css"
+      "src": "rhodecode/public/css",
+      "dest": "rhodecode/public/css"
     },
     "js": {
       "src": "rhodecode/public/js/src",
       "src_rc": "rhodecode/public/js/rhodecode",
       "dest": "rhodecode/public/js",
-      "bower": "bower_components",
       "node_modules": "node_modules"
     }
   },
   "copy": {
     "main": {
-      "expand": true,
-      "cwd": "bower_components",
-      "src": "webcomponentsjs/webcomponents-lite.js",
-      "dest": "<%= dirs.js.dest %>/vendors"
+      "files": [
+        {
+          "expand": true,
+          "cwd": "node_modules/@webcomponents",
+          "src": "webcomponentsjs/*.*",
+          "dest": "<%= dirs.js.dest %>/vendors"
+        },
+        {
+          "src": "<%= dirs.css.src %>/style-polymer.css",
+          "dest": "<%= dirs.js.dest %>/src/components/style-polymer.css"
+        }
+      ]
     }
   },
   "concat": {
-    "polymercss": {
-      "src": [
-        "<%= dirs.js.src %>/components/root-styles-prefix.html",
-        "<%= dirs.css.src %>/style-polymer.css",
-        "<%= dirs.js.src %>/components/root-styles-suffix.html"
-      ],
-      "dest": "<%= dirs.js.dest %>/src/components/root-styles.gen.html",
-      "nonull": true
-    },
     "dist": {
       "src": [
         "<%= dirs.js.node_modules %>/jquery/dist/jquery.min.js",
@@ -37,6 +35,10 b''
         "<%= dirs.js.node_modules %>/moment/min/moment.min.js",
         "<%= dirs.js.node_modules %>/clipboard/dist/clipboard.min.js",
         "<%= dirs.js.node_modules %>/favico.js/favico-0.3.10.min.js",
+        "<%= dirs.js.node_modules %>/sticky-sidebar/dist/sticky-sidebar.min.js",
+        "<%= dirs.js.node_modules %>/sticky-sidebar/dist/jquery.sticky-sidebar.min.js",
+        "<%= dirs.js.node_modules %>/waypoints/lib/noframework.waypoints.min.js",
+        "<%= dirs.js.node_modules %>/waypoints/lib/jquery.waypoints.min.js",
         "<%= dirs.js.node_modules %>/appenlight-client/appenlight-client.min.js",
         "<%= dirs.js.src %>/logging.js",
         "<%= dirs.js.src %>/bootstrap.js",
@@ -89,22 +91,13 b''
         "<%= dirs.js.src %>/rhodecode/tooltips.js",
         "<%= dirs.js.src %>/rhodecode/users.js",
         "<%= dirs.js.src %>/rhodecode/appenlight.js",
-        "<%= dirs.js.src %>/rhodecode.js"
+        "<%= dirs.js.src %>/rhodecode.js",
+        "<%= dirs.js.dest %>/rhodecode-components.js"
       ],
       "dest": "<%= dirs.js.dest %>/scripts.js",
       "nonull": true
     }
   },
-  "crisper": {
-    "dist": {
-      "options": {
-        "cleanup": false,
-        "onlySplit": true
-      },
-      "src": "<%= dirs.js.dest %>/rhodecode-components.html",
-      "dest": "<%= dirs.js.dest %>/rhodecode-components.js"
-    }
-  },
   "less": {
     "development": {
       "options": {
@@ -152,8 +145,7 b''
         "less:development",
         "less:components",
         "concat:polymercss",
-        "vulcanize",
-        "crisper",
+        "webpack",
         "concat:dist"
       ]
     },
@@ -166,8 +158,7 b''
       "tasks": [
         "less:components",
         "concat:polymercss",
-        "vulcanize",
-        "crisper",
+        "webpack",
         "concat:dist"
       ]
     }
@@ -179,18 +170,5 b''
         "jshintrc": ".jshintrc"
       }
     }
-  },
-  "vulcanize": {
-    "default": {
-      "options": {
-        "abspath": "",
-        "inlineScripts": true,
-        "inlineCss": true,
-        "stripComments": true
-      },
-      "files": {
-        "<%= dirs.js.dest %>/rhodecode-components.html": "<%= dirs.js.src %>/components/shared-components.html"
-      }
-    }
   }
 }

package.json

@@ -1,6 +1,6 b''
 {
   "name": "rhodecode-enterprise",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "private": true,
   "description" : "RhodeCode JS packaged",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -9,25 +9,50 b''
     "url" : "https://code.rhodecode.com/rhodecode-enterprise-ce"
   },
   "devDependencies": {
+    "appenlight-client": "git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1",
+    "clipboard": "^2.0.1",
+    "exports-loader": "^0.6.4",
+    "favico.js": "^0.3.10",
     "grunt": "^0.4.5",
+    "grunt-cli": "^1.3.1",
+    "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-jshint": "^0.12.0",
     "grunt-contrib-less": "^1.1.0",
     "grunt-contrib-watch": "^0.6.1",
-    "crisper": "^2.1.1",
-    "vulcanize": "^1.16.0",
-    "grunt-crisper": "^1.0.1",
-    "grunt-vulcanize": "^1.0.0",
-    "node2nix": "^1.0.0",
+    "grunt-webpack": "^3.1.3",
+    "jquery": "1.11.3",
     "jshint": "^2.9.1-rc3",
-    "bower": "^1.8.4",
-    "jquery": "1.11.3",
-    "favico.js": "^0.3.10",
-    "clipboard": "^2.0.1",
-    "qrious": "^4.0.2",
     "moment": "^2.18.1",
     "mousetrap": "^1.6.1",
-    "appenlight-client": "git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1"
+    "qrious": "^4.0.2",
+    "sticky-sidebar": "3.3.1",
+    "waypoints": "4.0.1",
+    "webpack": "4.23.1",
+    "webpack-cli": "3.1.2",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.6.0",
+    "copy-webpack-plugin": "^4.4.2",
+    "css-loader": "^0.28.11",
+    "html-loader": "^0.4.4",
+    "html-webpack-plugin": "^3.2.0",
+    "imports-loader": "^0.7.1",
+    "polymer-webpack-loader": "^2.0.1",
+    "style-loader": "^0.21.0",
+    "webpack-uglify-js-plugin": "^1.1.9",
+    "raw-loader": "1.0.0-beta.0",
+    "ts-loader": "^1.3.3",
+    "@webcomponents/webcomponentsjs": "^2.0.0",
+    "@polymer/polymer": "^3.0.0",
+    "@polymer/paper-button": "^3.0.0",
+    "@polymer/paper-spinner": "^3.0.0",
+    "@polymer/paper-tooltip": "^3.0.0",
+    "@polymer/paper-toast": "^3.0.0",
+    "@polymer/paper-toggle-button": "^3.0.0",
+    "@polymer/iron-ajax": "^3.0.0",
+    "@polymer/iron-autogrow-textarea": "^3.0.0",
+    "@polymer/iron-a11y-keys": "^3.0.0"
   }
 }

pkgs/README.rst

@@ -27,24 +27,29 b' Python dependencies'
 NodeJS dependencies
 ===================
 
+Generate node-packages.nix file with all dependencies from NPM and package.json file
+This should be run before entering nix-shell.
+
+The sed at the end fixes a bug with http rewrite of re-generated packages
+
 .. code:: shell
 
-   rm -rf node_modules
+   rm -rf node_modules &&
    nix-shell pkgs/shell-generate.nix --command "
        node2nix --input package.json \
                 -o pkgs/node-packages.nix \
                 -e pkgs/node-env.nix \
                 -c pkgs/node-default.nix \
-                -d --flatten --nodejs-6 "
+                -d --flatten --nodejs-8 " &&
+   sed -i -e 's/http:\/\//https:\/\//g' pkgs/node-packages.nix
 
 
-
-Bower dependencies
-==================
+Generate license data
+=====================
 
 .. code:: shell
 
-   nix-shell pkgs/shell-generate.nix --command "bower2nix bower.json pkgs/bower-packages.nix"
+   nix-build pkgs/license-generate.nix -o result-license && cat result-license/licenses.json | python -m json.tool > rhodecode/config/licenses.json
 
 
 .. Links

pkgs/license-generate.nix

@@ -2,9 +2,9 b''
 #
 # Usage:
 #
-#   nix-build -I ~/dev license.nix -A result
+#  nix-build license.nix -o result-license
 #
-# Afterwards ./result will contain the license information as JSON files.
+# Afterwards ./result-license will contain the license information as JSON files.
 #
 #
 # Overview
@@ -19,7 +19,7 b''
 #    dependencies. The results from step 1 are then limited to the ones which
 #    are in this list.
 #
-# The result is then available in ./result/license.json.
+# The result is then available in ./result-license/license.json.
 #
 
 
@@ -32,20 +32,20 b' let'
   # Enterprise as simple as possible, goal here is just to identify the runtime
   # dependencies. Ideally we could avoid building Enterprise at all and somehow
   # figure it out without calling into nix-store.
-  enterprise = import ./default.nix {
+  enterprise = import ../default.nix {
     doCheck = false;
   };
 
   # For a given derivation, return the list of all dependencies
   drvToDependencies = drv: nixpkgs.lib.flatten [
-    drv.nativeBuildInputs or []
-    drv.propagatedNativeBuildInputs or []
+    drv.buildInputs or []
+    drv.propagatedBuildInputs or []
   ];
 
   # Transform the given derivation into the meta information which we need in
   # the resulting JSON files.
   drvToMeta = drv: {
-    name = drv.name or "UNNAMED";
+    name = drv.name or drv;
     license = if drv ? meta.license then drv.meta.license else "UNKNOWN";
   };
 
@@ -70,10 +70,8 b' let'
     rawStorePaths = nixpkgs.lib.removeSuffix "\n" (
       builtins.readFile srcPath);
     storePaths = nixpkgs.lib.splitString "\n" rawStorePaths;
-    # TODO: johbo: Would be nice to use some sort of utility here to convert
-    # the path to a derivation name.
     storePathPrefix = (
-      builtins.stringLength "/nix/store/zwy7aavnif9ayw30rya1k6xiacafzzl6-");
+      builtins.stringLength "/nix/store/afafafafafafafafafafafafafafafaf-");
     storePathToName = path:
       builtins.substring storePathPrefix (builtins.stringLength path) path;
   in (map storePathToName storePaths);
@@ -147,6 +145,7 b' in rec {'
       cat > build/licenses.json <<EOF
       ${builtins.toJSON enterpriseRuntimeLicenses}
       EOF
+
     '';
 
     installPhase = ''

pkgs/node-default.nix

@@ -2,7 +2,7 b''
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
 
 let
   nodeEnv = import ./node-env.nix {

pkgs/python-packages-overrides.nix

@@ -30,8 +30,8 b' self: super: {'
 
   "beaker" = super."beaker".override (attrs: {
     patches = [
-      ./patch_beaker/patch-beaker-lock-func-debug.diff
-      ./patch_beaker/patch-beaker-metadata-reuse.diff
+      ./patches/beaker/patch-beaker-lock-func-debug.diff
+      ./patches/beaker/patch-beaker-metadata-reuse.diff
     ];
   });
 
@@ -240,6 +240,12 b' self: super: {'
     };
   });
 
+  "supervisor" = super."supervisor".override (attrs: {
+    patches = [
+      ./patches/supervisor/patch-rlimits-old-kernel.diff
+    ];
+  });
+
   # Avoid that base packages screw up the build process
   inherit (basePythonPackages)
     setuptools;

pkgs/python-packages.nix

@@ -52,22 +52,22 b' self: super: {'
     };
   };
   "atomicwrites" = super.buildPythonPackage {
-    name = "atomicwrites-1.1.5";
+    name = "atomicwrites-1.2.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/a1/e1/2d9bc76838e6e6667fde5814aa25d7feb93d6fa471bf6816daac2596e8b2/atomicwrites-1.1.5.tar.gz";
-      sha256 = "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214";
+      url = "https://files.pythonhosted.org/packages/ac/ed/a311712ef6b4355035489f665e63e1a73f9eb371929e3c98e5efd451069e/atomicwrites-1.2.1.tar.gz";
+      sha256 = "1vmkbw9j0qammwxbxycrs39gvdg4lc2d4lk98kwf8ag2manyi6pc";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "attrs" = super.buildPythonPackage {
-    name = "attrs-18.1.0";
+    name = "attrs-18.2.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e4/ac/a04671e118b57bee87dabca1e0f2d3bda816b7a551036012d0ca24190e71/attrs-18.1.0.tar.gz";
-      sha256 = "0yzqz8wv3w1srav5683a55v49i0szkm47dyrnkd56fqs8j8ypl70";
+      url = "https://files.pythonhosted.org/packages/0f/9e/26b1d194aab960063b266170e53c39f73ea0d0d3f5ce23313e0ec8ee9bdf/attrs-18.2.0.tar.gz";
+      sha256 = "0s9ydh058wmmf5v391pym877x4ahxg45dw6a0w4c7s5wgpigdjqh";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -160,17 +160,6 b' self: super: {'
       license = [ pkgs.lib.licenses.asl20 ];
     };
   };
-  "bottle" = super.buildPythonPackage {
-    name = "bottle-0.12.13";
-    doCheck = false;
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz";
-      sha256 = "0m9k2a7yxvggc4kw8fsvj381vgsvfcdshg5nzy6vwrxiw2p53drr";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
   "bumpversion" = super.buildPythonPackage {
     name = "bumpversion-0.5.3";
     doCheck = false;
@@ -295,28 +284,14 b' self: super: {'
     };
   };
   "coverage" = super.buildPythonPackage {
-    name = "coverage-3.7.1";
+    name = "coverage-4.5.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
-      sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni";
+      url = "https://files.pythonhosted.org/packages/35/fe/e7df7289d717426093c68d156e0fd9117c8f4872b6588e8a8928a0f68424/coverage-4.5.1.tar.gz";
+      sha256 = "1wbrzpxka3xd4nmmkc6q0ir343d91kymwsm8pbmwa0d2a7q4ir2n";
     };
     meta = {
-      license = [ pkgs.lib.licenses.bsdOriginal ];
-    };
-  };
-  "cprofilev" = super.buildPythonPackage {
-    name = "cprofilev-1.0.7";
-    doCheck = false;
-    propagatedBuildInputs = [
-      self."bottle"
-    ];
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/df/50/d8c1ada7d537c64b0f76453fa31dedb6af6e27b82fcf0331e5f71a4cf98b/CProfileV-1.0.7.tar.gz";
-      sha256 = "0xwszfhxgndpcjkpq89dix6vi02hj1gzvhr7r716hd1x3y5p94c7";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.asl20 ];
     };
   };
   "cssselect" = super.buildPythonPackage {
@@ -372,11 +347,11 b' self: super: {'
     };
   };
   "dogpile.cache" = super.buildPythonPackage {
-    name = "dogpile.cache-0.6.6";
+    name = "dogpile.cache-0.6.7";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/48/ca/604154d835c3668efb8a31bd979b0ea4bf39c2934a40ffecc0662296cb51/dogpile.cache-0.6.6.tar.gz";
-      sha256 = "1h8n1lxd4l2qvahfkiinljkqz7pww7w3sgag0j8j9ixbl2h4wk84";
+      url = "https://files.pythonhosted.org/packages/ee/bd/440da735a11c6087eed7cc8747fc4b995cbac2464168682f8ee1c8e43844/dogpile.cache-0.6.7.tar.gz";
+      sha256 = "1aw8rx8vhb75y7zc6gi67g21sw057jdx7i8m3jq7kf3nqavxx9zw";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -515,14 +490,14 b' self: super: {'
     };
   };
   "gevent" = super.buildPythonPackage {
-    name = "gevent-1.3.5";
+    name = "gevent-1.3.6";
     doCheck = false;
     propagatedBuildInputs = [
       self."greenlet"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e6/0a/fc345c6e6161f84484870dbcaa58e427c10bd9bdcd08a69bed3d6b398bf1/gevent-1.3.5.tar.gz";
-      sha256 = "1w3gydxirgd2f60c5yv579w4903ds9s4g3587ik4jby97hgqc5bz";
+      url = "https://files.pythonhosted.org/packages/49/13/aa4bb3640b5167fe58875d3d7e65390cdb14f9682a41a741a566bb560842/gevent-1.3.6.tar.gz";
+      sha256 = "1ih4k73dqz2zb561hda99vbanja3m6cdch3mgxxn1mla3qwkqhbv";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -550,23 +525,12 b' self: super: {'
       license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
     };
   };
-  "graphviz" = super.buildPythonPackage {
-    name = "graphviz-0.9";
+  "greenlet" = super.buildPythonPackage {
+    name = "greenlet-0.4.15";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/2b/e6/71521bab8fb99833133f08f6ac0460e2f6b425a7f75ac4b02323c3c3b512/graphviz-0.9.zip";
-      sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  "greenlet" = super.buildPythonPackage {
-    name = "greenlet-0.4.13";
-    doCheck = false;
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/13/de/ba92335e9e76040ca7274224942282a80d54f85e342a5e33c5277c7f87eb/greenlet-0.4.13.tar.gz";
-      sha256 = "1r412gfx25jrdiv444prmz5a8igrfabwnwqyr6b52ypq7ga87vqg";
+      url = "https://files.pythonhosted.org/packages/f8/e8/b30ae23b45f69aa3f024b46064c0ac8e5fcb4f22ace0dca8d6f9c8bbe5e7/greenlet-0.4.15.tar.gz";
+      sha256 = "1g4g1wwc472ds89zmqlpyan3fbnzpa8qm48z3z1y6mlk44z485ll";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -599,11 +563,11 b' self: super: {'
     };
   };
   "hupper" = super.buildPythonPackage {
-    name = "hupper-1.3";
+    name = "hupper-1.3.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/51/0c/96335b1f2f32245fb871eea5bb9773196505ddb71fad15190056a282df9e/hupper-1.3.tar.gz";
-      sha256 = "1pkyrm9c2crc32ps00k1ahnc5clj3pjwiarc7j0x8aykwih7ff10";
+      url = "https://files.pythonhosted.org/packages/cf/4b/467b826a84c8594b81f414b5ab6794e981951dac90ca40abaf9ea1cb36b0/hupper-1.3.1.tar.gz";
+      sha256 = "03mf13n6i4dd60wlb9m99ddl4m3lmly70cjp7f82vdkibfl1v6l9";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -850,11 +814,11 b' self: super: {'
     };
   };
   "mistune" = super.buildPythonPackage {
-    name = "mistune-0.8.3";
+    name = "mistune-0.8.4";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/9d/be/e06d4346cc608a01dec6bf770d7d0303a4fd6db588b318ced18f5f257145/mistune-0.8.3.tar.gz";
-      sha256 = "06b662p6kf46wh2jsabaqhaq4bz1srh2zxkrnx4yg96azlxw645w";
+      url = "https://files.pythonhosted.org/packages/2d/a4/509f6e7783ddd35482feda27bc7f72e65b5e7dc910eca4ab2164daf9c577/mistune-0.8.4.tar.gz";
+      sha256 = "0vkmsh0x480rni51lhyvigfdf06b9247z868pk3bal1wnnfl58sr";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -947,20 +911,6 b' self: super: {'
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  "objgraph" = super.buildPythonPackage {
-    name = "objgraph-3.1.1";
-    doCheck = false;
-    propagatedBuildInputs = [
-      self."graphviz"
-    ];
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/be/58/9ca81a20cc837054e94866df1475d899caaa94f3732b8a46006858b015f7/objgraph-3.1.1.tar.gz";
-      sha256 = "17aq4cwainiwvj8x61j0hx45c313bkwza5fijnmmw8v8glyy2bcc";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
   "packaging" = super.buildPythonPackage {
     name = "packaging-15.2";
     doCheck = false;
@@ -1025,15 +975,15 b' self: super: {'
     };
   };
   "pathlib2" = super.buildPythonPackage {
-    name = "pathlib2-2.3.0";
+    name = "pathlib2-2.3.2";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
       self."scandir"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/a1/14/df0deb867c2733f7d857523c10942b3d6612a1b222502fdffa9439943dfb/pathlib2-2.3.0.tar.gz";
-      sha256 = "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk";
+      url = "https://files.pythonhosted.org/packages/db/a8/7d6439c1aec525ed70810abee5b7d7f3aa35347f59bc28343e8f62019aa2/pathlib2-2.3.2.tar.gz";
+      sha256 = "10yb0iv5x2hs631rcppkhbddx799d3h8pcwmkbh2a66ns3w71ccf";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1065,14 +1015,14 b' self: super: {'
     };
   };
   "pickleshare" = super.buildPythonPackage {
-    name = "pickleshare-0.7.4";
+    name = "pickleshare-0.7.5";
     doCheck = false;
     propagatedBuildInputs = [
       self."pathlib2"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz";
-      sha256 = "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4";
+      url = "https://files.pythonhosted.org/packages/d8/b6/df3c1c9b616e9c0edbc4fbab6ddd09df9535849c64ba51fcb6531c32d4d8/pickleshare-0.7.5.tar.gz";
+      sha256 = "1jmghg3c53yp1i8cm6pcrm280ayi8621rwyav9fac7awjr3kss47";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1108,11 +1058,11 b' self: super: {'
     };
   };
   "pluggy" = super.buildPythonPackage {
-    name = "pluggy-0.6.0";
+    name = "pluggy-0.8.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/11/bf/cbeb8cdfaffa9f2ea154a30ae31a9d04a1209312e2919138b4171a1f8199/pluggy-0.6.0.tar.gz";
-      sha256 = "1zqckndfn85l1cd8pndw212zg1bq9fkg1nnj32kp2mppppsyg2kz";
+      url = "https://files.pythonhosted.org/packages/65/25/81d0de17cd00f8ca994a4e74e3c4baf7cd25072c0b831dad5c7d9d6138f8/pluggy-0.8.0.tar.gz";
+      sha256 = "1580p47l2zqzsza8jcnw1h2wh3vvmygk6ly8bvi4w0g8j14sjys4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1134,22 +1084,22 b' self: super: {'
     };
   };
   "psutil" = super.buildPythonPackage {
-    name = "psutil-5.4.6";
+    name = "psutil-5.4.7";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/51/9e/0f8f5423ce28c9109807024f7bdde776ed0b1161de20b408875de7e030c3/psutil-5.4.6.tar.gz";
-      sha256 = "1xmw4qi6hnrhw81xqzkvmsm9im7j2vkk4v26ycjwq2jczqsmlvk8";
+      url = "https://files.pythonhosted.org/packages/7d/9a/1e93d41708f8ed2b564395edfa3389f0fd6d567597401c2e5e2775118d8b/psutil-5.4.7.tar.gz";
+      sha256 = "0fsgmvzwbdbszkwfnqhib8jcxm4w6zyhvlxlcda0rfm5cyqj4qsv";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "psycopg2" = super.buildPythonPackage {
-    name = "psycopg2-2.7.4";
+    name = "psycopg2-2.7.5";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/74/83/51580322ed0e82cba7ad8e0af590b8fb2cf11bd5aaa1ed872661bd36f462/psycopg2-2.7.4.tar.gz";
-      sha256 = "02b2yaf1hlwb91xkscbzmajpfj5z3d8yikzh5r48fs8gss8i3xcb";
+      url = "https://files.pythonhosted.org/packages/b2/c1/7bf6c464e903ffc4f3f5907c389e5a4199666bf57f6cd6bf46c17912a1f9/psycopg2-2.7.5.tar.gz";
+      sha256 = "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
@@ -1167,11 +1117,11 b' self: super: {'
     };
   };
   "py" = super.buildPythonPackage {
-    name = "py-1.5.3";
+    name = "py-1.6.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/f7/84/b4c6e84672c4ceb94f727f3da8344037b62cee960d80e999b1cd9b832d83/py-1.5.3.tar.gz";
-      sha256 = "10gq2lckvgwlk9w6yzijhzkarx44hsaknd0ypa08wlnpjnsgmj99";
+      url = "https://files.pythonhosted.org/packages/4f/38/5f427d1eedae73063ce4da680d2bae72014995f9fdeaa57809df61c968cd/py-1.6.0.tar.gz";
+      sha256 = "1wcs3zv9wl5m5x7p16avqj2gsrviyb23yvc3pr330isqs0sh98q6";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1393,6 +1343,22 b' self: super: {'
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
+  "pyramid-mailer" = super.buildPythonPackage {
+    name = "pyramid-mailer-0.15.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."repoze.sendmail"
+      self."transaction"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/a0/f2/6febf5459dff4d7e653314d575469ad2e11b9d2af2c3606360e1c67202f2/pyramid_mailer-0.15.1.tar.gz";
+      sha256 = "16vg8jb203jgb7b0hd6wllfqvp542qh2ry1gjai2m6qpv5agy2pc";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
   "pyramid-mako" = super.buildPythonPackage {
     name = "pyramid-mako-1.0.2";
     doCheck = false;
@@ -1420,7 +1386,7 b' self: super: {'
     };
   };
   "pytest" = super.buildPythonPackage {
-    name = "pytest-3.6.0";
+    name = "pytest-3.8.2";
     doCheck = false;
     propagatedBuildInputs = [
       self."py"
@@ -1431,25 +1397,26 b' self: super: {'
       self."atomicwrites"
       self."pluggy"
       self."funcsigs"
+      self."pathlib2"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/67/6a/5bcdc22f8dbada1d2910d6e1a3a03f6b14306c78f81122890735b28be4bf/pytest-3.6.0.tar.gz";
-      sha256 = "0bdfazvjjbxssqzyvkb3m2x2in7xv56ipr899l00s87k7815sm9r";
+      url = "https://files.pythonhosted.org/packages/5f/d2/7f77f406ac505abda02ab4afb50d06ebf304f6ea42fca34f8f37529106b2/pytest-3.8.2.tar.gz";
+      sha256 = "18nrwzn61kph2y6gxwfz9ms68rfvr9d4vcffsxng9p7jk9z18clk";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pytest-cov" = super.buildPythonPackage {
-    name = "pytest-cov-2.5.1";
+    name = "pytest-cov-2.6.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."pytest"
       self."coverage"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz";
-      sha256 = "0bbfpwdh9k3636bxc88vz9fa7vf4akchgn513ql1vd0xy4n7bah3";
+      url = "https://files.pythonhosted.org/packages/d9/e2/58f90a316fbd94dd50bf5c826a23f3f5d079fb3cc448c1e9f0e3c33a3d2a/pytest-cov-2.6.0.tar.gz";
+      sha256 = "0qnpp9y3ygx4jk4pf5ad71fh2skbvnr6gl54m7rg5qysnx4g0q73";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.mit ];
@@ -1498,14 +1465,14 b' self: super: {'
     };
   };
   "pytest-timeout" = super.buildPythonPackage {
-    name = "pytest-timeout-1.2.1";
+    name = "pytest-timeout-1.3.2";
     doCheck = false;
     propagatedBuildInputs = [
       self."pytest"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/be/e9/a9106b8bc87521c6813060f50f7d1fdc15665bc1bbbe71c0ffc1c571aaa2/pytest-timeout-1.2.1.tar.gz";
-      sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
+      url = "https://files.pythonhosted.org/packages/8c/3e/1b6a319d12ae7baa3acb7c18ff2c8630a09471a0319d43535c683b4d03eb/pytest-timeout-1.3.2.tar.gz";
+      sha256 = "09wnmzvnls2mnsdz7x3c3sk2zdp6jl4dryvyj5i8hqz16q2zq5qi";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit { fullName = "DFSG approved"; } ];
@@ -1620,6 +1587,22 b' self: super: {'
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
+  "repoze.sendmail" = super.buildPythonPackage {
+    name = "repoze.sendmail-4.4.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."zope.interface"
+      self."transaction"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/12/4e/8ef1fd5c42765d712427b9c391419a77bd48877886d2cbc5e9f23c8cad9b/repoze.sendmail-4.4.1.tar.gz";
+      sha256 = "096ln02jr2afk7ab9j2czxqv2ryqq7m86ah572nqplx52iws73ks";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 ];
+    };
+  };
   "requests" = super.buildPythonPackage {
     name = "requests-2.9.1";
     doCheck = false;
@@ -1632,7 +1615,7 b' self: super: {'
     };
   };
   "rhodecode-enterprise-ce" = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.13.3";
+    name = "rhodecode-enterprise-ce-4.14.0";
     buildInputs = [
       self."pytest"
       self."py"
@@ -1640,8 +1623,8 b' self: super: {'
       self."pytest-sugar"
       self."pytest-runner"
       self."pytest-profiling"
+      self."pytest-timeout"
       self."gprof2dot"
-      self."pytest-timeout"
       self."mock"
       self."webtest"
       self."cov-core"
@@ -1688,7 +1671,6 b' self: super: {'
       self."mysql-python"
       self."pymysql"
       self."pyotp"
-      self."objgraph"
       self."packaging"
       self."paste"
       self."pastedeploy"
@@ -1709,6 +1691,7 b' self: super: {'
       self."pyramid-jinja2"
       self."pyramid-mako"
       self."pyramid"
+      self."pyramid-mailer"
       self."pysqlite"
       self."python-dateutil"
       self."python-ldap"
@@ -1722,7 +1705,6 b' self: super: {'
       self."repoze.lru"
       self."requests"
       self."routes"
-      self."setproctitle"
       self."simplejson"
       self."six"
       self."sqlalchemy"
@@ -1756,10 +1738,9 b' self: super: {'
       self."greenlet"
       self."gunicorn"
       self."waitress"
+      self."setproctitle"
       self."ipdb"
       self."ipython"
-      self."cprofilev"
-      self."bottle"
       self."rhodecode-tools"
       self."appenlight-client"
       self."pytest"
@@ -1768,8 +1749,8 b' self: super: {'
       self."pytest-sugar"
       self."pytest-runner"
       self."pytest-profiling"
+      self."pytest-timeout"
       self."gprof2dot"
-      self."pytest-timeout"
       self."mock"
       self."webtest"
       self."cov-core"
@@ -1781,7 +1762,7 b' self: super: {'
     };
   };
   "rhodecode-tools" = super.buildPythonPackage {
-    name = "rhodecode-tools-0.16.0";
+    name = "rhodecode-tools-1.0.1";
     doCheck = false;
     propagatedBuildInputs = [
       self."click"
@@ -1796,11 +1777,11 b' self: super: {'
       self."whoosh"
     ];
     src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164";
-      sha256 = "00xcc2mj99lx9d0ksml0p2xrd00kf5ypwyigg58cc9j9bznx7mzr";
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v1.0.1.tar.gz?md5=ffb5d6bcb855305b93cfe23ad42e500b";
+      sha256 = "0nr300s4sg685qs4wgbwlplwriawrwi6jq79z37frcnpyc89gpvm";
     };
     meta = {
-      license = [ { fullName = "AGPLv3 and Proprietary"; } ];
+      license = [ { fullName = "Apache 2.0 and Proprietary"; } ];
     };
   };
   "routes" = super.buildPythonPackage {
@@ -1841,11 +1822,11 b' self: super: {'
     };
   };
   "setuptools" = super.buildPythonPackage {
-    name = "setuptools-40.1.0";
+    name = "setuptools-40.4.3";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/5a/df/b2e3d9693bb0dcbeac516a73dd7a9eb82b126ae52e4a74605a9b01beddd5/setuptools-40.1.0.zip";
-      sha256 = "0w1blx5ajga5y15dci0mddk49cf2xpq0mp7rp7jrqr2diqk00ib6";
+      url = "https://files.pythonhosted.org/packages/6e/9c/6a003320b00ef237f94aa74e4ad66c57a7618f6c79d67527136e2544b728/setuptools-40.4.3.zip";
+      sha256 = "058v6zns4634n4al2nmmvp15j8nrgwn8wjrbdks47wk3vm05gg5c";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1922,11 +1903,11 b' self: super: {'
     };
   };
   "subprocess32" = super.buildPythonPackage {
-    name = "subprocess32-3.5.1";
+    name = "subprocess32-3.5.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/de/fb/fd3e91507021e2aecdb081d1b920082628d6b8869ead845e3e87b3d2e2ca/subprocess32-3.5.1.tar.gz";
-      sha256 = "0wgi3bfnssid1g6h0v803z3k1wjal6il16nr3r9c587cfzwfkv0q";
+      url = "https://files.pythonhosted.org/packages/c3/5f/7117737fc7114061837a4f51670d863dd7f7f9c762a6546fa8a0dcfe61c8/subprocess32-3.5.2.tar.gz";
+      sha256 = "11v62shwmdys48g7ncs3a8jwwnkcl8d4zcwy6dk73z1zy2f9hazb";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
@@ -1969,11 +1950,11 b' self: super: {'
     };
   };
   "testpath" = super.buildPythonPackage {
-    name = "testpath-0.3.1";
+    name = "testpath-0.4.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/f4/8b/b71e9ee10e5f751e9d959bc750ab122ba04187f5aa52aabdc4e63b0e31a7/testpath-0.3.1.tar.gz";
-      sha256 = "02bnmkvm6a8a1p5kcygylcd19v2s040qw3zp1n8ab3bqkj1kflqd";
+      url = "https://files.pythonhosted.org/packages/06/30/9a7e917066d851d8b4117e85794b5f14516419ea714a8a2681ec6aa8a981/testpath-0.4.2.tar.gz";
+      sha256 = "1y40hywscnnyb734pnzm55nd8r8kp1072bjxbil83gcd53cv755n";
     };
     meta = {
       license = [  ];
@@ -1996,6 +1977,20 b' self: super: {'
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  "transaction" = super.buildPythonPackage {
+    name = "transaction-2.4.0";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."zope.interface"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/9d/7d/0e8af0d059e052b9dcf2bb5a08aad20ae3e238746bdd3f8701a60969b363/transaction-2.4.0.tar.gz";
+      sha256 = "17wz1y524ca07vr03yddy8dv0gbscs06dbdywmllxv5rc725jq3j";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 ];
+    };
+  };
   "translationstring" = super.buildPythonPackage {
     name = "translationstring-1.3";
     doCheck = false;

pkgs/shell-generate.nix

@@ -23,9 +23,6 b' pkgs.stdenv.mkDerivation {'
     pip2nix.pip2nix
     pythonPackages.pip-tools
 
-    # Allows to generate bower dependencies
-    pkgs.nodePackages.bower2nix
-
     # Allows to generate node dependencies
     pkgs.nodePackages.node2nix
 

release.nix

@@ -1,14 +1,12 b''
 # This file defines how to "build" for packaging.
 
-{ pkgs ? import <nixpkgs> {}
-, doCheck ? false
+{ doCheck ? false
 }:
 
 let
   enterprise_ce = import ./default.nix {
     inherit
-      doCheck
-      pkgs;
+      doCheck;
 
     # disable checkPhase for build
     checkPhase = ''

requirements.txt

@@ -4,8 +4,8 b' setuptools-scm==2.1.0'
 amqp==2.3.1
 # not released authomatic that has updated some oauth providers
 https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801#egg=authomatic==0.1.0.post1
-atomicwrites==1.1.5
-attrs==18.1.0
+atomicwrites==1.2.1
+attrs==18.2.0
 babel==1.3
 beaker==1.9.1
 celery==4.1.1
@@ -19,7 +19,7 b' cssselect==1.0.3'
 decorator==4.1.2
 deform==2.0.5
 docutils==0.14.0
-dogpile.cache==0.6.6
+dogpile.cache==0.6.7
 dogpile.core==0.4.1
 ecdsa==0.13
 formencode==1.2.4
@@ -40,15 +40,14 b' msgpack-python==0.5.6'
 mysql-python==1.2.5
 pymysql==0.8.1
 pyotp==2.2.6
-objgraph==3.1.1
 packaging==15.2
 paste==2.0.3
 pastedeploy==1.5.2
 pastescript==2.0.2
-pathlib2==2.3.0
+pathlib2==2.3.2
 peppercorn==0.5
-psutil==5.4.6
-psycopg2==2.7.4
+psutil==5.4.7
+psycopg2==2.7.5
 py-bcrypt==0.4
 pycrypto==2.6.1
 pycurl==7.43.0.2
@@ -61,6 +60,7 b' pyramid-debugtoolbar==4.4.0'
 pyramid-jinja2==2.7
 pyramid-mako==1.0.2
 pyramid==1.9.2
+pyramid_mailer==0.15.1
 pysqlite==2.8.3
 python-dateutil
 python-ldap==3.1.0
@@ -74,12 +74,11 b' redis==2.10.6'
 repoze.lru==0.7
 requests==2.9.1
 routes==2.4.1
-setproctitle==1.1.10
 simplejson==3.11.1
 six==1.11.0
 sqlalchemy==1.1.18
 sshpubkeys==2.2.0
-subprocess32==3.5.1
+subprocess32==3.5.2
 supervisor==3.3.4
 tempita==0.5.2
 translationstring==1.3
@@ -113,22 +112,24 b' invoke==0.13.0'
 bumpversion==0.5.3
 
 ## http servers
-gevent==1.3.5
-greenlet==0.4.13
+gevent==1.3.6
+greenlet==0.4.15
 gunicorn==19.9.0
 waitress==1.1.0
+setproctitle==1.1.10
 
 ## debug
 ipdb==0.11.0
 ipython==5.1.0
-cprofilev==1.0.7
-bottle==0.12.13
 
 ## rhodecode-tools, special case
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164#egg=rhodecode-tools==0.16.0
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v1.0.1.tar.gz?md5=ffb5d6bcb855305b93cfe23ad42e500b#egg=rhodecode-tools==1.0.1
 
 ## appenlight
 appenlight-client==0.6.25
 
 ## test related requirements
 -r requirements_test.txt
+
+## uncomment to add the debug libraries
+#-r requirements_debug.txt

requirements_test.txt

@@ -1,14 +1,14 b''
 # test related requirements
-pytest==3.6.0
-py==1.5.3
-pytest-cov==2.5.1
+pytest==3.8.2
+py==1.6.0
+pytest-cov==2.6.0
 pytest-sugar==0.9.1
 pytest-runner==4.2.0
 pytest-profiling==1.3.0
+pytest-timeout==1.3.2
 gprof2dot==2017.9.19
-pytest-timeout==1.2.1
 
 mock==1.0.1
 webtest==2.0.29
 cov-core==1.15.0
-coverage==3.7.1
+coverage==4.5.1

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.13.3
  No newline at end of file
+4.14.0
  No newline at end of file

rhodecode/__init__.py

@@ -51,7 +51,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 90  # defines current db version for migrations
+__dbversion__ = 91  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/api/__init__.py

@@ -204,7 +204,7 b' def request_view(request):'
                 message='Request from IP:%s not allowed' % (
                     request.rpc_ip_addr,))
         else:
-            log.info('Access for IP:%s allowed' % (request.rpc_ip_addr,))
+            log.info('Access for IP:%s allowed', request.rpc_ip_addr)
 
         # register our auth-user
         request.rpc_user = auth_u
@@ -352,8 +352,7 b' def setup_request(request):'
         request.rpc_params = json_body['args'] \
             if isinstance(json_body['args'], dict) else {}
 
-        log.debug(
-            'method: %s, params: %s' % (request.rpc_method, request.rpc_params))
+        log.debug('method: %s, params: %s', request.rpc_method, request.rpc_params)
     except KeyError as e:
         raise JSONRPCError('Incorrect JSON data. Missing %s' % e)
 

rhodecode/api/exc.py

@@ -20,7 +20,9 b''
 
 
 class JSONRPCBaseError(Exception):
-    pass
+    def __init__(self, message='', *args):
+        self.message = message
+        super(JSONRPCBaseError, self).__init__(message, *args)
 
 
 class JSONRPCError(JSONRPCBaseError):
@@ -31,7 +33,8 b' class JSONRPCValidationError(JSONRPCBase'
 
     def __init__(self, *args, **kwargs):
         self.colander_exception = kwargs.pop('colander_exc')
-        super(JSONRPCValidationError, self).__init__(*args, **kwargs)
+        super(JSONRPCValidationError, self).__init__(
+            message=self.colander_exception, *args)
 
 
 class JSONRPCForbidden(JSONRPCBaseError):

rhodecode/api/tests/test_comment_commit.py

@@ -65,7 +65,7 b' class TestCommentCommit(object):'
             self, backend, status_change, message, commit_id,
             no_notifications):
 
-        commit_id = backend.repo.scm_instance().get_changeset(commit_id).raw_id
+        commit_id = backend.repo.scm_instance().get_commit(commit_id).raw_id
 
         id_, params = build_data(
             self.apikey, 'comment_commit', repoid=backend.repo_name,
@@ -74,7 +74,7 b' class TestCommentCommit(object):'
         repo = backend.repo.scm_instance()
         expected = {
             'msg': 'Commented on commit `%s` for repository `%s`' % (
-                repo.get_changeset().raw_id, backend.repo_name),
+                repo.get_commit().raw_id, backend.repo_name),
             'status_change': status_change,
             'success': True
         }

rhodecode/api/tests/test_create_pull_request.py

@@ -66,6 +66,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
+        assert result['error'] == None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -88,6 +89,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
+        assert result['error'] == None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -127,6 +129,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
+        assert result['error'] == None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
@@ -170,6 +173,7 b' class TestCreatePullRequestApi(object):'
         expected_message = "Created new pull request `{title}`".format(
             title=data['title'])
         result = response.json
+        assert result['error'] == None
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)

rhodecode/api/tests/test_pull.py

@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
-
+import mock
 import pytest
 
 from rhodecode.tests import TESTS_TMP_PATH
@@ -29,6 +29,7 b' from rhodecode.api.tests.utils import ('
 
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestPull(object):
+
     @pytest.mark.backends("git", "hg")
     def test_api_pull(self, backend):
         r = backend.create_repo()
@@ -37,12 +38,13 b' class TestPull(object):'
         r.clone_uri = clone_uri
 
         id_, params = build_data(self.apikey, 'pull', repoid=repo_name,)
-        response = api_call(self.app, params)
-        msg = 'Pulled from url `%s` on repo `%s`' % (
-            clone_uri, repo_name)
-        expected = {'msg': msg,
-                    'repository': repo_name}
-        assert_ok(id_, expected, given=response.body)
+        with mock.patch('rhodecode.model.scm.url_validator'):
+            response = api_call(self.app, params)
+            msg = 'Pulled from url `%s` on repo `%s`' % (
+                clone_uri, repo_name)
+            expected = {'msg': msg,
+                        'repository': repo_name}
+            assert_ok(id_, expected, given=response.body)
 
     def test_api_pull_error(self, backend):
         id_, params = build_data(

rhodecode/api/tests/test_update_pull_request.py

@@ -89,7 +89,6 b' class TestUpdatePullRequest(object):'
         pr_util.update_source_repository(head='c')
         repo = pull_request.source_repo.scm_instance()
         commits = [x for x in repo.get_commits()]
-        print commits
 
         added_commit_id = commits[-1].raw_id  # c commit
         common_commit_id = commits[1].raw_id  # b commit is common ancestor

rhodecode/api/tests/test_update_repo.py

@@ -26,7 +26,7 b' from rhodecode.tests import TEST_USER_AD'
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok, crash, jsonify)
 from rhodecode.tests.fixture import Fixture
-from rhodecode.tests.plugin import http_host_stub, http_host_only_stub
+from rhodecode.tests.plugin import plain_http_host_only_stub
 
 fixture = Fixture()
 
@@ -56,9 +56,15 b' class TestApiUpdateRepo(object):'
         ({'clone_uri': ''},
          {'clone_uri': ''}),
 
+        ({'clone_uri': 'http://example.com/repo_pull'},
+         {'clone_uri': 'http://example.com/repo_pull'}),
+
         ({'push_uri': ''},
          {'push_uri': ''}),
 
+        ({'push_uri': 'http://example.com/repo_push'},
+         {'push_uri': 'http://example.com/repo_push'}),
+
         ({'landing_rev': 'rev:tip'},
          {'landing_rev': ['rev', 'tip']}),
 
@@ -74,7 +80,7 b' class TestApiUpdateRepo(object):'
         ({'repo_name': 'new_repo_name'},
          {
             'repo_name': 'new_repo_name',
-            'url': 'http://{}/new_repo_name'.format(http_host_only_stub())
+            'url': 'http://{}/new_repo_name'.format(plain_http_host_only_stub())
          }),
 
         ({'repo_name': 'test_group_for_update/{}'.format(UPDATE_REPO_NAME),
@@ -82,7 +88,7 b' class TestApiUpdateRepo(object):'
          {
             'repo_name': 'test_group_for_update/{}'.format(UPDATE_REPO_NAME),
             'url': 'http://{}/test_group_for_update/{}'.format(
-                http_host_only_stub(), UPDATE_REPO_NAME)
+                plain_http_host_only_stub(), UPDATE_REPO_NAME)
          }),
     ])
     def test_api_update_repo(self, updates, expected, backend):

rhodecode/api/views/repo_api.py

@@ -33,7 +33,7 b' from rhodecode.lib import audit_logger'
 from rhodecode.lib import repo_maintenance
 from rhodecode.lib.auth import HasPermissionAnyApi, HasUserGroupPermissionAnyApi
 from rhodecode.lib.celerylib.utils import get_task_id
-from rhodecode.lib.utils2 import str2bool, time_to_datetime
+from rhodecode.lib.utils2 import str2bool, time_to_datetime, safe_str
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError
 from rhodecode.model.changeset_status import ChangesetStatusModel
@@ -316,7 +316,7 b' def get_repo_changeset(request, apiuser,'
     try:
         cs = repo.get_commit(commit_id=revision, pre_load=pre_load)
     except TypeError as e:
-        raise JSONRPCError(e.message)
+        raise JSONRPCError(safe_str(e))
     _cs_json = cs.__json__()
     _cs_json['diff'] = build_commit_data(cs, changes_details)
     if changes_details == 'full':
@@ -382,7 +382,7 b' def get_repo_changesets(request, apiuser'
         commits = vcs_repo.get_commits(
             start_id=start_rev, pre_load=pre_load)
     except TypeError as e:
-        raise JSONRPCError(e.message)
+        raise JSONRPCError(safe_str(e))
     except Exception:
         log.exception('Fetching of commits failed')
         raise JSONRPCError('Error occurred during commit fetching')
@@ -1433,7 +1433,7 b' def comment_commit('
         commit_id = repo.scm_instance().get_commit(commit_id=commit_id).raw_id
     except Exception as e:
         log.exception('Failed to fetch commit')
-        raise JSONRPCError(e.message)
+        raise JSONRPCError(safe_str(e))
 
     if isinstance(userid, Optional):
         userid = apiuser.user_id

rhodecode/apps/_base/__init__.py

@@ -25,7 +25,8 b' import operator'
 from pyramid.httpexceptions import HTTPFound, HTTPForbidden, HTTPBadRequest
 
 from rhodecode.lib import helpers as h, diffs
-from rhodecode.lib.utils2 import StrictAttributeDict, safe_int, datetime_to_time
+from rhodecode.lib.utils2 import (
+    StrictAttributeDict, safe_int, datetime_to_time, safe_unicode)
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.model import repo
 from rhodecode.model import repo_group
@@ -61,12 +62,13 b' def add_route_with_slash(config,name, pa'
         config.add_route(name + '_slash', pattern + '/', **kw)
 
 
-def add_route_requirements(route_path, requirements=URL_NAME_REQUIREMENTS):
+def add_route_requirements(route_path, requirements=None):
     """
     Adds regex requirements to pyramid routes using a mapping dict
     e.g::
         add_route_requirements('{repo_name}/settings')
     """
+    requirements = requirements or URL_NAME_REQUIREMENTS
     for key, regex in requirements.items():
         route_path = route_path.replace('{%s}' % key, '{%s:%s}' % (key, regex))
     return route_path
@@ -201,7 +203,7 b' class RepoAppView(BaseAppView):'
     def _handle_missing_requirements(self, error):
         log.error(
             'Requirements are missing for repository %s: %s',
-            self.db_repo_name, error.message)
+            self.db_repo_name, safe_unicode(error))
 
     def _get_local_tmpl_context(self, include_app_defaults=True):
         _ = self.request.translate
@@ -301,7 +303,8 b' class PathFilter(object):'
 
     def render_patchset_filtered(self, diffset, patchset, source_ref=None, target_ref=None):
         filtered_patchset, has_hidden_changes = self.filter_patchset(patchset)
-        result = diffset.render_patchset(filtered_patchset, source_ref=source_ref, target_ref=target_ref)
+        result = diffset.render_patchset(
+            filtered_patchset, source_ref=source_ref, target_ref=target_ref)
         result.has_hidden_changes = has_hidden_changes
         return result
 
@@ -505,6 +508,36 b' class RepoRoutePredicate(object):'
         return False
 
 
+class RepoForbidArchivedRoutePredicate(object):
+    def __init__(self, val, config):
+        self.val = val
+
+    def text(self):
+        return 'repo_forbid_archived = %s' % self.val
+
+    phash = text
+
+    def __call__(self, info, request):
+        _ = request.translate
+        rhodecode_db_repo = request.db_repo
+
+        log.debug(
+            '%s checking if archived flag for repo for %s',
+            self.__class__.__name__, rhodecode_db_repo.repo_name)
+
+        if rhodecode_db_repo.archived:
+            log.warning('Current view is not supported for archived repo:%s',
+                        rhodecode_db_repo.repo_name)
+
+            h.flash(
+                h.literal(_('Action not supported for archived repository.')),
+                category='warning')
+            summary_url = request.route_path(
+                'repo_summary', repo_name=rhodecode_db_repo.repo_name)
+            raise HTTPFound(summary_url)
+        return True
+
+
 class RepoTypeRoutePredicate(object):
     def __init__(self, val, config):
         self.val = val or ['hg', 'git', 'svn']
@@ -530,13 +563,6 b' class RepoTypeRoutePredicate(object):'
         else:
             log.warning('Current view is not supported for repo type:%s',
                         rhodecode_db_repo.repo_type)
-
-            # h.flash(h.literal(
-            #     _('Action not supported for %s.' % rhodecode_repo.alias)),
-            #     category='warning')
-            # return redirect(
-            #     route_path('repo_summary', repo_name=cls.rhodecode_db_repo.repo_name))
-
             return False
 
 
@@ -643,10 +669,12 b' def includeme(config):'
     config.add_route_predicate(
         'repo_accepted_types', RepoTypeRoutePredicate)
     config.add_route_predicate(
+        'repo_forbid_when_archived', RepoForbidArchivedRoutePredicate)
+    config.add_route_predicate(
         'repo_group_route', RepoGroupRoutePredicate)
     config.add_route_predicate(
         'user_group_route', UserGroupRoutePredicate)
     config.add_route_predicate(
         'user_route_with_default', UserRouteWithDefaultPredicate)
     config.add_route_predicate(
-        'user_route', UserRoutePredicate)
  No newline at end of file
+        'user_route', UserRoutePredicate)

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -488,14 +488,30 b' class TestLabsSettings(object):'
 class TestOpenSourceLicenses(object):
 
     def test_records_are_displayed(self, autologin_user):
-        sample_licenses = {
-            "python2.7-pytest-2.7.1": {
-                "UNKNOWN": None
+        sample_licenses = [
+            {
+                "license": [
+                    {
+                        "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                        "shortName": "bsdOriginal",
+                        "spdxId": "BSD-4-Clause",
+                        "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+                    }
+                ],
+                "name": "python2.7-coverage-3.7.1"
             },
-            "python2.7-Markdown-2.6.2": {
-                "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
-            }
-        }
+            {
+                "license": [
+                    {
+                        "fullName": "MIT License",
+                        "shortName": "mit",
+                        "spdxId": "MIT",
+                        "url": "http://spdx.org/licenses/MIT.html"
+                    }
+                ],
+                "name": "python2.7-bootstrapped-pip-9.0.1"
+            },
+        ]
         read_licenses_patch = mock.patch(
             'rhodecode.apps.admin.views.open_source_licenses.read_opensource_licenses',
             return_value=sample_licenses)
@@ -506,10 +522,9 b' class TestOpenSourceLicenses(object):'
         assert_response = AssertResponse(response)
         assert_response.element_contains(
             '.panel-heading', 'Licenses of Third Party Packages')
-        for name in sample_licenses:
-            response.mustcontain(name)
-            for license in sample_licenses[name]:
-                assert_response.element_contains('.panel-body', license)
+        for license_data in sample_licenses:
+            response.mustcontain(license_data["license"][0]["spdxId"])
+            assert_response.element_contains('.panel-body', license_data["name"])
 
     def test_records_can_be_read(self, autologin_user):
         response = self.app.get(

rhodecode/apps/admin/views/open_source_licenses.py

@@ -35,7 +35,6 b' class OpenSourceLicensesAdminSettingsVie'
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-
         return c
 
     @LoginRequired()
@@ -47,7 +46,6 b' class OpenSourceLicensesAdminSettingsVie'
         c = self.load_default_context()
         c.active = 'open_source'
         c.navlist = navigation_list(self.request)
-        items = sorted(read_opensource_licenses().items(), key=lambda t: t[0])
-        c.opensource_licenses = collections.OrderedDict(items)
-
+        c.opensource_licenses = sorted(
+            read_opensource_licenses(), key=lambda d: d["name"])
         return self._get_template_context(c)

rhodecode/apps/admin/views/process_management.py

@@ -26,6 +26,7 b' from pyramid.view import view_config'
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.apps.admin.navigation import navigation_list
+from rhodecode.lib import system_info
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
 from rhodecode.lib.utils2 import safe_int, StrictAttributeDict
@@ -71,6 +72,16 b' class AdminProcessManagementView(BaseApp'
 
         return proc_list
 
+    def get_workers(self):
+        workers = None
+        try:
+            rc_config = system_info.rhodecode_config().value['config']
+            workers = rc_config['server:main'].get('workers')
+        except Exception:
+            pass
+
+        return workers or '?'
+
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
@@ -83,6 +94,7 b' class AdminProcessManagementView(BaseApp'
         c.active = 'process_management'
         c.navlist = navigation_list(self.request)
         c.gunicorn_processes = self.get_processes()
+        c.gunicorn_workers = self.get_workers()
         return self._get_template_context(c)
 
     @LoginRequired()

rhodecode/apps/channelstream/views.py

@@ -26,7 +26,7 b' from pyramid.httpexceptions import HTTPB'
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib.channelstream import (
-    channelstream_request,
+    channelstream_request, get_channelstream_server_url,
     ChannelstreamConnectionException,
     ChannelstreamPermissionException,
     check_channel_permissions,
@@ -56,8 +56,9 b' class ChannelstreamView(BaseAppView):'
     @NotAnonymous()
     @view_config(route_name='channelstream_connect', renderer='json_ext')
     def connect(self):
+        """ handle authorization of users trying to connect """
+
         self.load_default_context()
-        """ handle authorization of users trying to connect """
         try:
             json_body = self.request.json_body
         except Exception:
@@ -107,11 +108,14 b' class ChannelstreamView(BaseAppView):'
                 'broadcast_presence_with_user_lists': True
             }
         # connect user to server
+        channelstream_url = get_channelstream_server_url(
+            self.channelstream_config, '/connect')
         try:
-            connect_result = channelstream_request(self.channelstream_config,
-                                                   payload, '/connect')
+            connect_result = channelstream_request(
+                self.channelstream_config, payload, '/connect')
         except ChannelstreamConnectionException:
-            log.exception('Channelstream service is down')
+            log.exception(
+                'Channelstream service at {} is down'.format(channelstream_url))
             return HTTPBadGateway()
 
         connect_result['channels'] = channels
@@ -153,17 +157,21 b' class ChannelstreamView(BaseAppView):'
                 'store_history': True,
                 'broadcast_presence_with_user_lists': True
             }
+
+        channelstream_url = get_channelstream_server_url(
+            self.channelstream_config, '/subscribe')
         try:
             connect_result = channelstream_request(
                 self.channelstream_config, payload, '/subscribe')
         except ChannelstreamConnectionException:
-            log.exception('Channelstream service is down')
+            log.exception(
+                'Channelstream service at {} is down'.format(channelstream_url))
             return HTTPBadGateway()
         # include_channel_info will limit history only to new channel
         # to not overwrite histories on other channels in client
         connect_result['channels_info'] = parse_channels_info(
             connect_result['channels_info'],
             include_channel_info=filtered_channels)
-        update_history_from_logs(self.channelstream_config,
-                                 filtered_channels, connect_result)
+        update_history_from_logs(
+            self.channelstream_config, filtered_channels, connect_result)
         return connect_result

rhodecode/apps/debug_style/__init__.py

@@ -21,22 +21,31 b' from rhodecode.apps._base import ADMIN_P'
 from rhodecode.lib.utils2 import str2bool
 
 
-def debug_style_enabled(info, request):
-    return str2bool(request.registry.settings.get('debug_style'))
+class DebugStylePredicate(object):
+    def __init__(self, val, config):
+        self.val = val
+
+    def text(self):
+        return 'debug style route = %s' % self.val
+
+    phash = text
+
+    def __call__(self, info, request):
+        return str2bool(request.registry.settings.get('debug_style'))
 
 
 def includeme(config):
+    config.add_route_predicate(
+        'debug_style', DebugStylePredicate)
+
     config.add_route(
         name='debug_style_home',
         pattern=ADMIN_PREFIX + '/debug_style',
-        custom_predicates=(debug_style_enabled,))
+        debug_style=True)
     config.add_route(
         name='debug_style_template',
         pattern=ADMIN_PREFIX + '/debug_style/t/{t_path}',
-        custom_predicates=(debug_style_enabled,))
+        debug_style=True)
 
     # Scan module for configuration decorators.
     config.scan('.views', ignore='.tests')
-
-
-

rhodecode/apps/gist/views.py

@@ -405,8 +405,8 b' class GistView(BaseAppView):'
         revision = self.request.GET.get('revision')
 
         if revision != last_rev.raw_id:
-            log.error('Last revision %s is different then submitted %s'
-                      % (revision, last_rev))
+            log.error('Last revision %s is different then submitted %s',
+                      revision, last_rev)
             # our gist has newer version than we
             success = False
 

rhodecode/apps/home/__init__.py

@@ -63,6 +63,10 b' def includeme(config):'
         name='markup_preview',
         pattern='/_markup_preview')
 
+    config.add_route(
+        name='store_user_session_value',
+        pattern='/_store_session_attr')
+
     # register our static links via redirection mechanism
     routing_links.connect_redirection_links(config)
 

rhodecode/apps/home/tests/test_home.py

@@ -60,10 +60,9 b' class TestHomeController(TestController)'
         response = self.app.get(route_path('home'))
 
         rhodecode_version_hash = calculate_version_hash(
-            {'beaker.session.secret':'test-rc-uytcxaz'})
+            {'beaker.session.secret': 'test-rc-uytcxaz'})
         response.mustcontain('style.css?ver={0}'.format(rhodecode_version_hash))
-        response.mustcontain('rhodecode-components.js?ver={0}'.format(
-            rhodecode_version_hash))
+        response.mustcontain('scripts.js?ver={0}'.format(rhodecode_version_hash))
 
     def test_index_contains_backend_specific_details(self, backend):
         self.log_user()

rhodecode/apps/home/views.py

@@ -33,7 +33,7 b' from rhodecode.lib.index import searcher'
 from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
 from rhodecode.lib.ext_json import json
 from rhodecode.model.db import (
-    func, or_, in_filter_generator, Repository, RepoGroup, User, UserGroup)
+    func, true, or_, in_filter_generator, Repository, RepoGroup, User, UserGroup)
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import RepoGroupList, RepoList
@@ -114,6 +114,7 b' class HomeView(BaseAppView):'
         query = Repository.query()\
             .order_by(func.length(Repository.repo_name))\
             .order_by(Repository.repo_name)\
+            .filter(Repository.archived.isnot(true()))\
             .filter(or_(
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(Repository.repo_id, allowed_ids)
@@ -444,3 +445,18 b' class HomeView(BaseAppView):'
         if text:
             return h.render(text, renderer=renderer, mentions=True)
         return ''
+
+    @LoginRequired()
+    @CSRFRequired()
+    @view_config(
+        route_name='store_user_session_value', request_method='POST',
+        renderer='string', xhr=True)
+    def store_user_session_attr(self):
+        key = self.request.POST.get('key')
+        val = self.request.POST.get('val')
+
+        existing_value = self.request.session.get(key)
+        if existing_value != val:
+            self.request.session[key] = val
+
+        return 'stored:{}'.format(key)

rhodecode/apps/login/views.py

@@ -93,16 +93,16 b' def get_came_from(request):'
     allowed_schemes = ['http', 'https']
     default_came_from = h.route_path('home')
     if parsed.scheme and parsed.scheme not in allowed_schemes:
-        log.error('Suspicious URL scheme detected %s for url %s' %
-                  (parsed.scheme, parsed))
+        log.error('Suspicious URL scheme detected %s for url %s',
+                  parsed.scheme, parsed)
         came_from = default_came_from
     elif parsed.netloc and request.host != parsed.netloc:
         log.error('Suspicious NETLOC detected %s for url %s server url '
-                  'is: %s' % (parsed.netloc, parsed, request.host))
+                  'is: %s', parsed.netloc, parsed, request.host)
         came_from = default_came_from
     elif any(bad_str in parsed.path for bad_str in ('\r', '\n')):
-        log.error('Header injection detected `%s` for url %s server url ' %
-                  (parsed.path, parsed))
+        log.error('Header injection detected `%s` for url %s server url ',
+                  parsed.path, parsed)
         came_from = default_came_from
 
     return came_from or default_came_from

rhodecode/apps/repo_group/views/repo_group_permissions.py

@@ -29,6 +29,8 b' from rhodecode.lib import helpers as h'
 from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoGroupPermissionAnyDecorator, CSRFRequired)
+from rhodecode.lib.utils2 import safe_int
+from rhodecode.model.db import UserGroup
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.forms import RepoGroupPermsForm
 from rhodecode.model.meta import Session
@@ -101,6 +103,11 b' class RepoGroupPermissionsView(RepoGroup'
         for change in changes['added'] + changes['updated'] + changes['deleted']:
             if change['type'] == 'user':
                 affected_user_ids.append(change['id'])
+            if change['type'] == 'user_group':
+                user_group = UserGroup.get(safe_int(change['id']))
+                if user_group:
+                    group_members_ids = [x.user_id for x in user_group.members]
+                    affected_user_ids.extend(group_members_ids)
 
         events.trigger(events.UserPermissionsChange(affected_user_ids))
 

rhodecode/apps/repository/__init__.py

@@ -231,11 +231,13 b' def includeme(config):'
     config.add_route(
         name='repo_fork_new',
         pattern='/{repo_name:.*?[^/]}/fork', repo_route=True,
+        repo_forbid_when_archived=True,
         repo_accepted_types=['hg', 'git'])
 
     config.add_route(
         name='repo_fork_create',
         pattern='/{repo_name:.*?[^/]}/fork/create', repo_route=True,
+        repo_forbid_when_archived=True,
         repo_accepted_types=['hg', 'git'])
 
     config.add_route(
@@ -276,27 +278,29 b' def includeme(config):'
     config.add_route(
         name='pullrequest_new',
         pattern='/{repo_name:.*?[^/]}/pull-request/new',
-        repo_route=True, repo_accepted_types=['hg', 'git'])
+        repo_route=True, repo_accepted_types=['hg', 'git'],
+        repo_forbid_when_archived=True)
 
     config.add_route(
         name='pullrequest_create',
         pattern='/{repo_name:.*?[^/]}/pull-request/create',
-        repo_route=True, repo_accepted_types=['hg', 'git'])
+        repo_route=True, repo_accepted_types=['hg', 'git'],
+        repo_forbid_when_archived=True)
 
     config.add_route(
         name='pullrequest_update',
         pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/update',
-        repo_route=True)
+        repo_route=True, repo_forbid_when_archived=True)
 
     config.add_route(
         name='pullrequest_merge',
         pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/merge',
-        repo_route=True)
+        repo_route=True, repo_forbid_when_archived=True)
 
     config.add_route(
         name='pullrequest_delete',
         pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/delete',
-        repo_route=True)
+        repo_route=True, repo_forbid_when_archived=True)
 
     config.add_route(
         name='pullrequest_comment_create',
@@ -319,6 +323,9 b' def includeme(config):'
         name='edit_repo_advanced',
         pattern='/{repo_name:.*?[^/]}/settings/advanced', repo_route=True)
     config.add_route(
+        name='edit_repo_advanced_archive',
+        pattern='/{repo_name:.*?[^/]}/settings/advanced/archive', repo_route=True)
+    config.add_route(
         name='edit_repo_advanced_delete',
         pattern='/{repo_name:.*?[^/]}/settings/advanced/delete', repo_route=True)
     config.add_route(

rhodecode/apps/repository/tests/test_repo_commit_comments.py

@@ -97,9 +97,10 b' class TestRepoCommitCommentsView(TestCon'
         comment_id = ChangesetComment.query().first().comment_id
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
 
-        sbj = 'left {0} on commit `{1}` in the {2} repository'.format(
-            comment_type, h.show_id(commit), backend.repo_name)
-        assert sbj in notification.subject
+        author = notification.created_by_user.username_and_name
+        sbj = '{0} left a {1} on commit `{2}` in the {3} repository'.format(
+            author, comment_type, h.show_id(commit), backend.repo_name)
+        assert sbj == notification.subject
 
         lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
             backend.repo_name, commit_id, comment_id))
@@ -134,12 +135,18 b' class TestRepoCommitCommentsView(TestCon'
         if backend.alias == 'svn':
             response.mustcontain(
                 '''data-f-path="vcs/commands/summary.py" '''
-                '''id="a_c--ad05457a43f8"'''
+                '''data-anchor-id="c-300-ad05457a43f8"'''
             )
-        else:
+        if backend.alias == 'git':
             response.mustcontain(
                 '''data-f-path="vcs/backends/hg.py" '''
-                '''id="a_c--9c390eb52cd6"'''
+                '''data-anchor-id="c-883e775e89ea-9c390eb52cd6"'''
+            )
+
+        if backend.alias == 'hg':
+            response.mustcontain(
+                '''data-f-path="vcs/backends/hg.py" '''
+                '''data-anchor-id="c-e58d85a3973b-9c390eb52cd6"'''
             )
 
         assert Notification.query().count() == 1
@@ -150,12 +157,12 b' class TestRepoCommitCommentsView(TestCon'
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
 
         assert comment.revision == commit_id
-        sbj = 'left {comment_type} on commit `{commit}` ' \
-              '(file: `{f_path}`) in the {repo} repository'.format(
-            commit=h.show_id(commit),
-            f_path=f_path, line=line, repo=backend.repo_name,
-            comment_type=comment_type)
-        assert sbj in notification.subject
+
+        author = notification.created_by_user.username_and_name
+        sbj = '{0} left a {1} on file `{2}` in commit `{3}` in the {4} repository'.format(
+            author, comment_type, f_path, h.show_id(commit), backend.repo_name)
+
+        assert sbj == notification.subject
 
         lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
             backend.repo_name, commit_id, comment.comment_id))
@@ -222,10 +229,10 b' class TestRepoCommitCommentsView(TestCon'
         comment_id = ChangesetComment.query().first().comment_id
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
 
-        sbj = 'left note on commit `{0}` (status: Approved) ' \
-              'in the {1} repository'.format(
-            h.show_id(commit), backend.repo_name)
-        assert sbj in notification.subject
+        author = notification.created_by_user.username_and_name
+        sbj = '[status: Approved] {0} left a note on commit `{1}` in the {2} repository'.format(
+            author, h.show_id(commit), backend.repo_name)
+        assert sbj == notification.subject
 
         lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
             backend.repo_name, commit_id, comment_id))
@@ -283,7 +290,7 b' class TestRepoCommitCommentsView(TestCon'
         commit_id = '0' * 16  # fake this for tests
         response = self.app.post(
             route_path('repo_commit_comment_preview',
-                        repo_name=backend.repo_name, commit_id=commit_id,),
+                       repo_name=backend.repo_name, commit_id=commit_id,),
             params=params,
             extra_environ=xhr_header)
 

rhodecode/apps/repository/tests/test_repo_commits.py

@@ -88,7 +88,7 b' class TestRepoCommitView(object):'
         response.mustcontain('21 files changed: 943 inserted, 288 deleted')
 
         # files op files
-        response.mustcontain('File no longer present at commit: %s' %
+        response.mustcontain('File not present at commit: %s' %
                              _shorten_commit_id(commit_id))
 
         # svn uses a different filename
@@ -133,7 +133,7 b' class TestRepoCommitView(object):'
             response.mustcontain('21 files changed: 943 inserted, 288 deleted')
 
         # files op files
-        response.mustcontain('File no longer present at commit: %s' %
+        response.mustcontain('File not present at commit: %s' %
                              _shorten_commit_id(commit_ids[1]))
         response.mustcontain('Added docstrings to vcs.cli')  # commit msg
         response.mustcontain('Changed theme to ADC theme')  # commit msg
@@ -163,7 +163,7 b' class TestRepoCommitView(object):'
         response.mustcontain(_shorten_commit_id(commit_ids[1]))
 
         # files op files
-        response.mustcontain('File no longer present at commit: %s' %
+        response.mustcontain('File not present at commit: %s' %
                              _shorten_commit_id(commit_ids[1]))
 
         # svn is special
@@ -293,26 +293,13 b' Added a symlink'
 """ + diffs['svn'],
     }
 
-    def _check_diff_menus(self, response, right_menu=False,):
-        # diff menus
-        for elem in ['Show File', 'Unified Diff', 'Side-by-side Diff',
-                     'Raw Diff', 'Download Diff']:
+    def _check_new_diff_menus(self, response, right_menu=False,):
+        # individual file diff menus
+        for elem in ['Show file before', 'Show file after']:
             response.mustcontain(elem)
 
         # right pane diff menus
         if right_menu:
-            for elem in ['Ignore whitespace', 'Increase context',
-                         'Hide comments']:
+            for elem in ['Hide whitespace changes', 'Toggle Wide Mode diff',
+                         'Show full context diff']:
                 response.mustcontain(elem)
-
-    def _check_new_diff_menus(self, response, right_menu=False,):
-        # diff menus
-        for elem in ['Show file before', 'Show file after',
-                     'Raw diff', 'Download diff']:
-            response.mustcontain(elem)
-
-        # right pane diff menus
-        if right_menu:
-            for elem in ['Ignore whitespace', 'Increase context',
-                         'Hide comments']:
-                response.mustcontain(elem)

rhodecode/apps/repository/tests/test_repo_compare.py

@@ -104,13 +104,11 b' class TestCompareView(object):'
         # Comparing the revisions
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=origin.repo_name,
-                source_ref_type="rev",
-                source_ref=commit3.raw_id,
-                target_ref_type="rev",
-                target_ref=commit4.raw_id,
-                params=dict(merge='1', target_repo=fork.repo_name)
-           ))
+                       repo_name=origin.repo_name,
+                       source_ref_type="rev", source_ref=commit3.raw_id,
+                       target_ref_type="rev", target_ref=commit4.raw_id,
+                       params=dict(merge='1', target_repo=fork.repo_name)
+                       ))
 
         compare_page = ComparePage(response)
         compare_page.contains_commits([commit4])
@@ -142,13 +140,11 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=repo1.repo_name,
-                source_ref_type="branch",
-                source_ref=commit_id2,
-                target_ref_type="branch",
-                target_ref=commit_id1,
-                params=dict(merge='1', target_repo=repo2.repo_name)
-        ))
+                       repo_name=repo1.repo_name,
+                       source_ref_type="branch", source_ref=commit_id2,
+                       target_ref_type="branch", target_ref=commit_id1,
+                       params=dict(merge='1', target_repo=repo2.repo_name)
+                       ))
 
         response.mustcontain('%s@%s' % (repo1.repo_name, commit_id2))
         response.mustcontain('%s@%s' % (repo2.repo_name, commit_id1))
@@ -156,9 +152,9 b' class TestCompareView(object):'
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(1, 2, 0)
         compare_page.contains_commits([commit1, commit2])
-        compare_page.contains_file_links_and_anchors([
-            ('file1', 'a_c--826e8142e6ba'),
-        ])
+
+        anchor = 'a_c-{}-826e8142e6ba'.format(commit0.short_id)
+        compare_page.contains_file_links_and_anchors([('file1', anchor), ])
 
         # Swap is removed when comparing branches since it's a PR feature and
         # it is then a preview mode
@@ -199,13 +195,11 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=repo1.repo_name,
-                source_ref_type="branch",
-                source_ref=commit_id2,
-                target_ref_type="branch",
-                target_ref=commit_id1,
-                params=dict(merge='1', target_repo=repo2.repo_name),
-            ))
+                       repo_name=repo1.repo_name,
+                       source_ref_type="branch", source_ref=commit_id2,
+                       target_ref_type="branch", target_ref=commit_id1,
+                       params=dict(merge='1', target_repo=repo2.repo_name),
+                       ))
 
         response.mustcontain('%s@%s' % (repo1.repo_name, commit_id2))
         response.mustcontain('%s@%s' % (repo2.repo_name, commit_id1))
@@ -213,9 +207,8 b' class TestCompareView(object):'
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(1, 2, 0)
         compare_page.contains_commits([commit1, commit2])
-        compare_page.contains_file_links_and_anchors([
-            ('file1', 'a_c--826e8142e6ba'),
-        ])
+        anchor = 'a_c-{}-826e8142e6ba'.format(commit0.short_id)
+        compare_page.contains_file_links_and_anchors([('file1', anchor), ])
 
         # Swap is removed when comparing branches since it's a PR feature and
         # it is then a preview mode
@@ -230,13 +223,11 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=orig.repo_name,
-                source_ref_type="rev",
-                source_ref="tip",
-                target_ref_type="rev",
-                target_ref="tip",
-                params=dict(merge='1', target_repo=fork.repo_name),
-            ),
+                       repo_name=orig.repo_name,
+                       source_ref_type="rev", source_ref="tip",
+                       target_ref_type="rev", target_ref="tip",
+                       params=dict(merge='1', target_repo=fork.repo_name),
+                       ),
             status=302)
         response = response.follow()
         response.mustcontain("Repositories unrelated.")
@@ -289,14 +280,12 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=repo2.repo_name,
-                source_ref_type="rev",
-                # parent of commit2, in target repo2
-                source_ref=commit1.raw_id,
-                target_ref_type="rev",
-                target_ref=commit4.raw_id,
-                params=dict(merge='1', target_repo=repo1.repo_name),
-            ))
+                       repo_name=repo2.repo_name,
+                       # parent of commit2, in target repo2
+                       source_ref_type="rev", source_ref=commit1.raw_id,
+                       target_ref_type="rev", target_ref=commit4.raw_id,
+                       params=dict(merge='1', target_repo=repo1.repo_name),
+                       ))
         response.mustcontain('%s@%s' % (repo2.repo_name, commit1.short_id))
         response.mustcontain('%s@%s' % (repo1.repo_name, commit4.short_id))
 
@@ -304,9 +293,8 b' class TestCompareView(object):'
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(1, 3, 0)
         compare_page.contains_commits([commit2, commit3, commit4])
-        compare_page.contains_file_links_and_anchors([
-            ('file1', 'a_c--826e8142e6ba'),
-        ])
+        anchor = 'a_c-{}-826e8142e6ba'.format(commit1.short_id)
+        compare_page.contains_file_links_and_anchors([('file1', anchor),])
 
     @pytest.mark.xfail_backends("svn")
     def test_compare_cherry_pick_commits_from_top(self, backend):
@@ -355,14 +343,11 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=repo1.repo_name,
-                source_ref_type="rev",
-                # parent of commit3, not in source repo2
-                source_ref=commit2.raw_id,
-                target_ref_type="rev",
-                target_ref=commit5.raw_id,
-                params=dict(merge='1'),
-        ))
+                       repo_name=repo1.repo_name,
+                       # parent of commit3, not in source repo2
+                       source_ref_type="rev", source_ref=commit2.raw_id,
+                       target_ref_type="rev", target_ref=commit5.raw_id,
+                       params=dict(merge='1'),))
 
         response.mustcontain('%s@%s' % (repo1.repo_name, commit2.short_id))
         response.mustcontain('%s@%s' % (repo1.repo_name, commit5.short_id))
@@ -372,9 +357,8 b' class TestCompareView(object):'
         compare_page.contains_commits([commit3, commit4, commit5])
 
         # files
-        compare_page.contains_file_links_and_anchors([
-            ('file1', 'a_c--826e8142e6ba'),
-        ])
+        anchor = 'a_c-{}-826e8142e6ba'.format(commit2.short_id)
+        compare_page.contains_file_links_and_anchors([('file1', anchor),])
 
     @pytest.mark.xfail_backends("svn")
     def test_compare_remote_branches(self, backend):
@@ -382,17 +366,17 b' class TestCompareView(object):'
         repo2 = backend.create_fork()
 
         commit_id1 = repo1.get_commit(commit_idx=3).raw_id
+        commit_id1_short = repo1.get_commit(commit_idx=3).short_id
         commit_id2 = repo1.get_commit(commit_idx=6).raw_id
+        commit_id2_short = repo1.get_commit(commit_idx=6).short_id
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=repo1.repo_name,
-                source_ref_type="rev",
-                source_ref=commit_id1,
-                target_ref_type="rev",
-                target_ref=commit_id2,
-                params=dict(merge='1', target_repo=repo2.repo_name),
-            ))
+                       repo_name=repo1.repo_name,
+                       source_ref_type="rev", source_ref=commit_id1,
+                       target_ref_type="rev", target_ref=commit_id2,
+                       params=dict(merge='1', target_repo=repo2.repo_name),
+                       ))
 
         response.mustcontain('%s@%s' % (repo1.repo_name, commit_id1))
         response.mustcontain('%s@%s' % (repo2.repo_name, commit_id2))
@@ -405,9 +389,9 b' class TestCompareView(object):'
 
         # files
         compare_page.contains_file_links_and_anchors([
-            ('vcs/backends/hg.py', 'a_c--9c390eb52cd6'),
-            ('vcs/backends/__init__.py', 'a_c--41b41c1f2796'),
-            ('vcs/backends/base.py', 'a_c--2f574d260608'),
+            ('vcs/backends/hg.py', 'a_c-{}-9c390eb52cd6'.format(commit_id2_short)),
+            ('vcs/backends/__init__.py', 'a_c-{}-41b41c1f2796'.format(commit_id1_short)),
+            ('vcs/backends/base.py', 'a_c-{}-2f574d260608'.format(commit_id1_short)),
         ])
 
     @pytest.mark.xfail_backends("svn")
@@ -451,13 +435,11 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=r2_name,
-                source_ref_type="branch",
-                source_ref=commit_id1,
-                target_ref_type="branch",
-                target_ref=commit_id2,
-                params=dict(merge='1', target_repo=r1_name),
-            ))
+                       repo_name=r2_name,
+                       source_ref_type="branch", source_ref=commit_id1,
+                       target_ref_type="branch", target_ref=commit_id2,
+                       params=dict(merge='1', target_repo=r1_name),
+                       ))
 
         response.mustcontain('%s@%s' % (r2_name, commit_id1))
         response.mustcontain('%s@%s' % (r1_name, commit_id2))
@@ -472,13 +454,11 b' class TestCompareView(object):'
         # compare !
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=r2_name,
-                source_ref_type="branch",
-                source_ref=commit_id1,
-                target_ref_type="branch",
-                target_ref=commit_id2,
-                params=dict(merge='1', target_repo=r1_name),
-            ))
+                       repo_name=r2_name,
+                       source_ref_type="branch", source_ref=commit_id1,
+                       target_ref_type="branch", target_ref=commit_id2,
+                       params=dict(merge='1', target_repo=r1_name),
+                       ))
 
         response.mustcontain('%s@%s' % (r2_name, commit_id1))
         response.mustcontain('%s@%s' % (r1_name, commit_id2))
@@ -495,14 +475,12 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=backend.repo_name,
-                source_ref_type="rev",
-                source_ref=commit0.raw_id,
-                target_ref_type="rev",
-                target_ref=commit1.raw_id,
-                params=dict(merge='1')
-            ),
-            extra_environ=xhr_header,)
+                       repo_name=backend.repo_name,
+                       source_ref_type="rev", source_ref=commit0.raw_id,
+                       target_ref_type="rev", target_ref=commit1.raw_id,
+                       params=dict(merge='1')
+                       ),
+            extra_environ=xhr_header, )
 
         # outgoing commits between those commits
         compare_page = ComparePage(response)
@@ -514,13 +492,11 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=badrepo,
-                source_ref_type="rev",
-                source_ref='tip',
-                target_ref_type="rev",
-                target_ref='tip',
-                params=dict(merge='1', target_repo=repo.repo_name)
-            ),
+                       repo_name=badrepo,
+                       source_ref_type="rev", source_ref='tip',
+                       target_ref_type="rev", target_ref='tip',
+                       params=dict(merge='1', target_repo=repo.repo_name)
+                       ),
             status=404)
 
     def test_errors_when_comparing_unknown_target_repo(self, backend):
@@ -529,13 +505,11 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=repo.repo_name,
-                source_ref_type="rev",
-                source_ref='tip',
-                target_ref_type="rev",
-                target_ref='tip',
-                params=dict(merge='1', target_repo=badrepo),
-            ),
+                       repo_name=repo.repo_name,
+                       source_ref_type="rev", source_ref='tip',
+                       target_ref_type="rev", target_ref='tip',
+                       params=dict(merge='1', target_repo=badrepo),
+                       ),
             status=302)
         redirected = response.follow()
         redirected.mustcontain(
@@ -547,12 +521,10 b' class TestCompareView(object):'
 
         response = self.app.get(
             route_path('repo_compare',
-                repo_name=backend_stub.repo_name,
-                source_ref_type="rev",
-                source_ref=commit0.raw_id,
-                target_ref_type="rev",
-                target_ref=commit1.raw_id,
-            ))
+                       repo_name=backend_stub.repo_name,
+                       source_ref_type="rev", source_ref=commit0.raw_id,
+                       target_ref_type="rev", target_ref=commit1.raw_id,
+                       ))
 
         # outgoing commits between those commits
         compare_page = ComparePage(response)
@@ -575,13 +547,11 b' class TestCompareView(object):'
 
             response = self.app.get(
                 route_path('repo_compare',
-                    repo_name=orig.repo_name,
-                    source_ref_type="rev",
-                    source_ref="tip",
-                    target_ref_type="rev",
-                    target_ref="tip",
-                    params=dict(merge='1', target_repo=fork.repo_name),
-                ),
+                           repo_name=orig.repo_name,
+                           source_ref_type="rev", source_ref="tip",
+                           target_ref_type="rev", target_ref="tip",
+                           params=dict(merge='1', target_repo=fork.repo_name),
+                           ),
                 status=302)
 
             assert_session_flash(
@@ -597,13 +567,13 b' class TestCompareControllerSvn(object):'
         commit_id = repo.get_commit(commit_idx=-1).raw_id
         response = app.get(
             route_path('repo_compare',
-                repo_name=repo.repo_name,
-                source_ref_type="tag",
-                source_ref="%s@%s" % ('tags/v0.1', commit_id),
-                target_ref_type="tag",
-                target_ref="%s@%s" % ('tags/v0.2', commit_id),
-                params=dict(merge='1'),
-            ),
+                       repo_name=repo.repo_name,
+                       source_ref_type="tag",
+                       source_ref="%s@%s" % ('tags/v0.1', commit_id),
+                       target_ref_type="tag",
+                       target_ref="%s@%s" % ('tags/v0.2', commit_id),
+                       params=dict(merge='1'),
+                       ),
             status=200)
 
         # Expecting no commits, since both paths are at the same revision
@@ -620,13 +590,13 b' class TestCompareControllerSvn(object):'
         target_id = repo.get_commit(commit_idx=-1).raw_id
         response = app.get(
             route_path('repo_compare',
-                repo_name=repo.repo_name,
-                source_ref_type="tag",
-                source_ref="%s@%s" % ('tags/v0.1', source_id),
-                target_ref_type="tag",
-                target_ref="%s@%s" % ('tags/v0.2', target_id),
-                params=dict(merge='1')
-            ),
+                       repo_name=repo.repo_name,
+                       source_ref_type="tag",
+                       source_ref="%s@%s" % ('tags/v0.1', source_id),
+                       target_ref_type="tag",
+                       target_ref="%s@%s" % ('tags/v0.2', target_id),
+                       params=dict(merge='1')
+                       ),
             status=200)
 
         # It should show commits
@@ -648,7 +618,7 b' class ComparePage(AssertResponse):'
         for filename, file_id in files:
             self.contains_one_anchor(file_id)
             diffblock = doc.cssselect('[data-f-path="%s"]' % filename)
-            assert len(diffblock) == 1
+            assert len(diffblock) == 2
             assert len(diffblock[0].cssselect('a[href="#%s"]' % file_id)) == 1
 
     def contains_change_summary(self, files_changed, inserted, deleted):
@@ -694,4 +664,3 b' class ComparePage(AssertResponse):'
     def target_source_are_enabled(self):
         response = self.response
         response.mustcontain("var enable_fields = true;")
-