rhodecode-enterprise-ce Commit - r3002:f5da0c46

release: Merge default into stable for release preparation

marcink -

r3002:f5da0c46 stable

parent child

docs/pip2nix.ini

0 created 644 +3 0

			@@ -0,0 +1,3 b''
		1	[pip2nix]
		2	requirements = -r ./requirements_docs.txt
		3	output = ./python-packages-generated.nix

docs/python-packages-generated.nix

0 created 644 +221 0

			@@ -0,0 +1,221 b''
		1	# Generated by pip2nix 0.8.0.dev1
		2	# See https://github.com/johbo/pip2nix
		3
		4	{ pkgs, fetchurl, fetchgit, fetchhg }:
		5
		6	self: super: {
		7	"alabaster" = super.buildPythonPackage {
		8	name = "alabaster-0.7.11";
		9	doCheck = false;
		10	src = fetchurl {
		11	url = "https://files.pythonhosted.org/packages/3f/46/9346ea429931d80244ab7f11c4fce83671df0b7ae5a60247a2b588592c46/alabaster-0.7.11.tar.gz";
		12	sha256 = "1mvm69xsn5xf1jc45kdq1mn0yq0pfn54mv2jcww4s1vwqx6iyfxn";
		13	};
		14	};
		15	"babel" = super.buildPythonPackage {
		16	name = "babel-2.6.0";
		17	doCheck = false;
		18	propagatedBuildInputs = [
		19	self."pytz"
		20	];
		21	src = fetchurl {
		22	url = "https://files.pythonhosted.org/packages/be/cc/9c981b249a455fa0c76338966325fc70b7265521bad641bf2932f77712f4/Babel-2.6.0.tar.gz";
		23	sha256 = "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc";
		24	};
		25	};
		26	"certifi" = super.buildPythonPackage {
		27	name = "certifi-2018.8.24";
		28	doCheck = false;
		29	src = fetchurl {
		30	url = "https://files.pythonhosted.org/packages/e1/0f/f8d5e939184547b3bdc6128551b831a62832713aa98c2ccdf8c47ecc7f17/certifi-2018.8.24.tar.gz";
		31	sha256 = "0f0nhrj9mlrf79iway4578wrsgmjh0fmacl9zv8zjckdy7b90rip";
		32	};
		33	};
		34	"chardet" = super.buildPythonPackage {
		35	name = "chardet-3.0.4";
		36	doCheck = false;
		37	src = fetchurl {
		38	url = "https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
		39	sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
		40	};
		41	};
		42	"docutils" = super.buildPythonPackage {
		43	name = "docutils-0.14";
		44	doCheck = false;
		45	src = fetchurl {
		46	url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
		47	sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
		48	};
		49	};
		50	"idna" = super.buildPythonPackage {
		51	name = "idna-2.7";
		52	doCheck = false;
		53	src = fetchurl {
		54	url = "https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935/idna-2.7.tar.gz";
		55	sha256 = "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8";
		56	};
		57	};
		58	"imagesize" = super.buildPythonPackage {
		59	name = "imagesize-1.1.0";
		60	doCheck = false;
		61	src = fetchurl {
		62	url = "https://files.pythonhosted.org/packages/41/f5/3cf63735d54aa9974e544aa25858d8f9670ac5b4da51020bbfc6aaade741/imagesize-1.1.0.tar.gz";
		63	sha256 = "1dg3wn7qpwmhgqc0r9na2ding1wif9q5spz3j9zn2riwphc2k0zk";
		64	};
		65	};
		66	"jinja2" = super.buildPythonPackage {
		67	name = "jinja2-2.9.6";
		68	doCheck = false;
		69	propagatedBuildInputs = [
		70	self."markupsafe"
		71	];
		72	src = fetchurl {
		73	url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
		74	sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
		75	};
		76	};
		77	"markupsafe" = super.buildPythonPackage {
		78	name = "markupsafe-1.0";
		79	doCheck = false;
		80	src = fetchurl {
		81	url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
		82	sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
		83	};
		84	};
		85	"packaging" = super.buildPythonPackage {
		86	name = "packaging-17.1";
		87	doCheck = false;
		88	propagatedBuildInputs = [
		89	self."pyparsing"
		90	self."six"
		91	];
		92	src = fetchurl {
		93	url = "https://files.pythonhosted.org/packages/77/32/439f47be99809c12ef2da8b60a2c47987786d2c6c9205549dd6ef95df8bd/packaging-17.1.tar.gz";
		94	sha256 = "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh";
		95	};
		96	};
		97	"pygments" = super.buildPythonPackage {
		98	name = "pygments-2.2.0";
		99	doCheck = false;
		100	src = fetchurl {
		101	url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
		102	sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
		103	};
		104	};
		105	"pyparsing" = super.buildPythonPackage {
		106	name = "pyparsing-2.2.0";
		107	doCheck = false;
		108	src = fetchurl {
		109	url = "https://files.pythonhosted.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz";
		110	sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
		111	};
		112	};
		113	"pytz" = super.buildPythonPackage {
		114	name = "pytz-2018.4";
		115	doCheck = false;
		116	src = fetchurl {
		117	url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz";
		118	sha256 = "0jgpqx3kk2rhv81j1izjxvmx8d0x7hzs1857pgqnixic5wq2ar60";
		119	};
		120	};
		121	"requests" = super.buildPythonPackage {
		122	name = "requests-2.19.1";
		123	doCheck = false;
		124	propagatedBuildInputs = [
		125	self."chardet"
		126	self."idna"
		127	self."urllib3"
		128	self."certifi"
		129	];
		130	src = fetchurl {
		131	url = "https://files.pythonhosted.org/packages/54/1f/782a5734931ddf2e1494e4cd615a51ff98e1879cbe9eecbdfeaf09aa75e9/requests-2.19.1.tar.gz";
		132	sha256 = "0snf8xxdzsgh1x2zv3vilvbrv9jbpmnfagzzb1rjmmvflckdh8pc";
		133	};
		134	};
		135	"setuptools" = super.buildPythonPackage {
		136	name = "setuptools-40.2.0";
		137	doCheck = false;
		138	src = fetchurl {
		139	url = "https://files.pythonhosted.org/packages/ef/1d/201c13e353956a1c840f5d0fbf0461bd45bbd678ea4843ebf25924e8984c/setuptools-40.2.0.zip";
		140	sha256 = "19ng5m7kigllg3x96c91y3a2k28g6kwnbb1v4warrnp4xma1v227";
		141	};
		142	};
		143	"six" = super.buildPythonPackage {
		144	name = "six-1.11.0";
		145	doCheck = false;
		146	src = fetchurl {
		147	url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
		148	sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
		149	};
		150	};
		151	"snowballstemmer" = super.buildPythonPackage {
		152	name = "snowballstemmer-1.2.1";
		153	doCheck = false;
		154	src = fetchurl {
		155	url = "https://files.pythonhosted.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
		156	sha256 = "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi";
		157	};
		158	};
		159	"sphinx" = super.buildPythonPackage {
		160	name = "sphinx-1.7.8";
		161	doCheck = false;
		162	propagatedBuildInputs = [
		163	self."six"
		164	self."jinja2"
		165	self."pygments"
		166	self."docutils"
		167	self."snowballstemmer"
		168	self."babel"
		169	self."alabaster"
		170	self."imagesize"
		171	self."requests"
		172	self."setuptools"
		173	self."packaging"
		174	self."sphinxcontrib-websupport"
		175	self."typing"
		176	];
		177	src = fetchurl {
		178	url = "https://files.pythonhosted.org/packages/ac/54/4ef326d0c654da1ed91341a7a1f43efc18a8c770ddd2b8e45df97cb79d82/Sphinx-1.7.8.tar.gz";
		179	sha256 = "1ryz0w4c31930f1br2sjwrxwx9cmsy7cqdb0d81g98n9bj250w50";
		180	};
		181	};
		182	"sphinx-rtd-theme" = super.buildPythonPackage {
		183	name = "sphinx-rtd-theme-0.4.1";
		184	doCheck = false;
		185	propagatedBuildInputs = [
		186	self."sphinx"
		187	];
		188	src = fetchurl {
		189	url = "https://files.pythonhosted.org/packages/f2/b0/a1933d792b806118ddbca6699f2e2c844d9b1b16e84a89d7effd5cd2a800/sphinx_rtd_theme-0.4.1.tar.gz";
		190	sha256 = "1xkyqam8dzbjaymdyvkiif85m4y3jf8crdiwlgcfp8gqcj57aj9v";
		191	};
		192	};
		193	"sphinxcontrib-websupport" = super.buildPythonPackage {
		194	name = "sphinxcontrib-websupport-1.1.0";
		195	doCheck = false;
		196	src = fetchurl {
		197	url = "https://files.pythonhosted.org/packages/07/7a/e74b06dce85555ffee33e1d6b7381314169ebf7e31b62c18fcb2815626b7/sphinxcontrib-websupport-1.1.0.tar.gz";
		198	sha256 = "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x";
		199	};
		200	};
		201	"typing" = super.buildPythonPackage {
		202	name = "typing-3.6.6";
		203	doCheck = false;
		204	src = fetchurl {
		205	url = "https://files.pythonhosted.org/packages/bf/9b/2bf84e841575b633d8d91ad923e198a415e3901f228715524689495b4317/typing-3.6.6.tar.gz";
		206	sha256 = "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0";
		207	};
		208	};
		209	"urllib3" = super.buildPythonPackage {
		210	name = "urllib3-1.23";
		211	doCheck = false;
		212	src = fetchurl {
		213	url = "https://files.pythonhosted.org/packages/3c/d2/dc5471622bd200db1cd9319e02e71bc655e9ea27b8e0ce65fc69de0dac15/urllib3-1.23.tar.gz";
		214	sha256 = "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6";
		215	};
		216	};
		217
		218	### Test requirements
		219
		220
		221	}

docs/release-notes/release-notes-4.13.0.rst

0 created 644 +133 0

			@@ -0,0 +1,133 b''
		1	\|RCE\| 4.13.0 \|RNS\|
		2	------------------
		3
		4	Release Date
		5	^^^^^^^^^^^^
		6
		7	- 2018-09-05
		8
		9
		10	New Features
		11	^^^^^^^^^^^^
		12
		13	- Branch permissions: new set of permissions were added to control branch modification.
		14	There are 4 basic permissions that can be set for branch names/branch patterns:
		15	* no-access (any modification for given branch is forbidden)
		16	* web-merge (modify branch by web based PR merge)
		17	* push (only non-forced modification on branch are allowed)
		18	* forced push (all modification to branch are allowed)
		19	Available in EE edition only.
		20	- Unified search and repo-switcher: a new persistent search box is now present allowing
		21	to search for repositories, repository groups, commits (using full text search),
		22	users, user-groups. Replaces redundant quick-filters/repo switcher.
		23	- Default Reviewers: added possibility to match against regex based pattern as
		24	alternative syntax to glob which didn't handle all the cases.
		25	- Built-in Error tracker: added new exception tracking capability. All errors are now
		26	tracked and stored. This allows instance admins to see potential problems without
		27	access to the machine and logs.
		28	- User Groups: each user group which users have access to expose public profile link.
		29	It's possible to view the members of a group before attaching it to any resource.
		30	- New caching framework: existing Beaker cache was completely replaced by dogpile.cache
		31	library. This new cache framework in addition to solving multiple
		32	performance/reliability problems of Beaker is used to cache permissions tree.
		33	This gives huge performance boosts for very large and complex permission trees.
		34	- Pull Requests: description field is now allowed to use a RST/Markdown syntax.
		35	- SVN: added support for SVN 1.10 release line.
		36
		37
		38	General
		39	^^^^^^^
		40
		41	- Google: updated google auth plugin with latest API changes.
		42	- Frontend: Switched to Polymer 2.0.
		43	- Events: added a default timeout for operation calling the endpoint url, so
		44	they won't block forever.
		45	- SQLAlchemy: allow DB connection ping/refresh using dedicated flag from .ini file.
		46	`sqlalchemy.db1.ping_connection = true`
		47	- Pull Requests: added option to force-refresh merge workspace in case of problems.
		48	Adding GET param `?force_refresh=1` into PR page triggers the refresh.
		49	- Pull Requests: show more info about version of comment vs latest version.
		50	- Diffs: skip line numbers during copy from a diff view.
		51	- License: use simple cache to read license info.
		52	Due to the complex and expensive encryption, this reduces requests time by ~10ms.
		53	- Debug: add new custom logging to track unique requests across systems.
		54	Allows tracking single requests in very busy system by unique ID added into logging system.
		55	- Configuration: .ini files now can replace a special placeholders e.g "{ENV_NAME}"
		56	into a value from the ENVIRONMENT. Allows easier setup in Docker and similar.
		57	- Backend: don't support vcsserver.scm_app anymore, now it uses http even if scm_app
		58	is specified.
		59	- Repositories: re-order creation/fork forms for better UX and consistency.
		60	- UI: Add the number of inactive users in _admin/users and _admin/user_groups
		61	- UX: updated registration form to better indicate what is the process of binding a
		62	RhodeCode account with external one like Google.
		63	- API: pull-requests allow automatic title generation via API
		64	- VCSServer: errors: use a better interface to track exceptions and tracebacks.
		65	- VCSServer: caches: replaced beaker with dogpile cache.
		66	- GIT: use GIT_DISCOVERY_ACROSS_FILESYSTEM for better compatibility on NFS servers.
		67	- Dependencies: bumped mercurial to 4.6.2
		68	- Dependencies: bumped evolve to 8.0.1
		69	- Dependencies: bumped hgsubversion to 1.9.2
		70	- Dependencies: bumped git version to 2.16.4
		71	- Dependencies: bumped SVN to 1.10.2
		72	- Dependencies: added alternative pymysql drivers for mysql
		73	- NIX: updated to 18.03 nix packages, now shipped with python 2.7.15
		74	release and multiple other new libraries.
		75
		76
		77	Security
		78	^^^^^^^^
		79
		80	- Mercurial: general protocol security updates.
		81	* Fixes Mercurial's CVE for lack of permissions checking on mercurial batch commands.
		82	* Introduced more strict checks for permissions, now they default to push instead of pull.
		83	* Decypher batch commands and pick top-most permission to be required.
		84	* This follows changes in Mercurial CORE after 4.6.1 release.
		85	- Fixed bug in bleach sanitizer allowing certain custom payload to bypass it. Now
		86	we always fails if sanitizing fails. This could lead to stored XSS
		87	- Fixed stored XSS in binary file rendering.
		88	- Fixed stored XSS in repo forks datagrid.
		89
		90
		91	Performance
		92	^^^^^^^^^^^
		93
		94	- Permissions: Permission trees for users and now cached, after calculation.
		95	This reduces response time for some pages dramatically.
		96	In case of any permission changes caches are invalidated.
		97	- Core: new dogpile.cache based cache framework was introduced, which is faster than
		98	previously used Beaker.
		99
		100
		101	Fixes
		102	^^^^^
		103
		104	- Audit Logs: store properly IP for certain events.
		105	- External Auth: pass along came_from into the url so we get properly
		106	redirected back after logging using external auth provider.
		107	- Pull Requests: lock submit on pull request to prevent double submission on a fast click.
		108	- Pull Requests: fixed a case of unresolved comments attached to removed file in pull request.
		109	That prevented from closing it.
		110	- Pull Requests: use numeric repo id for creation of shadow repos. Fixes a problem
		111	when repository is renamed during PR lifetime.
		112	- API: fixed creation of a pull request with default reviewer rules.
		113	- Default Reviewers: fixed voting rule calculation on user group.
		114	- Pull Requests: in GIT use force fetch and update for target ref.
		115	This solves a case when in PR a target repository is force updated (by push force)
		116	and is out of sync.
		117	- VCSServer: detect early potential locale problem, and fallback to LC_ALL=C,
		118	instead of crashing vcsserver.
		119	- Pull Requests: use a safer way of destroying shadow repositories.
		120	Fixes some problems in NFS storage and big repositories
		121
		122
		123	Upgrade notes
		124	^^^^^^^^^^^^^
		125
		126	- The direct backend `vcsserver.scm_app` is not supported anymore. This backed was
		127	already deprecated some time ago. Now it will use `http` mode even if scm_app is
		128	specified. Please contact us in case you still use it, and not sure how to upgrade.
		129	- New dogpile cache settings are not ported to converted .ini. If users want to do
		130	adjustments please copy the settings over dogpile cache section from a newly
		131	generated rhodecode.template.ini file. This file is stored next to rhodecode.ini
		132	- SVN 1.10.2 was introduced in this release. Please make sure to update your
		133	mod_dav to the same version for best compatibility.

pkgs/README.rst

0 created 644 +52 0

			@@ -0,0 +1,52 b''
		1
		2	==============================
		3	Generate the Nix expressions
		4	==============================
		5
		6	Details can be found in the repository of `RhodeCode Enterprise CE`_ inside of
		7	the file `docs/contributing/dependencies.rst`.
		8
		9	Start the environment as follows:
		10
		11	.. code:: shell
		12
		13	nix-shell pkgs/shell-generate.nix
		14
		15
		16
		17	Python dependencies
		18	===================
		19
		20	.. code:: shell
		21
		22	pip2nix generate --licenses
		23	# or
		24	nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
		25
		26
		27	NodeJS dependencies
		28	===================
		29
		30	.. code:: shell
		31
		32	rm -rf node_modules
		33	nix-shell pkgs/shell-generate.nix --command "
		34	node2nix --input package.json \
		35	-o pkgs/node-packages.nix \
		36	-e pkgs/node-env.nix \
		37	-c pkgs/node-default.nix \
		38	-d --flatten --nodejs-6 "
		39
		40
		41
		42	Bower dependencies
		43	==================
		44
		45	.. code:: shell
		46
		47	nix-shell pkgs/shell-generate.nix --command "bower2nix bower.json pkgs/bower-packages.nix"
		48
		49
		50	.. Links
		51
		52	.. _RhodeCode Enterprise CE: https://code.rhodecode.com/rhodecode-enterprise-ce

pkgs/nix-common/pip2nix.nix

0 created 755 +17 0

			@@ -0,0 +1,17 b''
		1	{ pkgs
		2	, pythonPackages
		3	}:
		4
		5	rec {
		6	pip2nix-src = pkgs.fetchzip {
		7	url = https://github.com/johbo/pip2nix/archive/51e6fdae34d0e8ded9efeef7a8601730249687a6.tar.gz;
		8	sha256 = "02a4jjgi7lsvf8mhrxsd56s9a3yg20081rl9bgc2m84w60v2gbz2";
		9	};
		10
		11	pip2nix = import pip2nix-src {
		12	inherit
		13	pkgs
		14	pythonPackages;
		15	};
		16
		17	}

pkgs/patch_beaker/patch-beaker-metadata-reuse.diff

0 created 644 +13 0

			@@ -0,0 +1,13 b''
		1	diff -rup Beaker-1.9.1-orig/beaker/ext/database.py Beaker-1.9.1/beaker/ext/database.py
		2	--- Beaker-1.9.1-orig/beaker/ext/database.py 2018-05-22 18:22:34.802619619 +0200
		3	+++ Beaker-1.9.1/beaker/ext/database.py 2018-05-22 17:07:14.048335196 +0200
		4	@@ -91,7 +91,8 @@ class DatabaseNamespaceManager(OpenResou
		5	sa.Column('created', types.DateTime, nullable=False),
		6	sa.Column('data', types.PickleType, nullable=False),
		7	sa.UniqueConstraint('namespace'),
		8	- schema=schema_name if schema_name else meta.schema
		9	+ schema=schema_name if schema_name else meta.schema,
		10	+ extend_existing=True
		11	)
		12	cache.create(checkfirst=True)
		13	return cache

pkgs/shell-generate.nix

0 created 755 +53 0

			@@ -0,0 +1,53 b''
		1	{ pkgs ? (import <nixpkgs> {})
		2	, pythonPackages ? "python27Packages"
		3	}:
		4
		5	with pkgs.lib;
		6
		7	let _pythonPackages = pythonPackages; in
		8	let
		9	pythonPackages = getAttr _pythonPackages pkgs;
		10
		11	pip2nix = import ./nix-common/pip2nix.nix {
		12	inherit
		13	pkgs
		14	pythonPackages;
		15	};
		16
		17	in
		18
		19	pkgs.stdenv.mkDerivation {
		20	name = "pip2nix-generated";
		21	buildInputs = [
		22	# Allows to generate python packages
		23	pip2nix.pip2nix
		24	pythonPackages.pip-tools
		25
		26	# Allows to generate bower dependencies
		27	pkgs.nodePackages.bower2nix
		28
		29	# Allows to generate node dependencies
		30	pkgs.nodePackages.node2nix
		31
		32	# We need mysql_config to be around
		33	pkgs.mysql
		34
		35	# We need postgresql to be around
		36	pkgs.postgresql
		37
		38	# Curl is needed for pycurl
		39	pkgs.curl
		40	];
		41
		42	shellHook = ''
		43	runHook preShellHook
		44	runHook postShellHook
		45	'';
		46
		47	preShellHook = ''
		48	echo "Starting Generate Shell"
		49	# Custom prompt to distinguish from other dev envs.
		50	export PS1="\n\[\033[1;32m\][Generate-shell:\w]$\[\033[0m\] "
		51	export PYCURL_SSL_LIBRARY=openssl
		52	'';
		53	}

rhodecode/apps/admin/subscribers.py

0 created 644 +44 0

			@@ -0,0 +1,44 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2016-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21	import logging
		22
		23	from rhodecode import events
		24	from rhodecode.lib import rc_cache
		25
		26	log = logging.getLogger(__name__)
		27
		28
		29	def trigger_user_permission_flush(event):
		30	"""
		31	Subscriber to the `UserPermissionsChange`. This triggers the
		32	automatic flush of permission caches, so the users affected receive new permissions
		33	Right Away
		34	"""
		35
		36	affected_user_ids = set(event.user_ids)
		37	for user_id in affected_user_ids:
		38	cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
		39	del_keys = rc_cache.clear_cache_namespace('cache_perms', cache_namespace_uid)
		40	log.debug('Deleted %s cache keys for user_id: %s', del_keys, user_id)
		41
		42
		43	def includeme(config):
		44	config.add_subscriber(trigger_user_permission_flush, events.UserPermissionsChange)

rhodecode/apps/admin/views/exception_tracker.py

0 created 644 +154 0

			@@ -0,0 +1,154 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2018-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20	import os
		21	import logging
		22
		23	from pyramid.httpexceptions import HTTPFound
		24	from pyramid.view import view_config
		25
		26	from rhodecode.apps._base import BaseAppView
		27	from rhodecode.apps.admin.navigation import navigation_list
		28	from rhodecode.lib import helpers as h
		29	from rhodecode.lib.auth import (
		30	LoginRequired, HasPermissionAllDecorator, CSRFRequired)
		31	from rhodecode.lib.utils2 import time_to_utcdatetime, safe_int
		32	from rhodecode.lib import exc_tracking
		33
		34	log = logging.getLogger(__name__)
		35
		36
		37	class ExceptionsTrackerView(BaseAppView):
		38	def load_default_context(self):
		39	c = self._get_local_tmpl_context()
		40	c.navlist = navigation_list(self.request)
		41	return c
		42
		43	def count_all_exceptions(self):
		44	exc_store_path = exc_tracking.get_exc_store()
		45	count = 0
		46	for fname in os.listdir(exc_store_path):
		47	parts = fname.split('_', 2)
		48	if not len(parts) == 3:
		49	continue
		50	count +=1
		51	return count
		52
		53	def get_all_exceptions(self, read_metadata=False, limit=None):
		54	exc_store_path = exc_tracking.get_exc_store()
		55	exception_list = []
		56
		57	def key_sorter(val):
		58	try:
		59	return val.split('_')[-1]
		60	except Exception:
		61	return 0
		62	count = 0
		63	for fname in reversed(sorted(os.listdir(exc_store_path), key=key_sorter)):
		64
		65	parts = fname.split('_', 2)
		66	if not len(parts) == 3:
		67	continue
		68
		69	exc_id, app_type, exc_timestamp = parts
		70
		71	exc = {'exc_id': exc_id, 'app_type': app_type, 'exc_type': 'unknown',
		72	'exc_utc_date': '', 'exc_timestamp': exc_timestamp}
		73
		74	if read_metadata:
		75	full_path = os.path.join(exc_store_path, fname)
		76	# we can read our metadata
		77	with open(full_path, 'rb') as f:
		78	exc_metadata = exc_tracking.exc_unserialize(f.read())
		79	exc.update(exc_metadata)
		80
		81	# convert our timestamp to a date obj, for nicer representation
		82	exc['exc_utc_date'] = time_to_utcdatetime(exc['exc_timestamp'])
		83	exception_list.append(exc)
		84
		85	count += 1
		86	if limit and count >= limit:
		87	break
		88	return exception_list
		89
		90	@LoginRequired()
		91	@HasPermissionAllDecorator('hg.admin')
		92	@view_config(
		93	route_name='admin_settings_exception_tracker', request_method='GET',
		94	renderer='rhodecode:templates/admin/settings/settings.mako')
		95	def browse_exceptions(self):
		96	_ = self.request.translate
		97	c = self.load_default_context()
		98	c.active = 'exceptions_browse'
		99	c.limit = safe_int(self.request.GET.get('limit')) or 50
		100	c.next_limit = c.limit + 50
		101	c.exception_list = self.get_all_exceptions(read_metadata=True, limit=c.limit)
		102	c.exception_list_count = self.count_all_exceptions()
		103	c.exception_store_dir = exc_tracking.get_exc_store()
		104	return self._get_template_context(c)
		105
		106	@LoginRequired()
		107	@HasPermissionAllDecorator('hg.admin')
		108	@view_config(
		109	route_name='admin_settings_exception_tracker_show', request_method='GET',
		110	renderer='rhodecode:templates/admin/settings/settings.mako')
		111	def exception_show(self):
		112	_ = self.request.translate
		113	c = self.load_default_context()
		114
		115	c.active = 'exceptions'
		116	c.exception_id = self.request.matchdict['exception_id']
		117	c.traceback = exc_tracking.read_exception(c.exception_id, prefix=None)
		118	return self._get_template_context(c)
		119
		120	@LoginRequired()
		121	@HasPermissionAllDecorator('hg.admin')
		122	@CSRFRequired()
		123	@view_config(
		124	route_name='admin_settings_exception_tracker_delete_all', request_method='POST',
		125	renderer='rhodecode:templates/admin/settings/settings.mako')
		126	def exception_delete_all(self):
		127	_ = self.request.translate
		128	c = self.load_default_context()
		129
		130	c.active = 'exceptions'
		131	all_exc = self.get_all_exceptions()
		132	exc_count = len(all_exc)
		133	for exc in all_exc:
		134	exc_tracking.delete_exception(exc['exc_id'], prefix=None)
		135
		136	h.flash(_('Removed {} Exceptions').format(exc_count), category='success')
		137	raise HTTPFound(h.route_path('admin_settings_exception_tracker'))
		138
		139	@LoginRequired()
		140	@HasPermissionAllDecorator('hg.admin')
		141	@CSRFRequired()
		142	@view_config(
		143	route_name='admin_settings_exception_tracker_delete', request_method='POST',
		144	renderer='rhodecode:templates/admin/settings/settings.mako')
		145	def exception_delete(self):
		146	_ = self.request.translate
		147	c = self.load_default_context()
		148
		149	c.active = 'exceptions'
		150	c.exception_id = self.request.matchdict['exception_id']
		151	exc_tracking.delete_exception(c.exception_id, prefix=None)
		152
		153	h.flash(_('Removed Exception {}').format(c.exception_id), category='success')
		154	raise HTTPFound(h.route_path('admin_settings_exception_tracker'))

rhodecode/apps/repository/tests/test_repo_permissions.py

0 created 644 +77 0

			@@ -0,0 +1,77 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2010-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21	import pytest
		22
		23	from rhodecode.tests.utils import permission_update_data_generator
		24
		25
		26	def route_path(name, params=None, **kwargs):
		27	import urllib
		28
		29	base_url = {
		30	'edit_repo_perms': '/{repo_name}/settings/permissions'
		31	# update is the same url
		32	}[name].format(**kwargs)
		33
		34	if params:
		35	base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
		36	return base_url
		37
		38
		39	@pytest.mark.usefixtures("app")
		40	class TestRepoPermissionsView(object):
		41
		42	def test_edit_perms_view(self, user_util, autologin_user):
		43	repo = user_util.create_repo()
		44	self.app.get(
		45	route_path('edit_repo_perms',
		46	repo_name=repo.repo_name), status=200)
		47
		48	def test_update_permissions(self, csrf_token, user_util):
		49	repo = user_util.create_repo()
		50	repo_name = repo.repo_name
		51	user = user_util.create_user()
		52	user_id = user.user_id
		53	username = user.username
		54
		55	# grant new
		56	form_data = permission_update_data_generator(
		57	csrf_token,
		58	default='repository.write',
		59	grant=[(user_id, 'repository.write', username, 'user')])
		60
		61	response = self.app.post(
		62	route_path('edit_repo_perms',
		63	repo_name=repo_name), form_data).follow()
		64
		65	assert 'Repository permissions updated' in response
		66
		67	# revoke given
		68	form_data = permission_update_data_generator(
		69	csrf_token,
		70	default='repository.read',
		71	revoke=[(user_id, 'user')])
		72
		73	response = self.app.post(
		74	route_path('edit_repo_perms',
		75	repo_name=repo_name), form_data).follow()
		76
		77	assert 'Repository permissions updated' in response

rhodecode/apps/repository/views/repo_branch_permissions.py

0 created 644 +45 0

			@@ -0,0 +1,45 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2011-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21	import logging
		22
		23	from pyramid.view import view_config
		24
		25	from rhodecode.apps._base import RepoAppView
		26	from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
		27
		28	log = logging.getLogger(__name__)
		29
		30
		31	class RepoSettingsBranchPermissionsView(RepoAppView):
		32
		33	def load_default_context(self):
		34	c = self._get_local_tmpl_context()
		35	return c
		36
		37	@LoginRequired()
		38	@HasRepoPermissionAnyDecorator('repository.admin')
		39	@view_config(
		40	route_name='edit_repo_perms_branch', request_method='GET',
		41	renderer='rhodecode:templates/admin/repos/repo_edit.mako')
		42	def branch_permissions(self):
		43	c = self.load_default_context()
		44	c.active = 'permissions_branch'
		45	return self._get_template_context(c)

rhodecode/apps/user_group/tests/test_user_groups_permissions.py

0 created 644 +80 0

			@@ -0,0 +1,80 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2010-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21	import pytest
		22
		23	from rhodecode.tests.utils import permission_update_data_generator
		24
		25
		26	def route_path(name, params=None, **kwargs):
		27	import urllib
		28	from rhodecode.apps._base import ADMIN_PREFIX
		29
		30	base_url = {
		31	'edit_user_group_perms':
		32	ADMIN_PREFIX + '/user_groups/{user_group_id}/edit/permissions',
		33	'edit_user_group_perms_update':
		34	ADMIN_PREFIX + '/user_groups/{user_group_id}/edit/permissions/update',
		35	}[name].format(**kwargs)
		36
		37	if params:
		38	base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
		39	return base_url
		40
		41
		42	@pytest.mark.usefixtures("app")
		43	class TestUserGroupPermissionsView(object):
		44
		45	def test_edit_perms_view(self, user_util, autologin_user):
		46	user_group = user_util.create_user_group()
		47	self.app.get(
		48	route_path('edit_user_group_perms',
		49	user_group_id=user_group.users_group_id), status=200)
		50
		51	def test_update_permissions(self, csrf_token, user_util):
		52	user_group = user_util.create_user_group()
		53	user_group_id = user_group.users_group_id
		54	user = user_util.create_user()
		55	user_id = user.user_id
		56	username = user.username
		57
		58	# grant new
		59	form_data = permission_update_data_generator(
		60	csrf_token,
		61	default='usergroup.write',
		62	grant=[(user_id, 'usergroup.write', username, 'user')])
		63
		64	response = self.app.post(
		65	route_path('edit_user_group_perms_update',
		66	user_group_id=user_group_id), form_data).follow()
		67
		68	assert 'User Group permissions updated' in response
		69
		70	# revoke given
		71	form_data = permission_update_data_generator(
		72	csrf_token,
		73	default='usergroup.read',
		74	revoke=[(user_id, 'user')])
		75
		76	response = self.app.post(
		77	route_path('edit_user_group_perms_update',
		78	user_group_id=user_group_id), form_data).follow()
		79
		80	assert 'User Group permissions updated' in response

rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py

0 created 644 +4587 0

This diff has been collapsed as it changes many lines, (4587 lines changed) Show them Hide them
		@@ -0,0 +1,4587 b''
	1	# -- coding: utf-8 --
	2
	3	# Copyright (C) 2010-2018 RhodeCode GmbH
	4	#
	5	# This program is free software: you can redistribute it and/or modify
	6	# it under the terms of the GNU Affero General Public License, version 3
	7	# (only), as published by the Free Software Foundation.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU Affero General Public License
	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
	16	#
	17	# This program is dual-licensed. If you wish to learn more about the
	18	# RhodeCode Enterprise Edition, including its added features, Support services,
	19	# and proprietary license terms, please see https://rhodecode.com/licenses/
	20
	21	"""
	22	Database Models for RhodeCode Enterprise
	23	"""
	24
	25	import re
	26	import os
	27	import time
	28	import hashlib
	29	import logging
	30	import datetime
	31	import warnings
	32	import ipaddress
	33	import functools
	34	import traceback
	35	import collections
	36
	37	from sqlalchemy import (
	38	or_, and_, not_, func, TypeDecorator, event,
	39	Index, Sequence, UniqueConstraint, ForeignKey, CheckConstraint, Column,
	40	Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
	41	Text, Float, PickleType)
	42	from sqlalchemy.sql.expression import true, false
	43	from sqlalchemy.sql.functions import coalesce, count # noqa
	44	from sqlalchemy.orm import (
	45	relationship, joinedload, class_mapper, validates, aliased)
	46	from sqlalchemy.ext.declarative import declared_attr
	47	from sqlalchemy.ext.hybrid import hybrid_property
	48	from sqlalchemy.exc import IntegrityError # noqa
	49	from sqlalchemy.dialects.mysql import LONGTEXT
	50	from beaker.cache import cache_region
	51	from zope.cachedescriptors.property import Lazy as LazyProperty
	52
	53	from pyramid.threadlocal import get_current_request
	54
	55	from rhodecode.translation import _
	56	from rhodecode.lib.vcs import get_vcs_instance
	57	from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
	58	from rhodecode.lib.utils2 import (
	59	str2bool, safe_str, get_commit_safe, safe_unicode, md5_safe,
	60	time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
	61	glob2re, StrictAttributeDict, cleaned_uri)
	62	from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
	63	JsonRaw
	64	from rhodecode.lib.ext_json import json
	65	from rhodecode.lib.caching_query import FromCache
	66	from rhodecode.lib.encrypt import AESCipher
	67
	68	from rhodecode.model.meta import Base, Session
	69
	70	URL_SEP = '/'
	71	log = logging.getLogger(__name__)
	72
	73	# =============================================================================
	74	# BASE CLASSES
	75	# =============================================================================
	76
	77	# this is propagated from .ini file rhodecode.encrypted_values.secret or
	78	# beaker.session.secret if first is not set.
	79	# and initialized at environment.py
	80	ENCRYPTION_KEY = None
	81
	82	# used to sort permissions by types, '#' used here is not allowed to be in
	83	# usernames, and it's very early in sorted string.printable table.
	84	PERMISSION_TYPE_SORT = {
	85	'admin': '####',
	86	'write': '###',
	87	'read': '##',
	88	'none': '#',
	89	}
	90
	91
	92	def display_user_sort(obj):
	93	"""
	94	Sort function used to sort permissions in .permissions() function of
	95	Repository, RepoGroup, UserGroup. Also it put the default user in front
	96	of all other resources
	97	"""
	98
	99	if obj.username == User.DEFAULT_USER:
	100	return '#####'
	101	prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
	102	return prefix + obj.username
	103
	104
	105	def display_user_group_sort(obj):
	106	"""
	107	Sort function used to sort permissions in .permissions() function of
	108	Repository, RepoGroup, UserGroup. Also it put the default user in front
	109	of all other resources
	110	"""
	111
	112	prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
	113	return prefix + obj.users_group_name
	114
	115
	116	def _hash_key(k):
	117	return md5_safe(k)
	118
	119
	120	def in_filter_generator(qry, items, limit=500):
	121	"""
	122	Splits IN() into multiple with OR
	123	e.g.::
	124	cnt = Repository.query().filter(
	125	or_(
	126	*in_filter_generator(Repository.repo_id, range(100000))
	127	)).count()
	128	"""
	129	if not items:
	130	# empty list will cause empty query which might cause security issues
	131	# this can lead to hidden unpleasant results
	132	items = [-1]
	133
	134	parts = []
	135	for chunk in xrange(0, len(items), limit):
	136	parts.append(
	137	qry.in_(items[chunk: chunk + limit])
	138	)
	139
	140	return parts
	141
	142
	143	class EncryptedTextValue(TypeDecorator):
	144	"""
	145	Special column for encrypted long text data, use like::
	146
	147	value = Column("encrypted_value", EncryptedValue(), nullable=False)
	148
	149	This column is intelligent so if value is in unencrypted form it return
	150	unencrypted form, but on save it always encrypts
	151	"""
	152	impl = Text
	153
	154	def process_bind_param(self, value, dialect):
	155	if not value:
	156	return value
	157	if value.startswith('enc$aes$') or value.startswith('enc$aes_hmac$'):
	158	# protect against double encrypting if someone manually starts
	159	# doing
	160	raise ValueError('value needs to be in unencrypted format, ie. '
	161	'not starting with enc$aes')
	162	return 'enc$aes_hmac$%s' % AESCipher(
	163	ENCRYPTION_KEY, hmac=True).encrypt(value)
	164
	165	def process_result_value(self, value, dialect):
	166	import rhodecode
	167
	168	if not value:
	169	return value
	170
	171	parts = value.split('$', 3)
	172	if not len(parts) == 3:
	173	# probably not encrypted values
	174	return value
	175	else:
	176	if parts[0] != 'enc':
	177	# parts ok but without our header ?
	178	return value
	179	enc_strict_mode = str2bool(rhodecode.CONFIG.get(
	180	'rhodecode.encrypted_values.strict') or True)
	181	# at that stage we know it's our encryption
	182	if parts[1] == 'aes':
	183	decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
	184	elif parts[1] == 'aes_hmac':
	185	decrypted_data = AESCipher(
	186	ENCRYPTION_KEY, hmac=True,
	187	strict_verification=enc_strict_mode).decrypt(parts[2])
	188	else:
	189	raise ValueError(
	190	'Encryption type part is wrong, must be `aes` '
	191	'or `aes_hmac`, got `%s` instead' % (parts[1]))
	192	return decrypted_data
	193
	194
	195	class BaseModel(object):
	196	"""
	197	Base Model for all classes
	198	"""
	199
	200	@classmethod
	201	def _get_keys(cls):
	202	"""return column names for this model """
	203	return class_mapper(cls).c.keys()
	204
	205	def get_dict(self):
	206	"""
	207	return dict with keys and values corresponding
	208	to this model data """
	209
	210	d = {}
	211	for k in self._get_keys():
	212	d[k] = getattr(self, k)
	213
	214	# also use __json__() if present to get additional fields
	215	_json_attr = getattr(self, '__json__', None)
	216	if _json_attr:
	217	# update with attributes from __json__
	218	if callable(_json_attr):
	219	_json_attr = _json_attr()
	220	for k, val in _json_attr.iteritems():
	221	d[k] = val
	222	return d
	223
	224	def get_appstruct(self):
	225	"""return list with keys and values tuples corresponding
	226	to this model data """
	227
	228	lst = []
	229	for k in self._get_keys():
	230	lst.append((k, getattr(self, k),))
	231	return lst
	232
	233	def populate_obj(self, populate_dict):
	234	"""populate model with data from given populate_dict"""
	235
	236	for k in self._get_keys():
	237	if k in populate_dict:
	238	setattr(self, k, populate_dict[k])
	239
	240	@classmethod
	241	def query(cls):
	242	return Session().query(cls)
	243
	244	@classmethod
	245	def get(cls, id_):
	246	if id_:
	247	return cls.query().get(id_)
	248
	249	@classmethod
	250	def get_or_404(cls, id_):
	251	from pyramid.httpexceptions import HTTPNotFound
	252
	253	try:
	254	id_ = int(id_)
	255	except (TypeError, ValueError):
	256	raise HTTPNotFound()
	257
	258	res = cls.query().get(id_)
	259	if not res:
	260	raise HTTPNotFound()
	261	return res
	262
	263	@classmethod
	264	def getAll(cls):
	265	# deprecated and left for backward compatibility
	266	return cls.get_all()
	267
	268	@classmethod
	269	def get_all(cls):
	270	return cls.query().all()
	271
	272	@classmethod
	273	def delete(cls, id_):
	274	obj = cls.query().get(id_)
	275	Session().delete(obj)
	276
	277	@classmethod
	278	def identity_cache(cls, session, attr_name, value):
	279	exist_in_session = []
	280	for (item_cls, pkey), instance in session.identity_map.items():
	281	if cls == item_cls and getattr(instance, attr_name) == value:
	282	exist_in_session.append(instance)
	283	if exist_in_session:
	284	if len(exist_in_session) == 1:
	285	return exist_in_session[0]
	286	log.exception(
	287	'multiple objects with attr %s and '
	288	'value %s found with same name: %r',
	289	attr_name, value, exist_in_session)
	290
	291	def __repr__(self):
	292	if hasattr(self, '__unicode__'):
	293	# python repr needs to return str
	294	try:
	295	return safe_str(self.__unicode__())
	296	except UnicodeDecodeError:
	297	pass
	298	return '<DB:%s>' % (self.__class__.__name__)
	299
	300
	301	class RhodeCodeSetting(Base, BaseModel):
	302	__tablename__ = 'rhodecode_settings'
	303	__table_args__ = (
	304	UniqueConstraint('app_settings_name'),
	305	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	306	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	307	)
	308
	309	SETTINGS_TYPES = {
	310	'str': safe_str,
	311	'int': safe_int,
	312	'unicode': safe_unicode,
	313	'bool': str2bool,
	314	'list': functools.partial(aslist, sep=',')
	315	}
	316	DEFAULT_UPDATE_URL = 'https://rhodecode.com/api/v1/info/versions'
	317	GLOBAL_CONF_KEY = 'app_settings'
	318
	319	app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	320	app_settings_name = Column("app_settings_name", String(255), nullable=True, unique=None, default=None)
	321	_app_settings_value = Column("app_settings_value", String(4096), nullable=True, unique=None, default=None)
	322	_app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
	323
	324	def __init__(self, key='', val='', type='unicode'):
	325	self.app_settings_name = key
	326	self.app_settings_type = type
	327	self.app_settings_value = val
	328
	329	@validates('_app_settings_value')
	330	def validate_settings_value(self, key, val):
	331	assert type(val) == unicode
	332	return val
	333
	334	@hybrid_property
	335	def app_settings_value(self):
	336	v = self._app_settings_value
	337	_type = self.app_settings_type
	338	if _type:
	339	_type = self.app_settings_type.split('.')[0]
	340	# decode the encrypted value
	341	if 'encrypted' in self.app_settings_type:
	342	cipher = EncryptedTextValue()
	343	v = safe_unicode(cipher.process_result_value(v, None))
	344
	345	converter = self.SETTINGS_TYPES.get(_type) or \
	346	self.SETTINGS_TYPES['unicode']
	347	return converter(v)
	348
	349	@app_settings_value.setter
	350	def app_settings_value(self, val):
	351	"""
	352	Setter that will always make sure we use unicode in app_settings_value
	353
	354	:param val:
	355	"""
	356	val = safe_unicode(val)
	357	# encode the encrypted value
	358	if 'encrypted' in self.app_settings_type:
	359	cipher = EncryptedTextValue()
	360	val = safe_unicode(cipher.process_bind_param(val, None))
	361	self._app_settings_value = val
	362
	363	@hybrid_property
	364	def app_settings_type(self):
	365	return self._app_settings_type
	366
	367	@app_settings_type.setter
	368	def app_settings_type(self, val):
	369	if val.split('.')[0] not in self.SETTINGS_TYPES:
	370	raise Exception('type must be one of %s got %s'
	371	% (self.SETTINGS_TYPES.keys(), val))
	372	self._app_settings_type = val
	373
	374	def __unicode__(self):
	375	return u"<%s('%s:%s[%s]')>" % (
	376	self.__class__.__name__,
	377	self.app_settings_name, self.app_settings_value,
	378	self.app_settings_type
	379	)
	380
	381
	382	class RhodeCodeUi(Base, BaseModel):
	383	__tablename__ = 'rhodecode_ui'
	384	__table_args__ = (
	385	UniqueConstraint('ui_key'),
	386	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	387	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	388	)
	389
	390	HOOK_REPO_SIZE = 'changegroup.repo_size'
	391	# HG
	392	HOOK_PRE_PULL = 'preoutgoing.pre_pull'
	393	HOOK_PULL = 'outgoing.pull_logger'
	394	HOOK_PRE_PUSH = 'prechangegroup.pre_push'
	395	HOOK_PRETX_PUSH = 'pretxnchangegroup.pre_push'
	396	HOOK_PUSH = 'changegroup.push_logger'
	397	HOOK_PUSH_KEY = 'pushkey.key_push'
	398
	399	# TODO: johbo: Unify way how hooks are configured for git and hg,
	400	# git part is currently hardcoded.
	401
	402	# SVN PATTERNS
	403	SVN_BRANCH_ID = 'vcs_svn_branch'
	404	SVN_TAG_ID = 'vcs_svn_tag'
	405
	406	ui_id = Column(
	407	"ui_id", Integer(), nullable=False, unique=True, default=None,
	408	primary_key=True)
	409	ui_section = Column(
	410	"ui_section", String(255), nullable=True, unique=None, default=None)
	411	ui_key = Column(
	412	"ui_key", String(255), nullable=True, unique=None, default=None)
	413	ui_value = Column(
	414	"ui_value", String(255), nullable=True, unique=None, default=None)
	415	ui_active = Column(
	416	"ui_active", Boolean(), nullable=True, unique=None, default=True)
	417
	418	def __repr__(self):
	419	return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section,
	420	self.ui_key, self.ui_value)
	421
	422
	423	class RepoRhodeCodeSetting(Base, BaseModel):
	424	__tablename__ = 'repo_rhodecode_settings'
	425	__table_args__ = (
	426	UniqueConstraint(
	427	'app_settings_name', 'repository_id',
	428	name='uq_repo_rhodecode_setting_name_repo_id'),
	429	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	430	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	431	)
	432
	433	repository_id = Column(
	434	"repository_id", Integer(), ForeignKey('repositories.repo_id'),
	435	nullable=False)
	436	app_settings_id = Column(
	437	"app_settings_id", Integer(), nullable=False, unique=True,
	438	default=None, primary_key=True)
	439	app_settings_name = Column(
	440	"app_settings_name", String(255), nullable=True, unique=None,
	441	default=None)
	442	_app_settings_value = Column(
	443	"app_settings_value", String(4096), nullable=True, unique=None,
	444	default=None)
	445	_app_settings_type = Column(
	446	"app_settings_type", String(255), nullable=True, unique=None,
	447	default=None)
	448
	449	repository = relationship('Repository')
	450
	451	def __init__(self, repository_id, key='', val='', type='unicode'):
	452	self.repository_id = repository_id
	453	self.app_settings_name = key
	454	self.app_settings_type = type
	455	self.app_settings_value = val
	456
	457	@validates('_app_settings_value')
	458	def validate_settings_value(self, key, val):
	459	assert type(val) == unicode
	460	return val
	461
	462	@hybrid_property
	463	def app_settings_value(self):
	464	v = self._app_settings_value
	465	type_ = self.app_settings_type
	466	SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
	467	converter = SETTINGS_TYPES.get(type_) or SETTINGS_TYPES['unicode']
	468	return converter(v)
	469
	470	@app_settings_value.setter
	471	def app_settings_value(self, val):
	472	"""
	473	Setter that will always make sure we use unicode in app_settings_value
	474
	475	:param val:
	476	"""
	477	self._app_settings_value = safe_unicode(val)
	478
	479	@hybrid_property
	480	def app_settings_type(self):
	481	return self._app_settings_type
	482
	483	@app_settings_type.setter
	484	def app_settings_type(self, val):
	485	SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
	486	if val not in SETTINGS_TYPES:
	487	raise Exception('type must be one of %s got %s'
	488	% (SETTINGS_TYPES.keys(), val))
	489	self._app_settings_type = val
	490
	491	def __unicode__(self):
	492	return u"<%s('%s:%s:%s[%s]')>" % (
	493	self.__class__.__name__, self.repository.repo_name,
	494	self.app_settings_name, self.app_settings_value,
	495	self.app_settings_type
	496	)
	497
	498
	499	class RepoRhodeCodeUi(Base, BaseModel):
	500	__tablename__ = 'repo_rhodecode_ui'
	501	__table_args__ = (
	502	UniqueConstraint(
	503	'repository_id', 'ui_section', 'ui_key',
	504	name='uq_repo_rhodecode_ui_repository_id_section_key'),
	505	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	506	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	507	)
	508
	509	repository_id = Column(
	510	"repository_id", Integer(), ForeignKey('repositories.repo_id'),
	511	nullable=False)
	512	ui_id = Column(
	513	"ui_id", Integer(), nullable=False, unique=True, default=None,
	514	primary_key=True)
	515	ui_section = Column(
	516	"ui_section", String(255), nullable=True, unique=None, default=None)
	517	ui_key = Column(
	518	"ui_key", String(255), nullable=True, unique=None, default=None)
	519	ui_value = Column(
	520	"ui_value", String(255), nullable=True, unique=None, default=None)
	521	ui_active = Column(
	522	"ui_active", Boolean(), nullable=True, unique=None, default=True)
	523
	524	repository = relationship('Repository')
	525
	526	def __repr__(self):
	527	return '<%s[%s:%s]%s=>%s]>' % (
	528	self.__class__.__name__, self.repository.repo_name,
	529	self.ui_section, self.ui_key, self.ui_value)
	530
	531
	532	class User(Base, BaseModel):
	533	__tablename__ = 'users'
	534	__table_args__ = (
	535	UniqueConstraint('username'), UniqueConstraint('email'),
	536	Index('u_username_idx', 'username'),
	537	Index('u_email_idx', 'email'),
	538	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	539	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	540	)
	541	DEFAULT_USER = 'default'
	542	DEFAULT_USER_EMAIL = 'anonymous@rhodecode.org'
	543	DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
	544
	545	user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	546	username = Column("username", String(255), nullable=True, unique=None, default=None)
	547	password = Column("password", String(255), nullable=True, unique=None, default=None)
	548	active = Column("active", Boolean(), nullable=True, unique=None, default=True)
	549	admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
	550	name = Column("firstname", String(255), nullable=True, unique=None, default=None)
	551	lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
	552	_email = Column("email", String(255), nullable=True, unique=None, default=None)
	553	last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
	554	last_activity = Column('last_activity', DateTime(timezone=False), nullable=True, unique=None, default=None)
	555
	556	extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
	557	extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
	558	_api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)
	559	inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
	560	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	561	_user_data = Column("user_data", LargeBinary(), nullable=True) # JSON data
	562
	563	user_log = relationship('UserLog')
	564	user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
	565
	566	repositories = relationship('Repository')
	567	repository_groups = relationship('RepoGroup')
	568	user_groups = relationship('UserGroup')
	569
	570	user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
	571	followings = relationship('UserFollowing', primaryjoin='UserFollowing.user_id==User.user_id', cascade='all')
	572
	573	repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
	574	repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
	575	user_group_to_perm = relationship('UserUserGroupToPerm', primaryjoin='UserUserGroupToPerm.user_id==User.user_id', cascade='all')
	576
	577	group_member = relationship('UserGroupMember', cascade='all')
	578
	579	notifications = relationship('UserNotification', cascade='all')
	580	# notifications assigned to this user
	581	user_created_notifications = relationship('Notification', cascade='all')
	582	# comments created by this user
	583	user_comments = relationship('ChangesetComment', cascade='all')
	584	# user profile extra info
	585	user_emails = relationship('UserEmailMap', cascade='all')
	586	user_ip_map = relationship('UserIpMap', cascade='all')
	587	user_auth_tokens = relationship('UserApiKeys', cascade='all')
	588	user_ssh_keys = relationship('UserSshKeys', cascade='all')
	589
	590	# gists
	591	user_gists = relationship('Gist', cascade='all')
	592	# user pull requests
	593	user_pull_requests = relationship('PullRequest', cascade='all')
	594	# external identities
	595	extenal_identities = relationship(
	596	'ExternalIdentity',
	597	primaryjoin="User.user_id==ExternalIdentity.local_user_id",
	598	cascade='all')
	599	# review rules
	600	user_review_rules = relationship('RepoReviewRuleUser', cascade='all')
	601
	602	def __unicode__(self):
	603	return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
	604	self.user_id, self.username)
	605
	606	@hybrid_property
	607	def email(self):
	608	return self._email
	609
	610	@email.setter
	611	def email(self, val):
	612	self._email = val.lower() if val else None
	613
	614	@hybrid_property
	615	def first_name(self):
	616	from rhodecode.lib import helpers as h
	617	if self.name:
	618	return h.escape(self.name)
	619	return self.name
	620
	621	@hybrid_property
	622	def last_name(self):
	623	from rhodecode.lib import helpers as h
	624	if self.lastname:
	625	return h.escape(self.lastname)
	626	return self.lastname
	627
	628	@hybrid_property
	629	def api_key(self):
	630	"""
	631	Fetch if exist an auth-token with role ALL connected to this user
	632	"""
	633	user_auth_token = UserApiKeys.query()\
	634	.filter(UserApiKeys.user_id == self.user_id)\
	635	.filter(or_(UserApiKeys.expires == -1,
	636	UserApiKeys.expires >= time.time()))\
	637	.filter(UserApiKeys.role == UserApiKeys.ROLE_ALL).first()
	638	if user_auth_token:
	639	user_auth_token = user_auth_token.api_key
	640
	641	return user_auth_token
	642
	643	@api_key.setter
	644	def api_key(self, val):
	645	# don't allow to set API key this is deprecated for now
	646	self._api_key = None
	647
	648	@property
	649	def reviewer_pull_requests(self):
	650	return PullRequestReviewers.query() \
	651	.options(joinedload(PullRequestReviewers.pull_request)) \
	652	.filter(PullRequestReviewers.user_id == self.user_id) \
	653	.all()
	654
	655	@property
	656	def firstname(self):
	657	# alias for future
	658	return self.name
	659
	660	@property
	661	def emails(self):
	662	other = UserEmailMap.query()\
	663	.filter(UserEmailMap.user == self) \
	664	.order_by(UserEmailMap.email_id.asc()) \
	665	.all()
	666	return [self.email] + [x.email for x in other]
	667
	668	@property
	669	def auth_tokens(self):
	670	auth_tokens = self.get_auth_tokens()
	671	return [x.api_key for x in auth_tokens]
	672
	673	def get_auth_tokens(self):
	674	return UserApiKeys.query()\
	675	.filter(UserApiKeys.user == self)\
	676	.order_by(UserApiKeys.user_api_key_id.asc())\
	677	.all()
	678
	679	@LazyProperty
	680	def feed_token(self):
	681	return self.get_feed_token()
	682
	683	def get_feed_token(self, cache=True):
	684	feed_tokens = UserApiKeys.query()\
	685	.filter(UserApiKeys.user == self)\
	686	.filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)
	687	if cache:
	688	feed_tokens = feed_tokens.options(
	689	FromCache("long_term", "get_user_feed_token_%s" % self.user_id))
	690
	691	feed_tokens = feed_tokens.all()
	692	if feed_tokens:
	693	return feed_tokens[0].api_key
	694	return 'NO_FEED_TOKEN_AVAILABLE'
	695
	696	@classmethod
	697	def get(cls, user_id, cache=False):
	698	if not user_id:
	699	return
	700
	701	user = cls.query()
	702	if cache:
	703	user = user.options(
	704	FromCache("sql_cache_short", "get_users_%s" % user_id))
	705	return user.get(user_id)
	706
	707	@classmethod
	708	def extra_valid_auth_tokens(cls, user, role=None):
	709	tokens = UserApiKeys.query().filter(UserApiKeys.user == user)\
	710	.filter(or_(UserApiKeys.expires == -1,
	711	UserApiKeys.expires >= time.time()))
	712	if role:
	713	tokens = tokens.filter(or_(UserApiKeys.role == role,
	714	UserApiKeys.role == UserApiKeys.ROLE_ALL))
	715	return tokens.all()
	716
	717	def authenticate_by_token(self, auth_token, roles=None, scope_repo_id=None):
	718	from rhodecode.lib import auth
	719
	720	log.debug('Trying to authenticate user: %s via auth-token, '
	721	'and roles: %s', self, roles)
	722
	723	if not auth_token:
	724	return False
	725
	726	crypto_backend = auth.crypto_backend()
	727
	728	roles = (roles or []) + [UserApiKeys.ROLE_ALL]
	729	tokens_q = UserApiKeys.query()\
	730	.filter(UserApiKeys.user_id == self.user_id)\
	731	.filter(or_(UserApiKeys.expires == -1,
	732	UserApiKeys.expires >= time.time()))
	733
	734	tokens_q = tokens_q.filter(UserApiKeys.role.in_(roles))
	735
	736	plain_tokens = []
	737	hash_tokens = []
	738
	739	for token in tokens_q.all():
	740	# verify scope first
	741	if token.repo_id:
	742	# token has a scope, we need to verify it
	743	if scope_repo_id != token.repo_id:
	744	log.debug(
	745	'Scope mismatch: token has a set repo scope: %s, '
	746	'and calling scope is:%s, skipping further checks',
	747	token.repo, scope_repo_id)
	748	# token has a scope, and it doesn't match, skip token
	749	continue
	750
	751	if token.api_key.startswith(crypto_backend.ENC_PREF):
	752	hash_tokens.append(token.api_key)
	753	else:
	754	plain_tokens.append(token.api_key)
	755
	756	is_plain_match = auth_token in plain_tokens
	757	if is_plain_match:
	758	return True
	759
	760	for hashed in hash_tokens:
	761	# TODO(marcink): this is expensive to calculate, but most secure
	762	match = crypto_backend.hash_check(auth_token, hashed)
	763	if match:
	764	return True
	765
	766	return False
	767
	768	@property
	769	def ip_addresses(self):
	770	ret = UserIpMap.query().filter(UserIpMap.user == self).all()
	771	return [x.ip_addr for x in ret]
	772
	773	@property
	774	def username_and_name(self):
	775	return '%s (%s %s)' % (self.username, self.first_name, self.last_name)
	776
	777	@property
	778	def username_or_name_or_email(self):
	779	full_name = self.full_name if self.full_name is not ' ' else None
	780	return self.username or full_name or self.email
	781
	782	@property
	783	def full_name(self):
	784	return '%s %s' % (self.first_name, self.last_name)
	785
	786	@property
	787	def full_name_or_username(self):
	788	return ('%s %s' % (self.first_name, self.last_name)
	789	if (self.first_name and self.last_name) else self.username)
	790
	791	@property
	792	def full_contact(self):
	793	return '%s %s <%s>' % (self.first_name, self.last_name, self.email)
	794
	795	@property
	796	def short_contact(self):
	797	return '%s %s' % (self.first_name, self.last_name)
	798
	799	@property
	800	def is_admin(self):
	801	return self.admin
	802
	803	def AuthUser(self, **kwargs):
	804	"""
	805	Returns instance of AuthUser for this user
	806	"""
	807	from rhodecode.lib.auth import AuthUser
	808	return AuthUser(user_id=self.user_id, username=self.username, **kwargs)
	809
	810	@hybrid_property
	811	def user_data(self):
	812	if not self._user_data:
	813	return {}
	814
	815	try:
	816	return json.loads(self._user_data)
	817	except TypeError:
	818	return {}
	819
	820	@user_data.setter
	821	def user_data(self, val):
	822	if not isinstance(val, dict):
	823	raise Exception('user_data must be dict, got %s' % type(val))
	824	try:
	825	self._user_data = json.dumps(val)
	826	except Exception:
	827	log.error(traceback.format_exc())
	828
	829	@classmethod
	830	def get_by_username(cls, username, case_insensitive=False,
	831	cache=False, identity_cache=False):
	832	session = Session()
	833
	834	if case_insensitive:
	835	q = cls.query().filter(
	836	func.lower(cls.username) == func.lower(username))
	837	else:
	838	q = cls.query().filter(cls.username == username)
	839
	840	if cache:
	841	if identity_cache:
	842	val = cls.identity_cache(session, 'username', username)
	843	if val:
	844	return val
	845	else:
	846	cache_key = "get_user_by_name_%s" % _hash_key(username)
	847	q = q.options(
	848	FromCache("sql_cache_short", cache_key))
	849
	850	return q.scalar()
	851
	852	@classmethod
	853	def get_by_auth_token(cls, auth_token, cache=False):
	854	q = UserApiKeys.query()\
	855	.filter(UserApiKeys.api_key == auth_token)\
	856	.filter(or_(UserApiKeys.expires == -1,
	857	UserApiKeys.expires >= time.time()))
	858	if cache:
	859	q = q.options(
	860	FromCache("sql_cache_short", "get_auth_token_%s" % auth_token))
	861
	862	match = q.first()
	863	if match:
	864	return match.user
	865
	866	@classmethod
	867	def get_by_email(cls, email, case_insensitive=False, cache=False):
	868
	869	if case_insensitive:
	870	q = cls.query().filter(func.lower(cls.email) == func.lower(email))
	871
	872	else:
	873	q = cls.query().filter(cls.email == email)
	874
	875	email_key = _hash_key(email)
	876	if cache:
	877	q = q.options(
	878	FromCache("sql_cache_short", "get_email_key_%s" % email_key))
	879
	880	ret = q.scalar()
	881	if ret is None:
	882	q = UserEmailMap.query()
	883	# try fetching in alternate email map
	884	if case_insensitive:
	885	q = q.filter(func.lower(UserEmailMap.email) == func.lower(email))
	886	else:
	887	q = q.filter(UserEmailMap.email == email)
	888	q = q.options(joinedload(UserEmailMap.user))
	889	if cache:
	890	q = q.options(
	891	FromCache("sql_cache_short", "get_email_map_key_%s" % email_key))
	892	ret = getattr(q.scalar(), 'user', None)
	893
	894	return ret
	895
	896	@classmethod
	897	def get_from_cs_author(cls, author):
	898	"""
	899	Tries to get User objects out of commit author string
	900
	901	:param author:
	902	"""
	903	from rhodecode.lib.helpers import email, author_name
	904	# Valid email in the attribute passed, see if they're in the system
	905	_email = email(author)
	906	if _email:
	907	user = cls.get_by_email(_email, case_insensitive=True)
	908	if user:
	909	return user
	910	# Maybe we can match by username?
	911	_author = author_name(author)
	912	user = cls.get_by_username(_author, case_insensitive=True)
	913	if user:
	914	return user
	915
	916	def update_userdata(self, **kwargs):
	917	usr = self
	918	old = usr.user_data
	919	old.update(**kwargs)
	920	usr.user_data = old
	921	Session().add(usr)
	922	log.debug('updated userdata with ', kwargs)
	923
	924	def update_lastlogin(self):
	925	"""Update user lastlogin"""
	926	self.last_login = datetime.datetime.now()
	927	Session().add(self)
	928	log.debug('updated user %s lastlogin', self.username)
	929
	930	def update_lastactivity(self):
	931	"""Update user lastactivity"""
	932	self.last_activity = datetime.datetime.now()
	933	Session().add(self)
	934	log.debug('updated user `%s` last activity', self.username)
	935
	936	def update_password(self, new_password):
	937	from rhodecode.lib.auth import get_crypt_password
	938
	939	self.password = get_crypt_password(new_password)
	940	Session().add(self)
	941
	942	@classmethod
	943	def get_first_super_admin(cls):
	944	user = User.query().filter(User.admin == true()).first()
	945	if user is None:
	946	raise Exception('FATAL: Missing administrative account!')
	947	return user
	948
	949	@classmethod
	950	def get_all_super_admins(cls):
	951	"""
	952	Returns all admin accounts sorted by username
	953	"""
	954	return User.query().filter(User.admin == true())\
	955	.order_by(User.username.asc()).all()
	956
	957	@classmethod
	958	def get_default_user(cls, cache=False, refresh=False):
	959	user = User.get_by_username(User.DEFAULT_USER, cache=cache)
	960	if user is None:
	961	raise Exception('FATAL: Missing default account!')
	962	if refresh:
	963	# The default user might be based on outdated state which
	964	# has been loaded from the cache.
	965	# A call to refresh() ensures that the
	966	# latest state from the database is used.
	967	Session().refresh(user)
	968	return user
	969
	970	def _get_default_perms(self, user, suffix=''):
	971	from rhodecode.model.permission import PermissionModel
	972	return PermissionModel().get_default_perms(user.user_perms, suffix)
	973
	974	def get_default_perms(self, suffix=''):
	975	return self._get_default_perms(self, suffix)
	976
	977	def get_api_data(self, include_secrets=False, details='full'):
	978	"""
	979	Common function for generating user related data for API
	980
	981	:param include_secrets: By default secrets in the API data will be replaced
	982	by a placeholder value to prevent exposing this data by accident. In case
	983	this data shall be exposed, set this flag to ``True``.
	984
	985	:param details: details can be 'basic\|full' basic gives only a subset of
	986	the available user information that includes user_id, name and emails.
	987	"""
	988	user = self
	989	user_data = self.user_data
	990	data = {
	991	'user_id': user.user_id,
	992	'username': user.username,
	993	'firstname': user.name,
	994	'lastname': user.lastname,
	995	'email': user.email,
	996	'emails': user.emails,
	997	}
	998	if details == 'basic':
	999	return data
	1000
	1001	auth_token_length = 40
	1002	auth_token_replacement = '' auth_token_length
	1003
	1004	extras = {
	1005	'auth_tokens': [auth_token_replacement],
	1006	'active': user.active,
	1007	'admin': user.admin,
	1008	'extern_type': user.extern_type,
	1009	'extern_name': user.extern_name,
	1010	'last_login': user.last_login,
	1011	'last_activity': user.last_activity,
	1012	'ip_addresses': user.ip_addresses,
	1013	'language': user_data.get('language')
	1014	}
	1015	data.update(extras)
	1016
	1017	if include_secrets:
	1018	data['auth_tokens'] = user.auth_tokens
	1019	return data
	1020
	1021	def __json__(self):
	1022	data = {
	1023	'full_name': self.full_name,
	1024	'full_name_or_username': self.full_name_or_username,
	1025	'short_contact': self.short_contact,
	1026	'full_contact': self.full_contact,
	1027	}
	1028	data.update(self.get_api_data())
	1029	return data
	1030
	1031
	1032	class UserApiKeys(Base, BaseModel):
	1033	__tablename__ = 'user_api_keys'
	1034	__table_args__ = (
	1035	Index('uak_api_key_idx', 'api_key', unique=True),
	1036	Index('uak_api_key_expires_idx', 'api_key', 'expires'),
	1037	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1038	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	1039	)
	1040	__mapper_args__ = {}
	1041
	1042	# ApiKey role
	1043	ROLE_ALL = 'token_role_all'
	1044	ROLE_HTTP = 'token_role_http'
	1045	ROLE_VCS = 'token_role_vcs'
	1046	ROLE_API = 'token_role_api'
	1047	ROLE_FEED = 'token_role_feed'
	1048	ROLE_PASSWORD_RESET = 'token_password_reset'
	1049
	1050	ROLES = [ROLE_ALL, ROLE_HTTP, ROLE_VCS, ROLE_API, ROLE_FEED]
	1051
	1052	user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	1053	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
	1054	api_key = Column("api_key", String(255), nullable=False, unique=True)
	1055	description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
	1056	expires = Column('expires', Float(53), nullable=False)
	1057	role = Column('role', String(255), nullable=True)
	1058	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	1059
	1060	# scope columns
	1061	repo_id = Column(
	1062	'repo_id', Integer(), ForeignKey('repositories.repo_id'),
	1063	nullable=True, unique=None, default=None)
	1064	repo = relationship('Repository', lazy='joined')
	1065
	1066	repo_group_id = Column(
	1067	'repo_group_id', Integer(), ForeignKey('groups.group_id'),
	1068	nullable=True, unique=None, default=None)
	1069	repo_group = relationship('RepoGroup', lazy='joined')
	1070
	1071	user = relationship('User', lazy='joined')
	1072
	1073	def __unicode__(self):
	1074	return u"<%s('%s')>" % (self.__class__.__name__, self.role)
	1075
	1076	def __json__(self):
	1077	data = {
	1078	'auth_token': self.api_key,
	1079	'role': self.role,
	1080	'scope': self.scope_humanized,
	1081	'expired': self.expired
	1082	}
	1083	return data
	1084
	1085	def get_api_data(self, include_secrets=False):
	1086	data = self.__json__()
	1087	if include_secrets:
	1088	return data
	1089	else:
	1090	data['auth_token'] = self.token_obfuscated
	1091	return data
	1092
	1093	@hybrid_property
	1094	def description_safe(self):
	1095	from rhodecode.lib import helpers as h
	1096	return h.escape(self.description)
	1097
	1098	@property
	1099	def expired(self):
	1100	if self.expires == -1:
	1101	return False
	1102	return time.time() > self.expires
	1103
	1104	@classmethod
	1105	def _get_role_name(cls, role):
	1106	return {
	1107	cls.ROLE_ALL: _('all'),
	1108	cls.ROLE_HTTP: _('http/web interface'),
	1109	cls.ROLE_VCS: _('vcs (git/hg/svn protocol)'),
	1110	cls.ROLE_API: _('api calls'),
	1111	cls.ROLE_FEED: _('feed access'),
	1112	}.get(role, role)
	1113
	1114	@property
	1115	def role_humanized(self):
	1116	return self._get_role_name(self.role)
	1117
	1118	def _get_scope(self):
	1119	if self.repo:
	1120	return repr(self.repo)
	1121	if self.repo_group:
	1122	return repr(self.repo_group) + ' (recursive)'
	1123	return 'global'
	1124
	1125	@property
	1126	def scope_humanized(self):
	1127	return self._get_scope()
	1128
	1129	@property
	1130	def token_obfuscated(self):
	1131	if self.api_key:
	1132	return self.api_key[:4] + "****"
	1133
	1134
	1135	class UserEmailMap(Base, BaseModel):
	1136	__tablename__ = 'user_email_map'
	1137	__table_args__ = (
	1138	Index('uem_email_idx', 'email'),
	1139	UniqueConstraint('email'),
	1140	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1141	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	1142	)
	1143	__mapper_args__ = {}
	1144
	1145	email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	1146	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
	1147	_email = Column("email", String(255), nullable=True, unique=False, default=None)
	1148	user = relationship('User', lazy='joined')
	1149
	1150	@validates('_email')
	1151	def validate_email(self, key, email):
	1152	# check if this email is not main one
	1153	main_email = Session().query(User).filter(User.email == email).scalar()
	1154	if main_email is not None:
	1155	raise AttributeError('email %s is present is user table' % email)
	1156	return email
	1157
	1158	@hybrid_property
	1159	def email(self):
	1160	return self._email
	1161
	1162	@email.setter
	1163	def email(self, val):
	1164	self._email = val.lower() if val else None
	1165
	1166
	1167	class UserIpMap(Base, BaseModel):
	1168	__tablename__ = 'user_ip_map'
	1169	__table_args__ = (
	1170	UniqueConstraint('user_id', 'ip_addr'),
	1171	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1172	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	1173	)
	1174	__mapper_args__ = {}
	1175
	1176	ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	1177	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
	1178	ip_addr = Column("ip_addr", String(255), nullable=True, unique=False, default=None)
	1179	active = Column("active", Boolean(), nullable=True, unique=None, default=True)
	1180	description = Column("description", String(10000), nullable=True, unique=None, default=None)
	1181	user = relationship('User', lazy='joined')
	1182
	1183	@hybrid_property
	1184	def description_safe(self):
	1185	from rhodecode.lib import helpers as h
	1186	return h.escape(self.description)
	1187
	1188	@classmethod
	1189	def _get_ip_range(cls, ip_addr):
	1190	net = ipaddress.ip_network(safe_unicode(ip_addr), strict=False)
	1191	return [str(net.network_address), str(net.broadcast_address)]
	1192
	1193	def __json__(self):
	1194	return {
	1195	'ip_addr': self.ip_addr,
	1196	'ip_range': self._get_ip_range(self.ip_addr),
	1197	}
	1198
	1199	def __unicode__(self):
	1200	return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
	1201	self.user_id, self.ip_addr)
	1202
	1203
	1204	class UserSshKeys(Base, BaseModel):
	1205	__tablename__ = 'user_ssh_keys'
	1206	__table_args__ = (
	1207	Index('usk_ssh_key_fingerprint_idx', 'ssh_key_fingerprint'),
	1208
	1209	UniqueConstraint('ssh_key_fingerprint'),
	1210
	1211	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1212	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	1213	)
	1214	__mapper_args__ = {}
	1215
	1216	ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
	1217	ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
	1218	ssh_key_fingerprint = Column('ssh_key_fingerprint', String(255), nullable=False, unique=None, default=None)
	1219
	1220	description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
	1221
	1222	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	1223	accessed_on = Column('accessed_on', DateTime(timezone=False), nullable=True, default=None)
	1224	user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
	1225
	1226	user = relationship('User', lazy='joined')
	1227
	1228	def __json__(self):
	1229	data = {
	1230	'ssh_fingerprint': self.ssh_key_fingerprint,
	1231	'description': self.description,
	1232	'created_on': self.created_on
	1233	}
	1234	return data
	1235
	1236	def get_api_data(self):
	1237	data = self.__json__()
	1238	return data
	1239
	1240
	1241	class UserLog(Base, BaseModel):
	1242	__tablename__ = 'user_logs'
	1243	__table_args__ = (
	1244	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1245	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	1246	)
	1247	VERSION_1 = 'v1'
	1248	VERSION_2 = 'v2'
	1249	VERSIONS = [VERSION_1, VERSION_2]
	1250
	1251	user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	1252	user_id = Column("user_id", Integer(), ForeignKey('users.user_id',ondelete='SET NULL'), nullable=True, unique=None, default=None)
	1253	username = Column("username", String(255), nullable=True, unique=None, default=None)
	1254	repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id', ondelete='SET NULL'), nullable=True, unique=None, default=None)
	1255	repository_name = Column("repository_name", String(255), nullable=True, unique=None, default=None)
	1256	user_ip = Column("user_ip", String(255), nullable=True, unique=None, default=None)
	1257	action = Column("action", Text().with_variant(Text(1200000), 'mysql'), nullable=True, unique=None, default=None)
	1258	action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
	1259
	1260	version = Column("version", String(255), nullable=True, default=VERSION_1)
	1261	user_data = Column('user_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=LONGTEXT()))))
	1262	action_data = Column('action_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=LONGTEXT()))))
	1263
	1264	def __unicode__(self):
	1265	return u"<%s('id:%s:%s')>" % (
	1266	self.__class__.__name__, self.repository_name, self.action)
	1267
	1268	def __json__(self):
	1269	return {
	1270	'user_id': self.user_id,
	1271	'username': self.username,
	1272	'repository_id': self.repository_id,
	1273	'repository_name': self.repository_name,
	1274	'user_ip': self.user_ip,
	1275	'action_date': self.action_date,
	1276	'action': self.action,
	1277	}
	1278
	1279	@hybrid_property
	1280	def entry_id(self):
	1281	return self.user_log_id
	1282
	1283	@property
	1284	def action_as_day(self):
	1285	return datetime.date(*self.action_date.timetuple()[:3])
	1286
	1287	user = relationship('User')
	1288	repository = relationship('Repository', cascade='')
	1289
	1290
	1291	class UserGroup(Base, BaseModel):
	1292	__tablename__ = 'users_groups'
	1293	__table_args__ = (
	1294	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1295	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	1296	)
	1297
	1298	users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	1299	users_group_name = Column("users_group_name", String(255), nullable=False, unique=True, default=None)
	1300	user_group_description = Column("user_group_description", String(10000), nullable=True, unique=None, default=None)
	1301	users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
	1302	inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
	1303	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
	1304	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	1305	_group_data = Column("group_data", LargeBinary(), nullable=True) # JSON data
	1306
	1307	members = relationship('UserGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
	1308	users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
	1309	users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
	1310	users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
	1311	user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
	1312	user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
	1313
	1314	user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
	1315	user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")
	1316
	1317	@classmethod
	1318	def _load_group_data(cls, column):
	1319	if not column:
	1320	return {}
	1321
	1322	try:
	1323	return json.loads(column) or {}
	1324	except TypeError:
	1325	return {}
	1326
	1327	@hybrid_property
	1328	def description_safe(self):
	1329	from rhodecode.lib import helpers as h
	1330	return h.escape(self.user_group_description)
	1331
	1332	@hybrid_property
	1333	def group_data(self):
	1334	return self._load_group_data(self._group_data)
	1335
	1336	@group_data.expression
	1337	def group_data(self, **kwargs):
	1338	return self._group_data
	1339
	1340	@group_data.setter
	1341	def group_data(self, val):
	1342	try:
	1343	self._group_data = json.dumps(val)
	1344	except Exception:
	1345	log.error(traceback.format_exc())
	1346
	1347	@classmethod
	1348	def _load_sync(cls, group_data):
	1349	if group_data:
	1350	return group_data.get('extern_type')
	1351
	1352	@property
	1353	def sync(self):
	1354	return self._load_sync(self.group_data)
	1355
	1356	def __unicode__(self):
	1357	return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
	1358	self.users_group_id,
	1359	self.users_group_name)
	1360
	1361	@classmethod
	1362	def get_by_group_name(cls, group_name, cache=False,
	1363	case_insensitive=False):
	1364	if case_insensitive:
	1365	q = cls.query().filter(func.lower(cls.users_group_name) ==
	1366	func.lower(group_name))
	1367
	1368	else:
	1369	q = cls.query().filter(cls.users_group_name == group_name)
	1370	if cache:
	1371	q = q.options(
	1372	FromCache("sql_cache_short", "get_group_%s" % _hash_key(group_name)))
	1373	return q.scalar()
	1374
	1375	@classmethod
	1376	def get(cls, user_group_id, cache=False):
	1377	if not user_group_id:
	1378	return
	1379
	1380	user_group = cls.query()
	1381	if cache:
	1382	user_group = user_group.options(
	1383	FromCache("sql_cache_short", "get_users_group_%s" % user_group_id))
	1384	return user_group.get(user_group_id)
	1385
	1386	def permissions(self, with_admins=True, with_owner=True):
	1387	q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
	1388	q = q.options(joinedload(UserUserGroupToPerm.user_group),
	1389	joinedload(UserUserGroupToPerm.user),
	1390	joinedload(UserUserGroupToPerm.permission),)
	1391
	1392	# get owners and admins and permissions. We do a trick of re-writing
	1393	# objects from sqlalchemy to named-tuples due to sqlalchemy session
	1394	# has a global reference and changing one object propagates to all
	1395	# others. This means if admin is also an owner admin_row that change
	1396	# would propagate to both objects
	1397	perm_rows = []
	1398	for _usr in q.all():
	1399	usr = AttributeDict(_usr.user.get_dict())
	1400	usr.permission = _usr.permission.permission_name
	1401	perm_rows.append(usr)
	1402
	1403	# filter the perm rows by 'default' first and then sort them by
	1404	# admin,write,read,none permissions sorted again alphabetically in
	1405	# each group
	1406	perm_rows = sorted(perm_rows, key=display_user_sort)
	1407
	1408	_admin_perm = 'usergroup.admin'
	1409	owner_row = []
	1410	if with_owner:
	1411	usr = AttributeDict(self.user.get_dict())
	1412	usr.owner_row = True
	1413	usr.permission = _admin_perm
	1414	owner_row.append(usr)
	1415
	1416	super_admin_rows = []
	1417	if with_admins:
	1418	for usr in User.get_all_super_admins():
	1419	# if this admin is also owner, don't double the record
	1420	if usr.user_id == owner_row[0].user_id:
	1421	owner_row[0].admin_row = True
	1422	else:
	1423	usr = AttributeDict(usr.get_dict())
	1424	usr.admin_row = True
	1425	usr.permission = _admin_perm
	1426	super_admin_rows.append(usr)
	1427
	1428	return super_admin_rows + owner_row + perm_rows
	1429
	1430	def permission_user_groups(self):
	1431	q = UserGroupUserGroupToPerm.query().filter(UserGroupUserGroupToPerm.target_user_group == self)
	1432	q = q.options(joinedload(UserGroupUserGroupToPerm.user_group),
	1433	joinedload(UserGroupUserGroupToPerm.target_user_group),
	1434	joinedload(UserGroupUserGroupToPerm.permission),)
	1435
	1436	perm_rows = []
	1437	for _user_group in q.all():
	1438	usr = AttributeDict(_user_group.user_group.get_dict())
	1439	usr.permission = _user_group.permission.permission_name
	1440	perm_rows.append(usr)
	1441
	1442	perm_rows = sorted(perm_rows, key=display_user_group_sort)
	1443	return perm_rows
	1444
	1445	def _get_default_perms(self, user_group, suffix=''):
	1446	from rhodecode.model.permission import PermissionModel
	1447	return PermissionModel().get_default_perms(user_group.users_group_to_perm, suffix)
	1448
	1449	def get_default_perms(self, suffix=''):
	1450	return self._get_default_perms(self, suffix)
	1451
	1452	def get_api_data(self, with_group_members=True, include_secrets=False):
	1453	"""
	1454	:param include_secrets: See :meth:`User.get_api_data`, this parameter is
	1455	basically forwarded.
	1456
	1457	"""
	1458	user_group = self
	1459	data = {
	1460	'users_group_id': user_group.users_group_id,
	1461	'group_name': user_group.users_group_name,
	1462	'group_description': user_group.user_group_description,
	1463	'active': user_group.users_group_active,
	1464	'owner': user_group.user.username,
	1465	'sync': user_group.sync,
	1466	'owner_email': user_group.user.email,
	1467	}
	1468
	1469	if with_group_members:
	1470	users = []
	1471	for user in user_group.members:
	1472	user = user.user
	1473	users.append(user.get_api_data(include_secrets=include_secrets))
	1474	data['users'] = users
	1475
	1476	return data
	1477
	1478
	1479	class UserGroupMember(Base, BaseModel):
	1480	__tablename__ = 'users_groups_members'
	1481	__table_args__ = (
	1482	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1483	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	1484	)
	1485
	1486	users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	1487	users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
	1488	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
	1489
	1490	user = relationship('User', lazy='joined')
	1491	users_group = relationship('UserGroup')
	1492
	1493	def __init__(self, gr_id='', u_id=''):
	1494	self.users_group_id = gr_id
	1495	self.user_id = u_id
	1496
	1497
	1498	class RepositoryField(Base, BaseModel):
	1499	__tablename__ = 'repositories_fields'
	1500	__table_args__ = (
	1501	UniqueConstraint('repository_id', 'field_key'), # no-multi field
	1502	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1503	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	1504	)
	1505	PREFIX = 'ex_' # prefix used in form to not conflict with already existing fields
	1506
	1507	repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	1508	repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
	1509	field_key = Column("field_key", String(250))
	1510	field_label = Column("field_label", String(1024), nullable=False)
	1511	field_value = Column("field_value", String(10000), nullable=False)
	1512	field_desc = Column("field_desc", String(1024), nullable=False)
	1513	field_type = Column("field_type", String(255), nullable=False, unique=None)
	1514	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	1515
	1516	repository = relationship('Repository')
	1517
	1518	@property
	1519	def field_key_prefixed(self):
	1520	return 'ex_%s' % self.field_key
	1521
	1522	@classmethod
	1523	def un_prefix_key(cls, key):
	1524	if key.startswith(cls.PREFIX):
	1525	return key[len(cls.PREFIX):]
	1526	return key
	1527
	1528	@classmethod
	1529	def get_by_key_name(cls, key, repo):
	1530	row = cls.query()\
	1531	.filter(cls.repository == repo)\
	1532	.filter(cls.field_key == key).scalar()
	1533	return row
	1534
	1535
	1536	class Repository(Base, BaseModel):
	1537	__tablename__ = 'repositories'
	1538	__table_args__ = (
	1539	Index('r_repo_name_idx', 'repo_name', mysql_length=255),
	1540	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	1541	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	1542	)
	1543	DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
	1544	DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
	1545	DEFAULT_CLONE_URI_SSH = 'ssh://{sys_user}@{hostname}/{repo}'
	1546
	1547	STATE_CREATED = 'repo_state_created'
	1548	STATE_PENDING = 'repo_state_pending'
	1549	STATE_ERROR = 'repo_state_error'
	1550
	1551	LOCK_AUTOMATIC = 'lock_auto'
	1552	LOCK_API = 'lock_api'
	1553	LOCK_WEB = 'lock_web'
	1554	LOCK_PULL = 'lock_pull'
	1555
	1556	NAME_SEP = URL_SEP
	1557
	1558	repo_id = Column(
	1559	"repo_id", Integer(), nullable=False, unique=True, default=None,
	1560	primary_key=True)
	1561	_repo_name = Column(
	1562	"repo_name", Text(), nullable=False, default=None)
	1563	_repo_name_hash = Column(
	1564	"repo_name_hash", String(255), nullable=False, unique=True)
	1565	repo_state = Column("repo_state", String(255), nullable=True)
	1566
	1567	clone_uri = Column(
	1568	"clone_uri", EncryptedTextValue(), nullable=True, unique=False,
	1569	default=None)
	1570	push_uri = Column(
	1571	"push_uri", EncryptedTextValue(), nullable=True, unique=False,
	1572	default=None)
	1573	repo_type = Column(
	1574	"repo_type", String(255), nullable=False, unique=False, default=None)
	1575	user_id = Column(
	1576	"user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
	1577	unique=False, default=None)
	1578	private = Column(
	1579	"private", Boolean(), nullable=True, unique=None, default=None)
	1580	enable_statistics = Column(
	1581	"statistics", Boolean(), nullable=True, unique=None, default=True)
	1582	enable_downloads = Column(
	1583	"downloads", Boolean(), nullable=True, unique=None, default=True)
	1584	description = Column(
	1585	"description", String(10000), nullable=True, unique=None, default=None)
	1586	created_on = Column(
	1587	'created_on', DateTime(timezone=False), nullable=True, unique=None,
	1588	default=datetime.datetime.now)
	1589	updated_on = Column(
	1590	'updated_on', DateTime(timezone=False), nullable=True, unique=None,
	1591	default=datetime.datetime.now)
	1592	_landing_revision = Column(
	1593	"landing_revision", String(255), nullable=False, unique=False,
	1594	default=None)
	1595	enable_locking = Column(
	1596	"enable_locking", Boolean(), nullable=False, unique=None,
	1597	default=False)
	1598	_locked = Column(
	1599	"locked", String(255), nullable=True, unique=False, default=None)
	1600	_changeset_cache = Column(
	1601	"changeset_cache", LargeBinary(), nullable=True) # JSON data
	1602
	1603	fork_id = Column(
	1604	"fork_id", Integer(), ForeignKey('repositories.repo_id'),
	1605	nullable=True, unique=False, default=None)
	1606	group_id = Column(
	1607	"group_id", Integer(), ForeignKey('groups.group_id'), nullable=True,
	1608	unique=False, default=None)
	1609
	1610	user = relationship('User', lazy='joined')
	1611	fork = relationship('Repository', remote_side=repo_id, lazy='joined')
	1612	group = relationship('RepoGroup', lazy='joined')
	1613	repo_to_perm = relationship(
	1614	'UserRepoToPerm', cascade='all',
	1615	order_by='UserRepoToPerm.repo_to_perm_id')
	1616	users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
	1617	stats = relationship('Statistics', cascade='all', uselist=False)
	1618
	1619	followers = relationship(
	1620	'UserFollowing',
	1621	primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
	1622	cascade='all')
	1623	extra_fields = relationship(
	1624	'RepositoryField', cascade="all, delete, delete-orphan")
	1625	logs = relationship('UserLog')
	1626	comments = relationship(
	1627	'ChangesetComment', cascade="all, delete, delete-orphan")
	1628	pull_requests_source = relationship(
	1629	'PullRequest',
	1630	primaryjoin='PullRequest.source_repo_id==Repository.repo_id',
	1631	cascade="all, delete, delete-orphan")
	1632	pull_requests_target = relationship(
	1633	'PullRequest',
	1634	primaryjoin='PullRequest.target_repo_id==Repository.repo_id',
	1635	cascade="all, delete, delete-orphan")
	1636	ui = relationship('RepoRhodeCodeUi', cascade="all")
	1637	settings = relationship('RepoRhodeCodeSetting', cascade="all")
	1638	integrations = relationship('Integration',
	1639	cascade="all, delete, delete-orphan")
	1640
	1641	scoped_tokens = relationship('UserApiKeys', cascade="all")
	1642
	1643	def __unicode__(self):
	1644	return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
	1645	safe_unicode(self.repo_name))
	1646
	1647	@hybrid_property
	1648	def description_safe(self):
	1649	from rhodecode.lib import helpers as h
	1650	return h.escape(self.description)
	1651
	1652	@hybrid_property
	1653	def landing_rev(self):
	1654	# always should return [rev_type, rev]
	1655	if self._landing_revision:
	1656	_rev_info = self._landing_revision.split(':')
	1657	if len(_rev_info) < 2:
	1658	_rev_info.insert(0, 'rev')
	1659	return [_rev_info[0], _rev_info[1]]
	1660	return [None, None]
	1661
	1662	@landing_rev.setter
	1663	def landing_rev(self, val):
	1664	if ':' not in val:
	1665	raise ValueError('value must be delimited with `:` and consist '
	1666	'of <rev_type>:<rev>, got %s instead' % val)
	1667	self._landing_revision = val
	1668
	1669	@hybrid_property
	1670	def locked(self):
	1671	if self._locked:
	1672	user_id, timelocked, reason = self._locked.split(':')
	1673	lock_values = int(user_id), timelocked, reason
	1674	else:
	1675	lock_values = [None, None, None]
	1676	return lock_values
	1677
	1678	@locked.setter
	1679	def locked(self, val):
	1680	if val and isinstance(val, (list, tuple)):
	1681	self._locked = ':'.join(map(str, val))
	1682	else:
	1683	self._locked = None
	1684
	1685	@hybrid_property
	1686	def changeset_cache(self):
	1687	from rhodecode.lib.vcs.backends.base import EmptyCommit
	1688	dummy = EmptyCommit().__json__()
	1689	if not self._changeset_cache:
	1690	return dummy
	1691	try:
	1692	return json.loads(self._changeset_cache)
	1693	except TypeError:
	1694	return dummy
	1695	except Exception:
	1696	log.error(traceback.format_exc())
	1697	return dummy
	1698
	1699	@changeset_cache.setter
	1700	def changeset_cache(self, val):
	1701	try:
	1702	self._changeset_cache = json.dumps(val)
	1703	except Exception:
	1704	log.error(traceback.format_exc())
	1705
	1706	@hybrid_property
	1707	def repo_name(self):
	1708	return self._repo_name
	1709
	1710	@repo_name.setter
	1711	def repo_name(self, value):
	1712	self._repo_name = value
	1713	self._repo_name_hash = hashlib.sha1(safe_str(value)).hexdigest()
	1714
	1715	@classmethod
	1716	def normalize_repo_name(cls, repo_name):
	1717	"""
	1718	Normalizes os specific repo_name to the format internally stored inside
	1719	database using URL_SEP
	1720
	1721	:param cls:
	1722	:param repo_name:
	1723	"""
	1724	return cls.NAME_SEP.join(repo_name.split(os.sep))
	1725
	1726	@classmethod
	1727	def get_by_repo_name(cls, repo_name, cache=False, identity_cache=False):
	1728	session = Session()
	1729	q = session.query(cls).filter(cls.repo_name == repo_name)
	1730
	1731	if cache:
	1732	if identity_cache:
	1733	val = cls.identity_cache(session, 'repo_name', repo_name)
	1734	if val:
	1735	return val
	1736	else:
	1737	cache_key = "get_repo_by_name_%s" % _hash_key(repo_name)
	1738	q = q.options(
	1739	FromCache("sql_cache_short", cache_key))
	1740
	1741	return q.scalar()
	1742
	1743	@classmethod
	1744	def get_by_id_or_repo_name(cls, repoid):
	1745	if isinstance(repoid, (int, long)):
	1746	try:
	1747	repo = cls.get(repoid)
	1748	except ValueError:
	1749	repo = None
	1750	else:
	1751	repo = cls.get_by_repo_name(repoid)
	1752	return repo
	1753
	1754	@classmethod
	1755	def get_by_full_path(cls, repo_full_path):
	1756	repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
	1757	repo_name = cls.normalize_repo_name(repo_name)
	1758	return cls.get_by_repo_name(repo_name.strip(URL_SEP))
	1759
	1760	@classmethod
	1761	def get_repo_forks(cls, repo_id):
	1762	return cls.query().filter(Repository.fork_id == repo_id)
	1763
	1764	@classmethod
	1765	def base_path(cls):
	1766	"""
	1767	Returns base path when all repos are stored
	1768
	1769	:param cls:
	1770	"""
	1771	q = Session().query(RhodeCodeUi)\
	1772	.filter(RhodeCodeUi.ui_key == cls.NAME_SEP)
	1773	q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
	1774	return q.one().ui_value
	1775
	1776	@classmethod
	1777	def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None),
	1778	case_insensitive=True):
	1779	q = Repository.query()
	1780
	1781	if not isinstance(user_id, Optional):
	1782	q = q.filter(Repository.user_id == user_id)
	1783
	1784	if not isinstance(group_id, Optional):
	1785	q = q.filter(Repository.group_id == group_id)
	1786
	1787	if case_insensitive:
	1788	q = q.order_by(func.lower(Repository.repo_name))
	1789	else:
	1790	q = q.order_by(Repository.repo_name)
	1791	return q.all()
	1792
	1793	@property
	1794	def forks(self):
	1795	"""
	1796	Return forks of this repo
	1797	"""
	1798	return Repository.get_repo_forks(self.repo_id)
	1799
	1800	@property
	1801	def parent(self):
	1802	"""
	1803	Returns fork parent
	1804	"""
	1805	return self.fork
	1806
	1807	@property
	1808	def just_name(self):
	1809	return self.repo_name.split(self.NAME_SEP)[-1]
	1810
	1811	@property
	1812	def groups_with_parents(self):
	1813	groups = []
	1814	if self.group is None:
	1815	return groups
	1816
	1817	cur_gr = self.group
	1818	groups.insert(0, cur_gr)
	1819	while 1:
	1820	gr = getattr(cur_gr, 'parent_group', None)
	1821	cur_gr = cur_gr.parent_group
	1822	if gr is None:
	1823	break
	1824	groups.insert(0, gr)
	1825
	1826	return groups
	1827
	1828	@property
	1829	def groups_and_repo(self):
	1830	return self.groups_with_parents, self
	1831
	1832	@LazyProperty
	1833	def repo_path(self):
	1834	"""
	1835	Returns base full path for that repository means where it actually
	1836	exists on a filesystem
	1837	"""
	1838	q = Session().query(RhodeCodeUi).filter(
	1839	RhodeCodeUi.ui_key == self.NAME_SEP)
	1840	q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
	1841	return q.one().ui_value
	1842
	1843	@property
	1844	def repo_full_path(self):
	1845	p = [self.repo_path]
	1846	# we need to split the name by / since this is how we store the
	1847	# names in the database, but that eventually needs to be converted
	1848	# into a valid system path
	1849	p += self.repo_name.split(self.NAME_SEP)
	1850	return os.path.join(*map(safe_unicode, p))
	1851
	1852	@property
	1853	def cache_keys(self):
	1854	"""
	1855	Returns associated cache keys for that repo
	1856	"""
	1857	return CacheKey.query()\
	1858	.filter(CacheKey.cache_args == self.repo_name)\
	1859	.order_by(CacheKey.cache_key)\
	1860	.all()
	1861
	1862	@property
	1863	def cached_diffs_relative_dir(self):
	1864	"""
	1865	Return a relative to the repository store path of cached diffs
	1866	used for safe display for users, who shouldn't know the absolute store
	1867	path
	1868	"""
	1869	return os.path.join(
	1870	os.path.dirname(self.repo_name),
	1871	self.cached_diffs_dir.split(os.path.sep)[-1])
	1872
	1873	@property
	1874	def cached_diffs_dir(self):
	1875	path = self.repo_full_path
	1876	return os.path.join(
	1877	os.path.dirname(path),
	1878	'.__shadow_diff_cache_repo_{}'.format(self.repo_id))
	1879
	1880	def cached_diffs(self):
	1881	diff_cache_dir = self.cached_diffs_dir
	1882	if os.path.isdir(diff_cache_dir):
	1883	return os.listdir(diff_cache_dir)
	1884	return []
	1885
	1886	def get_new_name(self, repo_name):
	1887	"""
	1888	returns new full repository name based on assigned group and new new
	1889
	1890	:param group_name:
	1891	"""
	1892	path_prefix = self.group.full_path_splitted if self.group else []
	1893	return self.NAME_SEP.join(path_prefix + [repo_name])
	1894
	1895	@property
	1896	def _config(self):
	1897	"""
	1898	Returns db based config object.
	1899	"""
	1900	from rhodecode.lib.utils import make_db_config
	1901	return make_db_config(clear_session=False, repo=self)
	1902
	1903	def permissions(self, with_admins=True, with_owner=True):
	1904	q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
	1905	q = q.options(joinedload(UserRepoToPerm.repository),
	1906	joinedload(UserRepoToPerm.user),
	1907	joinedload(UserRepoToPerm.permission),)
	1908
	1909	# get owners and admins and permissions. We do a trick of re-writing
	1910	# objects from sqlalchemy to named-tuples due to sqlalchemy session
	1911	# has a global reference and changing one object propagates to all
	1912	# others. This means if admin is also an owner admin_row that change
	1913	# would propagate to both objects
	1914	perm_rows = []
	1915	for _usr in q.all():
	1916	usr = AttributeDict(_usr.user.get_dict())
	1917	usr.permission = _usr.permission.permission_name
	1918	usr.permission_id = _usr.repo_to_perm_id
	1919	perm_rows.append(usr)
	1920
	1921	# filter the perm rows by 'default' first and then sort them by
	1922	# admin,write,read,none permissions sorted again alphabetically in
	1923	# each group
	1924	perm_rows = sorted(perm_rows, key=display_user_sort)
	1925
	1926	_admin_perm = 'repository.admin'
	1927	owner_row = []
	1928	if with_owner:
	1929	usr = AttributeDict(self.user.get_dict())
	1930	usr.owner_row = True
	1931	usr.permission = _admin_perm
	1932	usr.permission_id = None
	1933	owner_row.append(usr)
	1934
	1935	super_admin_rows = []
	1936	if with_admins:
	1937	for usr in User.get_all_super_admins():
	1938	# if this admin is also owner, don't double the record
	1939	if usr.user_id == owner_row[0].user_id:
	1940	owner_row[0].admin_row = True
	1941	else:
	1942	usr = AttributeDict(usr.get_dict())
	1943	usr.admin_row = True
	1944	usr.permission = _admin_perm
	1945	usr.permission_id = None
	1946	super_admin_rows.append(usr)
	1947
	1948	return super_admin_rows + owner_row + perm_rows
	1949
	1950	def permission_user_groups(self):
	1951	q = UserGroupRepoToPerm.query().filter(
	1952	UserGroupRepoToPerm.repository == self)
	1953	q = q.options(joinedload(UserGroupRepoToPerm.repository),
	1954	joinedload(UserGroupRepoToPerm.users_group),
	1955	joinedload(UserGroupRepoToPerm.permission),)
	1956
	1957	perm_rows = []
	1958	for _user_group in q.all():
	1959	usr = AttributeDict(_user_group.users_group.get_dict())
	1960	usr.permission = _user_group.permission.permission_name
	1961	perm_rows.append(usr)
	1962
	1963	perm_rows = sorted(perm_rows, key=display_user_group_sort)
	1964	return perm_rows
	1965
	1966	def get_api_data(self, include_secrets=False):
	1967	"""
	1968	Common function for generating repo api data
	1969
	1970	:param include_secrets: See :meth:`User.get_api_data`.
	1971
	1972	"""
	1973	# TODO: mikhail: Here there is an anti-pattern, we probably need to
	1974	# move this methods on models level.
	1975	from rhodecode.model.settings import SettingsModel
	1976	from rhodecode.model.repo import RepoModel
	1977
	1978	repo = self
	1979	_user_id, _time, _reason = self.locked
	1980
	1981	data = {
	1982	'repo_id': repo.repo_id,
	1983	'repo_name': repo.repo_name,
	1984	'repo_type': repo.repo_type,
	1985	'clone_uri': repo.clone_uri or '',
	1986	'push_uri': repo.push_uri or '',
	1987	'url': RepoModel().get_url(self),
	1988	'private': repo.private,
	1989	'created_on': repo.created_on,
	1990	'description': repo.description_safe,
	1991	'landing_rev': repo.landing_rev,
	1992	'owner': repo.user.username,
	1993	'fork_of': repo.fork.repo_name if repo.fork else None,
	1994	'fork_of_id': repo.fork.repo_id if repo.fork else None,
	1995	'enable_statistics': repo.enable_statistics,
	1996	'enable_locking': repo.enable_locking,
	1997	'enable_downloads': repo.enable_downloads,
	1998	'last_changeset': repo.changeset_cache,
	1999	'locked_by': User.get(_user_id).get_api_data(
	2000	include_secrets=include_secrets) if _user_id else None,
	2001	'locked_date': time_to_datetime(_time) if _time else None,
	2002	'lock_reason': _reason if _reason else None,
	2003	}
	2004
	2005	# TODO: mikhail: should be per-repo settings here
	2006	rc_config = SettingsModel().get_all_settings()
	2007	repository_fields = str2bool(
	2008	rc_config.get('rhodecode_repository_fields'))
	2009	if repository_fields:
	2010	for f in self.extra_fields:
	2011	data[f.field_key_prefixed] = f.field_value
	2012
	2013	return data
	2014
	2015	@classmethod
	2016	def lock(cls, repo, user_id, lock_time=None, lock_reason=None):
	2017	if not lock_time:
	2018	lock_time = time.time()
	2019	if not lock_reason:
	2020	lock_reason = cls.LOCK_AUTOMATIC
	2021	repo.locked = [user_id, lock_time, lock_reason]
	2022	Session().add(repo)
	2023	Session().commit()
	2024
	2025	@classmethod
	2026	def unlock(cls, repo):
	2027	repo.locked = None
	2028	Session().add(repo)
	2029	Session().commit()
	2030
	2031	@classmethod
	2032	def getlock(cls, repo):
	2033	return repo.locked
	2034
	2035	def is_user_lock(self, user_id):
	2036	if self.lock[0]:
	2037	lock_user_id = safe_int(self.lock[0])
	2038	user_id = safe_int(user_id)
	2039	# both are ints, and they are equal
	2040	return all([lock_user_id, user_id]) and lock_user_id == user_id
	2041
	2042	return False
	2043
	2044	def get_locking_state(self, action, user_id, only_when_enabled=True):
	2045	"""
	2046	Checks locking on this repository, if locking is enabled and lock is
	2047	present returns a tuple of make_lock, locked, locked_by.
	2048	make_lock can have 3 states None (do nothing) True, make lock
	2049	False release lock, This value is later propagated to hooks, which
	2050	do the locking. Think about this as signals passed to hooks what to do.
	2051
	2052	"""
	2053	# TODO: johbo: This is part of the business logic and should be moved
	2054	# into the RepositoryModel.
	2055
	2056	if action not in ('push', 'pull'):
	2057	raise ValueError("Invalid action value: %s" % repr(action))
	2058
	2059	# defines if locked error should be thrown to user
	2060	currently_locked = False
	2061	# defines if new lock should be made, tri-state
	2062	make_lock = None
	2063	repo = self
	2064	user = User.get(user_id)
	2065
	2066	lock_info = repo.locked
	2067
	2068	if repo and (repo.enable_locking or not only_when_enabled):
	2069	if action == 'push':
	2070	# check if it's already locked !, if it is compare users
	2071	locked_by_user_id = lock_info[0]
	2072	if user.user_id == locked_by_user_id:
	2073	log.debug(
	2074	'Got `push` action from user %s, now unlocking', user)
	2075	# unlock if we have push from user who locked
	2076	make_lock = False
	2077	else:
	2078	# we're not the same user who locked, ban with
	2079	# code defined in settings (default is 423 HTTP Locked) !
	2080	log.debug('Repo %s is currently locked by %s', repo, user)
	2081	currently_locked = True
	2082	elif action == 'pull':
	2083	# [0] user [1] date
	2084	if lock_info[0] and lock_info[1]:
	2085	log.debug('Repo %s is currently locked by %s', repo, user)
	2086	currently_locked = True
	2087	else:
	2088	log.debug('Setting lock on repo %s by %s', repo, user)
	2089	make_lock = True
	2090
	2091	else:
	2092	log.debug('Repository %s do not have locking enabled', repo)
	2093
	2094	log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s',
	2095	make_lock, currently_locked, lock_info)
	2096
	2097	from rhodecode.lib.auth import HasRepoPermissionAny
	2098	perm_check = HasRepoPermissionAny('repository.write', 'repository.admin')
	2099	if make_lock and not perm_check(repo_name=repo.repo_name, user=user):
	2100	# if we don't have at least write permission we cannot make a lock
	2101	log.debug('lock state reset back to FALSE due to lack '
	2102	'of at least read permission')
	2103	make_lock = False
	2104
	2105	return make_lock, currently_locked, lock_info
	2106
	2107	@property
	2108	def last_db_change(self):
	2109	return self.updated_on
	2110
	2111	@property
	2112	def clone_uri_hidden(self):
	2113	clone_uri = self.clone_uri
	2114	if clone_uri:
	2115	import urlobject
	2116	url_obj = urlobject.URLObject(cleaned_uri(clone_uri))
	2117	if url_obj.password:
	2118	clone_uri = url_obj.with_password('*****')
	2119	return clone_uri
	2120
	2121	@property
	2122	def push_uri_hidden(self):
	2123	push_uri = self.push_uri
	2124	if push_uri:
	2125	import urlobject
	2126	url_obj = urlobject.URLObject(cleaned_uri(push_uri))
	2127	if url_obj.password:
	2128	push_uri = url_obj.with_password('*****')
	2129	return push_uri
	2130
	2131	def clone_url(self, **override):
	2132	from rhodecode.model.settings import SettingsModel
	2133
	2134	uri_tmpl = None
	2135	if 'with_id' in override:
	2136	uri_tmpl = self.DEFAULT_CLONE_URI_ID
	2137	del override['with_id']
	2138
	2139	if 'uri_tmpl' in override:
	2140	uri_tmpl = override['uri_tmpl']
	2141	del override['uri_tmpl']
	2142
	2143	ssh = False
	2144	if 'ssh' in override:
	2145	ssh = True
	2146	del override['ssh']
	2147
	2148	# we didn't override our tmpl from **overrides
	2149	if not uri_tmpl:
	2150	rc_config = SettingsModel().get_all_settings(cache=True)
	2151	if ssh:
	2152	uri_tmpl = rc_config.get(
	2153	'rhodecode_clone_uri_ssh_tmpl') or self.DEFAULT_CLONE_URI_SSH
	2154	else:
	2155	uri_tmpl = rc_config.get(
	2156	'rhodecode_clone_uri_tmpl') or self.DEFAULT_CLONE_URI
	2157
	2158	request = get_current_request()
	2159	return get_clone_url(request=request,
	2160	uri_tmpl=uri_tmpl,
	2161	repo_name=self.repo_name,
	2162	repo_id=self.repo_id, **override)
	2163
	2164	def set_state(self, state):
	2165	self.repo_state = state
	2166	Session().add(self)
	2167	#==========================================================================
	2168	# SCM PROPERTIES
	2169	#==========================================================================
	2170
	2171	def get_commit(self, commit_id=None, commit_idx=None, pre_load=None):
	2172	return get_commit_safe(
	2173	self.scm_instance(), commit_id, commit_idx, pre_load=pre_load)
	2174
	2175	def get_changeset(self, rev=None, pre_load=None):
	2176	warnings.warn("Use get_commit", DeprecationWarning)
	2177	commit_id = None
	2178	commit_idx = None
	2179	if isinstance(rev, basestring):
	2180	commit_id = rev
	2181	else:
	2182	commit_idx = rev
	2183	return self.get_commit(commit_id=commit_id, commit_idx=commit_idx,
	2184	pre_load=pre_load)
	2185
	2186	def get_landing_commit(self):
	2187	"""
	2188	Returns landing commit, or if that doesn't exist returns the tip
	2189	"""
	2190	_rev_type, _rev = self.landing_rev
	2191	commit = self.get_commit(_rev)
	2192	if isinstance(commit, EmptyCommit):
	2193	return self.get_commit()
	2194	return commit
	2195
	2196	def update_commit_cache(self, cs_cache=None, config=None):
	2197	"""
	2198	Update cache of last changeset for repository, keys should be::
	2199
	2200	short_id
	2201	raw_id
	2202	revision
	2203	parents
	2204	message
	2205	date
	2206	author
	2207
	2208	:param cs_cache:
	2209	"""
	2210	from rhodecode.lib.vcs.backends.base import BaseChangeset
	2211	if cs_cache is None:
	2212	# use no-cache version here
	2213	scm_repo = self.scm_instance(cache=False, config=config)
	2214	if scm_repo:
	2215	cs_cache = scm_repo.get_commit(
	2216	pre_load=["author", "date", "message", "parents"])
	2217	else:
	2218	cs_cache = EmptyCommit()
	2219
	2220	if isinstance(cs_cache, BaseChangeset):
	2221	cs_cache = cs_cache.__json__()
	2222
	2223	def is_outdated(new_cs_cache):
	2224	if (new_cs_cache['raw_id'] != self.changeset_cache['raw_id'] or
	2225	new_cs_cache['revision'] != self.changeset_cache['revision']):
	2226	return True
	2227	return False
	2228
	2229	# check if we have maybe already latest cached revision
	2230	if is_outdated(cs_cache) or not self.changeset_cache:
	2231	_default = datetime.datetime.fromtimestamp(0)
	2232	last_change = cs_cache.get('date') or _default
	2233	log.debug('updated repo %s with new cs cache %s',
	2234	self.repo_name, cs_cache)
	2235	self.updated_on = last_change
	2236	self.changeset_cache = cs_cache
	2237	Session().add(self)
	2238	Session().commit()
	2239	else:
	2240	log.debug('Skipping update_commit_cache for repo:`%s` '
	2241	'commit already with latest changes', self.repo_name)
	2242
	2243	@property
	2244	def tip(self):
	2245	return self.get_commit('tip')
	2246
	2247	@property
	2248	def author(self):
	2249	return self.tip.author
	2250
	2251	@property
	2252	def last_change(self):
	2253	return self.scm_instance().last_change
	2254
	2255	def get_comments(self, revisions=None):
	2256	"""
	2257	Returns comments for this repository grouped by revisions
	2258
	2259	:param revisions: filter query by revisions only
	2260	"""
	2261	cmts = ChangesetComment.query()\
	2262	.filter(ChangesetComment.repo == self)
	2263	if revisions:
	2264	cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
	2265	grouped = collections.defaultdict(list)
	2266	for cmt in cmts.all():
	2267	grouped[cmt.revision].append(cmt)
	2268	return grouped
	2269
	2270	def statuses(self, revisions=None):
	2271	"""
	2272	Returns statuses for this repository
	2273
	2274	:param revisions: list of revisions to get statuses for
	2275	"""
	2276	statuses = ChangesetStatus.query()\
	2277	.filter(ChangesetStatus.repo == self)\
	2278	.filter(ChangesetStatus.version == 0)
	2279
	2280	if revisions:
	2281	# Try doing the filtering in chunks to avoid hitting limits
	2282	size = 500
	2283	status_results = []
	2284	for chunk in xrange(0, len(revisions), size):
	2285	status_results += statuses.filter(
	2286	ChangesetStatus.revision.in_(
	2287	revisions[chunk: chunk+size])
	2288	).all()
	2289	else:
	2290	status_results = statuses.all()
	2291
	2292	grouped = {}
	2293
	2294	# maybe we have open new pullrequest without a status?
	2295	stat = ChangesetStatus.STATUS_UNDER_REVIEW
	2296	status_lbl = ChangesetStatus.get_status_lbl(stat)
	2297	for pr in PullRequest.query().filter(PullRequest.source_repo == self).all():
	2298	for rev in pr.revisions:
	2299	pr_id = pr.pull_request_id
	2300	pr_repo = pr.target_repo.repo_name
	2301	grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
	2302
	2303	for stat in status_results:
	2304	pr_id = pr_repo = None
	2305	if stat.pull_request:
	2306	pr_id = stat.pull_request.pull_request_id
	2307	pr_repo = stat.pull_request.target_repo.repo_name
	2308	grouped[stat.revision] = [str(stat.status), stat.status_lbl,
	2309	pr_id, pr_repo]
	2310	return grouped
	2311
	2312	# ==========================================================================
	2313	# SCM CACHE INSTANCE
	2314	# ==========================================================================
	2315
	2316	def scm_instance(self, **kwargs):
	2317	import rhodecode
	2318
	2319	# Passing a config will not hit the cache currently only used
	2320	# for repo2dbmapper
	2321	config = kwargs.pop('config', None)
	2322	cache = kwargs.pop('cache', None)
	2323	full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
	2324	# if cache is NOT defined use default global, else we have a full
	2325	# control over cache behaviour
	2326	if cache is None and full_cache and not config:
	2327	return self._get_instance_cached()
	2328	return self._get_instance(cache=bool(cache), config=config)
	2329
	2330	def _get_instance_cached(self):
	2331	return self._get_instance()
	2332
	2333	def _get_instance(self, cache=True, config=None):
	2334	config = config or self._config
	2335	custom_wire = {
	2336	'cache': cache # controls the vcs.remote cache
	2337	}
	2338	repo = get_vcs_instance(
	2339	repo_path=safe_str(self.repo_full_path),
	2340	config=config,
	2341	with_wire=custom_wire,
	2342	create=False,
	2343	_vcs_alias=self.repo_type)
	2344
	2345	return repo
	2346
	2347	def __json__(self):
	2348	return {'landing_rev': self.landing_rev}
	2349
	2350	def get_dict(self):
	2351
	2352	# Since we transformed `repo_name` to a hybrid property, we need to
	2353	# keep compatibility with the code which uses `repo_name` field.
	2354
	2355	result = super(Repository, self).get_dict()
	2356	result['repo_name'] = result.pop('_repo_name', None)
	2357	return result
	2358
	2359
	2360	class RepoGroup(Base, BaseModel):
	2361	__tablename__ = 'groups'
	2362	__table_args__ = (
	2363	UniqueConstraint('group_name', 'group_parent_id'),
	2364	CheckConstraint('group_id != group_parent_id'),
	2365	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	2366	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	2367	)
	2368	__mapper_args__ = {'order_by': 'group_name'}
	2369
	2370	CHOICES_SEPARATOR = '/' # used to generate select2 choices for nested groups
	2371
	2372	group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	2373	group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
	2374	group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
	2375	group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
	2376	enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
	2377	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
	2378	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	2379	updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
	2380	personal = Column('personal', Boolean(), nullable=True, unique=None, default=None)
	2381
	2382	repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
	2383	users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
	2384	parent_group = relationship('RepoGroup', remote_side=group_id)
	2385	user = relationship('User')
	2386	integrations = relationship('Integration',
	2387	cascade="all, delete, delete-orphan")
	2388
	2389	def __init__(self, group_name='', parent_group=None):
	2390	self.group_name = group_name
	2391	self.parent_group = parent_group
	2392
	2393	def __unicode__(self):
	2394	return u"<%s('id:%s:%s')>" % (
	2395	self.__class__.__name__, self.group_id, self.group_name)
	2396
	2397	@hybrid_property
	2398	def description_safe(self):
	2399	from rhodecode.lib import helpers as h
	2400	return h.escape(self.group_description)
	2401
	2402	@classmethod
	2403	def _generate_choice(cls, repo_group):
	2404	from webhelpers.html import literal as _literal
	2405	_name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
	2406	return repo_group.group_id, _name(repo_group.full_path_splitted)
	2407
	2408	@classmethod
	2409	def groups_choices(cls, groups=None, show_empty_group=True):
	2410	if not groups:
	2411	groups = cls.query().all()
	2412
	2413	repo_groups = []
	2414	if show_empty_group:
	2415	repo_groups = [(-1, u'-- %s --' % _('No parent'))]
	2416
	2417	repo_groups.extend([cls._generate_choice(x) for x in groups])
	2418
	2419	repo_groups = sorted(
	2420	repo_groups, key=lambda t: t[1].split(cls.CHOICES_SEPARATOR)[0])
	2421	return repo_groups
	2422
	2423	@classmethod
	2424	def url_sep(cls):
	2425	return URL_SEP
	2426
	2427	@classmethod
	2428	def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
	2429	if case_insensitive:
	2430	gr = cls.query().filter(func.lower(cls.group_name)
	2431	== func.lower(group_name))
	2432	else:
	2433	gr = cls.query().filter(cls.group_name == group_name)
	2434	if cache:
	2435	name_key = _hash_key(group_name)
	2436	gr = gr.options(
	2437	FromCache("sql_cache_short", "get_group_%s" % name_key))
	2438	return gr.scalar()
	2439
	2440	@classmethod
	2441	def get_user_personal_repo_group(cls, user_id):
	2442	user = User.get(user_id)
	2443	if user.username == User.DEFAULT_USER:
	2444	return None
	2445
	2446	return cls.query()\
	2447	.filter(cls.personal == true()) \
	2448	.filter(cls.user == user).scalar()
	2449
	2450	@classmethod
	2451	def get_all_repo_groups(cls, user_id=Optional(None), group_id=Optional(None),
	2452	case_insensitive=True):
	2453	q = RepoGroup.query()
	2454
	2455	if not isinstance(user_id, Optional):
	2456	q = q.filter(RepoGroup.user_id == user_id)
	2457
	2458	if not isinstance(group_id, Optional):
	2459	q = q.filter(RepoGroup.group_parent_id == group_id)
	2460
	2461	if case_insensitive:
	2462	q = q.order_by(func.lower(RepoGroup.group_name))
	2463	else:
	2464	q = q.order_by(RepoGroup.group_name)
	2465	return q.all()
	2466
	2467	@property
	2468	def parents(self):
	2469	parents_recursion_limit = 10
	2470	groups = []
	2471	if self.parent_group is None:
	2472	return groups
	2473	cur_gr = self.parent_group
	2474	groups.insert(0, cur_gr)
	2475	cnt = 0
	2476	while 1:
	2477	cnt += 1
	2478	gr = getattr(cur_gr, 'parent_group', None)
	2479	cur_gr = cur_gr.parent_group
	2480	if gr is None:
	2481	break
	2482	if cnt == parents_recursion_limit:
	2483	# this will prevent accidental infinit loops
	2484	log.error(('more than %s parents found for group %s, stopping '
	2485	'recursive parent fetching' % (parents_recursion_limit, self)))
	2486	break
	2487
	2488	groups.insert(0, gr)
	2489	return groups
	2490
	2491	@property
	2492	def last_db_change(self):
	2493	return self.updated_on
	2494
	2495	@property
	2496	def children(self):
	2497	return RepoGroup.query().filter(RepoGroup.parent_group == self)
	2498
	2499	@property
	2500	def name(self):
	2501	return self.group_name.split(RepoGroup.url_sep())[-1]
	2502
	2503	@property
	2504	def full_path(self):
	2505	return self.group_name
	2506
	2507	@property
	2508	def full_path_splitted(self):
	2509	return self.group_name.split(RepoGroup.url_sep())
	2510
	2511	@property
	2512	def repositories(self):
	2513	return Repository.query()\
	2514	.filter(Repository.group == self)\
	2515	.order_by(Repository.repo_name)
	2516
	2517	@property
	2518	def repositories_recursive_count(self):
	2519	cnt = self.repositories.count()
	2520
	2521	def children_count(group):
	2522	cnt = 0
	2523	for child in group.children:
	2524	cnt += child.repositories.count()
	2525	cnt += children_count(child)
	2526	return cnt
	2527
	2528	return cnt + children_count(self)
	2529
	2530	def _recursive_objects(self, include_repos=True):
	2531	all_ = []
	2532
	2533	def _get_members(root_gr):
	2534	if include_repos:
	2535	for r in root_gr.repositories:
	2536	all_.append(r)
	2537	childs = root_gr.children.all()
	2538	if childs:
	2539	for gr in childs:
	2540	all_.append(gr)
	2541	_get_members(gr)
	2542
	2543	_get_members(self)
	2544	return [self] + all_
	2545
	2546	def recursive_groups_and_repos(self):
	2547	"""
	2548	Recursive return all groups, with repositories in those groups
	2549	"""
	2550	return self._recursive_objects()
	2551
	2552	def recursive_groups(self):
	2553	"""
	2554	Returns all children groups for this group including children of children
	2555	"""
	2556	return self._recursive_objects(include_repos=False)
	2557
	2558	def get_new_name(self, group_name):
	2559	"""
	2560	returns new full group name based on parent and new name
	2561
	2562	:param group_name:
	2563	"""
	2564	path_prefix = (self.parent_group.full_path_splitted if
	2565	self.parent_group else [])
	2566	return RepoGroup.url_sep().join(path_prefix + [group_name])
	2567
	2568	def permissions(self, with_admins=True, with_owner=True):
	2569	q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
	2570	q = q.options(joinedload(UserRepoGroupToPerm.group),
	2571	joinedload(UserRepoGroupToPerm.user),
	2572	joinedload(UserRepoGroupToPerm.permission),)
	2573
	2574	# get owners and admins and permissions. We do a trick of re-writing
	2575	# objects from sqlalchemy to named-tuples due to sqlalchemy session
	2576	# has a global reference and changing one object propagates to all
	2577	# others. This means if admin is also an owner admin_row that change
	2578	# would propagate to both objects
	2579	perm_rows = []
	2580	for _usr in q.all():
	2581	usr = AttributeDict(_usr.user.get_dict())
	2582	usr.permission = _usr.permission.permission_name
	2583	perm_rows.append(usr)
	2584
	2585	# filter the perm rows by 'default' first and then sort them by
	2586	# admin,write,read,none permissions sorted again alphabetically in
	2587	# each group
	2588	perm_rows = sorted(perm_rows, key=display_user_sort)
	2589
	2590	_admin_perm = 'group.admin'
	2591	owner_row = []
	2592	if with_owner:
	2593	usr = AttributeDict(self.user.get_dict())
	2594	usr.owner_row = True
	2595	usr.permission = _admin_perm
	2596	owner_row.append(usr)
	2597
	2598	super_admin_rows = []
	2599	if with_admins:
	2600	for usr in User.get_all_super_admins():
	2601	# if this admin is also owner, don't double the record
	2602	if usr.user_id == owner_row[0].user_id:
	2603	owner_row[0].admin_row = True
	2604	else:
	2605	usr = AttributeDict(usr.get_dict())
	2606	usr.admin_row = True
	2607	usr.permission = _admin_perm
	2608	super_admin_rows.append(usr)
	2609
	2610	return super_admin_rows + owner_row + perm_rows
	2611
	2612	def permission_user_groups(self):
	2613	q = UserGroupRepoGroupToPerm.query().filter(UserGroupRepoGroupToPerm.group == self)
	2614	q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
	2615	joinedload(UserGroupRepoGroupToPerm.users_group),
	2616	joinedload(UserGroupRepoGroupToPerm.permission),)
	2617
	2618	perm_rows = []
	2619	for _user_group in q.all():
	2620	usr = AttributeDict(_user_group.users_group.get_dict())
	2621	usr.permission = _user_group.permission.permission_name
	2622	perm_rows.append(usr)
	2623
	2624	perm_rows = sorted(perm_rows, key=display_user_group_sort)
	2625	return perm_rows
	2626
	2627	def get_api_data(self):
	2628	"""
	2629	Common function for generating api data
	2630
	2631	"""
	2632	group = self
	2633	data = {
	2634	'group_id': group.group_id,
	2635	'group_name': group.group_name,
	2636	'group_description': group.description_safe,
	2637	'parent_group': group.parent_group.group_name if group.parent_group else None,
	2638	'repositories': [x.repo_name for x in group.repositories],
	2639	'owner': group.user.username,
	2640	}
	2641	return data
	2642
	2643
	2644	class Permission(Base, BaseModel):
	2645	__tablename__ = 'permissions'
	2646	__table_args__ = (
	2647	Index('p_perm_name_idx', 'permission_name'),
	2648	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	2649	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	2650	)
	2651	PERMS = [
	2652	('hg.admin', _('RhodeCode Super Administrator')),
	2653
	2654	('repository.none', _('Repository no access')),
	2655	('repository.read', _('Repository read access')),
	2656	('repository.write', _('Repository write access')),
	2657	('repository.admin', _('Repository admin access')),
	2658
	2659	('group.none', _('Repository group no access')),
	2660	('group.read', _('Repository group read access')),
	2661	('group.write', _('Repository group write access')),
	2662	('group.admin', _('Repository group admin access')),
	2663
	2664	('usergroup.none', _('User group no access')),
	2665	('usergroup.read', _('User group read access')),
	2666	('usergroup.write', _('User group write access')),
	2667	('usergroup.admin', _('User group admin access')),
	2668
	2669	('branch.none', _('Branch no permissions')),
	2670	('branch.merge', _('Branch access by web merge')),
	2671	('branch.push', _('Branch access by push')),
	2672	('branch.push_force', _('Branch access by push with force')),
	2673
	2674	('hg.repogroup.create.false', _('Repository Group creation disabled')),
	2675	('hg.repogroup.create.true', _('Repository Group creation enabled')),
	2676
	2677	('hg.usergroup.create.false', _('User Group creation disabled')),
	2678	('hg.usergroup.create.true', _('User Group creation enabled')),
	2679
	2680	('hg.create.none', _('Repository creation disabled')),
	2681	('hg.create.repository', _('Repository creation enabled')),
	2682	('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')),
	2683	('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')),
	2684
	2685	('hg.fork.none', _('Repository forking disabled')),
	2686	('hg.fork.repository', _('Repository forking enabled')),
	2687
	2688	('hg.register.none', _('Registration disabled')),
	2689	('hg.register.manual_activate', _('User Registration with manual account activation')),
	2690	('hg.register.auto_activate', _('User Registration with automatic account activation')),
	2691
	2692	('hg.password_reset.enabled', _('Password reset enabled')),
	2693	('hg.password_reset.hidden', _('Password reset hidden')),
	2694	('hg.password_reset.disabled', _('Password reset disabled')),
	2695
	2696	('hg.extern_activate.manual', _('Manual activation of external account')),
	2697	('hg.extern_activate.auto', _('Automatic activation of external account')),
	2698
	2699	('hg.inherit_default_perms.false', _('Inherit object permissions from default user disabled')),
	2700	('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
	2701	]
	2702
	2703	# definition of system default permissions for DEFAULT user, created on
	2704	# system setup
	2705	DEFAULT_USER_PERMISSIONS = [
	2706	# object perms
	2707	'repository.read',
	2708	'group.read',
	2709	'usergroup.read',
	2710	# branch
	2711	'branch.push',
	2712	# global
	2713	'hg.create.repository',
	2714	'hg.repogroup.create.false',
	2715	'hg.usergroup.create.false',
	2716	'hg.create.write_on_repogroup.true',
	2717	'hg.fork.repository',
	2718	'hg.register.manual_activate',
	2719	'hg.password_reset.enabled',
	2720	'hg.extern_activate.auto',
	2721	'hg.inherit_default_perms.true',
	2722	]
	2723
	2724	# defines which permissions are more important higher the more important
	2725	# Weight defines which permissions are more important.
	2726	# The higher number the more important.
	2727	PERM_WEIGHTS = {
	2728	'repository.none': 0,
	2729	'repository.read': 1,
	2730	'repository.write': 3,
	2731	'repository.admin': 4,
	2732
	2733	'group.none': 0,
	2734	'group.read': 1,
	2735	'group.write': 3,
	2736	'group.admin': 4,
	2737
	2738	'usergroup.none': 0,
	2739	'usergroup.read': 1,
	2740	'usergroup.write': 3,
	2741	'usergroup.admin': 4,
	2742
	2743	'branch.none': 0,
	2744	'branch.merge': 1,
	2745	'branch.push': 3,
	2746	'branch.push_force': 4,
	2747
	2748	'hg.repogroup.create.false': 0,
	2749	'hg.repogroup.create.true': 1,
	2750
	2751	'hg.usergroup.create.false': 0,
	2752	'hg.usergroup.create.true': 1,
	2753
	2754	'hg.fork.none': 0,
	2755	'hg.fork.repository': 1,
	2756	'hg.create.none': 0,
	2757	'hg.create.repository': 1
	2758	}
	2759
	2760	permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	2761	permission_name = Column("permission_name", String(255), nullable=True, unique=None, default=None)
	2762	permission_longname = Column("permission_longname", String(255), nullable=True, unique=None, default=None)
	2763
	2764	def __unicode__(self):
	2765	return u"<%s('%s:%s')>" % (
	2766	self.__class__.__name__, self.permission_id, self.permission_name
	2767	)
	2768
	2769	@classmethod
	2770	def get_by_key(cls, key):
	2771	return cls.query().filter(cls.permission_name == key).scalar()
	2772
	2773	@classmethod
	2774	def get_default_repo_perms(cls, user_id, repo_id=None):
	2775	q = Session().query(UserRepoToPerm, Repository, Permission)\
	2776	.join((Permission, UserRepoToPerm.permission_id == Permission.permission_id))\
	2777	.join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
	2778	.filter(UserRepoToPerm.user_id == user_id)
	2779	if repo_id:
	2780	q = q.filter(UserRepoToPerm.repository_id == repo_id)
	2781	return q.all()
	2782
	2783	@classmethod
	2784	def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
	2785	q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
	2786	.join(
	2787	Permission,
	2788	UserGroupRepoToPerm.permission_id == Permission.permission_id)\
	2789	.join(
	2790	Repository,
	2791	UserGroupRepoToPerm.repository_id == Repository.repo_id)\
	2792	.join(
	2793	UserGroup,
	2794	UserGroupRepoToPerm.users_group_id ==
	2795	UserGroup.users_group_id)\
	2796	.join(
	2797	UserGroupMember,
	2798	UserGroupRepoToPerm.users_group_id ==
	2799	UserGroupMember.users_group_id)\
	2800	.filter(
	2801	UserGroupMember.user_id == user_id,
	2802	UserGroup.users_group_active == true())
	2803	if repo_id:
	2804	q = q.filter(UserGroupRepoToPerm.repository_id == repo_id)
	2805	return q.all()
	2806
	2807	@classmethod
	2808	def get_default_group_perms(cls, user_id, repo_group_id=None):
	2809	q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
	2810	.join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\
	2811	.join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
	2812	.filter(UserRepoGroupToPerm.user_id == user_id)
	2813	if repo_group_id:
	2814	q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
	2815	return q.all()
	2816
	2817	@classmethod
	2818	def get_default_group_perms_from_user_group(
	2819	cls, user_id, repo_group_id=None):
	2820	q = Session().query(UserGroupRepoGroupToPerm, RepoGroup, Permission)\
	2821	.join(
	2822	Permission,
	2823	UserGroupRepoGroupToPerm.permission_id ==
	2824	Permission.permission_id)\
	2825	.join(
	2826	RepoGroup,
	2827	UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)\
	2828	.join(
	2829	UserGroup,
	2830	UserGroupRepoGroupToPerm.users_group_id ==
	2831	UserGroup.users_group_id)\
	2832	.join(
	2833	UserGroupMember,
	2834	UserGroupRepoGroupToPerm.users_group_id ==
	2835	UserGroupMember.users_group_id)\
	2836	.filter(
	2837	UserGroupMember.user_id == user_id,
	2838	UserGroup.users_group_active == true())
	2839	if repo_group_id:
	2840	q = q.filter(UserGroupRepoGroupToPerm.group_id == repo_group_id)
	2841	return q.all()
	2842
	2843	@classmethod
	2844	def get_default_user_group_perms(cls, user_id, user_group_id=None):
	2845	q = Session().query(UserUserGroupToPerm, UserGroup, Permission)\
	2846	.join((Permission, UserUserGroupToPerm.permission_id == Permission.permission_id))\
	2847	.join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\
	2848	.filter(UserUserGroupToPerm.user_id == user_id)
	2849	if user_group_id:
	2850	q = q.filter(UserUserGroupToPerm.user_group_id == user_group_id)
	2851	return q.all()
	2852
	2853	@classmethod
	2854	def get_default_user_group_perms_from_user_group(
	2855	cls, user_id, user_group_id=None):
	2856	TargetUserGroup = aliased(UserGroup, name='target_user_group')
	2857	q = Session().query(UserGroupUserGroupToPerm, UserGroup, Permission)\
	2858	.join(
	2859	Permission,
	2860	UserGroupUserGroupToPerm.permission_id ==
	2861	Permission.permission_id)\
	2862	.join(
	2863	TargetUserGroup,
	2864	UserGroupUserGroupToPerm.target_user_group_id ==
	2865	TargetUserGroup.users_group_id)\
	2866	.join(
	2867	UserGroup,
	2868	UserGroupUserGroupToPerm.user_group_id ==
	2869	UserGroup.users_group_id)\
	2870	.join(
	2871	UserGroupMember,
	2872	UserGroupUserGroupToPerm.user_group_id ==
	2873	UserGroupMember.users_group_id)\
	2874	.filter(
	2875	UserGroupMember.user_id == user_id,
	2876	UserGroup.users_group_active == true())
	2877	if user_group_id:
	2878	q = q.filter(
	2879	UserGroupUserGroupToPerm.user_group_id == user_group_id)
	2880
	2881	return q.all()
	2882
	2883
	2884	class UserRepoToPerm(Base, BaseModel):
	2885	__tablename__ = 'repo_to_perm'
	2886	__table_args__ = (
	2887	UniqueConstraint('user_id', 'repository_id', 'permission_id'),
	2888	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	2889	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	2890	)
	2891	repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	2892	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
	2893	permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	2894	repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
	2895
	2896	user = relationship('User')
	2897	repository = relationship('Repository')
	2898	permission = relationship('Permission')
	2899
	2900	branch_perm_entry = relationship('UserToRepoBranchPermission', cascade="all, delete, delete-orphan", lazy='joined')
	2901
	2902	@classmethod
	2903	def create(cls, user, repository, permission):
	2904	n = cls()
	2905	n.user = user
	2906	n.repository = repository
	2907	n.permission = permission
	2908	Session().add(n)
	2909	return n
	2910
	2911	def __unicode__(self):
	2912	return u'<%s => %s >' % (self.user, self.repository)
	2913
	2914
	2915	class UserUserGroupToPerm(Base, BaseModel):
	2916	__tablename__ = 'user_user_group_to_perm'
	2917	__table_args__ = (
	2918	UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
	2919	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	2920	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	2921	)
	2922	user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	2923	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
	2924	permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	2925	user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
	2926
	2927	user = relationship('User')
	2928	user_group = relationship('UserGroup')
	2929	permission = relationship('Permission')
	2930
	2931	@classmethod
	2932	def create(cls, user, user_group, permission):
	2933	n = cls()
	2934	n.user = user
	2935	n.user_group = user_group
	2936	n.permission = permission
	2937	Session().add(n)
	2938	return n
	2939
	2940	def __unicode__(self):
	2941	return u'<%s => %s >' % (self.user, self.user_group)
	2942
	2943
	2944	class UserToPerm(Base, BaseModel):
	2945	__tablename__ = 'user_to_perm'
	2946	__table_args__ = (
	2947	UniqueConstraint('user_id', 'permission_id'),
	2948	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	2949	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	2950	)
	2951	user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	2952	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
	2953	permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	2954
	2955	user = relationship('User')
	2956	permission = relationship('Permission', lazy='joined')
	2957
	2958	def __unicode__(self):
	2959	return u'<%s => %s >' % (self.user, self.permission)
	2960
	2961
	2962	class UserGroupRepoToPerm(Base, BaseModel):
	2963	__tablename__ = 'users_group_repo_to_perm'
	2964	__table_args__ = (
	2965	UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
	2966	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	2967	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	2968	)
	2969	users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	2970	users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
	2971	permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	2972	repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
	2973
	2974	users_group = relationship('UserGroup')
	2975	permission = relationship('Permission')
	2976	repository = relationship('Repository')
	2977
	2978	@classmethod
	2979	def create(cls, users_group, repository, permission):
	2980	n = cls()
	2981	n.users_group = users_group
	2982	n.repository = repository
	2983	n.permission = permission
	2984	Session().add(n)
	2985	return n
	2986
	2987	def __unicode__(self):
	2988	return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
	2989
	2990
	2991	class UserGroupUserGroupToPerm(Base, BaseModel):
	2992	__tablename__ = 'user_group_user_group_to_perm'
	2993	__table_args__ = (
	2994	UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
	2995	CheckConstraint('target_user_group_id != user_group_id'),
	2996	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	2997	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	2998	)
	2999	user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	3000	target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
	3001	permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	3002	user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
	3003
	3004	target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id')
	3005	user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id')
	3006	permission = relationship('Permission')
	3007
	3008	@classmethod
	3009	def create(cls, target_user_group, user_group, permission):
	3010	n = cls()
	3011	n.target_user_group = target_user_group
	3012	n.user_group = user_group
	3013	n.permission = permission
	3014	Session().add(n)
	3015	return n
	3016
	3017	def __unicode__(self):
	3018	return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
	3019
	3020
	3021	class UserGroupToPerm(Base, BaseModel):
	3022	__tablename__ = 'users_group_to_perm'
	3023	__table_args__ = (
	3024	UniqueConstraint('users_group_id', 'permission_id',),
	3025	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3026	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	3027	)
	3028	users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	3029	users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
	3030	permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	3031
	3032	users_group = relationship('UserGroup')
	3033	permission = relationship('Permission')
	3034
	3035
	3036	class UserRepoGroupToPerm(Base, BaseModel):
	3037	__tablename__ = 'user_repo_group_to_perm'
	3038	__table_args__ = (
	3039	UniqueConstraint('user_id', 'group_id', 'permission_id'),
	3040	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3041	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	3042	)
	3043
	3044	group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	3045	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
	3046	group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
	3047	permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	3048
	3049	user = relationship('User')
	3050	group = relationship('RepoGroup')
	3051	permission = relationship('Permission')
	3052
	3053	@classmethod
	3054	def create(cls, user, repository_group, permission):
	3055	n = cls()
	3056	n.user = user
	3057	n.group = repository_group
	3058	n.permission = permission
	3059	Session().add(n)
	3060	return n
	3061
	3062
	3063	class UserGroupRepoGroupToPerm(Base, BaseModel):
	3064	__tablename__ = 'users_group_repo_group_to_perm'
	3065	__table_args__ = (
	3066	UniqueConstraint('users_group_id', 'group_id'),
	3067	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3068	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	3069	)
	3070
	3071	users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	3072	users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
	3073	group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
	3074	permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	3075
	3076	users_group = relationship('UserGroup')
	3077	permission = relationship('Permission')
	3078	group = relationship('RepoGroup')
	3079
	3080	@classmethod
	3081	def create(cls, user_group, repository_group, permission):
	3082	n = cls()
	3083	n.users_group = user_group
	3084	n.group = repository_group
	3085	n.permission = permission
	3086	Session().add(n)
	3087	return n
	3088
	3089	def __unicode__(self):
	3090	return u'<UserGroupRepoGroupToPerm:%s => %s >' % (self.users_group, self.group)
	3091
	3092
	3093	class Statistics(Base, BaseModel):
	3094	__tablename__ = 'statistics'
	3095	__table_args__ = (
	3096	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3097	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	3098	)
	3099	stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	3100	repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
	3101	stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
	3102	commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
	3103	commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
	3104	languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
	3105
	3106	repository = relationship('Repository', single_parent=True)
	3107
	3108
	3109	class UserFollowing(Base, BaseModel):
	3110	__tablename__ = 'user_followings'
	3111	__table_args__ = (
	3112	UniqueConstraint('user_id', 'follows_repository_id'),
	3113	UniqueConstraint('user_id', 'follows_user_id'),
	3114	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3115	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	3116	)
	3117
	3118	user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	3119	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
	3120	follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
	3121	follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
	3122	follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
	3123
	3124	user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
	3125
	3126	follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
	3127	follows_repository = relationship('Repository', order_by='Repository.repo_name')
	3128
	3129	@classmethod
	3130	def get_repo_followers(cls, repo_id):
	3131	return cls.query().filter(cls.follows_repo_id == repo_id)
	3132
	3133
	3134	class CacheKey(Base, BaseModel):
	3135	__tablename__ = 'cache_invalidation'
	3136	__table_args__ = (
	3137	UniqueConstraint('cache_key'),
	3138	Index('key_idx', 'cache_key'),
	3139	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3140	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	3141	)
	3142	CACHE_TYPE_ATOM = 'ATOM'
	3143	CACHE_TYPE_RSS = 'RSS'
	3144	CACHE_TYPE_README = 'README'
	3145
	3146	cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
	3147	cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
	3148	cache_args = Column("cache_args", String(255), nullable=True, unique=None, default=None)
	3149	cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
	3150
	3151	def __init__(self, cache_key, cache_args=''):
	3152	self.cache_key = cache_key
	3153	self.cache_args = cache_args
	3154	self.cache_active = False
	3155
	3156	def __unicode__(self):
	3157	return u"<%s('%s:%s[%s]')>" % (
	3158	self.__class__.__name__,
	3159	self.cache_id, self.cache_key, self.cache_active)
	3160
	3161	def _cache_key_partition(self):
	3162	prefix, repo_name, suffix = self.cache_key.partition(self.cache_args)
	3163	return prefix, repo_name, suffix
	3164
	3165	def get_prefix(self):
	3166	"""
	3167	Try to extract prefix from existing cache key. The key could consist
	3168	of prefix, repo_name, suffix
	3169	"""
	3170	# this returns prefix, repo_name, suffix
	3171	return self._cache_key_partition()[0]
	3172
	3173	def get_suffix(self):
	3174	"""
	3175	get suffix that might have been used in _get_cache_key to
	3176	generate self.cache_key. Only used for informational purposes
	3177	in repo_edit.mako.
	3178	"""
	3179	# prefix, repo_name, suffix
	3180	return self._cache_key_partition()[2]
	3181
	3182	@classmethod
	3183	def delete_all_cache(cls):
	3184	"""
	3185	Delete all cache keys from database.
	3186	Should only be run when all instances are down and all entries
	3187	thus stale.
	3188	"""
	3189	cls.query().delete()
	3190	Session().commit()
	3191
	3192	@classmethod
	3193	def get_cache_key(cls, repo_name, cache_type):
	3194	"""
	3195
	3196	Generate a cache key for this process of RhodeCode instance.
	3197	Prefix most likely will be process id or maybe explicitly set
	3198	instance_id from .ini file.
	3199	"""
	3200	import rhodecode
	3201	prefix = safe_unicode(rhodecode.CONFIG.get('instance_id') or '')
	3202
	3203	repo_as_unicode = safe_unicode(repo_name)
	3204	key = u'{}_{}'.format(repo_as_unicode, cache_type) \
	3205	if cache_type else repo_as_unicode
	3206
	3207	return u'{}{}'.format(prefix, key)
	3208
	3209	@classmethod
	3210	def set_invalidate(cls, repo_name, delete=False):
	3211	"""
	3212	Mark all caches of a repo as invalid in the database.
	3213	"""
	3214
	3215	try:
	3216	qry = Session().query(cls).filter(cls.cache_args == repo_name)
	3217	if delete:
	3218	log.debug('cache objects deleted for repo %s',
	3219	safe_str(repo_name))
	3220	qry.delete()
	3221	else:
	3222	log.debug('cache objects marked as invalid for repo %s',
	3223	safe_str(repo_name))
	3224	qry.update({"cache_active": False})
	3225
	3226	Session().commit()
	3227	except Exception:
	3228	log.exception(
	3229	'Cache key invalidation failed for repository %s',
	3230	safe_str(repo_name))
	3231	Session().rollback()
	3232
	3233	@classmethod
	3234	def get_active_cache(cls, cache_key):
	3235	inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
	3236	if inv_obj:
	3237	return inv_obj
	3238	return None
	3239
	3240
	3241	class ChangesetComment(Base, BaseModel):
	3242	__tablename__ = 'changeset_comments'
	3243	__table_args__ = (
	3244	Index('cc_revision_idx', 'revision'),
	3245	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3246	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	3247	)
	3248
	3249	COMMENT_OUTDATED = u'comment_outdated'
	3250	COMMENT_TYPE_NOTE = u'note'
	3251	COMMENT_TYPE_TODO = u'todo'
	3252	COMMENT_TYPES = [COMMENT_TYPE_NOTE, COMMENT_TYPE_TODO]
	3253
	3254	comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
	3255	repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
	3256	revision = Column('revision', String(40), nullable=True)
	3257	pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
	3258	pull_request_version_id = Column("pull_request_version_id", Integer(), ForeignKey('pull_request_versions.pull_request_version_id'), nullable=True)
	3259	line_no = Column('line_no', Unicode(10), nullable=True)
	3260	hl_lines = Column('hl_lines', Unicode(512), nullable=True)
	3261	f_path = Column('f_path', Unicode(1000), nullable=True)
	3262	user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
	3263	text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
	3264	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	3265	modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	3266	renderer = Column('renderer', Unicode(64), nullable=True)
	3267	display_state = Column('display_state', Unicode(128), nullable=True)
	3268
	3269	comment_type = Column('comment_type', Unicode(128), nullable=True, default=COMMENT_TYPE_NOTE)
	3270	resolved_comment_id = Column('resolved_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'), nullable=True)
	3271	resolved_comment = relationship('ChangesetComment', remote_side=comment_id, backref='resolved_by')
	3272	author = relationship('User', lazy='joined')
	3273	repo = relationship('Repository')
	3274	status_change = relationship('ChangesetStatus', cascade="all, delete, delete-orphan", lazy='joined')
	3275	pull_request = relationship('PullRequest', lazy='joined')
	3276	pull_request_version = relationship('PullRequestVersion')
	3277
	3278	@classmethod
	3279	def get_users(cls, revision=None, pull_request_id=None):
	3280	"""
	3281	Returns user associated with this ChangesetComment. ie those
	3282	who actually commented
	3283
	3284	:param cls:
	3285	:param revision:
	3286	"""
	3287	q = Session().query(User)\
	3288	.join(ChangesetComment.author)
	3289	if revision:
	3290	q = q.filter(cls.revision == revision)
	3291	elif pull_request_id:
	3292	q = q.filter(cls.pull_request_id == pull_request_id)
	3293	return q.all()
	3294
	3295	@classmethod
	3296	def get_index_from_version(cls, pr_version, versions):
	3297	num_versions = [x.pull_request_version_id for x in versions]
	3298	try:
	3299	return num_versions.index(pr_version) +1
	3300	except (IndexError, ValueError):
	3301	return
	3302
	3303	@property
	3304	def outdated(self):
	3305	return self.display_state == self.COMMENT_OUTDATED
	3306
	3307	def outdated_at_version(self, version):
	3308	"""
	3309	Checks if comment is outdated for given pull request version
	3310	"""
	3311	return self.outdated and self.pull_request_version_id != version
	3312
	3313	def older_than_version(self, version):
	3314	"""
	3315	Checks if comment is made from previous version than given
	3316	"""
	3317	if version is None:
	3318	return self.pull_request_version_id is not None
	3319
	3320	return self.pull_request_version_id < version
	3321
	3322	@property
	3323	def resolved(self):
	3324	return self.resolved_by[0] if self.resolved_by else None
	3325
	3326	@property
	3327	def is_todo(self):
	3328	return self.comment_type == self.COMMENT_TYPE_TODO
	3329
	3330	@property
	3331	def is_inline(self):
	3332	return self.line_no and self.f_path
	3333
	3334	def get_index_version(self, versions):
	3335	return self.get_index_from_version(
	3336	self.pull_request_version_id, versions)
	3337
	3338	def __repr__(self):
	3339	if self.comment_id:
	3340	return '<DB:Comment #%s>' % self.comment_id
	3341	else:
	3342	return '<DB:Comment at %#x>' % id(self)
	3343
	3344	def get_api_data(self):
	3345	comment = self
	3346	data = {
	3347	'comment_id': comment.comment_id,
	3348	'comment_type': comment.comment_type,
	3349	'comment_text': comment.text,
	3350	'comment_status': comment.status_change,
	3351	'comment_f_path': comment.f_path,
	3352	'comment_lineno': comment.line_no,
	3353	'comment_author': comment.author,
	3354	'comment_created_on': comment.created_on
	3355	}
	3356	return data
	3357
	3358	def __json__(self):
	3359	data = dict()
	3360	data.update(self.get_api_data())
	3361	return data
	3362
	3363
	3364	class ChangesetStatus(Base, BaseModel):
	3365	__tablename__ = 'changeset_statuses'
	3366	__table_args__ = (
	3367	Index('cs_revision_idx', 'revision'),
	3368	Index('cs_version_idx', 'version'),
	3369	UniqueConstraint('repo_id', 'revision', 'version'),
	3370	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3371	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	3372	)
	3373	STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
	3374	STATUS_APPROVED = 'approved'
	3375	STATUS_REJECTED = 'rejected'
	3376	STATUS_UNDER_REVIEW = 'under_review'
	3377
	3378	STATUSES = [
	3379	(STATUS_NOT_REVIEWED, _("Not Reviewed")), # (no icon) and default
	3380	(STATUS_APPROVED, _("Approved")),
	3381	(STATUS_REJECTED, _("Rejected")),
	3382	(STATUS_UNDER_REVIEW, _("Under Review")),
	3383	]
	3384
	3385	changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
	3386	repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
	3387	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
	3388	revision = Column('revision', String(40), nullable=False)
	3389	status = Column('status', String(128), nullable=False, default=DEFAULT)
	3390	changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
	3391	modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
	3392	version = Column('version', Integer(), nullable=False, default=0)
	3393	pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
	3394
	3395	author = relationship('User', lazy='joined')
	3396	repo = relationship('Repository')
	3397	comment = relationship('ChangesetComment', lazy='joined')
	3398	pull_request = relationship('PullRequest', lazy='joined')
	3399
	3400	def __unicode__(self):
	3401	return u"<%s('%s[v%s]:%s')>" % (
	3402	self.__class__.__name__,
	3403	self.status, self.version, self.author
	3404	)
	3405
	3406	@classmethod
	3407	def get_status_lbl(cls, value):
	3408	return dict(cls.STATUSES).get(value)
	3409
	3410	@property
	3411	def status_lbl(self):
	3412	return ChangesetStatus.get_status_lbl(self.status)
	3413
	3414	def get_api_data(self):
	3415	status = self
	3416	data = {
	3417	'status_id': status.changeset_status_id,
	3418	'status': status.status,
	3419	}
	3420	return data
	3421
	3422	def __json__(self):
	3423	data = dict()
	3424	data.update(self.get_api_data())
	3425	return data
	3426
	3427
	3428	class _PullRequestBase(BaseModel):
	3429	"""
	3430	Common attributes of pull request and version entries.
	3431	"""
	3432
	3433	# .status values
	3434	STATUS_NEW = u'new'
	3435	STATUS_OPEN = u'open'
	3436	STATUS_CLOSED = u'closed'
	3437
	3438	title = Column('title', Unicode(255), nullable=True)
	3439	description = Column(
	3440	'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
	3441	nullable=True)
	3442	# new/open/closed status of pull request (not approve/reject/etc)
	3443	status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
	3444	created_on = Column(
	3445	'created_on', DateTime(timezone=False), nullable=False,
	3446	default=datetime.datetime.now)
	3447	updated_on = Column(
	3448	'updated_on', DateTime(timezone=False), nullable=False,
	3449	default=datetime.datetime.now)
	3450
	3451	@declared_attr
	3452	def user_id(cls):
	3453	return Column(
	3454	"user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
	3455	unique=None)
	3456
	3457	# 500 revisions max
	3458	_revisions = Column(
	3459	'revisions', UnicodeText().with_variant(UnicodeText(20500), 'mysql'))
	3460
	3461	@declared_attr
	3462	def source_repo_id(cls):
	3463	# TODO: dan: rename column to source_repo_id
	3464	return Column(
	3465	'org_repo_id', Integer(), ForeignKey('repositories.repo_id'),
	3466	nullable=False)
	3467
	3468	source_ref = Column('org_ref', Unicode(255), nullable=False)
	3469
	3470	@declared_attr
	3471	def target_repo_id(cls):
	3472	# TODO: dan: rename column to target_repo_id
	3473	return Column(
	3474	'other_repo_id', Integer(), ForeignKey('repositories.repo_id'),
	3475	nullable=False)
	3476
	3477	target_ref = Column('other_ref', Unicode(255), nullable=False)
	3478	_shadow_merge_ref = Column('shadow_merge_ref', Unicode(255), nullable=True)
	3479
	3480	# TODO: dan: rename column to last_merge_source_rev
	3481	_last_merge_source_rev = Column(
	3482	'last_merge_org_rev', String(40), nullable=True)
	3483	# TODO: dan: rename column to last_merge_target_rev
	3484	_last_merge_target_rev = Column(
	3485	'last_merge_other_rev', String(40), nullable=True)
	3486	_last_merge_status = Column('merge_status', Integer(), nullable=True)
	3487	merge_rev = Column('merge_rev', String(40), nullable=True)
	3488
	3489	reviewer_data = Column(
	3490	'reviewer_data_json', MutationObj.as_mutable(
	3491	JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
	3492
	3493	@property
	3494	def reviewer_data_json(self):
	3495	return json.dumps(self.reviewer_data)
	3496
	3497	@hybrid_property
	3498	def description_safe(self):
	3499	from rhodecode.lib import helpers as h
	3500	return h.escape(self.description)
	3501
	3502	@hybrid_property
	3503	def revisions(self):
	3504	return self._revisions.split(':') if self._revisions else []
	3505
	3506	@revisions.setter
	3507	def revisions(self, val):
	3508	self._revisions = ':'.join(val)
	3509
	3510	@hybrid_property
	3511	def last_merge_status(self):
	3512	return safe_int(self._last_merge_status)
	3513
	3514	@last_merge_status.setter
	3515	def last_merge_status(self, val):
	3516	self._last_merge_status = val
	3517
	3518	@declared_attr
	3519	def author(cls):
	3520	return relationship('User', lazy='joined')
	3521
	3522	@declared_attr
	3523	def source_repo(cls):
	3524	return relationship(
	3525	'Repository',
	3526	primaryjoin='%s.source_repo_id==Repository.repo_id' % cls.__name__)
	3527
	3528	@property
	3529	def source_ref_parts(self):
	3530	return self.unicode_to_reference(self.source_ref)
	3531
	3532	@declared_attr
	3533	def target_repo(cls):
	3534	return relationship(
	3535	'Repository',
	3536	primaryjoin='%s.target_repo_id==Repository.repo_id' % cls.__name__)
	3537
	3538	@property
	3539	def target_ref_parts(self):
	3540	return self.unicode_to_reference(self.target_ref)
	3541
	3542	@property
	3543	def shadow_merge_ref(self):
	3544	return self.unicode_to_reference(self._shadow_merge_ref)
	3545
	3546	@shadow_merge_ref.setter
	3547	def shadow_merge_ref(self, ref):
	3548	self._shadow_merge_ref = self.reference_to_unicode(ref)
	3549
	3550	def unicode_to_reference(self, raw):
	3551	"""
	3552	Convert a unicode (or string) to a reference object.
	3553	If unicode evaluates to False it returns None.
	3554	"""
	3555	if raw:
	3556	refs = raw.split(':')
	3557	return Reference(*refs)
	3558	else:
	3559	return None
	3560
	3561	def reference_to_unicode(self, ref):
	3562	"""
	3563	Convert a reference object to unicode.
	3564	If reference is None it returns None.
	3565	"""
	3566	if ref:
	3567	return u':'.join(ref)
	3568	else:
	3569	return None
	3570
	3571	def get_api_data(self, with_merge_state=True):
	3572	from rhodecode.model.pull_request import PullRequestModel
	3573
	3574	pull_request = self
	3575	if with_merge_state:
	3576	merge_status = PullRequestModel().merge_status(pull_request)
	3577	merge_state = {
	3578	'status': merge_status[0],
	3579	'message': safe_unicode(merge_status[1]),
	3580	}
	3581	else:
	3582	merge_state = {'status': 'not_available',
	3583	'message': 'not_available'}
	3584
	3585	merge_data = {
	3586	'clone_url': PullRequestModel().get_shadow_clone_url(pull_request),
	3587	'reference': (
	3588	pull_request.shadow_merge_ref._asdict()
	3589	if pull_request.shadow_merge_ref else None),
	3590	}
	3591
	3592	data = {
	3593	'pull_request_id': pull_request.pull_request_id,
	3594	'url': PullRequestModel().get_url(pull_request),
	3595	'title': pull_request.title,
	3596	'description': pull_request.description,
	3597	'status': pull_request.status,
	3598	'created_on': pull_request.created_on,
	3599	'updated_on': pull_request.updated_on,
	3600	'commit_ids': pull_request.revisions,
	3601	'review_status': pull_request.calculated_review_status(),
	3602	'mergeable': merge_state,
	3603	'source': {
	3604	'clone_url': pull_request.source_repo.clone_url(),
	3605	'repository': pull_request.source_repo.repo_name,
	3606	'reference': {
	3607	'name': pull_request.source_ref_parts.name,
	3608	'type': pull_request.source_ref_parts.type,
	3609	'commit_id': pull_request.source_ref_parts.commit_id,
	3610	},
	3611	},
	3612	'target': {
	3613	'clone_url': pull_request.target_repo.clone_url(),
	3614	'repository': pull_request.target_repo.repo_name,
	3615	'reference': {
	3616	'name': pull_request.target_ref_parts.name,
	3617	'type': pull_request.target_ref_parts.type,
	3618	'commit_id': pull_request.target_ref_parts.commit_id,
	3619	},
	3620	},
	3621	'merge': merge_data,
	3622	'author': pull_request.author.get_api_data(include_secrets=False,
	3623	details='basic'),
	3624	'reviewers': [
	3625	{
	3626	'user': reviewer.get_api_data(include_secrets=False,
	3627	details='basic'),
	3628	'reasons': reasons,
	3629	'review_status': st[0][1].status if st else 'not_reviewed',
	3630	}
	3631	for obj, reviewer, reasons, mandatory, st in
	3632	pull_request.reviewers_statuses()
	3633	]
	3634	}
	3635
	3636	return data
	3637
	3638
	3639	class PullRequest(Base, _PullRequestBase):
	3640	__tablename__ = 'pull_requests'
	3641	__table_args__ = (
	3642	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3643	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	3644	)
	3645
	3646	pull_request_id = Column(
	3647	'pull_request_id', Integer(), nullable=False, primary_key=True)
	3648
	3649	def __repr__(self):
	3650	if self.pull_request_id:
	3651	return '<DB:PullRequest #%s>' % self.pull_request_id
	3652	else:
	3653	return '<DB:PullRequest at %#x>' % id(self)
	3654
	3655	reviewers = relationship('PullRequestReviewers',
	3656	cascade="all, delete, delete-orphan")
	3657	statuses = relationship('ChangesetStatus',
	3658	cascade="all, delete, delete-orphan")
	3659	comments = relationship('ChangesetComment',
	3660	cascade="all, delete, delete-orphan")
	3661	versions = relationship('PullRequestVersion',
	3662	cascade="all, delete, delete-orphan",
	3663	lazy='dynamic')
	3664
	3665	@classmethod
	3666	def get_pr_display_object(cls, pull_request_obj, org_pull_request_obj,
	3667	internal_methods=None):
	3668
	3669	class PullRequestDisplay(object):
	3670	"""
	3671	Special object wrapper for showing PullRequest data via Versions
	3672	It mimics PR object as close as possible. This is read only object
	3673	just for display
	3674	"""
	3675
	3676	def __init__(self, attrs, internal=None):
	3677	self.attrs = attrs
	3678	# internal have priority over the given ones via attrs
	3679	self.internal = internal or ['versions']
	3680
	3681	def __getattr__(self, item):
	3682	if item in self.internal:
	3683	return getattr(self, item)
	3684	try:
	3685	return self.attrs[item]
	3686	except KeyError:
	3687	raise AttributeError(
	3688	'%s object has no attribute %s' % (self, item))
	3689
	3690	def __repr__(self):
	3691	return '<DB:PullRequestDisplay #%s>' % self.attrs.get('pull_request_id')
	3692
	3693	def versions(self):
	3694	return pull_request_obj.versions.order_by(
	3695	PullRequestVersion.pull_request_version_id).all()
	3696
	3697	def is_closed(self):
	3698	return pull_request_obj.is_closed()
	3699
	3700	@property
	3701	def pull_request_version_id(self):
	3702	return getattr(pull_request_obj, 'pull_request_version_id', None)
	3703
	3704	attrs = StrictAttributeDict(pull_request_obj.get_api_data())
	3705
	3706	attrs.author = StrictAttributeDict(
	3707	pull_request_obj.author.get_api_data())
	3708	if pull_request_obj.target_repo:
	3709	attrs.target_repo = StrictAttributeDict(
	3710	pull_request_obj.target_repo.get_api_data())
	3711	attrs.target_repo.clone_url = pull_request_obj.target_repo.clone_url
	3712
	3713	if pull_request_obj.source_repo:
	3714	attrs.source_repo = StrictAttributeDict(
	3715	pull_request_obj.source_repo.get_api_data())
	3716	attrs.source_repo.clone_url = pull_request_obj.source_repo.clone_url
	3717
	3718	attrs.source_ref_parts = pull_request_obj.source_ref_parts
	3719	attrs.target_ref_parts = pull_request_obj.target_ref_parts
	3720	attrs.revisions = pull_request_obj.revisions
	3721
	3722	attrs.shadow_merge_ref = org_pull_request_obj.shadow_merge_ref
	3723	attrs.reviewer_data = org_pull_request_obj.reviewer_data
	3724	attrs.reviewer_data_json = org_pull_request_obj.reviewer_data_json
	3725
	3726	return PullRequestDisplay(attrs, internal=internal_methods)
	3727
	3728	def is_closed(self):
	3729	return self.status == self.STATUS_CLOSED
	3730
	3731	def __json__(self):
	3732	return {
	3733	'revisions': self.revisions,
	3734	}
	3735
	3736	def calculated_review_status(self):
	3737	from rhodecode.model.changeset_status import ChangesetStatusModel
	3738	return ChangesetStatusModel().calculated_review_status(self)
	3739
	3740	def reviewers_statuses(self):
	3741	from rhodecode.model.changeset_status import ChangesetStatusModel
	3742	return ChangesetStatusModel().reviewers_statuses(self)
	3743
	3744	@property
	3745	def workspace_id(self):
	3746	from rhodecode.model.pull_request import PullRequestModel
	3747	return PullRequestModel()._workspace_id(self)
	3748
	3749	def get_shadow_repo(self):
	3750	workspace_id = self.workspace_id
	3751	vcs_obj = self.target_repo.scm_instance()
	3752	shadow_repository_path = vcs_obj._get_shadow_repository_path(
	3753	workspace_id)
	3754	return vcs_obj._get_shadow_instance(shadow_repository_path)
	3755
	3756
	3757	class PullRequestVersion(Base, _PullRequestBase):
	3758	__tablename__ = 'pull_request_versions'
	3759	__table_args__ = (
	3760	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3761	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	3762	)
	3763
	3764	pull_request_version_id = Column(
	3765	'pull_request_version_id', Integer(), nullable=False, primary_key=True)
	3766	pull_request_id = Column(
	3767	'pull_request_id', Integer(),
	3768	ForeignKey('pull_requests.pull_request_id'), nullable=False)
	3769	pull_request = relationship('PullRequest')
	3770
	3771	def __repr__(self):
	3772	if self.pull_request_version_id:
	3773	return '<DB:PullRequestVersion #%s>' % self.pull_request_version_id
	3774	else:
	3775	return '<DB:PullRequestVersion at %#x>' % id(self)
	3776
	3777	@property
	3778	def reviewers(self):
	3779	return self.pull_request.reviewers
	3780
	3781	@property
	3782	def versions(self):
	3783	return self.pull_request.versions
	3784
	3785	def is_closed(self):
	3786	# calculate from original
	3787	return self.pull_request.status == self.STATUS_CLOSED
	3788
	3789	def calculated_review_status(self):
	3790	return self.pull_request.calculated_review_status()
	3791
	3792	def reviewers_statuses(self):
	3793	return self.pull_request.reviewers_statuses()
	3794
	3795
	3796	class PullRequestReviewers(Base, BaseModel):
	3797	__tablename__ = 'pull_request_reviewers'
	3798	__table_args__ = (
	3799	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3800	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	3801	)
	3802
	3803	@hybrid_property
	3804	def reasons(self):
	3805	if not self._reasons:
	3806	return []
	3807	return self._reasons
	3808
	3809	@reasons.setter
	3810	def reasons(self, val):
	3811	val = val or []
	3812	if any(not isinstance(x, basestring) for x in val):
	3813	raise Exception('invalid reasons type, must be list of strings')
	3814	self._reasons = val
	3815
	3816	pull_requests_reviewers_id = Column(
	3817	'pull_requests_reviewers_id', Integer(), nullable=False,
	3818	primary_key=True)
	3819	pull_request_id = Column(
	3820	"pull_request_id", Integer(),
	3821	ForeignKey('pull_requests.pull_request_id'), nullable=False)
	3822	user_id = Column(
	3823	"user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
	3824	_reasons = Column(
	3825	'reason', MutationList.as_mutable(
	3826	JsonType('list', dialect_map=dict(mysql=UnicodeText(16384)))))
	3827
	3828	mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
	3829	user = relationship('User')
	3830	pull_request = relationship('PullRequest')
	3831
	3832	rule_data = Column(
	3833	'rule_data_json',
	3834	JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
	3835
	3836	def rule_user_group_data(self):
	3837	"""
	3838	Returns the voting user group rule data for this reviewer
	3839	"""
	3840
	3841	if self.rule_data and 'vote_rule' in self.rule_data:
	3842	user_group_data = {}
	3843	if 'rule_user_group_entry_id' in self.rule_data:
	3844	# means a group with voting rules !
	3845	user_group_data['id'] = self.rule_data['rule_user_group_entry_id']
	3846	user_group_data['name'] = self.rule_data['rule_name']
	3847	user_group_data['vote_rule'] = self.rule_data['vote_rule']
	3848
	3849	return user_group_data
	3850
	3851	def __unicode__(self):
	3852	return u"<%s('id:%s')>" % (self.__class__.__name__,
	3853	self.pull_requests_reviewers_id)
	3854
	3855
	3856	class Notification(Base, BaseModel):
	3857	__tablename__ = 'notifications'
	3858	__table_args__ = (
	3859	Index('notification_type_idx', 'type'),
	3860	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3861	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	3862	)
	3863
	3864	TYPE_CHANGESET_COMMENT = u'cs_comment'
	3865	TYPE_MESSAGE = u'message'
	3866	TYPE_MENTION = u'mention'
	3867	TYPE_REGISTRATION = u'registration'
	3868	TYPE_PULL_REQUEST = u'pull_request'
	3869	TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
	3870
	3871	notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
	3872	subject = Column('subject', Unicode(512), nullable=True)
	3873	body = Column('body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
	3874	created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
	3875	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	3876	type_ = Column('type', Unicode(255))
	3877
	3878	created_by_user = relationship('User')
	3879	notifications_to_users = relationship('UserNotification', lazy='joined',
	3880	cascade="all, delete, delete-orphan")
	3881
	3882	@property
	3883	def recipients(self):
	3884	return [x.user for x in UserNotification.query()\
	3885	.filter(UserNotification.notification == self)\
	3886	.order_by(UserNotification.user_id.asc()).all()]
	3887
	3888	@classmethod
	3889	def create(cls, created_by, subject, body, recipients, type_=None):
	3890	if type_ is None:
	3891	type_ = Notification.TYPE_MESSAGE
	3892
	3893	notification = cls()
	3894	notification.created_by_user = created_by
	3895	notification.subject = subject
	3896	notification.body = body
	3897	notification.type_ = type_
	3898	notification.created_on = datetime.datetime.now()
	3899
	3900	for u in recipients:
	3901	assoc = UserNotification()
	3902	assoc.notification = notification
	3903
	3904	# if created_by is inside recipients mark his notification
	3905	# as read
	3906	if u.user_id == created_by.user_id:
	3907	assoc.read = True
	3908
	3909	u.notifications.append(assoc)
	3910	Session().add(notification)
	3911
	3912	return notification
	3913
	3914
	3915	class UserNotification(Base, BaseModel):
	3916	__tablename__ = 'user_to_notification'
	3917	__table_args__ = (
	3918	UniqueConstraint('user_id', 'notification_id'),
	3919	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3920	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	3921	)
	3922	user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
	3923	notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
	3924	read = Column('read', Boolean, default=False)
	3925	sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
	3926
	3927	user = relationship('User', lazy="joined")
	3928	notification = relationship('Notification', lazy="joined",
	3929	order_by=lambda: Notification.created_on.desc(),)
	3930
	3931	def mark_as_read(self):
	3932	self.read = True
	3933	Session().add(self)
	3934
	3935
	3936	class Gist(Base, BaseModel):
	3937	__tablename__ = 'gists'
	3938	__table_args__ = (
	3939	Index('g_gist_access_id_idx', 'gist_access_id'),
	3940	Index('g_created_on_idx', 'created_on'),
	3941	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	3942	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	3943	)
	3944	GIST_PUBLIC = u'public'
	3945	GIST_PRIVATE = u'private'
	3946	DEFAULT_FILENAME = u'gistfile1.txt'
	3947
	3948	ACL_LEVEL_PUBLIC = u'acl_public'
	3949	ACL_LEVEL_PRIVATE = u'acl_private'
	3950
	3951	gist_id = Column('gist_id', Integer(), primary_key=True)
	3952	gist_access_id = Column('gist_access_id', Unicode(250))
	3953	gist_description = Column('gist_description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
	3954	gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True)
	3955	gist_expires = Column('gist_expires', Float(53), nullable=False)
	3956	gist_type = Column('gist_type', Unicode(128), nullable=False)
	3957	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	3958	modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	3959	acl_level = Column('acl_level', Unicode(128), nullable=True)
	3960
	3961	owner = relationship('User')
	3962
	3963	def __repr__(self):
	3964	return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
	3965
	3966	@hybrid_property
	3967	def description_safe(self):
	3968	from rhodecode.lib import helpers as h
	3969	return h.escape(self.gist_description)
	3970
	3971	@classmethod
	3972	def get_or_404(cls, id_):
	3973	from pyramid.httpexceptions import HTTPNotFound
	3974
	3975	res = cls.query().filter(cls.gist_access_id == id_).scalar()
	3976	if not res:
	3977	raise HTTPNotFound()
	3978	return res
	3979
	3980	@classmethod
	3981	def get_by_access_id(cls, gist_access_id):
	3982	return cls.query().filter(cls.gist_access_id == gist_access_id).scalar()
	3983
	3984	def gist_url(self):
	3985	from rhodecode.model.gist import GistModel
	3986	return GistModel().get_url(self)
	3987
	3988	@classmethod
	3989	def base_path(cls):
	3990	"""
	3991	Returns base path when all gists are stored
	3992
	3993	:param cls:
	3994	"""
	3995	from rhodecode.model.gist import GIST_STORE_LOC
	3996	q = Session().query(RhodeCodeUi)\
	3997	.filter(RhodeCodeUi.ui_key == URL_SEP)
	3998	q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
	3999	return os.path.join(q.one().ui_value, GIST_STORE_LOC)
	4000
	4001	def get_api_data(self):
	4002	"""
	4003	Common function for generating gist related data for API
	4004	"""
	4005	gist = self
	4006	data = {
	4007	'gist_id': gist.gist_id,
	4008	'type': gist.gist_type,
	4009	'access_id': gist.gist_access_id,
	4010	'description': gist.gist_description,
	4011	'url': gist.gist_url(),
	4012	'expires': gist.gist_expires,
	4013	'created_on': gist.created_on,
	4014	'modified_at': gist.modified_at,
	4015	'content': None,
	4016	'acl_level': gist.acl_level,
	4017	}
	4018	return data
	4019
	4020	def __json__(self):
	4021	data = dict(
	4022	)
	4023	data.update(self.get_api_data())
	4024	return data
	4025	# SCM functions
	4026
	4027	def scm_instance(self, **kwargs):
	4028	full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
	4029	return get_vcs_instance(
	4030	repo_path=safe_str(full_repo_path), create=False)
	4031
	4032
	4033	class ExternalIdentity(Base, BaseModel):
	4034	__tablename__ = 'external_identities'
	4035	__table_args__ = (
	4036	Index('local_user_id_idx', 'local_user_id'),
	4037	Index('external_id_idx', 'external_id'),
	4038	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4039	'mysql_charset': 'utf8'})
	4040
	4041	external_id = Column('external_id', Unicode(255), default=u'',
	4042	primary_key=True)
	4043	external_username = Column('external_username', Unicode(1024), default=u'')
	4044	local_user_id = Column('local_user_id', Integer(),
	4045	ForeignKey('users.user_id'), primary_key=True)
	4046	provider_name = Column('provider_name', Unicode(255), default=u'',
	4047	primary_key=True)
	4048	access_token = Column('access_token', String(1024), default=u'')
	4049	alt_token = Column('alt_token', String(1024), default=u'')
	4050	token_secret = Column('token_secret', String(1024), default=u'')
	4051
	4052	@classmethod
	4053	def by_external_id_and_provider(cls, external_id, provider_name,
	4054	local_user_id=None):
	4055	"""
	4056	Returns ExternalIdentity instance based on search params
	4057
	4058	:param external_id:
	4059	:param provider_name:
	4060	:return: ExternalIdentity
	4061	"""
	4062	query = cls.query()
	4063	query = query.filter(cls.external_id == external_id)
	4064	query = query.filter(cls.provider_name == provider_name)
	4065	if local_user_id:
	4066	query = query.filter(cls.local_user_id == local_user_id)
	4067	return query.first()
	4068
	4069	@classmethod
	4070	def user_by_external_id_and_provider(cls, external_id, provider_name):
	4071	"""
	4072	Returns User instance based on search params
	4073
	4074	:param external_id:
	4075	:param provider_name:
	4076	:return: User
	4077	"""
	4078	query = User.query()
	4079	query = query.filter(cls.external_id == external_id)
	4080	query = query.filter(cls.provider_name == provider_name)
	4081	query = query.filter(User.user_id == cls.local_user_id)
	4082	return query.first()
	4083
	4084	@classmethod
	4085	def by_local_user_id(cls, local_user_id):
	4086	"""
	4087	Returns all tokens for user
	4088
	4089	:param local_user_id:
	4090	:return: ExternalIdentity
	4091	"""
	4092	query = cls.query()
	4093	query = query.filter(cls.local_user_id == local_user_id)
	4094	return query
	4095
	4096
	4097	class Integration(Base, BaseModel):
	4098	__tablename__ = 'integrations'
	4099	__table_args__ = (
	4100	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4101	'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
	4102	)
	4103
	4104	integration_id = Column('integration_id', Integer(), primary_key=True)
	4105	integration_type = Column('integration_type', String(255))
	4106	enabled = Column('enabled', Boolean(), nullable=False)
	4107	name = Column('name', String(255), nullable=False)
	4108	child_repos_only = Column('child_repos_only', Boolean(), nullable=False,
	4109	default=False)
	4110
	4111	settings = Column(
	4112	'settings_json', MutationObj.as_mutable(
	4113	JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
	4114	repo_id = Column(
	4115	'repo_id', Integer(), ForeignKey('repositories.repo_id'),
	4116	nullable=True, unique=None, default=None)
	4117	repo = relationship('Repository', lazy='joined')
	4118
	4119	repo_group_id = Column(
	4120	'repo_group_id', Integer(), ForeignKey('groups.group_id'),
	4121	nullable=True, unique=None, default=None)
	4122	repo_group = relationship('RepoGroup', lazy='joined')
	4123
	4124	@property
	4125	def scope(self):
	4126	if self.repo:
	4127	return repr(self.repo)
	4128	if self.repo_group:
	4129	if self.child_repos_only:
	4130	return repr(self.repo_group) + ' (child repos only)'
	4131	else:
	4132	return repr(self.repo_group) + ' (recursive)'
	4133	if self.child_repos_only:
	4134	return 'root_repos'
	4135	return 'global'
	4136
	4137	def __repr__(self):
	4138	return '<Integration(%r, %r)>' % (self.integration_type, self.scope)
	4139
	4140
	4141	class RepoReviewRuleUser(Base, BaseModel):
	4142	__tablename__ = 'repo_review_rules_users'
	4143	__table_args__ = (
	4144	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4145	'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
	4146	)
	4147
	4148	repo_review_rule_user_id = Column('repo_review_rule_user_id', Integer(), primary_key=True)
	4149	repo_review_rule_id = Column("repo_review_rule_id", Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
	4150	user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False)
	4151	mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
	4152	user = relationship('User')
	4153
	4154	def rule_data(self):
	4155	return {
	4156	'mandatory': self.mandatory
	4157	}
	4158
	4159
	4160	class RepoReviewRuleUserGroup(Base, BaseModel):
	4161	__tablename__ = 'repo_review_rules_users_groups'
	4162	__table_args__ = (
	4163	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4164	'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
	4165	)
	4166	VOTE_RULE_ALL = -1
	4167
	4168	repo_review_rule_users_group_id = Column('repo_review_rule_users_group_id', Integer(), primary_key=True)
	4169	repo_review_rule_id = Column("repo_review_rule_id", Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
	4170	users_group_id = Column("users_group_id", Integer(),ForeignKey('users_groups.users_group_id'), nullable=False)
	4171	mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
	4172	vote_rule = Column("vote_rule", Integer(), nullable=True, default=VOTE_RULE_ALL)
	4173	users_group = relationship('UserGroup')
	4174
	4175	def rule_data(self):
	4176	return {
	4177	'mandatory': self.mandatory,
	4178	'vote_rule': self.vote_rule
	4179	}
	4180
	4181	@property
	4182	def vote_rule_label(self):
	4183	if not self.vote_rule or self.vote_rule == self.VOTE_RULE_ALL:
	4184	return 'all must vote'
	4185	else:
	4186	return 'min. vote {}'.format(self.vote_rule)
	4187
	4188
	4189	class RepoReviewRule(Base, BaseModel):
	4190	__tablename__ = 'repo_review_rules'
	4191	__table_args__ = (
	4192	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4193	'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
	4194	)
	4195
	4196	repo_review_rule_id = Column(
	4197	'repo_review_rule_id', Integer(), primary_key=True)
	4198	repo_id = Column(
	4199	"repo_id", Integer(), ForeignKey('repositories.repo_id'))
	4200	repo = relationship('Repository', backref='review_rules')
	4201
	4202	review_rule_name = Column('review_rule_name', String(255))
	4203	_branch_pattern = Column("branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*') # glob
	4204	_target_branch_pattern = Column("target_branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*') # glob
	4205	_file_pattern = Column("file_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*') # glob
	4206
	4207	use_authors_for_review = Column("use_authors_for_review", Boolean(), nullable=False, default=False)
	4208	forbid_author_to_review = Column("forbid_author_to_review", Boolean(), nullable=False, default=False)
	4209	forbid_commit_author_to_review = Column("forbid_commit_author_to_review", Boolean(), nullable=False, default=False)
	4210	forbid_adding_reviewers = Column("forbid_adding_reviewers", Boolean(), nullable=False, default=False)
	4211
	4212	rule_users = relationship('RepoReviewRuleUser')
	4213	rule_user_groups = relationship('RepoReviewRuleUserGroup')
	4214
	4215	def _validate_glob(self, value):
	4216	re.compile('^' + glob2re(value) + '$')
	4217
	4218	@hybrid_property
	4219	def source_branch_pattern(self):
	4220	return self._branch_pattern or '*'
	4221
	4222	@source_branch_pattern.setter
	4223	def source_branch_pattern(self, value):
	4224	self._validate_glob(value)
	4225	self._branch_pattern = value or '*'
	4226
	4227	@hybrid_property
	4228	def target_branch_pattern(self):
	4229	return self._target_branch_pattern or '*'
	4230
	4231	@target_branch_pattern.setter
	4232	def target_branch_pattern(self, value):
	4233	self._validate_glob(value)
	4234	self._target_branch_pattern = value or '*'
	4235
	4236	@hybrid_property
	4237	def file_pattern(self):
	4238	return self._file_pattern or '*'
	4239
	4240	@file_pattern.setter
	4241	def file_pattern(self, value):
	4242	self._validate_glob(value)
	4243	self._file_pattern = value or '*'
	4244
	4245	def matches(self, source_branch, target_branch, files_changed):
	4246	"""
	4247	Check if this review rule matches a branch/files in a pull request
	4248
	4249	:param source_branch: source branch name for the commit
	4250	:param target_branch: target branch name for the commit
	4251	:param files_changed: list of file paths changed in the pull request
	4252	"""
	4253
	4254	source_branch = source_branch or ''
	4255	target_branch = target_branch or ''
	4256	files_changed = files_changed or []
	4257
	4258	branch_matches = True
	4259	if source_branch or target_branch:
	4260	if self.source_branch_pattern == '*':
	4261	source_branch_match = True
	4262	else:
	4263	source_branch_regex = re.compile(
	4264	'^' + glob2re(self.source_branch_pattern) + '$')
	4265	source_branch_match = bool(source_branch_regex.search(source_branch))
	4266	if self.target_branch_pattern == '*':
	4267	target_branch_match = True
	4268	else:
	4269	target_branch_regex = re.compile(
	4270	'^' + glob2re(self.target_branch_pattern) + '$')
	4271	target_branch_match = bool(target_branch_regex.search(target_branch))
	4272
	4273	branch_matches = source_branch_match and target_branch_match
	4274
	4275	files_matches = True
	4276	if self.file_pattern != '*':
	4277	files_matches = False
	4278	file_regex = re.compile(glob2re(self.file_pattern))
	4279	for filename in files_changed:
	4280	if file_regex.search(filename):
	4281	files_matches = True
	4282	break
	4283
	4284	return branch_matches and files_matches
	4285
	4286	@property
	4287	def review_users(self):
	4288	""" Returns the users which this rule applies to """
	4289
	4290	users = collections.OrderedDict()
	4291
	4292	for rule_user in self.rule_users:
	4293	if rule_user.user.active:
	4294	if rule_user.user not in users:
	4295	users[rule_user.user.username] = {
	4296	'user': rule_user.user,
	4297	'source': 'user',
	4298	'source_data': {},
	4299	'data': rule_user.rule_data()
	4300	}
	4301
	4302	for rule_user_group in self.rule_user_groups:
	4303	source_data = {
	4304	'user_group_id': rule_user_group.users_group.users_group_id,
	4305	'name': rule_user_group.users_group.users_group_name,
	4306	'members': len(rule_user_group.users_group.members)
	4307	}
	4308	for member in rule_user_group.users_group.members:
	4309	if member.user.active:
	4310	key = member.user.username
	4311	if key in users:
	4312	# skip this member as we have him already
	4313	# this prevents from override the "first" matched
	4314	# users with duplicates in multiple groups
	4315	continue
	4316
	4317	users[key] = {
	4318	'user': member.user,
	4319	'source': 'user_group',
	4320	'source_data': source_data,
	4321	'data': rule_user_group.rule_data()
	4322	}
	4323
	4324	return users
	4325
	4326	def user_group_vote_rule(self):
	4327	rules = []
	4328	if self.rule_user_groups:
	4329	for user_group in self.rule_user_groups:
	4330	rules.append(user_group)
	4331	return rules
	4332
	4333	def __repr__(self):
	4334	return '<RepoReviewerRule(id=%r, repo=%r)>' % (
	4335	self.repo_review_rule_id, self.repo)
	4336
	4337
	4338	class ScheduleEntry(Base, BaseModel):
	4339	__tablename__ = 'schedule_entries'
	4340	__table_args__ = (
	4341	UniqueConstraint('schedule_name', name='s_schedule_name_idx'),
	4342	UniqueConstraint('task_uid', name='s_task_uid_idx'),
	4343	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4344	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	4345	)
	4346	schedule_types = ['crontab', 'timedelta', 'integer']
	4347	schedule_entry_id = Column('schedule_entry_id', Integer(), primary_key=True)
	4348
	4349	schedule_name = Column("schedule_name", String(255), nullable=False, unique=None, default=None)
	4350	schedule_description = Column("schedule_description", String(10000), nullable=True, unique=None, default=None)
	4351	schedule_enabled = Column("schedule_enabled", Boolean(), nullable=False, unique=None, default=True)
	4352
	4353	_schedule_type = Column("schedule_type", String(255), nullable=False, unique=None, default=None)
	4354	schedule_definition = Column('schedule_definition_json', MutationObj.as_mutable(JsonType(default=lambda: "", dialect_map=dict(mysql=LONGTEXT()))))
	4355
	4356	schedule_last_run = Column('schedule_last_run', DateTime(timezone=False), nullable=True, unique=None, default=None)
	4357	schedule_total_run_count = Column('schedule_total_run_count', Integer(), nullable=True, unique=None, default=0)
	4358
	4359	# task
	4360	task_uid = Column("task_uid", String(255), nullable=False, unique=None, default=None)
	4361	task_dot_notation = Column("task_dot_notation", String(4096), nullable=False, unique=None, default=None)
	4362	task_args = Column('task_args_json', MutationObj.as_mutable(JsonType(default=list, dialect_map=dict(mysql=LONGTEXT()))))
	4363	task_kwargs = Column('task_kwargs_json', MutationObj.as_mutable(JsonType(default=dict, dialect_map=dict(mysql=LONGTEXT()))))
	4364
	4365	created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
	4366	updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=None)
	4367
	4368	@hybrid_property
	4369	def schedule_type(self):
	4370	return self._schedule_type
	4371
	4372	@schedule_type.setter
	4373	def schedule_type(self, val):
	4374	if val not in self.schedule_types:
	4375	raise ValueError('Value must be on of `{}` and got `{}`'.format(
	4376	val, self.schedule_type))
	4377
	4378	self._schedule_type = val
	4379
	4380	@classmethod
	4381	def get_uid(cls, obj):
	4382	args = obj.task_args
	4383	kwargs = obj.task_kwargs
	4384	if isinstance(args, JsonRaw):
	4385	try:
	4386	args = json.loads(args)
	4387	except ValueError:
	4388	args = tuple()
	4389
	4390	if isinstance(kwargs, JsonRaw):
	4391	try:
	4392	kwargs = json.loads(kwargs)
	4393	except ValueError:
	4394	kwargs = dict()
	4395
	4396	dot_notation = obj.task_dot_notation
	4397	val = '.'.join(map(safe_str, [
	4398	sorted(dot_notation), args, sorted(kwargs.items())]))
	4399	return hashlib.sha1(val).hexdigest()
	4400
	4401	@classmethod
	4402	def get_by_schedule_name(cls, schedule_name):
	4403	return cls.query().filter(cls.schedule_name == schedule_name).scalar()
	4404
	4405	@classmethod
	4406	def get_by_schedule_id(cls, schedule_id):
	4407	return cls.query().filter(cls.schedule_entry_id == schedule_id).scalar()
	4408
	4409	@property
	4410	def task(self):
	4411	return self.task_dot_notation
	4412
	4413	@property
	4414	def schedule(self):
	4415	from rhodecode.lib.celerylib.utils import raw_2_schedule
	4416	schedule = raw_2_schedule(self.schedule_definition, self.schedule_type)
	4417	return schedule
	4418
	4419	@property
	4420	def args(self):
	4421	try:
	4422	return list(self.task_args or [])
	4423	except ValueError:
	4424	return list()
	4425
	4426	@property
	4427	def kwargs(self):
	4428	try:
	4429	return dict(self.task_kwargs or {})
	4430	except ValueError:
	4431	return dict()
	4432
	4433	def _as_raw(self, val):
	4434	if hasattr(val, 'de_coerce'):
	4435	val = val.de_coerce()
	4436	if val:
	4437	val = json.dumps(val)
	4438
	4439	return val
	4440
	4441	@property
	4442	def schedule_definition_raw(self):
	4443	return self._as_raw(self.schedule_definition)
	4444
	4445	@property
	4446	def args_raw(self):
	4447	return self._as_raw(self.task_args)
	4448
	4449	@property
	4450	def kwargs_raw(self):
	4451	return self._as_raw(self.task_kwargs)
	4452
	4453	def __repr__(self):
	4454	return '<DB:ScheduleEntry({}:{})>'.format(
	4455	self.schedule_entry_id, self.schedule_name)
	4456
	4457
	4458	@event.listens_for(ScheduleEntry, 'before_update')
	4459	def update_task_uid(mapper, connection, target):
	4460	target.task_uid = ScheduleEntry.get_uid(target)
	4461
	4462
	4463	@event.listens_for(ScheduleEntry, 'before_insert')
	4464	def set_task_uid(mapper, connection, target):
	4465	target.task_uid = ScheduleEntry.get_uid(target)
	4466
	4467
	4468	class _BaseBranchPerms(BaseModel):
	4469	@classmethod
	4470	def compute_hash(cls, value):
	4471	return md5_safe(value)
	4472
	4473	@hybrid_property
	4474	def branch_pattern(self):
	4475	return self._branch_pattern or '*'
	4476
	4477	@hybrid_property
	4478	def branch_hash(self):
	4479	return self._branch_hash
	4480
	4481	def _validate_glob(self, value):
	4482	re.compile('^' + glob2re(value) + '$')
	4483
	4484	@branch_pattern.setter
	4485	def branch_pattern(self, value):
	4486	self._validate_glob(value)
	4487	self._branch_pattern = value or '*'
	4488	# set the Hash when setting the branch pattern
	4489	self._branch_hash = self.compute_hash(self._branch_pattern)
	4490
	4491	def matches(self, branch):
	4492	"""
	4493	Check if this the branch matches entry
	4494
	4495	:param branch: branch name for the commit
	4496	"""
	4497
	4498	branch = branch or ''
	4499
	4500	branch_matches = True
	4501	if branch:
	4502	branch_regex = re.compile('^' + glob2re(self.branch_pattern) + '$')
	4503	branch_matches = bool(branch_regex.search(branch))
	4504
	4505	return branch_matches
	4506
	4507
	4508	class UserToRepoBranchPermission(Base, _BaseBranchPerms):
	4509	__tablename__ = 'user_to_repo_branch_permissions'
	4510	__table_args__ = (
	4511	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4512	'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
	4513	)
	4514
	4515	branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
	4516
	4517	repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
	4518	repo = relationship('Repository', backref='user_branch_perms')
	4519
	4520	permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	4521	permission = relationship('Permission')
	4522
	4523	rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('repo_to_perm.repo_to_perm_id'), nullable=False, unique=None, default=None)
	4524	user_repo_to_perm = relationship('UserRepoToPerm')
	4525
	4526	rule_order = Column('rule_order', Integer(), nullable=False)
	4527	_branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*') # glob
	4528	_branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
	4529
	4530	def __unicode__(self):
	4531	return u'<UserBranchPermission(%s => %r)>' % (
	4532	self.user_repo_to_perm, self.branch_pattern)
	4533
	4534
	4535	class UserGroupToRepoBranchPermission(Base, _BaseBranchPerms):
	4536	__tablename__ = 'user_group_to_repo_branch_permissions'
	4537	__table_args__ = (
	4538	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4539	'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
	4540	)
	4541
	4542	branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
	4543
	4544	repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
	4545	repo = relationship('Repository', backref='user_group_branch_perms')
	4546
	4547	permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
	4548	permission = relationship('Permission')
	4549
	4550	rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('users_group_repo_to_perm.users_group_to_perm_id'), nullable=False, unique=None, default=None)
	4551	user_group_repo_to_perm = relationship('UserGroupRepoToPerm')
	4552
	4553	rule_order = Column('rule_order', Integer(), nullable=False)
	4554	_branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*') # glob
	4555	_branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
	4556
	4557	def __unicode__(self):
	4558	return u'<UserBranchPermission(%s => %r)>' % (
	4559	self.user_group_repo_to_perm, self.branch_pattern)
	4560
	4561
	4562	class DbMigrateVersion(Base, BaseModel):
	4563	__tablename__ = 'db_migrate_version'
	4564	__table_args__ = (
	4565	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4566	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	4567	)
	4568	repository_id = Column('repository_id', String(250), primary_key=True)
	4569	repository_path = Column('repository_path', Text)
	4570	version = Column('version', Integer)
	4571
	4572
	4573	class DbSession(Base, BaseModel):
	4574	__tablename__ = 'db_session'
	4575	__table_args__ = (
	4576	{'extend_existing': True, 'mysql_engine': 'InnoDB',
	4577	'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
	4578	)
	4579
	4580	def __repr__(self):
	4581	return '<DB:DbSession({})>'.format(self.id)
	4582
	4583	id = Column('id', Integer())
	4584	namespace = Column('namespace', String(255), primary_key=True)
	4585	accessed = Column('accessed', DateTime, nullable=False)
	4586	created = Column('created', DateTime, nullable=False)
	4587	data = Column('data', PickleType, nullable=False)

rhodecode/lib/dbmigrate/versions/087_version_4_13_0.py

0 created 644 +40 0

			@@ -0,0 +1,40 b''
		1	import logging
		2
		3	from sqlalchemy import *
		4
		5	from rhodecode.model import meta
		6	from rhodecode.lib.dbmigrate.versions import _reset_base, notify
		7
		8	log = logging.getLogger(__name__)
		9
		10
		11	def upgrade(migrate_engine):
		12	"""
		13	Upgrade operations go here.
		14	Don't create your own engine; bind migrate_engine to your metadata
		15	"""
		16	_reset_base(migrate_engine)
		17	from rhodecode.lib.dbmigrate.schema import db_4_11_0_0 as db
		18
		19	pull_request_table = db.PullRequest.__table__
		20	pull_request_version_table = db.PullRequestVersion.__table__
		21
		22	renderer = Column('description_renderer', Unicode(64), nullable=True)
		23	renderer.create(table=pull_request_table)
		24
		25	renderer_ver = Column('description_renderer', Unicode(64), nullable=True)
		26	renderer_ver.create(table=pull_request_version_table)
		27
		28	# issue fixups
		29	fixups(db, meta.Session)
		30
		31
		32	def downgrade(migrate_engine):
		33	meta = MetaData()
		34	meta.bind = migrate_engine
		35
		36
		37	def fixups(models, _SESSION):
		38	pass
		39
		40

rhodecode/lib/dbmigrate/versions/088_version_4_13_0.py

0 created 644 +46 0

			@@ -0,0 +1,46 b''
		1	import logging
		2
		3	from sqlalchemy import *
		4	from sqlalchemy.engine import reflection
		5	from sqlalchemy.dialects.mysql import LONGTEXT
		6
		7	from alembic.migration import MigrationContext
		8	from alembic.operations import Operations
		9
		10	from rhodecode.lib.dbmigrate.utils import create_default_permissions, \
		11	create_default_object_permission
		12	from rhodecode.model import meta
		13	from rhodecode.lib.dbmigrate.versions import _reset_base, notify
		14
		15	log = logging.getLogger(__name__)
		16
		17
		18	def upgrade(migrate_engine):
		19	"""
		20	Upgrade operations go here.
		21	Don't create your own engine; bind migrate_engine to your metadata
		22	"""
		23	_reset_base(migrate_engine)
		24	from rhodecode.lib.dbmigrate.schema import db_4_13_0_0 as db
		25
		26	# issue fixups
		27	fixups(db, meta.Session)
		28
		29
		30	def downgrade(migrate_engine):
		31	meta = MetaData()
		32	meta.bind = migrate_engine
		33
		34
		35	def fixups(models, _SESSION):
		36	# create default permissions
		37	create_default_permissions(_SESSION, models)
		38	log.info('created default global permissions definitions')
		39	_SESSION().commit()
		40
		41	# # fix default object permissions
		42	# create_default_object_permission(_SESSION, models)
		43
		44	log.info('created default permission')
		45	_SESSION().commit()
		46

rhodecode/lib/dbmigrate/versions/089_version_4_13_0.py

0 created 644 +39 0

			@@ -0,0 +1,39 b''
		1	import logging
		2
		3	from sqlalchemy import *
		4	from sqlalchemy.engine import reflection
		5	from sqlalchemy.dialects.mysql import LONGTEXT
		6
		7	from alembic.migration import MigrationContext
		8	from alembic.operations import Operations
		9
		10	from rhodecode.model import meta
		11	from rhodecode.lib.dbmigrate.versions import _reset_base, notify
		12
		13	log = logging.getLogger(__name__)
		14
		15
		16	def upgrade(migrate_engine):
		17	"""
		18	Upgrade operations go here.
		19	Don't create your own engine; bind migrate_engine to your metadata
		20	"""
		21	_reset_base(migrate_engine)
		22	from rhodecode.lib.dbmigrate.schema import db_4_13_0_0 as db
		23
		24	db.UserToRepoBranchPermission.__table__.create()
		25	db.UserGroupToRepoBranchPermission.__table__.create()
		26
		27	# issue fixups
		28	fixups(db, meta.Session)
		29
		30
		31	def downgrade(migrate_engine):
		32	meta = MetaData()
		33	meta.bind = migrate_engine
		34
		35
		36	def fixups(models, _SESSION):
		37	pass
		38
		39

rhodecode/lib/dbmigrate/versions/090_version_4_13_0.py

0 created 644 +43 0

			@@ -0,0 +1,43 b''
		1	import logging
		2
		3	from sqlalchemy import *
		4
		5	from rhodecode.lib.dbmigrate.utils import (
		6	create_default_object_permission, create_default_permissions)
		7
		8	from rhodecode.model import meta
		9	from rhodecode.lib.dbmigrate.versions import _reset_base, notify
		10
		11	log = logging.getLogger(__name__)
		12
		13
		14	def upgrade(migrate_engine):
		15	"""
		16	Upgrade operations go here.
		17	Don't create your own engine; bind migrate_engine to your metadata
		18	"""
		19	_reset_base(migrate_engine)
		20	from rhodecode.lib.dbmigrate.schema import db_4_13_0_0 as db
		21
		22	# issue fixups
		23	fixups(db, meta.Session)
		24
		25
		26	def downgrade(migrate_engine):
		27	meta = MetaData()
		28	meta.bind = migrate_engine
		29
		30
		31	def fixups(models, _SESSION):
		32	# create default permissions
		33	create_default_permissions(_SESSION, models)
		34	log.info('created default global permissions definitions')
		35	_SESSION().commit()
		36
		37	# fix default object permissions
		38	create_default_object_permission(_SESSION, models)
		39
		40	log.info('created default permission')
		41	_SESSION().commit()
		42
		43

rhodecode/lib/exc_tracking.py

0 created 644 +146 0

			@@ -0,0 +1,146 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2010-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21	import os
		22	import time
		23	import datetime
		24	import msgpack
		25	import logging
		26	import traceback
		27	import tempfile
		28
		29
		30	log = logging.getLogger(__name__)
		31
		32	# NOTE: Any changes should be synced with exc_tracking at vcsserver.lib.exc_tracking
		33	global_prefix = 'rhodecode'
		34
		35
		36	def exc_serialize(exc_id, tb, exc_type):
		37
		38	data = {
		39	'version': 'v1',
		40	'exc_id': exc_id,
		41	'exc_utc_date': datetime.datetime.utcnow().isoformat(),
		42	'exc_timestamp': repr(time.time()),
		43	'exc_message': tb,
		44	'exc_type': exc_type,
		45	}
		46	return msgpack.packb(data), data
		47
		48
		49	def exc_unserialize(tb):
		50	return msgpack.unpackb(tb)
		51
		52
		53	def get_exc_store():
		54	"""
		55	Get and create exception store if it's not existing
		56	"""
		57	exc_store_dir = 'rc_exception_store_v1'
		58	# fallback
		59	_exc_store_path = os.path.join(tempfile.gettempdir(), exc_store_dir)
		60
		61	exc_store_dir = '' # TODO: need a persistent cross instance store here
		62	if exc_store_dir:
		63	_exc_store_path = os.path.join(exc_store_dir, exc_store_dir)
		64
		65	_exc_store_path = os.path.abspath(_exc_store_path)
		66	if not os.path.isdir(_exc_store_path):
		67	os.makedirs(_exc_store_path)
		68	log.debug('Initializing exceptions store at %s', _exc_store_path)
		69	return _exc_store_path
		70
		71
		72	def _store_exception(exc_id, exc_info, prefix):
		73	exc_type, exc_value, exc_traceback = exc_info
		74	tb = ''.join(traceback.format_exception(
		75	exc_type, exc_value, exc_traceback, None))
		76
		77	exc_type_name = exc_type.__name__
		78	exc_store_path = get_exc_store()
		79	exc_data, org_data = exc_serialize(exc_id, tb, exc_type_name)
		80	exc_pref_id = '{}_{}_{}'.format(exc_id, prefix, org_data['exc_timestamp'])
		81	if not os.path.isdir(exc_store_path):
		82	os.makedirs(exc_store_path)
		83	stored_exc_path = os.path.join(exc_store_path, exc_pref_id)
		84	with open(stored_exc_path, 'wb') as f:
		85	f.write(exc_data)
		86	log.debug('Stored generated exception %s as: %s', exc_id, stored_exc_path)
		87
		88
		89	def store_exception(exc_id, exc_info, prefix=global_prefix):
		90	try:
		91	_store_exception(exc_id=exc_id, exc_info=exc_info, prefix=prefix)
		92	except Exception:
		93	log.exception('Failed to store exception `%s` information', exc_id)
		94	# there's no way this can fail, it will crash server badly if it does.
		95	pass
		96
		97
		98	def _find_exc_file(exc_id, prefix=global_prefix):
		99	exc_store_path = get_exc_store()
		100	if prefix:
		101	exc_id = '{}_{}'.format(exc_id, prefix)
		102	else:
		103	# search without a prefix
		104	exc_id = '{}'.format(exc_id)
		105
		106	# we need to search the store for such start pattern as above
		107	for fname in os.listdir(exc_store_path):
		108	if fname.startswith(exc_id):
		109	exc_id = os.path.join(exc_store_path, fname)
		110	break
		111	continue
		112	else:
		113	exc_id = None
		114
		115	return exc_id
		116
		117
		118	def _read_exception(exc_id, prefix):
		119	exc_id_file_path = _find_exc_file(exc_id=exc_id, prefix=prefix)
		120	if exc_id_file_path:
		121	with open(exc_id_file_path, 'rb') as f:
		122	return exc_unserialize(f.read())
		123	else:
		124	log.debug('Exception File `%s` not found', exc_id_file_path)
		125	return None
		126
		127
		128	def read_exception(exc_id, prefix=global_prefix):
		129	try:
		130	return _read_exception(exc_id=exc_id, prefix=prefix)
		131	except Exception:
		132	log.exception('Failed to read exception `%s` information', exc_id)
		133	# there's no way this can fail, it will crash server badly if it does.
		134	return None
		135
		136
		137	def delete_exception(exc_id, prefix=global_prefix):
		138	try:
		139	exc_id_file_path = _find_exc_file(exc_id, prefix=prefix)
		140	if exc_id_file_path:
		141	os.remove(exc_id_file_path)
		142
		143	except Exception:
		144	log.exception('Failed to remove exception `%s` information', exc_id)
		145	# there's no way this can fail, it will crash server badly if it does.
		146	pass

rhodecode/lib/rc_cache/__init__.py

0 created 644 +75 0

			@@ -0,0 +1,75 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2015-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21	import logging
		22	from dogpile.cache import register_backend
		23
		24	register_backend(
		25	"dogpile.cache.rc.memory_lru", "rhodecode.lib.rc_cache.backends",
		26	"LRUMemoryBackend")
		27
		28	register_backend(
		29	"dogpile.cache.rc.file_namespace", "rhodecode.lib.rc_cache.backends",
		30	"FileNamespaceBackend")
		31
		32	register_backend(
		33	"dogpile.cache.rc.redis", "rhodecode.lib.rc_cache.backends",
		34	"RedisPickleBackend")
		35
		36
		37	log = logging.getLogger(__name__)
		38
		39	from . import region_meta
		40	from .utils import (
		41	get_default_cache_settings, key_generator, get_or_create_region,
		42	clear_cache_namespace, make_region, InvalidationContext,
		43	FreshRegionCache, ActiveRegionCache)
		44
		45
		46	def configure_dogpile_cache(settings):
		47	cache_dir = settings.get('cache_dir')
		48	if cache_dir:
		49	region_meta.dogpile_config_defaults['cache_dir'] = cache_dir
		50
		51	rc_cache_data = get_default_cache_settings(settings, prefixes=['rc_cache.'])
		52
		53	# inspect available namespaces
		54	avail_regions = set()
		55	for key in rc_cache_data.keys():
		56	namespace_name = key.split('.', 1)[0]
		57	avail_regions.add(namespace_name)
		58	log.debug('dogpile: found following cache regions: %s', avail_regions)
		59
		60	# register them into namespace
		61	for region_name in avail_regions:
		62	new_region = make_region(
		63	name=region_name,
		64	function_key_generator=key_generator
		65	)
		66
		67	new_region.configure_from_config(settings, 'rc_cache.{}.'.format(region_name))
		68
		69	log.debug('dogpile: registering a new region %s[%s]',
		70	region_name, new_region.__dict__)
		71	region_meta.dogpile_cache_regions[region_name] = new_region
		72
		73
		74	def includeme(config):
		75	configure_dogpile_cache(config.registry.settings)

rhodecode/lib/rc_cache/backends.py

0 created 644 +203 0

			@@ -0,0 +1,203 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2015-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20	import time
		21	import errno
		22	import logging
		23
		24	import gevent
		25
		26	from dogpile.cache.backends import memory as memory_backend
		27	from dogpile.cache.backends import file as file_backend
		28	from dogpile.cache.backends import redis as redis_backend
		29	from dogpile.cache.backends.file import NO_VALUE, compat, FileLock
		30	from dogpile.cache.util import memoized_property
		31
		32	from rhodecode.lib.memory_lru_dict import LRUDict, LRUDictDebug
		33
		34
		35	_default_max_size = 1024
		36
		37	log = logging.getLogger(__name__)
		38
		39
		40	class LRUMemoryBackend(memory_backend.MemoryBackend):
		41	pickle_values = False
		42
		43	def __init__(self, arguments):
		44	max_size = arguments.pop('max_size', _default_max_size)
		45
		46	LRUDictClass = LRUDict
		47	if arguments.pop('log_key_count', None):
		48	LRUDictClass = LRUDictDebug
		49
		50	arguments['cache_dict'] = LRUDictClass(max_size)
		51	super(LRUMemoryBackend, self).__init__(arguments)
		52
		53	def delete(self, key):
		54	try:
		55	del self._cache[key]
		56	except KeyError:
		57	# we don't care if key isn't there at deletion
		58	pass
		59
		60	def delete_multi(self, keys):
		61	for key in keys:
		62	self.delete(key)
		63
		64
		65	class Serializer(object):
		66	def _dumps(self, value, safe=False):
		67	try:
		68	return compat.pickle.dumps(value)
		69	except Exception:
		70	if safe:
		71	return NO_VALUE
		72	else:
		73	raise
		74
		75	def _loads(self, value, safe=True):
		76	try:
		77	return compat.pickle.loads(value)
		78	except Exception:
		79	if safe:
		80	return NO_VALUE
		81	else:
		82	raise
		83
		84
		85	class CustomLockFactory(FileLock):
		86
		87	@memoized_property
		88	def _module(self):
		89	import fcntl
		90	flock_org = fcntl.flock
		91
		92	def gevent_flock(fd, operation):
		93	"""
		94	Gevent compatible flock
		95	"""
		96	# set non-blocking, this will cause an exception if we cannot acquire a lock
		97	operation \|= fcntl.LOCK_NB
		98	start_lock_time = time.time()
		99	timeout = 60 * 5 # 5min
		100	while True:
		101	try:
		102	flock_org(fd, operation)
		103	# lock has been acquired
		104	break
		105	except (OSError, IOError) as e:
		106	# raise on other errors than Resource temporarily unavailable
		107	if e.errno != errno.EAGAIN:
		108	raise
		109	elif (time.time() - start_lock_time) > timeout:
		110	# waited to much time on a lock, better fail than loop for ever
		111	log.error('Failed to acquire lock on `%s` after waiting %ss',
		112	self.filename, timeout)
		113	raise
		114	wait_timeout = 0.03
		115	log.debug('Failed to acquire lock on `%s`, retry in %ss',
		116	self.filename, wait_timeout)
		117	gevent.sleep(wait_timeout)
		118
		119	fcntl.flock = gevent_flock
		120	return fcntl
		121
		122
		123	class FileNamespaceBackend(Serializer, file_backend.DBMBackend):
		124
		125	def __init__(self, arguments):
		126	arguments['lock_factory'] = CustomLockFactory
		127	super(FileNamespaceBackend, self).__init__(arguments)
		128
		129	def list_keys(self, prefix=''):
		130	def cond(v):
		131	if not prefix:
		132	return True
		133
		134	if v.startswith(prefix):
		135	return True
		136	return False
		137
		138	with self._dbm_file(True) as dbm:
		139
		140	return filter(cond, dbm.keys())
		141
		142	def get_store(self):
		143	return self.filename
		144
		145	def get(self, key):
		146	with self._dbm_file(False) as dbm:
		147	if hasattr(dbm, 'get'):
		148	value = dbm.get(key, NO_VALUE)
		149	else:
		150	# gdbm objects lack a .get method
		151	try:
		152	value = dbm[key]
		153	except KeyError:
		154	value = NO_VALUE
		155	if value is not NO_VALUE:
		156	value = self._loads(value)
		157	return value
		158
		159	def set(self, key, value):
		160	with self._dbm_file(True) as dbm:
		161	dbm[key] = self._dumps(value)
		162
		163	def set_multi(self, mapping):
		164	with self._dbm_file(True) as dbm:
		165	for key, value in mapping.items():
		166	dbm[key] = self._dumps(value)
		167
		168
		169	class RedisPickleBackend(Serializer, redis_backend.RedisBackend):
		170	def list_keys(self, prefix=''):
		171	if prefix:
		172	prefix = prefix + '*'
		173	return self.client.keys(prefix)
		174
		175	def get_store(self):
		176	return self.client.connection_pool
		177
		178	def get(self, key):
		179	value = self.client.get(key)
		180	if value is None:
		181	return NO_VALUE
		182	return self._loads(value)
		183
		184	def set(self, key, value):
		185	if self.redis_expiration_time:
		186	self.client.setex(key, self.redis_expiration_time,
		187	self._dumps(value))
		188	else:
		189	self.client.set(key, self._dumps(value))
		190
		191	def set_multi(self, mapping):
		192	mapping = dict(
		193	(k, self._dumps(v))
		194	for k, v in mapping.items()
		195	)
		196
		197	if not self.redis_expiration_time:
		198	self.client.mset(mapping)
		199	else:
		200	pipe = self.client.pipeline()
		201	for key, value in mapping.items():
		202	pipe.setex(key, self.redis_expiration_time, value)
		203	pipe.execute()

rhodecode/lib/rc_cache/region_meta.py

0 created 644 +28 0

			@@ -0,0 +1,28 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2015-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20	import os
		21	import tempfile
		22
		23	dogpile_config_defaults = {
		24	'cache_dir': os.path.join(tempfile.gettempdir(), 'rc_cache')
		25	}
		26
		27	# GLOBAL TO STORE ALL REGISTERED REGIONS
		28	dogpile_cache_regions = {}

rhodecode/lib/rc_cache/utils.py

0 created 644 +322 0

			@@ -0,0 +1,322 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2015-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20	import os
		21	import time
		22	import logging
		23	import functools
		24	import threading
		25
		26	from dogpile.cache import CacheRegion
		27	from dogpile.cache.util import compat
		28
		29	import rhodecode
		30	from rhodecode.lib.utils import safe_str, sha1
		31	from rhodecode.lib.utils2 import safe_unicode, str2bool
		32	from rhodecode.model.db import Session, CacheKey, IntegrityError
		33
		34	from . import region_meta
		35
		36	log = logging.getLogger(__name__)
		37
		38
		39	class RhodeCodeCacheRegion(CacheRegion):
		40
		41	def conditional_cache_on_arguments(
		42	self, namespace=None,
		43	expiration_time=None,
		44	should_cache_fn=None,
		45	to_str=compat.string_type,
		46	function_key_generator=None,
		47	condition=True):
		48	"""
		49	Custom conditional decorator, that will not touch any dogpile internals if
		50	condition isn't meet. This works a bit different than should_cache_fn
		51	And it's faster in cases we don't ever want to compute cached values
		52	"""
		53	expiration_time_is_callable = compat.callable(expiration_time)
		54
		55	if function_key_generator is None:
		56	function_key_generator = self.function_key_generator
		57
		58	def decorator(fn):
		59	if to_str is compat.string_type:
		60	# backwards compatible
		61	key_generator = function_key_generator(namespace, fn)
		62	else:
		63	key_generator = function_key_generator(namespace, fn, to_str=to_str)
		64
		65	@functools.wraps(fn)
		66	def decorate(arg, *kw):
		67	key = key_generator(arg, *kw)
		68
		69	@functools.wraps(fn)
		70	def creator():
		71	return fn(arg, *kw)
		72
		73	if not condition:
		74	return creator()
		75
		76	timeout = expiration_time() if expiration_time_is_callable \
		77	else expiration_time
		78
		79	return self.get_or_create(key, creator, timeout, should_cache_fn)
		80
		81	def invalidate(arg, *kw):
		82	key = key_generator(arg, *kw)
		83	self.delete(key)
		84
		85	def set_(value, arg, *kw):
		86	key = key_generator(arg, *kw)
		87	self.set(key, value)
		88
		89	def get(arg, *kw):
		90	key = key_generator(arg, *kw)
		91	return self.get(key)
		92
		93	def refresh(arg, *kw):
		94	key = key_generator(arg, *kw)
		95	value = fn(arg, *kw)
		96	self.set(key, value)
		97	return value
		98
		99	decorate.set = set_
		100	decorate.invalidate = invalidate
		101	decorate.refresh = refresh
		102	decorate.get = get
		103	decorate.original = fn
		104	decorate.key_generator = key_generator
		105
		106	return decorate
		107
		108	return decorator
		109
		110
		111	def make_region(arg, *kw):
		112	return RhodeCodeCacheRegion(arg, *kw)
		113
		114
		115	def get_default_cache_settings(settings, prefixes=None):
		116	prefixes = prefixes or []
		117	cache_settings = {}
		118	for key in settings.keys():
		119	for prefix in prefixes:
		120	if key.startswith(prefix):
		121	name = key.split(prefix)[1].strip()
		122	val = settings[key]
		123	if isinstance(val, basestring):
		124	val = val.strip()
		125	cache_settings[name] = val
		126	return cache_settings
		127
		128
		129	def compute_key_from_params(*args):
		130	"""
		131	Helper to compute key from given params to be used in cache manager
		132	"""
		133	return sha1("_".join(map(safe_str, args)))
		134
		135
		136	def key_generator(namespace, fn):
		137	fname = fn.__name__
		138
		139	def generate_key(*args):
		140	namespace_pref = namespace or 'default'
		141	arg_key = compute_key_from_params(*args)
		142	final_key = "{}:{}_{}".format(namespace_pref, fname, arg_key)
		143
		144	return final_key
		145
		146	return generate_key
		147
		148
		149	def get_or_create_region(region_name, region_namespace=None):
		150	from rhodecode.lib.rc_cache.backends import FileNamespaceBackend
		151	region_obj = region_meta.dogpile_cache_regions.get(region_name)
		152	if not region_obj:
		153	raise EnvironmentError(
		154	'Region `{}` not in configured: {}.'.format(
		155	region_name, region_meta.dogpile_cache_regions.keys()))
		156
		157	region_uid_name = '{}:{}'.format(region_name, region_namespace)
		158	if isinstance(region_obj.actual_backend, FileNamespaceBackend):
		159	region_exist = region_meta.dogpile_cache_regions.get(region_namespace)
		160	if region_exist:
		161	log.debug('Using already configured region: %s', region_namespace)
		162	return region_exist
		163	cache_dir = region_meta.dogpile_config_defaults['cache_dir']
		164	expiration_time = region_obj.expiration_time
		165
		166	if not os.path.isdir(cache_dir):
		167	os.makedirs(cache_dir)
		168	new_region = make_region(
		169	name=region_uid_name, function_key_generator=key_generator
		170	)
		171	namespace_filename = os.path.join(
		172	cache_dir, "{}.cache.dbm".format(region_namespace))
		173	# special type that allows 1db per namespace
		174	new_region.configure(
		175	backend='dogpile.cache.rc.file_namespace',
		176	expiration_time=expiration_time,
		177	arguments={"filename": namespace_filename}
		178	)
		179
		180	# create and save in region caches
		181	log.debug('configuring new region: %s',region_uid_name)
		182	region_obj = region_meta.dogpile_cache_regions[region_namespace] = new_region
		183
		184	return region_obj
		185
		186
		187	def clear_cache_namespace(cache_region, cache_namespace_uid):
		188	region = get_or_create_region(cache_region, cache_namespace_uid)
		189	cache_keys = region.backend.list_keys(prefix=cache_namespace_uid)
		190	num_delete_keys = len(cache_keys)
		191	if num_delete_keys:
		192	region.delete_multi(cache_keys)
		193	return num_delete_keys
		194
		195
		196	class ActiveRegionCache(object):
		197	def __init__(self, context):
		198	self.context = context
		199
		200	def should_invalidate(self):
		201	return False
		202
		203
		204	class FreshRegionCache(object):
		205	def __init__(self, context):
		206	self.context = context
		207
		208	def should_invalidate(self):
		209	return True
		210
		211
		212	class InvalidationContext(object):
		213	"""
		214	usage::
		215
		216	from rhodecode.lib import rc_cache
		217
		218	cache_namespace_uid = CacheKey.SOME_NAMESPACE.format(1)
		219	region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
		220
		221	@region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=True)
		222	def heavy_compute(cache_name, param1, param2):
		223	print('COMPUTE {}, {}, {}'.format(cache_name, param1, param2))
		224
		225	# invalidation namespace is shared namespace key for all process caches
		226	# we use it to send a global signal
		227	invalidation_namespace = 'repo_cache:1'
		228
		229	inv_context_manager = rc_cache.InvalidationContext(
		230	uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
		231	with inv_context_manager as invalidation_context:
		232	args = ('one', 'two')
		233	# re-compute and store cache if we get invalidate signal
		234	if invalidation_context.should_invalidate():
		235	result = heavy_compute.refresh(*args)
		236	else:
		237	result = heavy_compute(*args)
		238
		239	compute_time = inv_context_manager.compute_time
		240	log.debug('result computed in %.3fs' ,compute_time)
		241
		242	# To send global invalidation signal, simply run
		243	CacheKey.set_invalidate(invalidation_namespace)
		244
		245	"""
		246
		247	def __repr__(self):
		248	return '<InvalidationContext:{}[{}]>'.format(
		249	safe_str(self.cache_key), safe_str(self.uid))
		250
		251	def __init__(self, uid, invalidation_namespace='',
		252	raise_exception=False, thread_scoped=None):
		253	self.uid = uid
		254	self.invalidation_namespace = invalidation_namespace
		255	self.raise_exception = raise_exception
		256	self.proc_id = safe_unicode(rhodecode.CONFIG.get('instance_id') or 'DEFAULT')
		257	self.thread_id = 'global'
		258
		259	if thread_scoped is None:
		260	# if we set "default" we can override this via .ini settings
		261	thread_scoped = str2bool(rhodecode.CONFIG.get('cache_thread_scoped'))
		262
		263	# Append the thread id to the cache key if this invalidation context
		264	# should be scoped to the current thread.
		265	if thread_scoped is True:
		266	self.thread_id = threading.current_thread().ident
		267
		268	self.cache_key = compute_key_from_params(uid)
		269	self.cache_key = 'proc:{}_thread:{}_{}'.format(
		270	self.proc_id, self.thread_id, self.cache_key)
		271	self.compute_time = 0
		272
		273	def get_or_create_cache_obj(self, uid, invalidation_namespace=''):
		274	cache_obj = CacheKey.get_active_cache(self.cache_key)
		275	log.debug('Fetched cache obj %s using %s cache key.', cache_obj, self.cache_key)
		276	invalidation_namespace = invalidation_namespace or self.invalidation_namespace
		277	if not cache_obj:
		278	cache_obj = CacheKey(self.cache_key, cache_args=invalidation_namespace)
		279	return cache_obj
		280
		281	def __enter__(self):
		282	"""
		283	Test if current object is valid, and return CacheRegion function
		284	that does invalidation and calculation
		285	"""
		286	# register or get a new key based on uid
		287	self.cache_obj = self.get_or_create_cache_obj(uid=self.uid)
		288	self._start_time = time.time()
		289	if self.cache_obj.cache_active:
		290	# means our cache obj is existing and marked as it's
		291	# cache is not outdated, we return ActiveRegionCache
		292	self.skip_cache_active_change = True
		293
		294	return ActiveRegionCache(context=self)
		295
		296	# the key is either not existing or set to False, we return
		297	# the real invalidator which re-computes value. We additionally set
		298	# the flag to actually update the Database objects
		299	self.skip_cache_active_change = False
		300	return FreshRegionCache(context=self)
		301
		302	def __exit__(self, exc_type, exc_val, exc_tb):
		303	# save compute time
		304	self.compute_time = time.time() - self._start_time
		305
		306	if self.skip_cache_active_change:
		307	return
		308
		309	try:
		310	self.cache_obj.cache_active = True
		311	Session().add(self.cache_obj)
		312	Session().commit()
		313	except IntegrityError:
		314	# if we catch integrity error, it means we inserted this object
		315	# assumption is that's really an edge race-condition case and
		316	# it's safe is to skip it
		317	Session().rollback()
		318	except Exception:
		319	log.exception('Failed to commit on cache key update')
		320	Session().rollback()
		321	if self.raise_exception:
		322	raise

rhodecode/lib/request.py

0 created 644 +29 0

			@@ -0,0 +1,29 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2017-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21	from uuid import uuid4
		22	from pyramid.decorator import reify
		23	from pyramid.request import Request as _Request
		24
		25
		26	class Request(_Request):
		27	@reify
		28	def req_id(self):
		29	return str(uuid4())

rhodecode/public/images/ee_features/admin_branch_permissions.png

0 created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

rhodecode/public/images/ee_features/repo_branch_permissions.png

0 created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

rhodecode/templates/admin/permissions/permissions_branch.mako

0 created 644 +9 0

			@@ -0,0 +1,9 b''
		1	<div class="panel panel-default">
		2	<div class="panel-heading">
		3	<h3 class="panel-title">${_('Default Permissions for Branches.')}</h3>
		4	</div>
		5	<div class="panel-body">
		6	<h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')\|n}</h4>
		7	<img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/admin_branch_permissions.png')}"/>
		8	</div>
		9	</div>

rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako

0 created 644 +9 0

			@@ -0,0 +1,9 b''
		1	<div class="panel panel-default">
		2	<div class="panel-heading">
		3	<h3 class="panel-title">${_('Repository Branch Permissions.')}</h3>
		4	</div>
		5	<div class="panel-body">
		6	<h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')\|n}</h4>
		7	<img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/repo_branch_permissions.png')}"/>
		8	</div>
		9	</div>

rhodecode/templates/admin/settings/settings_exceptions.mako

0 created 644 +38 0

			@@ -0,0 +1,38 b''
		1	<div class="panel panel-default">
		2	<div class="panel-heading">
		3	<h3 class="panel-title">${_('Exceptions Tracker - Exception ID')}: ${c.exception_id}</h3>
		4	</div>
		5	<div class="panel-body">
		6	% if c.traceback:
		7
		8	<h4>${_('Exception `{}` generated on UTC date: {}').format(c.traceback.get('exc_type', 'NO_TYPE'), c.traceback.get('exc_utc_date', 'NO_DATE'))}</h4>
		9	<pre>${c.traceback.get('exc_message', 'NO_MESSAGE')}</pre>
		10
		11	% else:
		12	${_('Unable to Read Exception. It might be removed or non-existing.')}
		13	% endif
		14	</div>
		15	</div>
		16
		17
		18	% if c.traceback:
		19	<div class="panel panel-danger">
		20	<div class="panel-heading" id="advanced-delete">
		21	<h3 class="panel-title">${_('Delete this Exception')}</h3>
		22	</div>
		23	<div class="panel-body">
		24	${h.secure_form(h.route_path('admin_settings_exception_tracker_delete', exception_id=c.exception_id), request=request)}
		25	<div style="margin: 0 0 20px 0" class="fake-space"></div>
		26
		27	<div class="field">
		28	<button class="btn btn-small btn-danger" type="submit"
		29	onclick="return confirm('${_('Confirm to delete this exception')}');">
		30	<i class="icon-remove-sign"></i>
		31	${_('Delete This Exception')}
		32	</button>
		33	</div>
		34
		35	${h.end_form()}
		36	</div>
		37	</div>
		38	% endif

rhodecode/templates/admin/settings/settings_exceptions_browse.mako

0 created 644 +57 0

			@@ -0,0 +1,57 b''
		1	<div class="panel panel-default">
		2	<div class="panel-heading">
		3	<h3 class="panel-title">${_('Exceptions Tracker ')}</h3>
		4	</div>
		5	<div class="panel-body">
		6	% if c.exception_list_count == 1:
		7	${_('There is {} stored exception.').format(c.exception_list_count)}
		8	% else:
		9	${_('There are {} stored exceptions.').format(c.exception_list_count)}
		10	% endif
		11	${_('Store directory')}: ${c.exception_store_dir}
		12
		13	${h.secure_form(h.route_path('admin_settings_exception_tracker_delete_all'), request=request)}
		14	<div style="margin: 0 0 20px 0" class="fake-space"></div>
		15
		16	<div class="field">
		17	<button class="btn btn-small btn-danger" type="submit"
		18	onclick="return confirm('${_('Confirm to delete all exceptions')}');">
		19	<i class="icon-remove-sign"></i>
		20	${_('Delete All')}
		21	</button>
		22	</div>
		23
		24	${h.end_form()}
		25
		26	</div>
		27	</div>
		28
		29
		30	<div class="panel panel-default">
		31	<div class="panel-heading">
		32	<h3 class="panel-title">${_('Exceptions Tracker - Showing the last {} Exceptions').format(c.limit)}.</h3>
		33	<a class="panel-edit" href="${h.current_route_path(request, limit=c.next_limit)}">${_('Show more')}</a>
		34	</div>
		35	<div class="panel-body">
		36	<table class="rctable">
		37	<tr>
		38	<th>#</th>
		39	<th>Exception ID</th>
		40	<th>Date</th>
		41	<th>App Type</th>
		42	<th>Exc Type</th>
		43	</tr>
		44	<% cnt = len(c.exception_list)%>
		45	% for tb in c.exception_list:
		46	<tr>
		47	<td>${cnt}</td>
		48	<td><a href="${h.route_path('admin_settings_exception_tracker_show', exception_id=tb['exc_id'])}"><code>${tb['exc_id']}</code></a></td>
		49	<td>${h.format_date(tb['exc_utc_date'])}</td>
		50	<td>${tb['app_type']}</td>
		51	<td>${tb['exc_type']}</td>
		52	</tr>
		53	<% cnt -=1 %>
		54	% endfor
		55	</table>
		56	</div>
		57	</div>

rhodecode/templates/admin/users/user_edit_caches.mako

0 created 644 +41 0

			@@ -0,0 +1,41 b''
		1	<%namespace name="base" file="/base/base.mako"/>
		2
		3	<div class="panel panel-default">
		4	<div class="panel-heading">
		5	<h3 class="panel-title">${_('Caches')}</h3>
		6	</div>
		7	<div class="panel-body">
		8	<p>
		9	Cache keys used for storing cached values of user permissions and authentication plugin cache.
		10	Invalidating the cache will remove those entries.
		11	</p>
		12
		13	<pre>
		14	region: ${c.region.name}
		15	backend: ${c.region.actual_backend.__class__}
		16	store: ${c.region.actual_backend.get_store()}
		17
		18	% if c.user_keys:
		19	${len(c.user_keys)} <a href="#showKeys" onclick="$('#show-keys').toggle()">${_('Show all')}</a>
		20	<span id="show-keys" style="display: none">
		21	% for k in c.user_keys:
		22	- ${k}
		23	% endfor
		24	</span>
		25	% else:
		26	NO KEYS FOUND
		27	% endif
		28	</pre>
		29	<p></p>
		30	${h.secure_form(h.route_path('edit_user_caches_update', user_id=c.user.user_id), request=request)}
		31	<div class="form">
		32	<div class="fields">
		33	${h.submit('reset_cache_%s' % c.user.user_id, _('Invalidate user cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate user cache')+"');")}
		34	</div>
		35	</div>
		36	${h.end_form()}
		37
		38	</div>
		39	</div>
		40
		41

rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py

0 created 644 +94 0

			@@ -0,0 +1,94 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2010-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21	import os
		22	import pytest
		23
		24	from rhodecode.tests import (
		25	TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS,
		26	TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
		27	from rhodecode.tests.vcs_operations import (
		28	Command, _check_proper_hg_push, _check_proper_git_push, _add_files_and_push)
		29
		30
		31	@pytest.mark.usefixtures("disable_anonymous_user")
		32	class TestVCSOperations(object):
		33
		34	@pytest.mark.parametrize('username, password', [
		35	(TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS),
		36	(TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS),
		37	])
		38	@pytest.mark.parametrize('branch_perm', [
		39	'branch.none',
		40	'branch.merge',
		41	'branch.push',
		42	'branch.push_force',
		43	])
		44	def test_push_to_protected_branch_fails_with_message_hg(
		45	self, rc_web_server, tmpdir, branch_perm, user_util,
		46	branch_permission_setter, username, password):
		47	repo = user_util.create_repo(repo_type='hg')
		48	repo_name = repo.repo_name
		49	branch_permission_setter(repo_name, username, permission=branch_perm)
		50
		51	clone_url = rc_web_server.repo_clone_url(
		52	repo.repo_name, user=username, passwd=password)
		53	Command(os.path.dirname(tmpdir.strpath)).execute(
		54	'hg clone', clone_url, tmpdir.strpath)
		55
		56	stdout, stderr = _add_files_and_push(
		57	'hg', tmpdir.strpath, clone_url=clone_url)
		58	if branch_perm in ['branch.push', 'branch.push_force']:
		59	_check_proper_hg_push(stdout, stderr)
		60	else:
		61	msg = "Branch `default` changes rejected by rule `*`=>{}".format(branch_perm)
		62	assert msg in stdout
		63	assert "transaction abort" in stdout
		64
		65	@pytest.mark.parametrize('username, password', [
		66	(TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS),
		67	(TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS),
		68	])
		69	@pytest.mark.parametrize('branch_perm', [
		70	'branch.none',
		71	'branch.merge',
		72	'branch.push',
		73	'branch.push_force',
		74	])
		75	def test_push_to_protected_branch_fails_with_message_git(
		76	self, rc_web_server, tmpdir, branch_perm, user_util,
		77	branch_permission_setter, username, password):
		78	repo = user_util.create_repo(repo_type='git')
		79	repo_name = repo.repo_name
		80	branch_permission_setter(repo_name, username, permission=branch_perm)
		81
		82	clone_url = rc_web_server.repo_clone_url(
		83	repo.repo_name, user=username, passwd=password)
		84	Command(os.path.dirname(tmpdir.strpath)).execute(
		85	'git clone', clone_url, tmpdir.strpath)
		86
		87	stdout, stderr = _add_files_and_push(
		88	'git', tmpdir.strpath, clone_url=clone_url)
		89	if branch_perm in ['branch.push', 'branch.push_force']:
		90	_check_proper_git_push(stdout, stderr)
		91	else:
		92	msg = "Branch `master` changes rejected by rule `*`=>{}".format(branch_perm)
		93	assert msg in stderr
		94	assert "(pre-receive hook declined)" in stderr

rhodecode/tests/vcs_operations/test_vcs_operations_force_push.py

0 created 644 +122 0

			@@ -0,0 +1,122 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2010-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21
		22	import os
		23	import pytest
		24
		25	from rhodecode.tests import TEST_USER_ADMIN_LOGIN
		26	from rhodecode.tests.vcs_operations import (
		27	Command, _check_proper_hg_push, _check_proper_git_push,
		28	_add_files, _add_files_and_push)
		29
		30
		31	@pytest.mark.usefixtures("disable_anonymous_user")
		32	class TestVCSOperations(object):
		33
		34	def test_push_force_hg(self, rc_web_server, tmpdir, user_util):
		35	repo = user_util.create_repo(repo_type='hg')
		36	clone_url = rc_web_server.repo_clone_url(repo.repo_name)
		37	Command(os.path.dirname(tmpdir.strpath)).execute(
		38	'hg clone', clone_url, tmpdir.strpath)
		39
		40	stdout, stderr = _add_files_and_push(
		41	'hg', tmpdir.strpath, clone_url=clone_url)
		42	_check_proper_hg_push(stdout, stderr)
		43
		44	# rewrite history, and push with force
		45	Command(tmpdir.strpath).execute(
		46	'hg checkout -r 1 && hg commit -m "starting new head"')
		47	_add_files('hg', tmpdir.strpath, clone_url=clone_url)
		48
		49	stdout, stderr = Command(tmpdir.strpath).execute(
		50	'hg push --verbose -f {}'.format(clone_url))
		51
		52	_check_proper_hg_push(stdout, stderr)
		53
		54	def test_push_force_git(self, rc_web_server, tmpdir, user_util):
		55	repo = user_util.create_repo(repo_type='git')
		56	clone_url = rc_web_server.repo_clone_url(repo.repo_name)
		57	Command(os.path.dirname(tmpdir.strpath)).execute(
		58	'git clone', clone_url, tmpdir.strpath)
		59
		60	stdout, stderr = _add_files_and_push(
		61	'git', tmpdir.strpath, clone_url=clone_url)
		62	_check_proper_git_push(stdout, stderr)
		63
		64	# rewrite history, and push with force
		65	Command(tmpdir.strpath).execute(
		66	'git reset --hard HEAD~2')
		67	stdout, stderr = Command(tmpdir.strpath).execute(
		68	'git push -f {} master'.format(clone_url))
		69
		70	assert '(forced update)' in stderr
		71
		72	def test_push_force_hg_blocked_by_branch_permissions(
		73	self, rc_web_server, tmpdir, user_util, branch_permission_setter):
		74	repo = user_util.create_repo(repo_type='hg')
		75	repo_name = repo.repo_name
		76	username = TEST_USER_ADMIN_LOGIN
		77	branch_permission_setter(repo_name, username, permission='branch.push')
		78
		79	clone_url = rc_web_server.repo_clone_url(repo.repo_name)
		80	Command(os.path.dirname(tmpdir.strpath)).execute(
		81	'hg clone', clone_url, tmpdir.strpath)
		82
		83	stdout, stderr = _add_files_and_push(
		84	'hg', tmpdir.strpath, clone_url=clone_url)
		85	_check_proper_hg_push(stdout, stderr)
		86
		87	# rewrite history, and push with force
		88	Command(tmpdir.strpath).execute(
		89	'hg checkout -r 1 && hg commit -m "starting new head"')
		90	_add_files('hg', tmpdir.strpath, clone_url=clone_url)
		91
		92	stdout, stderr = Command(tmpdir.strpath).execute(
		93	'hg push --verbose -f {}'.format(clone_url))
		94
		95	assert "Branch `default` changes rejected by rule `*`=>branch.push" in stdout
		96	assert "FORCE PUSH FORBIDDEN" in stdout
		97	assert "transaction abort" in stdout
		98
		99	def test_push_force_git_blocked_by_branch_permissions(
		100	self, rc_web_server, tmpdir, user_util, branch_permission_setter):
		101	repo = user_util.create_repo(repo_type='git')
		102	repo_name = repo.repo_name
		103	username = TEST_USER_ADMIN_LOGIN
		104	branch_permission_setter(repo_name, username, permission='branch.push')
		105
		106	clone_url = rc_web_server.repo_clone_url(repo.repo_name)
		107	Command(os.path.dirname(tmpdir.strpath)).execute(
		108	'git clone', clone_url, tmpdir.strpath)
		109
		110	stdout, stderr = _add_files_and_push(
		111	'git', tmpdir.strpath, clone_url=clone_url)
		112	_check_proper_git_push(stdout, stderr)
		113
		114	# rewrite history, and push with force
		115	Command(tmpdir.strpath).execute(
		116	'git reset --hard HEAD~2')
		117	stdout, stderr = Command(tmpdir.strpath).execute(
		118	'git push -f {} master'.format(clone_url))
		119
		120	assert "Branch `master` changes rejected by rule `*`=>branch.push" in stderr
		121	assert "FORCE PUSH FORBIDDEN" in stderr
		122	assert "(pre-receive hook declined)" in stderr

rhodecode/tests/vcs_operations/test_vcs_operations_new_branch_push.py

0 created 644 +115 0

			@@ -0,0 +1,115 b''
		1	# -- coding: utf-8 --
		2
		3	# Copyright (C) 2010-2018 RhodeCode GmbH
		4	#
		5	# This program is free software: you can redistribute it and/or modify
		6	# it under the terms of the GNU Affero General Public License, version 3
		7	# (only), as published by the Free Software Foundation.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU Affero General Public License
		15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	#
		17	# This program is dual-licensed. If you wish to learn more about the
		18	# RhodeCode Enterprise Edition, including its added features, Support services,
		19	# and proprietary license terms, please see https://rhodecode.com/licenses/
		20
		21
		22	import os
		23	import pytest
		24
		25	from rhodecode.tests import TEST_USER_ADMIN_LOGIN
		26	from rhodecode.tests.vcs_operations import (
		27	Command, _check_proper_hg_push, _check_proper_git_push, _add_files_and_push)
		28
		29
		30	@pytest.mark.usefixtures("disable_anonymous_user")
		31	class TestVCSOperations(object):
		32
		33	def test_push_new_branch_hg(self, rc_web_server, tmpdir, user_util):
		34	repo = user_util.create_repo(repo_type='hg')
		35	clone_url = rc_web_server.repo_clone_url(repo.repo_name)
		36	Command(os.path.dirname(tmpdir.strpath)).execute(
		37	'hg clone', clone_url, tmpdir.strpath)
		38
		39	stdout, stderr = _add_files_and_push(
		40	'hg', tmpdir.strpath, clone_url=clone_url)
		41	_check_proper_hg_push(stdout, stderr)
		42
		43	# start new branch, and push file into it
		44	Command(tmpdir.strpath).execute(
		45	'hg branch dev && hg commit -m "starting dev branch"')
		46	stdout, stderr = _add_files_and_push(
		47	'hg', tmpdir.strpath, clone_url=clone_url, target_branch='dev',
		48	new_branch=True)
		49
		50	_check_proper_hg_push(stdout, stderr)
		51
		52	def test_push_new_branch_git(self, rc_web_server, tmpdir, user_util):
		53	repo = user_util.create_repo(repo_type='git')
		54	clone_url = rc_web_server.repo_clone_url(repo.repo_name)
		55	Command(os.path.dirname(tmpdir.strpath)).execute(
		56	'git clone', clone_url, tmpdir.strpath)
		57
		58	stdout, stderr = _add_files_and_push(
		59	'git', tmpdir.strpath, clone_url=clone_url)
		60	_check_proper_git_push(stdout, stderr)
		61
		62	# start new branch, and push file into it
		63	Command(tmpdir.strpath).execute('git checkout -b dev')
		64	stdout, stderr = _add_files_and_push(
		65	'git', tmpdir.strpath, clone_url=clone_url, target_branch='dev',
		66	new_branch=True)
		67
		68	_check_proper_git_push(stdout, stderr, branch='dev')
		69
		70	def test_push_new_branch_hg_with_branch_permissions_no_force_push(
		71	self, rc_web_server, tmpdir, user_util, branch_permission_setter):
		72	repo = user_util.create_repo(repo_type='hg')
		73	repo_name = repo.repo_name
		74	username = TEST_USER_ADMIN_LOGIN
		75	branch_permission_setter(repo_name, username, permission='branch.push')
		76
		77	clone_url = rc_web_server.repo_clone_url(repo.repo_name)
		78	Command(os.path.dirname(tmpdir.strpath)).execute(
		79	'hg clone', clone_url, tmpdir.strpath)
		80
		81	stdout, stderr = _add_files_and_push(
		82	'hg', tmpdir.strpath, clone_url=clone_url)
		83	_check_proper_hg_push(stdout, stderr)
		84
		85	# start new branch, and push file into it
		86	Command(tmpdir.strpath).execute(
		87	'hg branch dev && hg commit -m "starting dev branch"')
		88	stdout, stderr = _add_files_and_push(
		89	'hg', tmpdir.strpath, clone_url=clone_url, target_branch='dev',
		90	new_branch=True)
		91
		92	_check_proper_hg_push(stdout, stderr)
		93
		94	def test_push_new_branch_git_with_branch_permissions_no_force_push(
		95	self, rc_web_server, tmpdir, user_util, branch_permission_setter):
		96	repo = user_util.create_repo(repo_type='git')
		97	repo_name = repo.repo_name
		98	username = TEST_USER_ADMIN_LOGIN
		99	branch_permission_setter(repo_name, username, permission='branch.push')
		100
		101	clone_url = rc_web_server.repo_clone_url(repo.repo_name)
		102	Command(os.path.dirname(tmpdir.strpath)).execute(
		103	'git clone', clone_url, tmpdir.strpath)
		104
		105	stdout, stderr = _add_files_and_push(
		106	'git', tmpdir.strpath, clone_url=clone_url)
		107	_check_proper_git_push(stdout, stderr)
		108
		109	# start new branch, and push file into it
		110	Command(tmpdir.strpath).execute('git checkout -b dev')
		111	stdout, stderr = _add_files_and_push(
		112	'git', tmpdir.strpath, clone_url=clone_url, target_branch='dev',
		113	new_branch=True)
		114
		115	_check_proper_git_push(stdout, stderr, branch='dev')

.bumpversion.cfg

0 +1 -1

              [bumpversion]
-             current_version = 4.12.4
+             current_version = 4.13.0
              message = release: Bump version {current_version} to {new_version}
              [bumpversion:file:rhodecode/VERSION]

.release.cfg

0 +4 -9

              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.12.4
-             [task:updated_translation]
+             state = in_progress
+             version = 4.13.0
              [task:generate_js_routes]

MANIFEST.in

0 +2 0

              # 502 page
              include rhodecode/public/502.html
+             # robots
+             include rhodecode/public/robots.txt
              # images, css
              include rhodecode/public/css/*.css

README.rst

0 +4 -4

              ``RhodeCode`` is a fast and powerful management tool for Mercurial_ and GIT_
              and Subversion_ with a built in push/pull server, full text search,
-             pull requests and powerfull code-review system. It works on http/https and
+             pull requests and powerful code-review system. It works on http/https and
              has a few unique features like:
-              - plugable architecture
               - advanced permission system with IP restrictions
               - rich set of authentication plugins including LDAP,
              - Official issue tracker `RhodeCode Issue tracker <https://issues.rhodecode.com>`_
-             - Search our community portal `Community portal <https://community.rhodecode.com>`_
+             - Official Slack Community Channel `RhodeCode Slack <https://rhodecode.com/join>`_
-             - Join #rhodecode on FreeNode (irc.freenode.net)
-               or use http://webchat.freenode.net/?channels=rhodecode for web access to irc.
+             - Search our community portal `Community portal <https://community.rhodecode.com>`_
              - You can also follow RhodeCode on twitter **@RhodeCode** where we often post
                news and other interesting stuff about RhodeCode.

bower.json

0 +10 -10

		@@ -3,15 +3,15 b''
3	3	"description": "User interface for elements for rhodecode",
4	4	"main": "index.html",
5	5	"dependencies": {
6		"webcomponentsjs": "^~~0.7.22~~",
7		"polymer": "Polymer/polymer#^~~1.6.1~~",
8		"paper-button": "PolymerElements/paper-button#^~~1.0.13~~",
9		"paper-spinner": "PolymerElements/paper-spinner#^1.2.0",
10		"paper-tooltip": "PolymerElements/paper-tooltip#^1.1.2",
11		"paper-toast": "PolymerElements/paper-toast#^~~1.3.0~~",
12		"paper-toggle-button": "PolymerElements/paper-toggle-button#^~~1.2.0~~",
13		"iron-ajax": "PolymerElements/iron-ajax#^~~1.4~~.3",
14		"iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^~~1.0.13~~",
15		"iron-a11y-keys": "PolymerElements/iron-a11y-keys#^~~1.0.6~~"
	6	"webcomponentsjs": "^1.2.3",
	7	"polymer": "Polymer/polymer#^2.6.0",
	8	"paper-button": "PolymerElements/paper-button#^2.1.2",
	9	"paper-spinner": "PolymerElements/paper-spinner#^2.1.0",
	10	"paper-tooltip": "PolymerElements/paper-tooltip#^2.1.1",
	11	"paper-toast": "PolymerElements/paper-toast#^2.1.2",
	12	"paper-toggle-button": "PolymerElements/paper-toggle-button#^2.1.1",
	13	"iron-ajax": "PolymerElements/iron-ajax#^2.1.3",
	14	"iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^2.2.0",
	15	"iron-a11y-keys": "PolymerElements/iron-a11y-keys#^2.1.2"
16	16	}
17	17	}

configs/development.ini

0 +91 -78

              ################################################################################
              ##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
-             # The %(here)s variable will be replaced with the parent directory of this file#
              ################################################################################
              [DEFAULT]
              host = 127.0.0.1
              port = 5000
-             ##################################
-             ##     WAITRESS WSGI SERVER     ##
-             ## Recommended for Development  ##
-             ##################################
+             ###########################################################
+             ## WAITRESS WSGI SERVER - Recommended for Development  ####
+             ###########################################################
              use = egg:waitress#main
              ## number of worker threads
              ## run with gunicorn --log-config rhodecode.ini --paste rhodecode.ini
              #use = egg:gunicorn#main
-             ## Sets the number of process workers. You must set `instance_id = *`
-             ## when this option is set to more than one worker, recommended
-             ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
-             ## The `instance_id = *` must be set in the [app:main] section below
+             ## Sets the number of process workers. More workers means more concurent connections
+             ## RhodeCode can handle at the same time. Each additional worker also it increases
+             ## memory usage as each has it's own set of caches.
+             ## Recommended value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers, but no more
+             ## than 8-10 unless for really big deployments .e.g 700-1000 users.
+             ## `instance_id = *` must be set in the [app:main] section below (which is the default)
+             ## when using more than 1 worker.
              #workers = 2
-             ## number of threads for each of the worker, must be set to 1 for gevent
-             ## generally recommended to be at 1
-             #threads = 1
-             ## process name
+             ## process name visible in process list
              #proc_name = rhodecode
              ## type of worker class, one of sync, gevent
              ## recommended for bigger setup is using of of other than sync one
              prefix = /
              [app:main]
+             ## The %(here)s variable will be replaced with the absolute path of parent directory
+             ## of this file
+             ## In addition ENVIRONMENT variables usage is possible, e.g
+             ## sqlalchemy.db1.url = {ENV_RC_DB_URL}
              use = egg:rhodecode-enterprise-ce
              ## enable proxy prefix middleware, defined above
              ## autogenerate javascript routes file on startup
              generate_js_files = false
-             ## Optional Languages
-             ## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
+             ## System global default language.
+             ## All available languages: en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
              lang = en
-             ## perform a full repository scan on each server start, this should be
-             ## set to false after first startup, to allow faster server restarts.
+             ## Perform a full repository scan and import on each server start.
+             ## Settings this to true could lead to very long startup time.
              startup.import_repos = false
              ## Uncomment and set this path to use archive download cache.
              ## SSH calls. Set this for events to receive proper url for SSH calls.
              app.base_url = http://rhodecode.local
-             ## change this to unique ID for security
+             ## Unique application ID. Should be a random unique string for security.
              app_instance_uuid = rc-production
-             ## cut off limit for large diffs (size in bytes). If overall diff size on
+             ## Cut off limit for large diffs (size in bytes). If overall diff size on
              ## commit, or pull request exceeds this limit this diff will be displayed
              ## partially. E.g 512000 == 512Kb
              cut_off_limit_diff = 512000
-             ## cut off limit for large files inside diffs (size in bytes). Each individual
+             ## Cut off limit for large files inside diffs (size in bytes). Each individual
              ## file inside diff which exceeds this limit will be displayed partially.
              ##  E.g 128000 == 128Kb
              cut_off_limit_file = 128000
-             ## use cache version of scm repo everywhere
+             ## use cached version of vcs repositories everywhere. Recommended to be `true`
              vcs_full_cache = true
-             ## force https in RhodeCode, fixes https redirects, assumes it's always https
+             ## Force https in RhodeCode, fixes https redirects, assumes it's always https.
              ## Normally this is controlled by proper http flags sent from http server
              force_https = false
              #    GistView:*
              api_access_controllers_whitelist =
-             ## default encoding used to convert from and to unicode
+             ## Default encoding used to convert from and to unicode
              ## can be also a comma separated list of encoding in case of mixed encodings
              default_encoding = UTF-8
              ## allows to setup custom hooks in settings page
              allow_custom_hooks_settings = true
-             ## generated license token, goto license page in RhodeCode settings to obtain
-             ## new token
+             ## Generated license token required for EE edition license.
+             ## New generated token value can be found in Admin > settings > license page.
              license_token =
              ## supervisor connection uri, for managing supervisor and logs.
              ## tasks will never be sent to the queue, but executed locally instead.
              celery.task_always_eager = false
-             ####################################
-             ###         BEAKER CACHE        ####
-             ####################################
-             # default cache dir for templates.  Putting this into a ramdisk
-             ## can boost performance, eg. %(here)s/data_ramdisk
+             #####################################
+             ###         DOGPILE CACHE        ####
+             #####################################
+             ## Default cache dir for caches.  Putting this into a ramdisk
+             ## can boost performance, eg. /tmpfs/data_ramdisk, however this directory might require
+             ## large amount of space
              cache_dir = %(here)s/data
-             ## locking and default file storage for Beaker. Putting this into a ramdisk
-             ## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
-             beaker.cache.data_dir = %(here)s/data/cache/beaker_data
-             beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
-             beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
+             ## `cache_perms` cache settings for permission tree, auth TTL.
+             rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
+             rc_cache.cache_perms.expiration_time = 300
-             beaker.cache.super_short_term.type = memory
-             beaker.cache.super_short_term.expire = 10
-             beaker.cache.super_short_term.key_length = 256
+             ## alternative `cache_perms` redis backend with distributed lock
+             #rc_cache.cache_perms.backend = dogpile.cache.rc.redis
+             #rc_cache.cache_perms.expiration_time = 300
+             ## redis_expiration_time needs to be greater then expiration_time
+             #rc_cache.cache_perms.arguments.redis_expiration_time = 7200
+             #rc_cache.cache_perms.arguments.socket_timeout = 30
+             #rc_cache.cache_perms.arguments.host = localhost
+             #rc_cache.cache_perms.arguments.port = 6379
+             #rc_cache.cache_perms.arguments.db = 0
+             #rc_cache.cache_perms.arguments.distributed_lock = true
-             beaker.cache.short_term.type = memory
-             beaker.cache.short_term.expire = 60
-             beaker.cache.short_term.key_length = 256
-             beaker.cache.long_term.type = memory
-             beaker.cache.long_term.expire = 36000
-             beaker.cache.long_term.key_length = 256
+             ## `cache_repo` cache settings for FileTree, Readme, RSS FEEDS
+             rc_cache.cache_repo.backend = dogpile.cache.rc.file_namespace
+             rc_cache.cache_repo.expiration_time = 2592000
-             beaker.cache.sql_cache_short.type = memory
-             beaker.cache.sql_cache_short.expire = 10
-             beaker.cache.sql_cache_short.key_length = 256
+             ## alternative `cache_repo` redis backend with distributed lock
+             #rc_cache.cache_repo.backend = dogpile.cache.rc.redis
+             #rc_cache.cache_repo.expiration_time = 2592000
+             ## redis_expiration_time needs to be greater then expiration_time
+             #rc_cache.cache_repo.arguments.redis_expiration_time = 2678400
+             #rc_cache.cache_repo.arguments.socket_timeout = 30
+             #rc_cache.cache_repo.arguments.host = localhost
+             #rc_cache.cache_repo.arguments.port = 6379
+             #rc_cache.cache_repo.arguments.db = 1
+             #rc_cache.cache_repo.arguments.distributed_lock = true
-             ## default is memory cache, configure only if required
-             ## using multi-node or multi-worker setup
-             #beaker.cache.auth_plugins.type = ext:database
-             #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
-             #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
-             #beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
-             #beaker.cache.auth_plugins.sa.pool_recycle = 3600
-             #beaker.cache.auth_plugins.sa.pool_size = 10
-             #beaker.cache.auth_plugins.sa.max_overflow = 0
+             ## cache settings for SQL queries, this needs to use memory type backend
+             rc_cache.sql_cache_short.backend = dogpile.cache.rc.memory_lru
+             rc_cache.sql_cache_short.expiration_time = 30
-             beaker.cache.repo_cache_long.type = memorylru_base
-             beaker.cache.repo_cache_long.max_items = 4096
-             beaker.cache.repo_cache_long.expire = 2592000
+             ## `cache_repo_longterm` cache for repo object instances, this needs to use memory
+             ## type backend as the objects kept are not pickle serializable
+             rc_cache.cache_repo_longterm.backend = dogpile.cache.rc.memory_lru
+             ## by default we use 96H, this is using invalidation on push anyway
+             rc_cache.cache_repo_longterm.expiration_time = 345600
+             ## max items in LRU cache, reduce this number to save memory, and expire last used
+             ## cached objects
+             rc_cache.cache_repo_longterm.max_size = 10000
-             ## default is memorylru_base cache, configure only if required
-             ## using multi-node or multi-worker setup
-             #beaker.cache.repo_cache_long.type = ext:memcached
-             #beaker.cache.repo_cache_long.url = localhost:11211
-             #beaker.cache.repo_cache_long.expire = 1209600
-             #beaker.cache.repo_cache_long.key_length = 256
              ####################################
              ###       BEAKER SESSION        ####
              ####################################
              ## .session.type is type of storage options for the session, current allowed
-             ## types are file, ext:memcached, ext:database, and memory (default).
+             ## types are file, ext:memcached, ext:redis, ext:database, and memory (default).
              beaker.session.type = file
-             beaker.session.data_dir = %(here)s/data/sessions/data
+             beaker.session.data_dir = %(here)s/data/sessions
              ## db based session, fast, and allows easy management over logged in users
              #beaker.session.type = ext:database
              ################################################################################
              #set debug = false
-             ##############
-             ## STYLING  ##
-             ##############
+             # enable debug style page
              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
+             # pymysql is an alternative driver for MySQL, use in case of problems with default one
+             #sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
              sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
              # see sqlalchemy docs for other advanced settings
              ## which defaults to five.
              #sqlalchemy.db1.max_overflow = 10
+             ## Connection check ping, used to detect broken database connections
+             ## could be enabled to better handle cases if MySQL has gone away errors
+             #sqlalchemy.db1.ping_connection = true
              ##################
              ### VCS CONFIG ###
              ## Push/Pull operations protocol, available options are:
              ## `http` - use http-rpc backend (default)
-             ##
              vcs.scm_app_implementation = http
              ## Push/Pull operations hooks protocol, available options are:
              ## `http` - use http-rpc backend (default)
              vcs.hooks.protocol = http
+             ## Host on which this instance is listening for hooks. If vcsserver is in other location
+             ## this should be adjusted.
+             vcs.hooks.host = 127.0.0.1
              vcs.server.log_level = debug
-             ## Start VCSServer with this instance as a subprocess, usefull for development
+             ## Start VCSServer with this instance as a subprocess, useful for development
              vcs.start_server = false
              ## List of enabled VCS backends, available options are:
              ### LOGGING CONFIGURATION   ####
              ################################
              [loggers]
-             keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
+             keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
              [handlers]
              keys = console, console_sql
              formatter = color_formatter
              [handler_console_sql]
+             # "level = DEBUG" logs SQL queries and results.
+             # "level = INFO" logs SQL queries.
+             # "level = WARN" logs neither.  (Recommended for production systems.)
              class = StreamHandler
              args = (sys.stderr, )
-             level = DEBUG
+             level = WARN
              formatter = color_formatter_sql
              ################
              [formatter_color_formatter_sql]
              class = rhodecode.lib.logging_formatter.ColorFormatterSql
-             format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+             format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
              datefmt = %Y-%m-%d %H:%M:%S

configs/production.ini

0 +89 -74

              ################################################################################
              ##                 RHODECODE COMMUNITY EDITION CONFIGURATION                  ##
-             # The %(here)s variable will be replaced with the parent directory of this file#
              ################################################################################
              [DEFAULT]
              host = 127.0.0.1
              port = 5000
-             ##################################
-             ##     WAITRESS WSGI SERVER     ##
-             ## Recommended for Development  ##
-             ##################################
+             ###########################################################
+             ## WAITRESS WSGI SERVER - Recommended for Development  ####
+             ###########################################################
              #use = egg:waitress#main
              ## number of worker threads
              ## run with gunicorn --log-config rhodecode.ini --paste rhodecode.ini
              use = egg:gunicorn#main
-             ## Sets the number of process workers. You must set `instance_id = *`
-             ## when this option is set to more than one worker, recommended
-             ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
-             ## The `instance_id = *` must be set in the [app:main] section below
+             ## Sets the number of process workers. More workers means more concurent connections
+             ## RhodeCode can handle at the same time. Each additional worker also it increases
+             ## memory usage as each has it's own set of caches.
+             ## Recommended value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers, but no more
+             ## than 8-10 unless for really big deployments .e.g 700-1000 users.
+             ## `instance_id = *` must be set in the [app:main] section below (which is the default)
+             ## when using more than 1 worker.
              workers = 2
-             ## number of threads for each of the worker, must be set to 1 for gevent
-             ## generally recommended to be at 1
-             #threads = 1
-             ## process name
+             ## process name visible in process list
              proc_name = rhodecode
              ## type of worker class, one of sync, gevent
              ## recommended for bigger setup is using of of other than sync one
              worker_class = gevent
              ## The maximum number of simultaneous clients. Valid only for Gevent
-             #worker_connections = 10
+             worker_connections = 10
              ## max number of requests that worker will handle before being gracefully
              ## restarted, could prevent memory leaks
              max_requests = 1000
              prefix = /
              [app:main]
+             ## The %(here)s variable will be replaced with the absolute path of parent directory
+             ## of this file
+             ## In addition ENVIRONMENT variables usage is possible, e.g
+             ## sqlalchemy.db1.url = {ENV_RC_DB_URL}
              use = egg:rhodecode-enterprise-ce
              ## enable proxy prefix middleware, defined above
              ## autogenerate javascript routes file on startup
              generate_js_files = false
-             ## Optional Languages
-             ## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
+             ## System global default language.
+             ## All available languages: en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
              lang = en
-             ## perform a full repository scan on each server start, this should be
-             ## set to false after first startup, to allow faster server restarts.
+             ## Perform a full repository scan and import on each server start.
+             ## Settings this to true could lead to very long startup time.
              startup.import_repos = false
              ## Uncomment and set this path to use archive download cache.
              ## SSH calls. Set this for events to receive proper url for SSH calls.
              app.base_url = http://rhodecode.local
-             ## change this to unique ID for security
+             ## Unique application ID. Should be a random unique string for security.
              app_instance_uuid = rc-production
-             ## cut off limit for large diffs (size in bytes). If overall diff size on
+             ## Cut off limit for large diffs (size in bytes). If overall diff size on
              ## commit, or pull request exceeds this limit this diff will be displayed
              ## partially. E.g 512000 == 512Kb
              cut_off_limit_diff = 512000
-             ## cut off limit for large files inside diffs (size in bytes). Each individual
+             ## Cut off limit for large files inside diffs (size in bytes). Each individual
              ## file inside diff which exceeds this limit will be displayed partially.
              ##  E.g 128000 == 128Kb
              cut_off_limit_file = 128000
-             ## use cache version of scm repo everywhere
+             ## use cached version of vcs repositories everywhere. Recommended to be `true`
              vcs_full_cache = true
-             ## force https in RhodeCode, fixes https redirects, assumes it's always https
+             ## Force https in RhodeCode, fixes https redirects, assumes it's always https.
              ## Normally this is controlled by proper http flags sent from http server
              force_https = false
              #    GistView:*
              api_access_controllers_whitelist =
-             ## default encoding used to convert from and to unicode
+             ## Default encoding used to convert from and to unicode
              ## can be also a comma separated list of encoding in case of mixed encodings
              default_encoding = UTF-8
              ## allows to setup custom hooks in settings page
              allow_custom_hooks_settings = true
-             ## generated license token, goto license page in RhodeCode settings to obtain
-             ## new token
+             ## Generated license token required for EE edition license.
+             ## New generated token value can be found in Admin > settings > license page.
              license_token =
              ## supervisor connection uri, for managing supervisor and logs.
              ## tasks will never be sent to the queue, but executed locally instead.
              celery.task_always_eager = false
-             ####################################
-             ###         BEAKER CACHE        ####
-             ####################################
-             # default cache dir for templates.  Putting this into a ramdisk
-             ## can boost performance, eg. %(here)s/data_ramdisk
+             #####################################
+             ###         DOGPILE CACHE        ####
+             #####################################
+             ## Default cache dir for caches.  Putting this into a ramdisk
+             ## can boost performance, eg. /tmpfs/data_ramdisk, however this directory might require
+             ## large amount of space
              cache_dir = %(here)s/data
-             ## locking and default file storage for Beaker. Putting this into a ramdisk
-             ## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
-             beaker.cache.data_dir = %(here)s/data/cache/beaker_data
-             beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
-             beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
+             ## `cache_perms` cache settings for permission tree, auth TTL.
+             rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
+             rc_cache.cache_perms.expiration_time = 300
-             beaker.cache.super_short_term.type = memory
-             beaker.cache.super_short_term.expire = 10
-             beaker.cache.super_short_term.key_length = 256
+             ## alternative `cache_perms` redis backend with distributed lock
+             #rc_cache.cache_perms.backend = dogpile.cache.rc.redis
+             #rc_cache.cache_perms.expiration_time = 300
+             ## redis_expiration_time needs to be greater then expiration_time
+             #rc_cache.cache_perms.arguments.redis_expiration_time = 7200
+             #rc_cache.cache_perms.arguments.socket_timeout = 30
+             #rc_cache.cache_perms.arguments.host = localhost
+             #rc_cache.cache_perms.arguments.port = 6379
+             #rc_cache.cache_perms.arguments.db = 0
+             #rc_cache.cache_perms.arguments.distributed_lock = true
-             beaker.cache.short_term.type = memory
-             beaker.cache.short_term.expire = 60
-             beaker.cache.short_term.key_length = 256
-             beaker.cache.long_term.type = memory
-             beaker.cache.long_term.expire = 36000
-             beaker.cache.long_term.key_length = 256
+             ## `cache_repo` cache settings for FileTree, Readme, RSS FEEDS
+             rc_cache.cache_repo.backend = dogpile.cache.rc.file_namespace
+             rc_cache.cache_repo.expiration_time = 2592000
-             beaker.cache.sql_cache_short.type = memory
-             beaker.cache.sql_cache_short.expire = 10
-             beaker.cache.sql_cache_short.key_length = 256
+             ## alternative `cache_repo` redis backend with distributed lock
+             #rc_cache.cache_repo.backend = dogpile.cache.rc.redis
+             #rc_cache.cache_repo.expiration_time = 2592000
+             ## redis_expiration_time needs to be greater then expiration_time
+             #rc_cache.cache_repo.arguments.redis_expiration_time = 2678400
+             #rc_cache.cache_repo.arguments.socket_timeout = 30
+             #rc_cache.cache_repo.arguments.host = localhost
+             #rc_cache.cache_repo.arguments.port = 6379
+             #rc_cache.cache_repo.arguments.db = 1
+             #rc_cache.cache_repo.arguments.distributed_lock = true
-             ## default is memory cache, configure only if required
-             ## using multi-node or multi-worker setup
-             #beaker.cache.auth_plugins.type = ext:database
-             #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
-             #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
-             #beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
-             #beaker.cache.auth_plugins.sa.pool_recycle = 3600
-             #beaker.cache.auth_plugins.sa.pool_size = 10
-             #beaker.cache.auth_plugins.sa.max_overflow = 0
+             ## cache settings for SQL queries, this needs to use memory type backend
+             rc_cache.sql_cache_short.backend = dogpile.cache.rc.memory_lru
+             rc_cache.sql_cache_short.expiration_time = 30
-             beaker.cache.repo_cache_long.type = memorylru_base
-             beaker.cache.repo_cache_long.max_items = 4096
-             beaker.cache.repo_cache_long.expire = 2592000
+             ## `cache_repo_longterm` cache for repo object instances, this needs to use memory
+             ## type backend as the objects kept are not pickle serializable
+             rc_cache.cache_repo_longterm.backend = dogpile.cache.rc.memory_lru
+             ## by default we use 96H, this is using invalidation on push anyway
+             rc_cache.cache_repo_longterm.expiration_time = 345600
+             ## max items in LRU cache, reduce this number to save memory, and expire last used
+             ## cached objects
+             rc_cache.cache_repo_longterm.max_size = 10000
-             ## default is memorylru_base cache, configure only if required
-             ## using multi-node or multi-worker setup
-             #beaker.cache.repo_cache_long.type = ext:memcached
-             #beaker.cache.repo_cache_long.url = localhost:11211
-             #beaker.cache.repo_cache_long.expire = 1209600
-             #beaker.cache.repo_cache_long.key_length = 256
              ####################################
              ###       BEAKER SESSION        ####
              ####################################
              ## .session.type is type of storage options for the session, current allowed
-             ## types are file, ext:memcached, ext:database, and memory (default).
+             ## types are file, ext:memcached, ext:redis, ext:database, and memory (default).
              beaker.session.type = file
-             beaker.session.data_dir = %(here)s/data/sessions/data
+             beaker.session.data_dir = %(here)s/data/sessions
              ## db based session, fast, and allows easy management over logged in users
              #beaker.session.type = ext:database
              #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
+             # pymysql is an alternative driver for MySQL, use in case of problems with default one
+             #sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
              sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
              # see sqlalchemy docs for other advanced settings
              ## which defaults to five.
              #sqlalchemy.db1.max_overflow = 10
+             ## Connection check ping, used to detect broken database connections
+             ## could be enabled to better handle cases if MySQL has gone away errors
+             #sqlalchemy.db1.ping_connection = true
              ##################
              ### VCS CONFIG ###
              ## Push/Pull operations protocol, available options are:
              ## `http` - use http-rpc backend (default)
-             ##
              vcs.scm_app_implementation = http
              ## Push/Pull operations hooks protocol, available options are:
              ## `http` - use http-rpc backend (default)
              vcs.hooks.protocol = http
+             ## Host on which this instance is listening for hooks. If vcsserver is in other location
+             ## this should be adjusted.
+             vcs.hooks.host = 127.0.0.1
              vcs.server.log_level = info
-             ## Start VCSServer with this instance as a subprocess, usefull for development
+             ## Start VCSServer with this instance as a subprocess, useful for development
              vcs.start_server = false
              ## List of enabled VCS backends, available options are:
              ### LOGGING CONFIGURATION   ####
              ################################
              [loggers]
-             keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
+             keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
              [handlers]
              keys = console, console_sql
              formatter = generic
              [handler_console_sql]
+             # "level = DEBUG" logs SQL queries and results.
+             # "level = INFO" logs SQL queries.
+             # "level = WARN" logs neither.  (Recommended for production systems.)
              class = StreamHandler
              args = (sys.stderr, )
              level = WARN
              [formatter_color_formatter_sql]
              class = rhodecode.lib.logging_formatter.ColorFormatterSql
-             format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+             format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
              datefmt = %Y-%m-%d %H:%M:%S

default.nix

0 +122 -107

              # Nix environment for the community edition
              #
-             # This shall be as lean as possible, just producing the Enterprise
+             # This shall be as lean as possible, just producing the enterprise-ce
              # derivation. For advanced tweaks to pimp up the development environment we use
              # "shell.nix" so that it does not have to clutter this file.
+             #
+             # Configuration, set values in "~/.nixpkgs/config.nix".
+             # example
+             #  {
+             #    # Thoughts on how to configure the dev environment
+             #    rc = {
+             #      codeInternalUrl = "https://usr:token@internal-code.rhodecode.com";
+             #      sources = {
+             #        rhodecode-vcsserver = "/home/user/work/rhodecode-vcsserver";
+             #        rhodecode-enterprise-ce = "/home/user/work/rhodecode-enterprise-ce";
+             #        rhodecode-enterprise-ee = "/home/user/work/rhodecode-enterprise-ee";
+             #      };
+             #    };
+             #  }
              args@
              { pythonPackages ? "python27Packages"
              , pythonExternalOverrides ? self: super: {}
-             , doCheck ? true
+             , doCheck ? false
              , ...
              }:
              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.
-               nixpkgs = args.pkgs or (import <nixpkgs> { });
+               pkgs = args.pkgs or (import <nixpkgs> { });
-               # johbo: Interim bridge which allows us to build with the upcoming
-               # nixos.16.09 branch (unstable at the moment of writing this note) and the
-               # current stable nixos-16.03.
-               backwardsCompatibleFetchgit = { ... }@args:
-                 let
-                   origSources = nixpkgs.fetchgit args;
-                 in
-                 nixpkgs.lib.overrideDerivation origSources (oldAttrs: {
-                   NIX_PREFETCH_GIT_CHECKOUT_HOOK = ''
-                     find $out -name '.git*' -print0 | xargs -0 rm -rf
-                   '';
-                 });
-               # Create a customized version of nixpkgs which should be used throughout the
-               # rest of this file.
-               pkgs = nixpkgs.overridePackages (self: super: {
-                 fetchgit = backwardsCompatibleFetchgit;
-               });
+               # Works with the new python-packages, still can fallback to the old
+               # variant.
+               basePythonPackagesUnfix = basePythonPackages.__unfix__ or (
+                 self: basePythonPackages.override (a: { inherit self; }));
                # Evaluates to the last segment of a file system path.
                basename = path: with pkgs.lib; last (splitString "/" path);
                    ext = last (splitString "." path);
                  in
                    !builtins.elem (basename path) [
-                     ".git" ".hg" "__pycache__" ".eggs"
+                     ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev"
                      "bower_components" "node_modules"
                      "build" "data" "result" "tmp"] &&
                    !builtins.elem ext ["egg-info" "pyc"] &&
                    # it would still be good to restore it since we want to ignore "result-*".
                    !hasPrefix "result" path;
-               basePythonPackages = with builtins; if isAttrs pythonPackages
-                 then pythonPackages
-                 else getAttr pythonPackages pkgs;
+               sources =
+                 let
+                   inherit (pkgs.lib) all isString attrValues;
+                   sourcesConfig = pkgs.config.rc.sources or {};
+                 in
+                   # Ensure that sources are configured as strings. Using a path
+                   # would result in a copy into the nix store.
+                   assert all isString (attrValues sourcesConfig);
+                   sourcesConfig;
-               buildBowerComponents =
-                 pkgs.buildBowerComponents or
-                 (import ./pkgs/backport-16.03-build-bower-components.nix { inherit pkgs; });
-               sources = pkgs.config.rc.sources or {};
-               version = builtins.readFile ./rhodecode/VERSION;
+               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;
                };
                  src = rhodecode-enterprise-ce-src;
                };
-               pythonGeneratedPackages = self: basePythonPackages.override (a: {
-                 inherit self;
-               })
-               // (scopedImport {
-                 self = self;
-                 super = basePythonPackages;
-                 inherit pkgs;
-                 inherit (pkgs) fetchurl fetchgit;
-               } ./pkgs/python-packages.nix);
+               rhodecode-testdata-src = sources.rhodecode-testdata or (
+                 pkgs.fetchhg {
+                   url = "https://code.rhodecode.com/upstream/rc_testdata";
+                   rev = "v0.10.0";
+                   sha256 = "0zn9swwvx4vgw4qn8q3ri26vvzgrxn15x6xnjrysi1bwmz01qjl0";
+               });
-               pythonOverrides = import ./pkgs/python-packages-overrides.nix {
-                 inherit
-                   basePythonPackages
-                   pkgs;
+               rhodecode-testdata = import "${rhodecode-testdata-src}/default.nix" {
+               inherit
+                 doCheck
+                 pkgs
+                 pythonPackages;
                };
                pythonLocalOverrides = self: super: {
                  rhodecode-enterprise-ce =
                    let
                      linkNodeAndBowerPackages = ''
-                       echo "Export RhodeCode CE path"
                        export RHODECODE_CE_PATH=${rhodecode-enterprise-ce-src}
-                       echo "Link node packages"
+                       echo "[BEGIN]: Link node packages"
                        rm -fr node_modules
                        mkdir node_modules
                        # 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.
                        ln -s ${nodeDependencies}/lib/node_modules/* node_modules/
+                       echo "[DONE]: Link node packages"
-                       echo "DONE: Link node packages"
-                       echo "Link bower packages"
+                       echo "[BEGIN]: Link bower packages"
                        rm -fr bower_components
                        mkdir bower_components
+                       ln -s ${bowerComponents}/bower_components/* bower_components/
+                       echo "[DONE]: Link bower packages"
+                     '';
-                       ln -s ${bowerComponents}/bower_components/* bower_components/
-                       echo "DONE: Link bower packages"
-                     '';
+                     releaseName = "RhodeCodeEnterpriseCE-${version}";
                    in super.rhodecode-enterprise-ce.override (attrs: {
                    inherit
                      doCheck
                      version;
                    name = "rhodecode-enterprise-ce-${version}";
-                   releaseName = "RhodeCodeEnterpriseCE-${version}";
+                   releaseName = releaseName;
                    src = rhodecode-enterprise-ce-src;
                    dontStrip = true; # prevent strip, we don't need it.
-                   buildInputs =
-                     attrs.buildInputs ++
-                     (with self; [
-                       pkgs.nodePackages.bower
-                       pkgs.nodePackages.grunt-cli
-                       pkgs.subversion
-                       pytest-catchlog
-                       rhodecode-testdata
-                     ]);
-                   #TODO: either move this into overrides, OR use the new machanics from
-                   # pip2nix and requiremtn.txt file
-                   propagatedBuildInputs = attrs.propagatedBuildInputs ++ (with self; [
-                     rhodecode-tools
-                   ]);
-                   # TODO: johbo: Make a nicer way to expose the parts. Maybe
-                   # pkgs/default.nix?
+                   # expose following attributed outside
                    passthru = {
                      inherit
+                       rhodecode-testdata
                        bowerComponents
                        linkNodeAndBowerPackages
                        myPythonPackagesUnfix
-                       pythonLocalOverrides;
+                       pythonLocalOverrides
+                       pythonCommunityOverrides;
                      pythonPackages = self;
                    };
+                   buildInputs =
+                     attrs.buildInputs or [] ++ [
+                       rhodecode-testdata
+                       pkgs.nodePackages.bower
+                       pkgs.nodePackages.grunt-cli
+                     ];
+                   #NOTE: option to inject additional propagatedBuildInputs
+                   propagatedBuildInputs =
+                     attrs.propagatedBuildInputs or [] ++ [
+                     ];
                    LC_ALL = "en_US.UTF-8";
                    LOCALE_ARCHIVE =
-                     if pkgs.stdenv ? glibc
+                     if pkgs.stdenv.isLinux
                      then "${pkgs.glibcLocales}/lib/locale/locale-archive"
                      else "";
+                   # Add bin directory to path so that tests can find 'rhodecode'.
                    preCheck = ''
                      export PATH="$out/bin:$PATH"
                    '';
+                   # custom check phase for testing
+                   checkPhase = ''
+                     runHook preCheck
+                     PYTHONHASHSEED=random py.test -vv -p no:sugar -r xw --cov-config=.coveragerc --cov=rhodecode --cov-report=term-missing rhodecode
+                     runHook postCheck
+                   '';
                    postCheck = ''
-                     rm -rf $out/lib/${self.python.libPrefix}/site-packages/pytest_pylons
+                     echo "Cleanup of rhodecode/tests"
                      rm -rf $out/lib/${self.python.libPrefix}/site-packages/rhodecode/tests
                    '';
-                   preBuild = linkNodeAndBowerPackages + ''
+                   preBuild = ''
+                     echo "Building frontend assets"
+                     ${linkNodeAndBowerPackages}
                      grunt
                      rm -fr node_modules
                    '';
                    postInstall = ''
-                     echo "Writing meta information for rccontrol to nix-support/rccontrol"
+                     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: 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"
                      # 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.PasteScript}/bin/paster $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"
-                     # rhodecode-tools
-                     ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
-                     # note that condition should be restricted when adding further tools
                      for file in $out/bin/*;
                      do
                        wrapProgram $file \
-                           --prefix PATH : $PATH \
-                           --prefix PYTHONPATH : $PYTHONPATH \
-                           --set PYTHONHASHSEED random
+                         --prefix PATH : $PATH \
+                         --prefix PYTHONPATH : $PYTHONPATH \
+                         --set PYTHONHASHSEED random
                      done
-                     mkdir $out/etc
-                     cp configs/production.ini $out/etc
+                     echo "[DONE]: enterprise-ce binary wrapping"
-                     # TODO: johbo: Make part of ac-tests
                      if [ ! -f rhodecode/public/js/scripts.js ]; then
                        echo "Missing scripts.js"
                        exit 1
                        exit 1
                      fi
                    '';
                  });
-                 rhodecode-testdata = import "${rhodecode-testdata-src}/default.nix" {
-                 inherit
-                   doCheck
-                   pkgs
-                   pythonPackages;
-                 };
                };
-               rhodecode-testdata-src = sources.rhodecode-testdata or (
-                 pkgs.fetchhg {
-                   url = "https://code.rhodecode.com/upstream/rc_testdata";
-                   rev = "v0.10.0";
-                   sha256 = "0zn9swwvx4vgw4qn8q3ri26vvzgrxn15x6xnjrysi1bwmz01qjl0";
-               });
+               basePythonPackages = with builtins;
+                 if isAttrs pythonPackages then
+                   pythonPackages
+                 else
+                   getAttr pythonPackages pkgs;
+               pythonGeneratedPackages = import ./pkgs/python-packages.nix {
+                 inherit pkgs;
+                 inherit (pkgs) fetchurl fetchgit fetchhg;
+               };
+               pythonCommunityOverrides = import ./pkgs/python-packages-overrides.nix {
+                 inherit pkgs basePythonPackages;
+               };
                # Apply all overrides and fix the final package set
                myPythonPackagesUnfix = with pkgs.lib;
                  (extends pythonExternalOverrides
                  (extends pythonLocalOverrides
-                 (extends pythonOverrides
-                          pythonGeneratedPackages)));
+                 (extends pythonCommunityOverrides
+                 (extends pythonGeneratedPackages
+                          basePythonPackagesUnfix))));
                myPythonPackages = (pkgs.lib.fix myPythonPackagesUnfix);
              in myPythonPackages.rhodecode-enterprise-ce

docs/.howto

0 +6 -1

+             # generating packages
+             nix-shell pkgs/shell-generate.nix
+             cd docs
+             pip2nix generate
              # building the docs
              cd docs
              nix-build default.nix -o result
-             make clean html
  No newline at end of file
+             make clean html

docs/admin/indexing.rst

0 +10 -6

                 (venv)$ rhodecode-index --instance-name=enterprise-1
                 # Using default installation
-                $ /home/user/.rccontrol/enterprise-4/profile/bin/rhodecode-index \
-                    --instance-name=enterprise-4
+                $ /home/user/.rccontrol/enterprise-1/profile/bin/rhodecode-index \
+                    --instance-name=enterprise-1
                 # Using a custom mapping file
-                $ /home/user/.rccontrol/enterprise-4/profile/bin/rhodecode-index \
-                    --instance-name=enterprise-4 \
-                    --mapping=/home/user/.rccontrol/enterprise-4/mapping.ini
+                $ /home/user/.rccontrol/enterprise-1/profile/bin/rhodecode-index \
+                    --instance-name=enterprise-1 \
+                    --mapping=/home/user/.rccontrol/enterprise-1/mapping.ini
              .. note::
-                |RCT| require |PY| 2.7 to run.
+                In case of often indexing the index may become fragmented. Most often a result of that
+                is error about `too many open files`. To fix this indexer needs to be executed with
+                --optimize flag. E.g `rhodecode-index --instance-name=enterprise-1 --optimize`
+                This should be executed regularly, once a week is recommended.
              .. _set-index:

docs/admin/tuning-user-sessions-performance.rst

0 +11 -5

              Therefore, in a large scale deployment, to give better performance,
              scalability, and maintainability we recommend switching from file-based
-             sessions to database-based user sessions or memcached sessions.
+             sessions to database-based user sessions or Redis based sessions.
              To switch to database-based user sessions uncomment the following section in
              your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
                    #beaker.session.data_dir = %(here)s/data/sessions/data
-             To switch to memcached-based user sessions uncomment the following section in
+             The `table_name` will be automatically created on specified database if it isn't yet existing.
+             Database specified in the `beaker.session.sa.url` can be the same that RhodeCode
+             uses, or if required it can be a different one. We recommend to use the same database.
+             To switch to reds-based user sessions uncomment the following section in
              your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
              .. code-block:: ini
-                   ## memcached sessions
-                   beaker.session.type = ext:memcached
-                   beaker.session.url = localhost:11211
+                   ## redis sessions
+                   beaker.session.type = ext:redis
+                   beaker.session.url = localhost:6379
              and make sure you comment out the file based sessions.

docs/api/methods/pull-request-methods.rst

0 +10 -3

              create_pull_request
              -------------------
-             .. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, title, description=<Optional:''>, reviewers=<Optional:None>)
+             .. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>)
                 Creates a new pull request.
                 :type source_ref: str
                 :param target_ref: Set the target ref name.
                 :type target_ref: str
-                :param title: Set the pull request title.
+                :param title: Optionally Set the pull request title, it's generated otherwise
                 :type title: str
                 :param description: Set the pull request description.
                 :type description: Optional(str)
+                :type description_renderer: Optional(str)
+                :param description_renderer: Set pull request renderer for the description.
+                    It should be 'rst', 'markdown' or 'plain'. If not give default
+                    system renderer will be used
                 :param reviewers: Set the new pull request reviewers list.
                     Reviewer defined by review rules will be added automatically to the
                     defined list.
              update_pull_request
              -------------------
-             .. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
+             .. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
                 Updates a pull request.
                 :type title: str
                 :param description: Update pull request description.
                 :type description: Optional(str)
+                :type description_renderer: Optional(str)
+                :param description_renderer: Update pull request renderer for the description.
+                    It should be 'rst', 'markdown' or 'plain'
                 :param reviewers: Update pull request reviewers list with new value.
                 :type reviewers: Optional(list)
                     Accepts username strings or objects of the format:

docs/conf.py

0 +3 -8

              # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
              # ones.
              extensions = [
+                 'sphinx.ext.autodoc',
                  'sphinx.ext.intersphinx',
                  'sphinx.ext.todo',
                  'sphinx.ext.imgmath'
                  'control': ('https://docs.rhodecode.com/RhodeCode-Control/', None),
              }
-             if tags.has('dev'):
-                 intersphinx_mapping.update({
-                     'enterprise': ('https://ci.rhodecode.com/documentation/Momentum/', None),
-                     'control': ('https://ci.rhodecode.com/documentation/Control/', None),
-                 })
              # Add any paths that contain templates here, relative to this directory.
              templates_path = ['_templates']
              # |version| and |release|, also used in various other places throughout the
              # built documents.
-             # TODO: johbo: Move into common package for documentation utilities
              def _get_version():
                  with open('../rhodecode/VERSION') as f:
                      return f.read().strip()
              # The full version, including alpha/beta/rc tags.
              release = _get_version()
              # The short X.Y version.

docs/contributing/dev-setup.rst

0 +1 -1

              run::
-                nix-channel --add https://nixos.org/channels/nixos-16.03 nixpkgs
+                nix-channel --add https://nixos.org/channels/nixos-18.03 nixpkgs
              Followed by::

docs/default.nix

0 +171 -205

		@@ -5,249 +5,215 b' let'
5	5
6	6	pkgs = import <nixpkgs> { inherit system; };
7	7
8		inherit (pkgs) fetchurl ~~fetchgit~~;
	8	inherit (pkgs) fetchurl;
9	9
10	10	buildPythonPackage = pkgs.python27Packages.buildPythonPackage;
11	11	python = pkgs.python27Packages.python;
12	12
13		Jinja2 = buildPythonPackage rec {
14		name = "Jinja2-2.9.6";
15		buildInputs = [];
	13
	14	alabaster = buildPythonPackage {
	15	name = "alabaster-0.7.11";
	16	doCheck = false;
	17	src = fetchurl {
	18	url = "https://files.pythonhosted.org/packages/3f/46/9346ea429931d80244ab7f11c4fce83671df0b7ae5a60247a2b588592c46/alabaster-0.7.11.tar.gz";
	19	sha256 = "1mvm69xsn5xf1jc45kdq1mn0yq0pfn54mv2jcww4s1vwqx6iyfxn";
	20	};
	21	};
	22	babel = buildPythonPackage {
	23	name = "babel-2.6.0";
16	24	doCheck = false;
17		propagatedBuildInputs = [~~MarkupSafe~~];
	25	propagatedBuildInputs = [
	26	pytz
	27	];
	28	src = fetchurl {
	29	url = "https://files.pythonhosted.org/packages/be/cc/9c981b249a455fa0c76338966325fc70b7265521bad641bf2932f77712f4/Babel-2.6.0.tar.gz";
	30	sha256 = "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc";
	31	};
	32	};
	33	certifi = buildPythonPackage {
	34	name = "certifi-2018.8.24";
	35	doCheck = false;
18	36	src = fetchurl {
19		url = "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
20		md5 = "6411537324b4dba0956aaa8109f3c77b";
	37	url = "https://files.pythonhosted.org/packages/e1/0f/f8d5e939184547b3bdc6128551b831a62832713aa98c2ccdf8c47ecc7f17/certifi-2018.8.24.tar.gz";
	38	sha256 = "0f0nhrj9mlrf79iway4578wrsgmjh0fmacl9zv8zjckdy7b90rip";
	39	};
	40	};
	41	chardet = buildPythonPackage {
	42	name = "chardet-3.0.4";
	43	doCheck = false;
	44	src = fetchurl {
	45	url = "https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
	46	sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
	47	};
	48	};
	49	docutils = buildPythonPackage {
	50	name = "docutils-0.14";
	51	doCheck = false;
	52	src = fetchurl {
	53	url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
	54	sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
21	55	};
22	56	};
23
24		MarkupSafe = buildPythonPackage rec {
25		name = "MarkupSafe-1.0";
26		buildInputs = [];
	57	idna = buildPythonPackage {
	58	name = "idna-2.7";
	59	doCheck = false;
	60	src = fetchurl {
	61	url = "https://files.pythonhosted.org/packages/65/c4/80f97e9c9628f3cac9b98bfca0402ede54e0563b56482e3e6e45c43c4935/idna-2.7.tar.gz";
	62	sha256 = "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8";
	63	};
	64	};
	65	imagesize = buildPythonPackage {
	66	name = "imagesize-1.1.0";
27	67	doCheck = false;
28		propagatedBuildInputs = [];
29	68	src = fetchurl {
30		url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
31		md5 = "2fcedc9284d50e577b5192e8e3578355";
	69	url = "https://files.pythonhosted.org/packages/41/f5/3cf63735d54aa9974e544aa25858d8f9670ac5b4da51020bbfc6aaade741/imagesize-1.1.0.tar.gz";
	70	sha256 = "1dg3wn7qpwmhgqc0r9na2ding1wif9q5spz3j9zn2riwphc2k0zk";
	71	};
	72	};
	73	jinja2 = buildPythonPackage {
	74	name = "jinja2-2.9.6";
	75	doCheck = false;
	76	propagatedBuildInputs = [
	77	markupsafe
	78	];
	79	src = fetchurl {
	80	url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
	81	sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
32	82	};
33	83	};
34
35		Pygments = buildPythonPackage {
36		name = "Pygments-2.2.0";
37		buildInputs = [];
	84	markupsafe = buildPythonPackage {
	85	name = "markupsafe-1.0";
	86	doCheck = false;
	87	src = fetchurl {
	88	url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
	89	sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
	90	};
	91	};
	92	packaging = buildPythonPackage {
	93	name = "packaging-17.1";
38	94	doCheck = false;
39		propagatedBuildInputs = [];
	95	propagatedBuildInputs = [
	96	pyparsing
	97	six
	98	];
40	99	src = fetchurl {
41		url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
42		md5 = "13037baca42f16917cbd5ad2fab50844";
	100	url = "https://files.pythonhosted.org/packages/77/32/439f47be99809c12ef2da8b60a2c47987786d2c6c9205549dd6ef95df8bd/packaging-17.1.tar.gz";
	101	sha256 = "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh";
	102	};
	103	};
	104	pygments = buildPythonPackage {
	105	name = "pygments-2.2.0";
	106	doCheck = false;
	107	src = fetchurl {
	108	url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
	109	sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
43	110	};
44	111	};
45
46		Sphinx = buildPythonPackage (rec {
47		name = "Sphinx-1.6.5";
	112	pyparsing = buildPythonPackage {
	113	name = "pyparsing-2.2.0";
	114	doCheck = false;
48	115	src = fetchurl {
49		url = "https://pypi.python.org/packages/8b/7e/b188d9a3b9c938e736e02a74c1363c2888e095d770df2c72b4c312f9fdcb/Sphinx-1.6.5.tar.gz";
50		md5 = "cd73118c21ec610432e63e6421ec54f1";
	116	url = "https://files.pythonhosted.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz";
	117	sha256 = "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8";
51	118	};
	119	};
	120	pytz = buildPythonPackage {
	121	name = "pytz-2018.4";
	122	doCheck = false;
	123	src = fetchurl {
	124	url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz";
	125	sha256 = "0jgpqx3kk2rhv81j1izjxvmx8d0x7hzs1857pgqnixic5wq2ar60";
	126	};
	127	};
	128	requests = buildPythonPackage {
	129	name = "requests-2.19.1";
	130	doCheck = false;
52	131	propagatedBuildInputs = [
53		six
54		Jinja2
55		Pygments
56		~~docutils~~
57		snowballstemmer
58		babel
59		alabaster
60		imagesize
61		requests
62		setuptools
63		sphinxcontrib-websupport
64		typing
65
66		# special cases
67		pytz
68		sphinx_rtd_theme
69
	132	chardet
	133	idna
	134	urllib3
	135	certifi
70	136	];
71		});
72
73		alabaster = buildPythonPackage rec {
74		name = "alabaster-0.7.10";
75		buildInputs = [];
	137	src = fetchurl {
	138	url = "https://files.pythonhosted.org/packages/54/1f/782a5734931ddf2e1494e4cd615a51ff98e1879cbe9eecbdfeaf09aa75e9/requests-2.19.1.tar.gz";
	139	sha256 = "0snf8xxdzsgh1x2zv3vilvbrv9jbpmnfagzzb1rjmmvflckdh8pc";
	140	};
	141	};
	142	six = buildPythonPackage {
	143	name = "six-1.11.0";
76	144	doCheck = false;
77		propagatedBuildInputs = [];
78	145	src = fetchurl {
79		url = "https://pypi.python.org/packages/d0/a5/e3a9ad3ee86aceeff71908ae562580643b955ea1b1d4f08ed6f7e8396bd7/alabaster-0.7.10.tar.gz";
80		md5 = "7934dccf38801faa105f6e7b4784f493";
	146	url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
	147	sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
	148	};
	149	};
	150	snowballstemmer = buildPythonPackage {
	151	name = "snowballstemmer-1.2.1";
	152	doCheck = false;
	153	src = fetchurl {
	154	url = "https://files.pythonhosted.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
	155	sha256 = "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi";
81	156	};
82	157	};
83
84		babel = buildPythonPackage {
85		name = "babel-2.5.1";
86		buildInputs = [];
	158	sphinx = buildPythonPackage {
	159	name = "sphinx-1.7.8";
87	160	doCheck = false;
88		propagatedBuildInputs = [~~pytz~~];
	161	propagatedBuildInputs = [
	162	six
	163	jinja2
	164	pygments
	165	docutils
	166	snowballstemmer
	167	babel
	168	alabaster
	169	imagesize
	170	requests
	171	setuptools
	172	packaging
	173	sphinxcontrib-websupport
	174	typing
	175	];
89	176	src = fetchurl {
90		url = "https://pypi.python.org/packages/5a/22/63f1dbb8514bb7e0d0c8a85cc9b14506599a075e231985f98afd70430e1f/Babel-2.5.1.tar.gz";
91		md5 = "60228b3ce93a203357158b909afe8ae1";
	177	url = "https://files.pythonhosted.org/packages/ac/54/4ef326d0c654da1ed91341a7a1f43efc18a8c770ddd2b8e45df97cb79d82/Sphinx-1.7.8.tar.gz";
	178	sha256 = "1ryz0w4c31930f1br2sjwrxwx9cmsy7cqdb0d81g98n9bj250w50";
92	179	};
93	180	};
94
95		certifi = buildPythonPackage {
96		name = "certifi-2017.11.5";
97		buildInputs = [];
	181	sphinx-rtd-theme = buildPythonPackage {
	182	name = "sphinx-rtd-theme-0.4.1";
98	183	doCheck = false;
99		propagatedBuildInputs = [];
	184	propagatedBuildInputs = [
	185	sphinx
	186	];
100	187	src = fetchurl {
101		url = "https://pypi.python.org/packages/23/3f/8be01c50ed24a4bd6b8da799839066ce0288f66f5e11f0367323467f0cbc/certifi-2017.11.5.tar.gz";
102		md5 = "c15ac46ed1fe4b607ff3405928f9a992";
	188	url = "https://files.pythonhosted.org/packages/f2/b0/a1933d792b806118ddbca6699f2e2c844d9b1b16e84a89d7effd5cd2a800/sphinx_rtd_theme-0.4.1.tar.gz";
	189	sha256 = "1xkyqam8dzbjaymdyvkiif85m4y3jf8crdiwlgcfp8gqcj57aj9v";
103	190	};
104	191	};
105
106		chardet = buildPythonPackage {
107		name = "chardet-3.0.4";
108		buildInputs = [];
	192	sphinxcontrib-websupport = buildPythonPackage {
	193	name = "sphinxcontrib-websupport-1.1.0";
109	194	doCheck = false;
110		propagatedBuildInputs = [];
111	195	src = fetchurl {
112		url = "https://pypi.python.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz";
113		md5 = "7dd1ba7f9c77e32351b0a0cfacf4055c";
	196	url = "https://files.pythonhosted.org/packages/07/7a/e74b06dce85555ffee33e1d6b7381314169ebf7e31b62c18fcb2815626b7/sphinxcontrib-websupport-1.1.0.tar.gz";
	197	sha256 = "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x";
114	198	};
115	199	};
116
117		docutils = buildPythonPackage {
118		name = "docutils-0.14";
119		buildInputs = [];
	200	typing = buildPythonPackage {
	201	name = "typing-3.6.6";
120	202	doCheck = false;
121		propagatedBuildInputs = [];
122	203	src = fetchurl {
123		url = "https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
124		md5 = "c53768d63db3873b7d452833553469de";
	204	url = "https://files.pythonhosted.org/packages/bf/9b/2bf84e841575b633d8d91ad923e198a415e3901f228715524689495b4317/typing-3.6.6.tar.gz";
	205	sha256 = "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0";
	206	};
	207	};
	208	urllib3 = buildPythonPackage {
	209	name = "urllib3-1.23";
	210	doCheck = false;
	211	src = fetchurl {
	212	url = "https://files.pythonhosted.org/packages/3c/d2/dc5471622bd200db1cd9319e02e71bc655e9ea27b8e0ce65fc69de0dac15/urllib3-1.23.tar.gz";
	213	sha256 = "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6";
125	214	};
126	215	};
127	216
128		idna = buildPythonPackage {
129		name = "idna-2.6";
130		buildInputs = [];
131		doCheck = false;
132		propagatedBuildInputs = [];
133		src = fetchurl {
134		url = "https://pypi.python.org/packages/f4/bd/0467d62790828c23c47fc1dfa1b1f052b24efdf5290f071c7a91d0d82fd3/idna-2.6.tar.gz";
135		md5 = "c706e2790b016bd0ed4edd2d4ba4d147";
136		};
137		};
138
139		imagesize = buildPythonPackage {
140		name = "imagesize-0.7.1";
141		buildInputs = [];
142		doCheck = false;
143		propagatedBuildInputs = [];
144		src = fetchurl {
145		url = "https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-0.7.1.tar.gz";
146		md5 = "976148283286a6ba5f69b0f81aef8052";
147		};
148		};
149
150		pytz = buildPythonPackage {
151		name = "pytz-2017.3";
152		buildInputs = [];
153		doCheck = false;
154		propagatedBuildInputs = [];
155		src = fetchurl {
156		url = "https://pypi.python.org/packages/60/88/d3152c234da4b2a1f7a989f89609ea488225eaea015bc16fbde2b3fdfefa/pytz-2017.3.zip";
157		md5 = "7006b56c0d68a162d9fe57d4249c3171";
158		};
159		};
160
161		requests = buildPythonPackage {
162		name = "requests-2.18.4";
163		buildInputs = [];
164		doCheck = false;
165		propagatedBuildInputs = [chardet idna urllib3 certifi];
166		src = fetchurl {
167		url = "https://pypi.python.org/packages/b0/e1/eab4fc3752e3d240468a8c0b284607899d2fbfb236a56b7377a329aa8d09/requests-2.18.4.tar.gz";
168		md5 = "081412b2ef79bdc48229891af13f4d82";
169		};
170		};
171
172		six = buildPythonPackage {
173		name = "six-1.11.0";
174		buildInputs = [];
175		doCheck = false;
176		propagatedBuildInputs = [];
177		src = fetchurl {
178		url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
179		md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
180		};
181		};
182
183		snowballstemmer = buildPythonPackage {
184		name = "snowballstemmer-1.2.1";
185		buildInputs = [];
186		doCheck = false;
187		propagatedBuildInputs = [];
188		src = fetchurl {
189		url = "https://pypi.python.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz";
190		md5 = "643b019667a708a922172e33a99bf2fa";
191		};
192		};
193
194		sphinx-rtd-theme = buildPythonPackage {
195		name = "sphinx-rtd-theme-0.2.5b1";
196		buildInputs = [];
197		doCheck = false;
198		propagatedBuildInputs = [];
199		src = fetchurl {
200		url = "https://pypi.python.org/packages/59/e4/9e3a74a3271e6734911d3f549e8439db53b8ac29adf10c8f698e6c86246b/sphinx_rtd_theme-0.2.5b1.tar.gz";
201		md5 = "0923473a43bd2527f32151f195f2a521";
202		};
203		};
204
205		sphinxcontrib-websupport = buildPythonPackage {
206		name = "sphinxcontrib-websupport-1.0.1";
207		buildInputs = [];
208		doCheck = false;
209		propagatedBuildInputs = [];
210		src = fetchurl {
211		url = "https://pypi.python.org/packages/c5/6b/f0630436b931ad4f8331a9399ca18a7d447f0fcc0c7178fb56b1aee68d01/sphinxcontrib-websupport-1.0.1.tar.gz";
212		md5 = "84df26463b1ba65b07f926dbe2055665";
213		};
214		};
215
216		typing = buildPythonPackage {
217		name = "typing-3.6.2";
218		buildInputs = [];
219		doCheck = false;
220		propagatedBuildInputs = [];
221		src = fetchurl {
222		url = "https://pypi.python.org/packages/ca/38/16ba8d542e609997fdcd0214628421c971f8c395084085354b11ff4ac9c3/typing-3.6.2.tar.gz";
223		md5 = "143af0bf3afd1887622771f2f1ffe8e1";
224		};
225		};
226
227		urllib3 = buildPythonPackage {
228		name = "urllib3-1.22";
229		buildInputs = [];
230		doCheck = false;
231		propagatedBuildInputs = [];
232		src = fetchurl {
233		url = "https://pypi.python.org/packages/ee/11/7c59620aceedcc1ef65e156cc5ce5a24ef87be4107c2b74458464e437a5d/urllib3-1.22.tar.gz";
234		md5 = "0da7bed3fe94bf7dc59ae37885cc72f7";
235		};
236		};
237
238
239		sphinx_rtd_theme = buildPythonPackage rec {
240		name = "sphinx-rtd-theme-0.2.5b1";
241		buildInputs = [];
242		doCheck = false;
243		propagatedBuildInputs = [];
244		src = fetchurl {
245		url = "https://pypi.python.org/packages/59/e4/9e3a74a3271e6734911d3f549e8439db53b8ac29adf10c8f698e6c86246b/sphinx_rtd_theme-0.2.5b1.tar.gz";
246		md5 = "0923473a43bd2527f32151f195f2a521";
247		};
248
249
250		};
251	217	# Avoid that setuptools is replaced, this leads to trouble
252	218	# with buildPythonPackage.
253	219	setuptools = pkgs.python27Packages.setuptools;
		@@ -255,7 +221,7 b' let'
255	221	in python.buildEnv.override {
256	222	inherit python;
257	223	extraLibs = [
258		Sphinx
259		sphinx~~_rtd_~~theme
	224	sphinx
	225	sphinx-rtd-theme
260	226	];
261		}
	227	} No newline at end of file

docs/known-issues/known-issues.rst

0 +21 -11

              |repo| into a local machine using a recent |git| client, then push it to a new
              |repo| inside |RCE|.
              VCS Server Memory Consumption
              -----------------------------
              To fix this issue, upgrade to |RCE| 3.3.2 or greater, and if you discover
              memory consumption issues check the VCS Server settings.
-             Fedora 23
-             ---------
+             Fedora 23 / Ubuntu 18.04
+             ------------------------
+             |RCC| has a know problem with locales, due to changes in glibc 2.27+ which affects
+             the local-archive format, which is now incompatible with our used glibc 2.26.
-             |RCC| does not run perfectly on Fedora 23 due to a locale issue. This is a
-             known issue under investigation due to the Nix packaging of the product, see the
-             `Github issue here`_. |RCC| runs fine on Fedora 21.
+             To work around this problem, you need set path to ``$LOCAL_ARCHIVE`` to the
+             locale package in older pre glibc 2.27 format, or set `LC_ALL=C` in your enviroment.
+             To use the pre 2.27 locale-archive fix follow these steps:
-             To work around this problem, you need to point ``$LOCAL_ARCHIVE`` to the
-             workaround locale package.
+. Download the pre 2.27 locale-archive package
-. Download this package:
-                http://lipa.ms.mff.cuni.cz/~cunav5am/nix/locale-archive
+             .. code-block:: bash
+                 wget https://dls.rhodecode.com/assets/locale-archive
 . Point ``$LOCAL_ARCHIVE`` to the locale package.
              .. code-block:: bash
-                 $ export LOCALE_ARCHIVE=/home/VERSION/locale-archive # change to your path
+                 $ export LOCALE_ARCHIVE=/home/USER/locale-archive  # change to your path
+             This can either added in `~/.rccontrol/supervisor/supervisord.ini`
+             or in user .bashrc/.zshrc etc, or via a startup script that
+             runs `rccontrol self-init`
              If you happen to be running |RCC| from systemd, use the following
              example to pass the correct locale information on boot.
                  [Install]
                  WantedBy=multi-user.target
-             .. _Github issue here: https://github.com/NixOS/nix/issues/599

docs/release-notes/release-notes.rst

0 +1 0

              .. toctree::
                 :maxdepth: 1
+                release-notes-4.13.0.rst
                 release-notes-4.12.4.rst
                 release-notes-4.12.3.rst
                 release-notes-4.12.2.rst

docs/requirements_docs.txt

0 +6 -6

		@@ -1,8 +1,8 b''
1		~~Sphinx==1.6.5~~
	1	sphinx==1.7.8
2	2	six==1.11.0
3		sphinx_rtd_theme==0.~~2.5b~~1
	3	sphinx_rtd_theme==0.4.1
4	4	docutils==0.14.0
5		Pygments==2.2.0
6		~~MarkupS~~afe==1.0.0
7		Jinja2==2.9.6
8		pytz No newline at end of file
	5	pygments==2.2.0
	6	markupsafe==1.0.0
	7	jinja2==2.9.6
	8	pytz==2018.4

package.json

0 +13 -5

              {
                "name": "rhodecode-enterprise",
-               "version": "0.0.1",
+               "version": "1.0.0",
+               "private": true,
+               "description" : "RhodeCode JS packaged",
+               "license": "SEE LICENSE IN LICENSE.txt",
+               "repository" : {
+                 "type" : "hg",
+                 "url" : "https://code.rhodecode.com/rhodecode-enterprise-ce"
+               },
                "devDependencies": {
                  "grunt": "^0.4.5",
                  "grunt-contrib-copy": "^1.0.0",
                  "grunt-contrib-jshint": "^0.12.0",
                  "grunt-contrib-less": "^1.1.0",
                  "grunt-contrib-watch": "^0.6.1",
-                 "crisper": "^2.0.2",
-                 "vulcanize": "^1.14.8",
+                 "crisper": "^2.1.1",
+                 "vulcanize": "^1.16.0",
                  "grunt-crisper": "^1.0.1",
                  "grunt-vulcanize": "^1.0.0",
                  "node2nix": "^1.0.0",
                  "jshint": "^2.9.1-rc3",
-                 "bower": "^1.7.9",
+                 "bower": "^1.8.4",
                  "jquery": "1.11.3",
                  "favico.js": "^0.3.10",
-                 "clipboard": "^1.7.1",
+                 "clipboard": "^2.0.1",
+                 "qrious": "^4.0.2",
                  "moment": "^2.18.1",
                  "mousetrap": "^1.6.1",
                  "appenlight-client": "git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1"

pkgs/bower-packages.nix

0 +27 -30

		@@ -1,33 +1,30 b''
	1	# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
1	2	{ fetchbower, buildEnv }:
2	3	buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
3		(fetchbower "webcomponentsjs" "0.7.22" "^0.7.22" "178h9j8jq9wi5845f5pxhhhqw6x022nzmpzm4di8fgsdl1f6nr5d")
4		(fetchbower "polymer" "Polymer/polymer#1.6.1" "Polymer/polymer#^1.6.1" "~~09mm0~~j~~gk457gv~~w~~qlc15~~5swch7gjr~~6fs3g7sp~~n~~vhi6vh5b651854~~0")
5		(fetchbower "paper-button" "PolymerElements/paper-button#1.~~0.13~~" "PolymerElements/paper-button#^1.~~0.13~~" "0i3y~~153nq~~k06~~pn0gk282v~~y~~ybnl3g1w3w41d~~5i9z~~659cgn27g3fvm~~")
6		(fetchbower "paper-spinner" "PolymerElements/paper-spinner#1.2.0" "PolymerElements/paper-spinner#^1.2.0" "1a~~v1m6y~~8~~1jw3~~hj~~hz1yqy3rwcgxarjzl~~5~~8ldfn4q6sn51pgzngfqb~~")
7		(fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#1.1.3" "PolymerElements/paper-tooltip#^1.1.2" "0vmr~~m1n8~~k9s~~k9nvqy03q177axy22pia6i3j1gxbk~~72~~j3pqiq~~vg6k")
8		(fetchbower "paper-toast" "PolymerElements/paper-toast#1.~~3.0~~" "PolymerElements/paper-toast#^1.~~3.0~~" "0x9rqxsks54~~55s8~~p~~k4aikpp99i~~j~~dn6~~kx~~r9gvhwh99~~n~~bcqdzcxq1m~~")
9		(fetchbower "paper-toggle-button" "PolymerElements/paper-toggle-button#1.~~2.0~~" "PolymerElements/paper-toggle-button#^1.~~2.0~~" "~~0mphcng~~3ngsp~~bpg~~4~~jjn0m~~b91nvr~~4xc1phq3qswib1~~5~~h6sfww1b2w~~")
10		(fetchbower "iron-ajax" "PolymerElements/iron-ajax#1.~~4.4~~" "PolymerElements/iron-ajax#^1.~~4.4~~" "~~0jpi~~7ik~~3zljw~~8yh2~~ccc~~85~~r26~~l~~cpzmkc2nl1kn6fqdx57zkzk9v5b~~")
11		(fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#1.0~~.13~~" "PolymerElements/iron-autogrow-textarea#^1.0~~.13~~" "0zw~~hpl97vii1s8~~k0lga~~in8i9dnw29b0mxc5ixdscx9las1~~3n2lqq")
12		(fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#1.~~0.6~~" "PolymerElements/iron-a11y-keys#^1.~~0.6~~" "1xz3mg~~ghfc~~x~~ixq~~2~~8sd~~b654iaxj~~4nyi1bzcwf77ydkms6fviqs9mv~~")
13		(fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#1.3.1" "PolymerElements/iron-flex-layout#^1.0.0" "0nswv3ih3bhflgcd2wjfmddqswzgqxb2xbq65jk9w3rkj26hplbl")
14		(fetchbower "paper-behaviors" "PolymerElements/paper-behaviors#1.0.12" "PolymerElements/paper-behaviors#^1.0.0" "012bqk97awgz55cn7rm9g7cckrdhkqhls3zvp8l6nd4rdwcrdzq8")
15		(fetchbower "paper-material" "PolymerElements/paper-material#1.0.6" "PolymerElements/paper-material#^1.0.0" "0rljmknfdbm5aabvx9pk77754zckj3l127c3mvnmwkpkkr353xnh")
16		(fetchbower "paper-styles" "PolymerElements/paper-styles#1.1.4" "PolymerElements/paper-styles#^1~~.0.0~~" "0j8~~vg74~~x~~rcxlni8i93dsab3y80f34kk30lv4yblqpkp9c3nrilf7~~")
17		(fetchbower "neon-animation" "PolymerElements/neon-animation#1.2.4" "PolymerElements/neon-animation#^1.0.0" "16mz9i2n5w0k5j8d6gha23cnbdgm5syz3fawyh89gdbq97bi2q5j")
18		(fetchbower "iron-a11y-announcer" "PolymerElements/iron-a11y-announcer#1.0.5" "PolymerElements/iron-a11y-announcer#^1.0.0" "0n7c7j1pwk3835s7s2jd9125wdcsqf216yi5gj07wn5s8h8p7m9d")
19		(fetchbower "iron-~~overlay~~-behavior" "PolymerElements/iron-~~overlay~~-behavior#1~~.8.6~~" "PolymerElements/iron-~~overlay~~-behavior#^1~~.0.9~~" "14b~~rn9gz6qqskarg3fxk91xs7~~vg02vgcs~~z9a974~~3~~kidxr0l0413m~~")
20		(fetchbower "iron-fit-behavior" "PolymerElements/iron-fit-behavior#1.2.5" "PolymerElements/iron-fit-behavior#^1.1.0" "1msnlh8lp1xg6v4h6dkjwj9kzac5q5q208ayla3x9hi483ki6rlf")
21		(fetchbower "iron-~~checked-element-~~behavior" "PolymerElements/iron-~~checked-element-~~behavior#1.~~0.5~~" "PolymerElements/iron-~~checked-element-~~behavior#^1~~.0.0~~" "0l0y~~y4a~~h~~454s~~8bzfv~~076s8~~b~~y7h67zy9n~~i~~6xb932q~~w~~yhx8~~br6c1m7")
22		(fetchbower "promise-polyfill" "polymerlabs/promise-polyfill#1.0.1" "polymerlabs/promise-polyfill#^1.0.0" "045bj2caav3famr5hhxgs1dx7n08r4s46mlzwb313vdy17is38xb")
23		(fetchbower "iron-behaviors" "PolymerElements/iron-behaviors#1.0.17" "PolymerElements/iron-behaviors#^1~~.0.0~~" "021~~qvkmbk32jrrmm~~ph~~pmwgby4bzi5jyf47rh~~1~~bxmq2ip07~~ly4bpr")
24		(fetchbower "iron-validatable-behavior" "PolymerElements/iron-validatable-behavior#1.1.1" "PolymerElements/iron-validatable-behavior#^1.0.0" "1yhxlvywhw2klbbgm3f3cmanxfxggagph4ii635zv0c13707wslv")
25		(fetchbower "iron-form-element-behavior" "PolymerElements/iron-form-element-behavior#1.0.6" "PolymerElements/iron-form-element-behavior#^1.0.0" "0rdhxivgkdhhz2yadgdbjfc70l555p3y83vjh8rfj5hr0asyn6q1")
26		(fetchbower "iron-a~~11y-k~~eys-behavior" "polymerelements/iron-a~~11y-k~~eys-behavior#1.1.9" "polymerelements/iron-a~~11y-k~~eys-behavior#^1~~.0.0~~" "1~~imm4~~g~~c84qizihh~~byhfa8lwj~~h3m~~yhj8~~37f7~~9i5~~m04xjgwrjm~~k~~af6~~")
27		(fetchbower "paper-ripple" "PolymerElements/paper-ripple#1.0.8" "PolymerElements/paper-ripple#^1.0.0" "0r9sq8ik7wwrw0qb82c3rw0c030ljwd3s466c9y4qbcrsbvfjnns")
28		(fetchbower "font-roboto" "PolymerElements/font-roboto#1.0.1" "PolymerElements/font-roboto#^1.0.1" "02jz43r0wkyr3yp7rq2rc08l5cwnsgca9fr54sr4rhsnl7cjpxrj")
29		(fetchbower "iron-meta" "PolymerElements/iron-meta#1.1.2" "PolymerElements/iron-meta#^1.0.0" "1wl4dx8fnsknw9z9xi8bpc4cy9x70c11x4zxwxnj73hf3smifppl")
30		(fetchbower "iron-resizable-behavior" "PolymerElements/iron-resizable-behavior#1.0.5" "PolymerElements/iron-resizable-behavior#^1.0.0" "1fd5zmbr2hax42vmcasncvk7lzi38fmb1kyii26nn8pnnjak7zkn")
31		(fetchbower "iron-selector" "PolymerElements/iron-selector#1.5.2" "PolymerElements/iron-selector#^1.0.0" "1ajv46llqzvahm5g6g75w7nfyjcslp53ji0wm96l2k94j87spv3r")
32		(fetchbower "web-animations-js" "web-animations/web-animations-js#2.2.2" "web-animations/web-animations-js#^2.2.0" "1izfvm3l67vwys0bqbhidi9rqziw2f8wv289386sc6jsxzgkzhga")
	4	(fetchbower "webcomponentsjs" "1.2.3" "^1.2.3" "0db2fjk779rhl9d4ifpk1j9a83vngx6j3hk7si1752dqxj857267")
	5	(fetchbower "polymer" "Polymer/polymer#2.6.0" "Polymer/polymer#^2.6.0" "1jw5syjn0naa7dlxzxvsgwb20zbkbpx0pcg0wzjq4wr49c20nw0k")
	6	(fetchbower "paper-button" "PolymerElements/paper-button#2.1.2" "PolymerElements/paper-button#^2.1.2" "1lwmjwhvimh02gss39yjp5h7yg9mxl1ig59yrk085v86y5f5ilz1")
	7	(fetchbower "paper-spinner" "PolymerElements/paper-spinner#2.1.0" "PolymerElements/paper-spinner#^2.1.0" "07jamgxzvy4r9pgf5ikj1fm8nkrw6sywgcxvmm7ax58hjvmd4i45")
	8	(fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#2.1.1" "PolymerElements/paper-tooltip#^2.1.1" "0ja9vz4xps7dxfx6kmrwq0gifbjsyc3pk9l3hd5233ss72ghlvgb")
	9	(fetchbower "paper-toast" "PolymerElements/paper-toast#2.1.2" "PolymerElements/paper-toast#^2.1.2" "0mkj9ayjx2l9hvrz4kw3yjbgrs9w873k05ywv94nh92mzpjkxn04")
	10	(fetchbower "paper-toggle-button" "PolymerElements/paper-toggle-button#2.1.1" "PolymerElements/paper-toggle-button#^2.1.1" "1rl5ar3ny6r3v9hr8s68v8b3zh5yl52pikhi4b9iv9grv29g5999")
	11	(fetchbower "iron-ajax" "PolymerElements/iron-ajax#2.1.3" "PolymerElements/iron-ajax#^2.1.3" "187zb6lkv18yapl292qhn611mbl4i2bqs2dimlwmdjaln285nc1l")
	12	(fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#2.2.0" "PolymerElements/iron-autogrow-textarea#^2.2.0" "1cx7g49m20z08x25z24g2pvv6m6dwfbkga3nsw0rpi3jk7xhznqw")
	13	(fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#2.1.2" "PolymerElements/iron-a11y-keys#^2.1.2" "0zdn3bzfrk88iwahmmzvcjn3m90zga1l8dx42b365n8if0n0zapj")
	14	(fetchbower "shadycss" "webcomponents/shadycss#1.3.5" "webcomponents/shadycss#^v1.1.0" "1xp07d6jlmc3ywg4cdp2nijwi0vrbzw468242xz0s6zx5z2n2wzf")
	15	(fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#2.0.3" "PolymerElements/iron-flex-layout#1 - 2" "1ir9ili3rkcgbfj6is5s70vyb7m6avz0av0lpjjlhhsplrrl90bk")
	16	(fetchbower "paper-behaviors" "PolymerElements/paper-behaviors#2.1.1" "PolymerElements/paper-behaviors#1 - 2" "0wzyznmy1q64jsm6lck0xma92lg2hz9h9m05r68iy20iyrvbjld7")
	17	(fetchbower "paper-styles" "PolymerElements/paper-styles#2.1.0" "PolymerElements/paper-styles#1 - 2" "0xzsd7pvjsk7lgcmvx4q0dvps40q3mymkx26zgs8ns91s1ssfqbx")
	18	(fetchbower "iron-a11y-announcer" "PolymerElements/iron-a11y-announcer#2.1.0" "PolymerElements/iron-a11y-announcer#1 - 2" "1hvmw76im8y3pxmg1yfnlkzap429q9i4v1z42y7m8lz0996jmxrz")
	19	(fetchbower "iron-overlay-behavior" "PolymerElements/iron-overlay-behavior#2.3.4" "PolymerElements/iron-overlay-behavior#1 - 2" "0hk2fxhfz7kg27349qz1c87vq6nfdcnjr9az3q95ak3rigsb71wg")
	20	(fetchbower "iron-fit-behavior" "PolymerElements/iron-fit-behavior#2.2.1" "PolymerElements/iron-fit-behavior#1 - 2" "0v89am4r2fncr7m9k0f2xqh5bvgn2dqjjc7p515ix4grk89whbs3")
	21	(fetchbower "iron-checked-element-behavior" "PolymerElements/iron-checked-element-behavior#2.1.1" "PolymerElements/iron-checked-element-behavior#1 - 2" "00gpvnb7anspadw59av7lca6p03qlx59dgnhw3lqf5v223dsh0l3")
	22	(fetchbower "iron-behaviors" "PolymerElements/iron-behaviors#2.1.1" "PolymerElements/iron-behaviors#1 - 2" "0c71l1il76jg8gvyh8bwlqraif53gfnz5700vpg35qyr1biwbr1w")
	23	(fetchbower "iron-validatable-behavior" "PolymerElements/iron-validatable-behavior#2.1.0" "PolymerElements/iron-validatable-behavior#1 - 2" "1j65zv7hcxdcyyanzhp2wap3bnx7cz8ghd44m12fad2206jj6ysi")
	24	(fetchbower "iron-a11y-keys-behavior" "PolymerElements/iron-a11y-keys-behavior#2.1.1" "PolymerElements/iron-a11y-keys-behavior#1 - 2" "0jsw7wvh4wzcjqdbvxyha99h1ph61lykyyyvdb6hm8m8w40bhs9b")
	25	(fetchbower "paper-ripple" "PolymerElements/paper-ripple#2.1.1" "PolymerElements/paper-ripple#1 - 2" "0sam6w83nxf9mss79j6hjfsx0288pf4hwr1bw5xclzgpddcjmrm5")
	26	(fetchbower "font-roboto" "PolymerElements/font-roboto#1.1.0" "PolymerElements/font-roboto#^1.0.1" "0z4msvaa5pnr84j2r957g313fmdbdbrknhdw1axy5g48845yv04s")
	27	(fetchbower "iron-resizable-behavior" "PolymerElements/iron-resizable-behavior#2.1.1" "PolymerElements/iron-resizable-behavior#1 - 2" "0169rg6kby0ypfiwbkin46ywaszwj7r91yn081yqd96l1115aqnk")
	28	(fetchbower "iron-form-element-behavior" "PolymerElements/iron-form-element-behavior#2.1.3" "PolymerElements/iron-form-element-behavior#1 - 2" "1c83kkfqvb5pdlvrhad3l7b11i244a8lykc8kzfnb9ya0xrln0cn")
	29	(fetchbower "iron-meta" "PolymerElements/iron-meta#2.1.1" "PolymerElements/iron-meta#1 - 2" "12w1pcl3w97xpxihqddbf2d9dx8xz5i1jd9bz1xrmfsh25isni40")
33	30	]; }

pkgs/node-default.nix

0 +5 -3

-             # This file has been generated by node2nix 1.0.0. Do not edit!
+             # This file has been generated by node2nix 1.6.0. Do not edit!
              {pkgs ? import <nixpkgs> {
                  inherit system;
-               }, system ? builtins.currentSystem}:
+               }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
              let
                nodeEnv = import ./node-env.nix {
-                 inherit (pkgs) stdenv python utillinux runCommand writeTextFile nodejs;
+                 inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+                 inherit nodejs;
+                 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
                };
              in
              import ./node-packages.nix {

pkgs/node-env.nix

0 +384 -134

This diff has been collapsed as it changes many lines, (518 lines changed) Show them Hide them
			@@ -1,31 +1,33 b''
	1	1	# This file originates from node2nix
	2	2
	3		{stdenv, ~~python~~, nodejs, utillinux, runCommand, writeTextFile}:
		3	{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
	4	4
	5	5	let
		6	python = if nodejs ? python then nodejs.python else python2;
		7
	6	8	# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
	7	9	tarWrapper = runCommand "tarWrapper" {} ''
	8	10	mkdir -p $out/bin
	9
		11
	10	12	cat > $out/bin/tar <<EOF
	11	13	#! ${stdenv.shell} -e
	12	14	$(type -p tar) "\$@" --warning=no-unknown-keyword
	13	15	EOF
	14
		16
	15	17	chmod +x $out/bin/tar
	16	18	'';
	17
		19
	18	20	# Function that generates a TGZ file from a NPM project
	19	21	buildNodeSourceDist =
	20	22	{ name, version, src, ... }:
	21
		23
	22	24	stdenv.mkDerivation {
	23	25	name = "node-tarball-${name}-${version}";
	24	26	inherit src;
	25	27	buildInputs = [ nodejs ];
	26	28	buildPhase = ''
	27	29	export HOME=$TMPDIR
	28		tgzFile=$(npm pack)
		30	tgzFile=$(npm pack \| tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
	29	31	'';
	30	32	installPhase = ''
	31	33	mkdir -p $out/tarballs
			@@ -42,151 +44,322 b' let'
	42	44	# Bundle the dependencies of the package
	43	45	mkdir -p node_modules
	44	46	cd node_modules
	45
		47
	46	48	# Only include dependencies if they don't exist. They may also be bundled in the package.
	47	49	if [ ! -e "${dependency.name}" ]
	48	50	then
	49	51	${composePackage dependency}
	50	52	fi
	51
		53
	52	54	cd ..
	53	55	''
	54	56	) dependencies);
	55	57
	56	58	# Recursively composes the dependencies of a package
	57	59	composePackage = { name, packageName, src, dependencies ? [], ... }@args:
	58		let
	59		fixImpureDependencies = writeTextFile {
	60		name = "fixDependencies.js";
	61		text = ''
	62		var fs = require('fs');
	63		var url = require('url');
	64
	65		/*
	66		* Replaces an impure version specification by *
	67		*/
	68		function replaceImpureVersionSpec(versionSpec) {
	69		var parsedUrl = url.parse(versionSpec);
	70
	71		if(versionSpec == "latest" \|\| versionSpec == "unstable" \|\|
	72		versionSpec.substr(0, 2) == ".." \|\| dependency.substr(0, 2) == "./" \|\| dependency.substr(0, 2) == "~/" \|\| dependency.substr(0, 1) == '/')
	73		return '*';
	74		else if(parsedUrl.protocol == "git:" \|\| parsedUrl.protocol == "git+ssh:" \|\| parsedUrl.protocol == "git+http:" \|\| parsedUrl.protocol == "git+https:" \|\|
	75		parsedUrl.protocol == "http:" \|\| parsedUrl.protocol == "https:")
	76		return '*';
	77		else
	78		return versionSpec;
	79		}
	80
	81		var packageObj = JSON.parse(fs.readFileSync('./package.json'));
	82
	83		/* Replace dependencies */
	84		if(packageObj.dependencies !== undefined) {
	85		for(var dependency in packageObj.dependencies) {
	86		var versionSpec = packageObj.dependencies[dependency];
	87		packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
	88		}
	89		}
	90
	91		/* Replace development dependencies */
	92		if(packageObj.devDependencies !== undefined) {
	93		for(var dependency in packageObj.devDependencies) {
	94		var versionSpec = packageObj.devDependencies[dependency];
	95		packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
	96		}
	97		}
	98
	99		/* Replace optional dependencies */
	100		if(packageObj.optionalDependencies !== undefined) {
	101		for(var dependency in packageObj.optionalDependencies) {
	102		var versionSpec = packageObj.optionalDependencies[dependency];
	103		packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
	104		}
	105		}
	106
	107		/* Write the fixed JSON file */
	108		fs.writeFileSync("package.json", JSON.stringify(packageObj));
	109		'';
	110		};
	111		in
	112	60	''
	113	61	DIR=$(pwd)
	114	62	cd $TMPDIR
	115
		63
	116	64	unpackFile ${src}
	117
		65
	118	66	# Make the base dir in which the target dependency resides first
	119	67	mkdir -p "$(dirname "$DIR/${packageName}")"
	120	68
	121	69	if [ -f "${src}" ]
	122	70	then
	123	71	# Figure out what directory has been unpacked
	124		packageDir=$(find . -~~type d -~~maxdepth 1 \| tail -1)
	125
		72	packageDir="$(find . -maxdepth 1 -type d \| tail -1)"
		73
	126	74	# Restore write permissions to make building work
		75	find "$packageDir" -type d -print0 \| xargs -0 chmod u+x
	127	76	chmod -R u+w "$packageDir"
	128
		77
	129	78	# Move the extracted tarball into the output folder
	130	79	mv "$packageDir" "$DIR/${packageName}"
	131	80	elif [ -d "${src}" ]
	132	81	then
		82	# Get a stripped name (without hash) of the source directory.
		83	# On old nixpkgs it's already set internally.
		84	if [ -z "$strippedName" ]
		85	then
		86	strippedName="$(stripHash ${src})"
		87	fi
		88
	133	89	# Restore write permissions to make building work
	134		chmod -R u+w $strippedName
	135
	136		# Move the extracted directory into the output folder
	137		mv $strippedName "$DIR/${packageName}"
		90	chmod -R u+w "$strippedName"
		91
		92	# Move the extracted directory into the output folder
		93	mv "$strippedName" "$DIR/${packageName}"
	138	94	fi
	139
		95
	140	96	# Unset the stripped name to not confuse the next unpack step
	141	97	unset strippedName
	142
	143		# Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
	144		# The following JavaScript replaces these by * to prevent that
		98
		99	# Include the dependencies of the package
	145	100	cd "$DIR/${packageName}"
	146		node ${fixImpureDependencies}
	147
	148		# Include the dependencies of the package
	149	101	${includeDependencies { inherit dependencies; }}
	150	102	cd ..
	151	103	${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
	152	104	'';
	153	105
		106	pinpointDependencies = {dependencies, production}:
		107	let
		108	pinpointDependenciesFromPackageJSON = writeTextFile {
		109	name = "pinpointDependencies.js";
		110	text = ''
		111	var fs = require('fs');
		112	var path = require('path');
		113
		114	function resolveDependencyVersion(location, name) {
		115	if(location == process.env['NIX_STORE']) {
		116	return null;
		117	} else {
		118	var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
		119
		120	if(fs.existsSync(dependencyPackageJSON)) {
		121	var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
		122
		123	if(dependencyPackageObj.name == name) {
		124	return dependencyPackageObj.version;
		125	}
		126	} else {
		127	return resolveDependencyVersion(path.resolve(location, ".."), name);
		128	}
		129	}
		130	}
		131
		132	function replaceDependencies(dependencies) {
		133	if(typeof dependencies == "object" && dependencies !== null) {
		134	for(var dependency in dependencies) {
		135	var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
		136
		137	if(resolvedVersion === null) {
		138	process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
		139	} else {
		140	dependencies[dependency] = resolvedVersion;
		141	}
		142	}
		143	}
		144	}
		145
		146	/* Read the package.json configuration */
		147	var packageObj = JSON.parse(fs.readFileSync('./package.json'));
		148
		149	/* Pinpoint all dependencies */
		150	replaceDependencies(packageObj.dependencies);
		151	if(process.argv[2] == "development") {
		152	replaceDependencies(packageObj.devDependencies);
		153	}
		154	replaceDependencies(packageObj.optionalDependencies);
		155
		156	/* Write the fixed package.json file */
		157	fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
		158	'';
		159	};
		160	in
		161	''
		162	node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
		163
		164	${stdenv.lib.optionalString (dependencies != [])
		165	''
		166	if [ -d node_modules ]
		167	then
		168	cd node_modules
		169	${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
		170	cd ..
		171	fi
		172	''}
		173	'';
		174
		175	# Recursively traverses all dependencies of a package and pinpoints all
		176	# dependencies in the package.json file to the versions that are actually
		177	# being used.
		178
		179	pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
		180	''
		181	if [ -d "${packageName}" ]
		182	then
		183	cd "${packageName}"
		184	${pinpointDependencies { inherit dependencies production; }}
		185	cd ..
		186	${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
		187	fi
		188	'';
		189
	154	190	# Extract the Node.js source code which is used to compile packages with
	155	191	# native bindings
	156	192	nodeSources = runCommand "node-sources" {} ''
	157	193	tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
	158	194	mv node-* $out
	159	195	'';
	160
		196
		197	# Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
		198	addIntegrityFieldsScript = writeTextFile {
		199	name = "addintegrityfields.js";
		200	text = ''
		201	var fs = require('fs');
		202	var path = require('path');
		203
		204	function augmentDependencies(baseDir, dependencies) {
		205	for(var dependencyName in dependencies) {
		206	var dependency = dependencies[dependencyName];
		207
		208	// Open package.json and augment metadata fields
		209	var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
		210	var packageJSONPath = path.join(packageJSONDir, "package.json");
		211
		212	if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
		213	console.log("Adding metadata fields to: "+packageJSONPath);
		214	var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
		215
		216	if(dependency.integrity) {
		217	packageObj["_integrity"] = dependency.integrity;
		218	} else {
		219	packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
		220	}
		221
		222	packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
		223	fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
		224	}
		225
		226	// Augment transitive dependencies
		227	if(dependency.dependencies !== undefined) {
		228	augmentDependencies(packageJSONDir, dependency.dependencies);
		229	}
		230	}
		231	}
		232
		233	if(fs.existsSync("./package-lock.json")) {
		234	var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
		235
		236	if(packageLock.lockfileVersion !== 1) {
		237	process.stderr.write("Sorry, I only understand lock file version 1!\n");
		238	process.exit(1);
		239	}
		240
		241	if(packageLock.dependencies !== undefined) {
		242	augmentDependencies(".", packageLock.dependencies);
		243	}
		244	}
		245	'';
		246	};
		247
		248	# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
		249	reconstructPackageLock = writeTextFile {
		250	name = "addintegrityfields.js";
		251	text = ''
		252	var fs = require('fs');
		253	var path = require('path');
		254
		255	var packageObj = JSON.parse(fs.readFileSync("package.json"));
		256
		257	var lockObj = {
		258	name: packageObj.name,
		259	version: packageObj.version,
		260	lockfileVersion: 1,
		261	requires: true,
		262	dependencies: {}
		263	};
		264
		265	function augmentPackageJSON(filePath, dependencies) {
		266	var packageJSON = path.join(filePath, "package.json");
		267	if(fs.existsSync(packageJSON)) {
		268	var packageObj = JSON.parse(fs.readFileSync(packageJSON));
		269	dependencies[packageObj.name] = {
		270	version: packageObj.version,
		271	integrity: "sha1-000000000000000000000000000=",
		272	dependencies: {}
		273	};
		274	processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
		275	}
		276	}
		277
		278	function processDependencies(dir, dependencies) {
		279	if(fs.existsSync(dir)) {
		280	var files = fs.readdirSync(dir);
		281
		282	files.forEach(function(entry) {
		283	var filePath = path.join(dir, entry);
		284	var stats = fs.statSync(filePath);
		285
		286	if(stats.isDirectory()) {
		287	if(entry.substr(0, 1) == "@") {
		288	// When we encounter a namespace folder, augment all packages belonging to the scope
		289	var pkgFiles = fs.readdirSync(filePath);
		290
		291	pkgFiles.forEach(function(entry) {
		292	if(stats.isDirectory()) {
		293	var pkgFilePath = path.join(filePath, entry);
		294	augmentPackageJSON(pkgFilePath, dependencies);
		295	}
		296	});
		297	} else {
		298	augmentPackageJSON(filePath, dependencies);
		299	}
		300	}
		301	});
		302	}
		303	}
		304
		305	processDependencies("node_modules", lockObj.dependencies);
		306
		307	fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
		308	'';
		309	};
		310
	161	311	# Builds and composes an NPM package including all its dependencies
	162		buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args:
	163
	164		stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
		312	buildNodePackage =
		313	{ name
		314	, packageName
		315	, version
		316	, dependencies ? []
		317	, buildInputs ? []
		318	, production ? true
		319	, npmFlags ? ""
		320	, dontNpmInstall ? false
		321	, bypassCache ? false
		322	, preRebuild ? ""
		323	, dontStrip ? true
		324	, unpackPhase ? "true"
		325	, buildPhase ? "true"
		326	, ... }@args:
		327
		328	let
		329	forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
		330	extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
		331	in
		332	stdenv.mkDerivation ({
	165	333	name = "node-${name}-${version}";
	166		buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
	167		dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments
	168
	169		inherit dontNpmInstall preRebuild;
	170
	171		unpackPhase = args.unpackPhase or "true";
	172
	173		buildPhase = args.buildPhase or "true";
	174
		334	buildInputs = [ tarWrapper python nodejs ]
		335	++ stdenv.lib.optional (stdenv.isLinux) utillinux
		336	++ stdenv.lib.optional (stdenv.isDarwin) libtool
		337	++ buildInputs;
		338
		339	inherit dontStrip; # Stripping may fail a build for some package deployments
		340	inherit dontNpmInstall preRebuild unpackPhase buildPhase;
		341
	175	342	compositionScript = composePackage args;
	176		passAsFile = [ "compositionScript" ];
	177
	178		installPhase = args.installPhase or ''
		343	pinpointDependenciesScript = pinpointDependenciesOfPackage args;
		344
		345	passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
		346
		347	installPhase = ''
	179	348	# Create and enter a root node_modules/ folder
	180	349	mkdir -p $out/lib/node_modules
	181	350	cd $out/lib/node_modules
	182
		351
	183	352	# Compose the package and all its dependencies
	184	353	source $compositionScriptPath
	185
		354
		355	# Pinpoint the versions of all dependencies to the ones that are actually being used
		356	echo "pinpointing versions of dependencies..."
		357	source $pinpointDependenciesScriptPath
		358
	186	359	# Patch the shebangs of the bundled modules to prevent them from
	187	360	# calling executables outside the Nix store as much as possible
	188	361	patchShebangs .
	189
		362
	190	363	# Deploy the Node.js package by running npm install. Since the
	191	364	# dependencies have been provided already by ourselves, it should not
	192	365	# attempt to install them again, which is good, because we want to make
			@@ -196,23 +369,37 b' let'
	196	369	#
	197	370	# The other responsibilities of NPM are kept -- version checks, build
	198	371	# steps, postprocessing etc.
	199
		372
	200	373	export HOME=$TMPDIR
	201	374	cd "${packageName}"
	202	375	runHook preRebuild
	203		npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
	204
		376
		377	${stdenv.lib.optionalString bypassCache ''
		378	if [ ! -f package-lock.json ]
		379	then
		380	echo "No package-lock.json file found, reconstructing..."
		381	node ${reconstructPackageLock}
		382	fi
		383
		384	node ${addIntegrityFieldsScript}
		385	''}
		386
		387	npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
		388
	205	389	if [ "$dontNpmInstall" != "1" ]
	206	390	then
	207		npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
		391	# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
		392	rm -f npm-shrinkwrap.json
		393
		394	npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
	208	395	fi
	209
		396
	210	397	# Create symlink to the deployed executable folder, if applicable
	211	398	if [ -d "$out/lib/node_modules/.bin" ]
	212	399	then
	213	400	ln -s $out/lib/node_modules/.bin $out/bin
	214	401	fi
	215
		402
	216	403	# Create symlinks to the deployed manual page folders, if applicable
	217	404	if [ -d "$out/lib/node_modules/${packageName}/man" ]
	218	405	then
			@@ -226,52 +413,111 b' let'
	226	413	done
	227	414	done
	228	415	fi
		416
		417	# Run post install hook, if provided
		418	runHook postInstall
	229	419	'';
	230		});
		420	} // extraArgs);
	231	421
	232	422	# Builds a development shell
	233		buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, ... }@args:
		423	buildNodeShell =
		424	{ name
		425	, packageName
		426	, version
		427	, src
		428	, dependencies ? []
		429	, buildInputs ? []
		430	, production ? true
		431	, npmFlags ? ""
		432	, dontNpmInstall ? false
		433	, bypassCache ? false
		434	, dontStrip ? true
		435	, unpackPhase ? "true"
		436	, buildPhase ? "true"
		437	, ... }@args:
		438
	234	439	let
	235		nodeDependencies = stdenv.mkDerivation {
		440	forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
		441
		442	extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
		443
		444	nodeDependencies = stdenv.mkDerivation ({
	236	445	name = "node-dependencies-${name}-${version}";
	237
	238		buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
	239
		446
		447	buildInputs = [ tarWrapper python nodejs ]
		448	++ stdenv.lib.optional (stdenv.isLinux) utillinux
		449	++ stdenv.lib.optional (stdenv.isDarwin) libtool
		450	++ buildInputs;
		451
		452	inherit dontStrip; # Stripping may fail a build for some package deployments
		453	inherit dontNpmInstall unpackPhase buildPhase;
		454
	240	455	includeScript = includeDependencies { inherit dependencies; };
	241		passAsFile = [ "includeScript" ];
	242
	243		buildCommand = ''
	244		mkdir -p $out/lib
	245		cd $out/lib
		456	pinpointDependenciesScript = pinpointDependenciesOfPackage args;
		457
		458	passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
		459
		460	installPhase = ''
		461	mkdir -p $out/${packageName}
		462	cd $out/${packageName}
		463
	246	464	source $includeScriptPath
	247
		465
	248	466	# Create fake package.json to make the npm commands work properly
	249		c~~at >~~ package.json ~~<<EOF~~
	250		{
	251		"name": "${packageName}",
	252		"version": "${version}"
	253		}
	254		EOF
	255
		467	cp ${src}/package.json .
		468	chmod 644 package.json
		469	${stdenv.lib.optionalString bypassCache ''
		470	if [ -f ${src}/package-lock.json ]
		471	then
		472	cp ${src}/package-lock.json .
		473	fi
		474	''}
		475
		476	# Pinpoint the versions of all dependencies to the ones that are actually being used
		477	echo "pinpointing versions of dependencies..."
		478	cd ..
		479	${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
		480
		481	source $pinpointDependenciesScriptPath
		482	cd ${packageName}
		483
	256	484	# Patch the shebangs of the bundled modules to prevent them from
	257	485	# calling executables outside the Nix store as much as possible
	258	486	patchShebangs .
	259
	260		export HOME=$TMPDIR
	261		npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
	262
	263		${stdenv.lib.optionalString (!dontNpmInstall) ''
	264		npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
		487
		488	export HOME=$PWD
		489
		490	${stdenv.lib.optionalString bypassCache ''
		491	if [ ! -f package-lock.json ]
		492	then
		493	echo "No package-lock.json file found, reconstructing..."
		494	node ${reconstructPackageLock}
		495	fi
		496
		497	node ${addIntegrityFieldsScript}
	265	498	''}
	266	499
		500	npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
		501
		502	${stdenv.lib.optionalString (!dontNpmInstall) ''
		503	# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
		504	rm -f npm-shrinkwrap.json
		505
		506	npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
		507	''}
		508
		509	cd ..
		510	${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
		511
		512	mv ${packageName} lib
	267	513	ln -s $out/lib/node_modules/.bin $out/bin
	268	514	'';
	269		};
		515	} // extraArgs);
	270	516	in
	271		~~stdenv~~.~~lib~~.~~makeOverridable~~ stdenv.mkDerivation {
		517	stdenv.mkDerivation {
	272	518	name = "node-shell-${name}-${version}";
	273
	274		buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ ~~args~~.buildInputs or [];
		519
		520	buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
	275	521	buildCommand = ''
	276	522	mkdir -p $out/bin
	277	523	cat > $out/bin/shell <<EOF
			@@ -281,7 +527,7 b' let'
	281	527	EOF
	282	528	chmod +x $out/bin/shell
	283	529	'';
	284
		530
	285	531	# Provide the dependencies in a development shell through the NODE_PATH environment variable
	286	532	inherit nodeDependencies;
	287	533	shellHook = stdenv.lib.optionalString (dependencies != []) ''
			@@ -289,4 +535,8 b' let'
	289	535	'';
	290	536	};
	291	537	in
	292		{ inherit buildNodeSourceDist buildNodePackage buildNodeShell; }
		538	{
		539	buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
		540	buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
		541	buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
		542	}

pkgs/node-packages.nix

0 +3022 -2658

This diff has been collapsed as it changes many lines, (5680 lines changed) Show them Hide them
			@@ -1,9 +1,1207 b''
	1		# This file has been generated by node2nix 1.0.0. Do not edit!
		1	# This file has been generated by node2nix 1.6.0. Do not edit!
	2	2
	3		{nodeEnv, fetchurl, fetchgit}:
		3	{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
	4	4
	5	5	let
	6	6	sources = {
		7	"@types/clone-0.1.30" = {
		8	name = "_at_types_slash_clone";
		9	packageName = "@types/clone";
		10	version = "0.1.30";
		11	src = fetchurl {
		12	url = "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz";
		13	sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
		14	};
		15	};
		16	"@types/node-4.2.23" = {
		17	name = "_at_types_slash_node";
		18	packageName = "@types/node";
		19	version = "4.2.23";
		20	src = fetchurl {
		21	url = "https://registry.npmjs.org/@types/node/-/node-4.2.23.tgz";
		22	sha512 = "U6IchCNLRyswc9p6G6lxWlbE+KwAhZp6mGo6MD2yWpmFomhYmetK+c98OpKyvphNn04CU3aXeJrXdOqbXVTS/w==";
		23	};
		24	};
		25	"@types/node-6.0.114" = {
		26	name = "_at_types_slash_node";
		27	packageName = "@types/node";
		28	version = "6.0.114";
		29	src = fetchurl {
		30	url = "https://registry.npmjs.org/@types/node/-/node-6.0.114.tgz";
		31	sha512 = "5ViC9dwf1VIAtrOFTvOuN04lJgw28eKjuy0Vg2Bd/fSlxKP2feCSkIw04ZgOENL2ywdWrtbkthp1XVLEjJmouw==";
		32	};
		33	};
		34	"@types/parse5-0.0.31" = {
		35	name = "_at_types_slash_parse5";
		36	packageName = "@types/parse5";
		37	version = "0.0.31";
		38	src = fetchurl {
		39	url = "https://registry.npmjs.org/@types/parse5/-/parse5-0.0.31.tgz";
		40	sha1 = "e827a493a443b156e1b582a2e4c3bdc0040f2ee7";
		41	};
		42	};
		43	"abbrev-1.1.1" = {
		44	name = "abbrev";
		45	packageName = "abbrev";
		46	version = "1.1.1";
		47	src = fetchurl {
		48	url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
		49	sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
		50	};
		51	};
		52	"acorn-3.3.0" = {
		53	name = "acorn";
		54	packageName = "acorn";
		55	version = "3.3.0";
		56	src = fetchurl {
		57	url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
		58	sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
		59	};
		60	};
		61	"acorn-5.7.1" = {
		62	name = "acorn";
		63	packageName = "acorn";
		64	version = "5.7.1";
		65	src = fetchurl {
		66	url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz";
		67	sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==";
		68	};
		69	};
		70	"acorn-jsx-3.0.1" = {
		71	name = "acorn-jsx";
		72	packageName = "acorn-jsx";
		73	version = "3.0.1";
		74	src = fetchurl {
		75	url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
		76	sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
		77	};
		78	};
		79	"ajv-4.11.8" = {
		80	name = "ajv";
		81	packageName = "ajv";
		82	version = "4.11.8";
		83	src = fetchurl {
		84	url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
		85	sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
		86	};
		87	};
		88	"amdefine-1.0.1" = {
		89	name = "amdefine";
		90	packageName = "amdefine";
		91	version = "1.0.1";
		92	src = fetchurl {
		93	url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
		94	sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
		95	};
		96	};
		97	"ansi-escape-sequences-3.0.0" = {
		98	name = "ansi-escape-sequences";
		99	packageName = "ansi-escape-sequences";
		100	version = "3.0.0";
		101	src = fetchurl {
		102	url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz";
		103	sha1 = "1c18394b6af9b76ff9a63509fa497669fd2ce53e";
		104	};
		105	};
		106	"ansi-regex-0.2.1" = {
		107	name = "ansi-regex";
		108	packageName = "ansi-regex";
		109	version = "0.2.1";
		110	src = fetchurl {
		111	url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
		112	sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
		113	};
		114	};
		115	"ansi-regex-2.1.1" = {
		116	name = "ansi-regex";
		117	packageName = "ansi-regex";
		118	version = "2.1.1";
		119	src = fetchurl {
		120	url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
		121	sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
		122	};
		123	};
		124	"ansi-styles-1.1.0" = {
		125	name = "ansi-styles";
		126	packageName = "ansi-styles";
		127	version = "1.1.0";
		128	src = fetchurl {
		129	url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
		130	sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
		131	};
		132	};
		133	"ansi-styles-2.2.1" = {
		134	name = "ansi-styles";
		135	packageName = "ansi-styles";
		136	version = "2.2.1";
		137	src = fetchurl {
		138	url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
		139	sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
		140	};
		141	};
		142	"appenlight-client-git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1" = {
		143	name = "appenlight-client";
		144	packageName = "appenlight-client";
		145	version = "0.5.1";
		146	src = fetchgit {
		147	url = "https://git@github.com/AppEnlight/appenlight-client-js.git";
		148	rev = "14712c64c230fbbe94fcbc8094aef5eb3b90b307";
		149	sha256 = "05146f5b932f166c9a4db601bc9c13ae686899653d1dd03121652631f9bc83d6";
		150	};
		151	};
		152	"aproba-1.2.0" = {
		153	name = "aproba";
		154	packageName = "aproba";
		155	version = "1.2.0";
		156	src = fetchurl {
		157	url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
		158	sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
		159	};
		160	};
		161	"are-we-there-yet-1.1.5" = {
		162	name = "are-we-there-yet";
		163	packageName = "are-we-there-yet";
		164	version = "1.1.5";
		165	src = fetchurl {
		166	url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
		167	sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
		168	};
		169	};
		170	"argparse-0.1.16" = {
		171	name = "argparse";
		172	packageName = "argparse";
		173	version = "0.1.16";
		174	src = fetchurl {
		175	url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
		176	sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
		177	};
		178	};
		179	"array-back-1.0.4" = {
		180	name = "array-back";
		181	packageName = "array-back";
		182	version = "1.0.4";
		183	src = fetchurl {
		184	url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz";
		185	sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b";
		186	};
		187	};
		188	"asap-2.0.6" = {
		189	name = "asap";
		190	packageName = "asap";
		191	version = "2.0.6";
		192	src = fetchurl {
		193	url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
		194	sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
		195	};
		196	};
		197	"asn1-0.2.3" = {
		198	name = "asn1";
		199	packageName = "asn1";
		200	version = "0.2.3";
		201	src = fetchurl {
		202	url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
		203	sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
		204	};
		205	};
		206	"assert-plus-0.2.0" = {
		207	name = "assert-plus";
		208	packageName = "assert-plus";
		209	version = "0.2.0";
		210	src = fetchurl {
		211	url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
		212	sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
		213	};
		214	};
		215	"assert-plus-1.0.0" = {
		216	name = "assert-plus";
		217	packageName = "assert-plus";
		218	version = "1.0.0";
		219	src = fetchurl {
		220	url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
		221	sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
		222	};
		223	};
		224	"async-0.1.22" = {
		225	name = "async";
		226	packageName = "async";
		227	version = "0.1.22";
		228	src = fetchurl {
		229	url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
		230	sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
		231	};
		232	};
		233	"async-0.2.10" = {
		234	name = "async";
		235	packageName = "async";
		236	version = "0.2.10";
		237	src = fetchurl {
		238	url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
		239	sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
		240	};
		241	};
		242	"async-1.0.0" = {
		243	name = "async";
		244	packageName = "async";
		245	version = "1.0.0";
		246	src = fetchurl {
		247	url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz";
		248	sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
		249	};
		250	};
		251	"async-2.6.1" = {
		252	name = "async";
		253	packageName = "async";
		254	version = "2.6.1";
		255	src = fetchurl {
		256	url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
		257	sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
		258	};
		259	};
		260	"asynckit-0.4.0" = {
		261	name = "asynckit";
		262	packageName = "asynckit";
		263	version = "0.4.0";
		264	src = fetchurl {
		265	url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
		266	sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
		267	};
		268	};
		269	"aws-sign2-0.6.0" = {
		270	name = "aws-sign2";
		271	packageName = "aws-sign2";
		272	version = "0.6.0";
		273	src = fetchurl {
		274	url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
		275	sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
		276	};
		277	};
		278	"aws4-1.7.0" = {
		279	name = "aws4";
		280	packageName = "aws4";
		281	version = "1.7.0";
		282	src = fetchurl {
		283	url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
		284	sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
		285	};
		286	};
		287	"babel-polyfill-6.26.0" = {
		288	name = "babel-polyfill";
		289	packageName = "babel-polyfill";
		290	version = "6.26.0";
		291	src = fetchurl {
		292	url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz";
		293	sha1 = "379937abc67d7895970adc621f284cd966cf2153";
		294	};
		295	};
		296	"babel-runtime-6.26.0" = {
		297	name = "babel-runtime";
		298	packageName = "babel-runtime";
		299	version = "6.26.0";
		300	src = fetchurl {
		301	url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
		302	sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
		303	};
		304	};
		305	"balanced-match-1.0.0" = {
		306	name = "balanced-match";
		307	packageName = "balanced-match";
		308	version = "1.0.0";
		309	src = fetchurl {
		310	url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
		311	sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
		312	};
		313	};
		314	"base64-js-1.2.3" = {
		315	name = "base64-js";
		316	packageName = "base64-js";
		317	version = "1.2.3";
		318	src = fetchurl {
		319	url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz";
		320	sha512 = "MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==";
		321	};
		322	};
		323	"bcrypt-pbkdf-1.0.2" = {
		324	name = "bcrypt-pbkdf";
		325	packageName = "bcrypt-pbkdf";
		326	version = "1.0.2";
		327	src = fetchurl {
		328	url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
		329	sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
		330	};
		331	};
		332	"boom-2.10.1" = {
		333	name = "boom";
		334	packageName = "boom";
		335	version = "2.10.1";
		336	src = fetchurl {
		337	url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
		338	sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
		339	};
		340	};
		341	"bower-1.8.4" = {
		342	name = "bower";
		343	packageName = "bower";
		344	version = "1.8.4";
		345	src = fetchurl {
		346	url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
		347	sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
		348	};
		349	};
		350	"brace-expansion-1.1.11" = {
		351	name = "brace-expansion";
		352	packageName = "brace-expansion";
		353	version = "1.1.11";
		354	src = fetchurl {
		355	url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
		356	sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
		357	};
		358	};
		359	"buffer-from-1.1.1" = {
		360	name = "buffer-from";
		361	packageName = "buffer-from";
		362	version = "1.1.1";
		363	src = fetchurl {
		364	url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
		365	sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
		366	};
		367	};
		368	"builtin-modules-1.1.1" = {
		369	name = "builtin-modules";
		370	packageName = "builtin-modules";
		371	version = "1.1.1";
		372	src = fetchurl {
		373	url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
		374	sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
		375	};
		376	};
		377	"builtins-1.0.3" = {
		378	name = "builtins";
		379	packageName = "builtins";
		380	version = "1.0.3";
		381	src = fetchurl {
		382	url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz";
		383	sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
		384	};
		385	};
		386	"caseless-0.12.0" = {
		387	name = "caseless";
		388	packageName = "caseless";
		389	version = "0.12.0";
		390	src = fetchurl {
		391	url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
		392	sha1 = "1b681c21ff84033c826543090689420d187151dc";
		393	};
		394	};
		395	"chalk-0.5.1" = {
		396	name = "chalk";
		397	packageName = "chalk";
		398	version = "0.5.1";
		399	src = fetchurl {
		400	url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
		401	sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
		402	};
		403	};
		404	"chalk-1.1.3" = {
		405	name = "chalk";
		406	packageName = "chalk";
		407	version = "1.1.3";
		408	src = fetchurl {
		409	url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
		410	sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
		411	};
		412	};
		413	"cli-1.0.1" = {
		414	name = "cli";
		415	packageName = "cli";
		416	version = "1.0.1";
		417	src = fetchurl {
		418	url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
		419	sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
		420	};
		421	};
		422	"clipboard-2.0.1" = {
		423	name = "clipboard";
		424	packageName = "clipboard";
		425	version = "2.0.1";
		426	src = fetchurl {
		427	url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.1.tgz";
		428	sha512 = "7yhQBmtN+uYZmfRjjVjKa0dZdWuabzpSKGtyQZN+9C8xlC788SSJjOHWh7tzurfwTqTD5UDYAhIv5fRJg3sHjQ==";
		429	};
		430	};
		431	"clone-1.0.4" = {
		432	name = "clone";
		433	packageName = "clone";
		434	version = "1.0.4";
		435	src = fetchurl {
		436	url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz";
		437	sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
		438	};
		439	};
		440	"co-4.6.0" = {
		441	name = "co";
		442	packageName = "co";
		443	version = "4.6.0";
		444	src = fetchurl {
		445	url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
		446	sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
		447	};
		448	};
		449	"code-point-at-1.1.0" = {
		450	name = "code-point-at";
		451	packageName = "code-point-at";
		452	version = "1.1.0";
		453	src = fetchurl {
		454	url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
		455	sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
		456	};
		457	};
		458	"coffee-script-1.3.3" = {
		459	name = "coffee-script";
		460	packageName = "coffee-script";
		461	version = "1.3.3";
		462	src = fetchurl {
		463	url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
		464	sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
		465	};
		466	};
		467	"colors-0.6.2" = {
		468	name = "colors";
		469	packageName = "colors";
		470	version = "0.6.2";
		471	src = fetchurl {
		472	url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
		473	sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
		474	};
		475	};
		476	"colors-1.0.3" = {
		477	name = "colors";
		478	packageName = "colors";
		479	version = "1.0.3";
		480	src = fetchurl {
		481	url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
		482	sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
		483	};
		484	};
		485	"combined-stream-1.0.6" = {
		486	name = "combined-stream";
		487	packageName = "combined-stream";
		488	version = "1.0.6";
		489	src = fetchurl {
		490	url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
		491	sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
		492	};
		493	};
		494	"command-line-args-3.0.5" = {
		495	name = "command-line-args";
		496	packageName = "command-line-args";
		497	version = "3.0.5";
		498	src = fetchurl {
		499	url = "https://registry.npmjs.org/command-line-args/-/command-line-args-3.0.5.tgz";
		500	sha1 = "5bd4ad45e7983e5c1344918e40280ee2693c5ac0";
		501	};
		502	};
		503	"command-line-usage-3.0.8" = {
		504	name = "command-line-usage";
		505	packageName = "command-line-usage";
		506	version = "3.0.8";
		507	src = fetchurl {
		508	url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-3.0.8.tgz";
		509	sha1 = "b6a20978c1b383477f5c11a529428b880bfe0f4d";
		510	};
		511	};
		512	"concat-map-0.0.1" = {
		513	name = "concat-map";
		514	packageName = "concat-map";
		515	version = "0.0.1";
		516	src = fetchurl {
		517	url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
		518	sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
		519	};
		520	};
		521	"concat-stream-1.6.2" = {
		522	name = "concat-stream";
		523	packageName = "concat-stream";
		524	version = "1.6.2";
		525	src = fetchurl {
		526	url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
		527	sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
		528	};
		529	};
		530	"config-chain-1.1.11" = {
		531	name = "config-chain";
		532	packageName = "config-chain";
		533	version = "1.1.11";
		534	src = fetchurl {
		535	url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
		536	sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
		537	};
		538	};
		539	"console-browserify-1.1.0" = {
		540	name = "console-browserify";
		541	packageName = "console-browserify";
		542	version = "1.1.0";
		543	src = fetchurl {
		544	url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
		545	sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
		546	};
		547	};
		548	"console-control-strings-1.1.0" = {
		549	name = "console-control-strings";
		550	packageName = "console-control-strings";
		551	version = "1.1.0";
		552	src = fetchurl {
		553	url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
		554	sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
		555	};
		556	};
		557	"core-js-2.5.7" = {
		558	name = "core-js";
		559	packageName = "core-js";
		560	version = "2.5.7";
		561	src = fetchurl {
		562	url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz";
		563	sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==";
		564	};
		565	};
		566	"core-util-is-1.0.2" = {
		567	name = "core-util-is";
		568	packageName = "core-util-is";
		569	version = "1.0.2";
		570	src = fetchurl {
		571	url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
		572	sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
		573	};
		574	};
		575	"crisper-1.2.0" = {
		576	name = "crisper";
		577	packageName = "crisper";
		578	version = "1.2.0";
		579	src = fetchurl {
		580	url = "https://registry.npmjs.org/crisper/-/crisper-1.2.0.tgz";
		581	sha1 = "9a91f597d71f6110294e076ad44dbb3408568e46";
		582	};
		583	};
		584	"crisper-2.1.1" = {
		585	name = "crisper";
		586	packageName = "crisper";
		587	version = "2.1.1";
		588	src = fetchurl {
		589	url = "https://registry.npmjs.org/crisper/-/crisper-2.1.1.tgz";
		590	sha512 = "yxfj9nTbFunDASztAxVF8hCPwaZBvTjayNzG3YL/VVQfQaKBXX2+TM3p1xB1Pxd8RYeDQJkJIQRwM3FQSIa+pw==";
		591	};
		592	};
		593	"cryptiles-2.0.5" = {
		594	name = "cryptiles";
		595	packageName = "cryptiles";
		596	version = "2.0.5";
		597	src = fetchurl {
		598	url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
		599	sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
		600	};
		601	};
		602	"cycle-1.0.3" = {
		603	name = "cycle";
		604	packageName = "cycle";
		605	version = "1.0.3";
		606	src = fetchurl {
		607	url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
		608	sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
		609	};
		610	};
		611	"dashdash-1.14.1" = {
		612	name = "dashdash";
		613	packageName = "dashdash";
		614	version = "1.14.1";
		615	src = fetchurl {
		616	url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
		617	sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
		618	};
		619	};
		620	"date-now-0.1.4" = {
		621	name = "date-now";
		622	packageName = "date-now";
		623	version = "0.1.4";
		624	src = fetchurl {
		625	url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
		626	sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
		627	};
		628	};
		629	"dateformat-1.0.2-1.2.3" = {
		630	name = "dateformat";
		631	packageName = "dateformat";
		632	version = "1.0.2-1.2.3";
		633	src = fetchurl {
		634	url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
		635	sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
		636	};
		637	};
		638	"debug-0.7.4" = {
		639	name = "debug";
		640	packageName = "debug";
		641	version = "0.7.4";
		642	src = fetchurl {
		643	url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
		644	sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
		645	};
		646	};
		647	"debug-2.6.9" = {
		648	name = "debug";
		649	packageName = "debug";
		650	version = "2.6.9";
		651	src = fetchurl {
		652	url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
		653	sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
		654	};
		655	};
		656	"deep-extend-0.4.2" = {
		657	name = "deep-extend";
		658	packageName = "deep-extend";
		659	version = "0.4.2";
		660	src = fetchurl {
		661	url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
		662	sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
		663	};
		664	};
		665	"deep-is-0.1.3" = {
		666	name = "deep-is";
		667	packageName = "deep-is";
		668	version = "0.1.3";
		669	src = fetchurl {
		670	url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
		671	sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
		672	};
		673	};
		674	"delayed-stream-1.0.0" = {
		675	name = "delayed-stream";
		676	packageName = "delayed-stream";
		677	version = "1.0.0";
		678	src = fetchurl {
		679	url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
		680	sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
		681	};
		682	};
		683	"delegate-3.2.0" = {
		684	name = "delegate";
		685	packageName = "delegate";
		686	version = "3.2.0";
		687	src = fetchurl {
		688	url = "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz";
		689	sha512 = "IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==";
		690	};
		691	};
		692	"delegates-1.0.0" = {
		693	name = "delegates";
		694	packageName = "delegates";
		695	version = "1.0.0";
		696	src = fetchurl {
		697	url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
		698	sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
		699	};
		700	};
		701	"doctrine-0.7.2" = {
		702	name = "doctrine";
		703	packageName = "doctrine";
		704	version = "0.7.2";
		705	src = fetchurl {
		706	url = "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz";
		707	sha1 = "7cb860359ba3be90e040b26b729ce4bfa654c523";
		708	};
		709	};
		710	"dom-serializer-0.1.0" = {
		711	name = "dom-serializer";
		712	packageName = "dom-serializer";
		713	version = "0.1.0";
		714	src = fetchurl {
		715	url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
		716	sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
		717	};
		718	};
		719	"dom5-1.1.0" = {
		720	name = "dom5";
		721	packageName = "dom5";
		722	version = "1.1.0";
		723	src = fetchurl {
		724	url = "https://registry.npmjs.org/dom5/-/dom5-1.1.0.tgz";
		725	sha1 = "3a0c7700c083ab4c4d26938a78b0f0c6dcc37794";
		726	};
		727	};
		728	"dom5-1.3.6" = {
		729	name = "dom5";
		730	packageName = "dom5";
		731	version = "1.3.6";
		732	src = fetchurl {
		733	url = "https://registry.npmjs.org/dom5/-/dom5-1.3.6.tgz";
		734	sha1 = "a7088a9fc5f3b08dc9f6eda4c7abaeb241945e0d";
		735	};
		736	};
		737	"domelementtype-1.1.3" = {
		738	name = "domelementtype";
		739	packageName = "domelementtype";
		740	version = "1.1.3";
		741	src = fetchurl {
		742	url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
		743	sha1 = "bd28773e2642881aec51544924299c5cd822185b";
		744	};
		745	};
		746	"domelementtype-1.3.0" = {
		747	name = "domelementtype";
		748	packageName = "domelementtype";
		749	version = "1.3.0";
		750	src = fetchurl {
		751	url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
		752	sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
		753	};
		754	};
		755	"domhandler-2.3.0" = {
		756	name = "domhandler";
		757	packageName = "domhandler";
		758	version = "2.3.0";
		759	src = fetchurl {
		760	url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
		761	sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
		762	};
		763	};
		764	"domutils-1.5.1" = {
		765	name = "domutils";
		766	packageName = "domutils";
		767	version = "1.5.1";
		768	src = fetchurl {
		769	url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
		770	sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
		771	};
		772	};
		773	"ecc-jsbn-0.1.2" = {
		774	name = "ecc-jsbn";
		775	packageName = "ecc-jsbn";
		776	version = "0.1.2";
		777	src = fetchurl {
		778	url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
		779	sha1 = "3a83a904e54353287874c564b7549386849a98c9";
		780	};
		781	};
		782	"entities-1.0.0" = {
		783	name = "entities";
		784	packageName = "entities";
		785	version = "1.0.0";
		786	src = fetchurl {
		787	url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
		788	sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
		789	};
		790	};
		791	"entities-1.1.1" = {
		792	name = "entities";
		793	packageName = "entities";
		794	version = "1.1.1";
		795	src = fetchurl {
		796	url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
		797	sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
		798	};
		799	};
		800	"errno-0.1.7" = {
		801	name = "errno";
		802	packageName = "errno";
		803	version = "0.1.7";
		804	src = fetchurl {
		805	url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
		806	sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
		807	};
		808	};
		809	"es6-promise-2.3.0" = {
		810	name = "es6-promise";
		811	packageName = "es6-promise";
		812	version = "2.3.0";
		813	src = fetchurl {
		814	url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
		815	sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
		816	};
		817	};
		818	"es6-promise-4.2.4" = {
		819	name = "es6-promise";
		820	packageName = "es6-promise";
		821	version = "4.2.4";
		822	src = fetchurl {
		823	url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz";
		824	sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==";
		825	};
		826	};
		827	"escape-string-regexp-1.0.5" = {
		828	name = "escape-string-regexp";
		829	packageName = "escape-string-regexp";
		830	version = "1.0.5";
		831	src = fetchurl {
		832	url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
		833	sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
		834	};
		835	};
		836	"escodegen-1.11.0" = {
		837	name = "escodegen";
		838	packageName = "escodegen";
		839	version = "1.11.0";
		840	src = fetchurl {
		841	url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz";
		842	sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==";
		843	};
		844	};
		845	"espree-3.5.4" = {
		846	name = "espree";
		847	packageName = "espree";
		848	version = "3.5.4";
		849	src = fetchurl {
		850	url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz";
		851	sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
		852	};
		853	};
		854	"esprima-1.0.4" = {
		855	name = "esprima";
		856	packageName = "esprima";
		857	version = "1.0.4";
		858	src = fetchurl {
		859	url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
		860	sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
		861	};
		862	};
		863	"esprima-3.1.3" = {
		864	name = "esprima";
		865	packageName = "esprima";
		866	version = "3.1.3";
		867	src = fetchurl {
		868	url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
		869	sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
		870	};
		871	};
		872	"estraverse-3.1.0" = {
		873	name = "estraverse";
		874	packageName = "estraverse";
		875	version = "3.1.0";
		876	src = fetchurl {
		877	url = "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz";
		878	sha1 = "15e28a446b8b82bc700ccc8b96c78af4da0d6cba";
		879	};
		880	};
		881	"estraverse-4.2.0" = {
		882	name = "estraverse";
		883	packageName = "estraverse";
		884	version = "4.2.0";
		885	src = fetchurl {
		886	url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
		887	sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
		888	};
		889	};
		890	"esutils-1.1.6" = {
		891	name = "esutils";
		892	packageName = "esutils";
		893	version = "1.1.6";
		894	src = fetchurl {
		895	url = "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
		896	sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
		897	};
		898	};
		899	"esutils-2.0.2" = {
		900	name = "esutils";
		901	packageName = "esutils";
		902	version = "2.0.2";
		903	src = fetchurl {
		904	url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
		905	sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
		906	};
		907	};
		908	"eventemitter2-0.4.14" = {
		909	name = "eventemitter2";
		910	packageName = "eventemitter2";
		911	version = "0.4.14";
		912	src = fetchurl {
		913	url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
		914	sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
		915	};
		916	};
		917	"exit-0.1.2" = {
		918	name = "exit";
		919	packageName = "exit";
		920	version = "0.1.2";
		921	src = fetchurl {
		922	url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
		923	sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
		924	};
		925	};
		926	"extend-3.0.2" = {
		927	name = "extend";
		928	packageName = "extend";
		929	version = "3.0.2";
		930	src = fetchurl {
		931	url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
		932	sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
		933	};
		934	};
		935	"extract-zip-1.6.7" = {
		936	name = "extract-zip";
		937	packageName = "extract-zip";
		938	version = "1.6.7";
		939	src = fetchurl {
		940	url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz";
		941	sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9";
		942	};
		943	};
		944	"extsprintf-1.3.0" = {
		945	name = "extsprintf";
		946	packageName = "extsprintf";
		947	version = "1.3.0";
		948	src = fetchurl {
		949	url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
		950	sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
		951	};
		952	};
		953	"eyes-0.1.8" = {
		954	name = "eyes";
		955	packageName = "eyes";
		956	version = "0.1.8";
		957	src = fetchurl {
		958	url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
		959	sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
		960	};
		961	};
		962	"fast-levenshtein-2.0.6" = {
		963	name = "fast-levenshtein";
		964	packageName = "fast-levenshtein";
		965	version = "2.0.6";
		966	src = fetchurl {
		967	url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
		968	sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
		969	};
		970	};
		971	"favico.js-0.3.10" = {
		972	name = "favico.js";
		973	packageName = "favico.js";
		974	version = "0.3.10";
		975	src = fetchurl {
		976	url = "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz";
		977	sha1 = "80586e27a117f24a8d51c18a99bdc714d4339301";
		978	};
		979	};
		980	"faye-websocket-0.4.4" = {
		981	name = "faye-websocket";
		982	packageName = "faye-websocket";
		983	version = "0.4.4";
		984	src = fetchurl {
		985	url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
		986	sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
		987	};
		988	};
		989	"fd-slicer-1.0.1" = {
		990	name = "fd-slicer";
		991	packageName = "fd-slicer";
		992	version = "1.0.1";
		993	src = fetchurl {
		994	url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
		995	sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
		996	};
		997	};
		998	"feature-detect-es6-1.5.0" = {
		999	name = "feature-detect-es6";
		1000	packageName = "feature-detect-es6";
		1001	version = "1.5.0";
		1002	src = fetchurl {
		1003	url = "https://registry.npmjs.org/feature-detect-es6/-/feature-detect-es6-1.5.0.tgz";
		1004	sha512 = "DzWPIGzTnfp3/KK1d/YPfmgLqeDju9F2DQYBL35VusgSApcA7XGqVtXfR4ETOOFEzdFJ3J7zh0Gkk011TiA4uQ==";
		1005	};
		1006	};
		1007	"file-sync-cmp-0.1.1" = {
		1008	name = "file-sync-cmp";
		1009	packageName = "file-sync-cmp";
		1010	version = "0.1.1";
		1011	src = fetchurl {
		1012	url = "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz";
		1013	sha1 = "a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b";
		1014	};
		1015	};
		1016	"find-replace-1.0.3" = {
		1017	name = "find-replace";
		1018	packageName = "find-replace";
		1019	version = "1.0.3";
		1020	src = fetchurl {
		1021	url = "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz";
		1022	sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0";
		1023	};
		1024	};
		1025	"findit-2.0.0" = {
		1026	name = "findit";
		1027	packageName = "findit";
		1028	version = "2.0.0";
		1029	src = fetchurl {
		1030	url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz";
		1031	sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
		1032	};
		1033	};
		1034	"findup-sync-0.1.3" = {
		1035	name = "findup-sync";
		1036	packageName = "findup-sync";
		1037	version = "0.1.3";
		1038	src = fetchurl {
		1039	url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
		1040	sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
		1041	};
		1042	};
		1043	"foreachasync-3.0.0" = {
		1044	name = "foreachasync";
		1045	packageName = "foreachasync";
		1046	version = "3.0.0";
		1047	src = fetchurl {
		1048	url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
		1049	sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
		1050	};
		1051	};
		1052	"forever-agent-0.6.1" = {
		1053	name = "forever-agent";
		1054	packageName = "forever-agent";
		1055	version = "0.6.1";
		1056	src = fetchurl {
		1057	url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
		1058	sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
		1059	};
		1060	};
		1061	"form-data-2.1.4" = {
		1062	name = "form-data";
		1063	packageName = "form-data";
		1064	version = "2.1.4";
		1065	src = fetchurl {
		1066	url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
		1067	sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
		1068	};
		1069	};
		1070	"fs-extra-0.6.4" = {
		1071	name = "fs-extra";
		1072	packageName = "fs-extra";
		1073	version = "0.6.4";
		1074	src = fetchurl {
		1075	url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
		1076	sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
		1077	};
		1078	};
		1079	"fs-extra-1.0.0" = {
		1080	name = "fs-extra";
		1081	packageName = "fs-extra";
		1082	version = "1.0.0";
		1083	src = fetchurl {
		1084	url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
		1085	sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
		1086	};
		1087	};
		1088	"fs.extra-1.3.2" = {
		1089	name = "fs.extra";
		1090	packageName = "fs.extra";
		1091	version = "1.3.2";
		1092	src = fetchurl {
		1093	url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
		1094	sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
		1095	};
		1096	};
		1097	"fs.realpath-1.0.0" = {
		1098	name = "fs.realpath";
		1099	packageName = "fs.realpath";
		1100	version = "1.0.0";
		1101	src = fetchurl {
		1102	url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
		1103	sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
		1104	};
		1105	};
		1106	"gauge-2.7.4" = {
		1107	name = "gauge";
		1108	packageName = "gauge";
		1109	version = "2.7.4";
		1110	src = fetchurl {
		1111	url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
		1112	sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
		1113	};
		1114	};
		1115	"gaze-0.5.2" = {
		1116	name = "gaze";
		1117	packageName = "gaze";
		1118	version = "0.5.2";
		1119	src = fetchurl {
		1120	url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz";
		1121	sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f";
		1122	};
		1123	};
		1124	"getobject-0.1.0" = {
		1125	name = "getobject";
		1126	packageName = "getobject";
		1127	version = "0.1.0";
		1128	src = fetchurl {
		1129	url = "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
		1130	sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
		1131	};
		1132	};
		1133	"getpass-0.1.7" = {
		1134	name = "getpass";
		1135	packageName = "getpass";
		1136	version = "0.1.7";
		1137	src = fetchurl {
		1138	url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
		1139	sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
		1140	};
		1141	};
		1142	"glob-3.1.21" = {
		1143	name = "glob";
		1144	packageName = "glob";
		1145	version = "3.1.21";
		1146	src = fetchurl {
		1147	url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
		1148	sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
		1149	};
		1150	};
		1151	"glob-3.2.11" = {
		1152	name = "glob";
		1153	packageName = "glob";
		1154	version = "3.2.11";
		1155	src = fetchurl {
		1156	url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
		1157	sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
		1158	};
		1159	};
		1160	"glob-7.1.2" = {
		1161	name = "glob";
		1162	packageName = "glob";
		1163	version = "7.1.2";
		1164	src = fetchurl {
		1165	url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
		1166	sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
		1167	};
		1168	};
		1169	"globule-0.1.0" = {
		1170	name = "globule";
		1171	packageName = "globule";
		1172	version = "0.1.0";
		1173	src = fetchurl {
		1174	url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
		1175	sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
		1176	};
		1177	};
		1178	"good-listener-1.2.2" = {
		1179	name = "good-listener";
		1180	packageName = "good-listener";
		1181	version = "1.2.2";
		1182	src = fetchurl {
		1183	url = "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz";
		1184	sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
		1185	};
		1186	};
		1187	"graceful-fs-1.2.3" = {
		1188	name = "graceful-fs";
		1189	packageName = "graceful-fs";
		1190	version = "1.2.3";
		1191	src = fetchurl {
		1192	url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
		1193	sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
		1194	};
		1195	};
		1196	"graceful-fs-4.1.11" = {
		1197	name = "graceful-fs";
		1198	packageName = "graceful-fs";
		1199	version = "4.1.11";
		1200	src = fetchurl {
		1201	url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
		1202	sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
		1203	};
		1204	};
	7	1205	"grunt-0.4.5" = {
	8	1206	name = "grunt";
	9	1207	packageName = "grunt";
			@@ -13,6 +1211,15 b' let'
	13	1211	sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
	14	1212	};
	15	1213	};
		1214	"grunt-contrib-concat-0.5.1" = {
		1215	name = "grunt-contrib-concat";
		1216	packageName = "grunt-contrib-concat";
		1217	version = "0.5.1";
		1218	src = fetchurl {
		1219	url = "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.1.tgz";
		1220	sha1 = "953c6efdfdfd2c107ab9c85077f2d4b24d31cd49";
		1221	};
		1222	};
	16	1223	"grunt-contrib-copy-1.0.0" = {
	17	1224	name = "grunt-contrib-copy";
	18	1225	packageName = "grunt-contrib-copy";
			@@ -22,15 +1229,6 b' let'
	22	1229	sha1 = "7060c6581e904b8ab0d00f076e0a8f6e3e7c3573";
	23	1230	};
	24	1231	};
	25		"grunt-contrib-concat-0.5.1" = {
	26		name = "grunt-contrib-concat";
	27		packageName = "grunt-contrib-concat";
	28		version = "0.5.1";
	29		src = fetchurl {
	30		url = "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.1.tgz";
	31		sha1 = "953c6efdfdfd2c107ab9c85077f2d4b24d31cd49";
	32		};
	33		};
	34	1232	"grunt-contrib-jshint-0.12.0" = {
	35	1233	name = "grunt-contrib-jshint";
	36	1234	packageName = "grunt-contrib-jshint";
			@@ -58,24 +1256,6 b' let'
	58	1256	sha1 = "64fdcba25a635f5b4da1b6ce6f90da0aeb6e3f15";
	59	1257	};
	60	1258	};
	61		"crisper-2.1.1" = {
	62		name = "crisper";
	63		packageName = "crisper";
	64		version = "2.1.1";
	65		src = fetchurl {
	66		url = "https://registry.npmjs.org/crisper/-/crisper-2.1.1.tgz";
	67		sha1 = "4cc7321c3e90f3c5cbdc3503217f118fd7d5c51c";
	68		};
	69		};
	70		"vulcanize-1.16.0" = {
	71		name = "vulcanize";
	72		packageName = "vulcanize";
	73		version = "1.16.0";
	74		src = fetchurl {
	75		url = "https://registry.npmjs.org/vulcanize/-/vulcanize-1.16.0.tgz";
	76		sha1 = "b0ce3b0044d194ad4908ae4f1a6c6110a6e4d5e6";
	77		};
	78		};
	79	1259	"grunt-crisper-1.0.1" = {
	80	1260	name = "grunt-crisper";
	81	1261	packageName = "grunt-crisper";
			@@ -85,6 +1265,33 b' let'
	85	1265	sha1 = "e7c091dcaff10deb0091e3035ca7e54008991fe7";
	86	1266	};
	87	1267	};
		1268	"grunt-legacy-log-0.1.3" = {
		1269	name = "grunt-legacy-log";
		1270	packageName = "grunt-legacy-log";
		1271	version = "0.1.3";
		1272	src = fetchurl {
		1273	url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz";
		1274	sha1 = "ec29426e803021af59029f87d2f9cd7335a05531";
		1275	};
		1276	};
		1277	"grunt-legacy-log-utils-0.1.1" = {
		1278	name = "grunt-legacy-log-utils";
		1279	packageName = "grunt-legacy-log-utils";
		1280	version = "0.1.1";
		1281	src = fetchurl {
		1282	url = "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz";
		1283	sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e";
		1284	};
		1285	};
		1286	"grunt-legacy-util-0.2.0" = {
		1287	name = "grunt-legacy-util";
		1288	packageName = "grunt-legacy-util";
		1289	version = "0.2.0";
		1290	src = fetchurl {
		1291	url = "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
		1292	sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
		1293	};
		1294	};
	88	1295	"grunt-vulcanize-1.0.0" = {
	89	1296	name = "grunt-vulcanize";
	90	1297	packageName = "grunt-vulcanize";
			@@ -94,437 +1301,31 b' let'
	94	1301	sha1 = "f4d6cfef274f8216c06f6c290e7dbb3b9e9e3b0f";
	95	1302	};
	96	1303	};
	97		"~~nod~~e~~2nix~~-1.3.0" = {
	98		name = "~~nod~~e~~2nix~~";
	99		packageName = "~~nod~~e~~2nix~~";
	100		version = "1.3.0";
	101		src = fetchurl {
	102		url = "https://registry.npmjs.org/~~nod~~e~~2nix~~/-/~~nod~~e~~2nix~~-1.3.0.tgz";
	103		sha1 = "e830a3bc5880dd22ae47be71a147f776542850cc";
	104		};
	105		};
	106		"jshint-2.~~9.5~~" = {
	107		name = "jshint";
	108		packageName = "jshint";
	109		version = "2.~~9.5~~";
	110		src = fetchurl {
	111		url = "https://registry.npmjs.org/jshint/-/jshint-2.~~9.5~~.tgz";
	112		sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c";
	113		};
	114		};
	115		"bower-1.8.2" = {
	116		name = "~~bower~~";
	117		packageName = "~~bower~~";
	118		version = "1.8.2";
	119		src = fetchurl {
	120		url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz";
	121		sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7";
	122		};
	123		};
	124		"jquery-1.11.3" = {
	125		name = "jquery";
	126		packageName = "jquery";
	127		version = "1.11.3";
	128		src = fetchurl {
	129		url = "https://registry.npmjs.org/jquery/-/jquery-1.11.3.tgz";
	130		sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
	131		};
	132		};
	133		"favico.js-0.3.10" = {
	134		name = "favico.js";
	135		packageName = "favico.js";
	136		version = "0.3.10";
	137		src = fetchurl {
	138		url = "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz";
	139		sha1 = "80586e27a117f24a8d51c18a99bdc714d4339301";
	140		};
	141		};
	142		"clipboard-1.7.1" = {
	143		name = "clipboard";
	144		packageName = "clipboard";
	145		version = "1.7.1";
	146		src = fetchurl {
	147		url = "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz";
	148		sha1 = "360d6d6946e99a7a1fef395e42ba92b5e9b5a16b";
	149		};
	150		};
	151		"moment-2.18.1" = {
	152		name = "moment";
	153		packageName = "moment";
	154		version = "2.18.1";
	155		src = fetchurl {
	156		url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
	157		sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
	158		};
	159		};
	160		"mousetrap-1.6.1" = {
	161		name = "mousetrap";
	162		packageName = "mousetrap";
	163		version = "1.6.1";
	164		src = fetchurl {
	165		url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.1.tgz";
	166		sha1 = "2a085f5c751294c75e7e81f6ec2545b29cbf42d9";
	167		};
	168		};
	169		"appenlight-client-git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1" = {
	170		name = "appenlight-client";
	171		packageName = "appenlight-client";
	172		version = "0.5.1";
	173		src = fetchgit {
	174		url = "https://git@github.com/AppEnlight/appenlight-client-js.git";
	175		rev = "14712c64c230fbbe94fcbc8094aef5eb3b90b307";
	176		sha256 = "92111f1104cbf0b31303c366c0fa752cf68af7ddde40d0161edd1b5fd9dd07f7";
	177		};
	178		};
	179		"async-0.1.22" = {
	180		name = "async";
	181		packageName = "async";
	182		version = "0.1.22";
	183		src = fetchurl {
	184		url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
	185		sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
	186		};
	187		};
	188		"coffee-script-1.3.3" = {
	189		name = "coffee-script";
	190		packageName = "coffee-script";
	191		version = "1.3.3";
	192		src = fetchurl {
	193		url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
	194		sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
	195		};
	196		};
	197		"colors-0.6.2" = {
	198		name = "colors";
	199		packageName = "colors";
	200		version = "0.6.2";
	201		src = fetchurl {
	202		url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
	203		sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
	204		};
	205		};
	206		"dateformat-1.0.2-1.2.3" = {
	207		name = "dateformat";
	208		packageName = "dateformat";
	209		version = "1.0.2-1.2.3";
	210		src = fetchurl {
	211		url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
	212		sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
	213		};
	214		};
	215		"eventemitter2-0.4.14" = {
	216		name = "eventemitter2";
	217		packageName = "eventemitter2";
	218		version = "0.4.14";
	219		src = fetchurl {
	220		url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
	221		sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
	222		};
	223		};
	224		"findup-sync-0.1.3" = {
	225		name = "findup-sync";
	226		packageName = "findup-sync";
	227		version = "0.1.3";
	228		src = fetchurl {
	229		url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
	230		sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
	231		};
	232		};
	233		"glob-3.1.21" = {
	234		name = "glob";
	235		packageName = "glob";
	236		version = "3.1.21";
	237		src = fetchurl {
	238		url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
	239		sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
	240		};
	241		};
	242		"hooker-0.2.3" = {
	243		name = "hooker";
	244		packageName = "hooker";
	245		version = "0.2.3";
	246		src = fetchurl {
	247		url = "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
	248		sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
	249		};
	250		};
	251		"iconv-lite-0.2.11" = {
	252		name = "iconv-lite";
	253		packageName = "iconv-lite";
	254		version = "0.2.11";
	255		src = fetchurl {
	256		url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
	257		sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
	258		};
	259		};
	260		"minimatch-0.2.14" = {
	261		name = "minimatch";
	262		packageName = "minimatch";
	263		version = "0.2.14";
	264		src = fetchurl {
	265		url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
	266		sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
	267		};
	268		};
	269		"nopt-1.0.10" = {
	270		name = "nopt";
	271		packageName = "nopt";
	272		version = "1.0.10";
	273		src = fetchurl {
	274		url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
	275		sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
	276		};
	277		};
	278		"rimraf-2.2.8" = {
	279		name = "rimraf";
	280		packageName = "rimraf";
	281		version = "2.2.8";
	282		src = fetchurl {
	283		url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
	284		sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
	285		};
	286		};
	287		"lodash-0.9.2" = {
	288		name = "lodash";
	289		packageName = "lodash";
	290		version = "0.9.2";
	291		src = fetchurl {
	292		url = "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
	293		sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
	294		};
	295		};
	296		"underscore.string-2.2.1" = {
	297		name = "underscore.string";
	298		packageName = "underscore.string";
	299		version = "2.2.1";
	300		src = fetchurl {
	301		url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
	302		sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
	303		};
	304		};
	305		"which-1.0.9" = {
	306		name = "which";
	307		packageName = "which";
	308		version = "1.0.9";
	309		src = fetchurl {
	310		url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
	311		sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
	312		};
	313		};
	314		"js-yaml-2.0.5" = {
	315		name = "js-yaml";
	316		packageName = "js-yaml";
	317		version = "2.0.5";
	318		src = fetchurl {
	319		url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
	320		sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
	321		};
	322		};
	323		"exit-0.1.2" = {
	324		name = "exit";
	325		packageName = "exit";
	326		version = "0.1.2";
	327		src = fetchurl {
	328		url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
	329		sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
	330		};
	331		};
	332		"getobject-0.1.0" = {
	333		name = "getobject";
	334		packageName = "getobject";
		1304	"har-schema-1.0.5" = {
		1305	name = "har-schema";
		1306	packageName = "har-schema";
		1307	version = "1.0.5";
		1308	src = fetchurl {
		1309	url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
		1310	sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
		1311	};
		1312	};
		1313	"har-validator-4.2.1" = {
		1314	name = "har-validator";
		1315	packageName = "har-validator";
		1316	version = "4.2.1";
		1317	src = fetchurl {
		1318	url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
		1319	sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
		1320	};
		1321	};
		1322	"has-ansi-0.1.0" = {
		1323	name = "has-ansi";
		1324	packageName = "has-ansi";
	335	1325	version = "0.1.0";
	336	1326	src = fetchurl {
	337		url = "https://registry.npmjs.org/~~getobject~~/-/~~getobject~~-0.1.0.tgz";
	338		sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
	339		};
	340		};
	341		"grunt-legacy-util-0.2.0" = {
	342		name = "grunt-legacy-util";
	343		packageName = "grunt-legacy-util";
	344		version = "0.2.0";
	345		src = fetchurl {
	346		url = "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
	347		sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
	348		};
	349		};
	350		"grunt-legacy-log-0.1.3" = {
	351		name = "grunt-legacy-log";
	352		packageName = "grunt-legacy-log";
	353		version = "0.1.3";
	354		src = fetchurl {
	355		url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz";
	356		sha1 = "ec29426e803021af59029f87d2f9cd7335a05531";
	357		};
	358		};
	359		"glob-3.2.11" = {
	360		name = "glob";
	361		packageName = "glob";
	362		version = "3.2.11";
	363		src = fetchurl {
	364		url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
	365		sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
	366		};
	367		};
	368		"lodash-2.4.2" = {
	369		name = "lodash";
	370		packageName = "lodash";
	371		version = "2.4.2";
	372		src = fetchurl {
	373		url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
	374		sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
	375		};
	376		};
	377		"inherits-2.0.3" = {
	378		name = "inherits";
	379		packageName = "inherits";
	380		version = "2.0.3";
	381		src = fetchurl {
	382		url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
	383		sha1 = "633c2c83e3da42a502f52466022480f4208261de";
	384		};
	385		};
	386		"minimatch-0.3.0" = {
	387		name = "minimatch";
	388		packageName = "minimatch";
	389		version = "0.3.0";
	390		src = fetchurl {
	391		url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
	392		sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
	393		};
	394		};
	395		"lru-cache-2.7.3" = {
	396		name = "lru-cache";
	397		packageName = "lru-cache";
	398		version = "2.7.3";
	399		src = fetchurl {
	400		url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
	401		sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
	402		};
	403		};
	404		"sigmund-1.0.1" = {
	405		name = "sigmund";
	406		packageName = "sigmund";
	407		version = "1.0.1";
	408		src = fetchurl {
	409		url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
	410		sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
	411		};
	412		};
	413		"graceful-fs-1.2.3" = {
	414		name = "graceful-fs";
	415		packageName = "graceful-fs";
	416		version = "1.2.3";
	417		src = fetchurl {
	418		url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
	419		sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
	420		};
	421		};
	422		"inherits-1.0.2" = {
	423		name = "inherits";
	424		packageName = "inherits";
	425		version = "1.0.2";
	426		src = fetchurl {
	427		url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
	428		sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
	429		};
	430		};
	431		"abbrev-1.1.0" = {
	432		name = "abbrev";
	433		packageName = "abbrev";
	434		version = "1.1.0";
	435		src = fetchurl {
	436		url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
	437		sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
	438		};
	439		};
	440		"argparse-0.1.16" = {
	441		name = "argparse";
	442		packageName = "argparse";
	443		version = "0.1.16";
	444		src = fetchurl {
	445		url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
	446		sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
	447		};
	448		};
	449		"esprima-1.0.4" = {
	450		name = "esprima";
	451		packageName = "esprima";
	452		version = "1.0.4";
	453		src = fetchurl {
	454		url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
	455		sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
	456		};
	457		};
	458		"underscore-1.7.0" = {
	459		name = "underscore";
	460		packageName = "underscore";
	461		version = "1.7.0";
	462		src = fetchurl {
	463		url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
	464		sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
	465		};
	466		};
	467		"underscore.string-2.4.0" = {
	468		name = "underscore.string";
	469		packageName = "underscore.string";
	470		version = "2.4.0";
	471		src = fetchurl {
	472		url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
	473		sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
	474		};
	475		};
	476		"grunt-legacy-log-utils-0.1.1" = {
	477		name = "grunt-legacy-log-utils";
	478		packageName = "grunt-legacy-log-utils";
	479		version = "0.1.1";
	480		src = fetchurl {
	481		url = "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz";
	482		sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e";
	483		};
	484		};
	485		"underscore.string-2.3.3" = {
	486		name = "underscore.string";
	487		packageName = "underscore.string";
	488		version = "2.3.3";
	489		src = fetchurl {
	490		url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
	491		sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
	492		};
	493		};
	494		"chalk-1.1.3" = {
	495		name = "chalk";
	496		packageName = "chalk";
	497		version = "1.1.3";
	498		src = fetchurl {
	499		url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
	500		sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
	501		};
	502		};
	503		"file-sync-cmp-0.1.1" = {
	504		name = "file-sync-cmp";
	505		packageName = "file-sync-cmp";
	506		version = "0.1.1";
	507		src = fetchurl {
	508		url = "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz";
	509		sha1 = "a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b";
	510		};
	511		};
	512		"ansi-styles-2.2.1" = {
	513		name = "ansi-styles";
	514		packageName = "ansi-styles";
	515		version = "2.2.1";
	516		src = fetchurl {
	517		url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
	518		sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
	519		};
	520		};
	521		"escape-string-regexp-1.0.5" = {
	522		name = "escape-string-regexp";
	523		packageName = "escape-string-regexp";
	524		version = "1.0.5";
	525		src = fetchurl {
	526		url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
	527		sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
		1327	url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
		1328	sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
	528	1329	};
	529	1330	};
	530	1331	"has-ansi-2.0.0" = {
			@@ -536,148 +1337,94 b' let'
	536	1337	sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
	537	1338	};
	538	1339	};
	539		"strip-~~ansi-3~~.0.1" = {
	540		name = "stri~~p-ansi~~";
	541		packageName = "stri~~p-ansi~~";
	542		version = "3.0.1";
	543		src = fetchurl {
	544		url = "https://registry.npmjs.org/stri~~p-ansi~~/-/strip-~~ansi-3~~.0.1.tgz";
	545		sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
	546		};
	547		};
	548		"s~~upports-color~~-2.0.0" = {
	549		name = "s~~upports-color~~";
	550		packageName = "s~~upports-color~~";
	551		version = "2.0.0";
	552		src = fetchurl {
	553		url = "https://registry.npmjs.org/s~~upports-color~~/-/s~~upports-color~~-2.0.0.tgz";
	554		sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
	555		};
	556		};
	557		"a~~nsi~~-~~regex-2~~.1.1" = {
	558		name = "a~~nsi-regex~~";
	559		packageName = "a~~nsi-regex~~";
	560		version = "2.1.1";
	561		src = fetchurl {
	562		url = "https://registry.npmjs.org/a~~nsi-regex~~/-/a~~nsi~~-~~regex-2~~.1.1.tgz";
	563		sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
	564		};
	565		};
	566		"chalk-~~0.5~~.1" = {
	567		name = "chalk";
	568		packageName = "chalk";
	569		version = "~~0.5~~.1";
	570		src = fetchurl {
	571		url = "https://registry.npmjs.org/chalk/-/chalk-~~0.5~~.1.tgz";
	572		sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
	573		};
	574		};
	575		"sour~~ce-map~~-0.3.0" = {
	576		name = "sour~~ce-map~~";
	577		packageName = "sour~~ce-map~~";
	578		version = "0.3.0";
	579		src = fetchurl {
	580		url = "https://registry.npmjs.org/sour~~ce-map~~/-/sour~~ce-map~~-0.3.0.tgz";
	581		sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
	582		};
	583		};
	584		"ansi-styles-1.1.0" = {
	585		name = "~~ansi-~~styles";
	586		packageName = "~~ansi-~~styles";
	587		version = "1.1.0";
	588		src = fetchurl {
	589		url = "https://registry.npmjs.org/~~ansi-~~styles/-/~~ansi-~~styles-1.1.0.tgz";
	590		sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
	591		};
	592		};
	593		"has-~~ansi-0~~.1.0" = {
	594		name = "has~~-ansi~~";
	595		packageName = "has~~-ansi~~";
	596		version = "0.1.0";
	597		src = fetchurl {
	598		url = "https://registry.npmjs.org/has~~-ansi~~/-/has-~~ansi-0~~.1.0.tgz";
	599		sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
	600		};
	601		};
	602		"strip-ansi-0.3.0" = {
	603		name = "strip-ansi";
	604		packageName = "strip-ansi";
	605		version = "0.3.0";
	606		src = fetchurl {
	607		url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
	608		sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
	609		};
	610		};
	611		"supports-color-0.2.0" = {
	612		name = "~~suppo~~r~~ts-c~~olor";
	613		packageName = "~~suppo~~r~~ts-c~~olor";
	614		version = "0.2.0";
	615		src = fetchurl {
	616		url = "https://registry.npmjs.org/~~suppo~~r~~ts-c~~olor/-/s~~upport~~s-~~color-0~~.2.0.tgz";
	617		sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
	618		};
	619		};
	620		"ansi-re~~gex~~-0.2.1" = {
	621		name = "ansi-re~~gex~~";
	622		packageName = "ansi-re~~gex~~";
	623		version = "0.2.1";
	624		src = fetchurl {
	625		url = "https://registry.npmjs.org/ansi-re~~gex~~/-/ansi-re~~gex~~-0.2.1.tgz";
	626		sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
	627		};
	628		};
	629		"amdefine-1.0.1" = {
	630		name = "amdefine";
	631		packageName = "amdefine";
	632		version = "1.0.1";
	633		src = fetchurl {
	634		url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
	635		sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
	636		};
	637		};
	638		"async-2.5.0" = {
	639		name = "async";
	640		packageName = "async";
	641		version = "2.5.0";
	642		src = fetchurl {
	643		url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz";
	644		sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d";
	645		};
	646		};
	647		"less-2.7.2" = {
	648		name = "less";
	649		packageName = "less";
	650		version = "2.7.2";
	651		src = fetchurl {
	652		url = "https://registry.npmjs.org/less/-/less-2.7.2.tgz";
	653		sha1 = "368d6cc73e1fb03981183280918743c5dcf9b3df";
	654		};
	655		};
	656		"lodash-4.17.4" = {
	657		name = "lodash";
	658		packageName = "lodash";
	659		version = "4.17.4";
	660		src = fetchurl {
	661		url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
	662		sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
	663		};
	664		};
	665		"errno-0.1.4" = {
	666		name = "errno";
	667		packageName = "errno";
	668		version = "0.1.4";
	669		src = fetchurl {
	670		url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
	671		sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
	672		};
	673		};
	674		"graceful-fs-4.1.11" = {
	675		name = "graceful-fs";
	676		packageName = "graceful-fs";
	677		version = "4.1.11";
	678		src = fetchurl {
	679		url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
	680		sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
		1340	"has-unicode-2.0.1" = {
		1341	name = "has-unicode";
		1342	packageName = "has-unicode";
		1343	version = "2.0.1";
		1344	src = fetchurl {
		1345	url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
		1346	sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
		1347	};
		1348	};
		1349	"hasha-2.2.0" = {
		1350	name = "hasha";
		1351	packageName = "hasha";
		1352	version = "2.2.0";
		1353	src = fetchurl {
		1354	url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
		1355	sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
		1356	};
		1357	};
		1358	"hawk-3.1.3" = {
		1359	name = "hawk";
		1360	packageName = "hawk";
		1361	version = "3.1.3";
		1362	src = fetchurl {
		1363	url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
		1364	sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
		1365	};
		1366	};
		1367	"hoek-2.16.3" = {
		1368	name = "hoek";
		1369	packageName = "hoek";
		1370	version = "2.16.3";
		1371	src = fetchurl {
		1372	url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
		1373	sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
		1374	};
		1375	};
		1376	"hooker-0.2.3" = {
		1377	name = "hooker";
		1378	packageName = "hooker";
		1379	version = "0.2.3";
		1380	src = fetchurl {
		1381	url = "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
		1382	sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
		1383	};
		1384	};
		1385	"hosted-git-info-2.7.1" = {
		1386	name = "hosted-git-info";
		1387	packageName = "hosted-git-info";
		1388	version = "2.7.1";
		1389	src = fetchurl {
		1390	url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
		1391	sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
		1392	};
		1393	};
		1394	"htmlparser2-3.8.3" = {
		1395	name = "htmlparser2";
		1396	packageName = "htmlparser2";
		1397	version = "3.8.3";
		1398	src = fetchurl {
		1399	url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
		1400	sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
		1401	};
		1402	};
		1403	"http-signature-1.1.1" = {
		1404	name = "http-signature";
		1405	packageName = "http-signature";
		1406	version = "1.1.1";
		1407	src = fetchurl {
		1408	url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
		1409	sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
		1410	};
		1411	};
		1412	"hydrolysis-1.25.0" = {
		1413	name = "hydrolysis";
		1414	packageName = "hydrolysis";
		1415	version = "1.25.0";
		1416	src = fetchurl {
		1417	url = "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.25.0.tgz";
		1418	sha1 = "a4fb14a37a1e03b0db52d8aaa57c682272a14d84";
		1419	};
		1420	};
		1421	"iconv-lite-0.2.11" = {
		1422	name = "iconv-lite";
		1423	packageName = "iconv-lite";
		1424	version = "0.2.11";
		1425	src = fetchurl {
		1426	url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
		1427	sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
	681	1428	};
	682	1429	};
	683	1430	"image-size-0.5.5" = {
			@@ -689,166 +1436,67 b' let'
	689	1436	sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c";
	690	1437	};
	691	1438	};
	692		"mime-1.4.0" = {
	693		name = "mime";
	694		packageName = "mime";
	695		version = "1.4.0";
	696		src = fetchurl {
	697		url = "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz";
	698		sha1 = "69e9e0db51d44f2a3b56e48b7817d7d137f1a343";
	699		};
	700		};
	701		"~~mkd~~irp-0.~~5.1~~" = {
	702		name = "~~mkd~~irp";
	703		packageName = "~~mkd~~irp";
	704		version = "0.~~5.1~~";
	705		src = fetchurl {
	706		url = "https://registry.npmjs.org/~~mkd~~irp/-/~~mkd~~irp-0.~~5.1~~.tgz";
	707		sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
	708		};
	709		};
	710		"promise-7.3.1" = {
	711		name = "promise";
	712		packageName = "promise";
	713		version = "7.3.1";
	714		src = fetchurl {
	715		url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
	716		sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
	717		};
	718		};
	719		"source-map-0.5.7" = {
	720		name = "~~source-map~~";
	721		packageName = "~~source-map~~";
	722		version = "0.5.7";
	723		src = fetchurl {
	724		url = "https://registry.npmjs.org/~~source-map~~/-/~~source~~-~~map-0~~.5.7.tgz";
	725		sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
	726		};
	727		};
	728		"request-2.82.0" = {
	729		name = "re~~quest~~";
	730		packageName = "re~~quest~~";
	731		version = "2.82.0";
	732		src = fetchurl {
	733		url = "https://registry.npmjs.org/re~~quest~~/-/re~~quest~~-2.82.0.tgz";
	734		sha1 = "2ba8a92cd7ac45660ea2b10a53ae67cd247516ea";
	735		};
	736		};
	737		"prr-0.0.0" = {
	738		name = "prr";
	739		packageName = "prr";
	740		version = "0.0.0";
	741		src = fetchurl {
	742		url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
	743		sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
	744		};
	745		};
	746		"~~minim~~ist-0.0.8" = {
	747		name = "~~minim~~ist";
	748		packageName = "~~minim~~ist";
	749		version = "0.0.8";
	750		src = fetchurl {
	751		url = "https://registry.npmjs.org/~~minim~~ist/-/~~minim~~ist-0.0.8.tgz";
	752		sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
	753		};
	754		};
	755		"asap-2.0.6" = {
	756		name = "asap";
	757		packageName = "asap";
	758		version = "2.0.6";
	759		src = fetchurl {
	760		url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
	761		sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
	762		};
	763		};
	764		"aws-sign2-0.7.0" = {
	765		name = "aws-sign2";
	766		packageName = "aws-sign2";
	767		version = "0.7.0";
	768		src = fetchurl {
	769		url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
	770		sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
	771		};
	772		};
	773		"aws4-1.6.0" = {
	774		name = "aws4";
	775		packageName = "aws4";
	776		version = "1.6.0";
	777		src = fetchurl {
	778		url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
	779		sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
	780		};
	781		};
	782		"caseless-0.12.0" = {
	783		name = "caseless";
	784		packageName = "caseless";
	785		version = "0.12.0";
	786		src = fetchurl {
	787		url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
	788		sha1 = "1b681c21ff84033c826543090689420d187151dc";
	789		};
	790		};
	791		"combined-stream-1.0.5" = {
	792		name = "combined-stream";
	793		packageName = "combined-stream";
	794		version = "1.0.5";
	795		src = fetchurl {
	796		url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
	797		sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
	798		};
	799		};
	800		"extend-3.0.1" = {
	801		name = "extend";
	802		packageName = "extend";
	803		version = "3.0.1";
	804		src = fetchurl {
	805		url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz";
	806		sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
	807		};
	808		};
	809		"forever-agent-0.6.1" = {
	810		name = "forever-agent";
	811		packageName = "forever-agent";
	812		version = "0.6.1";
	813		src = fetchurl {
	814		url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
	815		sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
	816		};
	817		};
	818		"form-data-2.3.1" = {
	819		name = "form-data";
	820		packageName = "form-data";
	821		version = "2.3.1";
	822		src = fetchurl {
	823		url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz";
	824		sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf";
	825		};
	826		};
	827		"har-validator-5.0.3" = {
	828		name = "har-validator";
	829		packageName = "har-validator";
	830		version = "5.0.3";
	831		src = fetchurl {
	832		url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz";
	833		sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
	834		};
	835		};
	836		"hawk-6.0.2" = {
	837		name = "hawk";
	838		packageName = "hawk";
	839		version = "6.0.2";
	840		src = fetchurl {
	841		url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz";
	842		sha1 = "af4d914eb065f9b5ce4d9d11c1cb2126eecc3038";
	843		};
	844		};
	845		"http-signature-1.2.0" = {
	846		name = "http-signature";
	847		packageName = "http-signature";
	848		version = "1.2.0";
	849		src = fetchurl {
	850		url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
	851		sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
		1439	"inflight-1.0.6" = {
		1440	name = "inflight";
		1441	packageName = "inflight";
		1442	version = "1.0.6";
		1443	src = fetchurl {
		1444	url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
		1445	sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
		1446	};
		1447	};
		1448	"inherits-1.0.2" = {
		1449	name = "inherits";
		1450	packageName = "inherits";
		1451	version = "1.0.2";
		1452	src = fetchurl {
		1453	url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
		1454	sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
		1455	};
		1456	};
		1457	"inherits-2.0.3" = {
		1458	name = "inherits";
		1459	packageName = "inherits";
		1460	version = "2.0.3";
		1461	src = fetchurl {
		1462	url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
		1463	sha1 = "633c2c83e3da42a502f52466022480f4208261de";
		1464	};
		1465	};
		1466	"ini-1.3.5" = {
		1467	name = "ini";
		1468	packageName = "ini";
		1469	version = "1.3.5";
		1470	src = fetchurl {
		1471	url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
		1472	sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
		1473	};
		1474	};
		1475	"is-builtin-module-1.0.0" = {
		1476	name = "is-builtin-module";
		1477	packageName = "is-builtin-module";
		1478	version = "1.0.0";
		1479	src = fetchurl {
		1480	url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
		1481	sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
		1482	};
		1483	};
		1484	"is-fullwidth-code-point-1.0.0" = {
		1485	name = "is-fullwidth-code-point";
		1486	packageName = "is-fullwidth-code-point";
		1487	version = "1.0.0";
		1488	src = fetchurl {
		1489	url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
		1490	sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
		1491	};
		1492	};
		1493	"is-stream-1.1.0" = {
		1494	name = "is-stream";
		1495	packageName = "is-stream";
		1496	version = "1.1.0";
		1497	src = fetchurl {
		1498	url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
		1499	sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
	852	1500	};
	853	1501	};
	854	1502	"is-typedarray-1.0.0" = {
			@@ -860,6 +1508,33 b' let'
	860	1508	sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
	861	1509	};
	862	1510	};
		1511	"isarray-0.0.1" = {
		1512	name = "isarray";
		1513	packageName = "isarray";
		1514	version = "0.0.1";
		1515	src = fetchurl {
		1516	url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
		1517	sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
		1518	};
		1519	};
		1520	"isarray-1.0.0" = {
		1521	name = "isarray";
		1522	packageName = "isarray";
		1523	version = "1.0.0";
		1524	src = fetchurl {
		1525	url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
		1526	sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
		1527	};
		1528	};
		1529	"isexe-2.0.0" = {
		1530	name = "isexe";
		1531	packageName = "isexe";
		1532	version = "2.0.0";
		1533	src = fetchurl {
		1534	url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
		1535	sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
		1536	};
		1537	};
	863	1538	"isstream-0.1.2" = {
	864	1539	name = "isstream";
	865	1540	packageName = "isstream";
			@@ -869,6 +1544,60 b' let'
	869	1544	sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
	870	1545	};
	871	1546	};
		1547	"jquery-1.11.3" = {
		1548	name = "jquery";
		1549	packageName = "jquery";
		1550	version = "1.11.3";
		1551	src = fetchurl {
		1552	url = "https://registry.npmjs.org/jquery/-/jquery-1.11.3.tgz";
		1553	sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
		1554	};
		1555	};
		1556	"js-yaml-2.0.5" = {
		1557	name = "js-yaml";
		1558	packageName = "js-yaml";
		1559	version = "2.0.5";
		1560	src = fetchurl {
		1561	url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
		1562	sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
		1563	};
		1564	};
		1565	"jsbn-0.1.1" = {
		1566	name = "jsbn";
		1567	packageName = "jsbn";
		1568	version = "0.1.1";
		1569	src = fetchurl {
		1570	url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
		1571	sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
		1572	};
		1573	};
		1574	"jshint-2.9.6" = {
		1575	name = "jshint";
		1576	packageName = "jshint";
		1577	version = "2.9.6";
		1578	src = fetchurl {
		1579	url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz";
		1580	sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
		1581	};
		1582	};
		1583	"json-schema-0.2.3" = {
		1584	name = "json-schema";
		1585	packageName = "json-schema";
		1586	version = "0.2.3";
		1587	src = fetchurl {
		1588	url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
		1589	sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
		1590	};
		1591	};
		1592	"json-stable-stringify-1.0.1" = {
		1593	name = "json-stable-stringify";
		1594	packageName = "json-stable-stringify";
		1595	version = "1.0.1";
		1596	src = fetchurl {
		1597	url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
		1598	sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
		1599	};
		1600	};
	872	1601	"json-stringify-safe-5.0.1" = {
	873	1602	name = "json-stringify-safe";
	874	1603	packageName = "json-stringify-safe";
			@@ -878,157 +1607,22 b' let'
	878	1607	sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
	879	1608	};
	880	1609	};
	881		"mime-types-2.1.17" = {
	882		name = "mime~~-types~~";
	883		packageName = "mime~~-types~~";
	884		version = "2.1.17";
	885		src = fetchurl {
	886		url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz";
	887		sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a";
	888		};
	889		};
	890		"oauth-sign-0.8.2" = {
	891		name = "oauth-sign";
	892		packageName = "oauth-sign";
	893		version = "0.8.2";
	894		src = fetchurl {
	895		url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
	896		sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
	897		};
	898		};
	899		"performance-now-2.1.0" = {
	900		name = "performance-now";
	901		packageName = "performance-now";
	902		version = "2.1.0";
	903		src = fetchurl {
	904		url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
	905		sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
	906		};
	907		};
	908		"qs-6.5.1" = {
	909		name = "qs";
	910		packageName = "qs";
	911		version = "6.5.1";
	912		src = fetchurl {
	913		url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
	914		sha1 = "349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8";
	915		};
	916		};
	917		"safe-buffer-5.1.1" = {
	918		name = "safe-buffer";
	919		packageName = "safe-buffer";
	920		version = "5.1.1";
	921		src = fetchurl {
	922		url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
	923		sha1 = "893312af69b2123def71f57889001671eeb2c853";
	924		};
	925		};
	926		"stringstream-0.0.5" = {
	927		name = "stringstream";
	928		packageName = "stringstream";
	929		version = "0.0.5";
	930		src = fetchurl {
	931		url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
	932		sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
	933		};
	934		};
	935		"tough-cookie-2.3.3" = {
	936		name = "tough-cookie";
	937		packageName = "tough-cookie";
	938		version = "2.3.3";
	939		src = fetchurl {
	940		url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
	941		sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
	942		};
	943		};
	944		"tunnel-agent-0.6.0" = {
	945		name = "tunnel-agent";
	946		packageName = "tunnel-agent";
	947		version = "0.6.0";
	948		src = fetchurl {
	949		url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
	950		sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
	951		};
	952		};
	953		"uuid-3.1.0" = {
	954		name = "uuid";
	955		packageName = "uuid";
	956		version = "3.1.0";
	957		src = fetchurl {
	958		url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
	959		sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
	960		};
	961		};
	962		"delayed-stream-1.0.0" = {
	963		name = "delayed-stream";
	964		packageName = "delayed-stream";
	965		version = "1.0.0";
	966		src = fetchurl {
	967		url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
	968		sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
	969		};
	970		};
	971		"asynckit-0.4.0" = {
	972		name = "asynckit";
	973		packageName = "asynckit";
	974		version = "0.4.0";
	975		src = fetchurl {
	976		url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
	977		sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
	978		};
	979		};
	980		"ajv-5.2.2" = {
	981		name = "ajv";
	982		packageName = "ajv";
	983		version = "5.2.2";
	984		src = fetchurl {
	985		url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz";
	986		sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39";
	987		};
	988		};
	989		"har-schema-2.0.0" = {
	990		name = "har-schema";
	991		packageName = "har-schema";
	992		version = "2.0.0";
	993		src = fetchurl {
	994		url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
	995		sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
	996		};
	997		};
	998		"co-4.6.0" = {
	999		name = "co";
	1000		packageName = "co";
	1001		version = "4.6.0";
	1002		src = fetchurl {
	1003		url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
	1004		sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
	1005		};
	1006		};
	1007		"fast-deep-equal-1.0.0" = {
	1008		name = "fast-deep-equal";
	1009		packageName = "fast-deep-equal";
	1010		version = "1.0.0";
	1011		src = fetchurl {
	1012		url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz";
	1013		sha1 = "96256a3bc975595eb36d82e9929d060d893439ff";
	1014		};
	1015		};
	1016		"json-schema-traverse-0.3.1" = {
	1017		name = "json-schema-traverse";
	1018		packageName = "json-schema-traverse";
	1019		version = "0.3.1";
	1020		src = fetchurl {
	1021		url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
	1022		sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
	1023		};
	1024		};
	1025		"json-stable-stringify-1.0.1" = {
	1026		name = "json-stable-stringify";
	1027		packageName = "json-stable-stringify";
		1610	"jsonfile-1.0.1" = {
		1611	name = "jsonfile";
		1612	packageName = "jsonfile";
	1028	1613	version = "1.0.1";
	1029	1614	src = fetchurl {
	1030		url = "https://registry.npmjs.org/json~~-stab~~le~~-stringify~~/-/json~~-stab~~le~~-stringify~~-1.0.1.tgz";
	1031		sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
		1615	url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
		1616	sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
		1617	};
		1618	};
		1619	"jsonfile-2.4.0" = {
		1620	name = "jsonfile";
		1621	packageName = "jsonfile";
		1622	version = "2.4.0";
		1623	src = fetchurl {
		1624	url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
		1625	sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
	1032	1626	};
	1033	1627	};
	1034	1628	"jsonify-0.0.0" = {
			@@ -1040,60 +1634,6 b' let'
	1040	1634	sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
	1041	1635	};
	1042	1636	};
	1043		"hoek-4.2.0" = {
	1044		name = "hoek";
	1045		packageName = "hoek";
	1046		version = "4.2.0";
	1047		src = fetchurl {
	1048		url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz";
	1049		sha1 = "72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d";
	1050		};
	1051		};
	1052		"boom-4.3.1" = {
	1053		name = "boom";
	1054		packageName = "boom";
	1055		version = "4.3.1";
	1056		src = fetchurl {
	1057		url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
	1058		sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
	1059		};
	1060		};
	1061		"cryptiles-3.1.2" = {
	1062		name = "cryptiles";
	1063		packageName = "cryptiles";
	1064		version = "3.1.2";
	1065		src = fetchurl {
	1066		url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
	1067		sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
	1068		};
	1069		};
	1070		"sntp-2.0.2" = {
	1071		name = "sntp";
	1072		packageName = "sntp";
	1073		version = "2.0.2";
	1074		src = fetchurl {
	1075		url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz";
	1076		sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b";
	1077		};
	1078		};
	1079		"boom-5.2.0" = {
	1080		name = "boom";
	1081		packageName = "boom";
	1082		version = "5.2.0";
	1083		src = fetchurl {
	1084		url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
	1085		sha1 = "5dd9da6ee3a5f302077436290cb717d3f4a54e02";
	1086		};
	1087		};
	1088		"assert-plus-1.0.0" = {
	1089		name = "assert-plus";
	1090		packageName = "assert-plus";
	1091		version = "1.0.0";
	1092		src = fetchurl {
	1093		url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
	1094		sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
	1095		};
	1096		};
	1097	1637	"jsprim-1.4.1" = {
	1098	1638	name = "jsprim";
	1099	1639	packageName = "jsprim";
			@@ -1103,166 +1643,49 b' let'
	1103	1643	sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
	1104	1644	};
	1105	1645	};
	1106		"~~sshp~~k-1.13.1" = {
	1107		name = "~~sshp~~k";
	1108		packageName = "~~sshp~~k";
	1109		version = "1.13.1";
	1110		src = fetchurl {
	1111		url = "https://registry.npmjs.org/~~sshp~~k/-/~~sshp~~k-1.13.1.tgz";
	1112		sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
	1113		};
	1114		};
	1115		"~~extsprintf~~-1.3.0" = {
	1116		name = "~~extsprintf~~";
	1117		packageName = "~~extsprintf~~";
	1118		version = "1.3.0";
	1119		src = fetchurl {
	1120		url = "https://registry.npmjs.org/~~extsprintf~~/-/~~extsprintf~~-1.3.0.tgz";
	1121		sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
	1122		};
	1123		};
	1124		"json-~~schema-0~~.2.3" = {
	1125		name = "js~~on-~~s~~chema~~";
	1126		packageName = "js~~on-~~s~~chema~~";
	1127		version = "0.2.3";
	1128		src = fetchurl {
	1129		url = "https://registry.npmjs.org/js~~on-~~s~~chema~~/-/json-~~schema-0~~.2.3.tgz";
	1130		sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
	1131		};
	1132		};
	1133		"v~~error~~-1.10.0" = {
	1134		name = "v~~error~~";
	1135		packageName = "v~~error~~";
	1136		version = "1.10.0";
	1137		src = fetchurl {
	1138		url = "https://registry.npmjs.org/v~~error~~/-/v~~error~~-1.10.0.tgz";
	1139		sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
	1140		};
	1141		};
	1142		"core-~~util-is-1~~.0.2" = {
	1143		name = "co~~re-util-i~~s";
	1144		packageName = "co~~re-util-i~~s";
	1145		version = "1.0.2";
	1146		src = fetchurl {
	1147		url = "https://registry.npmjs.org/co~~re-util-i~~s/-/core-~~util-is-1~~.0.2.tgz";
	1148		sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
	1149		};
	1150		};
	1151		"asn1-0.2.3" = {
	1152		name = "asn1";
	1153		packageName = "asn1";
	1154		version = "0.2.3";
	1155		src = fetchurl {
	1156		url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
	1157		sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
	1158		};
	1159		};
	1160		"dashdash-1.14.1" = {
	1161		name = "dashdash";
	1162		packageName = "dashdash";
	1163		version = "1.14.1";
	1164		src = fetchurl {
	1165		url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
	1166		sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
	1167		};
	1168		};
	1169		"getpass-0.1.7" = {
	1170		name = "getpass";
	1171		packageName = "getpass";
	1172		version = "0.1.7";
	1173		src = fetchurl {
	1174		url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
	1175		sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
	1176		};
	1177		};
	1178		"jsbn-0.1.1" = {
	1179		name = "jsbn";
	1180		packageName = "jsbn";
	1181		version = "0.1.1";
	1182		src = fetchurl {
	1183		url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
	1184		sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
	1185		};
	1186		};
	1187		"tweetnacl-0.14.5" = {
	1188		name = "tweetnacl";
	1189		packageName = "tweetnacl";
	1190		version = "0.14.5";
	1191		src = fetchurl {
	1192		url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
	1193		sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
	1194		};
	1195		};
	1196		"ecc-jsbn-0.1.1" = {
	1197		name = "ecc-jsbn";
	1198		packageName = "ecc-jsbn";
	1199		version = "0.1.1";
	1200		src = fetchurl {
	1201		url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
	1202		sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
	1203		};
	1204		};
	1205		"bcrypt-pbkdf-1.0.1" = {
	1206		name = "bcrypt-pbkdf";
	1207		packageName = "bcrypt-pbkdf";
	1208		version = "1.0.1";
	1209		src = fetchurl {
	1210		url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
	1211		sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
	1212		};
	1213		};
	1214		"mime-db-1.30.0" = {
	1215		name = "mime-db";
	1216		packageName = "mime-db";
	1217		version = "1.30.0";
	1218		src = fetchurl {
	1219		url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz";
	1220		sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01";
	1221		};
	1222		};
	1223		"punycode-1.4.1" = {
	1224		name = "punycode";
	1225		packageName = "punycode";
	1226		version = "1.4.1";
	1227		src = fetchurl {
	1228		url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
	1229		sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
	1230		};
	1231		};
	1232		"gaze-0.5.2" = {
	1233		name = "gaze";
	1234		packageName = "gaze";
	1235		version = "0.5.2";
	1236		src = fetchurl {
	1237		url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz";
	1238		sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f";
	1239		};
	1240		};
	1241		"tiny-lr-fork-0.0.5" = {
	1242		name = "tiny-lr-fork";
	1243		packageName = "tiny-lr-fork";
	1244		version = "0.0.5";
	1245		src = fetchurl {
	1246		url = "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz";
	1247		sha1 = "1e99e1e2a8469b736ab97d97eefa98c71f76ed0a";
	1248		};
	1249		};
	1250		"async-0.2.10" = {
	1251		name = "async";
	1252		packageName = "async";
	1253		version = "0.2.10";
	1254		src = fetchurl {
	1255		url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
	1256		sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
	1257		};
	1258		};
	1259		"globule-0.1.0" = {
	1260		name = "globule";
	1261		packageName = "globule";
	1262		version = "0.1.0";
	1263		src = fetchurl {
	1264		url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
	1265		sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
		1646	"kew-0.7.0" = {
		1647	name = "kew";
		1648	packageName = "kew";
		1649	version = "0.7.0";
		1650	src = fetchurl {
		1651	url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
		1652	sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
		1653	};
		1654	};
		1655	"klaw-1.3.1" = {
		1656	name = "klaw";
		1657	packageName = "klaw";
		1658	version = "1.3.1";
		1659	src = fetchurl {
		1660	url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
		1661	sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
		1662	};
		1663	};
		1664	"less-2.7.3" = {
		1665	name = "less";
		1666	packageName = "less";
		1667	version = "2.7.3";
		1668	src = fetchurl {
		1669	url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz";
		1670	sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==";
		1671	};
		1672	};
		1673	"levn-0.3.0" = {
		1674	name = "levn";
		1675	packageName = "levn";
		1676	version = "0.3.0";
		1677	src = fetchurl {
		1678	url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
		1679	sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
		1680	};
		1681	};
		1682	"lodash-0.9.2" = {
		1683	name = "lodash";
		1684	packageName = "lodash";
		1685	version = "0.9.2";
		1686	src = fetchurl {
		1687	url = "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
		1688	sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
	1266	1689	};
	1267	1690	};
	1268	1691	"lodash-1.0.2" = {
			@@ -1274,40 +1697,193 b' let'
	1274	1697	sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
	1275	1698	};
	1276	1699	};
	1277		"qs-0.5.6" = {
	1278		name = "qs";
	1279		packageName = "qs";
	1280		version = "0.5.6";
	1281		src = fetchurl {
	1282		url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
	1283		sha1 = "31b1ad058567651c526921506b9a8793911a0384";
	1284		};
	1285		};
	1286		"faye-websocket-0.4.4" = {
	1287		name = "fa~~ye-web~~s~~ocket~~";
	1288		packageName = "fa~~ye-web~~s~~ocket~~";
	1289		version = "0.4.4";
	1290		src = fetchurl {
	1291		url = "https://registry.npmjs.org/fa~~ye-web~~s~~ocket~~/-/faye-~~websocket-0.~~4.4.tgz";
	1292		sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
	1293		};
	1294		};
	1295		"noptify-0.0.3" = {
	1296		name = "~~noptify~~";
	1297		packageName = "~~noptify~~";
	1298		version = "0.0.3";
	1299		src = fetchurl {
	1300		url = "https://registry.npmjs.org/~~noptify~~/-/~~noptify~~-0.0.3.tgz";
	1301		sha1 = "58f654a73d9753df0c51d9686dc92104a67f4bbb";
	1302		};
	1303		};
	1304		"de~~bug~~-0~~.7.4~~" = {
	1305		name = "de~~bug~~";
	1306		packageName = "de~~bug~~";
	1307		version = "0~~.7.4~~";
	1308		src = fetchurl {
	1309		url = "https://registry.npmjs.org/de~~bug~~/-/de~~bug~~-0~~.7.4~~.tgz";
	1310		sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
		1700	"lodash-2.4.2" = {
		1701	name = "lodash";
		1702	packageName = "lodash";
		1703	version = "2.4.2";
		1704	src = fetchurl {
		1705	url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
		1706	sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
		1707	};
		1708	};
		1709	"lodash-4.17.10" = {
		1710	name = "lodash";
		1711	packageName = "lodash";
		1712	version = "4.17.10";
		1713	src = fetchurl {
		1714	url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
		1715	sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
		1716	};
		1717	};
		1718	"lru-cache-2.7.3" = {
		1719	name = "lru-cache";
		1720	packageName = "lru-cache";
		1721	version = "2.7.3";
		1722	src = fetchurl {
		1723	url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
		1724	sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
		1725	};
		1726	};
		1727	"mime-1.6.0" = {
		1728	name = "mime";
		1729	packageName = "mime";
		1730	version = "1.6.0";
		1731	src = fetchurl {
		1732	url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
		1733	sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
		1734	};
		1735	};
		1736	"mime-db-1.35.0" = {
		1737	name = "mime-db";
		1738	packageName = "mime-db";
		1739	version = "1.35.0";
		1740	src = fetchurl {
		1741	url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
		1742	sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
		1743	};
		1744	};
		1745	"mime-types-2.1.19" = {
		1746	name = "mime-types";
		1747	packageName = "mime-types";
		1748	version = "2.1.19";
		1749	src = fetchurl {
		1750	url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
		1751	sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
		1752	};
		1753	};
		1754	"minimatch-0.2.14" = {
		1755	name = "minimatch";
		1756	packageName = "minimatch";
		1757	version = "0.2.14";
		1758	src = fetchurl {
		1759	url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
		1760	sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
		1761	};
		1762	};
		1763	"minimatch-0.3.0" = {
		1764	name = "minimatch";
		1765	packageName = "minimatch";
		1766	version = "0.3.0";
		1767	src = fetchurl {
		1768	url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
		1769	sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
		1770	};
		1771	};
		1772	"minimatch-3.0.4" = {
		1773	name = "minimatch";
		1774	packageName = "minimatch";
		1775	version = "3.0.4";
		1776	src = fetchurl {
		1777	url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
		1778	sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
		1779	};
		1780	};
		1781	"minimist-0.0.8" = {
		1782	name = "minimist";
		1783	packageName = "minimist";
		1784	version = "0.0.8";
		1785	src = fetchurl {
		1786	url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
		1787	sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
		1788	};
		1789	};
		1790	"minipass-2.3.3" = {
		1791	name = "minipass";
		1792	packageName = "minipass";
		1793	version = "2.3.3";
		1794	src = fetchurl {
		1795	url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz";
		1796	sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==";
		1797	};
		1798	};
		1799	"minizlib-1.1.0" = {
		1800	name = "minizlib";
		1801	packageName = "minizlib";
		1802	version = "1.1.0";
		1803	src = fetchurl {
		1804	url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
		1805	sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
		1806	};
		1807	};
		1808	"mkdirp-0.3.5" = {
		1809	name = "mkdirp";
		1810	packageName = "mkdirp";
		1811	version = "0.3.5";
		1812	src = fetchurl {
		1813	url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
		1814	sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
		1815	};
		1816	};
		1817	"mkdirp-0.5.1" = {
		1818	name = "mkdirp";
		1819	packageName = "mkdirp";
		1820	version = "0.5.1";
		1821	src = fetchurl {
		1822	url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
		1823	sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
		1824	};
		1825	};
		1826	"moment-2.22.2" = {
		1827	name = "moment";
		1828	packageName = "moment";
		1829	version = "2.22.2";
		1830	src = fetchurl {
		1831	url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
		1832	sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
		1833	};
		1834	};
		1835	"mousetrap-1.6.2" = {
		1836	name = "mousetrap";
		1837	packageName = "mousetrap";
		1838	version = "1.6.2";
		1839	src = fetchurl {
		1840	url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.2.tgz";
		1841	sha512 = "jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA==";
		1842	};
		1843	};
		1844	"ms-2.0.0" = {
		1845	name = "ms";
		1846	packageName = "ms";
		1847	version = "2.0.0";
		1848	src = fetchurl {
		1849	url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
		1850	sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
		1851	};
		1852	};
		1853	"ncp-0.4.2" = {
		1854	name = "ncp";
		1855	packageName = "ncp";
		1856	version = "0.4.2";
		1857	src = fetchurl {
		1858	url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
		1859	sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
		1860	};
		1861	};
		1862	"nijs-0.0.25" = {
		1863	name = "nijs";
		1864	packageName = "nijs";
		1865	version = "0.0.25";
		1866	src = fetchurl {
		1867	url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz";
		1868	sha1 = "04b035cb530d46859d1018839a518c029133f676";
		1869	};
		1870	};
		1871	"node2nix-1.6.0" = {
		1872	name = "node2nix";
		1873	packageName = "node2nix";
		1874	version = "1.6.0";
		1875	src = fetchurl {
		1876	url = "https://registry.npmjs.org/node2nix/-/node2nix-1.6.0.tgz";
		1877	sha512 = "MJY6SsQH3pN59R9N3nMz/L8BsbQ0DlvSF38mgg1fwfwgnaJ+y600s3Nd0vZ+cnETUH+4OPETc4QohflccjPUYw==";
		1878	};
		1879	};
		1880	"nopt-1.0.10" = {
		1881	name = "nopt";
		1882	packageName = "nopt";
		1883	version = "1.0.10";
		1884	src = fetchurl {
		1885	url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
		1886	sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
	1311	1887	};
	1312	1888	};
	1313	1889	"nopt-2.0.0" = {
			@@ -1319,204 +1895,6 b' let'
	1319	1895	sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
	1320	1896	};
	1321	1897	};
	1322		"command-line-args-3.0.5" = {
	1323		name = "command-line-args";
	1324		packageName = "command-line-args";
	1325		version = "3.0.5";
	1326		src = fetchurl {
	1327		url = "https://registry.npmjs.org/command-line-args/-/command-line-args-3.0.5.tgz";
	1328		sha1 = "5bd4ad45e7983e5c1344918e40280ee2693c5ac0";
	1329		};
	1330		};
	1331		"command-line-usage-3.0.8" = {
	1332		name = "command-line-usage";
	1333		packageName = "command-line-usage";
	1334		version = "3.0.8";
	1335		src = fetchurl {
	1336		url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-3.0.8.tgz";
	1337		sha1 = "b6a20978c1b383477f5c11a529428b880bfe0f4d";
	1338		};
	1339		};
	1340		"dom5-1.3.6" = {
	1341		name = "dom5";
	1342		packageName = "dom5";
	1343		version = "1.3.6";
	1344		src = fetchurl {
	1345		url = "https://registry.npmjs.org/dom5/-/dom5-1.3.6.tgz";
	1346		sha1 = "a7088a9fc5f3b08dc9f6eda4c7abaeb241945e0d";
	1347		};
	1348		};
	1349		"array-back-1.0.4" = {
	1350		name = "array-back";
	1351		packageName = "array-back";
	1352		version = "1.0.4";
	1353		src = fetchurl {
	1354		url = "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz";
	1355		sha1 = "644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b";
	1356		};
	1357		};
	1358		"feature-detect-es6-1.3.1" = {
	1359		name = "feature-detect-es6";
	1360		packageName = "feature-detect-es6";
	1361		version = "1.3.1";
	1362		src = fetchurl {
	1363		url = "https://registry.npmjs.org/feature-detect-es6/-/feature-detect-es6-1.3.1.tgz";
	1364		sha1 = "f888736af9cb0c91f55663bfa4762eb96ee7047f";
	1365		};
	1366		};
	1367		"find-replace-1.0.3" = {
	1368		name = "find-replace";
	1369		packageName = "find-replace";
	1370		version = "1.0.3";
	1371		src = fetchurl {
	1372		url = "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz";
	1373		sha1 = "b88e7364d2d9c959559f388c66670d6130441fa0";
	1374		};
	1375		};
	1376		"typical-2.6.1" = {
	1377		name = "typical";
	1378		packageName = "typical";
	1379		version = "2.6.1";
	1380		src = fetchurl {
	1381		url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz";
	1382		sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
	1383		};
	1384		};
	1385		"test-value-2.1.0" = {
	1386		name = "test-value";
	1387		packageName = "test-value";
	1388		version = "2.1.0";
	1389		src = fetchurl {
	1390		url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz";
	1391		sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291";
	1392		};
	1393		};
	1394		"ansi-escape-sequences-3.0.0" = {
	1395		name = "ansi-escape-sequences";
	1396		packageName = "ansi-escape-sequences";
	1397		version = "3.0.0";
	1398		src = fetchurl {
	1399		url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-3.0.0.tgz";
	1400		sha1 = "1c18394b6af9b76ff9a63509fa497669fd2ce53e";
	1401		};
	1402		};
	1403		"table-layout-0.3.0" = {
	1404		name = "table-layout";
	1405		packageName = "table-layout";
	1406		version = "0.3.0";
	1407		src = fetchurl {
	1408		url = "https://registry.npmjs.org/table-layout/-/table-layout-0.3.0.tgz";
	1409		sha1 = "6ee20dc483db371b3e5c87f704ed2f7c799d2c9a";
	1410		};
	1411		};
	1412		"core-js-2.5.1" = {
	1413		name = "core-js";
	1414		packageName = "core-js";
	1415		version = "2.5.1";
	1416		src = fetchurl {
	1417		url = "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz";
	1418		sha1 = "ae6874dc66937789b80754ff5428df66819ca50b";
	1419		};
	1420		};
	1421		"deep-extend-0.4.2" = {
	1422		name = "deep-extend";
	1423		packageName = "deep-extend";
	1424		version = "0.4.2";
	1425		src = fetchurl {
	1426		url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
	1427		sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
	1428		};
	1429		};
	1430		"wordwrapjs-2.0.0" = {
	1431		name = "wordwrapjs";
	1432		packageName = "wordwrapjs";
	1433		version = "2.0.0";
	1434		src = fetchurl {
	1435		url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-2.0.0.tgz";
	1436		sha1 = "ab55f695e6118da93858fdd70c053d1c5e01ac20";
	1437		};
	1438		};
	1439		"reduce-flatten-1.0.1" = {
	1440		name = "reduce-flatten";
	1441		packageName = "reduce-flatten";
	1442		version = "1.0.1";
	1443		src = fetchurl {
	1444		url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
	1445		sha1 = "258c78efd153ddf93cb561237f61184f3696e327";
	1446		};
	1447		};
	1448		"@types/clone-0.1.30" = {
	1449		name = "@types/clone";
	1450		packageName = "@types/clone";
	1451		version = "0.1.30";
	1452		src = fetchurl {
	1453		url = "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz";
	1454		sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
	1455		};
	1456		};
	1457		"@types/node-4.2.20" = {
	1458		name = "@types/node";
	1459		packageName = "@types/node";
	1460		version = "4.2.20";
	1461		src = fetchurl {
	1462		url = "https://registry.npmjs.org/@types/node/-/node-4.2.20.tgz";
	1463		sha1 = "3f7dceff43e07cfff4407fc3495d98a533b32267";
	1464		};
	1465		};
	1466		"@types/parse5-0.0.31" = {
	1467		name = "@types/parse5";
	1468		packageName = "@types/parse5";
	1469		version = "0.0.31";
	1470		src = fetchurl {
	1471		url = "https://registry.npmjs.org/@types/parse5/-/parse5-0.0.31.tgz";
	1472		sha1 = "e827a493a443b156e1b582a2e4c3bdc0040f2ee7";
	1473		};
	1474		};
	1475		"clone-1.0.2" = {
	1476		name = "clone";
	1477		packageName = "clone";
	1478		version = "1.0.2";
	1479		src = fetchurl {
	1480		url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz";
	1481		sha1 = "260b7a99ebb1edfe247538175f783243cb19d149";
	1482		};
	1483		};
	1484		"parse5-1.5.1" = {
	1485		name = "parse5";
	1486		packageName = "parse5";
	1487		version = "1.5.1";
	1488		src = fetchurl {
	1489		url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
	1490		sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
	1491		};
	1492		};
	1493		"@types/node-6.0.88" = {
	1494		name = "@types/node";
	1495		packageName = "@types/node";
	1496		version = "6.0.88";
	1497		src = fetchurl {
	1498		url = "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz";
	1499		sha1 = "f618f11a944f6a18d92b5c472028728a3e3d4b66";
	1500		};
	1501		};
	1502		"es6-promise-2.3.0" = {
	1503		name = "es6-promise";
	1504		packageName = "es6-promise";
	1505		version = "2.3.0";
	1506		src = fetchurl {
	1507		url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
	1508		sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
	1509		};
	1510		};
	1511		"hydrolysis-1.25.0" = {
	1512		name = "hydrolysis";
	1513		packageName = "hydrolysis";
	1514		version = "1.25.0";
	1515		src = fetchurl {
	1516		url = "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.25.0.tgz";
	1517		sha1 = "a4fb14a37a1e03b0db52d8aaa57c682272a14d84";
	1518		};
	1519		};
	1520	1898	"nopt-3.0.6" = {
	1521	1899	name = "nopt";
	1522	1900	packageName = "nopt";
			@@ -1526,157 +1904,103 b' let'
	1526	1904	sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
	1527	1905	};
	1528	1906	};
	1529		"path-~~posix-1~~.0.0" = {
	1530		name = "pat~~h-pos~~ix";
	1531		packageName = "pat~~h-pos~~ix";
	1532		version = "1.0.0";
	1533		src = fetchurl {
	1534		url = "https://registry.npmjs.org/pat~~h-pos~~ix/-/path-~~posix-1~~.0.0.tgz";
	1535		sha1 = "06b26113f56beab042545a23bfa88003ccac260f";
	1536		};
	1537		};
	1538		"acorn-3.3.0" = {
	1539		name = "ac~~orn~~";
	1540		packageName = "ac~~orn~~";
	1541		version = "3.3.0";
	1542		src = fetchurl {
	1543		url = "https://registry.npmjs.org/ac~~orn~~/-/ac~~orn~~-3.3.0.tgz";
	1544		sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
	1545		};
	1546		};
	1547		"babel-polyfill-6.26.0" = {
	1548		name = "babel-polyfill";
	1549		packageName = "~~babel~~-p~~olyfill~~";
	1550		version = "6.26.0";
	1551		src = fetchurl {
	1552		url = "https://registry.npmjs.org/~~babel~~-p~~olyfill~~/-/~~babel~~-p~~olyfill~~-6.26.0.tgz";
	1553		sha1 = "379937abc67d7895970adc621f284cd966cf2153";
	1554		};
	1555		};
	1556		"doctrine-0.7.2" = {
	1557		name = "~~doc~~trine";
	1558		packageName = "~~doc~~trine";
	1559		version = "0.7.2";
	1560		src = fetchurl {
	1561		url = "https://registry.npmjs.org/~~doc~~trine/-/~~doc~~trine-0.7.2.tgz";
	1562		sha1 = "7cb860359ba3be90e040b26b729ce4bfa654c523";
	1563		};
	1564		};
	1565		"dom5-1.1.0" = {
	1566		name = "dom5";
	1567		packageName = "dom5";
	1568		version = "1.1.0";
	1569		src = fetchurl {
	1570		url = "https://registry.npmjs.org/dom5/-/dom5-1.1.0.tgz";
	1571		sha1 = "3a0c7700c083ab4c4d26938a78b0f0c6dcc37794";
	1572		};
	1573		};
	1574		"~~esc~~odegen-1.~~9.0~~" = {
	1575		name = "~~esc~~odegen";
	1576		packageName = "~~esc~~odegen";
	1577		version = "1.~~9.0~~";
	1578		src = fetchurl {
	1579		url = "https://registry.npmjs.org/~~esc~~odegen/-/~~esc~~odegen-1.~~9.0~~.tgz";
	1580		sha1 = "9811a2f265dc1cd3894420ee3717064b632b8852";
	1581		};
	1582		};
	1583		"es~~pree~~-3.5.1" = {
	1584		name = "es~~pree~~";
	1585		packageName = "es~~pree~~";
	1586		version = "3.5.1";
	1587		src = fetchurl {
	1588		url = "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz";
	1589		sha1 = "0c988b8ab46db53100a1954ae4ba995ddd27d87e";
	1590		};
	1591		};
	1592		"estraverse-3.1.0" = {
	1593		name = "estraverse";
	1594		packageName = "estraverse";
	1595		version = "3.1.0";
	1596		src = fetchurl {
	1597		url = "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz";
	1598		sha1 = "15e28a446b8b82bc700ccc8b96c78af4da0d6cba";
	1599		};
	1600		};
	1601		"path-is-absolute-1.0.1" = {
	1602		name = "path-is-absolute";
	1603		packageName = "path-is-absolute";
		1907	"noptify-0.0.3" = {
		1908	name = "noptify";
		1909	packageName = "noptify";
		1910	version = "0.0.3";
		1911	src = fetchurl {
		1912	url = "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz";
		1913	sha1 = "58f654a73d9753df0c51d9686dc92104a67f4bbb";
		1914	};
		1915	};
		1916	"normalize-package-data-2.4.0" = {
		1917	name = "normalize-package-data";
		1918	packageName = "normalize-package-data";
		1919	version = "2.4.0";
		1920	src = fetchurl {
		1921	url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
		1922	sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==";
		1923	};
		1924	};
		1925	"npm-package-arg-6.1.0" = {
		1926	name = "npm-package-arg";
		1927	packageName = "npm-package-arg";
		1928	version = "6.1.0";
		1929	src = fetchurl {
		1930	url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz";
		1931	sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==";
		1932	};
		1933	};
		1934	"npm-registry-client-8.5.1" = {
		1935	name = "npm-registry-client";
		1936	packageName = "npm-registry-client";
		1937	version = "8.5.1";
		1938	src = fetchurl {
		1939	url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz";
		1940	sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==";
		1941	};
		1942	};
		1943	"npmconf-2.1.3" = {
		1944	name = "npmconf";
		1945	packageName = "npmconf";
		1946	version = "2.1.3";
		1947	src = fetchurl {
		1948	url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.3.tgz";
		1949	sha512 = "iTK+HI68GceCoGOHAQiJ/ik1iDfI7S+cgyG8A+PP18IU3X83kRhQIRhAUNj4Bp2JMx6Zrt5kCiozYa9uGWTjhA==";
		1950	};
		1951	};
		1952	"npmlog-4.1.2" = {
		1953	name = "npmlog";
		1954	packageName = "npmlog";
		1955	version = "4.1.2";
		1956	src = fetchurl {
		1957	url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
		1958	sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
		1959	};
		1960	};
		1961	"number-is-nan-1.0.1" = {
		1962	name = "number-is-nan";
		1963	packageName = "number-is-nan";
	1604	1964	version = "1.0.1";
	1605	1965	src = fetchurl {
	1606		url = "https://registry.npmjs.org/~~path~~-is-a~~bsolute~~/-/~~path~~-is-a~~bsolute~~-1.0.1.tgz";
	1607		sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
	1608		};
	1609		};
	1610		"babel-runtime-6.26.0" = {
	1611		name = "ba~~bel~~-run~~time~~";
	1612		packageName = "ba~~bel~~-run~~time~~";
	1613		version = "6.2~~6.0~~";
	1614		src = fetchurl {
	1615		url = "https://registry.npmjs.org/ba~~bel~~-run~~time~~/-/ba~~bel~~-run~~time~~-6.2~~6.0~~.tgz";
	1616		sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
	1617		};
	1618		};
	1619		"regenerator-runtime-0.10.5" = {
	1620		name = "regenerator-runtime";
	1621		packageName = "regen~~erator-runtime~~";
	1622		version = "0.10.5";
	1623		src = fetchurl {
	1624		url = "https://registry.npmjs.org/regen~~erator-runtime~~/-/regen~~erator~~-~~runtime-0~~.10.5.tgz";
	1625		sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
	1626		};
	1627		};
	1628		"regenerator-runtime-0.11.0" = {
	1629		name = "~~rege~~n~~erator-runtim~~e";
	1630		packageName = "~~rege~~n~~erator-runtim~~e";
	1631		version = "~~0.1~~1.0";
	1632		src = fetchurl {
	1633		url = "https://registry.npmjs.org/~~rege~~n~~erator-runtim~~e/-/~~rege~~n~~erator-runtim~~e-~~0.1~~1.0.tgz";
	1634		sha1 = "7e54fe5b5ccd5d6624ea6255c3473be090b802e1";
	1635		};
	1636		};
	1637		"e~~sutils~~-1.1.6" = {
	1638		name = "e~~sutils~~";
	1639		packageName = "e~~sutils~~";
	1640		version = "1.1.6";
	1641		src = fetchurl {
	1642		url = "https://registry.npmjs.org/e~~sutils~~/-/e~~sutils~~-1.1.6.tgz";
	1643		sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
	1644		};
	1645		};
	1646		"isarray-0.0.1" = {
	1647		name = "isarray";
	1648		packageName = "isarray";
	1649		version = "0.0.1";
	1650		src = fetchurl {
	1651		url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
	1652		sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
	1653		};
	1654		};
	1655		"estraverse-4.2.0" = {
	1656		name = "estraverse";
	1657		packageName = "estraverse";
	1658		version = "4.2.0";
	1659		src = fetchurl {
	1660		url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
	1661		sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
	1662		};
	1663		};
	1664		"esutils-2.0.2" = {
	1665		name = "esutils";
	1666		packageName = "esutils";
	1667		version = "2.0.2";
	1668		src = fetchurl {
	1669		url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
	1670		sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
	1671		};
	1672		};
	1673		"esprima-3.1.3" = {
	1674		name = "esprima";
	1675		packageName = "esprima";
	1676		version = "3.1.3";
	1677		src = fetchurl {
	1678		url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
	1679		sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
		1966	url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
		1967	sha1 = "097b602b53422a522c1afb8790318336941a011d";
		1968	};
		1969	};
		1970	"oauth-sign-0.8.2" = {
		1971	name = "oauth-sign";
		1972	packageName = "oauth-sign";
		1973	version = "0.8.2";
		1974	src = fetchurl {
		1975	url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
		1976	sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
		1977	};
		1978	};
		1979	"object-assign-4.1.1" = {
		1980	name = "object-assign";
		1981	packageName = "object-assign";
		1982	version = "4.1.1";
		1983	src = fetchurl {
		1984	url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
		1985	sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
		1986	};
		1987	};
		1988	"once-1.3.3" = {
		1989	name = "once";
		1990	packageName = "once";
		1991	version = "1.3.3";
		1992	src = fetchurl {
		1993	url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
		1994	sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
		1995	};
		1996	};
		1997	"once-1.4.0" = {
		1998	name = "once";
		1999	packageName = "once";
		2000	version = "1.4.0";
		2001	src = fetchurl {
		2002	url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
		2003	sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
	1680	2004	};
	1681	2005	};
	1682	2006	"optionator-0.8.2" = {
			@@ -1688,96 +2012,6 b' let'
	1688	2012	sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
	1689	2013	};
	1690	2014	};
	1691		"prelude-ls-1.1.2" = {
	1692		name = "prelude-ls";
	1693		packageName = "prelude-ls";
	1694		version = "1.1.2";
	1695		src = fetchurl {
	1696		url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
	1697		sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
	1698		};
	1699		};
	1700		"deep-is-0.1.3" = {
	1701		name = "deep-is";
	1702		packageName = "deep-is";
	1703		version = "0.1.3";
	1704		src = fetchurl {
	1705		url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
	1706		sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
	1707		};
	1708		};
	1709		"wordwrap-1.0.0" = {
	1710		name = "wordwrap";
	1711		packageName = "wordwrap";
	1712		version = "1.0.0";
	1713		src = fetchurl {
	1714		url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
	1715		sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
	1716		};
	1717		};
	1718		"type-check-0.3.2" = {
	1719		name = "type-check";
	1720		packageName = "type-check";
	1721		version = "0.3.2";
	1722		src = fetchurl {
	1723		url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
	1724		sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
	1725		};
	1726		};
	1727		"levn-0.3.0" = {
	1728		name = "levn";
	1729		packageName = "levn";
	1730		version = "0.3.0";
	1731		src = fetchurl {
	1732		url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
	1733		sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
	1734		};
	1735		};
	1736		"fast-levenshtein-2.0.6" = {
	1737		name = "fast-levenshtein";
	1738		packageName = "fast-levenshtein";
	1739		version = "2.0.6";
	1740		src = fetchurl {
	1741		url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
	1742		sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
	1743		};
	1744		};
	1745		"acorn-5.1.2" = {
	1746		name = "acorn";
	1747		packageName = "acorn";
	1748		version = "5.1.2";
	1749		src = fetchurl {
	1750		url = "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz";
	1751		sha1 = "911cb53e036807cf0fa778dc5d370fbd864246d7";
	1752		};
	1753		};
	1754		"acorn-jsx-3.0.1" = {
	1755		name = "acorn-jsx";
	1756		packageName = "acorn-jsx";
	1757		version = "3.0.1";
	1758		src = fetchurl {
	1759		url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
	1760		sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
	1761		};
	1762		};
	1763		"object-assign-4.1.1" = {
	1764		name = "object-assign";
	1765		packageName = "object-assign";
	1766		version = "4.1.1";
	1767		src = fetchurl {
	1768		url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
	1769		sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
	1770		};
	1771		};
	1772		"crisper-1.2.0" = {
	1773		name = "crisper";
	1774		packageName = "crisper";
	1775		version = "1.2.0";
	1776		src = fetchurl {
	1777		url = "https://registry.npmjs.org/crisper/-/crisper-1.2.0.tgz";
	1778		sha1 = "9a91f597d71f6110294e076ad44dbb3408568e46";
	1779		};
	1780		};
	1781	2015	"optparse-1.0.5" = {
	1782	2016	name = "optparse";
	1783	2017	packageName = "optparse";
			@@ -1787,303 +2021,6 b' let'
	1787	2021	sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";
	1788	2022	};
	1789	2023	};
	1790		"semver-5.4.1" = {
	1791		name = "semver";
	1792		packageName = "semver";
	1793		version = "5.4.1";
	1794		src = fetchurl {
	1795		url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
	1796		sha1 = "e059c09d8571f0540823733433505d3a2f00b18e";
	1797		};
	1798		};
	1799		"npm-registry-client-8.4.0" = {
	1800		name = "npm-registry-client";
	1801		packageName = "npm-registry-client";
	1802		version = "8.4.0";
	1803		src = fetchurl {
	1804		url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz";
	1805		sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c";
	1806		};
	1807		};
	1808		"npmconf-2.1.2" = {
	1809		name = "npmconf";
	1810		packageName = "npmconf";
	1811		version = "2.1.2";
	1812		src = fetchurl {
	1813		url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
	1814		sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
	1815		};
	1816		};
	1817		"tar-3.1.15" = {
	1818		name = "tar";
	1819		packageName = "tar";
	1820		version = "3.1.15";
	1821		src = fetchurl {
	1822		url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
	1823		sha1 = "cccdc35b90917d58e4c3837795d5d022d7a1f46f";
	1824		};
	1825		};
	1826		"temp-0.8.3" = {
	1827		name = "temp";
	1828		packageName = "temp";
	1829		version = "0.8.3";
	1830		src = fetchurl {
	1831		url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
	1832		sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
	1833		};
	1834		};
	1835		"fs.extra-1.3.2" = {
	1836		name = "fs.extra";
	1837		packageName = "fs.extra";
	1838		version = "1.3.2";
	1839		src = fetchurl {
	1840		url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
	1841		sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
	1842		};
	1843		};
	1844		"findit-2.0.0" = {
	1845		name = "findit";
	1846		packageName = "findit";
	1847		version = "2.0.0";
	1848		src = fetchurl {
	1849		url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz";
	1850		sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
	1851		};
	1852		};
	1853		"base64-js-1.2.1" = {
	1854		name = "base64-js";
	1855		packageName = "base64-js";
	1856		version = "1.2.1";
	1857		src = fetchurl {
	1858		url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz";
	1859		sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886";
	1860		};
	1861		};
	1862		"slasp-0.0.4" = {
	1863		name = "slasp";
	1864		packageName = "slasp";
	1865		version = "0.0.4";
	1866		src = fetchurl {
	1867		url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
	1868		sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
	1869		};
	1870		};
	1871		"nijs-0.0.23" = {
	1872		name = "nijs";
	1873		packageName = "nijs";
	1874		version = "0.0.23";
	1875		src = fetchurl {
	1876		url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
	1877		sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
	1878		};
	1879		};
	1880		"concat-stream-1.6.0" = {
	1881		name = "concat-stream";
	1882		packageName = "concat-stream";
	1883		version = "1.6.0";
	1884		src = fetchurl {
	1885		url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
	1886		sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
	1887		};
	1888		};
	1889		"normalize-package-data-2.4.0" = {
	1890		name = "normalize-package-data";
	1891		packageName = "normalize-package-data";
	1892		version = "2.4.0";
	1893		src = fetchurl {
	1894		url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
	1895		sha1 = "12f95a307d58352075a04907b84ac8be98ac012f";
	1896		};
	1897		};
	1898		"npm-package-arg-5.1.2" = {
	1899		name = "npm-package-arg";
	1900		packageName = "npm-package-arg";
	1901		version = "5.1.2";
	1902		src = fetchurl {
	1903		url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
	1904		sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
	1905		};
	1906		};
	1907		"once-1.4.0" = {
	1908		name = "once";
	1909		packageName = "once";
	1910		version = "1.4.0";
	1911		src = fetchurl {
	1912		url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
	1913		sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
	1914		};
	1915		};
	1916		"retry-0.10.1" = {
	1917		name = "retry";
	1918		packageName = "retry";
	1919		version = "0.10.1";
	1920		src = fetchurl {
	1921		url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
	1922		sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
	1923		};
	1924		};
	1925		"slide-1.1.6" = {
	1926		name = "slide";
	1927		packageName = "slide";
	1928		version = "1.1.6";
	1929		src = fetchurl {
	1930		url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
	1931		sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
	1932		};
	1933		};
	1934		"ssri-4.1.6" = {
	1935		name = "ssri";
	1936		packageName = "ssri";
	1937		version = "4.1.6";
	1938		src = fetchurl {
	1939		url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
	1940		sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
	1941		};
	1942		};
	1943		"npmlog-4.1.2" = {
	1944		name = "npmlog";
	1945		packageName = "npmlog";
	1946		version = "4.1.2";
	1947		src = fetchurl {
	1948		url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
	1949		sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b";
	1950		};
	1951		};
	1952		"typedarray-0.0.6" = {
	1953		name = "typedarray";
	1954		packageName = "typedarray";
	1955		version = "0.0.6";
	1956		src = fetchurl {
	1957		url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
	1958		sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
	1959		};
	1960		};
	1961		"readable-stream-2.3.3" = {
	1962		name = "readable-stream";
	1963		packageName = "readable-stream";
	1964		version = "2.3.3";
	1965		src = fetchurl {
	1966		url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz";
	1967		sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c";
	1968		};
	1969		};
	1970		"isarray-1.0.0" = {
	1971		name = "isarray";
	1972		packageName = "isarray";
	1973		version = "1.0.0";
	1974		src = fetchurl {
	1975		url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
	1976		sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
	1977		};
	1978		};
	1979		"process-nextick-args-1.0.7" = {
	1980		name = "process-nextick-args";
	1981		packageName = "process-nextick-args";
	1982		version = "1.0.7";
	1983		src = fetchurl {
	1984		url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
	1985		sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
	1986		};
	1987		};
	1988		"string_decoder-1.0.3" = {
	1989		name = "string_decoder";
	1990		packageName = "string_decoder";
	1991		version = "1.0.3";
	1992		src = fetchurl {
	1993		url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz";
	1994		sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab";
	1995		};
	1996		};
	1997		"util-deprecate-1.0.2" = {
	1998		name = "util-deprecate";
	1999		packageName = "util-deprecate";
	2000		version = "1.0.2";
	2001		src = fetchurl {
	2002		url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
	2003		sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
	2004		};
	2005		};
	2006		"hosted-git-info-2.5.0" = {
	2007		name = "hosted-git-info";
	2008		packageName = "hosted-git-info";
	2009		version = "2.5.0";
	2010		src = fetchurl {
	2011		url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz";
	2012		sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c";
	2013		};
	2014		};
	2015		"is-builtin-module-1.0.0" = {
	2016		name = "is-builtin-module";
	2017		packageName = "is-builtin-module";
	2018		version = "1.0.0";
	2019		src = fetchurl {
	2020		url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
	2021		sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
	2022		};
	2023		};
	2024		"validate-npm-package-license-3.0.1" = {
	2025		name = "validate-npm-package-license";
	2026		packageName = "validate-npm-package-license";
	2027		version = "3.0.1";
	2028		src = fetchurl {
	2029		url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
	2030		sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
	2031		};
	2032		};
	2033		"builtin-modules-1.1.1" = {
	2034		name = "builtin-modules";
	2035		packageName = "builtin-modules";
	2036		version = "1.1.1";
	2037		src = fetchurl {
	2038		url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
	2039		sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
	2040		};
	2041		};
	2042		"spdx-correct-1.0.2" = {
	2043		name = "spdx-correct";
	2044		packageName = "spdx-correct";
	2045		version = "1.0.2";
	2046		src = fetchurl {
	2047		url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz";
	2048		sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
	2049		};
	2050		};
	2051		"spdx-expression-parse-1.0.4" = {
	2052		name = "spdx-expression-parse";
	2053		packageName = "spdx-expression-parse";
	2054		version = "1.0.4";
	2055		src = fetchurl {
	2056		url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz";
	2057		sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c";
	2058		};
	2059		};
	2060		"spdx-license-ids-1.2.2" = {
	2061		name = "spdx-license-ids";
	2062		packageName = "spdx-license-ids";
	2063		version = "1.2.2";
	2064		src = fetchurl {
	2065		url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz";
	2066		sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57";
	2067		};
	2068		};
	2069		"osenv-0.1.4" = {
	2070		name = "osenv";
	2071		packageName = "osenv";
	2072		version = "0.1.4";
	2073		src = fetchurl {
	2074		url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
	2075		sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
	2076		};
	2077		};
	2078		"validate-npm-package-name-3.0.0" = {
	2079		name = "validate-npm-package-name";
	2080		packageName = "validate-npm-package-name";
	2081		version = "3.0.0";
	2082		src = fetchurl {
	2083		url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
	2084		sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
	2085		};
	2086		};
	2087	2024	"os-homedir-1.0.2" = {
	2088	2025	name = "os-homedir";
	2089	2026	packageName = "os-homedir";
			@@ -2102,184 +2039,130 b' let'
	2102	2039	sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
	2103	2040	};
	2104	2041	};
	2105		"~~builti~~ns-1.~~0.3~~" = {
	2106		name = "~~builti~~ns";
	2107		packageName = "~~builti~~ns";
	2108		version = "1.~~0.3~~";
	2109		src = fetchurl {
	2110		url = "https://registry.npmjs.org/~~builti~~ns/-/~~builti~~ns-1.~~0.3~~.tgz";
	2111		sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88";
	2112		};
	2113		};
	2114		"wr~~appy~~-1.0.2" = {
	2115		name = "wr~~appy~~";
	2116		packageName = "wr~~appy~~";
	2117		version = "1.0.2";
	2118		src = fetchurl {
	2119		url = "https://registry.npmjs.org/wr~~appy~~/-/wr~~appy~~-1.0.2.tgz";
	2120		sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
	2121		};
	2122		};
	2123		"are-we-there-yet-1.1.4" = {
	2124		name = "a~~re-we-~~the~~re-yet~~";
	2125		packageName = "a~~re-we-~~the~~re-yet~~";
	2126		version = "1.1.4";
	2127		src = fetchurl {
	2128		url = "https://registry.npmjs.org/a~~re-we-~~the~~re-yet~~/-/a~~re-we-~~the~~re-yet~~-1.1.4.tgz";
	2129		sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
	2130		};
	2131		};
	2132		"console-control-strings-1.1.0" = {
	2133		name = "console-control-strings";
	2134		packageName = "cons~~ole-control-str~~i~~ngs~~";
	2135		version = "1.1.0";
	2136		src = fetchurl {
	2137		url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
	2138		sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
	2139		};
	2140		};
	2141		"gauge-2.7.4" = {
	2142		name = "gauge";
	2143		packageName = "gauge";
	2144		version = "2.7.4";
	2145		src = fetchurl {
	2146		url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
	2147		sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
	2148		};
	2149		};
	2150		"set-blocking-2.0.0" = {
	2151		name = "set-blocking";
	2152		packageName = "set-blocking";
	2153		version = "2.0.0";
	2154		src = fetchurl {
	2155		url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
	2156		sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
	2157		};
	2158		};
	2159		"delegates-1.0.0" = {
	2160		name = "delegates";
	2161		packageName = "delegates";
		2042	"osenv-0.1.5" = {
		2043	name = "osenv";
		2044	packageName = "osenv";
		2045	version = "0.1.5";
		2046	src = fetchurl {
		2047	url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
		2048	sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
		2049	};
		2050	};
		2051	"parse5-1.5.1" = {
		2052	name = "parse5";
		2053	packageName = "parse5";
		2054	version = "1.5.1";
		2055	src = fetchurl {
		2056	url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
		2057	sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
		2058	};
		2059	};
		2060	"path-is-absolute-1.0.1" = {
		2061	name = "path-is-absolute";
		2062	packageName = "path-is-absolute";
		2063	version = "1.0.1";
		2064	src = fetchurl {
		2065	url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
		2066	sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
		2067	};
		2068	};
		2069	"path-posix-1.0.0" = {
		2070	name = "path-posix";
		2071	packageName = "path-posix";
	2162	2072	version = "1.0.0";
	2163	2073	src = fetchurl {
	2164		url = "https://registry.npmjs.org/~~deleg~~ates/-/~~deleg~~ates-1.0.0.tgz";
	2165		sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
	2166		};
	2167		};
	2168		"ap~~roba~~-1.2.0" = {
	2169		name = "ap~~roba~~";
	2170		packageName = "ap~~roba~~";
		2074	url = "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz";
		2075	sha1 = "06b26113f56beab042545a23bfa88003ccac260f";
		2076	};
		2077	};
		2078	"pend-1.2.0" = {
		2079	name = "pend";
		2080	packageName = "pend";
	2171	2081	version = "1.2.0";
	2172	2082	src = fetchurl {
	2173		url = "https://registry.npmjs.org/ap~~roba~~/-/ap~~roba~~-1.2.0.tgz";
	2174		sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a";
	2175		};
	2176		};
	2177		"ha~~s-u~~nicode-2.0.1" = {
	2178		name = "has-unicode";
	2179		packageName = "has-unicode";
		2083	url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
		2084	sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
		2085	};
		2086	};
		2087	"performance-now-0.2.0" = {
		2088	name = "performance-now";
		2089	packageName = "performance-now";
		2090	version = "0.2.0";
		2091	src = fetchurl {
		2092	url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
		2093	sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
		2094	};
		2095	};
		2096	"phantom-4.0.12" = {
		2097	name = "phantom";
		2098	packageName = "phantom";
		2099	version = "4.0.12";
		2100	src = fetchurl {
		2101	url = "https://registry.npmjs.org/phantom/-/phantom-4.0.12.tgz";
		2102	sha512 = "Tz82XhtPmwCk1FFPmecy7yRGZG2btpzY2KI9fcoPT7zT9det0CcMyfBFPp1S8DqzsnQnm8ZYEfdy528mwVtksA==";
		2103	};
		2104	};
		2105	"phantomjs-prebuilt-2.1.16" = {
		2106	name = "phantomjs-prebuilt";
		2107	packageName = "phantomjs-prebuilt";
		2108	version = "2.1.16";
		2109	src = fetchurl {
		2110	url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz";
		2111	sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef";
		2112	};
		2113	};
		2114	"pinkie-2.0.4" = {
		2115	name = "pinkie";
		2116	packageName = "pinkie";
		2117	version = "2.0.4";
		2118	src = fetchurl {
		2119	url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
		2120	sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
		2121	};
		2122	};
		2123	"pinkie-promise-2.0.1" = {
		2124	name = "pinkie-promise";
		2125	packageName = "pinkie-promise";
	2180	2126	version = "2.0.1";
	2181	2127	src = fetchurl {
	2182		url = "https://registry.npmjs.org/has~~-unicod~~e/-/has~~-unicod~~e-2.0.1.tgz";
	2183		sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
	2184		};
	2185		};
	2186		"signal-exit-3.0.2" = {
	2187		name = "s~~ignal-exit~~";
	2188		packageName = "s~~ignal-exit~~";
	2189		version = "3.0.2";
	2190		src = fetchurl {
	2191		url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
	2192		sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
	2193		};
	2194		};
	2195		"string-width-1.0.2" = {
	2196		name = "string-width";
	2197		packageName = "string-width";
	2198		version = "1.0.2";
	2199		src = fetchurl {
	2200		url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
	2201		sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
	2202		};
	2203		};
	2204		"wide-align-1.1.2" = {
	2205		name = "wide-align";
	2206		packageName = "wide-align";
		2128	url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
		2129	sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
		2130	};
		2131	};
		2132	"prelude-ls-1.1.2" = {
		2133	name = "prelude-ls";
		2134	packageName = "prelude-ls";
	2207	2135	version = "1.1.2";
	2208	2136	src = fetchurl {
	2209		url = "https://registry.npmjs.org/wide-al~~ign~~/-/wide-al~~ign~~-1.1.2.tgz";
	2210		sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
	2211		};
	2212		};
	2213		"code-point-at-1.1.0" = {
	2214		name = "code-point-at";
	2215		packageName = "code-point-at";
	2216		version = "1.1.0";
	2217		src = fetchurl {
	2218		url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
	2219		sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
	2220		};
	2221		};
	2222		"is-fullwidth-code-point-1.0.0" = {
	2223		name = "is-fullwidth-code-point";
	2224		packageName = "is~~-fullwidth-code-point~~";
	2225		version = "1.0.0";
	2226		src = fetchurl {
	2227		url = "https://registry.npmjs.org/is~~-fullwidth-code-point~~/-/is~~-fullwidth-code-point~~-1.0.0.tgz";
	2228		sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
	2229		};
	2230		};
	2231		"num~~ber-~~is-~~nan-1~~.0.1" = {
	2232		name = "num~~ber-~~is~~-nan~~";
	2233		packageName = "num~~ber-~~is~~-nan~~";
	2234		version = "1.0.1";
	2235		src = fetchurl {
	2236		url = "https://registry.npmjs.org/num~~ber-~~is~~-nan~~/-/num~~ber-~~is-~~nan-1~~.0.1.tgz";
	2237		sha1 = "097b602b53422a522c1afb8790318336941a011d";
	2238		};
	2239		};
	2240		"config-chain-1.1.11" = {
	2241		name = "config-chain";
	2242		packageName = "config-chain";
	2243		version = "1.1.11";
	2244		src = fetchurl {
	2245		url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
	2246		sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
	2247		};
	2248		};
	2249		"ini-1.3.4" = {
	2250		name = "ini";
	2251		packageName = "ini";
	2252		version = "1.3.4";
	2253		src = fetchurl {
	2254		url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
	2255		sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
	2256		};
	2257		};
	2258		"once-1.3.3" = {
	2259		name = "once";
	2260		packageName = "once";
	2261		version = "1.3.3";
	2262		src = fetchurl {
	2263		url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
	2264		sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
	2265		};
	2266		};
	2267		"semver-4.3.6" = {
	2268		name = "semver";
	2269		packageName = "semver";
	2270		version = "4.3.6";
	2271		src = fetchurl {
	2272		url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
	2273		sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
	2274		};
	2275		};
	2276		"uid-number-0.0.5" = {
	2277		name = "uid-number";
	2278		packageName = "uid-number";
	2279		version = "0.0.5";
	2280		src = fetchurl {
	2281		url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
	2282		sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
		2137	url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
		2138	sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
		2139	};
		2140	};
		2141	"process-nextick-args-2.0.0" = {
		2142	name = "process-nextick-args";
		2143	packageName = "process-nextick-args";
		2144	version = "2.0.0";
		2145	src = fetchurl {
		2146	url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
		2147	sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
		2148	};
		2149	};
		2150	"progress-1.1.8" = {
		2151	name = "progress";
		2152	packageName = "progress";
		2153	version = "1.1.8";
		2154	src = fetchurl {
		2155	url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
		2156	sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
		2157	};
		2158	};
		2159	"promise-7.3.1" = {
		2160	name = "promise";
		2161	packageName = "promise";
		2162	version = "7.3.1";
		2163	src = fetchurl {
		2164	url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
		2165	sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
	2283	2166	};
	2284	2167	};
	2285	2168	"proto-list-1.2.4" = {
			@@ -2291,238 +2174,49 b' let'
	2291	2174	sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
	2292	2175	};
	2293	2176	};
	2294		"~~mini~~p~~ass~~-2.2.1" = {
	2295		name = "~~mini~~p~~ass~~";
	2296		packageName = "~~mini~~p~~ass~~";
	2297		version = "2.2.1";
	2298		src = fetchurl {
	2299		url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
	2300		sha1 = "5ada97538b1027b4cf7213432428578cb564011f";
	2301		};
	2302		};
	2303		"minizlib-1.0.3" = {
	2304		name = "minizlib";
	2305		packageName = "minizlib";
	2306		version = "1.0.3";
	2307		src = fetchurl {
	2308		url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz";
	2309		sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5";
	2310		};
	2311		};
	2312		"yallist-3.0.2" = {
	2313		name = "yallist";
	2314		packageName = "yallist";
	2315		version = "3.0.2";
	2316		src = fetchurl {
	2317		url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
	2318		sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
	2319		};
	2320		};
	2321		"fs-extra-0.6.4" = {
	2322		name = "fs-extra";
	2323		packageName = "fs-extra";
	2324		version = "0.6.4";
	2325		src = fetchurl {
	2326		url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
	2327		sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
	2328		};
	2329		};
	2330		"mkdirp-0.3.5" = {
	2331		name = "mkdirp";
	2332		packageName = "mkdirp";
	2333		version = "0.3.5";
	2334		src = fetchurl {
	2335		url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
	2336		sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
	2337		};
	2338		};
	2339		"walk-2.3.9" = {
	2340		name = "walk";
	2341		packageName = "walk";
	2342		version = "2.3.9";
	2343		src = fetchurl {
	2344		url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
	2345		sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
	2346		};
	2347		};
	2348		"ncp-0.4.2" = {
	2349		name = "ncp";
	2350		packageName = "ncp";
	2351		version = "0.4.2";
	2352		src = fetchurl {
	2353		url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
	2354		sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
	2355		};
	2356		};
	2357		"jsonfile-1.0.1" = {
	2358		name = "jsonfile";
	2359		packageName = "jsonfile";
	2360		version = "1.0.1";
	2361		src = fetchurl {
	2362		url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
	2363		sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
	2364		};
	2365		};
	2366		"foreachasync-3.0.0" = {
	2367		name = "foreachasync";
	2368		packageName = "foreachasync";
	2369		version = "3.0.0";
	2370		src = fetchurl {
	2371		url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
	2372		sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
	2373		};
	2374		};
	2375		"cli-1.0.1" = {
	2376		name = "cli";
	2377		packageName = "cli";
		2177	"prr-1.0.1" = {
		2178	name = "prr";
		2179	packageName = "prr";
	2378	2180	version = "1.0.1";
	2379	2181	src = fetchurl {
	2380		url = "https://registry.npmjs.org/~~cli~~/-/~~cli~~-1.0.1.tgz";
	2381		sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
	2382		};
	2383		};
	2384		"console-browserify-1.1.0" = {
	2385		name = "co~~nsol~~e~~-browserify~~";
	2386		packageName = "co~~nsol~~e~~-browserify~~";
	2387		version = "1.1.0";
	2388		src = fetchurl {
	2389		url = "https://registry.npmjs.org/co~~nsol~~e~~-browserify~~/-/co~~nsol~~e~~-browserify~~-1.1.0.tgz";
	2390		sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
	2391		};
	2392		};
	2393		"htmlparser2-3.8.3" = {
	2394		name = "~~htmlpa~~rs~~er2~~";
	2395		packageName = "~~htmlpa~~rs~~er2~~";
	2396		version = "3.8.3";
	2397		src = fetchurl {
	2398		url = "https://registry.npmjs.org/~~htmlpa~~rs~~er2~~/-/~~htmlpa~~rser2~~-3.8.3~~.tgz";
	2399		sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
	2400		};
	2401		};
	2402		"~~minimatch~~-3.0.4" = {
	2403		name = "~~minimatch~~";
	2404		packageName = "~~minimatch~~";
	2405		version = "3.0.4";
	2406		src = fetchurl {
	2407		url = "https://registry.npmjs.org/~~minimatch~~/-/~~minimatch~~-3.0.4.tgz";
	2408		sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
	2409		};
	2410		};
	2411		"~~shellj~~s-0.3.0" = {
	2412		name = "~~shellj~~s";
	2413		packageName = "~~shellj~~s";
	2414		version = "0.3.0";
	2415		src = fetchurl {
	2416		url = "https://registry.npmjs.org/~~shellj~~s/-/~~shellj~~s-0.3.0.tgz";
	2417		sha1 = "3596e6307a781544f591f37da618360f31db57b1";
	2418		};
	2419		};
	2420		"strip-json-comments-1.0.4" = {
	2421		name = "strip-json-comments";
	2422		packageName = "strip-json-comments";
	2423		version = "1.0.4";
	2424		src = fetchurl {
	2425		url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
	2426		sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
	2427		};
	2428		};
	2429		"lodash-3.7.0" = {
	2430		name = "lodash";
	2431		packageName = "lodash";
	2432		version = "3.7.0";
	2433		src = fetchurl {
	2434		url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
	2435		sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
	2436		};
	2437		};
	2438		"glob-7.1.2" = {
	2439		name = "glob";
	2440		packageName = "glob";
	2441		version = "7.1.2";
	2442		src = fetchurl {
	2443		url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
	2444		sha1 = "c19c9df9a028702d678612384a6552404c636d15";
	2445		};
	2446		};
	2447		"fs.realpath-1.0.0" = {
	2448		name = "fs.realpath";
	2449		packageName = "fs.realpath";
	2450		version = "1.0.0";
	2451		src = fetchurl {
	2452		url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
	2453		sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
	2454		};
	2455		};
	2456		"inflight-1.0.6" = {
	2457		name = "inflight";
	2458		packageName = "inflight";
	2459		version = "1.0.6";
	2460		src = fetchurl {
	2461		url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
	2462		sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
	2463		};
	2464		};
	2465		"brace-expansion-1.1.8" = {
	2466		name = "brace-expansion";
	2467		packageName = "brace-expansion";
	2468		version = "1.1.8";
	2469		src = fetchurl {
	2470		url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
	2471		sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
	2472		};
	2473		};
	2474		"balanced-match-1.0.0" = {
	2475		name = "balanced-match";
	2476		packageName = "balanced-match";
	2477		version = "1.0.0";
	2478		src = fetchurl {
	2479		url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
	2480		sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
	2481		};
	2482		};
	2483		"concat-map-0.0.1" = {
	2484		name = "concat-map";
	2485		packageName = "concat-map";
	2486		version = "0.0.1";
	2487		src = fetchurl {
	2488		url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
	2489		sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
	2490		};
	2491		};
	2492		"date-now-0.1.4" = {
	2493		name = "date-now";
	2494		packageName = "date-now";
	2495		version = "0.1.4";
	2496		src = fetchurl {
	2497		url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
	2498		sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
	2499		};
	2500		};
	2501		"domhandler-2.3.0" = {
	2502		name = "domhandler";
	2503		packageName = "domhandler";
	2504		version = "2.3.0";
	2505		src = fetchurl {
	2506		url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
	2507		sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
	2508		};
	2509		};
	2510		"domutils-1.5.1" = {
	2511		name = "domutils";
	2512		packageName = "domutils";
	2513		version = "1.5.1";
	2514		src = fetchurl {
	2515		url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
	2516		sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
	2517		};
	2518		};
	2519		"domelementtype-1.3.0" = {
	2520		name = "domelementtype";
	2521		packageName = "domelementtype";
	2522		version = "1.3.0";
	2523		src = fetchurl {
	2524		url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
	2525		sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
		2182	url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz";
		2183	sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
		2184	};
		2185	};
		2186	"punycode-1.4.1" = {
		2187	name = "punycode";
		2188	packageName = "punycode";
		2189	version = "1.4.1";
		2190	src = fetchurl {
		2191	url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
		2192	sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
		2193	};
		2194	};
		2195	"qrious-4.0.2" = {
		2196	name = "qrious";
		2197	packageName = "qrious";
		2198	version = "4.0.2";
		2199	src = fetchurl {
		2200	url = "https://registry.npmjs.org/qrious/-/qrious-4.0.2.tgz";
		2201	sha512 = "xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==";
		2202	};
		2203	};
		2204	"qs-0.5.6" = {
		2205	name = "qs";
		2206	packageName = "qs";
		2207	version = "0.5.6";
		2208	src = fetchurl {
		2209	url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
		2210	sha1 = "31b1ad058567651c526921506b9a8793911a0384";
		2211	};
		2212	};
		2213	"qs-6.4.0" = {
		2214	name = "qs";
		2215	packageName = "qs";
		2216	version = "6.4.0";
		2217	src = fetchurl {
		2218	url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
		2219	sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
	2526	2220	};
	2527	2221	};
	2528	2222	"readable-stream-1.1.14" = {
			@@ -2534,58 +2228,94 b' let'
	2534	2228	sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
	2535	2229	};
	2536	2230	};
	2537		"entities-1.0.0" = {
	2538		name = "ent~~iti~~es";
	2539		packageName = "ent~~iti~~es";
	2540		version = "1.0.0";
	2541		src = fetchurl {
	2542		url = "https://registry.npmjs.org/ent~~iti~~es/-/ent~~iti~~es-1.0.0.tgz";
	2543		sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
	2544		};
	2545		};
	2546		"dom-serializer-0.1.0" = {
	2547		name = "dom-se~~rializer~~";
	2548		packageName = "dom-se~~rializer~~";
	2549		version = "0.1.0";
	2550		src = fetchurl {
	2551		url = "https://registry.npmjs.org/dom-se~~rializer~~/-/dom-se~~rializer~~-0.1.0.tgz";
	2552		sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
	2553		};
	2554		};
	2555		"domelementtype-1.1.3" = {
	2556		name = "~~dom~~e~~lem~~enttype";
	2557		packageName = "~~dom~~e~~lem~~enttype";
	2558		version = "1.1.3";
	2559		src = fetchurl {
	2560		url = "https://registry.npmjs.org/~~dom~~e~~lem~~enttype/-/dome~~lementtype~~-1.1.3.tgz";
	2561		sha1 = "bd28773e2642881aec51544924299c5cd822185b";
	2562		};
	2563		};
	2564		"entities-1.1.1" = {
	2565		name = "entities";
	2566		packageName = "entities";
	2567		version = "1.1.1";
	2568		src = fetchurl {
	2569		url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
	2570		sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
	2571		};
	2572		};
	2573		"string_decoder-0.10.31" = {
	2574		name = "st~~ring_decoder~~";
	2575		packageName = "st~~ring_decoder~~";
	2576		version = "0~~.10.31~~";
	2577		src = fetchurl {
	2578		url = "https://registry.npmjs.org/st~~ring_decoder~~/-/st~~ring_decoder~~-0~~.10.31~~.tgz";
	2579		sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
	2580		};
	2581		};
	2582		"good-listener-1.2.2" = {
	2583		name = "~~good-li~~ste~~ner~~";
	2584		packageName = "~~good-li~~ste~~ner~~";
	2585		version = "1.2.2";
	2586		src = fetchurl {
	2587		url = "https://registry.npmjs.org/~~good-li~~ste~~ner~~/-/~~good-li~~ste~~ner~~-1.2.2.tgz";
	2588		sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
		2231	"readable-stream-2.3.6" = {
		2232	name = "readable-stream";
		2233	packageName = "readable-stream";
		2234	version = "2.3.6";
		2235	src = fetchurl {
		2236	url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
		2237	sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
		2238	};
		2239	};
		2240	"reduce-flatten-1.0.1" = {
		2241	name = "reduce-flatten";
		2242	packageName = "reduce-flatten";
		2243	version = "1.0.1";
		2244	src = fetchurl {
		2245	url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
		2246	sha1 = "258c78efd153ddf93cb561237f61184f3696e327";
		2247	};
		2248	};
		2249	"regenerator-runtime-0.10.5" = {
		2250	name = "regenerator-runtime";
		2251	packageName = "regenerator-runtime";
		2252	version = "0.10.5";
		2253	src = fetchurl {
		2254	url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
		2255	sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
		2256	};
		2257	};
		2258	"regenerator-runtime-0.11.1" = {
		2259	name = "regenerator-runtime";
		2260	packageName = "regenerator-runtime";
		2261	version = "0.11.1";
		2262	src = fetchurl {
		2263	url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
		2264	sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
		2265	};
		2266	};
		2267	"request-2.81.0" = {
		2268	name = "request";
		2269	packageName = "request";
		2270	version = "2.81.0";
		2271	src = fetchurl {
		2272	url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
		2273	sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
		2274	};
		2275	};
		2276	"request-progress-2.0.1" = {
		2277	name = "request-progress";
		2278	packageName = "request-progress";
		2279	version = "2.0.1";
		2280	src = fetchurl {
		2281	url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
		2282	sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
		2283	};
		2284	};
		2285	"retry-0.10.1" = {
		2286	name = "retry";
		2287	packageName = "retry";
		2288	version = "0.10.1";
		2289	src = fetchurl {
		2290	url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
		2291	sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
		2292	};
		2293	};
		2294	"rimraf-2.2.8" = {
		2295	name = "rimraf";
		2296	packageName = "rimraf";
		2297	version = "2.2.8";
		2298	src = fetchurl {
		2299	url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
		2300	sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
		2301	};
		2302	};
		2303	"safe-buffer-5.1.2" = {
		2304	name = "safe-buffer";
		2305	packageName = "safe-buffer";
		2306	version = "5.1.2";
		2307	src = fetchurl {
		2308	url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
		2309	sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
		2310	};
		2311	};
		2312	"safer-buffer-2.1.2" = {
		2313	name = "safer-buffer";
		2314	packageName = "safer-buffer";
		2315	version = "2.1.2";
		2316	src = fetchurl {
		2317	url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
		2318	sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
	2589	2319	};
	2590	2320	};
	2591	2321	"select-1.1.2" = {
			@@ -2597,88 +2327,734 b' let'
	2597	2327	sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
	2598	2328	};
	2599	2329	};
		2330	"semver-4.3.6" = {
		2331	name = "semver";
		2332	packageName = "semver";
		2333	version = "4.3.6";
		2334	src = fetchurl {
		2335	url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
		2336	sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
		2337	};
		2338	};
		2339	"semver-5.5.0" = {
		2340	name = "semver";
		2341	packageName = "semver";
		2342	version = "5.5.0";
		2343	src = fetchurl {
		2344	url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
		2345	sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
		2346	};
		2347	};
		2348	"set-blocking-2.0.0" = {
		2349	name = "set-blocking";
		2350	packageName = "set-blocking";
		2351	version = "2.0.0";
		2352	src = fetchurl {
		2353	url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
		2354	sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
		2355	};
		2356	};
		2357	"shelljs-0.3.0" = {
		2358	name = "shelljs";
		2359	packageName = "shelljs";
		2360	version = "0.3.0";
		2361	src = fetchurl {
		2362	url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
		2363	sha1 = "3596e6307a781544f591f37da618360f31db57b1";
		2364	};
		2365	};
		2366	"sigmund-1.0.1" = {
		2367	name = "sigmund";
		2368	packageName = "sigmund";
		2369	version = "1.0.1";
		2370	src = fetchurl {
		2371	url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
		2372	sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
		2373	};
		2374	};
		2375	"signal-exit-3.0.2" = {
		2376	name = "signal-exit";
		2377	packageName = "signal-exit";
		2378	version = "3.0.2";
		2379	src = fetchurl {
		2380	url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
		2381	sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
		2382	};
		2383	};
		2384	"slasp-0.0.4" = {
		2385	name = "slasp";
		2386	packageName = "slasp";
		2387	version = "0.0.4";
		2388	src = fetchurl {
		2389	url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
		2390	sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
		2391	};
		2392	};
		2393	"slide-1.1.6" = {
		2394	name = "slide";
		2395	packageName = "slide";
		2396	version = "1.1.6";
		2397	src = fetchurl {
		2398	url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
		2399	sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
		2400	};
		2401	};
		2402	"sntp-1.0.9" = {
		2403	name = "sntp";
		2404	packageName = "sntp";
		2405	version = "1.0.9";
		2406	src = fetchurl {
		2407	url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
		2408	sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
		2409	};
		2410	};
		2411	"source-map-0.3.0" = {
		2412	name = "source-map";
		2413	packageName = "source-map";
		2414	version = "0.3.0";
		2415	src = fetchurl {
		2416	url = "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
		2417	sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
		2418	};
		2419	};
		2420	"source-map-0.5.7" = {
		2421	name = "source-map";
		2422	packageName = "source-map";
		2423	version = "0.5.7";
		2424	src = fetchurl {
		2425	url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
		2426	sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
		2427	};
		2428	};
		2429	"source-map-0.6.1" = {
		2430	name = "source-map";
		2431	packageName = "source-map";
		2432	version = "0.6.1";
		2433	src = fetchurl {
		2434	url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
		2435	sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
		2436	};
		2437	};
		2438	"spdx-correct-3.0.0" = {
		2439	name = "spdx-correct";
		2440	packageName = "spdx-correct";
		2441	version = "3.0.0";
		2442	src = fetchurl {
		2443	url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
		2444	sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
		2445	};
		2446	};
		2447	"spdx-exceptions-2.1.0" = {
		2448	name = "spdx-exceptions";
		2449	packageName = "spdx-exceptions";
		2450	version = "2.1.0";
		2451	src = fetchurl {
		2452	url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
		2453	sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
		2454	};
		2455	};
		2456	"spdx-expression-parse-3.0.0" = {
		2457	name = "spdx-expression-parse";
		2458	packageName = "spdx-expression-parse";
		2459	version = "3.0.0";
		2460	src = fetchurl {
		2461	url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
		2462	sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
		2463	};
		2464	};
		2465	"spdx-license-ids-3.0.0" = {
		2466	name = "spdx-license-ids";
		2467	packageName = "spdx-license-ids";
		2468	version = "3.0.0";
		2469	src = fetchurl {
		2470	url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
		2471	sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
		2472	};
		2473	};
		2474	"split-1.0.1" = {
		2475	name = "split";
		2476	packageName = "split";
		2477	version = "1.0.1";
		2478	src = fetchurl {
		2479	url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
		2480	sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
		2481	};
		2482	};
		2483	"sshpk-1.14.2" = {
		2484	name = "sshpk";
		2485	packageName = "sshpk";
		2486	version = "1.14.2";
		2487	src = fetchurl {
		2488	url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
		2489	sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
		2490	};
		2491	};
		2492	"ssri-5.3.0" = {
		2493	name = "ssri";
		2494	packageName = "ssri";
		2495	version = "5.3.0";
		2496	src = fetchurl {
		2497	url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz";
		2498	sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==";
		2499	};
		2500	};
		2501	"stack-trace-0.0.10" = {
		2502	name = "stack-trace";
		2503	packageName = "stack-trace";
		2504	version = "0.0.10";
		2505	src = fetchurl {
		2506	url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
		2507	sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
		2508	};
		2509	};
		2510	"string-width-1.0.2" = {
		2511	name = "string-width";
		2512	packageName = "string-width";
		2513	version = "1.0.2";
		2514	src = fetchurl {
		2515	url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
		2516	sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
		2517	};
		2518	};
		2519	"string_decoder-0.10.31" = {
		2520	name = "string_decoder";
		2521	packageName = "string_decoder";
		2522	version = "0.10.31";
		2523	src = fetchurl {
		2524	url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
		2525	sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
		2526	};
		2527	};
		2528	"string_decoder-1.1.1" = {
		2529	name = "string_decoder";
		2530	packageName = "string_decoder";
		2531	version = "1.1.1";
		2532	src = fetchurl {
		2533	url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
		2534	sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
		2535	};
		2536	};
		2537	"stringstream-0.0.6" = {
		2538	name = "stringstream";
		2539	packageName = "stringstream";
		2540	version = "0.0.6";
		2541	src = fetchurl {
		2542	url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz";
		2543	sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==";
		2544	};
		2545	};
		2546	"strip-ansi-0.3.0" = {
		2547	name = "strip-ansi";
		2548	packageName = "strip-ansi";
		2549	version = "0.3.0";
		2550	src = fetchurl {
		2551	url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
		2552	sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
		2553	};
		2554	};
		2555	"strip-ansi-3.0.1" = {
		2556	name = "strip-ansi";
		2557	packageName = "strip-ansi";
		2558	version = "3.0.1";
		2559	src = fetchurl {
		2560	url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
		2561	sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
		2562	};
		2563	};
		2564	"strip-json-comments-1.0.4" = {
		2565	name = "strip-json-comments";
		2566	packageName = "strip-json-comments";
		2567	version = "1.0.4";
		2568	src = fetchurl {
		2569	url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
		2570	sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
		2571	};
		2572	};
		2573	"supports-color-0.2.0" = {
		2574	name = "supports-color";
		2575	packageName = "supports-color";
		2576	version = "0.2.0";
		2577	src = fetchurl {
		2578	url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
		2579	sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
		2580	};
		2581	};
		2582	"supports-color-2.0.0" = {
		2583	name = "supports-color";
		2584	packageName = "supports-color";
		2585	version = "2.0.0";
		2586	src = fetchurl {
		2587	url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
		2588	sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
		2589	};
		2590	};
		2591	"table-layout-0.3.0" = {
		2592	name = "table-layout";
		2593	packageName = "table-layout";
		2594	version = "0.3.0";
		2595	src = fetchurl {
		2596	url = "https://registry.npmjs.org/table-layout/-/table-layout-0.3.0.tgz";
		2597	sha1 = "6ee20dc483db371b3e5c87f704ed2f7c799d2c9a";
		2598	};
		2599	};
		2600	"tar-3.1.15" = {
		2601	name = "tar";
		2602	packageName = "tar";
		2603	version = "3.1.15";
		2604	src = fetchurl {
		2605	url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz";
		2606	sha512 = "pQNFsg+Wb6VXsrIPUnuQwrHR4wD5ASBR0jRyiT4/AALFA2Nl+CjhkDX5fTmIwCuULRtyQR3Dae2BBnP2EFHscw==";
		2607	};
		2608	};
		2609	"temp-0.8.3" = {
		2610	name = "temp";
		2611	packageName = "temp";
		2612	version = "0.8.3";
		2613	src = fetchurl {
		2614	url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
		2615	sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
		2616	};
		2617	};
		2618	"test-value-2.1.0" = {
		2619	name = "test-value";
		2620	packageName = "test-value";
		2621	version = "2.1.0";
		2622	src = fetchurl {
		2623	url = "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz";
		2624	sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291";
		2625	};
		2626	};
		2627	"throttleit-1.0.0" = {
		2628	name = "throttleit";
		2629	packageName = "throttleit";
		2630	version = "1.0.0";
		2631	src = fetchurl {
		2632	url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
		2633	sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
		2634	};
		2635	};
		2636	"through-2.3.8" = {
		2637	name = "through";
		2638	packageName = "through";
		2639	version = "2.3.8";
		2640	src = fetchurl {
		2641	url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
		2642	sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
		2643	};
		2644	};
	2600	2645	"tiny-emitter-2.0.2" = {
	2601	2646	name = "tiny-emitter";
	2602	2647	packageName = "tiny-emitter";
	2603	2648	version = "2.0.2";
	2604	2649	src = fetchurl {
	2605	2650	url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz";
	2606		sha1 = "82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c";
	2607		};
	2608		};
	2609		"delegate-3.1.3" = {
	2610		name = "del~~egate~~";
	2611		packageName = "del~~egate~~";
	2612		version = "3.1.3";
	2613		src = fetchurl {
	2614		url = "https://registry.npmjs.org/del~~egate~~/-/del~~egate~~-3.1.3.tgz";
	2615		sha1 = "9a8251a777d7025faa55737bc3b071742127a9fd";
		2651	sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==";
		2652	};
		2653	};
		2654	"tiny-lr-fork-0.0.5" = {
		2655	name = "tiny-lr-fork";
		2656	packageName = "tiny-lr-fork";
		2657	version = "0.0.5";
		2658	src = fetchurl {
		2659	url = "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz";
		2660	sha1 = "1e99e1e2a8469b736ab97d97eefa98c71f76ed0a";
		2661	};
		2662	};
		2663	"tough-cookie-2.3.4" = {
		2664	name = "tough-cookie";
		2665	packageName = "tough-cookie";
		2666	version = "2.3.4";
		2667	src = fetchurl {
		2668	url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
		2669	sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
		2670	};
		2671	};
		2672	"tunnel-agent-0.6.0" = {
		2673	name = "tunnel-agent";
		2674	packageName = "tunnel-agent";
		2675	version = "0.6.0";
		2676	src = fetchurl {
		2677	url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
		2678	sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
		2679	};
		2680	};
		2681	"tweetnacl-0.14.5" = {
		2682	name = "tweetnacl";
		2683	packageName = "tweetnacl";
		2684	version = "0.14.5";
		2685	src = fetchurl {
		2686	url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
		2687	sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
		2688	};
		2689	};
		2690	"type-check-0.3.2" = {
		2691	name = "type-check";
		2692	packageName = "type-check";
		2693	version = "0.3.2";
		2694	src = fetchurl {
		2695	url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
		2696	sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
		2697	};
		2698	};
		2699	"typedarray-0.0.6" = {
		2700	name = "typedarray";
		2701	packageName = "typedarray";
		2702	version = "0.0.6";
		2703	src = fetchurl {
		2704	url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
		2705	sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
		2706	};
		2707	};
		2708	"typical-2.6.1" = {
		2709	name = "typical";
		2710	packageName = "typical";
		2711	version = "2.6.1";
		2712	src = fetchurl {
		2713	url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz";
		2714	sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
		2715	};
		2716	};
		2717	"uid-number-0.0.5" = {
		2718	name = "uid-number";
		2719	packageName = "uid-number";
		2720	version = "0.0.5";
		2721	src = fetchurl {
		2722	url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
		2723	sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
		2724	};
		2725	};
		2726	"underscore-1.7.0" = {
		2727	name = "underscore";
		2728	packageName = "underscore";
		2729	version = "1.7.0";
		2730	src = fetchurl {
		2731	url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
		2732	sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
		2733	};
		2734	};
		2735	"underscore.string-2.2.1" = {
		2736	name = "underscore.string";
		2737	packageName = "underscore.string";
		2738	version = "2.2.1";
		2739	src = fetchurl {
		2740	url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
		2741	sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
		2742	};
		2743	};
		2744	"underscore.string-2.3.3" = {
		2745	name = "underscore.string";
		2746	packageName = "underscore.string";
		2747	version = "2.3.3";
		2748	src = fetchurl {
		2749	url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
		2750	sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
		2751	};
		2752	};
		2753	"underscore.string-2.4.0" = {
		2754	name = "underscore.string";
		2755	packageName = "underscore.string";
		2756	version = "2.4.0";
		2757	src = fetchurl {
		2758	url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
		2759	sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
		2760	};
		2761	};
		2762	"unicode-5.2.0-0.7.5" = {
		2763	name = "unicode-5.2.0";
		2764	packageName = "unicode-5.2.0";
		2765	version = "0.7.5";
		2766	src = fetchurl {
		2767	url = "https://registry.npmjs.org/unicode-5.2.0/-/unicode-5.2.0-0.7.5.tgz";
		2768	sha512 = "KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA==";
		2769	};
		2770	};
		2771	"util-deprecate-1.0.2" = {
		2772	name = "util-deprecate";
		2773	packageName = "util-deprecate";
		2774	version = "1.0.2";
		2775	src = fetchurl {
		2776	url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
		2777	sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
		2778	};
		2779	};
		2780	"uuid-3.3.2" = {
		2781	name = "uuid";
		2782	packageName = "uuid";
		2783	version = "3.3.2";
		2784	src = fetchurl {
		2785	url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
		2786	sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
		2787	};
		2788	};
		2789	"validate-npm-package-license-3.0.3" = {
		2790	name = "validate-npm-package-license";
		2791	packageName = "validate-npm-package-license";
		2792	version = "3.0.3";
		2793	src = fetchurl {
		2794	url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz";
		2795	sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==";
		2796	};
		2797	};
		2798	"validate-npm-package-name-3.0.0" = {
		2799	name = "validate-npm-package-name";
		2800	packageName = "validate-npm-package-name";
		2801	version = "3.0.0";
		2802	src = fetchurl {
		2803	url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz";
		2804	sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
		2805	};
		2806	};
		2807	"verror-1.10.0" = {
		2808	name = "verror";
		2809	packageName = "verror";
		2810	version = "1.10.0";
		2811	src = fetchurl {
		2812	url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
		2813	sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
		2814	};
		2815	};
		2816	"vulcanize-1.16.0" = {
		2817	name = "vulcanize";
		2818	packageName = "vulcanize";
		2819	version = "1.16.0";
		2820	src = fetchurl {
		2821	url = "https://registry.npmjs.org/vulcanize/-/vulcanize-1.16.0.tgz";
		2822	sha512 = "TYlFljSc896b5+0FmMiw0JAMrHNBiHx0IAFC/dQR3Dxdb9Nx43ohm6wMWTlPXQn4sk/0WkqfgoAA6SLxyvPCLQ==";
		2823	};
		2824	};
		2825	"walk-2.3.14" = {
		2826	name = "walk";
		2827	packageName = "walk";
		2828	version = "2.3.14";
		2829	src = fetchurl {
		2830	url = "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz";
		2831	sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==";
		2832	};
		2833	};
		2834	"which-1.0.9" = {
		2835	name = "which";
		2836	packageName = "which";
		2837	version = "1.0.9";
		2838	src = fetchurl {
		2839	url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
		2840	sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
		2841	};
		2842	};
		2843	"which-1.3.1" = {
		2844	name = "which";
		2845	packageName = "which";
		2846	version = "1.3.1";
		2847	src = fetchurl {
		2848	url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
		2849	sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
		2850	};
		2851	};
		2852	"wide-align-1.1.3" = {
		2853	name = "wide-align";
		2854	packageName = "wide-align";
		2855	version = "1.1.3";
		2856	src = fetchurl {
		2857	url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
		2858	sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
		2859	};
		2860	};
		2861	"winston-2.4.3" = {
		2862	name = "winston";
		2863	packageName = "winston";
		2864	version = "2.4.3";
		2865	src = fetchurl {
		2866	url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz";
		2867	sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==";
		2868	};
		2869	};
		2870	"wordwrap-1.0.0" = {
		2871	name = "wordwrap";
		2872	packageName = "wordwrap";
		2873	version = "1.0.0";
		2874	src = fetchurl {
		2875	url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
		2876	sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
		2877	};
		2878	};
		2879	"wordwrapjs-2.0.0" = {
		2880	name = "wordwrapjs";
		2881	packageName = "wordwrapjs";
		2882	version = "2.0.0";
		2883	src = fetchurl {
		2884	url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-2.0.0.tgz";
		2885	sha1 = "ab55f695e6118da93858fdd70c053d1c5e01ac20";
		2886	};
		2887	};
		2888	"wrappy-1.0.2" = {
		2889	name = "wrappy";
		2890	packageName = "wrappy";
		2891	version = "1.0.2";
		2892	src = fetchurl {
		2893	url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
		2894	sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
		2895	};
		2896	};
		2897	"yallist-3.0.2" = {
		2898	name = "yallist";
		2899	packageName = "yallist";
		2900	version = "3.0.2";
		2901	src = fetchurl {
		2902	url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
		2903	sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
		2904	};
		2905	};
		2906	"yauzl-2.4.1" = {
		2907	name = "yauzl";
		2908	packageName = "yauzl";
		2909	version = "2.4.1";
		2910	src = fetchurl {
		2911	url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
		2912	sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
	2616	2913	};
	2617	2914	};
	2618	2915	};
	2619	2916	args = {
	2620	2917	name = "rhodecode-enterprise";
	2621	2918	packageName = "rhodecode-enterprise";
	2622		version = "0.0.1";
	2623		src = ./.;
		2919	version = "1.0.0";
		2920	src = ./..;
	2624	2921	dependencies = [
	2625		sources."~~gru~~nt-0.4.5"
	2626		sources."grunt-contrib-copy-1.0.0"
	2627		(sources."gr~~unt-contrib-concat~~-0.5.1" // {
		2922	sources."@types/clone-0.1.30"
		2923	sources."@types/node-4.2.23"
		2924	(sources."@types/parse5-0.0.31" // {
	2628	2925	dependencies = [
	2629		sources."~~chalk~~-0.5.1"
	2630		sources."ansi-styles-1.1.0"
	2631		sources."has-ansi-0.1.0"
	2632		sources."strip-~~ansi-0~~.3.0"
	2633		sources."~~supp~~orts-~~color-0~~.2.0"
	2634		sources."ans~~i-rege~~x-0.2.1"
		2926	sources."@types/node-6.0.114"
		2927	];
		2928	})
		2929	sources."abbrev-1.1.1"
		2930	sources."acorn-3.3.0"
		2931	sources."acorn-jsx-3.0.1"
		2932	sources."ajv-4.11.8"
		2933	sources."amdefine-1.0.1"
		2934	sources."ansi-escape-sequences-3.0.0"
		2935	sources."ansi-regex-2.1.1"
		2936	sources."ansi-styles-2.2.1"
		2937	sources."appenlight-client-git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1"
		2938	sources."aproba-1.2.0"
		2939	sources."are-we-there-yet-1.1.5"
		2940	(sources."argparse-0.1.16" // {
		2941	dependencies = [
		2942	sources."underscore.string-2.4.0"
	2635	2943	];
	2636	2944	})
	2637		sources."grunt-contrib-jshint-0.12.0"
	2638		(sources."grunt-contrib-less-1.4.1" // {
		2945	sources."array-back-1.0.4"
		2946	sources."asap-2.0.6"
		2947	sources."asn1-0.2.3"
		2948	sources."assert-plus-0.2.0"
		2949	sources."async-0.1.22"
		2950	sources."asynckit-0.4.0"
		2951	sources."aws-sign2-0.6.0"
		2952	sources."aws4-1.7.0"
		2953	sources."babel-polyfill-6.26.0"
		2954	(sources."babel-runtime-6.26.0" // {
	2639	2955	dependencies = [
	2640		sources."async-2.5.0"
	2641		sources."lodash-4.17.4"
		2956	sources."regenerator-runtime-0.11.1"
	2642	2957	];
	2643	2958	})
	2644		(sources."~~gru~~nt-~~contrib-w~~atch-0.~~6.1~~" // {
		2959	sources."balanced-match-1.0.0"
		2960	sources."base64-js-1.2.3"
		2961	sources."bcrypt-pbkdf-1.0.2"
		2962	sources."boom-2.10.1"
		2963	sources."bower-1.8.4"
		2964	sources."brace-expansion-1.1.11"
		2965	sources."buffer-from-1.1.1"
		2966	sources."builtin-modules-1.1.1"
		2967	sources."builtins-1.0.3"
		2968	sources."caseless-0.12.0"
		2969	sources."chalk-1.1.3"
		2970	(sources."cli-1.0.1" // {
	2645	2971	dependencies = [
	2646		sources."lo~~dash~~-2.4.2"
	2647		sources."a~~syn~~c-0.~~2.10~~"
		2972	sources."glob-7.1.2"
		2973	sources."minimatch-3.0.4"
	2648	2974	];
	2649	2975	})
		2976	sources."clipboard-2.0.1"
		2977	sources."clone-1.0.4"
		2978	sources."co-4.6.0"
		2979	sources."code-point-at-1.1.0"
		2980	sources."coffee-script-1.3.3"
		2981	sources."colors-0.6.2"
		2982	sources."combined-stream-1.0.6"
		2983	sources."command-line-args-3.0.5"
		2984	sources."command-line-usage-3.0.8"
		2985	sources."concat-map-0.0.1"
		2986	sources."concat-stream-1.6.2"
		2987	sources."config-chain-1.1.11"
		2988	sources."console-browserify-1.1.0"
		2989	sources."console-control-strings-1.1.0"
		2990	sources."core-js-2.5.7"
		2991	sources."core-util-is-1.0.2"
	2650	2992	sources."crisper-2.1.1"
	2651		(sources."vul~~caniz~~e-~~1.16~~.0" // {
		2993	sources."cryptiles-2.0.5"
		2994	sources."cycle-1.0.3"
		2995	(sources."dashdash-1.14.1" // {
	2652	2996	dependencies = [
	2653		sources."~~nop~~t-3.0.6"
		2997	sources."assert-plus-1.0.0"
	2654	2998	];
	2655	2999	})
	2656		sources."~~gru~~nt-~~crisper-1.~~0.1"
	2657		(sources."grunt-vulcanize-1.0.0" // {
		3000	sources."date-now-0.1.4"
		3001	sources."dateformat-1.0.2-1.2.3"
		3002	sources."debug-0.7.4"
		3003	sources."deep-extend-0.4.2"
		3004	sources."deep-is-0.1.3"
		3005	sources."delayed-stream-1.0.0"
		3006	sources."delegate-3.2.0"
		3007	sources."delegates-1.0.0"
		3008	sources."doctrine-0.7.2"
		3009	(sources."dom-serializer-0.1.0" // {
	2658	3010	dependencies = [
	2659		sources."~~cris~~per-1.2.0"
	2660		sources."nopt-3.0.6"
		3011	sources."domelementtype-1.1.3"
		3012	sources."entities-1.1.1"
	2661	3013	];
	2662	3014	})
	2663		sources."no~~de2nix~~-1.3.0"
	2664		(sources."~~jshi~~nt-2.9.5" // {
		3015	sources."dom5-1.3.6"
		3016	sources."domelementtype-1.3.0"
		3017	sources."domhandler-2.3.0"
		3018	sources."domutils-1.5.1"
		3019	sources."ecc-jsbn-0.1.2"
		3020	sources."entities-1.0.0"
		3021	sources."errno-0.1.7"
		3022	sources."es6-promise-2.3.0"
		3023	sources."escape-string-regexp-1.0.5"
		3024	(sources."escodegen-1.11.0" // {
	2665	3025	dependencies = [
	2666		sources."~~min~~ima~~tch~~-3.0.4"
	2667		sources."~~lod~~ash-3.7.0"
		3026	sources."esprima-3.1.3"
		3027	sources."estraverse-4.2.0"
		3028	sources."esutils-2.0.2"
		3029	sources."source-map-0.6.1"
		3030	];
		3031	})
		3032	(sources."espree-3.5.4" // {
		3033	dependencies = [
		3034	sources."acorn-5.7.1"
	2668	3035	];
	2669	3036	})
	2670		sources."~~bow~~er-1.8.2"
	2671		sources."~~jqu~~ery-1.~~11.3~~"
		3037	sources."esprima-1.0.4"
		3038	sources."estraverse-3.1.0"
		3039	sources."esutils-1.1.6"
		3040	sources."eventemitter2-0.4.14"
		3041	sources."exit-0.1.2"
		3042	sources."extend-3.0.2"
		3043	(sources."extract-zip-1.6.7" // {
		3044	dependencies = [
		3045	sources."debug-2.6.9"
		3046	];
		3047	})
		3048	sources."extsprintf-1.3.0"
		3049	sources."eyes-0.1.8"
		3050	sources."fast-levenshtein-2.0.6"
	2672	3051	sources."favico.js-0.3.10"
	2673		sources."clipboard-1.7.1"
	2674		sources."~~mom~~ent-2.18.1"
	2675		sources."mouset~~rap~~-1.6.1"
	2676		sources."appenlight-client-git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1"
	2677		sources."a~~syn~~c-0.~~1.22~~"
	2678		sources."cof~~fee-scr~~ipt-1.3.3"
	2679		sources."colors-0.6.2"
	2680		sources."dateformat-1.0.2-1.2.3"
	2681		sources."eventemitter2-0.4.14"
		3052	sources."faye-websocket-0.4.4"
		3053	sources."fd-slicer-1.0.1"
		3054	sources."feature-detect-es6-1.5.0"
		3055	sources."file-sync-cmp-0.1.1"
		3056	sources."find-replace-1.0.3"
		3057	sources."findit-2.0.0"
	2682	3058	(sources."findup-sync-0.1.3" // {
	2683	3059	dependencies = [
	2684	3060	sources."glob-3.2.11"
			@@ -2686,333 +3062,321 b' let'
	2686	3062	sources."minimatch-0.3.0"
	2687	3063	];
	2688	3064	})
		3065	sources."foreachasync-3.0.0"
		3066	sources."forever-agent-0.6.1"
		3067	sources."form-data-2.1.4"
		3068	(sources."fs-extra-0.6.4" // {
		3069	dependencies = [
		3070	sources."mkdirp-0.3.5"
		3071	];
		3072	})
		3073	(sources."fs.extra-1.3.2" // {
		3074	dependencies = [
		3075	sources."mkdirp-0.3.5"
		3076	];
		3077	})
		3078	sources."fs.realpath-1.0.0"
		3079	sources."gauge-2.7.4"
		3080	sources."gaze-0.5.2"
		3081	sources."getobject-0.1.0"
		3082	(sources."getpass-0.1.7" // {
		3083	dependencies = [
		3084	sources."assert-plus-1.0.0"
		3085	];
		3086	})
	2689	3087	(sources."glob-3.1.21" // {
	2690	3088	dependencies = [
	2691	3089	sources."inherits-1.0.2"
	2692	3090	];
	2693	3091	})
	2694		sources."hooker-0.2.3"
	2695		sources."iconv-lite-0.2.11"
	2696		sources."~~minim~~atch-0.2~~.14~~"
	2697		sources."nopt-1.0.10"
	2698		sources."rimraf-2.2.8"
	2699		sources."lodash-0.9.2"
	2700		sources."u~~nder~~s~~core.string~~-2.2.1"
	2701		sources."~~which~~-1.0.9"
	2702		sources."js-yaml-2.0.5"
	2703		sources."exit-0.1.2"
	2704		sources."ge~~tobject~~-0.1.0"
	2705		sources."~~gru~~nt-le~~gacy~~-~~util-0~~.2.0"
		3092	(sources."globule-0.1.0" // {
		3093	dependencies = [
		3094	sources."lodash-1.0.2"
		3095	];
		3096	})
		3097	sources."good-listener-1.2.2"
		3098	sources."graceful-fs-1.2.3"
		3099	sources."grunt-0.4.5"
		3100	(sources."grunt-contrib-concat-0.5.1" // {
		3101	dependencies = [
		3102	sources."ansi-regex-0.2.1"
		3103	sources."ansi-styles-1.1.0"
		3104	sources."chalk-0.5.1"
		3105	sources."has-ansi-0.1.0"
		3106	sources."strip-ansi-0.3.0"
		3107	sources."supports-color-0.2.0"
		3108	];
		3109	})
		3110	sources."grunt-contrib-copy-1.0.0"
		3111	sources."grunt-contrib-jshint-0.12.0"
		3112	(sources."grunt-contrib-less-1.4.1" // {
		3113	dependencies = [
		3114	sources."async-2.6.1"
		3115	sources."lodash-4.17.10"
		3116	];
		3117	})
		3118	(sources."grunt-contrib-watch-0.6.1" // {
		3119	dependencies = [
		3120	sources."async-0.2.10"
		3121	sources."lodash-2.4.2"
		3122	];
		3123	})
		3124	sources."grunt-crisper-1.0.1"
	2706	3125	(sources."grunt-legacy-log-0.1.3" // {
	2707	3126	dependencies = [
	2708	3127	sources."lodash-2.4.2"
	2709	3128	sources."underscore.string-2.3.3"
	2710	3129	];
	2711	3130	})
	2712		sources."inherits-2.0.3"
	2713		sources."lru-cache-2.7.3"
	2714		sources."sigmund-1.0.1"
	2715		sources."graceful-fs-1.2.3"
	2716		sources."abbrev-1.1.0"
	2717		(sources."argparse-0.1.16" // {
	2718		dependencies = [
	2719		sources."underscore.string-2.4.0"
	2720		];
	2721		})
	2722		sources."esprima-1.0.4"
	2723		sources."underscore-1.7.0"
	2724	3131	(sources."grunt-legacy-log-utils-0.1.1" // {
	2725	3132	dependencies = [
	2726	3133	sources."lodash-2.4.2"
	2727	3134	sources."underscore.string-2.3.3"
	2728	3135	];
	2729	3136	})
	2730		sources."chalk-1.1.3"
	2731		sources."file-sync-cmp-0.1.1"
	2732		sources."ansi-styles-2.2.1"
	2733		sources."escape~~-st~~r~~ing-regexp~~-1.0.5"
		3137	sources."grunt-legacy-util-0.2.0"
		3138	(sources."grunt-vulcanize-1.0.0" // {
		3139	dependencies = [
		3140	sources."crisper-1.2.0"
		3141	sources."nopt-3.0.6"
		3142	];
		3143	})
		3144	sources."har-schema-1.0.5"
		3145	sources."har-validator-4.2.1"
	2734	3146	sources."has-ansi-2.0.0"
	2735		sources."strip-~~ansi-3~~.0.1"
	2736		sources."s~~upports-color~~-2.0.0"
	2737		sources."a~~nsi~~-~~regex-2~~.1.1"
	2738		sources."so~~urc~~e-~~map-0~~.3.0"
	2739		sources."~~amd~~e~~fine~~-1.0.1"
	2740		(sources."less-2.7.2" // {
		3147	sources."has-unicode-2.0.1"
		3148	sources."hasha-2.2.0"
		3149	sources."hawk-3.1.3"
		3150	sources."hoek-2.16.3"
		3151	sources."hooker-0.2.3"
		3152	sources."hosted-git-info-2.7.1"
		3153	(sources."htmlparser2-3.8.3" // {
		3154	dependencies = [
		3155	sources."readable-stream-1.1.14"
		3156	sources."string_decoder-0.10.31"
		3157	];
		3158	})
		3159	sources."http-signature-1.1.1"
		3160	(sources."hydrolysis-1.25.0" // {
		3161	dependencies = [
		3162	sources."dom5-1.1.0"
		3163	];
		3164	})
		3165	sources."iconv-lite-0.2.11"
		3166	sources."image-size-0.5.5"
		3167	sources."inflight-1.0.6"
		3168	sources."inherits-2.0.3"
		3169	sources."ini-1.3.5"
		3170	sources."is-builtin-module-1.0.0"
		3171	sources."is-fullwidth-code-point-1.0.0"
		3172	sources."is-stream-1.1.0"
		3173	sources."is-typedarray-1.0.0"
		3174	sources."isarray-0.0.1"
		3175	sources."isexe-2.0.0"
		3176	sources."isstream-0.1.2"
		3177	sources."jquery-1.11.3"
		3178	sources."js-yaml-2.0.5"
		3179	sources."jsbn-0.1.1"
		3180	(sources."jshint-2.9.6" // {
		3181	dependencies = [
		3182	sources."lodash-4.17.10"
		3183	sources."minimatch-3.0.4"
		3184	];
		3185	})
		3186	sources."json-schema-0.2.3"
		3187	sources."json-stable-stringify-1.0.1"
		3188	sources."json-stringify-safe-5.0.1"
		3189	sources."jsonfile-1.0.1"
		3190	sources."jsonify-0.0.0"
		3191	(sources."jsprim-1.4.1" // {
		3192	dependencies = [
		3193	sources."assert-plus-1.0.0"
		3194	];
		3195	})
		3196	sources."kew-0.7.0"
		3197	(sources."klaw-1.3.1" // {
		3198	dependencies = [
		3199	sources."graceful-fs-4.1.11"
		3200	];
		3201	})
		3202	(sources."less-2.7.3" // {
	2741	3203	dependencies = [
	2742	3204	sources."graceful-fs-4.1.11"
	2743	3205	sources."source-map-0.5.7"
	2744	3206	];
	2745	3207	})
	2746		sources."errno-0.1.4"
	2747		sources."ima~~ge-~~s~~ize~~-0.5.5"
	2748		sources."~~mim~~e-1.4.0"
	2749		sources."mkdirp-0~~.5.1~~"
	2750		sources."~~pro~~mise-7.3.1"
	2751		sources."request-2.82.0"
	2752		sources."~~prr~~-0.0.0"
		3208	sources."levn-0.3.0"
		3209	sources."lodash-0.9.2"
		3210	sources."lru-cache-2.7.3"
		3211	sources."mime-1.6.0"
		3212	sources."mime-db-1.35.0"
		3213	sources."mime-types-2.1.19"
		3214	sources."minimatch-0.2.14"
	2753	3215	sources."minimist-0.0.8"
	2754		sources."asap-2.0.6"
	2755		sources."~~aws~~-~~sign2-0~~.7.0"
	2756		sources."~~aws4~~-1~~.6.0~~"
	2757		sources."~~cas~~e~~less~~-~~0.1~~2.0"
	2758		sources."co~~mbin~~e~~d-s~~tream-1.0.5"
	2759		sources."~~extend~~-3.0.1"
	2760		sources."~~forever-age~~nt-0.6.1"
	2761		sources."~~form~~-~~data-~~2~~.3.1~~"
	2762		sources."har-validator-5.0.3"
	2763		sources."~~hawk~~-6.0.2"
	2764		sources."http-signature-1.2.0"
	2765		sources."is-typedarray-1.0.0"
	2766		sources."isstream-0.1.2"
	2767		sources."json-stringify-safe-5.0.1"
	2768		sources."mime-types-2.1.17"
	2769		sources."oauth-sign-0.8.2"
	2770		sources."performance-now-2.1.0"
	2771		sources."qs-6.5.1"
	2772		sources."safe-buffer-5.1.1"
	2773		sources."stringstream-0.0.5"
	2774		sources."tough-cookie-2.3.3"
	2775		sources."tunnel-agent-0.6.0"
	2776		sources."uuid-3.1.0"
	2777		sources."delayed-stream-1.0.0"
	2778		sources."asynckit-0.4.0"
	2779		sources."ajv-5.2.2"
	2780		sources."har-schema-2.0.0"
	2781		sources."co-4.6.0"
	2782		sources."fast-deep-equal-1.0.0"
	2783		sources."json-schema-traverse-0.3.1"
	2784		sources."json-stable-stringify-1.0.1"
	2785		sources."jsonify-0.0.0"
	2786		sources."hoek-4.2.0"
	2787		sources."boom-4.3.1"
	2788		(sources."cryptiles-3.1.2" // {
	2789		dependencies = [
	2790		sources."boom-5.2.0"
	2791		];
	2792		})
	2793		sources."sntp-2.0.2"
	2794		sources."assert-plus-1.0.0"
	2795		sources."jsprim-1.4.1"
	2796		sources."sshpk-1.13.1"
	2797		sources."extsprintf-1.3.0"
	2798		sources."json-schema-0.2.3"
	2799		sources."verror-1.10.0"
	2800		sources."core-util-is-1.0.2"
	2801		sources."asn1-0.2.3"
	2802		sources."dashdash-1.14.1"
	2803		sources."getpass-0.1.7"
	2804		sources."jsbn-0.1.1"
	2805		sources."tweetnacl-0.14.5"
	2806		sources."ecc-jsbn-0.1.1"
	2807		sources."bcrypt-pbkdf-1.0.1"
	2808		sources."mime-db-1.30.0"
	2809		sources."punycode-1.4.1"
	2810		sources."gaze-0.5.2"
	2811		(sources."tiny-lr-fork-0.0.5" // {
	2812		dependencies = [
	2813		sources."qs-0.5.6"
	2814		];
	2815		})
	2816		(sources."globule-0.1.0" // {
	2817		dependencies = [
	2818		sources."lodash-1.0.2"
	2819		];
	2820		})
	2821		sources."faye-websocket-0.4.4"
		3216	sources."minipass-2.3.3"
		3217	sources."minizlib-1.1.0"
		3218	sources."mkdirp-0.5.1"
		3219	sources."moment-2.22.2"
		3220	sources."mousetrap-1.6.2"
		3221	sources."ms-2.0.0"
		3222	sources."ncp-0.4.2"
		3223	sources."nijs-0.0.25"
		3224	sources."node2nix-1.6.0"
		3225	sources."nopt-1.0.10"
	2822	3226	(sources."noptify-0.0.3" // {
	2823	3227	dependencies = [
	2824	3228	sources."nopt-2.0.0"
	2825	3229	];
	2826	3230	})
	2827		sources."debug-0.7.4"
	2828		sources."c~~omm~~a~~nd-lin~~e-args-3.0.5"
	2829		sources."command-line-usage-3.0.8"
	2830		sources."dom5-1.3.6"
	2831		sources."array-back-1.0.4"
	2832		sources."feature-detect-es6-1.3.1"
	2833		sources."find-replace-1.0.3"
	2834		sources."typical-2.6.1"
	2835		sources."test-value-2.1.0"
	2836		sources."ansi-escape-sequences-3.0.0"
	2837		sources."table-layout-0.3.0"
	2838		sources."core-js-2.5.1"
	2839		sources."deep-extend-0.4.2"
	2840		sources."wordwrapjs-2.0.0"
	2841		sources."reduce-flatten-1.0.1"
	2842		sources."@types/clone-0.1.30"
	2843		sources."@types/node-4.2.20"
	2844		(sources."@types/parse5-0.0.31" // {
	2845		dependencies = [
	2846		sources."@types/node-6.0.88"
	2847		];
	2848		})
	2849		sources."clone-1.0.2"
	2850		sources."parse5-1.5.1"
	2851		sources."es6-promise-2.3.0"
	2852		(sources."hydrolysis-1.25.0" // {
	2853		dependencies = [
	2854		sources."dom5-1.1.0"
	2855		];
	2856		})
	2857		sources."path-posix-1.0.0"
	2858		sources."acorn-3.3.0"
	2859		sources."babel-polyfill-6.26.0"
	2860		sources."doctrine-0.7.2"
	2861		(sources."escodegen-1.9.0" // {
	2862		dependencies = [
	2863		sources."estraverse-4.2.0"
	2864		sources."esutils-2.0.2"
	2865		sources."esprima-3.1.3"
	2866		sources."source-map-0.5.7"
	2867		];
	2868		})
	2869		(sources."espree-3.5.1" // {
	2870		dependencies = [
	2871		sources."acorn-5.1.2"
	2872		];
	2873		})
	2874		sources."estraverse-3.1.0"
	2875		sources."path-is-absolute-1.0.1"
	2876		(sources."babel-runtime-6.26.0" // {
	2877		dependencies = [
	2878		sources."regenerator-runtime-0.11.0"
	2879		];
	2880		})
	2881		sources."regenerator-runtime-0.10.5"
	2882		sources."esutils-1.1.6"
	2883		sources."isarray-0.0.1"
	2884		sources."optionator-0.8.2"
	2885		sources."prelude-ls-1.1.2"
	2886		sources."deep-is-0.1.3"
	2887		sources."wordwrap-1.0.0"
	2888		sources."type-check-0.3.2"
	2889		sources."levn-0.3.0"
	2890		sources."fast-levenshtein-2.0.6"
	2891		sources."acorn-jsx-3.0.1"
	2892		sources."object-assign-4.1.1"
	2893		sources."optparse-1.0.5"
	2894		sources."semver-5.4.1"
	2895		(sources."npm-registry-client-8.4.0" // {
		3231	sources."normalize-package-data-2.4.0"
		3232	sources."npm-package-arg-6.1.0"
		3233	(sources."npm-registry-client-8.5.1" // {
	2896	3234	dependencies = [
	2897	3235	sources."graceful-fs-4.1.11"
	2898	3236	];
	2899	3237	})
	2900		(sources."npmconf-2.1.2" // {
		3238	(sources."npmconf-2.1.3" // {
	2901	3239	dependencies = [
	2902	3240	sources."nopt-3.0.6"
	2903	3241	sources."once-1.3.3"
	2904	3242	sources."semver-4.3.6"
	2905	3243	];
	2906	3244	})
	2907		sources."~~tar~~-3.1.15"
	2908		sources."temp-0.~~8.3~~"
	2909		(sources."fs.extra-1.3.2" // {
		3245	sources."npmlog-4.1.2"
		3246	sources."number-is-nan-1.0.1"
		3247	sources."oauth-sign-0.8.2"
		3248	sources."object-assign-4.1.1"
		3249	sources."once-1.4.0"
		3250	sources."optionator-0.8.2"
		3251	sources."optparse-1.0.5"
		3252	sources."os-homedir-1.0.2"
		3253	sources."os-tmpdir-1.0.2"
		3254	sources."osenv-0.1.5"
		3255	sources."parse5-1.5.1"
		3256	sources."path-is-absolute-1.0.1"
		3257	sources."path-posix-1.0.0"
		3258	sources."pend-1.2.0"
		3259	sources."performance-now-0.2.0"
		3260	sources."phantom-4.0.12"
		3261	(sources."phantomjs-prebuilt-2.1.16" // {
	2910	3262	dependencies = [
	2911		sources."mkdirp-0.3.5"
		3263	sources."es6-promise-4.2.4"
		3264	sources."fs-extra-1.0.0"
		3265	sources."graceful-fs-4.1.11"
		3266	sources."jsonfile-2.4.0"
		3267	sources."which-1.3.1"
	2912	3268	];
	2913	3269	})
	2914		sources."findit-2.0.0"
	2915		sources."base64-~~js-1~~.2.1"
	2916		sources."s~~lasp~~-0.0.4"
	2917		sources."~~nij~~s-0.0~~.23~~"
	2918		sources."co~~ncat-st~~ream-1.6.0"
	2919		sources."normalize-~~package-data-2~~.4.0"
	2920		sources."npm-~~package~~-~~arg-5.~~1.2"
	2921		sources."~~once~~-1.4.0"
	2922		sources."re~~try~~-0.10.1"
	2923		sources."s~~lide~~-1.1.6"
	2924		sources."s~~sri~~-4.~~1.6~~"
	2925		sources."npmlog-4.1.2"
	2926		sources."typedarray-0.0.6"
	2927		(sources."readable-stream-2.3.3" // {
		3270	sources."pinkie-2.0.4"
		3271	sources."pinkie-promise-2.0.1"
		3272	sources."prelude-ls-1.1.2"
		3273	sources."process-nextick-args-2.0.0"
		3274	sources."progress-1.1.8"
		3275	sources."promise-7.3.1"
		3276	sources."proto-list-1.2.4"
		3277	sources."prr-1.0.1"
		3278	sources."punycode-1.4.1"
		3279	sources."qrious-4.0.2"
		3280	sources."qs-6.4.0"
		3281	(sources."readable-stream-2.3.6" // {
	2928	3282	dependencies = [
	2929	3283	sources."isarray-1.0.0"
	2930	3284	];
	2931	3285	})
	2932		sources."process-n~~extick-args~~-1.0.7"
	2933		sources."string_decoder-1.0.3"
	2934		sources."~~util-dep~~recate-1.0.2"
	2935		sources."hoste~~d-git-info~~-2.5.0"
	2936		sources."is-builtin-module-1.0.0"
	2937		sources."validate-npm-package-license-3.0.1"
	2938		sources."bu~~iltin~~-~~modules-1~~.1.1"
	2939		sources."s~~pdx~~-cor~~rect~~-1.0.2"
	2940		sources."s~~pdx-~~e~~xpr~~e~~ssion-parse~~-1.0.4"
	2941		sources."s~~pdx~~-~~license-ids-1~~.2.2"
	2942		sources."osenv-0.1.4"
	2943		sources."validate-npm-package-name-3.0.0"
	2944		sources."os-homedir-1.0.2"
	2945		sources."os-tmpdir-1.0.2"
	2946		sources."builtins-1.0.3"
	2947		sources."wrappy-1.0.2"
	2948		sources."are-we-there-yet-1.1.4"
	2949		sources."console-control-strings-1.1.0"
	2950		sources."gauge-2.7.4"
		3286	sources."reduce-flatten-1.0.1"
		3287	sources."regenerator-runtime-0.10.5"
		3288	sources."request-2.81.0"
		3289	sources."request-progress-2.0.1"
		3290	sources."retry-0.10.1"
		3291	sources."rimraf-2.2.8"
		3292	sources."safe-buffer-5.1.2"
		3293	sources."safer-buffer-2.1.2"
		3294	sources."select-1.1.2"
		3295	sources."semver-5.5.0"
	2951	3296	sources."set-blocking-2.0.0"
	2952		sources."del~~egate~~s-1.0.0"
	2953		sources."~~aproba~~-1.2.0"
	2954		sources."has-unicode-2.0.1"
		3297	sources."shelljs-0.3.0"
		3298	sources."sigmund-1.0.1"
	2955	3299	sources."signal-exit-3.0.2"
	2956		sources."s~~tring~~-~~width-1~~.0.2"
	2957		sources."wide~~-align~~-1.1.2"
	2958		sources."~~code-poi~~nt~~-at~~-1.1.0"
	2959		sources."is-fu~~llwidth-~~code-p~~oint~~-1.0.0"
	2960		sources."~~numb~~er-~~is-nan-1~~.0.1"
	2961		sources."con~~fig~~-~~chain-1~~.1.11"
	2962		sources."ini-1.3.4"
	2963		sources."uid-~~number-~~0.0.5"
	2964		sources."p~~roto-~~list-1.2.4"
	2965		sources."~~minipa~~ss-2.2.1"
	2966		sources."minizlib-1.0.3"
	2967		sources."yallist-3.0.2"
	2968		(sources."fs-extra-0.6.4" // {
		3300	sources."slasp-0.0.4"
		3301	sources."slide-1.1.6"
		3302	sources."sntp-1.0.9"
		3303	sources."source-map-0.3.0"
		3304	sources."spdx-correct-3.0.0"
		3305	sources."spdx-exceptions-2.1.0"
		3306	sources."spdx-expression-parse-3.0.0"
		3307	sources."spdx-license-ids-3.0.0"
		3308	sources."split-1.0.1"
		3309	(sources."sshpk-1.14.2" // {
	2969	3310	dependencies = [
	2970		sources."~~mkdi~~rp-0.~~3.5~~"
		3311	sources."assert-plus-1.0.0"
	2971	3312	];
	2972	3313	})
	2973		sources."~~walk~~-2.3.9"
	2974		sources."ncp-0.4.2"
	2975		sources."jsonfile-1.0.1"
	2976		sources."for~~eachasync~~-3.0.0"
	2977		(sources."cli-1.0.1" // {
		3314	sources."ssri-5.3.0"
		3315	sources."stack-trace-0.0.10"
		3316	sources."string-width-1.0.2"
		3317	sources."string_decoder-1.1.1"
		3318	sources."stringstream-0.0.6"
		3319	sources."strip-ansi-3.0.1"
		3320	sources."strip-json-comments-1.0.4"
		3321	sources."supports-color-2.0.0"
		3322	sources."table-layout-0.3.0"
		3323	sources."tar-3.1.15"
		3324	sources."temp-0.8.3"
		3325	sources."test-value-2.1.0"
		3326	sources."throttleit-1.0.0"
		3327	sources."through-2.3.8"
		3328	sources."tiny-emitter-2.0.2"
		3329	(sources."tiny-lr-fork-0.0.5" // {
	2978	3330	dependencies = [
	2979		sources."~~glob~~-7.1.2"
	2980		sources."minimatch-3.0.4"
	2981		];
	2982		})
	2983		sources."console-browserify-1.1.0"
	2984		(sources."htmlparser2-3.8.3" // {
	2985		dependencies = [
	2986		sources."readable-stream-1.1.14"
	2987		sources."string_decoder-0.10.31"
		3331	sources."qs-0.5.6"
	2988	3332	];
	2989	3333	})
	2990		sources."she~~lljs~~-0.3.0"
	2991		sources."st~~rip~~-~~json-comm~~ents-1.0.4"
	2992		sources."~~fs.r~~eal~~path~~-1.0.0"
	2993		sources."~~inflig~~ht-1.0.6"
	2994		sources."brace-~~expansion-1~~.1.8"
	2995		sources."bal~~anced~~-~~match-~~1~~.0.0~~"
	2996		sources."con~~cat-~~map-0.0.1"
	2997		sources."date-~~now-0.~~1.4"
	2998		sources."~~domha~~ndler-2.3.0"
	2999		sources."d~~omutils~~-1.5.1"
	3000		sources."domele~~men~~t~~typ~~e-1.3.0"
	3001		sources."~~ent~~i~~ties~~-1.0.0"
	3002		(sources."dom-serializer-0.1.0" // {
		3334	sources."tough-cookie-2.3.4"
		3335	sources."tunnel-agent-0.6.0"
		3336	sources."tweetnacl-0.14.5"
		3337	sources."type-check-0.3.2"
		3338	sources."typedarray-0.0.6"
		3339	sources."typical-2.6.1"
		3340	sources."uid-number-0.0.5"
		3341	sources."underscore-1.7.0"
		3342	sources."underscore.string-2.2.1"
		3343	sources."unicode-5.2.0-0.7.5"
		3344	sources."util-deprecate-1.0.2"
		3345	sources."uuid-3.3.2"
		3346	sources."validate-npm-package-license-3.0.3"
		3347	sources."validate-npm-package-name-3.0.0"
		3348	(sources."verror-1.10.0" // {
	3003	3349	dependencies = [
	3004		sources."~~dom~~el~~ementtype~~-1.1.3"
	3005		sources."entities-1.1.1"
		3350	sources."assert-plus-1.0.0"
	3006	3351	];
	3007	3352	})
	3008		sources."~~good-~~liste~~ner~~-1.2.2"
	3009		sources."select-1.1.2"
	3010		sources."t~~iny~~-~~emitter-2~~.0.2"
	3011		sources."delegate-3.1.3"
		3353	(sources."vulcanize-1.16.0" // {
		3354	dependencies = [
		3355	sources."nopt-3.0.6"
		3356	];
		3357	})
		3358	sources."walk-2.3.14"
		3359	sources."which-1.0.9"
		3360	sources."wide-align-1.1.3"
		3361	(sources."winston-2.4.3" // {
		3362	dependencies = [
		3363	sources."async-1.0.0"
		3364	sources."colors-1.0.3"
		3365	];
		3366	})
		3367	sources."wordwrap-1.0.0"
		3368	sources."wordwrapjs-2.0.0"
		3369	sources."wrappy-1.0.2"
		3370	sources."yallist-3.0.2"
		3371	sources."yauzl-2.4.1"
	3012	3372	];
		3373	buildInputs = globalBuildInputs;
	3013	3374	meta = {
		3375	description = "RhodeCode JS packaged";
		3376	license = "SEE LICENSE IN LICENSE.txt";
	3014	3377	};
	3015	3378	production = false;
		3379	bypassCache = false;
	3016	3380	};
	3017	3381	in
	3018	3382	{

pkgs/patch_beaker/patch-beaker-lock-func-debug.diff ~~pkgs/patch-beaker-lock-func-debug.diff~~

0 renamed 0 0

NO CONTENT: file renamed from pkgs/patch-beaker-lock-func-debug.diff to pkgs/patch_beaker/patch-beaker-lock-func-debug.diff

pkgs/python-packages-overrides.nix

0 +80 -83

              # python-packages.nix. The main objective is to add needed dependencies of C
              # libraries and tweak the build instructions where needed.
-             { pkgs, basePythonPackages }:
+             { pkgs
+             , basePythonPackages
+             }:
              let
                sed = "sed -i";
                localLicenses = {
                  repoze = {
                    fullName = "Repoze License";
              self: super: {
-               appenlight-client = super.appenlight-client.override (attrs: {
+               "appenlight-client" = super."appenlight-client".override (attrs: {
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                });
-               Beaker = super.Beaker.override (attrs: {
+               "beaker" = super."beaker".override (attrs: {
                  patches = [
-                   ./patch-beaker-lock-func-debug.diff
+                   ./patch_beaker/patch-beaker-lock-func-debug.diff
+                   ./patch_beaker/patch-beaker-metadata-reuse.diff
                  ];
                });
-               future = super.future.override (attrs: {
+               "gevent" = super."gevent".override (attrs: {
+                 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+                   # NOTE: (marcink) odd requirements from gevent aren't set properly,
+                   # thus we need to inject psutil manually
+                   self."psutil"
+                 ];
+               });
+               "future" = super."future".override (attrs: {
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                });
-               testpath = super.testpath.override (attrs: {
+               "testpath" = super."testpath".override (attrs: {
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                });
-               gnureadline = super.gnureadline.override (attrs: {
-                 buildInputs = attrs.buildInputs ++ [
+               "gnureadline" = super."gnureadline".override (attrs: {
+                 buildInputs = [
                    pkgs.ncurses
                  ];
                  patchPhase = ''
                  '';
                });
-               gunicorn = super.gunicorn.override (attrs: {
-                 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+               "gunicorn" = super."gunicorn".override (attrs: {
+                 propagatedBuildInputs = [
                    # johbo: futures is needed as long as we are on Python 2, otherwise
                    # gunicorn explodes if used with multiple threads per worker.
-                   self.futures
+                   self."futures"
                  ];
                });
-               nbconvert = super.nbconvert.override (attrs: {
+              "nbconvert" = super."nbconvert".override (attrs: {
                  propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
                    # marcink: plug in jupyter-client for notebook rendering
-                   self.jupyter-client
+                   self."jupyter-client"
                  ];
                });
-               ipython = super.ipython.override (attrs: {
+               "ipython" = super."ipython".override (attrs: {
                  propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
-                   self.gnureadline
+                   self."gnureadline"
                  ];
                });
-               lxml = super.lxml.override (attrs: {
-                 # johbo: On 16.09 we need this to compile on darwin, otherwise compilation
-                 # fails on Darwin.
-                 hardeningDisable = if pkgs.stdenv.isDarwin then [ "format" ] else null;
-                 buildInputs = with self; [
+               "lxml" = super."lxml".override (attrs: {
+                 buildInputs = [
                    pkgs.libxml2
                    pkgs.libxslt
                  ];
+                 propagatedBuildInputs = [
+                   # Needed, so that "setup.py bdist_wheel" does work
+                   self."wheel"
+                 ];
                });
-               MySQL-python = super.MySQL-python.override (attrs: {
-                 buildInputs = attrs.buildInputs ++ [
+               "mysql-python" = super."mysql-python".override (attrs: {
+                 buildInputs = [
                    pkgs.openssl
                  ];
-                 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+                 propagatedBuildInputs = [
                    pkgs.libmysql
                    pkgs.zlib
                  ];
                });
-               psutil = super.psutil.override (attrs: {
-                 buildInputs = attrs.buildInputs ++
-                   pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.IOKit;
-               });
-               psycopg2 = super.psycopg2.override (attrs: {
-                 buildInputs = attrs.buildInputs ++
-                   pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.openssl;
-                 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+               "psycopg2" = super."psycopg2".override (attrs: {
+                 propagatedBuildInputs = [
                    pkgs.postgresql
                  ];
                  meta = {
                  };
                });
-               pycurl = super.pycurl.override (attrs: {
-                 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+               "pycurl" = super."pycurl".override (attrs: {
+                 propagatedBuildInputs = [
                    pkgs.curl
                    pkgs.openssl
                  ];
                    export PYCURL_SSL_LIBRARY=openssl
                  '';
                  meta = {
-                   # TODO: It is LGPL and MIT
                    license = pkgs.lib.licenses.mit;
                  };
                });
-               pyramid = super.pyramid.override (attrs: {
-                 postFixup = ''
-                   wrapPythonPrograms
-                   # TODO: johbo: "wrapPython" adds this magic line which
-                   # confuses pserve.
-                   ${sed} '/import sys; sys.argv/d' $out/bin/.pserve-wrapped
-                 '';
+               "pyramid" = super."pyramid".override (attrs: {
                  meta = {
                    license = localLicenses.repoze;
                  };
                });
-               pyramid-debugtoolbar = super.pyramid-debugtoolbar.override (attrs: {
+               "pyramid-debugtoolbar" = super."pyramid-debugtoolbar".override (attrs: {
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal localLicenses.repoze ];
                  };
                });
-               pysqlite = super.pysqlite.override (attrs: {
+               "pysqlite" = super."pysqlite".override (attrs: {
                  propagatedBuildInputs = [
                    pkgs.sqlite
                  ];
                  };
                });
-               pytest-runner = super.pytest-runner.override (attrs: {
+               "pytest-runner" = super."pytest-runner".override (attrs: {
                  propagatedBuildInputs = [
-                   self.setuptools-scm
+                   self."setuptools-scm"
+                 ];
+               });
+               "python-ldap" = super."python-ldap".override (attrs: {
+                 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+                   pkgs.openldap
+                   pkgs.cyrus_sasl
+                   pkgs.openssl
                  ];
                });
-               python-ldap = super.python-ldap.override (attrs: {
-                 propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
-                   pkgs.cyrus_sasl
-                   pkgs.openldap
-                   pkgs.openssl
+               "python-pam" = super."python-pam".override (attrs: {
+                 propagatedBuildInputs = [
+                     pkgs.pam
                  ];
-                 # TODO: johbo: Remove the "or" once we drop 16.03 support.
-                 NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev or pkgs.cyrus_sasl}/include/sasl";
+                 # TODO: johbo: Check if this can be avoided, or transform into
+                 # a real patch
+                 patchPhase = ''
+                   substituteInPlace pam.py \
+                     --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
+                 '';
+                 });
+               "pyzmq" = super."pyzmq".override (attrs: {
+                 buildInputs = [
+                   pkgs.czmq
+                 ];
                });
-               python-pam = super.python-pam.override (attrs:
-                 let
-                   includeLibPam = pkgs.stdenv.isLinux;
-                 in {
-                   # TODO: johbo: Move the option up into the default.nix, we should
-                   # include python-pam only on supported platforms.
-                   propagatedBuildInputs = attrs.propagatedBuildInputs ++
-                     pkgs.lib.optional includeLibPam [
-                       pkgs.pam
-                     ];
-                   # TODO: johbo: Check if this can be avoided, or transform into
-                   # a real patch
-                   patchPhase = pkgs.lib.optionals includeLibPam ''
-                     substituteInPlace pam.py \
-                       --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
-                   '';
-                 });
-               URLObject = super.URLObject.override (attrs: {
+               "urlobject" = super."urlobject".override (attrs: {
                  meta = {
                    license = {
                      spdxId = "Unlicense";
                  };
                });
-               docutils = super.docutils.override (attrs: {
+               "docutils" = super."docutils".override (attrs: {
                  meta = {
                    license = pkgs.lib.licenses.bsd2;
                  };
                });
-               colander = super.colander.override (attrs: {
+               "colander" = super."colander".override (attrs: {
                  meta = {
                    license = localLicenses.repoze;
                  };
                });
-               pyramid-beaker  = super.pyramid-beaker.override (attrs: {
+               "pyramid-beaker"  = super."pyramid-beaker".override (attrs: {
                  meta = {
                    license = localLicenses.repoze;
                  };
                });
-               pyramid-mako = super.pyramid-mako.override (attrs: {
+               "pyramid-mako" = super."pyramid-mako".override (attrs: {
                  meta = {
                    license = localLicenses.repoze;
                  };
                });
-               repoze.lru = super.repoze.lru.override (attrs: {
+               "repoze.lru" = super."repoze.lru".override (attrs: {
                  meta = {
                    license = localLicenses.repoze;
                  };
                });
-               python-editor = super.python-editor.override (attrs: {
+               "python-editor" = super."python-editor".override (attrs: {
                  meta = {
                    license = pkgs.lib.licenses.asl20;
                  };
                });
-               translationstring = super.translationstring.override (attrs: {
+               "translationstring" = super."translationstring".override (attrs: {
                  meta = {
                    license = localLicenses.repoze;
                  };
                });
-               venusian = super.venusian.override (attrs: {
+               "venusian" = super."venusian".override (attrs: {
                  meta = {
                    license = localLicenses.repoze;
                  };
                });
-               # Avoid that setuptools is replaced, this leads to trouble
-               # with buildPythonPackage.
-               setuptools = basePythonPackages.setuptools;
+               # Avoid that base packages screw up the build process
+               inherit (basePythonPackages)
+                 setuptools;
              }

pkgs/python-packages.nix

0 +1530 -1336

-             # Generated by pip2nix 0.4.0
+             # Generated by pip2nix 0.8.0.dev1
              # See https://github.com/johbo/pip2nix
+             {
-               Babel = super.buildPythonPackage {
-                 name = "Babel-1.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [pytz];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/33/27/e3978243a03a76398c384c83f7ca879bc6e8f1511233a621fcada135606e/Babel-1.3.tar.gz";
-                   md5 = "5264ceb02717843cbc9ffce8e6e06bdb";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               Beaker = super.buildPythonPackage {
-                 name = "Beaker-1.9.1";
-                 buildInputs = with self; [];
+             { pkgs, fetchurl, fetchgit, fetchhg }:
+             self: super: {
+               "alembic" = super.buildPythonPackage {
+                 name = "alembic-0.9.9";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [funcsigs];
+                 propagatedBuildInputs = [
+                   self."sqlalchemy"
+                   self."mako"
+                   self."python-editor"
+                   self."python-dateutil"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz";
-                   md5 = "46fda0a164e2b0d24ccbda51a2310301";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               CProfileV = super.buildPythonPackage {
-                 name = "CProfileV-1.0.7";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [bottle];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/df/50/d8c1ada7d537c64b0f76453fa31dedb6af6e27b82fcf0331e5f71a4cf98b/CProfileV-1.0.7.tar.gz";
-                   md5 = "db4c7640438aa3d8887e194c81c7a019";
+                   url = "https://files.pythonhosted.org/packages/89/03/756d5b8e1c90bf283c3f435766aa3f20208d1c3887579dd8f2122e01d5f4/alembic-0.9.9.tar.gz";
+                   sha256 = "0bmkq6isjbmy4p7nxfvfpknjsx7rb3xn9g00169y891hcfkkxgc5";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               Chameleon = super.buildPythonPackage {
-                 name = "Chameleon-2.24";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/5a/9e/637379ffa13c5172b5c0e704833ffea6bf51cec7567f93fd6e903d53ed74/Chameleon-2.24.tar.gz";
-                   md5 = "1b01f1f6533a8a11d0d2f2366dec5342";
-                 };
-                 meta = {
-                   license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
-                 };
-               };
-               FormEncode = super.buildPythonPackage {
-                 name = "FormEncode-1.2.4";
-                 buildInputs = with self; [];
+               "amqp" = super.buildPythonPackage {
+                 name = "amqp-2.3.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."vine"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/8e/59/0174271a6f004512e0201188593e6d319db139d14cb7490e488bbb078015/FormEncode-1.2.4.tar.gz";
-                   md5 = "6bc17fb9aed8aea198975e888e2077f4";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.psfl ];
-                 };
-               };
-               Jinja2 = super.buildPythonPackage {
-                 name = "Jinja2-2.9.6";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [MarkupSafe];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
-                   md5 = "6411537324b4dba0956aaa8109f3c77b";
+                   url = "https://files.pythonhosted.org/packages/1b/32/242ff76cd802766f11c89c72f3389b5c8de4bdfbab406137b90c5fae8b05/amqp-2.3.1.tar.gz";
+                   sha256 = "0wlfnvhmfrn7c8qif2jyvsm63ibdxp02ss564qwrvqfhz0di72s0";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               Mako = super.buildPythonPackage {
-                 name = "Mako-1.0.7";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [MarkupSafe];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-1.0.7.tar.gz";
-                   md5 = "5836cc997b1b773ef389bf6629c30e65";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               Markdown = super.buildPythonPackage {
-                 name = "Markdown-2.6.11";
-                 buildInputs = with self; [];
+               "appenlight-client" = super.buildPythonPackage {
+                 name = "appenlight-client-0.6.25";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."webob"
+                   self."requests"
+                   self."six"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/b3/73/fc5c850f44af5889192dff783b7b0d8f3fe8d30b65c8e3f78f8f0265fecf/Markdown-2.6.11.tar.gz";
-                   md5 = "a67c1b2914f7d74eeede2ebe0fdae470";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               MarkupSafe = super.buildPythonPackage {
-                 name = "MarkupSafe-1.0";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
-                   md5 = "2fcedc9284d50e577b5192e8e3578355";
+                   url = "https://files.pythonhosted.org/packages/fa/44/2911ef85ea4f4fe65058fd22959d8dad598fab6a3c84e5bcb569d15c8783/appenlight_client-0.6.25.tar.gz";
+                   sha256 = "1r9l2rfg677nxhamdbyb9y4fs1zgy2dy1p19c68fnvqkxz40y627";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               MySQL-python = super.buildPythonPackage {
-                 name = "MySQL-python-1.2.5";
-                 buildInputs = with self; [];
+               "atomicwrites" = super.buildPythonPackage {
+                 name = "atomicwrites-1.1.5";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/a5/e9/51b544da85a36a68debe7a7091f068d802fc515a3a202652828c73453cad/MySQL-python-1.2.5.zip";
-                   md5 = "654f75b302db6ed8dc5a898c625e030c";
+                   url = "https://files.pythonhosted.org/packages/a1/e1/2d9bc76838e6e6667fde5814aa25d7feb93d6fa471bf6816daac2596e8b2/atomicwrites-1.1.5.tar.gz";
+                   sha256 = "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.gpl1 ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               Paste = super.buildPythonPackage {
-                 name = "Paste-2.0.3";
-                 buildInputs = with self; [];
+               "attrs" = super.buildPythonPackage {
+                 name = "attrs-18.1.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/30/c3/5c2f7c7a02e4f58d4454353fa1c32c94f79fa4e36d07a67c0ac295ea369e/Paste-2.0.3.tar.gz";
-                   md5 = "1231e14eae62fa7ed76e9130b04bc61e";
+                   url = "https://files.pythonhosted.org/packages/e4/ac/a04671e118b57bee87dabca1e0f2d3bda816b7a551036012d0ca24190e71/attrs-18.1.0.tar.gz";
+                   sha256 = "0yzqz8wv3w1srav5683a55v49i0szkm47dyrnkd56fqs8j8ypl70";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               PasteDeploy = super.buildPythonPackage {
-                 name = "PasteDeploy-1.5.2";
-                 buildInputs = with self; [];
+               "authomatic" = super.buildPythonPackage {
+                 name = "authomatic-0.1.0.post1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
-                   md5 = "352b7205c78c8de4987578d19431af3b";
+                   url = "https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801";
+                   sha256 = "1cgk0a86sbsjbri06gf5z5l4npwkjdxw6fdnwl4vvfmxs2sx9yxw";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               PasteScript = super.buildPythonPackage {
-                 name = "PasteScript-2.0.2";
-                 buildInputs = with self; [];
+               "babel" = super.buildPythonPackage {
+                 name = "babel-1.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [Paste PasteDeploy six];
+                 propagatedBuildInputs = [
+                   self."pytz"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/e5/f0/78e766c3dcc61a4f3a6f71dd8c95168ae9c7a31722b5663d19c1fdf62cb6/PasteScript-2.0.2.tar.gz";
-                   md5 = "ccb3045445097192ca71a13b746c77b2";
+                   url = "https://files.pythonhosted.org/packages/33/27/e3978243a03a76398c384c83f7ca879bc6e8f1511233a621fcada135606e/Babel-1.3.tar.gz";
+                   sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "backports.shutil-get-terminal-size" = super.buildPythonPackage {
+                 name = "backports.shutil-get-terminal-size-1.0.0";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz";
+                   sha256 = "107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               Pygments = super.buildPythonPackage {
-                 name = "Pygments-2.2.0";
-                 buildInputs = with self; [];
+               "beaker" = super.buildPythonPackage {
+                 name = "beaker-1.9.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."funcsigs"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
-                   md5 = "13037baca42f16917cbd5ad2fab50844";
+                   url = "https://files.pythonhosted.org/packages/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz";
+                   sha256 = "08arsn61r255lhz6hcpn2lsiqpg30clla805ysx06wmbhvb6w9rj";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               Routes = super.buildPythonPackage {
-                 name = "Routes-2.4.1";
-                 buildInputs = with self; [];
+               "beautifulsoup4" = super.buildPythonPackage {
+                 name = "beautifulsoup4-4.6.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six repoze.lru];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/33/38/ea827837e68d9c7dde4cff7ec122a93c319f0effc08ce92a17095576603f/Routes-2.4.1.tar.gz";
-                   md5 = "c058dff6832941dec47e0d0052548ad8";
+                   url = "https://files.pythonhosted.org/packages/88/df/86bffad6309f74f3ff85ea69344a078fc30003270c8df6894fca7a3c72ff/beautifulsoup4-4.6.3.tar.gz";
+                   sha256 = "041dhalzjciw6qyzzq7a2k4h1yvyk76xigp35hv5ibnn448ydy4h";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               SQLAlchemy = super.buildPythonPackage {
-                 name = "SQLAlchemy-1.1.15";
-                 buildInputs = with self; [];
+               "billiard" = super.buildPythonPackage {
+                 name = "billiard-3.5.0.3";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/39/ac/f5571210cca2e4f4532e38aaff242f26c8654c5e2436bee966c230647ccc/billiard-3.5.0.3.tar.gz";
+                   sha256 = "1riwiiwgb141151md4ykx49qrz749akj5k8g290ji9bsqjyj4yqx";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "bleach" = super.buildPythonPackage {
+                 name = "bleach-2.1.4";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."six"
+                   self."html5lib"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/c2/f6/11fcc1ce19a7cb81b1c9377f4e27ce3813265611922e355905e57c44d164/SQLAlchemy-1.1.15.tar.gz";
-                   md5 = "077f9bd3339957f53068b5572a152674";
+                   url = "https://files.pythonhosted.org/packages/7a/b7/fa555afb61462b030abaf9ed1479b8ea031510f58c7706b06113be9f82ea/bleach-2.1.4.tar.gz";
+                   sha256 = "1n337zbdml6z6zia0b1qgv6xiddx3qlwmcg9vk2mk60jcxhmzs8f";
+                 };
+                 meta = {
+                   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 ];
                  };
                };
-               Tempita = super.buildPythonPackage {
-                 name = "Tempita-0.5.2";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/56/c8/8ed6eee83dbddf7b0fc64dd5d4454bc05e6ccaafff47991f73f2894d9ff4/Tempita-0.5.2.tar.gz";
-                   md5 = "4c2f17bb9d481821c41b6fbee904cea1";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               URLObject = super.buildPythonPackage {
-                 name = "URLObject-2.4.0";
-                 buildInputs = with self; [];
+               "bumpversion" = super.buildPythonPackage {
+                 name = "bumpversion-0.5.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/cb/b6/e25e58500f9caef85d664bec71ec67c116897bfebf8622c32cb75d1ca199/URLObject-2.4.0.tar.gz";
-                   md5 = "2ed819738a9f0a3051f31dc9924e3065";
-                 };
-                 meta = {
-                   license = [  ];
-                 };
-               };
-               WebError = super.buildPythonPackage {
-                 name = "WebError-0.10.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [WebOb Tempita Pygments Paste];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/35/76/e7e5c2ce7e9c7f31b54c1ff295a495886d1279a002557d74dd8957346a79/WebError-0.10.3.tar.gz";
-                   md5 = "84b9990b0baae6fd440b1e60cdd06f9a";
+                   url = "https://files.pythonhosted.org/packages/14/41/8c9da3549f8e00c84f0432c3a8cf8ed6898374714676aab91501d48760db/bumpversion-0.5.3.tar.gz";
+                   sha256 = "0zn7694yfipxg35ikkfh7kvgl2fissha3dnqad2c5bvsvmrwhi37";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               WebHelpers = super.buildPythonPackage {
-                 name = "WebHelpers-1.3";
-                 buildInputs = with self; [];
+               "celery" = super.buildPythonPackage {
+                 name = "celery-4.1.1";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."pytz"
+                   self."billiard"
+                   self."kombu"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/e9/cf/a4c0597effca20c57eb586324e41d1180bc8f13a933da41e0646cff69f02/celery-4.1.1.tar.gz";
+                   sha256 = "1xbir4vw42n2ir9lanhwl7w69zpmj7lbi66fxm2b7pyvkcss7wni";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "chameleon" = super.buildPythonPackage {
+                 name = "chameleon-2.24";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [MarkupSafe];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/ee/68/4d07672821d514184357f1552f2dad923324f597e722de3b016ca4f7844f/WebHelpers-1.3.tar.gz";
-                   md5 = "32749ffadfc40fea51075a7def32588b";
+                   url = "https://files.pythonhosted.org/packages/5a/9e/637379ffa13c5172b5c0e704833ffea6bf51cec7567f93fd6e903d53ed74/Chameleon-2.24.tar.gz";
+                   sha256 = "0ykqr7syxfa6h9adjfnsv1gdsca2xzm22vmic8859n0f0j09abj5";
+                 };
+                 meta = {
+                   license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+                 };
+               };
+               "channelstream" = super.buildPythonPackage {
+                 name = "channelstream-0.5.2";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."gevent"
+                   self."ws4py"
+                   self."pyramid"
+                   self."pyramid-jinja2"
+                   self."itsdangerous"
+                   self."requests"
+                   self."six"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/2b/31/29a8e085cf5bf97fa88e7b947adabfc581a18a3463adf77fb6dada34a65f/channelstream-0.5.2.tar.gz";
+                   sha256 = "1qbm4xdl5hfkja683x546bncg3rqq8qv79w1m1a1wd48cqqzb6rm";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               WebHelpers2 = super.buildPythonPackage {
-                 name = "WebHelpers2-2.0";
-                 buildInputs = with self; [];
+               "click" = super.buildPythonPackage {
+                 name = "click-6.6";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [MarkupSafe six];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/ff/30/56342c6ea522439e3662427c8d7b5e5b390dff4ff2dc92d8afcb8ab68b75/WebHelpers2-2.0.tar.gz";
-                   md5 = "0f6b68d70c12ee0aed48c00b24da13d3";
+                   url = "https://files.pythonhosted.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
+                   sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               WebOb = super.buildPythonPackage {
-                 name = "WebOb-1.7.4";
-                 buildInputs = with self; [];
+               "colander" = super.buildPythonPackage {
+                 name = "colander-1.4";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."translationstring"
+                   self."iso8601"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/75/34/731e23f52371852dfe7490a61644826ba7fe70fd52a377aaca0f4956ba7f/WebOb-1.7.4.tar.gz";
-                   md5 = "397e46892d7f199b1a07eb20a2d3d9bd";
+                   url = "https://files.pythonhosted.org/packages/cc/e2/c4e716ac4a426d8ad4dfe306c34f0018a22275d2420815784005bf771c84/colander-1.4.tar.gz";
+                   sha256 = "0wjfphyr5aakv5hw73q287lbc15cbm0aardajv7i2mqf377rl3p2";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
                  };
                };
-               WebTest = super.buildPythonPackage {
-                 name = "WebTest-2.0.29";
-                 buildInputs = with self; [];
+               "configobj" = super.buildPythonPackage {
+                 name = "configobj-5.0.6";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six WebOb waitress beautifulsoup4];
+                 propagatedBuildInputs = [
+                   self."six"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz";
-                   md5 = "30b4cf0d340b9a5335fac4389e6f84fc";
+                   url = "https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c";
+                   sha256 = "1hhcxirwvg58grlfr177b3awhbq8hlx1l3lh69ifl1ki7lfd1s1x";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "configparser" = super.buildPythonPackage {
+                 name = "configparser-3.5.0";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz";
+                   sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               Whoosh = super.buildPythonPackage {
-                 name = "Whoosh-2.7.4";
-                 buildInputs = with self; [];
+               "cov-core" = super.buildPythonPackage {
+                 name = "cov-core-1.15.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."coverage"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/Whoosh-2.7.4.tar.gz";
-                   md5 = "c2710105f20b3e29936bd2357383c325";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.bsd2 ];
-                 };
-               };
-               alembic = super.buildPythonPackage {
-                 name = "alembic-0.9.8";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [SQLAlchemy Mako python-editor python-dateutil];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/a1/95/2252783859df9ec76b9a25d968c2827ed75a43ba34c6e8d38f87a5c0fb26/alembic-0.9.8.tar.gz";
-                   md5 = "5cfef58641c9a94d4a5d547e951a7dda";
+                   url = "https://files.pythonhosted.org/packages/4b/87/13e75a47b4ba1be06f29f6d807ca99638bedc6b57fa491cd3de891ca2923/cov-core-1.15.0.tar.gz";
+                   sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               amqp = super.buildPythonPackage {
-                 name = "amqp-2.2.2";
-                 buildInputs = with self; [];
+               "coverage" = super.buildPythonPackage {
+                 name = "coverage-3.7.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [vine];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/e0/70/9ab9ccd8247fb7d2adb717e9f6a0ed358c9e1ab2c349048b0352f9e80ee2/amqp-2.2.2.tar.gz";
-                   md5 = "0971a3fd2d635ded45c349cfc17106bd";
+                   url = "https://files.pythonhosted.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
+                   sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               appenlight-client = super.buildPythonPackage {
-                 name = "appenlight-client-0.6.25";
-                 buildInputs = with self; [];
+               "cprofilev" = super.buildPythonPackage {
+                 name = "cprofilev-1.0.7";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [WebOb requests six];
+                 propagatedBuildInputs = [
+                   self."bottle"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/fa/44/2911ef85ea4f4fe65058fd22959d8dad598fab6a3c84e5bcb569d15c8783/appenlight_client-0.6.25.tar.gz";
-                   md5 = "76dd2f9d42659fae8f290982078dc880";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               authomatic = super.buildPythonPackage {
-                 name = "authomatic-0.1.0.post1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801";
-                   md5 = "3c68720a1322b25254009518d1ff6801";
+                   url = "https://files.pythonhosted.org/packages/df/50/d8c1ada7d537c64b0f76453fa31dedb6af6e27b82fcf0331e5f71a4cf98b/CProfileV-1.0.7.tar.gz";
+                   sha256 = "0xwszfhxgndpcjkpq89dix6vi02hj1gzvhr7r716hd1x3y5p94c7";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               backports.shutil-get-terminal-size = super.buildPythonPackage {
-                 name = "backports.shutil-get-terminal-size-1.0.0";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz";
-                   md5 = "03267762480bd86b50580dc19dff3c66";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               beautifulsoup4 = super.buildPythonPackage {
-                 name = "beautifulsoup4-4.6.0";
-                 buildInputs = with self; [];
+               "cssselect" = super.buildPythonPackage {
+                 name = "cssselect-1.0.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/fa/8d/1d14391fdaed5abada4e0f63543fef49b8331a34ca60c88bd521bcf7f782/beautifulsoup4-4.6.0.tar.gz";
-                   md5 = "c17714d0f91a23b708a592cb3c697728";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               billiard = super.buildPythonPackage {
-                 name = "billiard-3.5.0.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/39/ac/f5571210cca2e4f4532e38aaff242f26c8654c5e2436bee966c230647ccc/billiard-3.5.0.3.tar.gz";
-                   md5 = "113ba481e48400adbf6fbbf59a2f8554";
+                   url = "https://files.pythonhosted.org/packages/52/ea/f31e1d2e9eb130fda2a631e22eac369dc644e8807345fbed5113f2d6f92b/cssselect-1.0.3.tar.gz";
+                   sha256 = "011jqa2jhmydhi0iz4v1w3cr540z5zas8g2bw8brdw4s4b2qnv86";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               bleach = super.buildPythonPackage {
-                 name = "bleach-2.1.2";
-                 buildInputs = with self; [];
+               "decorator" = super.buildPythonPackage {
+                 name = "decorator-4.1.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six html5lib];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/b3/5f/0da670d30d3ffbc57cc97fa82947f81bbe3eab8d441e2d42e661f215baf2/bleach-2.1.2.tar.gz";
-                   md5 = "d0b14ae43a437ee0c650e04c6063eedd";
+                   url = "https://files.pythonhosted.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
+                   sha256 = "1d8npb11kxyi36mrvjdpcjij76l5zfyrz2f820brf0l0rcw4vdkw";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
+                 };
+               };
+               "deform" = super.buildPythonPackage {
+                 name = "deform-2.0.5";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."chameleon"
+                   self."colander"
+                   self."iso8601"
+                   self."peppercorn"
+                   self."translationstring"
+                   self."zope.deprecation"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/0c/b1/ba711d5808c12538c8504f534d79c124ed834f19ac36f0ac5391c3bbd1c1/deform-2.0.5.tar.gz";
+                   sha256 = "0ybg9zsnfac1kaxrjanmkjk0xaklf4d3piywxwr08l1cl1336kc7";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.asl20 ];
+                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+                 };
+               };
+               "docutils" = super.buildPythonPackage {
+                 name = "docutils-0.14";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
+                   sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
                  };
                };
-               bottle = super.buildPythonPackage {
-                 name = "bottle-0.12.13";
-                 buildInputs = with self; [];
+               "dogpile.cache" = super.buildPythonPackage {
+                 name = "dogpile.cache-0.6.6";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/48/ca/604154d835c3668efb8a31bd979b0ea4bf39c2934a40ffecc0662296cb51/dogpile.cache-0.6.6.tar.gz";
+                   sha256 = "1h8n1lxd4l2qvahfkiinljkqz7pww7w3sgag0j8j9ixbl2h4wk84";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "dogpile.core" = super.buildPythonPackage {
+                 name = "dogpile.core-0.4.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz";
-                   md5 = "d2fe1b48c1d49217e78bf326b1cad437";
+                   url = "https://files.pythonhosted.org/packages/0e/77/e72abc04c22aedf874301861e5c1e761231c288b5de369c18be8f4b5c9bb/dogpile.core-0.4.1.tar.gz";
+                   sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "ecdsa" = super.buildPythonPackage {
+                 name = "ecdsa-0.13";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/f9/e5/99ebb176e47f150ac115ffeda5fedb6a3dbb3c00c74a59fd84ddf12f5857/ecdsa-0.13.tar.gz";
+                   sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               bumpversion = super.buildPythonPackage {
-                 name = "bumpversion-0.5.3";
-                 buildInputs = with self; [];
+               "elasticsearch" = super.buildPythonPackage {
+                 name = "elasticsearch-2.3.0";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."urllib3"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/10/35/5fd52c5f0b0ee405ed4b5195e8bce44c5e041787680dc7b94b8071cac600/elasticsearch-2.3.0.tar.gz";
+                   sha256 = "10ad2dk73xsys9vajwsncibs69asa63w1hgwz6lz1prjpyi80c5y";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.asl20 ];
+                 };
+               };
+               "elasticsearch-dsl" = super.buildPythonPackage {
+                 name = "elasticsearch-dsl-2.2.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."six"
+                   self."python-dateutil"
+                   self."elasticsearch"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/14/41/8c9da3549f8e00c84f0432c3a8cf8ed6898374714676aab91501d48760db/bumpversion-0.5.3.tar.gz";
-                   md5 = "c66a3492eafcf5ad4b024be9fca29820";
+                   url = "https://files.pythonhosted.org/packages/66/2f/52a086968788e58461641570f45c3207a52d46ebbe9b77dc22b6a8ffda66/elasticsearch-dsl-2.2.0.tar.gz";
+                   sha256 = "1g4kxzxsdwlsl2a9kscmx11pafgimhj7y8wrfksv8pgvpkfb9fwr";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.asl20 ];
+                 };
+               };
+               "entrypoints" = super.buildPythonPackage {
+                 name = "entrypoints-0.2.2";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."configparser"
+                 ];
+                 src = fetchurl {
+                   url = "https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313";
+                   sha256 = "0bihrdp8ahsys437kxdhk52gz6kib8rxjv71i93wkw7594fcaxll";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               celery = super.buildPythonPackage {
-                 name = "celery-4.1.0";
-                 buildInputs = with self; [];
+               "enum34" = super.buildPythonPackage {
+                 name = "enum34-1.1.6";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [pytz billiard kombu];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/07/65/88a2a45fc80f487872c93121a701a53bbbc3d3d832016876fac84fc8d46a/celery-4.1.0.tar.gz";
-                   md5 = "db91e1d26936381127f01e150fe3054a";
+                   url = "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz";
+                   sha256 = "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               channelstream = super.buildPythonPackage {
-                 name = "channelstream-0.5.2";
-                 buildInputs = with self; [];
+               "formencode" = super.buildPythonPackage {
+                 name = "formencode-1.2.4";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [gevent ws4py pyramid pyramid-jinja2 itsdangerous requests six];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/2b/31/29a8e085cf5bf97fa88e7b947adabfc581a18a3463adf77fb6dada34a65f/channelstream-0.5.2.tar.gz";
-                   md5 = "1c5eb2a8a405be6f1073da94da6d81d3";
+                   url = "https://files.pythonhosted.org/packages/8e/59/0174271a6f004512e0201188593e6d319db139d14cb7490e488bbb078015/FormEncode-1.2.4.tar.gz";
+                   sha256 = "1fgy04sdy4yry5xcjls3x3xy30dqwj58ycnkndim819jx0788w42";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                   license = [ pkgs.lib.licenses.psfl ];
                  };
                };
-               click = super.buildPythonPackage {
-                 name = "click-6.6";
-                 buildInputs = with self; [];
+               "funcsigs" = super.buildPythonPackage {
+                 name = "funcsigs-1.0.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
-                   md5 = "d0b09582123605220ad6977175f3e51d";
+                   url = "https://files.pythonhosted.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz";
+                   sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                   license = [ { fullName = "ASL"; } pkgs.lib.licenses.asl20 ];
+                 };
+               };
+               "functools32" = super.buildPythonPackage {
+                 name = "functools32-3.2.3.post2";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz";
+                   sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.psfl ];
                  };
                };
-               colander = super.buildPythonPackage {
-                 name = "colander-1.4";
-                 buildInputs = with self; [];
+               "future" = super.buildPythonPackage {
+                 name = "future-0.14.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [translationstring iso8601];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/cc/e2/c4e716ac4a426d8ad4dfe306c34f0018a22275d2420815784005bf771c84/colander-1.4.tar.gz";
-                   md5 = "cbb8e403c2ba05aeaa419d51fdb93736";
+                   url = "https://files.pythonhosted.org/packages/83/80/8ef3a11a15f8eaafafa0937b20c1b3f73527e69ab6b3fa1cf94a5a96aabb/future-0.14.3.tar.gz";
+                   sha256 = "1savk7jx7hal032f522c5ajhh8fra6gmnadrj9adv5qxi18pv1b2";
                  };
                  meta = {
-                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+                   license = [ { fullName = "OSI Approved"; } pkgs.lib.licenses.mit ];
                  };
                };
-               configobj = super.buildPythonPackage {
-                 name = "configobj-5.0.6";
-                 buildInputs = with self; [];
+               "futures" = super.buildPythonPackage {
+                 name = "futures-3.0.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz";
-                   md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
+                   url = "https://files.pythonhosted.org/packages/f8/e7/fc0fcbeb9193ba2d4de00b065e7fd5aecd0679e93ce95a07322b2b1434f4/futures-3.0.2.tar.gz";
+                   sha256 = "0mz2pbgxbc2nbib1szifi07whjbfs4r02pv2z390z7p410awjgyw";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               configparser = super.buildPythonPackage {
-                 name = "configparser-3.5.0";
-                 buildInputs = with self; [];
+               "gevent" = super.buildPythonPackage {
+                 name = "gevent-1.3.5";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."greenlet"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz";
-                   md5 = "cfdd915a5b7a6c09917a64a573140538";
+                   url = "https://files.pythonhosted.org/packages/e6/0a/fc345c6e6161f84484870dbcaa58e427c10bd9bdcd08a69bed3d6b398bf1/gevent-1.3.5.tar.gz";
+                   sha256 = "1w3gydxirgd2f60c5yv579w4903ds9s4g3587ik4jby97hgqc5bz";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               cov-core = super.buildPythonPackage {
-                 name = "cov-core-1.15.0";
-                 buildInputs = with self; [];
+               "gnureadline" = super.buildPythonPackage {
+                 name = "gnureadline-6.3.8";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/50/64/86085c823cd78f9df9d8e33dce0baa71618016f8860460b82cf6610e1eb3/gnureadline-6.3.8.tar.gz";
+                   sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq";
+                 };
+                 meta = {
+                   license = [ { fullName = "GNU General Public License v3 (GPLv3)"; } pkgs.lib.licenses.gpl1 ];
+                 };
+               };
+               "gprof2dot" = super.buildPythonPackage {
+                 name = "gprof2dot-2017.9.19";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [coverage];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
+                   sha256 = "17ih23ld2nzgc3xwgbay911l6lh96jp1zshmskm17n1gg2i7mg6f";
+                 };
+                 meta = {
+                   license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
+                 };
+               };
+               "graphviz" = super.buildPythonPackage {
+                 name = "graphviz-0.9";
+                 doCheck = false;
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/4b/87/13e75a47b4ba1be06f29f6d807ca99638bedc6b57fa491cd3de891ca2923/cov-core-1.15.0.tar.gz";
-                   md5 = "f519d4cb4c4e52856afb14af52919fe6";
+                   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";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               coverage = super.buildPythonPackage {
-                 name = "coverage-3.7.1";
-                 buildInputs = with self; [];
+               "gunicorn" = super.buildPythonPackage {
+                 name = "gunicorn-19.9.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
-                   md5 = "c47b36ceb17eaff3ecfab3bcd347d0df";
+                   url = "https://files.pythonhosted.org/packages/47/52/68ba8e5e8ba251e54006a49441f7ccabca83b6bef5aedacb4890596c7911/gunicorn-19.9.0.tar.gz";
+                   sha256 = "1wzlf4xmn6qjirh5w81l6i6kqjnab1n1qqkh7zsj1yb6gh4n49ps";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               cssselect = super.buildPythonPackage {
-                 name = "cssselect-1.0.1";
-                 buildInputs = with self; [];
+               "html5lib" = super.buildPythonPackage {
+                 name = "html5lib-1.0.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."six"
+                   self."webencodings"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/77/ff/9c865275cd19290feba56344eba570e719efb7ca5b34d67ed12b22ebbb0d/cssselect-1.0.1.tar.gz";
-                   md5 = "3fa03bf82a9f0b1223c0f1eb1369e139";
+                   url = "https://files.pythonhosted.org/packages/85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f/html5lib-1.0.1.tar.gz";
+                   sha256 = "0dipzfrycv6j1jw82v9b7d8lzggx3x8xngx6l4xrqkxwvg7hvjv6";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               decorator = super.buildPythonPackage {
-                 name = "decorator-4.1.2";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
-                   md5 = "a0f7f4fe00ae2dde93494d90c192cf8c";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               deform = super.buildPythonPackage {
-                 name = "deform-2.0.4";
-                 buildInputs = with self; [];
+               "hupper" = super.buildPythonPackage {
+                 name = "hupper-1.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [Chameleon colander iso8601 peppercorn translationstring zope.deprecation];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/66/3b/eefcb07abcab7a97f6665aa2d0cf1af741d9d6e78a2e4657fd2b89f89880/deform-2.0.4.tar.gz";
-                   md5 = "34756e42cf50dd4b4430809116c4ec0a";
-                 };
-                 meta = {
-                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-                 };
-               };
-               docutils = super.buildPythonPackage {
-                 name = "docutils-0.14";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
-                   md5 = "c53768d63db3873b7d452833553469de";
+                   url = "https://files.pythonhosted.org/packages/51/0c/96335b1f2f32245fb871eea5bb9773196505ddb71fad15190056a282df9e/hupper-1.3.tar.gz";
+                   sha256 = "1pkyrm9c2crc32ps00k1ahnc5clj3pjwiarc7j0x8aykwih7ff10";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               dogpile.cache = super.buildPythonPackage {
-                 name = "dogpile.cache-0.6.4";
-                 buildInputs = with self; [];
+               "infrae.cache" = super.buildPythonPackage {
+                 name = "infrae.cache-1.0.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."beaker"
+                   self."repoze.lru"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/b6/3d/35c05ca01c070bb70d9d422f2c4858ecb021b05b21af438fec5ccd7b945c/dogpile.cache-0.6.4.tar.gz";
-                   md5 = "66e0a6cae6c08cb1ea25f89d0eadfeb0";
+                   url = "https://files.pythonhosted.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
+                   sha256 = "1dvqsjn8vw253wz9d1pz17j79mf4bs53dvp2qxck2qdp1am1njw4";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                   license = [ pkgs.lib.licenses.zpl21 ];
                  };
                };
-               dogpile.core = super.buildPythonPackage {
-                 name = "dogpile.core-0.4.1";
-                 buildInputs = with self; [];
+               "invoke" = super.buildPythonPackage {
+                 name = "invoke-0.13.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/0e/77/e72abc04c22aedf874301861e5c1e761231c288b5de369c18be8f4b5c9bb/dogpile.core-0.4.1.tar.gz";
-                   md5 = "01cb19f52bba3e95c9b560f39341f045";
+                   url = "https://files.pythonhosted.org/packages/47/bf/d07ef52fa1ac645468858bbac7cb95b246a972a045e821493d17d89c81be/invoke-0.13.0.tar.gz";
+                   sha256 = "0794vhgxfmkh0vzkkg5cfv1w82g3jc3xr18wim29far9qpx9468s";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               ecdsa = super.buildPythonPackage {
-                 name = "ecdsa-0.13";
-                 buildInputs = with self; [];
+               "ipaddress" = super.buildPythonPackage {
+                 name = "ipaddress-1.0.22";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/f9/e5/99ebb176e47f150ac115ffeda5fedb6a3dbb3c00c74a59fd84ddf12f5857/ecdsa-0.13.tar.gz";
-                   md5 = "1f60eda9cb5c46722856db41a3ae6670";
+                   url = "https://files.pythonhosted.org/packages/97/8d/77b8cedcfbf93676148518036c6b1ce7f8e14bf07e95d7fd4ddcb8cc052f/ipaddress-1.0.22.tar.gz";
+                   sha256 = "0b570bm6xqpjwqis15pvdy6lyvvzfndjvkynilcddjj5x98wfimi";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [ pkgs.lib.licenses.psfl ];
                  };
                };
-               elasticsearch = super.buildPythonPackage {
-                 name = "elasticsearch-2.3.0";
-                 buildInputs = with self; [];
+               "ipdb" = super.buildPythonPackage {
+                 name = "ipdb-0.11";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [urllib3];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                   self."ipython"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/10/35/5fd52c5f0b0ee405ed4b5195e8bce44c5e041787680dc7b94b8071cac600/elasticsearch-2.3.0.tar.gz";
-                   md5 = "2550f3b51629cf1ef9636608af92c340";
+                   url = "https://files.pythonhosted.org/packages/80/fe/4564de08f174f3846364b3add8426d14cebee228f741c27e702b2877e85b/ipdb-0.11.tar.gz";
+                   sha256 = "02m0l8wrhhd3z7dg3czn5ys1g5pxib516hpshdzp7rxzsxgcd0bh";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.asl20 ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               elasticsearch-dsl = super.buildPythonPackage {
-                 name = "elasticsearch-dsl-2.2.0";
-                 buildInputs = with self; [];
+               "ipython" = super.buildPythonPackage {
+                 name = "ipython-5.1.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six python-dateutil elasticsearch];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                   self."decorator"
+                   self."pickleshare"
+                   self."simplegeneric"
+                   self."traitlets"
+                   self."prompt-toolkit"
+                   self."pygments"
+                   self."pexpect"
+                   self."backports.shutil-get-terminal-size"
+                   self."pathlib2"
+                   self."pexpect"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/66/2f/52a086968788e58461641570f45c3207a52d46ebbe9b77dc22b6a8ffda66/elasticsearch-dsl-2.2.0.tar.gz";
-                   md5 = "fa6bd3c87ea3caa8f0f051bc37c53221";
+                   url = "https://files.pythonhosted.org/packages/89/63/a9292f7cd9d0090a0f995e1167f3f17d5889dcbc9a175261719c513b9848/ipython-5.1.0.tar.gz";
+                   sha256 = "0qdrf6aj9kvjczd5chj1my8y2iq09am9l8bb2a1334a52d76kx3y";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.asl20 ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               entrypoints = super.buildPythonPackage {
-                 name = "entrypoints-0.2.2";
-                 buildInputs = with self; [];
+               "ipython-genutils" = super.buildPythonPackage {
+                 name = "ipython-genutils-0.2.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [configparser];
                  src = fetchurl {
-                   url = "https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313";
-                   md5 = "7db37771aea9ac9fefe093e5d6987313";
+                   url = "https://files.pythonhosted.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
+                   sha256 = "1a4bc9y8hnvq6cp08qs4mckgm6i6ajpndp4g496rvvzcfmp12bpb";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "iso8601" = super.buildPythonPackage {
+                 name = "iso8601-0.1.11";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/c0/75/c9209ee4d1b5975eb8c2cba4428bde6b61bd55664a98290dd015cdb18e98/iso8601-0.1.11.tar.gz";
+                   sha256 = "0c7gh3lsdjds262h0v1sqc66l7hqgfwbakn96qrhdbl0i3vm5yz8";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               enum34 = super.buildPythonPackage {
-                 name = "enum34-1.1.6";
-                 buildInputs = with self; [];
+               "itsdangerous" = super.buildPythonPackage {
+                 name = "itsdangerous-0.24";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz";
-                   md5 = "5f13a0841a61f7fc295c514490d120d0";
+                   url = "https://files.pythonhosted.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz";
+                   sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               funcsigs = super.buildPythonPackage {
-                 name = "funcsigs-1.0.2";
-                 buildInputs = with self; [];
+               "jinja2" = super.buildPythonPackage {
+                 name = "jinja2-2.9.6";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz";
-                   md5 = "7e583285b1fb8a76305d6d68f4ccc14e";
-                 };
-                 meta = {
-                   license = [ { fullName = "ASL"; } pkgs.lib.licenses.asl20 ];
-                 };
-               };
-               functools32 = super.buildPythonPackage {
-                 name = "functools32-3.2.3.post2";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."markupsafe"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz";
-                   md5 = "09f24ffd9af9f6cd0f63cb9f4e23d4b2";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.psfl ];
-                 };
-               };
-               future = super.buildPythonPackage {
-                 name = "future-0.14.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/83/80/8ef3a11a15f8eaafafa0937b20c1b3f73527e69ab6b3fa1cf94a5a96aabb/future-0.14.3.tar.gz";
-                   md5 = "e94079b0bd1fc054929e8769fc0f6083";
-                 };
-                 meta = {
-                   license = [ { fullName = "OSI Approved"; } pkgs.lib.licenses.mit ];
-                 };
-               };
-               futures = super.buildPythonPackage {
-                 name = "futures-3.0.2";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/f8/e7/fc0fcbeb9193ba2d4de00b065e7fd5aecd0679e93ce95a07322b2b1434f4/futures-3.0.2.tar.gz";
-                   md5 = "42aaf1e4de48d6e871d77dc1f9d96d5a";
+                   url = "https://files.pythonhosted.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-2.9.6.tar.gz";
+                   sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               gevent = super.buildPythonPackage {
-                 name = "gevent-1.2.2";
-                 buildInputs = with self; [];
+               "jsonschema" = super.buildPythonPackage {
+                 name = "jsonschema-2.6.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [greenlet];
+                 propagatedBuildInputs = [
+                   self."functools32"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/1b/92/b111f76e54d2be11375b47b213b56687214f258fd9dae703546d30b837be/gevent-1.2.2.tar.gz";
-                   md5 = "7f0baf355384fe5ff2ecf66853422554";
+                   url = "https://files.pythonhosted.org/packages/58/b9/171dbb07e18c6346090a37f03c7e74410a1a56123f847efed59af260a298/jsonschema-2.6.0.tar.gz";
+                   sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               gnureadline = super.buildPythonPackage {
-                 name = "gnureadline-6.3.8";
-                 buildInputs = with self; [];
+               "jupyter-client" = super.buildPythonPackage {
+                 name = "jupyter-client-5.0.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."traitlets"
+                   self."jupyter-core"
+                   self."pyzmq"
+                   self."python-dateutil"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/50/64/86085c823cd78f9df9d8e33dce0baa71618016f8860460b82cf6610e1eb3/gnureadline-6.3.8.tar.gz";
-                   md5 = "ba341f4b907250bd1f47dbc06290604f";
+                   url = "https://files.pythonhosted.org/packages/e5/6f/65412ed462202b90134b7e761b0b7e7f949e07a549c1755475333727b3d0/jupyter_client-5.0.0.tar.gz";
+                   sha256 = "0nxw4rqk4wsjhc87gjqd7pv89cb9dnimcfnmcmp85bmrvv1gjri7";
                  };
                  meta = {
-                   license = [ { fullName = "GNU General Public License v3 (GPLv3)"; } pkgs.lib.licenses.gpl1 ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               gprof2dot = super.buildPythonPackage {
-                 name = "gprof2dot-2017.9.19";
-                 buildInputs = with self; [];
+               "jupyter-core" = super.buildPythonPackage {
+                 name = "jupyter-core-4.4.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."traitlets"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
-                   md5 = "cda2d552bb0d0b9f16e6824a9aabd225";
+                   url = "https://files.pythonhosted.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
+                   sha256 = "1dy083rarba8prn9f9srxq3c7n7vyql02ycrqq306c40lr57aw5s";
                  };
                  meta = {
-                   license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "kombu" = super.buildPythonPackage {
+                 name = "kombu-4.2.0";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."amqp"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/ab/b1/46a7a8babf5e60f3b2ca081a100af8edfcf132078a726375f52a054e70cf/kombu-4.2.0.tar.gz";
+                   sha256 = "1yz19qlqf0inl1mnwlpq9j6kj9r67clpy0xg99phyg4329rw80fn";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               graphviz = super.buildPythonPackage {
-                 name = "graphviz-0.8.2";
-                 buildInputs = with self; [];
+               "lxml" = super.buildPythonPackage {
+                 name = "lxml-3.7.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/fa/d1/63b62dee9e55368f60b5ea445e6afb361bb47e692fc27553f3672e16efb8/graphviz-0.8.2.zip";
-                   md5 = "50866e780f43e1cb0d073c70424fcaff";
+                   url = "https://files.pythonhosted.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
+                   sha256 = "1iv1jgkqn1hdh1xyxri6g0y1s67h01jzjkw2nhkx3rqylmw2sl5a";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               greenlet = super.buildPythonPackage {
-                 name = "greenlet-0.4.13";
-                 buildInputs = with self; [];
+               "mako" = super.buildPythonPackage {
+                 name = "mako-1.0.7";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."markupsafe"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/13/de/ba92335e9e76040ca7274224942282a80d54f85e342a5e33c5277c7f87eb/greenlet-0.4.13.tar.gz";
-                   md5 = "6e0b9dd5385f81d478451ec8ed1d62b3";
+                   url = "https://files.pythonhosted.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-1.0.7.tar.gz";
+                   sha256 = "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               gunicorn = super.buildPythonPackage {
-                 name = "gunicorn-19.7.1";
-                 buildInputs = with self; [];
+               "markdown" = super.buildPythonPackage {
+                 name = "markdown-2.6.11";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/30/3a/10bb213cede0cc4d13ac2263316c872a64bf4c819000c8ccd801f1d5f822/gunicorn-19.7.1.tar.gz";
-                   md5 = "174d3c3cd670a5be0404d84c484e590c";
+                   url = "https://files.pythonhosted.org/packages/b3/73/fc5c850f44af5889192dff783b7b0d8f3fe8d30b65c8e3f78f8f0265fecf/Markdown-2.6.11.tar.gz";
+                   sha256 = "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               html5lib = super.buildPythonPackage {
-                 name = "html5lib-1.0.1";
-                 buildInputs = with self; [];
+               "markupsafe" = super.buildPythonPackage {
+                 name = "markupsafe-1.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six webencodings];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f/html5lib-1.0.1.tar.gz";
-                   md5 = "942a0688d6bdf20d087c9805c40182ad";
+                   url = "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";
+                   sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               hupper = super.buildPythonPackage {
-                 name = "hupper-1.0";
-                 buildInputs = with self; [];
+               "meld3" = super.buildPythonPackage {
+                 name = "meld3-1.0.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/2e/07/df892c564dc09bb3cf6f6deb976c26adf9117db75ba218cb4353dbc9d826/hupper-1.0.tar.gz";
-                   md5 = "26e77da7d5ac5858f59af050d1a6eb5a";
+                   url = "https://files.pythonhosted.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f/meld3-1.0.2.tar.gz";
+                   sha256 = "0n4mkwlpsqnmn0dm0wm5hn9nkda0nafl0jdy5sdl5977znh59dzp";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
                  };
                };
-               infrae.cache = super.buildPythonPackage {
-                 name = "infrae.cache-1.0.1";
-                 buildInputs = with self; [];
+               "mistune" = super.buildPythonPackage {
+                 name = "mistune-0.8.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [Beaker repoze.lru];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
-                   md5 = "b09076a766747e6ed2a755cc62088e32";
+                   url = "https://files.pythonhosted.org/packages/9d/be/e06d4346cc608a01dec6bf770d7d0303a4fd6db588b318ced18f5f257145/mistune-0.8.3.tar.gz";
+                   sha256 = "06b662p6kf46wh2jsabaqhaq4bz1srh2zxkrnx4yg96azlxw645w";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.zpt21 ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               invoke = super.buildPythonPackage {
-                 name = "invoke-0.13.0";
-                 buildInputs = with self; [];
+               "mock" = super.buildPythonPackage {
+                 name = "mock-1.0.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/47/bf/d07ef52fa1ac645468858bbac7cb95b246a972a045e821493d17d89c81be/invoke-0.13.0.tar.gz";
-                   md5 = "c0d1ed4bfb34eaab551662d8cfee6540";
+                   url = "https://files.pythonhosted.org/packages/a2/52/7edcd94f0afb721a2d559a5b9aae8af4f8f2c79bc63fdbe8a8a6c9b23bbe/mock-1.0.1.tar.gz";
+                   sha256 = "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               ipaddress = super.buildPythonPackage {
-                 name = "ipaddress-1.0.19";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/f0/ba/860a4a3e283456d6b7e2ab39ce5cf11a3490ee1a363652ac50abf9f0f5df/ipaddress-1.0.19.tar.gz";
-                   md5 = "d0687efaf93a32476d81e90ba0609c57";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.psfl ];
-                 };
-               };
-               ipdb = super.buildPythonPackage {
-                 name = "ipdb-0.10.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools ipython];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/ad/cc/0e7298e1fbf2efd52667c9354a12aa69fb6f796ce230cca03525051718ef/ipdb-0.10.3.tar.gz";
-                   md5 = "def1f6ac075d54bdee07e6501263d4fa";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               ipython = super.buildPythonPackage {
-                 name = "ipython-5.1.0";
-                 buildInputs = with self; [];
+               "more-itertools" = super.buildPythonPackage {
+                 name = "more-itertools-4.3.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools decorator pickleshare simplegeneric traitlets prompt-toolkit Pygments pexpect backports.shutil-get-terminal-size pathlib2 pexpect];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/89/63/a9292f7cd9d0090a0f995e1167f3f17d5889dcbc9a175261719c513b9848/ipython-5.1.0.tar.gz";
-                   md5 = "47c8122420f65b58784cb4b9b4af35e3";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               ipython-genutils = super.buildPythonPackage {
-                 name = "ipython-genutils-0.2.0";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."six"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
-                   md5 = "5a4f9781f78466da0ea1a648f3e1f79f";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               iso8601 = super.buildPythonPackage {
-                 name = "iso8601-0.1.12";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/45/13/3db24895497345fb44c4248c08b16da34a9eb02643cea2754b21b5ed08b0/iso8601-0.1.12.tar.gz";
-                   md5 = "4de940f691c5ea759fb254384c8ddcf6";
+                   url = "https://files.pythonhosted.org/packages/88/ff/6d485d7362f39880810278bdc906c13300db05485d9c65971dec1142da6a/more-itertools-4.3.0.tar.gz";
+                   sha256 = "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               itsdangerous = super.buildPythonPackage {
-                 name = "itsdangerous-0.24";
-                 buildInputs = with self; [];
+               "msgpack-python" = super.buildPythonPackage {
+                 name = "msgpack-python-0.5.6";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/8a/20/6eca772d1a5830336f84aca1d8198e5a3f4715cd1c7fc36d3cc7f7185091/msgpack-python-0.5.6.tar.gz";
+                   sha256 = "16wh8qgybmfh4pjp8vfv78mdlkxfmcasg78lzlnm6nslsfkci31p";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.asl20 ];
+                 };
+               };
+               "mysql-python" = super.buildPythonPackage {
+                 name = "mysql-python-1.2.5";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz";
-                   md5 = "a3d55aa79369aef5345c036a8a26307f";
+                   url = "https://files.pythonhosted.org/packages/a5/e9/51b544da85a36a68debe7a7091f068d802fc515a3a202652828c73453cad/MySQL-python-1.2.5.zip";
+                   sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.gpl1 ];
+                 };
+               };
+               "nbconvert" = super.buildPythonPackage {
+                 name = "nbconvert-5.3.1";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."mistune"
+                   self."jinja2"
+                   self."pygments"
+                   self."traitlets"
+                   self."jupyter-core"
+                   self."nbformat"
+                   self."entrypoints"
+                   self."bleach"
+                   self."pandocfilters"
+                   self."testpath"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/b9/a4/d0a0938ad6f5eeb4dea4e73d255c617ef94b0b2849d51194c9bbdb838412/nbconvert-5.3.1.tar.gz";
+                   sha256 = "1f9dkvpx186xjm4xab0qbph588mncp4vqk3fmxrsnqs43mks9c8j";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               jsonschema = super.buildPythonPackage {
-                 name = "jsonschema-2.6.0";
-                 buildInputs = with self; [];
+               "nbformat" = super.buildPythonPackage {
+                 name = "nbformat-4.4.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [functools32];
+                 propagatedBuildInputs = [
+                   self."ipython-genutils"
+                   self."traitlets"
+                   self."jsonschema"
+                   self."jupyter-core"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/58/b9/171dbb07e18c6346090a37f03c7e74410a1a56123f847efed59af260a298/jsonschema-2.6.0.tar.gz";
-                   md5 = "50c6b69a373a8b55ff1e0ec6e78f13f4";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               jupyter-client = super.buildPythonPackage {
-                 name = "jupyter-client-5.0.0";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [traitlets jupyter-core pyzmq python-dateutil];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/e5/6f/65412ed462202b90134b7e761b0b7e7f949e07a549c1755475333727b3d0/jupyter_client-5.0.0.tar.gz";
-                   md5 = "1acd331b5c9fb4d79dae9939e79f2426";
+                   url = "https://files.pythonhosted.org/packages/6e/0e/160754f7ae3e984863f585a3743b0ed1702043a81245907c8fae2d537155/nbformat-4.4.0.tar.gz";
+                   sha256 = "00nlf08h8yc4q73nphfvfhxrcnilaqanb8z0mdy6nxk0vzq4wjgp";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               jupyter-core = super.buildPythonPackage {
-                 name = "jupyter-core-4.4.0";
-                 buildInputs = with self; [];
+               "objgraph" = super.buildPythonPackage {
+                 name = "objgraph-3.1.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [traitlets];
+                 propagatedBuildInputs = [
+                   self."graphviz"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
-                   md5 = "7829fc07884ed98459e170f217e2a5ba";
+                   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;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/24/c4/185da1304f07047dc9e0c46c31db75c0351bd73458ac3efad7da3dbcfbe1/packaging-15.2.tar.gz";
+                   sha256 = "1zn60w84bxvw6wypffka18ca66pa1k2cfrq3cq8fnsfja5m3k4ng";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.asl20 ];
+                 };
+               };
+               "pandocfilters" = super.buildPythonPackage {
+                 name = "pandocfilters-1.4.2";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/4c/ea/236e2584af67bb6df960832731a6e5325fd4441de001767da328c33368ce/pandocfilters-1.4.2.tar.gz";
+                   sha256 = "1a8d9b7s48gmq9zj0pmbyv2sivn5i7m6mybgpkk4jm5vd7hp1pdk";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               kombu = super.buildPythonPackage {
-                 name = "kombu-4.1.0";
-                 buildInputs = with self; [];
+               "paste" = super.buildPythonPackage {
+                 name = "paste-2.0.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [amqp];
+                 propagatedBuildInputs = [
+                   self."six"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/03/5e/1a47d1e543d4943d65330af4e4406049f443878818fb65bfdc651bb93a96/kombu-4.1.0.tar.gz";
-                   md5 = "2fb2be9fec0e6514231bba23a3779439";
+                   url = "https://files.pythonhosted.org/packages/30/c3/5c2f7c7a02e4f58d4454353fa1c32c94f79fa4e36d07a67c0ac295ea369e/Paste-2.0.3.tar.gz";
+                   sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "pastedeploy" = super.buildPythonPackage {
+                 name = "pastedeploy-1.5.2";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
+                   sha256 = "1jz3m4hq8v6hyhfjz9425nd3nvn52cvbfipdcd72krjmla4qz1fm";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               lxml = super.buildPythonPackage {
-                 name = "lxml-3.7.3";
-                 buildInputs = with self; [];
+               "pastescript" = super.buildPythonPackage {
+                 name = "pastescript-2.0.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."paste"
+                   self."pastedeploy"
+                   self."six"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-3.7.3.tar.gz";
-                   md5 = "075692ce442e69bbd604d44e21c02753";
+                   url = "https://files.pythonhosted.org/packages/e5/f0/78e766c3dcc61a4f3a6f71dd8c95168ae9c7a31722b5663d19c1fdf62cb6/PasteScript-2.0.2.tar.gz";
+                   sha256 = "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               meld3 = super.buildPythonPackage {
-                 name = "meld3-1.0.2";
-                 buildInputs = with self; [];
+               "pathlib2" = super.buildPythonPackage {
+                 name = "pathlib2-2.3.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."six"
+                   self."scandir"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f/meld3-1.0.2.tar.gz";
-                   md5 = "3ccc78cd79cffd63a751ad7684c02c91";
+                   url = "https://files.pythonhosted.org/packages/a1/14/df0deb867c2733f7d857523c10942b3d6612a1b222502fdffa9439943dfb/pathlib2-2.3.0.tar.gz";
+                   sha256 = "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "peppercorn" = super.buildPythonPackage {
+                 name = "peppercorn-0.5";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/45/ec/a62ec317d1324a01567c5221b420742f094f05ee48097e5157d32be3755c/peppercorn-0.5.tar.gz";
+                   sha256 = "0jvp144zn7yqk9kbpxc059167mlqk85i5lpvl1niw8gsa5fvl74j";
                  };
                  meta = {
                    license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
                  };
                };
-               mistune = super.buildPythonPackage {
-                 name = "mistune-0.8.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/9d/be/e06d4346cc608a01dec6bf770d7d0303a4fd6db588b318ced18f5f257145/mistune-0.8.3.tar.gz";
-                   md5 = "a5e4043e93fb8f9082e27f29eeb5e054";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               mock = super.buildPythonPackage {
-                 name = "mock-1.0.1";
-                 buildInputs = with self; [];
+               "pexpect" = super.buildPythonPackage {
+                 name = "pexpect-4.6.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."ptyprocess"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/a2/52/7edcd94f0afb721a2d559a5b9aae8af4f8f2c79bc63fdbe8a8a6c9b23bbe/mock-1.0.1.tar.gz";
-                   md5 = "c3971991738caa55ec7c356bbc154ee2";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               msgpack-python = super.buildPythonPackage {
-                 name = "msgpack-python-0.4.8";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/21/27/8a1d82041c7a2a51fcc73675875a5f9ea06c2663e02fcfeb708be1d081a0/msgpack-python-0.4.8.tar.gz";
-                   md5 = "dcd854fb41ee7584ebbf35e049e6be98";
+                   url = "https://files.pythonhosted.org/packages/89/43/07d07654ee3e25235d8cea4164cdee0ec39d1fda8e9203156ebe403ffda4/pexpect-4.6.0.tar.gz";
+                   sha256 = "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.asl20 ];
-                 };
-               };
-               nbconvert = super.buildPythonPackage {
-                 name = "nbconvert-5.3.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [mistune Jinja2 Pygments traitlets jupyter-core nbformat entrypoints bleach pandocfilters testpath];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/b9/a4/d0a0938ad6f5eeb4dea4e73d255c617ef94b0b2849d51194c9bbdb838412/nbconvert-5.3.1.tar.gz";
-                   md5 = "c128d0d93d02f70a85429a383dae96d2";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                   license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
                  };
                };
-               nbformat = super.buildPythonPackage {
-                 name = "nbformat-4.4.0";
-                 buildInputs = with self; [];
+               "pickleshare" = super.buildPythonPackage {
+                 name = "pickleshare-0.7.4";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [ipython-genutils traitlets jsonschema jupyter-core];
+                 propagatedBuildInputs = [
+                   self."pathlib2"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/6e/0e/160754f7ae3e984863f585a3743b0ed1702043a81245907c8fae2d537155/nbformat-4.4.0.tar.gz";
-                   md5 = "2d5f873138d9fbc2a3f9eaaebca3b8a1";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               objgraph = super.buildPythonPackage {
-                 name = "objgraph-3.1.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [graphviz];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/be/58/9ca81a20cc837054e94866df1475d899caaa94f3732b8a46006858b015f7/objgraph-3.1.1.tar.gz";
-                   md5 = "253af9944763377877c3678d8aaebb8b";
+                   url = "https://files.pythonhosted.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz";
+                   sha256 = "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               packaging = super.buildPythonPackage {
-                 name = "packaging-15.2";
-                 buildInputs = with self; [];
+               "plaster" = super.buildPythonPackage {
+                 name = "plaster-1.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/24/c4/185da1304f07047dc9e0c46c31db75c0351bd73458ac3efad7da3dbcfbe1/packaging-15.2.tar.gz";
-                   md5 = "c16093476f6ced42128bf610e5db3784";
+                   url = "https://files.pythonhosted.org/packages/37/e1/56d04382d718d32751017d32f351214384e529b794084eee20bb52405563/plaster-1.0.tar.gz";
+                   sha256 = "1hy8k0nv2mxq94y5aysk6hjk9ryb4bsd13g83m60hcyzxz3wflc3";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.asl20 ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               pandocfilters = super.buildPythonPackage {
-                 name = "pandocfilters-1.4.2";
-                 buildInputs = with self; [];
+               "plaster-pastedeploy" = super.buildPythonPackage {
+                 name = "plaster-pastedeploy-0.6";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."pastedeploy"
+                   self."plaster"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/4c/ea/236e2584af67bb6df960832731a6e5325fd4441de001767da328c33368ce/pandocfilters-1.4.2.tar.gz";
-                   md5 = "dc391791ef54c7de1572d7b46b63361f";
+                   url = "https://files.pythonhosted.org/packages/3f/e7/6a6833158d2038ec40085433308a1e164fd1dac595513f6dd556d5669bb8/plaster_pastedeploy-0.6.tar.gz";
+                   sha256 = "1bkggk18f4z2bmsmxyxabvf62znvjwbivzh880419r3ap0616cf2";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               pathlib2 = super.buildPythonPackage {
-                 name = "pathlib2-2.3.0";
-                 buildInputs = with self; [];
+               "pluggy" = super.buildPythonPackage {
+                 name = "pluggy-0.6.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six scandir];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/a1/14/df0deb867c2733f7d857523c10942b3d6612a1b222502fdffa9439943dfb/pathlib2-2.3.0.tar.gz";
-                   md5 = "89c90409d11fd5947966b6a30a47d18c";
+                   url = "https://files.pythonhosted.org/packages/11/bf/cbeb8cdfaffa9f2ea154a30ae31a9d04a1209312e2919138b4171a1f8199/pluggy-0.6.0.tar.gz";
+                   sha256 = "1zqckndfn85l1cd8pndw212zg1bq9fkg1nnj32kp2mppppsyg2kz";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               peppercorn = super.buildPythonPackage {
-                 name = "peppercorn-0.5";
-                 buildInputs = with self; [];
+               "prompt-toolkit" = super.buildPythonPackage {
+                 name = "prompt-toolkit-1.0.15";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."six"
+                   self."wcwidth"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/45/ec/a62ec317d1324a01567c5221b420742f094f05ee48097e5157d32be3755c/peppercorn-0.5.tar.gz";
-                   md5 = "f08efbca5790019ab45d76b7244abd40";
+                   url = "https://files.pythonhosted.org/packages/8a/ad/cf6b128866e78ad6d7f1dc5b7f99885fb813393d9860778b2984582e81b5/prompt_toolkit-1.0.15.tar.gz";
+                   sha256 = "05v9h5nydljwpj5nm8n804ms0glajwfy1zagrzqrg91wk3qqi1c5";
                  };
                  meta = {
-                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               pexpect = super.buildPythonPackage {
-                 name = "pexpect-4.4.0";
-                 buildInputs = with self; [];
+               "psutil" = super.buildPythonPackage {
+                 name = "psutil-5.4.6";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [ptyprocess];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/fa/c3/60c0cbf96f242d0b47a82e9ca634dcd6dcb043832cf05e17540812e1c707/pexpect-4.4.0.tar.gz";
-                   md5 = "e9b07f0765df8245ac72201d757baaef";
+                   url = "https://files.pythonhosted.org/packages/51/9e/0f8f5423ce28c9109807024f7bdde776ed0b1161de20b408875de7e030c3/psutil-5.4.6.tar.gz";
+                   sha256 = "1xmw4qi6hnrhw81xqzkvmsm9im7j2vkk4v26ycjwq2jczqsmlvk8";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "psycopg2" = super.buildPythonPackage {
+                 name = "psycopg2-2.7.4";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/74/83/51580322ed0e82cba7ad8e0af590b8fb2cf11bd5aaa1ed872661bd36f462/psycopg2-2.7.4.tar.gz";
+                   sha256 = "02b2yaf1hlwb91xkscbzmajpfj5z3d8yikzh5r48fs8gss8i3xcb";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.zpl21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
                  };
                };
-               pickleshare = super.buildPythonPackage {
-                 name = "pickleshare-0.7.4";
-                 buildInputs = with self; [];
+               "ptyprocess" = super.buildPythonPackage {
+                 name = "ptyprocess-0.6.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [pathlib2];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz";
-                   md5 = "6a9e5dd8dfc023031f6b7b3f824cab12";
+                   url = "https://files.pythonhosted.org/packages/7d/2d/e4b8733cf79b7309d84c9081a4ab558c89d8c89da5961bf4ddb050ca1ce0/ptyprocess-0.6.0.tar.gz";
+                   sha256 = "1h4lcd3w5nrxnsk436ar7fwkiy5rfn5wj2xwy9l0r4mdqnf2jgwj";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [  ];
                  };
                };
-               plaster = super.buildPythonPackage {
-                 name = "plaster-1.0";
-                 buildInputs = with self; [];
+               "py" = super.buildPythonPackage {
+                 name = "py-1.5.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/37/e1/56d04382d718d32751017d32f351214384e529b794084eee20bb52405563/plaster-1.0.tar.gz";
-                   md5 = "80e6beb4760c16fea31754babcc0576e";
+                   url = "https://files.pythonhosted.org/packages/f7/84/b4c6e84672c4ceb94f727f3da8344037b62cee960d80e999b1cd9b832d83/py-1.5.3.tar.gz";
+                   sha256 = "10gq2lckvgwlk9w6yzijhzkarx44hsaknd0ypa08wlnpjnsgmj99";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               plaster-pastedeploy = super.buildPythonPackage {
-                 name = "plaster-pastedeploy-0.4.2";
-                 buildInputs = with self; [];
+               "py-bcrypt" = super.buildPythonPackage {
+                 name = "py-bcrypt-0.4";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [PasteDeploy plaster];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/2c/62/0daf9c0be958e785023e583e51baac15863699e956bfb3d448898d80edd8/plaster_pastedeploy-0.4.2.tar.gz";
-                   md5 = "58fd7852002909378e818c9d5b71e90a";
+                   url = "https://files.pythonhosted.org/packages/68/b1/1c3068c5c4d2e35c48b38dcc865301ebfdf45f54507086ac65ced1fd3b3d/py-bcrypt-0.4.tar.gz";
+                   sha256 = "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.mit ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               prompt-toolkit = super.buildPythonPackage {
-                 name = "prompt-toolkit-1.0.15";
-                 buildInputs = with self; [];
+               "py-gfm" = super.buildPythonPackage {
+                 name = "py-gfm-0.1.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six wcwidth];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                   self."markdown"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/8a/ad/cf6b128866e78ad6d7f1dc5b7f99885fb813393d9860778b2984582e81b5/prompt_toolkit-1.0.15.tar.gz";
-                   md5 = "8fe70295006dbc8afedd43e5eba99032";
+                   url = "https://files.pythonhosted.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
+                   sha256 = "162ggwwj0af9g3s1k8m4bfwbvis03x9pinnf35mj79pb90rf81zi";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "pyasn1" = super.buildPythonPackage {
+                 name = "pyasn1-0.4.4";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/10/46/059775dc8e50f722d205452bced4b3cc965d27e8c3389156acd3b1123ae3/pyasn1-0.4.4.tar.gz";
+                   sha256 = "0drilmx5j25aplfr5wrml0030cs5fgxp9yp94fhllxgx28yjm3zm";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               psutil = super.buildPythonPackage {
-                 name = "psutil-5.4.3";
-                 buildInputs = with self; [];
+               "pyasn1-modules" = super.buildPythonPackage {
+                 name = "pyasn1-modules-0.2.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."pyasn1"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/e2/e1/600326635f97fee89bf8426fef14c5c29f4849c79f68fd79f433d8c1bd96/psutil-5.4.3.tar.gz";
-                   md5 = "3b291833dbea631db9d271aa602a169a";
+                   url = "https://files.pythonhosted.org/packages/37/33/74ebdc52be534e683dc91faf263931bc00ae05c6073909fde53999088541/pyasn1-modules-0.2.2.tar.gz";
+                   sha256 = "0ivm850yi7ajjbi8j115qpsj95bgxdsx48nbjzg0zip788c3xkx0";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               psycopg2 = super.buildPythonPackage {
-                 name = "psycopg2-2.7.3.2";
-                 buildInputs = with self; [];
+               "pycrypto" = super.buildPythonPackage {
+                 name = "pycrypto-2.6.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/dd/47/000b405d73ca22980684fd7bd3318690cc03cfa3b2ae1c5b7fff8050b28a/psycopg2-2.7.3.2.tar.gz";
-                   md5 = "8114e672d5f23fa5329874a4314fbd6f";
+                   url = "https://files.pythonhosted.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-2.6.1.tar.gz";
+                   sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.zpt21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
+                   license = [ pkgs.lib.licenses.publicDomain ];
                  };
                };
-               ptyprocess = super.buildPythonPackage {
-                 name = "ptyprocess-0.5.2";
-                 buildInputs = with self; [];
+               "pycurl" = super.buildPythonPackage {
+                 name = "pycurl-7.43.0.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/51/83/5d07dc35534640b06f9d9f1a1d2bc2513fb9cc7595a1b0e28ae5477056ce/ptyprocess-0.5.2.tar.gz";
-                   md5 = "d3b8febae1b8c53b054bd818d0bb8665";
+                   url = "https://files.pythonhosted.org/packages/e8/e4/0dbb8735407189f00b33d84122b9be52c790c7c3b25286826f4e1bdb7bde/pycurl-7.43.0.2.tar.gz";
+                   sha256 = "1915kb04k1j4y6k1dx1sgnbddxrl9r1n4q928if2lkrdm73xy30g";
                  };
                  meta = {
-                   license = [  ];
+                   license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
                  };
                };
-               py = super.buildPythonPackage {
-                 name = "py-1.5.2";
-                 buildInputs = with self; [];
+               "pyflakes" = super.buildPythonPackage {
+                 name = "pyflakes-0.8.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/90/e3/e075127d39d35f09a500ebb4a90afd10f9ef0a1d28a6d09abeec0e444fdd/py-1.5.2.tar.gz";
-                   md5 = "279ca69c632069e1b71e11b14641ca28";
+                   url = "https://files.pythonhosted.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
+                   sha256 = "0sbpq6pqm1i9wqi41mlfrsc5rk92jv4mskvlyxmnhlbdnc80ma1z";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               py-bcrypt = super.buildPythonPackage {
-                 name = "py-bcrypt-0.4";
-                 buildInputs = with self; [];
+               "pygments" = super.buildPythonPackage {
+                 name = "pygments-2.2.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/68/b1/1c3068c5c4d2e35c48b38dcc865301ebfdf45f54507086ac65ced1fd3b3d/py-bcrypt-0.4.tar.gz";
-                   md5 = "dd8b367d6b716a2ea2e72392525f4e36";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               py-gfm = super.buildPythonPackage {
-                 name = "py-gfm-0.1.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools Markdown];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
-                   md5 = "e588d9e69640a241b97e2c59c22527a6";
+                   url = "https://files.pythonhosted.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-2.2.0.tar.gz";
+                   sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               pycrypto = super.buildPythonPackage {
-                 name = "pycrypto-2.6.1";
-                 buildInputs = with self; [];
+               "pygments-markdown-lexer" = super.buildPythonPackage {
+                 name = "pygments-markdown-lexer-0.1.0.dev39";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."pygments"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-2.6.1.tar.gz";
-                   md5 = "55a61a054aa66812daf5161a0d5d7eda";
+                   url = "https://files.pythonhosted.org/packages/c3/12/674cdee66635d638cedb2c5d9c85ce507b7b2f91bdba29e482f1b1160ff6/pygments-markdown-lexer-0.1.0.dev39.zip";
+                   sha256 = "1pzb5wy23q3fhs0rqzasjnw6hdzwjngpakb73i98cn0b8lk8q4jc";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.publicDomain ];
+                   license = [ pkgs.lib.licenses.asl20 ];
                  };
                };
-               pycurl = super.buildPythonPackage {
-                 name = "pycurl-7.19.5";
-                 buildInputs = with self; [];
+               "pymysql" = super.buildPythonPackage {
+                 name = "pymysql-0.8.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/6c/48/13bad289ef6f4869b1d8fc11ae54de8cfb3cc4a2eb9f7419c506f763be46/pycurl-7.19.5.tar.gz";
-                   md5 = "47b4eac84118e2606658122104e62072";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
-                 };
-               };
-               pyflakes = super.buildPythonPackage {
-                 name = "pyflakes-0.8.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
-                   md5 = "905fe91ad14b912807e8fdc2ac2e2c23";
+                   url = "https://files.pythonhosted.org/packages/44/39/6bcb83cae0095a31b6be4511707fdf2009d3e29903a55a0494d3a9a2fac0/PyMySQL-0.8.1.tar.gz";
+                   sha256 = "0a96crz55bw4h6myh833skrli7b0ck89m3x673y2z2ryy7zrpq9l";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               pygments-markdown-lexer = super.buildPythonPackage {
-                 name = "pygments-markdown-lexer-0.1.0.dev39";
-                 buildInputs = with self; [];
+               "pyotp" = super.buildPythonPackage {
+                 name = "pyotp-2.2.6";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [Pygments];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/c3/12/674cdee66635d638cedb2c5d9c85ce507b7b2f91bdba29e482f1b1160ff6/pygments-markdown-lexer-0.1.0.dev39.zip";
-                   md5 = "6360fe0f6d1f896e35b7a0142ce6459c";
+                   url = "https://files.pythonhosted.org/packages/67/69/131f5ad63de40c30f3be88d891e4a2ea1b69398528db99bc1e5c543422fa/pyotp-2.2.6.tar.gz";
+                   sha256 = "0sdxxvr3j4j0pk26v258jpxhgpbnpmyqhvzhl24hsd50j7fk14fx";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.asl20 ];
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               pyparsing = super.buildPythonPackage {
+               "pyparsing" = super.buildPythonPackage {
                  name = "pyparsing-1.5.7";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/6f/2c/47457771c02a8ff0f302b695e094ec309e30452232bd79198ee94fda689f/pyparsing-1.5.7.tar.gz";
-                   md5 = "9be0fcdcc595199c646ab317c1d9a709";
+                   url = "https://files.pythonhosted.org/packages/6f/2c/47457771c02a8ff0f302b695e094ec309e30452232bd79198ee94fda689f/pyparsing-1.5.7.tar.gz";
+                   sha256 = "17z7ws076z977sclj628fvwrp8y9j2rvdjcsq42v129n1gwi8vk4";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               pyramid = super.buildPythonPackage {
-                 name = "pyramid-1.9.1";
-                 buildInputs = with self; [];
+               "pyramid" = super.buildPythonPackage {
+                 name = "pyramid-1.9.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools WebOb repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy plaster plaster-pastedeploy hupper];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                   self."webob"
+                   self."repoze.lru"
+                   self."zope.interface"
+                   self."zope.deprecation"
+                   self."venusian"
+                   self."translationstring"
+                   self."pastedeploy"
+                   self."plaster"
+                   self."plaster-pastedeploy"
+                   self."hupper"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/9a/57/73447be9e7d0512d601e3f0a1fb9d7d1efb941911f49efdfe036d2826507/pyramid-1.9.1.tar.gz";
-                   md5 = "0163e19c58c2d12976a3b6fdb57e052d";
+                   url = "https://files.pythonhosted.org/packages/a0/c1/b321d07cfc4870541989ad131c86a1d593bfe802af0eca9718a0dadfb97a/pyramid-1.9.2.tar.gz";
+                   sha256 = "09drsl0346nchgxp2j7sa5hlk7mkhfld9wvbd0wicacrp26a92fg";
                  };
                  meta = {
                    license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
                  };
                };
-               pyramid-beaker = super.buildPythonPackage {
+               "pyramid-beaker" = super.buildPythonPackage {
                  name = "pyramid-beaker-0.8";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [pyramid Beaker];
+                 propagatedBuildInputs = [
+                   self."pyramid"
+                   self."beaker"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
-                   md5 = "22f14be31b06549f80890e2c63a93834";
+                   url = "https://files.pythonhosted.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
+                   sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
                  };
                  meta = {
                    license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
                  };
                };
-               pyramid-debugtoolbar = super.buildPythonPackage {
-                 name = "pyramid-debugtoolbar-4.3";
-                 buildInputs = with self; [];
+               "pyramid-debugtoolbar" = super.buildPythonPackage {
+                 name = "pyramid-debugtoolbar-4.4";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [pyramid pyramid-mako repoze.lru Pygments ipaddress];
+                 propagatedBuildInputs = [
+                   self."pyramid"
+                   self."pyramid-mako"
+                   self."repoze.lru"
+                   self."pygments"
+                   self."ipaddress"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/a4/40/f09d8800bfc3c09bdb6c95f37bb61c890dc62c19c4e7caa304da7aa77403/pyramid_debugtoolbar-4.3.tar.gz";
-                   md5 = "9c49029e9f0695130499ef6416ffaaf8";
+                   url = "https://files.pythonhosted.org/packages/00/6f/c04eb4e715a7a5a4b24079ab7ffd1dceb1f70b2e24fc17686a2922dbac0a/pyramid_debugtoolbar-4.4.tar.gz";
+                   sha256 = "17p7nxvapvy2hab1rah3ndq2kbs4v83pixj8x2n4m7008ai9lxsz";
                  };
                  meta = {
                    license = [ { fullName = "Repoze Public License"; } pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               pyramid-jinja2 = super.buildPythonPackage {
+               "pyramid-jinja2" = super.buildPythonPackage {
                  name = "pyramid-jinja2-2.7";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
+                 propagatedBuildInputs = [
+                   self."pyramid"
+                   self."zope.deprecation"
+                   self."jinja2"
+                   self."markupsafe"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/d8/80/d60a7233823de22ce77bd864a8a83736a1fe8b49884b08303a2e68b2c853/pyramid_jinja2-2.7.tar.gz";
-                   md5 = "c2f8b2cd7b73a6f1d9a311fcfaf4fb92";
+                   url = "https://files.pythonhosted.org/packages/d8/80/d60a7233823de22ce77bd864a8a83736a1fe8b49884b08303a2e68b2c853/pyramid_jinja2-2.7.tar.gz";
+                   sha256 = "1sz5s0pp5jqhf4w22w9527yz8hgdi4mhr6apd6vw1gm5clghh8aw";
                  };
                  meta = {
                    license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
                  };
                };
-               pyramid-mako = super.buildPythonPackage {
+               "pyramid-mako" = super.buildPythonPackage {
                  name = "pyramid-mako-1.0.2";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [pyramid Mako];
+                 propagatedBuildInputs = [
+                   self."pyramid"
+                   self."mako"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
-                   md5 = "ee25343a97eb76bd90abdc2a774eb48a";
+                   url = "https://files.pythonhosted.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
+                   sha256 = "18gk2vliq8z4acblsl6yzgbvnr9rlxjlcqir47km7kvlk1xri83d";
                  };
                  meta = {
                    license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
                  };
                };
-               pysqlite = super.buildPythonPackage {
+               "pysqlite" = super.buildPythonPackage {
                  name = "pysqlite-2.8.3";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/42/02/981b6703e3c83c5b25a829c6e77aad059f9481b0bbacb47e6e8ca12bd731/pysqlite-2.8.3.tar.gz";
-                   md5 = "033f17b8644577715aee55e8832ac9fc";
+                   url = "https://files.pythonhosted.org/packages/42/02/981b6703e3c83c5b25a829c6e77aad059f9481b0bbacb47e6e8ca12bd731/pysqlite-2.8.3.tar.gz";
+                   sha256 = "1424gwq9sil2ffmnizk60q36vydkv8rxs6m7xs987kz8cdc37lqp";
                  };
                  meta = {
                    license = [ { fullName = "zlib/libpng License"; } { fullName = "zlib/libpng license"; } ];
                  };
                };
-               pytest = super.buildPythonPackage {
-                 name = "pytest-3.2.5";
-                 buildInputs = with self; [];
+               "pytest" = super.buildPythonPackage {
+                 name = "pytest-3.6.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [py setuptools];
+                 propagatedBuildInputs = [
+                   self."py"
+                   self."six"
+                   self."setuptools"
+                   self."attrs"
+                   self."more-itertools"
+                   self."atomicwrites"
+                   self."pluggy"
+                   self."funcsigs"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/1f/f8/8cd74c16952163ce0db0bd95fdd8810cbf093c08be00e6e665ebf0dc3138/pytest-3.2.5.tar.gz";
-                   md5 = "6dbe9bb093883f75394a689a1426ac6f";
+                   url = "https://files.pythonhosted.org/packages/67/6a/5bcdc22f8dbada1d2910d6e1a3a03f6b14306c78f81122890735b28be4bf/pytest-3.6.0.tar.gz";
+                   sha256 = "0bdfazvjjbxssqzyvkb3m2x2in7xv56ipr899l00s87k7815sm9r";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               pytest-catchlog = super.buildPythonPackage {
-                 name = "pytest-catchlog-1.2.2";
-                 buildInputs = with self; [];
+               "pytest-cov" = super.buildPythonPackage {
+                 name = "pytest-cov-2.5.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [py pytest];
+                 propagatedBuildInputs = [
+                   self."pytest"
+                   self."coverage"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/f2/2b/2faccdb1a978fab9dd0bf31cca9f6847fbe9184a0bdcc3011ac41dd44191/pytest-catchlog-1.2.2.zip";
-                   md5 = "09d890c54c7456c818102b7ff8c182c8";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               pytest-cov = super.buildPythonPackage {
-                 name = "pytest-cov-2.5.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [pytest coverage];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz";
-                   md5 = "5acf38d4909e19819eb5c1754fbfc0ac";
+                   url = "https://files.pythonhosted.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz";
+                   sha256 = "0bbfpwdh9k3636bxc88vz9fa7vf4akchgn513ql1vd0xy4n7bah3";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.mit ];
                  };
                };
-               pytest-profiling = super.buildPythonPackage {
-                 name = "pytest-profiling-1.2.11";
-                 buildInputs = with self; [];
+               "pytest-profiling" = super.buildPythonPackage {
+                 name = "pytest-profiling-1.3.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six pytest gprof2dot];
+                 propagatedBuildInputs = [
+                   self."six"
+                   self."pytest"
+                   self."gprof2dot"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/c0/4a/b4aa786e93c07a86f1f87c581a36bf355a9e06a9da7e00dbd05047626bd2/pytest-profiling-1.2.11.tar.gz";
-                   md5 = "9ef6b60248731be5d44477980408e8f7";
+                   url = "https://files.pythonhosted.org/packages/f5/34/4626126e041a51ef50a80d0619519b18d20aef249aac25b0d0fdd47e57ee/pytest-profiling-1.3.0.tar.gz";
+                   sha256 = "08r5afx5z22yvpmsnl91l4amsy1yxn8qsmm61mhp06mz8zjs51kb";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               pytest-runner = super.buildPythonPackage {
-                 name = "pytest-runner-3.0";
-                 buildInputs = with self; [];
+               "pytest-runner" = super.buildPythonPackage {
+                 name = "pytest-runner-4.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/65/b4/ae89338cd2d81e2cc54bd6db2e962bfe948f612303610d68ab24539ac2d1/pytest-runner-3.0.tar.gz";
-                   md5 = "8f8363a52bbabc4cedd5e239beb2ba11";
+                   url = "https://files.pythonhosted.org/packages/9e/b7/fe6e8f87f9a756fd06722216f1b6698ccba4d269eac6329d9f0c441d0f93/pytest-runner-4.2.tar.gz";
+                   sha256 = "1gkpyphawxz38ni1gdq1fmwyqcg02m7ypzqvv46z06crwdxi2gyj";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               pytest-sugar = super.buildPythonPackage {
-                 name = "pytest-sugar-0.9.0";
-                 buildInputs = with self; [];
+               "pytest-sugar" = super.buildPythonPackage {
+                 name = "pytest-sugar-0.9.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [pytest termcolor];
+                 propagatedBuildInputs = [
+                   self."pytest"
+                   self."termcolor"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/49/d8/c5ff6cca3ce2ebd8b73eec89779bf6b4a7737456a70e8ea4d44c1ff90f71/pytest-sugar-0.9.0.tar.gz";
-                   md5 = "89fbff17277fa6a95a560a04b68cb9f9";
+                   url = "https://files.pythonhosted.org/packages/3e/6a/a3f909083079d03bde11d06ab23088886bbe25f2c97fbe4bb865e2bf05bc/pytest-sugar-0.9.1.tar.gz";
+                   sha256 = "0b4av40dv30727m54v211r0nzwjp2ajkjgxix6j484qjmwpw935b";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               pytest-timeout = super.buildPythonPackage {
-                 name = "pytest-timeout-1.2.0";
-                 buildInputs = with self; [];
+               "pytest-timeout" = super.buildPythonPackage {
+                 name = "pytest-timeout-1.2.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [pytest];
+                 propagatedBuildInputs = [
+                   self."pytest"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/cc/b7/b2a61365ea6b6d2e8881360ae7ed8dad0327ad2df89f2f0be4a02304deb2/pytest-timeout-1.2.0.tar.gz";
-                   md5 = "83607d91aa163562c7ee835da57d061d";
+                   url = "https://files.pythonhosted.org/packages/be/e9/a9106b8bc87521c6813060f50f7d1fdc15665bc1bbbe71c0ffc1c571aaa2/pytest-timeout-1.2.1.tar.gz";
+                   sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit { fullName = "DFSG approved"; } ];
                  };
                };
-               python-dateutil = super.buildPythonPackage {
-                 name = "python-dateutil-2.6.1";
-                 buildInputs = with self; [];
+               "python-dateutil" = super.buildPythonPackage {
+                 name = "python-dateutil-2.7.3";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [six];
+                 propagatedBuildInputs = [
+                   self."six"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/54/bb/f1db86504f7a49e1d9b9301531181b00a1c7325dc85a29160ee3eaa73a54/python-dateutil-2.6.1.tar.gz";
-                   md5 = "db38f6b4511cefd76014745bb0cc45a4";
+                   url = "https://files.pythonhosted.org/packages/a0/b0/a4e3241d2dee665fea11baec21389aec6886655cd4db7647ddf96c3fad15/python-dateutil-2.7.3.tar.gz";
+                   sha256 = "1f7h54lg0w2ckch7592xpjkh8dg87k2br256h0iw49zn6bg02w72";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal { fullName = "Simplified BSD"; } ];
+                   license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 { fullName = "Dual License"; } ];
                  };
                };
-               python-editor = super.buildPythonPackage {
+               "python-editor" = super.buildPythonPackage {
                  name = "python-editor-1.0.3";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/65/1e/adf6e000ea5dc909aa420352d6ba37f16434c8a3c2fa030445411a1ed545/python-editor-1.0.3.tar.gz";
-                   md5 = "0aca5f2ef176ce68e98a5b7e31372835";
+                   url = "https://files.pythonhosted.org/packages/65/1e/adf6e000ea5dc909aa420352d6ba37f16434c8a3c2fa030445411a1ed545/python-editor-1.0.3.tar.gz";
+                   sha256 = "0rf5xz8vw93v7mhdcvind7fkykipzga430wkcd7wk892xsn6dh53";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.asl20 { fullName = "Apache"; } ];
                  };
                };
-               python-ldap = super.buildPythonPackage {
-                 name = "python-ldap-2.4.45";
-                 buildInputs = with self; [];
+               "python-ldap" = super.buildPythonPackage {
+                 name = "python-ldap-3.1.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools];
+                 propagatedBuildInputs = [
+                   self."pyasn1"
+                   self."pyasn1-modules"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/ce/52/6b5372d0166820f4a4b0a88ed73dc7504219355049fc1d266d8ccdb7942e/python-ldap-2.4.45.tar.gz";
-                   md5 = "6108e189a44eea8bc7d1cc281c222978";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.psfl ];
-                 };
-               };
-               python-memcached = super.buildPythonPackage {
-                 name = "python-memcached-1.58";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [six];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/f7/62/14b2448cfb04427366f24104c9da97cf8ea380d7258a3233f066a951a8d8/python-memcached-1.58.tar.gz";
-                   md5 = "23b258105013d14d899828d334e6b044";
+                   url = "https://files.pythonhosted.org/packages/7f/1c/28d721dff2fcd2fef9d55b40df63a00be26ec8a11e8c6fc612ae642f9cfd/python-ldap-3.1.0.tar.gz";
+                   sha256 = "1i97nwfnraylyn0myxlf3vciicrf5h6fymrcff9c00k581wmx5s1";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.psfl ];
                  };
                };
-               python-pam = super.buildPythonPackage {
-                 name = "python-pam-1.8.2";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/de/8c/f8f5d38b4f26893af267ea0b39023d4951705ab0413a39e0cf7cf4900505/python-pam-1.8.2.tar.gz";
-                   md5 = "db71b6b999246fb05d78ecfbe166629d";
-                 };
-                 meta = {
-                   license = [ { fullName = "License :: OSI Approved :: MIT License"; } pkgs.lib.licenses.mit ];
-                 };
-               };
-               pytz = super.buildPythonPackage {
-                 name = "pytz-2018.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/1b/50/4cdc62fc0753595fc16c8f722a89740f487c6e5670c644eb8983946777be/pytz-2018.3.tar.gz";
-                   md5 = "abb07c09c79f78d7c04f222a550c99ef";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               pyzmq = super.buildPythonPackage {
-                 name = "pyzmq-14.6.0";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/8a/3b/5463d5a9d712cd8bbdac335daece0d69f6a6792da4e3dd89956c0db4e4e6/pyzmq-14.6.0.tar.gz";
-                   md5 = "395b5de95a931afa5b14c9349a5b8024";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal { fullName = "LGPL+BSD"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
-                 };
-               };
-               redis = super.buildPythonPackage {
-                 name = "redis-2.10.6";
-                 buildInputs = with self; [];
+               "python-memcached" = super.buildPythonPackage {
+                 name = "python-memcached-1.59";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/09/8d/6d34b75326bf96d4139a2ddd8e74b80840f800a0a79f9294399e212cb9a7/redis-2.10.6.tar.gz";
-                   md5 = "048348d8cfe0b5d0bba2f4d835005c3b";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               repoze.lru = super.buildPythonPackage {
-                 name = "repoze.lru-0.7";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/12/bc/595a77c4b5e204847fdf19268314ef59c85193a9dc9f83630fc459c0fee5/repoze.lru-0.7.tar.gz";
-                   md5 = "c08cc030387e0b1fc53c5c7d964b35e2";
-                 };
-                 meta = {
-                   license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-                 };
-               };
-               requests = super.buildPythonPackage {
-                 name = "requests-2.9.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/f9/6d/07c44fb1ebe04d069459a189e7dab9e4abfe9432adcd4477367c25332748/requests-2.9.1.tar.gz";
-                   md5 = "0b7f480d19012ec52bab78292efd976d";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.asl20 ];
-                 };
-               };
-               rhodecode-enterprise-ce = super.buildPythonPackage {
-                 name = "rhodecode-enterprise-ce-4.12.4";
-                 buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj];
-                 doCheck = true;
-                 propagatedBuildInputs = with self; [setuptools-scm amqp authomatic Babel Beaker celery Chameleon channelstream click colander configobj cssselect decorator deform docutils dogpile.cache dogpile.core ecdsa FormEncode future futures gnureadline infrae.cache iso8601 itsdangerous Jinja2 billiard kombu lxml Mako Markdown MarkupSafe msgpack-python MySQL-python objgraph packaging Paste PasteDeploy PasteScript pathlib2 peppercorn psutil psycopg2 py-bcrypt pycrypto pycurl pyflakes pygments-markdown-lexer Pygments pyparsing pyramid-beaker pyramid-debugtoolbar pyramid-jinja2 pyramid-mako pyramid pysqlite python-dateutil python-ldap python-memcached python-pam pytz tzlocal pyzmq py-gfm redis repoze.lru requests Routes setproctitle simplejson six SQLAlchemy sshpubkeys subprocess32 supervisor Tempita translationstring trollius urllib3 URLObject venusian WebError WebHelpers2 WebHelpers WebOb Whoosh wsgiref zope.cachedescriptors zope.deprecation zope.event zope.interface nbconvert bleach nbformat jupyter-client alembic invoke bumpversion transifex-client gevent greenlet gunicorn waitress uWSGI ipdb ipython CProfileV bottle rhodecode-tools appenlight-client pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
-                 src = ./.;
-                 meta = {
-                   license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
-                 };
-               };
-               rhodecode-tools = super.buildPythonPackage {
-                 name = "rhodecode-tools-0.14.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests elasticsearch elasticsearch-dsl urllib3 Whoosh];
-                 src = fetchurl {
-                   url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.14.1.tar.gz?md5=0b9c2caad160b68889f8172ea54af7b2";
-                   md5 = "0b9c2caad160b68889f8172ea54af7b2";
-                 };
-                 meta = {
-                   license = [ { fullName = "AGPLv3 and Proprietary"; } ];
-                 };
-               };
-               scandir = super.buildPythonPackage {
-                 name = "scandir-1.7";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."six"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/13/bb/e541b74230bbf7a20a3949a2ee6631be299378a784f5445aa5d0047c192b/scandir-1.7.tar.gz";
-                   md5 = "037e5f24d1a0e78b17faca72dea9555f";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
-                 };
-               };
-               setproctitle = super.buildPythonPackage {
-                 name = "setproctitle-1.1.10";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3/setproctitle-1.1.10.tar.gz";
-                   md5 = "2dcdd1b761700a5a13252fea3dfd1977";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               setuptools = super.buildPythonPackage {
-                 name = "setuptools-30.1.0";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/1e/43/002c8616db9a3e7be23c2556e39b90a32bb40ba0dc652de1999d5334d372/setuptools-30.1.0.tar.gz";
-                   md5 = "cac497f42e5096ac8df29e38d3f81c3e";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               setuptools-scm = super.buildPythonPackage {
-                 name = "setuptools-scm-1.15.6";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/03/6d/aafdd01edd227ee879b691455bf19895091872af7e48192bea1758c82032/setuptools_scm-1.15.6.tar.gz";
-                   md5 = "f17493d53f0d842bb0152f214775640b";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               simplegeneric = super.buildPythonPackage {
-                 name = "simplegeneric-0.8.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
-                   md5 = "f9c1fab00fd981be588fc32759f474e3";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.zpt21 ];
-                 };
-               };
-               simplejson = super.buildPythonPackage {
-                 name = "simplejson-3.11.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/08/48/c97b668d6da7d7bebe7ea1817a6f76394b0ec959cb04214ca833c34359df/simplejson-3.11.1.tar.gz";
-                   md5 = "6e2f1bd5fb0a926facf5d89d217a7183";
-                 };
-                 meta = {
-                   license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ];
-                 };
-               };
-               six = super.buildPythonPackage {
-                 name = "six-1.11.0";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
-                   md5 = "d12789f9baf7e9fb2524c0c64f1773f8";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.mit ];
-                 };
-               };
-               sshpubkeys = super.buildPythonPackage {
-                 name = "sshpubkeys-2.2.0";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [pycrypto ecdsa];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/27/da/337fabeb3dca6b62039a93ceaa636f25065e0ae92b575b1235342076cf0a/sshpubkeys-2.2.0.tar.gz";
-                   md5 = "458e45f6b92b1afa84f0ffe1f1c90935";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.bsdOriginal ];
-                 };
-               };
-               subprocess32 = super.buildPythonPackage {
-                 name = "subprocess32-3.2.7";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/b8/2f/49e53b0d0e94611a2dc624a1ad24d41b6d94d0f1b0a078443407ea2214c2/subprocess32-3.2.7.tar.gz";
-                   md5 = "824c801e479d3e916879aae3e9c15e16";
+                   url = "https://files.pythonhosted.org/packages/90/59/5faf6e3cd8a568dd4f737ddae4f2e54204fd8c51f90bf8df99aca6c22318/python-memcached-1.59.tar.gz";
+                   sha256 = "0kvyapavbirk2x3n1jx4yb9nyigrj1s3x15nm3qhpvhkpqvqdqm2";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.psfl ];
                  };
                };
-               supervisor = super.buildPythonPackage {
-                 name = "supervisor-3.3.4";
-                 buildInputs = with self; [];
+               "python-pam" = super.buildPythonPackage {
+                 name = "python-pam-1.8.4";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [meld3];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/44/60/698e54b4a4a9b956b2d709b4b7b676119c833d811d53ee2500f1b5e96dc3/supervisor-3.3.4.tar.gz";
-                   md5 = "f1814d71d820ddfa8c86d46a72314cec";
+                   url = "https://files.pythonhosted.org/packages/01/16/544d01cae9f28e0292dbd092b6b8b0bf222b528f362ee768a5bed2140111/python-pam-1.8.4.tar.gz";
+                   sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8";
+                 };
+                 meta = {
+                   license = [ { fullName = "License :: OSI Approved :: MIT License"; } pkgs.lib.licenses.mit ];
+                 };
+               };
+               "pytz" = super.buildPythonPackage {
+                 name = "pytz-2018.4";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz";
+                   sha256 = "0jgpqx3kk2rhv81j1izjxvmx8d0x7hzs1857pgqnixic5wq2ar60";
                  };
                  meta = {
-                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               termcolor = super.buildPythonPackage {
-                 name = "termcolor-1.1.0";
-                 buildInputs = with self; [];
+               "pyzmq" = super.buildPythonPackage {
+                 name = "pyzmq-14.6.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz";
-                   md5 = "043e89644f8909d462fbbfa511c768df";
+                   url = "https://files.pythonhosted.org/packages/8a/3b/5463d5a9d712cd8bbdac335daece0d69f6a6792da4e3dd89956c0db4e4e6/pyzmq-14.6.0.tar.gz";
+                   sha256 = "1frmbjykvhmdg64g7sn20c9fpamrsfxwci1nhhg8q7jgz5pq0ikp";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal { fullName = "LGPL+BSD"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
+                 };
+               };
+               "redis" = super.buildPythonPackage {
+                 name = "redis-2.10.6";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/09/8d/6d34b75326bf96d4139a2ddd8e74b80840f800a0a79f9294399e212cb9a7/redis-2.10.6.tar.gz";
+                   sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               testpath = super.buildPythonPackage {
-                 name = "testpath-0.3.1";
-                 buildInputs = with self; [];
+               "repoze.lru" = super.buildPythonPackage {
+                 name = "repoze.lru-0.7";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/12/bc/595a77c4b5e204847fdf19268314ef59c85193a9dc9f83630fc459c0fee5/repoze.lru-0.7.tar.gz";
+                   sha256 = "0xzz1aw2smy8hdszrq8yhnklx6w1r1mf55061kalw3iq35gafa84";
+                 };
+                 meta = {
+                   license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+                 };
+               };
+               "requests" = super.buildPythonPackage {
+                 name = "requests-2.9.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/f4/8b/b71e9ee10e5f751e9d959bc750ab122ba04187f5aa52aabdc4e63b0e31a7/testpath-0.3.1.tar.gz";
-                   md5 = "2cd5ed5522fda781bb497c9d80ae2fc9";
+                   url = "https://files.pythonhosted.org/packages/f9/6d/07c44fb1ebe04d069459a189e7dab9e4abfe9432adcd4477367c25332748/requests-2.9.1.tar.gz";
+                   sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.asl20 ];
+                 };
+               };
+               "rhodecode-enterprise-ce" = super.buildPythonPackage {
+                 name = "rhodecode-enterprise-ce-4.13.0";
+                 buildInputs = [
+                   self."pytest"
+                   self."py"
+                   self."pytest-cov"
+                   self."pytest-sugar"
+                   self."pytest-runner"
+                   self."pytest-profiling"
+                   self."gprof2dot"
+                   self."pytest-timeout"
+                   self."mock"
+                   self."webtest"
+                   self."cov-core"
+                   self."coverage"
+                   self."configobj"
+                 ];
+                 doCheck = true;
+                 propagatedBuildInputs = [
+                   self."setuptools-scm"
+                   self."amqp"
+                   self."authomatic"
+                   self."babel"
+                   self."beaker"
+                   self."celery"
+                   self."chameleon"
+                   self."channelstream"
+                   self."click"
+                   self."colander"
+                   self."configobj"
+                   self."cssselect"
+                   self."decorator"
+                   self."deform"
+                   self."docutils"
+                   self."dogpile.cache"
+                   self."dogpile.core"
+                   self."ecdsa"
+                   self."formencode"
+                   self."future"
+                   self."futures"
+                   self."gnureadline"
+                   self."infrae.cache"
+                   self."iso8601"
+                   self."itsdangerous"
+                   self."jinja2"
+                   self."billiard"
+                   self."kombu"
+                   self."lxml"
+                   self."mako"
+                   self."markdown"
+                   self."markupsafe"
+                   self."msgpack-python"
+                   self."mysql-python"
+                   self."pymysql"
+                   self."pyotp"
+                   self."objgraph"
+                   self."packaging"
+                   self."paste"
+                   self."pastedeploy"
+                   self."pastescript"
+                   self."pathlib2"
+                   self."peppercorn"
+                   self."psutil"
+                   self."psycopg2"
+                   self."py-bcrypt"
+                   self."pycrypto"
+                   self."pycurl"
+                   self."pyflakes"
+                   self."pygments-markdown-lexer"
+                   self."pygments"
+                   self."pyparsing"
+                   self."pyramid-beaker"
+                   self."pyramid-debugtoolbar"
+                   self."pyramid-jinja2"
+                   self."pyramid-mako"
+                   self."pyramid"
+                   self."pysqlite"
+                   self."python-dateutil"
+                   self."python-ldap"
+                   self."python-memcached"
+                   self."python-pam"
+                   self."pytz"
+                   self."tzlocal"
+                   self."pyzmq"
+                   self."py-gfm"
+                   self."redis"
+                   self."repoze.lru"
+                   self."requests"
+                   self."routes"
+                   self."setproctitle"
+                   self."simplejson"
+                   self."six"
+                   self."sqlalchemy"
+                   self."sshpubkeys"
+                   self."subprocess32"
+                   self."supervisor"
+                   self."tempita"
+                   self."translationstring"
+                   self."trollius"
+                   self."urllib3"
+                   self."urlobject"
+                   self."venusian"
+                   self."weberror"
+                   self."webhelpers2"
+                   self."webhelpers"
+                   self."webob"
+                   self."whoosh"
+                   self."wsgiref"
+                   self."zope.cachedescriptors"
+                   self."zope.deprecation"
+                   self."zope.event"
+                   self."zope.interface"
+                   self."nbconvert"
+                   self."bleach"
+                   self."nbformat"
+                   self."jupyter-client"
+                   self."alembic"
+                   self."invoke"
+                   self."bumpversion"
+                   self."gevent"
+                   self."greenlet"
+                   self."gunicorn"
+                   self."waitress"
+                   self."ipdb"
+                   self."ipython"
+                   self."cprofilev"
+                   self."bottle"
+                   self."rhodecode-tools"
+                   self."appenlight-client"
+                   self."pytest"
+                   self."py"
+                   self."pytest-cov"
+                   self."pytest-sugar"
+                   self."pytest-runner"
+                   self."pytest-profiling"
+                   self."gprof2dot"
+                   self."pytest-timeout"
+                   self."mock"
+                   self."webtest"
+                   self."cov-core"
+                   self."coverage"
+                 ];
+                 src = ./.;
+                 meta = {
+                   license = [ { fullName = "Affero GNU General Public License v3 or later (AGPLv3+)"; } { fullName = "AGPLv3, and Commercial License"; } ];
+                 };
+               };
+               "rhodecode-tools" = super.buildPythonPackage {
+                 name = "rhodecode-tools-0.16.0";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."click"
+                   self."future"
+                   self."six"
+                   self."mako"
+                   self."markupsafe"
+                   self."requests"
+                   self."elasticsearch"
+                   self."elasticsearch-dsl"
+                   self."urllib3"
+                   self."whoosh"
+                 ];
+                 src = fetchurl {
+                   url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164";
+                   sha256 = "00xcc2mj99lx9d0ksml0p2xrd00kf5ypwyigg58cc9j9bznx7mzr";
+                 };
+                 meta = {
+                   license = [ { fullName = "AGPLv3 and Proprietary"; } ];
+                 };
+               };
+               "routes" = super.buildPythonPackage {
+                 name = "routes-2.4.1";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."six"
+                   self."repoze.lru"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/33/38/ea827837e68d9c7dde4cff7ec122a93c319f0effc08ce92a17095576603f/Routes-2.4.1.tar.gz";
+                   sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               traitlets = super.buildPythonPackage {
-                 name = "traitlets-4.3.2";
-                 buildInputs = with self; [];
+               "scandir" = super.buildPythonPackage {
+                 name = "scandir-1.9.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [ipython-genutils six decorator enum34];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069/traitlets-4.3.2.tar.gz";
-                   md5 = "3068663f2f38fd939a9eb3a500ccc154";
+                   url = "https://files.pythonhosted.org/packages/16/2a/557af1181e6b4e30254d5a6163b18f5053791ca66e251e77ab08887e8fe3/scandir-1.9.0.tar.gz";
+                   sha256 = "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
+                 };
+               };
+               "setproctitle" = super.buildPythonPackage {
+                 name = "setproctitle-1.1.10";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3/setproctitle-1.1.10.tar.gz";
+                   sha256 = "163kplw9dcrw0lffq1bvli5yws3rngpnvrxrzdw89pbphjjvg0v2";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               transifex-client = super.buildPythonPackage {
-                 name = "transifex-client-0.12.5";
-                 buildInputs = with self; [];
+               "setuptools" = super.buildPythonPackage {
+                 name = "setuptools-40.1.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [urllib3 six];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/7b/86/60f31a0c9b8d0b1266ce15b6c80b55f88522140c8acfc395d5aec5e23475/transifex-client-0.12.5.tar.gz";
-                   md5 = "e6e278117b23f60702c06e203b7e51ae";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.gpl2 ];
-                 };
-               };
-               translationstring = super.buildPythonPackage {
-                 name = "translationstring-1.3";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
-                   md5 = "a4b62e0f3c189c783a1685b3027f7c90";
+                   url = "https://files.pythonhosted.org/packages/5a/df/b2e3d9693bb0dcbeac516a73dd7a9eb82b126ae52e4a74605a9b01beddd5/setuptools-40.1.0.zip";
+                   sha256 = "0w1blx5ajga5y15dci0mddk49cf2xpq0mp7rp7jrqr2diqk00ib6";
                  };
                  meta = {
-                   license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+                   license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               trollius = super.buildPythonPackage {
-                 name = "trollius-1.0.4";
-                 buildInputs = with self; [];
+               "setuptools-scm" = super.buildPythonPackage {
+                 name = "setuptools-scm-2.1.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [futures];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/aa/e6/4141db437f55e6ee7a3fb69663239e3fde7841a811b4bef293145ad6c836/trollius-1.0.4.tar.gz";
-                   md5 = "3631a464d49d0cbfd30ab2918ef2b783";
-                 };
-                 meta = {
-                   license = [ pkgs.lib.licenses.asl20 ];
-                 };
-               };
-               tzlocal = super.buildPythonPackage {
-                 name = "tzlocal-1.5.1";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [pytz];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/cb/89/e3687d3ed99bc882793f82634e9824e62499fdfdc4b1ae39e211c5b05017/tzlocal-1.5.1.tar.gz";
-                   md5 = "4553be891efa0812c4adfb0c6e818eec";
+                   url = "https://files.pythonhosted.org/packages/e5/62/f9e1ac314464eb5945c97542acb6bf6f3381dfa5d7a658de7730c36f31a1/setuptools_scm-2.1.0.tar.gz";
+                   sha256 = "0yb364cgk15sfw3x8ln4ssh98z1dj6n8iiz4r2rw1cfsxhgi8rx7";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               uWSGI = super.buildPythonPackage {
-                 name = "uWSGI-2.0.15";
-                 buildInputs = with self; [];
+               "simplegeneric" = super.buildPythonPackage {
+                 name = "simplegeneric-0.8.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/bb/0a/45e5aa80dc135889594bb371c082d20fb7ee7303b174874c996888cc8511/uwsgi-2.0.15.tar.gz";
-                   md5 = "fc50bd9e83b7602fa474b032167010a7";
+                   url = "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip";
+                   sha256 = "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.zpl21 ];
+                 };
+               };
+               "simplejson" = super.buildPythonPackage {
+                 name = "simplejson-3.11.1";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/08/48/c97b668d6da7d7bebe7ea1817a6f76394b0ec959cb04214ca833c34359df/simplejson-3.11.1.tar.gz";
+                   sha256 = "1rr58dppsq73p0qcd9bsw066cdd3v63sqv7j6sqni8frvm4jv8h1";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.gpl2 ];
+                   license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ];
                  };
                };
-               urllib3 = super.buildPythonPackage {
-                 name = "urllib3-1.16";
-                 buildInputs = with self; [];
+               "six" = super.buildPythonPackage {
+                 name = "six-1.11.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/3b/f0/e763169124e3f5db0926bc3dbfcd580a105f9ca44cf5d8e6c7a803c9f6b5/urllib3-1.16.tar.gz";
-                   md5 = "fcaab1c5385c57deeb7053d3d7d81d59";
+                   url = "https://files.pythonhosted.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe/six-1.11.0.tar.gz";
+                   sha256 = "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "sqlalchemy" = super.buildPythonPackage {
+                 name = "sqlalchemy-1.1.18";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/cc/4d/96d93ff77cd67aca7618e402191eee3490d8f5f245d6ab7622d35fe504f4/SQLAlchemy-1.1.18.tar.gz";
+                   sha256 = "1ab4ysip6irajfbxl9wy27kv76miaz8h6759hfx92499z4dcf3lb";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               venusian = super.buildPythonPackage {
-                 name = "venusian-1.1.0";
-                 buildInputs = with self; [];
+               "sshpubkeys" = super.buildPythonPackage {
+                 name = "sshpubkeys-2.2.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."pycrypto"
+                   self."ecdsa"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/38/24/b4b470ab9e0a2e2e9b9030c7735828c8934b4c6b45befd1bb713ec2aeb2d/venusian-1.1.0.tar.gz";
-                   md5 = "56bc5e6756e4bda37bcdb94f74a72b8f";
-                 };
-                 meta = {
-                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-                 };
-               };
-               vine = super.buildPythonPackage {
-                 name = "vine-1.1.4";
-                 buildInputs = with self; [];
-                 doCheck = false;
-                 propagatedBuildInputs = with self; [];
-                 src = fetchurl {
-                   url = "https://pypi.python.org/packages/32/23/36284986e011f3c130d802c3c66abd8f1aef371eae110ddf80c5ae22e1ff/vine-1.1.4.tar.gz";
-                   md5 = "9fdb971e7fd15b181b84f3bfcf20d11c";
+                   url = "https://files.pythonhosted.org/packages/27/da/337fabeb3dca6b62039a93ceaa636f25065e0ae92b575b1235342076cf0a/sshpubkeys-2.2.0.tar.gz";
+                   sha256 = "0r4kpwzmg96a2x56pllik7dmc3fnqk189v3sfgsi07q2ryrhr6xm";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               waitress = super.buildPythonPackage {
-                 name = "waitress-1.1.0";
-                 buildInputs = with self; [];
+               "subprocess32" = super.buildPythonPackage {
+                 name = "subprocess32-3.5.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
-                   md5 = "0f1eb7fdfdbf2e6d18decbda1733045c";
+                   url = "https://files.pythonhosted.org/packages/de/fb/fd3e91507021e2aecdb081d1b920082628d6b8869ead845e3e87b3d2e2ca/subprocess32-3.5.1.tar.gz";
+                   sha256 = "0wgi3bfnssid1g6h0v803z3k1wjal6il16nr3r9c587cfzwfkv0q";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.zpt21 ];
+                   license = [ pkgs.lib.licenses.psfl ];
+                 };
+               };
+               "supervisor" = super.buildPythonPackage {
+                 name = "supervisor-3.3.4";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."meld3"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/44/60/698e54b4a4a9b956b2d709b4b7b676119c833d811d53ee2500f1b5e96dc3/supervisor-3.3.4.tar.gz";
+                   sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
+                 };
+                 meta = {
+                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
                  };
                };
-               wcwidth = super.buildPythonPackage {
-                 name = "wcwidth-0.1.7";
-                 buildInputs = with self; [];
+               "tempita" = super.buildPythonPackage {
+                 name = "tempita-0.5.2";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz";
-                   md5 = "b3b6a0a08f0c8a34d1de8cf44150a4ad";
+                   url = "https://files.pythonhosted.org/packages/56/c8/8ed6eee83dbddf7b0fc64dd5d4454bc05e6ccaafff47991f73f2894d9ff4/Tempita-0.5.2.tar.gz";
+                   sha256 = "177wwq45slfyajd8csy477bmdmzipyw0dm7i85k3akb7m85wzkna";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "termcolor" = super.buildPythonPackage {
+                 name = "termcolor-1.1.0";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz";
+                   sha256 = "0fv1vq14rpqwgazxg4981904lfyp84mnammw7y046491cv76jv8x";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.mit ];
                  };
                };
-               webencodings = super.buildPythonPackage {
-                 name = "webencodings-0.5.1";
-                 buildInputs = with self; [];
+               "testpath" = super.buildPythonPackage {
+                 name = "testpath-0.3.1";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/f4/8b/b71e9ee10e5f751e9d959bc750ab122ba04187f5aa52aabdc4e63b0e31a7/testpath-0.3.1.tar.gz";
+                   sha256 = "02bnmkvm6a8a1p5kcygylcd19v2s040qw3zp1n8ab3bqkj1kflqd";
+                 };
+                 meta = {
+                   license = [  ];
+                 };
+               };
+               "traitlets" = super.buildPythonPackage {
+                 name = "traitlets-4.3.2";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."ipython-genutils"
+                   self."six"
+                   self."decorator"
+                   self."enum34"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069/traitlets-4.3.2.tar.gz";
+                   sha256 = "0dbq7sx26xqz5ixs711k5nc88p8a0nqyz6162pwks5dpcz9d4jww";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "translationstring" = super.buildPythonPackage {
+                 name = "translationstring-1.3";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
+                   sha256 = "0bdpcnd9pv0131dl08h4zbcwmgc45lyvq3pa224xwan5b3x4rr2f";
+                 };
+                 meta = {
+                   license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+                 };
+               };
+               "trollius" = super.buildPythonPackage {
+                 name = "trollius-1.0.4";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."futures"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/aa/e6/4141db437f55e6ee7a3fb69663239e3fde7841a811b4bef293145ad6c836/trollius-1.0.4.tar.gz";
+                   sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.asl20 ];
+                 };
+               };
+               "tzlocal" = super.buildPythonPackage {
+                 name = "tzlocal-1.5.1";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."pytz"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/cb/89/e3687d3ed99bc882793f82634e9824e62499fdfdc4b1ae39e211c5b05017/tzlocal-1.5.1.tar.gz";
+                   sha256 = "0kiciwiqx0bv0fbc913idxibc4ygg4cb7f8rcpd9ij2shi4bigjf";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "urllib3" = super.buildPythonPackage {
+                 name = "urllib3-1.21";
+                 doCheck = false;
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz";
-                   md5 = "32f6e261d52e57bf7e1c4d41546d15b8";
+                   url = "https://files.pythonhosted.org/packages/34/95/7b28259d0006ed681c424cd71a668363265eac92b67dddd018eb9a22bff8/urllib3-1.21.tar.gz";
+                   sha256 = "0irnj4wvh2y36s4q3l2vas9qr9m766w6w418nb490j3mf8a8zw6h";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "urlobject" = super.buildPythonPackage {
+                 name = "urlobject-2.4.3";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/e2/b8/1d0a916f4b34c4618846e6da0e4eeaa8fcb4a2f39e006434fe38acb74b34/URLObject-2.4.3.tar.gz";
+                   sha256 = "1ahc8ficzfvr2avln71immfh4ls0zyv6cdaa5xmkdj5rd87f5cj7";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.publicDomain ];
+                 };
+               };
+               "venusian" = super.buildPythonPackage {
+                 name = "venusian-1.1.0";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/38/24/b4b470ab9e0a2e2e9b9030c7735828c8934b4c6b45befd1bb713ec2aeb2d/venusian-1.1.0.tar.gz";
+                   sha256 = "0zapz131686qm0gazwy8bh11vr57pr89jbwbl50s528sqy9f80lr";
+                 };
+                 meta = {
+                   license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+                 };
+               };
+               "vine" = super.buildPythonPackage {
+                 name = "vine-1.1.4";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/32/23/36284986e011f3c130d802c3c66abd8f1aef371eae110ddf80c5ae22e1ff/vine-1.1.4.tar.gz";
+                   sha256 = "0wkskb2hb494v9gixqnf4bl972p4ibcmxdykzpwjlfa5picns4aj";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               ws4py = super.buildPythonPackage {
-                 name = "ws4py-0.4.3";
-                 buildInputs = with self; [];
+               "waitress" = super.buildPythonPackage {
+                 name = "waitress-1.1.0";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
+                   sha256 = "1a85gyji0kajc3p0s1pwwfm06w4wfxjkvvl4rnrz3h164kbd6g6k";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.zpl21 ];
+                 };
+               };
+               "wcwidth" = super.buildPythonPackage {
+                 name = "wcwidth-0.1.7";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz";
+                   sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "webencodings" = super.buildPythonPackage {
+                 name = "webencodings-0.5.1";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/fa/a1/33c43a4304ac3b4dc81deb93cbd329de9297dd034d75c47cce64fda806bc/ws4py-0.4.3.tar.gz";
-                   md5 = "d5834cf7d3965bb0da31bbb02bd8513a";
+                   url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz";
+                   sha256 = "08qrgrc4hrximb2gqnl69g01s93rhf2842jfxdjljc1dbwj1qsmk";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "weberror" = super.buildPythonPackage {
+                 name = "weberror-0.10.3";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."webob"
+                   self."tempita"
+                   self."pygments"
+                   self."paste"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/35/76/e7e5c2ce7e9c7f31b54c1ff295a495886d1279a002557d74dd8957346a79/WebError-0.10.3.tar.gz";
+                   sha256 = "0frg4kvycqpj5bi8asfqfs6bxsr2cvjvb6b56c4d1ai1z57kbjx6";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "webhelpers" = super.buildPythonPackage {
+                 name = "webhelpers-1.3";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."markupsafe"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/ee/68/4d07672821d514184357f1552f2dad923324f597e722de3b016ca4f7844f/WebHelpers-1.3.tar.gz";
+                   sha256 = "10x5i82qdkrvyw18gsybwggfhfpl869siaab89vnndi9x62g51pa";
                  };
                  meta = {
                    license = [ pkgs.lib.licenses.bsdOriginal ];
                  };
                };
-               wsgiref = super.buildPythonPackage {
-                 name = "wsgiref-0.1.2";
-                 buildInputs = with self; [];
+               "webhelpers2" = super.buildPythonPackage {
+                 name = "webhelpers2-2.0";
+                 doCheck = false;
+                 propagatedBuildInputs = [
+                   self."markupsafe"
+                   self."six"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/ff/30/56342c6ea522439e3662427c8d7b5e5b390dff4ff2dc92d8afcb8ab68b75/WebHelpers2-2.0.tar.gz";
+                   sha256 = "0aphva1qmxh83n01p53f5fd43m4srzbnfbz5ajvbx9aj2aipwmcs";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "webob" = super.buildPythonPackage {
+                 name = "webob-1.7.4";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/75/34/731e23f52371852dfe7490a61644826ba7fe70fd52a377aaca0f4956ba7f/WebOb-1.7.4.tar.gz";
+                   sha256 = "1na01ljg04z40il7vcrn8g29vaw7nvg1xvhk64cr4jys5wcay44d";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "webtest" = super.buildPythonPackage {
+                 name = "webtest-2.0.29";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [];
+                 propagatedBuildInputs = [
+                   self."six"
+                   self."webob"
+                   self."waitress"
+                   self."beautifulsoup4"
+                 ];
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz";
+                   sha256 = "0bcj1ica5lnmj5zbvk46x28kgphcsgh7sfnwjmn0cr94mhawrg6v";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.mit ];
+                 };
+               };
+               "whoosh" = super.buildPythonPackage {
+                 name = "whoosh-2.7.4";
+                 doCheck = false;
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/41/9e/309259ce8dff8c596e8c26df86dbc4e848b9249fd36797fd60be456f03fc/wsgiref-0.1.2.zip";
-                   md5 = "29b146e6ebd0f9fb119fe321f7bcf6cb";
+                   url = "https://files.pythonhosted.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/Whoosh-2.7.4.tar.gz";
+                   sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.bsd2 ];
+                 };
+               };
+               "ws4py" = super.buildPythonPackage {
+                 name = "ws4py-0.5.1";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/53/20/4019a739b2eefe9282d3822ef6a225250af964b117356971bd55e274193c/ws4py-0.5.1.tar.gz";
+                   sha256 = "10slbbf2jm4hpr92jx7kh7mhf48sjl01v2w4d8z3f1p0ybbp7l19";
+                 };
+                 meta = {
+                   license = [ pkgs.lib.licenses.bsdOriginal ];
+                 };
+               };
+               "wsgiref" = super.buildPythonPackage {
+                 name = "wsgiref-0.1.2";
+                 doCheck = false;
+                 src = fetchurl {
+                   url = "https://files.pythonhosted.org/packages/41/9e/309259ce8dff8c596e8c26df86dbc4e848b9249fd36797fd60be456f03fc/wsgiref-0.1.2.zip";
+                   sha256 = "0y8fyjmpq7vwwm4x732w97qbkw78rjwal5409k04cw4m03411rn7";
                  };
                  meta = {
                    license = [ { fullName = "PSF or ZPL"; } ];
                  };
                };
-               zope.cachedescriptors = super.buildPythonPackage {
+               "zope.cachedescriptors" = super.buildPythonPackage {
                  name = "zope.cachedescriptors-4.3.1";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/2f/89/ebe1890cc6d3291ebc935558fa764d5fffe571018dbbee200e9db78762cb/zope.cachedescriptors-4.3.1.tar.gz";
-                   md5 = "42f3693f43bc93f3b1eb86940f58acf3";
+                   url = "https://files.pythonhosted.org/packages/2f/89/ebe1890cc6d3291ebc935558fa764d5fffe571018dbbee200e9db78762cb/zope.cachedescriptors-4.3.1.tar.gz";
+                   sha256 = "0jhr3m5p74c6r7k8iv0005b8bfsialih9d7zl5vx38rf5xq1lk8z";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.zpt21 ];
+                   license = [ pkgs.lib.licenses.zpl21 ];
                  };
                };
-               zope.deprecation = super.buildPythonPackage {
+               "zope.deprecation" = super.buildPythonPackage {
                  name = "zope.deprecation-4.3.0";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/a1/18/2dc5e6bfe64fdc3b79411b67464c55bb0b43b127051a20f7f492ab767758/zope.deprecation-4.3.0.tar.gz";
-                   md5 = "2166b2cb7e0e96a21104e6f8f9b696bb";
+                   url = "https://files.pythonhosted.org/packages/a1/18/2dc5e6bfe64fdc3b79411b67464c55bb0b43b127051a20f7f492ab767758/zope.deprecation-4.3.0.tar.gz";
+                   sha256 = "095jas41wbxgmw95kwdxqhbc3bgihw2hzj9b3qpdg85apcsf2lkx";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.zpt21 ];
+                   license = [ pkgs.lib.licenses.zpl21 ];
                  };
                };
-               zope.event = super.buildPythonPackage {
+               "zope.event" = super.buildPythonPackage {
                  name = "zope.event-4.3.0";
-                 buildInputs = with self; [];
                  doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/9e/d0/54ba59f19a0635f6591b74be259cf6fbf67e73f4edda27b5cd0cf4d26efa/zope.event-4.3.0.tar.gz";
-                   md5 = "8ca737960741c6fd112972f3313303bd";
+                   url = "https://files.pythonhosted.org/packages/9e/d0/54ba59f19a0635f6591b74be259cf6fbf67e73f4edda27b5cd0cf4d26efa/zope.event-4.3.0.tar.gz";
+                   sha256 = "1rrkyx42bcq8dkpj23c2v99kczlrg8d39c06q5qpr0vs4hjfmv70";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.zpt21 ];
+                   license = [ pkgs.lib.licenses.zpl21 ];
                  };
                };
-               zope.interface = super.buildPythonPackage {
-                 name = "zope.interface-4.4.3";
-                 buildInputs = with self; [];
+               "zope.interface" = super.buildPythonPackage {
+                 name = "zope.interface-4.5.0";
                  doCheck = false;
-                 propagatedBuildInputs = with self; [setuptools];
+                 propagatedBuildInputs = [
+                   self."setuptools"
+                 ];
                  src = fetchurl {
-                   url = "https://pypi.python.org/packages/bd/d2/25349ed41f9dcff7b3baf87bd88a4c82396cf6e02f1f42bb68657a3132af/zope.interface-4.4.3.tar.gz";
-                   md5 = "8700a4f527c1203b34b10c2b4e7a6912";
+                   url = "https://files.pythonhosted.org/packages/ac/8a/657532df378c2cd2a1fe6b12be3b4097521570769d4852ec02c24bd3594e/zope.interface-4.5.0.tar.gz";
+                   sha256 = "0k67m60ij06wkg82n15qgyn96waf4pmrkhv0njpkfzpmv5q89hsp";
                  };
                  meta = {
-                   license = [ pkgs.lib.licenses.zpt21 ];
+                   license = [ pkgs.lib.licenses.zpl21 ];
                  };
                };

pytest.ini

0 +1 0

              [pytest]
              testpaths = rhodecode
              norecursedirs = rhodecode/public rhodecode/templates tests/scripts
+             cache_dir = /tmp/.pytest_cache
              pyramid_config = rhodecode/tests/rhodecode.ini
              vcsserver_protocol = http

release.nix

0 +10 -221

		@@ -1,232 +1,21 b''
1		#
2		# About
3		# =====
4		#
5		# This file defines jobs for our CI system and the attribute "build" is used
6		# as the input for packaging.
7		#
8		#
9		# CI details
10		# ==========
11		#
12		# This file defines an attribute set of derivations. Each of these attributes is
13		# then used in our CI system as one job to run. This way we keep the
14		# configuration for the CI jobs as well under version control.
15		#
16		# Run CI jobs locally
17		# -------------------
18		#
19		# Since it is all based on normal Nix derivations, the jobs can be tested
20		# locally with a run of "nix-build" like the following example:
21		#
22		# nix-build release.nix -A test-api -I vcsserver=~/rhodecode-vcsserver
23		#
24		# Note: Replace "~/rhodecode-vcsserver" with a path where a clone of the
25		# vcsserver resides.
	1	# This file defines how to "build" for packaging.
26	2
27	3	{ pkgs ? import <nixpkgs> {}
28		, doCheck ? ~~tru~~e
	4	, doCheck ? false
29	5	}:
30	6
31	7	let
32
33		inherit (pkgs)
34		stdenv
35		system;
36
37		testing = import <nixpkgs/nixos/lib/testing.nix> {
38		inherit system;
39		};
40
41		runInMachine = testing.runInMachine;
42
43		sphinx = import ./docs/default.nix {};
44
45		mkDocs = kind: stdenv.mkDerivation {
46		name = kind;
47		srcs = [
48		(./. + (builtins.toPath "/${kind}"))
49		(builtins.filterSource
50		(path: type: baseNameOf path == "VERSION")
51		./rhodecode)
52		];
53		sourceRoot = kind;
54		buildInputs = [ sphinx ];
55		configurePhase = null;
56		buildPhase = ''
57		make SPHINXBUILD=sphinx-build html
58		'';
59		installPhase = ''
60		mkdir -p $out
61		mv _build/html $out/
62
63		mkdir -p $out/nix-support
64		echo "doc manual $out/html index.html" >> \
65		"$out/nix-support/hydra-build-products"
66		'';
67		};
68
69		enterprise = import ./default.nix {
	8	enterprise_ce = import ./default.nix {
70	9	inherit
	10	doCheck
71	11	pkgs;
72	12
73		# TODO: for quick local testing
74		doCheck = false;
75		};
	13	# disable checkPhase for build
	14	checkPhase = ''
	15	'';
76	16
77		test-cfg = stdenv.mkDerivation {
78		name = "test-cfg";
79		unpackPhase = "true";
80		buildInputs = [
81		enterprise.src
82		];
83		installPhase = ''
84		mkdir -p $out/etc
85		cp ${enterprise.src}/test.ini $out/etc/enterprise.ini
86		# TODO: johbo: Needed, so that the login works, this causes
87		# probably some side effects
88		substituteInPlace $out/etc/enterprise.ini --replace "is_test = True" ""
89
90		# Gevent configuration
91		cp $out/etc/enterprise.ini $out/etc/enterprise-gevent.ini;
92		cat >> $out/etc/enterprise-gevent.ini <<EOF
93
94		[server:main]
95		use = egg:gunicorn#main
96		worker_class = gevent
97		EOF
98
99		cp ${enterprise.src}/vcsserver/test.ini $out/etc/vcsserver.ini
100		'';
101		};
102
103		ac-test-drv = import ./acceptance_tests {
104		withExternals = false;
105	17	};
106	18
107		# TODO: johbo: Currently abusing buildPythonPackage to make the
108		# needed environment for the ac-test tools.
109		mkAcTests = {
110		# Path to an INI file which will be used to run Enterprise.
111		#
112		# Intended usage is to provide different configuration files to
113		# run the tests against a different configuration.
114		enterpriseCfg ? "${test-cfg}/etc/enterprise.ini"
115
116		# Path to an INI file which will be used to run the VCSServer.
117		, vcsserverCfg ? "${test-cfg}/etc/vcsserver.ini"
118		}: pkgs.pythonPackages.buildPythonPackage {
119		name = "enterprise-ac-tests";
120		src = ./acceptance_tests;
121
122		buildInputs = with pkgs; [
123		curl
124		enterprise
125		ac-test-drv
126		];
127
128		buildPhase = ''
129		cp ${enterpriseCfg} enterprise.ini
130
131		echo "Creating a fake home directory"
132		mkdir fake-home
133		export HOME=$PWD/fake-home
134
135		echo "Creating a repository directory"
136		mkdir repos
137
138		echo "Preparing the database"
139		rc-setup-app \
140		--user=admin \
141		--email=admin@example.com \
142		--password=secret \
143		--api-key=9999999999999999999999999999999999999999 \
144		--force-yes \
145		--repos=$PWD/repos \
146		enterprise.ini > /dev/null
147
148		echo "Starting rc-server"
149		vcsserver --config ${vcsserverCfg} >vcsserver.log 2>&1 &
150		rc-server enterprise.ini >rc-server.log 2>&1 &
151
152		while ! curl -f -s http://localhost:5000 > /dev/null
153		do
154		echo "Waiting for server to be ready..."
155		sleep 3
156		done
157		echo "Webserver is ready."
158
159		echo "Starting the test run"
160		py.test -c example.ini -vs --maxfail=5 tests
161
162		echo "Kill rc-server"
163		kill %2
164		kill %1
165		'';
166
167		# TODO: johbo: Use the install phase again once the normal mkDerivation
168		# can be used again.
169		postInstall = ''
170		mkdir -p $out
171		cp enterprise.ini $out
172		cp ${vcsserverCfg} $out/vcsserver.ini
173		cp rc-server.log $out
174		cp vcsserver.log $out
175
176		mkdir -p $out/nix-support
177		echo "report config $out enterprise.ini" >> $out/nix-support/hydra-build-products
178		echo "report config $out vcsserver.ini" >> $out/nix-support/hydra-build-products
179		echo "report rc-server $out rc-server.log" >> $out/nix-support/hydra-build-products
180		echo "report vcsserver $out vcsserver.log" >> $out/nix-support/hydra-build-products
181		'';
182		};
183
184		vcsserver = import <vcsserver> {
185		inherit pkgs;
186
187		# TODO: johbo: Think of a more elegant solution to this problem
188		pythonExternalOverrides = self: super: (enterprise.myPythonPackagesUnfix self);
189		};
190
191		runTests = optionString: (enterprise.override (attrs: {
192		doCheck = true;
193		name = "test-run";
194		buildInputs = attrs.buildInputs ++ [
195		vcsserver
196		];
197		checkPhase = ''
198		py.test ${optionString} -vv -ra
199		'';
200		buildPhase = attrs.shellHook;
201		installPhase = ''
202		echo "Intentionally not installing anything"
203		'';
204		meta.description = "Enterprise test run ${optionString}";
205		}));
206
207		jobs = {
208
209		build = enterprise;
210
211		# johbo: Currently this is simply running the tests against the sources. Nicer
212		# would be to run xdist and against the installed application, so that we also
213		# cover the impact of installing the application.
214		test-api = runTests "rhodecode/api";
215		test-functional = runTests "rhodecode/tests/functional";
216		test-rest = runTests "rhodecode/tests --ignore=rhodecode/tests/functional";
217		test-full = runTests "rhodecode";
218
219		docs = mkDocs "docs";
220
221		aggregate = pkgs.releaseTools.aggregate {
222		name = "aggregated-jobs";
223		constituents = [
224		jobs.build
225		jobs.test-api
226		jobs.test-rest
227		jobs.docs
228		];
229		};
230		};
231
232		in jobs
	19	in {
	20	build = enterprise_ce;
	21	}

requirements.txt

0 +55 -55

-             ## core
-             setuptools==30.1.0
-             setuptools-scm==1.15.6
+             ## dependencies
-             amqp==2.2.2
+             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
-             Babel==1.3
-             Beaker==1.9.1
-             celery==4.1.0
-             Chameleon==2.24
+             babel==1.3
+             beaker==1.9.1
+             celery==4.1.1
+             chameleon==2.24
              channelstream==0.5.2
              click==6.6
              colander==1.4.0
-             configobj==5.0.6
-             cssselect==1.0.1
+             # our custom configobj
+             https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c#egg=configobj==5.0.6
+             cssselect==1.0.3
              decorator==4.1.2
-             deform==2.0.4
+             deform==2.0.5
              docutils==0.14.0
-             dogpile.cache==0.6.4
+             dogpile.cache==0.6.6
              dogpile.core==0.4.1
              ecdsa==0.13
-             FormEncode==1.2.4
+             formencode==1.2.4
              future==0.14.3
              futures==3.0.2
              gnureadline==6.3.8
              infrae.cache==1.0.1
-             iso8601==0.1.12
+             iso8601==0.1.11
              itsdangerous==0.24
-             Jinja2==2.9.6
+             jinja2==2.9.6
              billiard==3.5.0.3
-             kombu==4.1.0
+             kombu==4.2.0
              lxml==3.7.3
-             Mako==1.0.7
-             Markdown==2.6.11
-             MarkupSafe==1.0.0
-             msgpack-python==0.4.8
-             MySQL-python==1.2.5
+             mako==1.0.7
+             markdown==2.6.11
+             markupsafe==1.0.0
+             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
+             paste==2.0.3
+             pastedeploy==1.5.2
+             pastescript==2.0.2
              pathlib2==2.3.0
              peppercorn==0.5
-             psutil==5.4.3
-             psycopg2==2.7.3.2
+             psutil==5.4.6
+             psycopg2==2.7.4
              py-bcrypt==0.4
              pycrypto==2.6.1
-             pycurl==7.19.5
+             pycurl==7.43.0.2
              pyflakes==0.8.1
              pygments-markdown-lexer==0.1.0.dev39
-             Pygments==2.2.0
+             pygments==2.2.0
              pyparsing==1.5.7
              pyramid-beaker==0.8
-             pyramid-debugtoolbar==4.3.0
+             pyramid-debugtoolbar==4.4.0
              pyramid-jinja2==2.7
              pyramid-mako==1.0.2
-             pyramid==1.9.1
+             pyramid==1.9.2
              pysqlite==2.8.3
              python-dateutil
-             python-ldap==2.4.45
-             python-memcached==1.58
-             python-pam==1.8.2
-             pytz==2018.3
+             python-ldap==3.1.0
+             python-memcached==1.59
+             python-pam==1.8.4
+             pytz==2018.4
              tzlocal==1.5.1
              pyzmq==14.6.0
              py-gfm==0.1.3
              redis==2.10.6
              repoze.lru==0.7
              requests==2.9.1
-             Routes==2.4.1
+             routes==2.4.1
              setproctitle==1.1.10
              simplejson==3.11.1
              six==1.11.0
-             SQLAlchemy==1.1.15
+             sqlalchemy==1.1.18
              sshpubkeys==2.2.0
-             subprocess32==3.2.7
+             subprocess32==3.5.1
              supervisor==3.3.4
-             Tempita==0.5.2
+             tempita==0.5.2
              translationstring==1.3
              trollius==1.0.4
-             urllib3==1.16
-             URLObject==2.4.0
+             urllib3==1.21
+             urlobject==2.4.3
              venusian==1.1.0
-             WebError==0.10.3
-             WebHelpers2==2.0
-             WebHelpers==1.3
-             WebOb==1.7.4
-             Whoosh==2.7.4
+             weberror==0.10.3
+             webhelpers2==2.0
+             webhelpers==1.3
+             webob==1.7.4
+             whoosh==2.7.4
              wsgiref==0.1.2
              zope.cachedescriptors==4.3.1
              zope.deprecation==4.3.0
              zope.event==4.3.0
-             zope.interface==4.4.3
+             zope.interface==4.5.0
              # IPYTHON RENDERING
              # entrypoints backport, pypi version doesn't support egg installs
              https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313#egg=entrypoints==0.2.2.rhodecode-upstream1
              nbconvert==5.3.1
-             bleach==2.1.2
+             bleach==2.1.4
              nbformat==4.4.0
              jupyter_client==5.0.0
              ## cli tools
-             alembic==0.9.8
+             alembic==0.9.9
              invoke==0.13.0
              bumpversion==0.5.3
-             transifex-client==0.12.5
              ## http servers
-             gevent==1.2.2
+             gevent==1.3.5
              greenlet==0.4.13
-             gunicorn==19.7.1
+             gunicorn==19.9.0
              waitress==1.1.0
-             uWSGI==2.0.15
              ## debug
-             ipdb==0.10.3
+             ipdb==0.11.0
              ipython==5.1.0
-             CProfileV==1.0.7
+             cprofilev==1.0.7
              bottle==0.12.13
              ## rhodecode-tools, special case
-             https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.14.1.tar.gz?md5=0b9c2caad160b68889f8172ea54af7b2#egg=rhodecode-tools==0.14.1
+             https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.16.0.tar.gz?md5=87f81286b49156c2ac36f1a1acfa2164#egg=rhodecode-tools==0.16.0
              ## appenlight
              appenlight-client==0.6.25

requirements_test.txt

0 +7 -8

              # test related requirements
-             pytest==3.2.5
-             py==1.5.2
+             pytest==3.6.0
+             py==1.5.3
              pytest-cov==2.5.1
-             pytest-sugar==0.9.0
-             pytest-runner==3.0.0
-             pytest-catchlog==1.2.2
-             pytest-profiling==1.2.11
+             pytest-sugar==0.9.1
+             pytest-runner==4.2.0
+             pytest-profiling==1.3.0
              gprof2dot==2017.9.19
-             pytest-timeout==1.2.0
+             pytest-timeout==1.2.1
              mock==1.0.1
-             WebTest==2.0.29
+             webtest==2.0.29
              cov-core==1.15.0
              coverage==3.7.1

rhodecode/VERSION

0 +1 -1

		@@ -1,1 +1,1 b''
1		4.1~~2.4~~ No newline at end of file
	1	4.13.0 No newline at end of file

rhodecode/__init__.py

0 +1 -1

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

rhodecode/api/__init__.py

0 +1 0

                      # register our auth-user
                      request.rpc_user = auth_u
+                     request.environ['rc_auth_user_id'] = auth_u.user_id
                      # now check if token is valid for API
                      auth_token = request.rpc_api_key

rhodecode/api/tests/test_create_pull_request.py

0 +5 -2

                           'mandatory': True},
                      ]
                      data['reviewers'] = reviewers
                      id_, params = build_data(
                          self.apikey_regular, 'create_pull_request', **data)
                      response = api_call(self.app, params)
                      id_, params = build_data(
                          self.apikey_regular, 'create_pull_request', **data)
                      response = api_call(self.app, params)
-                     expected_message = 'The specified branch `{}` does not exist'.format(
-                         branch_name)
+                     expected_message = 'The specified value:{type}:`{name}` ' \
+                                        'does not exist, or is not allowed.'.format(type='branch',
+                                                                                    name=branch_name)
                      assert_error(id_, expected_message, given=response.body)
                  @pytest.mark.backends("git", "hg")
                      self.commit_ids = backend.create_master_repo(commits)
                      self.source = backend.create_repo(heads=[source_head])
                      self.target = backend.create_repo(heads=[target_head])
                      data = {
                          'source_repo': self.source.repo_name,
                          'target_repo': self.target.repo_name,

rhodecode/api/tests/test_update_user.py

0 +4 0

                          'user': ret
                      }
                      expected = ret
+                     expected['user']['last_activity'] = response.json['result']['user'][
+                         'last_activity']
                      assert_ok(id_, expected, given=response.body)
                  def test_api_update_user_by_user_id(self):
                          'user': ret
                      }
                      expected = ret
+                     expected['user']['last_activity'] = response.json['result']['user'][
+                         'last_activity']
                      assert_ok(id_, expected, given=response.body)
                  def test_api_update_user_default_user(self):

rhodecode/api/tests/test_utils.py

0 +4 -3

                      ref = 'ancestor:ref'
                      with pytest.raises(JSONRPCError) as excinfo:
                          utils.resolve_ref_or_error(ref, repo)
-                     expected_message = 'The specified ancestor `ref` does not exist'
+                     expected_message = (
+                         'The specified value:ancestor:`ref` does not exist, or is not allowed.')
                      assert excinfo.value.message == expected_message
                  def test_branch_is_not_found(self):
                          with pytest.raises(JSONRPCError) as excinfo:
                              utils.resolve_ref_or_error(ref, repo)
                      expected_message = (
-                         'The specified branch `non-existing-one` does not exist')
+                         'The specified value:branch:`non-existing-one` does not exist, or is not allowed.')
                      assert excinfo.value.message == expected_message
                  def test_bookmark_is_not_found(self):
                          with pytest.raises(JSONRPCError) as excinfo:
                              utils.resolve_ref_or_error(ref, repo)
                      expected_message = (
-                         'The specified bookmark `non-existing-one` does not exist')
+                         'The specified value:bookmark:`non-existing-one` does not exist, or is not allowed.')
                      assert excinfo.value.message == expected_message
                  @pytest.mark.parametrize("ref", ['ref', '12345', 'a:b:c:d'])

rhodecode/api/utils.py

0 +1 -2

                      ref_hash = ref_hash or _get_ref_hash(repo, ref_type, ref_name)
                  except (KeyError, ValueError):
                      raise JSONRPCError(
-                         'The specified {type} `{name}` does not exist'.format(
+                         'The specified value:{type}:`{name}` does not exist, or is not allowed.'.format(
                              type=ref_type, name=ref_name))
                  return ':'.join([ref_type, ref_name, ref_hash])
                  }
-             # TODO: mikhail: Think about moving this function to some library
              def _get_ref_hash(repo, type_, name):
                  vcs_repo = repo.scm_instance()
                  if type_ == 'branch' and vcs_repo.alias in ('hg', 'git'):

rhodecode/api/views/pull_request_api.py

0 +29 -9

                          raise JSONRPCError('userid is not the same as your user')
                  check = MergeCheck.validate(
-                     pull_request, user=apiuser, translator=request.translate)
+                     pull_request, auth_user=apiuser, translator=request.translate)
                  merge_possible = not check.failed
                  if not merge_possible:
                      request.environ, repo_name=target_repo.repo_name,
                      username=apiuser.username, action='push',
                      scm=target_repo.repo_type)
-                 merge_response = PullRequestModel().merge(
+                 merge_response = PullRequestModel().merge_repo(
                      pull_request, apiuser, extras=extras)
                  if merge_response.executed:
                      PullRequestModel().close_pull_request(
                      closing_pr=False,
                      renderer=renderer,
                      comment_type=comment_type,
-                     resolves_comment_id=resolves_comment_id
+                     resolves_comment_id=resolves_comment_id,
+                     auth_user=apiuser
                  )
                  if allowed_to_change_status and status:
              @jsonrpc_method()
              def create_pull_request(
                      request, apiuser, source_repo, target_repo, source_ref, target_ref,
-                     title=Optional(''), description=Optional(''), reviewers=Optional(None)):
+                     title=Optional(''), description=Optional(''), description_renderer=Optional(''),
+                     reviewers=Optional(None)):
                  """
                  Creates a new pull request.
                  :type title: str
                  :param description: Set the pull request description.
                  :type description: Optional(str)
+                 :type description_renderer: Optional(str)
+                 :param description_renderer: Set pull request renderer for the description.
+                     It should be 'rst', 'markdown' or 'plain'. If not give default
+                     system renderer will be used
                  :param reviewers: Set the new pull request reviewers list.
                      Reviewer defined by review rules will be added automatically to the
                      defined list.
                          [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
                  """
-                 source_db_repo =  get_repo_or_error(source_repo)
+                 source_db_repo = get_repo_or_error(source_repo)
                  target_db_repo = get_repo_or_error(target_repo)
                  if not has_superadmin_permission(apiuser):
                      _perms = ('repository.admin', 'repository.write', 'repository.read',)
                          source_ref=title_source_ref,
                          target=target_repo
                      )
+                 # fetch renderer, if set fallback to plain in case of PR
+                 rc_config = SettingsModel().get_all_settings()
+                 default_system_renderer = rc_config.get('rhodecode_markup_renderer', 'plain')
                  description = Optional.extract(description)
+                 description_renderer = Optional.extract(description_renderer) or default_system_renderer
                  pull_request = PullRequestModel().create(
                      created_by=apiuser.user_id,
                      reviewers=reviewers,
                      title=title,
                      description=description,
+                     description_renderer=description_renderer,
                      reviewer_data=reviewer_rules,
+                     auth_user=apiuser
                  )
                  Session().commit()
              @jsonrpc_method()
              def update_pull_request(
                      request, apiuser, pullrequestid, repoid=Optional(None),
-                     title=Optional(''), description=Optional(''), reviewers=Optional(None),
-                     update_commits=Optional(None)):
+                     title=Optional(''), description=Optional(''), description_renderer=Optional(''),
+                     reviewers=Optional(None), update_commits=Optional(None)):
                  """
                  Updates a pull request.
                  :type title: str
                  :param description: Update pull request description.
                  :type description: Optional(str)
+                 :type description_renderer: Optional(str)
+                 :param description_renderer: Update pull request renderer for the description.
+                     It should be 'rst', 'markdown' or 'plain'
                  :param reviewers: Update pull request reviewers list with new value.
                  :type reviewers: Optional(list)
                      Accepts username strings or objects of the format:
                  title = Optional.extract(title)
                  description = Optional.extract(description)
+                 description_renderer = Optional.extract(description_renderer)
                  if title or description:
                      PullRequestModel().edit(
-                         pull_request, title or pull_request.title,
-                         description or pull_request.description, apiuser)
+                         pull_request,
+                         title or pull_request.title,
+                         description or pull_request.description,
+                         description_renderer or pull_request.description_renderer,
+                         apiuser)
                      Session().commit()
                  commit_changes = {"added": [], "common": [], "removed": []}

rhodecode/api/views/repo_api.py

0 +2 -1

                          status_change_type=status,
                          renderer=renderer,
                          comment_type=comment_type,
-                         resolves_comment_id=resolves_comment_id
+                         resolves_comment_id=resolves_comment_id,
+                         auth_user=apiuser
                      )
                      if status:
                          # also do a status change

rhodecode/apps/_base/__init__.py

0 +19 -15

                  phash = text
                  def __call__(self, info, request):
                      if hasattr(request, 'vcs_call'):
                          # skip vcs calls
                          return
                      repo_name = info['match']['repo_name']
                      repo_model = repo.RepoModel()
-                     by_name_match = repo_model.get_by_repo_name(repo_name, cache=True)
+                     by_name_match = repo_model.get_by_repo_name(repo_name, cache=False)
-                     def redirect_if_creating(db_repo):
+                     def redirect_if_creating(route_info, db_repo):
+                         skip_views = ['edit_repo_advanced_delete']
+                         route = route_info['route']
+                         # we should skip delete view so we can actually "remove" repositories
+                         # if they get stuck in creating state.
+                         if route.name in skip_views:
+                             return
                          if db_repo.repo_state in [repo.Repository.STATE_PENDING]:
-                             raise HTTPFound(
-                                 request.route_path('repo_creating',
-                                                    repo_name=db_repo.repo_name))
+                             repo_creating_url = request.route_path(
+                                 'repo_creating', repo_name=db_repo.repo_name)
+                             raise HTTPFound(repo_creating_url)
                      if by_name_match:
                          # register this as request object we can re-use later
                          request.db_repo = by_name_match
-                         redirect_if_creating(by_name_match)
+                         redirect_if_creating(info, by_name_match)
                          return True
                      by_id_match = repo_model.get_repo_by_id(repo_name)
                      if by_id_match:
                          request.db_repo = by_id_match
-                         redirect_if_creating(by_id_match)
+                         redirect_if_creating(info, by_id_match)
                          return True
                      return False
                      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')
                      repo_group_name = info['match']['repo_group_name']
                      repo_group_model = repo_group.RepoGroupModel()
-                     by_name_match = repo_group_model.get_by_group_name(
-                         repo_group_name, cache=True)
+                     by_name_match = repo_group_model.get_by_group_name(repo_group_name, cache=False)
                      if by_name_match:
                          # register this as request object we can re-use later
                      user_group_id = info['match']['user_group_id']
                      user_group_model = user_group.UserGroup()
-                     by_id_match = user_group_model.get(
-                         user_group_id, cache=True)
+                     by_id_match = user_group_model.get(user_group_id, cache=False)
                      if by_id_match:
                          # register this as request object we can re-use later
                      user_id = info['match']['user_id']
                      user_model = user.User()
-                     by_id_match = user_model.get(
-                         user_id, cache=True)
+                     by_id_match = user_model.get(user_id, cache=False)
                      if by_id_match:
                          # register this as request object we can re-use later

rhodecode/apps/admin/__init__.py

0 +30 0

                      pattern='/settings/system/updates')
                  config.add_route(
+                     name='admin_settings_exception_tracker',
+                     pattern='/settings/exceptions')
+                 config.add_route(
+                     name='admin_settings_exception_tracker_delete_all',
+                     pattern='/settings/exceptions/delete')
+                 config.add_route(
+                     name='admin_settings_exception_tracker_show',
+                     pattern='/settings/exceptions/{exception_id}')
+                 config.add_route(
+                     name='admin_settings_exception_tracker_delete',
+                     pattern='/settings/exceptions/{exception_id}/delete')
+                 config.add_route(
                      name='admin_settings_sessions',
                      pattern='/settings/sessions')
                  config.add_route(
                      name='admin_permissions_object_update',
                      pattern='/permissions/object/update')
+                 # Branch perms EE feature
+                 config.add_route(
+                     name='admin_permissions_branch',
+                     pattern='/permissions/branch')
                  config.add_route(
                      name='admin_permissions_ips',
                      pattern='/permissions/ips')
                      name='edit_user_audit_logs',
                      pattern='/users/{user_id:\d+}/edit/audit', user_route=True)
+                 # user caches
+                 config.add_route(
+                     name='edit_user_caches',
+                     pattern='/users/{user_id:\d+}/edit/caches',
+                     user_route=True)
+                 config.add_route(
+                     name='edit_user_caches_update',
+                     pattern='/users/{user_id:\d+}/edit/caches/update',
+                     user_route=True)
                  # user-groups admin
                  config.add_route(
                      name='user_groups',
                  config.add_route(name='admin_home', pattern=ADMIN_PREFIX)
                  config.include(admin_routes, route_prefix=ADMIN_PREFIX)
+                 config.include('.subscribers')
                  # Scan module for configuration decorators.
                  config.scan('.views', ignore='.tests')

rhodecode/apps/admin/navigation.py

0 +3 0

                               'global_integrations_home'),
                      NavEntry('system', _('System Info'),
                               'admin_settings_system'),
+                     NavEntry('exceptions', _('Exceptions Tracker'),
+                              'admin_settings_exception_tracker',
+                              active_list=['exceptions', 'exceptions_browse']),
                      NavEntry('process_management', _('Processes'),
                               'admin_settings_process_management'),
                      NavEntry('sessions', _('User Sessions'),

rhodecode/apps/admin/tests/test_admin_main_views.py

0 +2 -2

                      self.log_user()
                      pull_request = pr_util.create_pull_request()
                      pull_request_id = pull_request.pull_request_id
+                     repo_name = pull_request.target_repo.repo_name
                      response = self.app.get(
                          route_path(view, pull_request_id=pull_request_id),
                      assert response.location.endswith(
                          'pull-request/{}'.format(pull_request_id))
-                     repo_name = pull_request.target_repo.repo_name
                      redirect_url = route_path(
                          'pullrequest_show', repo_name=repo_name,
-                         pull_request_id=pull_request.pull_request_id)
+                         pull_request_id=pull_request_id)
                      assert redirect_url in response.location

rhodecode/apps/admin/tests/test_admin_permissions.py

0 +8 -9

              from rhodecode.model.permission import PermissionModel
              from rhodecode.model.ssh_key import SshKeyModel
              from rhodecode.tests import (
-                 TestController, clear_all_caches, assert_session_flash)
+                 TestController, clear_cache_regions, assert_session_flash)
              def route_path(name, params=None, **kwargs):
                  def test_index_ips(self):
                      self.log_user()
                      response = self.app.get(route_path('admin_permissions_ips'))
-                     # TODO: Test response...
                      response.mustcontain('All IP addresses are allowed')
                  def test_add_delete_ips(self):
+                     clear_cache_regions(['sql_cache_short'])
                      self.log_user()
-                     clear_all_caches()
                      # ADD
                      default_user_id = User.get_default_user().user_id
                      self.app.post(
                          route_path('edit_user_ips_add', user_id=default_user_id),
-                         params={'new_ip': '127.0.0.0/24', 'csrf_token': self.csrf_token})
+                         params={'new_ip': '0.0.0.0/24', 'csrf_token': self.csrf_token})
                      response = self.app.get(route_path('admin_permissions_ips'))
-                     response.mustcontain('127.0.0.0/24')
-                     response.mustcontain('127.0.0.0 - 127.0.0.255')
+                     response.mustcontain('0.0.0.0/24')
+                     response.mustcontain('0.0.0.0 - 0.0.0.255')
                      # DELETE
                      default_user_id = User.get_default_user().user_id
                      assert_session_flash(response, 'Removed ip address from user whitelist')
-                     clear_all_caches()
+                     clear_cache_regions(['sql_cache_short'])
                      response = self.app.get(route_path('admin_permissions_ips'))
                      response.mustcontain('All IP addresses are allowed')
-                     response.mustcontain(no=['127.0.0.0/24'])
-                     response.mustcontain(no=['127.0.0.0 - 127.0.0.255'])
+                     response.mustcontain(no=['0.0.0.0/24'])
+                     response.mustcontain(no=['0.0.0.0 - 0.0.0.255'])
                  def test_index_overview(self):
                      self.log_user()

rhodecode/apps/admin/tests/test_admin_repos.py

0 +8 -5

                  def test_repo_list(self, autologin_user, user_util):
                      repo = user_util.create_repo()
+                     repo_name = repo.repo_name
                      response = self.app.get(
                          route_path('repos'), status=200)
-                     response.mustcontain(repo.repo_name)
+                     response.mustcontain(repo_name)
                  def test_create_page_restricted_to_single_backend(self, autologin_user, backend):
                      with mock.patch('rhodecode.BACKENDS', {'git': 'git'}):
                                                   group_description='test',
                                                   owner=TEST_USER_ADMIN_LOGIN)
                      Session().commit()
+                     repo_group_id = gr.group_id
                      group_name_allowed = 'reg_sometest_allowed_%s' % backend.alias
                      gr_allowed = RepoGroupModel().create(
                          group_name=group_name_allowed,
                          group_description='test',
                          owner=TEST_USER_REGULAR_LOGIN)
+                     allowed_repo_group_id = gr_allowed.group_id
                      Session().commit()
                      repo_name = 'ingroup'
                              repo_name=repo_name,
                              repo_type=backend.alias,
                              repo_description=description,
-                             repo_group=gr.group_id,
+                             repo_group=repo_group_id,
                              csrf_token=csrf_token))
                      response.mustcontain('Invalid value')
                              repo_name=repo_name,
                              repo_type=backend.alias,
                              repo_description=description,
-                             repo_group=gr_allowed.group_id,
+                             repo_group=allowed_repo_group_id,
                              csrf_token=csrf_token))
                      # TODO: johbo: Cleanup in pytest fixture
                      # add repo permissions
                      Session().commit()
+                     repo_group_id = gr.group_id
                      repo_name = 'ingroup_inherited_%s' % backend.alias
                      repo_name_full = RepoGroup.url_sep().join([group_name, repo_name])
                      description = 'description for newly created repo'
                              repo_name=repo_name,
                              repo_type=backend.alias,
                              repo_description=description,
-                             repo_group=gr.group_id,
+                             repo_group=repo_group_id,
                              repo_copy_permissions=True,
                              csrf_token=csrf_token))

rhodecode/apps/admin/tests/test_admin_user_groups.py

0 +1 -1

                          'csrf_token': self.csrf_token}, status=200)
                      response.mustcontain(
-                         'User group `{}` already exists'.format(user_group.users_group_name))
+                         'User group `{}` already exists'.format(duplicate_name))

rhodecode/apps/admin/tests/test_admin_users.py

0 +4 -2

                      self.log_user()
                      user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
+                     user_id = user.user_id
+                     auth_tokens = user.auth_tokens
                      response = self.app.get(
-                         route_path('edit_user_auth_tokens', user_id=user.user_id))
-                     for token in user.auth_tokens:
+                         route_path('edit_user_auth_tokens', user_id=user_id))
+                     for token in auth_tokens:
                          response.mustcontain(token)
                          response.mustcontain('never')

rhodecode/apps/admin/views/permissions.py

0 +26 -1

                          self.request.translate,
                          [x[0] for x in c.repo_perms_choices],
                          [x[0] for x in c.group_perms_choices],
-                         [x[0] for x in c.user_group_perms_choices])()
+                         [x[0] for x in c.user_group_perms_choices],
+                     )()
                      try:
                          form_result = _form.to_python(dict(self.request.POST))
                  @LoginRequired()
                  @HasPermissionAllDecorator('hg.admin')
                  @view_config(
+                     route_name='admin_permissions_branch', request_method='GET',
+                     renderer='rhodecode:templates/admin/permissions/permissions.mako')
+                 def permissions_branch(self):
+                     c = self.load_default_context()
+                     c.active = 'branch'
+                     c.user = User.get_default_user(refresh=True)
+                     defaults = {}
+                     defaults.update(c.user.get_default_perms())
+                     data = render(
+                         'rhodecode:templates/admin/permissions/permissions.mako',
+                         self._get_template_context(c), self.request)
+                     html = formencode.htmlfill.render(
+                         data,
+                         defaults=defaults,
+                         encoding="UTF-8",
+                         force_defaults=False
+                     )
+                     return Response(html)
+                 @LoginRequired()
+                 @HasPermissionAllDecorator('hg.admin')
+                 @view_config(
                      route_name='admin_permissions_global', request_method='GET',
                      renderer='rhodecode:templates/admin/permissions/permissions.mako')
                  def permissions_global(self):

rhodecode/apps/admin/views/repo_groups.py

0 +2 0

              from pyramid.renderers import render
              from pyramid.response import Response
+             from rhodecode import events
              from rhodecode.apps._base import BaseAppView, DataGridAppView
              from rhodecode.lib.ext_json import json
                                  % repo_group_name, category='error')
                          raise HTTPFound(h.route_path('home'))
+                     events.trigger(events.UserPermissionsChange([self._rhodecode_user.user_id]))
                      raise HTTPFound(
                          h.route_path('repo_group_home',
                                       repo_group_name=form_result['group_name_full']))

rhodecode/apps/admin/views/repositories.py

0 +3 0

              from pyramid.renderers import render
              from pyramid.response import Response
+             from rhodecode import events
              from rhodecode.apps._base import BaseAppView, DataGridAppView
              from rhodecode.lib.celerylib.utils import get_task_id
                          h.flash(msg, category='error')
                          raise HTTPFound(h.route_path('home'))
+                     events.trigger(events.UserPermissionsChange([self._rhodecode_user.user_id]))
                      raise HTTPFound(
                          h.route_path('repo_creating',
                                       repo_name=form_result['repo_name_full'],

rhodecode/apps/admin/views/system_info.py

0 +1 0

                          # Platform/Python
                          (_('Platform'), val('platform')['name'], state('platform')),
                          (_('Platform UUID'), val('platform')['uuid'], state('platform')),
+                         (_('Lang'), val('locale'), state('locale')),
                          (_('Python version'), val('python')['version'], state('python')),
                          (_('Python path'), val('python')['executable'], state('python')),
                          ('', '', ''),  # spacer

rhodecode/apps/admin/views/user_groups.py

0 +13 0

              from pyramid.response import Response
              from pyramid.renderers import render
+             from rhodecode import events
              from rhodecode.apps._base import BaseAppView, DataGridAppView
              from rhodecode.lib.auth import (
                  LoginRequired, NotAnonymous, CSRFRequired, HasPermissionAnyDecorator)
                  or_, count, User, UserGroup, UserGroupMember)
              from rhodecode.model.meta import Session
              from rhodecode.model.user_group import UserGroupModel
+             from rhodecode.model.db import true
              log = logging.getLogger(__name__)
                          .filter(UserGroup.users_group_id.in_(allowed_ids))\
                          .count()
+                     user_groups_data_total_inactive_count = UserGroup.query()\
+                         .filter(UserGroup.users_group_id.in_(allowed_ids))\
+                         .filter(UserGroup.users_group_active != true()).count()
                      member_count = count(UserGroupMember.user_id)
                      base_q = Session.query(
                          UserGroup.users_group_name,
                      .join(User, User.user_id == UserGroup.user_id) \
                      .group_by(UserGroup, User)
+                     base_q_inactive = base_q.filter(UserGroup.users_group_active != true())
                      if search_q:
                          like_expression = u'%{}%'.format(safe_unicode(search_q))
                          base_q = base_q.filter(or_(
                              UserGroup.users_group_name.ilike(like_expression),
                          ))
+                         base_q_inactive = base_q.filter(UserGroup.users_group_active != true())
                      user_groups_data_total_filtered_count = base_q.count()
+                     user_groups_data_total_filtered_inactive_count = base_q_inactive.count()
                      if order_by == 'members_total':
                          sort_col = member_count
                          'draw': draw,
                          'data': user_groups_data,
                          'recordsTotal': user_groups_data_total_count,
+                         'recordsTotalInactive': user_groups_data_total_inactive_count,
                          'recordsFiltered': user_groups_data_total_filtered_count,
+                         'recordsFilteredInactive': user_groups_data_total_filtered_inactive_count,
                      })
                      return data
                                  % user_group_name, category='error')
                          raise HTTPFound(h.route_path('user_groups_new'))
+                     events.trigger(events.UserPermissionsChange([self._rhodecode_user.user_id]))
                      raise HTTPFound(
                          h.route_path('edit_user_group', user_group_id=user_group_id))

rhodecode/apps/admin/views/users.py

0 +57 -6

              from rhodecode.apps.ssh_support import SshKeyFileChangeEvent
              from rhodecode.authentication.plugins import auth_rhodecode
              from rhodecode.events import trigger
+             from rhodecode.model.db import true
-             from rhodecode.lib import audit_logger
+             from rhodecode.lib import audit_logger, rc_cache
              from rhodecode.lib.exceptions import (
                  UserCreationError, UserOwnsReposException, UserOwnsRepoGroupsException,
                  UserOwnsUserGroupsException, DefaultUserException)
                      draw, start, limit = self._extract_chunk(self.request)
                      search_q, order_by, order_dir = self._extract_ordering(
                          self.request, column_map=column_map)
                      _render = self.request.get_partial_renderer(
                          'rhodecode:templates/data_table/_dt_elements.mako')
                          .filter(User.username != User.DEFAULT_USER) \
                          .count()
+                     users_data_total_inactive_count = User.query()\
+                         .filter(User.username != User.DEFAULT_USER) \
+                         .filter(User.active != true())\
+                         .count()
                      # json generate
                      base_q = User.query().filter(User.username != User.DEFAULT_USER)
+                     base_inactive_q = base_q.filter(User.active != true())
                      if search_q:
                          like_expression = u'%{}%'.format(safe_unicode(search_q))
                              User.name.ilike(like_expression),
                              User.lastname.ilike(like_expression),
                          ))
+                         base_inactive_q = base_q.filter(User.active != true())
                      users_data_total_filtered_count = base_q.count()
+                     users_data_total_filtered_inactive_count = base_inactive_q.count()
                      sort_col = getattr(User, order_by, None)
                      if sort_col:
                              "extern_name": user.extern_name,
                              "action": user_actions(user.user_id, user.username),
                          })
                      data = ({
                          'draw': draw,
                          'data': users_data,
                          'recordsTotal': users_data_total_count,
                          'recordsFiltered': users_data_total_filtered_count,
+                         'recordsTotalInactive': users_data_total_inactive_count,
+                         'recordsFilteredInactive': users_data_total_filtered_inactive_count
                      })
                      return data
                      description = self.request.POST.get('description')
                      role = self.request.POST.get('role')
-                     token = AuthTokenModel().create(
-                         c.user.user_id, description, lifetime, role)
+                     token = UserModel().add_auth_token(
+                         user=c.user.user_id,
+                         lifetime_minutes=lifetime, role=role, description=description,
+                         scope_callback=self.maybe_attach_token_scope)
                      token_data = token.get_api_data()
-                     self.maybe_attach_token_scope(token)
                      audit_logger.store_web(
                          'user.edit.token.add', action_data={
                              'data': {'token': token_data, 'user': user_data}},
                      perm_user = self.db_user.AuthUser(ip_addr=self.request.remote_addr)
                      return perm_user.permissions
+                 @LoginRequired()
+                 @HasPermissionAllDecorator('hg.admin')
+                 @view_config(
+                     route_name='edit_user_caches', request_method='GET',
+                     renderer='rhodecode:templates/admin/users/user_edit.mako')
+                 def user_caches(self):
+                     _ = self.request.translate
+                     c = self.load_default_context()
+                     c.user = self.db_user
+                     c.active = 'caches'
+                     c.perm_user = c.user.AuthUser(ip_addr=self.request.remote_addr)
+                     cache_namespace_uid = 'cache_user_auth.{}'.format(self.db_user.user_id)
+                     c.region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
+                     c.backend = c.region.backend
+                     c.user_keys = sorted(c.region.backend.list_keys(prefix=cache_namespace_uid))
+                     return self._get_template_context(c)
+                 @LoginRequired()
+                 @HasPermissionAllDecorator('hg.admin')
+                 @CSRFRequired()
+                 @view_config(
+                     route_name='edit_user_caches_update', request_method='POST')
+                 def user_caches_update(self):
+                     _ = self.request.translate
+                     c = self.load_default_context()
+                     c.user = self.db_user
+                     c.active = 'caches'
+                     c.perm_user = c.user.AuthUser(ip_addr=self.request.remote_addr)
+                     cache_namespace_uid = 'cache_user_auth.{}'.format(self.db_user.user_id)
+                     del_keys = rc_cache.clear_cache_namespace('cache_perms', cache_namespace_uid)
+                     h.flash(_("Deleted {} cache keys").format(del_keys), category='success')
+                     return HTTPFound(h.route_path(
+                         'edit_user_caches', user_id=c.user.user_id))

rhodecode/apps/home/__init__.py

0 +4 0

                      name='goto_switcher_data',
                      pattern='/_goto_data')
+                 config.add_route(
+                     name='markup_preview',
+                     pattern='/_markup_preview')
                  # register our static links via redirection mechanism
                  routing_links.connect_redirection_links(config)

rhodecode/apps/home/tests/__init__.py

0 +28 -6

              # and proprietary license terms, please see https://rhodecode.com/licenses/
-             def assert_and_get_content(result):
+             def assert_and_get_main_filter_content(result):
                  repos = []
                  groups = []
                  commits = []
+                 users = []
+                 for data_item in result:
+                     assert data_item['id']
+                     assert data_item['value']
+                     assert data_item['value_display']
+                     assert data_item['url']
+                     if data_item['type'] == 'search':
+                         assert data_item['value_display'].startswith('Full text search for:')
+                     elif data_item['type'] == 'repo':
+                         repos.append(data_item)
+                     elif data_item['type'] == 'repo_group':
+                         groups.append(data_item)
+                     elif data_item['type'] == 'user':
+                         users.append(data_item)
+                     elif data_item['type'] == 'commit':
+                         commits.append(data_item)
+                     else:
+                         raise Exception('invalid type `%s`' % data_item['type'])
+                 return repos, groups, users, commits
+             def assert_and_get_repo_list_content(result):
+                 repos = []
                  for data in result:
                      for data_item in data['children']:
                          assert data_item['id']
                          assert data_item['text']
                          assert data_item['url']
                          if data_item['type'] == 'repo':
                              repos.append(data_item)
-                         elif data_item['type'] == 'group':
-                             groups.append(data_item)
-                         elif data_item['type'] == 'commit':
-                             commits.append(data_item)
                          else:
                              raise Exception('invalid type %s' % data_item['type'])
-                 return repos, groups, commits
  No newline at end of file
+                 return repos

rhodecode/apps/home/tests/test_get_goto_switched_data.py

0 +43 -14

              import pytest
-             from . import assert_and_get_content
+             from . import assert_and_get_main_filter_content
              from rhodecode.tests import TestController, TEST_USER_ADMIN_LOGIN
              from rhodecode.tests.fixture import Fixture
                                  RepoGroupModel().delete(el, force_delete=True)
                                  Session().commit()
-                 def test_returns_list_of_repos_and_groups(self, xhr_header):
+                 def test_empty_query(self, xhr_header):
                      self.log_user()
                      response = self.app.get(
                          route_path('goto_switcher_data'),
                          extra_environ=xhr_header, status=200)
-                     result = json.loads(response.body)['results']
-                     repos, groups, commits = assert_and_get_content(result)
+                     result = json.loads(response.body)['suggestions']
-                     assert len(repos) == len(Repository.get_all())
-                     assert len(groups) == len(RepoGroup.get_all())
-                     assert len(commits) == 0
+                     assert result == []
                  def test_returns_list_of_repos_and_groups_filtered(self, xhr_header):
                      self.log_user()
                          route_path('goto_switcher_data'),
                          params={'query': 'abc'},
                          extra_environ=xhr_header, status=200)
-                     result = json.loads(response.body)['results']
+                     result = json.loads(response.body)['suggestions']
-                     repos, groups, commits = assert_and_get_content(result)
+                     repos, groups, users, commits = assert_and_get_main_filter_content(result)
                      assert len(repos) == 13
                      assert len(groups) == 5
+                     assert len(users) == 0
                      assert len(commits) == 0
+                 def test_returns_list_of_users_filtered(self, xhr_header):
+                     self.log_user()
+                     response = self.app.get(
+                         route_path('goto_switcher_data'),
+                         params={'query': 'user:admin'},
+                         extra_environ=xhr_header, status=200)
+                     result = json.loads(response.body)['suggestions']
+                     repos, groups, users, commits = assert_and_get_main_filter_content(result)
+                     assert len(repos) == 0
+                     assert len(groups) == 0
+                     assert len(users) == 1
+                     assert len(commits) == 0
+                 def test_returns_list_of_commits_filtered(self, xhr_header):
+                     self.log_user()
+                     response = self.app.get(
+                         route_path('goto_switcher_data'),
+                         params={'query': 'commit:e8'},
+                         extra_environ=xhr_header, status=200)
+                     result = json.loads(response.body)['suggestions']
+                     repos, groups, users, commits = assert_and_get_main_filter_content(result)
+                     assert len(repos) == 0
+                     assert len(groups) == 0
+                     assert len(users) == 0
+                     assert len(commits) == 5
                  def test_returns_list_of_properly_sorted_and_filtered(self, xhr_header):
                      self.log_user()
                          route_path('goto_switcher_data'),
                          params={'query': 'abc'},
                          extra_environ=xhr_header, status=200)
-                     result = json.loads(response.body)['results']
+                     result = json.loads(response.body)['suggestions']
-                     repos, groups, commits = assert_and_get_content(result)
+                     repos, groups, users, commits = assert_and_get_main_filter_content(result)
-                     test_repos = [x['text'] for x in repos[:4]]
+                     test_repos = [x['value_display'] for x in repos[:4]]
                      assert ['abc', 'abcd', 'a/abc', 'abcde'] == test_repos
-                     test_groups = [x['text'] for x in groups[:4]]
+                     test_groups = [x['value_display'] for x in groups[:4]]
                      assert ['abc_repos', 'repos_abc',
                              'forked-abc', 'forked-abc/a'] == test_groups

rhodecode/apps/home/tests/test_get_repo_list_data.py

0 +5 -13

              import json
-             from . import assert_and_get_content
+             from . import assert_and_get_repo_list_content
              from rhodecode.tests import TestController
              from rhodecode.tests.fixture import Fixture
              from rhodecode.model.db import Repository
                          extra_environ=xhr_header, status=200)
                      result = json.loads(response.body)['results']
-                     repos, groups, commits = assert_and_get_content(result)
+                     repos = assert_and_get_repo_list_content(result)
                      assert len(repos) == len(Repository.get_all())
-                     assert len(groups) == 0
-                     assert len(commits) == 0
                  def test_returns_list_of_repos_and_groups_filtered(self, xhr_header):
                      self.log_user()
                          extra_environ=xhr_header, status=200)
                      result = json.loads(response.body)['results']
-                     repos, groups, commits = assert_and_get_content(result)
+                     repos = assert_and_get_repo_list_content(result)
                      assert len(repos) == len(Repository.query().filter(
                          Repository.repo_name.ilike('%vcs_test_git%')).all())
-                     assert len(groups) == 0
-                     assert len(commits) == 0
                  def test_returns_list_of_repos_and_groups_filtered_with_type(self, xhr_header):
                      self.log_user()
                          extra_environ=xhr_header, status=200)
                      result = json.loads(response.body)['results']
-                     repos, groups, commits = assert_and_get_content(result)
+                     repos = assert_and_get_repo_list_content(result)
                      assert len(repos) == len(Repository.query().filter(
                          Repository.repo_name.ilike('%vcs_test_git%')).all())
-                     assert len(groups) == 0
-                     assert len(commits) == 0
                  def test_returns_list_of_repos_non_ascii_query(self, xhr_header):
                      self.log_user()
                          extra_environ=xhr_header, status=200)
                      result = json.loads(response.body)['results']
-                     repos, groups, commits = assert_and_get_content(result)
+                     repos = assert_and_get_repo_list_content(result)
                      assert len(repos) == 0
-                     assert len(groups) == 0
-                     assert len(commits) == 0

rhodecode/apps/home/views.py

0 +164 -43

              import re
              import logging
+             import collections
              from pyramid.view import view_config
              from rhodecode.apps._base import BaseAppView
              from rhodecode.lib import helpers as h
              from rhodecode.lib.auth import (
-                 LoginRequired, NotAnonymous, HasRepoGroupPermissionAnyDecorator)
+                 LoginRequired, NotAnonymous, HasRepoGroupPermissionAnyDecorator,
+                 CSRFRequired)
              from rhodecode.lib.index import searcher_from_config
-             from rhodecode.lib.utils2 import safe_unicode, str2bool
+             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)
+                 func, 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
                      return {'suggestions': _user_groups}
                  def _get_repo_list(self, name_contains=None, repo_type=None, limit=20):
+                     org_query = name_contains
                      allowed_ids = self._rhodecode_user.repo_acl_ids(
                          ['repository.read', 'repository.write', 'repository.admin'],
                          cache=False, name_filter=name_contains) or [-1]
                              Repository.repo_name.ilike(ilike_expression))
                          query = query.limit(limit)
-                     acl_repo_iter = query
+                     acl_iter = query
                      return [
                          {
                              'id': obj.repo_name,
+                             'value': org_query,
+                             'value_display': obj.repo_name,
                              'text': obj.repo_name,
                              'type': 'repo',
-                             'obj': {'repo_type': obj.repo_type, 'private': obj.private,
-                                     'repo_id': obj.repo_id},
+                             'repo_id': obj.repo_id,
+                             'repo_type': obj.repo_type,
+                             'private': obj.private,
                              'url': h.route_path('repo_summary', repo_name=obj.repo_name)
                          }
-                         for obj in acl_repo_iter]
+                         for obj in acl_iter]
                  def _get_repo_group_list(self, name_contains=None, limit=20):
+                     org_query = name_contains
                      allowed_ids = self._rhodecode_user.repo_group_acl_ids(
                          ['group.read', 'group.write', 'group.admin'],
                          cache=False, name_filter=name_contains) or [-1]
                              RepoGroup.group_name.ilike(ilike_expression))
                          query = query.limit(limit)
-                     acl_repo_iter = query
+                     acl_iter = query
                      return [
                          {
                              'id': obj.group_name,
-                             'text': obj.group_name,
-                             'type': 'group',
-                             'obj': {},
+                             'value': org_query,
+                             'value_display': obj.group_name,
+                             'type': 'repo_group',
                              'url': h.route_path(
                                  'repo_group_home', repo_group_name=obj.group_name)
                          }
-                         for obj in acl_repo_iter]
+                         for obj in acl_iter]
+                 def _get_user_list(self, name_contains=None, limit=20):
+                     org_query = name_contains
+                     if not name_contains:
+                         return []
+                     name_contains = re.compile('(?:user:)(.+)').findall(name_contains)
+                     if len(name_contains) != 1:
+                         return []
+                     name_contains = name_contains[0]
+                     query = User.query()\
+                         .order_by(func.length(User.username))\
+                         .order_by(User.username) \
+                         .filter(User.username != User.DEFAULT_USER)
+                     if name_contains:
+                         ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+                         query = query.filter(
+                             User.username.ilike(ilike_expression))
+                         query = query.limit(limit)
+                     acl_iter = query
-                 def _get_hash_commit_list(self, auth_user, query=None):
+                     return [
+                         {
+                             'id': obj.user_id,
+                             'value': org_query,
+                             'value_display': obj.username,
+                             'type': 'user',
+                             'icon_link': h.gravatar_url(obj.email, 30),
+                             'url': h.route_path(
+                                 'user_profile', username=obj.username)
+                         }
+                         for obj in acl_iter]
+                 def _get_user_groups_list(self, name_contains=None, limit=20):
+                     org_query = name_contains
+                     if not name_contains:
+                         return []
+                     name_contains = re.compile('(?:user_group:)(.+)').findall(name_contains)
+                     if len(name_contains) != 1:
+                         return []
+                     name_contains = name_contains[0]
+                     query = UserGroup.query()\
+                         .order_by(func.length(UserGroup.users_group_name))\
+                         .order_by(UserGroup.users_group_name)
+                     if name_contains:
+                         ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+                         query = query.filter(
+                             UserGroup.users_group_name.ilike(ilike_expression))
+                         query = query.limit(limit)
+                     acl_iter = query
+                     return [
+                         {
+                             'id': obj.users_group_id,
+                             'value': org_query,
+                             'value_display': obj.users_group_name,
+                             'type': 'user_group',
+                             'url': h.route_path(
+                                 'user_group_profile', user_group_name=obj.users_group_name)
+                         }
+                         for obj in acl_iter]
+                 def _get_hash_commit_list(self, auth_user, query):
+                     org_query = query
                      if not query or len(query) < 3:
                          return []
                      if len(commit_hashes) != 1:
                          return []
-                     commit_hash_prefix = commit_hashes[0]
+                     commit_hash = commit_hashes[0]
                      searcher = searcher_from_config(self.request.registry.settings)
                      result = searcher.search(
-                         'commit_id:%s*' % commit_hash_prefix, 'commit', auth_user,
+                         'commit_id:%s*' % commit_hash, 'commit', auth_user,
                          raise_on_exc=False)
                      return [
                          {
                              'id': entry['commit_id'],
-                             'text': entry['commit_id'],
+                             'value': org_query,
+                             'value_display': 'repo `{}` commit: {}'.format(
+                                 entry['repository'], entry['commit_id']),
                              'type': 'commit',
-                             'obj': {'repo': entry['repository']},
+                             'repo': entry['repository'],
                              'url': h.route_path(
                                  'repo_commit',
                                  repo_name=entry['repository'], commit_id=entry['commit_id'])
                      _ = self.request.translate
                      query = self.request.GET.get('query')
-                     log.debug('generating goto switcher list, query %s', query)
+                     log.debug('generating main filter data, query %s', query)
+                     default_search_val = u'Full text search for: `{}`'.format(query)
+                     res = []
+                     if not query:
+                         return {'suggestions': res}
-                     res = []
+                     res.append({
+                         'id': -1,
+                         'value': query,
+                         'value_display': default_search_val,
+                         'type': 'search',
+                         'url': h.route_path(
+                             'search', _query={'q': query})
+                     })
+                     repo_group_id = safe_int(self.request.GET.get('repo_group_id'))
+                     if repo_group_id:
+                         repo_group = RepoGroup.get(repo_group_id)
+                         composed_hint = '{}/{}'.format(repo_group.group_name, query)
+                         show_hint = not query.startswith(repo_group.group_name)
+                         if repo_group and show_hint:
+                             hint = u'Group search: `{}`'.format(composed_hint)
+                             res.append({
+                                 'id': -1,
+                                 'value': composed_hint,
+                                 'value_display': hint,
+                                 'type': 'hint',
+                                 'url': ""
+                             })
                      repo_groups = self._get_repo_group_list(query)
-                     if repo_groups:
-                         res.append({
-                             'text': _('Groups'),
-                             'children': repo_groups
-                         })
+                     for serialized_repo_group in repo_groups:
+                         res.append(serialized_repo_group)
                      repos = self._get_repo_list(query)
-                     if repos:
-                         res.append({
-                             'text': _('Repositories'),
-                             'children': repos
-                         })
+                     for serialized_repo in repos:
+                         res.append(serialized_repo)
+                     # TODO(marcink): permissions for that ?
+                     allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+                     if allowed_user_search:
+                         users = self._get_user_list(query)
+                         for serialized_user in users:
+                             res.append(serialized_user)
+                         user_groups = self._get_user_groups_list(query)
+                         for serialized_user_group in user_groups:
+                             res.append(serialized_user_group)
                      commits = self._get_hash_commit_list(c.auth_user, query)
                      if commits:
-                         unique_repos = {}
+                         unique_repos = collections.OrderedDict()
                          for commit in commits:
-                             unique_repos.setdefault(commit['obj']['repo'], []
-                                 ).append(commit)
+                             repo_name = commit['repo']
+                             unique_repos.setdefault(repo_name, []).append(commit)
-                         for repo in unique_repos:
-                             res.append({
-                                 'text': _('Commits in %(repo)s') % {'repo': repo},
-                                 'children': unique_repos[repo]
-                             })
+                         for repo, commits in unique_repos.items():
+                             for commit in commits:
+                                 res.append(commit)
-                     data = {
-                         'more': False,
-                         'results': res
+                     }
-                     return data
+                     return {'suggestions': res}
                  def _get_groups_and_repos(self, repo_group_id=None):
                      # repo groups groups
                      c.repo_groups_data = json.dumps(repo_group_data)
                      return self._get_template_context(c)
+                 @LoginRequired()
+                 @CSRFRequired()
+                 @view_config(
+                     route_name='markup_preview', request_method='POST',
+                     renderer='string', xhr=True)
+                 def markup_preview(self):
+                     # Technically a CSRF token is not needed as no state changes with this
+                     # call. However, as this is a POST is better to have it, so automated
+                     # tools don't flag it as potential CSRF.
+                     # Post is required because the payload could be bigger than the maximum
+                     # allowed by GET.
+                     text = self.request.POST.get('text')
+                     renderer = self.request.POST.get('renderer') or 'rst'
+                     if text:
+                         return h.render(text, renderer=renderer, mentions=True)
+                     return ''

rhodecode/apps/login/tests/test_password_reset.py

0 +2 -2

              from rhodecode.lib import helpers as h
              from rhodecode.tests import (
-                 TestController, clear_all_caches,
+                 TestController, clear_cache_regions,
                  TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS)
              from rhodecode.tests.fixture import Fixture
              from rhodecode.tests.utils import AssertResponse
                      ])
                  def test_password_reset_settings(
                          self, pwd_reset_setting, show_link, show_reset):
-                     clear_all_caches()
+                     clear_cache_regions()
                      self.log_user(TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS)
                      params = {
                          'csrf_token': self.csrf_token,

rhodecode/apps/login/views.py

0 +15 -8

                          'response': captcha_rs,
                          'remoteip': get_ip_addr(self.request.environ)
                      }
-                     verify_rs = requests.get(url, params=params, verify=True)
+                     verify_rs = requests.get(url, params=params, verify=True, timeout=60)
                      verify_rs = verify_rs.json()
                      captcha_status = verify_rs.get('success', False)
                      captcha_errors = verify_rs.get('error-codes', [])
                          action_data = {'data': new_user.get_api_data(),
                                         'user_agent': self.request.user_agent}
+                         audit_user = audit_logger.UserWrap(
+                             username=new_user.username,
+                             user_id=new_user.user_id,
+                             ip_addr=self.request.remote_addr)
                          audit_logger.store_web(
                              'user.register', action_data=action_data,
-                             user=new_user)
+                             user=audit_user)
                          event = UserRegistered(user=new_user, session=self.session)
                          trigger(event)
                              # Generate reset URL and send mail.
                              user = User.get_by_email(user_email)
-                             # generate password reset token that expires in 10minutes
-                             desc = 'Generated token for password reset from {}'.format(
+                             # generate password reset token that expires in 10 minutes
+                             description = u'Generated token for password reset from {}'.format(
                                  datetime.datetime.now().isoformat())
-                             reset_token = AuthTokenModel().create(
-                                 user, lifetime=10,
-                                 description=desc,
-                                 role=UserApiKeys.ROLE_PASSWORD_RESET)
+                             reset_token = UserModel().add_auth_token(
+                                 user=user, lifetime_minutes=10,
+                                 role=UserModel.auth_token_role.ROLE_PASSWORD_RESET,
+                                 description=description)
                              Session().commit()
                              log.debug('Successfully created password recovery token')

rhodecode/apps/my_account/tests/test_my_account_notifications.py

0 +1 0

                      notification = NotificationModel().create(
                          created_by=cur_user, notification_subject=subject,
                          notification_body=notif_body, recipients=[cur_user, u1, u2])
+                     Session().commit()
                      response = self.app.get(
                          route_path('notifications_show',

rhodecode/apps/my_account/views/my_account.py

0 +4 -3

                      description = self.request.POST.get('description')
                      role = self.request.POST.get('role')
-                     token = AuthTokenModel().create(
-                         c.user.user_id, description, lifetime, role)
+                     token = UserModel().add_auth_token(
+                         user=c.user.user_id,
+                         lifetime_minutes=lifetime, role=role, description=description,
+                         scope_callback=self.maybe_attach_token_scope)
                      token_data = token.get_api_data()
-                     self.maybe_attach_token_scope(token)
                      audit_logger.store_web(
                          'user.edit.token.add', action_data={
                              'data': {'token': token_data, 'user': 'self'}},

rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py

0 +41 -4

              import pytest
+             from rhodecode.tests.utils import permission_update_data_generator
              def route_path(name, params=None, **kwargs):
                  import urllib
              @pytest.mark.usefixtures("app")
-             class TestRepoGroupsPermissionsView(object):
+             class TestRepoGroupPermissionsView(object):
-                 def test_edit_repo_group_perms(self, user_util, autologin_user):
+                 def test_edit_perms_view(self, user_util, autologin_user):
                      repo_group = user_util.create_repo_group()
                      self.app.get(
                          route_path('edit_repo_group_perms',
                                     repo_group_name=repo_group.group_name), status=200)
-                 def test_update_permissions(self):
-                     pass
+                 def test_update_permissions(self, csrf_token, user_util):
+                     repo_group = user_util.create_repo_group()
+                     repo_group_name = repo_group.group_name
+                     user = user_util.create_user()
+                     user_id = user.user_id
+                     username = user.username
+                     # grant new
+                     form_data = permission_update_data_generator(
+                         csrf_token,
+                         default='group.write',
+                         grant=[(user_id, 'group.write', username, 'user')])
+                     # recursive flag required for repo groups
+                     form_data.extend([('recursive', u'none')])
+                     response = self.app.post(
+                         route_path('edit_repo_group_perms_update',
+                                    repo_group_name=repo_group_name), form_data).follow()
+                     assert 'Repository Group permissions updated' in response
+                     # revoke given
+                     form_data = permission_update_data_generator(
+                         csrf_token,
+                         default='group.read',
+                         revoke=[(user_id, 'user')])
+                     # recursive flag required for repo groups
+                     form_data.extend([('recursive', u'none')])
+                     response = self.app.post(
+                         route_path('edit_repo_group_perms_update',
+                                    repo_group_name=repo_group_name), form_data).follow()
+                     assert 'Repository Group permissions updated' in response

rhodecode/apps/repo_group/views/repo_group_permissions.py

0 +9 0

              from pyramid.view import view_config
              from pyramid.httpexceptions import HTTPFound
+             from rhodecode import events
              from rhodecode.apps._base import RepoGroupAppView
              from rhodecode.lib import helpers as h
              from rhodecode.lib import audit_logger
                      Session().commit()
                      h.flash(_('Repository Group permissions updated'), category='success')
+                     affected_user_ids = []
+                     for change in changes['added'] + changes['updated'] + changes['deleted']:
+                         if change['type'] == 'user':
+                             affected_user_ids.append(change['id'])
+                     events.trigger(events.UserPermissionsChange(affected_user_ids))
                      raise HTTPFound(
                          h.route_path('edit_repo_group_perms',
                                       repo_group_name=self.db_repo_group_name))

rhodecode/apps/repo_group/views/repo_group_settings.py

0 +9 -3

              from pyramid.view import view_config
              from pyramid.httpexceptions import HTTPFound
+             from rhodecode import events
              from rhodecode.apps._base import RepoGroupAppView
              from rhodecode.forms import RcForm
              from rhodecode.lib import helpers as h
              from rhodecode.lib.auth import (
                  LoginRequired, HasPermissionAll,
                  HasRepoGroupPermissionAny, HasRepoGroupPermissionAnyDecorator, CSRFRequired)
-             from rhodecode.model.db import Session, RepoGroup
+             from rhodecode.model.db import Session, RepoGroup, User
              from rhodecode.model.scm import RepoGroupList
              from rhodecode.model.repo_group import RepoGroupModel
              from rhodecode.model.validation_schema.schemas import repo_group_schema
                      if add_parent_group:
                          c.repo_groups_choices.append(parent_group.group_id)
                          c.repo_groups.append(RepoGroup._generate_choice(parent_group))
                      return c
                  def _can_create_repo_group(self, parent_group_id=None):
                          h.flash(_('Error occurred during update of repository group %s')
                                  % old_repo_group_name, category='error')
+                     name_changed = old_repo_group_name != new_repo_group_name
+                     if name_changed:
+                         owner = User.get_by_username(schema_data['repo_group_owner'])
+                         owner_id = owner.user_id if owner else self._rhodecode_user.user_id
+                         events.trigger(events.UserPermissionsChange([
+                             self._rhodecode_user.user_id, owner_id]))
                      raise HTTPFound(
                          h.route_path('edit_repo_group', repo_group_name=new_repo_group_name))

rhodecode/apps/repository/__init__.py

0 +9 0

                      name='edit_repo_perms',
                      pattern='/{repo_name:.*?[^/]}/settings/permissions', repo_route=True)
+                 # Permissions Branch (EE feature)
+                 config.add_route(
+                     name='edit_repo_perms_branch',
+                     pattern='/{repo_name:.*?[^/]}/settings/branch_permissions', repo_route=True)
+                 config.add_route(
+                     name='edit_repo_perms_branch_delete',
+                     pattern='/{repo_name:.*?[^/]}/settings/branch_permissions/{rule_id}/delete',
+                     repo_route=True)
                  # Maintenance
                  config.add_route(
                      name='edit_repo_maintenance',

rhodecode/apps/repository/tests/test_repo_files.py

0 +2 -1

              from rhodecode.lib.vcs.conf import settings
              from rhodecode.tests import assert_session_flash
              from rhodecode.tests.fixture import Fixture
+             from rhodecode.model.db import Session
              fixture = Fixture()
                          {'message': 'b', 'branch': new_branch}
                      ]
                      backend.create_repo(commits)
                      backend.repo.landing_rev = "branch:%s" % new_branch
+                     Session().commit()
                      # get response based on tip and not new commit
                      response = self.app.get(

rhodecode/apps/repository/tests/test_repo_pullrequests.py

0 +70 -4

                              ('target_repo', target.repo_name),
                              ('target_ref',  'branch:default:' + commit_ids['ancestor']),
                              ('common_ancestor', commit_ids['ancestor']),
+                             ('pullrequest_title', 'Title'),
                              ('pullrequest_desc', 'Description'),
-                             ('pullrequest_title', 'Title'),
+                             ('description_renderer', 'markdown'),
                              ('__start__', 'review_members:sequence'),
                                  ('__start__', 'reviewer:mapping'),
                                      ('user_id', '1'),
                              ('target_repo', target.repo_name),
                              ('target_ref',  'branch:default:' + commit_ids['ancestor-child']),
                              ('common_ancestor', commit_ids['ancestor']),
+                             ('pullrequest_title', 'Title'),
                              ('pullrequest_desc', 'Description'),
-                             ('pullrequest_title', 'Title'),
+                             ('description_renderer', 'markdown'),
                              ('__start__', 'review_members:sequence'),
                                  ('__start__', 'reviewer:mapping'),
                                      ('user_id', '2'),
                              ('target_repo', target.repo_name),
                              ('target_ref',  'branch:default:' + commit_ids['ancestor-child']),
                              ('common_ancestor', commit_ids['ancestor']),
+                             ('pullrequest_title', 'Title'),
                              ('pullrequest_desc', 'Description'),
-                             ('pullrequest_title', 'Title'),
+                             ('description_renderer', 'markdown'),
                              ('__start__', 'review_members:sequence'),
                                  ('__start__', 'reviewer:mapping'),
                                      ('user_id', '1'),
                      model_patcher = mock.patch.multiple(
                          PullRequestModel,
-                         merge=mock.Mock(return_value=MergeResponse(
+                         merge_repo=mock.Mock(return_value=MergeResponse(
                              True, False, 'STUB_COMMIT_ID', MergeFailureReason.PUSH_FAILED)),
                          merge_status=mock.Mock(return_value=(True, 'WRONG_MESSAGE')))
                      assert 'Pull request updated to' in response.body
                      assert 'with 1 added, 1 removed commits.' in response.body
+                 def test_update_target_revision_with_removal_of_1_commit_git(self, backend_git, csrf_token):
+                     backend = backend_git
+                     commits = [
+                         {'message': 'master-commit-1'},
+                         {'message': 'master-commit-2-change-1'},
+                         {'message': 'master-commit-3-change-2'},
+                         {'message': 'feat-commit-1', 'parents': ['master-commit-1']},
+                         {'message': 'feat-commit-2'},
+                     ]
+                     commit_ids = backend.create_master_repo(commits)
+                     target = backend.create_repo(heads=['master-commit-3-change-2'])
+                     source = backend.create_repo(heads=['feat-commit-2'])
+                     # create pr from a in source to A in target
+                     pull_request = PullRequest()
+                     pull_request.source_repo = source
+                     # TODO: johbo: Make sure that we write the source ref this way!
+                     pull_request.source_ref = 'branch:{branch}:{commit_id}'.format(
+                         branch=backend.default_branch_name,
+                         commit_id=commit_ids['master-commit-3-change-2'])
+                     pull_request.target_repo = target
+                     # TODO: johbo: Target ref should be branch based, since tip can jump
+                     # from branch to branch
+                     pull_request.target_ref = 'branch:{branch}:{commit_id}'.format(
+                         branch=backend.default_branch_name,
+                         commit_id=commit_ids['feat-commit-2'])
+                     pull_request.revisions = [
+                         commit_ids['feat-commit-1'],
+                         commit_ids['feat-commit-2']
+                     ]
+                     pull_request.title = u"Test"
+                     pull_request.description = u"Description"
+                     pull_request.author = UserModel().get_by_username(
+                         TEST_USER_ADMIN_LOGIN)
+                     Session().add(pull_request)
+                     Session().commit()
+                     pull_request_id = pull_request.pull_request_id
+                     # PR is created, now we simulate a force-push into target,
+                     # that drops a 2 last commits
+                     vcsrepo = target.scm_instance()
+                     vcsrepo.config.clear_section('hooks')
+                     vcsrepo.run_git_command(['reset', '--soft', 'HEAD~2'])
+                     # update PR
+                     self.app.post(
+                         route_path('pullrequest_update',
+                             repo_name=target.repo_name,
+                             pull_request_id=pull_request_id),
+                         params={'update_commits': 'true',
+                                 'csrf_token': csrf_token},
+                         status=200)
+                     response = self.app.get(route_path(
+                         'pullrequest_new',
+                         repo_name=target.repo_name))
+                     assert response.status_int == 200
+                     response.mustcontain('Pull request updated to')
+                     response.mustcontain('with 0 added, 0 removed commits.')
                  def test_update_of_ancestor_reference(self, backend, csrf_token):
                      commits = [
                          {'message': 'ancestor'},

rhodecode/apps/repository/views/repo_caches.py

0 +9 -1

              from rhodecode.apps._base import RepoAppView
              from rhodecode.lib.auth import (
                  LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
-             from rhodecode.lib import helpers as h
+             from rhodecode.lib import helpers as h, rc_cache
              from rhodecode.lib import system_info
              from rhodecode.model.meta import Session
              from rhodecode.model.scm import ScmModel
                      c.cached_diff_size = 0
                      if os.path.isdir(cached_diffs_dir):
                          c.cached_diff_size = system_info.get_storage_size(cached_diffs_dir)
+                     c.shadow_repos = c.rhodecode_db_repo.shadow_repos()
+                     cache_namespace_uid = 'cache_repo.{}'.format(self.db_repo.repo_id)
+                     c.region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+                     c.backend = c.region.backend
+                     c.repo_keys = sorted(c.region.backend.list_keys(prefix=cache_namespace_uid))
                      return self._get_template_context(c)
                      try:
                          ScmModel().mark_for_invalidation(self.db_repo_name, delete=True)
                          Session().commit()
                          h.flash(_('Cache invalidation successful'),
                                  category='success')
                      except Exception:

rhodecode/apps/repository/views/repo_changelog.py

0 +1 -1

                          data = dict(
                              raw_id=commit.raw_id,
                              idx=commit.idx,
-                             branch=commit.branch,
+                             branch=h.escape(commit.branch),
                          )
                          if parents:
                              data['parents'] = [

rhodecode/apps/repository/views/repo_commits.py

0 +3 -2

                                             if status else None),
                              status_change_type=status,
                              comment_type=comment_type,
-                             resolves_comment_id=resolves_comment_id
+                             resolves_comment_id=resolves_comment_id,
+                             auth_user=self._rhodecode_user
                          )
                          # get status if set !
                      comment_repo_admin = is_repo_admin and is_repo_comment
                      if super_admin or comment_owner or comment_repo_admin:
-                         CommentsModel().delete(comment=comment, user=self._rhodecode_db_user)
+                         CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)
                          Session().commit()
                          return True
                      else:

rhodecode/apps/repository/views/repo_feed.py

0 +58 -40

              # This program is dual-licensed. If you wish to learn more about the
              # RhodeCode Enterprise Edition, including its added features, Support services,
              # and proprietary license terms, please see https://rhodecode.com/licenses/
              import pytz
              import logging
-             from beaker.cache import cache_region
              from pyramid.view import view_config
              from pyramid.response import Response
              from webhelpers.feedgenerator import Rss201rev2Feed, Atom1Feed
              from rhodecode.apps._base import RepoAppView
              from rhodecode.lib import audit_logger
+             from rhodecode.lib import rc_cache
              from rhodecode.lib import helpers as h
              from rhodecode.lib.auth import (
                  LoginRequired, HasRepoPermissionAnyDecorator)
                      """
                      self.load_default_context()
-                     def _generate_feed():
+                     cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+                         self.db_repo.repo_id, CacheKey.CACHE_TYPE_FEED)
+                     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                         repo_id=self.db_repo.repo_id)
+                     region = rc_cache.get_or_create_region('cache_repo_longterm',
+                                                            cache_namespace_uid)
+                     condition = not self.path_filter.is_enabled
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                                            condition=condition)
+                     def generate_atom_feed(repo_id, _repo_name, _feed_type):
                          feed = Atom1Feed(
-                             title=self.title % self.db_repo_name,
-                             link=h.route_url('repo_summary', repo_name=self.db_repo_name),
-                             description=self.description % self.db_repo_name,
+                             title=self.title % _repo_name,
+                             link=h.route_url('repo_summary', repo_name=_repo_name),
+                             description=self.description % _repo_name,
                              language=self.language,
                              ttl=self.ttl
                          )
                          for commit in reversed(self._get_commits()):
                              date = self._set_timezone(commit.date)
                              feed.add_item(
-                                 unique_id=self.uid(self.db_repo.repo_id, commit.raw_id),
+                                 unique_id=self.uid(repo_id, commit.raw_id),
                                  title=self._get_title(commit),
                                  author_name=commit.author,
                                  description=self._get_description(commit),
                                  link=h.route_url(
-                                     'repo_commit', repo_name=self.db_repo_name,
+                                     'repo_commit', repo_name=_repo_name,
                                      commit_id=commit.raw_id),
                                  pubdate=date,)
                          return feed.mime_type, feed.writeString('utf-8')
-                     @cache_region('long_term')
-                     def _generate_feed_and_cache(cache_key):
-                         return _generate_feed()
+                     inv_context_manager = rc_cache.InvalidationContext(
+                         uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+                     with inv_context_manager as invalidation_context:
+                         args = (self.db_repo.repo_id, self.db_repo.repo_name, 'atom',)
+                         # re-compute and store cache if we get invalidate signal
+                         if invalidation_context.should_invalidate():
+                             mime_type, feed = generate_atom_feed.refresh(*args)
+                         else:
+                             mime_type, feed = generate_atom_feed(*args)
-                     if self.path_filter.is_enabled:
-                         mime_type, feed = _generate_feed()
-                     else:
-                         invalidator_context = CacheKey.repo_context_cache(
-                             _generate_feed_and_cache, self.db_repo_name,
-                             CacheKey.CACHE_TYPE_ATOM)
-                         with invalidator_context as context:
-                             context.invalidate()
-                             mime_type, feed = context.compute()
+                         log.debug('Repo ATOM feed computed in %.3fs',
+                                   inv_context_manager.compute_time)
                      response = Response(feed)
                      response.content_type = mime_type
                      """
                      self.load_default_context()
-                     def _generate_feed():
+                     cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+                         self.db_repo.repo_id, CacheKey.CACHE_TYPE_FEED)
+                     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                         repo_id=self.db_repo.repo_id)
+                     region = rc_cache.get_or_create_region('cache_repo_longterm',
+                                                            cache_namespace_uid)
+                     condition = not self.path_filter.is_enabled
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                                            condition=condition)
+                     def generate_rss_feed(repo_id, _repo_name, _feed_type):
                          feed = Rss201rev2Feed(
-                             title=self.title % self.db_repo_name,
-                             link=h.route_url('repo_summary', repo_name=self.db_repo_name),
-                             description=self.description % self.db_repo_name,
+                             title=self.title % _repo_name,
+                             link=h.route_url('repo_summary', repo_name=_repo_name),
+                             description=self.description % _repo_name,
                              language=self.language,
                              ttl=self.ttl
                          )
                          for commit in reversed(self._get_commits()):
                              date = self._set_timezone(commit.date)
                              feed.add_item(
-                                 unique_id=self.uid(self.db_repo.repo_id, commit.raw_id),
+                                 unique_id=self.uid(repo_id, commit.raw_id),
                                  title=self._get_title(commit),
                                  author_name=commit.author,
                                  description=self._get_description(commit),
                                  link=h.route_url(
-                                     'repo_commit', repo_name=self.db_repo_name,
+                                     'repo_commit', repo_name=_repo_name,
                                      commit_id=commit.raw_id),
                                  pubdate=date,)
                          return feed.mime_type, feed.writeString('utf-8')
-                     @cache_region('long_term')
-                     def _generate_feed_and_cache(cache_key):
-                         return _generate_feed()
-                     if self.path_filter.is_enabled:
-                         mime_type, feed = _generate_feed()
-                     else:
-                         invalidator_context = CacheKey.repo_context_cache(
-                             _generate_feed_and_cache, self.db_repo_name,
-                             CacheKey.CACHE_TYPE_RSS)
-                         with invalidator_context as context:
-                             context.invalidate()
-                             mime_type, feed = context.compute()
+                     inv_context_manager = rc_cache.InvalidationContext(
+                         uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+                     with inv_context_manager as invalidation_context:
+                         args = (self.db_repo.repo_id, self.db_repo.repo_name, 'rss',)
+                         # re-compute and store cache if we get invalidate signal
+                         if invalidation_context.should_invalidate():
+                             mime_type, feed = generate_rss_feed.refresh(*args)
+                         else:
+                             mime_type, feed = generate_rss_feed(*args)
+                         log.debug(
+                             'Repo RSS feed computed in %.3fs', inv_context_manager.compute_time)
                      response = Response(feed)
                      response.content_type = mime_type

rhodecode/apps/repository/views/repo_files.py

0 +153 -60

              from pyramid.renderers import render
              from pyramid.response import Response
+             import rhodecode
              from rhodecode.apps._base import RepoAppView
              from rhodecode.controllers.utils import parse_path_ref
-             from rhodecode.lib import diffs, helpers as h, caches
+             from rhodecode.lib import diffs, helpers as h, rc_cache
              from rhodecode.lib import audit_logger
              from rhodecode.lib.exceptions import NonRelativePathError
              from rhodecode.lib.codeblocks import (
                  filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
              from rhodecode.lib.utils2 import (
-                 convert_line_endings, detect_mode, safe_str, str2bool)
+                 convert_line_endings, detect_mode, safe_str, str2bool, safe_int)
              from rhodecode.lib.auth import (
                  LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
              from rhodecode.lib.vcs import path as vcspath
                  def load_default_context(self):
                      c = self._get_local_tmpl_context(include_app_defaults=True)
                      c.rhodecode_repo = self.rhodecode_vcs_repo
                      return c
                  def _ensure_not_locked(self):
                              repo_name=self.db_repo_name, commit_id='tip')
                          raise HTTPFound(files_url)
+                 def check_branch_permission(self, branch_name):
+                     _ = self.request.translate
+                     rule, branch_perm = self._rhodecode_user.get_rule_and_branch_permission(
+                         self.db_repo_name, branch_name)
+                     if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']:
+                         h.flash(
+                             _('Branch `{}` changes forbidden by rule {}.').format(branch_name, rule),
+                             'warning')
+                         files_url = h.route_path(
+                             'repo_files:default_path',
+                             repo_name=self.db_repo_name, commit_id='tip')
+                         raise HTTPFound(files_url)
                  def _get_commit_and_path(self):
                      default_commit_id = self.db_repo.landing_rev[1]
                      default_f_path = '/'
                      return file_node
                  def _is_valid_head(self, commit_id, repo):
-                     # check if commit is a branch identifier- basically we cannot
-                     # create multiple heads via file editing
-                     valid_heads = repo.branches.keys() + repo.branches.values()
+                     branch_name = sha_commit_id = ''
+                     is_head = False
                      if h.is_svn(repo) and not repo.is_empty():
-                         # Note: Subversion only has one head, we add it here in case there
-                         # is no branch matched.
-                         valid_heads.append(repo.get_commit(commit_idx=-1).raw_id)
+                         # Note: Subversion only has one head.
+                         if commit_id == repo.get_commit(commit_idx=-1).raw_id:
+                             is_head = True
+                             return branch_name, sha_commit_id, is_head
-                     # check if commit is a branch name or branch hash
-                     return commit_id in valid_heads
+                     for _branch_name, branch_commit_id in repo.branches.items():
+                         # simple case we pass in branch name, it's a HEAD
+                         if commit_id == _branch_name:
+                             is_head = True
+                             branch_name = _branch_name
+                             sha_commit_id = branch_commit_id
+                             break
+                         # case when we pass in full sha commit_id, which is a head
+                         elif commit_id == branch_commit_id:
+                             is_head = True
+                             branch_name = _branch_name
+                             sha_commit_id = branch_commit_id
+                             break
-                 def _get_tree_cache_manager(self, namespace_type):
-                     _namespace = caches.get_repo_namespace_key(
-                         namespace_type, self.db_repo_name)
-                     return caches.get_cache_manager('repo_cache_long', _namespace)
+                     # checked branches, means we only need to try to get the branch/commit_sha
+                     if not repo.is_empty:
+                         commit = repo.get_commit(commit_id=commit_id)
+                         if commit:
+                             branch_name = commit.branch
+                             sha_commit_id = commit.raw_id
+                     return branch_name, sha_commit_id, is_head
                  def _get_tree_at_commit(
-                         self, c, commit_id, f_path, full_load=False, force=False):
-                     def _cached_tree():
-                         log.debug('Generating cached file tree for %s, %s, %s',
-                                   self.db_repo_name, commit_id, f_path)
+                         self, c, commit_id, f_path, full_load=False):
+                     repo_id = self.db_repo.repo_id
+                     cache_seconds = safe_int(
+                         rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
+                     cache_on = cache_seconds > 0
+                     log.debug(
+                         'Computing FILE TREE for repo_id %s commit_id `%s` and path `%s`'
+                         'with caching: %s[TTL: %ss]' % (
+                             repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
+                     cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
+                     region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                                            condition=cache_on)
+                     def compute_file_tree(repo_id, commit_id, f_path, full_load):
+                         log.debug('Generating cached file tree for repo_id: %s, %s, %s',
+                                   repo_id, commit_id, f_path)
                          c.full_load = full_load
                          return render(
                              'rhodecode:templates/files/files_browser_tree.mako',
                              self._get_template_context(c), self.request)
-                     cache_manager = self._get_tree_cache_manager(caches.FILE_TREE)
-                     cache_key = caches.compute_key_from_params(
-                         self.db_repo_name, commit_id, f_path)
-                     if force:
-                         # we want to force recompute of caches
-                         cache_manager.remove_value(cache_key)
-                     return cache_manager.get(cache_key, createfunc=_cached_tree)
+                     return compute_file_tree(self.db_repo.repo_id, commit_id, f_path, full_load)
                  def _get_archive_spec(self, fname):
                      log.debug('Detecting archive spec for: `%s`', fname)
                      use_cached_archive = False
                      archive_cache_enabled = CONFIG.get(
                          'archive_cache_dir') and not self.request.GET.get('no_cache')
+                     cached_archive_path = None
                      if archive_cache_enabled:
                          # check if we it's ok to write
                          commit=True
                      )
-                     def get_chunked_archive(archive):
-                         with open(archive, 'rb') as stream:
+                     def get_chunked_archive(archive_path):
+                         with open(archive_path, 'rb') as stream:
                              while True:
                                  data = stream.read(16 * 1024)
                                  if not data:
                                      if fd:  # fd means we used temporary file
                                          os.close(fd)
                                      if not archive_cache_enabled:
-                                         log.debug('Destroying temp archive %s', archive)
-                                         os.remove(archive)
+                                         log.debug('Destroying temp archive %s', archive_path)
+                                         os.remove(archive_path)
                                      break
                                  yield data
                                      if not c.renderer:
                                          c.lines = filenode_as_lines_tokens(c.file)
-                             c.on_branch_head = self._is_valid_head(
+                             _branch_name, _sha_commit_id, is_head = self._is_valid_head(
                                  commit_id, self.rhodecode_vcs_repo)
+                             c.on_branch_head = is_head
                              branch = c.commit.branch if (
                                  c.commit.branch and '/' not in c.commit.branch) else None
                      c.file = dir_node
                      c.commit = commit
-                     # using force=True here, make a little trick. We flush the cache and
-                     # compute it using the same key as without previous full_load, so now
-                     # the fully loaded tree is now returned instead of partial,
-                     # and we store this in caches
                      html = self._get_tree_at_commit(
-                         c, commit.raw_id, dir_node.path, full_load=True, force=True)
+                         c, commit.raw_id, dir_node.path, full_load=True)
                      return Response(html)
                      return response
-                 def _get_nodelist_at_commit(self, repo_name, commit_id, f_path):
-                     def _cached_nodes():
-                         log.debug('Generating cached nodelist for %s, %s, %s',
-                                   repo_name, commit_id, f_path)
+                 def _get_nodelist_at_commit(self, repo_name, repo_id, commit_id, f_path):
+                     cache_seconds = safe_int(
+                         rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
+                     cache_on = cache_seconds > 0
+                     log.debug(
+                         'Computing FILE SEARCH for repo_id %s commit_id `%s` and path `%s`'
+                         'with caching: %s[TTL: %ss]' % (
+                             repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
+                     cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
+                     region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                                            condition=cache_on)
+                     def compute_file_search(repo_id, commit_id, f_path):
+                         log.debug('Generating cached nodelist for repo_id:%s, %s, %s',
+                                   repo_id, commit_id, f_path)
                          try:
                              _d, _f = ScmModel().get_nodes(
                                  repo_name, commit_id, f_path, flat=False)
                                  commit_id='tip', f_path='/'))
                          return _d + _f
-                     cache_manager = self._get_tree_cache_manager(
-                         caches.FILE_SEARCH_TREE_META)
-                     cache_key = caches.compute_key_from_params(
-                         repo_name, commit_id, f_path)
-                     return cache_manager.get(cache_key, createfunc=_cached_nodes)
+                     return compute_file_search(self.db_repo.repo_id, commit_id, f_path)
                  @LoginRequired()
                  @HasRepoPermissionAnyDecorator(
                      commit = self._get_commit_or_redirect(commit_id)
                      metadata = self._get_nodelist_at_commit(
-                         self.db_repo_name, commit.raw_id, f_path)
+                         self.db_repo_name, self.db_repo.repo_id, commit.raw_id, f_path)
                      return {'nodes': metadata}
                  def _create_references(
                      commit_id, f_path = self._get_commit_and_path()
                      self._ensure_not_locked()
+                     _branch_name, _sha_commit_id, is_head = \
+                         self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
-                     if not self._is_valid_head(commit_id, self.rhodecode_vcs_repo):
+                     if not is_head:
                          h.flash(_('You can only delete files with commit '
-                                   'being a valid branch '), category='warning')
+                                   'being a valid branch head.'), category='warning')
                          raise HTTPFound(
                              h.route_path('repo_files',
                                           repo_name=self.db_repo_name, commit_id='tip',
                                           f_path=f_path))
+                     self.check_branch_permission(_branch_name)
                      c.commit = self._get_commit_or_redirect(commit_id)
                      c.file = self._get_filenode_or_redirect(c.commit, f_path)
                      commit_id, f_path = self._get_commit_and_path()
                      self._ensure_not_locked()
+                     _branch_name, _sha_commit_id, is_head = \
+                         self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
-                     if not self._is_valid_head(commit_id, self.rhodecode_vcs_repo):
+                     if not is_head:
                          h.flash(_('You can only delete files with commit '
-                                   'being a valid branch '), category='warning')
+                                   'being a valid branch head.'), category='warning')
                          raise HTTPFound(
                              h.route_path('repo_files',
                                           repo_name=self.db_repo_name, commit_id='tip',
                                           f_path=f_path))
+                     self.check_branch_permission(_branch_name)
                      c.commit = self._get_commit_or_redirect(commit_id)
                      c.file = self._get_filenode_or_redirect(c.commit, f_path)
                      commit_id, f_path = self._get_commit_and_path()
                      self._ensure_not_locked()
+                     _branch_name, _sha_commit_id, is_head = \
+                         self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
-                     if not self._is_valid_head(commit_id, self.rhodecode_vcs_repo):
+                     if not is_head:
                          h.flash(_('You can only edit files with commit '
-                                   'being a valid branch '), category='warning')
+                                   'being a valid branch head.'), category='warning')
                          raise HTTPFound(
                              h.route_path('repo_files',
                                           repo_name=self.db_repo_name, commit_id='tip',
                                           f_path=f_path))
+                     self.check_branch_permission(_branch_name)
                      c.commit = self._get_commit_or_redirect(commit_id)
                      c.file = self._get_filenode_or_redirect(c.commit, f_path)
                      commit_id, f_path = self._get_commit_and_path()
                      self._ensure_not_locked()
+                     _branch_name, _sha_commit_id, is_head = \
+                         self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
-                     if not self._is_valid_head(commit_id, self.rhodecode_vcs_repo):
+                     if not is_head:
                          h.flash(_('You can only edit files with commit '
-                                   'being a valid branch '), category='warning')
+                                   'being a valid branch head.'), category='warning')
                          raise HTTPFound(
                              h.route_path('repo_files',
                                           repo_name=self.db_repo_name, commit_id='tip',
                                           f_path=f_path))
+                     self.check_branch_permission(_branch_name)
                      c.commit = self._get_commit_or_redirect(commit_id)
                      c.file = self._get_filenode_or_redirect(c.commit, f_path)
                      c.default_message = (_('Added file via RhodeCode Enterprise'))
                      c.f_path = f_path.lstrip('/')  # ensure not relative path
+                     if self.rhodecode_vcs_repo.is_empty:
+                         # for empty repository we cannot check for current branch, we rely on
+                         # c.commit.branch instead
+                         _branch_name = c.commit.branch
+                         is_head = True
+                     else:
+                         _branch_name, _sha_commit_id, is_head = \
+                             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+                     if not is_head:
+                         h.flash(_('You can only add files with commit '
+                                   'being a valid branch head.'), category='warning')
+                         raise HTTPFound(
+                             h.route_path('repo_files',
+                                          repo_name=self.db_repo_name, commit_id='tip',
+                                          f_path=f_path))
+                     self.check_branch_permission(_branch_name)
                      return self._get_template_context(c)
                  @LoginRequired()
                          commit_id, redirect_after=False)
                      if c.commit is None:
                          c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
+                     if self.rhodecode_vcs_repo.is_empty:
+                         # for empty repository we cannot check for current branch, we rely on
+                         # c.commit.branch instead
+                         _branch_name = c.commit.branch
+                         is_head = True
+                     else:
+                         _branch_name, _sha_commit_id, is_head = \
+                             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+                     if not is_head:
+                         h.flash(_('You can only add files with commit '
+                                   'being a valid branch head.'), category='warning')
+                         raise HTTPFound(
+                             h.route_path('repo_files',
+                                          repo_name=self.db_repo_name, commit_id='tip',
+                                          f_path=f_path))
+                     self.check_branch_permission(_branch_name)
                      c.default_message = (_('Added file via RhodeCode Enterprise'))
                      c.f_path = f_path
                      unix_mode = 0

rhodecode/apps/repository/views/repo_forks.py

0 +5 -1

              from pyramid.renderers import render
              from pyramid.response import Response
+             from rhodecode import events
              from rhodecode.apps._base import RepoAppView, DataGridAppView
              from rhodecode.lib.auth import (
                  LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous,
                          forks_data.append({
                              "username": h.gravatar_with_user(self.request, fork.user.username),
                              "fork_name": fork_name(fork),
-                             "description": fork.description,
+                             "description": fork.description_safe,
                              "fork_date": h.age_component(fork.created_on, time_is_local=True),
                              "last_activity": h.format_date(fork.updated_on),
                              "action": fork_actions(fork),
                          h.flash(msg, category='error')
                      repo_name = form_result.get('repo_name_full', self.db_repo_name)
+                     events.trigger(events.UserPermissionsChange([self._rhodecode_user.user_id]))
                      raise HTTPFound(
                          h.route_path('repo_creating',
                                       repo_name=repo_name,

rhodecode/apps/repository/views/repo_permissions.py

0 +8 -2

              from pyramid.httpexceptions import HTTPFound
              from pyramid.view import view_config
+             from rhodecode import events
              from rhodecode.apps._base import RepoAppView
              from rhodecode.lib import helpers as h
              from rhodecode.lib import audit_logger
                  def load_default_context(self):
                      c = self._get_local_tmpl_context()
                      return c
                  @LoginRequired()
                      Session().commit()
                      h.flash(_('Repository permissions updated'), category='success')
+                     affected_user_ids = []
+                     for change in changes['added'] + changes['updated'] + changes['deleted']:
+                         if change['type'] == 'user':
+                             affected_user_ids.append(change['id'])
+                     events.trigger(events.UserPermissionsChange(affected_user_ids))
                      raise HTTPFound(
                          h.route_path('edit_repo_perms', repo_name=self.db_repo_name))

rhodecode/apps/repository/views/repo_pull_requests.py

0 +55 -28

                      c = self._get_local_tmpl_context(include_app_defaults=True)
                      c.REVIEW_STATUS_APPROVED = ChangesetStatus.STATUS_APPROVED
                      c.REVIEW_STATUS_REJECTED = ChangesetStatus.STATUS_REJECTED
+                     # backward compat., we use for OLD PRs a plain renderer
+                     c.renderer = 'plain'
                      return c
                  def _get_pull_requests_list(
                      from_version = self.request.GET.get('from_version') or version
                      merge_checks = self.request.GET.get('merge_checks')
                      c.fulldiff = str2bool(self.request.GET.get('fulldiff'))
+                     force_refresh = str2bool(self.request.GET.get('force_refresh'))
                      (pull_request_latest,
                       pull_request_at_ver,
                          pull_request_at_ver)
                      c.pull_request = pull_request_display_obj
+                     c.renderer = pull_request_at_ver.description_renderer or c.renderer
                      c.pull_request_latest = pull_request_latest
                      if compare or (at_version and not at_version == 'latest'):
                      # check merge capabilities
                      _merge_check = MergeCheck.validate(
-                         pull_request_latest, user=self._rhodecode_user,
-                         translator=self.request.translate)
+                         pull_request_latest, auth_user=self._rhodecode_user,
+                         translator=self.request.translate,
+                         force_shadow_repo_refresh=force_refresh)
                      c.pr_merge_errors = _merge_check.error_details
                      c.pr_merge_possible = not _merge_check.failed
                      c.pr_merge_message = _merge_check.merge_msg
                      source_scm = source_repo.scm_instance()
                      target_scm = target_repo.scm_instance()
-                     # try first shadow repo, fallback to regular repo
+                     shadow_scm = None
                      try:
-                         commits_source_repo = pull_request_latest.get_shadow_repo()
+                         shadow_scm = pull_request_latest.get_shadow_repo()
                      except Exception:
                          log.debug('Failed to get shadow repo', exc_info=True)
-                         commits_source_repo = source_scm
+                     # try first the existing source_repo, and then shadow
+                     # repo if we can obtain one
+                     commits_source_repo = source_scm or shadow_scm
                      c.commits_source_repo = commits_source_repo
                      c.ancestor = None  # set it to None, to hide it from PR view
                              'id': obj['name'],
                              'text': obj['name'],
                              'type': 'repo',
-                             'obj': obj['dbrepo']
+                             'repo_id': obj['dbrepo']['repo_id'],
+                             'repo_type': obj['dbrepo']['repo_type'],
+                             'private': obj['dbrepo']['private'],
                          })
                      data = {
                      ancestor = source_scm.get_common_ancestor(
                          source_commit.raw_id, target_commit.raw_id, target_scm)
+                     # recalculate target ref based on ancestor
                      target_ref_type, target_ref_name, __ = _form['target_ref'].split(':')
                      target_ref = ':'.join((target_ref_type, target_ref_name, ancestor))
+                     get_default_reviewers_data, validate_default_reviewers = \
+                         PullRequestModel().get_reviewer_functions()
+                     # recalculate reviewers logic, to make sure we can validate this
+                     reviewer_rules = get_default_reviewers_data(
+                         self._rhodecode_db_user, source_db_repo,
+                         source_commit, target_db_repo, target_commit)
+                     given_reviewers = _form['review_members']
+                     reviewers = validate_default_reviewers(
+                         given_reviewers, reviewer_rules)
                      pullrequest_title = _form['pullrequest_title']
                      title_source_ref = source_ref.split(':', 2)[1]
                      if not pullrequest_title:
                          )
                      description = _form['pullrequest_desc']
-                     get_default_reviewers_data, validate_default_reviewers = \
-                         PullRequestModel().get_reviewer_functions()
-                     # recalculate reviewers logic, to make sure we can validate this
-                     reviewer_rules = get_default_reviewers_data(
-                         self._rhodecode_db_user, source_db_repo,
-                         source_commit, target_db_repo, target_commit)
-                     given_reviewers = _form['review_members']
-                     reviewers = validate_default_reviewers(given_reviewers, reviewer_rules)
+                     description_renderer = _form['description_renderer']
                      try:
                          pull_request = PullRequestModel().create(
-                             self._rhodecode_user.user_id, source_repo, source_ref,
-                             target_repo, target_ref, commit_ids, reviewers,
-                             pullrequest_title, description, reviewer_rules
+                             created_by=self._rhodecode_user.user_id,
+                             source_repo=source_repo,
+                             source_ref=source_ref,
+                             target_repo=target_repo,
+                             target_ref=target_ref,
+                             revisions=commit_ids,
+                             reviewers=reviewers,
+                             title=pullrequest_title,
+                             description=description,
+                             description_renderer=description_renderer,
+                             reviewer_data=reviewer_rules,
+                             auth_user=self._rhodecode_user
                          )
                          Session().commit()
                  def _edit_pull_request(self, pull_request):
                      _ = self.request.translate
                      try:
                          PullRequestModel().edit(
-                             pull_request, self.request.POST.get('title'),
-                             self.request.POST.get('description'), self._rhodecode_user)
+                             pull_request,
+                             self.request.POST.get('title'),
+                             self.request.POST.get('description'),
+                             self.request.POST.get('description_renderer'),
+                             self._rhodecode_user)
                      except ValueError:
                          msg = _(u'Cannot update closed pull requests.')
                          h.flash(msg, category='error')
                          self.request.matchdict['pull_request_id'])
                      self.load_default_context()
-                     check = MergeCheck.validate(pull_request, self._rhodecode_db_user,
-                                                 translator=self.request.translate)
+                     check = MergeCheck.validate(
+                         pull_request, auth_user=self._rhodecode_user,
+                         translator=self.request.translate)
                      merge_possible = not check.failed
                      for err_type, error_msg in check.errors:
                  def _merge_pull_request(self, pull_request, user, extras):
                      _ = self.request.translate
-                     merge_resp = PullRequestModel().merge(pull_request, user, extras=extras)
+                     merge_resp = PullRequestModel().merge_repo(pull_request, user, extras=extras)
                      if merge_resp.executed:
                          log.debug("The merge was successful, closing the pull request.")
                              status_change_type=(status
                                                  if status and allowed_to_change_status else None),
                              comment_type=comment_type,
-                             resolves_comment_id=resolves_comment_id
+                             resolves_comment_id=resolves_comment_id,
+                             auth_user=self._rhodecode_user
                          )
                          if allowed_to_change_status:
                      if super_admin or comment_owner or comment_repo_admin:
                          old_calculated_status = comment.pull_request.calculated_review_status()
-                         CommentsModel().delete(comment=comment, user=self._rhodecode_user)
+                         CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)
                          Session().commit()
                          calculated_status = comment.pull_request.calculated_review_status()
                          if old_calculated_status != calculated_status:

rhodecode/apps/repository/views/repo_settings.py

0 +9 -3

              from pyramid.httpexceptions import HTTPFound
              from pyramid.view import view_config
+             from rhodecode import events
              from rhodecode.apps._base import RepoAppView
              from rhodecode.forms import RcForm
              from rhodecode.lib import helpers as h
              from rhodecode.lib import audit_logger
              from rhodecode.lib.auth import (
                  LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
-             from rhodecode.model.db import RepositoryField, RepoGroup, Repository
+             from rhodecode.model.db import RepositoryField, RepoGroup, Repository, User
              from rhodecode.model.meta import Session
              from rhodecode.model.repo import RepoModel
              from rhodecode.model.scm import RepoGroupList, ScmModel
                      c.personal_repo_group = c.auth_user.personal_repo_group
                      c.repo_fields = RepositoryField.query()\
                          .filter(RepositoryField.repository == self.db_repo).all()
                      return c
                  def _get_schema(self, c, old_values=None):
                          h.flash(_('Error occurred during update of repository {}').format(
                              old_repo_name), category='error')
+                     name_changed = old_repo_name != new_repo_name
+                     if name_changed:
+                         owner = User.get_by_username(schema_data['repo_owner'])
+                         owner_id = owner.user_id if owner else self._rhodecode_user.user_id
+                         events.trigger(events.UserPermissionsChange([
+                             self._rhodecode_user.user_id, owner_id]))
                      raise HTTPFound(
                          h.route_path('edit_repo', repo_name=new_repo_name))

rhodecode/apps/repository/views/repo_settings_advanced.py

0 +2 -1

                      _ = self.request.translate
                      self.load_default_context()
                      self.rhodecode_vcs_repo.install_hooks(force=True)
-                     h.flash(_('installed hooks repository'), category='success')
+                     h.flash(_('installed updated hooks into this repository'),
+                             category='success')
                      raise HTTPFound(
                          h.route_path('edit_repo_advanced', repo_name=self.db_repo_name))

rhodecode/apps/repository/views/repo_summary.py

0 +47 -29

              import logging
              import string
+             import rhodecode
              from pyramid.view import view_config
-             from beaker.cache import cache_region
              from rhodecode.controllers import utils
              from rhodecode.apps._base import RepoAppView
              from rhodecode.config.conf import (LANGUAGES_EXTENSIONS_MAP)
-             from rhodecode.lib import caches, helpers as h
-             from rhodecode.lib.helpers import RepoPage
+             from rhodecode.lib import helpers as h, rc_cache
              from rhodecode.lib.utils2 import safe_str, safe_int
              from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
              from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
              from rhodecode.lib.ext_json import json
              from rhodecode.lib.vcs.backends.base import EmptyCommit
-             from rhodecode.lib.vcs.exceptions import CommitError, EmptyRepositoryError, \
-                 CommitDoesNotExistError
+             from rhodecode.lib.vcs.exceptions import (
+                 CommitError, EmptyRepositoryError, CommitDoesNotExistError)
              from rhodecode.model.db import Statistics, CacheKey, User
              from rhodecode.model.meta import Session
              from rhodecode.model.repo import ReadmeFinder
                          c.rhodecode_repo = self.rhodecode_vcs_repo
                      return c
-                 def _get_readme_data(self, db_repo, default_renderer):
-                     repo_name = db_repo.repo_name
+                 def _get_readme_data(self, db_repo, renderer_type):
                      log.debug('Looking for README file')
-                     @cache_region('long_term')
-                     def _generate_readme(cache_key):
+                     cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+                         db_repo.repo_id, CacheKey.CACHE_TYPE_README)
+                     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                         repo_id=self.db_repo.repo_id)
+                     region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
+                     def generate_repo_readme(repo_id, _repo_name, _renderer_type):
                          readme_data = None
                          readme_node = None
                          readme_filename = None
                          commit = self._get_landing_commit_or_none(db_repo)
                          if commit:
                              log.debug("Searching for a README file.")
-                             readme_node = ReadmeFinder(default_renderer).search(commit)
+                             readme_node = ReadmeFinder(_renderer_type).search(commit)
                          if readme_node:
                              relative_urls = {
                                  'raw': h.route_path(
-                                     'repo_file_raw', repo_name=repo_name,
+                                     'repo_file_raw', repo_name=_repo_name,
                                      commit_id=commit.raw_id, f_path=readme_node.path),
                                  'standard': h.route_path(
-                                     'repo_files', repo_name=repo_name,
+                                     'repo_files', repo_name=_repo_name,
                                      commit_id=commit.raw_id, f_path=readme_node.path),
                              }
                              readme_data = self._render_readme_or_none(
                              readme_filename = readme_node.path
                          return readme_data, readme_filename
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _generate_readme, repo_name, CacheKey.CACHE_TYPE_README)
+                     inv_context_manager = rc_cache.InvalidationContext(
+                         uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+                     with inv_context_manager as invalidation_context:
+                         args = (db_repo.repo_id, db_repo.repo_name, renderer_type,)
+                         # re-compute and store cache if we get invalidate signal
+                         if invalidation_context.should_invalidate():
+                             instance = generate_repo_readme.refresh(*args)
+                         else:
+                             instance = generate_repo_readme(*args)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     return computed
+                         log.debug(
+                             'Repo readme generated and computed in %.3fs',
+                             inv_context_manager.compute_time)
+                         return instance
                  def _get_landing_commit_or_none(self, db_repo):
                      log.debug("Getting the landing commit.")
                      except EmptyRepositoryError:
                          collection = self.rhodecode_vcs_repo
-                     c.repo_commits = RepoPage(
+                     c.repo_commits = h.RepoPage(
                          collection, page=p, items_per_page=size, url=url_generator)
                      page_ids = [x.raw_id for x in c.repo_commits]
                      c.comments = self.db_repo.get_comments(page_ids)
                      renderer='json_ext')
                  def repo_stats(self):
                      commit_id = self.get_request_commit_id()
+                     show_stats = bool(self.db_repo.enable_statistics)
+                     repo_id = self.db_repo.repo_id
-                     _namespace = caches.get_repo_namespace_key(
-                         caches.SUMMARY_STATS, self.db_repo_name)
-                     show_stats = bool(self.db_repo.enable_statistics)
-                     cache_manager = caches.get_cache_manager(
-                         'repo_cache_long', _namespace)
-                     _cache_key = caches.compute_key_from_params(
-                         self.db_repo_name, commit_id, show_stats)
+                     cache_seconds = safe_int(
+                         rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
+                     cache_on = cache_seconds > 0
+                     log.debug(
+                         'Computing REPO TREE for repo_id %s commit_id `%s` '
+                         'with caching: %s[TTL: %ss]' % (
+                             repo_id, commit_id, cache_on, cache_seconds or 0))
-                     def compute_stats():
+                     cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
+                     region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                                            condition=cache_on)
+                     def compute_stats(repo_id, commit_id, show_stats):
                          code_stats = {}
                          size = 0
                          try:
                          return {'size': h.format_byte_size_binary(size),
                                  'code_stats': code_stats}
-                     stats = cache_manager.get(_cache_key, createfunc=compute_stats)
+                     stats = compute_stats(self.db_repo.repo_id, commit_id, show_stats)
                      return stats
                  @LoginRequired()

rhodecode/apps/ssh_support/lib/backends/__init__.py

0 +24 -8

                          key.accessed_on = datetime.datetime.utcnow()
                          Session().add(key)
                          Session().commit()
-                         log.debug('Update key `%s` access time', key_id)
+                         log.debug('Update key id:`%s` fingerprint:`%s` access time',
+                                   key_id, key.ssh_key_fingerprint)
                  def get_connection_info(self):
                      """
                      return vcs_type, repo_name, mode
-                 def serve(self, vcs, repo, mode, user, permissions):
+                 def serve(self, vcs, repo, mode, user, permissions, branch_permissions):
                      store = ScmModel().repos_path
+                     check_branch_perms = False
+                     detect_force_push = False
+                     if branch_permissions:
+                         check_branch_perms = True
+                         detect_force_push = True
                      log.debug(
-                         'VCS detected:`%s` mode: `%s` repo_name: %s', vcs, mode, repo)
+                         'VCS detected:`%s` mode: `%s` repo_name: %s, branch_permission_checks:%s',
+                         vcs, mode, repo, check_branch_perms)
+                     # detect if we have to check branch permissions
+                     extras = {
+                         'detect_force_push': detect_force_push,
+                         'check_branch_perms': check_branch_perms,
+                     }
                      if vcs == 'hg':
                          server = MercurialServer(
                              repo_name=repo, user=user,
                              user_permissions=permissions, config=self.config, env=self.env)
                          self.server_impl = server
-                         return server.run()
+                         return server.run(tunnel_extras=extras)
                      elif vcs == 'git':
                          server = GitServer(
                              repo_name=repo, repo_mode=mode, user=user,
                              user_permissions=permissions, config=self.config, env=self.env)
                          self.server_impl = server
-                         return server.run()
+                         return server.run(tunnel_extras=extras)
                      elif vcs == 'svn':
                          server = SubversionServer(
                              repo_name=None, user=user,
                              user_permissions=permissions, config=self.config, env=self.env)
                          self.server_impl = server
-                         return server.run()
+                         return server.run(tunnel_extras=extras)
                      else:
                          raise Exception('Unrecognised VCS: {}'.format(vcs))
                          auth_user = user.AuthUser()
                          permissions = auth_user.permissions['repositories']
+                         repo_branch_permissions = auth_user.get_branch_permissions(scm_repo)
                          try:
                              exit_code, is_updated = self.serve(
-                                 scm_detected, scm_repo, scm_mode, user, permissions)
+                                 scm_detected, scm_repo, scm_mode, user, permissions,
+                                 repo_branch_permissions)
                          except Exception:
                              log.exception('Error occurred during execution of SshWrapper')
                              exit_code = -1

rhodecode/apps/ssh_support/lib/backends/base.py

0 +18 -6

                          'permission for %s on %s are: %s',
                          self.user, self.repo_name, permission)
+                     if not permission:
+                         log.error('user `%s` permissions to repo:%s are empty. Forbidding access.',
+                                   self.user, self.repo_name)
+                         return -2
                      if action == 'pull':
                          if permission in self.read_perms:
                              log.info(
                                  self.user, self.repo_name)
                              return 0
-                     log.error('Cannot properly fetch or allow user %s permissions. '
-                               'Return value is: %s, req action: %s',
+                     log.error('Cannot properly fetch or verify user `%s` permissions. '
+                               'Permissions: %s, vcs action: %s',
                                self.user, permission, action)
                      return -2
                          'make_lock': None,
                          'locked_by': [None, None],
                          'server_url': None,
-                         'is_shadow_repo': False,
-                         'hooks_module': 'rhodecode.lib.hooks_daemon',
+                         'user_agent': 'ssh-user-agent',
                          'hooks': ['push', 'pull'],
+                         'hooks_module': 'rhodecode.lib.hooks_daemon',
+                         'is_shadow_repo': False,
+                         'detect_force_push': False,
+                         'check_branch_perms': False,
                          'SSH': True,
-                         'SSH_PERMISSIONS': self.user_permissions.get(self.repo_name)
+                         'SSH_PERMISSIONS': self.user_permissions.get(self.repo_name),
                      }
                      if extras:
                          scm_data.update(extras)
                      return exit_code, action == "push"
-                 def run(self):
+                 def run(self, tunnel_extras=None):
+                     tunnel_extras = tunnel_extras or {}
                      extras = {}
+                     extras.update(tunnel_extras)
                      callback_daemon, extras = prepare_callback_daemon(
                          extras, protocol=vcs_settings.HOOKS_PROTOCOL,
+                         host=vcs_settings.HOOKS_HOST,
                          use_direct_calls=False)
                      with callback_daemon:

rhodecode/apps/ssh_support/tests/test_server_git.py

0 +3 0

                          'hooks': ['push', 'pull'],
                          'is_shadow_repo': False,
                          'hooks_module': 'rhodecode.lib.hooks_daemon',
+                         'check_branch_perms': False,
+                         'detect_force_push': False,
+                         'user_agent': u'ssh-user-agent',
                          'SSH': True,
                          'SSH_PERMISSIONS': 'repository.admin',
                      }

rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py

0 +1 -1

                      with pytest.raises(Exception) as exc_info:
                          ssh_wrapper.serve(
                              vcs='microsoft-tfs', repo='test-repo', mode=None, user='test',
-                             permissions={})
+                             permissions={}, branch_permissions={})
                      assert exc_info.value.message == 'Unrecognised VCS: microsoft-tfs'
                  def test_parse_config(self, ssh_wrapper):

rhodecode/apps/user_group/views/__init__.py

0 +30 -4

              from pyramid.response import Response
              from pyramid.renderers import render
+             from rhodecode import events
              from rhodecode.lib.exceptions import (
                  RepoGroupAssignmentError, UserGroupAssignedException)
              from rhodecode.model.forms import (
                      user_group = self.db_user_group
                      user_group_id = user_group.users_group_id
+                     old_user_group_name = self.db_user_group_name
+                     new_user_group_name = old_user_group_name
                      c = self.load_default_context()
                      c.user_group = user_group
                      c.group_members_obj = [x.user for x in c.user_group.members]
                          old_data=c.user_group.get_dict(), allow_disabled=True)()
                      old_values = c.user_group.get_api_data()
-                     user_group_name = self.request.POST.get('users_group_name')
                      try:
                          form_result = users_group_form.to_python(self.request.POST)
                          pstruct = peppercorn.parse(self.request.POST.items())
                          user_group, added_members, removed_members = \
                              UserGroupModel().update(c.user_group, form_result)
-                         updated_user_group = form_result['users_group_name']
+                         new_user_group_name = form_result['users_group_name']
                          for user_id in added_members:
                              user = User.get(user_id)
                              'user_group.edit', action_data={'old_data': old_values},
                              user=self._rhodecode_user)
-                         h.flash(_('Updated user group %s') % updated_user_group,
+                         h.flash(_('Updated user group %s') % new_user_group_name,
                                  category='success')
+                         affected_user_ids = []
+                         for user_id in added_members + removed_members:
+                             affected_user_ids.append(user_id)
+                         name_changed = old_user_group_name != new_user_group_name
+                         if name_changed:
+                             owner = User.get_by_username(form_result['user'])
+                             owner_id = owner.user_id if owner else self._rhodecode_user.user_id
+                             affected_user_ids.append(self._rhodecode_user.user_id)
+                             affected_user_ids.append(owner_id)
+                         events.trigger(events.UserPermissionsChange(affected_user_ids))
                          Session().commit()
                      except formencode.Invalid as errors:
                          defaults = errors.value
                      except Exception:
                          log.exception("Exception during update of user group")
                          h.flash(_('Error occurred during update of user group %s')
-                                 % user_group_name, category='error')
+                                 % new_user_group_name, category='error')
                      raise HTTPFound(
                          h.route_path('edit_user_group', user_group_id=user_group_id))
                      Session().commit()
                      h.flash(_('User Group permissions updated'), category='success')
+                     affected_user_ids = []
+                     for change in changes['added'] + changes['updated'] + changes['deleted']:
+                         if change['type'] == 'user':
+                             affected_user_ids.append(change['id'])
+                     events.trigger(events.UserPermissionsChange(affected_user_ids))
                      raise HTTPFound(
                          h.route_path('edit_user_group_perms', user_group_id=user_group_id))

rhodecode/authentication/__init__.py

0 +1 0

              # Plugin ID prefixes to distinct between normal and legacy plugins.
              plugin_prefix = 'egg:'
              legacy_plugin_prefix = 'py:'
+             plugin_default_auth_ttl = 30
              # TODO: Currently this is only used to discover the authentication plugins.

rhodecode/authentication/base.py

0 +28 -48

              from rhodecode.authentication.interface import IAuthnPluginRegistry
              from rhodecode.authentication.schema import AuthnPluginSettingsSchemaBase
-             from rhodecode.lib import caches
+             from rhodecode.lib import rc_cache
              from rhodecode.lib.auth import PasswordGenerator, _RhodeCodeCryptoBCrypt
              from rhodecode.lib.utils2 import safe_int, safe_str
              from rhodecode.lib.exceptions import LdapConnectionError
                  def get_ttl_cache(self, settings=None):
                      plugin_settings = settings or self.get_settings()
-                     cache_ttl = 0
+                     # we set default to 30, we make a compromise here,
+                     # performance > security, mostly due to LDAP/SVN, majority
+                     # of users pick cache_ttl to be enabled
+                     from rhodecode.authentication import plugin_default_auth_ttl
+                     cache_ttl = plugin_default_auth_ttl
                      if isinstance(self.AUTH_CACHE_TTL, (int, long)):
                          # plugin cache set inside is more important than the settings value
                  return authn_registry
-             def get_auth_cache_manager(custom_ttl=None, suffix=None):
-                 cache_name = 'rhodecode.authentication'
-                 if suffix:
-                     cache_name = 'rhodecode.authentication.{}'.format(suffix)
-                 return caches.get_cache_manager(
-                     'auth_plugins', cache_name, custom_ttl)
-             def get_perms_cache_manager(custom_ttl=None, suffix=None):
-                 cache_name = 'rhodecode.permissions'
-                 if suffix:
-                     cache_name = 'rhodecode.permissions.{}'.format(suffix)
-                 return caches.get_cache_manager(
-                     'auth_plugins', cache_name, custom_ttl)
              def authenticate(username, password, environ=None, auth_type=None,
                               skip_missing=False, registry=None, acl_repo_name=None):
                  """
                      plugin_cache_active, cache_ttl = plugin.get_ttl_cache(plugin_settings)
-                     # get instance of cache manager configured for a namespace
-                     cache_manager = get_auth_cache_manager(
-                         custom_ttl=cache_ttl, suffix=user.user_id if user else '')
                      log.debug('AUTH_CACHE_TTL for plugin `%s` active: %s (TTL: %s)',
                                plugin.get_id(), plugin_cache_active, cache_ttl)
-                     # for environ based password can be empty, but then the validation is
-                     # on the server that fills in the env data needed for authentication
-                     _password_hash = caches.compute_key_from_params(
-                         plugin.name, username, (password or ''))
+                     user_id = user.user_id if user else None
+                     # don't cache for empty users
+                     plugin_cache_active = plugin_cache_active and user_id
+                     cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
+                     region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
-                     # _authenticate is a wrapper for .auth() method of plugin.
-                     # it checks if .auth() sends proper data.
-                     # For RhodeCodeExternalAuthPlugin it also maps users to
-                     # Database and maps the attributes returned from .auth()
-                     # to RhodeCode database. If this function returns data
-                     # then auth is correct.
-                     start = time.time()
-                     log.debug('Running plugin `%s` _authenticate method', plugin.get_id())
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                                            expiration_time=cache_ttl,
+                                                            condition=plugin_cache_active)
+                     def compute_auth(
+                             cache_name, plugin_name, username, password):
-                     def auth_func():
-                         """
-                         This function is used internally in Cache of Beaker to calculate
-                         Results
-                         """
-                         log.debug('auth: calculating password access now...')
+                         # _authenticate is a wrapper for .auth() method of plugin.
+                         # it checks if .auth() sends proper data.
+                         # For RhodeCodeExternalAuthPlugin it also maps users to
+                         # Database and maps the attributes returned from .auth()
+                         # to RhodeCode database. If this function returns data
+                         # then auth is correct.
+                         log.debug('Running plugin `%s` _authenticate method '
+                                   'using username and password', plugin.get_id())
                          return plugin._authenticate(
                              user, username, password, plugin_settings,
                              environ=environ or {})
-                     if plugin_cache_active:
-                         log.debug('Trying to fetch cached auth by pwd hash `...%s`',
-                                   _password_hash[:6])
-                         plugin_user = cache_manager.get(
-                             _password_hash, createfunc=auth_func)
-                     else:
-                         plugin_user = auth_func()
+                     start = time.time()
+                     # for environ based auth, password can be empty, but then the validation is
+                     # on the server that fills in the env data needed for authentication
+                     plugin_user = compute_auth('auth', plugin.name, username, (password or ''))
                      auth_time = time.time() - start
                      log.debug('Authentication for plugin `%s` completed in %.3fs, '

rhodecode/authentication/plugins/auth_ldap.py

0 +1 0

              class LdapError(Exception):
                  pass
              def plugin_factory(plugin_id, *args, **kwds):
                  """
                  Factory function that is called during plugin discovery.

rhodecode/authentication/plugins/auth_pam.py

0 +2 -2

                      if not username or not password:
                          log.debug('Empty username or password skipping...')
                          return None
-                     auth_result = pam.authenticate(username, password, settings["service"])
+                     _pam = pam.pam()
+                     auth_result = _pam.authenticate(username, password, settings["service"])
                      if not auth_result:
                          log.error("PAM was unable to authenticate user: %s" % (username, ))

rhodecode/authentication/schema.py

0 +2 -1

              import colander
+             from rhodecode.authentication import plugin_default_auth_ttl
              from rhodecode.translation import _
                  )
                  cache_ttl = colander.SchemaNode(
                      colander.Int(),
-                     default=0,
+                     default=plugin_default_auth_ttl,
                      description=_('Amount of seconds to cache the authentication and '
                                    'permissions check response call for this plugin. \n'
                                    'Useful for expensive calls like LDAP to improve the '

rhodecode/authentication/tests/conftest.py

0 +2 -5

                  """
                  def __init__(self, plugin):
-                     self.new_value = set([
-                         'egg:rhodecode-enterprise-ce#rhodecode',
-                         plugin.get_id()
-                     ])
+                     self.new_value = {'egg:rhodecode-enterprise-ce#rhodecode', plugin.get_id()}
                  def __enter__(self):
                      from rhodecode.model.settings import SettingsModel
                          'auth_plugins', ','.join(self._old_value))
-             class DisabledAuthPlugin():
+             class DisabledAuthPlugin(object):
                  """
                  Context manager that updates the 'auth_plugins' setting in DB to disable
                  a plugin. Previous setting is restored on exit.

rhodecode/authentication/views.py

0 +1 -13

              from pyramid.response import Response
              from rhodecode.apps._base import BaseAppView
-             from rhodecode.authentication.base import (
-                 get_auth_cache_manager, get_perms_cache_manager, get_authn_registry)
+             from rhodecode.authentication.base import get_authn_registry
              from rhodecode.lib import helpers as h
              from rhodecode.lib.auth import (
                  LoginRequired, HasPermissionAllDecorator, CSRFRequired)
-             from rhodecode.lib.caches import clear_cache_manager
              from rhodecode.model.forms import AuthSettingsForm
              from rhodecode.model.meta import Session
              from rhodecode.model.settings import SettingsModel
                          self.plugin.create_or_update_setting(name, value)
                      Session().commit()
-                     # cleanup cache managers in case of change for plugin
-                     # TODO(marcink): because we can register multiple namespaces
-                     # we should at some point figure out how to retrieve ALL namespace
-                     # cache managers and clear them...
-                     cache_manager = get_auth_cache_manager()
-                     clear_cache_manager(cache_manager)
-                     cache_manager = get_perms_cache_manager()
-                     clear_cache_manager(cache_manager)
                      # Display success message and redirect.
                      h.flash(_('Auth settings updated successfully.'), category='success')
                      redirect_to = self.request.resource_path(

rhodecode/config/environment.py

0 +2 -2

              # RhodeCode Enterprise Edition, including its added features, Support services,
              # and proprietary license terms, please see https://rhodecode.com/licenses/
              import os
              import logging
              import rhodecode
              from rhodecode.config import utils
              from rhodecode.lib.utils import load_rcextensions
                  if settings['is_test']:
                      rhodecode.is_test = True
                      rhodecode.disable_error_handler = True
+                     from rhodecode import authentication
+                     authentication.plugin_default_auth_ttl = 0
                      utils.initialize_test_environment(settings_merged)

rhodecode/config/licenses.json

0 +1 -5

                },
                "python2.7-requests-2.9.1": {
                  "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
-               },
-               "python2.7-setuptools-19.4": {
-                 "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0",
-                 "Zope Public License 2.0": "http://spdx.org/licenses/ZPL-2.0"
-               },
+               },
                "python2.7-setuptools-scm-1.15.6": {
                  "MIT License": "http://spdx.org/licenses/MIT"
                },

rhodecode/config/middleware.py

0 +137 -19

              # RhodeCode Enterprise Edition, including its added features, Support services,
              # and proprietary license terms, please see https://rhodecode.com/licenses/
+             import os
+             import sys
              import logging
-             import traceback
              import collections
+             import tempfile
              from paste.gzipper import make_gzip_middleware
+             import pyramid.events
              from pyramid.wsgi import wsgiapp
              from pyramid.authorization import ACLAuthorizationPolicy
              from pyramid.config import Configurator
              from pyramid.settings import asbool, aslist
              from pyramid.httpexceptions import (
                  HTTPException, HTTPError, HTTPInternalServerError, HTTPFound, HTTPNotFound)
-             from pyramid.events import ApplicationCreated
              from pyramid.renderers import render_to_response
              from rhodecode.model import meta
              from rhodecode.config import utils as config_utils
              from rhodecode.config.environment import load_pyramid_environment
+             import rhodecode.events
              from rhodecode.lib.middleware.vcs import VCSMiddleware
+             from rhodecode.lib.request import Request
              from rhodecode.lib.vcs import VCSCommunicationError
              from rhodecode.lib.exceptions import VCSServerUnavailable
              from rhodecode.lib.middleware.appenlight import wrap_in_appenlight_if_enabled
              from rhodecode.lib.celerylib.loader import configure_celery
              from rhodecode.lib.plugins.utils import register_rhodecode_plugin
              from rhodecode.lib.utils2 import aslist as rhodecode_aslist, AttributeDict
+             from rhodecode.lib.exc_tracking import store_exception
              from rhodecode.subscribers import (
                  scan_repositories_if_enabled, write_js_routes_if_enabled,
                  write_metadata_if_needed, inject_app_settings)
                    cases when these fragments are assembled from another place.
                  """
+                 # Allows to use format style "{ENV_NAME}" placeholders in the configuration. It
+                 # will be replaced by the value of the environment variable "NAME" in this case.
+                 environ = {
+                     'ENV_{}'.format(key): value for key, value in os.environ.items()}
+                 global_config = _substitute_values(global_config, environ)
+                 settings = _substitute_values(settings, environ)
                  sanitize_settings_and_apply_defaults(settings)
                  config = Configurator(settings=settings)
                      c.causes = base_response.causes
                  c.messages = helpers.flash.pop_messages(request=request)
-                 c.traceback = traceback.format_exc()
+                 exc_info = sys.exc_info()
+                 c.exception_id = id(exc_info)
+                 c.show_exception_id = isinstance(base_response, VCSServerUnavailable) \
+                                       or base_response.status_code > 499
+                 c.exception_id_url = request.route_url(
+                     'admin_settings_exception_tracker_show', exception_id=c.exception_id)
+                 if c.show_exception_id:
+                     store_exception(c.exception_id, exc_info)
                  response = render_to_response(
                      '/errors/error_document.mako', {'c': c, 'h': helpers}, request=request,
                      response=base_response)
              def includeme(config):
                  settings = config.registry.settings
+                 config.set_request_factory(Request)
                  # plugin information
                  config.registry.rhodecode_plugins = collections.OrderedDict()
                  # Includes which are required. The application would fail without them.
                  config.include('pyramid_mako')
                  config.include('pyramid_beaker')
-                 config.include('rhodecode.lib.caches')
+                 config.include('rhodecode.lib.rc_cache')
                  config.include('rhodecode.authentication')
                  config.include('rhodecode.integrations')
                  settings['default_locale_name'] = settings.get('lang', 'en')
                  # Add subscribers.
-                 config.add_subscriber(inject_app_settings, ApplicationCreated)
-                 config.add_subscriber(scan_repositories_if_enabled, ApplicationCreated)
-                 config.add_subscriber(write_metadata_if_needed, ApplicationCreated)
-                 config.add_subscriber(write_js_routes_if_enabled, ApplicationCreated)
-                 # events
-                 # TODO(marcink): this should be done when pyramid migration is finished
-                 # config.add_subscriber(
-                 #     'rhodecode.integrations.integrations_event_handler',
-                 #     'rhodecode.events.RhodecodeEvent')
+                 config.add_subscriber(inject_app_settings,
+                                       pyramid.events.ApplicationCreated)
+                 config.add_subscriber(scan_repositories_if_enabled,
+                                       pyramid.events.ApplicationCreated)
+                 config.add_subscriber(write_metadata_if_needed,
+                                       pyramid.events.ApplicationCreated)
+                 config.add_subscriber(write_js_routes_if_enabled,
+                                       pyramid.events.ApplicationCreated)
                  # request custom methods
                  config.add_request_method(
                  """
                  Apply outer WSGI middlewares around the application.
                  """
-                 settings = config.registry.settings
+                 registry = config.registry
+                 settings = registry.settings
                  # enable https redirects based on HTTP_X_URL_SCHEME set by proxy
                  pyramid_app = HttpsFixup(pyramid_app, settings)
                  pyramid_app, _ae_client = wrap_in_appenlight_if_enabled(
                      pyramid_app, settings)
-                 config.registry.ae_client = _ae_client
+                 registry.ae_client = _ae_client
                  if settings['gzip_responses']:
                      pyramid_app = make_gzip_middleware(
                          # if not, then something, somewhere is leaving a connection open
                          pool = meta.Base.metadata.bind.engine.pool
                          log.debug('sa pool status: %s', pool.status())
+                         log.debug('Request processing finalized')
                  return pyramid_app_with_cleanup
                  # Call split out functions that sanitize settings for each topic.
                  _sanitize_appenlight_settings(settings)
                  _sanitize_vcs_settings(settings)
+                 _sanitize_cache_settings(settings)
                  # configure instance id
                  config_utils.set_instance_id(settings)
                  _string_setting(settings, 'vcs.svn.compatible_version', '')
                  _string_setting(settings, 'git_rev_filter', '--all')
                  _string_setting(settings, 'vcs.hooks.protocol', 'http')
+                 _string_setting(settings, 'vcs.hooks.host', '127.0.0.1')
                  _string_setting(settings, 'vcs.scm_app_implementation', 'http')
                  _string_setting(settings, 'vcs.server', '')
                  _string_setting(settings, 'vcs.server.log_level', 'debug')
                  _int_setting(settings, 'vcs.connection_timeout', 3600)
                  # Support legacy values of vcs.scm_app_implementation. Legacy
-                 # configurations may use 'rhodecode.lib.middleware.utils.scm_app_http'
-                 # which is now mapped to 'http'.
+                 # configurations may use 'rhodecode.lib.middleware.utils.scm_app_http', or
+                 # disabled since 4.13 'vcsserver.scm_app' which is now mapped to 'http'.
                  scm_app_impl = settings['vcs.scm_app_implementation']
-                 if scm_app_impl == 'rhodecode.lib.middleware.utils.scm_app_http':
+                 if scm_app_impl in ['rhodecode.lib.middleware.utils.scm_app_http', 'vcsserver.scm_app']:
                      settings['vcs.scm_app_implementation'] = 'http'
+             def _sanitize_cache_settings(settings):
+                 _string_setting(settings, 'cache_dir',
+                                 os.path.join(tempfile.gettempdir(), 'rc_cache'))
+                 # cache_perms
+                 _string_setting(
+                     settings,
+                     'rc_cache.cache_perms.backend',
+                     'dogpile.cache.rc.file_namespace')
+                 _int_setting(
+                     settings,
+                     'rc_cache.cache_perms.expiration_time',
+)
+                 _string_setting(
+                     settings,
+                     'rc_cache.cache_perms.arguments.filename',
+                     os.path.join(tempfile.gettempdir(), 'rc_cache_1'))
+                 # cache_repo
+                 _string_setting(
+                     settings,
+                     'rc_cache.cache_repo.backend',
+                     'dogpile.cache.rc.file_namespace')
+                 _int_setting(
+                     settings,
+                     'rc_cache.cache_repo.expiration_time',
+)
+                 _string_setting(
+                     settings,
+                     'rc_cache.cache_repo.arguments.filename',
+                     os.path.join(tempfile.gettempdir(), 'rc_cache_2'))
+                 # cache_license
+                 _string_setting(
+                     settings,
+                     'rc_cache.cache_license.backend',
+                     'dogpile.cache.rc.file_namespace')
+                 _int_setting(
+                     settings,
+                     'rc_cache.cache_license.expiration_time',
+*60)
+                 _string_setting(
+                     settings,
+                     'rc_cache.cache_license.arguments.filename',
+                     os.path.join(tempfile.gettempdir(), 'rc_cache_3'))
+                 # cache_repo_longterm memory, 96H
+                 _string_setting(
+                     settings,
+                     'rc_cache.cache_repo_longterm.backend',
+                     'dogpile.cache.rc.memory_lru')
+                 _int_setting(
+                     settings,
+                     'rc_cache.cache_repo_longterm.expiration_time',
+)
+                 _int_setting(
+                     settings,
+                     'rc_cache.cache_repo_longterm.max_size',
+)
+                 # sql_cache_short
+                 _string_setting(
+                     settings,
+                     'rc_cache.sql_cache_short.backend',
+                     'dogpile.cache.rc.memory_lru')
+                 _int_setting(
+                     settings,
+                     'rc_cache.sql_cache_short.expiration_time',
+)
+                 _int_setting(
+                     settings,
+                     'rc_cache.sql_cache_short.max_size',
+)
              def _int_setting(settings, name, default):
                  settings[name] = int(settings.get(name, default))
                  if lower:
                      value = value.lower()
                  settings[name] = value
+             def _substitute_values(mapping, substitutions):
+                 try:
+                     result = {
+                         # Note: Cannot use regular replacements, since they would clash
+                         # with the implementation of ConfigParser. Using "format" instead.
+                         key: value.format(**substitutions)
+                         for key, value in mapping.items()
+                     }
+                 except KeyError as e:
+                     raise ValueError(
+                         'Failed to substitute env variable: {}. '
+                         'Make sure you have specified this env variable without ENV_ prefix'.format(e))
+                 return result

rhodecode/config/utils.py

0 +3 -1

              from rhodecode.model import init_model
              def configure_vcs(config):
                  """
                  Patch VCS config with some RhodeCode specific stuff
                  """
                  from rhodecode.lib.vcs import conf
+                 import rhodecode.lib.vcs.conf.settings
                  conf.settings.BACKENDS = {
                      'hg': 'rhodecode.lib.vcs.backends.hg.MercurialRepository',
                      'git': 'rhodecode.lib.vcs.backends.git.GitRepository',
                  }
                  conf.settings.HOOKS_PROTOCOL = config['vcs.hooks.protocol']
+                 conf.settings.HOOKS_HOST = config['vcs.hooks.host']
                  conf.settings.HOOKS_DIRECT_CALLS = config['vcs.hooks.direct_calls']
                  conf.settings.GIT_REV_FILTER = shlex.split(config['git_rev_filter'])
                  conf.settings.DEFAULT_ENCODINGS = config['default_encoding']

rhodecode/events/__init__.py

0 +10 -14

              import logging
              from pyramid.threadlocal import get_current_registry
-             from rhodecode.events.base import RhodecodeEvent
+             from rhodecode.events.base import RhodeCodeIntegrationEvent
              log = logging.getLogger(__name__)
                  # For the first step we are using pyramids thread locals here. If the
                  # event mechanism works out as a good solution we should think about
                  # passing the registry as an argument to get rid of it.
+                 event_name = event.__class__
+                 log.debug('event %s sent for execution', event_name)
                  registry = registry or get_current_registry()
                  registry.notify(event)
-                 log.debug('event %s triggered using registry %s', event, registry)
-                 # Until we can work around the problem that VCS operations do not have a
-                 # pyramid context to work with, we send the events to integrations directly
+                 log.debug('event %s triggered using registry %s', event_name, registry)
-                 # Later it will be possible to use regular pyramid subscribers ie:
-                 # config.add_subscriber(
-                 #     'rhodecode.integrations.integrations_event_handler',
-                 #     'rhodecode.events.RhodecodeEvent')
-                 # trigger(event, request.registry)
+                 # Send the events to integrations directly
+                 from rhodecode.integrations import integrations_event_handler
+                 if isinstance(event, RhodeCodeIntegrationEvent):
+                     integrations_event_handler(event)
-                 from rhodecode.integrations import integrations_event_handler
-                 if isinstance(event, RhodecodeEvent):
-                     integrations_event_handler(event)
              from rhodecode.events.user import (  # noqa
                  UserPreCreate,
                  UserPostCreate,
                  UserPreUpdate,
-                 UserRegistered
+                 UserRegistered,
+                 UserPermissionsChange,
              )
              from rhodecode.events.repo import (  # noqa

rhodecode/events/base.py

0 +6 0

                          'server_url': self.server_url
                      }
                      return data
+             class RhodeCodeIntegrationEvent(RhodecodeEvent):
+                 """
+                 Special subclass for Integration events
+                 """

rhodecode/events/repo.py

0 +2 -2

              from rhodecode.translation import lazy_ugettext
              from rhodecode.model.db import User, Repository, Session
-             from rhodecode.events.base import RhodecodeEvent
+             from rhodecode.events.base import RhodeCodeIntegrationEvent
              from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
              log = logging.getLogger(__name__)
                  return issues
-             class RepoEvent(RhodecodeEvent):
+             class RepoEvent(RhodeCodeIntegrationEvent):
                  """
                  Base class for events acting on a repository.

rhodecode/events/repo_group.py

0 +2 -2

              import logging
              from rhodecode.translation import lazy_ugettext
-             from rhodecode.events.base import RhodecodeEvent
+             from rhodecode.events.base import RhodeCodeIntegrationEvent
              log = logging.getLogger(__name__)
-             class RepoGroupEvent(RhodecodeEvent):
+             class RepoGroupEvent(RhodeCodeIntegrationEvent):
                  """
                  Base class for events acting on a repository group.

rhodecode/events/user.py

0 +24 -5

              from zope.interface import implementer
              from rhodecode.translation import lazy_ugettext
-             from rhodecode.events.base import RhodecodeEvent
+             from rhodecode.events.base import RhodecodeEvent, RhodeCodeIntegrationEvent
              from rhodecode.events.interfaces import (
                  IUserRegistered, IUserPreCreate, IUserPreUpdate)
              @implementer(IUserRegistered)
-             class UserRegistered(RhodecodeEvent):
+             class UserRegistered(RhodeCodeIntegrationEvent):
                  """
                  An instance of this class is emitted as an :term:`event` whenever a user
                  account is registered.
              @implementer(IUserPreCreate)
-             class UserPreCreate(RhodecodeEvent):
+             class UserPreCreate(RhodeCodeIntegrationEvent):
                  """
                  An instance of this class is emitted as an :term:`event` before a new user
                  object is created.
              @implementer(IUserPreCreate)
-             class UserPostCreate(RhodecodeEvent):
+             class UserPostCreate(RhodeCodeIntegrationEvent):
                  """
                  An instance of this class is emitted as an :term:`event` after a new user
                  object is created.
              @implementer(IUserPreUpdate)
-             class UserPreUpdate(RhodecodeEvent):
+             class UserPreUpdate(RhodeCodeIntegrationEvent):
                  """
                  An instance of this class is emitted as an :term:`event` before a user
                  object is updated.
                      super(UserPreUpdate, self).__init__()
                      self.user = user
                      self.user_data = user_data
+             class UserPermissionsChange(RhodecodeEvent):
+                 """
+                 This event should be triggered on an event that permissions of user might changed.
+                 Currently this should be triggered on:
+                   - user added/removed from user group
+                   - repo permissions changed
+                   - repo group permissions changed
+                   - user group permissions changed
+                 """
+                 name = 'user-permissions-change'
+                 display_name = lazy_ugettext('user permissions change')
+                 def __init__(self, user_ids):
+                     super(UserPermissionsChange, self).__init__()
+                     self.user_ids = user_ids

rhodecode/i18n/rhodecode.pot

0 +1689 -1412

              #, fuzzy
              msgid ""
              msgstr ""
-             "Project-Id-Version: rhodecode-enterprise-ce 4.12.0\n"
+             "Project-Id-Version: rhodecode-enterprise-ce 4.13.0\n"
              "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
-             "POT-Creation-Date: 2018-04-23 15:50+0200\n"
+             "POT-Creation-Date: 2018-09-04 13:25+0200\n"
              "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
              "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
              "Language-Team: LANGUAGE <LL@li.org>\n"
              msgstr ""
              #: rhodecode/apps/admin/navigation.py:74
-             #: rhodecode/templates/admin/repos/repo_edit.mako:55
+             #: rhodecode/templates/admin/repos/repo_edit.mako:58
              msgid "VCS"
              msgstr ""
              msgstr ""
              #: rhodecode/apps/admin/navigation.py:80
-             #: rhodecode/templates/admin/repos/repo_edit.mako:61
+             #: rhodecode/templates/admin/repos/repo_edit.mako:64
              msgid "Issue Tracker"
              msgstr ""
              #: rhodecode/apps/admin/navigation.py:82
              #: rhodecode/integrations/types/email.py:176
-             #: rhodecode/templates/register.mako:76
+             #: rhodecode/templates/register.mako:91
              #: rhodecode/templates/admin/my_account/my_account_profile.mako:48
              #: rhodecode/templates/admin/users/user_add.mako:86
              #: rhodecode/templates/admin/users/user_edit_profile.mako:65
-             #: rhodecode/templates/admin/users/users.mako:65
+             #: rhodecode/templates/admin/users/users.mako:73
              #: rhodecode/templates/email_templates/user_registration.mako:25
              #: rhodecode/templates/users/user_profile.mako:51
              msgid "Email"
              #: rhodecode/templates/admin/integrations/new.mako:17
              #: rhodecode/templates/admin/integrations/new.mako:23
              #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51
-             #: rhodecode/templates/admin/repos/repo_edit.mako:75
+             #: rhodecode/templates/admin/repos/repo_edit.mako:78
              #: rhodecode/templates/base/base.mako:84
              msgid "Integrations"
              msgstr ""
              msgstr ""
              #: rhodecode/apps/admin/navigation.py:92
+             msgid "Exceptions Tracker"
+             msgstr ""
+             #: rhodecode/apps/admin/navigation.py:95
              msgid "Processes"
              msgstr ""
-             #: rhodecode/apps/admin/navigation.py:94
+             #: rhodecode/apps/admin/navigation.py:97
              msgid "User Sessions"
              msgstr ""
-             #: rhodecode/apps/admin/navigation.py:96
+             #: rhodecode/apps/admin/navigation.py:99
              msgid "Open Source Licenses"
              msgstr ""
-             #: rhodecode/apps/admin/navigation.py:98
-             #: rhodecode/templates/admin/repos/repo_edit.mako:83
+             #: rhodecode/apps/admin/navigation.py:101
+             #: rhodecode/templates/admin/repos/repo_edit.mako:86
              msgid "Automation"
              msgstr ""
-             #: rhodecode/apps/admin/navigation.py:102
+             #: rhodecode/apps/admin/navigation.py:105
              msgid "Labs"
              msgstr ""
              msgid "Error occurred during update of default values"
              msgstr ""
+             #: rhodecode/apps/admin/views/exception_tracker.py:136
+             msgid "Removed {} Exceptions"
+             msgstr ""
+             #: rhodecode/apps/admin/views/exception_tracker.py:153
+             msgid "Removed Exception {}"
+             msgstr ""
              #: rhodecode/apps/admin/views/permissions.py:120
              msgid "Application permissions updated successfully"
              msgstr ""
              #: rhodecode/apps/admin/views/permissions.py:141
-             #: rhodecode/apps/admin/views/permissions.py:213
-             #: rhodecode/apps/admin/views/permissions.py:288
+             #: rhodecode/apps/admin/views/permissions.py:214
+             #: rhodecode/apps/admin/views/permissions.py:313
              msgid "Error occurred during update of permissions"
              msgstr ""
-             #: rhodecode/apps/admin/views/permissions.py:193
+             #: rhodecode/apps/admin/views/permissions.py:194
              msgid "Object permissions updated successfully"
              msgstr ""
-             #: rhodecode/apps/admin/views/permissions.py:268
+             #: rhodecode/apps/admin/views/permissions.py:293
              msgid "Global permissions updated successfully"
              msgstr ""
-             #: rhodecode/apps/admin/views/permissions.py:450
+             #: rhodecode/apps/admin/views/permissions.py:475
              #: rhodecode/templates/admin/gists/show.mako:63
              #: rhodecode/templates/admin/integrations/list.mako:174
              #: rhodecode/templates/admin/my_account/my_account_profile.mako:5
              #: rhodecode/templates/files/files_edit.mako:168
              #: rhodecode/templates/files/files_source.mako:54
              #: rhodecode/templates/files/files_source.mako:57
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:63
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:345
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:64
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:347
              #: rhodecode/templates/user_group/profile.mako:7
              #: rhodecode/templates/users/user_profile.mako:7
              msgid "Edit"
              msgstr ""
-             #: rhodecode/apps/admin/views/permissions.py:478
+             #: rhodecode/apps/admin/views/permissions.py:503
              msgid "Updated SSH keys file: {}"
              msgstr ""
-             #: rhodecode/apps/admin/views/permissions.py:481
+             #: rhodecode/apps/admin/views/permissions.py:506
              msgid "SSH key support is disabled in .ini file"
              msgstr ""
-             #: rhodecode/apps/admin/views/repo_groups.py:181
+             #: rhodecode/apps/admin/views/repo_groups.py:182
              #, python-format
              msgid "Created repository group %s"
              msgstr ""
-             #: rhodecode/apps/admin/views/repo_groups.py:199
+             #: rhodecode/apps/admin/views/repo_groups.py:200
              #, python-format
              msgid "Error occurred during creation of repository group %s"
              msgstr ""
              msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:115
-             msgid "Python version"
+             msgid "Lang"
              msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:116
+             msgid "Python version"
+             msgstr ""
+             #: rhodecode/apps/admin/views/system_info.py:117
              msgid "Python path"
              msgstr ""
-             #: rhodecode/apps/admin/views/system_info.py:120
-             msgid "CPU"
-             msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:121
-             msgid "Load"
+             msgid "CPU"
              msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:122
-             msgid "Memory"
+             msgid "Load"
              msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:123
+             msgid "Memory"
+             msgstr ""
+             #: rhodecode/apps/admin/views/system_info.py:124
              msgid "Uptime"
              msgstr ""
-             #: rhodecode/apps/admin/views/system_info.py:127
+             #: rhodecode/apps/admin/views/system_info.py:128
              msgid "Ulimit"
              msgstr ""
-             #: rhodecode/apps/admin/views/system_info.py:130
-             msgid "Storage location"
-             msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:131
-             msgid "Storage info"
+             msgid "Storage location"
              msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:132
+             msgid "Storage info"
+             msgstr ""
+             #: rhodecode/apps/admin/views/system_info.py:133
              msgid "Storage inodes"
              msgstr ""
-             #: rhodecode/apps/admin/views/system_info.py:134
-             msgid "Gist storage location"
-             msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:135
+             msgid "Gist storage location"
+             msgstr ""
+             #: rhodecode/apps/admin/views/system_info.py:136
              msgid "Gist storage info"
              msgstr ""
-             #: rhodecode/apps/admin/views/system_info.py:137
-             msgid "Archive cache storage location"
-             msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:138
+             msgid "Archive cache storage location"
+             msgstr ""
+             #: rhodecode/apps/admin/views/system_info.py:139
              msgid "Archive cache info"
              msgstr ""
-             #: rhodecode/apps/admin/views/system_info.py:140
-             msgid "Temp storage location"
-             msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:141
+             msgid "Temp storage location"
+             msgstr ""
+             #: rhodecode/apps/admin/views/system_info.py:142
              msgid "Temp storage info"
              msgstr ""
-             #: rhodecode/apps/admin/views/system_info.py:143
-             msgid "Search info"
-             msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:144
+             msgid "Search info"
+             msgstr ""
+             #: rhodecode/apps/admin/views/system_info.py:145
              msgid "Search location"
              msgstr ""
-             #: rhodecode/apps/admin/views/system_info.py:148
-             msgid "VCS Backends"
-             msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:149
-             msgid "VCS Server"
+             msgid "VCS Backends"
              msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:150
-             msgid "GIT"
+             msgid "VCS Server"
              msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:151
-             msgid "HG"
+             msgid "GIT"
              msgstr ""
              #: rhodecode/apps/admin/views/system_info.py:152
+             msgid "HG"
+             msgstr ""
+             #: rhodecode/apps/admin/views/system_info.py:153
              msgid "SVN"
              msgstr ""
-             #: rhodecode/apps/admin/views/user_groups.py:219
+             #: rhodecode/apps/admin/views/user_groups.py:231
              #, python-format
              msgid "Created user group %(user_group_link)s"
              msgstr ""
-             #: rhodecode/apps/admin/views/user_groups.py:241
+             #: rhodecode/apps/admin/views/user_groups.py:253
              #, python-format
              msgid "Error occurred during creation of user group %s"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:209
+             #: rhodecode/apps/admin/views/users.py:218
              #, python-format
              msgid "Created user %(user_link)s"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:230
+             #: rhodecode/apps/admin/views/users.py:239
              #, python-format
              msgid "Error occurred during creation of user %s"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:304
+             #: rhodecode/apps/admin/views/users.py:313
              msgid "User updated successfully"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:322
+             #: rhodecode/apps/admin/views/users.py:331
              #, python-format
              msgid "Error occurred during update of user %s"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:354
+             #: rhodecode/apps/admin/views/users.py:363
              #, python-format
              msgid "Detached %s repositories"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:359
+             #: rhodecode/apps/admin/views/users.py:368
              #, python-format
              msgid "Deleted %s repositories"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:367
+             #: rhodecode/apps/admin/views/users.py:376
              #, python-format
              msgid "Detached %s repository groups"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:372
+             #: rhodecode/apps/admin/views/users.py:381
              #, python-format
              msgid "Deleted %s repository groups"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:380
+             #: rhodecode/apps/admin/views/users.py:389
              #, python-format
              msgid "Detached %s user groups"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:385
+             #: rhodecode/apps/admin/views/users.py:394
              #, python-format
              msgid "Deleted %s user groups"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:402
+             #: rhodecode/apps/admin/views/users.py:411
              msgid "Successfully deleted user"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:408
+             #: rhodecode/apps/admin/views/users.py:417
              msgid "An error occurred during deletion of user"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:473
+             #: rhodecode/apps/admin/views/users.py:482
              msgid ""
              "The user participates as reviewer in {} pull request and cannot be deleted. \n"
              "You can set the user to \"{}\" instead of deleting it."
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:479
+             #: rhodecode/apps/admin/views/users.py:488
              msgid ""
              "The user participates as reviewer in {} pull requests and cannot be deleted. \n"
              "You can set the user to \"{}\" instead of deleting it."
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:567
+             #: rhodecode/apps/admin/views/users.py:576
              msgid "User global permissions updated successfully"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:585
-             #: rhodecode/apps/user_group/views/__init__.py:448
+             #: rhodecode/apps/admin/views/users.py:594
+             #: rhodecode/apps/user_group/views/__init__.py:474
              msgid "An error occurred during permissions saving"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:610
+             #: rhodecode/apps/admin/views/users.py:619
              msgid "Force password change disabled for user"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:615
-             msgid "Force password change enabled for user"
-             msgstr ""
              #: rhodecode/apps/admin/views/users.py:624
+             msgid "Force password change enabled for user"
+             msgstr ""
+             #: rhodecode/apps/admin/views/users.py:633
              msgid "An error occurred during password reset for user"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:663
+             #: rhodecode/apps/admin/views/users.py:672
              #, python-format
              msgid "Linked repository group `%s` as personal"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:669
-             #, python-format
-             msgid "Created repository group `%s`"
-             msgstr ""
-             #: rhodecode/apps/admin/views/users.py:673
-             #, python-format
-             msgid "Repository group `%s` is already taken"
-             msgstr ""
              #: rhodecode/apps/admin/views/users.py:678
+             #, python-format
+             msgid "Created repository group `%s`"
+             msgstr ""
+             #: rhodecode/apps/admin/views/users.py:682
+             #, python-format
+             msgid "Repository group `%s` is already taken"
+             msgstr ""
+             #: rhodecode/apps/admin/views/users.py:687
              msgid "An error occurred during repository group creation for user"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:701
+             #: rhodecode/apps/admin/views/users.py:710
              #: rhodecode/apps/my_account/views/my_account.py:160
              #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16
              #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16
              msgid "Role"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:739
-             #: rhodecode/apps/my_account/views/my_account.py:194
+             #: rhodecode/apps/admin/views/users.py:749
+             #: rhodecode/apps/my_account/views/my_account.py:195
              msgid "Auth token successfully created"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:768
-             #: rhodecode/apps/my_account/views/my_account.py:218
+             #: rhodecode/apps/admin/views/users.py:778
+             #: rhodecode/apps/my_account/views/my_account.py:219
              msgid "Auth token successfully deleted"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:841
+             #: rhodecode/apps/admin/views/users.py:851
              #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113
              msgid "Ssh Key successfully created"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:847
-             #: rhodecode/apps/admin/views/users.py:851
+             #: rhodecode/apps/admin/views/users.py:857
+             #: rhodecode/apps/admin/views/users.py:861
              #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:119
              #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:123
              msgid "An error occurred during ssh key saving: {}"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:885
+             #: rhodecode/apps/admin/views/users.py:895
              #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:153
              msgid "Ssh key successfully deleted"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:931
-             #, python-format
-             msgid "Added new email address `%s` for user account"
-             msgstr ""
-             #: rhodecode/apps/admin/views/users.py:937
-             msgid "Email `{}` is already registered for another user."
-             msgstr ""
              #: rhodecode/apps/admin/views/users.py:941
+             #, python-format
+             msgid "Added new email address `%s` for user account"
+             msgstr ""
+             #: rhodecode/apps/admin/views/users.py:947
+             msgid "Email `{}` is already registered for another user."
+             msgstr ""
+             #: rhodecode/apps/admin/views/users.py:951
              msgid "An error occurred during email saving"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:968
+             #: rhodecode/apps/admin/views/users.py:978
              msgid "Removed email address from user account"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:1014
+             #: rhodecode/apps/admin/views/users.py:1024
              #, python-format
              msgid "An error occurred during ip saving:%s"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:1036
+             #: rhodecode/apps/admin/views/users.py:1046
              msgid "An error occurred during ip saving"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:1040
+             #: rhodecode/apps/admin/views/users.py:1050
              #, python-format
              msgid "Added ips %s to user whitelist"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:1070
+             #: rhodecode/apps/admin/views/users.py:1080
              msgid "Removed ip address from user whitelist"
              msgstr ""
-             #: rhodecode/apps/admin/views/users.py:1135
+             #: rhodecode/apps/admin/views/users.py:1145
              msgid "Groups successfully changed"
              msgstr ""
+             #: rhodecode/apps/admin/views/users.py:1239
+             msgid "Deleted {} cache keys"
+             msgstr ""
              #: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51
              msgid "forever"
              msgstr ""
              msgstr ""
              #: rhodecode/apps/gist/views.py:64
-             #: rhodecode/public/js/rhodecode-components.js:49292
-             #: rhodecode/public/js/scripts.js:41140
+             #: rhodecode/public/js/rhodecode-components.js:54572
+             #: rhodecode/public/js/scripts.js:41322
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
              #: rhodecode/public/js/src/rhodecode.js:502
              msgid "Lifetime"
              msgid "Error occurred during update of gist %s"
              msgstr ""
-             #: rhodecode/apps/home/views.py:218 rhodecode/apps/home/views.py:251
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:775
+             #: rhodecode/apps/home/views.py:295
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:784
              #: rhodecode/templates/admin/my_account/my_account.mako:41
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197
              #: rhodecode/templates/admin/repos/repo_add.mako:15
              #: rhodecode/templates/admin/repos/repo_add.mako:19
              #: rhodecode/templates/admin/users/user_edit_advanced.mako:11
              #: rhodecode/templates/base/base.mako:78 rhodecode/templates/base/base.mako:150
-             #: rhodecode/templates/base/base.mako:584
+             #: rhodecode/templates/base/base.mako:655
              msgid "Repositories"
              msgstr ""
-             #: rhodecode/apps/home/views.py:244
-             msgid "Groups"
-             msgstr ""
-             #: rhodecode/apps/home/views.py:264
-             #, python-format
-             msgid "Commits in %(repo)s"
-             msgstr ""
              #: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178
              msgid "public journal"
              msgstr ""
              msgid "journal"
              msgstr ""
-             #: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349
+             #: rhodecode/apps/login/views.py:293 rhodecode/apps/login/views.py:374
              msgid "Bad captcha"
              msgstr ""
-             #: rhodecode/apps/login/views.py:288
+             #: rhodecode/apps/login/views.py:315
              msgid "You have successfully registered with RhodeCode"
              msgstr ""
-             #: rhodecode/apps/login/views.py:325
+             #: rhodecode/apps/login/views.py:352
              msgid "If such email exists, a password reset link was sent to it."
              msgstr ""
-             #: rhodecode/apps/login/views.py:331
+             #: rhodecode/apps/login/views.py:358
              msgid "Password reset has been disabled."
              msgstr ""
-             #: rhodecode/apps/login/views.py:420
+             #: rhodecode/apps/login/views.py:446
              msgid "Given reset token is invalid"
              msgstr ""
-             #: rhodecode/apps/login/views.py:428
+             #: rhodecode/apps/login/views.py:454
              msgid "Your password reset was successful, a new password has been sent to your email"
              msgstr ""
              msgid "Successfully updated password"
              msgstr ""
-             #: rhodecode/apps/my_account/views/my_account.py:282
+             #: rhodecode/apps/my_account/views/my_account.py:283
              msgid "Error occurred during adding email"
              msgstr ""
-             #: rhodecode/apps/my_account/views/my_account.py:285
+             #: rhodecode/apps/my_account/views/my_account.py:286
              msgid "Successfully added email"
              msgstr ""
-             #: rhodecode/apps/my_account/views/my_account.py:307
+             #: rhodecode/apps/my_account/views/my_account.py:308
              msgid "Email successfully deleted"
              msgstr ""
-             #: rhodecode/apps/my_account/views/my_account.py:490
+             #: rhodecode/apps/my_account/views/my_account.py:491
              msgid "Your account was updated successfully"
              msgstr ""
-             #: rhodecode/apps/my_account/views/my_account.py:497
+             #: rhodecode/apps/my_account/views/my_account.py:498
              msgid "Error occurred during update of user"
              msgstr ""
              msgid "Error occurred during deletion of repository group %s"
              msgstr ""
-             #: rhodecode/apps/repo_group/views/repo_group_permissions.py:73
-             #: rhodecode/apps/user_group/views/__init__.py:328
+             #: rhodecode/apps/repo_group/views/repo_group_permissions.py:74
+             #: rhodecode/apps/user_group/views/__init__.py:346
              msgid "Cannot change permission for yourself as admin"
              msgstr ""
-             #: rhodecode/apps/repo_group/views/repo_group_permissions.py:97
+             #: rhodecode/apps/repo_group/views/repo_group_permissions.py:98
              msgid "Repository Group permissions updated"
              msgstr ""
-             #: rhodecode/apps/repo_group/views/repo_group_settings.py:174
+             #: rhodecode/apps/repo_group/views/repo_group_settings.py:173
              msgid "Repository Group `{}` updated successfully"
              msgstr ""
-             #: rhodecode/apps/repo_group/views/repo_group_settings.py:179
+             #: rhodecode/apps/repo_group/views/repo_group_settings.py:178
              #, python-format
              msgid "Error occurred during update of repository group %s"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_caches.py:72
+             #: rhodecode/apps/repository/views/repo_caches.py:80
              msgid "Cache invalidation successful"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_caches.py:76
+             #: rhodecode/apps/repository/views/repo_caches.py:84
              msgid "An error occurred during cache invalidation"
              msgstr ""
              #: rhodecode/apps/repository/views/repo_changelog.py:66
              #: rhodecode/apps/repository/views/repo_compare.py:66
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:641
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:647
              msgid "There are no commits yet"
              msgstr ""
              #: rhodecode/apps/repository/views/repo_changelog.py:71
              #: rhodecode/apps/repository/views/repo_commits.py:199
-             #: rhodecode/apps/repository/views/repo_files.py:150
-             #: rhodecode/apps/repository/views/repo_files.py:170
+             #: rhodecode/apps/repository/views/repo_files.py:162
+             #: rhodecode/apps/repository/views/repo_files.py:182
              msgid "No such commit exists for this repository"
              msgstr ""
              msgstr ""
              #: rhodecode/apps/repository/views/repo_commits.py:415
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:1185
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:1211
              #, python-format
              msgid "Status change %(transition_icon)s %(status)s"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_commits.py:459
+             #: rhodecode/apps/repository/views/repo_commits.py:460
              msgid "Changing the status of a commit associated with a closed pull request is not allowed"
              msgstr ""
              msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_feed.py:70
+             #: rhodecode/apps/repository/views/repo_feed.py:69
              #, python-format
              msgid "Changes on %s repository"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_feed.py:71
+             #: rhodecode/apps/repository/views/repo_feed.py:70
              #, python-format
              msgid "%s %s feed"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:94
+             #: rhodecode/apps/repository/views/repo_files.py:92
              #, python-format
              msgid "This repository has been locked by %s on %s"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:140
+             #: rhodecode/apps/repository/views/repo_files.py:108
+             msgid "Branch `{}` changes forbidden by rule {}."
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_files.py:152
              msgid "Click here to add a new file."
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:145
+             #: rhodecode/apps/repository/views/repo_files.py:157
              #, python-format
              msgid "There are no files yet. %s"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:259
+             #: rhodecode/apps/repository/views/repo_files.py:293
              msgid "Downloads disabled"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:265
+             #: rhodecode/apps/repository/views/repo_files.py:299
              msgid "Unknown archive type for: `{}`"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:271
-             msgid "Unknown commit_id {}"
-             msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:274
-             msgid "Empty repository"
-             msgstr ""
              #: rhodecode/apps/repository/views/repo_files.py:305
+             msgid "Unknown commit_id {}"
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_files.py:308
+             msgid "Empty repository"
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_files.py:340
              msgid "Unknown archive type"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:865
+             #: rhodecode/apps/repository/views/repo_files.py:906
              msgid "Changesets"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:886
-             #: rhodecode/apps/repository/views/repo_summary.py:322
-             #: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789
+             #: rhodecode/apps/repository/views/repo_files.py:927
+             #: rhodecode/apps/repository/views/repo_summary.py:340
+             #: rhodecode/model/pull_request.py:1445 rhodecode/model/scm.py:795
              #: rhodecode/templates/base/vcs_settings.mako:235
              msgid "Branches"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:890 rhodecode/model/scm.py:804
+             #: rhodecode/apps/repository/views/repo_files.py:931 rhodecode/model/scm.py:810
              #: rhodecode/templates/base/vcs_settings.mako:260
              msgid "Tags"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:987
-             #: rhodecode/apps/repository/views/repo_files.py:1018
-             msgid "You can only delete files with commit being a valid branch "
-             msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:997
-             #: rhodecode/apps/repository/views/repo_files.py:1028
+             #: rhodecode/apps/repository/views/repo_files.py:1030
+             #: rhodecode/apps/repository/views/repo_files.py:1064
+             msgid "You can only delete files with commit being a valid branch head."
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_files.py:1041
+             #: rhodecode/apps/repository/views/repo_files.py:1075
              msgid "Deleted file {} via RhodeCode Enterprise"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1049
+             #: rhodecode/apps/repository/views/repo_files.py:1096
              msgid "Successfully deleted file `{}`"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1053
-             #: rhodecode/apps/repository/views/repo_files.py:1171
-             #: rhodecode/apps/repository/views/repo_files.py:1290
+             #: rhodecode/apps/repository/views/repo_files.py:1100
+             #: rhodecode/apps/repository/views/repo_files.py:1225
+             #: rhodecode/apps/repository/views/repo_files.py:1383
              msgid "Error occurred during commit"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1071
-             #: rhodecode/apps/repository/views/repo_files.py:1108
-             msgid "You can only edit files with commit being a valid branch "
-             msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1088
-             #: rhodecode/apps/repository/views/repo_files.py:1125
+             #: rhodecode/apps/repository/views/repo_files.py:1120
+             #: rhodecode/apps/repository/views/repo_files.py:1160
+             msgid "You can only edit files with commit being a valid branch head."
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_files.py:1138
+             #: rhodecode/apps/repository/views/repo_files.py:1179
              msgid "Edited file {} via RhodeCode Enterprise"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1143
+             #: rhodecode/apps/repository/views/repo_files.py:1197
              msgid "No changes"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1167
+             #: rhodecode/apps/repository/views/repo_files.py:1221
              msgid "Successfully committed changes to file `{}`"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1191
-             #: rhodecode/apps/repository/views/repo_files.py:1215
+             #: rhodecode/apps/repository/views/repo_files.py:1245
+             #: rhodecode/apps/repository/views/repo_files.py:1308
              msgid "Added file via RhodeCode Enterprise"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1248
+             #: rhodecode/apps/repository/views/repo_files.py:1258
+             #: rhodecode/apps/repository/views/repo_files.py:1299
+             msgid "You can only add files with commit being a valid branch head."
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_files.py:1341
              msgid "No filename"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1278
+             #: rhodecode/apps/repository/views/repo_files.py:1371
              msgid "Successfully committed new file `{}`"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_files.py:1282
+             #: rhodecode/apps/repository/views/repo_files.py:1375
              msgid "The location specified must be a relative path and must not contain .. in the path"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_forks.py:146
+             #: rhodecode/apps/repository/views/repo_forks.py:147
              #: rhodecode/templates/base/base.mako:264
              msgid "Compare fork"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_forks.py:251
+             #: rhodecode/apps/repository/views/repo_forks.py:252
              #, python-format
              msgid "An error occurred during repository forking %s"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_permissions.py:86
+             #: rhodecode/apps/repository/views/repo_permissions.py:85
              msgid "Repository permissions updated"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:671
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:677
              msgid "Commit does not exist"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:806
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:815
              msgid "Error creating pull request: {}"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:831
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:840
              msgid "Not Enough permissions to source repo `{}`."
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:846
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:855
              msgid "Not Enough permissions to target repo `{}`."
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:897
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:918
              msgid "Successfully opened new pull request"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:900
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:921
              msgid "Error occurred during creation of this pull request."
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:931
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:961
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:952
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:986
              msgid "Cannot update closed pull requests."
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:967
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:992
              msgid "Pull request title & description updated."
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:986
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:1011
              msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:1002
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:1027
              msgid "Reload page"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:1066
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:1092
              msgid "Pull request was successfully merged and closed."
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_pull_requests.py:1090
-             msgid "Pull request reviewers updated."
-             msgstr ""
              #: rhodecode/apps/repository/views/repo_pull_requests.py:1116
+             msgid "Pull request reviewers updated."
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_pull_requests.py:1142
              msgid "Successfully deleted pull request"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_settings.py:172
+             #: rhodecode/apps/repository/views/repo_settings.py:171
              msgid "Repository `{}` updated successfully"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_settings.py:176
+             #: rhodecode/apps/repository/views/repo_settings.py:175
              msgid "Error occurred during update of repository {}"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_settings.py:198
+             #: rhodecode/apps/repository/views/repo_settings.py:204
              msgid "Unlocked"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_settings.py:203
-             msgid "Locked"
-             msgstr ""
-             #: rhodecode/apps/repository/views/repo_settings.py:205
-             #, python-format
-             msgid "Repository has been %s"
-             msgstr ""
              #: rhodecode/apps/repository/views/repo_settings.py:209
+             msgid "Locked"
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_settings.py:211
+             #, python-format
+             msgid "Repository has been %s"
+             msgstr ""
+             #: rhodecode/apps/repository/views/repo_settings.py:215
              #: rhodecode/apps/repository/views/repo_settings_advanced.py:228
              msgid "An error occurred during unlocking"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_settings.py:253
+             #: rhodecode/apps/repository/views/repo_settings.py:259
              msgid "An error occurred during deletion of repository stats"
              msgstr ""
              msgstr ""
              #: rhodecode/apps/repository/views/repo_settings_advanced.py:245
-             msgid "installed hooks repository"
+             msgid "installed updated hooks into this repository"
              msgstr ""
              #: rhodecode/apps/repository/views/repo_settings_fields.py:86
              msgid "Error occurred during updating repository VCS settings"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_summary.py:297
+             #: rhodecode/apps/repository/views/repo_summary.py:315
+             #: rhodecode/templates/admin/permissions/permissions.mako:42
+             #: rhodecode/templates/files/files_add.mako:15
              msgid "Branch"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_summary.py:298
+             #: rhodecode/apps/repository/views/repo_summary.py:316
              msgid "Tag"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_summary.py:299
+             #: rhodecode/apps/repository/views/repo_summary.py:317
              msgid "Bookmark"
              msgstr ""
-             #: rhodecode/apps/repository/views/repo_summary.py:323
+             #: rhodecode/apps/repository/views/repo_summary.py:341
              msgid "Closed branches"
              msgstr ""
              msgid "Configuration for Apache mad_dav_svn changed."
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:184
+             #: rhodecode/apps/user_group/views/__init__.py:188
              #, python-format
              msgid "Updated user group %s"
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:206
+             #: rhodecode/apps/user_group/views/__init__.py:224
              #, python-format
              msgid "Error occurred during update of user group %s"
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:232
+             #: rhodecode/apps/user_group/views/__init__.py:250
              msgid "Successfully deleted user group"
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:237
+             #: rhodecode/apps/user_group/views/__init__.py:255
              msgid "An error occurred during deletion of user group"
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:341
+             #: rhodecode/apps/user_group/views/__init__.py:359
              msgid "Target group cannot be the same"
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:356
+             #: rhodecode/apps/user_group/views/__init__.py:374
              msgid "User Group permissions updated"
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:428
+             #: rhodecode/apps/user_group/views/__init__.py:454
              msgid "User Group global permissions updated successfully"
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:510
+             #: rhodecode/apps/user_group/views/__init__.py:536
              msgid "User Group synchronization updated successfully"
              msgstr ""
-             #: rhodecode/apps/user_group/views/__init__.py:514
+             #: rhodecode/apps/user_group/views/__init__.py:540
              msgid "An error occurred during synchronization update"
              msgstr ""
-             #: rhodecode/authentication/schema.py:35
+             #: rhodecode/authentication/schema.py:36
              msgid "Enable or disable this authentication plugin."
              msgstr ""
-             #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32
-             #: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105
-             #: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113
-             #: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121
-             #: rhodecode/model/validation_schema/schemas/integration_schema.py:197
+             #: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32
+             #: rhodecode/model/permission.py:110 rhodecode/model/permission.py:114
+             #: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
+             #: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
+             #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
              #: rhodecode/templates/admin/integrations/list.mako:71
              msgid "Enabled"
              msgstr ""
-             #: rhodecode/authentication/schema.py:43
+             #: rhodecode/authentication/schema.py:44
              msgid ""
              "Amount of seconds to cache the authentication and permissions check response call for this plugin. \n"
              "Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)."
              msgstr ""
-             #: rhodecode/authentication/schema.py:48
+             #: rhodecode/authentication/schema.py:49
              msgid "Auth Cache TTL"
              msgstr ""
-             #: rhodecode/authentication/views.py:94
+             #: rhodecode/authentication/views.py:92
              msgid "Errors exist when saving plugin settings. Please check the form inputs."
              msgstr ""
-             #: rhodecode/authentication/views.py:116 rhodecode/authentication/views.py:175
+             #: rhodecode/authentication/views.py:104 rhodecode/authentication/views.py:163
              msgid "Auth settings updated successfully."
              msgstr ""
-             #: rhodecode/authentication/views.py:178
+             #: rhodecode/authentication/views.py:166
              msgid "Errors exist when saving plugin setting. Please check the form inputs."
              msgstr ""
-             #: rhodecode/authentication/views.py:186
+             #: rhodecode/authentication/views.py:174
              msgid "Error occurred during update of auth settings."
              msgstr ""
              msgstr ""
              #: rhodecode/authentication/plugins/auth_crowd.py:69
-             #: rhodecode/authentication/plugins/auth_ldap.py:91
+             #: rhodecode/authentication/plugins/auth_ldap.py:89
              msgid "Port"
              msgstr ""
              msgid "Jasig-CAS"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:79
+             #: rhodecode/authentication/plugins/auth_ldap.py:77
              msgid ""
              "Host[s] of the LDAP Server \n"
              "(e.g., 192.168.2.154, or ldap-server.domain.com.\n"
              " Multiple servers can be specified using commas"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:83
+             #: rhodecode/authentication/plugins/auth_ldap.py:81
              msgid "LDAP Host"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:88
+             #: rhodecode/authentication/plugins/auth_ldap.py:86
              msgid "Custom port that the LDAP server is listening on. Default value is: 389"
              msgstr ""
+             #: rhodecode/authentication/plugins/auth_ldap.py:96
+             msgid "Timeout for LDAP connection"
+             msgstr ""
              #: rhodecode/authentication/plugins/auth_ldap.py:98
-             msgid "Timeout for LDAP connection"
-             msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:100
              msgid "Connection timeout"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:107
+             #: rhodecode/authentication/plugins/auth_ldap.py:105
              msgid ""
              "Optional user DN/account to connect to LDAP if authentication is required. \n"
              "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or admin@mydomain.com"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:112
+             #: rhodecode/authentication/plugins/auth_ldap.py:110
              msgid "Account"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:117
+             #: rhodecode/authentication/plugins/auth_ldap.py:115
              msgid "Password to authenticate for given user DN."
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:120
+             #: rhodecode/authentication/plugins/auth_ldap.py:118
              #: rhodecode/integrations/types/webhook.py:92 rhodecode/templates/login.mako:50
-             #: rhodecode/templates/register.mako:48
+             #: rhodecode/templates/register.mako:58
              #: rhodecode/templates/admin/my_account/my_account.mako:30
              #: rhodecode/templates/admin/users/user_add.mako:44
              #: rhodecode/templates/base/base.mako:326
              msgid "Password"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:125
+             #: rhodecode/authentication/plugins/auth_ldap.py:123
              msgid "TLS Type"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:126
+             #: rhodecode/authentication/plugins/auth_ldap.py:124
              msgid "Connection Security"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:132
+             #: rhodecode/authentication/plugins/auth_ldap.py:130
              msgid ""
              "Require Cert over TLS?. Self-signed and custom certificates can be used when\n"
              " `RhodeCode Certificate` found in admin > settings > system info page is extended."
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:135
+             #: rhodecode/authentication/plugins/auth_ldap.py:133
              msgid "Certificate Checks"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:141
+             #: rhodecode/authentication/plugins/auth_ldap.py:139
              msgid ""
              "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n"
              "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:146
+             #: rhodecode/authentication/plugins/auth_ldap.py:144
              msgid "Base DN"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:151
+             #: rhodecode/authentication/plugins/auth_ldap.py:149
              msgid ""
              "Filter to narrow results \n"
              "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n"
              "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:156
+             #: rhodecode/authentication/plugins/auth_ldap.py:154
              msgid "LDAP Search Filter"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:162
+             #: rhodecode/authentication/plugins/auth_ldap.py:160
              msgid "How deep to search LDAP. If unsure set to SUBTREE"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:163
+             #: rhodecode/authentication/plugins/auth_ldap.py:161
              msgid "LDAP Search Scope"
              msgstr ""
+             #: rhodecode/authentication/plugins/auth_ldap.py:167
+             msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
+             msgstr ""
              #: rhodecode/authentication/plugins/auth_ldap.py:169
-             msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
-             msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:171
              msgid "Login Attribute"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:172
+             #: rhodecode/authentication/plugins/auth_ldap.py:170
              msgid "The LDAP Login attribute of the CN must be specified"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:177
+             #: rhodecode/authentication/plugins/auth_ldap.py:175
              msgid "LDAP Attribute to map to first name (e.g., givenName)"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:180
+             #: rhodecode/authentication/plugins/auth_ldap.py:178
              msgid "First Name Attribute"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:185
+             #: rhodecode/authentication/plugins/auth_ldap.py:183
              msgid "LDAP Attribute to map to last name (e.g., sn)"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:188
+             #: rhodecode/authentication/plugins/auth_ldap.py:186
              msgid "Last Name Attribute"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:193
+             #: rhodecode/authentication/plugins/auth_ldap.py:191
              msgid ""
              "LDAP Attribute to map to email address (e.g., mail).\n"
              "Emails are a crucial part of RhodeCode. \n"
              "If possible add a valid email attribute to ldap users."
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:198
+             #: rhodecode/authentication/plugins/auth_ldap.py:196
              msgid "Email Attribute"
              msgstr ""
-             #: rhodecode/authentication/plugins/auth_ldap.py:426
+             #: rhodecode/authentication/plugins/auth_ldap.py:390
              msgid "LDAP"
              msgstr ""
              msgid "user pre update"
              msgstr ""
+             #: rhodecode/events/user.py:100
+             msgid "user permissions change"
+             msgstr ""
              #: rhodecode/forms/__init__.py:35 rhodecode/templates/admin/gists/new.mako:62
              #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:70
              #: rhodecode/templates/admin/permissions/permissions_application.mako:60
              #: rhodecode/templates/admin/permissions/permissions_ips.mako:64
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:57
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:60
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:205
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84
              #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66
              #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:187
              #: rhodecode/templates/admin/repos/repo_edit_settings.mako:244
              #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44
              #: rhodecode/templates/admin/settings/settings_global.mako:140
              #: rhodecode/templates/admin/settings/settings_labs.mako:49
              #: rhodecode/templates/admin/settings/settings_vcs.mako:14
              #: rhodecode/templates/admin/settings/settings_visual.mako:215
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:192
              #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83
              #: rhodecode/templates/admin/users/user_edit_emails.mako:63
              #: rhodecode/templates/admin/users/user_edit_ips.mako:71
              #: rhodecode/templates/admin/users/user_edit_profile.mako:135
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:65
              #: rhodecode/templates/base/default_perms_box.mako:89
              msgid "Reset"
              msgstr ""
              #: rhodecode/templates/admin/integrations/list.mako:181
              #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49
              #: rhodecode/templates/admin/my_account/my_account_emails.mako:32
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:33
              #: rhodecode/templates/admin/notifications/notifications_data.mako:22
              #: rhodecode/templates/admin/notifications/notifications_show.mako:35
              #: rhodecode/templates/admin/permissions/permissions_ips.mako:29
              #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45
              #: rhodecode/templates/admin/users/user_edit_emails.mako:31
              #: rhodecode/templates/admin/users/user_edit_ips.mako:35
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:30
              #: rhodecode/templates/base/issue_tracker_settings.mako:69
              #: rhodecode/templates/base/vcs_settings.mako:244
              #: rhodecode/templates/base/vcs_settings.mako:269
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:143
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:145
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:148
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:144
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:146
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:149
              #: rhodecode/templates/data_table/_dt_elements.mako:171
              #: rhodecode/templates/data_table/_dt_elements.mako:244
              #: rhodecode/templates/data_table/_dt_elements.mako:258
              #: rhodecode/templates/files/files_source.mako:51
              #: rhodecode/templates/files/files_source.mako:55
              #: rhodecode/templates/files/files_source.mako:58
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:56
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:60
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:57
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:61
              msgid "Delete"
              msgstr ""
              #: rhodecode/integrations/schema.py:30
-             #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
+             #: rhodecode/model/validation_schema/schemas/integration_schema.py:193
              msgid "Enable or disable this integration."
              msgstr ""
              #: rhodecode/integrations/schema.py:37
-             #: rhodecode/model/validation_schema/schemas/integration_schema.py:176
+             #: rhodecode/model/validation_schema/schemas/integration_schema.py:174
              msgid "Short name for this integration."
              msgstr ""
              #: rhodecode/integrations/schema.py:39
-             #: rhodecode/model/validation_schema/schemas/integration_schema.py:178
+             #: rhodecode/model/validation_schema/schemas/integration_schema.py:176
              msgid "Integration name"
              msgstr ""
              #: rhodecode/integrations/types/slack.py:60
              #: rhodecode/integrations/types/webhook.py:82 rhodecode/templates/login.mako:43
-             #: rhodecode/templates/register.mako:41
+             #: rhodecode/templates/register.mako:46
              #: rhodecode/templates/admin/admin_log_base.mako:7
              #: rhodecode/templates/admin/my_account/my_account_profile.mako:24
              #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:23
              #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70
              #: rhodecode/templates/admin/users/user_add.mako:35
              #: rhodecode/templates/admin/users/user_edit_profile.mako:39
-             #: rhodecode/templates/admin/users/users.mako:63
+             #: rhodecode/templates/admin/users/users.mako:71
              #: rhodecode/templates/base/base.mako:317
              #: rhodecode/templates/debug_style/login.html:36
              #: rhodecode/templates/email_templates/user_registration.mako:23
              msgstr ""
              #: rhodecode/lib/action_parser.py:191
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:51
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:52
              #, python-format
              msgid "Pull request #%s"
              msgstr ""
              msgid "Commit not found"
              msgstr ""
-             #: rhodecode/lib/auth.py:1441
+             #: rhodecode/lib/auth.py:1600
              #, python-format
              msgid "IP %s not allowed"
              msgstr ""
-             #: rhodecode/lib/auth.py:1531
+             #: rhodecode/lib/auth.py:1687
              msgid "You need to be a registered user to perform this action"
              msgstr ""
-             #: rhodecode/lib/auth.py:1575
+             #: rhodecode/lib/auth.py:1731
              msgid "You need to be signed in to view this page"
              msgstr ""
              msgid "Click to select line"
              msgstr ""
-             #: rhodecode/lib/helpers.py:1868
+             #: rhodecode/lib/helpers.py:1881
              msgid ""
              "Example filter terms:\n"
              "     repository:vcs\n"
              "     date:20120101\n"
              "     date:[20120101100000 TO 20120102]\n"
              "\n"
+             "Actions: {actions}\n"
+             "\n"
              "Generate wildcards using '*' character:\n"
              "     \"repository:vcs*\" - search everything starting with 'vcs'\n"
              "     \"repository:*vcs*\" - search for repository containing 'vcs'\n"
              "     \"username:test AND repository:test*\"\n"
              msgstr ""
-             #: rhodecode/lib/helpers.py:1892
+             #: rhodecode/lib/helpers.py:1907
              msgid ""
              "Example filter terms for `{searcher}` search:\n"
              "{terms}\n"
              "More: {search_doc}"
              msgstr ""
-             #: rhodecode/lib/helpers.py:1909
+             #: rhodecode/lib/helpers.py:1924
              #, python-format
              msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
              msgstr ""
-             #: rhodecode/lib/utils2.py:524
+             #: rhodecode/lib/utils2.py:535
              msgid "in ${ago}"
              msgstr ""
-             #: rhodecode/lib/utils2.py:530
-             msgid "${ago} ago"
-             msgstr ""
-             #: rhodecode/lib/utils2.py:539
-             msgid "${val}, ${detail}"
-             msgstr ""
              #: rhodecode/lib/utils2.py:541
+             msgid "${ago} ago"
+             msgstr ""
+             #: rhodecode/lib/utils2.py:550
+             msgid "${val}, ${detail}"
+             msgstr ""
+             #: rhodecode/lib/utils2.py:552
              msgid "${val}, ${detail} ago"
              msgstr ""
-             #: rhodecode/lib/utils2.py:543
+             #: rhodecode/lib/utils2.py:554
              msgid "in ${val}, ${detail}"
              msgstr ""
-             #: rhodecode/lib/utils2.py:545
+             #: rhodecode/lib/utils2.py:556
              msgid "${val} and ${detail}"
              msgstr ""
-             #: rhodecode/lib/utils2.py:547
+             #: rhodecode/lib/utils2.py:558
              msgid "${val} and ${detail} ago"
              msgstr ""
-             #: rhodecode/lib/utils2.py:549
+             #: rhodecode/lib/utils2.py:560
              msgid "in ${val} and ${detail}"
              msgstr ""
-             #: rhodecode/lib/utils2.py:553
-             #: rhodecode/public/js/rhodecode-components.js:30702
-             #: rhodecode/public/js/scripts.js:22550
+             #: rhodecode/lib/utils2.py:564
+             #: rhodecode/public/js/rhodecode-components.js:35750
+             #: rhodecode/public/js/scripts.js:22544
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
              msgid "just now"
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2662
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2588
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2654
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2272
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:2717
              msgid "Repository no access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 rhodecode/model/db.py:2663
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2589
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2655
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2273
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:2718
              msgid "Repository read access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2601
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2664
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2590
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2656
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2270
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2274
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2274
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2526 rhodecode/model/db.py:2719
              msgid "Repository write access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2602
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:2665
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2591
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2657
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2279
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2271
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2275
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2325
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2326
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:2720
              msgid "Repository admin access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2620
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:2683
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2680
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2743
              msgid "Repository creation disabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2684
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2681
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2744
              msgid "Repository creation enabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 rhodecode/model/db.py:2688
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2685
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 rhodecode/model/db.py:2748
              msgid "Repository forking disabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2626
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:2689
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2615
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2686
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2749
              msgid "Repository forking enabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3328
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 rhodecode/model/db.py:3391
-             #: rhodecode/public/js/rhodecode-components.js:48219
-             #: rhodecode/public/js/scripts.js:40067
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3296
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3379
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2912
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3466
+             #: rhodecode/public/js/rhodecode-components.js:53541
+             #: rhodecode/public/js/scripts.js:40291
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:319
              msgid "Not Reviewed"
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3329
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 rhodecode/model/db.py:3392
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3297
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3380
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2913
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3467
              msgid "Approved"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3330
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 rhodecode/model/db.py:3393
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3298
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3381
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2911
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2914
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2914
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3234 rhodecode/model/db.py:3468
              msgid "Rejected"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3331
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 rhodecode/model/db.py:3394
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3299
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3382
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2919
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2911
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2912
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2915
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2915
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3015
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3016
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3235 rhodecode/model/db.py:3469
              msgid "Under Review"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2604
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2667
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2593
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2659
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2277
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:2722
              msgid "Repository group no access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2605
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:2668
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2594
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2660
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2278
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:2723
              msgid "Repository group read access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 rhodecode/model/db.py:2669
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2595
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2661
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2275
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2279
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2279
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2531 rhodecode/model/db.py:2724
              msgid "Repository group write access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2607
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2670
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2596
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2662
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2284
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2276
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2276
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2280
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2330
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2331
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:2725
              msgid "Repository group admin access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2672
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2598
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2664
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2278
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2282
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:2727
              msgid "User group no access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2673
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2665
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2728
              msgid "User group read access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 rhodecode/model/db.py:2674
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2666
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 rhodecode/model/db.py:2729
              msgid "User group write access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2612
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2675
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2601
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2667
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2730
              msgid "User group admin access"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 rhodecode/model/db.py:2677
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2603
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2674
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2539 rhodecode/model/db.py:2737
              msgid "Repository Group creation disabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2615
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2678
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2604
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2675
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2738
              msgid "Repository Group creation enabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2680
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2677
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 rhodecode/model/db.py:2740
              msgid "User Group creation disabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 rhodecode/model/db.py:2681
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2607
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2678
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2741
              msgid "User Group creation enabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 rhodecode/model/db.py:2691
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2688
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2751
              msgid "Registration disabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2629
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 rhodecode/model/db.py:2692
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2689
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 rhodecode/model/db.py:2752
              msgid "User Registration with manual account activation"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2630
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 rhodecode/model/db.py:2693
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2619
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2690
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2307
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2299
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2299
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2303
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2353
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2354
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:2753
              msgid "User Registration with automatic account activation"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2636
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 rhodecode/model/db.py:2699
-             #: rhodecode/model/permission.py:96
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2696
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 rhodecode/model/db.py:2759
+             #: rhodecode/model/permission.py:105
              msgid "Manual activation of external account"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2637
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 rhodecode/model/db.py:2700
-             #: rhodecode/model/permission.py:97
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2626
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2697
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:2760
+             #: rhodecode/model/permission.py:106
              msgid "Automatic activation of external account"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 rhodecode/model/db.py:2685
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2682
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 rhodecode/model/db.py:2745
              msgid "Repository creation enabled with write permission to a repository group"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2623
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:2686
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2612
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2683
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2746
              msgid "Repository creation disabled with write permission to a repository group"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2597
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:2660
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2586
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2652
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2274
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2266
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2270
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2320
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2321
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:2715
              msgid "RhodeCode Super Administrator"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2639
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 rhodecode/model/db.py:2702
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2699
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 rhodecode/model/db.py:2762
              msgid "Inherit object permissions from default user disabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860
              #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982
              #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2640
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 rhodecode/model/db.py:2703
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2629
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2700
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 rhodecode/model/db.py:2763
              msgid "Inherit object permissions from default user enabled"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1107
              #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911
              #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1107
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1103
              msgid "all"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1108
              #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912
              #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1108
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1104
              msgid "http/web interface"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1109
              #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913
              #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1109
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1105
              msgid "vcs (git/hg/svn protocol)"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1110
              #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914
              #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1110
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1106
              msgid "api calls"
              msgstr ""
              #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1111
              #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915
              #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915
              #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959
              #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 rhodecode/model/db.py:1111
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 rhodecode/model/db.py:1107
              msgid "feed access"
              msgstr ""
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360
-             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055
-             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059
-             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 rhodecode/model/db.py:2423
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2349
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2415
+             #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2052
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2044
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2044
+             #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2048
+             #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2048
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2091
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2092
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2286 rhodecode/model/db.py:2468
              msgid "No parent"
              msgstr ""
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 rhodecode/model/db.py:2695
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2692
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2755
              msgid "Password reset enabled"
              msgstr ""
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 rhodecode/model/db.py:2696
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2693
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 rhodecode/model/db.py:2756
              msgid "Password reset hidden"
              msgstr ""
-             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368
-             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369
-             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 rhodecode/model/db.py:2697
+             #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2623
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2694
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357
+             #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358
+             #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:2757
              msgid "Password reset disabled"
              msgstr ""
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2669
+             #: rhodecode/model/db.py:2732
+             msgid "Branch no permissions"
+             msgstr ""
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2670
+             #: rhodecode/model/db.py:2733
+             msgid "Branch access by web merge"
+             msgstr ""
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2671
+             #: rhodecode/model/db.py:2734
+             msgid "Branch access by push"
+             msgstr ""
+             #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2672
+             #: rhodecode/model/db.py:2735
+             msgid "Branch access by push with force"
+             msgstr ""
              #: rhodecode/lib/index/whoosh.py:164
              msgid "Index Type"
              msgstr ""
              msgid "1 month {end_date}"
              msgstr ""
-             #: rhodecode/model/comment.py:382
+             #: rhodecode/model/comment.py:384
              msgid "made a comment"
              msgstr ""
-             #: rhodecode/model/comment.py:383
+             #: rhodecode/model/comment.py:385
              msgid "Show it now"
              msgstr ""
              msgid "%(user)s commented on pull request at %(date_or_age)s"
              msgstr ""
-             #: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74
-             #: rhodecode/model/permission.py:80
+             #: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77
+             #: rhodecode/model/permission.py:83
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:195
              #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
              #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11
              msgid "None"
              msgstr ""
-             #: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75
-             #: rhodecode/model/permission.py:81
+             #: rhodecode/model/permission.py:72 rhodecode/model/permission.py:78
+             #: rhodecode/model/permission.py:84
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12
              #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
              #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12
              msgid "Read"
              msgstr ""
-             #: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76
-             #: rhodecode/model/permission.py:82
+             #: rhodecode/model/permission.py:73 rhodecode/model/permission.py:79
+             #: rhodecode/model/permission.py:85
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13
              #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
              #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:272
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:322
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:273
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:323
+             #: rhodecode/templates/data_table/_dt_elements.mako:386
              msgid "Write"
              msgstr ""
-             #: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77
-             #: rhodecode/model/permission.py:83
+             #: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80
+             #: rhodecode/model/permission.py:86
              #: rhodecode/templates/admin/auth/auth_settings.mako:12
              #: rhodecode/templates/admin/auth/plugin_settings.mako:12
              #: rhodecode/templates/admin/defaults/defaults.mako:12
              #: rhodecode/templates/admin/users/user_add.mako:11
              #: rhodecode/templates/admin/users/user_edit.mako:12
              #: rhodecode/templates/admin/users/users.mako:13
-             #: rhodecode/templates/admin/users/users.mako:76
-             #: rhodecode/templates/base/base.mako:421
-             #: rhodecode/templates/base/base.mako:428
+             #: rhodecode/templates/admin/users/users.mako:84
+             #: rhodecode/templates/base/base.mako:452
+             #: rhodecode/templates/base/base.mako:459
              msgid "Admin"
              msgstr ""
-             #: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100
-             #: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108
-             #: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116
-             #: rhodecode/model/permission.py:120
-             msgid "Disabled"
-             msgstr ""
-             #: rhodecode/model/permission.py:87
-             msgid "Allowed with manual account activation"
-             msgstr ""
-             #: rhodecode/model/permission.py:88
-             msgid "Allowed with automatic account activation"
+             #: rhodecode/model/permission.py:89
+             msgid "Protected/No Access"
+             msgstr ""
+             #: rhodecode/model/permission.py:90
+             msgid "Web merge"
              msgstr ""
              #: rhodecode/model/permission.py:91
-             msgid "Allow password recovery"
+             msgid "Push"
              msgstr ""
              #: rhodecode/model/permission.py:92
+             msgid "Force Push"
+             msgstr ""
+             #: rhodecode/model/permission.py:95 rhodecode/model/permission.py:109
+             #: rhodecode/model/permission.py:113 rhodecode/model/permission.py:117
+             #: rhodecode/model/permission.py:121 rhodecode/model/permission.py:125
+             #: rhodecode/model/permission.py:129
+             msgid "Disabled"
+             msgstr ""
+             #: rhodecode/model/permission.py:96
+             msgid "Allowed with manual account activation"
+             msgstr ""
+             #: rhodecode/model/permission.py:97
+             msgid "Allowed with automatic account activation"
+             msgstr ""
+             #: rhodecode/model/permission.py:100
+             msgid "Allow password recovery"
+             msgstr ""
+             #: rhodecode/model/permission.py:101
              msgid "Hide password recovery link"
              msgstr ""
-             #: rhodecode/model/permission.py:93
+             #: rhodecode/model/permission.py:102
              msgid "Disable password recovery"
              msgstr ""
              msgid "This pull request cannot be updated because the source reference is missing."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1218
+             #: rhodecode/model/pull_request.py:1236
              msgid "Server-side pull request merging is disabled."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1220
+             #: rhodecode/model/pull_request.py:1238
              msgid "This pull request is closed."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1233
+             #: rhodecode/model/pull_request.py:1253
              msgid "Pull request merging is not supported."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1252
+             #: rhodecode/model/pull_request.py:1272
              msgid "Target repository large files support is disabled."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1255
+             #: rhodecode/model/pull_request.py:1275
              msgid "Source repository large files support is disabled."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797
+             #: rhodecode/model/pull_request.py:1444 rhodecode/model/scm.py:803
              msgid "Bookmarks"
              msgstr ""
-             #: rhodecode/model/pull_request.py:1425
+             #: rhodecode/model/pull_request.py:1449
              msgid "Commit IDs"
              msgstr ""
-             #: rhodecode/model/pull_request.py:1428
+             #: rhodecode/model/pull_request.py:1452
              msgid "Closed Branches"
              msgstr ""
-             #: rhodecode/model/pull_request.py:1588
+             #: rhodecode/model/pull_request.py:1613
              msgid "User `{}` not allowed to perform merge."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1601
+             #: rhodecode/model/pull_request.py:1631
+             msgid "Target branch `{}` changes rejected by rule {}."
+             msgstr ""
+             #: rhodecode/model/pull_request.py:1645
              msgid "Pull request reviewer approval is pending."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1616
+             #: rhodecode/model/pull_request.py:1660
              msgid "Cannot merge, {} TODO still not resolved."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1619
+             #: rhodecode/model/pull_request.py:1663
              msgid "Cannot merge, {} TODOs still not resolved."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1654
+             #: rhodecode/model/pull_request.py:1699
              msgid "Merge strategy: rebase"
              msgstr ""
-             #: rhodecode/model/pull_request.py:1659
+             #: rhodecode/model/pull_request.py:1704
              msgid "Merge strategy: explicit merge commit"
              msgstr ""
-             #: rhodecode/model/pull_request.py:1666
+             #: rhodecode/model/pull_request.py:1711
              msgid "Source branch will be closed after merge."
              msgstr ""
-             #: rhodecode/model/pull_request.py:1668
+             #: rhodecode/model/pull_request.py:1713
              msgid "Source branch will be deleted after merge."
              msgstr ""
-             #: rhodecode/model/scm.py:775
+             #: rhodecode/model/scm.py:781
              msgid "latest tip"
              msgstr ""
              msgid "Only superadmins can create global integrations"
              msgstr ""
-             #: rhodecode/model/validation_schema/schemas/integration_schema.py:183
+             #: rhodecode/model/validation_schema/schemas/integration_schema.py:181
              msgid "Scope of the integration. Recursive means the integration  runs on all repos of that group and children recursively."
              msgstr ""
-             #: rhodecode/model/validation_schema/schemas/integration_schema.py:186
+             #: rhodecode/model/validation_schema/schemas/integration_schema.py:184
              msgid "Integration scope"
              msgstr ""
-             #: rhodecode/model/validation_schema/schemas/integration_schema.py:216
+             #: rhodecode/model/validation_schema/schemas/integration_schema.py:214
              msgid "General integration options"
              msgstr ""
-             #: rhodecode/model/validation_schema/schemas/integration_schema.py:219
+             #: rhodecode/model/validation_schema/schemas/integration_schema.py:217
              msgid "{integration_type} settings"
              msgstr ""
              msgid "Additional emails can be specified at <a href=\"{}\">extra emails</a> page."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:28706
-             #: rhodecode/public/js/scripts.js:20554
+             #: rhodecode/public/js/rhodecode-components.js:13225
+             #: rhodecode/public/js/scripts.js:19
+             msgid ": , "
+             msgstr ""
+             #: rhodecode/public/js/rhodecode-components.js:33754
+             #: rhodecode/public/js/scripts.js:20548
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
              #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
              msgid "No results"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30637
-             #: rhodecode/public/js/scripts.js:22485
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
+             #: rhodecode/public/js/rhodecode-components.js:35685
+             #: rhodecode/public/js/scripts.js:22479
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
              msgid "{0} year"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30638
-             #: rhodecode/public/js/scripts.js:22486
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
+             #: rhodecode/public/js/rhodecode-components.js:35686
+             #: rhodecode/public/js/scripts.js:22480
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
              msgid "{0} month"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30639
-             #: rhodecode/public/js/scripts.js:22487
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
+             #: rhodecode/public/js/rhodecode-components.js:35687
+             #: rhodecode/public/js/scripts.js:22481
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
              msgid "{0} day"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30640
-             #: rhodecode/public/js/scripts.js:22488
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
+             #: rhodecode/public/js/rhodecode-components.js:35688
+             #: rhodecode/public/js/scripts.js:22482
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
              msgid "{0} hour"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30641
-             #: rhodecode/public/js/scripts.js:22489
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
+             #: rhodecode/public/js/rhodecode-components.js:35689
+             #: rhodecode/public/js/scripts.js:22483
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
              msgid "{0} min"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30642
-             #: rhodecode/public/js/scripts.js:22490
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
+             #: rhodecode/public/js/rhodecode-components.js:35690
+             #: rhodecode/public/js/scripts.js:22484
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
              msgid "{0} sec"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30662
-             #: rhodecode/public/js/scripts.js:22510
+             #: rhodecode/public/js/rhodecode-components.js:35710
+             #: rhodecode/public/js/scripts.js:22504
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
              msgid "in {0}"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30670
-             #: rhodecode/public/js/scripts.js:22518
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
+             #: rhodecode/public/js/rhodecode-components.js:35718
+             #: rhodecode/public/js/scripts.js:22512
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
              msgid "{0} ago"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30682
-             #: rhodecode/public/js/scripts.js:22530
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
+             #: rhodecode/public/js/rhodecode-components.js:35730
+             #: rhodecode/public/js/scripts.js:22524
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
              msgid "{0}, {1} ago"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30684
-             #: rhodecode/public/js/scripts.js:22532
+             #: rhodecode/public/js/rhodecode-components.js:35732
+             #: rhodecode/public/js/scripts.js:22526
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
              msgid "in {0}, {1}"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30688
-             #: rhodecode/public/js/scripts.js:22536
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
+             #: rhodecode/public/js/rhodecode-components.js:35736
+             #: rhodecode/public/js/scripts.js:22530
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
              msgid "{0} and {1}"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30690
-             #: rhodecode/public/js/scripts.js:22538
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
+             #: rhodecode/public/js/rhodecode-components.js:35738
+             #: rhodecode/public/js/scripts.js:22532
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
              msgid "{0} and {1} ago"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:30692
-             #: rhodecode/public/js/scripts.js:22540
+             #: rhodecode/public/js/rhodecode-components.js:35740
+             #: rhodecode/public/js/scripts.js:22534
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
              #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
              msgid "in {0} and {1}"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44751
-             #: rhodecode/public/js/scripts.js:36599
+             #: rhodecode/public/js/rhodecode-components.js:49799
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
              msgid "Loading more results..."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44754
-             #: rhodecode/public/js/scripts.js:36602
+             #: rhodecode/public/js/rhodecode-components.js:49802
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
              msgid "Searching..."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44757
-             #: rhodecode/public/js/scripts.js:36605
+             #: rhodecode/public/js/rhodecode-components.js:49805
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
              msgid "No matches found"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44760
-             #: rhodecode/public/js/scripts.js:36608
+             #: rhodecode/public/js/rhodecode-components.js:49808
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
              msgid "Loading failed"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44764
-             #: rhodecode/public/js/scripts.js:36612
+             #: rhodecode/public/js/rhodecode-components.js:49812
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
              msgid "One result is available, press enter to select it."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44766
-             #: rhodecode/public/js/scripts.js:36614
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
+             #: rhodecode/public/js/rhodecode-components.js:49814
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19
              msgid "{0} results are available, use up and down arrow keys to navigate."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44771
-             #: rhodecode/public/js/scripts.js:36619
+             #: rhodecode/public/js/rhodecode-components.js:49819
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
              msgid "Please enter {0} or more character"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44773
-             #: rhodecode/public/js/scripts.js:36621
+             #: rhodecode/public/js/rhodecode-components.js:49821
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
              msgid "Please enter {0} or more characters"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44778
-             #: rhodecode/public/js/scripts.js:36626
+             #: rhodecode/public/js/rhodecode-components.js:49826
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
              msgid "Please delete {0} character"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44780
-             #: rhodecode/public/js/scripts.js:36628
+             #: rhodecode/public/js/rhodecode-components.js:49828
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
              msgid "Please delete {0} characters"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44784
-             #: rhodecode/public/js/scripts.js:36632
+             #: rhodecode/public/js/rhodecode-components.js:49832
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
              msgid "You can only select {0} item"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:44786
-             #: rhodecode/public/js/scripts.js:36634
+             #: rhodecode/public/js/rhodecode-components.js:49834
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
              #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
              msgid "You can only select {0} items"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:45724
-             #: rhodecode/public/js/scripts.js:37572
+             #: rhodecode/public/js/rhodecode-components.js:50772
+             #: rhodecode/public/js/scripts.js:37522
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
              #: rhodecode/public/js/src/rhodecode/changelog.js:35
              msgid "showing {0} out of {1} commit"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:45726
-             #: rhodecode/public/js/scripts.js:37574
+             #: rhodecode/public/js/rhodecode-components.js:50774
+             #: rhodecode/public/js/scripts.js:37524
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
              #: rhodecode/public/js/src/rhodecode/changelog.js:37
              msgid "showing {0} out of {1} commits"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46172
-             #: rhodecode/public/js/scripts.js:38020
+             #: rhodecode/public/js/rhodecode-components.js:51282
+             #: rhodecode/public/js/scripts.js:38032
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
-             #: rhodecode/public/js/src/rhodecode/codemirror.js:297
+             #: rhodecode/public/js/src/rhodecode/codemirror.js:359
              msgid "Set status to Approved"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46191
-             #: rhodecode/public/js/scripts.js:38039
+             #: rhodecode/public/js/rhodecode-components.js:51301
+             #: rhodecode/public/js/scripts.js:38051
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
-             #: rhodecode/public/js/src/rhodecode/codemirror.js:316
+             #: rhodecode/public/js/src/rhodecode/codemirror.js:378
              msgid "Set status to Rejected"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46210
-             #: rhodecode/public/js/scripts.js:38058
+             #: rhodecode/public/js/rhodecode-components.js:51320
+             #: rhodecode/public/js/scripts.js:38070
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
-             #: rhodecode/public/js/src/rhodecode/codemirror.js:335
+             #: rhodecode/public/js/src/rhodecode/codemirror.js:397
              #: rhodecode/templates/email_templates/commit_comment.mako:99
              #: rhodecode/templates/email_templates/pull_request_comment.mako:107
              msgid "TODO comment"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46230
-             #: rhodecode/public/js/scripts.js:38078
+             #: rhodecode/public/js/rhodecode-components.js:51340
+             #: rhodecode/public/js/scripts.js:38090
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
-             #: rhodecode/public/js/src/rhodecode/codemirror.js:355
+             #: rhodecode/public/js/src/rhodecode/codemirror.js:417
              msgid "Note Comment"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46597
-             #: rhodecode/public/js/scripts.js:38445
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
-             #: rhodecode/public/js/src/rhodecode/comments.js:126
-             msgid "resolve comment"
-             msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46681
-             #: rhodecode/public/js/scripts.js:38529
+             #: rhodecode/public/js/rhodecode-components.js:51653
+             #: rhodecode/public/js/rhodecode-components.js:52007
+             #: rhodecode/public/js/scripts.js:38403 rhodecode/public/js/scripts.js:38757
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
-             #: rhodecode/public/js/src/rhodecode/comments.js:210
+             #: rhodecode/public/js/src/rhodecode/codemirror.js:730
+             #: rhodecode/public/js/src/rhodecode/comments.js:233
              msgid "Status Review"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46696
-             #: rhodecode/public/js/scripts.js:38544
+             #: rhodecode/public/js/rhodecode-components.js:51668
+             #: rhodecode/public/js/rhodecode-components.js:52022
+             #: rhodecode/public/js/scripts.js:38418 rhodecode/public/js/scripts.js:38772
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
-             #: rhodecode/public/js/src/rhodecode/comments.js:225
+             #: rhodecode/public/js/src/rhodecode/codemirror.js:745
+             #: rhodecode/public/js/src/rhodecode/comments.js:248
              msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46853
-             #: rhodecode/public/js/scripts.js:38701
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
-             #: rhodecode/public/js/src/rhodecode/comments.js:382
-             msgid "Submitting..."
-             msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:46904
-             #: rhodecode/public/js/scripts.js:38752
+             #: rhodecode/public/js/rhodecode-components.js:51749
+             #: rhodecode/public/js/rhodecode-components.js:52217
+             #: rhodecode/public/js/scripts.js:38499 rhodecode/public/js/scripts.js:38967
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
-             #: rhodecode/public/js/src/rhodecode/comments.js:433
+             #: rhodecode/public/js/src/rhodecode/codemirror.js:826
+             #: rhodecode/public/js/src/rhodecode/comments.js:443
              #: rhodecode/templates/files/files_browser_tree.mako:51
              msgid "Loading ..."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47014
-             #: rhodecode/public/js/scripts.js:38862
+             #: rhodecode/public/js/rhodecode-components.js:51923
+             #: rhodecode/public/js/scripts.js:38673
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
+             #: rhodecode/public/js/src/rhodecode/comments.js:149
+             msgid "resolve comment"
+             msgstr ""
+             #: rhodecode/public/js/rhodecode-components.js:52166
+             #: rhodecode/public/js/scripts.js:38916
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
+             #: rhodecode/public/js/src/rhodecode/comments.js:392
+             msgid "Submitting..."
+             msgstr ""
+             #: rhodecode/public/js/rhodecode-components.js:52331
+             #: rhodecode/public/js/scripts.js:39081
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
-             #: rhodecode/public/js/src/rhodecode/comments.js:543
+             #: rhodecode/public/js/src/rhodecode/comments.js:557
              msgid "Delete this comment?"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47086
-             #: rhodecode/public/js/scripts.js:38934
+             #: rhodecode/public/js/rhodecode-components.js:52403
+             #: rhodecode/public/js/scripts.js:39153
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
-             #: rhodecode/public/js/src/rhodecode/comments.js:615
+             #: rhodecode/public/js/src/rhodecode/comments.js:629
              msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47163
-             #: rhodecode/public/js/scripts.js:39011
+             #: rhodecode/public/js/rhodecode-components.js:52480
+             #: rhodecode/public/js/scripts.js:39230
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
-             #: rhodecode/public/js/src/rhodecode/comments.js:692
+             #: rhodecode/public/js/src/rhodecode/comments.js:706
              msgid "Leave a comment on line {0}."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47277
-             #: rhodecode/public/js/scripts.js:39125
+             #: rhodecode/public/js/rhodecode-components.js:52598
+             #: rhodecode/public/js/scripts.js:39348
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
-             #: rhodecode/public/js/src/rhodecode/comments.js:806
+             #: rhodecode/public/js/src/rhodecode/comments.js:824
              msgid "TODO from comment {0} was fixed."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47457
-             #: rhodecode/public/js/scripts.js:39305
+             #: rhodecode/public/js/rhodecode-components.js:52778
+             #: rhodecode/public/js/scripts.js:39528
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
              #: rhodecode/public/js/src/rhodecode/files.js:150
              msgid "truncated result"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47459
-             #: rhodecode/public/js/scripts.js:39307
+             #: rhodecode/public/js/rhodecode-components.js:52780
+             #: rhodecode/public/js/scripts.js:39530
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
              #: rhodecode/public/js/src/rhodecode/files.js:152
              msgid "truncated results"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47468
-             #: rhodecode/public/js/scripts.js:39316
+             #: rhodecode/public/js/rhodecode-components.js:52789
+             #: rhodecode/public/js/scripts.js:39539
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
              #: rhodecode/public/js/src/rhodecode/files.js:161
              msgid "No matching files"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47603
-             #: rhodecode/public/js/scripts.js:39451
+             #: rhodecode/public/js/rhodecode-components.js:52924
+             #: rhodecode/public/js/scripts.js:39674
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
              #: rhodecode/public/js/src/rhodecode/files.js:296
              msgid "Selection link"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47643
-             #: rhodecode/public/js/scripts.js:39491
+             #: rhodecode/public/js/rhodecode-components.js:52964
+             #: rhodecode/public/js/scripts.js:39714
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
              #: rhodecode/public/js/src/rhodecode/followers.js:26
              msgid "Stop following this repository"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47644
-             #: rhodecode/public/js/scripts.js:39492
+             #: rhodecode/public/js/rhodecode-components.js:52965
+             #: rhodecode/public/js/scripts.js:39715
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
              #: rhodecode/public/js/src/rhodecode/followers.js:27
              msgid "Unfollow"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47653
-             #: rhodecode/public/js/scripts.js:39501
+             #: rhodecode/public/js/rhodecode-components.js:52974
+             #: rhodecode/public/js/scripts.js:39724
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
              #: rhodecode/public/js/src/rhodecode/followers.js:36
              msgid "Start following this repository"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:47654
-             #: rhodecode/public/js/scripts.js:39502
+             #: rhodecode/public/js/rhodecode-components.js:52975
+             #: rhodecode/public/js/scripts.js:39725
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
              #: rhodecode/public/js/src/rhodecode/followers.js:37
              msgid "Follow"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48034
-             #: rhodecode/public/js/scripts.js:39882
+             #: rhodecode/public/js/rhodecode-components.js:53356
+             #: rhodecode/public/js/scripts.js:40106
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:134
              msgid "All reviewers must vote."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48043
-             #: rhodecode/public/js/scripts.js:39891
+             #: rhodecode/public/js/rhodecode-components.js:53365
+             #: rhodecode/public/js/scripts.js:40115
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:143
              msgid "All individual reviewers must vote."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48048
-             #: rhodecode/public/js/scripts.js:39896
+             #: rhodecode/public/js/rhodecode-components.js:53370
+             #: rhodecode/public/js/scripts.js:40120
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:148
              msgid "At least {0} reviewer must vote."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48054
-             #: rhodecode/public/js/scripts.js:39902
+             #: rhodecode/public/js/rhodecode-components.js:53376
+             #: rhodecode/public/js/scripts.js:40126
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:154
              msgid "At least {0} reviewers must vote."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48070
-             #: rhodecode/public/js/scripts.js:39918
+             #: rhodecode/public/js/rhodecode-components.js:53392
+             #: rhodecode/public/js/scripts.js:40142
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:170
              msgid "Reviewers picked from source code changes."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48077
-             #: rhodecode/public/js/scripts.js:39925
+             #: rhodecode/public/js/rhodecode-components.js:53399
+             #: rhodecode/public/js/scripts.js:40149
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:177
              msgid "Adding new reviewers is forbidden."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48084
-             #: rhodecode/public/js/scripts.js:39932
+             #: rhodecode/public/js/rhodecode-components.js:53406
+             #: rhodecode/public/js/scripts.js:40156
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:184
              msgid "Author is not allowed to be a reviewer."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48098
-             #: rhodecode/public/js/scripts.js:39946
+             #: rhodecode/public/js/rhodecode-components.js:53420
+             #: rhodecode/public/js/scripts.js:40170
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:198
              msgid "Commit Authors are not allowed to be a reviewer."
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48206
-             #: rhodecode/public/js/scripts.js:40054
+             #: rhodecode/public/js/rhodecode-components.js:53528
+             #: rhodecode/public/js/scripts.js:40278
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:306
              msgid "User `{0}` not allowed to be a reviewer"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48212
-             #: rhodecode/public/js/scripts.js:40060
+             #: rhodecode/public/js/rhodecode-components.js:53534
+             #: rhodecode/public/js/scripts.js:40284
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
              #: rhodecode/public/js/src/rhodecode/pullrequests.js:312
              msgid "User `{0}` already in reviewers"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48342
-             #: rhodecode/public/js/scripts.js:40190
+             #: rhodecode/public/js/rhodecode-components.js:53622
+             #: rhodecode/public/js/scripts.js:40372
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
-             #: rhodecode/public/js/src/rhodecode/pullrequests.js:442
+             #: rhodecode/public/js/src/rhodecode/pullrequests.js:400
              msgid "added manually by \"{0}\""
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48346
-             #: rhodecode/public/js/scripts.js:40194
+             #: rhodecode/public/js/rhodecode-components.js:53626
+             #: rhodecode/public/js/scripts.js:40376
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
-             #: rhodecode/public/js/src/rhodecode/pullrequests.js:446
+             #: rhodecode/public/js/src/rhodecode/pullrequests.js:404
              msgid "member of \"{0}\""
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48932
-             #: rhodecode/public/js/scripts.js:40780
+             #: rhodecode/public/js/rhodecode-components.js:54212
+             #: rhodecode/public/js/scripts.js:40962
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
              #: rhodecode/public/js/src/rhodecode.js:142
              msgid "file"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:48952
-             #: rhodecode/public/js/scripts.js:40800
+             #: rhodecode/public/js/rhodecode-components.js:54232
+             #: rhodecode/public/js/scripts.js:40982
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
              #: rhodecode/public/js/src/rhodecode.js:162
+             #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:33
              msgid "Show more"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:49328
-             #: rhodecode/public/js/scripts.js:41176
+             #: rhodecode/public/js/rhodecode-components.js:54608
+             #: rhodecode/public/js/scripts.js:41358
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
              #: rhodecode/public/js/src/rhodecode.js:538
              msgid "date not in future"
              msgstr ""
-             #: rhodecode/public/js/rhodecode-components.js:49336
-             #: rhodecode/public/js/scripts.js:41184
+             #: rhodecode/public/js/rhodecode-components.js:54616
+             #: rhodecode/public/js/scripts.js:41366
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
              #: rhodecode/public/js/src/rhodecode.js:546
              msgid "Specified expiration date"
              msgstr ""
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
-             #: rhodecode/templates/codeblocks/diffs.mako:497
              #: rhodecode/templates/codeblocks/diffs.mako:502
+             #: rhodecode/templates/codeblocks/diffs.mako:507
              msgid "Add another comment"
              msgstr ""
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
              #: rhodecode/public/js/src/i18n_messages.js:5
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:331
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:333
              msgid "Close"
              msgstr ""
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
              #: rhodecode/public/js/src/i18n_messages.js:6
-             #: rhodecode/templates/admin/settings/settings_email.mako:48
+             #: rhodecode/templates/admin/settings/settings_email.mako:52
              msgid "Send"
              msgstr ""
              msgstr ""
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
-             #: rhodecode/templates/pullrequests/pullrequest.mako:140
+             #: rhodecode/templates/pullrequests/pullrequest.mako:141
              msgid "loading..."
              msgstr ""
              msgstr ""
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
+             msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
+             msgstr ""
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
+             msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
+             msgstr ""
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
              msgid "{0} active out of {1} users"
              msgstr ""
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
-             msgid "{0} days"
-             msgstr ""
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
+             msgid "{0} days"
+             msgstr ""
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
              msgid "{0} hours"
              msgstr ""
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
-             msgid "{0} months"
-             msgstr ""
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
-             msgid "{0} out of {1} ssh keys"
-             msgstr ""
              #: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
+             msgid "{0} months"
+             msgstr ""
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
+             msgid "{0} out of {1} ssh keys"
+             msgstr ""
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
              msgid "{0} out of {1} users"
              msgstr ""
-             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
+             msgid "{0} user groups ({1} inactive)"
+             msgstr ""
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
+             msgid "{0} users ({1} inactive)"
+             msgstr ""
+             #: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
              msgid "{0} years"
              msgstr ""
              msgid "Dashboard"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:8
-             #: rhodecode/templates/admin/gists/index.mako:18
-             #: rhodecode/templates/admin/my_account/my_account_repos.mako:7
-             #: rhodecode/templates/admin/my_account/my_account_watched.mako:7
-             #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11
-             #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12
-             #: rhodecode/templates/admin/repos/repos.mako:12
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:12
-             #: rhodecode/templates/admin/users/users.mako:12
-             #: rhodecode/templates/bookmarks/bookmarks.mako:12
-             #: rhodecode/templates/branches/branches.mako:12
-             #: rhodecode/templates/journal/journal.mako:13
-             #: rhodecode/templates/tags/tags.mako:12
-             msgid "quick filter..."
-             msgstr ""
-             #: rhodecode/templates/index_base.mako:10
+             #: rhodecode/templates/index_base.mako:9
              msgid "matches"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:30
-             #: rhodecode/templates/index_base.mako:39
+             #: rhodecode/templates/index_base.mako:29
+             #: rhodecode/templates/index_base.mako:38
              #: rhodecode/templates/admin/repos/repo_add.mako:22
              #: rhodecode/templates/admin/repos/repos.mako:27
              msgid "Add Repository"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:34
-             #: rhodecode/templates/index_base.mako:42
+             #: rhodecode/templates/index_base.mako:33
+             #: rhodecode/templates/index_base.mako:41
              #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16
              #: rhodecode/templates/admin/repo_groups/repo_groups.mako:27
              msgid "Add Repository Group"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:45
+             #: rhodecode/templates/index_base.mako:44
              msgid "You have admin right to this group, and can edit it"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:45
+             #: rhodecode/templates/index_base.mako:44
              msgid "Edit Repository Group"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:68
+             #: rhodecode/templates/index_base.mako:67
              msgid "No repositories or repositories groups exists here."
              msgstr ""
-             #: rhodecode/templates/index_base.mako:86
-             #: rhodecode/templates/index_base.mako:116
+             #: rhodecode/templates/index_base.mako:85
+             #: rhodecode/templates/index_base.mako:115
              #: rhodecode/templates/admin/gists/index.mako:112
              #: rhodecode/templates/admin/integrations/list.mako:72
              #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55
              #: rhodecode/templates/admin/repos/repo_add_base.mako:9
              #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16
              #: rhodecode/templates/admin/repos/repos.mako:54
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:61
+             #: rhodecode/templates/admin/user_groups/user_groups.mako:73
              #: rhodecode/templates/admin/users/user_edit_groups.mako:54
-             #: rhodecode/templates/base/perms_summary.mako:149
+             #: rhodecode/templates/base/perms_summary.mako:168
+             #: rhodecode/templates/base/perms_summary.mako:242
              #: rhodecode/templates/bookmarks/bookmarks.mako:59
              #: rhodecode/templates/branches/branches.mako:58
              #: rhodecode/templates/files/files_browser_tree.mako:5
              msgid "Name"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:89
-             #: rhodecode/templates/index_base.mako:119
+             #: rhodecode/templates/index_base.mako:88
+             #: rhodecode/templates/index_base.mako:118
              #: rhodecode/templates/admin/gists/index.mako:114
              #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15
              #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71
              #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:57
              #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44
              #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49
              #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55
              #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56
-             #: rhodecode/templates/admin/repos/repo_add_base.mako:43
+             #: rhodecode/templates/admin/repos/repo_add_base.mako:52
              #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29
              #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170
              #: rhodecode/templates/admin/repos/repos.mako:57
              #: rhodecode/templates/admin/user_groups/user_group_add.mako:43
              #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:63
+             #: rhodecode/templates/admin/user_groups/user_groups.mako:75
              #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15
              #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67
              #: rhodecode/templates/admin/users/user_edit_groups.mako:59
              #: rhodecode/templates/admin/users/user_edit_ips.mako:12
              #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:52
              #: rhodecode/templates/base/issue_tracker_settings.mako:10
              #: rhodecode/templates/changeset/changeset.mako:76
              #: rhodecode/templates/compare/compare_commits.mako:21
              #: rhodecode/templates/files/file_tree_detail.mako:5
              #: rhodecode/templates/files/file_tree_detail.mako:12
              #: rhodecode/templates/forks/fork.mako:48
-             #: rhodecode/templates/forks/forks.mako:72
-             #: rhodecode/templates/pullrequests/pullrequest.mako:54
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:169
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:481
+             #: rhodecode/templates/forks/forks.mako:64
+             #: rhodecode/templates/pullrequests/pullrequest.mako:55
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:170
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:484
              #: rhodecode/templates/summary/components.mako:88
              msgid "Description"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:92
-             #: rhodecode/templates/index_base.mako:122
+             #: rhodecode/templates/index_base.mako:91
+             #: rhodecode/templates/index_base.mako:121
              #: rhodecode/templates/admin/repo_groups/repo_groups.mako:59
              #: rhodecode/templates/admin/repos/repos.mako:60
              msgid "Last Change"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:94
-             #: rhodecode/templates/index_base.mako:127
+             #: rhodecode/templates/index_base.mako:93
+             #: rhodecode/templates/index_base.mako:126
              #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37
              #: rhodecode/templates/admin/repos/repos.mako:65
              #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5
              #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:71
+             #: rhodecode/templates/admin/user_groups/user_groups.mako:83
              #: rhodecode/templates/admin/users/user_edit_groups.mako:65
-             #: rhodecode/templates/forks/forks.mako:68
+             #: rhodecode/templates/forks/forks.mako:60
              #: rhodecode/templates/summary/components.mako:209
              #: rhodecode/templates/user_group/profile.mako:23
              msgid "Owner"
              msgstr ""
-             #: rhodecode/templates/index_base.mako:125
+             #: rhodecode/templates/index_base.mako:124
              #: rhodecode/templates/admin/my_account/my_account_repos.mako:35
              #: rhodecode/templates/admin/my_account/my_account_watched.mako:35
              #: rhodecode/templates/admin/repos/repos.mako:63
              #: rhodecode/templates/email_templates/commit_comment.mako:49
              #: rhodecode/templates/email_templates/commit_comment.mako:88
              #: rhodecode/templates/files/file_authors_box.mako:31
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:479
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:482
              #: rhodecode/templates/search/search_commit.mako:6
              #: rhodecode/templates/summary/summary_commits.mako:8
              #: rhodecode/templates/tags/tags.mako:66
              #: rhodecode/templates/login.mako:68 rhodecode/templates/password_reset.mako:37
              #: rhodecode/templates/base/base.mako:48
-             #: rhodecode/templates/errors/error_document.mako:63
              msgid "Support"
              msgstr ""
              msgid "Email Address"
              msgstr ""
-             #: rhodecode/templates/password_reset.mako:61
-             #: rhodecode/templates/register.mako:85
+             #: rhodecode/templates/password_reset.mako:58
+             msgid "Password reset link will be sent to matching email address"
+             msgstr ""
+             #: rhodecode/templates/password_reset.mako:62
+             #: rhodecode/templates/register.mako:100
              msgid "Captcha"
              msgstr ""
-             #: rhodecode/templates/password_reset.mako:71
+             #: rhodecode/templates/password_reset.mako:73
              msgid "Send password reset email"
              msgstr ""
-             #: rhodecode/templates/password_reset.mako:72
-             msgid "Password reset link will be sent to matching email address"
-             msgstr ""
              #: rhodecode/templates/register.mako:5
              msgid "Create an Account"
              msgstr ""
-             #: rhodecode/templates/register.mako:35
+             #: rhodecode/templates/register.mako:36
+             msgid "Create an account linked with {}"
+             msgstr ""
+             #: rhodecode/templates/register.mako:38
              msgid "Create an account"
              msgstr ""
-             #: rhodecode/templates/register.mako:36
+             #: rhodecode/templates/register.mako:41
              msgid "Go to the login page to sign in with an existing account."
              msgstr ""
-             #: rhodecode/templates/register.mako:55
+             #: rhodecode/templates/register.mako:65
              msgid "Re-enter password"
              msgstr ""
-             #: rhodecode/templates/register.mako:62
+             #: rhodecode/templates/register.mako:77
              #: rhodecode/templates/admin/my_account/my_account_profile.mako:32
              #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:32
              #: rhodecode/templates/admin/users/user_add.mako:68
              #: rhodecode/templates/admin/users/user_edit_profile.mako:47
-             #: rhodecode/templates/admin/users/users.mako:67
+             #: rhodecode/templates/admin/users/users.mako:75
              msgid "First Name"
              msgstr ""
-             #: rhodecode/templates/register.mako:69
+             #: rhodecode/templates/register.mako:84
              #: rhodecode/templates/admin/my_account/my_account_profile.mako:40
              #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:41
              #: rhodecode/templates/admin/users/user_add.mako:77
              #: rhodecode/templates/admin/users/user_edit_profile.mako:56
-             #: rhodecode/templates/admin/users/users.mako:69
+             #: rhodecode/templates/admin/users/users.mako:77
              msgid "Last Name"
              msgstr ""
-             #: rhodecode/templates/register.mako:97
+             #: rhodecode/templates/register.mako:112
              msgid "Account activation requires admin approval."
              msgstr ""
-             #: rhodecode/templates/register.mako:104
+             #: rhodecode/templates/register.mako:119
              msgid "Create Account"
              msgstr ""
              #: rhodecode/templates/admin/admin_log_base.mako:8
              #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18
              #: rhodecode/templates/admin/my_account/my_account_repos.mako:37
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13
              #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55
              #: rhodecode/templates/admin/repo_groups/repo_groups.mako:65
              #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13
              #: rhodecode/templates/admin/repos/repos.mako:69
              #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:73
+             #: rhodecode/templates/admin/user_groups/user_groups.mako:85
              #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18
              #: rhodecode/templates/admin/users/user_edit_groups.mako:73
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12
-             #: rhodecode/templates/admin/users/users.mako:80
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:13
+             #: rhodecode/templates/admin/users/users.mako:88
              #: rhodecode/templates/files/files_detail.mako:58
-             #: rhodecode/templates/forks/forks.mako:79
+             #: rhodecode/templates/forks/forks.mako:71
              msgid "Action"
              msgstr ""
              #: rhodecode/templates/admin/admin_audit_log_entry.mako:92
              #: rhodecode/templates/admin/admin_log_base.mako:10
              #: rhodecode/templates/admin/defaults/defaults.mako:31
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:13
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:16
              #: rhodecode/templates/search/search_commit.mako:5
              #: rhodecode/templates/search/search_path.mako:3
              msgid "Repository"
              #: rhodecode/templates/admin/admin_audit_logs.mako:14
              #: rhodecode/templates/admin/repos/repo_edit_audit.mako:15
              #: rhodecode/templates/admin/users/user_edit_audit.mako:15
+             #: rhodecode/templates/journal/journal.mako:13
              msgid "filter"
              msgstr ""
              #: rhodecode/templates/admin/admin_audit_logs.mako:15
-             #: rhodecode/templates/admin/repos/repo_edit.mako:92
+             #: rhodecode/templates/admin/repos/repo_edit.mako:95
              #: rhodecode/templates/admin/users/user_edit.mako:47
              msgid "Audit logs"
              msgstr ""
              #: rhodecode/templates/admin/admin_audit_logs.mako:17
-             #: rhodecode/templates/admin/repos/repo_edit_audit.mako:17
-             #: rhodecode/templates/admin/users/user_edit_audit.mako:17
-             #: rhodecode/templates/journal/journal.mako:18
+             #: rhodecode/templates/admin/repos/repo_edit_audit.mako:18
+             #: rhodecode/templates/admin/users/user_edit_audit.mako:18
+             #: rhodecode/templates/journal/journal.mako:16
              #: rhodecode/templates/search/search.mako:76
              msgid "Example Queries"
              msgstr ""
              #: rhodecode/templates/admin/auth/plugin_settings.mako:87
              #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63
              #: rhodecode/templates/admin/permissions/permissions_application.mako:59
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:56
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:59
              #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:204
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83
              #: rhodecode/templates/admin/repos/repo_add_base.mako:106
              #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:186
              #: rhodecode/templates/admin/repos/repo_edit_settings.mako:243
              #: rhodecode/templates/admin/settings/settings_hooks.mako:63
              #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15
              #: rhodecode/templates/admin/user_groups/user_group_add.mako:60
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:191
              #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102
              #: rhodecode/templates/admin/users/user_add.mako:128
              #: rhodecode/templates/admin/users/user_edit_groups.mako:27
              #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14
              #: rhodecode/templates/admin/gists/index.mako:110
              #: rhodecode/templates/admin/integrations/list.mako:73
-             #: rhodecode/templates/admin/repos/repo_add_base.mako:80
+             #: rhodecode/templates/admin/repos/repo_add_base.mako:43
              #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12
              msgid "Type"
              msgstr ""
              #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
              #: rhodecode/templates/admin/repos/repo_add_base.mako:102
              #: rhodecode/templates/admin/repos/repo_edit_settings.mako:192
-             #: rhodecode/templates/forks/fork.mako:92
+             #: rhodecode/templates/forks/fork.mako:102
              msgid "Private repositories are only visible to people explicitly added as collaborators."
              msgstr ""
              #: rhodecode/templates/admin/gists/edit.mako:102
              #: rhodecode/templates/base/issue_tracker_settings.mako:73
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:391
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:392
              #: rhodecode/templates/codeblocks/diffs.mako:72
              #: rhodecode/templates/files/files_add.mako:108
              #: rhodecode/templates/files/files_delete.mako:69
              #: rhodecode/templates/files/files_edit.mako:108
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:64
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:65
              msgid "Cancel"
              msgstr ""
              msgid "Public Gists"
              msgstr ""
+             #: rhodecode/templates/admin/gists/index.mako:18
+             #: rhodecode/templates/admin/my_account/my_account_repos.mako:7
+             #: rhodecode/templates/admin/my_account/my_account_watched.mako:7
+             #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11
+             #: rhodecode/templates/admin/repo_groups/repo_groups.mako:12
+             #: rhodecode/templates/admin/repos/repos.mako:12
+             #: rhodecode/templates/admin/user_groups/user_groups.mako:12
+             #: rhodecode/templates/admin/users/users.mako:12
+             #: rhodecode/templates/bookmarks/bookmarks.mako:12
+             #: rhodecode/templates/branches/branches.mako:12
+             #: rhodecode/templates/journal/journal.mako:12
+             #: rhodecode/templates/tags/tags.mako:12
+             msgid "quick filter..."
+             msgstr ""
              #: rhodecode/templates/admin/gists/index.mako:24
              #, python-format
              msgid "All Gists for user %s"
              #: rhodecode/templates/changeset/changeset.mako:203
              #: rhodecode/templates/compare/compare_commits.mako:18
              #: rhodecode/templates/files/files_browser_tree.mako:9
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:478
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:481
              #: rhodecode/templates/pullrequests/pullrequests.mako:112
              #: rhodecode/templates/search/search_commit.mako:16
              #: rhodecode/templates/summary/summary_commits.mako:11
              msgstr ""
              #: rhodecode/templates/admin/gists/index.mako:116
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11
              #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6
              #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6
              #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6
              #: rhodecode/templates/admin/users/user_edit_advanced.mako:5
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11
              msgid "Created on"
              msgstr ""
              #: rhodecode/templates/admin/integrations/form.mako:17
              #: rhodecode/templates/admin/integrations/list.mako:10
              #: rhodecode/templates/admin/integrations/new.mako:13
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:28
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:31
              #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:196
              msgid "Repository Groups"
              msgstr ""
              #: rhodecode/templates/admin/my_account/my_account.mako:32
              #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3
-             #: rhodecode/templates/admin/permissions/permissions.mako:48
+             #: rhodecode/templates/admin/permissions/permissions.mako:51
              #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4
              #: rhodecode/templates/admin/users/user_edit.mako:40
              #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3
              msgstr ""
              #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:69
              #: rhodecode/templates/admin/permissions/permissions_ips.mako:63
              #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65
              #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82
              #: rhodecode/templates/admin/users/user_edit_emails.mako:62
              #: rhodecode/templates/admin/users/user_edit_ips.mako:70
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:64
              msgid "Add"
              msgstr ""
              msgid "No additional emails specified"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_notifications.mako:21
+             #: rhodecode/templates/admin/my_account/my_account_emails.mako:51
+             #: rhodecode/templates/admin/my_account/my_account_password.mako:6
+             #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:17
+             msgid "Your user account details are managed by an external source. Details cannot be managed here."
+             msgstr ""
+             #: rhodecode/templates/admin/my_account/my_account_emails.mako:52
+             #: rhodecode/templates/admin/my_account/my_account_password.mako:7
+             #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18
+             msgid "Source type"
+             msgstr ""
+             #: rhodecode/templates/admin/my_account/my_account_notifications.mako:22
              msgid "Your Live Notification Settings"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_notifications.mako:33
+             #: rhodecode/templates/admin/my_account/my_account_notifications.mako:34
              msgid "Notifications Status"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_notifications.mako:46
+             #: rhodecode/templates/admin/my_account/my_account_notifications.mako:47
              msgid "Test Notifications"
              msgstr ""
              msgid "Change Your Account Password"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_password.mako:6
-             #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:17
-             msgid "Your user account details are managed by an external source. Details cannot be managed here."
-             msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_password.mako:7
-             #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18
-             msgid "Source type"
-             msgstr ""
              #: rhodecode/templates/admin/my_account/my_account_profile.mako:4
              #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4
              msgid "My Profile"
              #: rhodecode/templates/admin/settings/settings_global.mako:9
              #: rhodecode/templates/email_templates/pull_request_review.mako:39
              #: rhodecode/templates/email_templates/pull_request_review.mako:72
-             #: rhodecode/templates/pullrequests/pullrequest.mako:45
+             #: rhodecode/templates/pullrequests/pullrequest.mako:46
              #: rhodecode/templates/pullrequests/pullrequests.mako:114
              msgid "Title"
              msgstr ""
              msgid "Fingerprint"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11
-             #: rhodecode/templates/data_table/_dt_elements.mako:183
-             msgid "Created"
-             msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12
+             #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12
+             msgid "Accessed on"
+             msgstr ""
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:16
              msgid "SSH Keys usage is currently disabled, please ask your administrator to enable them."
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:32
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:29
              #, python-format
              msgid "Confirm to remove ssh key %s"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:40
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:37
              msgid "No additional ssh keys specified"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:54
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:49
              msgid "New ssh key"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:58
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:53
              msgid "Generate random RSA key"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:64
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:59
              msgid "Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'"
              msgstr ""
-             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71
-             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66
+             #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:73
+             #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:68
              msgid "Click add to use this generate SSH key"
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41
              #: rhodecode/templates/admin/user_groups/user_group_add.mako:52
              #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:69
+             #: rhodecode/templates/admin/user_groups/user_groups.mako:81
              #: rhodecode/templates/admin/users/user_add.mako:97
              #: rhodecode/templates/admin/users/user_edit_groups.mako:64
              #: rhodecode/templates/admin/users/user_edit_profile.mako:90
-             #: rhodecode/templates/admin/users/users.mako:74
+             #: rhodecode/templates/admin/users/users.mako:82
              #: rhodecode/templates/user_group/profile.mako:33
              msgid "Active"
              msgstr ""
              msgid "Object"
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions.mako:42
+             #: rhodecode/templates/admin/permissions/permissions.mako:45
              msgid "IP Whitelist"
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions.mako:45
+             #: rhodecode/templates/admin/permissions/permissions.mako:48
              msgid "AuthToken Access"
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions.mako:51
+             #: rhodecode/templates/admin/permissions/permissions.mako:54
              msgid "Overview"
              msgstr ""
              msgid "List of views available for usage in whitelist access"
              msgstr ""
+             #: rhodecode/templates/admin/permissions/permissions_branch.mako:3
+             msgid "Default Permissions for Branches."
+             msgstr ""
+             #: rhodecode/templates/admin/permissions/permissions_branch.mako:6
+             #: rhodecode/templates/admin/repos/repo_edit_automation.mako:6
+             #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6
+             #: rhodecode/templates/admin/repos/repo_edit_remote.mako:62
+             #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
+             #: rhodecode/templates/admin/settings/settings_automation.mako:6
+             msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
+             msgstr ""
              #: rhodecode/templates/admin/permissions/permissions_ips.mako:5
              msgid "Default IP Whitelist For All Users"
              msgstr ""
              msgid "Default Permissions for Repositories, User Groups and Repository Groups."
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:6
-             msgid "Default system permissions. Each permissions management entity will be created with the following default settings. Check the overwrite checkbox to force any permission changes on already existing settings."
-             msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:20
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:7
+             msgid "Default access permissions. This defines permissions for the `default` user from which other users inherit permissions."
+             msgstr ""
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:9
+             msgid "Check the overwrite checkbox to force change all previously defined permissions for `default` user to the new selected value."
+             msgstr ""
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:23
              msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost"
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:21
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:35
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:49
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:24
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:38
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:52
              msgid "Overwrite Existing Settings"
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:34
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:37
              msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:42
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:45
              #: rhodecode/templates/admin/user_groups/user_group_edit.mako:14
              msgid "User Groups"
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions_objects.mako:48
-             msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
+             #: rhodecode/templates/admin/permissions/permissions_objects.mako:51
+             msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost"
              msgstr ""
              #: rhodecode/templates/admin/permissions/permissions_perms.mako:1
              msgid "Update SSH keys file"
              msgstr ""
-             #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53
-             msgid "Accessed on"
-             msgstr ""
              #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5
              msgid "Add repository group"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69
-             #: rhodecode/templates/admin/repos/repo_add_base.mako:71
+             #: rhodecode/templates/admin/repos/repo_add_base.mako:89
              msgid "Copy Parent Group Permissions"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50
-             #: rhodecode/templates/admin/repos/repo_edit.mako:52
+             #: rhodecode/templates/admin/repos/repo_edit.mako:55
              #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
              #: rhodecode/templates/admin/users/user_edit.mako:41
              msgid "Advanced"
              msgid "User/User Group"
              msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:32
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:33
              msgid "super admin"
              msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:36
              msgid "owner"
              msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76
-             msgid "permission for all other users"
-             msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:64
              #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98
-             msgid "Revoke"
-             msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80
-             msgid "delegated admin"
-             msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:86
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:66
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:109
+             msgid "permission for all other users"
+             msgstr ""
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:68
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:111
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:90
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:70
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:113
+             msgid "inactive duplicate"
+             msgstr ""
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:77
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:155
              #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117
-             #: rhodecode/templates/base/issue_tracker_settings.mako:83
-             msgid "Add new"
-             msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:150
+             #: rhodecode/templates/admin/repos/repo_edit_strip.mako:46
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:157
+             msgid "Remove"
+             msgstr ""
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:114
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:116
+             msgid "delegated admin"
+             msgstr ""
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:182
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:177
+             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:183
+             msgid "Add user/user group"
+             msgstr ""
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:192
              msgid "Apply to children"
              msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
              msgid "Both"
              msgstr ""
-             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128
+             #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199
              msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen."
              msgstr ""
              msgid "Clone from"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_add_base.mako:48
-             #: rhodecode/templates/admin/repos/repo_edit_settings.mako:177
-             #: rhodecode/templates/forks/fork.mako:53
-             msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions"
+             #: rhodecode/templates/admin/repos/repo_add_base.mako:47
+             msgid "Set the type of repository to create."
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_add_base.mako:57
-             msgid "Repository Group"
-             msgstr ""
-             #: rhodecode/templates/admin/repos/repo_add_base.mako:63
-             #: rhodecode/templates/forks/fork.mako:69
-             #, python-format
-             msgid "Select my personal group (%(repo_group_name)s)"
+             #: rhodecode/templates/admin/repos/repo_edit_settings.mako:177
+             #: rhodecode/templates/forks/fork.mako:53
+             msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions"
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_add_base.mako:66
-             #: rhodecode/templates/forks/fork.mako:72
-             msgid "Optionally select a group to put this repository into."
+             msgid "Repository Group"
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_add_base.mako:72
+             #: rhodecode/templates/forks/fork.mako:69
+             #, python-format
+             msgid "Select my personal group (%(repo_group_name)s)"
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_add_base.mako:75
-             msgid "Copy permission set from the parent repository group."
+             #: rhodecode/templates/forks/fork.mako:72
+             msgid "Optionally select a group to put this repository into."
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_add_base.mako:80
+             #: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
+             #: rhodecode/templates/forks/fork.mako:78
+             msgid "Landing commit"
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_add_base.mako:84
-             msgid "Set the type of repository to create."
-             msgstr ""
-             #: rhodecode/templates/admin/repos/repo_add_base.mako:89
-             #: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
-             #: rhodecode/templates/forks/fork.mako:78
-             msgid "Landing commit"
+             msgid "The default commit for file pages, downloads, full text search index, and README generation."
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_add_base.mako:93
-             msgid "The default commit for file pages, downloads, full text search index, and README generation."
+             msgid "Copy permission set from the parent repository group."
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_creating.mako:5
              msgid "%s repository settings"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit.mako:58
+             #: rhodecode/templates/admin/repos/repo_edit.mako:52
+             msgid "Branch Permissions"
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit.mako:61
              msgid "Extra Fields"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit.mako:64
+             #: rhodecode/templates/admin/repos/repo_edit.mako:67
+             #: rhodecode/templates/admin/users/user_edit.mako:48
+             #: rhodecode/templates/admin/users/user_edit_caches.mako:5
              msgid "Caches"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit.mako:68
+             #: rhodecode/templates/admin/repos/repo_edit.mako:71
              msgid "Remote sync"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit.mako:72
+             #: rhodecode/templates/admin/repos/repo_edit.mako:75
              #: rhodecode/templates/summary/components.mako:149
              msgid "Statistics"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit.mako:79
+             #: rhodecode/templates/admin/repos/repo_edit.mako:82
              msgid "Reviewer Rules"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit.mako:86
-             #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
-             msgid "Maintenance"
-             msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit.mako:89
+             #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
+             msgid "Maintenance"
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit.mako:92
              msgid "Strip"
              msgstr ""
              msgid "Repo Automation"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit_automation.mako:6
-             #: rhodecode/templates/admin/repos/repo_edit_remote.mako:62
-             #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
-             #: rhodecode/templates/admin/settings/settings_automation.mako:6
-             msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
-             msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3
              msgid "Invalidate Cache for Repository"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_caches.mako:39
-             #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
-             #: rhodecode/templates/base/issue_tracker_settings.mako:13
-             msgid "Prefix"
+             #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
+             msgid "Key"
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_caches.mako:40
-             #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
-             msgid "Key"
+             msgid "Namespace"
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_caches.mako:58
+             msgid "Cache keys"
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:74
+             #: rhodecode/templates/admin/users/user_edit_caches.mako:19
+             msgid "Show all"
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:92
+             msgid "Shadow Repositories"
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:104
+             msgid "No Shadow repositories exist for this repository."
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:115
              msgid "Diff Caches"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:63
+             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:120
              msgid "Cached diff name"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:67
+             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:124
              msgid "Cached diff files"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:71
+             #: rhodecode/templates/admin/repos/repo_edit_caches.mako:128
              msgid "Cached diff size"
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30
              #: rhodecode/templates/base/issue_tracker_settings.mako:11
+             #: rhodecode/templates/base/perms_summary.mako:169
              msgid "Pattern"
              msgstr ""
              msgid "Url"
              msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
+             #: rhodecode/templates/base/issue_tracker_settings.mako:13
+             msgid "Prefix"
+             msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:70
              #: rhodecode/templates/admin/settings/settings_issuetracker.mako:5
              msgid "Issue Tracker / Wiki Patterns"
              msgid "Repository Permissions"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:42
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55
              msgid "private repository"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:47
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60
              msgid "only users/user groups explicitly added here will have access"
              msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94
+             msgid "used by {} branch rule, requires write+ permissions"
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:96
+             msgid "used by {} branch rules, requires write+ permissions"
+             msgstr ""
+             #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3
+             msgid "Repository Branch Permissions."
+             msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_remote.mako:3
              msgid "Remote Sync"
              msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_settings.mako:60
              #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102
-             #: rhodecode/templates/base/perms_summary.mako:92
-             #: rhodecode/templates/base/perms_summary.mako:210
-             #: rhodecode/templates/base/perms_summary.mako:212
+             #: rhodecode/templates/base/perms_summary.mako:111
+             #: rhodecode/templates/base/perms_summary.mako:228
+             #: rhodecode/templates/base/perms_summary.mako:306
+             #: rhodecode/templates/base/perms_summary.mako:308
              #: rhodecode/templates/debug_style/form-elements.html:45
              msgid "edit"
              msgstr ""
              msgid "Sorry this functionality is not available for SVN repository"
              msgstr ""
-             #: rhodecode/templates/admin/repos/repo_edit_strip.mako:46
-             msgid "Remove"
-             msgstr ""
              #: rhodecode/templates/admin/repos/repo_edit_strip.mako:114
              msgid "Checking commits"
              msgstr ""
              msgid "SMTP auth"
              msgstr ""
-             #: rhodecode/templates/admin/settings/settings_email.mako:34
+             #: rhodecode/templates/admin/settings/settings_email.mako:30
+             msgid "You can adjust those settings in [DEFAULT] section of .ini file located at"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_email.mako:38
              msgid "Test Email"
              msgstr ""
-             #: rhodecode/templates/admin/settings/settings_email.mako:40
-             msgid "enter valid email"
-             msgstr ""
              #: rhodecode/templates/admin/settings/settings_email.mako:44
+             msgid "enter valid email"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_email.mako:48
              msgid "Send an auto-generated email from this server to above email..."
              msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions.mako:3
+             msgid "Exceptions Tracker - Exception ID"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions.mako:8
+             msgid "Exception `{}` generated on UTC date: {}"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions.mako:12
+             msgid "Unable to Read Exception. It might be removed or non-existing."
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions.mako:21
+             msgid "Delete this Exception"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions.mako:29
+             msgid "Confirm to delete this exception"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions.mako:31
+             msgid "Delete This Exception"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:3
+             msgid "Exceptions Tracker "
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:7
+             msgid "There is {} stored exception."
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:9
+             msgid "There are {} stored exceptions."
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:11
+             msgid "Store directory"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:18
+             msgid "Confirm to delete all exceptions"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:20
+             msgid "Delete All"
+             msgstr ""
+             #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:32
+             msgid "Exceptions Tracker - Showing the last {} Exceptions"
+             msgstr ""
              #: rhodecode/templates/admin/settings/settings_global.mako:5
              msgid "Branding"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/admin/settings/settings_global.mako:68
-             msgid "Google ReCaptcha public key"
+             msgid "Google reCaptcha v2 site key."
              msgstr ""
              #: rhodecode/templates/admin/settings/settings_global.mako:75
-             msgid "Public key for reCaptcha system."
+             msgid "Site key for reCaptcha v2 system."
              msgstr ""
              #: rhodecode/templates/admin/settings/settings_global.mako:80
-             msgid "Google ReCaptcha private key"
+             msgid "Google reCaptcha v2 secret key."
              msgstr ""
              #: rhodecode/templates/admin/settings/settings_global.mako:87
-             msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration"
+             msgid "Secret key for reCaptcha v2 system. Setting this value will enable captcha on registration and password reset forms."
              msgstr ""
              #: rhodecode/templates/admin/settings/settings_global.mako:95
              msgstr ""
              #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:65
+             #: rhodecode/templates/admin/user_groups/user_groups.mako:77
              #: rhodecode/templates/debug_style/form-elements.html:509
              #: rhodecode/templates/user_group/profile.mako:42
              msgid "Members"
              msgid "User Group Permissions"
              msgstr ""
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:62
-             #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:109
-             msgid "revoke"
-             msgstr ""
              #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:36
              msgid "Change owner of this user group."
              msgstr ""
              msgid "User groups administration"
              msgstr ""
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:13
-             msgid "user groups"
-             msgstr ""
-             #: rhodecode/templates/admin/user_groups/user_groups.mako:67
+             #: rhodecode/templates/admin/user_groups/user_groups.mako:79
              msgid "Sync"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/admin/users/user_edit_advanced.mako:9
-             #: rhodecode/templates/admin/users/users.mako:72
-             #: rhodecode/templates/forks/forks.mako:77
+             #: rhodecode/templates/admin/users/users.mako:80
+             #: rhodecode/templates/forks/forks.mako:69
              msgid "Last activity"
              msgstr ""
              msgid "User Audit Logs"
              msgstr ""
+             #: rhodecode/templates/admin/users/user_edit_caches.mako:33
+             msgid "Invalidate user cache"
+             msgstr ""
+             #: rhodecode/templates/admin/users/user_edit_caches.mako:33
+             msgid "Confirm to invalidate user cache"
+             msgstr ""
              #: rhodecode/templates/admin/users/user_edit_emails.mako:5
              msgid "Additional Email Addresses"
              msgstr ""
              msgid "Users administration"
              msgstr ""
-             #: rhodecode/templates/admin/users/users.mako:78
+             #: rhodecode/templates/admin/users/users.mako:86
              msgid "Auth type"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/base/base.mako:269
-             #: rhodecode/templates/base/base.mako:415
+             #: rhodecode/templates/base/base.mako:446
              #: rhodecode/templates/search/search.mako:64
              msgid "Search"
              msgstr ""
              msgid "Sign Out"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:397
+             #: rhodecode/templates/base/base.mako:403
+             msgid "search / go to..."
+             msgstr ""
+             #: rhodecode/templates/base/base.mako:428
              msgid "Show activity journal"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:398
+             #: rhodecode/templates/base/base.mako:429
              #: rhodecode/templates/journal/journal.mako:4
-             #: rhodecode/templates/journal/journal.mako:15
+             #: rhodecode/templates/journal/journal.mako:14
              msgid "Journal"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:403
+             #: rhodecode/templates/base/base.mako:434
              msgid "Show Public activity journal"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:404
+             #: rhodecode/templates/base/base.mako:435
              msgid "Public journal"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:409
+             #: rhodecode/templates/base/base.mako:440
              msgid "Show Gists"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:410
+             #: rhodecode/templates/base/base.mako:441
              msgid "Gists"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:414
+             #: rhodecode/templates/base/base.mako:445
              msgid "Search in repositories you have access to"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:420
+             #: rhodecode/templates/base/base.mako:451
              msgid "Admin settings"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:427
+             #: rhodecode/templates/base/base.mako:458
              msgid "Delegated Admin settings"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:437
-             #: rhodecode/templates/base/base.mako:438
+             #: rhodecode/templates/base/base.mako:471
              #: rhodecode/templates/debug_style/alerts.html:5
              #: rhodecode/templates/debug_style/buttons.html:5
              #: rhodecode/templates/debug_style/code-block.html:6
              msgid "Style"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:495
-             msgid "Go to"
-             msgstr ""
-             #: rhodecode/templates/base/base.mako:548
+             #: rhodecode/templates/base/base.mako:472
+             msgid "[Style]"
+             msgstr ""
+             #: rhodecode/templates/base/base.mako:619
              msgid "Keyboard shortcuts"
              msgstr ""
-             #: rhodecode/templates/base/base.mako:556
+             #: rhodecode/templates/base/base.mako:627
              msgid "Site-wide shortcuts"
              msgstr ""
              msgid "Read more"
              msgstr ""
+             #: rhodecode/templates/base/issue_tracker_settings.mako:83
+             msgid "Add new"
+             msgstr ""
              #: rhodecode/templates/base/issue_tracker_settings.mako:91
              msgid "New Entry"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/base/issue_tracker_settings.mako:191
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:275
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:325
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:276
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:326
+             #: rhodecode/templates/data_table/_dt_elements.mako:389
              #: rhodecode/templates/files/files_add.mako:84
              #: rhodecode/templates/files/files_add.mako:230
              #: rhodecode/templates/files/files_edit.mako:85
              msgid "Test Pattern Preview"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:14
+             #: rhodecode/templates/base/perms_summary.mako:26
              msgid "in JSON format"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:23
+             #: rhodecode/templates/base/perms_summary.mako:35
+             #: rhodecode/templates/base/perms_summary.mako:43
              msgid "show"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:24
+             #: rhodecode/templates/base/perms_summary.mako:36
+             #: rhodecode/templates/base/perms_summary.mako:44
              msgid "none"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:25
+             #: rhodecode/templates/base/perms_summary.mako:37
+             #: rhodecode/templates/changelog/changelog_elements.mako:107
+             #: rhodecode/templates/changeset/changeset.mako:109
+             #: rhodecode/templates/files/base.mako:4
+             msgid "merge"
+             msgstr ""
+             #: rhodecode/templates/base/perms_summary.mako:38
+             msgid "push"
+             msgstr ""
+             #: rhodecode/templates/base/perms_summary.mako:39
+             msgid "push force"
+             msgstr ""
+             #: rhodecode/templates/base/perms_summary.mako:45
              msgid "read"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:26
+             #: rhodecode/templates/base/perms_summary.mako:46
              msgid "write"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:27
+             #: rhodecode/templates/base/perms_summary.mako:47
              msgid "admin"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:34
+             #: rhodecode/templates/base/perms_summary.mako:55
              msgid "No permissions defined"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:42
-             #: rhodecode/templates/base/perms_summary.mako:150
+             #: rhodecode/templates/base/perms_summary.mako:63
+             #: rhodecode/templates/base/perms_summary.mako:170
+             #: rhodecode/templates/base/perms_summary.mako:243
              msgid "Permission"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:44
-             #: rhodecode/templates/base/perms_summary.mako:152
+             #: rhodecode/templates/base/perms_summary.mako:65
+             #: rhodecode/templates/base/perms_summary.mako:245
              msgid "Edit Permission"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:100
-             #: rhodecode/templates/base/perms_summary.mako:109
+             #: rhodecode/templates/base/perms_summary.mako:119
+             #: rhodecode/templates/base/perms_summary.mako:128
              msgid "edit global"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:117
+             #: rhodecode/templates/base/perms_summary.mako:136
              msgid "Repository default permission"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:120
+             #: rhodecode/templates/base/perms_summary.mako:139
              msgid "Repository group default permission"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:123
+             #: rhodecode/templates/base/perms_summary.mako:142
              msgid "User group default permission"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:126
+             #: rhodecode/templates/base/perms_summary.mako:145
              msgid "Super admin"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:129
+             #: rhodecode/templates/base/perms_summary.mako:148
              msgid "Inherit permissions"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:132
+             #: rhodecode/templates/base/perms_summary.mako:151
              msgid "Create repositories"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:135
+             #: rhodecode/templates/base/perms_summary.mako:154
              msgid "Fork repositories"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:138
+             #: rhodecode/templates/base/perms_summary.mako:157
              msgid "Create repository groups"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:141
+             #: rhodecode/templates/base/perms_summary.mako:160
              msgid "Create user groups"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:190
+             #: rhodecode/templates/base/perms_summary.mako:172
+             msgid "Edit Branch Permission"
+             msgstr ""
+             #: rhodecode/templates/base/perms_summary.mako:286
              msgid "overridden by"
              msgstr ""
-             #: rhodecode/templates/base/perms_summary.mako:223
-             msgid "No permission defined"
-             msgstr ""
-             #: rhodecode/templates/base/root.mako:165
+             #: rhodecode/templates/base/perms_summary.mako:321
+             msgid "No matching permission defined"
+             msgstr ""
+             #: rhodecode/templates/base/root.mako:142
              msgid "Please enable JavaScript to use RhodeCode Enterprise"
              msgstr ""
              #: rhodecode/templates/changelog/changelog_elements.mako:83
              #: rhodecode/templates/compare/compare_commits.mako:50
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:516
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:519
              #: rhodecode/templates/search/search_commit.mako:36
              msgid "Expand commit message"
              msgstr ""
-             #: rhodecode/templates/changelog/changelog_elements.mako:107
-             #: rhodecode/templates/changeset/changeset.mako:109
-             #: rhodecode/templates/files/base.mako:4
-             msgid "merge"
-             msgstr ""
              #: rhodecode/templates/changelog/changelog_elements.mako:129
              #: rhodecode/templates/changeset/changeset.mako:122
              #: rhodecode/templates/files/base.mako:17
              msgstr ""
              #: rhodecode/templates/changeset/changeset.mako:65
-             msgid "Parent"
+             msgid "parent"
              msgstr ""
              #: rhodecode/templates/changeset/changeset.mako:69
              msgstr ""
              #: rhodecode/templates/changeset/changeset.mako:69
-             msgid "Child"
+             msgid "child"
              msgstr ""
              #: rhodecode/templates/changeset/changeset.mako:81
              #: rhodecode/templates/changeset/changeset.mako:89
              #: rhodecode/templates/changeset/changeset.mako:95
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:82
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:83
              #: rhodecode/templates/compare/compare_diff.mako:159
              msgid "Commit status"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/changeset/changeset.mako:142
-             #: rhodecode/templates/codeblocks/diffs.mako:455
-             #: rhodecode/templates/codeblocks/diffs.mako:458
+             #: rhodecode/templates/codeblocks/diffs.mako:460
+             #: rhodecode/templates/codeblocks/diffs.mako:463
              msgid "Raw diff"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/changeset/changeset.mako:150
-             #: rhodecode/templates/codeblocks/diffs.mako:462
-             #: rhodecode/templates/codeblocks/diffs.mako:465
+             #: rhodecode/templates/codeblocks/diffs.mako:467
+             #: rhodecode/templates/codeblocks/diffs.mako:470
              msgid "Download diff"
              msgstr ""
              msgid "No Parent Commits"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:33
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:34
              msgid "Resolved by comment #{}"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:40
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:41
              msgid "Click to resolve this comment"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:67
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:69
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:68
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:70
              #, python-format
              msgid "pull request #%s"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:74
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:75
              msgid "Status change on commit"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:89
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:90
              msgid "resolves comment #{}"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:97
-             msgid "Pull request author"
-             msgstr ""
              #: rhodecode/templates/changeset/changeset_file_comment.mako:98
+             msgid "Pull request author"
+             msgstr ""
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:99
              msgid "author"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:106
-             msgid "Outdated comment from pull request version {0}"
-             msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:110
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:125
-             msgid "Comment from pull request version {0}"
-             msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:122
-             msgid "Outdated comment from pull request version {}"
-             msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:152
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:155
-             msgid "Prev"
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:107
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:123
+             msgid "Outdated comment from pull request version v{0}, latest v{1}"
+             msgstr ""
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:111
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:126
+             msgid "Comment from pull request version v{0}, latest v{1}"
              msgstr ""
              #: rhodecode/templates/changeset/changeset_file_comment.mako:153
              #: rhodecode/templates/changeset/changeset_file_comment.mako:156
+             msgid "Prev"
+             msgstr ""
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:154
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:157
              msgid "Next"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:191
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:192
              msgid "Leave a comment on this Pull Request."
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:193
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:194
              msgid "Leave a comment on {} commits in this range."
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:195
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:196
              msgid "Leave a comment on this Commit."
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:283
-             #: rhodecode/templates/codeblocks/diffs.mako:67
-             msgid "You need to be logged in to leave comments."
-             msgstr ""
              #: rhodecode/templates/changeset/changeset_file_comment.mako:284
              #: rhodecode/templates/codeblocks/diffs.mako:67
+             msgid "You need to be logged in to leave comments."
+             msgstr ""
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:285
+             #: rhodecode/templates/codeblocks/diffs.mako:67
              msgid "Login now"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:349
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:350
              #, python-format
              msgid "Comments parsed using %s syntax with %s, and %s actions support."
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:351
-             msgid "Use @username inside this text to send notification to this RhodeCode user"
-             msgstr ""
              #: rhodecode/templates/changeset/changeset_file_comment.mako:352
+             msgid "Use @username inside this text to send notification to this RhodeCode user"
+             msgstr ""
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:353
              msgid "Start typing with / for certain actions to be triggered via text box."
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:369
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:15
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:159
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:370
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:16
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:160
              #: rhodecode/templates/pullrequests/pullrequests.mako:52
              msgid "Closed"
              msgstr ""
-             #: rhodecode/templates/changeset/changeset_file_comment.mako:399
+             #: rhodecode/templates/changeset/changeset_file_comment.mako:400
              #: rhodecode/templates/compare/compare_diff.mako:104
              #: rhodecode/templates/compare/compare_diff.mako:112
              #: rhodecode/templates/compare/compare_diff.mako:120
              msgid "Hide them"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:294
-             msgid "File was deleted in this version, and outdated comments were made on it"
-             msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:360
+             #: rhodecode/templates/codeblocks/diffs.mako:299
+             msgid "File was deleted in this version. There are still outdated/unresolved comments attached to it."
+             msgstr ""
+             #: rhodecode/templates/codeblocks/diffs.mako:365
              #: rhodecode/templates/files/files_source.mako:19
              msgid "Copy the full path"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:425
-             #: rhodecode/templates/codeblocks/diffs.mako:441
+             #: rhodecode/templates/codeblocks/diffs.mako:430
+             #: rhodecode/templates/codeblocks/diffs.mako:446
              #, python-format
              msgid "Show file at commit: %(commit_id)s"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:427
-             #: rhodecode/templates/codeblocks/diffs.mako:434
-             msgid "Show file before"
-             msgstr ""
              #: rhodecode/templates/codeblocks/diffs.mako:432
-             #: rhodecode/templates/codeblocks/diffs.mako:448
+             #: rhodecode/templates/codeblocks/diffs.mako:439
+             msgid "Show file before"
+             msgstr ""
+             #: rhodecode/templates/codeblocks/diffs.mako:437
+             #: rhodecode/templates/codeblocks/diffs.mako:453
              #, python-format
              msgid "File no longer present at commit: %(commit_id)s"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:443
-             #: rhodecode/templates/codeblocks/diffs.mako:450
+             #: rhodecode/templates/codeblocks/diffs.mako:448
+             #: rhodecode/templates/codeblocks/diffs.mako:455
              msgid "Show file after"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:481
+             #: rhodecode/templates/codeblocks/diffs.mako:486
              msgid "Show comments"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:481
+             #: rhodecode/templates/codeblocks/diffs.mako:486
              msgid "Hide comments"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:547
-             #: rhodecode/templates/codeblocks/diffs.mako:590
-             #: rhodecode/templates/codeblocks/diffs.mako:645
+             #: rhodecode/templates/codeblocks/diffs.mako:552
+             #: rhodecode/templates/codeblocks/diffs.mako:595
+             #: rhodecode/templates/codeblocks/diffs.mako:650
              msgid "comments including outdated"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:549
-             #: rhodecode/templates/codeblocks/diffs.mako:592
-             #: rhodecode/templates/codeblocks/diffs.mako:647
+             #: rhodecode/templates/codeblocks/diffs.mako:554
+             #: rhodecode/templates/codeblocks/diffs.mako:597
+             #: rhodecode/templates/codeblocks/diffs.mako:652
              msgid "comments"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:701
+             #: rhodecode/templates/codeblocks/diffs.mako:706
              msgid "View side by side"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:703
-             msgid "Side by Side"
-             msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:707
-             msgid "View unified"
-             msgstr ""
              #: rhodecode/templates/codeblocks/diffs.mako:708
+             msgid "Side by Side"
+             msgstr ""
+             #: rhodecode/templates/codeblocks/diffs.mako:712
+             msgid "View unified"
+             msgstr ""
+             #: rhodecode/templates/codeblocks/diffs.mako:713
              msgid "Unified"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:718
+             #: rhodecode/templates/codeblocks/diffs.mako:723
              msgid "Expand All Files"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:722
+             #: rhodecode/templates/codeblocks/diffs.mako:727
              msgid "Collapse All Files"
              msgstr ""
-             #: rhodecode/templates/codeblocks/diffs.mako:726
+             #: rhodecode/templates/codeblocks/diffs.mako:731
              msgid "Wide Mode Diff"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/compare/compare_commits.mako:17
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:477
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:480
              msgid "Time"
              msgstr ""
              #: rhodecode/templates/compare/compare_diff.mako:60
              #: rhodecode/templates/email_templates/pull_request_review.mako:74
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:107
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:108
              msgid "Target"
              msgstr ""
              #: rhodecode/templates/email_templates/pull_request_comment.mako:90
              #: rhodecode/templates/email_templates/pull_request_review.mako:73
              #: rhodecode/templates/files/files_source.mako:29
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:71
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:72
              msgid "Source"
              msgstr ""
              msgid "Creating"
              msgstr ""
+             #: rhodecode/templates/data_table/_dt_elements.mako:183
+             msgid "Created"
+             msgstr ""
              #: rhodecode/templates/data_table/_dt_elements.mako:225
              msgid "personal"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/data_table/_dt_elements.mako:332
-             #: rhodecode/templates/forks/fork.mako:88
+             #: rhodecode/templates/forks/fork.mako:98
              msgid "Private"
              msgstr ""
-             #: rhodecode/templates/data_table/_dt_elements.mako:366
+             #: rhodecode/templates/data_table/_dt_elements.mako:365
              #, python-format
              msgid "Pull request #%(pr_number)s"
              msgstr ""
+             #: rhodecode/templates/data_table/_dt_elements.mako:406
+             #, python-format
+             msgid "Parsed using %s syntax"
+             msgstr ""
              #: rhodecode/templates/debug_style/buttons.html:131
              msgid "Confirm to remove this field: Field"
              msgstr ""
              msgstr ""
              #: rhodecode/templates/email_templates/pull_request_comment.mako:49
-             #: rhodecode/templates/pullrequests/pullrequest.mako:72
+             #: rhodecode/templates/pullrequests/pullrequest.mako:73
              msgid "Source repository"
              msgstr ""
              msgid "You will be redirected to %s in %s seconds"
              msgstr ""
+             #: rhodecode/templates/errors/error_document.mako:63
+             msgid "Support Page"
+             msgstr ""
              #: rhodecode/templates/feed/atom_feed_entry.mako:3
              #, python-format
              msgid "%(user)s commited on %(date)s UTC"
              msgstr ""
              #: rhodecode/templates/forks/fork.mako:37
-             #: rhodecode/templates/forks/forks.mako:70
+             #: rhodecode/templates/forks/forks.mako:62
              msgid "Fork name"
              msgstr ""
              msgid "Default commit for files page, downloads, whoosh and readme"
              msgstr ""
-             #: rhodecode/templates/forks/fork.mako:98
+             #: rhodecode/templates/forks/fork.mako:88
              msgid "Copy permissions"
              msgstr ""
-             #: rhodecode/templates/forks/fork.mako:102
+             #: rhodecode/templates/forks/fork.mako:92
              msgid "Copy permissions from forked repository"
              msgstr ""
              msgid "Create new fork"
              msgstr ""
-             #: rhodecode/templates/forks/forks.mako:74
+             #: rhodecode/templates/forks/forks.mako:66
              msgid "Forked"
              msgstr ""
-             #: rhodecode/templates/journal/journal.mako:14
-             msgid "Filter"
-             msgstr ""
-             #: rhodecode/templates/journal/journal.mako:24
-             msgid "ATOM journal feed"
-             msgstr ""
              #: rhodecode/templates/journal/journal.mako:25
+             msgid "ATOM journal feed"
+             msgstr ""
+             #: rhodecode/templates/journal/journal.mako:26
              msgid "RSS journal feed"
              msgstr ""
              msgid "RSS public journal feed"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:4
-             #: rhodecode/templates/pullrequests/pullrequest.mako:8
+             #: rhodecode/templates/pullrequests/pullrequest.mako:5
+             #: rhodecode/templates/pullrequests/pullrequest.mako:9
              msgid "New pull request"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:35
+             #: rhodecode/templates/pullrequests/pullrequest.mako:36
              msgid "Pull request summary"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:58
-             msgid "Write a short description on this pull request"
-             msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:64
+             #: rhodecode/templates/pullrequests/pullrequest.mako:65
              msgid "Commit flow"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:90
+             #: rhodecode/templates/pullrequests/pullrequest.mako:91
              msgid "Loading refs..."
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:101
+             #: rhodecode/templates/pullrequests/pullrequest.mako:102
              msgid "Submit Pull Request"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:115
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:315
+             #: rhodecode/templates/pullrequests/pullrequest.mako:116
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:317
              msgid "Author of this pull request"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:129
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:329
+             #: rhodecode/templates/pullrequests/pullrequest.mako:130
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:331
              msgid "Reviewer rules"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:139
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:343
+             #: rhodecode/templates/pullrequests/pullrequest.mako:140
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:345
              msgid "Pull request reviewers"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:150
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:386
+             #: rhodecode/templates/pullrequests/pullrequest.mako:151
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:388
              msgid "Add reviewer or reviewer group"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:305
-             #: rhodecode/templates/pullrequests/pullrequest.mako:513
+             #: rhodecode/templates/pullrequests/pullrequest.mako:307
+             #: rhodecode/templates/pullrequests/pullrequest.mako:524
              msgid "Please select source and target"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:311
+             #: rhodecode/templates/pullrequests/pullrequest.mako:313
              msgid "Loading compare ..."
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:367
+             #: rhodecode/templates/pullrequests/pullrequest.mako:372
              msgid "Show detailed compare."
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:374
+             #: rhodecode/templates/pullrequests/pullrequest.mako:379
              msgid "There are no commits to merge."
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:424
-             #: rhodecode/templates/pullrequests/pullrequest.mako:450
+             #: rhodecode/templates/pullrequests/pullrequest.mako:429
+             #: rhodecode/templates/pullrequests/pullrequest.mako:455
              msgid "Select commit reference"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest.mako:440
+             #: rhodecode/templates/pullrequests/pullrequest.mako:445
              msgid "Target repository"
              msgstr ""
              msgid "Close with status {}"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:5
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:6
              #, python-format
              msgid "%s Pull Request #%s"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:51
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:52
              msgid "From"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:57
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:58
              msgid "Confirm to delete this pull request"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:88
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:89
              msgid "Common ancestor"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:100
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:101
              msgid "Copy the pull url"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:129
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:130
              msgid "Merge"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:140
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:141
              #: rhodecode/templates/summary/components.mako:66
              msgid "Copy the clone url"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:144
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:145
              msgid "Shadow repository data not available"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:152
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:153
              msgid "Review"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:181
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:169
+             msgid "Rendered using {} renderer"
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:183
              msgid "Versions"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:193
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:195
              msgid "Hide all versions of this pull request"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:218
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:220
              msgid "Your review status at this version"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:224
-             msgid "Comment from pull request version {0}, general:{1} inline:{2}"
-             msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:241
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:245
-             msgid "select versions to show changes"
-             msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:242
-             msgid "show changes between versions"
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:226
+             msgid "Comment from pull request version v{0}, general:{1} inline:{2}"
              msgstr ""
              #: rhodecode/templates/pullrequests/pullrequest_show.mako:243
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:247
+             msgid "select versions to show changes"
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:244
+             msgid "show changes between versions"
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:245
              msgid "show pull request for this version"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:258
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:260
              msgid "Comments at this version"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:262
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:264
              msgid "Comments for this pull request"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:267
              #: rhodecode/templates/pullrequests/pullrequest_show.mako:269
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:271
              #, python-format
              msgid "%d General "
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:273
              #: rhodecode/templates/pullrequests/pullrequest_show.mako:275
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:277
              #, python-format
              msgid "%d Inline"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:279
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:283
-             #, python-format
-             msgid "%d Outdated"
-             msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:280
-             msgid "show outdated comments"
-             msgstr ""
              #: rhodecode/templates/pullrequests/pullrequest_show.mako:281
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:285
+             #, python-format
+             msgid "%d Outdated"
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:282
+             msgid "show outdated comments"
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:283
              msgid "hide outdated comments"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:292
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:294
              msgid "Pull request versions not available"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:306
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:391
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:308
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:393
              msgid "Save Changes"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:408
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:410
              msgid "Missing requirements:"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:409
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:411
              msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled."
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:417
-             msgid "Missing commits"
-             msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:418
-             msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
-             msgstr ""
              #: rhodecode/templates/pullrequests/pullrequest_show.mako:419
+             msgid "Missing commits"
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:420
+             msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:421
              msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request."
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:430
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:422
+             msgid "Consider doing a {force_refresh_url} in case you think this is an error."
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:433
              #, python-format
              msgid "Showing changes at v%d, commenting is disabled."
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:453
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:455
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:456
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:458
              msgid "Update commits"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:455
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:458
              msgid "Update is disabled for current view"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:466
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:469
              msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:470
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:473
              msgid "commits added: {}, removed: {}"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:488
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:491
              msgid "Commit added in displayed changes"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:490
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:493
              msgid "Commit removed in displayed changes"
              msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:594
-             msgid "there is {num} general comment from older versions"
-             msgstr ""
-             #: rhodecode/templates/pullrequests/pullrequest_show.mako:595
-             msgid "show it"
-             msgstr ""
              #: rhodecode/templates/pullrequests/pullrequest_show.mako:597
-             msgid "there are {num} general comments from older versions"
+             msgid "there is {num} general comment from older versions"
              msgstr ""
              #: rhodecode/templates/pullrequests/pullrequest_show.mako:598
+             msgid "show it"
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:600
+             msgid "there are {num} general comments from older versions"
+             msgstr ""
+             #: rhodecode/templates/pullrequests/pullrequest_show.mako:601
              msgid "show them"
              msgstr ""

rhodecode/integrations/types/hipchat.py

0 +4 -2

              @async_task(ignore_result=True, base=RequestContextTask)
              def post_text_to_hipchat(settings, text):
                  log.debug('sending %s to hipchat %s' % (text, settings['server_url']))
-                 resp = requests.post(settings['server_url'], json={
+                 json_message = {
                      "message": text,
                      "color": settings.get('color', 'yellow'),
                      "notify": settings.get('notify', False),
-                 })
+                 }
+                 resp = requests.post(settings['server_url'], json=json_message, timeout=60)
                  resp.raise_for_status()  # raise exception on a failed request

rhodecode/integrations/types/slack.py

0 +1 -1

                      "attachments": [message_data]
                  }
-                 resp = requests.post(settings['service'], json=json_message)
+                 resp = requests.post(settings['service'], json=json_message, timeout=60)
                  resp.raise_for_status()  # raise exception on a failed request

rhodecode/integrations/types/webhook.py

0 +1 -1

                      resp = call_method(url, json={
                          'token': token,
                          'event': data
-                     }, headers=call_headers, auth=auth)
+                     }, headers=call_headers, auth=auth, timeout=60)
                      log.debug('Got Webhook response: %s', resp)
                      try:

rhodecode/lib/audit_logger.py

0 +28 -13

		@@ -241,20 +241,24 b' def store(action, user, action_data=None'
241	241	action_name = safe_unicode(action)
242	242	ip_address = safe_unicode(ip_addr)
243	243
244		user_log = _store_log(
245		action_name=action_name,
246		action_data=action_data or {},
247		user_id=user_id,
248		username=username,
249		user_data=user_data or {},
250		ip_address=ip_address,
251		repository_id=repository_id,
252		repository_name=repository_name
253		)
	244	with sa_session.no_autoflush:
	245	update_user_last_activity(sa_session, user_id)
254	246
255		sa_session.add(user_log)
256		if commit:
257		sa_session.commit()
	247	user_log = _store_log(
	248	action_name=action_name,
	249	action_data=action_data or {},
	250	user_id=user_id,
	251	username=username,
	252	user_data=user_data or {},
	253	ip_address=ip_address,
	254	repository_id=repository_id,
	255	repository_name=repository_name
	256	)
	257
	258	sa_session.add(user_log)
	259
	260	if commit:
	261	sa_session.commit()
258	262
259	263	entry_id = user_log.entry_id or ''
260	264	log.info('AUDIT[%s]: Logging action: `%s` by user:id:%s[%s] ip:%s',
		@@ -262,3 +266,14 b' def store(action, user, action_data=None'
262	266
263	267	except Exception:
264	268	log.exception('AUDIT: failed to store audit log')
	269
	270
	271	def update_user_last_activity(sa_session, user_id):
	272	_last_activity = datetime.datetime.now()
	273	try:
	274	sa_session.query(User).filter(User.user_id == user_id).update(
	275	{"last_activity": _last_activity})
	276	log.debug(
	277	'updated user `%s` last activity to:%s', user_id, _last_activity)
	278	except Exception:
	279	log.exception("Failed last activity update")

rhodecode/lib/auth.py

0 +297 -145

              """
              import os
+             import time
              import inspect
              import collections
              import fnmatch
              from rhodecode.model.db import (
                  User, Repository, Permission, UserToPerm, UserGroupToPerm, UserGroupMember,
                  UserIpMap, UserApiKeys, RepoGroup, UserGroup)
-             from rhodecode.lib import caches
-             from rhodecode.lib.utils2 import safe_unicode, aslist, safe_str, md5
+             from rhodecode.lib import rc_cache
+             from rhodecode.lib.utils2 import safe_unicode, aslist, safe_str, md5, safe_int, sha1
              from rhodecode.lib.utils import (
                  get_repo_slug, get_repo_group_slug, get_user_group_slug)
              from rhodecode.lib.caching_query import FromCache
                  def gen_password(self, length, type_=None):
                      if type_ is None:
                          type_ = self.ALPHABETS_FULL
-                     self.passwd = ''.join([random.choice(type_) for _ in xrange(length)])
+                     self.passwd = ''.join([random.choice(type_) for _ in range(length)])
                      return self.passwd
                      return hashlib.sha256(password).hexdigest() == hashed
-             class _RhodeCodeCryptoMd5(_RhodeCodeCryptoBase):
+             class _RhodeCodeCryptoTest(_RhodeCodeCryptoBase):
                  ENC_PREF = '_'
                  def hash_create(self, str_):
                      self._assert_bytes(str_)
-                     return hashlib.md5(str_).hexdigest()
+                     return sha1(str_)
                  def hash_check(self, password, hashed):
                      """
                      :param hashed: password in hashed form
                      """
                      self._assert_bytes(password)
-                     return hashlib.md5(password).hexdigest() == hashed
+                     return sha1(password) == hashed
              def crypto_backend():
                  """
                  Return the matching crypto backend.
-                 Selection is based on if we run tests or not, we pick md5 backend to run
+                 Selection is based on if we run tests or not, we pick sha1-test backend to run
                  tests faster since BCRYPT is expensive to calculate
                  """
                  if rhodecode.is_test:
-                     RhodeCodeCrypto = _RhodeCodeCryptoMd5()
+                     RhodeCodeCrypto = _RhodeCodeCryptoTest()
                  else:
                      RhodeCodeCrypto = _RhodeCodeCryptoBCrypt()
                      self.perm_origin_stack = collections.OrderedDict()
                  def __setitem__(self, key, (perm, origin)):
-                     self.perm_origin_stack.setdefault(key, []).append((perm, origin))
+                     self.perm_origin_stack.setdefault(key, []).append(
+                         (perm, origin))
                      dict.__setitem__(self, key, perm)
+             class BranchPermOriginDict(PermOriginDict):
+                 """
+                 Dedicated branch permissions dict, with tracking of patterns and origins.
+                 >>> perms = BranchPermOriginDict()
+                 >>> perms['resource'] = '*pattern', 'read', 'default'
+                 >>> perms['resource']
+                 {'*pattern': 'read'}
+                 >>> perms['resource'] = '*pattern', 'write', 'admin'
+                 >>> perms['resource']
+                 {'*pattern': 'write'}
+                 >>> perms.perm_origin_stack
+                 {'resource': {'*pattern': [('read', 'default'), ('write', 'admin')]}}
+                 """
+                 def __setitem__(self, key, (pattern, perm, origin)):
+                     self.perm_origin_stack.setdefault(key, {}) \
+                         .setdefault(pattern, []).append((perm, origin))
+                     if key in self:
+                         self[key].__setitem__(pattern, perm)
+                     else:
+                         patterns = collections.OrderedDict()
+                         patterns[pattern] = perm
+                         dict.__setitem__(self, key, patterns)
              class PermissionCalculator(object):
                  def __init__(
                          self, user_id, scope, user_is_admin,
                          user_inherit_default_permissions, explicit, algo,
-                         calculate_super_admin=False):
+                         calculate_super_admin_as_user=False):
                      self.user_id = user_id
                      self.user_is_admin = user_is_admin
                      self.inherit_default_permissions = user_inherit_default_permissions
                      self.explicit = explicit
                      self.algo = algo
-                     self.calculate_super_admin = calculate_super_admin
+                     self.calculate_super_admin_as_user = calculate_super_admin_as_user
                      scope = scope or {}
                      self.scope_repo_id = scope.get('repo_id')
                      self.permissions_repositories = PermOriginDict()
                      self.permissions_repository_groups = PermOriginDict()
                      self.permissions_user_groups = PermOriginDict()
+                     self.permissions_repository_branches = BranchPermOriginDict()
                      self.permissions_global = set()
                      self.default_repo_perms = Permission.get_default_repo_perms(
                          Permission.get_default_user_group_perms(
                              self.default_user_id, self.scope_user_group_id)
+                     # default branch perms
+                     self.default_branch_repo_perms = \
+                         Permission.get_default_repo_branch_perms(
+                             self.default_user_id, self.scope_repo_id)
                  def calculate(self):
-                     if self.user_is_admin and not self.calculate_super_admin:
-                         return self._admin_permissions()
+                     if self.user_is_admin and not self.calculate_super_admin_as_user:
+                         return self._calculate_admin_permissions()
                      self._calculate_global_default_permissions()
                      self._calculate_global_permissions()
                      self._calculate_default_permissions()
                      self._calculate_repository_permissions()
+                     self._calculate_repository_branch_permissions()
                      self._calculate_repository_group_permissions()
                      self._calculate_user_group_permissions()
                      return self._permission_structure()
-                 def _admin_permissions(self):
+                 def _calculate_admin_permissions(self):
                      """
                      admin user have all default rights for repositories
                      and groups set to admin
                          p = 'usergroup.admin'
                          self.permissions_user_groups[u_k] = p, PermOrigin.SUPER_ADMIN
+                     # branch permissions
+                     # since super-admin also can have custom rule permissions
+                     # we *always* need to calculate those inherited from default, and also explicit
+                     self._calculate_default_permissions_repository_branches(
+                         user_inherit_object_permissions=False)
+                     self._calculate_repository_branch_permissions()
                      return self._permission_structure()
                  def _calculate_global_default_permissions(self):
                      # now we read the defined permissions and overwrite what we have set
                      # before those can be configured from groups or users explicitly.
-                     # TODO: johbo: This seems to be out of sync, find out the reason
-                     # for the comment below and update it.
-                     # In case we want to extend this list we should be always in sync with
-                     # User.DEFAULT_USER_PERMISSIONS definitions
+                     # In case we want to extend this list we should make sure
+                     # this is in sync with User.DEFAULT_USER_PERMISSIONS definitions
                      _configurable = frozenset([
                          'hg.fork.none', 'hg.fork.repository',
                          'hg.create.none', 'hg.create.repository',
                          'hg.usergroup.create.false', 'hg.usergroup.create.true',
                          'hg.repogroup.create.false', 'hg.repogroup.create.true',
-                         'hg.create.write_on_repogroup.false',
-                         'hg.create.write_on_repogroup.true',
+                         'hg.create.write_on_repogroup.false', 'hg.create.write_on_repogroup.true',
                          'hg.inherit_default_perms.false', 'hg.inherit_default_perms.true'
                      ])
                      for gr, perms in _explicit_grouped_perms:
                          # since user can be in multiple groups iterate over them and
                          # select the lowest permissions first (more explicit)
-                         # TODO: marcink: do this^^
+                         # TODO(marcink): do this^^
                          # group doesn't inherit default permissions so we actually set them
                          if not gr.inherit_default_permissions:
                          for perm in user_perms:
                              self.permissions_global.add(perm.permission.permission_name)
-                 def _calculate_default_permissions(self):
-                     """
-                     Set default user permissions for repositories, repository groups
-                     taken from the default user.
-                     Calculate inheritance of object permissions based on what we have now
-                     in GLOBAL permissions. We check if .false is in GLOBAL since this is
-                     explicitly set. Inherit is the opposite of .false being there.
-                     .. note::
-                        the syntax is little bit odd but what we need to check here is
-                        the opposite of .false permission being in the list so even for
-                        inconsistent state when both .true/.false is there
-                        .false is more important
-                     """
-                     user_inherit_object_permissions = not ('hg.inherit_default_perms.false'
-                                                            in self.permissions_global)
-                     # defaults for repositories, taken from `default` user permissions
-                     # on given repo
+                 def _calculate_default_permissions_repositories(self, user_inherit_object_permissions):
                      for perm in self.default_repo_perms:
                          r_k = perm.UserRepoToPerm.repository.repo_name
                          p = perm.Permission.permission_name
                              o = PermOrigin.SUPER_ADMIN
                              self.permissions_repositories[r_k] = p, o
-                     # defaults for repository groups taken from `default` user permission
-                     # on given group
+                 def _calculate_default_permissions_repository_branches(self, user_inherit_object_permissions):
+                     for perm in self.default_branch_repo_perms:
+                         r_k = perm.UserRepoToPerm.repository.repo_name
+                         p = perm.Permission.permission_name
+                         pattern = perm.UserToRepoBranchPermission.branch_pattern
+                         o = PermOrigin.REPO_USER % perm.UserRepoToPerm.user.username
+                         if not self.explicit:
+                             # TODO(marcink): fix this for multiple entries
+                             cur_perm = self.permissions_repository_branches.get(r_k) or 'branch.none'
+                             p = self._choose_permission(p, cur_perm)
+                         # NOTE(marcink): register all pattern/perm instances in this
+                         # special dict that aggregates entries
+                         self.permissions_repository_branches[r_k] = pattern, p, o
+                 def _calculate_default_permissions_repository_groups(self, user_inherit_object_permissions):
                      for perm in self.default_repo_groups_perms:
                          rg_k = perm.UserRepoGroupToPerm.group.group_name
                          p = perm.Permission.permission_name
                              o = PermOrigin.SUPER_ADMIN
                              self.permissions_repository_groups[rg_k] = p, o
-                     # defaults for user groups taken from `default` user permission
-                     # on given user group
+                 def _calculate_default_permissions_user_groups(self, user_inherit_object_permissions):
                      for perm in self.default_user_group_perms:
                          u_k = perm.UserUserGroupToPerm.user_group.users_group_name
                          p = perm.Permission.permission_name
                              o = PermOrigin.SUPER_ADMIN
                              self.permissions_user_groups[u_k] = p, o
+                 def _calculate_default_permissions(self):
+                     """
+                     Set default user permissions for repositories, repository branches,
+                     repository groups, user groups taken from the default user.
+                     Calculate inheritance of object permissions based on what we have now
+                     in GLOBAL permissions. We check if .false is in GLOBAL since this is
+                     explicitly set. Inherit is the opposite of .false being there.
+                     .. note::
+                        the syntax is little bit odd but what we need to check here is
+                        the opposite of .false permission being in the list so even for
+                        inconsistent state when both .true/.false is there
+                        .false is more important
+                     """
+                     user_inherit_object_permissions = not ('hg.inherit_default_perms.false'
+                                                            in self.permissions_global)
+                     # default permissions inherited from `default` user permissions
+                     self._calculate_default_permissions_repositories(
+                         user_inherit_object_permissions)
+                     self._calculate_default_permissions_repository_branches(
+                         user_inherit_object_permissions)
+                     self._calculate_default_permissions_repository_groups(
+                         user_inherit_object_permissions)
+                     self._calculate_default_permissions_user_groups(
+                         user_inherit_object_permissions)
                  def _calculate_repository_permissions(self):
                      """
                      Repository permissions for the current user.
                              o = PermOrigin.SUPER_ADMIN
                              self.permissions_repositories[r_k] = p, o
+                 def _calculate_repository_branch_permissions(self):
+                     # user group for repositories permissions
+                     user_repo_branch_perms_from_user_group = Permission\
+                         .get_default_repo_branch_perms_from_user_group(
+                             self.user_id, self.scope_repo_id)
+                     multiple_counter = collections.defaultdict(int)
+                     for perm in user_repo_branch_perms_from_user_group:
+                         r_k = perm.UserGroupRepoToPerm.repository.repo_name
+                         p = perm.Permission.permission_name
+                         pattern = perm.UserGroupToRepoBranchPermission.branch_pattern
+                         o = PermOrigin.REPO_USERGROUP % perm.UserGroupRepoToPerm\
+                             .users_group.users_group_name
+                         multiple_counter[r_k] += 1
+                         if multiple_counter[r_k] > 1:
+                             # TODO(marcink): fix this for multi branch support, and multiple entries
+                             cur_perm = self.permissions_repository_branches[r_k]
+                             p = self._choose_permission(p, cur_perm)
+                         self.permissions_repository_branches[r_k] = pattern, p, o
+                     # user explicit branch permissions for repositories, overrides
+                     # any specified by the group permission
+                     user_repo_branch_perms = Permission.get_default_repo_branch_perms(
+                         self.user_id, self.scope_repo_id)
+                     for perm in user_repo_branch_perms:
+                         r_k = perm.UserRepoToPerm.repository.repo_name
+                         p = perm.Permission.permission_name
+                         pattern = perm.UserToRepoBranchPermission.branch_pattern
+                         o = PermOrigin.REPO_USER % perm.UserRepoToPerm.user.username
+                         if not self.explicit:
+                             # TODO(marcink): fix this for multiple entries
+                             cur_perm = self.permissions_repository_branches.get(r_k) or 'branch.none'
+                             p = self._choose_permission(p, cur_perm)
+                         # NOTE(marcink): register all pattern/perm instances in this
+                         # special dict that aggregates entries
+                         self.permissions_repository_branches[r_k] = pattern, p, o
                  def _calculate_repository_group_permissions(self):
                      """
                      Repository group permissions for the current user.
                      return {
                          'global': self.permissions_global,
                          'repositories': self.permissions_repositories,
+                         'repository_branches': self.permissions_repository_branches,
                          'repositories_groups': self.permissions_repository_groups,
                          'user_groups': self.permissions_user_groups,
                      }
                  @LazyProperty
                  def permissions(self):
-                     return self.get_perms(user=self, cache=False)
+                     return self.get_perms(user=self, cache=None)
                  @LazyProperty
                  def permissions_safe(self):
                      """
                      Filtered permissions excluding not allowed repositories
                      """
-                     perms = self.get_perms(user=self, cache=False)
+                     perms = self.get_perms(user=self, cache=None)
                      perms['repositories'] = {
-                         k: v for k, v in perms['repositories'].iteritems()
+                         k: v for k, v in perms['repositories'].items()
                          if v != 'repository.none'}
                      perms['repositories_groups'] = {
-                         k: v for k, v in perms['repositories_groups'].iteritems()
+                         k: v for k, v in perms['repositories_groups'].items()
                          if v != 'group.none'}
                      perms['user_groups'] = {
-                         k: v for k, v in perms['user_groups'].iteritems()
+                         k: v for k, v in perms['user_groups'].items()
                          if v != 'usergroup.none'}
+                     perms['repository_branches'] = {
+                         k: v for k, v in perms['repository_branches'].iteritems()
+                         if v != 'branch.none'}
                      return perms
                  @LazyProperty
                  def permissions_full_details(self):
                      return self.get_perms(
-                         user=self, cache=False, calculate_super_admin=True)
+                         user=self, cache=None, calculate_super_admin=True)
                  def permissions_with_scope(self, scope):
                      """
                          obj = Repository.get_by_repo_name(scope['repo_name'])
                          if obj:
                              scope['repo_id'] = obj.repo_id
-                     _scope = {
-                         'repo_id': -1,
-                         'user_group_id': -1,
-                         'repo_group_id': -1,
+                     }
-                     _scope.update(scope)
-                     cache_key = "_".join(map(safe_str, reduce(lambda a, b: a+b,
-                                                               _scope.items())))
-                     if cache_key not in self._permissions_scoped_cache:
-                         # store in cache to mimic how the @LazyProperty works,
-                         # the difference here is that we use the unique key calculated
-                         # from params and values
-                         res = self.get_perms(user=self, cache=False, scope=_scope)
-                         self._permissions_scoped_cache[cache_key] = res
-                     return self._permissions_scoped_cache[cache_key]
+                     _scope = collections.OrderedDict()
+                     _scope['repo_id'] = -1
+                     _scope['user_group_id'] = -1
+                     _scope['repo_group_id'] = -1
+                     for k in sorted(scope.keys()):
+                         _scope[k] = scope[k]
+                     # store in cache to mimic how the @LazyProperty works,
+                     # the difference here is that we use the unique key calculated
+                     # from params and values
+                     return self.get_perms(user=self, cache=None, scope=_scope)
                  def get_instance(self):
                      return User.get(self.user_id)
-                 def update_lastactivity(self):
-                     if self.user_id:
-                         User.get(self.user_id).update_lastactivity()
                  def propagate_data(self):
                      """
                      Fills in user data and propagates values to this instance. Maps fetched
                      log.debug('AuthUser: propagated user is now %s', self)
                  def get_perms(self, user, scope=None, explicit=True, algo='higherwin',
-                               calculate_super_admin=False, cache=False):
+                               calculate_super_admin=False, cache=None):
                      """
                      Fills user permission attribute with permissions taken from database
                      works for permissions given for repositories, and for permissions that
                          it's multiple defined, eg user in two different groups. It also
                          decides if explicit flag is turned off how to specify the permission
                          for case when user is in a group + have defined separate permission
+                     :param calculate_super_admin: calculate permissions for super-admin in the
+                         same way as for regular user without speedups
+                     :param cache: Use caching for calculation, None = let the cache backend decide
                      """
                      user_id = user.user_id
                      user_is_admin = user.is_admin
                      # inheritance of global permissions like create repo/fork repo etc
                      user_inherit_default_permissions = user.inherit_default_permissions
-                     log.debug('Computing PERMISSION tree for scope %s' % (scope, ))
-                     compute = caches.conditional_cache(
-                         'short_term', 'cache_desc',
-                         condition=cache, func=_cached_perms_data)
-                     result = compute(user_id, scope, user_is_admin,
-                                      user_inherit_default_permissions, explicit, algo,
-                                      calculate_super_admin)
+                     cache_seconds = safe_int(
+                         rhodecode.CONFIG.get('rc_cache.cache_perms.expiration_time'))
+                     if cache is None:
+                         # let the backend cache decide
+                         cache_on = cache_seconds > 0
+                     else:
+                         cache_on = cache
+                     log.debug(
+                         'Computing PERMISSION tree for user %s scope `%s` '
+                         'with caching: %s[TTL: %ss]' % (user, scope, cache_on, cache_seconds or 0))
+                     cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
+                     region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                                            condition=cache_on)
+                     def compute_perm_tree(cache_name,
+                             user_id, scope, user_is_admin,user_inherit_default_permissions,
+                             explicit, algo, calculate_super_admin):
+                         return _cached_perms_data(
+                             user_id, scope, user_is_admin, user_inherit_default_permissions,
+                             explicit, algo, calculate_super_admin)
+                     start = time.time()
+                     result = compute_perm_tree(
+                         'permissions', user_id, scope, user_is_admin,
+                          user_inherit_default_permissions, explicit, algo,
+                          calculate_super_admin)
                      result_repr = []
                      for k in result:
                          result_repr.append((k, len(result[k])))
-                     log.debug('PERMISSION tree computed %s' % (result_repr,))
+                     total = time.time() - start
+                     log.debug('PERMISSION tree for user %s computed in %.3fs: %s' % (
+                         user, total, result_repr))
                      return result
                  @property
                      Returns list of repositories you're an admin of
                      """
                      return [
-                         x[0] for x in self.permissions['repositories'].iteritems()
+                         x[0] for x in self.permissions['repositories'].items()
                          if x[1] == 'repository.admin']
                  @property
                      Returns list of repository groups you're an admin of
                      """
                      return [
-                         x[0] for x in self.permissions['repositories_groups'].iteritems()
+                         x[0] for x in self.permissions['repositories_groups'].items()
                          if x[1] == 'group.admin']
                  @property
                      Returns list of user groups you're an admin of
                      """
                      return [
-                         x[0] for x in self.permissions['user_groups'].iteritems()
+                         x[0] for x in self.permissions['user_groups'].items()
                          if x[1] == 'usergroup.admin']
                  def repo_acl_ids(self, perms=None, name_filter=None, cache=False):
                          perms = [
                              'repository.read', 'repository.write', 'repository.admin']
-                     def _cached_repo_acl(user_id, perm_def, name_filter):
+                     def _cached_repo_acl(user_id, perm_def, _name_filter):
                          qry = Repository.query()
-                         if name_filter:
-                             ilike_expression = u'%{}%'.format(safe_unicode(name_filter))
+                         if _name_filter:
+                             ilike_expression = u'%{}%'.format(safe_unicode(_name_filter))
                              qry = qry.filter(
                                  Repository.repo_name.ilike(ilike_expression))
                          return [x.repo_id for x in
                                  RepoList(qry, perm_set=perm_def)]
-                     compute = caches.conditional_cache(
-                         'long_term', 'repo_acl_ids',
-                         condition=cache, func=_cached_repo_acl)
-                     return compute(self.user_id, perms, name_filter)
+                     return _cached_repo_acl(self.user_id, perms, name_filter)
                  def repo_group_acl_ids(self, perms=None, name_filter=None, cache=False):
                      """
                          perms = [
                              'group.read', 'group.write', 'group.admin']
-                     def _cached_repo_group_acl(user_id, perm_def, name_filter):
+                     def _cached_repo_group_acl(user_id, perm_def, _name_filter):
                          qry = RepoGroup.query()
-                         if name_filter:
-                             ilike_expression = u'%{}%'.format(safe_unicode(name_filter))
+                         if _name_filter:
+                             ilike_expression = u'%{}%'.format(safe_unicode(_name_filter))
                              qry = qry.filter(
                                  RepoGroup.group_name.ilike(ilike_expression))
                          return [x.group_id for x in
                                  RepoGroupList(qry, perm_set=perm_def)]
-                     compute = caches.conditional_cache(
-                         'long_term', 'repo_group_acl_ids',
-                         condition=cache, func=_cached_repo_group_acl)
-                     return compute(self.user_id, perms, name_filter)
+                     return _cached_repo_group_acl(self.user_id, perms, name_filter)
                  def user_group_acl_ids(self, perms=None, name_filter=None, cache=False):
                      """
                          return [x.users_group_id for x in
                                  UserGroupList(qry, perm_set=perm_def)]
-                     compute = caches.conditional_cache(
-                         'long_term', 'user_group_acl_ids',
-                         condition=cache, func=_cached_user_group_acl)
-                     return compute(self.user_id, perms, name_filter)
+                     return _cached_user_group_acl(self.user_id, perms, name_filter)
                  @property
                  def ip_allowed(self):
                      allowed_ips = AuthUser.get_allowed_ips(
                          user_id, cache=True, inherit_from_default=inherit_from_default)
                      if check_ip_access(source_ip=ip_addr, allowed_ips=allowed_ips):
-                         log.debug('IP:%s is in range of %s' % (ip_addr, allowed_ips))
+                         log.debug('IP:%s for user %s is in range of %s' % (
+                             ip_addr, user_id, allowed_ips))
                          return True
                      else:
-                         log.info('Access for IP:%s forbidden, '
-                                  'not in %s' % (ip_addr, allowed_ips))
+                         log.info('Access for IP:%s forbidden for user %s, '
+                                  'not in %s' % (ip_addr, user_id, allowed_ips))
                          return False
+                 def get_branch_permissions(self, repo_name, perms=None):
+                     perms = perms or self.permissions_with_scope({'repo_name': repo_name})
+                     branch_perms = perms.get('repository_branches', {})
+                     if not branch_perms:
+                         return {}
+                     repo_branch_perms = branch_perms.get(repo_name)
+                     return repo_branch_perms or {}
+                 def get_rule_and_branch_permission(self, repo_name, branch_name):
+                     """
+                     Check if this AuthUser has defined any permissions for branches. If any of
+                     the rules match in order, we return the matching permissions
+                     """
+                     rule = default_perm = ''
+                     repo_branch_perms = self.get_branch_permissions(repo_name=repo_name)
+                     if not repo_branch_perms:
+                         return rule, default_perm
+                     # now calculate the permissions
+                     for pattern, branch_perm in repo_branch_perms.items():
+                         if fnmatch.fnmatch(branch_name, pattern):
+                             rule = '`{}`=>{}'.format(pattern, branch_perm)
+                             return rule, branch_perm
+                     return rule, default_perm
                  def __repr__(self):
                      return "<AuthUser('id:%s[%s] ip:%s auth:%s')>"\
                          % (self.user_id, self.username, self.ip_addr, self.is_authenticated)
                      _set = set()
                      if inherit_from_default:
-                         default_ips = UserIpMap.query().filter(
-                             UserIpMap.user == User.get_default_user(cache=True))
+                         def_user_id = User.get_default_user(cache=True).user_id
+                         default_ips = UserIpMap.query().filter(UserIpMap.user_id == def_user_id)
                          if cache:
                              default_ips = default_ips.options(
                                  FromCache("sql_cache_short", "get_user_ips_default"))
                                  # we get deleted objects here, we just skip them
                                  pass
-                     user_ips = UserIpMap.query().filter(UserIpMap.user_id == user_id)
-                     if cache:
-                         user_ips = user_ips.options(
-                             FromCache("sql_cache_short", "get_user_ips_%s" % user_id))
+                     # NOTE:(marcink) we don't want to load any rules for empty
+                     # user_id which is the case of access of non logged users when anonymous
+                     # access is disabled
+                     user_ips = []
+                     if user_id:
+                         user_ips = UserIpMap.query().filter(UserIpMap.user_id == user_id)
+                         if cache:
+                             user_ips = user_ips.options(
+                                 FromCache("sql_cache_short", "get_user_ips_%s" % user_id))
                      for ip in user_ips:
                          try:
                              # since we use heavy caching sometimes it happens that we get
                              # deleted objects here, we just skip them
                              pass
-                     return _set or set(['0.0.0.0/0', '::/0'])
+                     return _set or {ip for ip in ['0.0.0.0/0', '::/0']}
              def set_available_permissions(settings):
                              'user %s authenticating with:%s IS authenticated on func %s'
                              % (user, reason, loc))
-                         # update user data to check last activity
-                         user.update_lastactivity()
-                         Session().commit()
                          return func(*fargs, **fkwargs)
                      else:
                          log.warning(
                      repo_name = self._get_repo_name()
                      try:
-                         user_perms = set([perms['repositories'][repo_name]])
+                         user_perms = {perms['repositories'][repo_name]}
                      except KeyError:
                          log.debug('cannot locate repo with name: `%s` in permissions defs',
                                    repo_name)
                      repo_name = self._get_repo_name()
                      try:
-                         user_perms = set([perms['repositories'][repo_name]])
+                         user_perms = {perms['repositories'][repo_name]}
                      except KeyError:
                          log.debug(
                              'cannot locate repo with name: `%s` in permissions defs',
                      perms = user.permissions
                      group_name = self._get_repo_group_name()
                      try:
-                         user_perms = set([perms['repositories_groups'][group_name]])
+                         user_perms = {perms['repositories_groups'][group_name]}
                      except KeyError:
                          log.debug(
                              'cannot locate repo group with name: `%s` in permissions defs',
                      group_name = self._get_repo_group_name()
                      try:
-                         user_perms = set([perms['repositories_groups'][group_name]])
+                         user_perms = {perms['repositories_groups'][group_name]}
                      except KeyError:
                          log.debug(
                              'cannot locate repo group with name: `%s` in permissions defs',
                      perms = user.permissions
                      group_name = self._get_user_group_name()
                      try:
-                         user_perms = set([perms['user_groups'][group_name]])
+                         user_perms = {perms['user_groups'][group_name]}
                      except KeyError:
                          return False
                      perms = user.permissions
                      group_name = self._get_user_group_name()
                      try:
-                         user_perms = set([perms['user_groups'][group_name]])
+                         user_perms = {perms['user_groups'][group_name]}
                      except KeyError:
                          return False
                  def __call__(self, check_location='', user=None):
                      if not user:
                          log.debug('Using user attribute from global request')
-                         # TODO: remove this someday,put as user as attribute here
                          request = self._get_request()
                          user = request.user
                      self.repo_name = self._get_repo_name()
                      perms = user.permissions
                      try:
-                         user_perms = set([perms['repositories'][self.repo_name]])
+                         user_perms = {perms['repositories'][self.repo_name]}
                      except KeyError:
                          return False
                      if self.required_perms.issubset(user_perms):
                      self.repo_name = self._get_repo_name()
                      perms = user.permissions
                      try:
-                         user_perms = set([perms['repositories'][self.repo_name]])
+                         user_perms = {perms['repositories'][self.repo_name]}
                      except KeyError:
                          return False
                      if self.required_perms.intersection(user_perms):
                  def check_permissions(self, user):
                      perms = user.permissions
                      try:
-                         user_perms = set(
-                             [perms['repositories_groups'][self.repo_group_name]])
+                         user_perms = {perms['repositories_groups'][self.repo_group_name]}
                      except KeyError:
                          return False
                      if self.required_perms.intersection(user_perms):
                  def check_permissions(self, user):
                      perms = user.permissions
                      try:
-                         user_perms = set(
-                             [perms['repositories_groups'][self.repo_group_name]])
+                         user_perms = {perms['repositories_groups'][self.repo_group_name]}
                      except KeyError:
                          return False
                      if self.required_perms.issubset(user_perms):
                  def check_permissions(self, user):
                      perms = user.permissions
                      try:
-                         user_perms = set([perms['user_groups'][self.user_group_name]])
+                         user_perms = {perms['user_groups'][self.user_group_name]}
                      except KeyError:
                          return False
                      if self.required_perms.intersection(user_perms):
                  def check_permissions(self, user):
                      perms = user.permissions
                      try:
-                         user_perms = set([perms['user_groups'][self.user_group_name]])
+                         user_perms = {perms['user_groups'][self.user_group_name]}
                      except KeyError:
                          return False
                      if self.required_perms.issubset(user_perms):
                  def __init__(self, *perms):
                      self.required_perms = set(perms)
-                 def __call__(self, user, repo_name):
+                 def __call__(self, auth_user, repo_name):
                      # repo_name MUST be unicode, since we handle keys in permission
                      # dict by unicode
                      repo_name = safe_unicode(repo_name)
-                     user = AuthUser(user.user_id)
                      log.debug(
                          'Checking VCS protocol permissions %s for user:%s repo:`%s`',
-                         self.required_perms, user, repo_name)
-                     if self.check_permissions(user, repo_name):
+                         self.required_perms, auth_user, repo_name)
+                     if self.check_permissions(auth_user, repo_name):
                          log.debug('Permission to repo:`%s` GRANTED for user:%s @ %s',
-                                   repo_name, user, 'PermissionMiddleware')
+                                   repo_name, auth_user, 'PermissionMiddleware')
                          return True
                      else:
                          log.debug('Permission to repo:`%s` DENIED for user:%s @ %s',
-                                   repo_name, user, 'PermissionMiddleware')
+                                   repo_name, auth_user, 'PermissionMiddleware')
                          return False
                  def check_permissions(self, user, repo_name):
                      perms = user.permissions_with_scope({'repo_name': repo_name})
                      try:
-                         user_perms = set([perms['repositories'][repo_name]])
+                         user_perms = {perms['repositories'][repo_name]}
                      except Exception:
                          log.exception('Error while accessing user permissions')
                          return False
                  def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                                        user_group_name=None):
                      try:
-                         _user_perms = set([perm_defs['repositories'][repo_name]])
+                         _user_perms = {perm_defs['repositories'][repo_name]}
                      except KeyError:
                          log.warning(traceback.format_exc())
                          return False
                  def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                                        user_group_name=None):
                      try:
-                         _user_perms = set([perm_defs['repositories'][repo_name]])
+                         _user_perms = {perm_defs['repositories'][repo_name]}
                      except KeyError:
                          log.warning(traceback.format_exc())
                          return False
                  def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                                        user_group_name=None):
                      try:
-                         _user_perms = set([perm_defs['repositories_groups'][group_name]])
+                         _user_perms = {perm_defs['repositories_groups'][group_name]}
                      except KeyError:
                          log.warning(traceback.format_exc())
                          return False
                  def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                                        user_group_name=None):
                      try:
-                         _user_perms = set([perm_defs['repositories_groups'][group_name]])
+                         _user_perms = {perm_defs['repositories_groups'][group_name]}
                      except KeyError:
                          log.warning(traceback.format_exc())
                          return False
                  def check_permissions(self, perm_defs, repo_name=None, group_name=None,
                                        user_group_name=None):
                      try:
-                         _user_perms = set([perm_defs['user_groups'][user_group_name]])
+                         _user_perms = {perm_defs['user_groups'][user_group_name]}
                      except KeyError:
                          log.warning(traceback.format_exc())
                          return False

rhodecode/lib/base.py

0 +10 -6

              from rhodecode.lib.exceptions import UserCreationError
              from rhodecode.lib.utils import (password_changed, get_enabled_hook_classes)
              from rhodecode.lib.utils2 import (
-                 str2bool, safe_unicode, AttributeDict, safe_int, md5, aslist, safe_str)
+                 str2bool, safe_unicode, AttributeDict, safe_int, sha1, aslist, safe_str)
              from rhodecode.model.db import Repository, User, ChangesetComment
              from rhodecode.model.notification import NotificationModel
              from rhodecode.model.settings import VcsSettingsModel, SettingsModel
              def vcs_operation_context(
                      environ, repo_name, username, action, scm, check_locking=True,
-                     is_shadow_repo=False):
+                     is_shadow_repo=False, check_branch_perms=False, detect_force_push=False):
                  """
                  Generate the context for a vcs operation, e.g. push or pull.
                  settings_model = VcsSettingsModel(repo=repo_name)
                  ui_settings = settings_model.get_ui_settings()
-                 extras = {
+                 # NOTE(marcink): This should be also in sync with
+                 # rhodecode/apps/ssh_support/lib/backends/base.py:update_enviroment scm_data
+                 scm_data = {
                      'ip': get_ip_addr(environ),
                      'username': username,
                      'user_id': user_id,
                      'user_agent': get_user_agent(environ),
                      'hooks': get_enabled_hook_classes(ui_settings),
                      'is_shadow_repo': is_shadow_repo,
+                     'detect_force_push': detect_force_push,
+                     'check_branch_perms': check_branch_perms,
                  }
-                 return extras
+                 return scm_data
              class BasicAuth(AuthBasicAuthenticator):
              def calculate_version_hash(config):
-                 return md5(
+                 return sha1(
                      config.get('beaker.session.secret', '') +
                      rhodecode.__version__)[:8]
                  # allow pyramid lookup in testing
                  config.include('pyramid_mako')
                  config.include('pyramid_beaker')
-                 config.include('rhodecode.lib.caches')
+                 config.include('rhodecode.lib.rc_cache')
                  add_events_routes(config)

rhodecode/lib/caching_query.py

0 +138 -165

              # RhodeCode Enterprise Edition, including its added features, Support services,
              # and proprietary license terms, please see https://rhodecode.com/licenses/
-             """
-             caching_query.py
+             """caching_query.py
-             Represent persistence structures which allow the usage of
-             Beaker caching with SQLAlchemy.
+             Represent functions and classes
+             which allow the usage of Dogpile caching with SQLAlchemy.
+             Introduces a query option called FromCache.
              The three new concepts introduced here are:
               * CachingQuery - a Query subclass that caches and
-                retrieves results in/from Beaker.
+                retrieves results in/from dogpile.cache.
               * FromCache - a query option that establishes caching
                 parameters on a Query
               * RelationshipCache - a variant of FromCache which is specific
                 a Query.
              The rest of what's here are standard SQLAlchemy and
-             Beaker constructs.
+             dogpile.cache constructs.
              """
-             import beaker
-             from beaker.exceptions import BeakerException
              from sqlalchemy.orm.interfaces import MapperOption
              from sqlalchemy.orm.query import Query
              from sqlalchemy.sql import visitors
+             from dogpile.cache.api import NO_VALUE
              from rhodecode.lib.utils2 import safe_str
              class CachingQuery(Query):
-                 """A Query subclass which optionally loads full results from a Beaker
+                 """A Query subclass which optionally loads full results from a dogpile
                  cache region.
-                 The CachingQuery stores additional state that allows it to consult
-                 a Beaker cache before accessing the database:
-                 * A "region", which is a cache region argument passed to a
-                   Beaker CacheManager, specifies a particular cache configuration
-                   (including backend implementation, expiration times, etc.)
-                 * A "namespace", which is a qualifying name that identifies a
-                   group of keys within the cache.  A query that filters on a name
-                   might use the name "by_name", a query that filters on a date range
-                   to a joined table might use the name "related_date_range".
-                 When the above state is present, a Beaker cache is retrieved.
-                 The "namespace" name is first concatenated with
-                 a string composed of the individual entities and columns the Query
-                 requests, i.e. such as ``Query(User.id, User.name)``.
-                 The Beaker cache is then loaded from the cache manager based
-                 on the region and composed namespace.  The key within the cache
-                 itself is then constructed against the bind parameters specified
-                 by this query, which are usually literals defined in the
-                 WHERE clause.
+                 The CachingQuery optionally stores additional state that allows it to consult
+                 a dogpile.cache cache before accessing the database, in the form
+                 of a FromCache or RelationshipCache object.   Each of these objects
+                 refer to the name of a :class:`dogpile.cache.Region` that's been configured
+                 and stored in a lookup dictionary.  When such an object has associated
+                 itself with the CachingQuery, the corresponding :class:`dogpile.cache.Region`
+                 is used to locate a cached result.  If none is present, then the
+                 Query is invoked normally, the results being cached.
                  The FromCache and RelationshipCache mapper options below represent
                  the "public" method of configuring this state upon the CachingQuery.
                  """
+                 def _get_region(self):
+                     from rhodecode.lib.rc_cache import region_meta
+                     return region_meta.dogpile_cache_regions
-                 def __init__(self, manager, *args, **kw):
-                     self.cache_manager = manager
+                 def __init__(self, regions, *args, **kw):
+                     self.cache_regions = regions or self._get_region()
                      Query.__init__(self, *args, **kw)
                  def __iter__(self):
-                     """override __iter__ to pull results from Beaker
+                     """override __iter__ to pull results from dogpile
                         if particular attributes have been configured.
                         Note that this approach does *not* detach the loaded objects from
                         in the cache are not the same ones in the current Session.
                      """
-                     if hasattr(self, '_cache_parameters'):
+                     super_ = super(CachingQuery, self)
+                     if hasattr(self, '_cache_region'):
+                         return self.get_value(createfunc=lambda: list(super_.__iter__()))
+                     else:
+                         return super_.__iter__()
+                 def _execute_and_instances(self, context):
+                     """override _execute_and_instances to pull results from dogpile
+                         if the query is invoked directly from an external context.
+                        This method is necessary in order to maintain compatibility
+                        with the "baked query" system now used by default in some
+                        relationship loader scenarios.   Note also the
+                        RelationshipCache._generate_cache_key method which enables
+                        the baked query to be used within lazy loads.
-                         def caching_query():
-                             return list(Query.__iter__(self))
+                        .. versionadded:: 1.2.7
+                     """
+                     super_ = super(CachingQuery, self)
-                         return self.get_value(createfunc=caching_query)
+                     if context.query is not self and hasattr(self, '_cache_region'):
+                         # special logic called when the Query._execute_and_instances()
+                         # method is called directly from the baked query
+                         return self.get_value(
+                             createfunc=lambda: list(
+                                 super_._execute_and_instances(context)
+                             )
+                         )
                      else:
-                         return Query.__iter__(self)
+                         return super_._execute_and_instances(context)
+                 def _get_cache_plus_key(self):
+                     """Return a cache region plus key."""
+                     dogpile_region = self.cache_regions[self._cache_region.region]
+                     if self._cache_region.cache_key:
+                         key = self._cache_region.cache_key
+                     else:
+                         key = _key_from_query(self)
+                     return dogpile_region, key
                  def invalidate(self):
-                     """Invalidate the value represented by this Query."""
+                     """Invalidate the cache value represented by this Query."""
-                     cache, cache_key = _get_cache_parameters(self)
-                     cache.remove(cache_key)
+                     dogpile_region, cache_key = self._get_cache_plus_key()
+                     dogpile_region.delete(cache_key)
-                 def get_value(self, merge=True, createfunc=None):
+                 def get_value(self, merge=True, createfunc=None,
+                               expiration_time=None, ignore_expiration=False):
                      """Return the value from the cache for this query.
                      Raise KeyError if no value present and no
                      createfunc specified.
                      """
-                     cache, cache_key = _get_cache_parameters(self)
-                     ret = cache.get_value(cache_key, createfunc=createfunc)
+                     dogpile_region, cache_key = self._get_cache_plus_key()
+                     # ignore_expiration means, if the value is in the cache
+                     # but is expired, return it anyway.   This doesn't make sense
+                     # with createfunc, which says, if the value is expired, generate
+                     # a new value.
+                     assert not ignore_expiration or not createfunc, \
+                             "Can't ignore expiration and also provide createfunc"
+                     if ignore_expiration or not createfunc:
+                         cached_value = dogpile_region.get(cache_key,
+                                             expiration_time=expiration_time,
+                                             ignore_expiration=ignore_expiration)
+                     else:
+                         cached_value = dogpile_region.get_or_create(
+                                                 cache_key,
+                                                 createfunc,
+                                                 expiration_time=expiration_time
+                                             )
+                     if cached_value is NO_VALUE:
+                         raise KeyError(cache_key)
                      if merge:
-                         ret = self.merge_result(ret, load=False)
-                     return ret
+                         cached_value = self.merge_result(cached_value, load=False)
+                     return cached_value
                  def set_value(self, value):
                      """Set the value in the cache for this query."""
-                     cache, cache_key = _get_cache_parameters(self)
-                     cache.put(cache_key, value)
+                     dogpile_region, cache_key = self._get_cache_plus_key()
+                     dogpile_region.set(cache_key, value)
-             def query_callable(manager, query_cls=CachingQuery):
+             def query_callable(regions=None, query_cls=CachingQuery):
                  def query(*arg, **kw):
-                     return query_cls(manager, *arg, **kw)
+                     return query_cls(regions, *arg, **kw)
                  return query
-             def get_cache_region(name, region):
-                 if region not in beaker.cache.cache_regions:
-                     raise BeakerException('Cache region `%s` not configured '
-                         'Check if proper cache settings are in the .ini files' % region)
-                 kw = beaker.cache.cache_regions[region]
-                 return beaker.cache.Cache._get_cache(name, kw)
+             def _key_from_query(query, qualifier=None):
+                 """Given a Query, create a cache key.
-             def _get_cache_parameters(query):
-                 """For a query with cache_region and cache_namespace configured,
-                 return the correspoinding Cache instance and cache key, based
-                 on this query's current criterion and parameter values.
+                 There are many approaches to this; here we use the simplest,
+                 which is to create an md5 hash of the text of the SQL statement,
+                 combined with stringified versions of all the bound parameters
+                 within it.     There's a bit of a performance hit with
+                 compiling out "query.statement" here; other approaches include
+                 setting up an explicit cache key with a particular Query,
+                 then combining that with the bound parameter values.
                  """
-                 if not hasattr(query, '_cache_parameters'):
-                     raise ValueError("This Query does not have caching "
-                                      "parameters configured.")
-                 region, namespace, cache_key = query._cache_parameters
-                 namespace = _namespace_from_query(namespace, query)
-                 if cache_key is None:
-                     # cache key - the value arguments from this query's parameters.
-                     args = [safe_str(x) for x in _params_from_query(query)]
-                     args.extend(filter(lambda k: k not in ['None', None, u'None'],
-                                        [str(query._limit), str(query._offset)]))
-                     cache_key = " ".join(args)
-                 if cache_key is None:
-                     raise Exception('Cache key cannot be None')
+                 stmt = query.with_labels().statement
+                 compiled = stmt.compile()
+                 params = compiled.params
-                 # get cache
-                 #cache = query.cache_manager.get_cache_region(namespace, region)
-                 cache = get_cache_region(namespace, region)
-                 # optional - hash the cache_key too for consistent length
-                 # import uuid
-                 # cache_key= str(uuid.uuid5(uuid.NAMESPACE_DNS, cache_key))
-                 return cache, cache_key
-             def _namespace_from_query(namespace, query):
-                 # cache namespace - the token handed in by the
-                 # option + class we're querying against
-                 namespace = " ".join([namespace] + [str(x) for x in query._entities])
-                 # memcached wants this
-                 namespace = namespace.replace(' ', '_')
-                 return namespace
-             def _set_cache_parameters(query, region, namespace, cache_key):
-                 if hasattr(query, '_cache_parameters'):
-                     region, namespace, cache_key = query._cache_parameters
-                     raise ValueError("This query is already configured "
-                                      "for region %r namespace %r" %
-                                      (region, namespace))
-                 query._cache_parameters = region, namespace, cache_key
+                 # here we return the key as a long string.  our "key mangler"
+                 # set up with the region will boil it down to an md5.
+                 return " ".join(
+                                 [safe_str(compiled)] +
+                                 [safe_str(params[k]) for k in sorted(params)])
              class FromCache(MapperOption):
                  propagate_to_loaders = False
-                 def __init__(self, region, namespace, cache_key=None):
+                 def __init__(self, region="sql_cache_short", cache_key=None):
                      """Construct a new FromCache.
                      :param region: the cache region.  Should be a
-                     region configured in the Beaker CacheManager.
-                     :param namespace: the cache namespace.  Should
-                     be a name uniquely describing the target Query's
-                     lexical structure.
+                     region configured in the dictionary of dogpile
+                     regions.
                      :param cache_key: optional.  A string cache key
                      that will serve as the key to the query.   Use this
                      """
                      self.region = region
-                     self.namespace = namespace
                      self.cache_key = cache_key
                  def process_query(self, query):
                      """Process a Query during normal loading operation."""
-                     _set_cache_parameters(query, self.region, self.namespace,
-                                           self.cache_key)
+                     query._cache_region = self
              class RelationshipCache(MapperOption):
                  propagate_to_loaders = True
-                 def __init__(self, region, namespace, attribute):
+                 def __init__(self, attribute, region="sql_cache_short", cache_key=None):
                      """Construct a new RelationshipCache.
-                     :param region: the cache region.  Should be a
-                     region configured in the Beaker CacheManager.
-                     :param namespace: the cache namespace.  Should
-                     be a name uniquely describing the target Query's
-                     lexical structure.
                      :param attribute: A Class.attribute which
                      indicates a particular class relationship() whose
                      lazy loader should be pulled from the cache.
+                     :param region: name of the cache region.
+                     :param cache_key: optional.  A string cache key
+                     that will serve as the key to the query, bypassing
+                     the usual means of forming a key from the Query itself.
                      """
                      self.region = region
-                     self.namespace = namespace
+                     self.cache_key = cache_key
                      self._relationship_options = {
                          (attribute.property.parent.class_, attribute.property.key): self
                      }
+                 def _generate_cache_key(self, path):
+                     """Indicate to the lazy-loader strategy that a "baked" query
+                     may be used by returning ``None``.
+                     If this method is omitted, the default implementation of
+                     :class:`.MapperOption._generate_cache_key` takes place, which
+                     returns ``False`` to disable the "baked" query from being used.
+                     .. versionadded:: 1.2.7
+                     """
+                     return None
                  def process_query_conditionally(self, query):
                      """Process a Query that is used within a lazy loader.
                      """
                      if query._current_path:
-                         mapper, key = query._current_path[-2:]
+                         mapper, prop = query._current_path[-2:]
+                         key = prop.key
                          for cls in mapper.class_.__mro__:
                              if (cls, key) in self._relationship_options:
-                                 relationship_option = \
-                                     self._relationship_options[(cls, key)]
-                                 _set_cache_parameters(
-                                         query,
-                                         relationship_option.region,
-                                         relationship_option.namespace,
-                                         None)
+                                 relationship_option = self._relationship_options[(cls, key)]
+                                 query._cache_region = relationship_option
+                                 break
                  def and_(self, option):
                      """Chain another RelationshipCache option to this one.
                      self._relationship_options.update(option._relationship_options)
                      return self
-             def _params_from_query(query):
-                 """Pull the bind parameter values from a query.
-                 This takes into account any scalar attribute bindparam set up.
-                 E.g. params_from_query(query.filter(Cls.foo==5).filter(Cls.bar==7)))
-                 would return [5, 7].
-                 """
-                 v = []
-                 def visit_bindparam(bind):
-                     if bind.key in query._params:
-                         value = query._params[bind.key]
-                     elif bind.callable:
-                         # lazyloader may dig a callable in here, intended
-                         # to late-evaluate params after autoflush is called.
-                         # convert to a scalar value.
-                         value = bind.callable()
-                     else:
-                         value = bind.value
-                     v.append(value)
-                 if query._criterion is not None:
-                     visitors.traverse(query._criterion, {}, {'bindparam':visit_bindparam})
-                 for f in query._from_obj:
-                     visitors.traverse(f, {}, {'bindparam':visit_bindparam})
-                 return v

rhodecode/lib/celerylib/tasks.py

0 +10 -4

              from rhodecode.lib.hooks_base import log_create_repository
              from rhodecode.lib.rcmail.smtp_mailer import SmtpMailer
              from rhodecode.lib.utils2 import safe_int, str2bool
-             from rhodecode.model.db import Session, IntegrityError, Repository, User
+             from rhodecode.model.db import Session, IntegrityError, Repository, User, true
              @async_task(ignore_result=True, base=RequestContextTask)
                  subject = "%s %s" % (email_config.get('email_prefix', ''), subject)
                  if not recipients:
                      # if recipients are not defined we send to email_config + all admins
-                     admins = [
-                         u.email for u in User.query().filter(User.admin == True).all()]
-                     recipients = [email_config.get('email_to')] + admins
+                     admins = []
+                     for u in User.query().filter(User.admin == true()).all():
+                         if u.email:
+                             admins.append(u.email)
+                     recipients = []
+                     config_email = email_config.get('email_to')
+                     if config_email:
+                         recipients += [config_email]
+                     recipients += admins
                  mail_server = email_config.get('smtp_server') or None
                  if mail_server is None:

rhodecode/lib/db_manage.py

0 +7 -6

                  def create_user(self, username, password, email='', admin=False,
                                  strict_creation_check=True, api_key=None):
-                     log.info('creating user %s' % username)
+                     log.info('creating user `%s`' % username)
                      user = UserModel().create_or_update(
                          username, password, email, firstname=u'RhodeCode', lastname=u'Admin',
                          active=True, admin=admin, extern_type="rhodecode",
                          strict_creation_check=strict_creation_check)
                      if api_key:
-                         log.info('setting a provided api key for the user %s', username)
-                         from rhodecode.model.auth_token import AuthTokenModel
-                         AuthTokenModel().create(
-                             user=user, description=u'BUILTIN TOKEN')
+                         log.info('setting a new default auth token for user `%s`', username)
+                         UserModel().add_auth_token(
+                             user=user, lifetime_minutes=-1,
+                             role=UserModel.auth_token_role.ROLE_ALL,
+                             description=u'BUILTIN TOKEN')
                  def create_default_user(self):
                      log.info('creating default user')
                                                          firstname=u'Anonymous',
                                                          lastname=u'User',
                                                          strict_creation_check=False)
-                     # based on configuration options activate/deactive this user which
+                     # based on configuration options activate/de-activate this user which
                      # controlls anonymous access
                      if self.cli_args.get('public_access') is False:
                          log.info('Public access disabled')

rhodecode/lib/dbmigrate/schema/db_1_2_0.py

0 +1 -11

                  @property
                  def scm_instance_cached(self):
-                     @cache_region('long_term')
-                     def _c(repo_name):
-                         return self.__get_instance()
-                     rn = self.repo_name
-                     inv = self.invalidate
-                     if inv is not None:
-                         region_invalidate(_c, None, rn)
-                         # update our cache
-                         CacheInvalidation.set_valid(inv.cache_key)
-                     return _c(rn)
+                     return self.__get_instance()
                  def __get_instance(self):

rhodecode/lib/dbmigrate/schema/db_1_3_0.py

0 +1 -11

                  @property
                  def scm_instance_cached(self):
-                     @cache_region('long_term')
-                     def _c(repo_name):
-                         return self.__get_instance()
-                     rn = self.repo_name
-                     log.debug('Getting cached instance of repo')
-                     inv = self.invalidate
-                     if inv is not None:
-                         region_invalidate(_c, None, rn)
-                         # update our cache
-                         CacheInvalidation.set_valid(inv.cache_key)
-                     return _c(rn)
+                     return self.__get_instance()
                  def __get_instance(self):
                      repo_full_path = self.repo_full_path

rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py

0 +1 -33

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'

rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py

0 +1 -31

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      repo_full_path = self.repo_full_path
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(compute_func, repo_name, cache_type)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'

rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py

0 +1 -33

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'

rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py

0 +1 -32

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):

rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py

0 +1 -33

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'

rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py

0 +1 -33

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'

rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py

0 +1 -33

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'

rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py

0 +1 -33

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'

rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py

0 +1 -33

                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
-                         return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     self._get_instance()
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'

rhodecode/lib/exceptions.py

0 +15 0

                      self.args = (message, )
+             class HTTPBranchProtected(HTTPClientError):
+                 """
+                 Special Exception For Indicating that branch is protected in RhodeCode, the
+                 return code can be overwritten by _code keyword argument passed into constructors
+                 """
+                 code = 403
+                 title = explanation = 'Branch Protected'
+                 reason = None
+                 def __init__(self, message, *args, **kwargs):
+                     self.title = self.explanation = message
+                     super(HTTPBranchProtected, self).__init__(*args, **kwargs)
+                     self.args = (message, )
              class IMCCommitError(Exception):
                  pass

rhodecode/lib/helpers.py

0 +20 -5

              import random
              import hashlib
              import StringIO
+             import textwrap
              import urllib
              import math
              import logging
              import pygments
              import itertools
              import fnmatch
+             import bleach
              from datetime import datetime
              from functools import partial
                  """
                  Choose how to render a binary file
                  """
                  filename = file_obj.name
                  # images
                  for ext in ['*.png', '*.jpg', '*.ico', '*.gif']:
                      if fnmatch.fnmatch(filename, pat=ext):
-                         alt = filename
+                         alt = escape(filename)
                          src = route_path(
                              'repo_file_raw', repo_name=repo_name,
-                             commit_id=file_obj.commit.raw_id, f_path=file_obj.path)
-                         return literal('<img class="rendered-binary" alt="{}" src="{}">'.format(alt, src))
+                             commit_id=file_obj.commit.raw_id,
+                             f_path=file_obj.path)
+                         return literal(
+                             '<img class="rendered-binary" alt="{}" src="{}">'.format(alt, src))
              def renderer_from_filename(filename, exclude=None):
                          return relative_links(html_source, relative_urls)
                      return html_source
-                 if renderer == 'rst':
+                 if renderer == 'plain':
+                     return literal(
+                         MarkupRenderer.plain(source, leading_newline=False))
+                 elif renderer == 'rst':
                      if repo_name:
                          # process patterns on comments if we pass in repo name
                          source, issues = process_patterns(
                          '<div class="rst-block">%s</div>' %
                          maybe_convert_relative_links(
                              MarkupRenderer.rst(source, mentions=mentions)))
                  elif renderer == 'markdown':
                      if repo_name:
                          # process patterns on comments if we pass in repo name
                          maybe_convert_relative_links(
                              MarkupRenderer.markdown(source, flavored=True,
                                                      mentions=mentions)))
                  elif renderer == 'jupyter':
                      return literal(
                          '<div class="ipynb">%s</div>' %
              def journal_filter_help(request):
                  _ = request.translate
+                 from rhodecode.lib.audit_logger import ACTIONS
+                 actions = '\n'.join(textwrap.wrap(', '.join(sorted(ACTIONS.keys())), 80))
                  return _(
                      'Example filter terms:\n' +
                      '     date:20120101\n' +
                      '     date:[20120101100000 TO 20120102]\n' +
                      '\n' +
+                     'Actions: {actions}\n' +
+                     '\n' +
                      'Generate wildcards using \'*\' character:\n' +
                      '     "repository:vcs*" - search everything starting with \'vcs\'\n' +
                      '     "repository:*vcs*" - search for repository containing \'vcs\'\n' +
                      'Optional AND / OR operators in queries\n' +
                      '     "repository:vcs OR repository:test"\n' +
                      '     "username:test AND repository:test*"\n'
+                 )
+                 ).format(actions=actions)
              def search_filter_help(searcher, request):

rhodecode/lib/hooks_base.py

0 +45 -5

              from rhodecode.lib import helpers as h
              from rhodecode.lib import audit_logger
              from rhodecode.lib.utils2 import safe_str
-             from rhodecode.lib.exceptions import HTTPLockedRC, UserCreationError
+             from rhodecode.lib.exceptions import (
+                 HTTPLockedRC, HTTPBranchProtected, UserCreationError)
              from rhodecode.model.db import Repository, User
              log = logging.getLogger(__name__)
                  It bans pushing when the repository is locked.
                  """
-                 usr = User.get_by_username(extras.username)
+                 user = User.get_by_username(extras.username)
                  output = ''
-                 if extras.locked_by[0] and usr.user_id != int(extras.locked_by[0]):
+                 if extras.locked_by[0] and user.user_id != int(extras.locked_by[0]):
                      locked_by = User.get(extras.locked_by[0]).username
                      reason = extras.locked_by[2]
                      # this exception is interpreted in git/hg middlewares and based
                      else:
                          raise _http_ret
-                 # Propagate to external components. This is done after checking the
-                 # lock, for consistent behavior.
                  if not is_shadow_repo(extras):
+                     if extras.commit_ids and extras.check_branch_perms:
+                         auth_user = user.AuthUser()
+                         repo = Repository.get_by_repo_name(extras.repository)
+                         affected_branches = []
+                         if repo.repo_type == 'hg':
+                             for entry in extras.commit_ids:
+                                 if entry['type'] == 'branch':
+                                     is_forced = bool(entry['multiple_heads'])
+                                     affected_branches.append([entry['name'], is_forced])
+                         elif repo.repo_type == 'git':
+                             for entry in extras.commit_ids:
+                                 if entry['type'] == 'heads':
+                                     is_forced = bool(entry['pruned_sha'])
+                                     affected_branches.append([entry['name'], is_forced])
+                         for branch_name, is_forced in affected_branches:
+                             rule, branch_perm = auth_user.get_rule_and_branch_permission(
+                                 extras.repository, branch_name)
+                             if not branch_perm:
+                                 # no branch permission found for this branch, just keep checking
+                                 continue
+                             if branch_perm == 'branch.push_force':
+                                 continue
+                             elif branch_perm == 'branch.push' and is_forced is False:
+                                 continue
+                             elif branch_perm == 'branch.push' and is_forced is True:
+                                 halt_message = 'Branch `{}` changes rejected by rule {}. ' \
+                                                'FORCE PUSH FORBIDDEN.'.format(branch_name, rule)
+                             else:
+                                 halt_message = 'Branch `{}` changes rejected by rule {}.'.format(
+                                     branch_name, rule)
+                             if halt_message:
+                                 _http_ret = HTTPBranchProtected(halt_message)
+                                 raise _http_ret
+                     # Propagate to external components. This is done after checking the
+                     # lock, for consistent behavior.
                      pre_push_extension(repo_store_path=Repository.base_path(), **extras)
                      events.trigger(events.RepoPrePushEvent(
                          repo_name=extras.repository, extras=extras))

rhodecode/lib/hooks_daemon.py

0 +27 -16

              from SocketServer import TCPServer
              import rhodecode
+             from rhodecode.lib.exceptions import HTTPLockedRC, HTTPBranchProtected
              from rhodecode.model import meta
              from rhodecode.lib.base import bootstrap_request, bootstrap_config
              from rhodecode.lib import hooks_base
              from rhodecode.lib.utils2 import AttributeDict
              from rhodecode.lib.ext_json import json
+             from rhodecode.lib import rc_cache
              log = logging.getLogger(__name__)
                      method, extras = self._read_request()
                      txn_id = getattr(self.server, 'txn_id', None)
                      if txn_id:
-                         from rhodecode.lib.caches import compute_key_from_params
                          log.debug('Computing TXN_ID based on `%s`:`%s`',
                                    extras['repository'], extras['txn_id'])
-                         computed_txn_id = compute_key_from_params(
+                         computed_txn_id = rc_cache.utils.compute_key_from_params(
                              extras['repository'], extras['txn_id'])
                          if txn_id != computed_txn_id:
                              raise Exception(
                  _daemon = None
                  _done = False
-                 def __init__(self, txn_id=None, port=None):
-                     self._prepare(txn_id=txn_id, port=port)
+                 def __init__(self, txn_id=None, host=None, port=None):
+                     self._prepare(txn_id=txn_id, host=None, port=port)
                  def __enter__(self):
                      self._run()
                      log.debug('Callback daemon exiting now...')
                      self._stop()
-                 def _prepare(self, txn_id=None, port=None):
+                 def _prepare(self, txn_id=None, host=None, port=None):
                      raise NotImplementedError()
                  def _run(self):
                  hooks_uri = None
-                 IP_ADDRESS = '127.0.0.1'
                  # From Python docs: Polling reduces our responsiveness to a shutdown
                  # request and wastes cpu at all other times.
                  POLL_INTERVAL = 0.01
-                 def _prepare(self, txn_id=None, port=None):
+                 def _prepare(self, txn_id=None, host=None, port=None):
+                     host = host or '127.0.0.1'
                      self._done = False
-                     self._daemon = TCPServer((self.IP_ADDRESS, port or 0), HooksHttpHandler)
+                     self._daemon = TCPServer((host, port or 0), HooksHttpHandler)
                      _, port = self._daemon.server_address
-                     self.hooks_uri = '{}:{}'.format(self.IP_ADDRESS, port)
+                     self.hooks_uri = '{}:{}'.format(host, port)
                      self.txn_id = txn_id
                      # inject transaction_id for later verification
                      self._daemon.txn_id = self.txn_id
                      return {}
-             def prepare_callback_daemon(extras, protocol, use_direct_calls, txn_id=None):
+             def prepare_callback_daemon(extras, protocol, host, use_direct_calls, txn_id=None):
                  txn_details = get_txn_id_from_store(txn_id)
                  port = txn_details.get('port', 0)
                  if use_direct_calls:
                      extras['hooks_module'] = callback_daemon.hooks_module
                  else:
                      if protocol == 'http':
-                         callback_daemon = HttpHooksCallbackDaemon(txn_id=txn_id, port=port)
+                         callback_daemon = HttpHooksCallbackDaemon(
+                             txn_id=txn_id, host=host, port=port)
                      else:
                          log.error('Unsupported callback daemon protocol "%s"', protocol)
                          raise Exception('Unsupported callback daemon protocol.')
                      try:
                          result = hook(extras)
-                     except Exception as error:
-                         exc_tb = traceback.format_exc()
-                         log.exception('Exception when handling hook %s', hook)
+                     except HTTPBranchProtected as handled_error:
+                         # Those special cases doesn't need error reporting. It's a case of
+                         # locked repo or protected branch
+                         result = AttributeDict({
+                             'status': handled_error.code,
+                             'output': handled_error.explanation
+                         })
+                     except (HTTPLockedRC, Exception) as error:
+                         # locked needs different handling since we need to also
+                         # handle PULL operations
+                         exc_tb = ''
+                         if not isinstance(error, HTTPLockedRC):
+                             exc_tb = traceback.format_exc()
+                             log.exception('Exception when handling hook %s', hook)
                          error_args = error.args
                          return {
                              'status': 128,

rhodecode/lib/logging_formatter.py

0 +29 0

		@@ -123,6 +123,35 b' class ColorFormatter(ExceptionAwareForma'
123	123	return colored_record
124	124
125	125
	126	def _inject_req_id(record):
	127	from pyramid.threadlocal import get_current_request
	128	req = get_current_request()
	129	req_id = 'req_id:%-36s ' % (getattr(req, 'req_id', None))
	130	record.req_id = req_id
	131
	132
	133	class RequestTrackingFormatter(ExceptionAwareFormatter):
	134	def format(self, record):
	135	_inject_req_id(record)
	136	def_record = logging.Formatter.format(self, record)
	137	return def_record
	138
	139
	140	class ColorRequestTrackingFormatter(ColorFormatter):
	141	def format(self, record):
	142	"""
	143	Changes record's levelname to use with COLORS enum
	144	"""
	145	_inject_req_id(record)
	146	levelname = record.levelname
	147	start = COLOR_SEQ % (COLORS[levelname])
	148	def_record = logging.Formatter.format(self, record)
	149	end = RESET_SEQ
	150
	151	colored_record = ''.join([start, def_record, end])
	152	return colored_record
	153
	154
126	155	class ColorFormatterSql(logging.Formatter):
127	156
128	157	def format(self, record):

rhodecode/lib/markup_renderer.py

0 +17 -8

                      from .bleach_whitelist import markdown_attrs, markdown_tags
                      allowed_tags = markdown_tags
                      allowed_attrs = markdown_attrs
-                     return bleach.clean(text, tags=allowed_tags, attributes=allowed_attrs)
+                     try:
+                         return bleach.clean(text, tags=allowed_tags, attributes=allowed_attrs)
+                     except Exception:
+                         return 'UNPARSEABLE TEXT'
                  @classmethod
                  def renderer_from_filename(cls, filename, exclude):
                      return cls.URL_PAT.sub(url_func, text)
                  @classmethod
-                 def plain(cls, source, universal_newline=True):
+                 def plain(cls, source, universal_newline=True, leading_newline=True):
                      source = safe_unicode(source)
                      if universal_newline:
                          newline = '\n'
                          source = newline.join(source.splitlines())
-                     source = cls.urlify_text(source)
-                     return '<br />' + source.replace("\n", '<br />')
+                     rendered_source = cls.urlify_text(source)
+                     source = ''
+                     if leading_newline:
+                         source += '<br />'
+                     source += rendered_source.replace("\n", '<br />')
+                     return source
                  @classmethod
                  def markdown(cls, source, safe=True, flavored=True, mentions=False,
                          if flavored:
                              source = cls._flavored_markdown(source)
                          rendered = markdown_renderer.convert(source)
-                         if clean_html:
-                             rendered = cls.bleach_clean(rendered)
-                         return rendered
                      except Exception:
                          log.exception('Error when rendering Markdown')
                          if safe:
                              log.debug('Fallback to render in plain mode')
-                             return cls.plain(source)
+                             rendered = cls.plain(source)
                          else:
                              raise
+                     if clean_html:
+                         rendered = cls.bleach_clean(rendered)
+                     return rendered
                  @classmethod
                  def rst(cls, source, safe=True, mentions=False, clean_html=False):
                      if mentions:

rhodecode/lib/memory_lru_dict.py ~~rhodecode/lib/memory_lru_debug.py~~

0 renamed +23 -9

              inrae.cache is licensed under LRUDict is licensed under ZPL license
              This software is Copyright (c) Zope Corporation (tm) and
              Contributors. All rights reserved.
-             TODO: marcink, we might think of replacing the LRUDict with lru-dict library
-             written in C.
+             """
-             eg difference in speed:
-                 LRUDictC  Time : 0.00025 s, Memory : 110592 Kb
-                 LRUDict   Time : 0.00369 s, Memory : 147456 Kb
-             """
              import logging
-             from infrae.cache.beakerext.lru import LRUDict
+             from repoze.lru import LRUCache
              from beaker.container import MemoryNamespaceManager, AbstractDictionaryNSManager
              from rhodecode.lib.utils2 import safe_str
              log = logging.getLogger(__name__)
+             class LRUDict(LRUCache):
+                 """
+                 Wrapper to provide partial dict access
+                 """
+                 def __setitem__(self, key, value):
+                     return self.put(key, value)
+                 def __getitem__(self, key):
+                     return self.get(key)
+                 def __contains__(self, key):
+                     return bool(self.get(key))
+                 def __delitem__(self, key):
+                     del self.data[key]
+                 def keys(self):
+                     return self.data.keys()
              class LRUDictDebug(LRUDict):
                  """
                  Wrapper to provide some debug options

rhodecode/lib/middleware/simplehg.py

0 +74 -3

              import logging
              import urlparse
+             import urllib
              from rhodecode.lib import utils
              from rhodecode.lib.ext_json import json
                      'getbundle': 'pull',
                      'stream_out': 'pull',
                      'listkeys': 'pull',
+                     'between': 'pull',
+                     'branchmap': 'pull',
+                     'branches': 'pull',
+                     'clonebundles': 'pull',
+                     'capabilities': 'pull',
+                     'debugwireargs': 'pull',
+                     'heads': 'pull',
+                     'lookup': 'pull',
+                     'hello': 'pull',
+                     'known': 'pull',
+                     # largefiles
+                     'putlfile': 'push',
+                     'getlfile': 'pull',
+                     'statlfile': 'pull',
+                     'lheads': 'pull',
                      'unbundle': 'push',
                      'pushkey': 'push',
                  }
+                 @classmethod
+                 def _get_xarg_headers(cls, environ):
+                     i = 1
+                     chunks = []  # gather chunks stored in multiple 'hgarg_N'
+                     while True:
+                         head = environ.get('HTTP_X_HGARG_{}'.format(i))
+                         if not head:
+                             break
+                         i += 1
+                         chunks.append(urllib.unquote_plus(head))
+                     full_arg = ''.join(chunks)
+                     pref = 'cmds='
+                     if full_arg.startswith(pref):
+                         # strip the cmds= header defining our batch commands
+                         full_arg = full_arg[len(pref):]
+                     cmds = full_arg.split(';')
+                     return cmds
+                 @classmethod
+                 def _get_batch_cmd(cls, environ):
+                     """
+                     Handle batch command send commands. Those are ';' separated commands
+                     sent by batch command that server needs to execute. We need to extract
+                     those, and map them to our ACTION_MAPPING to get all push/pull commands
+                     specified in the batch
+                     """
+                     default = 'push'
+                     batch_cmds = []
+                     try:
+                         cmds = cls._get_xarg_headers(environ)
+                         for pair in cmds:
+                             parts = pair.split(' ', 1)
+                             if len(parts) != 2:
+                                 continue
+                             # entry should be in a format `key ARGS`
+                             cmd, args = parts
+                             action = cls._ACTION_MAPPING.get(cmd, default)
+                             batch_cmds.append(action)
+                     except Exception:
+                         log.exception('Failed to extract batch commands operations')
+                     # in case we failed, (e.g malformed data) assume it's PUSH sub-command
+                     # for safety
+                     return batch_cmds or [default]
                  def _get_action(self, environ):
                      """
                      Maps mercurial request commands into a pull or push command.
-                     In case of unknown/unexpected data, it returns 'pull' to be safe.
+                     In case of unknown/unexpected data, it returns 'push' to be safe.
                      :param environ:
                      """
+                     default = 'push'
                      query = urlparse.parse_qs(environ['QUERY_STRING'],
                                                keep_blank_values=True)
                      if 'cmd' in query:
                          cmd = query['cmd'][0]
-                         return self._ACTION_MAPPING.get(cmd, 'pull')
+                         if cmd == 'batch':
+                             cmds = self._get_batch_cmd(environ)
+                             if 'push' in cmds:
+                                 return 'push'
+                             else:
+                                 return 'pull'
+                         return self._ACTION_MAPPING.get(cmd, default)
-                     return 'pull'
+                     return default
                  def _create_wsgi_app(self, repo_path, repo_name, config):
                      return self.scm_app.create_hg_wsgi_app(

rhodecode/lib/middleware/simplesvn.py

0 +2 -2

              import requests
              from pyramid.httpexceptions import HTTPNotAcceptable
-             from rhodecode.lib import caches
+             from rhodecode.lib import rc_cache
              from rhodecode.lib.middleware import simplevcs
              from rhodecode.lib.utils import is_valid_repo
              from rhodecode.lib.utils2 import str2bool, safe_int
                      if response.headers.get('SVN-Txn-name'):
                          svn_tx_id = response.headers.get('SVN-Txn-name')
-                         txn_id = caches.compute_key_from_params(
+                         txn_id = rc_cache.utils.compute_key_from_params(
                              self.config['repository'], svn_tx_id)
                          port = safe_int(self.rc_extras['hooks_uri'].split(':')[-1])
                          store_txn_id_data(txn_id, {'port': port})

rhodecode/lib/middleware/simplevcs.py

0 +46 -46

              from zope.cachedescriptors.property import Lazy as LazyProperty
              import rhodecode
-             from rhodecode.authentication.base import (
-                 authenticate, get_perms_cache_manager, VCS_TYPE, loadplugin)
-             from rhodecode.lib import caches
+             from rhodecode.authentication.base import authenticate, VCS_TYPE, loadplugin
+             from rhodecode.lib import rc_cache
              from rhodecode.lib.auth import AuthUser, HasPermissionAnyMiddleware
              from rhodecode.lib.base import (
                  BasicAuth, get_ip_addr, get_user_agent, vcs_operation_context)
              def extract_svn_txn_id(acl_repo_name, data):
                  """
-                 Helper method for extraction of svn txn_id from submited XML data during
+                 Helper method for extraction of svn txn_id from submitted XML data during
                  POST operations
                  """
                  try:
                                      match = pat.search(sub_el.text)
                                      if match:
                                          svn_tx_id = match.groupdict()['txn_id']
-                                         txn_id = caches.compute_key_from_params(
+                                         txn_id = rc_cache.utils.compute_key_from_params(
                                              acl_repo_name, svn_tx_id)
                                          return txn_id
                  except Exception:
                          # Only proceed if we got a pull request and if acl repo name from
                          # URL equals the target repo name of the pull request.
-                         if pull_request and (acl_repo_name ==
-                                              pull_request.target_repo.repo_name):
+                         if pull_request and \
+                                 (acl_repo_name == pull_request.target_repo.repo_name):
+                             repo_id = pull_request.target_repo.repo_id
                              # Get file system path to shadow repository.
                              workspace_id = PullRequestModel()._workspace_id(pull_request)
                              target_vcs = pull_request.target_repo.scm_instance()
                              vcs_repo_name = target_vcs._get_shadow_repository_path(
-                                 workspace_id)
+                                 repo_id, workspace_id)
                              # Store names for later usage.
                              self.vcs_repo_name = vcs_repo_name
                  def is_shadow_repo_dir(self):
                      return os.path.isdir(self.vcs_repo_name)
-                 def _check_permission(self, action, user, repo_name, ip_addr=None,
+                 def _check_permission(self, action, user, auth_user, repo_name, ip_addr=None,
                                        plugin_id='', plugin_cache_active=False, cache_ttl=0):
                      """
                      Checks permissions using action (push/pull) user and repository
                      :param repo_name: repository name
                      """
-                     # get instance of cache manager configured for a namespace
-                     cache_manager = get_perms_cache_manager(
-                         custom_ttl=cache_ttl, suffix=user.user_id)
                      log.debug('AUTH_CACHE_TTL for permissions `%s` active: %s (TTL: %s)',
                                plugin_id, plugin_cache_active, cache_ttl)
-                     # for environ based password can be empty, but then the validation is
-                     # on the server that fills in the env data needed for authentication
-                     _perm_calc_hash = caches.compute_key_from_params(
-                         plugin_id, action, user.user_id, repo_name, ip_addr)
+                     user_id = user.user_id
+                     cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
+                     region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
-                     # _authenticate is a wrapper for .auth() method of plugin.
-                     # it checks if .auth() sends proper data.
-                     # For RhodeCodeExternalAuthPlugin it also maps users to
-                     # Database and maps the attributes returned from .auth()
-                     # to RhodeCode database. If this function returns data
-                     # then auth is correct.
-                     start = time.time()
-                     log.debug('Running plugin `%s` permissions check', plugin_id)
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
+                                                            expiration_time=cache_ttl,
+                                                            condition=plugin_cache_active)
+                     def compute_perm_vcs(
+                             cache_name, plugin_id, action, user_id, repo_name, ip_addr):
-                     def perm_func():
-                         """
-                         This function is used internally in Cache of Beaker to calculate
-                         Results
-                         """
                          log.debug('auth: calculating permission access now...')
                          # check IP
                          inherit = user.inherit_default_permissions
                          ip_allowed = AuthUser.check_ip_allowed(
-                             user.user_id, ip_addr, inherit_from_default=inherit)
+                             user_id, ip_addr, inherit_from_default=inherit)
                          if ip_allowed:
                              log.info('Access for IP:%s allowed', ip_addr)
                          else:
                          if action == 'push':
                              perms = ('repository.write', 'repository.admin')
-                             if not HasPermissionAnyMiddleware(*perms)(user, repo_name):
+                             if not HasPermissionAnyMiddleware(*perms)(auth_user, repo_name):
                                  return False
                          else:
                              # any other action need at least read permission
                              perms = (
                                  'repository.read', 'repository.write', 'repository.admin')
-                             if not HasPermissionAnyMiddleware(*perms)(user, repo_name):
+                             if not HasPermissionAnyMiddleware(*perms)(auth_user, repo_name):
                                  return False
                          return True
-                     if plugin_cache_active:
-                         log.debug('Trying to fetch cached perms by %s', _perm_calc_hash[:6])
-                         perm_result = cache_manager.get(
-                             _perm_calc_hash, createfunc=perm_func)
-                     else:
-                         perm_result = perm_func()
+                     start = time.time()
+                     log.debug('Running plugin `%s` permissions check', plugin_id)
+                     # for environ based auth, password can be empty, but then the validation is
+                     # on the server that fills in the env data needed for authentication
+                     perm_result = compute_perm_vcs(
+                         'vcs_permissions', plugin_id, action, user.user_id, repo_name, ip_addr)
                      auth_time = time.time() - start
                      log.debug('Permissions for plugin `%s` completed in %.3fs, '
                      # ======================================================================
                      # CHECK ANONYMOUS PERMISSION
                      # ======================================================================
+                     detect_force_push = False
+                     check_branch_perms = False
                      if action in ['pull', 'push']:
-                         anonymous_user = User.get_default_user()
+                         user_obj = anonymous_user = User.get_default_user()
+                         auth_user = user_obj.AuthUser()
                          username = anonymous_user.username
                          if anonymous_user.active:
                              plugin_cache_active, cache_ttl = self._get_default_cache_ttl()
                              # ONLY check permissions if the user is activated
                              anonymous_perm = self._check_permission(
-                                 action, anonymous_user, self.acl_repo_name, ip_addr,
+                                 action, anonymous_user, auth_user, self.acl_repo_name, ip_addr,
                                  plugin_id='anonymous_access',
                                  plugin_cache_active=plugin_cache_active,
                                  cache_ttl=cache_ttl,
                                      return auth_result.wsgi_application(
                                          environ, start_response)
                              # ==============================================================
                              # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME
                              # ==============================================================
                              if not self.valid_and_active_user(user):
                                  return HTTPForbidden()(environ, start_response)
                              username = user.username
-                             user.update_lastactivity()
-                             meta.Session().commit()
+                             user_id = user.user_id
                              # check user attributes for password change flag
                              user_obj = user
+                             auth_user = user_obj.AuthUser()
                              if user_obj and user_obj.username != User.DEFAULT_USER and \
                                      user_obj.user_data.get('force_password_change'):
                                  reason = 'password change required'
                              # check permissions for this repository
                              perm = self._check_permission(
-                                 action, user, self.acl_repo_name, ip_addr,
+                                 action, user, auth_user, self.acl_repo_name, ip_addr,
                                  plugin, plugin_cache_active, cache_ttl)
                              if not perm:
                                  return HTTPForbidden()(environ, start_response)
+                             environ['rc_auth_user_id'] = user_id
+                         if action == 'push':
+                             perms = auth_user.get_branch_permissions(self.acl_repo_name)
+                             if perms:
+                                 check_branch_perms = True
+                                 detect_force_push = True
                      # extras are injected into UI object and later available
                      # in hooks executed by RhodeCode
                      check_locking = _should_check_locking(environ.get('QUERY_STRING'))
                      extras = vcs_operation_context(
                          environ, repo_name=self.acl_repo_name, username=username,
                          action=action, scm=self.SCM, check_locking=check_locking,
-                         is_shadow_repo=self.is_shadow_repo
+                         is_shadow_repo=self.is_shadow_repo, check_branch_perms=check_branch_perms,
+                         detect_force_push=detect_force_push
                      )
                      # ======================================================================
                      return prepare_callback_daemon(
                          extras, protocol=vcs_settings.HOOKS_PROTOCOL,
-                         use_direct_calls=direct_calls, txn_id=txn_id)
+                         host=vcs_settings.HOOKS_HOST, use_direct_calls=direct_calls, txn_id=txn_id)
              def _should_check_locking(query_string):

rhodecode/lib/middleware/vcs.py

0 +1 -1

                          log.debug('got handler:%s from environ', handler)
                  if not handler:
-                     log.debug('checking if request is of VCS type in order: %s', backends)
+                     log.debug('request start: checking if request is of VCS type in order: %s', backends)
                      for vcs_type in backends:
                          vcs_check, _handler = checks[vcs_type]
                          if vcs_check(environ):

rhodecode/lib/pyramid_utils.py

0 +2 -1

              import os
              from pyramid.compat import configparser
              from pyramid.paster import bootstrap as pyramid_bootstrap, setup_logging  # noqa
-             from pyramid.request import Request
              from pyramid.scripting import prepare
+             from rhodecode.lib.request import Request
              def get_config(ini_path, **kwargs):
                  parser = configparser.ConfigParser(**kwargs)

rhodecode/lib/rcmail/smtp_mailer.py

0 +8 -6

              import time
              import logging
-             from socket import sslerror
+             import socket
              from email.utils import formatdate
              from rhodecode.lib.rcmail.message import Message
              from rhodecode.lib.rcmail.utils import DNS_NAME
              class SmtpMailer(object):
-                 """SMTP mailer class
+                 """
+                 SMTP mailer class
                  mailer = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth
                                      mail_port, ssl, tls)
                      self.auth = smtp_auth
                  def _get_smptlib(self):
-                     #patch the output
+                     # patch the output
                      import smtplib
                      class StderrLogger(object):
                                    recipients_separator=", ", extra_headers=headers)
                      raw_msg = msg.to_message()
-                     #patched smtplib without stderr
+                     # patched smtplib without stderr
                      smtplib = self._get_smptlib()
                      if self.ssl:
                          smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port,
                          smtp_serv.login(self.user, self.passwd)
                      smtp_serv.sendmail(msg.sender, msg.send_to, raw_msg.as_string())
-                     logging.info('MAIL SEND TO: %s' % recipients)
+                     log.info('email sent to: %s' % recipients)
                      try:
                          smtp_serv.quit()
-                     except sslerror:
+                     except socket.sslerror:
                          # sslerror is raised in tls connections on closing sometimes
                          smtp_serv.close()

rhodecode/lib/system_info.py

0 +16 -1

                  return SysInfoRes(value=value)
+             def locale_info():
+                 import locale
+                 value = dict(
+                     locale_default=locale.getdefaultlocale(),
+                     locale_lc_all=locale.getlocale(locale.LC_ALL),
+                     lang_env=os.environ.get('LANG'),
+                     lc_all_env=os.environ.get('LC_ALL'),
+                     local_archive_env=os.environ.get('LOCALE_ARCHIVE'),
+                 )
+                 human_value = 'LANG: {}, locale LC_ALL: {},  Default locales: {}'.format(
+                     value['lang_env'], value['locale_lc_all'], value['locale_default'])
+                 return SysInfoRes(value=value, human_value=human_value)
              def ulimit_info():
                  data = collections.OrderedDict([
                      ('cpu time (seconds)', resource.getrlimit(resource.RLIMIT_CPU)),
                  return SysInfoRes(value=value)
              def get_system_info(environ):
                  environ = environ or {}
                  return {
                      'py_modules': SysInfo(py_modules)(),
                      'platform': SysInfo(platform_type)(),
+                     'locale': SysInfo(locale_info)(),
                      'server': SysInfo(server_info, environ=environ)(),
                      'database': SysInfo(database_info)(),
                      'ulimit': SysInfo(ulimit_info)(),

rhodecode/lib/utils.py

0 +2 -3

              from webhelpers.text import collapse, remove_formatting, strip_tags
              from mako import exceptions
              from pyramid.threadlocal import get_current_registry
-             from pyramid.request import Request
+             from rhodecode.lib.request import Request
              from rhodecode.lib.fakemod import create_module
              from rhodecode.lib.vcs.backends.base import Config
              from rhodecode.lib.vcs.exceptions import VCSError
              from rhodecode.lib.vcs.utils.helpers import get_scm, get_scm_backend
              from rhodecode.lib.utils2 import (
-                 safe_str, safe_unicode, get_current_rhodecode_user, md5)
+                 safe_str, safe_unicode, get_current_rhodecode_user, md5, sha1)
              from rhodecode.model import meta
              from rhodecode.model.db import (
                  Repository, User, RhodeCodeUi, UserLog, RepoGroup, UserGroup)
                      # pyramid
                      _group = request.matchdict.get('repo_group_name')
                  if _group:
                      _group = _group.rstrip('/')
                  return _group

rhodecode/lib/utils2.py

0 +20 -2

                  return md5(safe_str(s))
+             def sha1(s):
+                 return hashlib.sha1(s).hexdigest()
+             def sha1_safe(s):
+                 return sha1(safe_str(s))
              def __get_lem(extra_mapping=None):
                  """
                  Get language extension map based on what's inside pygments lexers
              def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
                  """Custom engine_from_config functions."""
                  log = logging.getLogger('sqlalchemy.engine')
+                 _ping_connection = configuration.pop('sqlalchemy.db1.ping_connection', None)
                  engine = sqlalchemy.engine_from_config(configuration, prefix, **kwargs)
                  def color_sql(sql):
                      normal = '\x1b[0m'
                      return ''.join([color_seq, sql, normal])
+                 if configuration['debug'] or _ping_connection:
+                     sqlalchemy.event.listen(engine, "engine_connect", ping_connection)
                  if configuration['debug']:
                      # attach events only for debug configuration
                                               parameters, context, executemany):
                          delattr(conn, 'query_start_time')
-                     sqlalchemy.event.listen(engine, "engine_connect",
-                                             ping_connection)
                      sqlalchemy.event.listen(engine, "before_cursor_execute",
                                              before_cursor_execute)
                      sqlalchemy.event.listen(engine, "after_cursor_execute",
+             class OrderedDefaultDict(collections.OrderedDict, collections.defaultdict):
+                 def __init__(self, default_factory=None, *args, **kwargs):
+                     # in python3 you can omit the args to super
+                     super(OrderedDefaultDict, self).__init__(*args, **kwargs)
+                     self.default_factory = default_factory
              def fix_PATH(os_=None):
                  """
                  Get current active python path, and append it to PATH variable to fix

rhodecode/lib/vcs/__init__.py

0 +10 -15

              Various version Control System version lib (vcs) management abstraction layer
              for Python. Build with server client architecture.
              """
+             import atexit
+             import logging
+             import urlparse
+             from cStringIO import StringIO
+             from rhodecode.lib.vcs.conf import settings
+             from rhodecode.lib.vcs.backends import get_vcs_instance, get_backend
+             from rhodecode.lib.vcs.exceptions import (
+                 VCSError, RepositoryError, CommitError, VCSCommunicationError)
              VERSION = (0, 5, 0, 'dev')
              __all__ = [
                  'get_version', 'get_vcs_instance', 'get_backend',
-                 'VCSError', 'RepositoryError', 'CommitError'
+                 ]
-             import atexit
-             import logging
-             import subprocess32
-             import time
-             import urlparse
-             from cStringIO import StringIO
-             from rhodecode.lib.vcs.conf import settings
-             from rhodecode.lib.vcs.backends import get_vcs_instance, get_backend
-             from rhodecode.lib.vcs.exceptions import (
-                 VCSError, RepositoryError, CommitError, VCSCommunicationError)
+                 'VCSError', 'RepositoryError', 'CommitError', 'VCSCommunicationError'
+             ]
              log = logging.getLogger(__name__)

rhodecode/lib/vcs/backends/base.py

0 +32 -13

                  EMPTY_COMMIT_ID = '0' * 40
                  path = None
-                 _remote = None
                  def __init__(self, repo_path, config=None, create=False, **kwargs):
                      """
                      return config
                  @LazyProperty
+                 def _remote(self):
+                     raise NotImplementedError
+                 @LazyProperty
                  def EMPTY_COMMIT(self):
                      return EmptyCommit(self.EMPTY_COMMIT_ID)
                      """
                      raise NotImplementedError
-                 def merge(self, target_ref, source_repo, source_ref, workspace_id,
+                 def merge(self, repo_id, workspace_id, target_ref, source_repo, source_ref,
                            user_name='', user_email='', message='', dry_run=False,
                            use_rebase=False, close_branch=False):
                      """
                      'possible', 'executed', 'source_commit', 'target_commit',
                      'merge_commit'.
+                     :param repo_id: `repo_id` target repo id.
+                     :param workspace_id: `workspace_id` unique identifier.
                      :param target_ref: `target_ref` points to the commit on top of which
                          the `source_ref` should be merged.
                      :param source_repo: The repository that contains the commits to be
                          merged.
                      :param source_ref: `source_ref` points to the topmost commit from
                          the `source_repo` which should be merged.
-                     :param workspace_id: `workspace_id` unique identifier.
                      :param user_name: Merge commit `user_name`.
                      :param user_email: Merge commit `user_email`.
                      :param message: Merge commit `message`.
                          if not message:
                              raise ValueError('message cannot be empty')
-                     shadow_repository_path = self._maybe_prepare_merge_workspace(
-                         workspace_id, target_ref, source_ref)
                      try:
                          return self._merge_repo(
-                             shadow_repository_path, target_ref, source_repo,
+                             repo_id, workspace_id, target_ref, source_repo,
                              source_ref, message, user_name, user_email, dry_run=dry_run,
                              use_rebase=use_rebase, close_branch=close_branch)
                      except RepositoryError:
                          return MergeResponse(
                              False, False, None, MergeFailureReason.UNKNOWN)
-                 def _merge_repo(self, shadow_repository_path, target_ref,
+                 def _merge_repo(self, repo_id, workspace_id, target_ref,
                                  source_repo, source_ref, merge_message,
                                  merger_name, merger_email, dry_run=False,
                                  use_rebase=False, close_branch=False):
                      """Internal implementation of merge."""
                      raise NotImplementedError
-                 def _maybe_prepare_merge_workspace(self, workspace_id, target_ref, source_ref):
+                 def _maybe_prepare_merge_workspace(
+                         self, repo_id, workspace_id, target_ref, source_ref):
                      """
                      Create the merge workspace.
                      """
                      raise NotImplementedError
-                 def _get_shadow_repository_path(self, workspace_id):
-                     raise NotImplementedError
+                 def _get_legacy_shadow_repository_path(self, workspace_id):
+                     """
+                     Legacy version that was used before. We still need it for
+                     backward compat
+                     """
+                     return os.path.join(
+                         os.path.dirname(self.path),
+                         '.__shadow_%s_%s' % (os.path.basename(self.path), workspace_id))
-                 def cleanup_merge_workspace(self, workspace_id):
+                 def _get_shadow_repository_path(self, repo_id, workspace_id):
+                     # The name of the shadow repository must start with '.', so it is
+                     # skipped by 'rhodecode.lib.utils.get_filesystem_repos'.
+                     legacy_repository_path = self._get_legacy_shadow_repository_path(workspace_id)
+                     if os.path.exists(legacy_repository_path):
+                         return legacy_repository_path
+                     else:
+                         return os.path.join(
+                             os.path.dirname(self.path),
+                             '.__shadow_repo_%s_%s' % (repo_id, workspace_id))
+                 def cleanup_merge_workspace(self, repo_id, workspace_id):
                      """
                      Remove merge workspace.
                      :param workspace_id: `workspace_id` unique identifier.
                      """
-                     shadow_repository_path = self._get_shadow_repository_path(workspace_id)
+                     shadow_repository_path = self._get_shadow_repository_path(repo_id, workspace_id)
                      shadow_repository_path_del = '{}.{}.delete'.format(
                          shadow_repository_path, time.time())

rhodecode/lib/vcs/backends/git/repository.py

0 +55 -30

                      self.path = safe_str(os.path.abspath(repo_path))
                      self.config = config if config else self.get_default_config()
-                     self._remote = connection.Git(
-                         self.path, self.config, with_wire=with_wire)
+                     self.with_wire = with_wire
                      self._init_repo(create, src_url, update_after_clone, bare)
                      self._commit_ids = {}
                  @LazyProperty
+                 def _remote(self):
+                     return connection.Git(self.path, self.config, with_wire=self.with_wire)
+                 @LazyProperty
                  def bare(self):
                      return self._remote.bare()
                      if not isinstance(cmd, list):
                          raise ValueError('cmd must be a list, got %s instead' % type(cmd))
+                     skip_stderr_log = opts.pop('skip_stderr_log', False)
                      out, err = self._remote.run_git_command(cmd, **opts)
-                     if err:
+                     if err and not skip_stderr_log:
                          log.debug('Stderr output of git command "%s":\n%s', cmd, err)
                      return out, err
                      # we must check if this repo is not empty, since later command
                      # fails if it is. And it's cheaper to ask than throw the subprocess
                      # errors
-                     try:
-                         self._remote.head()
-                     except KeyError:
+                     head = self._remote.head(show_exc=False)
+                     if not head:
                          return []
                      rev_filter = ['--branches', '--tags']
                              cmd = ['fetch', self.path, source_branch]
                              self.run_git_command(cmd, fail_on_stderr=False)
-                 def _local_fetch(self, repository_path, branch_name):
+                 def _local_fetch(self, repository_path, branch_name, use_origin=False):
                      """
                      Fetch a branch from a local repository.
                      """
                      if repository_path == self.path:
                          raise ValueError('Cannot fetch from the same repository')
-                     cmd = ['fetch', '--no-tags', repository_path, branch_name]
+                     if use_origin:
+                         branch_name = '+{branch}:refs/heads/{branch}'.format(
+                             branch=branch_name)
+                     cmd = ['fetch', '--no-tags', '--update-head-ok',
+                            repository_path, branch_name]
+                     self.run_git_command(cmd, fail_on_stderr=False)
+                 def _local_reset(self, branch_name):
+                     branch_name = '{}'.format(branch_name)
+                     cmd = ['reset', '--hard', branch_name]
                      self.run_git_command(cmd, fail_on_stderr=False)
                  def _last_fetch_heads(self):
                      # N.B.(skreft): the --no-ff option is used to enforce the creation of a
                      # commit message. We also specify the user who is doing the merge.
-                     cmd = ['-c', 'user.name=%s' % safe_str(user_name),
+                     cmd = ['-c', 'user.name="%s"' % safe_str(user_name),
                             '-c', 'user.email=%s' % safe_str(user_email),
                             'merge', '--no-ff', '-m', safe_str(merge_message)]
                      cmd.extend(heads)
                      try:
-                         self.run_git_command(cmd, fail_on_stderr=False)
+                         output = self.run_git_command(cmd, fail_on_stderr=False)
                      except RepositoryError:
                          # Cleanup any merge leftovers
                          self.run_git_command(['merge', '--abort'], fail_on_stderr=False)
                      return '%s%d' % (prefix, branch_id)
-                 def _merge_repo(self, shadow_repository_path, target_ref,
+                 def _maybe_prepare_merge_workspace(
+                         self, repo_id, workspace_id, target_ref, source_ref):
+                     shadow_repository_path = self._get_shadow_repository_path(
+                         repo_id, workspace_id)
+                     if not os.path.exists(shadow_repository_path):
+                         self._local_clone(
+                             shadow_repository_path, target_ref.name, source_ref.name)
+                         log.debug(
+                             'Prepared shadow repository in %s', shadow_repository_path)
+                     return shadow_repository_path
+                 def _merge_repo(self, repo_id, workspace_id, target_ref,
                                  source_repo, source_ref, merge_message,
                                  merger_name, merger_email, dry_run=False,
                                  use_rebase=False, close_branch=False):
                      if target_ref.commit_id != self.branches[target_ref.name]:
+                         log.warning('Target ref %s commit mismatch %s vs %s', target_ref,
+                                     target_ref.commit_id, self.branches[target_ref.name])
                          return MergeResponse(
                              False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD)
-                     shadow_repo = GitRepository(shadow_repository_path)
+                     shadow_repository_path = self._maybe_prepare_merge_workspace(
+                         repo_id, workspace_id, target_ref, source_ref)
+                     shadow_repo = self._get_shadow_instance(shadow_repository_path)
                      # checkout source, if it's different. Otherwise we could not
                      # fetch proper commits for merge testing
                      if source_ref.name != target_ref.name:
                          if shadow_repo.get_remote_ref(source_ref.name):
                              shadow_repo._checkout(source_ref.name, force=True)
-                     # checkout target
+                     # checkout target, and fetch changes
                      shadow_repo._checkout(target_ref.name, force=True)
-                     shadow_repo._local_pull(self.path, target_ref.name)
+                     # fetch/reset pull the target, in case it is changed
+                     # this handles even force changes
+                     shadow_repo._local_fetch(self.path, target_ref.name, use_origin=True)
+                     shadow_repo._local_reset(target_ref.name)
                      # Need to reload repo to invalidate the cache, or otherwise we cannot
                      # retrieve the last target commit.
-                     shadow_repo = GitRepository(shadow_repository_path)
+                     shadow_repo = self._get_shadow_instance(shadow_repository_path)
                      if target_ref.commit_id != shadow_repo.branches[target_ref.name]:
+                         log.warning('Shadow Target ref %s commit mismatch %s vs %s',
+                                     target_ref, target_ref.commit_id,
+                                     shadow_repo.branches[target_ref.name])
                          return MergeResponse(
                              False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD)
+                     # calculate new branch
                      pr_branch = shadow_repo._get_new_pr_branch(
                          source_ref.name, target_ref.name)
                      log.debug('using pull-request merge branch: `%s`', pr_branch)
+                     # checkout to temp branch, and fetch changes
                      shadow_repo._checkout(pr_branch, create=True)
                      try:
                          shadow_repo._local_fetch(source_repo.path, source_ref.name)
                      return MergeResponse(
                          merge_possible, merge_succeeded, merge_ref,
                          merge_failure_reason)
-                 def _get_shadow_repository_path(self, workspace_id):
-                     # The name of the shadow repository must start with '.', so it is
-                     # skipped by 'rhodecode.lib.utils.get_filesystem_repos'.
-                     return os.path.join(
-                         os.path.dirname(self.path),
-                         '.__shadow_%s_%s' % (os.path.basename(self.path), workspace_id))
-                 def _maybe_prepare_merge_workspace(self, workspace_id, target_ref, source_ref):
-                     shadow_repository_path = self._get_shadow_repository_path(workspace_id)
-                     if not os.path.exists(shadow_repository_path):
-                         self._local_clone(
-                             shadow_repository_path, target_ref.name, source_ref.name)
-                     return shadow_repository_path

rhodecode/lib/vcs/backends/hg/commit.py

0 +1 -1

                      self._remote = repository._remote
                      self.raw_id = raw_id
-                     self.idx = repository._sanitize_commit_idx(idx)
+                     self.idx = idx
                      self._set_bulk_properties(pre_load)

rhodecode/lib/vcs/backends/hg/repository.py

0 +12 -26

                      # special requirements
                      self.config = config if config else self.get_default_config(
                          default=[('extensions', 'largefiles', '1')])
-                     self._remote = connection.Hg(
-                         self.path, self.config, with_wire=with_wire)
+                     self.with_wire = with_wire
                      self._init_repo(create, src_url, update_after_clone)
                      self._commit_ids = {}
                  @LazyProperty
+                 def _remote(self):
+                     return connection.Hg(self.path, self.config, with_wire=self.with_wire)
+                 @LazyProperty
                  def commit_ids(self):
                      """
                      Returns list of commit ids, in ascending order.  Being lazy
                      else:
                          return os.stat(st_path).st_mtime
-                 def _sanitize_commit_idx(self, idx):
-                     # Note: Mercurial has ``int(-1)`` reserved as not existing id_or_idx
-                     # number. A `long` is treated in the correct way though. So we convert
-                     # `int` to `long` here to make sure it is handled correctly.
-                     if isinstance(idx, int):
-                         return long(idx)
-                     return idx
                  def _get_url(self, url):
                      """
                      Returns normalized url. If schema is not given, would fall
                              pass
                      elif commit_idx is not None:
                          self._validate_commit_idx(commit_idx)
-                         commit_idx = self._sanitize_commit_idx(commit_idx)
                          try:
                              id_ = self.commit_ids[commit_idx]
                              if commit_idx < 0:
                      else:
                          commit_id = "tip"
-                     # TODO Paris: Ugly hack to "serialize" long for msgpack
-                     if isinstance(commit_id, long):
-                         commit_id = float(commit_id)
                      if isinstance(commit_id, unicode):
                          commit_id = safe_str(commit_id)
                          return ref.name
                      return self._remote.ctx_branch(ref.commit_id)
-                 def _get_shadow_repository_path(self, workspace_id):
-                     # The name of the shadow repository must start with '.', so it is
-                     # skipped by 'rhodecode.lib.utils.get_filesystem_repos'.
-                     return os.path.join(
-                         os.path.dirname(self.path),
-                         '.__shadow_%s_%s' % (os.path.basename(self.path), workspace_id))
-                 def _maybe_prepare_merge_workspace(self, workspace_id, unused_target_ref, unused_source_ref):
-                     shadow_repository_path = self._get_shadow_repository_path(workspace_id)
+                 def _maybe_prepare_merge_workspace(
+                         self, repo_id, workspace_id, unused_target_ref, unused_source_ref):
+                     shadow_repository_path = self._get_shadow_repository_path(
+                         repo_id, workspace_id)
                      if not os.path.exists(shadow_repository_path):
                          self._local_clone(shadow_repository_path)
                          log.debug(
                      return shadow_repository_path
-                 def _merge_repo(self, shadow_repository_path, target_ref,
+                 def _merge_repo(self, repo_id, workspace_id, target_ref,
                                  source_repo, source_ref, merge_message,
                                  merger_name, merger_email, dry_run=False,
                                  use_rebase=False, close_branch=False):
                          return MergeResponse(
                              False, False, None, MergeFailureReason.MISSING_TARGET_REF)
+                     shadow_repository_path = self._maybe_prepare_merge_workspace(
+                         repo_id, workspace_id, target_ref, source_ref)
                      shadow_repo = self._get_shadow_instance(shadow_repository_path)
                      log.debug('Pulling in target reference %s', target_ref)

rhodecode/lib/vcs/backends/svn/repository.py

0 +4 -2

                               **kwargs):
                      self.path = safe_str(os.path.abspath(repo_path))
                      self.config = config if config else self.get_default_config()
-                     self._remote = connection.Svn(
-                         self.path, self.config)
                      self._init_repo(create, src_url)
+                 @LazyProperty
+                 def _remote(self):
+                     return connection.Svn(self.path, self.config)
                  def _init_repo(self, create, src_url):
                      if create and os.path.exists(self.path):
                          raise RepositoryError(

rhodecode/lib/vcs/client_http.py

0 +6 -3

              import urllib2
              import urlparse
              import uuid
+             import traceback
              import pycurl
              import msgpack
                      return _remote_call(self.url, payload, EXCEPTIONS_MAP, self._session)
                  def _call_with_logging(self, name, *args, **kwargs):
-                     log.debug('Calling %s@%s with args:%r', self.url, name, args)
+                     context_uid = self._wire.get('context')
+                     log.debug('Calling %s@%s with args:%r. wire_context: %s',
+                               self.url, name, args, context_uid)
                      return RemoteRepo._call(self, name, *args, **kwargs)
                  def __getitem__(self, key):
                  try:
                      response = session.post(url, data=msgpack.packb(payload))
                  except pycurl.error as e:
-                     raise exceptions.HttpVCSCommunicationError(e)
+                     msg = '{}. \npycurl traceback: {}'.format(e, traceback.format_exc())
+                     raise exceptions.HttpVCSCommunicationError(msg)
                  except Exception as e:
                      message = getattr(e, 'message', '')
                      if 'Failed to connect' in message:

rhodecode/lib/vcs/conf/settings.py

0 +1 0

              HOOKS_PROTOCOL = None
              HOOKS_DIRECT_CALLS = False
+             HOOKS_HOST = '127.0.0.1'
              def available_aliases():

rhodecode/lib/vcs/exceptions.py

0 +1 -1

                                  args = e.args
                              else:
                                  args = [__traceback_info__ or 'unhandledException']
-                             if __traceback_info__ and kind != 'unhandled':
+                             if __traceback_info__ and kind not in ['unhandled', 'lookup']:
                                  # for other than unhandled errors also log the traceback
                                  # can be usefull for debugging
                                  log.error(__traceback_info__)

rhodecode/lib/vcs/geventcurl.py

0 +14 -6

              import logging
              import gevent
              import pycurl
+             import greenlet
              # Import everything from pycurl.
              # This allows us to use this module as a drop in replacement of pycurl.
                      while True:
                          try:
                              ret, num_handles = self._curl_multi.socket_action(fd, action)
-                         except pycurl.error, e:
+                         except pycurl.error as e:
                              ret = e.args[0]
                          if ret != pycurl.E_CALL_MULTI_PERFORM:
                              break
                          try:
                              ret, num_handles = self._curl_multi.socket_action(
                                  pycurl.SOCKET_TIMEOUT, 0)
-                         except pycurl.error, e:
+                         except pycurl.error as e:
                              ret = e.args[0]
                          if ret != pycurl.E_CALL_MULTI_PERFORM:
                              break
                      while True:
                          num_q, ok_list, err_list = self._curl_multi.info_read()
                          for curl in ok_list:
-                             curl.waiter.switch()
+                             curl.waiter.switch(None)
                          for curl, errnum, errmsg in err_list:
                              curl.waiter.throw(Exception('%s %s' % (errnum, errmsg)))
                          if num_q == 0:
                      This perform method is compatible with gevent because it uses gevent
                      synchronization mechanisms to wait for the request to finish.
                      """
+                     if getattr(self._curl, 'waiter', None) is not None:
+                         current = greenlet.getcurrent()
+                         msg = 'This curl object is already used by another greenlet, {}, \n' \
+                               'this is {}'.format(self._curl.waiter, current)
+                         raise Exception(msg)
                      waiter = self._curl.waiter = Waiter()
                      try:
                          self._multi.add_handle(self._curl)
-                         response = waiter.get()
+                         try:
+                             return waiter.get()
+                         finally:
+                             self._multi.remove_handle(self._curl)
                      finally:
-                         self._multi.remove_handle(self._curl)
                          del self._curl.waiter
-                     return response
              # Curl is originally imported from pycurl. At this point we override it with
              # our custom implementation.

rhodecode/model/comment.py

0 +8 -6

                      return todos
-                 def _log_audit_action(self, action, action_data, user, comment):
+                 def _log_audit_action(self, action, action_data, auth_user, comment):
                      audit_logger.store(
                          action=action,
                          action_data=action_data,
-                         user=user,
+                         user=auth_user,
                          repo=comment.repo)
                  def create(self, text, repo, user, commit_id=None, pull_request=None,
                             f_path=None, line_no=None, status_change=None,
                             status_change_type=None, comment_type=None,
                             resolves_comment_id=None, closing_pr=False, send_email=True,
-                            renderer=None):
+                            renderer=None, auth_user=None):
                      """
                      Creates new comment for commit or pull request.
                      IF status_change is not none this comment is associated with a
                      :param send_email:
                      :param renderer: pick renderer for this comment
                      """
+                     auth_user = auth_user or user
                      if not text:
                          log.warning('Missing text for comment, skipping...')
                          return
                      comment_data = comment.get_api_data()
                      self._log_audit_action(
-                         action, {'data': comment_data}, user, comment)
+                         action, {'data': comment_data}, auth_user, comment)
                      msg_url = ''
                      channel = None
                      return comment
-                 def delete(self, comment, user):
+                 def delete(self, comment, auth_user):
                      """
                      Deletes given comment
                      """
                          action = 'repo.commit.comment.delete'
                      self._log_audit_action(
-                         action, {'old_data': old_data}, user, comment)
+                         action, {'old_data': old_data}, auth_user, comment)
                      return comment

rhodecode/model/db.py

0 +427 -237

              from sqlalchemy.ext.hybrid import hybrid_property
              from sqlalchemy.exc import IntegrityError  # noqa
              from sqlalchemy.dialects.mysql import LONGTEXT
-             from beaker.cache import cache_region
              from zope.cachedescriptors.property import Lazy as LazyProperty
              from pyramid.threadlocal import get_current_request
              from rhodecode.lib.vcs import get_vcs_instance
              from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
              from rhodecode.lib.utils2 import (
-                 str2bool, safe_str, get_commit_safe, safe_unicode, md5_safe,
+                 str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
                  time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
                  glob2re, StrictAttributeDict, cleaned_uri)
              from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
              def _hash_key(k):
-                 return md5_safe(k)
+                 return sha1_safe(k)
              def in_filter_generator(qry, items, limit=500):
                  return parts
+             base_table_args = {
+                 'extend_existing': True,
+                 'mysql_engine': 'InnoDB',
+                 'mysql_charset': 'utf8',
+                 'sqlite_autoincrement': True
+             }
              class EncryptedTextValue(TypeDecorator):
                  """
                  Special column for encrypted long text data, use like::
                  __tablename__ = 'rhodecode_settings'
                  __table_args__ = (
                      UniqueConstraint('app_settings_name'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  SETTINGS_TYPES = {
                  __tablename__ = 'rhodecode_ui'
                  __table_args__ = (
                      UniqueConstraint('ui_key'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  HOOK_REPO_SIZE = 'changegroup.repo_size'
                      UniqueConstraint(
                          'app_settings_name', 'repository_id',
                          name='uq_repo_rhodecode_setting_name_repo_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  repository_id = Column(
                      UniqueConstraint(
                          'repository_id', 'ui_section', 'ui_key',
                          name='uq_repo_rhodecode_ui_repository_id_section_key'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  repository_id = Column(
                      UniqueConstraint('username'), UniqueConstraint('email'),
                      Index('u_username_idx', 'username'),
                      Index('u_email_idx', 'email'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  DEFAULT_USER = 'default'
                  DEFAULT_USER_EMAIL = 'anonymous@rhodecode.org'
                  DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
                          .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)
                      if cache:
                          feed_tokens = feed_tokens.options(
-                             FromCache("long_term", "get_user_feed_token_%s" % self.user_id))
+                             FromCache("sql_cache_short", "get_user_feed_token_%s" % self.user_id))
                      feed_tokens = feed_tokens.all()
                      if feed_tokens:
                      Session().add(self)
                      log.debug('updated user %s lastlogin', self.username)
-                 def update_lastactivity(self):
-                     """Update user lastactivity"""
-                     self.last_activity = datetime.datetime.now()
-                     Session().add(self)
-                     log.debug('updated user `%s` last activity', self.username)
                  def update_password(self, new_password):
                      from rhodecode.lib.auth import get_crypt_password
                  __table_args__ = (
                      Index('uak_api_key_idx', 'api_key', unique=True),
                      Index('uak_api_key_expires_idx', 'api_key', 'expires'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  __mapper_args__ = {}
                  __table_args__ = (
                      Index('uem_email_idx', 'email'),
                      UniqueConstraint('email'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  __mapper_args__ = {}
                  __tablename__ = 'user_ip_map'
                  __table_args__ = (
                      UniqueConstraint('user_id', 'ip_addr'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  __mapper_args__ = {}
                      UniqueConstraint('ssh_key_fingerprint'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  __mapper_args__ = {}
              class UserLog(Base, BaseModel):
                  __tablename__ = 'user_logs'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  VERSION_1 = 'v1'
                  VERSION_2 = 'v2'
                  VERSIONS = [VERSION_1, VERSION_2]
              class UserGroup(Base, BaseModel):
                  __tablename__ = 'users_groups'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                      return user_group.get(user_group_id)
                  def permissions(self, with_admins=True, with_owner=True):
+                     """
+                     Permissions for user groups
+                     """
+                     _admin_perm = 'usergroup.admin'
+                     owner_row = []
+                     if with_owner:
+                         usr = AttributeDict(self.user.get_dict())
+                         usr.owner_row = True
+                         usr.permission = _admin_perm
+                         owner_row.append(usr)
+                     super_admin_ids = []
+                     super_admin_rows = []
+                     if with_admins:
+                         for usr in User.get_all_super_admins():
+                             super_admin_ids.append(usr.user_id)
+                             # if this admin is also owner, don't double the record
+                             if usr.user_id == owner_row[0].user_id:
+                                 owner_row[0].admin_row = True
+                             else:
+                                 usr = AttributeDict(usr.get_dict())
+                                 usr.admin_row = True
+                                 usr.permission = _admin_perm
+                                 super_admin_rows.append(usr)
                      q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
                      q = q.options(joinedload(UserUserGroupToPerm.user_group),
                                    joinedload(UserUserGroupToPerm.user),
                      perm_rows = []
                      for _usr in q.all():
                          usr = AttributeDict(_usr.user.get_dict())
+                         # if this user is also owner/admin, mark as duplicate record
+                         if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
+                             usr.duplicate_perm = True
                          usr.permission = _usr.permission.permission_name
                          perm_rows.append(usr)
                      # each group
                      perm_rows = sorted(perm_rows, key=display_user_sort)
-                     _admin_perm = 'usergroup.admin'
-                     owner_row = []
-                     if with_owner:
-                         usr = AttributeDict(self.user.get_dict())
-                         usr.owner_row = True
-                         usr.permission = _admin_perm
-                         owner_row.append(usr)
-                     super_admin_rows = []
-                     if with_admins:
-                         for usr in User.get_all_super_admins():
-                             # if this admin is also owner, don't double the record
-                             if usr.user_id == owner_row[0].user_id:
-                                 owner_row[0].admin_row = True
-                             else:
-                                 usr = AttributeDict(usr.get_dict())
-                                 usr.admin_row = True
-                                 usr.permission = _admin_perm
-                                 super_admin_rows.append(usr)
                      return super_admin_rows + owner_row + perm_rows
                  def permission_user_groups(self):
              class UserGroupMember(Base, BaseModel):
                  __tablename__ = 'users_groups_members'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  __tablename__ = 'repositories_fields'
                  __table_args__ = (
                      UniqueConstraint('repository_id', 'field_key'),  # no-multi field
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  PREFIX = 'ex_'  # prefix used in form to not conflict with already existing fields
                  repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  __tablename__ = 'repositories'
                  __table_args__ = (
                      Index('r_repo_name_idx', 'repo_name', mysql_length=255),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
                  DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
                      """
                      Returns associated cache keys for that repo
                      """
+                     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                         repo_id=self.repo_id)
                      return CacheKey.query()\
-                         .filter(CacheKey.cache_args == self.repo_name)\
+                         .filter(CacheKey.cache_args == invalidation_namespace)\
                          .order_by(CacheKey.cache_key)\
                          .all()
                          return os.listdir(diff_cache_dir)
                      return []
+                 def shadow_repos(self):
+                     shadow_repos_pattern = '.__shadow_repo_{}'.format(self.repo_id)
+                     return [
+                         x for x in os.listdir(os.path.dirname(self.repo_full_path))
+                         if x.startswith(shadow_repos_pattern)]
                  def get_new_name(self, repo_name):
                      """
                      returns new full repository name based on assigned group and new new
                      return make_db_config(clear_session=False, repo=self)
                  def permissions(self, with_admins=True, with_owner=True):
+                     """
+                     Permissions for repositories
+                     """
+                     _admin_perm = 'repository.admin'
+                     owner_row = []
+                     if with_owner:
+                         usr = AttributeDict(self.user.get_dict())
+                         usr.owner_row = True
+                         usr.permission = _admin_perm
+                         usr.permission_id = None
+                         owner_row.append(usr)
+                     super_admin_ids = []
+                     super_admin_rows = []
+                     if with_admins:
+                         for usr in User.get_all_super_admins():
+                             super_admin_ids.append(usr.user_id)
+                             # if this admin is also owner, don't double the record
+                             if usr.user_id == owner_row[0].user_id:
+                                 owner_row[0].admin_row = True
+                             else:
+                                 usr = AttributeDict(usr.get_dict())
+                                 usr.admin_row = True
+                                 usr.permission = _admin_perm
+                                 usr.permission_id = None
+                                 super_admin_rows.append(usr)
                      q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
                      q = q.options(joinedload(UserRepoToPerm.repository),
                                    joinedload(UserRepoToPerm.user),
                      perm_rows = []
                      for _usr in q.all():
                          usr = AttributeDict(_usr.user.get_dict())
+                         # if this user is also owner/admin, mark as duplicate record
+                         if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
+                             usr.duplicate_perm = True
+                         # also check if this permission is maybe used by branch_permissions
+                         if _usr.branch_perm_entry:
+                             usr.branch_rules = [x.branch_rule_id for x in _usr.branch_perm_entry]
                          usr.permission = _usr.permission.permission_name
+                         usr.permission_id = _usr.repo_to_perm_id
                          perm_rows.append(usr)
                      # filter the perm rows by 'default' first and then sort them by
                      # each group
                      perm_rows = sorted(perm_rows, key=display_user_sort)
-                     _admin_perm = 'repository.admin'
-                     owner_row = []
-                     if with_owner:
-                         usr = AttributeDict(self.user.get_dict())
-                         usr.owner_row = True
-                         usr.permission = _admin_perm
-                         owner_row.append(usr)
-                     super_admin_rows = []
-                     if with_admins:
-                         for usr in User.get_all_super_admins():
-                             # if this admin is also owner, don't double the record
-                             if usr.user_id == owner_row[0].user_id:
-                                 owner_row[0].admin_row = True
-                             else:
-                                 usr = AttributeDict(usr.get_dict())
-                                 usr.admin_row = True
-                                 usr.permission = _admin_perm
-                                 super_admin_rows.append(usr)
                      return super_admin_rows + owner_row + perm_rows
                  def permission_user_groups(self):
                      if cs_cache is None:
                          # use no-cache version here
                          scm_repo = self.scm_instance(cache=False, config=config)
-                         if scm_repo:
+                         empty = scm_repo.is_empty()
+                         if not empty:
                              cs_cache = scm_repo.get_commit(
                                  pre_load=["author", "date", "message", "parents"])
                          else:
                      # check if we have maybe already latest cached revision
                      if is_outdated(cs_cache) or not self.changeset_cache:
-                         _default = datetime.datetime.fromtimestamp(0)
+                         _default = datetime.datetime.utcnow()
                          last_change = cs_cache.get('date') or _default
+                         if self.updated_on and self.updated_on > last_change:
+                             # we check if last update is newer than the new value
+                             # if yes, we use the current timestamp instead. Imagine you get
+                             # old commit pushed 1y ago, we'd set last update 1y to ago.
+                             last_change = _default
                          log.debug('updated repo %s with new cs cache %s',
                                    self.repo_name, cs_cache)
                          self.updated_on = last_change
                      return self._get_instance(cache=bool(cache), config=config)
                  def _get_instance_cached(self):
-                     @cache_region('long_term')
-                     def _get_repo(cache_key):
+                     from rhodecode.lib import rc_cache
+                     cache_namespace_uid = 'cache_repo_instance.{}'.format(self.repo_id)
+                     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                         repo_id=self.repo_id)
+                     region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
+                     def get_instance_cached(repo_id, context_id):
                          return self._get_instance()
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _get_repo, self.repo_name, None, thread_scoped=True)
-                     with invalidator_context as context:
-                         context.invalidate()
-                         repo = context.compute()
-                     return repo
+                     # we must use thread scoped cache here,
+                     # because each thread of gevent needs it's own not shared connection and cache
+                     # we also alter `args` so the cache key is individual for every green thread.
+                     inv_context_manager = rc_cache.InvalidationContext(
+                         uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace,
+                         thread_scoped=True)
+                     with inv_context_manager as invalidation_context:
+                         args = (self.repo_id, inv_context_manager.cache_key)
+                         # re-compute and store cache if we get invalidate signal
+                         if invalidation_context.should_invalidate():
+                             instance = get_instance_cached.refresh(*args)
+                         else:
+                             instance = get_instance_cached(*args)
+                         log.debug(
+                             'Repo instance fetched in %.3fs', inv_context_manager.compute_time)
+                         return instance
                  def _get_instance(self, cache=True, config=None):
                      config = config or self._config
                  __table_args__ = (
                      UniqueConstraint('group_name', 'group_parent_id'),
                      CheckConstraint('group_id != group_parent_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  __mapper_args__ = {'order_by': 'group_name'}
                      return RepoGroup.url_sep().join(path_prefix + [group_name])
                  def permissions(self, with_admins=True, with_owner=True):
+                     """
+                     Permissions for repository groups
+                     """
+                     _admin_perm = 'group.admin'
+                     owner_row = []
+                     if with_owner:
+                         usr = AttributeDict(self.user.get_dict())
+                         usr.owner_row = True
+                         usr.permission = _admin_perm
+                         owner_row.append(usr)
+                     super_admin_ids = []
+                     super_admin_rows = []
+                     if with_admins:
+                         for usr in User.get_all_super_admins():
+                             super_admin_ids.append(usr.user_id)
+                             # if this admin is also owner, don't double the record
+                             if usr.user_id == owner_row[0].user_id:
+                                 owner_row[0].admin_row = True
+                             else:
+                                 usr = AttributeDict(usr.get_dict())
+                                 usr.admin_row = True
+                                 usr.permission = _admin_perm
+                                 super_admin_rows.append(usr)
                      q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
                      q = q.options(joinedload(UserRepoGroupToPerm.group),
                                    joinedload(UserRepoGroupToPerm.user),
                      perm_rows = []
                      for _usr in q.all():
                          usr = AttributeDict(_usr.user.get_dict())
+                         # if this user is also owner/admin, mark as duplicate record
+                         if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
+                             usr.duplicate_perm = True
                          usr.permission = _usr.permission.permission_name
                          perm_rows.append(usr)
                      # each group
                      perm_rows = sorted(perm_rows, key=display_user_sort)
-                     _admin_perm = 'group.admin'
-                     owner_row = []
-                     if with_owner:
-                         usr = AttributeDict(self.user.get_dict())
-                         usr.owner_row = True
-                         usr.permission = _admin_perm
-                         owner_row.append(usr)
-                     super_admin_rows = []
-                     if with_admins:
-                         for usr in User.get_all_super_admins():
-                             # if this admin is also owner, don't double the record
-                             if usr.user_id == owner_row[0].user_id:
-                                 owner_row[0].admin_row = True
-                             else:
-                                 usr = AttributeDict(usr.get_dict())
-                                 usr.admin_row = True
-                                 usr.permission = _admin_perm
-                                 super_admin_rows.append(usr)
                      return super_admin_rows + owner_row + perm_rows
                  def permission_user_groups(self):
-                     q = UserGroupRepoGroupToPerm.query().filter(UserGroupRepoGroupToPerm.group == self)
+                     q = UserGroupRepoGroupToPerm.query().filter(
+                         UserGroupRepoGroupToPerm.group == self)
                      q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
                                    joinedload(UserGroupRepoGroupToPerm.users_group),
                                    joinedload(UserGroupRepoGroupToPerm.permission),)
                  __tablename__ = 'permissions'
                  __table_args__ = (
                      Index('p_perm_name_idx', 'permission_name'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  PERMS = [
                      ('hg.admin', _('RhodeCode Super Administrator')),
                      ('usergroup.write', _('User group write access')),
                      ('usergroup.admin', _('User group admin access')),
+                     ('branch.none', _('Branch no permissions')),
+                     ('branch.merge', _('Branch access by web merge')),
+                     ('branch.push', _('Branch access by push')),
+                     ('branch.push_force', _('Branch access by push with force')),
                      ('hg.repogroup.create.false', _('Repository Group creation disabled')),
                      ('hg.repogroup.create.true', _('Repository Group creation enabled')),
                      ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
                  ]
-                 # definition of system default permissions for DEFAULT user
+                 # definition of system default permissions for DEFAULT user, created on
+                 # system setup
                  DEFAULT_USER_PERMISSIONS = [
+                     # object perms
                      'repository.read',
                      'group.read',
                      'usergroup.read',
+                     # branch, for backward compat we need same value as before so forced pushed
+                     'branch.push_force',
+                     # global
                      'hg.create.repository',
                      'hg.repogroup.create.false',
                      'hg.usergroup.create.false',
                      'usergroup.write': 3,
                      'usergroup.admin': 4,
+                     'branch.none': 0,
+                     'branch.merge': 1,
+                     'branch.push': 3,
+                     'branch.push_force': 4,
                      'hg.repogroup.create.false': 0,
                      'hg.repogroup.create.true': 1,
                      return q.all()
                  @classmethod
+                 def get_default_repo_branch_perms(cls, user_id, repo_id=None):
+                     q = Session().query(UserToRepoBranchPermission, UserRepoToPerm, Permission) \
+                         .join(
+                             Permission,
+                             UserToRepoBranchPermission.permission_id == Permission.permission_id) \
+                         .join(
+                             UserRepoToPerm,
+                             UserToRepoBranchPermission.rule_to_perm_id == UserRepoToPerm.repo_to_perm_id) \
+                         .filter(UserRepoToPerm.user_id == user_id)
+                     if repo_id:
+                         q = q.filter(UserToRepoBranchPermission.repository_id == repo_id)
+                     return q.order_by(UserToRepoBranchPermission.rule_order).all()
+                 @classmethod
                  def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
                      q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
                          .join(
                      return q.all()
                  @classmethod
+                 def get_default_repo_branch_perms_from_user_group(cls, user_id, repo_id=None):
+                     q = Session().query(UserGroupToRepoBranchPermission, UserGroupRepoToPerm, Permission) \
+                         .join(
+                             Permission,
+                             UserGroupToRepoBranchPermission.permission_id == Permission.permission_id) \
+                         .join(
+                             UserGroupRepoToPerm,
+                             UserGroupToRepoBranchPermission.rule_to_perm_id == UserGroupRepoToPerm.users_group_to_perm_id) \
+                         .join(
+                             UserGroup,
+                             UserGroupRepoToPerm.users_group_id == UserGroup.users_group_id) \
+                         .join(
+                             UserGroupMember,
+                             UserGroupRepoToPerm.users_group_id == UserGroupMember.users_group_id) \
+                         .filter(
+                             UserGroupMember.user_id == user_id,
+                             UserGroup.users_group_active == true())
+                     if repo_id:
+                         q = q.filter(UserGroupToRepoBranchPermission.repository_id == repo_id)
+                     return q.order_by(UserGroupToRepoBranchPermission.rule_order).all()
+                 @classmethod
                  def get_default_group_perms(cls, user_id, repo_group_id=None):
                      q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
-                         .join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\
-                         .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
+                         .join(
+                             Permission,
+                             UserRepoGroupToPerm.permission_id == Permission.permission_id)\
+                         .join(
+                             RepoGroup,
+                             UserRepoGroupToPerm.group_id == RepoGroup.group_id)\
                          .filter(UserRepoGroupToPerm.user_id == user_id)
                      if repo_group_id:
                          q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
                  __tablename__ = 'repo_to_perm'
                  __table_args__ = (
                      UniqueConstraint('user_id', 'repository_id', 'permission_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
                  permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
                  repository = relationship('Repository')
                  permission = relationship('Permission')
+                 branch_perm_entry = relationship('UserToRepoBranchPermission', cascade="all, delete, delete-orphan", lazy='joined')
                  @classmethod
                  def create(cls, user, repository, permission):
                      n = cls()
                  __tablename__ = 'user_user_group_to_perm'
                  __table_args__ = (
                      UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
                  permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
                  __tablename__ = 'user_to_perm'
                  __table_args__ = (
                      UniqueConstraint('user_id', 'permission_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
                  permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
                  __tablename__ = 'users_group_repo_to_perm'
                  __table_args__ = (
                      UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
                  permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
                  users_group = relationship('UserGroup')
                  permission = relationship('Permission')
                  repository = relationship('Repository')
+                 user_group_branch_perms = relationship('UserGroupToRepoBranchPermission', cascade='all')
                  @classmethod
                  def create(cls, users_group, repository, permission):
                  __table_args__ = (
                      UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
                      CheckConstraint('target_user_group_id != user_group_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
                  permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
                  __tablename__ = 'users_group_to_perm'
                  __table_args__ = (
                      UniqueConstraint('users_group_id', 'permission_id',),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
                  permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
                  __tablename__ = 'user_repo_group_to_perm'
                  __table_args__ = (
                      UniqueConstraint('user_id', 'group_id', 'permission_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  __tablename__ = 'users_group_repo_group_to_perm'
                  __table_args__ = (
                      UniqueConstraint('users_group_id', 'group_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
              class Statistics(Base, BaseModel):
                  __tablename__ = 'statistics'
                  __table_args__ = (
-                      {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                       'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                      base_table_args
                  )
                  stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
                  stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
                  __table_args__ = (
                      UniqueConstraint('user_id', 'follows_repository_id'),
                      UniqueConstraint('user_id', 'follows_user_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  __table_args__ = (
                      UniqueConstraint('cache_key'),
                      Index('key_idx', 'cache_key'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
-                 CACHE_TYPE_ATOM = 'ATOM'
-                 CACHE_TYPE_RSS = 'RSS'
+                 CACHE_TYPE_FEED = 'FEED'
                  CACHE_TYPE_README = 'README'
+                 # namespaces used to register process/thread aware caches
+                 REPO_INVALIDATION_NAMESPACE = 'repo_cache:{repo_id}'
+                 SETTINGS_INVALIDATION_NAMESPACE = 'system_settings'
                  cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
                  cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
                      Session().commit()
                  @classmethod
-                 def get_cache_key(cls, repo_name, cache_type):
-                     """
-                     Generate a cache key for this process of RhodeCode instance.
-                     Prefix most likely will be process id or maybe explicitly set
-                     instance_id from .ini file.
-                     """
-                     import rhodecode
-                     prefix = safe_unicode(rhodecode.CONFIG.get('instance_id') or '')
-                     repo_as_unicode = safe_unicode(repo_name)
-                     key = u'{}_{}'.format(repo_as_unicode, cache_type) \
-                         if cache_type else repo_as_unicode
-                     return u'{}{}'.format(prefix, key)
-                 @classmethod
-                 def set_invalidate(cls, repo_name, delete=False):
+                 def set_invalidate(cls, cache_uid, delete=False):
                      """
                      Mark all caches of a repo as invalid in the database.
                      """
                      try:
-                         qry = Session().query(cls).filter(cls.cache_args == repo_name)
+                         qry = Session().query(cls).filter(cls.cache_args == cache_uid)
                          if delete:
-                             log.debug('cache objects deleted for repo %s',
-                                       safe_str(repo_name))
                              qry.delete()
+                             log.debug('cache objects deleted for cache args %s',
+                                       safe_str(cache_uid))
                          else:
-                             log.debug('cache objects marked as invalid for repo %s',
-                                       safe_str(repo_name))
                              qry.update({"cache_active": False})
+                             log.debug('cache objects marked as invalid for cache args %s',
+                                       safe_str(cache_uid))
                          Session().commit()
                      except Exception:
                          log.exception(
-                             'Cache key invalidation failed for repository %s',
-                             safe_str(repo_name))
+                             'Cache key invalidation failed for cache args %s',
+                             safe_str(cache_uid))
                          Session().rollback()
                  @classmethod
                          return inv_obj
                      return None
-                 @classmethod
-                 def repo_context_cache(cls, compute_func, repo_name, cache_type,
-                                        thread_scoped=False):
-                     """
-                     @cache_region('long_term')
-                     def _heavy_calculation(cache_key):
-                         return 'result'
-                     cache_context = CacheKey.repo_context_cache(
-                         _heavy_calculation, repo_name, cache_type)
-                     with cache_context as context:
-                         context.invalidate()
-                         computed = context.compute()
-                     assert computed == 'result'
-                     """
-                     from rhodecode.lib import caches
-                     return caches.InvalidationContext(
-                         compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
              class ChangesetComment(Base, BaseModel):
                  __tablename__ = 'changeset_comments'
                  __table_args__ = (
                      Index('cc_revision_idx', 'revision'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  COMMENT_OUTDATED = u'comment_outdated'
                      Index('cs_revision_idx', 'revision'),
                      Index('cs_version_idx', 'version'),
                      UniqueConstraint('repo_id', 'revision', 'version'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
                  STATUS_APPROVED = 'approved'
                  STATUS_REJECTED = 'rejected'
                  description = Column(
                      'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
                      nullable=True)
+                 description_renderer = Column('description_renderer', Unicode(64), nullable=True)
                  # new/open/closed status of pull request (not approve/reject/etc)
                  status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
                  created_on = Column(
              class PullRequest(Base, _PullRequestBase):
                  __tablename__ = 'pull_requests'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  pull_request_id = Column(
                      workspace_id = self.workspace_id
                      vcs_obj = self.target_repo.scm_instance()
                      shadow_repository_path = vcs_obj._get_shadow_repository_path(
-                         workspace_id)
-                     return vcs_obj._get_shadow_instance(shadow_repository_path)
+                         self.target_repo.repo_id, workspace_id)
+                     if os.path.isdir(shadow_repository_path):
+                         return vcs_obj._get_shadow_instance(shadow_repository_path)
              class PullRequestVersion(Base, _PullRequestBase):
                  __tablename__ = 'pull_request_versions'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  pull_request_version_id = Column(
              class PullRequestReviewers(Base, BaseModel):
                  __tablename__ = 'pull_request_reviewers'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  @hybrid_property
                  __tablename__ = 'notifications'
                  __table_args__ = (
                      Index('notification_type_idx', 'type'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  TYPE_CHANGESET_COMMENT = u'cs_comment'
                      notification.type_ = type_
                      notification.created_on = datetime.datetime.now()
+                     # For each recipient link the created notification to his account
                      for u in recipients:
                          assoc = UserNotification()
+                         assoc.user_id = u.user_id
                          assoc.notification = notification
                          # if created_by is inside recipients mark his notification
                          # as read
                          if u.user_id == created_by.user_id:
                              assoc.read = True
-                         u.notifications.append(assoc)
+                         Session().add(assoc)
                      Session().add(notification)
                      return notification
                  __tablename__ = 'user_to_notification'
                  __table_args__ = (
                      UniqueConstraint('user_id', 'notification_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
                  notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
                  read = Column('read', Boolean, default=False)
                  __table_args__ = (
                      Index('g_gist_access_id_idx', 'gist_access_id'),
                      Index('g_created_on_idx', 'created_on'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  GIST_PUBLIC = u'public'
                  GIST_PRIVATE = u'private'
                  DEFAULT_FILENAME = u'gistfile1.txt'
                  __table_args__ = (
                      Index('local_user_id_idx', 'local_user_id'),
                      Index('external_id_idx', 'external_id'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8'})
+                     base_table_args
+                 )
                  external_id = Column('external_id', Unicode(255), default=u'',
                                       primary_key=True)
              class Integration(Base, BaseModel):
                  __tablename__ = 'integrations'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+                     base_table_args
                  )
                  integration_id = Column('integration_id', Integer(), primary_key=True)
              class RepoReviewRuleUser(Base, BaseModel):
                  __tablename__ = 'repo_review_rules_users'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+                     base_table_args
                  )
                  repo_review_rule_user_id = Column('repo_review_rule_user_id', Integer(), primary_key=True)
              class RepoReviewRuleUserGroup(Base, BaseModel):
                  __tablename__ = 'repo_review_rules_users_groups'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+                     base_table_args
                  )
                  VOTE_RULE_ALL = -1
                  repo_review_rule_users_group_id = Column('repo_review_rule_users_group_id', Integer(), primary_key=True)
              class RepoReviewRule(Base, BaseModel):
                  __tablename__ = 'repo_review_rules'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+                     base_table_args
                  )
                  repo_review_rule_id = Column(
                  rule_users = relationship('RepoReviewRuleUser')
                  rule_user_groups = relationship('RepoReviewRuleUserGroup')
-                 def _validate_glob(self, value):
+                 def _validate_pattern(self, value):
                      re.compile('^' + glob2re(value) + '$')
                  @hybrid_property
                  @source_branch_pattern.setter
                  def source_branch_pattern(self, value):
-                     self._validate_glob(value)
+                     self._validate_pattern(value)
                      self._branch_pattern = value or '*'
                  @hybrid_property
                  @target_branch_pattern.setter
                  def target_branch_pattern(self, value):
-                     self._validate_glob(value)
+                     self._validate_pattern(value)
                      self._target_branch_pattern = value or '*'
                  @hybrid_property
                  @file_pattern.setter
                  def file_pattern(self, value):
-                     self._validate_glob(value)
+                     self._validate_pattern(value)
                      self._file_pattern = value or '*'
                  def matches(self, source_branch, target_branch, files_changed):
                          if self.source_branch_pattern == '*':
                              source_branch_match = True
                          else:
-                             source_branch_regex = re.compile(
-                                 '^' + glob2re(self.source_branch_pattern) + '$')
+                             if self.source_branch_pattern.startswith('re:'):
+                                 source_pattern = self.source_branch_pattern[3:]
+                             else:
+                                 source_pattern = '^' + glob2re(self.source_branch_pattern) + '$'
+                             source_branch_regex = re.compile(source_pattern)
                              source_branch_match = bool(source_branch_regex.search(source_branch))
                          if self.target_branch_pattern == '*':
                              target_branch_match = True
                          else:
-                             target_branch_regex = re.compile(
-                                 '^' + glob2re(self.target_branch_pattern) + '$')
+                             if self.target_branch_pattern.startswith('re:'):
+                                 target_pattern = self.target_branch_pattern[3:]
+                             else:
+                                 target_pattern = '^' + glob2re(self.target_branch_pattern) + '$'
+                             target_branch_regex = re.compile(target_pattern)
                              target_branch_match = bool(target_branch_regex.search(target_branch))
                          branch_matches = source_branch_match and target_branch_match
                      files_matches = True
                      if self.file_pattern != '*':
                          files_matches = False
-                         file_regex = re.compile(glob2re(self.file_pattern))
+                         if self.file_pattern.startswith('re:'):
+                             file_pattern = self.file_pattern[3:]
+                         else:
+                             file_pattern = glob2re(self.file_pattern)
+                         file_regex = re.compile(file_pattern)
                          for filename in files_changed:
                              if file_regex.search(filename):
                                  files_matches = True
                      return users
-                 def user_group_vote_rule(self):
+                 def user_group_vote_rule(self, user_id):
                      rules = []
-                     if self.rule_user_groups:
-                         for user_group in self.rule_user_groups:
+                     if not self.rule_user_groups:
+                         return rules
+                     for user_group in self.rule_user_groups:
+                         user_group_members = [x.user_id for x in user_group.users_group.members]
+                         if user_id in user_group_members:
                              rules.append(user_group)
                      return rules
                  __table_args__ = (
                      UniqueConstraint('schedule_name', name='s_schedule_name_idx'),
                      UniqueConstraint('task_uid', name='s_task_uid_idx'),
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  schedule_types = ['crontab', 'timedelta', 'integer']
                  schedule_entry_id = Column('schedule_entry_id', Integer(), primary_key=True)
                  target.task_uid = ScheduleEntry.get_uid(target)
+             class _BaseBranchPerms(BaseModel):
+                 @classmethod
+                 def compute_hash(cls, value):
+                     return sha1_safe(value)
+                 @hybrid_property
+                 def branch_pattern(self):
+                     return self._branch_pattern or '*'
+                 @hybrid_property
+                 def branch_hash(self):
+                     return self._branch_hash
+                 def _validate_glob(self, value):
+                     re.compile('^' + glob2re(value) + '$')
+                 @branch_pattern.setter
+                 def branch_pattern(self, value):
+                     self._validate_glob(value)
+                     self._branch_pattern = value or '*'
+                     # set the Hash when setting the branch pattern
+                     self._branch_hash = self.compute_hash(self._branch_pattern)
+                 def matches(self, branch):
+                     """
+                     Check if this the branch matches entry
+                     :param branch: branch name for the commit
+                     """
+                     branch = branch or ''
+                     branch_matches = True
+                     if branch:
+                         branch_regex = re.compile('^' + glob2re(self.branch_pattern) + '$')
+                         branch_matches = bool(branch_regex.search(branch))
+                     return branch_matches
+             class UserToRepoBranchPermission(Base, _BaseBranchPerms):
+                 __tablename__ = 'user_to_repo_branch_permissions'
+                 __table_args__ = (
+                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
+                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+                 )
+                 branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
+                 repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+                 repo = relationship('Repository', backref='user_branch_perms')
+                 permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+                 permission = relationship('Permission')
+                 rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('repo_to_perm.repo_to_perm_id'), nullable=False, unique=None, default=None)
+                 user_repo_to_perm = relationship('UserRepoToPerm')
+                 rule_order = Column('rule_order', Integer(), nullable=False)
+                 _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
+                 _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
+                 def __unicode__(self):
+                     return u'<UserBranchPermission(%s => %r)>' % (
+                         self.user_repo_to_perm, self.branch_pattern)
+             class UserGroupToRepoBranchPermission(Base, _BaseBranchPerms):
+                 __tablename__ = 'user_group_to_repo_branch_permissions'
+                 __table_args__ = (
+                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
+                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
+                 )
+                 branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
+                 repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+                 repo = relationship('Repository', backref='user_group_branch_perms')
+                 permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+                 permission = relationship('Permission')
+                 rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('users_group_repo_to_perm.users_group_to_perm_id'), nullable=False, unique=None, default=None)
+                 user_group_repo_to_perm = relationship('UserGroupRepoToPerm')
+                 rule_order = Column('rule_order', Integer(), nullable=False)
+                 _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
+                 _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
+                 def __unicode__(self):
+                     return u'<UserBranchPermission(%s => %r)>' % (
+                         self.user_group_repo_to_perm, self.branch_pattern)
              class DbMigrateVersion(Base, BaseModel):
                  __tablename__ = 'db_migrate_version'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  repository_id = Column('repository_id', String(250), primary_key=True)
                  repository_path = Column('repository_path', Text)
                  version = Column('version', Integer)
+                 @classmethod
+                 def set_version(cls, version):
+                     """
+                     Helper for forcing a different version, usually for debugging purposes via ishell.
+                     """
+                     ver = DbMigrateVersion.query().first()
+                     ver.version = version
+                     Session().commit()
              class DbSession(Base, BaseModel):
                  __tablename__ = 'db_session'
                  __table_args__ = (
-                     {'extend_existing': True, 'mysql_engine': 'InnoDB',
-                      'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+                     base_table_args,
                  )
                  def __repr__(self):

rhodecode/model/forms.py

0 +15 0

                      overwrite_default_repo = v.StringBoolean(if_missing=False)
                      overwrite_default_group = v.StringBoolean(if_missing=False)
                      overwrite_default_user_group = v.StringBoolean(if_missing=False)
                      default_repo_perm = v.OneOf(repo_perms_choices)
                      default_group_perm = v.OneOf(group_perms_choices)
                      default_user_group_perm = v.OneOf(user_group_perms_choices)
                  return _ObjectPermissionsForm
+             def BranchPermissionsForm(localizer, branch_perms_choices):
+                 _ = localizer
+                 class _BranchPermissionsForm(formencode.Schema):
+                     allow_extra_fields = True
+                     filter_extra_fields = True
+                     overwrite_default_branch = v.StringBoolean(if_missing=False)
+                     default_branch_perm = v.OneOf(branch_perms_choices)
+                 return _BranchPermissionsForm
              def UserPermissionsForm(localizer, create_choices, create_on_write_choices,
                                      repo_group_create_choices, user_group_create_choices,
                                      fork_choices, inherit_default_permissions_choices):
                      review_members = formencode.ForEach(ReviewerForm())
                      pullrequest_title = v.UnicodeString(strip=True, required=True, min=3, max=255)
                      pullrequest_desc = v.UnicodeString(strip=True, required=False)
+                     description_renderer = v.UnicodeString(strip=True, required=False)
                  return _PullRequestForm

rhodecode/model/gist.py

0 +6 -1

              from rhodecode.lib.utils2 import (
                  safe_unicode, unique_id, safe_int, time_to_datetime, AttributeDict)
              from rhodecode.lib.ext_json import json
+             from rhodecode.lib.vcs import VCSError
              from rhodecode.model import BaseModel
              from rhodecode.model.db import Gist
              from rhodecode.model.repo import RepoModel
                      :param gist_access_id:
                      """
                      repo = Gist.get_by_access_id(gist_access_id)
-                     commit = repo.scm_instance().get_commit(commit_id=revision)
+                     vcs_repo = repo.scm_instance()
+                     if not vcs_repo:
+                         raise VCSError('Failed to load gist repository for {}'.format(repo))
+                     commit = vcs_repo.get_commit(commit_id=revision)
                      return commit, [n for n in commit.get_node('/')]
                  def create(self, description, owner, gist_mapping,

rhodecode/model/integration.py

0 +23 -24

              from rhodecode.integrations.types.base import EEIntegration
              from rhodecode.lib.caching_query import FromCache
              from rhodecode.model import BaseModel
-             from rhodecode.model.db import Integration, Repository, RepoGroup
+             from rhodecode.model.db import Integration, Repository, RepoGroup, true, false
              from rhodecode.integrations import integration_type_registry
              log = logging.getLogger(__name__)
                      if isinstance(scope, Repository):
                          query = self.sa.query(Integration).filter(
-                             Integration.repo==scope)
+                             Integration.repo == scope)
                      elif isinstance(scope, RepoGroup):
                          query = self.sa.query(Integration).filter(
-                             Integration.repo_group==scope)
+                             Integration.repo_group == scope)
                      elif scope == 'global':
                          # global integrations
                          query = self.sa.query(Integration).filter(
-                             and_(Integration.repo_id==None, Integration.repo_group_id==None)
+                             and_(Integration.repo_id == None, Integration.repo_group_id == None)
                          )
                      elif scope == 'root-repos':
                          query = self.sa.query(Integration).filter(
-                             and_(Integration.repo_id==None,
-                                  Integration.repo_group_id==None,
-                                  Integration.child_repos_only==True)
+                             and_(Integration.repo_id == None,
+                                  Integration.repo_group_id == None,
+                                  Integration.child_repos_only == true())
                          )
                      elif scope == 'all':
                          query = self.sa.query(Integration)
                      query = self.sa.query(
                          Integration
                      ).filter(
-                         Integration.enabled==True
+                         Integration.enabled == true()
                      )
                      global_integrations_filter = and_(
-                         Integration.repo_id==None,
-                         Integration.repo_group_id==None,
-                         Integration.child_repos_only==False,
+                         Integration.repo_id == None,
+                         Integration.repo_group_id == None,
+                         Integration.child_repos_only == False,
                      )
                      if isinstance(event, events.RepoEvent):
                          root_repos_integrations_filter = and_(
-                             Integration.repo_id==None,
-                             Integration.repo_group_id==None,
-                             Integration.child_repos_only==True,
+                             Integration.repo_id == None,
+                             Integration.repo_group_id == None,
+                             Integration.child_repos_only == true(),
                          )
                          clauses = [
                          ]
                          # repo integrations
-                         if event.repo.repo_id: # pre create events dont have a repo_id yet
+                         if event.repo.repo_id:  # pre create events dont have a repo_id yet
                              clauses.append(
-                                 Integration.repo_id==event.repo.repo_id
+                                 Integration.repo_id == event.repo.repo_id
                              )
                          if event.repo.group:
                              clauses.append(
                                  and_(
-                                     Integration.repo_group_id==event.repo.group.group_id,
-                                     Integration.child_repos_only==True
+                                     Integration.repo_group_id == event.repo.group.group_id,
+                                     Integration.child_repos_only == true()
                                  )
                              )
                              # repo group cascade to kids
                                  and_(
                                      Integration.repo_group_id.in_(
                                          [group.group_id for group in
-                                         event.repo.groups_with_parents]
+                                          event.repo.groups_with_parents]
                                      ),
-                                     Integration.child_repos_only==False
+                                     Integration.child_repos_only == false()
                                  )
                              )
-                         if not event.repo.group: # root repo
+                         if not event.repo.group:  # root repo
                              clauses.append(root_repos_integrations_filter)
                          query = query.filter(or_(*clauses))
                              cache_key = "get_enabled_repo_integrations_%i" % event.repo.repo_id
                              query = query.options(
                                  FromCache("sql_cache_short", cache_key))
-                     else: # only global integrations
+                     else:  # only global integrations
                          query = query.filter(global_integrations_filter)
                          if cache:
                              query = query.options(
                                  FromCache("sql_cache_short", "get_enabled_global_integrations"))
                      result = query.all()
-                     return result
  No newline at end of file
+                     return result

rhodecode/model/meta.py

0 +7 -12

              from sqlalchemy.ext.declarative import declarative_base
              from sqlalchemy.orm import scoped_session, sessionmaker
-             from beaker import cache
              from rhodecode.lib import caching_query
-             # Beaker CacheManager.  A home base for cache configurations.
-             cache_manager = cache.CacheManager()
+             __all__ = ['Base', 'Session']
-             __all__ = ['Base', 'Session']
+             #
-             # SQLAlchemy session manager. Updated by model.init_model()
+             #
+             # scoped_session.  Apply our custom CachingQuery class to it,
+             # using a callable that will associate the dictionary
+             # of regions with the Query.
+             # to use cache use this in query
+             # .options(FromCache("sqlalchemy_cache_type", "cachekey"))
              Session = scoped_session(
                              sessionmaker(
-                                 query_cls=caching_query.query_callable(cache_manager),
+                                 query_cls=caching_query.query_callable(),
                                  expire_on_commit=True,
                              )
                        )
              # The declarative Base
              Base = declarative_base()
-             #to use cache use this in query
-             #.options(FromCache("sqlalchemy_cache_type", "cachekey"))

rhodecode/model/permission.py

0 +79 -5

              from rhodecode.model import BaseModel
              from rhodecode.model.db import (
                  User, Permission, UserToPerm, UserRepoToPerm, UserRepoGroupToPerm,
-                 UserUserGroupToPerm, UserGroup, UserGroupToPerm)
+                 UserUserGroupToPerm, UserGroup, UserGroupToPerm, UserToRepoBranchPermission)
              from rhodecode.lib.utils2 import str2bool, safe_int
              log = logging.getLogger(__name__)
                      'default_repo_perm': None,
                      'default_group_perm': None,
                      'default_user_group_perm': None,
+                     # branch
+                     'default_branch_perm': None,
                  }
                  def set_global_permission_choices(self, c_obj, gettext_translator):
                          ('usergroup.write', _('Write'),),
                          ('usergroup.admin', _('Admin'),)]
+                     c_obj.branch_perms_choices = [
+                         ('branch.none', _('Protected/No Access'),),
+                         ('branch.merge', _('Web merge'),),
+                         ('branch.push', _('Push'),),
+                         ('branch.push_force', _('Force Push'),)]
                      c_obj.register_choices = [
                          ('hg.register.none', _('Disabled')),
                          ('hg.register.manual_activate', _('Allowed with manual account activation')),
                          if perm.permission.permission_name.startswith('usergroup.'):
                              defaults['default_user_group_perm' + suffix] = perm.permission.permission_name
+                         # branch
+                         if perm.permission.permission_name.startswith('branch.'):
+                             defaults['default_branch_perm' + suffix] = perm.permission.permission_name
                          # creation of objects
                          if perm.permission.permission_name.startswith('hg.create.write_on_repogroup'):
                              defaults['default_repo_create_on_write' + suffix] = perm.permission.permission_name
                              'default_repo_perm': 'repository.',
                              'default_group_perm': 'group.',
                              'default_user_group_perm': 'usergroup.',
+                             # branch
+                             'default_branch_perm': 'branch.',
                          }[field_name]
                      for field in keep_fields:
                          pat = get_pat(field)
                      _global_perms = self.global_perms.copy()
                      if obj_type not in ['user', 'user_group']:
                          raise ValueError("obj_type must be on of 'user' or 'user_group'")
-                     if len(_global_perms) != len(Permission.DEFAULT_USER_PERMISSIONS):
-                         raise Exception('Inconsistent permissions definition')
+                     global_perms = len(_global_perms)
+                     default_user_perms = len(Permission.DEFAULT_USER_PERMISSIONS)
+                     if global_perms != default_user_perms:
+                         raise Exception(
+                             'Inconsistent permissions definition. Got {} vs {}'.format(
+                                 global_perms, default_user_perms))
                      if obj_type == 'user':
                          self._clear_user_perms(object.user_id, preserve)
                  def create_default_user_group_permissions(self, user_group, force=False):
                      """
-                     Creates only missing default permissions for user group, if force is set it
-                     resets the default permissions for that user group
+                     Creates only missing default permissions for user group, if force is
+                     set it resets the default permissions for that user group
                      :param user_group:
                      :param force:
                              'default_repo_perm',
                              'default_group_perm',
                              'default_user_group_perm',
+                             'default_branch_perm',
                              'default_repo_group_create',
                              'default_user_group_create',
                              'default_repo_perm',
                              'default_group_perm',
                              'default_user_group_perm',
+                             'default_branch_perm',
                              'default_register',
                              'default_password_reset',
                              'default_repo_perm',
                              'default_group_perm',
                              'default_user_group_perm',
+                             'default_branch_perm',
                              'default_register',
                              'default_password_reset',
                              'default_repo_create',
                              'default_fork_create',
                              'default_inherit_default_permissions',
+                             'default_branch_perm',
                              'default_register',
                              'default_password_reset',
                                             .all():
                                  g2p.permission = _def
                                  self.sa.add(g2p)
+                         # COMMIT
                          self.sa.commit()
                      except (DatabaseError,):
                          log.exception('Failed to set default object permissions')
                          self.sa.rollback()
                          raise
+                 def update_branch_permissions(self, form_result):
+                     if 'perm_user_id' in form_result:
+                         perm_user = User.get(safe_int(form_result['perm_user_id']))
+                     else:
+                         # used mostly to do lookup for default user
+                         perm_user = User.get_by_username(form_result['perm_user_name'])
+                     try:
+                         # stage 2 reset defaults and set them from form data
+                         self._set_new_user_perms(perm_user, form_result, preserve=[
+                             'default_repo_perm',
+                             'default_group_perm',
+                             'default_user_group_perm',
+                             'default_repo_group_create',
+                             'default_user_group_create',
+                             'default_repo_create_on_write',
+                             'default_repo_create',
+                             'default_fork_create',
+                             'default_inherit_default_permissions',
+                             'default_register',
+                             'default_password_reset',
+                             'default_extern_activate'])
+                         # overwrite default branch permissions
+                         if form_result['overwrite_default_branch']:
+                             _def_name = \
+                                 form_result['default_branch_perm'].split('branch.')[-1]
+                             _def = Permission.get_by_key('branch.' + _def_name)
+                             user_perms = UserToRepoBranchPermission.query()\
+                                 .join(UserToRepoBranchPermission.user_repo_to_perm)\
+                                 .filter(UserRepoToPerm.user == perm_user).all()
+                             for g2p in user_perms:
+                                 g2p.permission = _def
+                                 self.sa.add(g2p)
+                         # COMMIT
+                         self.sa.commit()
+                     except (DatabaseError,):
+                         log.exception('Failed to set default branch permissions')
+                         self.sa.rollback()
+                         raise

rhodecode/model/pull_request.py

0 +63 -25

                  def create(self, created_by, source_repo, source_ref, target_repo,
                             target_ref, revisions, reviewers, title, description=None,
-                            reviewer_data=None, translator=None):
+                            description_renderer=None,
+                            reviewer_data=None, translator=None, auth_user=None):
                      translator = translator or get_current_request().translate
                      created_by_user = self._get_user(created_by)
+                     auth_user = auth_user or created_by_user.AuthUser()
                      source_repo = self._get_repo(source_repo)
                      target_repo = self._get_repo(target_repo)
                      pull_request.revisions = revisions
                      pull_request.title = title
                      pull_request.description = description
+                     pull_request.description_renderer = description_renderer
                      pull_request.author = created_by_user
                      pull_request.reviewer_data = reviewer_data
                          rule_id = list(rules)[0] if rules else None
                          rule = RepoReviewRule.get(rule_id) if rule_id else None
                          if rule:
-                             review_group = rule.user_group_vote_rule()
+                             review_group = rule.user_group_vote_rule(user_id)
+                             # we check if this particular reviewer is member of a voting group
                              if review_group:
                                  # NOTE(marcink):
-                                 # again, can be that user is member of more,
-                                 # but we pick the first same, as default reviewers algo
+                                 # can be that user is member of more but we pick the first same,
+                                 # same as default reviewers algo
                                  review_group = review_group[0]
                                  rule_data = {
                                          review_group.users_group.users_group_name,
                                      'rule_user_group_members':
                                          [x.user.username for x in review_group.users_group.members],
+                                     'rule_user_group_members_id':
+                                         [x.user.user_id for x in review_group.users_group.members],
                                  }
                                  # e.g {'vote_rule': -1, 'mandatory': True}
                                  rule_data.update(review_group.rule_data())
                      # prepare workspace, and run initial merge simulation
                      MergeCheck.validate(
-                         pull_request, user=created_by_user, translator=translator)
+                         pull_request, auth_user=auth_user, translator=translator)
                      self.notify_reviewers(pull_request, reviewer_ids)
                      self._trigger_pull_request_hook(
                      creation_data = pull_request.get_api_data(with_merge_state=False)
                      self._log_audit_action(
                          'repo.pull_request.create', {'data': creation_data},
-                         created_by_user, pull_request)
+                         auth_user, pull_request)
                      return pull_request
                      return commit_ids
-                 def merge(self, pull_request, user, extras):
+                 def merge_repo(self, pull_request, user, extras):
                      log.debug("Merging pull request %s", pull_request.pull_request_id)
                      merge_state = self._merge_pull_request(pull_request, user, extras)
                      if merge_state.executed:
                          }
                      workspace_id = self._workspace_id(pull_request)
+                     repo_id = pull_request.target_repo.repo_id
                      use_rebase = self._use_rebase_for_merging(pull_request)
                      close_branch = self._close_branch_before_merging(pull_request)
                      callback_daemon, extras = prepare_callback_daemon(
                          extras, protocol=vcs_settings.HOOKS_PROTOCOL,
+                         host=vcs_settings.HOOKS_HOST,
                          use_direct_calls=vcs_settings.HOOKS_DIRECT_CALLS)
                      with callback_daemon:
                          target_vcs.config.set(
                              'rhodecode', 'RC_SCM_DATA', json.dumps(extras))
                          merge_state = target_vcs.merge(
-                             target_ref, source_vcs, pull_request.source_ref_parts,
-                             workspace_id, user_name=user.username,
-                             user_email=user.email, message=message, use_rebase=use_rebase,
+                             repo_id, workspace_id, target_ref, source_vcs,
+                             pull_request.source_ref_parts,
+                             user_name=user.username, user_email=user.email,
+                             message=message, use_rebase=use_rebase,
                              close_branch=close_branch)
                      return merge_state
                      renderer = RstTemplateRenderer()
                      return renderer.render('pull_request_update.mako', **params)
-                 def edit(self, pull_request, title, description, user):
+                 def edit(self, pull_request, title, description, description_renderer, user):
                      pull_request = self.__get_pull_request(pull_request)
                      old_data = pull_request.get_api_data(with_merge_state=False)
                      if pull_request.is_closed():
                          pull_request.title = title
                      pull_request.description = description
                      pull_request.updated_on = datetime.datetime.now()
+                     pull_request.description_renderer = description_renderer
                      Session().add(pull_request)
                      self._log_audit_action(
                          'repo.pull_request.edit', {'old_data': old_data},
                      return comment, status
-                 def merge_status(self, pull_request, translator=None):
+                 def merge_status(self, pull_request, translator=None,
+                                  force_shadow_repo_refresh=False):
                      _ = translator or get_current_request().translate
                      if not self._is_merge_enabled(pull_request):
                          return merge_possible, msg
                      try:
-                         resp = self._try_merge(pull_request)
+                         resp = self._try_merge(
+                             pull_request,
+                             force_shadow_repo_refresh=force_shadow_repo_refresh)
                          log.debug("Merge response: %s", resp)
                          status = resp.possible, self.merge_status_message(
                              resp.failure_reason)
                          'extensions', 'largefiles')
                      return largefiles_ui and largefiles_ui[0].active
-                 def _try_merge(self, pull_request):
+                 def _try_merge(self, pull_request, force_shadow_repo_refresh=False):
                      """
                      Try to merge the pull request and return the merge status.
                      """
                      log.debug(
-                         "Trying out if the pull request %s can be merged.",
-                         pull_request.pull_request_id)
+                         "Trying out if the pull request %s can be merged. Force_refresh=%s",
+                         pull_request.pull_request_id, force_shadow_repo_refresh)
                      target_vcs = pull_request.target_repo.scm_instance()
                      # Refresh the target reference.
                          log.debug("The target repository is locked.")
                          merge_state = MergeResponse(
                              False, False, None, MergeFailureReason.TARGET_IS_LOCKED)
-                     elif self._needs_merge_state_refresh(pull_request, target_ref):
+                     elif force_shadow_repo_refresh or self._needs_merge_state_refresh(
+                             pull_request, target_ref):
                          log.debug("Refreshing the merge status of the repository.")
                          merge_state = self._refresh_merge_state(
                              pull_request, target_vcs, target_ref)
                  def _refresh_merge_state(self, pull_request, target_vcs, target_reference):
                      workspace_id = self._workspace_id(pull_request)
                      source_vcs = pull_request.source_repo.scm_instance()
+                     repo_id = pull_request.target_repo.repo_id
                      use_rebase = self._use_rebase_for_merging(pull_request)
                      close_branch = self._close_branch_before_merging(pull_request)
                      merge_state = target_vcs.merge(
+                         repo_id, workspace_id,
                          target_reference, source_vcs, pull_request.source_ref_parts,
-                         workspace_id, dry_run=True, use_rebase=use_rebase,
+                         dry_run=True, use_rebase=use_rebase,
                          close_branch=close_branch)
                      # Do not store the response if there was an unknown error.
                  def _cleanup_merge_workspace(self, pull_request):
                      # Merging related cleanup
+                     repo_id = pull_request.target_repo.repo_id
                      target_scm = pull_request.target_repo.scm_instance()
-                     workspace_id = 'pr-%s' % pull_request.pull_request_id
+                     workspace_id = self._workspace_id(pull_request)
                      try:
-                         target_scm.cleanup_merge_workspace(workspace_id)
+                         target_scm.cleanup_merge_workspace(repo_id, workspace_id)
                      except NotImplementedError:
                          pass
                      )
                  @classmethod
-                 def validate(cls, pull_request, user, translator, fail_early=False):
+                 def validate(cls, pull_request, auth_user, translator, fail_early=False,
+                              force_shadow_repo_refresh=False):
                      _ = translator
                      merge_check = cls()
                      # permissions to merge
                      user_allowed_to_merge = PullRequestModel().check_user_merge(
-                         pull_request, user)
+                         pull_request, auth_user)
                      if not user_allowed_to_merge:
                          log.debug("MergeCheck: cannot merge, approval is pending.")
-                         msg = _('User `{}` not allowed to perform merge.').format(user.username)
-                         merge_check.push_error('error', msg, cls.PERM_CHECK, user.username)
+                         msg = _('User `{}` not allowed to perform merge.').format(auth_user.username)
+                         merge_check.push_error('error', msg, cls.PERM_CHECK, auth_user.username)
+                         if fail_early:
+                             return merge_check
+                     # permission to merge into the target branch
+                     target_commit_id = pull_request.target_ref_parts.commit_id
+                     if pull_request.target_ref_parts.type == 'branch':
+                         branch_name = pull_request.target_ref_parts.name
+                     else:
+                         # for mercurial we can always figure out the branch from the commit
+                         # in case of bookmark
+                         target_commit = pull_request.target_repo.get_commit(target_commit_id)
+                         branch_name = target_commit.branch
+                     rule, branch_perm = auth_user.get_rule_and_branch_permission(
+                         pull_request.target_repo.repo_name, branch_name)
+                     if branch_perm and branch_perm == 'branch.none':
+                         msg = _('Target branch `{}` changes rejected by rule {}.').format(
+                             branch_name, rule)
+                         merge_check.push_error('error', msg, cls.PERM_CHECK, auth_user.username)
                          if fail_early:
                              return merge_check
                      # merge possible, here is the filesystem simulation + shadow repo
                      merge_status, msg = PullRequestModel().merge_status(
-                         pull_request, translator=translator)
+                         pull_request, translator=translator,
+                         force_shadow_repo_refresh=force_shadow_repo_refresh)
                      merge_check.merge_possible = merge_status
                      merge_check.merge_msg = msg
                      if not merge_status:

rhodecode/model/repo.py

0 +14 -8

                      settings_model = VcsSettingsModel(sa=self.sa)
                      return settings_model.get_repos_location()
-                 def get(self, repo_id, cache=False):
+                 def get(self, repo_id):
                      repo = self.sa.query(Repository) \
                          .filter(Repository.repo_id == repo_id)
-                     if cache:
-                         repo = repo.options(
-                             FromCache("sql_cache_short", "get_repo_%s" % repo_id))
                      return repo.scalar()
                  def get_repo(self, repository):
                              # this updates also current one if found
                              self.grant_user_permission(
                                  repo=repo, user=member_id, perm=perm)
-                         else:  # set for user group
+                         elif member_type == 'user_group':
                              # check if we have permissions to alter this usergroup
                              member_name = UserGroup.get(member_id).users_group_name
                              if not check_perms or HasUserGroupPermissionAny(
                                      *req_perms)(member_name, user=cur_user):
                                  self.grant_user_group_permission(
                                      repo=repo, group_name=member_id, perm=perm)
+                         else:
+                             raise ValueError("member_type must be 'user' or 'user_group' "
+                                              "got {} instead".format(member_type))
                          changes['updated'].append({'type': member_type, 'id': member_id,
                                                     'name': member_name, 'new_perm': perm})
                              member_name = User.get(member_id).username
                              self.grant_user_permission(
                                  repo=repo, user=member_id, perm=perm)
-                         else:  # set for user group
+                         elif member_type == 'user_group':
                              # check if we have permissions to alter this usergroup
                              member_name = UserGroup.get(member_id).users_group_name
                              if not check_perms or HasUserGroupPermissionAny(
                                      *req_perms)(member_name, user=cur_user):
                                  self.grant_user_group_permission(
                                      repo=repo, group_name=member_id, perm=perm)
+                         else:
+                             raise ValueError("member_type must be 'user' or 'user_group' "
+                                              "got {} instead".format(member_type))
                          changes['added'].append({'type': member_type, 'id': member_id,
                                                   'name': member_name, 'new_perm': perm})
                      # delete permissions
                          if member_type == 'user':
                              member_name = User.get(member_id).username
                              self.revoke_user_permission(repo=repo, user=member_id)
-                         else:  # set for user group
+                         elif member_type == 'user_group':
                              # check if we have permissions to alter this usergroup
                              member_name = UserGroup.get(member_id).users_group_name
                              if not check_perms or HasUserGroupPermissionAny(
                                      *req_perms)(member_name, user=cur_user):
                                  self.revoke_user_group_permission(
                                      repo=repo, group_name=member_id)
+                         else:
+                             raise ValueError("member_type must be 'user' or 'user_group' "
+                                              "got {} instead".format(member_type))
                          changes['deleted'].append({'type': member_type, 'id': member_id,
                                                     'name': member_name, 'new_perm': perm})

rhodecode/model/repo_group.py

0 +12 -3

                                  member_name = User.get(member_id).username
                                  # this updates also current one if found
                                  _set_perm_user(obj, user=member_id, perm=perm)
-                             else:  # set for user group
+                             elif member_type == 'user_group':
                                  member_name = UserGroup.get(member_id).users_group_name
                                  if not check_perms or has_group_perm(member_name,
                                                                       user=cur_user):
                                      _set_perm_group(obj, users_group=member_id, perm=perm)
+                             else:
+                                 raise ValueError("member_type must be 'user' or 'user_group' "
+                                                  "got {} instead".format(member_type))
                              changes['updated'].append(
                                  {'change_obj': change_obj, 'type': member_type,
                              if member_type == 'user':
                                  member_name = User.get(member_id).username
                                  _set_perm_user(obj, user=member_id, perm=perm)
-                             else:  # set for user group
+                             elif member_type == 'user_group':
                                  # check if we have permissions to alter this usergroup
                                  member_name = UserGroup.get(member_id).users_group_name
                                  if not check_perms or has_group_perm(member_name,
                                                                       user=cur_user):
                                      _set_perm_group(obj, users_group=member_id, perm=perm)
+                             else:
+                                 raise ValueError("member_type must be 'user' or 'user_group' "
+                                                  "got {} instead".format(member_type))
                              changes['added'].append(
                                  {'change_obj': change_obj, 'type': member_type,
                              if member_type == 'user':
                                  member_name = User.get(member_id).username
                                  _revoke_perm_user(obj, user=member_id)
-                             else:  # set for user group
+                             elif member_type == 'user_group':
                                  # check if we have permissions to alter this usergroup
                                  member_name = UserGroup.get(member_id).users_group_name
                                  if not check_perms or has_group_perm(member_name,
                                                                       user=cur_user):
                                      _revoke_perm_group(obj, user_group=member_id)
+                             else:
+                                 raise ValueError("member_type must be 'user' or 'user_group' "
+                                                  "got {} instead".format(member_type))
                              changes['deleted'].append(
                                  {'change_obj': change_obj, 'type': member_type,

rhodecode/model/scm.py

0 +11 -5

              from rhodecode.lib.vcs.exceptions import RepositoryError, NodeNotChangedError
              from rhodecode.lib.vcs.nodes import FileNode
              from rhodecode.lib.vcs.backends.base import EmptyCommit
-             from rhodecode.lib import helpers as h
+             from rhodecode.lib import helpers as h, rc_cache
              from rhodecode.lib.auth import (
                  HasRepoPermissionAny, HasRepoGroupPermissionAny,
                  HasUserGroupPermissionAny)
              from rhodecode.lib.exceptions import NonRelativePathError, IMCCommitError
-             from rhodecode.lib import hooks_utils, caches
+             from rhodecode.lib import hooks_utils
              from rhodecode.lib.utils import (
                  get_filesystem_repos, make_db_config)
              from rhodecode.lib.utils2 import (safe_str, safe_unicode)
                      :param repo_name: the repo_name for which caches should be marked
                          invalid, or deleted
                      :param delete: delete the entry keys instead of setting bool
-                         flag on them
+                         flag on them, and also purge caches used by the dogpile
                      """
-                     CacheKey.set_invalidate(repo_name, delete=delete)
                      repo = Repository.get_by_repo_name(repo_name)
                      if repo:
+                         invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                             repo_id=repo.repo_id)
+                         CacheKey.set_invalidate(invalidation_namespace, delete=delete)
+                         repo_id = repo.repo_id
                          config = repo._config
                          config.set('extensions', 'largefiles', '')
                          repo.update_commit_cache(config=config, cs_cache=None)
-                         caches.clear_repo_caches(repo_name)
+                         if delete:
+                             cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
+                             rc_cache.clear_cache_namespace('cache_repo', cache_namespace_uid)
                  def toggle_following_repo(self, follow_repo_id, user_id):

rhodecode/model/settings.py

0 +27 -18

              from functools import wraps
              import bleach
-             from rhodecode.lib import caches
+             from rhodecode.lib import rc_cache
              from rhodecode.lib.utils2 import (
                  Optional, AttributeDict, safe_str, remove_prefix, str2bool)
              from rhodecode.lib.vcs.backends import base
              from rhodecode.model import BaseModel
              from rhodecode.model.db import (
-                 RepoRhodeCodeUi, RepoRhodeCodeSetting, RhodeCodeUi, RhodeCodeSetting)
+                 RepoRhodeCodeUi, RepoRhodeCodeSetting, RhodeCodeUi, RhodeCodeSetting, CacheKey)
              from rhodecode.model.meta import Session
                      return res
                  def invalidate_settings_cache(self):
-                     namespace = 'rhodecode_settings'
-                     cache_manager = caches.get_cache_manager('sql_cache_short', namespace)
-                     caches.clear_cache_manager(cache_manager)
+                     invalidation_namespace = CacheKey.SETTINGS_INVALIDATION_NAMESPACE
+                     CacheKey.set_invalidate(invalidation_namespace)
                  def get_all_settings(self, cache=False):
+                     region = rc_cache.get_or_create_region('sql_cache_short')
+                     invalidation_namespace = CacheKey.SETTINGS_INVALIDATION_NAMESPACE
-                     def _compute():
+                     @region.conditional_cache_on_arguments(condition=cache)
+                     def _get_all_settings(name, key):
                          q = self._get_settings_query()
                          if not q:
                              raise Exception('Could not get application settings !')
                          }
                          return settings
-                     if cache:
-                         log.debug('Fetching app settings using cache')
-                         repo = self._get_repo(self.repo) if self.repo else None
-                         namespace = 'rhodecode_settings'
-                         cache_manager = caches.get_cache_manager(
-                             'sql_cache_short', namespace)
-                         _cache_key = (
-                             "get_repo_{}_settings".format(repo.repo_id)
-                             if repo else "get_app_settings")
+                     repo = self._get_repo(self.repo) if self.repo else None
+                     key = "settings_repo.{}".format(repo.repo_id) if repo else "settings_app"
-                         return cache_manager.get(_cache_key, createfunc=_compute)
+                     inv_context_manager = rc_cache.InvalidationContext(
+                         uid='cache_settings', invalidation_namespace=invalidation_namespace)
+                     with inv_context_manager as invalidation_context:
+                         # check for stored invalidation signal, and maybe purge the cache
+                         # before computing it again
+                         if invalidation_context.should_invalidate():
+                             # NOTE:(marcink) we flush the whole sql_cache_short region, because it
+                             # reads different settings etc. It's little too much but those caches
+                             # are anyway very short lived and it's a safest way.
+                             region = rc_cache.get_or_create_region('sql_cache_short')
+                             region.invalidate()
-                     else:
-                         return _compute()
+                         result = _get_all_settings('rhodecode_settings', key)
+                         log.debug(
+                             'Fetching app settings for key: %s took: %.3fs', key,
+                             inv_context_manager.compute_time)
+                     return result
                  def get_auth_settings(self):
                      q = self._get_settings_query()

rhodecode/model/user.py

0 +26 -4

                          if not edit:
                              # add the RSS token
-                             AuthTokenModel().create(username,
-                                                     description=u'Generated feed token',
-                                                     role=AuthTokenModel.cls.ROLE_FEED)
+                             self.add_auth_token(
+                                 user=username, lifetime_minutes=-1,
+                                 role=self.auth_token_role.ROLE_FEED,
+                                 description=u'Generated feed token')
                              kwargs = new_user.get_dict()
                              # backward compat, require api_keys present
                              kwargs['api_keys'] = kwargs['auth_tokens']
                      self.sa.add(obj)
                      return obj
+                 auth_token_role = AuthTokenModel.cls
+                 def add_auth_token(self, user, lifetime_minutes, role, description=u'',
+                                    scope_callback=None):
+                     """
+                     Add AuthToken for user.
+                     :param user: username/user_id
+                     :param lifetime_minutes: in minutes the lifetime for token, -1 equals no limit
+                     :param role: one of AuthTokenModel.cls.ROLE_*
+                     :param description: optional string description
+                     """
+                     token = AuthTokenModel().create(
+                         user, description, lifetime_minutes, role)
+                     if scope_callback and callable(scope_callback):
+                         # call the callback if we provide, used to attach scope for EE edition
+                         scope_callback(token)
+                     return token
                  def delete_extra_ip(self, user, ip_id):
                      """
                      Removes ip address from UserIpMap
                      This way we block only latest created accounts.
                      :param expected_users: list of users in special order, we deactivate
-                         the end N ammoun of users from that list
+                         the end N amount of users from that list
                      """
                      list_of_accounts = self.get_accounts_in_creation_order(

rhodecode/model/user_group.py

0 +13 -4

                              self.grant_user_permission(
                                  user_group=user_group, user=member_id, perm=perm
                              )
-                         else:
+                         elif member_type == 'user_group':
                              # check if we have permissions to alter this usergroup
                              member_name = UserGroup.get(member_id).users_group_name
                              if not check_perms or HasUserGroupPermissionAny(
                                      *req_perms)(member_name, user=cur_user):
                                  self.grant_user_group_permission(
                                      target_user_group=user_group, user_group=member_id, perm=perm)
+                         else:
+                             raise ValueError("member_type must be 'user' or 'user_group' "
+                                              "got {} instead".format(member_type))
                          changes['updated'].append({
                              'change_obj': change_obj,
                              member_name = User.get(member_id).username
                              self.grant_user_permission(
                                  user_group=user_group, user=member_id, perm=perm)
-                         else:
+                         elif member_type == 'user_group':
                              # check if we have permissions to alter this usergroup
                              member_name = UserGroup.get(member_id).users_group_name
                              if not check_perms or HasUserGroupPermissionAny(
                                      *req_perms)(member_name, user=cur_user):
                                  self.grant_user_group_permission(
                                      target_user_group=user_group, user_group=member_id, perm=perm)
+                         else:
+                             raise ValueError("member_type must be 'user' or 'user_group' "
+                                              "got {} instead".format(member_type))
                          changes['added'].append({
                              'change_obj': change_obj,
                          if member_type == 'user':
                              member_name = User.get(member_id).username
                              self.revoke_user_permission(user_group=user_group, user=member_id)
-                         else:
+                         elif member_type == 'user_group':
                              # check if we have permissions to alter this usergroup
                              member_name = UserGroup.get(member_id).users_group_name
                              if not check_perms or HasUserGroupPermissionAny(
                                      *req_perms)(member_name, user=cur_user):
                                  self.revoke_user_group_permission(
                                      target_user_group=user_group, user_group=member_id)
+                         else:
+                             raise ValueError("member_type must be 'user' or 'user_group' "
+                                              "got {} instead".format(member_type))
                          changes['deleted'].append({
                              'change_obj': change_obj,
                      data = {
                          'users_group_id': user_group.users_group_id,
-                         'group_name': user_group.users_group_name,
+                         'group_name': h.link_to_group(user_group.users_group_name),
                          'group_description': user_group.user_group_description,
                          'active': user_group.users_group_active,
                          "owner": user_group.user.username,

rhodecode/model/validation_schema/schemas/integration_schema.py

0 0 -2

                          else:
                              return 'global'
-                     raise colander.Invalid(node, '%r is not a valid scope' % appstruct)
                  def deserialize(self, node, cstruct):
                      if cstruct is colander.null:
                          return colander.null

rhodecode/model/validators.py

0 +2 -2

                                  obj_type = k[0]
                                  obj_id = k[7:]
                                  update_type = {'u': 'user',
-                                                'g': 'users_group'}[obj_type]
+                                                'g': 'user_group'}[obj_type]
                                  if obj_type == 'u' and safe_int(obj_id) == default_user_id:
                                      if str2bool(value.get('repo_private')):
                                      User.query()\
                                          .filter(User.active == true())\
                                          .filter(User.user_id == member_id).one()
-                                 if member_type == 'users_group':
+                                 if member_type == 'user_group':
                                      UserGroup.query()\
                                          .filter(UserGroup.users_group_active == true())\
                                          .filter(UserGroup.users_group_id == member_id)\

rhodecode/public/css/main-content.less

0 +24 0

                  min-width: 100%;
              }
+             .main-content-auto-width {
+                 .main-content;
+                 width: auto;
+                 min-width: 100%;
+                 max-width: inherit;
+             }
              .field {
                  clear: left;
                  margin-bottom: @padding;
                          .label;
                          padding-top: 5px;
                      }
+                     .label-branch-perm {
+                         .label;
+                         width: 115px;
+                     }
                      // Used to position content on the right side of a .label
                      .content,
                      .side-by-side-selector {
                          }
                      }
+                     .input-branch-perm {
+                         .input;
+                         margin-left: 140px;
+                     }
+                     .input-branch-perm-order {
+                         width: 40px;
+                     }
                      .checkboxes,
                      .input,
                      .select {
                      }
                      .input {
+                         .branch-perm {
+                             width: 80px;
+                         }
                          .medium {
                              width: @fields-input-m;
                          }

rhodecode/public/css/main.less

0 +63 -4

		@@ -462,7 +462,7 b' ul.auth_plugins {'
462	462
463	463	.radios {
464	464	position: relative;
465		width: 405px;
	465	width: 505px;
466	466	}
467	467	}
468	468
		@@ -1418,9 +1418,6 b' table.integrations {'
1418	1418	margin-top: @textmargin;
1419	1419	margin-bottom: @textmargin;
1420	1420	}
1421		.pr-description {
1422		white-space:pre-wrap;
1423		}
1424	1421
1425	1422	.pr-reviewer-rules {
1426	1423	padding: 10px 0px 20px 0px;
		@@ -2405,3 +2402,65 b' input[type=radio] {'
2405	2402	height: 16px;
2406	2403	width: 16px;
2407	2404	}
	2405
	2406
	2407	.markup-form .clearfix {
	2408	.border-radius(@border-radius);
	2409	margin: 0px;
	2410	}
	2411
	2412	.markup-form-area {
	2413	padding: 8px 12px;
	2414	border: 1px solid @grey4;
	2415	.border-radius(@border-radius);
	2416	}
	2417
	2418	.markup-form-area-header .nav-links {
	2419	display: flex;
	2420	flex-flow: row wrap;
	2421	-webkit-flex-flow: row wrap;
	2422	width: 100%;
	2423	}
	2424
	2425	.markup-form-area-footer {
	2426	display: flex;
	2427	}
	2428
	2429	.markup-form-area-footer .toolbar {
	2430
	2431	}
	2432
	2433	// markup Form
	2434	div.markup-form {
	2435	margin-top: 20px;
	2436	}
	2437
	2438	.markup-form strong {
	2439	display: block;
	2440	margin-bottom: 15px;
	2441	}
	2442
	2443	.markup-form textarea {
	2444	width: 100%;
	2445	height: 100px;
	2446	font-family: 'Monaco', 'Courier', 'Courier New', monospace;
	2447	}
	2448
	2449	form.markup-form {
	2450	margin-top: 10px;
	2451	margin-left: 10px;
	2452	}
	2453
	2454	.markup-form .comment-block-ta,
	2455	.markup-form .preview-box {
	2456	.border-radius(@border-radius);
	2457	.box-sizing(border-box);
	2458	background-color: white;
	2459	}
	2460
	2461	.markup-form .preview-box.unloaded {
	2462	height: 50px;
	2463	text-align: center;
	2464	padding: 20px;
	2465	background-color: white;
	2466	}

rhodecode/public/css/navigation.less

0 +57 -5

		@@ -281,11 +281,9 b''
281	281	}
282	282
283	283	.navigation li.open {
284
285		.submenu,
286		.repo_switcher {
287		display: block;
288		}
	284	.submenu {
	285	display: block;
	286	}
289	287	}
290	288
291	289	.navigation li:last-child .submenu {
		@@ -411,6 +409,7 b''
411	409	display: block;
412	410	height: 16px;
413	411	padding: 8px; //must add up to td height (28px)
	412	width: 120px; // set width
414	413
415	414	&:hover {
416	415	background-color: @grey5;
		@@ -642,3 +641,56 b' ul#context-pages {'
642	641
643	642	}
644	643	}
	644
	645	.main_filter_help_box {
	646	padding: 7px 7px;
	647	border-top: 1px solid @grey4;
	648	border-right: 1px solid @grey4;
	649	border-bottom: 1px solid @grey4;
	650	display: inline-block;
	651	vertical-align: top;
	652	margin-left: -5px;
	653	background: @grey3;
	654	}
	655
	656	.main_filter_input_box {
	657	display: inline-block;
	658	}
	659
	660	.main_filter_box {
	661	margin: 9px 0 0 0;
	662	}
	663
	664	#main_filter_help {
	665	background: @grey3;
	666	border: 1px solid black;
	667	position: absolute;
	668	white-space: pre-wrap;
	669	z-index: 9999;
	670	color: @nav-grey;
	671	margin: 1px 7px;
	672	padding: 0 2px;
	673	}
	674
	675	.main_filter_input {
	676	padding: 6px;
	677	min-width: 220px;
	678	color: @nav-grey;
	679	background: @grey3;
	680	}
	681
	682	.main_filter_input::placeholder {
	683	color: @nav-grey;
	684	opacity: 1;
	685	}
	686
	687	.notice-box {
	688	display:block !important;
	689	padding: 9px 0 !important;
	690	}
	691
	692	.menulabel-notice {
	693	border: 1px solid @color5;
	694	padding:7px 10px;
	695	color: @color5;
	696	}

rhodecode/public/css/rcicons.less

0 +10 0

                /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
              }
+             .icon-no-margin::before {
+                 margin: 0;
+             }
              // -- ICON CLASSES -- //
              .icon-bookmark:before { content: '\e803'; } /* '' */
                      &:extend(.icon-svn-transparent:before);
                  }
              }
+             .icon-user-group:before {
+               &:extend(.icon-group:before);
+               margin: 0;
+               font-size: 16px;
+             }

rhodecode/public/css/select2.less

0 +2 -2

              }
              .select2-search input {
-                 width: auto !important;
-                 margin: .5em;
+                 width: 100%;
+                 margin: .5em 0;
                  padding: .5em;
              }

rhodecode/public/css/tags.less

0 +9 -1

                  &.read {
                      &:extend(.tag1);
                  }
                  &.write {
                      &:extend(.tag4);
                  }
                  &.admin {
                      &:extend(.tag5);
                  }
+                 &.merge {
+                     &:extend(.tag1);
+                 }
+                 &.push {
+                     &:extend(.tag4);
+                 }
+                 &.push_force {
+                     &:extend(.tag5);
+                 }
              }
              .phase-draft {

rhodecode/public/css/type.less

0 +1 -1

                  clear: both;
                  float: left;
                  width: 100%;
-                 margin: @pagepadding 0 @pagepadding;
+                 margin: @pagepadding/2 0 @pagepadding;
                  .breadcrumbs{
                      float: left;

rhodecode/public/js/rhodecode/base/keyboard-bindings.js

0 +1 -1

                  // / open the quick filter
                  Mousetrap.bind(['/'], function(e) {
-                     $('#repo_switcher').select2('open');
+                     $('#main_filter').get(0).focus();
                      // return false to prevent default browser behavior
                      // and stop event from bubbling

rhodecode/public/js/rhodecode/i18n/be.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/de.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/en.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/es.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/fr.js

0 +4 0

                  'specify commit': 'Spécifier un commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} années',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/it.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/ja.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': '省略された結果',
                  'truncated results': '省略された結果',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} 前',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} 件の結果があります。矢印キーの上下で選択できます。',
                  '{0} sec': '{0} 秒',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} 年',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/js_translations.js

0 +4 0

              _gettext('specify commit');
              _gettext('truncated result');
              _gettext('truncated results');
+             _gettext('{0} ({1} inactive) of {2} user groups ({3} inactive)');
+             _gettext('{0} ({1} inactive) of {2} users ({3} inactive)');
              _gettext('{0} active out of {1} users');
              _gettext('{0} ago');
              _gettext('{0} and {1}');
              _gettext('{0} out of {1} users');
              _gettext('{0} results are available, use up and down arrow keys to navigate.');
              _gettext('{0} sec');
+             _gettext('{0} user groups ({1} inactive)');
+             _gettext('{0} users ({1} inactive)');
              _gettext('{0} year');
              _gettext('{0} years');
              _gettext('{0}, {1} ago');

rhodecode/public/js/rhodecode/i18n/pl.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} aktywnych z {1} użytkowników',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/pt.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/ru.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/i18n/zh.js

0 +4 0

                  'specify commit': 'specify commit',
                  'truncated result': 'truncated result',
                  'truncated results': 'truncated results',
+                 '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
+                 '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
                  '{0} active out of {1} users': '{0} active out of {1} users',
                  '{0} ago': '{0} ago',
                  '{0} and {1}': '{0} and {1}',
                  '{0} out of {1} users': '{0} out of {1} users',
                  '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
                  '{0} sec': '{0} sec',
+                 '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
+                 '{0} users ({1} inactive)': '{0} users ({1} inactive)',
                  '{0} year': '{0} year',
                  '{0} years': '{0} years',
                  '{0}, {1} ago': '{0}, {1} ago'

rhodecode/public/js/rhodecode/routes.js

0 +13 0

                  pyroutes.register('admin_settings_vcs_svn_generate_cfg', '/_admin/settings/vcs/svn_generate_cfg', []);
                  pyroutes.register('admin_settings_system', '/_admin/settings/system', []);
                  pyroutes.register('admin_settings_system_update', '/_admin/settings/system/updates', []);
+                 pyroutes.register('admin_settings_exception_tracker', '/_admin/settings/exceptions', []);
+                 pyroutes.register('admin_settings_exception_tracker_delete_all', '/_admin/settings/exceptions/delete', []);
+                 pyroutes.register('admin_settings_exception_tracker_show', '/_admin/settings/exceptions/%(exception_id)s', ['exception_id']);
+                 pyroutes.register('admin_settings_exception_tracker_delete', '/_admin/settings/exceptions/%(exception_id)s/delete', ['exception_id']);
                  pyroutes.register('admin_settings_sessions', '/_admin/settings/sessions', []);
                  pyroutes.register('admin_settings_sessions_cleanup', '/_admin/settings/sessions/cleanup', []);
                  pyroutes.register('admin_settings_process_management', '/_admin/settings/process_management', []);
                  pyroutes.register('admin_settings_search', '/_admin/settings/search', []);
                  pyroutes.register('admin_settings_labs', '/_admin/settings/labs', []);
                  pyroutes.register('admin_settings_labs_update', '/_admin/settings/labs/update', []);
+                 pyroutes.register('admin_settings_automation', '/_admin/_admin/settings/automation', []);
                  pyroutes.register('admin_permissions_application', '/_admin/permissions/application', []);
                  pyroutes.register('admin_permissions_application_update', '/_admin/permissions/application/update', []);
                  pyroutes.register('admin_permissions_global', '/_admin/permissions/global', []);
                  pyroutes.register('admin_permissions_global_update', '/_admin/permissions/global/update', []);
                  pyroutes.register('admin_permissions_object', '/_admin/permissions/object', []);
                  pyroutes.register('admin_permissions_object_update', '/_admin/permissions/object/update', []);
+                 pyroutes.register('admin_permissions_branch', '/_admin/permissions/branch', []);
                  pyroutes.register('admin_permissions_ips', '/_admin/permissions/ips', []);
                  pyroutes.register('admin_permissions_overview', '/_admin/permissions/overview', []);
                  pyroutes.register('admin_permissions_auth_token_access', '/_admin/permissions/auth_token_access', []);
                  pyroutes.register('edit_user_groups_management', '/_admin/users/%(user_id)s/edit/groups_management', ['user_id']);
                  pyroutes.register('edit_user_groups_management_updates', '/_admin/users/%(user_id)s/edit/edit_user_groups_management/updates', ['user_id']);
                  pyroutes.register('edit_user_audit_logs', '/_admin/users/%(user_id)s/edit/audit', ['user_id']);
+                 pyroutes.register('edit_user_caches', '/_admin/users/%(user_id)s/edit/caches', ['user_id']);
+                 pyroutes.register('edit_user_caches_update', '/_admin/users/%(user_id)s/edit/caches/update', ['user_id']);
                  pyroutes.register('user_groups', '/_admin/user_groups', []);
                  pyroutes.register('user_groups_data', '/_admin/user_groups_data', []);
                  pyroutes.register('user_groups_new', '/_admin/user_groups/new', []);
                  pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
                  pyroutes.register('repo_list_data', '/_repos', []);
                  pyroutes.register('goto_switcher_data', '/_goto_data', []);
+                 pyroutes.register('markup_preview', '/_markup_preview', []);
                  pyroutes.register('journal', '/_admin/journal', []);
                  pyroutes.register('journal_rss', '/_admin/journal/rss', []);
                  pyroutes.register('journal_atom', '/_admin/journal/atom', []);
                  pyroutes.register('edit_repo_advanced_locking', '/%(repo_name)s/settings/advanced/locking', ['repo_name']);
                  pyroutes.register('edit_repo_advanced_journal', '/%(repo_name)s/settings/advanced/journal', ['repo_name']);
                  pyroutes.register('edit_repo_advanced_fork', '/%(repo_name)s/settings/advanced/fork', ['repo_name']);
+                 pyroutes.register('edit_repo_advanced_hooks', '/%(repo_name)s/settings/advanced/hooks', ['repo_name']);
                  pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
                  pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
+                 pyroutes.register('edit_repo_perms_branch', '/%(repo_name)s/settings/branch_permissions', ['repo_name']);
+                 pyroutes.register('edit_repo_perms_branch_delete', '/%(repo_name)s/settings/branch_permissions/%(rule_id)s/delete', ['repo_name', 'rule_id']);
                  pyroutes.register('edit_repo_maintenance', '/%(repo_name)s/settings/maintenance', ['repo_name']);
                  pyroutes.register('edit_repo_maintenance_execute', '/%(repo_name)s/settings/maintenance/execute', ['repo_name']);
                  pyroutes.register('edit_repo_fields', '/%(repo_name)s/settings/fields', ['repo_name']);
                  pyroutes.register('search', '/_admin/search', []);
                  pyroutes.register('search_repo', '/%(repo_name)s/search', ['repo_name']);
                  pyroutes.register('user_profile', '/_profiles/%(username)s', ['username']);
+                 pyroutes.register('user_group_profile', '/_profile_user_group/%(user_group_name)s', ['user_group_name']);
                  pyroutes.register('my_account_profile', '/_admin/my_account/profile', []);
                  pyroutes.register('my_account_edit', '/_admin/my_account/edit', []);
                  pyroutes.register('my_account_update', '/_admin/my_account/update', []);

rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js

0 +18 -2

                      for (var i = 0; i < alertMessagePayloads.length; i++) {
                          $.Topic('/notifications').publish(alertMessagePayloads[i]);
                      }
-                     this.kickoffChannelstreamPlugin();
+                     this.initPlugins();
+                     // after rest of application loads and topics get fired, launch connection
+                     $(document).ready(function () {
+                         this.kickoffChannelstreamPlugin();
+                     }.bind(this));
                  },
+                 initPlugins: function(){
+                     for (var i = 0; i < window.APPLICATION_PLUGINS.length; i++) {
+                         var pluginDef = window.APPLICATION_PLUGINS[i];
+                         if (pluginDef.component){
+                             var pluginElem = document.createElement(pluginDef.component);
+                             this.shadowRoot.appendChild(pluginElem);
+                             if (typeof pluginElem.init !== 'undefined'){
+                                 pluginElem.init();
+                             }
+                         }
+                     }
+                 },
                  /** proxy to channelstream connection */
                  getChannelStreamConnection: function () {
                      return this.$['channelstream-connection'];
                  },
                  faviconUpdate: function (data) {
-                     this.$$('rhodecode-favicon').counter = data.count;
+                     this.shadowRoot.querySelector('rhodecode-favicon').counter = data.count;
                  },
                  /** opens connection to ws server */

rhodecode/public/js/src/components/rhodecode-toast/rhodecode-toast.html

0 0 -1

              <link rel="import" href="../../../../../../bower_components/paper-button/paper-button.html">
-             <link rel="import" href="../../../../../../bower_components/paper-toast/paper-toast.html">
              <link rel="import" href="../../../../../../bower_components/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
              <link rel="import" href="../rhodecode-unsafe-html/rhodecode-unsafe-html.html">
              <dom-module id="rhodecode-toast">

rhodecode/public/js/src/components/rhodecode-unsafe-html/rhodecode-unsafe-html.html

0 +1 -1

              <dom-module id="rhodecode-unsafe-html">
                  <template>
                      <style include="shared-styles"></style>
-                     <content></content>
+                     <slot></slot>
                  </template>
                  <script src="rhodecode-unsafe-html.js"></script>
              </dom-module>

rhodecode/public/js/src/rhodecode.js

0 +1 -1

                  *
                  * <i class="tooltip icon-plus clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i>
                  * */
-                 var clipboard = new Clipboard('.clipboard-action');
+                 var clipboard = new ClipboardJS('.clipboard-action');
                  clipboard.on('success', function(e) {
                      var callback = function () {

rhodecode/public/js/src/rhodecode/codemirror.js

0 +255 0

		@@ -231,6 +231,68 b' var initCodeMirror = function(textAreadI'
231	231	return myCodeMirror;
232	232	};
233	233
	234
	235	var initMarkupCodeMirror = function(textAreadId, focus, options) {
	236	var initialHeight = 100;
	237
	238	var ta = $(textAreadId).get(0);
	239	if (focus === undefined) {
	240	focus = true;
	241	}
	242
	243	// default options
	244	var codeMirrorOptions = {
	245	lineNumbers: false,
	246	indentUnit: 4,
	247	viewportMargin: 30,
	248	// this is a trick to trigger some logic behind codemirror placeholder
	249	// it influences styling and behaviour.
	250	placeholder: " ",
	251	lineWrapping: true,
	252	autofocus: focus
	253	};
	254
	255	if (options !== undefined) {
	256	// extend with custom options
	257	codeMirrorOptions = $.extend(true, codeMirrorOptions, options);
	258	}
	259
	260	var cm = CodeMirror.fromTextArea(ta, codeMirrorOptions);
	261	cm.setSize(null, initialHeight);
	262	cm.setOption("mode", DEFAULT_RENDERER);
	263	CodeMirror.autoLoadMode(cm, DEFAULT_RENDERER); // load rst or markdown mode
	264	cmLog.debug('Loading codemirror mode', DEFAULT_RENDERER);
	265
	266	// start listening on changes to make auto-expanded editor
	267	cm.on("change", function(instance, changeObj) {
	268	var height = initialHeight;
	269	var lines = instance.lineCount();
	270	if ( lines > 6 && lines < 20) {
	271	height = "auto";
	272	}
	273	else if (lines >= 20){
	274	zheight = 20*15;
	275	}
	276	instance.setSize(null, height);
	277
	278	// detect if the change was trigger by auto desc, or user input
	279	var changeOrigin = changeObj.origin;
	280
	281	if (changeOrigin === "setValue") {
	282	cmLog.debug('Change triggered by setValue');
	283	}
	284	else {
	285	cmLog.debug('user triggered change !');
	286	// set special marker to indicate user has created an input.
	287	instance._userDefinedValue = true;
	288	}
	289
	290	});
	291
	292	return cm;
	293	};
	294
	295
234	296	var initCommentBoxCodeMirror = function(CommentForm, textAreaId, triggerActions){
235	297	var initialHeight = 100;
236	298
		@@ -593,3 +655,196 b' var CodeMirrorPreviewEnable = function(e'
593	655	}
594	656	}
595	657	};
	658
	659
	660	/* markup form */
	661	(function(mod) {
	662
	663	if (typeof exports == "object" && typeof module == "object") {
	664	// CommonJS
	665	module.exports = mod();
	666	}
	667	else {
	668	// Plain browser env
	669	(this \|\| window).MarkupForm = mod();
	670	}
	671
	672	})(function() {
	673	"use strict";
	674
	675	function MarkupForm(textareaId) {
	676	if (!(this instanceof MarkupForm)) {
	677	return new MarkupForm(textareaId);
	678	}
	679
	680	// bind the element instance to our Form
	681	$('#' + textareaId).get(0).MarkupForm = this;
	682
	683	this.withSelectorId = function(selector) {
	684	var selectorId = textareaId;
	685	return selector + '_' + selectorId;
	686	};
	687
	688	this.previewButton = this.withSelectorId('#preview-btn');
	689	this.previewContainer = this.withSelectorId('#preview-container');
	690
	691	this.previewBoxSelector = this.withSelectorId('#preview-box');
	692
	693	this.editButton = this.withSelectorId('#edit-btn');
	694	this.editContainer = this.withSelectorId('#edit-container');
	695
	696	this.cmBox = textareaId;
	697	this.cm = initMarkupCodeMirror('#' + textareaId);
	698
	699	this.previewUrl = pyroutes.url('markup_preview');
	700
	701	// FUNCTIONS and helpers
	702	var self = this;
	703
	704	this.getCmInstance = function(){
	705	return this.cm
	706	};
	707
	708	this.setPlaceholder = function(placeholder) {
	709	var cm = this.getCmInstance();
	710	if (cm){
	711	cm.setOption('placeholder', placeholder);
	712	}
	713	};
	714
	715	this.initStatusChangeSelector = function(){
	716	var formatChangeStatus = function(state, escapeMarkup) {
	717	var originalOption = state.element;
	718	return '<div class="flag_status ' + $(originalOption).data('status') + ' pull-left"></div>' +
	719	'<span>' + escapeMarkup(state.text) + '</span>';
	720	};
	721	var formatResult = function(result, container, query, escapeMarkup) {
	722	return formatChangeStatus(result, escapeMarkup);
	723	};
	724
	725	var formatSelection = function(data, container, escapeMarkup) {
	726	return formatChangeStatus(data, escapeMarkup);
	727	};
	728
	729	$(this.submitForm).find(this.statusChange).select2({
	730	placeholder: _gettext('Status Review'),
	731	formatResult: formatResult,
	732	formatSelection: formatSelection,
	733	containerCssClass: "drop-menu status_box_menu",
	734	dropdownCssClass: "drop-menu-dropdown",
	735	dropdownAutoWidth: true,
	736	minimumResultsForSearch: -1
	737	});
	738	$(this.submitForm).find(this.statusChange).on('change', function() {
	739	var status = self.getCommentStatus();
	740
	741	if (status && !self.isInline()) {
	742	$(self.submitButton).prop('disabled', false);
	743	}
	744
	745	var placeholderText = _gettext('Comment text will be set automatically based on currently selected status ({0}) ...').format(status);
	746	self.setPlaceholder(placeholderText)
	747	})
	748	};
	749
	750	// reset the text area into it's original state
	751	this.resetMarkupFormState = function(content) {
	752	content = content \|\| '';
	753
	754	$(this.editContainer).show();
	755	$(this.editButton).parent().addClass('active');
	756
	757	$(this.previewContainer).hide();
	758	$(this.previewButton).parent().removeClass('active');
	759
	760	this.setActionButtonsDisabled(true);
	761	self.cm.setValue(content);
	762	self.cm.setOption("readOnly", false);
	763	};
	764
	765	this.previewSuccessCallback = function(o) {
	766	$(self.previewBoxSelector).html(o);
	767	$(self.previewBoxSelector).removeClass('unloaded');
	768
	769	// swap buttons, making preview active
	770	$(self.previewButton).parent().addClass('active');
	771	$(self.editButton).parent().removeClass('active');
	772
	773	// unlock buttons
	774	self.setActionButtonsDisabled(false);
	775	};
	776
	777	this.setActionButtonsDisabled = function(state) {
	778	$(this.editButton).prop('disabled', state);
	779	$(this.previewButton).prop('disabled', state);
	780	};
	781
	782	// lock preview/edit/submit buttons on load, but exclude cancel button
	783	var excludeCancelBtn = true;
	784	this.setActionButtonsDisabled(true);
	785
	786	// anonymous users don't have access to initialized CM instance
	787	if (this.cm !== undefined){
	788	this.cm.on('change', function(cMirror) {
	789	if (cMirror.getValue() === "") {
	790	self.setActionButtonsDisabled(true)
	791	} else {
	792	self.setActionButtonsDisabled(false)
	793	}
	794	});
	795	}
	796
	797	$(this.editButton).on('click', function(e) {
	798	e.preventDefault();
	799
	800	$(self.previewButton).parent().removeClass('active');
	801	$(self.previewContainer).hide();
	802
	803	$(self.editButton).parent().addClass('active');
	804	$(self.editContainer).show();
	805
	806	});
	807
	808	$(this.previewButton).on('click', function(e) {
	809	e.preventDefault();
	810	var text = self.cm.getValue();
	811
	812	if (text === "") {
	813	return;
	814	}
	815
	816	var postData = {
	817	'text': text,
	818	'renderer': templateContext.visual.default_renderer,
	819	'csrf_token': CSRF_TOKEN
	820	};
	821
	822	// lock ALL buttons on preview
	823	self.setActionButtonsDisabled(true);
	824
	825	$(self.previewBoxSelector).addClass('unloaded');
	826	$(self.previewBoxSelector).html(_gettext('Loading ...'));
	827
	828	$(self.editContainer).hide();
	829	$(self.previewContainer).show();
	830
	831	// by default we reset state of comment preserving the text
	832	var previewFailCallback = function(data){
	833	alert(
	834	"Error while submitting preview.\n" +
	835	"Error code {0} ({1}).".format(data.status, data.statusText)
	836	);
	837	self.resetMarkupFormState(text)
	838	};
	839	_submitAjaxPOST(
	840	self.previewUrl, postData, self.previewSuccessCallback,
	841	previewFailCallback);
	842
	843	$(self.previewButton).parent().addClass('active');
	844	$(self.editButton).parent().removeClass('active');
	845	});
	846
	847	}
	848
	849	return MarkupForm;
	850	});

rhodecode/public/js/src/rhodecode/comments.js

0 +39 -21

                });
              };
+             var _submitAjaxPOST = function(url, postData, successHandler, failHandler) {
+                 failHandler = failHandler || function() {};
+                 postData = toQueryString(postData);
+                 var request = $.ajax({
+                     url: url,
+                     type: 'POST',
+                     data: postData,
+                     headers: {'X-PARTIAL-XHR': true}
+                 })
+                 .done(function (data) {
+                     successHandler(data);
+                 })
+                 .fail(function (data, textStatus, errorThrown) {
+                     failHandler(data, textStatus, errorThrown)
+                 });
+                 return request;
+             };
              /* Comment form for main and inline comments */
              (function(mod) {
                      };
                      this.submitAjaxPOST = function(url, postData, successHandler, failHandler) {
-                         failHandler = failHandler || function() {};
-                         var postData = toQueryString(postData);
-                         var request = $.ajax({
-                                 url: url,
-                                 type: 'POST',
-                                 data: postData,
-                                 headers: {'X-PARTIAL-XHR': true}
-                             })
-                             .done(function(data) {
-                                 successHandler(data);
-                             })
-                             .fail(function(data, textStatus, errorThrown){
-                                 alert(
-                                     "Error while submitting comment.\n" +
-                                     "Error code {0} ({1}).".format(data.status, data.statusText));
-                                 failHandler()
-                             });
-                         return request;
+                         return _submitAjaxPOST(url, postData, successHandler, failHandler);
                      };
                      // overwrite a submitHandler, we need to do it for inline comments
                              self.globalSubmitSuccessCallback();
                          };
-                         var submitFailCallback = function(){
+                         var submitFailCallback = function(data) {
+                             alert(
+                             "Error while submitting comment.\n" +
+                             "Error code {0} ({1}).".format(data.status, data.statusText)
+                             );
                              self.resetCommentFormState(text);
                          };
                          self.submitAjaxPOST(
                          $(self.previewContainer).show();
                          // by default we reset state of comment preserving the text
-                         var previewFailCallback = function(){
+                         var previewFailCallback = function(data){
+                             alert(
+                             "Error while preview of comment.\n" +
+                             "Error code {0} ({1}).".format(data.status, data.statusText)
+                             );
                              self.resetCommentFormState(text)
                          };
                          self.submitAjaxPOST(
                            commentForm.setActionButtonsDisabled(false);
                          };
-                         var submitFailCallback = function(){
+                         var submitFailCallback = function(data){
+                             alert(
+                             "Error while submitting comment.\n" +
+                             "Error code {0} ({1}).".format(data.status, data.statusText)
+                             );
                              commentForm.resetCommentFormState(text)
                          };
                          commentForm.submitAjaxPOST(

rhodecode/public/js/src/rhodecode/permissions.js

0 +1 0

                              '    </div>'+
                              '</td>'+
                              '<td></td>'+
+                             '<td></td>'+
                              '</tr>';
                  var _next_id = 'new'+$('.new_members').length;
                  _html = _html.format(_next_id, permission_type);

rhodecode/public/js/src/rhodecode/pullrequests.js

0 +4 -46

                    }
                    var checksMeet = prButtonLockChecks.compare && prButtonLockChecks.reviewers;
                    if (lockEnabled) {
-                       $('#save').attr('disabled', 'disabled');
+                       $('#pr_submit').attr('disabled', 'disabled');
                    }
                    else if (checksMeet) {
-                       $('#save').removeAttr('disabled');
+                       $('#pr_submit').removeAttr('disabled');
                    }
                    if (msg) {
              /**
               * PULL REQUEST edit info
               */
-             var editPullRequest = function(repo_name, pull_request_id, title, description) {
+             var editPullRequest = function(repo_name, pull_request_id, title, description, renderer) {
                  var url = pyroutes.url(
                      'pullrequest_update',
                      {"repo_name": repo_name, "pull_request_id": pull_request_id});
                  var postData = {
                      'title': title,
                      'description': description,
+                     'description_renderer': renderer,
                      'edit_pull_request': true,
                      'csrf_token': CSRF_TOKEN
                  };
                  ajaxPOST(url, postData, success);
              };
-             var initPullRequestsCodeMirror = function (textAreaId) {
-                 var ta = $(textAreaId).get(0);
-                 var initialHeight = '100px';
-                 // default options
-                 var codeMirrorOptions = {
-                     mode: "text",
-                     lineNumbers: false,
-                     indentUnit: 4,
-                     theme: 'rc-input'
-                 };
-                 var codeMirrorInstance = CodeMirror.fromTextArea(ta, codeMirrorOptions);
-                 // marker for manually set description
-                 codeMirrorInstance._userDefinedDesc = false;
-                 codeMirrorInstance.setSize(null, initialHeight);
-                 codeMirrorInstance.on("change", function(instance, changeObj) {
-                     var height = initialHeight;
-                     var lines = instance.lineCount();
-                     if (lines > 6 && lines < 20) {
-                         height = "auto"
+                     }
-                     else if (lines >= 20) {
-                         height = 20 * 15;
+                     }
-                     instance.setSize(null, height);
-                     // detect if the change was trigger by auto desc, or user input
-                     changeOrigin = changeObj.origin;
-                     if (changeOrigin === "setValue") {
-                         cmLog.debug('Change triggered by setValue');
+                     }
-                     else {
-                         cmLog.debug('user triggered change !');
-                         // set special marker to indicate user has created an input.
-                         instance._userDefinedDesc = true;
+                     }
-                 });
-                 return codeMirrorInstance
-             };
              /**
               * Reviewer autocomplete

rhodecode/public/js/vendors/webcomponentsjs/webcomponents-lite.js

0 +224 -2499

This diff has been collapsed as it changes many lines, (2723 lines changed) Show them Hide them
			@@ -1,2505 +1,230 b''
	1	1	/**
	2		* @license
	3		* Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
	4		* This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
	5		* The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
	6		* The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
	7		* Code distributed by Google as part of the polymer project is also
	8		* subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
	9		*/
	10		// @version 0.7.22
	11		(function() {
	12		window.WebComponents = window.WebComponents \|\| {
	13		flags: {}
	14		};
	15		var file = "webcomponents-lite.js";
	16		var script = document.querySelector('script[src*="' + file + '"]');
	17		var flags = {};
	18		if (!flags.noOpts) {
	19		location.search.slice(1).split("&").forEach(function(option) {
	20		var parts = option.split("=");
	21		var match;
	22		if (parts[0] && (match = parts[0].match(/wc-(.+)/))) {
	23		flags[match[1]] = parts[1] \|\| true;
	24		}
	25		});
	26		if (script) {
	27		for (var i = 0, a; a = script.attributes[i]; i++) {
	28		if (a.name !== "src") {
	29		flags[a.name] = a.value \|\| true;
	30		}
	31		}
	32		}
	33		if (flags.log && flags.log.split) {
	34		var parts = flags.log.split(",");
	35		flags.log = {};
	36		parts.forEach(function(f) {
	37		flags.log[f] = true;
	38		});
	39		} else {
	40		flags.log = {};
	41		}
	42		}
	43		if (flags.register) {
	44		window.CustomElements = window.CustomElements \|\| {
	45		flags: {}
	46		};
	47		window.CustomElements.flags.register = flags.register;
	48		}
	49		WebComponents.flags = flags;
	50		})();
	51
	52		(function(scope) {
	53		"use strict";
	54		var hasWorkingUrl = false;
	55		if (!scope.forceJURL) {
	56		try {
	57		var u = new URL("b", "http://a");
	58		u.pathname = "c%20d";
	59		hasWorkingUrl = u.href === "http://a/c%20d";
	60		} catch (e) {}
	61		}
	62		if (hasWorkingUrl) return;
	63		var relative = Object.create(null);
	64		relative["ftp"] = 21;
	65		relative["file"] = 0;
	66		relative["gopher"] = 70;
	67		relative["http"] = 80;
	68		relative["https"] = 443;
	69		relative["ws"] = 80;
	70		relative["wss"] = 443;
	71		var relativePathDotMapping = Object.create(null);
	72		relativePathDotMapping["%2e"] = ".";
	73		relativePathDotMapping[".%2e"] = "..";
	74		relativePathDotMapping["%2e."] = "..";
	75		relativePathDotMapping["%2e%2e"] = "..";
	76		function isRelativeScheme(scheme) {
	77		return relative[scheme] !== undefined;
	78		}
	79		function invalid() {
	80		clear.call(this);
	81		this._isInvalid = true;
	82		}
	83		function IDNAToASCII(h) {
	84		if ("" == h) {
	85		invalid.call(this);
	86		}
	87		return h.toLowerCase();
	88		}
	89		function percentEscape(c) {
	90		var unicode = c.charCodeAt(0);
	91		if (unicode > 32 && unicode < 127 && [ 34, 35, 60, 62, 63, 96 ].indexOf(unicode) == -1) {
	92		return c;
	93		}
	94		return encodeURIComponent(c);
	95		}
	96		function percentEscapeQuery(c) {
	97		var unicode = c.charCodeAt(0);
	98		if (unicode > 32 && unicode < 127 && [ 34, 35, 60, 62, 96 ].indexOf(unicode) == -1) {
	99		return c;
	100		}
	101		return encodeURIComponent(c);
	102		}
	103		var EOF = undefined, ALPHA = /[a-zA-Z]/, ALPHANUMERIC = /[a-zA-Z0-9\+\-\.]/;
	104		function parse(input, stateOverride, base) {
	105		function err(message) {
	106		errors.push(message);
	107		}
	108		var state = stateOverride \|\| "scheme start", cursor = 0, buffer = "", seenAt = false, seenBracket = false, errors = [];
	109		loop: while ((input[cursor - 1] != EOF \|\| cursor == 0) && !this._isInvalid) {
	110		var c = input[cursor];
	111		switch (state) {
	112		case "scheme start":
	113		if (c && ALPHA.test(c)) {
	114		buffer += c.toLowerCase();
	115		state = "scheme";
	116		} else if (!stateOverride) {
	117		buffer = "";
	118		state = "no scheme";
	119		continue;
	120		} else {
	121		err("Invalid scheme.");
	122		break loop;
	123		}
	124		break;
	125
	126		case "scheme":
	127		if (c && ALPHANUMERIC.test(c)) {
	128		buffer += c.toLowerCase();
	129		} else if (":" == c) {
	130		this._scheme = buffer;
	131		buffer = "";
	132		if (stateOverride) {
	133		break loop;
	134		}
	135		if (isRelativeScheme(this._scheme)) {
	136		this._isRelative = true;
	137		}
	138		if ("file" == this._scheme) {
	139		state = "relative";
	140		} else if (this._isRelative && base && base._scheme == this._scheme) {
	141		state = "relative or authority";
	142		} else if (this._isRelative) {
	143		state = "authority first slash";
	144		} else {
	145		state = "scheme data";
	146		}
	147		} else if (!stateOverride) {
	148		buffer = "";
	149		cursor = 0;
	150		state = "no scheme";
	151		continue;
	152		} else if (EOF == c) {
	153		break loop;
	154		} else {
	155		err("Code point not allowed in scheme: " + c);
	156		break loop;
	157		}
	158		break;
	159
	160		case "scheme data":
	161		if ("?" == c) {
	162		this._query = "?";
	163		state = "query";
	164		} else if ("#" == c) {
	165		this._fragment = "#";
	166		state = "fragment";
	167		} else {
	168		if (EOF != c && " " != c && "\n" != c && "\r" != c) {
	169		this._schemeData += percentEscape(c);
	170		}
	171		}
	172		break;
	173
	174		case "no scheme":
	175		if (!base \|\| !isRelativeScheme(base._scheme)) {
	176		err("Missing scheme.");
	177		invalid.call(this);
	178		} else {
	179		state = "relative";
	180		continue;
	181		}
	182		break;
	183
	184		case "relative or authority":
	185		if ("/" == c && "/" == input[cursor + 1]) {
	186		state = "authority ignore slashes";
	187		} else {
	188		err("Expected /, got: " + c);
	189		state = "relative";
	190		continue;
	191		}
	192		break;
	193
	194		case "relative":
	195		this._isRelative = true;
	196		if ("file" != this._scheme) this._scheme = base._scheme;
	197		if (EOF == c) {
	198		this._host = base._host;
	199		this._port = base._port;
	200		this._path = base._path.slice();
	201		this._query = base._query;
	202		this._username = base._username;
	203		this._password = base._password;
	204		break loop;
	205		} else if ("/" == c \|\| "\\" == c) {
	206		if ("\\" == c) err("\\ is an invalid code point.");
	207		state = "relative slash";
	208		} else if ("?" == c) {
	209		this._host = base._host;
	210		this._port = base._port;
	211		this._path = base._path.slice();
	212		this._query = "?";
	213		this._username = base._username;
	214		this._password = base._password;
	215		state = "query";
	216		} else if ("#" == c) {
	217		this._host = base._host;
	218		this._port = base._port;
	219		this._path = base._path.slice();
	220		this._query = base._query;
	221		this._fragment = "#";
	222		this._username = base._username;
	223		this._password = base._password;
	224		state = "fragment";
	225		} else {
	226		var nextC = input[cursor + 1];
	227		var nextNextC = input[cursor + 2];
	228		if ("file" != this._scheme \|\| !ALPHA.test(c) \|\| nextC != ":" && nextC != "\|" \|\| EOF != nextNextC && "/" != nextNextC && "\\" != nextNextC && "?" != nextNextC && "#" != nextNextC) {
	229		this._host = base._host;
	230		this._port = base._port;
	231		this._username = base._username;
	232		this._password = base._password;
	233		this._path = base._path.slice();
	234		this._path.pop();
	235		}
	236		state = "relative path";
	237		continue;
	238		}
	239		break;
	240
	241		case "relative slash":
	242		if ("/" == c \|\| "\\" == c) {
	243		if ("\\" == c) {
	244		err("\\ is an invalid code point.");
	245		}
	246		if ("file" == this._scheme) {
	247		state = "file host";
	248		} else {
	249		state = "authority ignore slashes";
	250		}
	251		} else {
	252		if ("file" != this._scheme) {
	253		this._host = base._host;
	254		this._port = base._port;
	255		this._username = base._username;
	256		this._password = base._password;
	257		}
	258		state = "relative path";
	259		continue;
	260		}
	261		break;
	262
	263		case "authority first slash":
	264		if ("/" == c) {
	265		state = "authority second slash";
	266		} else {
	267		err("Expected '/', got: " + c);
	268		state = "authority ignore slashes";
	269		continue;
	270		}
	271		break;
	272
	273		case "authority second slash":
	274		state = "authority ignore slashes";
	275		if ("/" != c) {
	276		err("Expected '/', got: " + c);
	277		continue;
	278		}
	279		break;
	280
	281		case "authority ignore slashes":
	282		if ("/" != c && "\\" != c) {
	283		state = "authority";
	284		continue;
	285		} else {
	286		err("Expected authority, got: " + c);
	287		}
	288		break;
	289
	290		case "authority":
	291		if ("@" == c) {
	292		if (seenAt) {
	293		err("@ already seen.");
	294		buffer += "%40";
	295		}
	296		seenAt = true;
	297		for (var i = 0; i < buffer.length; i++) {
	298		var cp = buffer[i];
	299		if (" " == cp \|\| "\n" == cp \|\| "\r" == cp) {
	300		err("Invalid whitespace in authority.");
	301		continue;
	302		}
	303		if (":" == cp && null === this._password) {
	304		this._password = "";
	305		continue;
	306		}
	307		var tempC = percentEscape(cp);
	308		null !== this._password ? this._password += tempC : this._username += tempC;
	309		}
	310		buffer = "";
	311		} else if (EOF == c \|\| "/" == c \|\| "\\" == c \|\| "?" == c \|\| "#" == c) {
	312		cursor -= buffer.length;
	313		buffer = "";
	314		state = "host";
	315		continue;
	316		} else {
	317		buffer += c;
	318		}
	319		break;
	320
	321		case "file host":
	322		if (EOF == c \|\| "/" == c \|\| "\\" == c \|\| "?" == c \|\| "#" == c) {
	323		if (buffer.length == 2 && ALPHA.test(buffer[0]) && (buffer[1] == ":" \|\| buffer[1] == "\|")) {
	324		state = "relative path";
	325		} else if (buffer.length == 0) {
	326		state = "relative path start";
	327		} else {
	328		this._host = IDNAToASCII.call(this, buffer);
	329		buffer = "";
	330		state = "relative path start";
	331		}
	332		continue;
	333		} else if (" " == c \|\| "\n" == c \|\| "\r" == c) {
	334		err("Invalid whitespace in file host.");
	335		} else {
	336		buffer += c;
	337		}
	338		break;
	339
	340		case "host":
	341		case "hostname":
	342		if (":" == c && !seenBracket) {
	343		this._host = IDNAToASCII.call(this, buffer);
	344		buffer = "";
	345		state = "port";
	346		if ("hostname" == stateOverride) {
	347		break loop;
	348		}
	349		} else if (EOF == c \|\| "/" == c \|\| "\\" == c \|\| "?" == c \|\| "#" == c) {
	350		this._host = IDNAToASCII.call(this, buffer);
	351		buffer = "";
	352		state = "relative path start";
	353		if (stateOverride) {
	354		break loop;
	355		}
	356		continue;
	357		} else if (" " != c && "\n" != c && "\r" != c) {
	358		if ("[" == c) {
	359		seenBracket = true;
	360		} else if ("]" == c) {
	361		seenBracket = false;
	362		}
	363		buffer += c;
	364		} else {
	365		err("Invalid code point in host/hostname: " + c);
	366		}
	367		break;
	368
	369		case "port":
	370		if (/[0-9]/.test(c)) {
	371		buffer += c;
	372		} else if (EOF == c \|\| "/" == c \|\| "\\" == c \|\| "?" == c \|\| "#" == c \|\| stateOverride) {
	373		if ("" != buffer) {
	374		var temp = parseInt(buffer, 10);
	375		if (temp != relative[this._scheme]) {
	376		this._port = temp + "";
	377		}
	378		buffer = "";
	379		}
	380		if (stateOverride) {
	381		break loop;
	382		}
	383		state = "relative path start";
	384		continue;
	385		} else if (" " == c \|\| "\n" == c \|\| "\r" == c) {
	386		err("Invalid code point in port: " + c);
	387		} else {
	388		invalid.call(this);
	389		}
	390		break;
	391
	392		case "relative path start":
	393		if ("\\" == c) err("'\\' not allowed in path.");
	394		state = "relative path";
	395		if ("/" != c && "\\" != c) {
	396		continue;
	397		}
	398		break;
	399
	400		case "relative path":
	401		if (EOF == c \|\| "/" == c \|\| "\\" == c \|\| !stateOverride && ("?" == c \|\| "#" == c)) {
	402		if ("\\" == c) {
	403		err("\\ not allowed in relative path.");
	404		}
	405		var tmp;
	406		if (tmp = relativePathDotMapping[buffer.toLowerCase()]) {
	407		buffer = tmp;
	408		}
	409		if (".." == buffer) {
	410		this._path.pop();
	411		if ("/" != c && "\\" != c) {
	412		this._path.push("");
	413		}
	414		} else if ("." == buffer && "/" != c && "\\" != c) {
	415		this._path.push("");
	416		} else if ("." != buffer) {
	417		if ("file" == this._scheme && this._path.length == 0 && buffer.length == 2 && ALPHA.test(buffer[0]) && buffer[1] == "\|") {
	418		buffer = buffer[0] + ":";
	419		}
	420		this._path.push(buffer);
	421		}
	422		buffer = "";
	423		if ("?" == c) {
	424		this._query = "?";
	425		state = "query";
	426		} else if ("#" == c) {
	427		this._fragment = "#";
	428		state = "fragment";
	429		}
	430		} else if (" " != c && "\n" != c && "\r" != c) {
	431		buffer += percentEscape(c);
	432		}
	433		break;
	434
	435		case "query":
	436		if (!stateOverride && "#" == c) {
	437		this._fragment = "#";
	438		state = "fragment";
	439		} else if (EOF != c && " " != c && "\n" != c && "\r" != c) {
	440		this._query += percentEscapeQuery(c);
	441		}
	442		break;
	443
	444		case "fragment":
	445		if (EOF != c && " " != c && "\n" != c && "\r" != c) {
	446		this._fragment += c;
	447		}
	448		break;
	449		}
	450		cursor++;
	451		}
	452		}
	453		function clear() {
	454		this._scheme = "";
	455		this._schemeData = "";
	456		this._username = "";
	457		this._password = null;
	458		this._host = "";
	459		this._port = "";
	460		this._path = [];
	461		this._query = "";
	462		this._fragment = "";
	463		this._isInvalid = false;
	464		this._isRelative = false;
	465		}
	466		function jURL(url, base) {
	467		if (base !== undefined && !(base instanceof jURL)) base = new jURL(String(base));
	468		this._url = url;
	469		clear.call(this);
	470		var input = url.replace(/^[ \t\r\n\f]+\|[ \t\r\n\f]+$/g, "");
	471		parse.call(this, input, null, base);
	472		}
	473		jURL.prototype = {
	474		toString: function() {
	475		return this.href;
	476		},
	477		get href() {
	478		if (this._isInvalid) return this._url;
	479		var authority = "";
	480		if ("" != this._username \|\| null != this._password) {
	481		authority = this._username + (null != this._password ? ":" + this._password : "") + "@";
	482		}
	483		return this.protocol + (this._isRelative ? "//" + authority + this.host : "") + this.pathname + this._query + this._fragment;
	484		},
	485		set href(href) {
	486		clear.call(this);
	487		parse.call(this, href);
	488		},
	489		get protocol() {
	490		return this._scheme + ":";
	491		},
	492		set protocol(protocol) {
	493		if (this._isInvalid) return;
	494		parse.call(this, protocol + ":", "scheme start");
	495		},
	496		get host() {
	497		return this._isInvalid ? "" : this._port ? this._host + ":" + this._port : this._host;
	498		},
	499		set host(host) {
	500		if (this._isInvalid \|\| !this._isRelative) return;
	501		parse.call(this, host, "host");
	502		},
	503		get hostname() {
	504		return this._host;
	505		},
	506		set hostname(hostname) {
	507		if (this._isInvalid \|\| !this._isRelative) return;
	508		parse.call(this, hostname, "hostname");
	509		},
	510		get port() {
	511		return this._port;
	512		},
	513		set port(port) {
	514		if (this._isInvalid \|\| !this._isRelative) return;
	515		parse.call(this, port, "port");
	516		},
	517		get pathname() {
	518		return this._isInvalid ? "" : this._isRelative ? "/" + this._path.join("/") : this._schemeData;
	519		},
	520		set pathname(pathname) {
	521		if (this._isInvalid \|\| !this._isRelative) return;
	522		this._path = [];
	523		parse.call(this, pathname, "relative path start");
	524		},
	525		get search() {
	526		return this._isInvalid \|\| !this._query \|\| "?" == this._query ? "" : this._query;
	527		},
	528		set search(search) {
	529		if (this._isInvalid \|\| !this._isRelative) return;
	530		this._query = "?";
	531		if ("?" == search[0]) search = search.slice(1);
	532		parse.call(this, search, "query");
	533		},
	534		get hash() {
	535		return this._isInvalid \|\| !this._fragment \|\| "#" == this._fragment ? "" : this._fragment;
	536		},
	537		set hash(hash) {
	538		if (this._isInvalid) return;
	539		this._fragment = "#";
	540		if ("#" == hash[0]) hash = hash.slice(1);
	541		parse.call(this, hash, "fragment");
	542		},
	543		get origin() {
	544		var host;
	545		if (this._isInvalid \|\| !this._scheme) {
	546		return "";
	547		}
	548		switch (this._scheme) {
	549		case "data":
	550		case "file":
	551		case "javascript":
	552		case "mailto":
	553		return "null";
	554		}
	555		host = this.host;
	556		if (!host) {
	557		return "";
	558		}
	559		return this._scheme + "://" + host;
	560		}
	561		};
	562		var OriginalURL = scope.URL;
	563		if (OriginalURL) {
	564		jURL.createObjectURL = function(blob) {
	565		return OriginalURL.createObjectURL.apply(OriginalURL, arguments);
	566		};
	567		jURL.revokeObjectURL = function(url) {
	568		OriginalURL.revokeObjectURL(url);
	569		};
	570		}
	571		scope.URL = jURL;
	572		})(self);
		2	@license @nocompile
		3	Copyright (c) 2018 The Polymer Project Authors. All rights reserved.
		4	This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
		5	The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
		6	The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
		7	Code distributed by Google as part of the polymer project is also
		8	subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
		9	*/
		10	(function(){/*
	573	11
	574		if (typeof WeakMap === "undefined") {
	575		(function() {
	576		var defineProperty = Object.defineProperty;
	577		var counter = Date.now() % 1e9;
	578		var WeakMap = function() {
	579		this.name = "__st" + (Math.random() * 1e9 >>> 0) + (counter++ + "__");
	580		};
	581		WeakMap.prototype = {
	582		set: function(key, value) {
	583		var entry = key[this.name];
	584		if (entry && entry[0] === key) entry[1] = value; else defineProperty(key, this.name, {
	585		value: [ key, value ],
	586		writable: true
	587		});
	588		return this;
	589		},
	590		get: function(key) {
	591		var entry;
	592		return (entry = key[this.name]) && entry[0] === key ? entry[1] : undefined;
	593		},
	594		"delete": function(key) {
	595		var entry = key[this.name];
	596		if (!entry \|\| entry[0] !== key) return false;
	597		entry[0] = entry[1] = undefined;
	598		return true;
	599		},
	600		has: function(key) {
	601		var entry = key[this.name];
	602		if (!entry) return false;
	603		return entry[0] === key;
	604		}
	605		};
	606		window.WeakMap = WeakMap;
	607		})();
	608		}
		12	Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
		13	This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
		14	The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
		15	The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
		16	Code distributed by Google as part of the polymer project is also
		17	subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
		18	*/
		19	'use strict';var p,aa="function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){a!=Array.prototype&&a!=Object.prototype&&(a[b]=c.value)},ea="undefined"!=typeof window&&window===this?this:"undefined"!=typeof global&&null!=global?global:this;function ha(){ha=function(){};ea.Symbol\|\|(ea.Symbol=ia)}var ia=function(){var a=0;return function(b){return"jscomp_symbol_"+(b\|\|"")+a++}}();
		20	function ja(){ha();var a=ea.Symbol.iterator;a\|\|(a=ea.Symbol.iterator=ea.Symbol("iterator"));"function"!=typeof Array.prototype[a]&&aa(Array.prototype,a,{configurable:!0,writable:!0,value:function(){return ka(this)}});ja=function(){}}function ka(a){var b=0;return la(function(){return b<a.length?{done:!1,value:a[b++]}:{done:!0}})}function la(a){ja();a={next:a};a[ea.Symbol.iterator]=function(){return this};return a}function ma(a){ja();var b=a[Symbol.iterator];return b?b.call(a):ka(a)}
		21	function na(a){for(var b,c=[];!(b=a.next()).done;)c.push(b.value);return c}
		22	(function(){if(!function(){var a=document.createEvent("Event");a.initEvent("foo",!0,!0);a.preventDefault();return a.defaultPrevented}()){var a=Event.prototype.preventDefault;Event.prototype.preventDefault=function(){this.cancelable&&(a.call(this),Object.defineProperty(this,"defaultPrevented",{get:function(){return!0},configurable:!0}))}}var b=/Trident/.test(navigator.userAgent);if(!window.CustomEvent\|\|b&&"function"!==typeof window.CustomEvent)window.CustomEvent=function(a,b){b=b\|\|{};var c=document.createEvent("CustomEvent");
		23	c.initCustomEvent(a,!!b.bubbles,!!b.cancelable,b.detail);return c},window.CustomEvent.prototype=window.Event.prototype;if(!window.Event\|\|b&&"function"!==typeof window.Event){var c=window.Event;window.Event=function(a,b){b=b\|\|{};var c=document.createEvent("Event");c.initEvent(a,!!b.bubbles,!!b.cancelable);return c};if(c)for(var d in c)window.Event[d]=c[d];window.Event.prototype=c.prototype}if(!window.MouseEvent\|\|b&&"function"!==typeof window.MouseEvent){b=window.MouseEvent;window.MouseEvent=function(a,
		24	b){b=b\|\|{};var c=document.createEvent("MouseEvent");c.initMouseEvent(a,!!b.bubbles,!!b.cancelable,b.view\|\|window,b.detail,b.screenX,b.screenY,b.clientX,b.clientY,b.ctrlKey,b.altKey,b.shiftKey,b.metaKey,b.button,b.relatedTarget);return c};if(b)for(d in b)window.MouseEvent[d]=b[d];window.MouseEvent.prototype=b.prototype}Array.from\|\|(Array.from=function(a){return[].slice.call(a)});Object.assign\|\|(Object.assign=function(a,b){for(var c=[].slice.call(arguments,1),d=0,e;d<c.length;d++)if(e=c[d])for(var f=
		25	a,m=e,n=Object.getOwnPropertyNames(m),t=0;t<n.length;t++)e=n[t],f[e]=m[e];return a})})(window.WebComponents);(function(){function a(){}function b(a,b){if(!a.childNodes.length)return[];switch(a.nodeType){case Node.DOCUMENT_NODE:return ya.call(a,b);case Node.DOCUMENT_FRAGMENT_NODE:return qb.call(a,b);default:return ba.call(a,b)}}var c="undefined"===typeof HTMLTemplateElement,d=!(document.createDocumentFragment().cloneNode()instanceof DocumentFragment),e=!1;/Trident/.test(navigator.userAgent)&&function(){function a(a,b){if(a instanceof DocumentFragment)for(var d;d=a.firstChild;)c.call(this,d,b);else c.call(this,
		26	a,b);return a}e=!0;var b=Node.prototype.cloneNode;Node.prototype.cloneNode=function(a){a=b.call(this,a);this instanceof DocumentFragment&&(a.__proto__=DocumentFragment.prototype);return a};DocumentFragment.prototype.querySelectorAll=HTMLElement.prototype.querySelectorAll;DocumentFragment.prototype.querySelector=HTMLElement.prototype.querySelector;Object.defineProperties(DocumentFragment.prototype,{nodeType:{get:function(){return Node.DOCUMENT_FRAGMENT_NODE},configurable:!0},localName:{get:function(){},
		27	configurable:!0},nodeName:{get:function(){return"#document-fragment"},configurable:!0}});var c=Node.prototype.insertBefore;Node.prototype.insertBefore=a;var d=Node.prototype.appendChild;Node.prototype.appendChild=function(b){b instanceof DocumentFragment?a.call(this,b,null):d.call(this,b);return b};var f=Node.prototype.removeChild,h=Node.prototype.replaceChild;Node.prototype.replaceChild=function(b,c){b instanceof DocumentFragment?(a.call(this,b,c),f.call(this,c)):h.call(this,b,c);return c};Document.prototype.createDocumentFragment=
		28	function(){var a=this.createElement("df");a.__proto__=DocumentFragment.prototype;return a};var g=Document.prototype.importNode;Document.prototype.importNode=function(a,b){b=g.call(this,a,b\|\|!1);a instanceof DocumentFragment&&(b.__proto__=DocumentFragment.prototype);return b}}();var f=Node.prototype.cloneNode,h=Document.prototype.createElement,g=Document.prototype.importNode,k=Node.prototype.removeChild,l=Node.prototype.appendChild,m=Node.prototype.replaceChild,n=DOMParser.prototype.parseFromString,
		29	t=Object.getOwnPropertyDescriptor(window.HTMLElement.prototype,"innerHTML"),C=Object.getOwnPropertyDescriptor(window.Node.prototype,"childNodes"),ba=Element.prototype.querySelectorAll,ya=Document.prototype.querySelectorAll,qb=DocumentFragment.prototype.querySelectorAll,rb=function(){if(!c){var a=document.createElement("template"),b=document.createElement("template");b.content.appendChild(document.createElement("div"));a.content.appendChild(b);a=a.cloneNode(!0);return 0===a.content.childNodes.length\|\|
		30	0===a.content.firstChild.content.childNodes.length\|\|d}}();if(c){var V=document.implementation.createHTMLDocument("template"),D=!0,ca=document.createElement("style");ca.textContent="template{display:none;}";var oa=document.head;oa.insertBefore(ca,oa.firstElementChild);a.prototype=Object.create(HTMLElement.prototype);var za=!document.createElement("div").hasOwnProperty("innerHTML");a.I=function(b){if(!b.content&&b.namespaceURI===document.documentElement.namespaceURI){b.content=V.createDocumentFragment();
		31	for(var c;c=b.firstChild;)l.call(b.content,c);if(za)b.__proto__=a.prototype;else if(b.cloneNode=function(b){return a.a(this,b)},D)try{T(b),da(b)}catch(Gh){D=!1}a.C(b.content)}};var fa={option:["select"],thead:["table"],col:["colgroup","table"],tr:["tbody","table"],th:["tr","tbody","table"],td:["tr","tbody","table"]},T=function(b){Object.defineProperty(b,"innerHTML",{get:function(){return sb(this)},set:function(b){var c=fa[(/<([a-z][^/\0>\x20\t\r\n\f]+)/i.exec(b)\|\|["",""])[1].toLowerCase()];if(c)for(var d=
		32	0;d<c.length;d++)b="<"+c[d]+">"+b+"</"+c[d]+">";V.body.innerHTML=b;for(a.C(V);this.content.firstChild;)k.call(this.content,this.content.firstChild);b=V.body;if(c)for(d=0;d<c.length;d++)b=b.lastChild;for(;b.firstChild;)l.call(this.content,b.firstChild)},configurable:!0})},da=function(a){Object.defineProperty(a,"outerHTML",{get:function(){return"<template>"+this.innerHTML+"</template>"},set:function(a){if(this.parentNode){V.body.innerHTML=a;for(a=this.ownerDocument.createDocumentFragment();V.body.firstChild;)l.call(a,
		33	V.body.firstChild);m.call(this.parentNode,a,this)}else throw Error("Failed to set the 'outerHTML' property on 'Element': This element has no parent node.");},configurable:!0})};T(a.prototype);da(a.prototype);a.C=function(c){c=b(c,"template");for(var d=0,e=c.length,f;d<e&&(f=c[d]);d++)a.I(f)};document.addEventListener("DOMContentLoaded",function(){a.C(document)});Document.prototype.createElement=function(){var b=h.apply(this,arguments);"template"===b.localName&&a.I(b);return b};DOMParser.prototype.parseFromString=
		34	function(){var b=n.apply(this,arguments);a.C(b);return b};Object.defineProperty(HTMLElement.prototype,"innerHTML",{get:function(){return sb(this)},set:function(b){t.set.call(this,b);a.C(this)},configurable:!0,enumerable:!0});var sf=/[&\u00A0"]/g,Kc=/[&\u00A0<>]/g,Lc=function(a){switch(a){case "&":return"&";case "<":return"<";case ">":return">";case '"':return""";case "\u00a0":return" "}};ca=function(a){for(var b={},c=0;c<a.length;c++)b[a[c]]=!0;return b};var tf=ca("area base br col command embed hr img input keygen link meta param source track wbr".split(" ")),
		35	uf=ca("style script xmp iframe noembed noframes plaintext noscript".split(" ")),sb=function(a,b){"template"===a.localName&&(a=a.content);for(var c="",d=b?b(a):C.get.call(a),e=0,f=d.length,h;e<f&&(h=d[e]);e++){a:{var g=h;var k=a;var l=b;switch(g.nodeType){case Node.ELEMENT_NODE:for(var T=g.localName,m="<"+T,da=g.attributes,n=0;k=da[n];n++)m+=" "+k.name+'="'+k.value.replace(sf,Lc)+'"';m+=">";g=tf[T]?m:m+sb(g,l)+"</"+T+">";break a;case Node.TEXT_NODE:g=g.data;g=k&&uf[k.localName]?g:g.replace(Kc,Lc);
		36	break a;case Node.COMMENT_NODE:g="\x3c!--"+g.data+"--\x3e";break a;default:throw window.console.error(g),Error("not implemented");}}c+=g}return c}}if(c\|\|rb){a.a=function(a,b){var c=f.call(a,!1);this.I&&this.I(c);b&&(l.call(c.content,f.call(a.content,!0)),tb(c.content,a.content));return c};var tb=function(c,d){if(d.querySelectorAll&&(d=b(d,"template"),0!==d.length)){c=b(c,"template");for(var e=0,f=c.length,h,g;e<f;e++)g=d[e],h=c[e],a&&a.I&&a.I(g),m.call(h.parentNode,vf.call(g,!0),h)}},vf=Node.prototype.cloneNode=
		37	function(b){if(!e&&d&&this instanceof DocumentFragment)if(b)var c=wf.call(this.ownerDocument,this,!0);else return this.ownerDocument.createDocumentFragment();else this.nodeType===Node.ELEMENT_NODE&&"template"===this.localName&&this.namespaceURI==document.documentElement.namespaceURI?c=a.a(this,b):c=f.call(this,b);b&&tb(c,this);return c},wf=Document.prototype.importNode=function(c,d){d=d\|\|!1;if("template"===c.localName)return a.a(c,d);var e=g.call(this,c,d);if(d){tb(e,c);c=b(e,'script:not([type]),script[type="application/javascript"],script[type="text/javascript"]');
		38	for(var f,k=0;k<c.length;k++){f=c[k];d=h.call(document,"script");d.textContent=f.textContent;for(var l=f.attributes,T=0,da;T<l.length;T++)da=l[T],d.setAttribute(da.name,da.value);m.call(f.parentNode,d,f)}}return e}}c&&(window.HTMLTemplateElement=a)})();var pa;Array.isArray?pa=Array.isArray:pa=function(a){return"[object Array]"===Object.prototype.toString.call(a)};var qa=pa;var ra=0,sa,ta="undefined"!==typeof window?window:void 0,ua=ta\|\|{},va=ua.MutationObserver\|\|ua.WebKitMutationObserver,wa="undefined"!==typeof Uint8ClampedArray&&"undefined"!==typeof importScripts&&"undefined"!==typeof MessageChannel;function xa(){return"undefined"!==typeof sa?function(){sa(Aa)}:Ba()}function Ca(){var a=0,b=new va(Aa),c=document.createTextNode("");b.observe(c,{characterData:!0});return function(){c.data=a=++a%2}}
		39	function Da(){var a=new MessageChannel;a.port1.onmessage=Aa;return function(){return a.port2.postMessage(0)}}function Ba(){var a=setTimeout;return function(){return a(Aa,1)}}var Ea=Array(1E3);function Aa(){for(var a=0;a<ra;a+=2)(0,Ea[a])(Ea[a+1]),Ea[a]=void 0,Ea[a+1]=void 0;ra=0}var Fa,Ga;
		40	if("undefined"===typeof self&&"undefined"!==typeof process&&"[object process]"==={}.toString.call(process))Ga=function(){return process.vb(Aa)};else{var Ha;if(va)Ha=Ca();else{var Ia;if(wa)Ia=Da();else{var Ja;if(void 0===ta&&"function"===typeof require)try{var Ka=require("vertx");sa=Ka.xb\|\|Ka.wb;Ja=xa()}catch(a){Ja=Ba()}else Ja=Ba();Ia=Ja}Ha=Ia}Ga=Ha}Fa=Ga;function La(a,b){Ea[ra]=a;Ea[ra+1]=b;ra+=2;2===ra&&Fa()};function Ma(a,b){var c=this,d=new this.constructor(Na);void 0===d[Oa]&&Pa(d);var e=c.h;if(e){var f=arguments[e-1];La(function(){return Qa(e,d,f,c.f)})}else Ra(c,d,a,b);return d};function Sa(a){if(a&&"object"===typeof a&&a.constructor===this)return a;var b=new this(Na);Ta(b,a);return b};var Oa=Math.random().toString(36).substring(16);function Na(){}var Va=new Ua;function Wa(a){try{return a.then}catch(b){return Va.error=b,Va}}function Xa(a,b,c,d){try{a.call(b,c,d)}catch(e){return e}}function Ya(a,b,c){La(function(a){var d=!1,f=Xa(c,b,function(c){d\|\|(d=!0,b!==c?Ta(a,c):q(a,c))},function(b){d\|\|(d=!0,r(a,b))});!d&&f&&(d=!0,r(a,f))},a)}function Za(a,b){1===b.h?q(a,b.f):2===b.h?r(a,b.f):Ra(b,void 0,function(b){return Ta(a,b)},function(b){return r(a,b)})}
		41	function $a(a,b,c){b.constructor===a.constructor&&c===Ma&&b.constructor.resolve===Sa?Za(a,b):c===Va?(r(a,Va.error),Va.error=null):void 0===c?q(a,b):"function"===typeof c?Ya(a,b,c):q(a,b)}function Ta(a,b){if(a===b)r(a,new TypeError("You cannot resolve a promise with itself"));else{var c=typeof b;null===b\|\|"object"!==c&&"function"!==c?q(a,b):$a(a,b,Wa(b))}}function ab(a){a.va&&a.va(a.f);bb(a)}function q(a,b){void 0===a.h&&(a.f=b,a.h=1,0!==a.M.length&&La(bb,a))}
		42	function r(a,b){void 0===a.h&&(a.h=2,a.f=b,La(ab,a))}function Ra(a,b,c,d){var e=a.M,f=e.length;a.va=null;e[f]=b;e[f+1]=c;e[f+2]=d;0===f&&a.h&&La(bb,a)}function bb(a){var b=a.M,c=a.h;if(0!==b.length){for(var d,e,f=a.f,h=0;h<b.length;h+=3)d=b[h],e=b[h+c],d?Qa(c,d,e,f):e(f);a.M.length=0}}function Ua(){this.error=null}var cb=new Ua;
		43	function Qa(a,b,c,d){var e="function"===typeof c;if(e){try{var f=c(d)}catch(l){cb.error=l,f=cb}if(f===cb){var h=!0;var g=f.error;f.error=null}else var k=!0;if(b===f){r(b,new TypeError("A promises callback cannot return that same promise."));return}}else f=d,k=!0;void 0===b.h&&(e&&k?Ta(b,f):h?r(b,g):1===a?q(b,f):2===a&&r(b,f))}function db(a,b){try{b(function(b){Ta(a,b)},function(b){r(a,b)})}catch(c){r(a,c)}}var eb=0;function Pa(a){a[Oa]=eb++;a.h=void 0;a.f=void 0;a.M=[]};function fb(a,b){this.Ka=a;this.F=new a(Na);this.F[Oa]\|\|Pa(this.F);if(qa(b))if(this.V=this.length=b.length,this.f=Array(this.length),0===this.length)q(this.F,this.f);else{this.length=this.length\|\|0;for(a=0;void 0===this.h&&a<b.length;a++)gb(this,b[a],a);0===this.V&&q(this.F,this.f)}else r(this.F,Error("Array Methods must be provided an Array"))}
		44	function gb(a,b,c){var d=a.Ka,e=d.resolve;e===Sa?(e=Wa(b),e===Ma&&void 0!==b.h?hb(a,b.h,c,b.f):"function"!==typeof e?(a.V--,a.f[c]=b):d===u?(d=new d(Na),$a(d,b,e),ib(a,d,c)):ib(a,new d(function(a){return a(b)}),c)):ib(a,e(b),c)}function hb(a,b,c,d){var e=a.F;void 0===e.h&&(a.V--,2===b?r(e,d):a.f[c]=d);0===a.V&&q(e,a.f)}function ib(a,b,c){Ra(b,void 0,function(b){return hb(a,1,c,b)},function(b){return hb(a,2,c,b)})};function jb(a){return(new fb(this,a)).F};function kb(a){var b=this;return qa(a)?new b(function(c,d){for(var e=a.length,f=0;f<e;f++)b.resolve(a[f]).then(c,d)}):new b(function(a,b){return b(new TypeError("You must pass an array to race."))})};function lb(a){var b=new this(Na);r(b,a);return b};function u(a){this[Oa]=eb++;this.f=this.h=void 0;this.M=[];if(Na!==a){if("function"!==typeof a)throw new TypeError("You must pass a resolver function as the first argument to the promise constructor");if(this instanceof u)db(this,a);else throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");}}u.prototype={constructor:u,then:Ma,a:function(a){return this.then(null,a)}};/*
	609	45
	610		(function(global) {
	611		if (global.JsMutationObserver) {
	612		return;
	613		}
	614		var registrationsTable = new WeakMap();
	615		var setImmediate;
	616		if (/Trident\|Edge/.test(navigator.userAgent)) {
	617		setImmediate = setTimeout;
	618		} else if (window.setImmediate) {
	619		setImmediate = window.setImmediate;
	620		} else {
	621		var setImmediateQueue = [];
	622		var sentinel = String(Math.random());
	623		window.addEventListener("message", function(e) {
	624		if (e.data === sentinel) {
	625		var queue = setImmediateQueue;
	626		setImmediateQueue = [];
	627		queue.forEach(function(func) {
	628		func();
	629		});
	630		}
	631		});
	632		setImmediate = function(func) {
	633		setImmediateQueue.push(func);
	634		window.postMessage(sentinel, "*");
	635		};
	636		}
	637		var isScheduled = false;
	638		var scheduledObservers = [];
	639		function scheduleCallback(observer) {
	640		scheduledObservers.push(observer);
	641		if (!isScheduled) {
	642		isScheduled = true;
	643		setImmediate(dispatchCallbacks);
	644		}
	645		}
	646		function wrapIfNeeded(node) {
	647		return window.ShadowDOMPolyfill && window.ShadowDOMPolyfill.wrapIfNeeded(node) \|\| node;
	648		}
	649		function dispatchCallbacks() {
	650		isScheduled = false;
	651		var observers = scheduledObservers;
	652		scheduledObservers = [];
	653		observers.sort(function(o1, o2) {
	654		return o1.uid_ - o2.uid_;
	655		});
	656		var anyNonEmpty = false;
	657		observers.forEach(function(observer) {
	658		var queue = observer.takeRecords();
	659		removeTransientObserversFor(observer);
	660		if (queue.length) {
	661		observer.callback_(queue, observer);
	662		anyNonEmpty = true;
	663		}
	664		});
	665		if (anyNonEmpty) dispatchCallbacks();
	666		}
	667		function removeTransientObserversFor(observer) {
	668		observer.nodes_.forEach(function(node) {
	669		var registrations = registrationsTable.get(node);
	670		if (!registrations) return;
	671		registrations.forEach(function(registration) {
	672		if (registration.observer === observer) registration.removeTransientObservers();
	673		});
	674		});
	675		}
	676		function forEachAncestorAndObserverEnqueueRecord(target, callback) {
	677		for (var node = target; node; node = node.parentNode) {
	678		var registrations = registrationsTable.get(node);
	679		if (registrations) {
	680		for (var j = 0; j < registrations.length; j++) {
	681		var registration = registrations[j];
	682		var options = registration.options;
	683		if (node !== target && !options.subtree) continue;
	684		var record = callback(options);
	685		if (record) registration.enqueue(record);
	686		}
	687		}
	688		}
	689		}
	690		var uidCounter = 0;
	691		function JsMutationObserver(callback) {
	692		this.callback_ = callback;
	693		this.nodes_ = [];
	694		this.records_ = [];
	695		this.uid_ = ++uidCounter;
	696		}
	697		JsMutationObserver.prototype = {
	698		observe: function(target, options) {
	699		target = wrapIfNeeded(target);
	700		if (!options.childList && !options.attributes && !options.characterData \|\| options.attributeOldValue && !options.attributes \|\| options.attributeFilter && options.attributeFilter.length && !options.attributes \|\| options.characterDataOldValue && !options.characterData) {
	701		throw new SyntaxError();
	702		}
	703		var registrations = registrationsTable.get(target);
	704		if (!registrations) registrationsTable.set(target, registrations = []);
	705		var registration;
	706		for (var i = 0; i < registrations.length; i++) {
	707		if (registrations[i].observer === this) {
	708		registration = registrations[i];
	709		registration.removeListeners();
	710		registration.options = options;
	711		break;
	712		}
	713		}
	714		if (!registration) {
	715		registration = new Registration(this, target, options);
	716		registrations.push(registration);
	717		this.nodes_.push(target);
	718		}
	719		registration.addListeners();
	720		},
	721		disconnect: function() {
	722		this.nodes_.forEach(function(node) {
	723		var registrations = registrationsTable.get(node);
	724		for (var i = 0; i < registrations.length; i++) {
	725		var registration = registrations[i];
	726		if (registration.observer === this) {
	727		registration.removeListeners();
	728		registrations.splice(i, 1);
	729		break;
	730		}
	731		}
	732		}, this);
	733		this.records_ = [];
	734		},
	735		takeRecords: function() {
	736		var copyOfRecords = this.records_;
	737		this.records_ = [];
	738		return copyOfRecords;
	739		}
	740		};
	741		function MutationRecord(type, target) {
	742		this.type = type;
	743		this.target = target;
	744		this.addedNodes = [];
	745		this.removedNodes = [];
	746		this.previousSibling = null;
	747		this.nextSibling = null;
	748		this.attributeName = null;
	749		this.attributeNamespace = null;
	750		this.oldValue = null;
	751		}
	752		function copyMutationRecord(original) {
	753		var record = new MutationRecord(original.type, original.target);
	754		record.addedNodes = original.addedNodes.slice();
	755		record.removedNodes = original.removedNodes.slice();
	756		record.previousSibling = original.previousSibling;
	757		record.nextSibling = original.nextSibling;
	758		record.attributeName = original.attributeName;
	759		record.attributeNamespace = original.attributeNamespace;
	760		record.oldValue = original.oldValue;
	761		return record;
	762		}
	763		var currentRecord, recordWithOldValue;
	764		function getRecord(type, target) {
	765		return currentRecord = new MutationRecord(type, target);
	766		}
	767		function getRecordWithOldValue(oldValue) {
	768		if (recordWithOldValue) return recordWithOldValue;
	769		recordWithOldValue = copyMutationRecord(currentRecord);
	770		recordWithOldValue.oldValue = oldValue;
	771		return recordWithOldValue;
	772		}
	773		function clearRecords() {
	774		currentRecord = recordWithOldValue = undefined;
	775		}
	776		function recordRepresentsCurrentMutation(record) {
	777		return record === recordWithOldValue \|\| record === currentRecord;
	778		}
	779		function selectRecord(lastRecord, newRecord) {
	780		if (lastRecord === newRecord) return lastRecord;
	781		if (recordWithOldValue && recordRepresentsCurrentMutation(lastRecord)) return recordWithOldValue;
	782		return null;
	783		}
	784		function Registration(observer, target, options) {
	785		this.observer = observer;
	786		this.target = target;
	787		this.options = options;
	788		this.transientObservedNodes = [];
	789		}
	790		Registration.prototype = {
	791		enqueue: function(record) {
	792		var records = this.observer.records_;
	793		var length = records.length;
	794		if (records.length > 0) {
	795		var lastRecord = records[length - 1];
	796		var recordToReplaceLast = selectRecord(lastRecord, record);
	797		if (recordToReplaceLast) {
	798		records[length - 1] = recordToReplaceLast;
	799		return;
	800		}
	801		} else {
	802		scheduleCallback(this.observer);
	803		}
	804		records[length] = record;
	805		},
	806		addListeners: function() {
	807		this.addListeners_(this.target);
	808		},
	809		addListeners_: function(node) {
	810		var options = this.options;
	811		if (options.attributes) node.addEventListener("DOMAttrModified", this, true);
	812		if (options.characterData) node.addEventListener("DOMCharacterDataModified", this, true);
	813		if (options.childList) node.addEventListener("DOMNodeInserted", this, true);
	814		if (options.childList \|\| options.subtree) node.addEventListener("DOMNodeRemoved", this, true);
	815		},
	816		removeListeners: function() {
	817		this.removeListeners_(this.target);
	818		},
	819		removeListeners_: function(node) {
	820		var options = this.options;
	821		if (options.attributes) node.removeEventListener("DOMAttrModified", this, true);
	822		if (options.characterData) node.removeEventListener("DOMCharacterDataModified", this, true);
	823		if (options.childList) node.removeEventListener("DOMNodeInserted", this, true);
	824		if (options.childList \|\| options.subtree) node.removeEventListener("DOMNodeRemoved", this, true);
	825		},
	826		addTransientObserver: function(node) {
	827		if (node === this.target) return;
	828		this.addListeners_(node);
	829		this.transientObservedNodes.push(node);
	830		var registrations = registrationsTable.get(node);
	831		if (!registrations) registrationsTable.set(node, registrations = []);
	832		registrations.push(this);
	833		},
	834		removeTransientObservers: function() {
	835		var transientObservedNodes = this.transientObservedNodes;
	836		this.transientObservedNodes = [];
	837		transientObservedNodes.forEach(function(node) {
	838		this.removeListeners_(node);
	839		var registrations = registrationsTable.get(node);
	840		for (var i = 0; i < registrations.length; i++) {
	841		if (registrations[i] === this) {
	842		registrations.splice(i, 1);
	843		break;
	844		}
	845		}
	846		}, this);
	847		},
	848		handleEvent: function(e) {
	849		e.stopImmediatePropagation();
	850		switch (e.type) {
	851		case "DOMAttrModified":
	852		var name = e.attrName;
	853		var namespace = e.relatedNode.namespaceURI;
	854		var target = e.target;
	855		var record = new getRecord("attributes", target);
	856		record.attributeName = name;
	857		record.attributeNamespace = namespace;
	858		var oldValue = e.attrChange === MutationEvent.ADDITION ? null : e.prevValue;
	859		forEachAncestorAndObserverEnqueueRecord(target, function(options) {
	860		if (!options.attributes) return;
	861		if (options.attributeFilter && options.attributeFilter.length && options.attributeFilter.indexOf(name) === -1 && options.attributeFilter.indexOf(namespace) === -1) {
	862		return;
	863		}
	864		if (options.attributeOldValue) return getRecordWithOldValue(oldValue);
	865		return record;
	866		});
	867		break;
	868
	869		case "DOMCharacterDataModified":
	870		var target = e.target;
	871		var record = getRecord("characterData", target);
	872		var oldValue = e.prevValue;
	873		forEachAncestorAndObserverEnqueueRecord(target, function(options) {
	874		if (!options.characterData) return;
	875		if (options.characterDataOldValue) return getRecordWithOldValue(oldValue);
	876		return record;
	877		});
	878		break;
	879
	880		case "DOMNodeRemoved":
	881		this.addTransientObserver(e.target);
		46	Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
		47	This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
		48	The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
		49	The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
		50	Code distributed by Google as part of the polymer project is also
		51	subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
		52	*/
		53	window.Promise\|\|(window.Promise=u,u.prototype["catch"]=u.prototype.a,u.prototype.then=u.prototype.then,u.all=jb,u.race=kb,u.resolve=Sa,u.reject=lb);(function(a){function b(a,b){if("function"===typeof window.CustomEvent)return new CustomEvent(a,b);var c=document.createEvent("CustomEvent");c.initCustomEvent(a,!!b.bubbles,!!b.cancelable,b.detail);return c}function c(a){if(C)return a.ownerDocument!==document?a.ownerDocument:null;var b=a.__importDoc;if(!b&&a.parentNode){b=a.parentNode;if("function"===typeof b.closest)b=b.closest("link[rel=import]");else for(;!g(b)&&(b=b.parentNode););a.__importDoc=b}return b}function d(a){var b=m(document,"link[rel=import]:not([import-dependency])"),
		54	c=b.length;c?n(b,function(b){return h(b,function(){0===--c&&a()})}):a()}function e(a){function b(){"loading"!==document.readyState&&document.body&&(document.removeEventListener("readystatechange",b),a())}document.addEventListener("readystatechange",b);b()}function f(a){e(function(){return d(function(){return a&&a()})})}function h(a,b){if(a.__loaded)b&&b();else if("script"===a.localName&&!a.src\|\|"style"===a.localName&&!a.firstChild)a.__loaded=!0,b&&b();else{var c=function(d){a.removeEventListener(d.type,
		55	c);a.__loaded=!0;b&&b()};a.addEventListener("load",c);oa&&"style"===a.localName\|\|a.addEventListener("error",c)}}function g(a){return a.nodeType===Node.ELEMENT_NODE&&"link"===a.localName&&"import"===a.rel}function k(){var a=this;this.a={};this.b=0;this.c=new MutationObserver(function(b){return a.Va(b)});this.c.observe(document.head,{childList:!0,subtree:!0});this.loadImports(document)}function l(a){n(m(a,"template"),function(a){n(m(a.content,'script:not([type]),script[type="application/javascript"],script[type="text/javascript"],script[type="module"]'),
		56	function(a){var b=document.createElement("script");n(a.attributes,function(a){return b.setAttribute(a.name,a.value)});b.textContent=a.textContent;a.parentNode.replaceChild(b,a)});l(a.content)})}function m(a,b){return a.childNodes.length?a.querySelectorAll(b):ba}function n(a,b,c){var d=a?a.length:0,e=c?-1:1;for(c=c?d-1:0;c<d&&0<=c;c+=e)b(a[c],c)}var t=document.createElement("link"),C="import"in t,ba=t.querySelectorAll("*"),ya=null;!1==="currentScript"in document&&Object.defineProperty(document,"currentScript",
		57	{get:function(){return ya\|\|("complete"!==document.readyState?document.scripts[document.scripts.length-1]:null)},configurable:!0});var qb=/(url$)([^)])($)/g,rb=/(@import[\s]+(?!url\())([^;])(;)/g,V=/(<link[^>])(rel=['\|"]?stylesheet['\|"]?[^>]>)/g,D={Pa:function(a,b){a.href&&a.setAttribute("href",D.ba(a.getAttribute("href"),b));a.src&&a.setAttribute("src",D.ba(a.getAttribute("src"),b));if("style"===a.localName){var c=D.za(a.textContent,b,qb);a.textContent=D.za(c,b,rb)}},za:function(a,b,c){return a.replace(c,
		58	function(a,c,d,e){a=d.replace(/["']/g,"");b&&(a=D.ba(a,b));return c+"'"+a+"'"+e})},ba:function(a,b){if(void 0===D.ha){D.ha=!1;try{var c=new URL("b","http://a");c.pathname="c%20d";D.ha="http://a/c%20d"===c.href}catch(Kc){}}if(D.ha)return(new URL(a,b)).href;c=D.Ha;c\|\|(c=document.implementation.createHTMLDocument("temp"),D.Ha=c,c.ra=c.createElement("base"),c.head.appendChild(c.ra),c.qa=c.createElement("a"));c.ra.href=b;c.qa.href=a;return c.qa.href\|\|a}},ca={async:!0,load:function(a,b,c){if(a)if(a.match(/^data:/)){a=
		59	a.split(",");var d=a[1];d=-1<a[0].indexOf(";base64")?atob(d):decodeURIComponent(d);b(d)}else{var e=new XMLHttpRequest;e.open("GET",a,ca.async);e.onload=function(){var a=e.responseURL\|\|e.getResponseHeader("Location");a&&0===a.indexOf("/")&&(a=(location.origin\|\|location.protocol+"//"+location.host)+a);var d=e.response\|\|e.responseText;304===e.status\|\|0===e.status\|\|200<=e.status&&300>e.status?b(d,a):c(d)};e.send()}else c("error: href must be specified")}},oa=/Trident/.test(navigator.userAgent)\|\|/Edge\/\d./i.test(navigator.userAgent);
		60	k.prototype.loadImports=function(a){var b=this;a=m(a,"link[rel=import]");n(a,function(a){return b.o(a)})};k.prototype.o=function(a){var b=this,c=a.href;if(void 0!==this.a[c]){var d=this.a[c];d&&d.__loaded&&(a.__import=d,this.i(a))}else this.b++,this.a[c]="pending",ca.load(c,function(a,d){a=b.Wa(a,d\|\|c);b.a[c]=a;b.b--;b.loadImports(a);b.J()},function(){b.a[c]=null;b.b--;b.J()})};k.prototype.Wa=function(a,b){if(!a)return document.createDocumentFragment();oa&&(a=a.replace(V,function(a,b,c){return-1===
		61	a.indexOf("type=")?b+" type=import-disable "+c:a}));var c=document.createElement("template");c.innerHTML=a;if(c.content)a=c.content,l(a);else for(a=document.createDocumentFragment();c.firstChild;)a.appendChild(c.firstChild);if(c=a.querySelector("base"))b=D.ba(c.getAttribute("href"),b),c.removeAttribute("href");c=m(a,'link[rel=import],link[rel=stylesheet][href][type=import-disable],style:not([type]),link[rel=stylesheet][href]:not([type]),script:not([type]),script[type="application/javascript"],script[type="text/javascript"],script[type="module"]');
		62	var d=0;n(c,function(a){h(a);D.Pa(a,b);a.setAttribute("import-dependency","");if("script"===a.localName&&!a.src&&a.textContent){if("module"===a.type)throw Error("Inline module scripts are not supported in HTML Imports.");a.setAttribute("src","data:text/javascript;charset=utf-8,"+encodeURIComponent(a.textContent+("\n//# sourceURL="+b+(d?"-"+d:"")+".js\n")));a.textContent="";d++}});return a};k.prototype.J=function(){var a=this;if(!this.b){this.c.disconnect();this.flatten(document);var b=!1,c=!1,d=function(){c&&
		63	b&&(a.loadImports(document),a.b\|\|(a.c.observe(document.head,{childList:!0,subtree:!0}),a.Ta()))};this.Ya(function(){c=!0;d()});this.Xa(function(){b=!0;d()})}};k.prototype.flatten=function(a){var b=this;a=m(a,"link[rel=import]");n(a,function(a){var c=b.a[a.href];(a.__import=c)&&c.nodeType===Node.DOCUMENT_FRAGMENT_NODE&&(b.a[a.href]=a,a.readyState="loading",a.__import=a,b.flatten(c),a.appendChild(c))})};k.prototype.Xa=function(a){function b(e){if(e<d){var f=c[e],g=document.createElement("script");f.removeAttribute("import-dependency");
		64	n(f.attributes,function(a){return g.setAttribute(a.name,a.value)});ya=g;f.parentNode.replaceChild(g,f);h(g,function(){ya=null;b(e+1)})}else a()}var c=m(document,"script[import-dependency]"),d=c.length;b(0)};k.prototype.Ya=function(a){var b=m(document,"style[import-dependency],link[rel=stylesheet][import-dependency]"),d=b.length;if(d){var e=oa&&!!document.querySelector("link[rel=stylesheet][href][type=import-disable]");n(b,function(b){h(b,function(){b.removeAttribute("import-dependency");0===--d&&
		65	a()});if(e&&b.parentNode!==document.head){var f=document.createElement(b.localName);f.__appliedElement=b;f.setAttribute("type","import-placeholder");b.parentNode.insertBefore(f,b.nextSibling);for(f=c(b);f&&c(f);)f=c(f);f.parentNode!==document.head&&(f=null);document.head.insertBefore(b,f);b.removeAttribute("type")}})}else a()};k.prototype.Ta=function(){var a=this,b=m(document,"link[rel=import]");n(b,function(b){return a.i(b)},!0)};k.prototype.i=function(a){a.__loaded\|\|(a.__loaded=!0,a.import&&(a.import.readyState=
		66	"complete"),a.dispatchEvent(b(a.import?"load":"error",{bubbles:!1,cancelable:!1,detail:void 0})))};k.prototype.Va=function(a){var b=this;n(a,function(a){return n(a.addedNodes,function(a){a&&a.nodeType===Node.ELEMENT_NODE&&(g(a)?b.o(a):b.loadImports(a))})})};var za=null;if(C)t=m(document,"link[rel=import]"),n(t,function(a){a.import&&"loading"===a.import.readyState\|\|(a.__loaded=!0)}),t=function(a){a=a.target;g(a)&&(a.__loaded=!0)},document.addEventListener("load",t,!0),document.addEventListener("error",
		67	t,!0);else{var fa=Object.getOwnPropertyDescriptor(Node.prototype,"baseURI");Object.defineProperty((!fa\|\|fa.configurable?Node:Element).prototype,"baseURI",{get:function(){var a=g(this)?this:c(this);return a?a.href:fa&&fa.get?fa.get.call(this):(document.querySelector("base")\|\|window.location).href},configurable:!0,enumerable:!0});Object.defineProperty(HTMLLinkElement.prototype,"import",{get:function(){return this.__import\|\|null},configurable:!0,enumerable:!0});e(function(){za=new k})}f(function(){return document.dispatchEvent(b("HTMLImportsLoaded",
		68	{cancelable:!0,bubbles:!0,detail:void 0}))});a.useNative=C;a.whenReady=f;a.importForElement=c;a.loadImports=function(a){za&&za.loadImports(a)}})(window.HTMLImports=window.HTMLImports\|\|{});/*
	882	69
	883		case "DOMNodeInserted":
	884		var changedNode = e.target;
	885		var addedNodes, removedNodes;
	886		if (e.type === "DOMNodeInserted") {
	887		addedNodes = [ changedNode ];
	888		removedNodes = [];
	889		} else {
	890		addedNodes = [];
	891		removedNodes = [ changedNode ];
	892		}
	893		var previousSibling = changedNode.previousSibling;
	894		var nextSibling = changedNode.nextSibling;
	895		var record = getRecord("childList", e.target.parentNode);
	896		record.addedNodes = addedNodes;
	897		record.removedNodes = removedNodes;
	898		record.previousSibling = previousSibling;
	899		record.nextSibling = nextSibling;
	900		forEachAncestorAndObserverEnqueueRecord(e.relatedNode, function(options) {
	901		if (!options.childList) return;
	902		return record;
	903		});
	904		}
	905		clearRecords();
	906		}
	907		};
	908		global.JsMutationObserver = JsMutationObserver;
	909		if (!global.MutationObserver) {
	910		global.MutationObserver = JsMutationObserver;
	911		JsMutationObserver._isPolyfilled = true;
	912		}
	913		})(self);
	914
	915		(function() {
	916		var needsTemplate = typeof HTMLTemplateElement === "undefined";
	917		if (/Trident/.test(navigator.userAgent)) {
	918		(function() {
	919		var importNode = document.importNode;
	920		document.importNode = function() {
	921		var n = importNode.apply(document, arguments);
	922		if (n.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
	923		var f = document.createDocumentFragment();
	924		f.appendChild(n);
	925		return f;
	926		} else {
	927		return n;
	928		}
	929		};
	930		})();
	931		}
	932		var needsCloning = function() {
	933		if (!needsTemplate) {
	934		var t = document.createElement("template");
	935		var t2 = document.createElement("template");
	936		t2.content.appendChild(document.createElement("div"));
	937		t.content.appendChild(t2);
	938		var clone = t.cloneNode(true);
	939		return clone.content.childNodes.length === 0 \|\| clone.content.firstChild.content.childNodes.length === 0;
	940		}
	941		}();
	942		var TEMPLATE_TAG = "template";
	943		var TemplateImpl = function() {};
	944		if (needsTemplate) {
	945		var contentDoc = document.implementation.createHTMLDocument("template");
	946		var canDecorate = true;
	947		var templateStyle = document.createElement("style");
	948		templateStyle.textContent = TEMPLATE_TAG + "{display:none;}";
	949		var head = document.head;
	950		head.insertBefore(templateStyle, head.firstElementChild);
	951		TemplateImpl.prototype = Object.create(HTMLElement.prototype);
	952		TemplateImpl.decorate = function(template) {
	953		if (template.content) {
	954		return;
	955		}
	956		template.content = contentDoc.createDocumentFragment();
	957		var child;
	958		while (child = template.firstChild) {
	959		template.content.appendChild(child);
	960		}
	961		template.cloneNode = function(deep) {
	962		return TemplateImpl.cloneNode(this, deep);
	963		};
	964		if (canDecorate) {
	965		try {
	966		Object.defineProperty(template, "innerHTML", {
	967		get: function() {
	968		var o = "";
	969		for (var e = this.content.firstChild; e; e = e.nextSibling) {
	970		o += e.outerHTML \|\| escapeData(e.data);
	971		}
	972		return o;
	973		},
	974		set: function(text) {
	975		contentDoc.body.innerHTML = text;
	976		TemplateImpl.bootstrap(contentDoc);
	977		while (this.content.firstChild) {
	978		this.content.removeChild(this.content.firstChild);
	979		}
	980		while (contentDoc.body.firstChild) {
	981		this.content.appendChild(contentDoc.body.firstChild);
	982		}
	983		},
	984		configurable: true
	985		});
	986		} catch (err) {
	987		canDecorate = false;
	988		}
	989		}
	990		TemplateImpl.bootstrap(template.content);
	991		};
	992		TemplateImpl.bootstrap = function(doc) {
	993		var templates = doc.querySelectorAll(TEMPLATE_TAG);
	994		for (var i = 0, l = templates.length, t; i < l && (t = templates[i]); i++) {
	995		TemplateImpl.decorate(t);
	996		}
	997		};
	998		document.addEventListener("DOMContentLoaded", function() {
	999		TemplateImpl.bootstrap(document);
	1000		});
	1001		var createElement = document.createElement;
	1002		document.createElement = function() {
	1003		"use strict";
	1004		var el = createElement.apply(document, arguments);
	1005		if (el.localName === "template") {
	1006		TemplateImpl.decorate(el);
	1007		}
	1008		return el;
	1009		};
	1010		var escapeDataRegExp = /[&\u00A0<>]/g;
	1011		function escapeReplace(c) {
	1012		switch (c) {
	1013		case "&":
	1014		return "&";
	1015
	1016		case "<":
	1017		return "<";
	1018
	1019		case ">":
	1020		return ">";
	1021
	1022		case " ":
	1023		return " ";
	1024		}
	1025		}
	1026		function escapeData(s) {
	1027		return s.replace(escapeDataRegExp, escapeReplace);
	1028		}
	1029		}
	1030		if (needsTemplate \|\| needsCloning) {
	1031		var nativeCloneNode = Node.prototype.cloneNode;
	1032		TemplateImpl.cloneNode = function(template, deep) {
	1033		var clone = nativeCloneNode.call(template, false);
	1034		if (this.decorate) {
	1035		this.decorate(clone);
	1036		}
	1037		if (deep) {
	1038		clone.content.appendChild(nativeCloneNode.call(template.content, true));
	1039		this.fixClonedDom(clone.content, template.content);
	1040		}
	1041		return clone;
	1042		};
	1043		TemplateImpl.fixClonedDom = function(clone, source) {
	1044		if (!source.querySelectorAll) return;
	1045		var s$ = source.querySelectorAll(TEMPLATE_TAG);
	1046		var t$ = clone.querySelectorAll(TEMPLATE_TAG);
	1047		for (var i = 0, l = t$.length, t, s; i < l; i++) {
	1048		s = s$[i];
	1049		t = t$[i];
	1050		if (this.decorate) {
	1051		this.decorate(s);
	1052		}
	1053		t.parentNode.replaceChild(s.cloneNode(true), t);
	1054		}
	1055		};
	1056		var originalImportNode = document.importNode;
	1057		Node.prototype.cloneNode = function(deep) {
	1058		var dom = nativeCloneNode.call(this, deep);
	1059		if (deep) {
	1060		TemplateImpl.fixClonedDom(dom, this);
	1061		}
	1062		return dom;
	1063		};
	1064		document.importNode = function(element, deep) {
	1065		if (element.localName === TEMPLATE_TAG) {
	1066		return TemplateImpl.cloneNode(element, deep);
	1067		} else {
	1068		var dom = originalImportNode.call(document, element, deep);
	1069		if (deep) {
	1070		TemplateImpl.fixClonedDom(dom, element);
	1071		}
	1072		return dom;
	1073		}
	1074		};
	1075		if (needsCloning) {
	1076		HTMLTemplateElement.prototype.cloneNode = function(deep) {
	1077		return TemplateImpl.cloneNode(this, deep);
	1078		};
	1079		}
	1080		}
	1081		if (needsTemplate) {
	1082		window.HTMLTemplateElement = TemplateImpl;
	1083		}
	1084		})();
	1085
	1086		(function(scope) {
	1087		"use strict";
	1088		if (!window.performance) {
	1089		var start = Date.now();
	1090		window.performance = {
	1091		now: function() {
	1092		return Date.now() - start;
	1093		}
	1094		};
	1095		}
	1096		if (!window.requestAnimationFrame) {
	1097		window.requestAnimationFrame = function() {
	1098		var nativeRaf = window.webkitRequestAnimationFrame \|\| window.mozRequestAnimationFrame;
	1099		return nativeRaf ? function(callback) {
	1100		return nativeRaf(function() {
	1101		callback(performance.now());
	1102		});
	1103		} : function(callback) {
	1104		return window.setTimeout(callback, 1e3 / 60);
	1105		};
	1106		}();
	1107		}
	1108		if (!window.cancelAnimationFrame) {
	1109		window.cancelAnimationFrame = function() {
	1110		return window.webkitCancelAnimationFrame \|\| window.mozCancelAnimationFrame \|\| function(id) {
	1111		clearTimeout(id);
	1112		};
	1113		}();
	1114		}
	1115		var workingDefaultPrevented = function() {
	1116		var e = document.createEvent("Event");
	1117		e.initEvent("foo", true, true);
	1118		e.preventDefault();
	1119		return e.defaultPrevented;
	1120		}();
	1121		if (!workingDefaultPrevented) {
	1122		var origPreventDefault = Event.prototype.preventDefault;
	1123		Event.prototype.preventDefault = function() {
	1124		if (!this.cancelable) {
	1125		return;
	1126		}
	1127		origPreventDefault.call(this);
	1128		Object.defineProperty(this, "defaultPrevented", {
	1129		get: function() {
	1130		return true;
	1131		},
	1132		configurable: true
	1133		});
	1134		};
	1135		}
	1136		var isIE = /Trident/.test(navigator.userAgent);
	1137		if (!window.CustomEvent \|\| isIE && typeof window.CustomEvent !== "function") {
	1138		window.CustomEvent = function(inType, params) {
	1139		params = params \|\| {};
	1140		var e = document.createEvent("CustomEvent");
	1141		e.initCustomEvent(inType, Boolean(params.bubbles), Boolean(params.cancelable), params.detail);
	1142		return e;
	1143		};
	1144		window.CustomEvent.prototype = window.Event.prototype;
	1145		}
	1146		if (!window.Event \|\| isIE && typeof window.Event !== "function") {
	1147		var origEvent = window.Event;
	1148		window.Event = function(inType, params) {
	1149		params = params \|\| {};
	1150		var e = document.createEvent("Event");
	1151		e.initEvent(inType, Boolean(params.bubbles), Boolean(params.cancelable));
	1152		return e;
	1153		};
	1154		window.Event.prototype = origEvent.prototype;
	1155		}
	1156		})(window.WebComponents);
	1157
	1158		window.HTMLImports = window.HTMLImports \|\| {
	1159		flags: {}
	1160		};
		70	Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
		71	This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
		72	The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
		73	The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
		74	Code distributed by Google as part of the polymer project is also
		75	subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
		76	*/
		77	window.WebComponents=window.WebComponents\|\|{flags:{}};var mb=document.querySelector('script[src*="webcomponents-lite.js"]'),nb=/wc-(.+)/,v={};if(!v.noOpts){location.search.slice(1).split("&").forEach(function(a){a=a.split("=");var b;a[0]&&(b=a[0].match(nb))&&(v[b[1]]=a[1]\|\|!0)});if(mb)for(var ob=0,pb;pb=mb.attributes[ob];ob++)"src"!==pb.name&&(v[pb.name]=pb.value\|\|!0);if(v.log&&v.log.split){var ub=v.log.split(",");v.log={};ub.forEach(function(a){v.log[a]=!0})}else v.log={}}
		78	window.WebComponents.flags=v;var vb=v.shadydom;vb&&(window.ShadyDOM=window.ShadyDOM\|\|{},window.ShadyDOM.force=vb);var wb=v.register\|\|v.ce;wb&&window.customElements&&(window.customElements.forcePolyfill=wb);/*
	1161	79
	1162		(function(scope) {
	1163		var IMPORT_LINK_TYPE = "import";
	1164		var useNative = Boolean(IMPORT_LINK_TYPE in document.createElement("link"));
	1165		var hasShadowDOMPolyfill = Boolean(window.ShadowDOMPolyfill);
	1166		var wrap = function(node) {
	1167		return hasShadowDOMPolyfill ? window.ShadowDOMPolyfill.wrapIfNeeded(node) : node;
	1168		};
	1169		var rootDocument = wrap(document);
	1170		var currentScriptDescriptor = {
	1171		get: function() {
	1172		var script = window.HTMLImports.currentScript \|\| document.currentScript \|\| (document.readyState !== "complete" ? document.scripts[document.scripts.length - 1] : null);
	1173		return wrap(script);
	1174		},
	1175		configurable: true
	1176		};
	1177		Object.defineProperty(document, "_currentScript", currentScriptDescriptor);
	1178		Object.defineProperty(rootDocument, "_currentScript", currentScriptDescriptor);
	1179		var isIE = /Trident/.test(navigator.userAgent);
	1180		function whenReady(callback, doc) {
	1181		doc = doc \|\| rootDocument;
	1182		whenDocumentReady(function() {
	1183		watchImportsLoad(callback, doc);
	1184		}, doc);
	1185		}
	1186		var requiredReadyState = isIE ? "complete" : "interactive";
	1187		var READY_EVENT = "readystatechange";
	1188		function isDocumentReady(doc) {
	1189		return doc.readyState === "complete" \|\| doc.readyState === requiredReadyState;
	1190		}
	1191		function whenDocumentReady(callback, doc) {
	1192		if (!isDocumentReady(doc)) {
	1193		var checkReady = function() {
	1194		if (doc.readyState === "complete" \|\| doc.readyState === requiredReadyState) {
	1195		doc.removeEventListener(READY_EVENT, checkReady);
	1196		whenDocumentReady(callback, doc);
	1197		}
	1198		};
	1199		doc.addEventListener(READY_EVENT, checkReady);
	1200		} else if (callback) {
	1201		callback();
	1202		}
	1203		}
	1204		function markTargetLoaded(event) {
	1205		event.target.__loaded = true;
	1206		}
	1207		function watchImportsLoad(callback, doc) {
	1208		var imports = doc.querySelectorAll("link[rel=import]");
	1209		var parsedCount = 0, importCount = imports.length, newImports = [], errorImports = [];
	1210		function checkDone() {
	1211		if (parsedCount == importCount && callback) {
	1212		callback({
	1213		allImports: imports,
	1214		loadedImports: newImports,
	1215		errorImports: errorImports
	1216		});
	1217		}
	1218		}
	1219		function loadedImport(e) {
	1220		markTargetLoaded(e);
	1221		newImports.push(this);
	1222		parsedCount++;
	1223		checkDone();
	1224		}
	1225		function errorLoadingImport(e) {
	1226		errorImports.push(this);
	1227		parsedCount++;
	1228		checkDone();
	1229		}
	1230		if (importCount) {
	1231		for (var i = 0, imp; i < importCount && (imp = imports[i]); i++) {
	1232		if (isImportLoaded(imp)) {
	1233		newImports.push(this);
	1234		parsedCount++;
	1235		checkDone();
	1236		} else {
	1237		imp.addEventListener("load", loadedImport);
	1238		imp.addEventListener("error", errorLoadingImport);
	1239		}
	1240		}
	1241		} else {
	1242		checkDone();
	1243		}
	1244		}
	1245		function isImportLoaded(link) {
	1246		return useNative ? link.__loaded \|\| link.import && link.import.readyState !== "loading" : link.__importParsed;
	1247		}
	1248		if (useNative) {
	1249		new MutationObserver(function(mxns) {
	1250		for (var i = 0, l = mxns.length, m; i < l && (m = mxns[i]); i++) {
	1251		if (m.addedNodes) {
	1252		handleImports(m.addedNodes);
	1253		}
	1254		}
	1255		}).observe(document.head, {
	1256		childList: true
	1257		});
	1258		function handleImports(nodes) {
	1259		for (var i = 0, l = nodes.length, n; i < l && (n = nodes[i]); i++) {
	1260		if (isImport(n)) {
	1261		handleImport(n);
	1262		}
	1263		}
	1264		}
	1265		function isImport(element) {
	1266		return element.localName === "link" && element.rel === "import";
	1267		}
	1268		function handleImport(element) {
	1269		var loaded = element.import;
	1270		if (loaded) {
	1271		markTargetLoaded({
	1272		target: element
	1273		});
	1274		} else {
	1275		element.addEventListener("load", markTargetLoaded);
	1276		element.addEventListener("error", markTargetLoaded);
	1277		}
	1278		}
	1279		(function() {
	1280		if (document.readyState === "loading") {
	1281		var imports = document.querySelectorAll("link[rel=import]");
	1282		for (var i = 0, l = imports.length, imp; i < l && (imp = imports[i]); i++) {
	1283		handleImport(imp);
	1284		}
	1285		}
	1286		})();
	1287		}
	1288		whenReady(function(detail) {
	1289		window.HTMLImports.ready = true;
	1290		window.HTMLImports.readyTime = new Date().getTime();
	1291		var evt = rootDocument.createEvent("CustomEvent");
	1292		evt.initCustomEvent("HTMLImportsLoaded", true, true, detail);
	1293		rootDocument.dispatchEvent(evt);
	1294		});
	1295		scope.IMPORT_LINK_TYPE = IMPORT_LINK_TYPE;
	1296		scope.useNative = useNative;
	1297		scope.rootDocument = rootDocument;
	1298		scope.whenReady = whenReady;
	1299		scope.isIE = isIE;
	1300		})(window.HTMLImports);
	1301
	1302		(function(scope) {
	1303		var modules = [];
	1304		var addModule = function(module) {
	1305		modules.push(module);
	1306		};
	1307		var initializeModules = function() {
	1308		modules.forEach(function(module) {
	1309		module(scope);
	1310		});
	1311		};
	1312		scope.addModule = addModule;
	1313		scope.initializeModules = initializeModules;
	1314		})(window.HTMLImports);
	1315
	1316		window.HTMLImports.addModule(function(scope) {
	1317		var CSS_URL_REGEXP = /(url$)([^)]*)($)/g;
	1318		var CSS_IMPORT_REGEXP = /(@import[\s]+(?!url\())([^;]*)(;)/g;
	1319		var path = {
	1320		resolveUrlsInStyle: function(style, linkUrl) {
	1321		var doc = style.ownerDocument;
	1322		var resolver = doc.createElement("a");
	1323		style.textContent = this.resolveUrlsInCssText(style.textContent, linkUrl, resolver);
	1324		return style;
	1325		},
	1326		resolveUrlsInCssText: function(cssText, linkUrl, urlObj) {
	1327		var r = this.replaceUrls(cssText, urlObj, linkUrl, CSS_URL_REGEXP);
	1328		r = this.replaceUrls(r, urlObj, linkUrl, CSS_IMPORT_REGEXP);
	1329		return r;
	1330		},
	1331		replaceUrls: function(text, urlObj, linkUrl, regexp) {
	1332		return text.replace(regexp, function(m, pre, url, post) {
	1333		var urlPath = url.replace(/["']/g, "");
	1334		if (linkUrl) {
	1335		urlPath = new URL(urlPath, linkUrl).href;
	1336		}
	1337		urlObj.href = urlPath;
	1338		urlPath = urlObj.href;
	1339		return pre + "'" + urlPath + "'" + post;
	1340		});
	1341		}
	1342		};
	1343		scope.path = path;
	1344		});
	1345
	1346		window.HTMLImports.addModule(function(scope) {
	1347		var xhr = {
	1348		async: true,
	1349		ok: function(request) {
	1350		return request.status >= 200 && request.status < 300 \|\| request.status === 304 \|\| request.status === 0;
	1351		},
	1352		load: function(url, next, nextContext) {
	1353		var request = new XMLHttpRequest();
	1354		if (scope.flags.debug \|\| scope.flags.bust) {
	1355		url += "?" + Math.random();
	1356		}
	1357		request.open("GET", url, xhr.async);
	1358		request.addEventListener("readystatechange", function(e) {
	1359		if (request.readyState === 4) {
	1360		var redirectedUrl = null;
	1361		try {
	1362		var locationHeader = request.getResponseHeader("Location");
	1363		if (locationHeader) {
	1364		redirectedUrl = locationHeader.substr(0, 1) === "/" ? location.origin + locationHeader : locationHeader;
	1365		}
	1366		} catch (e) {
	1367		console.error(e.message);
	1368		}
	1369		next.call(nextContext, !xhr.ok(request) && request, request.response \|\| request.responseText, redirectedUrl);
	1370		}
	1371		});
	1372		request.send();
	1373		return request;
	1374		},
	1375		loadDocument: function(url, next, nextContext) {
	1376		this.load(url, next, nextContext).responseType = "document";
	1377		}
	1378		};
	1379		scope.xhr = xhr;
	1380		});
	1381
	1382		window.HTMLImports.addModule(function(scope) {
	1383		var xhr = scope.xhr;
	1384		var flags = scope.flags;
	1385		var Loader = function(onLoad, onComplete) {
	1386		this.cache = {};
	1387		this.onload = onLoad;
	1388		this.oncomplete = onComplete;
	1389		this.inflight = 0;
	1390		this.pending = {};
	1391		};
	1392		Loader.prototype = {
	1393		addNodes: function(nodes) {
	1394		this.inflight += nodes.length;
	1395		for (var i = 0, l = nodes.length, n; i < l && (n = nodes[i]); i++) {
	1396		this.require(n);
	1397		}
	1398		this.checkDone();
	1399		},
	1400		addNode: function(node) {
	1401		this.inflight++;
	1402		this.require(node);
	1403		this.checkDone();
	1404		},
	1405		require: function(elt) {
	1406		var url = elt.src \|\| elt.href;
	1407		elt.__nodeUrl = url;
	1408		if (!this.dedupe(url, elt)) {
	1409		this.fetch(url, elt);
	1410		}
	1411		},
	1412		dedupe: function(url, elt) {
	1413		if (this.pending[url]) {
	1414		this.pending[url].push(elt);
	1415		return true;
	1416		}
	1417		var resource;
	1418		if (this.cache[url]) {
	1419		this.onload(url, elt, this.cache[url]);
	1420		this.tail();
	1421		return true;
	1422		}
	1423		this.pending[url] = [ elt ];
	1424		return false;
	1425		},
	1426		fetch: function(url, elt) {
	1427		flags.load && console.log("fetch", url, elt);
	1428		if (!url) {
	1429		setTimeout(function() {
	1430		this.receive(url, elt, {
	1431		error: "href must be specified"
	1432		}, null);
	1433		}.bind(this), 0);
	1434		} else if (url.match(/^data:/)) {
	1435		var pieces = url.split(",");
	1436		var header = pieces[0];
	1437		var body = pieces[1];
	1438		if (header.indexOf(";base64") > -1) {
	1439		body = atob(body);
	1440		} else {
	1441		body = decodeURIComponent(body);
	1442		}
	1443		setTimeout(function() {
	1444		this.receive(url, elt, null, body);
	1445		}.bind(this), 0);
	1446		} else {
	1447		var receiveXhr = function(err, resource, redirectedUrl) {
	1448		this.receive(url, elt, err, resource, redirectedUrl);
	1449		}.bind(this);
	1450		xhr.load(url, receiveXhr);
	1451		}
	1452		},
	1453		receive: function(url, elt, err, resource, redirectedUrl) {
	1454		this.cache[url] = resource;
	1455		var $p = this.pending[url];
	1456		for (var i = 0, l = $p.length, p; i < l && (p = $p[i]); i++) {
	1457		this.onload(url, p, resource, err, redirectedUrl);
	1458		this.tail();
	1459		}
	1460		this.pending[url] = null;
	1461		},
	1462		tail: function() {
	1463		--this.inflight;
	1464		this.checkDone();
	1465		},
	1466		checkDone: function() {
	1467		if (!this.inflight) {
	1468		this.oncomplete();
	1469		}
	1470		}
	1471		};
	1472		scope.Loader = Loader;
	1473		});
	1474
	1475		window.HTMLImports.addModule(function(scope) {
	1476		var Observer = function(addCallback) {
	1477		this.addCallback = addCallback;
	1478		this.mo = new MutationObserver(this.handler.bind(this));
	1479		};
	1480		Observer.prototype = {
	1481		handler: function(mutations) {
	1482		for (var i = 0, l = mutations.length, m; i < l && (m = mutations[i]); i++) {
	1483		if (m.type === "childList" && m.addedNodes.length) {
	1484		this.addedNodes(m.addedNodes);
	1485		}
	1486		}
	1487		},
	1488		addedNodes: function(nodes) {
	1489		if (this.addCallback) {
	1490		this.addCallback(nodes);
	1491		}
	1492		for (var i = 0, l = nodes.length, n, loading; i < l && (n = nodes[i]); i++) {
	1493		if (n.children && n.children.length) {
	1494		this.addedNodes(n.children);
	1495		}
	1496		}
	1497		},
	1498		observe: function(root) {
	1499		this.mo.observe(root, {
	1500		childList: true,
	1501		subtree: true
	1502		});
	1503		}
	1504		};
	1505		scope.Observer = Observer;
	1506		});
	1507
	1508		window.HTMLImports.addModule(function(scope) {
	1509		var path = scope.path;
	1510		var rootDocument = scope.rootDocument;
	1511		var flags = scope.flags;
	1512		var isIE = scope.isIE;
	1513		var IMPORT_LINK_TYPE = scope.IMPORT_LINK_TYPE;
	1514		var IMPORT_SELECTOR = "link[rel=" + IMPORT_LINK_TYPE + "]";
	1515		var importParser = {
	1516		documentSelectors: IMPORT_SELECTOR,
	1517		importsSelectors: [ IMPORT_SELECTOR, "link[rel=stylesheet]:not([type])", "style:not([type])", "script:not([type])", 'script[type="application/javascript"]', 'script[type="text/javascript"]' ].join(","),
	1518		map: {
	1519		link: "parseLink",
	1520		script: "parseScript",
	1521		style: "parseStyle"
	1522		},
	1523		dynamicElements: [],
	1524		parseNext: function() {
	1525		var next = this.nextToParse();
	1526		if (next) {
	1527		this.parse(next);
	1528		}
	1529		},
	1530		parse: function(elt) {
	1531		if (this.isParsed(elt)) {
	1532		flags.parse && console.log("[%s] is already parsed", elt.localName);
	1533		return;
	1534		}
	1535		var fn = this[this.map[elt.localName]];
	1536		if (fn) {
	1537		this.markParsing(elt);
	1538		fn.call(this, elt);
	1539		}
	1540		},
	1541		parseDynamic: function(elt, quiet) {
	1542		this.dynamicElements.push(elt);
	1543		if (!quiet) {
	1544		this.parseNext();
	1545		}
	1546		},
	1547		markParsing: function(elt) {
	1548		flags.parse && console.log("parsing", elt);
	1549		this.parsingElement = elt;
	1550		},
	1551		markParsingComplete: function(elt) {
	1552		elt.__importParsed = true;
	1553		this.markDynamicParsingComplete(elt);
	1554		if (elt.__importElement) {
	1555		elt.__importElement.__importParsed = true;
	1556		this.markDynamicParsingComplete(elt.__importElement);
	1557		}
	1558		this.parsingElement = null;
	1559		flags.parse && console.log("completed", elt);
	1560		},
	1561		markDynamicParsingComplete: function(elt) {
	1562		var i = this.dynamicElements.indexOf(elt);
	1563		if (i >= 0) {
	1564		this.dynamicElements.splice(i, 1);
	1565		}
	1566		},
	1567		parseImport: function(elt) {
	1568		elt.import = elt.__doc;
	1569		if (window.HTMLImports.__importsParsingHook) {
	1570		window.HTMLImports.__importsParsingHook(elt);
	1571		}
	1572		if (elt.import) {
	1573		elt.import.__importParsed = true;
	1574		}
	1575		this.markParsingComplete(elt);
	1576		if (elt.__resource && !elt.__error) {
	1577		elt.dispatchEvent(new CustomEvent("load", {
	1578		bubbles: false
	1579		}));
	1580		} else {
	1581		elt.dispatchEvent(new CustomEvent("error", {
	1582		bubbles: false
	1583		}));
	1584		}
	1585		if (elt.__pending) {
	1586		var fn;
	1587		while (elt.__pending.length) {
	1588		fn = elt.__pending.shift();
	1589		if (fn) {
	1590		fn({
	1591		target: elt
	1592		});
	1593		}
	1594		}
	1595		}
	1596		this.parseNext();
	1597		},
	1598		parseLink: function(linkElt) {
	1599		if (nodeIsImport(linkElt)) {
	1600		this.parseImport(linkElt);
	1601		} else {
	1602		linkElt.href = linkElt.href;
	1603		this.parseGeneric(linkElt);
	1604		}
	1605		},
	1606		parseStyle: function(elt) {
	1607		var src = elt;
	1608		elt = cloneStyle(elt);
	1609		src.__appliedElement = elt;
	1610		elt.__importElement = src;
	1611		this.parseGeneric(elt);
	1612		},
	1613		parseGeneric: function(elt) {
	1614		this.trackElement(elt);
	1615		this.addElementToDocument(elt);
	1616		},
	1617		rootImportForElement: function(elt) {
	1618		var n = elt;
	1619		while (n.ownerDocument.__importLink) {
	1620		n = n.ownerDocument.__importLink;
	1621		}
	1622		return n;
	1623		},
	1624		addElementToDocument: function(elt) {
	1625		var port = this.rootImportForElement(elt.__importElement \|\| elt);
	1626		port.parentNode.insertBefore(elt, port);
	1627		},
	1628		trackElement: function(elt, callback) {
	1629		var self = this;
	1630		var done = function(e) {
	1631		elt.removeEventListener("load", done);
	1632		elt.removeEventListener("error", done);
	1633		if (callback) {
	1634		callback(e);
	1635		}
	1636		self.markParsingComplete(elt);
	1637		self.parseNext();
	1638		};
	1639		elt.addEventListener("load", done);
	1640		elt.addEventListener("error", done);
	1641		if (isIE && elt.localName === "style") {
	1642		var fakeLoad = false;
	1643		if (elt.textContent.indexOf("@import") == -1) {
	1644		fakeLoad = true;
	1645		} else if (elt.sheet) {
	1646		fakeLoad = true;
	1647		var csr = elt.sheet.cssRules;
	1648		var len = csr ? csr.length : 0;
	1649		for (var i = 0, r; i < len && (r = csr[i]); i++) {
	1650		if (r.type === CSSRule.IMPORT_RULE) {
	1651		fakeLoad = fakeLoad && Boolean(r.styleSheet);
	1652		}
	1653		}
	1654		}
	1655		if (fakeLoad) {
	1656		setTimeout(function() {
	1657		elt.dispatchEvent(new CustomEvent("load", {
	1658		bubbles: false
	1659		}));
	1660		});
	1661		}
	1662		}
	1663		},
	1664		parseScript: function(scriptElt) {
	1665		var script = document.createElement("script");
	1666		script.__importElement = scriptElt;
	1667		script.src = scriptElt.src ? scriptElt.src : generateScriptDataUrl(scriptElt);
	1668		scope.currentScript = scriptElt;
	1669		this.trackElement(script, function(e) {
	1670		if (script.parentNode) {
	1671		script.parentNode.removeChild(script);
	1672		}
	1673		scope.currentScript = null;
	1674		});
	1675		this.addElementToDocument(script);
	1676		},
	1677		nextToParse: function() {
	1678		this._mayParse = [];
	1679		return !this.parsingElement && (this.nextToParseInDoc(rootDocument) \|\| this.nextToParseDynamic());
	1680		},
	1681		nextToParseInDoc: function(doc, link) {
	1682		if (doc && this._mayParse.indexOf(doc) < 0) {
	1683		this._mayParse.push(doc);
	1684		var nodes = doc.querySelectorAll(this.parseSelectorsForNode(doc));
	1685		for (var i = 0, l = nodes.length, n; i < l && (n = nodes[i]); i++) {
	1686		if (!this.isParsed(n)) {
	1687		if (this.hasResource(n)) {
	1688		return nodeIsImport(n) ? this.nextToParseInDoc(n.__doc, n) : n;
	1689		} else {
	1690		return;
	1691		}
	1692		}
	1693		}
	1694		}
	1695		return link;
	1696		},
	1697		nextToParseDynamic: function() {
	1698		return this.dynamicElements[0];
	1699		},
	1700		parseSelectorsForNode: function(node) {
	1701		var doc = node.ownerDocument \|\| node;
	1702		return doc === rootDocument ? this.documentSelectors : this.importsSelectors;
	1703		},
	1704		isParsed: function(node) {
	1705		return node.__importParsed;
	1706		},
	1707		needsDynamicParsing: function(elt) {
	1708		return this.dynamicElements.indexOf(elt) >= 0;
	1709		},
	1710		hasResource: function(node) {
	1711		if (nodeIsImport(node) && node.__doc === undefined) {
	1712		return false;
	1713		}
	1714		return true;
	1715		}
	1716		};
	1717		function nodeIsImport(elt) {
	1718		return elt.localName === "link" && elt.rel === IMPORT_LINK_TYPE;
	1719		}
	1720		function generateScriptDataUrl(script) {
	1721		var scriptContent = generateScriptContent(script);
	1722		return "data:text/javascript;charset=utf-8," + encodeURIComponent(scriptContent);
	1723		}
	1724		function generateScriptContent(script) {
	1725		return script.textContent + generateSourceMapHint(script);
	1726		}
	1727		function generateSourceMapHint(script) {
	1728		var owner = script.ownerDocument;
	1729		owner.__importedScripts = owner.__importedScripts \|\| 0;
	1730		var moniker = script.ownerDocument.baseURI;
	1731		var num = owner.__importedScripts ? "-" + owner.__importedScripts : "";
	1732		owner.__importedScripts++;
	1733		return "\n//# sourceURL=" + moniker + num + ".js\n";
	1734		}
	1735		function cloneStyle(style) {
	1736		var clone = style.ownerDocument.createElement("style");
	1737		clone.textContent = style.textContent;
	1738		path.resolveUrlsInStyle(clone);
	1739		return clone;
	1740		}
	1741		scope.parser = importParser;
	1742		scope.IMPORT_SELECTOR = IMPORT_SELECTOR;
	1743		});
		80	Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
		81	This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
		82	The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
		83	The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
		84	Code distributed by Google as part of the polymer project is also
		85	subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
		86	*/
		87	function xb(){this.ya=this.root=null;this.Z=!1;this.D=this.U=this.la=this.assignedSlot=this.assignedNodes=this.K=null;this.childNodes=this.nextSibling=this.previousSibling=this.lastChild=this.firstChild=this.parentNode=this.N=void 0;this.Da=this.ta=!1;this.S={}}xb.prototype.toJSON=function(){return{}};function w(a){a.fa\|\|(a.fa=new xb);return a.fa}function x(a){return a&&a.fa};var y=window.ShadyDOM\|\|{};y.Ra=!(!Element.prototype.attachShadow\|\|!Node.prototype.getRootNode);var yb=Object.getOwnPropertyDescriptor(Node.prototype,"firstChild");y.w=!!(yb&&yb.configurable&&yb.get);y.na=y.force\|\|!y.Ra;var zb=navigator.userAgent.match("Trident"),Ab=navigator.userAgent.match("Edge");void 0===y.Ba&&(y.Ba=y.w&&(zb\|\|Ab));function Bb(a){return(a=x(a))&&void 0!==a.firstChild}function z(a){return"ShadyRoot"===a.La}function Cb(a){a=a.getRootNode();if(z(a))return a}
		88	var Db=Element.prototype,Eb=Db.matches\|\|Db.matchesSelector\|\|Db.mozMatchesSelector\|\|Db.msMatchesSelector\|\|Db.oMatchesSelector\|\|Db.webkitMatchesSelector;function Fb(a,b){if(a&&b)for(var c=Object.getOwnPropertyNames(b),d=0,e;d<c.length&&(e=c[d]);d++){var f=Object.getOwnPropertyDescriptor(b,e);f&&Object.defineProperty(a,e,f)}}function Gb(a,b){for(var c=[],d=1;d<arguments.length;++d)c[d-1]=arguments[d];for(d=0;d<c.length;d++)Fb(a,c[d]);return a}function Hb(a,b){for(var c in b)a[c]=b[c]}
		89	var Ib=document.createTextNode(""),Jb=0,Kb=[];(new MutationObserver(function(){for(;Kb.length;)try{Kb.shift()()}catch(a){throw Ib.textContent=Jb++,a;}})).observe(Ib,{characterData:!0});function Lb(a){Kb.push(a);Ib.textContent=Jb++}var Mb=!!document.contains;function Nb(a,b){for(;b;){if(b==a)return!0;b=b.parentNode}return!1}
		90	function Ob(a){for(var b=a.length-1;0<=b;b--){var c=a[b],d=c.getAttribute("id")\|\|c.getAttribute("name");d&&"length"!==d&&isNaN(d)&&(a[d]=c)}a.item=function(b){return a[b]};a.namedItem=function(b){if("length"!==b&&isNaN(b)&&a[b])return a[b];for(var c=ma(a),d=c.next();!d.done;d=c.next())if(d=d.value,(d.getAttribute("id")\|\|d.getAttribute("name"))==b)return d;return null};return a};var Pb=[],Qb;function Rb(a){Qb\|\|(Qb=!0,Lb(Sb));Pb.push(a)}function Sb(){Qb=!1;for(var a=!!Pb.length;Pb.length;)Pb.shift()();return a}Sb.list=Pb;function Tb(){this.a=!1;this.addedNodes=[];this.removedNodes=[];this.Y=new Set}function Ub(a){a.a\|\|(a.a=!0,Lb(function(){Vb(a)}))}function Vb(a){if(a.a){a.a=!1;var b=a.takeRecords();b.length&&a.Y.forEach(function(a){a(b)})}}Tb.prototype.takeRecords=function(){if(this.addedNodes.length\|\|this.removedNodes.length){var a=[{addedNodes:this.addedNodes,removedNodes:this.removedNodes}];this.addedNodes=[];this.removedNodes=[];return a}return[]};
		91	function Wb(a,b){var c=w(a);c.K\|\|(c.K=new Tb);c.K.Y.add(b);var d=c.K;return{Ia:b,H:d,Ma:a,takeRecords:function(){return d.takeRecords()}}}function Xb(a){var b=a&&a.H;b&&(b.Y.delete(a.Ia),b.Y.size\|\|(w(a.Ma).K=null))}
		92	function Yb(a,b){var c=b.getRootNode();return a.map(function(a){var b=c===a.target.getRootNode();if(b&&a.addedNodes){if(b=Array.from(a.addedNodes).filter(function(a){return c===a.getRootNode()}),b.length)return a=Object.create(a),Object.defineProperty(a,"addedNodes",{value:b,configurable:!0}),a}else if(b)return a}).filter(function(a){return a})};var A={},Zb=Element.prototype.insertBefore,$b=Element.prototype.replaceChild,ac=Element.prototype.removeChild,bc=Element.prototype.setAttribute,cc=Element.prototype.removeAttribute,dc=Element.prototype.cloneNode,ec=Document.prototype.importNode,fc=Element.prototype.addEventListener,gc=Element.prototype.removeEventListener,hc=Window.prototype.addEventListener,ic=Window.prototype.removeEventListener,jc=Element.prototype.dispatchEvent,kc=Node.prototype.contains\|\|HTMLElement.prototype.contains,lc=Document.prototype.getElementById,
		93	mc=Element.prototype.querySelector,nc=DocumentFragment.prototype.querySelector,oc=Document.prototype.querySelector,pc=Element.prototype.querySelectorAll,qc=DocumentFragment.prototype.querySelectorAll,rc=Document.prototype.querySelectorAll;A.appendChild=Element.prototype.appendChild;A.insertBefore=Zb;A.replaceChild=$b;A.removeChild=ac;A.setAttribute=bc;A.removeAttribute=cc;A.cloneNode=dc;A.importNode=ec;A.addEventListener=fc;A.removeEventListener=gc;A.fb=hc;A.gb=ic;A.dispatchEvent=jc;A.contains=kc;
		94	A.getElementById=lc;A.pb=mc;A.sb=nc;A.nb=oc;A.querySelector=function(a){switch(this.nodeType){case Node.ELEMENT_NODE:return mc.call(this,a);case Node.DOCUMENT_NODE:return oc.call(this,a);default:return nc.call(this,a)}};A.qb=pc;A.tb=qc;A.ob=rc;A.querySelectorAll=function(a){switch(this.nodeType){case Node.ELEMENT_NODE:return pc.call(this,a);case Node.DOCUMENT_NODE:return rc.call(this,a);default:return qc.call(this,a)}};var sc=/[&\u00A0"]/g,tc=/[&\u00A0<>]/g;function uc(a){switch(a){case "&":return"&";case "<":return"<";case ">":return">";case '"':return""";case "\u00a0":return" "}}function vc(a){for(var b={},c=0;c<a.length;c++)b[a[c]]=!0;return b}var wc=vc("area base br col command embed hr img input keygen link meta param source track wbr".split(" ")),xc=vc("style script xmp iframe noembed noframes plaintext noscript".split(" "));
		95	function yc(a,b){"template"===a.localName&&(a=a.content);for(var c="",d=b?b(a):a.childNodes,e=0,f=d.length,h;e<f&&(h=d[e]);e++){a:{var g=h;var k=a;var l=b;switch(g.nodeType){case Node.ELEMENT_NODE:for(var m=g.localName,n="<"+m,t=g.attributes,C=0;k=t[C];C++)n+=" "+k.name+'="'+k.value.replace(sc,uc)+'"';n+=">";g=wc[m]?n:n+yc(g,l)+"</"+m+">";break a;case Node.TEXT_NODE:g=g.data;g=k&&xc[k.localName]?g:g.replace(tc,uc);break a;case Node.COMMENT_NODE:g="\x3c!--"+g.data+"--\x3e";break a;default:throw window.console.error(g),
		96	Error("not implemented");}}c+=g}return c};var B={},E=document.createTreeWalker(document,NodeFilter.SHOW_ALL,null,!1),F=document.createTreeWalker(document,NodeFilter.SHOW_ELEMENT,null,!1);function zc(a){var b=[];E.currentNode=a;for(a=E.firstChild();a;)b.push(a),a=E.nextSibling();return b}B.parentNode=function(a){E.currentNode=a;return E.parentNode()};B.firstChild=function(a){E.currentNode=a;return E.firstChild()};B.lastChild=function(a){E.currentNode=a;return E.lastChild()};B.previousSibling=function(a){E.currentNode=a;return E.previousSibling()};
		97	B.nextSibling=function(a){E.currentNode=a;return E.nextSibling()};B.childNodes=zc;B.parentElement=function(a){F.currentNode=a;return F.parentNode()};B.firstElementChild=function(a){F.currentNode=a;return F.firstChild()};B.lastElementChild=function(a){F.currentNode=a;return F.lastChild()};B.previousElementSibling=function(a){F.currentNode=a;return F.previousSibling()};B.nextElementSibling=function(a){F.currentNode=a;return F.nextSibling()};
		98	B.children=function(a){var b=[];F.currentNode=a;for(a=F.firstChild();a;)b.push(a),a=F.nextSibling();return Ob(b)};B.innerHTML=function(a){return yc(a,function(a){return zc(a)})};B.textContent=function(a){switch(a.nodeType){case Node.ELEMENT_NODE:case Node.DOCUMENT_FRAGMENT_NODE:a=document.createTreeWalker(a,NodeFilter.SHOW_TEXT,null,!1);for(var b="",c;c=a.nextNode();)b+=c.nodeValue;return b;default:return a.nodeValue}};var G={},Ac=y.w,Bc=[Node.prototype,Element.prototype,HTMLElement.prototype];function H(a){var b;a:{for(b=0;b<Bc.length;b++){var c=Bc[b];if(c.hasOwnProperty(a)){b=c;break a}}b=void 0}if(!b)throw Error("Could not find descriptor for "+a);return Object.getOwnPropertyDescriptor(b,a)}
		99	var I=Ac?{parentNode:H("parentNode"),firstChild:H("firstChild"),lastChild:H("lastChild"),previousSibling:H("previousSibling"),nextSibling:H("nextSibling"),childNodes:H("childNodes"),parentElement:H("parentElement"),previousElementSibling:H("previousElementSibling"),nextElementSibling:H("nextElementSibling"),innerHTML:H("innerHTML"),textContent:H("textContent"),firstElementChild:H("firstElementChild"),lastElementChild:H("lastElementChild"),children:H("children")}:{},Cc=Ac?{firstElementChild:Object.getOwnPropertyDescriptor(DocumentFragment.prototype,
		100	"firstElementChild"),lastElementChild:Object.getOwnPropertyDescriptor(DocumentFragment.prototype,"lastElementChild"),children:Object.getOwnPropertyDescriptor(DocumentFragment.prototype,"children")}:{},Dc=Ac?{firstElementChild:Object.getOwnPropertyDescriptor(Document.prototype,"firstElementChild"),lastElementChild:Object.getOwnPropertyDescriptor(Document.prototype,"lastElementChild"),children:Object.getOwnPropertyDescriptor(Document.prototype,"children")}:{};G.xa=I;G.rb=Cc;G.mb=Dc;G.parentNode=function(a){return I.parentNode.get.call(a)};
		101	G.firstChild=function(a){return I.firstChild.get.call(a)};G.lastChild=function(a){return I.lastChild.get.call(a)};G.previousSibling=function(a){return I.previousSibling.get.call(a)};G.nextSibling=function(a){return I.nextSibling.get.call(a)};G.childNodes=function(a){return Array.prototype.slice.call(I.childNodes.get.call(a))};G.parentElement=function(a){return I.parentElement.get.call(a)};G.previousElementSibling=function(a){return I.previousElementSibling.get.call(a)};G.nextElementSibling=function(a){return I.nextElementSibling.get.call(a)};
		102	G.innerHTML=function(a){return I.innerHTML.get.call(a)};G.textContent=function(a){return I.textContent.get.call(a)};G.children=function(a){switch(a.nodeType){case Node.DOCUMENT_FRAGMENT_NODE:return Cc.children.get.call(a);case Node.DOCUMENT_NODE:return Dc.children.get.call(a);default:return I.children.get.call(a)}};
		103	G.firstElementChild=function(a){switch(a.nodeType){case Node.DOCUMENT_FRAGMENT_NODE:return Cc.firstElementChild.get.call(a);case Node.DOCUMENT_NODE:return Dc.firstElementChild.get.call(a);default:return I.firstElementChild.get.call(a)}};G.lastElementChild=function(a){switch(a.nodeType){case Node.DOCUMENT_FRAGMENT_NODE:return Cc.lastElementChild.get.call(a);case Node.DOCUMENT_NODE:return Dc.lastElementChild.get.call(a);default:return I.lastElementChild.get.call(a)}};var J=y.Ba?G:B;function Ec(a){for(;a.firstChild;)a.removeChild(a.firstChild)}
		104	var Fc=y.w,Gc=document.implementation.createHTMLDocument("inert"),Hc=Object.getOwnPropertyDescriptor(Node.prototype,"isConnected"),Ic=Hc&&Hc.get,Jc=Object.getOwnPropertyDescriptor(Document.prototype,"activeElement"),Mc={parentElement:{get:function(){var a=x(this);(a=a&&a.parentNode)&&a.nodeType!==Node.ELEMENT_NODE&&(a=null);return void 0!==a?a:J.parentElement(this)},configurable:!0},parentNode:{get:function(){var a=x(this);a=a&&a.parentNode;return void 0!==a?a:J.parentNode(this)},configurable:!0},
		105	nextSibling:{get:function(){var a=x(this);a=a&&a.nextSibling;return void 0!==a?a:J.nextSibling(this)},configurable:!0},previousSibling:{get:function(){var a=x(this);a=a&&a.previousSibling;return void 0!==a?a:J.previousSibling(this)},configurable:!0},nextElementSibling:{get:function(){var a=x(this);if(a&&void 0!==a.nextSibling){for(a=this.nextSibling;a&&a.nodeType!==Node.ELEMENT_NODE;)a=a.nextSibling;return a}return J.nextElementSibling(this)},configurable:!0},previousElementSibling:{get:function(){var a=
		106	x(this);if(a&&void 0!==a.previousSibling){for(a=this.previousSibling;a&&a.nodeType!==Node.ELEMENT_NODE;)a=a.previousSibling;return a}return J.previousElementSibling(this)},configurable:!0}},Nc={className:{get:function(){return this.getAttribute("class")\|\|""},set:function(a){this.setAttribute("class",a)},configurable:!0}},Oc={childNodes:{get:function(){if(Bb(this)){var a=x(this);if(!a.childNodes){a.childNodes=[];for(var b=this.firstChild;b;b=b.nextSibling)a.childNodes.push(b)}var c=a.childNodes}else c=
		107	J.childNodes(this);c.item=function(a){return c[a]};return c},configurable:!0},childElementCount:{get:function(){return this.children.length},configurable:!0},firstChild:{get:function(){var a=x(this);a=a&&a.firstChild;return void 0!==a?a:J.firstChild(this)},configurable:!0},lastChild:{get:function(){var a=x(this);a=a&&a.lastChild;return void 0!==a?a:J.lastChild(this)},configurable:!0},textContent:{get:function(){if(Bb(this)){for(var a=[],b=0,c=this.childNodes,d;d=c[b];b++)d.nodeType!==Node.COMMENT_NODE&&
		108	a.push(d.textContent);return a.join("")}return J.textContent(this)},set:function(a){if("undefined"===typeof a\|\|null===a)a="";switch(this.nodeType){case Node.ELEMENT_NODE:case Node.DOCUMENT_FRAGMENT_NODE:if(!Bb(this)&&Fc){var b=this.firstChild;(b!=this.lastChild\|\|b&&b.nodeType!=Node.TEXT_NODE)&&Ec(this);G.xa.textContent.set.call(this,a)}else Ec(this),(0<a.length\|\|this.nodeType===Node.ELEMENT_NODE)&&this.appendChild(document.createTextNode(a));break;default:this.nodeValue=a}},configurable:!0},firstElementChild:{get:function(){var a=
		109	x(this);if(a&&void 0!==a.firstChild){for(a=this.firstChild;a&&a.nodeType!==Node.ELEMENT_NODE;)a=a.nextSibling;return a}return J.firstElementChild(this)},configurable:!0},lastElementChild:{get:function(){var a=x(this);if(a&&void 0!==a.lastChild){for(a=this.lastChild;a&&a.nodeType!==Node.ELEMENT_NODE;)a=a.previousSibling;return a}return J.lastElementChild(this)},configurable:!0},children:{get:function(){return Bb(this)?Ob(Array.prototype.filter.call(this.childNodes,function(a){return a.nodeType===Node.ELEMENT_NODE})):
		110	J.children(this)},configurable:!0},innerHTML:{get:function(){return Bb(this)?yc("template"===this.localName?this.content:this):J.innerHTML(this)},set:function(a){var b="template"===this.localName?this.content:this;Ec(b);var c=this.localName\|\|"div";c=this.namespaceURI&&this.namespaceURI!==Gc.namespaceURI?Gc.createElementNS(this.namespaceURI,c):Gc.createElement(c);Fc?G.xa.innerHTML.set.call(c,a):c.innerHTML=a;for(a="template"===this.localName?c.content:c;a.firstChild;)b.appendChild(a.firstChild)},configurable:!0}},
		111	Pc={shadowRoot:{get:function(){var a=x(this);return a&&a.ya\|\|null},configurable:!0}},Qc={activeElement:{get:function(){var a=Jc&&Jc.get?Jc.get.call(document):y.w?void 0:document.activeElement;if(a&&a.nodeType){var b=!!z(this);if(this===document\|\|b&&this.host!==a&&A.contains.call(this.host,a)){for(b=Cb(a);b&&b!==this;)a=b.host,b=Cb(a);a=this===document?b?null:a:b===this?a:null}else a=null}else a=null;return a},set:function(){},configurable:!0}};
		112	function K(a,b,c){for(var d in b){var e=Object.getOwnPropertyDescriptor(a,d);e&&e.configurable\|\|!e&&c?Object.defineProperty(a,d,b[d]):c&&console.warn("Could not define",d,"on",a)}}function Rc(a){K(a,Mc);K(a,Nc);K(a,Oc);K(a,Qc)}
		113	function Sc(){var a=Tc.prototype;a.__proto__=DocumentFragment.prototype;K(a,Mc,!0);K(a,Oc,!0);K(a,Qc,!0);Object.defineProperties(a,{nodeType:{value:Node.DOCUMENT_FRAGMENT_NODE,configurable:!0},nodeName:{value:"#document-fragment",configurable:!0},nodeValue:{value:null,configurable:!0}});["localName","namespaceURI","prefix"].forEach(function(b){Object.defineProperty(a,b,{value:void 0,configurable:!0})});["ownerDocument","baseURI","isConnected"].forEach(function(b){Object.defineProperty(a,b,{get:function(){return this.host[b]},
		114	configurable:!0})})}var Uc=y.w?function(){}:function(a){var b=w(a);b.ta\|\|(b.ta=!0,K(a,Mc,!0),K(a,Nc,!0))},Vc=y.w?function(){}:function(a){w(a).Da\|\|(K(a,Oc,!0),K(a,Pc,!0))};var Wc=J.childNodes;function Xc(a,b,c){Uc(a);c=c\|\|null;var d=w(a),e=w(b),f=c?w(c):null;d.previousSibling=c?f.previousSibling:b.lastChild;if(f=x(d.previousSibling))f.nextSibling=a;if(f=x(d.nextSibling=c))f.previousSibling=a;d.parentNode=b;c?c===e.firstChild&&(e.firstChild=a):(e.lastChild=a,e.firstChild\|\|(e.firstChild=a));e.childNodes=null}
		115	function Yc(a){var b=w(a);if(void 0===b.firstChild){b.childNodes=null;var c=Wc(a);b.firstChild=c[0]\|\|null;b.lastChild=c[c.length-1]\|\|null;Vc(a);for(b=0;b<c.length;b++){var d=c[b],e=w(d);e.parentNode=a;e.nextSibling=c[b+1]\|\|null;e.previousSibling=c[b-1]\|\|null;Uc(d)}}};var Zc=J.parentNode;
		116	function $c(a,b,c){if(b===a)throw Error("Failed to execute 'appendChild' on 'Node': The new child element contains the parent.");if(c){var d=x(c);d=d&&d.parentNode;if(void 0!==d&&d!==a\|\|void 0===d&&Zc(c)!==a)throw Error("Failed to execute 'insertBefore' on 'Node': The node before which the new node is to be inserted is not a child of this node.");}if(c===b)return b;b.parentNode&&ad(b.parentNode,b);var e,f;if(!b.__noInsertionPoint){if(f=e=Cb(a)){var h;"slot"===b.localName?h=[b]:b.querySelectorAll&&
		117	(h=b.querySelectorAll("slot"));f=h&&h.length?h:void 0}f&&(h=e,d=f,h.a=h.a\|\|[],h.g=h.g\|\|[],h.j=h.j\|\|{},h.a.push.apply(h.a,[].concat(d instanceof Array?d:na(ma(d)))))}("slot"===a.localName\|\|f)&&(e=e\|\|Cb(a))&&bd(e);if(Bb(a)){e=c;Vc(a);f=w(a);void 0!==f.firstChild&&(f.childNodes=null);if(b.nodeType===Node.DOCUMENT_FRAGMENT_NODE){f=b.childNodes;for(h=0;h<f.length;h++)Xc(f[h],a,e);e=w(b);f=void 0!==e.firstChild?null:void 0;e.firstChild=e.lastChild=f;e.childNodes=f}else Xc(b,a,e);e=x(a);if(cd(a)){bd(e.root);
		118	var g=!0}else e.root&&(g=!0)}g\|\|(g=z(a)?a.host:a,c?(c=dd(c),A.insertBefore.call(g,b,c)):A.appendChild.call(g,b));ed(a,b);return b}
		119	function ad(a,b){if(b.parentNode!==a)throw Error("The node to be removed is not a child of this node: "+b);var c=Cb(b),d=x(a);if(Bb(a)){var e=w(b),f=w(a);b===f.firstChild&&(f.firstChild=e.nextSibling);b===f.lastChild&&(f.lastChild=e.previousSibling);var h=e.previousSibling,g=e.nextSibling;h&&(w(h).nextSibling=g);g&&(w(g).previousSibling=h);e.parentNode=e.previousSibling=e.nextSibling=void 0;void 0!==f.childNodes&&(f.childNodes=null);if(cd(a)){bd(d.root);var k=!0}}fd(b);if(c){(e=a&&"slot"===a.localName)&&
		120	(k=!0);if(c.g){gd(c);f=c.j;for(ba in f)for(h=f[ba],g=0;g<h.length;g++){var l=h[g];if(Nb(b,l)){h.splice(g,1);var m=c.g.indexOf(l);0<=m&&c.g.splice(m,1);g--;m=x(l);if(l=m.D)for(var n=0;n<l.length;n++){var t=l[n],C=hd(t);C&&A.removeChild.call(C,t)}m.D=[];m.assignedNodes=[];m=!0}}var ba=m}else ba=void 0;(ba\|\|e)&&bd(c)}k\|\|(k=z(a)?a.host:a,(!d.root&&"slot"!==b.localName\|\|k===Zc(b))&&A.removeChild.call(k,b));ed(a,null,b);return b}
		121	function fd(a){var b=x(a);if(b&&void 0!==b.N){b=a.childNodes;for(var c=0,d=b.length,e;c<d&&(e=b[c]);c++)fd(e)}if(a=x(a))a.N=void 0}function dd(a){var b=a;a&&"slot"===a.localName&&(b=(b=(b=x(a))&&b.D)&&b.length?b[0]:dd(a.nextSibling));return b}function cd(a){return(a=(a=x(a))&&a.root)&&id(a)}
		122	function jd(a,b){if("slot"===b)a=a.parentNode,cd(a)&&bd(x(a).root);else if("slot"===a.localName&&"name"===b&&(b=Cb(a))){if(b.g){gd(b);var c=a.Ga,d=kd(a);if(d!==c){c=b.j[c];var e=c.indexOf(a);0<=e&&c.splice(e,1);c=b.j[d]\|\|(b.j[d]=[]);c.push(a);1<c.length&&(b.j[d]=ld(c))}}bd(b)}}function ed(a,b,c){if(a=(a=x(a))&&a.K)b&&a.addedNodes.push(b),c&&a.removedNodes.push(c),Ub(a)}
		123	function md(a){if(a&&a.nodeType){var b=w(a),c=b.N;void 0===c&&(z(a)?(c=a,b.N=c):(c=(c=a.parentNode)?md(c):a,A.contains.call(document.documentElement,a)&&(b.N=c)));return c}}function nd(a,b,c){var d=[];od(a.childNodes,b,c,d);return d}function od(a,b,c,d){for(var e=0,f=a.length,h;e<f&&(h=a[e]);e++){var g;if(g=h.nodeType===Node.ELEMENT_NODE){g=h;var k=b,l=c,m=d,n=k(g);n&&m.push(g);l&&l(n)?g=n:(od(g.childNodes,k,l,m),g=void 0)}if(g)break}}var pd=null;
		124	function qd(a,b,c){pd\|\|(pd=window.ShadyCSS&&window.ShadyCSS.ScopingShim);pd&&"class"===b?pd.setElementClass(a,c):(A.setAttribute.call(a,b,c),jd(a,b))}function rd(a,b){if(a.ownerDocument!==document\|\|"template"===a.localName)return A.importNode.call(document,a,b);var c=A.importNode.call(document,a,!1);if(b){a=a.childNodes;b=0;for(var d;b<a.length;b++)d=rd(a[b],!0),c.appendChild(d)}return c};var sd="__eventWrappers"+Date.now(),td=function(){var a=Object.getOwnPropertyDescriptor(Event.prototype,"composed");return a?function(b){return a.get.call(b)}:null}(),ud={blur:!0,focus:!0,focusin:!0,focusout:!0,click:!0,dblclick:!0,mousedown:!0,mouseenter:!0,mouseleave:!0,mousemove:!0,mouseout:!0,mouseover:!0,mouseup:!0,wheel:!0,beforeinput:!0,input:!0,keydown:!0,keyup:!0,compositionstart:!0,compositionupdate:!0,compositionend:!0,touchstart:!0,touchend:!0,touchmove:!0,touchcancel:!0,pointerover:!0,
		125	pointerenter:!0,pointerdown:!0,pointermove:!0,pointerup:!0,pointercancel:!0,pointerout:!0,pointerleave:!0,gotpointercapture:!0,lostpointercapture:!0,dragstart:!0,drag:!0,dragenter:!0,dragleave:!0,dragover:!0,drop:!0,dragend:!0,DOMActivate:!0,DOMFocusIn:!0,DOMFocusOut:!0,keypress:!0},vd={DOMAttrModified:!0,DOMAttributeNameChanged:!0,DOMCharacterDataModified:!0,DOMElementNameChanged:!0,DOMNodeInserted:!0,DOMNodeInsertedIntoDocument:!0,DOMNodeRemoved:!0,DOMNodeRemovedFromDocument:!0,DOMSubtreeModified:!0};
		126	function wd(a,b){var c=[],d=a;for(a=a===window?window:a.getRootNode();d;)c.push(d),d=d.assignedSlot?d.assignedSlot:d.nodeType===Node.DOCUMENT_FRAGMENT_NODE&&d.host&&(b\|\|d!==a)?d.host:d.parentNode;c[c.length-1]===document&&c.push(window);return c}function xd(a,b){if(!z)return a;a=wd(a,!0);for(var c=0,d,e,f,h;c<b.length;c++)if(d=b[c],f=d===window?window:d.getRootNode(),f!==e&&(h=a.indexOf(f),e=f),!z(f)\|\|-1<h)return d}
		127	var yd={get composed(){void 0===this.R&&(td?this.R=td(this):!1!==this.isTrusted&&(this.R=ud[this.type]));return this.R\|\|!1},composedPath:function(){this.sa\|\|(this.sa=wd(this.__target,this.composed));return this.sa},get target(){return xd(this.currentTarget\|\|this.__previousCurrentTarget,this.composedPath())},get relatedTarget(){if(!this.ea)return null;this.ua\|\|(this.ua=wd(this.ea,!0));return xd(this.currentTarget,this.ua)},stopPropagation:function(){Event.prototype.stopPropagation.call(this);this.da=
		128	!0},stopImmediatePropagation:function(){Event.prototype.stopImmediatePropagation.call(this);this.da=this.Ca=!0}};function zd(a){function b(b,d){b=new a(b,d);b.R=d&&!!d.composed;return b}Hb(b,a);b.prototype=a.prototype;return b}var Ad={focus:!0,blur:!0};function Bd(a){return a.__target!==a.target\|\|a.ea!==a.relatedTarget}function Cd(a,b,c){if(c=b.__handlers&&b.__handlers[a.type]&&b.__handlers[a.type][c])for(var d=0,e;(e=c[d])&&(!Bd(a)\|\|a.target!==a.relatedTarget)&&(e.call(b,a),!a.Ca);d++);}
		129	function Dd(a){var b=a.composedPath();Object.defineProperty(a,"currentTarget",{get:function(){return d},configurable:!0});for(var c=b.length-1;0<=c;c--){var d=b[c];Cd(a,d,"capture");if(a.da)return}Object.defineProperty(a,"eventPhase",{get:function(){return Event.AT_TARGET}});var e;for(c=0;c<b.length;c++){d=b[c];var f=x(d);f=f&&f.root;if(0===c\|\|f&&f===e)if(Cd(a,d,"bubble"),d!==window&&(e=d.getRootNode()),a.da)break}}
		130	function Ed(a,b,c,d,e,f){for(var h=0;h<a.length;h++){var g=a[h],k=g.type,l=g.capture,m=g.once,n=g.passive;if(b===g.node&&c===k&&d===l&&e===m&&f===n)return h}return-1}
		131	function Fd(a,b,c){if(b){var d=typeof b;if("function"===d\|\|"object"===d)if("object"!==d\|\|b.handleEvent&&"function"===typeof b.handleEvent){var e=this instanceof Window?A.fb:A.addEventListener;if(vd[a])return e.call(this,a,b,c);if(c&&"object"===typeof c){var f=!!c.capture;var h=!!c.once;var g=!!c.passive}else f=!!c,g=h=!1;var k=c&&c.ga\|\|this,l=b[sd];if(l){if(-1<Ed(l,k,a,f,h,g))return}else b[sd]=[];l=function(e){h&&this.removeEventListener(a,b,c);e.__target\|\|Gd(e);if(k!==this){var f=Object.getOwnPropertyDescriptor(e,
		132	"currentTarget");Object.defineProperty(e,"currentTarget",{get:function(){return k},configurable:!0})}e.__previousCurrentTarget=e.currentTarget;if(!z(k)\|\|-1!=e.composedPath().indexOf(k))if(e.composed\|\|-1<e.composedPath().indexOf(k))if(Bd(e)&&e.target===e.relatedTarget)e.eventPhase===Event.BUBBLING_PHASE&&e.stopImmediatePropagation();else if(e.eventPhase===Event.CAPTURING_PHASE\|\|e.bubbles\|\|e.target===k\|\|k instanceof Window){var g="function"===d?b.call(k,e):b.handleEvent&&b.handleEvent(e);k!==this&&
		133	(f?(Object.defineProperty(e,"currentTarget",f),f=null):delete e.currentTarget);return g}};b[sd].push({node:k,type:a,capture:f,once:h,passive:g,hb:l});Ad[a]?(this.__handlers=this.__handlers\|\|{},this.__handlers[a]=this.__handlers[a]\|\|{capture:[],bubble:[]},this.__handlers[a][f?"capture":"bubble"].push(l)):e.call(this,a,l,c)}}}
		134	function Hd(a,b,c){if(b){var d=this instanceof Window?A.gb:A.removeEventListener;if(vd[a])return d.call(this,a,b,c);if(c&&"object"===typeof c){var e=!!c.capture;var f=!!c.once;var h=!!c.passive}else e=!!c,h=f=!1;var g=c&&c.ga\|\|this,k=void 0;var l=null;try{l=b[sd]}catch(m){}l&&(f=Ed(l,g,a,e,f,h),-1<f&&(k=l.splice(f,1)[0].hb,l.length\|\|(b[sd]=void 0)));d.call(this,a,k\|\|b,c);k&&Ad[a]&&this.__handlers&&this.__handlers[a]&&(a=this.__handlers[a][e?"capture":"bubble"],k=a.indexOf(k),-1<k&&a.splice(k,1))}}
		135	function Id(){for(var a in Ad)window.addEventListener(a,function(a){a.__target\|\|(Gd(a),Dd(a))},!0)}function Gd(a){a.__target=a.target;a.ea=a.relatedTarget;if(y.w){var b=Object.getPrototypeOf(a);if(!b.hasOwnProperty("__patchProto")){var c=Object.create(b);c.jb=b;Fb(c,yd);b.__patchProto=c}a.__proto__=b.__patchProto}else Fb(a,yd)}var Jd=zd(window.Event),Kd=zd(window.CustomEvent),Ld=zd(window.MouseEvent);
		136	function Md(){window.Event=Jd;window.CustomEvent=Kd;window.MouseEvent=Ld;Id();if(!td&&Object.getOwnPropertyDescriptor(Event.prototype,"isTrusted")){var a=function(){var a=new MouseEvent("click",{bubbles:!0,cancelable:!0,composed:!0});this.dispatchEvent(a)};Element.prototype.click?Element.prototype.click=a:HTMLElement.prototype.click&&(HTMLElement.prototype.click=a)}};function Nd(a,b){return{index:a,O:[],X:b}}
		137	function Od(a,b,c,d){var e=0,f=0,h=0,g=0,k=Math.min(b-e,d-f);if(0==e&&0==f)a:{for(h=0;h<k;h++)if(a[h]!==c[h])break a;h=k}if(b==a.length&&d==c.length){g=a.length;for(var l=c.length,m=0;m<k-h&&Pd(a[--g],c[--l]);)m++;g=m}e+=h;f+=h;b-=g;d-=g;if(0==b-e&&0==d-f)return[];if(e==b){for(b=Nd(e,0);f<d;)b.O.push(c[f++]);return[b]}if(f==d)return[Nd(e,b-e)];k=e;h=f;d=d-h+1;g=b-k+1;b=Array(d);for(l=0;l<d;l++)b[l]=Array(g),b[l][0]=l;for(l=0;l<g;l++)b[0][l]=l;for(l=1;l<d;l++)for(m=1;m<g;m++)if(a[k+m-1]===c[h+l-1])b[l][m]=
		138	b[l-1][m-1];else{var n=b[l-1][m]+1,t=b[l][m-1]+1;b[l][m]=n<t?n:t}k=b.length-1;h=b[0].length-1;d=b[k][h];for(a=[];0<k\|\|0<h;)0==k?(a.push(2),h--):0==h?(a.push(3),k--):(g=b[k-1][h-1],l=b[k-1][h],m=b[k][h-1],n=l<m?l<g?l:g:m<g?m:g,n==g?(g==d?a.push(0):(a.push(1),d=g),k--,h--):n==l?(a.push(3),k--,d=l):(a.push(2),h--,d=m));a.reverse();b=void 0;k=[];for(h=0;h<a.length;h++)switch(a[h]){case 0:b&&(k.push(b),b=void 0);e++;f++;break;case 1:b\|\|(b=Nd(e,0));b.X++;e++;b.O.push(c[f]);f++;break;case 2:b\|\|(b=Nd(e,0));
		139	b.X++;e++;break;case 3:b\|\|(b=Nd(e,0)),b.O.push(c[f]),f++}b&&k.push(b);return k}function Pd(a,b){return a===b};var hd=J.parentNode,Qd=J.childNodes,Rd={},Sd=y.deferConnectionCallbacks&&"loading"===document.readyState,Td;function Ud(a){var b=[];do b.unshift(a);while(a=a.parentNode);return b}
		140	function Tc(a,b,c){if(a!==Rd)throw new TypeError("Illegal constructor");this.La="ShadyRoot";this.host=b;this.c=c&&c.mode;Yc(b);a=w(b);a.root=this;a.ya="closed"!==this.c?this:null;a=w(this);a.firstChild=a.lastChild=a.parentNode=a.nextSibling=a.previousSibling=null;a.childNodes=[];this.b=this.W=!1;this.a=this.j=this.g=null;bd(this)}function bd(a){a.W\|\|(a.W=!0,Rb(function(){return Vd(a)}))}
		141	function Vd(a){for(var b;a;){a.W&&(b=a);a:{var c=a;a=c.host.getRootNode();if(z(a))for(var d=c.host.childNodes,e=0;e<d.length;e++)if(c=d[e],"slot"==c.localName)break a;a=void 0}}b&&b._renderRoot()}
		142	Tc.prototype._renderRoot=function(){var a=Sd;Sd=!0;this.W=!1;if(this.g){gd(this);for(var b=0,c;b<this.g.length;b++){c=this.g[b];var d=x(c),e=d.assignedNodes;d.assignedNodes=[];d.D=[];if(d.la=e)for(d=0;d<e.length;d++){var f=x(e[d]);f.U=f.assignedSlot;f.assignedSlot===c&&(f.assignedSlot=null)}}for(c=this.host.firstChild;c;c=c.nextSibling)Wd(this,c);for(b=0;b<this.g.length;b++){c=this.g[b];e=x(c);if(!e.assignedNodes.length)for(d=c.firstChild;d;d=d.nextSibling)Wd(this,d,c);(d=(d=x(c.parentNode))&&d.root)&&
		143	id(d)&&d._renderRoot();Xd(this,e.D,e.assignedNodes);if(d=e.la){for(f=0;f<d.length;f++)x(d[f]).U=null;e.la=null;d.length>e.assignedNodes.length&&(e.Z=!0)}e.Z&&(e.Z=!1,Yd(this,c))}b=this.g;c=[];for(e=0;e<b.length;e++)d=b[e].parentNode,(f=x(d))&&f.root\|\|!(0>c.indexOf(d))\|\|c.push(d);for(b=0;b<c.length;b++){e=c[b];d=e===this?this.host:e;f=[];e=e.childNodes;for(var h=0;h<e.length;h++){var g=e[h];if("slot"==g.localName){g=x(g).D;for(var k=0;k<g.length;k++)f.push(g[k])}else f.push(g)}e=void 0;h=Qd(d);g=Od(f,
		144	f.length,h,h.length);for(var l=k=0;k<g.length&&(e=g[k]);k++){for(var m=0,n;m<e.O.length&&(n=e.O[m]);m++)hd(n)===d&&A.removeChild.call(d,n),h.splice(e.index+l,1);l-=e.X}for(l=0;l<g.length&&(e=g[l]);l++)for(k=h[e.index],m=e.index;m<e.index+e.X;m++)n=f[m],A.insertBefore.call(d,n,k),h.splice(m,0,n)}}if(!this.b)for(n=this.host.childNodes,c=0,b=n.length;c<b;c++)e=n[c],d=x(e),hd(e)!==this.host\|\|"slot"!==e.localName&&d.assignedSlot\|\|A.removeChild.call(this.host,e);this.b=!0;Sd=a;Td&&Td()};
		145	function Wd(a,b,c){var d=w(b),e=d.U;d.U=null;c\|\|(c=(a=a.j[b.slot\|\|"__catchall"])&&a[0]);c?(w(c).assignedNodes.push(b),d.assignedSlot=c):d.assignedSlot=void 0;e!==d.assignedSlot&&d.assignedSlot&&(w(d.assignedSlot).Z=!0)}function Xd(a,b,c){for(var d=0,e;d<c.length&&(e=c[d]);d++)if("slot"==e.localName){var f=x(e).assignedNodes;f&&f.length&&Xd(a,b,f)}else b.push(c[d])}function Yd(a,b){A.dispatchEvent.call(b,new Event("slotchange"));b=x(b);b.assignedSlot&&Yd(a,b.assignedSlot)}
		146	function gd(a){if(a.a&&a.a.length){for(var b=a.a,c,d=0;d<b.length;d++){var e=b[d];Yc(e);Yc(e.parentNode);var f=kd(e);a.j[f]?(c=c\|\|{},c[f]=!0,a.j[f].push(e)):a.j[f]=[e];a.g.push(e)}if(c)for(var h in c)a.j[h]=ld(a.j[h]);a.a=[]}}function kd(a){var b=a.name\|\|a.getAttribute("name")\|\|"__catchall";return a.Ga=b}function ld(a){return a.sort(function(a,c){a=Ud(a);for(var b=Ud(c),e=0;e<a.length;e++){c=a[e];var f=b[e];if(c!==f)return a=Array.from(c.parentNode.childNodes),a.indexOf(c)-a.indexOf(f)}})}
		147	function id(a){gd(a);return!(!a.g\|\|!a.g.length)}
		148	if(window.customElements&&y.na){var Zd=new Map;Td=function(){var a=Array.from(Zd);Zd.clear();a=ma(a);for(var b=a.next();!b.done;b=a.next()){b=ma(b.value);var c=b.next().value;b.next().value?c.Ea():c.Fa()}};Sd&&document.addEventListener("readystatechange",function(){Sd=!1;Td()},{once:!0});var $d=function(a,b,c){var d=0,e="__isConnected"+d++;if(b\|\|c)a.prototype.connectedCallback=a.prototype.Ea=function(){Sd?Zd.set(this,!0):this[e]\|\|(this[e]=!0,b&&b.call(this))},a.prototype.disconnectedCallback=a.prototype.Fa=
		149	function(){Sd?this.isConnected\|\|Zd.set(this,!1):this[e]&&(this[e]=!1,c&&c.call(this))};return a},define=window.customElements.define;Object.defineProperty(window.CustomElementRegistry.prototype,"define",{value:function(a,b){var c=b.prototype.connectedCallback,d=b.prototype.disconnectedCallback;define.call(window.customElements,a,$d(b,c,d));b.prototype.connectedCallback=c;b.prototype.disconnectedCallback=d}})};function ae(a){var b=a.getRootNode();z(b)&&Vd(b);return(a=x(a))&&a.assignedSlot\|\|null}
		150	var be={addEventListener:Fd.bind(window),removeEventListener:Hd.bind(window)},ce={addEventListener:Fd,removeEventListener:Hd,appendChild:function(a){return $c(this,a)},insertBefore:function(a,b){return $c(this,a,b)},removeChild:function(a){return ad(this,a)},replaceChild:function(a,b){$c(this,a,b);ad(this,b);return a},cloneNode:function(a){if("template"==this.localName)var b=A.cloneNode.call(this,a);else if(b=A.cloneNode.call(this,!1),a&&b.nodeType!==Node.ATTRIBUTE_NODE){a=this.childNodes;for(var c=
		151	0,d;c<a.length;c++)d=a[c].cloneNode(!0),b.appendChild(d)}return b},getRootNode:function(){return md(this)},contains:function(a){return Nb(this,a)},dispatchEvent:function(a){Sb();return A.dispatchEvent.call(this,a)}};
		152	Object.defineProperties(ce,{isConnected:{get:function(){if(Ic&&Ic.call(this))return!0;if(this.nodeType==Node.DOCUMENT_FRAGMENT_NODE)return!1;var a=this.ownerDocument;if(Mb){if(A.contains.call(a,this))return!0}else if(a.documentElement&&A.contains.call(a.documentElement,this))return!0;for(a=this;a&&!(a instanceof Document);)a=a.parentNode\|\|(z(a)?a.host:void 0);return!!(a&&a instanceof Document)},configurable:!0}});
		153	var de={get assignedSlot(){return ae(this)}},ee={querySelector:function(a){return nd(this,function(b){return Eb.call(b,a)},function(a){return!!a})[0]\|\|null},querySelectorAll:function(a,b){if(b){b=Array.prototype.slice.call(A.querySelectorAll.call(this,a));var c=this.getRootNode();return b.filter(function(a){return a.getRootNode()==c})}return nd(this,function(b){return Eb.call(b,a)})}},fe={assignedNodes:function(a){if("slot"===this.localName){var b=this.getRootNode();z(b)&&Vd(b);return(b=x(this))?
		154	(a&&a.flatten?b.D:b.assignedNodes)\|\|[]:[]}}},ge=Gb({setAttribute:function(a,b){qd(this,a,b)},removeAttribute:function(a){A.removeAttribute.call(this,a);jd(this,a)},attachShadow:function(a){if(!this)throw"Must provide a host.";if(!a)throw"Not enough arguments.";return new Tc(Rd,this,a)},get slot(){return this.getAttribute("slot")},set slot(a){qd(this,"slot",a)},get assignedSlot(){return ae(this)}},ee,fe);Object.defineProperties(ge,Pc);
		155	var he=Gb({importNode:function(a,b){return rd(a,b)},getElementById:function(a){return nd(this,function(b){return b.id==a},function(a){return!!a})[0]\|\|null}},ee);Object.defineProperties(he,{_activeElement:Qc.activeElement});
		156	for(var ie=HTMLElement.prototype.blur,je={blur:function(){var a=x(this);(a=(a=a&&a.root)&&a.activeElement)?a.blur():ie.call(this)}},ke={},le=ma(Object.getOwnPropertyNames(Document.prototype)),me=le.next();!me.done;ke={u:ke.u},me=le.next())ke.u=me.value,"on"===ke.u.substring(0,2)&&Object.defineProperty(je,ke.u,{set:function(a){return function(b){var c=w(this),d=a.u.substring(2);c.S[a.u]&&this.removeEventListener(d,c.S[a.u]);this.addEventListener(d,b,{});c.S[a.u]=b}}(ke),get:function(a){return function(){var b=
		157	x(this);return b&&b.S[a.u]}}(ke),configurable:!0});var ne={addEventListener:function(a,b,c){"object"!==typeof c&&(c={capture:!!c});c.ga=this;this.host.addEventListener(a,b,c)},removeEventListener:function(a,b,c){"object"!==typeof c&&(c={capture:!!c});c.ga=this;this.host.removeEventListener(a,b,c)},getElementById:function(a){return nd(this,function(b){return b.id==a},function(a){return!!a})[0]\|\|null}};
		158	function L(a,b){for(var c=Object.getOwnPropertyNames(b),d=0;d<c.length;d++){var e=c[d],f=Object.getOwnPropertyDescriptor(b,e);f.value?a[e]=f.value:Object.defineProperty(a,e,f)}};if(y.na){var ShadyDOM={inUse:y.na,patch:function(a){Vc(a);Uc(a);return a},isShadyRoot:z,enqueue:Rb,flush:Sb,settings:y,filterMutations:Yb,observeChildren:Wb,unobserveChildren:Xb,nativeMethods:A,nativeTree:J,deferConnectionCallbacks:y.deferConnectionCallbacks};window.ShadyDOM=ShadyDOM;Md();var oe=window.customElements&&window.customElements.nativeHTMLElement\|\|HTMLElement;L(Tc.prototype,ne);L(window.Node.prototype,ce);L(window.Window.prototype,be);L(window.Text.prototype,de);L(window.DocumentFragment.prototype,
		159	ee);L(window.Element.prototype,ge);L(window.Document.prototype,he);window.HTMLSlotElement&&L(window.HTMLSlotElement.prototype,fe);L(oe.prototype,je);y.w&&(Rc(window.Node.prototype),Rc(window.Text.prototype),Rc(window.DocumentFragment.prototype),Rc(window.Element.prototype),Rc(oe.prototype),Rc(window.Document.prototype),window.HTMLSlotElement&&Rc(window.HTMLSlotElement.prototype));Sc();window.ShadowRoot=Tc};var pe=new Set("annotation-xml color-profile font-face font-face-src font-face-uri font-face-format font-face-name missing-glyph".split(" "));function qe(a){var b=pe.has(a);a=/^[a-z][.0-9_a-z]-[\-.0-9_a-z]$/.test(a);return!b&&a}function M(a){var b=a.isConnected;if(void 0!==b)return b;for(;a&&!(a.__CE_isImportDocument\|\|a instanceof Document);)a=a.parentNode\|\|(window.ShadowRoot&&a instanceof ShadowRoot?a.host:void 0);return!(!a\|\|!(a.__CE_isImportDocument\|\|a instanceof Document))}
		160	function re(a,b){for(;b&&b!==a&&!b.nextSibling;)b=b.parentNode;return b&&b!==a?b.nextSibling:null}
		161	function se(a,b,c){c=void 0===c?new Set:c;for(var d=a;d;){if(d.nodeType===Node.ELEMENT_NODE){var e=d;b(e);var f=e.localName;if("link"===f&&"import"===e.getAttribute("rel")){d=e.import;if(d instanceof Node&&!c.has(d))for(c.add(d),d=d.firstChild;d;d=d.nextSibling)se(d,b,c);d=re(a,e);continue}else if("template"===f){d=re(a,e);continue}if(e=e.__CE_shadowRoot)for(e=e.firstChild;e;e=e.nextSibling)se(e,b,c)}d=d.firstChild?d.firstChild:re(a,d)}}function N(a,b,c){a[b]=c};function te(){this.a=new Map;this.o=new Map;this.i=[];this.c=!1}function ue(a,b,c){a.a.set(b,c);a.o.set(c.constructor,c)}function ve(a,b){a.c=!0;a.i.push(b)}function we(a,b){a.c&&se(b,function(b){return a.b(b)})}te.prototype.b=function(a){if(this.c&&!a.__CE_patched){a.__CE_patched=!0;for(var b=0;b<this.i.length;b++)this.i[b](a)}};function O(a,b){var c=[];se(b,function(a){return c.push(a)});for(b=0;b<c.length;b++){var d=c[b];1===d.__CE_state?a.connectedCallback(d):xe(a,d)}}
		162	function P(a,b){var c=[];se(b,function(a){return c.push(a)});for(b=0;b<c.length;b++){var d=c[b];1===d.__CE_state&&a.disconnectedCallback(d)}}
		163	function Q(a,b,c){c=void 0===c?{}:c;var d=c.eb\|\|new Set,e=c.ca\|\|function(b){return xe(a,b)},f=[];se(b,function(b){if("link"===b.localName&&"import"===b.getAttribute("rel")){var c=b.import;c instanceof Node&&(c.__CE_isImportDocument=!0,c.__CE_hasRegistry=!0);c&&"complete"===c.readyState?c.__CE_documentLoadHandled=!0:b.addEventListener("load",function(){var c=b.import;if(!c.__CE_documentLoadHandled){c.__CE_documentLoadHandled=!0;var f=new Set(d);f.delete(c);Q(a,c,{eb:f,ca:e})}})}else f.push(b)},d);
		164	if(a.c)for(b=0;b<f.length;b++)a.b(f[b]);for(b=0;b<f.length;b++)e(f[b])}
		165	function xe(a,b){if(void 0===b.__CE_state){var c=b.ownerDocument;if(c.defaultView\|\|c.__CE_isImportDocument&&c.__CE_hasRegistry)if(c=a.a.get(b.localName)){c.constructionStack.push(b);var d=c.constructor;try{try{if(new d!==b)throw Error("The custom element constructor did not produce the element being upgraded.");}finally{c.constructionStack.pop()}}catch(h){throw b.__CE_state=2,h;}b.__CE_state=1;b.__CE_definition=c;if(c.attributeChangedCallback)for(c=c.observedAttributes,d=0;d<c.length;d++){var e=c[d],
		166	f=b.getAttribute(e);null!==f&&a.attributeChangedCallback(b,e,null,f,null)}M(b)&&a.connectedCallback(b)}}}te.prototype.connectedCallback=function(a){var b=a.__CE_definition;b.connectedCallback&&b.connectedCallback.call(a)};te.prototype.disconnectedCallback=function(a){var b=a.__CE_definition;b.disconnectedCallback&&b.disconnectedCallback.call(a)};
		167	te.prototype.attributeChangedCallback=function(a,b,c,d,e){var f=a.__CE_definition;f.attributeChangedCallback&&-1<f.observedAttributes.indexOf(b)&&f.attributeChangedCallback.call(a,b,c,d,e)};function ye(a){var b=document;this.l=a;this.a=b;this.H=void 0;Q(this.l,this.a);"loading"===this.a.readyState&&(this.H=new MutationObserver(this.b.bind(this)),this.H.observe(this.a,{childList:!0,subtree:!0}))}function ze(a){a.H&&a.H.disconnect()}ye.prototype.b=function(a){var b=this.a.readyState;"interactive"!==b&&"complete"!==b\|\|ze(this);for(b=0;b<a.length;b++)for(var c=a[b].addedNodes,d=0;d<c.length;d++)Q(this.l,c[d])};function Ae(){var a=this;this.b=this.a=void 0;this.c=new Promise(function(b){a.b=b;a.a&&b(a.a)})}Ae.prototype.resolve=function(a){if(this.a)throw Error("Already resolved.");this.a=a;this.b&&this.b(a)};function R(a){this.ia=!1;this.l=a;this.ma=new Map;this.ja=function(a){return a()};this.T=!1;this.ka=[];this.Ja=new ye(a)}p=R.prototype;
		168	p.define=function(a,b){var c=this;if(!(b instanceof Function))throw new TypeError("Custom element constructors must be functions.");if(!qe(a))throw new SyntaxError("The element name '"+a+"' is not valid.");if(this.l.a.get(a))throw Error("A custom element with name '"+a+"' has already been defined.");if(this.ia)throw Error("A custom element is already being defined.");this.ia=!0;try{var d=function(a){var b=e[a];if(void 0!==b&&!(b instanceof Function))throw Error("The '"+a+"' callback must be a function.");
		169	return b},e=b.prototype;if(!(e instanceof Object))throw new TypeError("The custom element constructor's prototype is not an object.");var f=d("connectedCallback");var h=d("disconnectedCallback");var g=d("adoptedCallback");var k=d("attributeChangedCallback");var l=b.observedAttributes\|\|[]}catch(m){return}finally{this.ia=!1}b={localName:a,constructor:b,connectedCallback:f,disconnectedCallback:h,adoptedCallback:g,attributeChangedCallback:k,observedAttributes:l,constructionStack:[]};ue(this.l,a,b);this.ka.push(b);
		170	this.T\|\|(this.T=!0,this.ja(function(){return Be(c)}))};p.ca=function(a){Q(this.l,a)};
		171	function Be(a){if(!1!==a.T){a.T=!1;for(var b=a.ka,c=[],d=new Map,e=0;e<b.length;e++)d.set(b[e].localName,[]);Q(a.l,document,{ca:function(b){if(void 0===b.__CE_state){var e=b.localName,f=d.get(e);f?f.push(b):a.l.a.get(e)&&c.push(b)}}});for(e=0;e<c.length;e++)xe(a.l,c[e]);for(;0<b.length;){var f=b.shift();e=f.localName;f=d.get(f.localName);for(var h=0;h<f.length;h++)xe(a.l,f[h]);(e=a.ma.get(e))&&e.resolve(void 0)}}}p.get=function(a){if(a=this.l.a.get(a))return a.constructor};
		172	p.whenDefined=function(a){if(!qe(a))return Promise.reject(new SyntaxError("'"+a+"' is not a valid custom element name."));var b=this.ma.get(a);if(b)return b.c;b=new Ae;this.ma.set(a,b);this.l.a.get(a)&&!this.ka.some(function(b){return b.localName===a})&&b.resolve(void 0);return b.c};p.Za=function(a){ze(this.Ja);var b=this.ja;this.ja=function(c){return a(function(){return b(c)})}};window.CustomElementRegistry=R;R.prototype.define=R.prototype.define;R.prototype.upgrade=R.prototype.ca;
		173	R.prototype.get=R.prototype.get;R.prototype.whenDefined=R.prototype.whenDefined;R.prototype.polyfillWrapFlushCallback=R.prototype.Za;var Ce=window.Document.prototype.createElement,De=window.Document.prototype.createElementNS,Ee=window.Document.prototype.importNode,Fe=window.Document.prototype.prepend,Ge=window.Document.prototype.append,He=window.DocumentFragment.prototype.prepend,Ie=window.DocumentFragment.prototype.append,Je=window.Node.prototype.cloneNode,Ke=window.Node.prototype.appendChild,Le=window.Node.prototype.insertBefore,Me=window.Node.prototype.removeChild,Ne=window.Node.prototype.replaceChild,Oe=Object.getOwnPropertyDescriptor(window.Node.prototype,
		174	"textContent"),Pe=window.Element.prototype.attachShadow,Qe=Object.getOwnPropertyDescriptor(window.Element.prototype,"innerHTML"),Re=window.Element.prototype.getAttribute,Se=window.Element.prototype.setAttribute,Te=window.Element.prototype.removeAttribute,Ue=window.Element.prototype.getAttributeNS,Ve=window.Element.prototype.setAttributeNS,We=window.Element.prototype.removeAttributeNS,Xe=window.Element.prototype.insertAdjacentElement,Ye=window.Element.prototype.insertAdjacentHTML,Ze=window.Element.prototype.prepend,
		175	$e=window.Element.prototype.append,af=window.Element.prototype.before,bf=window.Element.prototype.after,cf=window.Element.prototype.replaceWith,df=window.Element.prototype.remove,ef=window.HTMLElement,ff=Object.getOwnPropertyDescriptor(window.HTMLElement.prototype,"innerHTML"),gf=window.HTMLElement.prototype.insertAdjacentElement,hf=window.HTMLElement.prototype.insertAdjacentHTML;var jf=new function(){};function kf(){var a=lf;window.HTMLElement=function(){function b(){var b=this.constructor,d=a.o.get(b);if(!d)throw Error("The custom element being constructed was not registered with `customElements`.");var e=d.constructionStack;if(0===e.length)return e=Ce.call(document,d.localName),Object.setPrototypeOf(e,b.prototype),e.__CE_state=1,e.__CE_definition=d,a.b(e),e;d=e.length-1;var f=e[d];if(f===jf)throw Error("The HTMLElement constructor was either called reentrantly for this constructor or called multiple times.");
		176	e[d]=jf;Object.setPrototypeOf(f,b.prototype);a.b(f);return f}b.prototype=ef.prototype;Object.defineProperty(b.prototype,"constructor",{writable:!0,configurable:!0,enumerable:!1,value:b});return b}()};function mf(a,b,c){function d(b){return function(c){for(var d=[],e=0;e<arguments.length;++e)d[e-0]=arguments[e];e=[];for(var f=[],l=0;l<d.length;l++){var m=d[l];m instanceof Element&&M(m)&&f.push(m);if(m instanceof DocumentFragment)for(m=m.firstChild;m;m=m.nextSibling)e.push(m);else e.push(m)}b.apply(this,d);for(d=0;d<f.length;d++)P(a,f[d]);if(M(this))for(d=0;d<e.length;d++)f=e[d],f instanceof Element&&O(a,f)}}void 0!==c.aa&&(b.prepend=d(c.aa));void 0!==c.append&&(b.append=d(c.append))};function nf(){var a=lf;N(Document.prototype,"createElement",function(b){if(this.__CE_hasRegistry){var c=a.a.get(b);if(c)return new c.constructor}b=Ce.call(this,b);a.b(b);return b});N(Document.prototype,"importNode",function(b,c){b=Ee.call(this,b,c);this.__CE_hasRegistry?Q(a,b):we(a,b);return b});N(Document.prototype,"createElementNS",function(b,c){if(this.__CE_hasRegistry&&(null===b\|\|"http://www.w3.org/1999/xhtml"===b)){var d=a.a.get(c);if(d)return new d.constructor}b=De.call(this,b,c);a.b(b);return b});
		177	mf(a,Document.prototype,{aa:Fe,append:Ge})};function of(){var a=lf;function b(b,d){Object.defineProperty(b,"textContent",{enumerable:d.enumerable,configurable:!0,get:d.get,set:function(b){if(this.nodeType===Node.TEXT_NODE)d.set.call(this,b);else{var c=void 0;if(this.firstChild){var e=this.childNodes,g=e.length;if(0<g&&M(this)){c=Array(g);for(var k=0;k<g;k++)c[k]=e[k]}}d.set.call(this,b);if(c)for(b=0;b<c.length;b++)P(a,c[b])}}})}N(Node.prototype,"insertBefore",function(b,d){if(b instanceof DocumentFragment){var c=Array.prototype.slice.apply(b.childNodes);
		178	b=Le.call(this,b,d);if(M(this))for(d=0;d<c.length;d++)O(a,c[d]);return b}c=M(b);d=Le.call(this,b,d);c&&P(a,b);M(this)&&O(a,b);return d});N(Node.prototype,"appendChild",function(b){if(b instanceof DocumentFragment){var c=Array.prototype.slice.apply(b.childNodes);b=Ke.call(this,b);if(M(this))for(var e=0;e<c.length;e++)O(a,c[e]);return b}c=M(b);e=Ke.call(this,b);c&&P(a,b);M(this)&&O(a,b);return e});N(Node.prototype,"cloneNode",function(b){b=Je.call(this,b);this.ownerDocument.__CE_hasRegistry?Q(a,b):
		179	we(a,b);return b});N(Node.prototype,"removeChild",function(b){var c=M(b),e=Me.call(this,b);c&&P(a,b);return e});N(Node.prototype,"replaceChild",function(b,d){if(b instanceof DocumentFragment){var c=Array.prototype.slice.apply(b.childNodes);b=Ne.call(this,b,d);if(M(this))for(P(a,d),d=0;d<c.length;d++)O(a,c[d]);return b}c=M(b);var f=Ne.call(this,b,d),h=M(this);h&&P(a,d);c&&P(a,b);h&&O(a,b);return f});Oe&&Oe.get?b(Node.prototype,Oe):ve(a,function(a){b(a,{enumerable:!0,configurable:!0,get:function(){for(var a=
		180	[],b=0;b<this.childNodes.length;b++)a.push(this.childNodes[b].textContent);return a.join("")},set:function(a){for(;this.firstChild;)Me.call(this,this.firstChild);Ke.call(this,document.createTextNode(a))}})})};function pf(a){var b=Element.prototype;function c(b){return function(c){for(var d=[],e=0;e<arguments.length;++e)d[e-0]=arguments[e];e=[];for(var g=[],k=0;k<d.length;k++){var l=d[k];l instanceof Element&&M(l)&&g.push(l);if(l instanceof DocumentFragment)for(l=l.firstChild;l;l=l.nextSibling)e.push(l);else e.push(l)}b.apply(this,d);for(d=0;d<g.length;d++)P(a,g[d]);if(M(this))for(d=0;d<e.length;d++)g=e[d],g instanceof Element&&O(a,g)}}void 0!==af&&(b.before=c(af));void 0!==af&&(b.after=c(bf));void 0!==
		181	cf&&N(b,"replaceWith",function(b){for(var c=[],d=0;d<arguments.length;++d)c[d-0]=arguments[d];d=[];for(var h=[],g=0;g<c.length;g++){var k=c[g];k instanceof Element&&M(k)&&h.push(k);if(k instanceof DocumentFragment)for(k=k.firstChild;k;k=k.nextSibling)d.push(k);else d.push(k)}g=M(this);cf.apply(this,c);for(c=0;c<h.length;c++)P(a,h[c]);if(g)for(P(a,this),c=0;c<d.length;c++)h=d[c],h instanceof Element&&O(a,h)});void 0!==df&&N(b,"remove",function(){var b=M(this);df.call(this);b&&P(a,this)})};function qf(){var a=lf;function b(b,c){Object.defineProperty(b,"innerHTML",{enumerable:c.enumerable,configurable:!0,get:c.get,set:function(b){var d=this,e=void 0;M(this)&&(e=[],se(this,function(a){a!==d&&e.push(a)}));c.set.call(this,b);if(e)for(var f=0;f<e.length;f++){var h=e[f];1===h.__CE_state&&a.disconnectedCallback(h)}this.ownerDocument.__CE_hasRegistry?Q(a,this):we(a,this);return b}})}function c(b,c){N(b,"insertAdjacentElement",function(b,d){var e=M(d);b=c.call(this,b,d);e&&P(a,d);M(b)&&O(a,
		182	d);return b})}function d(b,c){function d(b,c){for(var d=[];b!==c;b=b.nextSibling)d.push(b);for(c=0;c<d.length;c++)Q(a,d[c])}N(b,"insertAdjacentHTML",function(a,b){a=a.toLowerCase();if("beforebegin"===a){var e=this.previousSibling;c.call(this,a,b);d(e\|\|this.parentNode.firstChild,this)}else if("afterbegin"===a)e=this.firstChild,c.call(this,a,b),d(this.firstChild,e);else if("beforeend"===a)e=this.lastChild,c.call(this,a,b),d(e\|\|this.firstChild,null);else if("afterend"===a)e=this.nextSibling,c.call(this,
		183	a,b),d(this.nextSibling,e);else throw new SyntaxError("The value provided ("+String(a)+") is not one of 'beforebegin', 'afterbegin', 'beforeend', or 'afterend'.");})}Pe&&N(Element.prototype,"attachShadow",function(a){return this.__CE_shadowRoot=a=Pe.call(this,a)});Qe&&Qe.get?b(Element.prototype,Qe):ff&&ff.get?b(HTMLElement.prototype,ff):ve(a,function(a){b(a,{enumerable:!0,configurable:!0,get:function(){return Je.call(this,!0).innerHTML},set:function(a){var b="template"===this.localName,c=b?this.content:
		184	this,d=De.call(document,this.namespaceURI,this.localName);for(d.innerHTML=a;0<c.childNodes.length;)Me.call(c,c.childNodes[0]);for(a=b?d.content:d;0<a.childNodes.length;)Ke.call(c,a.childNodes[0])}})});N(Element.prototype,"setAttribute",function(b,c){if(1!==this.__CE_state)return Se.call(this,b,c);var d=Re.call(this,b);Se.call(this,b,c);c=Re.call(this,b);a.attributeChangedCallback(this,b,d,c,null)});N(Element.prototype,"setAttributeNS",function(b,c,d){if(1!==this.__CE_state)return Ve.call(this,b,c,
		185	d);var e=Ue.call(this,b,c);Ve.call(this,b,c,d);d=Ue.call(this,b,c);a.attributeChangedCallback(this,c,e,d,b)});N(Element.prototype,"removeAttribute",function(b){if(1!==this.__CE_state)return Te.call(this,b);var c=Re.call(this,b);Te.call(this,b);null!==c&&a.attributeChangedCallback(this,b,c,null,null)});N(Element.prototype,"removeAttributeNS",function(b,c){if(1!==this.__CE_state)return We.call(this,b,c);var d=Ue.call(this,b,c);We.call(this,b,c);var e=Ue.call(this,b,c);d!==e&&a.attributeChangedCallback(this,
		186	c,d,e,b)});gf?c(HTMLElement.prototype,gf):Xe?c(Element.prototype,Xe):console.warn("Custom Elements: `Element#insertAdjacentElement` was not patched.");hf?d(HTMLElement.prototype,hf):Ye?d(Element.prototype,Ye):console.warn("Custom Elements: `Element#insertAdjacentHTML` was not patched.");mf(a,Element.prototype,{aa:Ze,append:$e});pf(a)};var rf=window.customElements;if(!rf\|\|rf.forcePolyfill\|\|"function"!=typeof rf.define\|\|"function"!=typeof rf.get){var lf=new te;kf();nf();mf(lf,DocumentFragment.prototype,{aa:He,append:Ie});of();qf();document.__CE_hasRegistry=!0;var customElements=new R(lf);Object.defineProperty(window,"customElements",{configurable:!0,enumerable:!0,value:customElements})};function xf(){this.end=this.start=0;this.rules=this.parent=this.previous=null;this.cssText=this.parsedCssText="";this.atRule=!1;this.type=0;this.parsedSelector=this.selector=this.keyframesName=""}
		187	function yf(a){a=a.replace(zf,"").replace(Af,"");var b=Bf,c=a,d=new xf;d.start=0;d.end=c.length;for(var e=d,f=0,h=c.length;f<h;f++)if("{"===c[f]){e.rules\|\|(e.rules=[]);var g=e,k=g.rules[g.rules.length-1]\|\|null;e=new xf;e.start=f+1;e.parent=g;e.previous=k;g.rules.push(e)}else"}"===c[f]&&(e.end=f+1,e=e.parent\|\|d);return b(d,a)}
		188	function Bf(a,b){var c=b.substring(a.start,a.end-1);a.parsedCssText=a.cssText=c.trim();a.parent&&(c=b.substring(a.previous?a.previous.end:a.parent.start,a.start-1),c=Cf(c),c=c.replace(Df," "),c=c.substring(c.lastIndexOf(";")+1),c=a.parsedSelector=a.selector=c.trim(),a.atRule=0===c.indexOf("@"),a.atRule?0===c.indexOf("@media")?a.type=Ef:c.match(Ff)&&(a.type=Gf,a.keyframesName=a.selector.split(Df).pop()):a.type=0===c.indexOf("--")?Hf:If);if(c=a.rules)for(var d=0,e=c.length,f;d<e&&(f=c[d]);d++)Bf(f,
		189	b);return a}function Cf(a){return a.replace(/\\([0-9a-f]{1,6})\s/gi,function(a,c){a=c;for(c=6-a.length;c--;)a="0"+a;return"\\"+a})}
		190	function Jf(a,b,c){c=void 0===c?"":c;var d="";if(a.cssText\|\|a.rules){var e=a.rules,f;if(f=e)f=e[0],f=!(f&&f.selector&&0===f.selector.indexOf("--"));if(f){f=0;for(var h=e.length,g;f<h&&(g=e[f]);f++)d=Jf(g,b,d)}else b?b=a.cssText:(b=a.cssText,b=b.replace(Kf,"").replace(Lf,""),b=b.replace(Mf,"").replace(Nf,"")),(d=b.trim())&&(d=" "+d+"\n")}d&&(a.selector&&(c+=a.selector+" {\n"),c+=d,a.selector&&(c+="}\n\n"));return c}
		191	var If=1,Gf=7,Ef=4,Hf=1E3,zf=/\/\[^]\+([^/][^]\+)\//gim,Af=/@import[^;];/gim,Kf=/(?:^[^;\-\s}]+)?--[^;{}]?:[^{};]?(?:[;\n]\|$)/gim,Lf=/(?:^[^;\-\s}]+)?--[^;{}]?:[^{};]?{[^}]?}(?:[;\n]\|$)?/gim,Mf=/@apply\s$?[^);]$?\s(?:[;\n]\|$)?/gim,Nf=/[^;:]?:[^;]?var$[^;]$(?:[;\n]\|$)?/gim,Ff=/^@[^\s]keyframes/,Df=/\s+/g;var S=!(window.ShadyDOM&&window.ShadyDOM.inUse),Of;function Pf(a){Of=a&&a.shimcssproperties?!1:S\|\|!(navigator.userAgent.match(/AppleWebKit\/601\|Edge\/15/)\|\|!window.CSS\|\|!CSS.supports\|\|!CSS.supports("box-shadow","0 0 0 var(--foo)"))}window.ShadyCSS&&void 0!==window.ShadyCSS.nativeCss?Of=window.ShadyCSS.nativeCss:window.ShadyCSS?(Pf(window.ShadyCSS),window.ShadyCSS=void 0):Pf(window.WebComponents&&window.WebComponents.flags);var U=Of;var Qf=/(?:^\|[;\s{]\s)(--[\w-]?)\s:\s(?:((?:'(?:\\'\|.)?'\|"(?:\\"\|.)?"\|$[^)]?$\|[^};{])+)\|\{([^}])\}(?:(?=[;\s}])\|$))/gi,Rf=/(?:^\|\W+)@apply\s$?([^);\n])$?/gi,Sf=/(--[\w-]+)\s([:,;)]\|$)/gi,Tf=/(animation\s:)\|(animation-name\s:)/,Uf=/@media\s(.)/,Vf=/\{[^}]*\}/g;var Wf=new Set;function Xf(a,b){if(!a)return"";"string"===typeof a&&(a=yf(a));b&&Yf(a,b);return Jf(a,U)}function Zf(a){!a.__cssRules&&a.textContent&&(a.__cssRules=yf(a.textContent));return a.__cssRules\|\|null}function $f(a){return!!a.parent&&a.parent.type===Gf}function Yf(a,b,c,d){if(a){var e=!1,f=a.type;if(d&&f===Ef){var h=a.selector.match(Uf);h&&(window.matchMedia(h[1]).matches\|\|(e=!0))}f===If?b(a):c&&f===Gf?c(a):f===Hf&&(e=!0);if((a=a.rules)&&!e){e=0;f=a.length;for(var g;e<f&&(g=a[e]);e++)Yf(g,b,c,d)}}}
		192	function ag(a,b,c,d){var e=document.createElement("style");b&&e.setAttribute("scope",b);e.textContent=a;bg(e,c,d);return e}var cg=null;function bg(a,b,c){b=b\|\|document.head;b.insertBefore(a,c&&c.nextSibling\|\|b.firstChild);cg?a.compareDocumentPosition(cg)===Node.DOCUMENT_POSITION_PRECEDING&&(cg=a):cg=a}
		193	function dg(a,b){var c=a.indexOf("var(");if(-1===c)return b(a,"","","");a:{var d=0;var e=c+3;for(var f=a.length;e<f;e++)if("("===a[e])d++;else if(")"===a[e]&&0===--d)break a;e=-1}d=a.substring(c+4,e);c=a.substring(0,c);a=dg(a.substring(e+1),b);e=d.indexOf(",");return-1===e?b(c,d.trim(),"",a):b(c,d.substring(0,e).trim(),d.substring(e+1).trim(),a)}function eg(a,b){S?a.setAttribute("class",b):window.ShadyDOM.nativeMethods.setAttribute.call(a,"class",b)}
		194	function fg(a){var b=a.localName,c="";b?-1<b.indexOf("-")\|\|(c=b,b=a.getAttribute&&a.getAttribute("is")\|\|""):(b=a.is,c=a.extends);return{is:b,P:c}};function gg(){}function hg(a,b){var c=W;a.__styleScoped?a.__styleScoped=null:ig(c,a,function(a){jg(a,b\|\|"")})}function ig(a,b,c){b.nodeType===Node.ELEMENT_NODE&&c(b);if(b="template"===b.localName?(b.content\|\|b.kb\|\|b).childNodes:b.children\|\|b.childNodes)for(var d=0;d<b.length;d++)ig(a,b[d],c)}
		195	function jg(a,b,c){if(b)if(a.classList)c?(a.classList.remove("style-scope"),a.classList.remove(b)):(a.classList.add("style-scope"),a.classList.add(b));else if(a.getAttribute){var d=a.getAttribute(kg);c?d&&(b=d.replace("style-scope","").replace(b,""),eg(a,b)):eg(a,(d?d+" ":"")+"style-scope "+b)}}function lg(a,b,c){var d=W;a.__styleScoped?a.__styleScoped=null:ig(d,a,function(a){jg(a,b,!0);jg(a,c)})}function mg(a,b){var c=W;a.__styleScoped?a.__styleScoped=null:ig(c,a,function(a){jg(a,b\|\|"",!0)})}
		196	function ng(a,b,c){var d=W,e=a.__cssBuild;S\|\|"shady"===e?b=Xf(b,c):(a=fg(a),b=og(d,b,a.is,a.P,c)+"\n\n");return b.trim()}function og(a,b,c,d,e){var f=pg(c,d);c=c?qg+c:"";return Xf(b,function(b){b.c\|\|(b.selector=b.s=rg(a,b,a.b,c,f),b.c=!0);e&&e(b,c,f)})}function pg(a,b){return b?"[is="+a+"]":a}function rg(a,b,c,d,e){var f=b.selector.split(sg);if(!$f(b)){b=0;for(var h=f.length,g;b<h&&(g=f[b]);b++)f[b]=c.call(a,g,d,e)}return f.join(sg)}
		197	function tg(a){return a.replace(ug,function(a,c,d){-1<d.indexOf("+")?d=d.replace(/\+/g,"___"):-1<d.indexOf("___")&&(d=d.replace(/___/g,"+"));return":"+c+"("+d+")"})}gg.prototype.b=function(a,b,c){var d=!1;a=a.trim();var e=ug.test(a);e&&(a=a.replace(ug,function(a,b,c){return":"+b+"("+c.replace(/\s/g,"")+")"}),a=tg(a));a=a.replace(vg,wg+" $1");a=a.replace(xg,function(a,e,g){d\|\|(a=yg(g,e,b,c),d=d\|\|a.stop,e=a.Oa,g=a.value);return e+g});e&&(a=tg(a));return a};
		198	function yg(a,b,c,d){var e=a.indexOf(zg);0<=a.indexOf(wg)?a=Ag(a,d):0!==e&&(a=c?Bg(a,c):a);c=!1;0<=e&&(b="",c=!0);if(c){var f=!0;c&&(a=a.replace(Cg,function(a,b){return" > "+b}))}a=a.replace(Dg,function(a,b,c){return'[dir="'+c+'"] '+b+", "+b+'[dir="'+c+'"]'});return{value:a,Oa:b,stop:f}}function Bg(a,b){a=a.split(Eg);a[0]+=b;return a.join(Eg)}
		199	function Ag(a,b){var c=a.match(Fg);return(c=c&&c[2].trim()\|\|"")?c[0].match(Gg)?a.replace(Fg,function(a,c,f){return b+f}):c.split(Gg)[0]===b?c:Hg:a.replace(wg,b)}function Ig(a){a.selector===Jg&&(a.selector="html")}gg.prototype.c=function(a){return a.match(zg)?this.b(a,Kg):Bg(a.trim(),Kg)};ea.Object.defineProperties(gg.prototype,{a:{configurable:!0,enumerable:!0,get:function(){return"style-scope"}}});
		200	var ug=/:(nth[-\w]+)$([^)]+)$/,Kg=":not(.style-scope)",sg=",",xg=/(^\|[\s>+~]+)((?:\[.+?\]\|[^\s>+~=[])+)/g,Gg=/[[.:#]/,wg=":host",Jg=":root",zg="::slotted",vg=new RegExp("^("+zg+")"),Fg=/(:host)(?:$((?:\([^)(]$\|[^)(])+?)\))/,Cg=/(?:::slotted)(?:$((?:\([^)(]$\|[^)(])+?)\))/,Dg=/(.):dir$(?:(ltr\|rtl))$/,qg=".",Eg=":",kg="class",Hg="should_not_match",W=new gg;function Lg(a,b,c,d){this.B=a\|\|null;this.b=b\|\|null;this.oa=c\|\|[];this.L=null;this.P=d\|\|"";this.a=this.v=this.G=null}function X(a){return a?a.__styleInfo:null}function Mg(a,b){return a.__styleInfo=b}Lg.prototype.c=function(){return this.B};Lg.prototype._getStyleRules=Lg.prototype.c;function Ng(a){var b=this.matches\|\|this.matchesSelector\|\|this.mozMatchesSelector\|\|this.msMatchesSelector\|\|this.oMatchesSelector\|\|this.webkitMatchesSelector;return b&&b.call(this,a)}var Og=navigator.userAgent.match("Trident");function Pg(){}function Qg(a){var b={},c=[],d=0;Yf(a,function(a){Rg(a);a.index=d++;a=a.m.cssText;for(var c;c=Sf.exec(a);){var e=c[1];":"!==c[2]&&(b[e]=!0)}},function(a){c.push(a)});a.b=c;a=[];for(var e in b)a.push(e);return a}
		201	function Rg(a){if(!a.m){var b={},c={};Sg(a,c)&&(b.A=c,a.rules=null);b.cssText=a.parsedCssText.replace(Vf,"").replace(Qf,"");a.m=b}}function Sg(a,b){var c=a.m;if(c){if(c.A)return Object.assign(b,c.A),!0}else{c=a.parsedCssText;for(var d;a=Qf.exec(c);){d=(a[2]\|\|a[3]).trim();if("inherit"!==d\|\|"unset"!==d)b[a[1].trim()]=d;d=!0}return d}}
		202	function Tg(a,b,c){b&&(b=0<=b.indexOf(";")?Ug(a,b,c):dg(b,function(b,e,f,h){if(!e)return b+h;(e=Tg(a,c[e],c))&&"initial"!==e?"apply-shim-inherit"===e&&(e="inherit"):e=Tg(a,c[f]\|\|f,c)\|\|f;return b+(e\|\|"")+h}));return b&&b.trim()\|\|""}
		203	function Ug(a,b,c){b=b.split(";");for(var d=0,e,f;d<b.length;d++)if(e=b[d]){Rf.lastIndex=0;if(f=Rf.exec(e))e=Tg(a,c[f[1]],c);else if(f=e.indexOf(":"),-1!==f){var h=e.substring(f);h=h.trim();h=Tg(a,h,c)\|\|h;e=e.substring(0,f)+h}b[d]=e&&e.lastIndexOf(";")===e.length-1?e.slice(0,-1):e\|\|""}return b.join(";")}
		204	function Vg(a,b){var c={},d=[];Yf(a,function(a){a.m\|\|Rg(a);var e=a.s\|\|a.parsedSelector;b&&a.m.A&&e&&Ng.call(b,e)&&(Sg(a,c),a=a.index,e=parseInt(a/32,10),d[e]=(d[e]\|\|0)\|1<<a%32)},null,!0);return{A:c,key:d}}
		205	function Wg(a,b,c,d){b.m\|\|Rg(b);if(b.m.A){var e=fg(a);a=e.is;e=e.P;e=a?pg(a,e):"html";var f=b.parsedSelector,h=":host > "===f\|\|"html"===f,g=0===f.indexOf(":host")&&!h;"shady"===c&&(h=f===e+" > ."+e\|\|-1!==f.indexOf("html"),g=!h&&0===f.indexOf(e));"shadow"===c&&(h=":host > *"===f\|\|"html"===f,g=g&&!h);if(h\|\|g)c=e,g&&(b.s\|\|(b.s=rg(W,b,W.b,a?qg+a:"",e)),c=b.s\|\|e),d({ab:c,Ua:g,ub:h})}}
		206	function Xg(a,b){var c={},d={},e=b&&b.__cssBuild;Yf(b,function(b){Wg(a,b,e,function(e){Ng.call(a.lb\|\|a,e.ab)&&(e.Ua?Sg(b,c):Sg(b,d))})},null,!0);return{$a:d,Sa:c}}
		207	function Yg(a,b,c,d){var e=fg(b),f=pg(e.is,e.P),h=new RegExp("(?:^\|[^.#[:])"+(b.extends?"\\"+f.slice(0,-1)+"\\]":f)+"($\|[.:[\\s>+~])");e=X(b).B;var g=Zg(e,d);return ng(b,e,function(b){var e="";b.m\|\|Rg(b);b.m.cssText&&(e=Ug(a,b.m.cssText,c));b.cssText=e;if(!S&&!$f(b)&&b.cssText){var k=e=b.cssText;null==b.wa&&(b.wa=Tf.test(e));if(b.wa)if(null==b.$){b.$=[];for(var n in g)k=g[n],k=k(e),e!==k&&(e=k,b.$.push(n))}else{for(n=0;n<b.$.length;++n)k=g[b.$[n]],e=k(e);k=e}b.cssText=k;b.s=b.s\|\|b.selector;e="."+
		208	d;n=b.s.split(",");k=0;for(var t=n.length,C;k<t&&(C=n[k]);k++)n[k]=C.match(h)?C.replace(f,e):e+" "+C;b.selector=n.join(",")}})}function Zg(a,b){a=a.b;var c={};if(!S&&a)for(var d=0,e=a[d];d<a.length;e=a[++d]){var f=e,h=b;f.i=new RegExp("\\b"+f.keyframesName+"(?!\\B\|-)","g");f.a=f.keyframesName+"-"+h;f.s=f.s\|\|f.selector;f.selector=f.s.replace(f.keyframesName,f.a);c[e.keyframesName]=$g(e)}return c}function $g(a){return function(b){return b.replace(a.i,a.a)}}
		209	function ah(a,b){var c=bh,d=Zf(a);a.textContent=Xf(d,function(a){var d=a.cssText=a.parsedCssText;a.m&&a.m.cssText&&(d=d.replace(Kf,"").replace(Lf,""),a.cssText=Ug(c,d,b))})}ea.Object.defineProperties(Pg.prototype,{a:{configurable:!0,enumerable:!0,get:function(){return"x-scope"}}});var bh=new Pg;var ch={},dh=window.customElements;if(dh&&!S){var eh=dh.define;dh.define=function(a,b,c){var d=document.createComment(" Shady DOM styles for "+a+" "),e=document.head;e.insertBefore(d,(cg?cg.nextSibling:null)\|\|e.firstChild);cg=d;ch[a]=d;eh.call(dh,a,b,c)}};function fh(){this.cache={}}fh.prototype.store=function(a,b,c,d){var e=this.cache[a]\|\|[];e.push({A:b,styleElement:c,v:d});100<e.length&&e.shift();this.cache[a]=e};fh.prototype.fetch=function(a,b,c){if(a=this.cache[a])for(var d=a.length-1;0<=d;d--){var e=a[d],f;a:{for(f=0;f<c.length;f++){var h=c[f];if(e.A[h]!==b[h]){f=!1;break a}}f=!0}if(f)return e}};function gh(){}
		210	function hh(a){for(var b=0;b<a.length;b++){var c=a[b];if(c.target!==document.documentElement&&c.target!==document.head)for(var d=0;d<c.addedNodes.length;d++){var e=c.addedNodes[d];if(e.nodeType===Node.ELEMENT_NODE){var f=e.getRootNode();var h=e;var g=[];h.classList?g=Array.from(h.classList):h instanceof window.SVGElement&&h.hasAttribute("class")&&(g=h.getAttribute("class").split(/\s+/));h=g;g=h.indexOf(W.a);if((h=-1<g?h[g+1]:"")&&f===e.ownerDocument)mg(e,h);else if(f.nodeType===Node.DOCUMENT_FRAGMENT_NODE&&(f=
		211	f.host))for(f=fg(f).is,f!==h&&lg(e,h,f),e=window.ShadyDOM.nativeMethods.querySelectorAll.call(e,":not(."+W.a+")"),f=0;f<e.length;f++)if(h=e[f],g=h.getRootNode().host)g=fg(g).is,jg(h,g)}}}}
		212	if(!S){var ih=new MutationObserver(hh),jh=function(a){ih.observe(a,{childList:!0,subtree:!0})};if(window.customElements&&!window.customElements.polyfillWrapFlushCallback)jh(document);else{var kh=function(){jh(document.body)};window.HTMLImports?window.HTMLImports.whenReady(kh):requestAnimationFrame(function(){if("loading"===document.readyState){var a=function(){kh();document.removeEventListener("readystatechange",a)};document.addEventListener("readystatechange",a)}else kh()})}gh=function(){hh(ih.takeRecords())}}
		213	var lh=gh;var mh={};var nh=Promise.resolve();function oh(a){if(a=mh[a])a._applyShimCurrentVersion=a._applyShimCurrentVersion\|\|0,a._applyShimValidatingVersion=a._applyShimValidatingVersion\|\|0,a._applyShimNextVersion=(a._applyShimNextVersion\|\|0)+1}function ph(a){return a._applyShimCurrentVersion===a._applyShimNextVersion}function qh(a){a._applyShimValidatingVersion=a._applyShimNextVersion;a.b\|\|(a.b=!0,nh.then(function(){a._applyShimCurrentVersion=a._applyShimNextVersion;a.b=!1}))};var rh=new fh;function Y(){this.J={};this.c=document.documentElement;var a=new xf;a.rules=[];this.i=Mg(this.c,new Lg(a));this.o=!1;this.b=this.a=null}p=Y.prototype;p.pa=function(){lh()};p.Qa=function(a){return Zf(a)};p.cb=function(a){return Xf(a)};p.prepareTemplate=function(a,b,c){this.prepareTemplateDom(a,b);this.prepareTemplateStyles(a,b,c)};
		214	p.prepareTemplateStyles=function(a,b,c){if(!a.o){a.o=!0;a.name=b;a.extends=c;mh[b]=a;var d=(d=a.content.querySelector("style"))?d.getAttribute("css-build")\|\|"":"";var e=[];for(var f=a.content.querySelectorAll("style"),h=0;h<f.length;h++){var g=f[h];if(g.hasAttribute("shady-unscoped")){if(!S){var k=g.textContent;Wf.has(k)\|\|(Wf.add(k),k=g.cloneNode(!0),document.head.appendChild(k));g.parentNode.removeChild(g)}}else e.push(g.textContent),g.parentNode.removeChild(g)}e=e.join("").trim();c={is:b,extends:c,
		215	ib:d};sh(this);f=Rf.test(e)\|\|Qf.test(e);Rf.lastIndex=0;Qf.lastIndex=0;e=yf(e);f&&U&&this.a&&this.a.transformRules(e,b);a._styleAst=e;a.J=d;d=[];U\|\|(d=Qg(a._styleAst));if(!d.length\|\|U)e=S?a.content:null,b=ch[b],f=ng(c,a._styleAst),b=f.length?ag(f,c.is,e,b):void 0,a.a=b;a.i=d}};p.prepareTemplateDom=function(a,b){S\|\|a.c\|\|(a.c=!0,hg(a.content,b))};
		216	function th(a){!a.b&&window.ShadyCSS&&window.ShadyCSS.CustomStyleInterface&&(a.b=window.ShadyCSS.CustomStyleInterface,a.b.transformCallback=function(b){a.Aa(b)},a.b.validateCallback=function(){requestAnimationFrame(function(){(a.b.enqueued\|\|a.o)&&a.flushCustomStyles()})})}function sh(a){!a.a&&window.ShadyCSS&&window.ShadyCSS.ApplyShim&&(a.a=window.ShadyCSS.ApplyShim,a.a.invalidCallback=oh);th(a)}
		217	p.flushCustomStyles=function(){sh(this);if(this.b){var a=this.b.processStyles();if(this.b.enqueued){if(U)for(var b=0;b<a.length;b++){var c=this.b.getStyleForCustomStyle(a[b]);if(c&&U&&this.a){var d=Zf(c);sh(this);this.a.transformRules(d);c.textContent=Xf(d)}}else for(uh(this,this.c,this.i),b=0;b<a.length;b++)(c=this.b.getStyleForCustomStyle(a[b]))&&ah(c,this.i.G);this.b.enqueued=!1;this.o&&!U&&this.styleDocument()}}};
		218	p.styleElement=function(a,b){var c=fg(a).is,d=X(a);if(!d){var e=fg(a);d=e.is;e=e.P;var f=ch[d];d=mh[d];if(d){var h=d._styleAst;var g=d.i}d=Mg(a,new Lg(h,f,g,e))}a!==this.c&&(this.o=!0);b&&(d.L=d.L\|\|{},Object.assign(d.L,b));if(U){if(d.L){b=d.L;for(var k in b)null===k?a.style.removeProperty(k):a.style.setProperty(k,b[k])}if(((k=mh[c])\|\|a===this.c)&&k&&k.a&&!ph(k)){if(ph(k)\|\|k._applyShimValidatingVersion!==k._applyShimNextVersion)sh(this),this.a&&this.a.transformRules(k._styleAst,c),k.a.textContent=
		219	ng(a,d.B),qh(k);S&&(c=a.shadowRoot)&&(c.querySelector("style").textContent=ng(a,d.B));d.B=k._styleAst}}else if(this.pa(),uh(this,a,d),d.oa&&d.oa.length){c=d;k=fg(a).is;d=(b=rh.fetch(k,c.G,c.oa))?b.styleElement:null;h=c.v;(g=b&&b.v)\|\|(g=this.J[k]=(this.J[k]\|\|0)+1,g=k+"-"+g);c.v=g;g=c.v;e=bh;e=d?d.textContent\|\|"":Yg(e,a,c.G,g);f=X(a);var l=f.a;l&&!S&&l!==d&&(l._useCount--,0>=l._useCount&&l.parentNode&&l.parentNode.removeChild(l));S?f.a?(f.a.textContent=e,d=f.a):e&&(d=ag(e,g,a.shadowRoot,f.b)):d?d.parentNode\|\|
		220	(Og&&-1<e.indexOf("@media")&&(d.textContent=e),bg(d,null,f.b)):e&&(d=ag(e,g,null,f.b));d&&(d._useCount=d._useCount\|\|0,f.a!=d&&d._useCount++,f.a=d);g=d;S\|\|(d=c.v,f=e=a.getAttribute("class")\|\|"",h&&(f=e.replace(new RegExp("\\sx-scope\\s"+h+"\\s*","g")," ")),f+=(f?" ":"")+"x-scope "+d,e!==f&&eg(a,f));b\|\|rh.store(k,c.G,g,c.v)}};function vh(a,b){return(b=b.getRootNode().host)?X(b)?b:vh(a,b):a.c}
		221	function uh(a,b,c){a=vh(a,b);var d=X(a);a=Object.create(d.G\|\|null);var e=Xg(b,c.B);b=Vg(d.B,b).A;Object.assign(a,e.Sa,b,e.$a);b=c.L;for(var f in b)if((e=b[f])\|\|0===e)a[f]=e;f=bh;b=Object.getOwnPropertyNames(a);for(e=0;e<b.length;e++)d=b[e],a[d]=Tg(f,a[d],a);c.G=a}p.styleDocument=function(a){this.styleSubtree(this.c,a)};
		222	p.styleSubtree=function(a,b){var c=a.shadowRoot;(c\|\|a===this.c)&&this.styleElement(a,b);if(b=c&&(c.children\|\|c.childNodes))for(a=0;a<b.length;a++)this.styleSubtree(b[a]);else if(a=a.children\|\|a.childNodes)for(b=0;b<a.length;b++)this.styleSubtree(a[b])};p.Aa=function(a){var b=this,c=Zf(a);Yf(c,function(a){if(S)Ig(a);else{var c=W;a.selector=a.parsedSelector;Ig(a);a.selector=a.s=rg(c,a,c.c,void 0,void 0)}U&&(sh(b),b.a&&b.a.transformRule(a))});U?a.textContent=Xf(c):this.i.B.rules.push(c)};
		223	p.getComputedStyleValue=function(a,b){var c;U\|\|(c=(X(a)\|\|X(vh(this,a))).G[b]);return(c=c\|\|window.getComputedStyle(a).getPropertyValue(b))?c.trim():""};p.bb=function(a,b){var c=a.getRootNode();b=b?b.split(/\s/):[];c=c.host&&c.host.localName;if(!c){var d=a.getAttribute("class");if(d){d=d.split(/\s/);for(var e=0;e<d.length;e++)if(d[e]===W.a){c=d[e+1];break}}}c&&b.push(W.a,c);U\|\|(c=X(a))&&c.v&&b.push(bh.a,c.v);eg(a,b.join(" "))};p.Na=function(a){return X(a)};Y.prototype.flush=Y.prototype.pa;
		224	Y.prototype.prepareTemplate=Y.prototype.prepareTemplate;Y.prototype.styleElement=Y.prototype.styleElement;Y.prototype.styleDocument=Y.prototype.styleDocument;Y.prototype.styleSubtree=Y.prototype.styleSubtree;Y.prototype.getComputedStyleValue=Y.prototype.getComputedStyleValue;Y.prototype.setElementClass=Y.prototype.bb;Y.prototype._styleInfoForNode=Y.prototype.Na;Y.prototype.transformCustomStyleForDocument=Y.prototype.Aa;Y.prototype.getStyleAst=Y.prototype.Qa;Y.prototype.styleAstToString=Y.prototype.cb;
		225	Y.prototype.flushCustomStyles=Y.prototype.flushCustomStyles;Object.defineProperties(Y.prototype,{nativeShadow:{get:function(){return S}},nativeCss:{get:function(){return U}}});var Z=new Y,wh,xh;window.ShadyCSS&&(wh=window.ShadyCSS.ApplyShim,xh=window.ShadyCSS.CustomStyleInterface);
		226	window.ShadyCSS={ScopingShim:Z,prepareTemplate:function(a,b,c){Z.flushCustomStyles();Z.prepareTemplate(a,b,c)},prepareTemplateDom:function(a,b){Z.prepareTemplateDom(a,b)},prepareTemplateStyles:function(a,b,c){Z.flushCustomStyles();Z.prepareTemplateStyles(a,b,c)},styleSubtree:function(a,b){Z.flushCustomStyles();Z.styleSubtree(a,b)},styleElement:function(a){Z.flushCustomStyles();Z.styleElement(a)},styleDocument:function(a){Z.flushCustomStyles();Z.styleDocument(a)},flushCustomStyles:function(){Z.flushCustomStyles()},
		227	getComputedStyleValue:function(a,b){return Z.getComputedStyleValue(a,b)},nativeCss:U,nativeShadow:S};wh&&(window.ShadyCSS.ApplyShim=wh);xh&&(window.ShadyCSS.CustomStyleInterface=xh);var yh=window.customElements,zh=window.HTMLImports,Ah=window.HTMLTemplateElement;window.WebComponents=window.WebComponents\|\|{};if(yh&&yh.polyfillWrapFlushCallback){var Bh,Ch=function(){if(Bh){Ah.C&&Ah.C(window.document);var a=Bh;Bh=null;a();return!0}},Dh=zh.whenReady;yh.polyfillWrapFlushCallback(function(a){Bh=a;Dh(Ch)});zh.whenReady=function(a){Dh(function(){Ch()?zh.whenReady(a):a()})}}
		228	zh.whenReady(function(){requestAnimationFrame(function(){window.WebComponents.ready=!0;document.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0}))})});var Eh=document.createElement("style");Eh.textContent="body {transition: opacity ease-in 0.2s; } \nbody[unresolved] {opacity: 0; display: block; overflow: hidden; position: relative; } \n";var Fh=document.querySelector("head");Fh.insertBefore(Eh,Fh.firstChild);}).call(this);
	1744	229
	1745		window.HTMLImports.addModule(function(scope) {
	1746		var flags = scope.flags;
	1747		var IMPORT_LINK_TYPE = scope.IMPORT_LINK_TYPE;
	1748		var IMPORT_SELECTOR = scope.IMPORT_SELECTOR;
	1749		var rootDocument = scope.rootDocument;
	1750		var Loader = scope.Loader;
	1751		var Observer = scope.Observer;
	1752		var parser = scope.parser;
	1753		var importer = {
	1754		documents: {},
	1755		documentPreloadSelectors: IMPORT_SELECTOR,
	1756		importsPreloadSelectors: [ IMPORT_SELECTOR ].join(","),
	1757		loadNode: function(node) {
	1758		importLoader.addNode(node);
	1759		},
	1760		loadSubtree: function(parent) {
	1761		var nodes = this.marshalNodes(parent);
	1762		importLoader.addNodes(nodes);
	1763		},
	1764		marshalNodes: function(parent) {
	1765		return parent.querySelectorAll(this.loadSelectorsForNode(parent));
	1766		},
	1767		loadSelectorsForNode: function(node) {
	1768		var doc = node.ownerDocument \|\| node;
	1769		return doc === rootDocument ? this.documentPreloadSelectors : this.importsPreloadSelectors;
	1770		},
	1771		loaded: function(url, elt, resource, err, redirectedUrl) {
	1772		flags.load && console.log("loaded", url, elt);
	1773		elt.__resource = resource;
	1774		elt.__error = err;
	1775		if (isImportLink(elt)) {
	1776		var doc = this.documents[url];
	1777		if (doc === undefined) {
	1778		doc = err ? null : makeDocument(resource, redirectedUrl \|\| url);
	1779		if (doc) {
	1780		doc.__importLink = elt;
	1781		this.bootDocument(doc);
	1782		}
	1783		this.documents[url] = doc;
	1784		}
	1785		elt.__doc = doc;
	1786		}
	1787		parser.parseNext();
	1788		},
	1789		bootDocument: function(doc) {
	1790		this.loadSubtree(doc);
	1791		this.observer.observe(doc);
	1792		parser.parseNext();
	1793		},
	1794		loadedAll: function() {
	1795		parser.parseNext();
	1796		}
	1797		};
	1798		var importLoader = new Loader(importer.loaded.bind(importer), importer.loadedAll.bind(importer));
	1799		importer.observer = new Observer();
	1800		function isImportLink(elt) {
	1801		return isLinkRel(elt, IMPORT_LINK_TYPE);
	1802		}
	1803		function isLinkRel(elt, rel) {
	1804		return elt.localName === "link" && elt.getAttribute("rel") === rel;
	1805		}
	1806		function hasBaseURIAccessor(doc) {
	1807		return !!Object.getOwnPropertyDescriptor(doc, "baseURI");
	1808		}
	1809		function makeDocument(resource, url) {
	1810		var doc = document.implementation.createHTMLDocument(IMPORT_LINK_TYPE);
	1811		doc._URL = url;
	1812		var base = doc.createElement("base");
	1813		base.setAttribute("href", url);
	1814		if (!doc.baseURI && !hasBaseURIAccessor(doc)) {
	1815		Object.defineProperty(doc, "baseURI", {
	1816		value: url
	1817		});
	1818		}
	1819		var meta = doc.createElement("meta");
	1820		meta.setAttribute("charset", "utf-8");
	1821		doc.head.appendChild(meta);
	1822		doc.head.appendChild(base);
	1823		doc.body.innerHTML = resource;
	1824		if (window.HTMLTemplateElement && HTMLTemplateElement.bootstrap) {
	1825		HTMLTemplateElement.bootstrap(doc);
	1826		}
	1827		return doc;
	1828		}
	1829		if (!document.baseURI) {
	1830		var baseURIDescriptor = {
	1831		get: function() {
	1832		var base = document.querySelector("base");
	1833		return base ? base.href : window.location.href;
	1834		},
	1835		configurable: true
	1836		};
	1837		Object.defineProperty(document, "baseURI", baseURIDescriptor);
	1838		Object.defineProperty(rootDocument, "baseURI", baseURIDescriptor);
	1839		}
	1840		scope.importer = importer;
	1841		scope.importLoader = importLoader;
	1842		});
	1843
	1844		window.HTMLImports.addModule(function(scope) {
	1845		var parser = scope.parser;
	1846		var importer = scope.importer;
	1847		var dynamic = {
	1848		added: function(nodes) {
	1849		var owner, parsed, loading;
	1850		for (var i = 0, l = nodes.length, n; i < l && (n = nodes[i]); i++) {
	1851		if (!owner) {
	1852		owner = n.ownerDocument;
	1853		parsed = parser.isParsed(owner);
	1854		}
	1855		loading = this.shouldLoadNode(n);
	1856		if (loading) {
	1857		importer.loadNode(n);
	1858		}
	1859		if (this.shouldParseNode(n) && parsed) {
	1860		parser.parseDynamic(n, loading);
	1861		}
	1862		}
	1863		},
	1864		shouldLoadNode: function(node) {
	1865		return node.nodeType === 1 && matches.call(node, importer.loadSelectorsForNode(node));
	1866		},
	1867		shouldParseNode: function(node) {
	1868		return node.nodeType === 1 && matches.call(node, parser.parseSelectorsForNode(node));
	1869		}
	1870		};
	1871		importer.observer.addCallback = dynamic.added.bind(dynamic);
	1872		var matches = HTMLElement.prototype.matches \|\| HTMLElement.prototype.matchesSelector \|\| HTMLElement.prototype.webkitMatchesSelector \|\| HTMLElement.prototype.mozMatchesSelector \|\| HTMLElement.prototype.msMatchesSelector;
	1873		});
	1874
	1875		(function(scope) {
	1876		var initializeModules = scope.initializeModules;
	1877		var isIE = scope.isIE;
	1878		if (scope.useNative) {
	1879		return;
	1880		}
	1881		initializeModules();
	1882		var rootDocument = scope.rootDocument;
	1883		function bootstrap() {
	1884		window.HTMLImports.importer.bootDocument(rootDocument);
	1885		}
	1886		if (document.readyState === "complete" \|\| document.readyState === "interactive" && !window.attachEvent) {
	1887		bootstrap();
	1888		} else {
	1889		document.addEventListener("DOMContentLoaded", bootstrap);
	1890		}
	1891		})(window.HTMLImports);
	1892
	1893		window.CustomElements = window.CustomElements \|\| {
	1894		flags: {}
	1895		};
	1896
	1897		(function(scope) {
	1898		var flags = scope.flags;
	1899		var modules = [];
	1900		var addModule = function(module) {
	1901		modules.push(module);
	1902		};
	1903		var initializeModules = function() {
	1904		modules.forEach(function(module) {
	1905		module(scope);
	1906		});
	1907		};
	1908		scope.addModule = addModule;
	1909		scope.initializeModules = initializeModules;
	1910		scope.hasNative = Boolean(document.registerElement);
	1911		scope.isIE = /Trident/.test(navigator.userAgent);
	1912		scope.useNative = !flags.register && scope.hasNative && !window.ShadowDOMPolyfill && (!window.HTMLImports \|\| window.HTMLImports.useNative);
	1913		})(window.CustomElements);
	1914
	1915		window.CustomElements.addModule(function(scope) {
	1916		var IMPORT_LINK_TYPE = window.HTMLImports ? window.HTMLImports.IMPORT_LINK_TYPE : "none";
	1917		function forSubtree(node, cb) {
	1918		findAllElements(node, function(e) {
	1919		if (cb(e)) {
	1920		return true;
	1921		}
	1922		forRoots(e, cb);
	1923		});
	1924		forRoots(node, cb);
	1925		}
	1926		function findAllElements(node, find, data) {
	1927		var e = node.firstElementChild;
	1928		if (!e) {
	1929		e = node.firstChild;
	1930		while (e && e.nodeType !== Node.ELEMENT_NODE) {
	1931		e = e.nextSibling;
	1932		}
	1933		}
	1934		while (e) {
	1935		if (find(e, data) !== true) {
	1936		findAllElements(e, find, data);
	1937		}
	1938		e = e.nextElementSibling;
	1939		}
	1940		return null;
	1941		}
	1942		function forRoots(node, cb) {
	1943		var root = node.shadowRoot;
	1944		while (root) {
	1945		forSubtree(root, cb);
	1946		root = root.olderShadowRoot;
	1947		}
	1948		}
	1949		function forDocumentTree(doc, cb) {
	1950		_forDocumentTree(doc, cb, []);
	1951		}
	1952		function _forDocumentTree(doc, cb, processingDocuments) {
	1953		doc = window.wrap(doc);
	1954		if (processingDocuments.indexOf(doc) >= 0) {
	1955		return;
	1956		}
	1957		processingDocuments.push(doc);
	1958		var imports = doc.querySelectorAll("link[rel=" + IMPORT_LINK_TYPE + "]");
	1959		for (var i = 0, l = imports.length, n; i < l && (n = imports[i]); i++) {
	1960		if (n.import) {
	1961		_forDocumentTree(n.import, cb, processingDocuments);
	1962		}
	1963		}
	1964		cb(doc);
	1965		}
	1966		scope.forDocumentTree = forDocumentTree;
	1967		scope.forSubtree = forSubtree;
	1968		});
	1969
	1970		window.CustomElements.addModule(function(scope) {
	1971		var flags = scope.flags;
	1972		var forSubtree = scope.forSubtree;
	1973		var forDocumentTree = scope.forDocumentTree;
	1974		function addedNode(node, isAttached) {
	1975		return added(node, isAttached) \|\| addedSubtree(node, isAttached);
	1976		}
	1977		function added(node, isAttached) {
	1978		if (scope.upgrade(node, isAttached)) {
	1979		return true;
	1980		}
	1981		if (isAttached) {
	1982		attached(node);
	1983		}
	1984		}
	1985		function addedSubtree(node, isAttached) {
	1986		forSubtree(node, function(e) {
	1987		if (added(e, isAttached)) {
	1988		return true;
	1989		}
	1990		});
	1991		}
	1992		var hasThrottledAttached = window.MutationObserver._isPolyfilled && flags["throttle-attached"];
	1993		scope.hasPolyfillMutations = hasThrottledAttached;
	1994		scope.hasThrottledAttached = hasThrottledAttached;
	1995		var isPendingMutations = false;
	1996		var pendingMutations = [];
	1997		function deferMutation(fn) {
	1998		pendingMutations.push(fn);
	1999		if (!isPendingMutations) {
	2000		isPendingMutations = true;
	2001		setTimeout(takeMutations);
	2002		}
	2003		}
	2004		function takeMutations() {
	2005		isPendingMutations = false;
	2006		var $p = pendingMutations;
	2007		for (var i = 0, l = $p.length, p; i < l && (p = $p[i]); i++) {
	2008		p();
	2009		}
	2010		pendingMutations = [];
	2011		}
	2012		function attached(element) {
	2013		if (hasThrottledAttached) {
	2014		deferMutation(function() {
	2015		_attached(element);
	2016		});
	2017		} else {
	2018		_attached(element);
	2019		}
	2020		}
	2021		function _attached(element) {
	2022		if (element.__upgraded__ && !element.__attached) {
	2023		element.__attached = true;
	2024		if (element.attachedCallback) {
	2025		element.attachedCallback();
	2026		}
	2027		}
	2028		}
	2029		function detachedNode(node) {
	2030		detached(node);
	2031		forSubtree(node, function(e) {
	2032		detached(e);
	2033		});
	2034		}
	2035		function detached(element) {
	2036		if (hasThrottledAttached) {
	2037		deferMutation(function() {
	2038		_detached(element);
	2039		});
	2040		} else {
	2041		_detached(element);
	2042		}
	2043		}
	2044		function _detached(element) {
	2045		if (element.__upgraded__ && element.__attached) {
	2046		element.__attached = false;
	2047		if (element.detachedCallback) {
	2048		element.detachedCallback();
	2049		}
	2050		}
	2051		}
	2052		function inDocument(element) {
	2053		var p = element;
	2054		var doc = window.wrap(document);
	2055		while (p) {
	2056		if (p == doc) {
	2057		return true;
	2058		}
	2059		p = p.parentNode \|\| p.nodeType === Node.DOCUMENT_FRAGMENT_NODE && p.host;
	2060		}
	2061		}
	2062		function watchShadow(node) {
	2063		if (node.shadowRoot && !node.shadowRoot.__watched) {
	2064		flags.dom && console.log("watching shadow-root for: ", node.localName);
	2065		var root = node.shadowRoot;
	2066		while (root) {
	2067		observe(root);
	2068		root = root.olderShadowRoot;
	2069		}
	2070		}
	2071		}
	2072		function handler(root, mutations) {
	2073		if (flags.dom) {
	2074		var mx = mutations[0];
	2075		if (mx && mx.type === "childList" && mx.addedNodes) {
	2076		if (mx.addedNodes) {
	2077		var d = mx.addedNodes[0];
	2078		while (d && d !== document && !d.host) {
	2079		d = d.parentNode;
	2080		}
	2081		var u = d && (d.URL \|\| d._URL \|\| d.host && d.host.localName) \|\| "";
	2082		u = u.split("/?").shift().split("/").pop();
	2083		}
	2084		}
	2085		console.group("mutations (%d) [%s]", mutations.length, u \|\| "");
	2086		}
	2087		var isAttached = inDocument(root);
	2088		mutations.forEach(function(mx) {
	2089		if (mx.type === "childList") {
	2090		forEach(mx.addedNodes, function(n) {
	2091		if (!n.localName) {
	2092		return;
	2093		}
	2094		addedNode(n, isAttached);
	2095		});
	2096		forEach(mx.removedNodes, function(n) {
	2097		if (!n.localName) {
	2098		return;
	2099		}
	2100		detachedNode(n);
	2101		});
	2102		}
	2103		});
	2104		flags.dom && console.groupEnd();
	2105		}
	2106		function takeRecords(node) {
	2107		node = window.wrap(node);
	2108		if (!node) {
	2109		node = window.wrap(document);
	2110		}
	2111		while (node.parentNode) {
	2112		node = node.parentNode;
	2113		}
	2114		var observer = node.__observer;
	2115		if (observer) {
	2116		handler(node, observer.takeRecords());
	2117		takeMutations();
	2118		}
	2119		}
	2120		var forEach = Array.prototype.forEach.call.bind(Array.prototype.forEach);
	2121		function observe(inRoot) {
	2122		if (inRoot.__observer) {
	2123		return;
	2124		}
	2125		var observer = new MutationObserver(handler.bind(this, inRoot));
	2126		observer.observe(inRoot, {
	2127		childList: true,
	2128		subtree: true
	2129		});
	2130		inRoot.__observer = observer;
	2131		}
	2132		function upgradeDocument(doc) {
	2133		doc = window.wrap(doc);
	2134		flags.dom && console.group("upgradeDocument: ", doc.baseURI.split("/").pop());
	2135		var isMainDocument = doc === window.wrap(document);
	2136		addedNode(doc, isMainDocument);
	2137		observe(doc);
	2138		flags.dom && console.groupEnd();
	2139		}
	2140		function upgradeDocumentTree(doc) {
	2141		forDocumentTree(doc, upgradeDocument);
	2142		}
	2143		var originalCreateShadowRoot = Element.prototype.createShadowRoot;
	2144		if (originalCreateShadowRoot) {
	2145		Element.prototype.createShadowRoot = function() {
	2146		var root = originalCreateShadowRoot.call(this);
	2147		window.CustomElements.watchShadow(this);
	2148		return root;
	2149		};
	2150		}
	2151		scope.watchShadow = watchShadow;
	2152		scope.upgradeDocumentTree = upgradeDocumentTree;
	2153		scope.upgradeDocument = upgradeDocument;
	2154		scope.upgradeSubtree = addedSubtree;
	2155		scope.upgradeAll = addedNode;
	2156		scope.attached = attached;
	2157		scope.takeRecords = takeRecords;
	2158		});
	2159
	2160		window.CustomElements.addModule(function(scope) {
	2161		var flags = scope.flags;
	2162		function upgrade(node, isAttached) {
	2163		if (node.localName === "template") {
	2164		if (window.HTMLTemplateElement && HTMLTemplateElement.decorate) {
	2165		HTMLTemplateElement.decorate(node);
	2166		}
	2167		}
	2168		if (!node.__upgraded__ && node.nodeType === Node.ELEMENT_NODE) {
	2169		var is = node.getAttribute("is");
	2170		var definition = scope.getRegisteredDefinition(node.localName) \|\| scope.getRegisteredDefinition(is);
	2171		if (definition) {
	2172		if (is && definition.tag == node.localName \|\| !is && !definition.extends) {
	2173		return upgradeWithDefinition(node, definition, isAttached);
	2174		}
	2175		}
	2176		}
	2177		}
	2178		function upgradeWithDefinition(element, definition, isAttached) {
	2179		flags.upgrade && console.group("upgrade:", element.localName);
	2180		if (definition.is) {
	2181		element.setAttribute("is", definition.is);
	2182		}
	2183		implementPrototype(element, definition);
	2184		element.__upgraded__ = true;
	2185		created(element);
	2186		if (isAttached) {
	2187		scope.attached(element);
	2188		}
	2189		scope.upgradeSubtree(element, isAttached);
	2190		flags.upgrade && console.groupEnd();
	2191		return element;
	2192		}
	2193		function implementPrototype(element, definition) {
	2194		if (Object.__proto__) {
	2195		element.__proto__ = definition.prototype;
	2196		} else {
	2197		customMixin(element, definition.prototype, definition.native);
	2198		element.__proto__ = definition.prototype;
	2199		}
	2200		}
	2201		function customMixin(inTarget, inSrc, inNative) {
	2202		var used = {};
	2203		var p = inSrc;
	2204		while (p !== inNative && p !== HTMLElement.prototype) {
	2205		var keys = Object.getOwnPropertyNames(p);
	2206		for (var i = 0, k; k = keys[i]; i++) {
	2207		if (!used[k]) {
	2208		Object.defineProperty(inTarget, k, Object.getOwnPropertyDescriptor(p, k));
	2209		used[k] = 1;
	2210		}
	2211		}
	2212		p = Object.getPrototypeOf(p);
	2213		}
	2214		}
	2215		function created(element) {
	2216		if (element.createdCallback) {
	2217		element.createdCallback();
	2218		}
	2219		}
	2220		scope.upgrade = upgrade;
	2221		scope.upgradeWithDefinition = upgradeWithDefinition;
	2222		scope.implementPrototype = implementPrototype;
	2223		});
	2224
	2225		window.CustomElements.addModule(function(scope) {
	2226		var isIE = scope.isIE;
	2227		var upgradeDocumentTree = scope.upgradeDocumentTree;
	2228		var upgradeAll = scope.upgradeAll;
	2229		var upgradeWithDefinition = scope.upgradeWithDefinition;
	2230		var implementPrototype = scope.implementPrototype;
	2231		var useNative = scope.useNative;
	2232		function register(name, options) {
	2233		var definition = options \|\| {};
	2234		if (!name) {
	2235		throw new Error("document.registerElement: first argument `name` must not be empty");
	2236		}
	2237		if (name.indexOf("-") < 0) {
	2238		throw new Error("document.registerElement: first argument ('name') must contain a dash ('-'). Argument provided was '" + String(name) + "'.");
	2239		}
	2240		if (isReservedTag(name)) {
	2241		throw new Error("Failed to execute 'registerElement' on 'Document': Registration failed for type '" + String(name) + "'. The type name is invalid.");
	2242		}
	2243		if (getRegisteredDefinition(name)) {
	2244		throw new Error("DuplicateDefinitionError: a type with name '" + String(name) + "' is already registered");
	2245		}
	2246		if (!definition.prototype) {
	2247		definition.prototype = Object.create(HTMLElement.prototype);
	2248		}
	2249		definition.__name = name.toLowerCase();
	2250		if (definition.extends) {
	2251		definition.extends = definition.extends.toLowerCase();
	2252		}
	2253		definition.lifecycle = definition.lifecycle \|\| {};
	2254		definition.ancestry = ancestry(definition.extends);
	2255		resolveTagName(definition);
	2256		resolvePrototypeChain(definition);
	2257		overrideAttributeApi(definition.prototype);
	2258		registerDefinition(definition.__name, definition);
	2259		definition.ctor = generateConstructor(definition);
	2260		definition.ctor.prototype = definition.prototype;
	2261		definition.prototype.constructor = definition.ctor;
	2262		if (scope.ready) {
	2263		upgradeDocumentTree(document);
	2264		}
	2265		return definition.ctor;
	2266		}
	2267		function overrideAttributeApi(prototype) {
	2268		if (prototype.setAttribute._polyfilled) {
	2269		return;
	2270		}
	2271		var setAttribute = prototype.setAttribute;
	2272		prototype.setAttribute = function(name, value) {
	2273		changeAttribute.call(this, name, value, setAttribute);
	2274		};
	2275		var removeAttribute = prototype.removeAttribute;
	2276		prototype.removeAttribute = function(name) {
	2277		changeAttribute.call(this, name, null, removeAttribute);
	2278		};
	2279		prototype.setAttribute._polyfilled = true;
	2280		}
	2281		function changeAttribute(name, value, operation) {
	2282		name = name.toLowerCase();
	2283		var oldValue = this.getAttribute(name);
	2284		operation.apply(this, arguments);
	2285		var newValue = this.getAttribute(name);
	2286		if (this.attributeChangedCallback && newValue !== oldValue) {
	2287		this.attributeChangedCallback(name, oldValue, newValue);
	2288		}
	2289		}
	2290		function isReservedTag(name) {
	2291		for (var i = 0; i < reservedTagList.length; i++) {
	2292		if (name === reservedTagList[i]) {
	2293		return true;
	2294		}
	2295		}
	2296		}
	2297		var reservedTagList = [ "annotation-xml", "color-profile", "font-face", "font-face-src", "font-face-uri", "font-face-format", "font-face-name", "missing-glyph" ];
	2298		function ancestry(extnds) {
	2299		var extendee = getRegisteredDefinition(extnds);
	2300		if (extendee) {
	2301		return ancestry(extendee.extends).concat([ extendee ]);
	2302		}
	2303		return [];
	2304		}
	2305		function resolveTagName(definition) {
	2306		var baseTag = definition.extends;
	2307		for (var i = 0, a; a = definition.ancestry[i]; i++) {
	2308		baseTag = a.is && a.tag;
	2309		}
	2310		definition.tag = baseTag \|\| definition.__name;
	2311		if (baseTag) {
	2312		definition.is = definition.__name;
	2313		}
	2314		}
	2315		function resolvePrototypeChain(definition) {
	2316		if (!Object.__proto__) {
	2317		var nativePrototype = HTMLElement.prototype;
	2318		if (definition.is) {
	2319		var inst = document.createElement(definition.tag);
	2320		nativePrototype = Object.getPrototypeOf(inst);
	2321		}
	2322		var proto = definition.prototype, ancestor;
	2323		var foundPrototype = false;
	2324		while (proto) {
	2325		if (proto == nativePrototype) {
	2326		foundPrototype = true;
	2327		}
	2328		ancestor = Object.getPrototypeOf(proto);
	2329		if (ancestor) {
	2330		proto.__proto__ = ancestor;
	2331		}
	2332		proto = ancestor;
	2333		}
	2334		if (!foundPrototype) {
	2335		console.warn(definition.tag + " prototype not found in prototype chain for " + definition.is);
	2336		}
	2337		definition.native = nativePrototype;
	2338		}
	2339		}
	2340		function instantiate(definition) {
	2341		return upgradeWithDefinition(domCreateElement(definition.tag), definition);
	2342		}
	2343		var registry = {};
	2344		function getRegisteredDefinition(name) {
	2345		if (name) {
	2346		return registry[name.toLowerCase()];
	2347		}
	2348		}
	2349		function registerDefinition(name, definition) {
	2350		registry[name] = definition;
	2351		}
	2352		function generateConstructor(definition) {
	2353		return function() {
	2354		return instantiate(definition);
	2355		};
	2356		}
	2357		var HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
	2358		function createElementNS(namespace, tag, typeExtension) {
	2359		if (namespace === HTML_NAMESPACE) {
	2360		return createElement(tag, typeExtension);
	2361		} else {
	2362		return domCreateElementNS(namespace, tag);
	2363		}
	2364		}
	2365		function createElement(tag, typeExtension) {
	2366		if (tag) {
	2367		tag = tag.toLowerCase();
	2368		}
	2369		if (typeExtension) {
	2370		typeExtension = typeExtension.toLowerCase();
	2371		}
	2372		var definition = getRegisteredDefinition(typeExtension \|\| tag);
	2373		if (definition) {
	2374		if (tag == definition.tag && typeExtension == definition.is) {
	2375		return new definition.ctor();
	2376		}
	2377		if (!typeExtension && !definition.is) {
	2378		return new definition.ctor();
	2379		}
	2380		}
	2381		var element;
	2382		if (typeExtension) {
	2383		element = createElement(tag);
	2384		element.setAttribute("is", typeExtension);
	2385		return element;
	2386		}
	2387		element = domCreateElement(tag);
	2388		if (tag.indexOf("-") >= 0) {
	2389		implementPrototype(element, HTMLElement);
	2390		}
	2391		return element;
	2392		}
	2393		var domCreateElement = document.createElement.bind(document);
	2394		var domCreateElementNS = document.createElementNS.bind(document);
	2395		var isInstance;
	2396		if (!Object.__proto__ && !useNative) {
	2397		isInstance = function(obj, ctor) {
	2398		if (obj instanceof ctor) {
	2399		return true;
	2400		}
	2401		var p = obj;
	2402		while (p) {
	2403		if (p === ctor.prototype) {
	2404		return true;
	2405		}
	2406		p = p.__proto__;
	2407		}
	2408		return false;
	2409		};
	2410		} else {
	2411		isInstance = function(obj, base) {
	2412		return obj instanceof base;
	2413		};
	2414		}
	2415		function wrapDomMethodToForceUpgrade(obj, methodName) {
	2416		var orig = obj[methodName];
	2417		obj[methodName] = function() {
	2418		var n = orig.apply(this, arguments);
	2419		upgradeAll(n);
	2420		return n;
	2421		};
	2422		}
	2423		wrapDomMethodToForceUpgrade(Node.prototype, "cloneNode");
	2424		wrapDomMethodToForceUpgrade(document, "importNode");
	2425		document.registerElement = register;
	2426		document.createElement = createElement;
	2427		document.createElementNS = createElementNS;
	2428		scope.registry = registry;
	2429		scope.instanceof = isInstance;
	2430		scope.reservedTagList = reservedTagList;
	2431		scope.getRegisteredDefinition = getRegisteredDefinition;
	2432		document.register = document.registerElement;
	2433		});
	2434
	2435		(function(scope) {
	2436		var useNative = scope.useNative;
	2437		var initializeModules = scope.initializeModules;
	2438		var isIE = scope.isIE;
	2439		if (useNative) {
	2440		var nop = function() {};
	2441		scope.watchShadow = nop;
	2442		scope.upgrade = nop;
	2443		scope.upgradeAll = nop;
	2444		scope.upgradeDocumentTree = nop;
	2445		scope.upgradeSubtree = nop;
	2446		scope.takeRecords = nop;
	2447		scope.instanceof = function(obj, base) {
	2448		return obj instanceof base;
	2449		};
	2450		} else {
	2451		initializeModules();
	2452		}
	2453		var upgradeDocumentTree = scope.upgradeDocumentTree;
	2454		var upgradeDocument = scope.upgradeDocument;
	2455		if (!window.wrap) {
	2456		if (window.ShadowDOMPolyfill) {
	2457		window.wrap = window.ShadowDOMPolyfill.wrapIfNeeded;
	2458		window.unwrap = window.ShadowDOMPolyfill.unwrapIfNeeded;
	2459		} else {
	2460		window.wrap = window.unwrap = function(node) {
	2461		return node;
	2462		};
	2463		}
	2464		}
	2465		if (window.HTMLImports) {
	2466		window.HTMLImports.__importsParsingHook = function(elt) {
	2467		if (elt.import) {
	2468		upgradeDocument(wrap(elt.import));
	2469		}
	2470		};
	2471		}
	2472		function bootstrap() {
	2473		upgradeDocumentTree(window.wrap(document));
	2474		window.CustomElements.ready = true;
	2475		var requestAnimationFrame = window.requestAnimationFrame \|\| function(f) {
	2476		setTimeout(f, 16);
	2477		};
	2478		requestAnimationFrame(function() {
	2479		setTimeout(function() {
	2480		window.CustomElements.readyTime = Date.now();
	2481		if (window.HTMLImports) {
	2482		window.CustomElements.elapsed = window.CustomElements.readyTime - window.HTMLImports.readyTime;
	2483		}
	2484		document.dispatchEvent(new CustomEvent("WebComponentsReady", {
	2485		bubbles: true
	2486		}));
	2487		});
	2488		});
	2489		}
	2490		if (document.readyState === "complete" \|\| scope.flags.eager) {
	2491		bootstrap();
	2492		} else if (document.readyState === "interactive" && !window.attachEvent && (!window.HTMLImports \|\| window.HTMLImports.ready)) {
	2493		bootstrap();
	2494		} else {
	2495		var loadEvent = window.HTMLImports && !window.HTMLImports.ready ? "HTMLImportsLoaded" : "DOMContentLoaded";
	2496		window.addEventListener(loadEvent, bootstrap);
	2497		}
	2498		})(window.CustomElements);
	2499
	2500		(function(scope) {
	2501		var style = document.createElement("style");
	2502		style.textContent = "" + "body {" + "transition: opacity ease-in 0.2s;" + " } \n" + "body[unresolved] {" + "opacity: 0; display: block; overflow: hidden; position: relative;" + " } \n";
	2503		var head = document.querySelector("head");
	2504		head.insertBefore(style, head.firstChild);
	2505		})(window.WebComponents); No newline at end of file
		230	//# sourceMappingURL=webcomponents-lite.js.map

rhodecode/public/robots.txt

0 +6 -5

		@@ -1,8 +1,9 b''
1	1	# See http://www.robotstxt.org/robotstxt.html for documentation on
2	2	# how to use the robots.txt file
3		#
4		# To forbid all spiders from indexing, uncomment the next two lines:
5		# User-Agent: *
6		# Disallow: /
	3
	4	User-agent: *
7	5
8		User-Agent: *
	6	# To forbid all spiders from indexing, uncomment the next line:
	7	#Disallow: /
	8
	9

rhodecode/subscribers.py

0 +9 -2

                  Adds auth user into request context
                  """
                  request = event.request
+                 # access req_id as soon as possible
+                 req_id = request.req_id
                  if hasattr(request, 'vcs_call'):
                      # skip vcs calls
                  auth_user = get_auth_user(request)
                  request.user = auth_user
                  request.environ['rc_auth_user'] = auth_user
+                 request.environ['rc_auth_user_id'] = auth_user.user_id
+                 request.environ['rc_req_id'] = req_id
              def inject_app_settings(event):
                      jsroutes_file_path = os.path.join(
                          static_path, 'js', 'rhodecode', 'routes.js')
-                     with io.open(jsroutes_file_path, 'w', encoding='utf-8') as f:
-                         f.write(jsroutes_file_content)
+                     try:
+                         with io.open(jsroutes_file_path, 'w', encoding='utf-8') as f:
+                             f.write(jsroutes_file_content)
+                     except Exception:
+                         log.exception('Failed to write routes.js into %s', jsroutes_file_path)
              class Subscriber(object):

rhodecode/templates/admin/admin_audit_logs.mako

0 +3 -1

                      <input type='submit' value="${_('filter')}" class="btn" />
                      ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
                  ${h.end_form()}
-                 <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
+                 <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+                 <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
              </%def>
              <%def name="menu_bar_nav()">
                  ${self.menu_items(active='admin')}
              </%def>
              <%def name="main()">
              <div class="box">
                  <!-- box / title -->

rhodecode/templates/admin/my_account/my_account_auth_tokens.mako

0 +2 -2

                  $.each(data.results[0].children, function() {
                      // replace name to ID for submision
-                     this.id = this.obj.repo_id;
+                     this.id = this.repo_id;
                      results.push(this);
                  });
                  dropdownAutoWidth: true,
                  containerCssClass: "drop-menu",
                  dropdownCssClass: "drop-menu-dropdown",
-                 formatResult: formatResult,
+                 formatResult: formatRepoResult,
                  query: $.debounce(250, function(query){
                      self = this;
                      var cacheKey = query.term;

rhodecode/templates/admin/my_account/my_account_emails.mako

0 +6 0

                        </table>
                      </div>
+                 % if c.user.extern_type != 'rhodecode':
+                     <p>${_('Your user account details are managed by an external source. Details cannot be managed here.')}
+                        <br/>${_('Source type')}: <strong>${c.user.extern_type}</strong>
+                     </p>
+                 % else:
                      <div>
                         ${c.form.render() | n}
                      </div>
+                 % endif
                  </div>
              </div>

rhodecode/templates/admin/my_account/my_account_notifications.mako

0 +7 -4

-             <template is="dom-bind" id="notificationsPage">
+             <dom-bind id="notificationsPage">
+             <template>
              <iron-ajax id="toggleNotifications"
                         method="post"
                         url="${h.route_path('my_account_notifications_toggle_visibility')}"
              </div>
+             </template>
+             </dom-bind>
              <script type="text/javascript">
                  /** because im not creating a custom element for this page
                   * we need to push the function onto the dom-template
                      var levels = ['info', 'error', 'warning', 'success'];
                      var level = levels[Math.floor(Math.random()*levels.length)];
                      function getRandomArbitrary(min, max) {
-                       return parseInt(Math.random() * (max - min) + min);
+                         return parseInt(Math.random() * (max - min) + min);
                      }
                      function shuffle(a) {
                          var j, x, i;
                  };
              </script>
-             </template>

rhodecode/templates/admin/my_account/my_account_ssh_keys.mako

0 +3 -1

                          <tr>
                              <th>${_('Fingerprint')}</th>
                              <th>${_('Description')}</th>
-                             <th>${_('Created')}</th>
+                             <th>${_('Created on')}</th>
+                             <th>${_('Accessed on')}</th>
                              <th>${_('Action')}</th>
                          </tr>
                          % if not c.ssh_enabled:
                                      </td>
                                      <td class="td-wrap">${ssh_key.description}</td>
                                      <td class="td-tags">${h.format_date(ssh_key.created_on)}</td>
+                                     <td class="td-tags">${h.format_date(ssh_key.accessed_on)}</td>
                                      <td class="td-action">
                                          ${h.secure_form(h.route_path('my_account_ssh_keys_delete'), request=request)}

rhodecode/templates/admin/my_account/my_account_user_group_membership.mako

0 +1 -1

                       { data: {"_": "group_name",
                                "sort": "group_name"}, title: "${_('Name')}", className: "td-componentname," ,
                          render: function (data,type,full,meta)
-                                 {return '<div><i class="icon-group" title="User group">'+data+'</i></div>'}},
+                                 {return '<div><i class="icon-user-group" title="User group">'+data+'</i></div>'}},
                       { data: {"_": "group_description",
                                "sort": "group_description"}, title: "${_('Description')}", className: "td-description" },

rhodecode/templates/admin/permissions/permissions.mako

0 +3 0

                        <li class="${'active' if c.active=='objects' else ''}">
                          <a href="${h.route_path('admin_permissions_object')}">${_('Object')}</a>
                        </li>
+                       <li class="${'active' if c.active=='branch' else ''}">
+                         <a href="${h.route_path('admin_permissions_branch')}">${_('Branch')}</a>
+                       </li>
                        <li class="${'active' if c.active=='ips' else ''}">
                          <a href="${h.route_path('admin_permissions_ips')}">${_('IP Whitelist')}</a>
                        </li>

rhodecode/templates/admin/permissions/permissions_objects.mako

0 +5 -2

                      <h3 class="panel-title">${_('Default Permissions for Repositories, User Groups and Repository Groups.')}</h3>
                  </div>
                  <div class="panel-body">
-                     <p>${_('Default system permissions. Each permissions management entity will be created with the following default settings. Check the overwrite checkbox to force any permission changes on already existing settings.')}
+                     <p>
+                     ${_('Default access permissions. This defines permissions for the `default` user from which other users inherit permissions.')}
+                     <br/>
+                     ${_('Check the overwrite checkbox to force change all previously defined permissions for `default` user to the new selected value.')}
                      </p>
                      ${h.secure_form(h.route_path('admin_permissions_object_update'), request=request)}
                          <div class="form">
                                          ${h.select('default_user_group_perm','',c.user_group_perms_choices)}
                                          ${h.checkbox('overwrite_default_user_group','true')}
                                          <label for="overwrite_default_user_group">
-                                             <span class="tooltip" title="${h.tooltip(_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on repository groups will be lost'))}">
+                                             <span class="tooltip" title="${h.tooltip(_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost'))}">
                                                  ${_('Overwrite Existing Settings')}
                                              </span>
                                          </label>

rhodecode/templates/admin/permissions/permissions_ssh_keys.mako

0 +11 -16

              $(document).ready(function() {
                  var $sshKeyListTable = $('#ssh_keys_table');
-                 var getDatatableCount = function(){
-                   var table = $sshKeyListTable.dataTable();
-                   var page = table.api().page.info();
-                   var  active = page.recordsDisplay;
-                   var  total = page.recordsTotal;
-                   var _text = _gettext("{0} out of {1} ssh keys").format(active, total);
-                   $('#ssh_keys_count').text(_text);
-                 };
                  // user list
                  $sshKeyListTable.DataTable({
                    processing: true,
                    serverSide: true,
-                   ajax: "${h.route_path('admin_permissions_ssh_keys_data')}",
+                   ajax: {
+                       "url": "${h.route_path('admin_permissions_ssh_keys_data')}",
+                       "dataSrc": function ( json ) {
+                           var filteredCount = json.recordsFiltered;
+                           var total = json.recordsTotal;
+                           var _text = _gettext("{0} out of {1} ssh keys").format(filteredCount, total);
+                           $('#ssh_keys_count').text(_text);
+                           return json.data;
+                       }
+                   },
                    dom: 'rtp',
                    pageLength: ${c.visual.admin_grid_items},
                    order: [[ 0, "asc" ]],
                      $sshKeyListTable.css('opacity', 0.3);
                  });
-                 // refresh counters on draw
-                 $sshKeyListTable.on('draw.dt', function(){
-                     getDatatableCount();
-                 });
                  // filter
                  $('#q_filter').on('keyup',
                      $.debounce(250, function() {

rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako

0 +81 -9

                              <th class="td-radio">${_('Write')}</th>
                              <th class="td-radio">${_('Admin')}</th>
                              <th class="td-owner">${_('User/User Group')}</th>
-                             <th></th>
+                             <th class="td-action"></th>
+                             <th class="td-action"></th>
                          </tr>
                          ## USERS
                          %for _user in c.repo_group.permissions():
+                             ## super admin/owner row
                              %if getattr(_user, 'admin_row', None) or getattr(_user, 'owner_row', None):
                                  <tr class="perm_admin_row">
                                      <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.none', disabled="disabled")}</td>
                                              %endif
                                      </td>
                                      <td></td>
+                                     <td class="quick_repo_menu">
+                                         % if c.rhodecode_user.is_admin:
+                                             <i class="icon-more"></i>
+                                             <div class="menu_items_container" style="display: none;">
+                                             <ul class="menu_items">
+                                               <li>
+                                                  ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
+                                               </li>
+                                             </ul>
+                                             </div>
+                                         % endif
+                                     </td>
                                  </tr>
                              %else:
                                  <tr>
                                                  ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                              % else:
                                                  ${h.link_to_user(_user.username)}
+                                                 %if getattr(_user, 'duplicate_perm', None):
+                                                     (${_('inactive duplicate')})
+                                                 %endif
                                              % endif
                                          </span>
                                      </td>
                                          %if _user.username != h.DEFAULT_USER:
                                              <span  class="btn btn-link btn-danger revoke_perm"
                                                member="${_user.user_id}" member_type="user">
-                                             <i class="icon-remove"></i> ${_('Revoke')}
+                                             ${_('Remove')}
                                              </span>
                                          %endif
                                      </td>
+                                     <td class="quick_repo_menu">
+                                         % if c.rhodecode_user.is_admin:
+                                             <i class="icon-more"></i>
+                                             <div class="menu_items_container" style="display: none;">
+                                             <ul class="menu_items">
+                                               <li>
+                                                 % if _user.username == h.DEFAULT_USER:
+                                                     ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-groups-permissions'))}
+                                                 % else:
+                                                     ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
+                                                 % endif
+                                               </li>
+                                             </ul>
+                                             </div>
+                                         % endif
+                                     </td>
                                      %else:
-                                         ## special case for current user permissions, we make sure he cannot take his own permissions
+                                         ## special case for currently logged-in user permissions, we make sure he cannot take his own permissions
                                          <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.none', disabled="disabled")}</td>
                                          <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.read', disabled="disabled")}</td>
                                          <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.write', disabled="disabled")}</td>
                                                      ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                                  % else:
                                                      ${h.link_to_user(_user.username)}
+                                                     %if getattr(_user, 'duplicate_perm', None):
+                                                         (${_('inactive duplicate')})
+                                                     %endif
                                                  % endif
                                                  <span class="user-perm-help-text">(${_('delegated admin')})</span>
                                              </span>
                                          </td>
                                          <td></td>
+                                         <td class="quick_repo_menu">
+                                             % if c.rhodecode_user.is_admin:
+                                                 <i class="icon-more"></i>
+                                                 <div class="menu_items_container" style="display: none;">
+                                                 <ul class="menu_items">
+                                                   <li>
+                                                      ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
+                                                   </li>
+                                                 </ul>
+                                                 </div>
+                                             % endif
+                                         </td>
                                      %endif
                                  </tr>
                              %endif
                                  <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.write', checked=_user_group.permission=='group.write')}</td>
                                  <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.admin', checked=_user_group.permission=='group.admin')}</td>
                                  <td class="td-componentname">
-                                     <i class="icon-group" ></i>
+                                     <i class="icon-user-group"></i>
                                      %if h.HasPermissionAny('hg.admin')():
                                       <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                                           ${_user_group.users_group_name}
                                  <td class="td-action">
                                      <span  class="btn btn-link btn-danger revoke_perm"
                                            member="${_user_group.users_group_id}" member_type="user_group">
-                                     <i class="icon-remove"></i> ${_('Revoke')}
+                                     ${_('Remove')}
                                      </span>
                                  </td>
+                                 <td class="quick_repo_menu">
+                                     % if c.rhodecode_user.is_admin:
+                                         <i class="icon-more"></i>
+                                         <div class="menu_items_container" style="display: none;">
+                                         <ul class="menu_items">
+                                           <li>
+                                              ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-groups-permissions'))}
+                                           </li>
+                                         </ul>
+                                         </div>
+                                     % endif
+                                 </td>
                              </tr>
                          %endfor
                          <tr class="new_members" id="add_perm_input"></tr>
+                         <tr>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td>
+                                 <span id="add_perm" class="link">
+                                     ${_('Add user/user group')}
+                                 </span>
+                             </td>
+                             <td></td>
+                         </tr>
                      </table>
-                     <div id="add_perm" class="link">
-                         ${_('Add new')}
-                     </div>
                      <div class="fields">
                          <div class="field">
                             <div class="label label-radio">
                  });
                  $('.revoke_perm').on('click', function(e){
                      markRevokePermInput($(this), 'group');
-                 })
+                 });
+                 quick_repo_menu();
              </script>

rhodecode/templates/admin/repos/repo_add_base.mako

0 +18 -18

                      </div>
                      <div class="field">
                          <div class="label">
+                             <label for="repo_type">${_('Type')}:</label>
+                         </div>
+                         <div class="select">
+                             ${h.select('repo_type','hg',c.backends)}
+                             <span class="help-block">${_('Set the type of repository to create.')}</span>
+                         </div>
+                     </div>
+                     <div class="field">
+                         <div class="label">
                              <label for="repo_description">${_('Description')}:</label>
                          </div>
                          <div class="textarea editor">
                               <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                           </div>
                      </div>
+                     <div class="field">
+                         <div class="label">
+                             <label for="repo_landing_rev">${_('Landing commit')}:</label>
+                         </div>
+                         <div class="select">
+                             ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
+                             <span class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</span>
+                         </div>
+                     </div>
                      <div id="copy_perms" class="field">
                          <div class="label label-checkbox">
                              <label for="repo_copy_permissions">${_('Copy Parent Group Permissions')}:</label>
                          </div>
                      </div>
                      <div class="field">
-                         <div class="label">
-                             <label for="repo_type">${_('Type')}:</label>
-                         </div>
-                         <div class="select">
-                             ${h.select('repo_type','hg',c.backends)}
-                             <span class="help-block">${_('Set the type of repository to create.')}</span>
-                         </div>
-                     </div>
-                     <div class="field">
-                         <div class="label">
-                             <label for="repo_landing_rev">${_('Landing commit')}:</label>
-                         </div>
-                         <div class="select">
-                             ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
-                             <span class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</span>
-                         </div>
-                     </div>
-                     <div class="field">
                          <div class="label label-checkbox">
                              <label for="repo_private">${_('Private Repository')}:</label>
                          </div>

rhodecode/templates/admin/repos/repo_edit.mako

0 +3 0

                        <li class="${'active' if c.active=='permissions' else ''}">
                            <a href="${h.route_path('edit_repo_perms', repo_name=c.repo_name)}">${_('Permissions')}</a>
                        </li>
+                       <li class="${'active' if c.active=='permissions_branch' else ''}">
+                           <a href="${h.route_path('edit_repo_perms_branch', repo_name=c.repo_name)}">${_('Branch Permissions')}</a>
+                       </li>
                        <li class="${'active' if c.active=='advanced' else ''}">
                            <a href="${h.route_path('edit_repo_advanced', repo_name=c.repo_name)}">${_('Advanced')}</a>
                        </li>

rhodecode/templates/admin/repos/repo_edit_advanced.mako

0 +3 -3

                  $.each(data.results[0].children, function() {
                      // filter out the SAME repo, it cannot be used as fork of itself
-                     if (this.obj.repo_id != currentRepoId) {
-                         this.id = this.obj.repo_id;
+                     if (this.repo_id != currentRepoId) {
+                         this.id = this.repo_id;
                          results.push(this)
                      }
                  });
                  dropdownAutoWidth: true,
                  containerCssClass: "drop-menu",
                  dropdownCssClass: "drop-menu-dropdown",
-                 formatResult: formatResult,
+                 formatResult: formatRepoResult,
                  query: $.debounce(250, function(query){
                      self = this;
                      var cacheKey = query.term;

rhodecode/templates/admin/repos/repo_edit_audit.mako

0 +3 -1

                          <input class="q_filter_box ${'' if c.filter_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.filter_term or ''}" placeholder="${_('audit filter...')}"/>
                          <input type='submit' value="${_('filter')}" class="btn" />
                      ${h.end_form()}
-                     <p class="tooltip filterexample" style="position: inherit" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
+                     <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+                     <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
                      <%include file="/admin/admin_log_base.mako" />

rhodecode/templates/admin/repos/repo_edit_caches.mako

0 +60 -3

		@@ -36,14 +36,14 b''
36	36	<div class="field" >
37	37	<table class="rctable edit_cache">
38	38	<tr>
39		<th>${_('Prefix')}</th>
40	39	<th>${_('Key')}</th>
	40	<th>${_('Namespace')}</th>
41	41	<th>${_('Active')}</th>
42	42	</tr>
43	43	%for cache in c.rhodecode_db_repo.cache_keys:
44	44	<tr>
45		<td class="td-prefix">${cache.~~get_prefix~~() or ~~'-'~~}</td>
46		<td class="td-cachekey">${cache.cache_~~key~~}</td>
	45	<td class="td-prefix"><code>${cache.cache_key}</code></td>
	46	<td class="td-cachekey"><code>${cache.cache_args}</code></td>
47	47	<td class="td-active">${h.bool2icon(cache.cache_active)}</td>
48	48	</tr>
49	49	%endfor
		@@ -52,6 +52,63 b''
52	52	</div>
53	53	</div>
54	54
	55	<div class="panel panel-default">
	56	<div class="panel-heading">
	57	<h3 class="panel-title">
	58	${_('Cache keys')}
	59	</h3>
	60	</div>
	61	<div class="panel-body">
	62	<p>
	63	Cache keys used for storing cached values of repository stats,
	64	file tree history and file tree search.
	65	Invalidating the cache will remove those entries.
	66	</p>
	67	<pre>
	68	region: ${c.region.name}
	69	backend: ${c.region.actual_backend.__class__}
	70	store: ${c.region.actual_backend.get_store()}
	71
	72
	73	% if c.repo_keys:
	74	${len(c.repo_keys)} <a href="#showKeys" onclick="$('#show-keys').toggle()">${_('Show all')}</a>
	75	<span id="show-keys" style="display: none">
	76	% for k in c.repo_keys:
	77	- ${k}
	78	% endfor
	79	</span>
	80	% else:
	81	NO KEYS FOUND
	82	% endif
	83
	84	</pre>
	85
	86	</div>
	87	</div>
	88
	89
	90	<div class="panel panel-default">
	91	<div class="panel-heading">
	92	<h3 class="panel-title">${_('Shadow Repositories')}</h3>
	93	</div>
	94	<div class="panel-body">
	95	<table class="rctable edit_cache">
	96	% if c.shadow_repos:
	97	% for shadow_repo in c.shadow_repos:
	98	<tr>
	99	<td>${shadow_repo}</td>
	100	</tr>
	101	% endfor
	102	% else:
	103	<tr>
	104	<td>${_('No Shadow repositories exist for this repository.')}</td>
	105	</tr>
	106	% endif
	107
	108	</table>
	109	</div>
	110	</div>
	111
55	112
56	113	<div class="panel panel-default">
57	114	<div class="panel-heading">

rhodecode/templates/admin/repos/repo_edit_permissions.mako

0 +88 -10

                              <th class="td-radio">${_('Write')}</th>
                              <th class="td-radio">${_('Admin')}</th>
                              <th class="td-owner">${_('User/User Group')}</th>
-                             <th></th>
+                             <th class="td-action"></th>
+                             <th class="td-action"></th>
                          </tr>
                          ## USERS
                          %for _user in c.rhodecode_db_repo.permissions():
                                          %endif
                                      </td>
                                      <td></td>
+                                     <td class="quick_repo_menu">
+                                         % if c.rhodecode_user.is_admin:
+                                             <i class="icon-more"></i>
+                                             <div class="menu_items_container" style="display: none;">
+                                             <ul class="menu_items">
+                                               <li>
+                                                  ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
+                                               </li>
+                                             </ul>
+                                             </div>
+                                         % endif
+                                     </td>
                                  </tr>
                              %elif _user.username == h.DEFAULT_USER and c.rhodecode_db_repo.private:
                                  <tr>
                                          ${base.gravatar(h.DEFAULT_USER_EMAIL, 16)}
                                          ${h.DEFAULT_USER} - ${_('only users/user groups explicitly added here will have access')}</td>
                                      <td></td>
+                                     <td class="quick_repo_menu">
+                                         % if c.rhodecode_user.is_admin:
+                                             <i class="icon-more"></i>
+                                             <div class="menu_items_container" style="display: none;">
+                                             <ul class="menu_items">
+                                               <li>
+                                                  ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
+                                               </li>
+                                             </ul>
+                                             </div>
+                                         % endif
+                                     </td>
                                  </tr>
                              %else:
+                                 <% used_by_n_rules = len(getattr(_user, 'branch_rules', None) or []) %>
                                  <tr>
-                                     <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.none', checked=_user.permission=='repository.none')}</td>
-                                     <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.read', checked=_user.permission=='repository.read')}</td>
+                                     <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.none', checked=_user.permission=='repository.none', disabled="disabled" if (used_by_n_rules and _user.username != h.DEFAULT_USER) else None)}</td>
+                                     <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.read', checked=_user.permission=='repository.read', disabled="disabled" if (used_by_n_rules and _user.username != h.DEFAULT_USER) else None)}</td>
                                      <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.write', checked=_user.permission=='repository.write')}</td>
                                      <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.admin', checked=_user.permission=='repository.admin')}</td>
                                      <td class="td-user">
                                                  ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                              % else:
                                                  ${h.link_to_user(_user.username)}
+                                                 %if getattr(_user, 'duplicate_perm', None):
+                                                     (${_('inactive duplicate')})
+                                                 %endif
+                                                 %if getattr(_user, 'branch_rules', None):
+                                                     % if used_by_n_rules == 1:
+                                                         (${_('used by {} branch rule, requires write+ permissions').format(used_by_n_rules)})
+                                                     % else:
+                                                         (${_('used by {} branch rules, requires write+ permissions').format(used_by_n_rules)})
+                                                     % endif
+                                                 %endif
                                              % endif
                                          </span>
                                      </td>
                                      <td class="td-action">
-                                       %if _user.username != h.DEFAULT_USER:
+                                       %if _user.username != h.DEFAULT_USER and getattr(_user, 'branch_rules', None) is None:
                                          <span class="btn btn-link btn-danger revoke_perm"
                                                member="${_user.user_id}" member_type="user">
-                                         <i class="icon-remove"></i> ${_('Revoke')}
+                                         ${_('Remove')}
                                          </span>
                                        %endif
                                      </td>
+                                     <td class="quick_repo_menu">
+                                         % if c.rhodecode_user.is_admin:
+                                             <i class="icon-more"></i>
+                                             <div class="menu_items_container" style="display: none;">
+                                             <ul class="menu_items">
+                                               <li>
+                                                  % if _user.username == h.DEFAULT_USER:
+                                                     ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
+                                                 % else:
+                                                     ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
+                                                 % endif
+                                               </li>
+                                             </ul>
+                                             </div>
+                                         % endif
+                                     </td>
                                  </tr>
                              %endif
                          %endfor
                                  <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.write', checked=_user_group.permission=='repository.write')}</td>
                                  <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.admin', checked=_user_group.permission=='repository.admin')}</td>
                                  <td class="td-componentname">
-                                     <i class="icon-group" ></i>
+                                     <i class="icon-user-group"></i>
                                      %if h.HasPermissionAny('hg.admin')():
                                       <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                                           ${_user_group.users_group_name}
                                  <td class="td-action">
                                      <span class="btn btn-link btn-danger revoke_perm"
                                            member="${_user_group.users_group_id}" member_type="user_group">
-                                     <i class="icon-remove"></i> ${_('Revoke')}
+                                     ${_('Remove')}
                                      </span>
                                  </td>
+                                 <td class="quick_repo_menu">
+                                     % if c.rhodecode_user.is_admin:
+                                         <i class="icon-more"></i>
+                                         <div class="menu_items_container" style="display: none;">
+                                         <ul class="menu_items">
+                                           <li>
+                                              ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))}
+                                           </li>
+                                         </ul>
+                                         </div>
+                                     % endif
+                                 </td>
                              </tr>
                          %endfor
                          <tr class="new_members" id="add_perm_input"></tr>
+                         <tr>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td>
+                                 <span id="add_perm" class="link">
+                                     ${_('Add user/user group')}
+                                 </span>
+                             </td>
+                             <td></td>
+                         </tr>
                      </table>
-                     <div id="add_perm" class="link">
-                         ${_('Add new')}
-                     </div>
                      <div class="buttons">
                        ${h.submit('save',_('Save'),class_="btn btn-primary")}
                        ${h.reset('reset',_('Reset'),class_="btn btn-danger")}
                  $('.revoke_perm').on('click', function(e){
                      markRevokePermInput($(this), 'repository');
                  });
+                 quick_repo_menu();
              </script>

rhodecode/templates/admin/settings/settings.mako

0 +1 -1

                        </ul>
                    </div>
-                   <div class="main-content-full-width">
+                   <div class="main-content-auto-width">
                      ${self.main_content()}
                    </div>
                  </div>

rhodecode/templates/admin/settings/settings_email.mako

0 +4 0

                        <dd  title="${h.tooltip(tt)}">${dd}</dd>
                      %endfor
                      </dl>
+                     <span class="help-block">
+                         ${_('You can adjust those settings in [DEFAULT] section of .ini file located at')}: <br/>
+                         ${c.rhodecode_ini.get('__file__')}
+                     </span>
                  </div>
              </div>

rhodecode/templates/admin/user_groups/user_group_edit_perms.mako

0 +80 -8

                              <th class="td-radio">${_('Write')}</th>
                              <th class="td-radio">${_('Admin')}</th>
                              <th>${_('User/User Group')}</th>
-                             <th></th>
+                             <th class="td-action"></th>
+                             <th class="td-action"></th>
                          </tr>
                          ## USERS
                          %for _user in c.user_group.permissions():
+                             ## super admin/owner row
                              %if getattr(_user, 'admin_row', None) or getattr(_user, 'owner_row', None):
                                  <tr class="perm_admin_row">
                                      <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.none', disabled="disabled")}</td>
                                          </span>
                                      </td>
                                      <td></td>
+                                     <td class="quick_repo_menu">
+                                         % if c.rhodecode_user.is_admin:
+                                             <i class="icon-more"></i>
+                                             <div class="menu_items_container" style="display: none;">
+                                             <ul class="menu_items">
+                                               <li>
+                                                  ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
+                                               </li>
+                                             </ul>
+                                             </div>
+                                         % endif
+                                     </td>
                                  </tr>
                              %else:
                                  ##forbid revoking permission from yourself, except if you're an super admin
                                                  ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                              % else:
                                                  ${h.link_to_user(_user.username)}
+                                                 %if getattr(_user, 'duplicate_perm', None):
+                                                     (${_('inactive duplicate')})
+                                                 %endif
                                              % endif
                                          </span>
                                      </td>
                                        %if _user.username != h.DEFAULT_USER:
                                          <span class="btn btn-link btn-danger revoke_perm"
                                                member="${_user.user_id}" member_type="user">
-                                         <i class="icon-remove"></i> ${_('revoke')}
+                                         ${_('Remove')}
                                          </span>
                                        %endif
                                      </td>
+                                     <td class="quick_repo_menu">
+                                         % if c.rhodecode_user.is_admin:
+                                             <i class="icon-more"></i>
+                                             <div class="menu_items_container" style="display: none;">
+                                             <ul class="menu_items">
+                                               <li>
+                                                 % if _user.username == h.DEFAULT_USER:
+                                                     ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='user-groups-permissions'))}
+                                                 % else:
+                                                     ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
+                                                 % endif
+                                               </li>
+                                             </ul>
+                                             </div>
+                                         % endif
+                                     </td>
                                      %else:
-                                     ## special case for current user permissions, we make sure he cannot take his own permissions
+                                     ## special case for currently logged-in user permissions, we make sure he cannot take his own permissions
                                      <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'usergroup.none', disabled="disabled")}</td>
                                      <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'usergroup.read', disabled="disabled")}</td>
                                      <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'usergroup.write', disabled="disabled")}</td>
                                                  ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                              % else:
                                                  ${h.link_to_user(_user.username)}
+                                                 %if getattr(_user, 'duplicate_perm', None):
+                                                     (${_('inactive duplicate')})
+                                                 %endif
                                              % endif
                                              <span class="user-perm-help-text">(${_('delegated admin')})</span>
                                          </span>
                                      </td>
                                      <td></td>
+                                     <td class="quick_repo_menu">
+                                         % if c.rhodecode_user.is_admin:
+                                             <i class="icon-more"></i>
+                                             <div class="menu_items_container" style="display: none;">
+                                             <ul class="menu_items">
+                                               <li>
+                                                  ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
+                                               </li>
+                                             </ul>
+                                             </div>
+                                         % endif
+                                     </td>
                                      %endif
                                  </tr>
                              %endif
                                  <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.write')}</td>
                                  <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.admin')}</td>
                                  <td class="td-user">
-                                     <i class="icon-group" ></i>
+                                     <i class="icon-user-group"></i>
                                      %if h.HasPermissionAny('hg.admin')():
                                       <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                                           ${_user_group.users_group_name}
                                  <td class="td-action">
                                      <span class="btn btn-link btn-danger revoke_perm"
                                            member="${_user_group.users_group_id}" member_type="user_group">
-                                     <i class="icon-remove"></i> ${_('revoke')}
+                                     ${_('Remove')}
                                      </span>
                                  </td>
+                                 <td class="quick_repo_menu">
+                                     % if c.rhodecode_user.is_admin:
+                                         <i class="icon-more"></i>
+                                         <div class="menu_items_container" style="display: none;">
+                                         <ul class="menu_items">
+                                           <li>
+                                              ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='user-groups-permissions'))}
+                                           </li>
+                                         </ul>
+                                         </div>
+                                     % endif
+                                 </td>
                              </tr>
                          %endfor
                          <tr class="new_members" id="add_perm_input"></tr>
+                         <tr>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td></td>
+                             <td>
+                                 <span id="add_perm" class="link">
+                                     ${_('Add user/user group')}
+                                 </span>
+                             </td>
+                             <td></td>
+                         </tr>
                      </table>
-                     <div id="add_perm" class="link">
-                         ${_('Add new')}
-                     </div>
                      <div class="buttons">
                        ${h.submit('save',_('Save'),class_="btn btn-primary")}
                        ${h.reset('reset',_('Reset'),class_="btn btn-danger")}
                  $('.revoke_perm').on('click', function(e){
                      markRevokePermInput($(this), 'usergroup');
                  });
+                 quick_repo_menu()
              </script>

rhodecode/templates/admin/user_groups/user_groups.mako

0 +28 -21

              <%def name="breadcrumbs_links()">
                  <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-                 ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_group_count">0</span> ${_('user groups')}
+                 ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_group_count">0</span>
              </%def>
              <%def name="menu_bar_nav()">
              </div>
              <script>
              $(document).ready(function() {
-                 var getDatatableCount = function(){
-                   var table = $('#user_group_list_table').dataTable();
-                   var page = table.api().page.info();
-                   var  active = page.recordsDisplay;
-                   var  total = page.recordsTotal;
-                   var _text = _gettext("{0} out of {1} users").format(active, total);
-                   $('#user_group_count').text(_text);
-                 };
+                 var $userGroupsListTable = $('#user_group_list_table');
                  // user list
-                 $('#user_group_list_table').DataTable({
+                 $userGroupsListTable.DataTable({
                    processing: true,
                    serverSide: true,
-                   ajax: "${h.route_path('user_groups_data')}",
+                   ajax: {
+                       "url": "${h.route_path('user_groups_data')}",
+                       "dataSrc": function (json) {
+                           var filteredCount = json.recordsFiltered;
+                           var filteredInactiveCount = json.recordsFilteredInactive;
+                           var totalInactive = json.recordsTotalInactive;
+                           var total = json.recordsTotal;
+                           var _text = _gettext(
+                                   "{0} ({1} inactive) of {2} user groups ({3} inactive)").format(
+                                   filteredCount, filteredInactiveCount, total, totalInactive);
+                           if (total === filteredCount) {
+                               _text = _gettext(
+                                       "{0} user groups ({1} inactive)").format(total, totalInactive);
+                           }
+                           $('#user_group_count').text(_text);
+                           return json.data;
+                       },
+                   },
                    dom: 'rtp',
                    pageLength: ${c.visual.admin_grid_items},
                    order: [[ 0, "asc" ]],
                    }
                  });
-                 $('#user_group_list_table').on('xhr.dt', function(e, settings, json, xhr){
-                     $('#user_group_list_table').css('opacity', 1);
+                 $userGroupsListTable.on('xhr.dt', function(e, settings, json, xhr){
+                     $userGroupsListTable.css('opacity', 1);
                  });
-                 $('#user_group_list_table').on('preXhr.dt', function(e, settings, data){
-                     $('#user_group_list_table').css('opacity', 0.3);
-                 });
-                 // refresh counters on draw
-                 $('#user_group_list_table').on('draw.dt', function(){
-                     getDatatableCount();
+                 $userGroupsListTable.on('preXhr.dt', function(e, settings, data){
+                     $userGroupsListTable.css('opacity', 0.3);
                  });
                  // filter

rhodecode/templates/admin/users/user_edit.mako

0 +1 0

                        <li class="${'active' if c.active=='ips' else ''}"><a href="${h.route_path('edit_user_ips', user_id=c.user.user_id)}">${_('Ip Whitelist')}</a></li>
                        <li class="${'active' if c.active=='groups' else ''}"><a href="${h.route_path('edit_user_groups_management', user_id=c.user.user_id)}">${_('User Groups Management')}</a></li>
                        <li class="${'active' if c.active=='audit' else ''}"><a href="${h.route_path('edit_user_audit_logs', user_id=c.user.user_id)}">${_('Audit logs')}</a></li>
+                       <li class="${'active' if c.active=='caches' else ''}"><a href="${h.route_path('edit_user_caches', user_id=c.user.user_id)}">${_('Caches')}</a></li>
                      </ul>
                  </div>

rhodecode/templates/admin/users/user_edit_audit.mako

0 +3 -1

                          <input class="q_filter_box ${'' if c.filter_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.filter_term or ''}" placeholder="${_('audit filter...')}"/>
                          <input type='submit' value="${_('filter')}" class="btn" />
                      ${h.end_form()}
-                     <p class="tooltip filterexample" style="position: inherit" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
+                     <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+                     <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
                      <%include file="/admin/admin_log_base.mako" />

rhodecode/templates/admin/users/user_edit_auth_tokens.mako

0 +2 -2

                  $.each(data.results[0].children, function() {
                      // replace name to ID for submision
-                     this.id = this.obj.repo_id;
+                     this.id = this.repo_id;
                      results.push(this);
                  });
                  dropdownAutoWidth: true,
                  containerCssClass: "drop-menu",
                  dropdownCssClass: "drop-menu-dropdown",
-                 formatResult: formatResult,
+                 formatResult: formatRepoResult,
                  query: $.debounce(250, function(query){
                      self = this;
                      var cacheKey = query.term;

rhodecode/templates/admin/users/user_edit_groups.mako

0 +1 -1

                       { data: {"_": "group_name",
                                "sort": "group_name"}, title: "${_('Name')}", className: "td-componentname," ,
                          render: function (data,type,full,meta)
-                                 {return '<div><i class="icon-group" title="User group">'+data+'</i></div>'}},
+                                 {return '<div><i class="icon-user-group" title="User group">'+data+'</i></div>'}},
                       { data: {"_": "group_description",
                                "sort": "group_description"}, title: "${_('Description')}", className: "td-description" },

rhodecode/templates/admin/users/user_edit_ssh_keys.mako

0 +3 -1

                          <tr>
                              <th>${_('Fingerprint')}</th>
                              <th>${_('Description')}</th>
-                             <th>${_('Created')}</th>
+                             <th>${_('Created on')}</th>
+                             <th>${_('Accessed on')}</th>
                              <th>${_('Action')}</th>
                          </tr>
                          %if c.user_ssh_keys:
                                  </td>
                                  <td class="td-wrap">${ssh_key.description}</td>
                                  <td class="td-tags">${h.format_date(ssh_key.created_on)}</td>
+                                 <td class="td-tags">${h.format_date(ssh_key.accessed_on)}</td>
                                  <td class="td-action">
                                      ${h.secure_form(h.route_path('edit_user_ssh_keys_delete', user_id=c.user.user_id), request=request)}

rhodecode/templates/admin/users/users.mako

0 +20 -17

              $(document).ready(function() {
                  var $userListTable = $('#user_list_table');
-                 var getDatatableCount = function(){
-                   var table = $userListTable.dataTable();
-                   var page = table.api().page.info();
-                   var  active = page.recordsDisplay;
-                   var  total = page.recordsTotal;
-                   var _text = _gettext("{0} out of {1} users").format(active, total);
-                   $('#user_count').text(_text);
-                 };
                  // user list
                  $userListTable.DataTable({
                    processing: true,
                    serverSide: true,
-                   ajax: "${h.route_path('users_data')}",
+                   ajax: {
+                       "url": "${h.route_path('users_data')}",
+                       "dataSrc": function ( json ) {
+                           var filteredCount = json.recordsFiltered;
+                           var filteredInactiveCount = json.recordsFilteredInactive;
+                           var totalInactive = json.recordsTotalInactive;
+                           var total = json.recordsTotal;
+                           var _text = _gettext(
+                               "{0} ({1} inactive) of {2} users ({3} inactive)").format(
+                                   filteredCount, filteredInactiveCount, total, totalInactive);
+                           if(total === filteredCount){
+                               _text = _gettext(
+                                   "{0} users ({1} inactive)").format(total, totalInactive);
+                           }
+                           $('#user_count').text(_text);
+                           return json.data;
+                       }
+                   },
                    dom: 'rtp',
                    pageLength: ${c.visual.admin_grid_items},
                    order: [[ 0, "asc" ]],
                      $userListTable.css('opacity', 0.3);
                  });
-                 // refresh counters on draw
-                 $userListTable.on('draw.dt', function(){
-                     getDatatableCount();
-                 });
                  // filter
                  $('#q_filter').on('keyup',
                      $.debounce(250, function() {

rhodecode/templates/base/base.mako

0 +163 -91

		@@ -226,7 +226,7 b''
226	226	<!--- CONTEXT BAR -->
227	227	<div id="context-bar">
228	228	<div class="wrapper">
229		<ul id="context-pages" class="horizontal-list ~~navigation~~">
	229	<ul id="context-pages" class="navigation horizontal-list">
230	230	<li class="${is_active('summary')}"><a class="menulink" href="${h.route_path('repo_summary', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li>
231	231	<li class="${is_active('changelog')}"><a class="menulink" href="${h.route_path('repo_changelog', repo_name=c.repo_name)}"><div class="menulabel">${_('Changelog')}</div></a></li>
232	232	<li class="${is_active('files')}"><a class="menulink" href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.rhodecode_db_repo.landing_rev[1], f_path='')}"><div class="menulabel">${_('Files')}</div></a></li>
		@@ -385,11 +385,42 b''
385	385	return "active"
386	386	return ""
387	387	%>
	388
388	389	<ul id="quick" class="main_nav navigation horizontal-list">
389		<!-- repo switcher -->
390		<li class="${is_active('repositories')} repo_switcher_li has_select2">
391		<input id="repo_switcher" name="repo_switcher" type="hidden">
392		</li>
	390	## notice box for important system messages
	391	<li style="display: none">
	392	<a class="notice-box" href="#openNotice" onclick="showNoticeBox(); return false">
	393	<div class="menulabel-notice" >
	394	0
	395	</div>
	396	</a>
	397	</li>
	398
	399	## Main filter
	400	<li>
	401	<div class="menulabel main_filter_box">
	402	<div class="main_filter_input_box">
	403	<input class="main_filter_input" id="main_filter" size="15" type="text" name="main_filter" placeholder="${_('search / go to...')}" value=""/>
	404	</div>
	405	<div class="main_filter_help_box">
	406	<a href="#showFilterHelp" onclick="showMainFilterBox(); return false">?</a>
	407	</div>
	408	</div>
	409
	410	<div id="main_filter_help" style="display: none">
	411	Use '/' key to quickly access this field.
	412	Enter name of repository, or repository group for quick search.
	413
	414	Prefix query to allow special search:
	415
	416	user:admin, to search for usernames
	417
	418	user_group:devops, to search for user groups
	419
	420	commit:efced4, to search for commits
	421
	422	</div>
	423	</li>
393	424
394	425	## ROOT MENU
395	426	%if c.rhodecode_user.username != h.DEFAULT_USER:
		@@ -432,109 +463,149 b''
432	463	c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
433	464	</li>
434	465	% endif
	466	## render extra user menu
	467	${usermenu(active=(active=='my_account'))}
	468
435	469	% if c.debug_style:
436		<li class="${is_active('debug_style')}">
	470	<li>
437	471	<a class="menulink" title="${_('Style')}" href="${h.route_path('debug_style_home')}">
438		<div class="menulabel">${_('Style')}</div>
	472	<div class="menulabel">${_('[Style]')}</div>
439	473	</a>
440	474	</li>
441	475	% endif
442		## render extra user menu
443		${usermenu(active=(active=='my_account'))}
444	476	</ul>
445	477
446	478	<script type="text/javascript">
447		var visual~~_show_public_i~~con = "${c.visual.show_public_icon}" == "True";
448
449		/format the look of items in the list/
450		var format = function(state, escapeMarkup){
451		if (!state.id){
452		return state.text; // optgroup
453		}
454		var obj_dict = state.obj;
455		var tmpl = '';
	479	var visualShowPublicIcon = "${c.visual.show_public_icon}" == "True";
456	480
457		if(obj_dict && state.type == 'repo'){
458		if(obj_dict['repo_type'] === 'hg'){
459		tmpl += '<i class="icon-hg"></i> ';
460		}
461		else if(obj_dict['repo_type'] === 'git'){
462		tmpl += '<i class="icon-git"></i> ';
463		}
464		else if(obj_dict['repo_type'] === 'svn'){
465		tmpl += '<i class="icon-svn"></i> ';
	481	var formatRepoResult = function(result, container, query, escapeMarkup) {
	482	return function(data, escapeMarkup) {
	483	if (!data.repo_id){
	484	return data.text; // optgroup text Repositories
466	485	}
467		if(obj_dict['private']){
468		tmpl += '~~<i class="icon-lock" ></i>~~ ';
469		}
470		else if(visual_show_public_icon){
471		tmpl += '<i class="icon-unlock-alt"></i> ';
	486
	487	var tmpl = '';
	488	var repoType = data['repo_type'];
	489	var repoName = data['text'];
	490
	491	if(data && data.type == 'repo'){
	492	if(repoType === 'hg'){
	493	tmpl += '<i class="icon-hg"></i> ';
	494	}
	495	else if(repoType === 'git'){
	496	tmpl += '<i class="icon-git"></i> ';
	497	}
	498	else if(repoType === 'svn'){
	499	tmpl += '<i class="icon-svn"></i> ';
	500	}
	501	if(data['private']){
	502	tmpl += '<i class="icon-lock" ></i> ';
	503	}
	504	else if(visualShowPublicIcon){
	505	tmpl += '<i class="icon-unlock-alt"></i> ';
	506	}
472	507	}
473		}
474		if(obj_dict && state.type == 'commit') {
475		tmpl += '<i class="icon-tag"></i>';
476		}
477		if(obj_dict && state.type == 'group'){
478		tmpl += '<i class="icon-folder-close"></i> ';
479		}
480		tmpl += escapeMarkup(state.text);
481		return tmpl;
482		};
	508	tmpl += escapeMarkup(repoName);
	509	return tmpl;
483	510
484		var formatResult = function(result, container, query, escapeMarkup) {
485		return format(result, escapeMarkup);
486		};
487
488		var formatSelection = function(data, container, escapeMarkup) {
489		return format(data, escapeMarkup);
	511	}(result, escapeMarkup);
490	512	};
491	513
492		$("#repo_switcher").select2({
493		cachedDataSource: {},
494		minimumInputLength: 2,
495		placeholder: '<div class="menulabel">${_('Go to')} <div class="show_more"></div></div>',
496		dropdownAutoWidth: true,
497		formatResult: formatResult,
498		formatSelection: formatSelection,
499		containerCssClass: "repo-switcher",
500		dropdownCssClass: "repo-switcher-dropdown",
501		escapeMarkup: function(m){
502		// don't escape our custom placeholder
503		if(m.substr(0,23) == '<div class="menulabel">'){
504		~~return~~ m;
505		}
	514
	515	var autocompleteMainFilterFormatResult = function (data, value, org_formatter) {
	516
	517	if (value.split(':').length === 2) {
	518	value = value.split(':')[1]
	519	}
	520
	521	var searchType = data['type'];
	522	var valueDisplay = data['value_display'];
	523
	524	var escapeRegExChars = function (value) {
	525	return value.replace(/[\-\[\]\/\{\}\*\+\?\.\\\^\$\\|]/g, "\\$&");
	526	};
	527	var pattern = '(' + escapeRegExChars(value) + ')';
	528
	529	// highlight match
	530	valueDisplay = Select2.util.escapeMarkup(valueDisplay);
	531	valueDisplay = valueDisplay.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
	532
	533	var icon = '';
506	534
507		return Select2.util.escapeMarkup(m);
508		},
509		query: $.debounce(250, function(query){
510		self = this;
511		var cacheKey = query.term;
512		var cachedData = self.cachedDataSource[cacheKey];
	535	if (searchType === 'hint') {
	536	icon += '<i class="icon-folder-close"></i> ';
	537	}
	538	else if (searchType === 'search') {
	539	icon += '<i class="icon-more"></i> ';
	540	}
	541	else if (searchType === 'repo') {
	542	if (data['repo_type'] === 'hg') {
	543	icon += '<i class="icon-hg"></i> ';
	544	}
	545	else if (data['repo_type'] === 'git') {
	546	icon += '<i class="icon-git"></i> ';
	547	}
	548	else if (data['repo_type'] === 'svn') {
	549	icon += '<i class="icon-svn"></i> ';
	550	}
	551	if (data['private']) {
	552	icon += '<i class="icon-lock" ></i> ';
	553	}
	554	else if (visualShowPublicIcon) {
	555	icon += '<i class="icon-unlock-alt"></i> ';
	556	}
	557	}
	558	else if (searchType === 'repo_group') {
	559	icon += '<i class="icon-folder-close"></i> ';
	560	}
	561	else if (searchType === 'user_group') {
	562	icon += '<i class="icon-group"></i> ';
	563	}
	564	else if (searchType === 'user') {
	565	icon += '<img class="gravatar" src="{0}"/>'.format(data['icon_link']);
	566	}
	567	else if (searchType === 'commit') {
	568	icon += '<i class="icon-tag"></i>';
	569	}
513	570
514		if (cachedData) {
515		query.callback({results: cachedData.results});
516		} else {
517		$.ajax({
518		url: pyroutes.url('goto_switcher_data'),
519		data: {'query': query.term},
520		~~dataType~~: ~~'json'~~,
521		type: 'GET',
522		success: function(data) {
523		self.cachedDataSource[cacheKey] = data;
524		query.callback({results: data.results});
525		},
526		error: function(data, textStatus, errorThrown) {
527		alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
528		}
529		})
530		}
531		})
	571	var tmpl = '<div class="ac-container-wrap">{0}{1}</div>';
	572	return tmpl.format(icon, valueDisplay);
	573	};
	574
	575	var handleSelect = function(element, suggestion) {
	576	if (suggestion.type === "hint") {
	577	// we skip action
	578	$('#main_filter').focus();
	579	} else {
	580	window.location = suggestion['url'];
	581	}
	582	};
	583	var autocompleteMainFilterResult = function (suggestion, originalQuery, queryLowerCase) {
	584	if (queryLowerCase.split(':').length === 2) {
	585	queryLowerCase = queryLowerCase.split(':')[1]
	586	}
	587	return suggestion.value_display.toLowerCase().indexOf(queryLowerCase) !== -1;
	588	};
	589
	590	$('#main_filter').autocomplete({
	591	serviceUrl: pyroutes.url('goto_switcher_data'),
	592	params: {"repo_group_id": templateContext.repo_group_id},
	593	minChars:2,
	594	maxHeight:400,
	595	deferRequestBy: 300, //miliseconds
	596	tabDisabled: true,
	597	autoSelectFirst: true,
	598	formatResult: autocompleteMainFilterFormatResult,
	599	lookupFilter: autocompleteMainFilterResult,
	600	onSelect: function(element, suggestion){
	601	handleSelect(element, suggestion);
	602	return false;
	603	}
532	604	});
533	605
534		$("#repo_switcher").on('select2-selecting', function(e){
535		e.preventDefault();
536		window.location = e.choice.url;
537		});
	606	showMainFilterBox = function () {
	607	$('#main_filter_help').toggle();
	608	}
538	609
539	610	</script>
540	611	<script src="${h.asset('js/rhodecode/base/keyboard-bindings.js', ver=c.rhodecode_version_hash)}"></script>
		@@ -557,7 +628,7 b''
557	628	</tr>
558	629	<%
559	630	elems = [
560		('/', '~~Open~~ quick search box'),
	631	('/', 'Use quick search box'),
561	632	('g h', 'Goto home page'),
562	633	('g g', 'Goto my private gists page'),
563	634	('g G', 'Goto my public gists page'),
		@@ -611,3 +682,4 b''
611	682	</div><!-- /.modal-content -->
612	683	</div><!-- /.modal-dialog -->
613	684	</div><!-- /.modal -->
	685

rhodecode/templates/base/perms_summary.mako

0 +125 -21

              ##    ${p.perms_summary(c.perm_user.permissions)}
              <%def name="perms_summary(permissions, show_all=False, actions=True, side_link=None)">
+             <% section_to_label = {
+                 'global': 'Global Permissions',
+                 'repository_branches': 'Repository Branch Rules',
+                 'repositories': 'Repository Permissions',
+                 'user_groups': 'User Group Permissions',
+                 'repositories_groups': 'Repository Group Permissions',
+             } %>
              <div id="perms" class="table fields">
-               %for section in sorted(permissions.keys()):
+               %for section in sorted(permissions.keys(), key=lambda item: {'global': 0, 'repository_branches': 1}.get(item, 1000)):
+               <% total_counter = 0 %>
                <div class="panel panel-default">
-                 <div class="panel-heading">
-                     <h3 class="panel-title">${section.replace("_"," ").capitalize()}</h3>
+                 <div class="panel-heading" id="${section.replace("_","-")}-permissions">
+                     <h3 class="panel-title">${section_to_label.get(section, section)} - <span id="total_count_${section}"></span>
+                     <a class="permalink" href="#${section.replace("_","-")}-permissions"> ¶</a>
+                     </h3>
                      % if side_link:
                          <div class="pull-right">
                              <a href="${side_link}">${_('in JSON format')}</a>
                  <div class="panel-body">
                    <div class="perms_section_head field">
                      <div class="radios">
-                       %if section != 'global':
+                       % if section == 'repository_branches':
                            <span class="permissions_boxes">
                            <span class="desc">${_('show')}: </span>
-                           ${h.checkbox('perms_filter_none_%s' % section, 'none', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='none')}   <label for="${'perms_filter_none_%s' % section}"><span class="perm_tag none">${_('none')}</span></label>
-                           ${h.checkbox('perms_filter_read_%s' % section, 'read', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='read')}   <label for="${'perms_filter_read_%s' % section}"><span class="perm_tag read">${_('read')}</span></label>
-                           ${h.checkbox('perms_filter_write_%s' % section, 'write', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='write')} <label for="${'perms_filter_write_%s' % section}"> <span class="perm_tag write">${_('write')}</span></label>
-                           ${h.checkbox('perms_filter_admin_%s' % section, 'admin', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='admin')} <label for="${'perms_filter_admin_%s' % section}"><span class="perm_tag admin">${_('admin')}</span></label>
+                           ${h.checkbox('perms_filter_none_%s' % section, 'none', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='none')}   <label for="${'perms_filter_none_{}'.format(section)}"><span class="perm_tag none">${_('none')}</span></label>
+                           ${h.checkbox('perms_filter_merge_%s' % section, 'merge', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='merge')}   <label for="${'perms_filter_merge_{}'.format(section)}"><span class="perm_tag merge">${_('merge')}</span></label>
+                           ${h.checkbox('perms_filter_push_%s' % section, 'push', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='push')} <label for="${'perms_filter_push_{}'.format(section)}"> <span class="perm_tag push">${_('push')}</span></label>
+                           ${h.checkbox('perms_filter_push_force_%s' % section, 'push_force', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='push_force')} <label for="${'perms_filter_push_force_{}'.format(section)}"><span class="perm_tag push_force">${_('push force')}</span></label>
                            </span>
-                       %endif
+                       % elif section != 'global':
+                           <span class="permissions_boxes">
+                           <span class="desc">${_('show')}: </span>
+                           ${h.checkbox('perms_filter_none_%s' % section, 'none', '', class_='perm_filter filter_%s' % section, section=section, perm_type='none')}   <label for="${'perms_filter_none_{}'.format(section)}"><span class="perm_tag none">${_('none')}</span></label>
+                           ${h.checkbox('perms_filter_read_%s' % section, 'read', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='read')}   <label for="${'perms_filter_read_{}'.format(section)}"><span class="perm_tag read">${_('read')}</span></label>
+                           ${h.checkbox('perms_filter_write_%s' % section, 'write', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='write')} <label for="${'perms_filter_write_{}'.format(section)}"> <span class="perm_tag write">${_('write')}</span></label>
+                           ${h.checkbox('perms_filter_admin_%s' % section, 'admin', 'checked', class_='perm_filter filter_%s' % section, section=section, perm_type='admin')} <label for="${'perms_filter_admin_{}'.format(section)}"><span class="perm_tag admin">${_('admin')}</span></label>
+                           </span>
+                       % endif
                      </div>
                    </div>
                    <div class="field">
                                    %endif
                                  %else:
                                    %if not val_lbl:
-                                       ${
-                                          {'false': False,
+                                       ${{'false': False,
                                           'true': True,
                                           'none': False,
-                                          'repository': True}.get(val[1][0] if 0 < len(val[1]) else 'false')
+                                       }
+                                          'repository': True}.get(val[1][0] if 0 < len(val[1]) else 'false')}
                                    %else:
                                        <span class="perm_tag ${val[1][0]}">${val_lbl}.${val[1][0]}</span>
                                    %endif
                              edit_url=h.route_path('user_edit_global_perms', user_id=c.user.user_id), edit_global_url=h.route_path('admin_permissions_object'))}
                         </tbody>
+                       ## Branch perms
+                       %elif section == 'repository_branches':
+                         <thead>
+                             <tr>
+                             <th>${_('Name')}</th>
+                             <th>${_('Pattern')}</th>
+                             <th>${_('Permission')}</th>
+                             %if actions:
+                             <th>${_('Edit Branch Permission')}</th>
+                             %endif
+                         </thead>
+                         <tbody class="section_${section}">
+                         <%
+                             def name_sorter(permissions):
+                                 def custom_sorter(item):
+                                     return item[0]
+                                 return sorted(permissions, key=custom_sorter)
+                             def branch_sorter(permissions):
+                                 def custom_sorter(item):
+                                    ## none, merge, push, push_force
+                                    section = item[1].split('.')[-1]
+                                    section_importance = {'none': u'0',
+                                                          'merge': u'1',
+                                                          'push': u'2',
+                                                          'push_force': u'3'}.get(section)
+                                    ## sort by importance + name
+                                    return section_importance + item[0]
+                                 return sorted(permissions, key=custom_sorter)
+                         %>
+                         %for k, section_perms in name_sorter(permissions[section].items()):
+                             ## for display purposes, for non super-admins we need to check if shown
+                             ## repository is actually accessible for user
+                             <% repo_perm = permissions['repositories'][k] %>
+                             % if repo_perm == 'repository.none' and not c.rhodecode_user.is_admin:
+                                 ## skip this entry
+                                 <% continue %>
+                             % endif
+                             <% total_counter +=1 %>
+                             % for pattern, perm in branch_sorter(section_perms.items()):
+                                 <tr class="perm_row ${'{}_{}'.format(section, perm.split('.')[-1])}">
+                                     <td class="td-name">
+                                         <a href="${h.route_path('repo_summary',repo_name=k)}">${k}</a>
+                                     </td>
+                                     <td>${pattern}</td>
+                                     <td class="td-tags">
+                                         ## TODO: calculate origin somehow
+                                         ## % for i, ((_pat, perm), origin) in enumerate((permissions[section].perm_origin_stack[k])):
+                                          <div>
+                                              <% i = 0 %>
+                                              <% origin = 'unknown' %>
+                                              <% _css_class = i > 0 and 'perm_overriden' or '' %>
+                                              <span class="${_css_class} perm_tag ${perm.split('.')[-1]}">
+                                               ${perm}
+                                               ##(${origin})
+                                              </span>
+                                          </div>
+                                         ## % endfor
+                                     </td>
+                                     %if actions:
+                                     <td class="td-action">
+                                         <a href="${h.route_path('edit_repo_perms_branch',repo_name=k)}">${_('edit')}</a>
+                                     </td>
+                                     %endif
+                                 </tr>
+                             % endfor
+                         %endfor
+                         </tbody>
+                       ## Repos/Repo Groups/users groups perms
                        %else:
-                        ## none/read/write/admin permissions on groups/repos etc
                          <thead>
                              <tr>
                                  return sorted(permissions, key=custom_sorter)
                          %>
                          %for k, section_perm in sorter(permissions[section].items()):
-                             %if section_perm.split('.')[-1] != 'none' or show_all:
-                             <tr class="perm_row ${'%s_%s' % (section, section_perm.split('.')[-1])}">
+                             <% perm_value = section_perm.split('.')[-1] %>
+                             <% _css_class = 'display:none' if perm_value in ['none'] else '' %>
+                             %if perm_value != 'none' or show_all:
+                             <tr class="perm_row ${'{}_{}'.format(section, section_perm.split('.')[-1])}" style="${_css_class}">
                                  <td class="td-name">
                                      %if section == 'repositories':
                                          <a href="${h.route_path('repo_summary',repo_name=k)}">${k}</a>
                                    %if hasattr(permissions[section], 'perm_origin_stack'):
                                       <div>
                                       %for i, (perm, origin) in enumerate(reversed(permissions[section].perm_origin_stack[k])):
+                                      <% _css_class =  i > 0 and 'perm_overriden' or '' %>
                                       % if i > 0:
                                           <div style="color: #979797">
                                           <i class="icon-arrow_up"></i>
                                       % endif
                                       <div>
-                                          <span class="${i > 0 and 'perm_overriden' or ''} perm_tag ${perm.split('.')[-1]}">
+                                          <span class="${_css_class} perm_tag ${perm.split('.')[-1]}">
                                            ${perm} (${origin})
                                           </span>
                                       </div>
                                  </td>
                                  %endif
                              </tr>
+                             <% total_counter +=1 %>
-                             %endif
-                         %endfor
                          <tr id="empty_${section}" class="noborder" style="display:none;">
-                           <td colspan="6">${_('No permission defined')}</td>
+                           <td colspan="6">${_('No matching permission defined')}</td>
                          </tr>
                          </tbody>
                    </div>
                  </div>
                </div>
+               <script>
+                 $('#total_count_${section}').html(${total_counter})
+               </script>
-               %endfor
              </div>
              <script>
                  $(document).ready(function(){
-                     var show_empty = function(section){
+                     var showEmpty = function(section){
                          var visible = $('.section_{0} tr.perm_row:visible'.format(section)).length;
-                         if(visible == 0){
+                         if(visible === 0){
                              $('#empty_{0}'.format(section)).show();
                          }
                          else{
                              $('#empty_{0}'.format(section)).hide();
                          }
                      };
                      $('.perm_filter').on('change', function(e){
                          var self = this;
                          var section = $(this).attr('section');
                                  $('.'+section+'_'+perm_type).hide();
                              }
                          });
-                         show_empty(section);
+                         showEmpty(section);
                      })
                  })
              </script>

rhodecode/templates/base/root.mako

0 +5 -28

                  c.template_context['repo_type'] = c.rhodecode_db_repo.repo_type
                  c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_rev[1]
+             if getattr(c, 'repo_group', None):
+                 c.template_context['repo_group_id'] = c.repo_group.group_id
              if getattr(c, 'rhodecode_user', None) and c.rhodecode_user.user_id:
                  c.template_context['rhodecode_user']['username'] = c.rhodecode_user.username
                  c.template_context['rhodecode_user']['email'] = c.rhodecode_user.email
              %>
              <html xmlns="http://www.w3.org/1999/xhtml">
                  <head>
-                     <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.min.js', ver=c.rhodecode_version_hash)}"></script>
+                     <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.js', ver=c.rhodecode_version_hash)}"></script>
                      <link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}">
                      <title>${self.title()}</title>
                      <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
                      ## JAVASCRIPT
                      <%def name="js()">
-                         <script>
-                             // setup Polymer options
-                             window.Polymer = {lazyRegister: true, dom: 'shadow'};
-                             // Load webcomponentsjs polyfill if browser does not support native Web Components
-                             (function() {
-                                 'use strict';
-                                 var onload = function() {
-                                     // For native Imports, manually fire WebComponentsReady so user code
-                                     // can use the same code path for native and polyfill'd imports.
-                                     if (!window.HTMLImports) {
-                                         document.dispatchEvent(
-                                                 new CustomEvent('WebComponentsReady', {bubbles: true})
-                                         );
+                                     }
-                                 };
-                                 var webComponentsSupported = (
-                                         'registerElement' in document
-                                         && 'import' in document.createElement('link')
-                                         && 'content' in document.createElement('template')
-                                 );
-                                 if (!webComponentsSupported) {
-                                 } else {
-                                     onload();
+                                 }
-                             })();
-                         </script>
                          <script src="${h.asset('js/rhodecode/i18n/%s.js' % c.language, ver=c.rhodecode_version_hash)}"></script>
                          <script type="text/javascript">
                          var templateContext = ${h.json.dumps(c.template_context)|n};
                          var APPLICATION_URL = "${h.route_path('home').rstrip('/')}";
+                         var APPLICATION_PLUGINS = [];
                          var ASSET_URL = "${h.asset('')}";
                          var DEFAULT_RENDERER = "${h.get_visual_attr(c, 'default_renderer')}";
                          var CSRF_TOKEN = "${getattr(c, 'csrf_token', '')}";

rhodecode/templates/changeset/changeset.mako

0 +2 -2

                        </div>
                        <div class="pull-right">
                            <span id="parent_link">
-                             <a href="#parentCommit" title="${_('Parent Commit')}">${_('Parent')}</a>
+                             <a href="#parentCommit" title="${_('Parent Commit')}"><i class="icon-left icon-no-margin"></i>${_('parent')}</a>
                            </span>
                             |
                            <span id="child_link">
-                             <a href="#childCommit" title="${_('Child Commit')}">${_('Child')}</a>
+                             <a href="#childCommit" title="${_('Child Commit')}">${_('child')}<i class="icon-right icon-no-margin"></i></a>
                            </span>
                        </div>
                    </div>

rhodecode/templates/changeset/changeset_file_comment.mako

0 +5 -4

              <%def name="comment_block(comment, inline=False)">
                <% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %>
+               <% latest_ver = len(getattr(c, 'versions', [])) %>
                % if inline:
                    <% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version_num', None)) %>
                % else:
                                <div class="pr-version-inline">
                                  <a href="${request.current_route_path(_query=dict(version=comment.pull_request_version_id), _anchor='comment-{}'.format(comment.comment_id))}">
                                  % if outdated_at_ver:
-                                     <code class="pr-version-num" title="${_('Outdated comment from pull request version {0}').format(pr_index_ver)}">
+                                     <code class="pr-version-num" title="${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
                                          outdated ${'v{}'.format(pr_index_ver)} |
                                      </code>
                                  % elif pr_index_ver:
-                                     <code class="pr-version-num" title="${_('Comment from pull request version {0}').format(pr_index_ver)}">
+                                     <code class="pr-version-num" title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
                                          ${'v{}'.format(pr_index_ver)} |
                                      </code>
                                  % endif
                                  <div class="pr-version">
                                    % if comment.outdated:
                                      <a href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}">
-                                         ${_('Outdated comment from pull request version {}').format(pr_index_ver)}
+                                         ${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}
                                      </a>
                                    % else:
-                                     <div title="${_('Comment from pull request version {0}').format(pr_index_ver)}">
+                                     <div title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
                                          <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}">
                                          <code class="pr-version-num">
                                              ${'v{}'.format(pr_index_ver)}

rhodecode/templates/codeblocks/diffs.mako

0 +8 -3

                  ## outdated comments that are made for a file that has been deleted
                  % for filename, comments_dict in (deleted_files_comments or {}).items():
-                     <div class="filediffs filediff-outdated" style="display: none">
+                     <%
+                         display_state = 'display: none'
+                         open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False]
+                         if open_comments_in_file:
+                             display_state = ''
+                     %>
+                     <div class="filediffs filediff-outdated" style="${display_state}">
                          <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
                          <div class="filediff" data-f-path="${filename}"  id="a_${h.FID('', filename)}">
                              <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
                                      <td></td>
                                      <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
-                                     ${_('File was deleted in this version, and outdated comments were made on it')}
+                                     ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')}
                                      </td>
                                  </tr>
                                  %if c.diffmode == 'unified':

rhodecode/templates/data_table/_dt_elements.mako

0 +51 -3

		@@ -284,7 +284,7 b''
284	284
285	285	<%def name="user_group_name(user_group_name)">
286	286	<div>
287		<i class="icon-group" title="${_('User group')}"></i>
	287	<i class="icon-user-group" title="${_('User group')}"></i>
288	288	${h.link_to_group(user_group_name)}
289	289	</div>
290	290	</%def>
		@@ -350,8 +350,7 b''
350	350	</%def>
351	351
352	352	<%def name="pullrequest_title(title, description)">
353		${title} <br/>
354		${h.shorter(description, 40)}
	353	${title}
355	354	</%def>
356	355
357	356	<%def name="pullrequest_comments(comments_nr)">
		@@ -375,3 +374,52 b''
375	374	<%def name="pullrequest_author(full_contact)">
376	375	${base.gravatar_with_user(full_contact, 16)}
377	376	</%def>
	377
	378
	379	<%def name="markup_form(form_id, form_text='', help_text=None)">
	380
	381	<div class="markup-form">
	382	<div class="markup-form-area">
	383	<div class="markup-form-area-header">
	384	<ul class="nav-links clearfix">
	385	<li class="active">
	386	<a href="#edit-text" tabindex="-1" id="edit-btn_${form_id}">${_('Write')}</a>
	387	</li>
	388	<li class="">
	389	<a href="#preview-text" tabindex="-1" id="preview-btn_${form_id}">${_('Preview')}</a>
	390	</li>
	391	</ul>
	392	</div>
	393
	394	<div class="markup-form-area-write" style="display: block;">
	395	<div id="edit-container_${form_id}">
	396	<textarea id="${form_id}" name="${form_id}" class="comment-block-ta ac-input">${form_text if form_text else ''}</textarea>
	397	</div>
	398	<div id="preview-container_${form_id}" class="clearfix" style="display: none;">
	399	<div id="preview-box_${form_id}" class="preview-box"></div>
	400	</div>
	401	</div>
	402
	403	<div class="markup-form-area-footer">
	404	<div class="toolbar">
	405	<div class="toolbar-text">
	406	${(_('Parsed using %s syntax') % (
	407	('<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
	408	)
	409	)\|n}
	410	</div>
	411	</div>
	412	</div>
	413	</div>
	414
	415	<div class="markup-form-footer">
	416	% if help_text:
	417	<span class="help-block">${help_text}</span>
	418	% endif
	419	</div>
	420	</div>
	421	<script type="text/javascript">
	422	new MarkupForm('${form_id}');
	423	</script>
	424
	425	</%def>

rhodecode/templates/debug_style/tables.html

0 +1 -1

                      </tbody>
                    </table>
                    <div class="link" id="add_perm">
-                     Add new
+                     Add user/user group
                    </div>

rhodecode/templates/errors/error_document.mako

0 +16 -1

                              </div>
                              <div class="inner-column">
                                  <h4>Support</h4>
-                                 <p>For support, go to <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>.
+                                 <p>For help and support, go to the <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support Page')}</a>.
                                     It may be useful to include your log file; see the log file locations <a href="${h.route_url('enterprise_log_file_locations')}">here</a>.
                                  </p>
                              </div>
                              <div class="inner-column">
                                  <h4>Documentation</h4>
                                  <p>For more information, see <a href="${h.route_url('enterprise_docs')}">docs.rhodecode.com</a>.</p>
                              </div>
                          </div>
+                         % if c.show_exception_id:
+                         <div class="sidebar" style="width: 130px">
+                         </div>
+                         <div class="main-content">
+                             <p>
+                             <strong>Exception ID: <code><a href="${c.exception_id_url}">${c.exception_id}</a></code> </strong> <br/>
+                             Super Admins can see detailed traceback information from this exception by checking the below Exception ID.<br/>
+                             Please include the above link for further details of this exception.
+                             </p>
+                         </div>
+                         % endif
                      </div>
                  </body>

rhodecode/templates/files/files_add.mako

0 +1 -1

              </%def>
              <%def name="breadcrumbs_links()">
-                 ${_('Add new file')} @ ${h.show_id(c.commit)}
+                 ${_('Add new file')} @ ${h.show_id(c.commit)} ${_('Branch')}: ${c.commit.branch}
              </%def>
              <%def name="menu_bar_subnav()">

rhodecode/templates/forks/fork.mako

0 +10 -10

                          <div class="field">
                              <div class="label label-checkbox">
+                                 <label for="private">${_('Copy permissions')}:</label>
+                             </div>
+                             <div class="checkboxes">
+                                 ${h.checkbox('copy_permissions',value="True", checked="checked")}
+                                 <span class="help-block">${_('Copy permissions from forked repository')}</span>
+                             </div>
+                         </div>
+                         <div class="field">
+                             <div class="label label-checkbox">
                                  <label for="private">${_('Private')}:</label>
                              </div>
                              <div class="checkboxes">
                              </div>
                          </div>
-                         <div class="field">
-                             <div class="label label-checkbox">
-                                 <label for="private">${_('Copy permissions')}:</label>
-                             </div>
-                             <div class="checkboxes">
-                                 ${h.checkbox('copy_permissions',value="True", checked="checked")}
-                                 <span class="help-block">${_('Copy permissions from forked repository')}</span>
-                             </div>
-                         </div>
                          <div class="buttons">
                              ${h.submit('',_('Fork this Repository'),class_="btn")}
                          </div>

rhodecode/templates/forks/forks.mako

0 +11 -24

              <script type="text/javascript">
              $(document).ready(function() {
-                 var $userListTable = $('#fork_list_table');
+                 var $forksListTable = $('#fork_list_table');
-                 var getDatatableCount = function(){
-                   var table = $userListTable.dataTable();
-                   var page = table.api().page.info();
-                   var  active = page.recordsDisplay;
-                   var  total = page.recordsTotal;
-                   var _text = _gettext("{0} out of {1} users").format(active, total);
-                   $('#user_count').text(_text);
-                 };
-                 // user list
-                 $userListTable.DataTable({
+                 // fork list
+                 $forksListTable.DataTable({
                    processing: true,
                    serverSide: true,
-                   ajax: "${h.route_path('repo_forks_data', repo_name=c.repo_name)}",
+                   ajax: {
+                       "url": "${h.route_path('repo_forks_data', repo_name=c.repo_name)}",
+                   },
                    dom: 'rtp',
                    pageLength: ${c.visual.dashboard_items},
                    order: [[ 0, "asc" ]],
                    }
                  });
-                 $userListTable.on('xhr.dt', function(e, settings, json, xhr){
-                     $userListTable.css('opacity', 1);
+                 $forksListTable.on('xhr.dt', function(e, settings, json, xhr){
+                     $forksListTable.css('opacity', 1);
                  });
-                 $userListTable.on('preXhr.dt', function(e, settings, data){
-                     $userListTable.css('opacity', 0.3);
-                 });
-                 // refresh counters on draw
-                 $userListTable.on('draw.dt', function(){
-                     getDatatableCount();
+                 $forksListTable.on('preXhr.dt', function(e, settings, data){
+                     $forksListTable.css('opacity', 0.3);
                  });
                  // filter
                  $('#q_filter').on('keyup',
                      $.debounce(250, function() {
-                         $userListTable.DataTable().search(
+                         $forksListTable.DataTable().search(
                              $('#q_filter').val()
                          ).draw();
                      })

rhodecode/templates/forms/mapping.pt

0 +4 -5

                  <div class="panel-heading">${title}</div>
                  <div class="panel-body">
-                   <div tal:condition="errormsg"
-                        class="clearfix alert alert-danger">
-                     <p i18n:translate="">
+                   <div tal:condition="errormsg" class="clearfix alert alert-error">
+                     <span i18n:translate="">
                         There was a problem with this section
-                     </p>
-                     <p>${errormsg}</p>
+                     </span>
+                     <div>${errormsg}</div>
                    </div>
                    <div tal:condition="description">

rhodecode/templates/index_base.mako

0 +1 -61

		@@ -5,9 +5,8 b''
5	5	<!-- box / title -->
6	6	<div class="title">
7	7	<div class="block-left breadcrumbs">
8		<input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
9	8	${self.breadcrumbs()}
10		<span id="match_container" style="display:none">~~»~~ <span id="match_count">0</span> ${_('matches')}</span>
	9	<span id="match_container" style="display:none"><span id="match_count">0</span> ${_('matches')}</span>
11	10	</div>
12	11	%if c.rhodecode_user.username != h.DEFAULT_USER:
13	12	<div class="block-right">
		@@ -137,65 +136,6 b''
137	136	});
138	137	% endif
139	138
140		var getDatatableCount = function() {
141		var reposCount = 0;
142		var reposCountTotal = 0;
143
144		% if c.repos_data != '[]':
145		var pageInfo = $('#repo_list_table').dataTable().api().page.info();
146		var reposCount = pageInfo.recordsDisplay;
147		var reposCountTotal = pageInfo.recordsTotal;
148		% endif
149
150		var repoGroupsCount = 0;
151		var repoGroupsCountTotal = 0;
152
153		% if c.repo_groups_data != '[]':
154		var pageInfo = $('#group_list_table').dataTable().api().page.info();
155		var repoGroupsCount = pageInfo.recordsDisplay;
156		var repoGroupsCountTotal = pageInfo.recordsTotal;
157		% endif
158
159		if (repoGroupsCount !== repoGroupsCountTotal) {
160		$('#match_count').text(reposCount + repoGroupsCount);
161		}
162		if (reposCount !== reposCountTotal) {
163		$('#match_container').show();
164		}
165		if ($('#q_filter').val() === '') {
166		$('#match_container').hide();
167		}
168		};
169
170		// update the counter when doing search
171		$('#repo_list_table, #group_list_table').on( 'search.dt', function (e,settings) {
172		getDatatableCount();
173		});
174
175		// filter, filter both grids
176		$('#q_filter').on( 'keyup', function () {
177
178		% if c.repo_groups_data != '[]':
179		var repo_group_api = $('#group_list_table').dataTable().api();
180		repo_group_api
181		.columns( 0 )
182		.search( this.value )
183		.draw();
184		% endif
185
186		% if c.repos_data != '[]':
187		var repo_api = $('#repo_list_table').dataTable().api();
188		repo_api
189		.columns( 0 )
190		.search( this.value )
191		.draw();
192		% endif
193
194		});
195
196		// refilter table if page load via back button
197		$("#q_filter").trigger('keyup');
198
199	139	});
200	140	</script>
201	141	</%def>

rhodecode/templates/journal/journal.mako

0 +29 -27

                  %endif
              </%def>
-             <%def name="breadcrumbs()">
-                 <h1 class="block-left">
+             <%def name="breadcrumbs_links()">
                  ${h.form(None, id_="filter_form", method="get")}
                      <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term}" placeholder="${_('quick filter...')}"/>
-                     <input type='submit' value="${_('Filter')}" class="btn" />
+                     <input type='submit' value="${_('filter')}" class="btn" />
                      ${_('Journal')} - ${_ungettext('%s entry', '%s entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
                  ${h.end_form()}
-                 </h1>
-                 <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help(request))}">${_('Example Queries')}</p>
+                 <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+                 <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
              </%def>
              <%def name="menu_bar_nav()">
                  ${self.menu_items(active='journal')}
              </%def>
              <%def name="head_extra()">
              <link href="${h.route_path('journal_atom', _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
              <link href="${h.route_path('journal_rss', _query=dict(auth_token=c.rhodecode_user.feed_token))}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
              <%def name="main()">
-                 <div class="box">
-                     <!-- box / title -->
-                     <div class="title journal">
-                      ${self.breadcrumbs()}
-                      <ul class="links icon-only-links block-right">
-                        <li>
-                          <span><a id="refresh" href="${h.route_path('journal')}"><i class="icon-refresh"></i></a></span>
-                        </li>
-                        <li>
-                          <span><a href="${h.route_path('journal_atom', _query=dict(auth_token=c.rhodecode_user.feed_token))}"><i class="icon-rss-sign"></i></a></span>
-                        </li>
-                      </ul>
-                     </div>
-                     <div id="journal">${c.journal_data|n}</div>
+             <div class="box">
+                 <!-- box / title -->
+                 <div class="title journal">
+                  ${self.breadcrumbs()}
+                  <ul class="links icon-only-links block-right">
+                    <li>
+                      <span><a id="refresh" href="${h.route_path('journal')}"><i class="icon-refresh"></i></a></span>
+                    </li>
+                    <li>
+                      <span><a href="${h.route_path('journal_atom', _query=dict(auth_token=c.rhodecode_user.feed_token))}"><i class="icon-rss-sign"></i></a></span>
+                    </li>
+                  </ul>
                  </div>
+                 <div id="journal">${c.journal_data|n}</div>
+             </div>
-                 <script type="text/javascript">
+             <script type="text/javascript">
-                 $('#j_filter').autoGrowInput();
-                 $(document).on('pjax:success',function(){
-                   show_more_event();
-                 });
-                 $(document).pjax('#refresh', '#journal',
-                                  {url: "${request.current_route_path(_query=dict(filter=c.search_term))}", push: false});
+             $('#j_filter').autoGrowInput();
+             $(document).on('pjax:success',function(){
+               show_more_event();
+             });
+             $(document).pjax(
+                 '#refresh', '#journal',
+                 {url: "${request.current_route_path(_query=dict(filter=c.search_term))}", push: false});
-                 </script>
+             </script>
              </%def>

rhodecode/templates/login.mako

0 +3 -1

                                  %endif
                                  ${h.submit('sign_in', _('Sign In'), class_="btn sign-in")}
+                                 <p class="help-block pull-right">
+                                     RhodeCode ${c.rhodecode_edition}
+                                 </p>
                              ${h.end_form()}
                              <script type="text/javascript">
                                  $(document).ready(function(){

rhodecode/templates/password_reset.mako

0 +4 -1

                                        <span class="error-message">${errors.get('email')}</span>
                                        <br />
                                      %endif
+                                     <p class="help-block">${_('Password reset link will be sent to matching email address')}</p>
                                      %if captcha_active:
                                      <div class="login-captcha">
                                      %endif
                                      ${h.submit('send', _('Send password reset email'), class_="btn sign-in")}
-                                     <div class="activation_msg">${_('Password reset link will be sent to matching email address')}</div>
+                                     <p class="help-block pull-right">
+                                         RhodeCode ${c.rhodecode_edition}
+                                     </p>
                                  ${h.end_form()}
                              </div>

rhodecode/templates/pullrequests/pullrequest.mako

0 +326 -315

This diff has been collapsed as it changes many lines, (641 lines changed) Show them Hide them
			@@ -1,4 +1,5 b''
	1	1	<%inherit file="/base/base.mako"/>
		2	<%namespace name="dt" file="/data_table/_dt_elements.mako"/>
	2	3
	3	4	<%def name="title()">
	4	5	${c.repo_name} ${_('New pull request')}
			@@ -54,14 +55,14 b''
	54	55	<label for="pullrequest_desc">${_('Description')}:</label>
	55	56	</div>
	56	57	<div class="textarea text-area editor">
	57		${h.textarea('pullrequest_desc',size=30, )}
	58		<span class="help-block">${_('Write a short description on this pull request')}</span>
		58	<input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
		59	${dt.markup_form('pullrequest_desc')}
	59	60	</div>
	60	61	</div>
	61	62
	62	63	<div class="field">
	63	64	<div class="label label-textarea">
	64		<label for="~~pullrequest_desc~~">${_('Commit flow')}:</label>
		65	<label for="commit_flow">${_('Commit flow')}:</label>
	65	66	</div>
	66	67
	67	68	## TODO: johbo: Abusing the "content" class here to get the
			@@ -98,7 +99,7 b''
	98	99	</div>
	99	100	<div class="input">
	100	101	<div class="pr-submit-button">
	101		${h.~~submit~~(~~'save'~~,_('Submit Pull Request'),~~class_~~="~~btn"~~)}
		102	<input id="pr_submit" class="btn" name="save" type="submit" value="${_('Submit Pull Request')}">
	102	103	</div>
	103	104	<div id="pr_open_message"></div>
	104	105	</div>
			@@ -164,374 +165,384 b''
	164	165	</div>
	165	166
	166	167	<script type="text/javascript">
	167		$(function(){
	168		var defaultSourceRepo = '${c.default_repo_data['source_repo_name']}';
	169		var defaultSourceRepoData = ${c.default_repo_data['source_refs_json']\|n};
	170		var defaultTargetRepo = '${c.default_repo_data['target_repo_name']}';
	171		var defaultTargetRepoData = ${c.default_repo_data['target_refs_json']\|n};
		168	$(function(){
		169	var defaultSourceRepo = '${c.default_repo_data['source_repo_name']}';
		170	var defaultSourceRepoData = ${c.default_repo_data['source_refs_json']\|n};
		171	var defaultTargetRepo = '${c.default_repo_data['target_repo_name']}';
		172	var defaultTargetRepoData = ${c.default_repo_data['target_refs_json']\|n};
	172	173
	173		var $pullRequestForm = $('#pull_request_form');
	174		var $~~sourceRepo~~ = $('#~~source_repo~~', $pullRequestForm);
	175		var $~~target~~Repo = $('#~~target~~_repo', $pullRequestForm);
	176		var $~~sourceRef~~ = $('#~~source_ref~~', $pullRequestForm);
	177		var $~~target~~Ref = $('#~~target~~_ref', $pullRequestForm);
		174	var $pullRequestForm = $('#pull_request_form');
		175	var $pullRequestSubmit = $('#pr_submit', $pullRequestForm);
		176	var $sourceRepo = $('#source_repo', $pullRequestForm);
		177	var $targetRepo = $('#target_repo', $pullRequestForm);
		178	var $sourceRef = $('#source_ref', $pullRequestForm);
		179	var $targetRef = $('#target_ref', $pullRequestForm);
	178	180
	179		var sourceRepo = function() { return $sourceRepo.eq(0).val() };
	180		var sourceRef = function() { return $sourceRef.eq(0).val().split(':') };
		181	var sourceRepo = function() { return $sourceRepo.eq(0).val() };
		182	var sourceRef = function() { return $sourceRef.eq(0).val().split(':') };
	181	183
	182		var targetRepo = function() { return $targetRepo.eq(0).val() };
	183		var targetRef = function() { return $targetRef.eq(0).val().split(':') };
		184	var targetRepo = function() { return $targetRepo.eq(0).val() };
		185	var targetRef = function() { return $targetRef.eq(0).val().split(':') };
	184	186
	185		var calculateContainerWidth = function() {
	186		var maxWidth = 0;
	187		var repoSelect2Containers = ['#source_repo', '#target_repo'];
	188		$.each(repoSelect2Containers, function(idx, value) {
	189		$(value).select2('container').width('auto');
	190		var curWidth = $(value).select2('container').width();
	191		if (maxWidth <= curWidth) {
	192		maxWidth = curWidth;
	193		}
	194		$.each(repoSelect2Containers, function(idx, value) {
	195		$(value).select2('container').width(maxWidth + 10);
	196		});
	197		});
	198		};
		187	var calculateContainerWidth = function() {
		188	var maxWidth = 0;
		189	var repoSelect2Containers = ['#source_repo', '#target_repo'];
		190	$.each(repoSelect2Containers, function(idx, value) {
		191	$(value).select2('container').width('auto');
		192	var curWidth = $(value).select2('container').width();
		193	if (maxWidth <= curWidth) {
		194	maxWidth = curWidth;
		195	}
		196	$.each(repoSelect2Containers, function(idx, value) {
		197	$(value).select2('container').width(maxWidth + 10);
		198	});
		199	});
		200	};
	199	201
	200		var initRefSelection = function(selectedRef) {
	201		return function(element, callback) {
	202		// translate our select2 id into a text, it's a mapping to show
	203		// simple label when selecting by internal ID.
	204		var id, refData;
	205		if (selectedRef === undefined \|\| selectedRef === null) {
	206		id = element.val();
	207		refData = element.val().split(':');
		202	var initRefSelection = function(selectedRef) {
		203	return function(element, callback) {
		204	// translate our select2 id into a text, it's a mapping to show
		205	// simple label when selecting by internal ID.
		206	var id, refData;
		207	if (selectedRef === undefined \|\| selectedRef === null) {
		208	id = element.val();
		209	refData = element.val().split(':');
	208	210
	209		if (refData.length !== 3){
	210		refData = ["", "", ""]
	211		}
	212		} else {
	213		id = selectedRef;
	214		refData = selectedRef.split(':');
	215		}
		211	if (refData.length !== 3){
		212	refData = ["", "", ""]
		213	}
		214	} else {
		215	id = selectedRef;
		216	refData = selectedRef.split(':');
		217	}
	216	218
	217		var text = refData[1];
	218		if (refData[0] === 'rev') {
	219		text = text.substring(0, 12);
	220		}
		219	var text = refData[1];
		220	if (refData[0] === 'rev') {
		221	text = text.substring(0, 12);
		222	}
	221	223
	222		var data = {id: id, text: text};
	223		callback(data);
	224		};
	225		};
		224	var data = {id: id, text: text};
		225	callback(data);
		226	};
		227	};
	226	228
	227		var formatRefSelection = function(~~item~~) {
	228		var prefix = '';
	229		var refData = ~~item~~.id.split(':');
	230		if (refData[0] === 'branch') {
	231		prefix = '<i class="icon-branch"></i>';
	232		}
	233		else if (refData[0] === 'book') {
	234		prefix = '<i class="icon-bookmark"></i>';
	235		}
	236		else if (refData[0] === 'tag') {
	237		prefix = '<i class="icon-tag"></i>';
	238		}
		229	var formatRefSelection = function(data, container, escapeMarkup) {
		230	var prefix = '';
		231	var refData = data.id.split(':');
		232	if (refData[0] === 'branch') {
		233	prefix = '<i class="icon-branch"></i>';
		234	}
		235	else if (refData[0] === 'book') {
		236	prefix = '<i class="icon-bookmark"></i>';
		237	}
		238	else if (refData[0] === 'tag') {
		239	prefix = '<i class="icon-tag"></i>';
		240	}
	239	241
	240		var originalOption = ~~item~~.element;
	241		return prefix + ~~item~~.text;
	242		};
		242	var originalOption = data.element;
		243	return prefix + escapeMarkup(data.text);
		244	};formatSelection:
	243	245
	244		// custom code mirror
	245		var codeMirrorInstance = ~~initPullRequestsCodeMirror~~('#pullrequest_desc');
		246	// custom code mirror
		247	var codeMirrorInstance = $('#pullrequest_desc').get(0).MarkupForm.cm;
	246	248
	247		reviewersController = new ReviewersController();
		249	reviewersController = new ReviewersController();
	248	250
	249		var queryTargetRepo = function(self, query) {
	250		// cache ALL results if query is empty
	251		var cacheKey = query.term \|\| '__';
	252		var cachedData = self.cachedDataSource[cacheKey];
		251	var queryTargetRepo = function(self, query) {
		252	// cache ALL results if query is empty
		253	var cacheKey = query.term \|\| '__';
		254	var cachedData = self.cachedDataSource[cacheKey];
	253	255
	254		if (cachedData) {
	255		query.callback({results: cachedData.results});
	256		} else {
	257		$.ajax({
	258		url: pyroutes.url('pullrequest_repo_destinations', {'repo_name': templateContext.repo_name}),
	259		data: {query: query.term},
	260		dataType: 'json',
	261		type: 'GET',
	262		success: function(data) {
	263		self.cachedDataSource[cacheKey] = data;
	264		query.callback({results: data.results});
	265		},
	266		error: function(data, textStatus, errorThrown) {
	267		alert(
	268		"Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
	269		}
	270		});
	271		}
	272		};
		256	if (cachedData) {
		257	query.callback({results: cachedData.results});
		258	} else {
		259	$.ajax({
		260	url: pyroutes.url('pullrequest_repo_destinations', {'repo_name': templateContext.repo_name}),
		261	data: {query: query.term},
		262	dataType: 'json',
		263	type: 'GET',
		264	success: function(data) {
		265	self.cachedDataSource[cacheKey] = data;
		266	query.callback({results: data.results});
		267	},
		268	error: function(data, textStatus, errorThrown) {
		269	alert(
		270	"Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
		271	}
		272	});
		273	}
		274	};
	273	275
	274		var queryTargetRefs = function(initialData, query) {
	275		var data = {results: []};
	276		// filter initialData
	277		$.each(initialData, function() {
	278		var section = this.text;
	279		var children = [];
	280		$.each(this.children, function() {
	281		if (query.term.length === 0 \|\|
	282		this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ) {
	283		children.push({'id': this.id, 'text': this.text})
	284		}
	285		});
	286		data.results.push({'text': section, 'children': children})
	287		});
	288		query.callback({results: data.results});
	289		};
		276	var queryTargetRefs = function(initialData, query) {
		277	var data = {results: []};
		278	// filter initialData
		279	$.each(initialData, function() {
		280	var section = this.text;
		281	var children = [];
		282	$.each(this.children, function() {
		283	if (query.term.length === 0 \|\|
		284	this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ) {
		285	children.push({'id': this.id, 'text': this.text})
		286	}
		287	});
		288	data.results.push({'text': section, 'children': children})
		289	});
		290	query.callback({results: data.results});
		291	};
	290	292
	291		var loadRepoRefDiffPreview = function() {
		293	var loadRepoRefDiffPreview = function() {
	292	294
	293		var url_data = {
	294		'repo_name': targetRepo(),
	295		'target_repo': sourceRepo(),
	296		'source_ref': targetRef()[2],
	297		'source_ref_type': 'rev',
	298		'target_ref': sourceRef()[2],
	299		'target_ref_type': 'rev',
	300		'merge': true,
	301		'_': Date.now() // bypass browser caching
	302		}; // gather the source/target ref and repo here
		295	var url_data = {
		296	'repo_name': targetRepo(),
		297	'target_repo': sourceRepo(),
		298	'source_ref': targetRef()[2],
		299	'source_ref_type': 'rev',
		300	'target_ref': sourceRef()[2],
		301	'target_ref_type': 'rev',
		302	'merge': true,
		303	'_': Date.now() // bypass browser caching
		304	}; // gather the source/target ref and repo here
	303	305
	304		if (sourceRef().length !== 3 \|\| targetRef().length !== 3) {
	305		prButtonLock(true, "${_('Please select source and target')}");
	306		return;
	307		}
	308		var url = pyroutes.url('repo_compare', url_data);
		306	if (sourceRef().length !== 3 \|\| targetRef().length !== 3) {
		307	prButtonLock(true, "${_('Please select source and target')}");
		308	return;
		309	}
		310	var url = pyroutes.url('repo_compare', url_data);
	309	311
	310		// lock PR button, so we cannot send PR before it's calculated
	311		prButtonLock(true, "${_('Loading compare ...')}", 'compare');
		312	// lock PR button, so we cannot send PR before it's calculated
		313	prButtonLock(true, "${_('Loading compare ...')}", 'compare');
		314
		315	if (loadRepoRefDiffPreview._currentRequest) {
		316	loadRepoRefDiffPreview._currentRequest.abort();
		317	}
	312	318
	313		if (loadRepoRefDiffPreview._currentRequest) {
	314		loadRepoRefDiffPreview._currentRequest.abort();
	315		}
		319	loadRepoRefDiffPreview._currentRequest = $.get(url)
		320	.error(function(data, textStatus, errorThrown) {
		321	if (textStatus !== 'abort') {
		322	alert(
		323	"Error while processing request.\nError code {0} ({1}).".format(
		324	data.status, data.statusText));
		325	}
	316	326
	317		loadRepoRefDiffPreview._currentRequest = $.get(url)
	318		.e~~rror~~(function(data, ~~textStatus~~, ~~errorThrown~~) {
	319		if (textStatus !== 'abort') {
	320		alert(
	321		"Error while processing request.\nError code {0} ({1}).".format(
	322		data.status, data.statusText));
	323		}
		327	})
		328	.done(function(data) {
		329	loadRepoRefDiffPreview._currentRequest = null;
		330	$('#pull_request_overview').html(data);
		331
		332	var commitElements = $(data).find('tr[commit_id]');
	324	333
	325		})
	326		.done(function(data) {
	327		loadRepoRefDiffPreview._currentRequest = null;
	328		$('#pull_request_overview').html(data);
		334	var prTitleAndDesc = getTitleAndDescription(
		335	sourceRef()[1], commitElements, 5);
	329	336
	330		var commitElements = $(data).find('tr[commit_id]');
		337	var title = prTitleAndDesc[0];
		338	var proposedDescription = prTitleAndDesc[1];
	331	339
	332		var prTitleAndDesc = getTitleAndDescription(
	333		sourceRef()[1], commitElements, 5);
		340	var useGeneratedTitle = (
		341	$('#pullrequest_title').hasClass('autogenerated-title') \|\|
		342	$('#pullrequest_title').val() === "");
	334	343
	335		~~var~~ title = ~~prTitleAndDesc~~[0];
	336		var proposedDescription = prTitleAndDesc[1];
	337
	338		var useGeneratedTitle = (
	339		$('#pullrequest_title').hasClass('autogenerated-title') \|\|
	340		$('#pullrequest_title').val() === "");
		344	if (title && useGeneratedTitle) {
		345	// use generated title if we haven't specified our own
		346	$('#pullrequest_title').val(title);
		347	$('#pullrequest_title').addClass('autogenerated-title');
	341	348
	342		if (title && useGeneratedTitle) {
	343		// use generated title if we haven't specified our own
	344		$('#pullrequest_title').val(title);
	345		$('#pullrequest_title').addClass('autogenerated-title');
		349	}
		350
		351	var useGeneratedDescription = (
		352	!codeMirrorInstance._userDefinedValue \|\|
		353	codeMirrorInstance.getValue() === "");
	346	354
	347		}
		355	if (proposedDescription && useGeneratedDescription) {
		356	// set proposed content, if we haven't defined our own,
		357	// or we don't have description written
		358	codeMirrorInstance._userDefinedValue = false; // reset state
		359	codeMirrorInstance.setValue(proposedDescription);
		360	}
	348	361
	349		var useGeneratedDescription = (
	350		!codeMirrorInstance.~~_userDefinedDesc~~ \|\|
	351		codeMirrorInstance.getValue() === "");
		362	// refresh our codeMirror so events kicks in and it's change aware
		363	codeMirrorInstance.refresh();
	352	364
	353		if (proposedDescription && useGeneratedDescription) {
	354		// set proposed content, if we haven't defined our own,
	355		// or we don't have description written
	356		codeMirrorInstance._userDefinedDesc = false; // reset state
	357		codeMirrorInstance.setValue(proposedDescription);
	358		}
		365	var msg = '';
		366	if (commitElements.length === 1) {
		367	msg = "${_ungettext('This pull request will consist of __COMMITS__ commit.', 'This pull request will consist of __COMMITS__ commits.', 1)}";
		368	} else {
		369	msg = "${_ungettext('This pull request will consist of __COMMITS__ commit.', 'This pull request will consist of __COMMITS__ commits.', 2)}";
		370	}
	359	371
	360		var msg = '';
	361		if (commitElements.length === 1) {
	362		msg = "${_ungettext('This pull request will consist of __COMMITS__ commit.', 'This pull request will consist of __COMMITS__ commits.', 1)}";
	363		} else {
	364		msg = "${_ungettext('This pull request will consist of __COMMITS__ commit.', 'This pull request will consist of __COMMITS__ commits.', 2)}";
	365		}
		372	msg += ' <a id="pull_request_overview_url" href="{0}" target="_blank">${_('Show detailed compare.')}</a>'.format(url);
	366	373
	367		msg += ' <a id="pull_request_overview_url" href="{0}" target="_blank">${_('Show detailed compare.')}</a>'.format(url);
	368
	369		if (commitElements.length) {
	370		var commitsLink = '<a href="#pull_request_overview"><strong>{0}</strong></a>'.format(commitElements.length);
	371		prButtonLock(false, msg.replace('__COMMITS__', commitsLink), 'compare');
	372		}
	373		~~else~~ {
	374		prButtonLock(true, "${_('There are no commits to merge.')}", 'compare');
	375		}
		374	if (commitElements.length) {
		375	var commitsLink = '<a href="#pull_request_overview"><strong>{0}</strong></a>'.format(commitElements.length);
		376	prButtonLock(false, msg.replace('__COMMITS__', commitsLink), 'compare');
		377	}
		378	else {
		379	prButtonLock(true, "${_('There are no commits to merge.')}", 'compare');
		380	}
	376	381
	377	382
	378		});
	379		};
		383	});
		384	};
	380	385
	381		var Select2Box = function(element, overrides) {
	382		var globalDefaults = {
	383		dropdownAutoWidth: true,
	384		containerCssClass: "drop-menu",
	385		dropdownCssClass: "drop-menu-dropdown"
	386		};
		386	var Select2Box = function(element, overrides) {
		387	var globalDefaults = {
		388	dropdownAutoWidth: true,
		389	containerCssClass: "drop-menu",
		390	dropdownCssClass: "drop-menu-dropdown"
		391	};
	387	392
	388		var initSelect2 = function(defaultOptions) {
	389		var options = jQuery.extend(globalDefaults, defaultOptions, overrides);
	390		element.select2(options);
	391		};
		393	var initSelect2 = function(defaultOptions) {
		394	var options = jQuery.extend(globalDefaults, defaultOptions, overrides);
		395	element.select2(options);
		396	};
	392	397
	393		return {
	394		initRef: function() {
	395		var defaultOptions = {
	396		minimumResultsForSearch: 5,
	397		formatSelection: formatRefSelection
	398		};
		398	return {
		399	initRef: function() {
		400	var defaultOptions = {
		401	minimumResultsForSearch: 5,
		402	formatSelection: formatRefSelection
		403	};
	399	404
	400		initSelect2(defaultOptions);
	401		},
		405	initSelect2(defaultOptions);
		406	},
	402	407
	403		initRepo: function(defaultValue, readOnly) {
	404		var defaultOptions = {
	405		initSelection : function (element, callback) {
	406		var data = {id: defaultValue, text: defaultValue};
	407		callback(data);
	408		}
	409		};
		408	initRepo: function(defaultValue, readOnly) {
		409	var defaultOptions = {
		410	initSelection : function (element, callback) {
		411	var data = {id: defaultValue, text: defaultValue};
		412	callback(data);
		413	}
		414	};
	410	415
	411		initSelect2(defaultOptions);
		416	initSelect2(defaultOptions);
	412	417
	413		element.select2('val', defaultSourceRepo);
	414		if (readOnly === true) {
	415		element.select2('readonly', true);
	416		}
	417		}
	418		};
	419		};
		418	element.select2('val', defaultSourceRepo);
		419	if (readOnly === true) {
		420	element.select2('readonly', true);
		421	}
		422	}
		423	};
		424	};
		425
		426	var initTargetRefs = function(refsData, selectedRef) {
	420	427
	421		var initTargetRefs = function(refsData, selectedRef) {
		428	Select2Box($targetRef, {
		429	placeholder: "${_('Select commit reference')}",
		430	query: function(query) {
		431	queryTargetRefs(refsData, query);
		432	},
		433	initSelection : initRefSelection(selectedRef)
		434	}).initRef();
	422	435
	423		Select2Box($targetRef, {
	424		placeholder: "${_('Select commit reference')}",
	425		query: function(query) {
	426		queryTargetRefs(refsData, query);
	427		},
	428		initSelection : initRefSelection(selectedRef)
	429		}).initRef();
		436	if (!(selectedRef === undefined)) {
		437	$targetRef.select2('val', selectedRef);
		438	}
		439	};
	430	440
	431		if (!(selectedRef === undefined)) {
	432		$targetRef.select2('val', selectedRef);
	433		}
	434		};
		441	var targetRepoChanged = function(repoData) {
		442	// generate new DESC of target repo displayed next to select
		443	var prLink = pyroutes.url('pullrequest_new', {'repo_name': repoData['name']});
		444	$('#target_repo_desc').html(
		445	"<strong>${_('Target repository')}</strong>: {0}. <a href=\"{1}\">Switch base, and use as source.</a>".format(repoData['description'], prLink)
		446	);
		447
		448	// generate dynamic select2 for refs.
		449	initTargetRefs(repoData['refs']['select2_refs'],
		450	repoData['refs']['selected_ref']);
	435	451
	436		var targetRepoChanged = function(repoData) {
	437		// generate new DESC of target repo displayed next to select
	438		var prLink = pyroutes.url('pullrequest_new', {'repo_name': repoData['name']});
	439		$('#target_repo_desc').html(
	440		"<strong>${_('Target repository')}</strong>: {0}. <a href=\"{1}\">Switch base, and use as source.</a>".format(repoData['description'], prLink)
	441		);
		452	};
	442	453
	443		// generate dynamic select2 for refs.
	444		initTargetRefs(repoData['refs']['select2_refs'],
	445		repoData['refs']['selected_ref']);
	446
	447		};
		454	var sourceRefSelect2 = Select2Box($sourceRef, {
		455	placeholder: "${_('Select commit reference')}",
		456	query: function(query) {
		457	var initialData = defaultSourceRepoData['refs']['select2_refs'];
		458	queryTargetRefs(initialData, query)
		459	},
		460	initSelection: initRefSelection()
		461	}
		462	);
	448	463
	449		var sourceRefSelect2 = Select2Box($sourceRef, {
	450		placeholder: "${_('Select commit reference')}",
	451		query: function(query) {
	452		var initialData = defaultSourceRepoData['refs']['select2_refs'];
	453		queryTargetRefs(initialData, query)
	454		},
	455		initSelection: initRefSelection()
	456		}
	457		);
		464	var sourceRepoSelect2 = Select2Box($sourceRepo, {
		465	query: function(query) {}
		466	});
	458	467
	459		var ~~source~~RepoSelect2 = Select2Box($~~source~~Repo, {
	460		query: function(query) {}
	461		});
		468	var targetRepoSelect2 = Select2Box($targetRepo, {
		469	cachedDataSource: {},
		470	query: $.debounce(250, function(query) {
		471	queryTargetRepo(this, query);
		472	}),
		473	formatResult: formatRepoResult
		474	});
		475
		476	sourceRefSelect2.initRef();
		477
		478	sourceRepoSelect2.initRepo(defaultSourceRepo, true);
		479
		480	targetRepoSelect2.initRepo(defaultTargetRepo, false);
	462	481
	463		var targetRepoSelect2 = Select2Box($targetRepo, {
	464		cachedDataSource: {},
	465		query: $.debounce(250, function(query) {
	466		queryTargetRepo(this, query);
	467		}),
	468		formatResult: formatResult
	469		});
	470
	471		sourceRefSelect2.initRef();
	472
	473		sourceRepoSelect2.initRepo(defaultSourceRepo, true);
		482	$sourceRef.on('change', function(e){
		483	loadRepoRefDiffPreview();
		484	reviewersController.loadDefaultReviewers(
		485	sourceRepo(), sourceRef(), targetRepo(), targetRef());
		486	});
	474	487
	475		targetRepoSelect2.initRepo(defaultTargetRepo, false);
		488	$targetRef.on('change', function(e){
		489	loadRepoRefDiffPreview();
		490	reviewersController.loadDefaultReviewers(
		491	sourceRepo(), sourceRef(), targetRepo(), targetRef());
		492	});
	476	493
	477		~~$sourceRef~~.on('change', function(e){
	478		loadRepoRefDiffPreview();
	479		reviewersController.loadDefaultReviewers(
	480		sourceRepo(), sourceRef(), targetRepo(), targetRef());
	481		});
	482
	483		$targetRef.on('change', function(e){
	484		loadRepoRefDiffPreview();
	485		reviewersController.loadDefaultReviewers(
	486		sourceRepo(), sourceRef(), targetRepo(), targetRef());
	487		});
		494	$targetRepo.on('change', function(e){
		495	var repoName = $(this).val();
		496	calculateContainerWidth();
		497	$targetRef.select2('destroy');
		498	$('#target_ref_loading').show();
	488	499
	489		$targetRepo.on('change', function(e){
	490		var repoName = $(this).val();
	491		calculateContainerWidth();
	492		$targetRef.select2('destroy');
	493		$('#target_ref_loading').show();
		500	$.ajax({
		501	url: pyroutes.url('pullrequest_repo_refs',
		502	{'repo_name': templateContext.repo_name, 'target_repo_name':repoName}),
		503	data: {},
		504	dataType: 'json',
		505	type: 'GET',
		506	success: function(data) {
		507	$('#target_ref_loading').hide();
		508	targetRepoChanged(data);
		509	loadRepoRefDiffPreview();
		510	},
		511	error: function(data, textStatus, errorThrown) {
		512	alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
		513	}
		514	})
	494	515
	495		$.ajax({
	496		url: pyroutes.url('pullrequest_repo_refs',
	497		{'repo_name': templateContext.repo_name, 'target_repo_name':repoName}),
	498		data: {},
	499		dataType: 'json',
	500		type: 'GET',
	501		success: function(data) {
	502		$('#target_ref_loading').hide();
	503		targetRepoChanged(data);
	504		loadRepoRefDiffPreview();
	505		},
	506		error: function(data, textStatus, errorThrown) {
	507		alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
	508		}
	509		})
		516	});
	510	517
	511		});
	512
	513		prButtonLock(true, "${_('Please select source and target')}", 'all');
		518	$pullRequestForm.on('submit', function(e){
		519	// Flush changes into textarea
		520	codeMirrorInstance.save();
		521	prButtonLock(true, null, 'all');
		522	});
	514	523
	515		// auto-load on init, the target refs select2
	516		calculateContainerWidth();
	517		targetRepoChanged(defaultTargetRepoData);
		524	prButtonLock(true, "${_('Please select source and target')}", 'all');
	518	525
	519		$('#pullrequest_title').on('keyup', function(e){
	520		$(this).removeClass('autogenerated-title');
	521		});
		526	// auto-load on init, the target refs select2
		527	calculateContainerWidth();
		528	targetRepoChanged(defaultTargetRepoData);
	522	529
	523		% if c.default_source_ref:
	524		// in case we have a pre-selected value, use it now
	525		$sourceRef.select2('val', '${c.default_source_ref}');
	526		// diff preview load
	527		loadRepoRefDiffPreview();
	528		// default reviewers
	529		reviewersController.loadDefaultReviewers(
	530		sourceRepo(), sourceRef(), targetRepo(), targetRef());
	531		% endif
		530	$('#pullrequest_title').on('keyup', function(e){
		531	$(this).removeClass('autogenerated-title');
		532	});
	532	533
	533		ReviewerAutoComplete('#user');
	534		});
		534	% if c.default_source_ref:
		535	// in case we have a pre-selected value, use it now
		536	$sourceRef.select2('val', '${c.default_source_ref}');
		537	// diff preview load
		538	loadRepoRefDiffPreview();
		539	// default reviewers
		540	reviewersController.loadDefaultReviewers(
		541	sourceRepo(), sourceRef(), targetRepo(), targetRef());
		542	% endif
		543
		544	ReviewerAutoComplete('#user');
		545	});
	535	546	</script>
	536	547
	537	548	</%def>

rhodecode/templates/pullrequests/pullrequest_show.mako

0 +10 -6

              <%inherit file="/base/base.mako"/>
              <%namespace name="base" file="/base/base.mako"/>
+             <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
              <%def name="title()">
                  ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
                          </div>
                         </div>
                         <div class="field">
-                         <div class="pr-description-label label-summary">
+                         <div class="pr-description-label label-summary" title="${_('Rendered using {} renderer').format(c.renderer)}">
                              <label>${_('Description')}:</label>
                          </div>
                          <div id="pr-desc" class="input">
-                             <div class="pr-description">${h.urlify_commit_message(c.pull_request.description, c.repo_name)}</div>
+                             <div class="pr-description">${h.render(c.pull_request.description, renderer=c.renderer)}</div>
                          </div>
                          <div id="pr-desc-edit" class="input textarea editor" style="display: none;">
-                             <textarea id="pr-description-input" size="30">${c.pull_request.description}</textarea>
+                             <input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
+                             ${dt.markup_form('pr-description-input', form_text=c.pull_request.description)}
                          </div>
                         </div>
                                             <td>
                                                 % if c.at_version_num != ver_pr:
                                                  <i class="icon-comment"></i>
-                                                    <code class="tooltip" title="${_('Comment from pull request version {0}, general:{1} inline:{2}').format(ver_pos, len(c.comment_versions[ver_pr]['at']), len(c.inline_versions[ver_pr]['at']))}">
+                                                    <code class="tooltip" title="${_('Comment from pull request version v{0}, general:{1} inline:{2}').format(ver_pos, len(c.comment_versions[ver_pr]['at']), len(c.inline_versions[ver_pr]['at']))}">
                                                         G:${len(c.comment_versions[ver_pr]['at'])} / I:${len(c.inline_versions[ver_pr]['at'])}
                                                     </code>
                                                 % endif
                                    <strong>${_('Missing commits')}:</strong>
                                      ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
                                      ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
+                                     ${_('Consider doing a {force_refresh_url} in case you think this is an error.').format(force_refresh_url=h.link_to('force refresh', h.current_route_path(request, force_refresh='1')))|n}
                                  </div>
                                </div>
                              </div>
                      $(function(){
                          // custom code mirror
-                         var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
+                         var codeMirrorInstance = $('#pr-description-input').get(0).MarkupForm.cm;
                          var PRDetails = {
                            editButton: $('#open_edit_pullrequest'),
                          $('#edit_pull_request').on('click', function(e){
                              var title = $('#pr-title-input').val();
                              var description = codeMirrorInstance.getValue();
+                             var renderer = $('#pr-renderer-input').val();
                              editPullRequest(
                                  "${c.repo_name}", "${c.pull_request.pull_request_id}",
-                                 title, description);
+                                 title, description, renderer);
                          });
                          $('#update_pull_request').on('click', function(e){

rhodecode/templates/register.mako

0 +19 -2

                      <div id="register" class="right-column">
                          <!-- login -->
                          <div class="sign-in-title">
-                             <h1>${_('Create an account')}</h1>
+                             % if social_auth_provider:
+                                 <h1>${_('Create an account linked with {}').format(social_auth_provider)}</h1>
+                             % else:
+                                 <h1>${_('Create an account')}</h1>
+                             % endif
                              <h4>${h.link_to(_("Go to the login page to sign in with an existing account."), request.route_path('login'))}</h4>
                          </div>
                          <div class="inner form">
                                    <br />
                                  %endif
+                                 % if social_auth_provider:
+                                     ## hide password prompts for social auth
+                                     <div style="display: none">
+                                 % endif
                                  <label for="password">${_('Password')}:</label>
                                  ${h.password('password', defaults.get('password'))}
                                  %if 'password' in errors:
                                    <br />
                                  %endif
+                                 % if social_auth_provider:
+                                     ## hide password prompts for social auth
+                                     </div>
+                                 % endif
                                  <label for="firstname">${_('First Name')}:</label>
                                  ${h.text('firstname', defaults.get('firstname'))}
                                  %if 'firstname' in errors:
                                  </p>
                                  ${h.submit('sign_up',_('Create Account'),class_="btn sign-in")}
+                                 <p class="help-block pull-right">
+                                     RhodeCode ${c.rhodecode_edition}
+                                 </p>
                              ${h.end_form()}
                          </div>
                          <%block name="below_register_button" />

rhodecode/tests/__init__.py

0 +14 -5

              __all__ = [
                  'get_new_dir', 'TestController',
-                 'link_to', 'clear_all_caches',
+                 'link_to', 'clear_cache_regions',
                  'assert_session_flash', 'login_user', 'no_newline_id_generator',
                  'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'SVN_REPO',
                  'NEW_HG_REPO', 'NEW_GIT_REPO',
              TEST_REPO_PREFIX = 'vcs-test'
-             def clear_all_caches():
-                 from beaker.cache import cache_managers
-                 for _cache in cache_managers.values():
-                     _cache.clear()
+             def clear_cache_regions(regions=None):
+                 # dogpile
+                 from rhodecode.lib.rc_cache import region_meta
+                 for region_name, region in region_meta.dogpile_cache_regions.items():
+                     if not regions or region_name in regions:
+                         region.invalidate()
              def get_new_dir(title):
                  return get_normalized_path(path)
+             def repo_id_generator(name):
+                 numeric_hash = 0
+                 for char in name:
+                     numeric_hash += (ord(char))
+                 return numeric_hash
              @pytest.mark.usefixtures('app', 'index_location')
              class TestController(object):

rhodecode/tests/config/test_sanitize_settings.py

0 +1 0

                      ('vcs.svn.compatible_version', ''),
                      ('git_rev_filter', '--all'),
                      ('vcs.hooks.protocol', 'http'),
+                     ('vcs.hooks.host', '127.0.0.1'),
                      ('vcs.scm_app_implementation', 'http'),
                      ('vcs.server', ''),
                      ('vcs.server.log_level', 'debug'),

rhodecode/tests/lib/middleware/test_simplehg.py

0 +35 -4

                      ('/foo/bar?cmd=pushkey&key=tip', 'push'),
                      ('/foo/bar?cmd=listkeys&key=tip', 'pull'),
                      ('/foo/bar?cmd=changegroup&key=tip', 'pull'),
-                     # Edge case: unknown argument: assume pull
-                     ('/foo/bar?cmd=unknown&key=tip', 'pull'),
-                     ('/foo/bar?cmd=&key=tip', 'pull'),
+                     ('/foo/bar?cmd=hello', 'pull'),
+                     ('/foo/bar?cmd=batch', 'push'),
+                     ('/foo/bar?cmd=putlfile', 'push'),
+                     # Edge case: unknown argument: assume push
+                     ('/foo/bar?cmd=unknown&key=tip', 'push'),
+                     ('/foo/bar?cmd=&key=tip', 'push'),
                      # Edge case: not cmd argument
-                     ('/foo/bar?key=tip', 'pull'),
+                     ('/foo/bar?key=tip', 'push'),
                  ])
              def test_get_action(url, expected_action, request_stub):
                  app = simplehg.SimpleHg(config={'auth_ret_code': '', 'base_path': ''},
              @pytest.mark.parametrize(
+                 'environ, expected_xargs, expected_batch',
+                 [
+                     ({},
+                      [''], ['push']),
+                     ({'HTTP_X_HGARG_1': ''},
+                      [''], ['push']),
+                     ({'HTTP_X_HGARG_1': 'cmds=listkeys+namespace%3Dphases'},
+                      ['listkeys namespace=phases'], ['pull']),
+                     ({'HTTP_X_HGARG_1': 'cmds=pushkey+namespace%3Dbookmarks%2Ckey%3Dbm%2Cold%3D%2Cnew%3Dcb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b'},
+                      ['pushkey namespace=bookmarks,key=bm,old=,new=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b'], ['push']),
+                     ({'HTTP_X_HGARG_1': 'namespace=phases'},
+                      ['namespace=phases'], ['push']),
+                 ])
+             def test_xarg_and_batch_commands(environ, expected_xargs, expected_batch):
+                 app = simplehg.SimpleHg
+                 result = app._get_xarg_headers(environ)
+                 result_batch = app._get_batch_cmd(environ)
+                 assert expected_xargs == result
+                 assert expected_batch == result_batch
+             @pytest.mark.parametrize(
                  'url, expected_repo_name',
                  [
                      ('/foo?cmd=unbundle&key=tip', 'foo'),

rhodecode/tests/lib/middleware/test_simplevcs.py

0 +2 -1

                      workspace_id = PullRequestModel()._workspace_id(pull_request)
                      target_vcs = pull_request.target_repo.scm_instance()
                      vcs_repo_name = target_vcs._get_shadow_repository_path(
-                         workspace_id)
+                         pull_request.target_repo.repo_id, workspace_id)
                      assert controller.vcs_repo_name == vcs_repo_name
                      assert controller.url_repo_name == shadow_url
                      prepare_mock.assert_called_once_with(
                          expected_extras,
                          protocol=app_settings['vcs.hooks.protocol'],
+                         host=app_settings['vcs.hooks.host'],
                          txn_id=None,
                          use_direct_calls=app_settings['vcs.hooks.direct_calls'])

rhodecode/tests/lib/test_auth.py

0 +1 -1

                  calculator = auth.PermissionCalculator(
                      user.user_id, {}, False, False, True, 'higherwin')
-                 permissions = calculator._admin_permissions()
+                 permissions = calculator._calculate_admin_permissions()
                  assert permissions['repositories_groups'][repo_group.group_name] == \
                      'group.admin'

rhodecode/tests/lib/test_auth_crypto_backend.py

0 +1 -1

              @pytest.fixture(params=[
-                 auth._RhodeCodeCryptoMd5,
+                 auth._RhodeCodeCryptoTest,
                  auth._RhodeCodeCryptoBCrypt,
                  auth._RhodeCodeCryptoSha256,
              ])

rhodecode/tests/lib/test_caches.py

0 +61 -59

		@@ -22,36 +22,24 b' import time'
22	22
23	23	import pytest
24	24
25		from rhodecode.lib import caches
26		from rhodecode.lib.memory_lru_debug import MemoryLRUNamespaceManagerBase
	25	from rhodecode.lib import rc_cache
27	26
28	27
29		class TestCacheManager(object):
	28	@pytest.mark.usefixtures('app')
	29	class TestCaches(object):
30	30
31		@pytest.mark.parametrize('repo_name', [
32		('',),
33		(u'',),
34		(u'ac',),
35		('ac', ),
36		(u'ęćc',),
37		('ąac',),
	31	def test_cache_decorator_init_not_configured(self):
	32	with pytest.raises(EnvironmentError):
	33	rc_cache.get_or_create_region('dontexist')
	34
	35	@pytest.mark.parametrize('region_name', [
	36	'cache_perms', u'cache_perms',
38	37	])
39		def test_cache_~~manage~~r_init(self, repo_name):
40		cache_manager_instance = caches.get_cache_manager(
41		repo_name, 'my_cache')
42		assert cache_manager_instance
43
44		def test_cache_manager_init_undefined_namespace(self):
45		cache_manager_instance = caches.get_cache_manager(
46		'repo_cache_long_undefined', 'my_cache')
47		assert cache_manager_instance
48
49		def_config = caches.DEFAULT_CACHE_MANAGER_CONFIG.copy()
50		def_config.pop('type')
51		assert cache_manager_instance.nsargs == def_config
52
53		assert isinstance(
54		cache_manager_instance.namespace, MemoryLRUNamespaceManagerBase)
	38	def test_cache_decorator_init(self, region_name):
	39	namespace = region_name
	40	cache_region = rc_cache.get_or_create_region(
	41	region_name, region_namespace=namespace)
	42	assert cache_region
55	43
56	44	@pytest.mark.parametrize('example_input', [
57	45	('',),
		@@ -62,45 +50,59 b' class TestCacheManager(object):'
62	50	(u'/ac', ),
63	51	])
64	52	def test_cache_manager_create_key(self, example_input):
65		key = caches.compute_key_from_params(*example_input)
	53	key = rc_cache.utils.compute_key_from_params(*example_input)
66	54	assert key
67	55
68		def test_store_and_invalidate_value_from_manager(self):
69		cache_manger_instance = caches.get_cache_manager(
70		'repo_cache_long', 'my_cache_store')
	56	@pytest.mark.parametrize('example_namespace', [
	57	'namespace', None
	58	])
	59	@pytest.mark.parametrize('example_input', [
	60	('',),
	61	(u'/ac',),
	62	(u'/ac', 1, 2, object()),
	63	(u'/ęćc', 1, 2, object()),
	64	('/ąac',),
	65	(u'/ac', ),
	66	])
	67	def test_cache_keygen(self, example_input, example_namespace):
	68	def func_wrapped():
	69	return 1
	70	func = rc_cache.utils.key_generator(example_namespace, func_wrapped)
	71	key = func(*example_input)
	72	assert key
71	73
72		def compute():
	74	def test_store_value_in_cache(self):
	75	cache_region = rc_cache.get_or_create_region('cache_perms')
	76	# make sure we empty the cache now
	77	cache_region.delete_multi(cache_region.backend.list_keys())
	78
	79	assert cache_region.backend.list_keys() == []
	80
	81	@cache_region.conditional_cache_on_arguments(expiration_time=5)
	82	def compute(key):
73	83	return time.time()
74	84
75		added_keys = []
76		for i in xrange(3):
77		_cache_key = caches.compute_key_from_params('foo_bar', 'p%s' % i)
78		added_keys.append(_cache_key)
79		for x in xrange(10):
80		cache_manger_instance.get(_cache_key, createfunc=compute)
	85	for x in range(10):
	86	compute(x)
	87
	88	assert len(set(cache_region.backend.list_keys())) == 10
81	89
82		for key in added_keys:
83		assert cache_manger_instance[key]
84
85		caches.clear_cache_manager(cache_manger_instance)
86
87		for key in added_keys:
88		assert key not in cache_manger_instance
89		assert len(cache_manger_instance.namespace.keys()) == 0
	90	def test_store_and_get_value_from_region(self):
	91	cache_region = rc_cache.get_or_create_region('cache_perms')
	92	# make sure we empty the cache now
	93	for key in cache_region.backend.list_keys():
	94	cache_region.delete(key)
	95	assert cache_region.backend.list_keys() == []
90	96
91		def test_store_and_get_value_from_manager(self):
92		cache_manger_instance = caches.get_cache_manager(
93		'repo_cache_long', 'my_cache_store')
94
95		_cache_key = caches.compute_key_from_params('foo_bar', 'multicall')
	97	@cache_region.conditional_cache_on_arguments(expiration_time=5)
	98	def compute(key):
	99	return time.time()
96	100
97		def compute():
98		return time.time()
	101	result = set()
	102	for x in range(10):
	103	ret = compute('x')
	104	result.add(ret)
99	105
100		result = set()
101		for x in xrange(10):
102		ret = cache_manger_instance.get(_cache_key, createfunc=compute)
103		result.add(ret)
104
105		# once computed we have only one value after executing it 10x
106		assert len(result) == 1
	106	# once computed we have only one value (the same from cache)
	107	# after executing it 10x
	108	assert len(result) == 1

rhodecode/tests/lib/test_hooks_daemon.py

0 +7 -5

                      assert daemon._daemon == tcp_server
                      _, port = tcp_server.server_address
-                     expected_uri = '{}:{}'.format(daemon.IP_ADDRESS, port)
+                     expected_uri = '{}:{}'.format('127.0.0.1', port)
                      msg = 'Preparing HTTP callback daemon at `{}` and ' \
                            'registering hook object'.format(expected_uri)
                      assert_message_in_log(
                          daemon = hooks_daemon.HttpHooksCallbackDaemon()
                      _, port = tcp_server.server_address
-                     expected_uri = '{}:{}'.format(daemon.IP_ADDRESS, port)
+                     expected_uri = '{}:{}'.format('127.0.0.1', port)
                      assert daemon.hooks_uri == expected_uri
                      msg = 'Preparing HTTP callback daemon at `{}` and ' \
                          self, protocol):
                      expected_extras = {'extra1': 'value1'}
                      callback, extras = hooks_daemon.prepare_callback_daemon(
-                         expected_extras.copy(), protocol=protocol, use_direct_calls=True)
+                         expected_extras.copy(), protocol=protocol,
+                         host='127.0.0.1', use_direct_calls=True)
                      assert isinstance(callback, hooks_daemon.DummyHooksCallbackDaemon)
                      expected_extras['hooks_module'] = 'rhodecode.lib.hooks_daemon'
                      expected_extras['time'] = extras['time']
                          'hooks_protocol': protocol.lower()
                      }
                      callback, extras = hooks_daemon.prepare_callback_daemon(
-                         expected_extras.copy(), protocol=protocol, use_direct_calls=False,
+                         expected_extras.copy(), protocol=protocol, host='127.0.0.1',
+                         use_direct_calls=False,
                          txn_id='txnid2')
                      assert isinstance(callback, expected_class)
                      extras.pop('hooks_uri')
                      with pytest.raises(Exception):
                          callback, extras = hooks_daemon.prepare_callback_daemon(
                              expected_extras.copy(),
-                             protocol=protocol,
+                             protocol=protocol, host='127.0.0.1',
                              use_direct_calls=False)

rhodecode/tests/lib/test_libs.py

0 +99 -56

              from rhodecode.tests import no_newline_id_generator
              from rhodecode.tests.utils import run_test_concurrently
-             from rhodecode.lib.helpers import InitialsGravatar
+             from rhodecode.lib import rc_cache
+             from rhodecode.lib.helpers import InitialsGravatar
              from rhodecode.lib.utils2 import AttributeDict
-             from rhodecode.model.db import Repository
+             from rhodecode.model.db import Repository, CacheKey
              def _urls_for_proto(proto):
                  assert _test == expected
-             @pytest.mark.parametrize("test_repo_name, repo_type", [
-               ("test_repo_1", None),
-               ("repo_group/foobar", None),
-               ("test_non_asci_ąćę", None),
-               (u"test_non_asci_unicode_ąćę", None),
-             ])
-             def test_invalidation_context(baseapp, test_repo_name, repo_type):
-                 from beaker.cache import cache_region
-                 from rhodecode.lib import caches
-                 from rhodecode.model.db import CacheKey
+             def test_invalidation_context(baseapp):
+                 repo_id = 999
+                 cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+                     repo_id, CacheKey.CACHE_TYPE_README)
+                 invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                     repo_id=repo_id)
+                 region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
+                 calls = [1, 2]
-                 @cache_region('long_term')
+                 @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
                  def _dummy_func(cache_key):
-                     return 'result'
+                     val = calls.pop(0)
+                     return 'result:{}'.format(val)
+                 inv_context_manager = rc_cache.InvalidationContext(
+                     uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+                 # 1st call, fresh caches
+                 with inv_context_manager as invalidation_context:
+                     should_invalidate = invalidation_context.should_invalidate()
+                     if should_invalidate:
+                         result = _dummy_func.refresh('some-key')
+                     else:
+                         result = _dummy_func('some-key')
+                     assert isinstance(invalidation_context, rc_cache.FreshRegionCache)
+                     assert should_invalidate is True
-                 invalidator_context = CacheKey.repo_context_cache(
-                     _dummy_func, test_repo_name, 'repo')
+                     assert 'result:1' == result
+                     # should be cached so calling it twice will give the same result !
+                     result = _dummy_func('some-key')
+                     assert 'result:1' == result
-                 with invalidator_context as context:
-                     invalidated = context.invalidate()
-                     result = context.compute()
+                 # 2nd call, we create a new context manager, this should be now key aware, and
+                 # return an active cache region
+                 with inv_context_manager as invalidation_context:
+                     should_invalidate = invalidation_context.should_invalidate()
+                     assert isinstance(invalidation_context, rc_cache.ActiveRegionCache)
+                     assert should_invalidate is False
+                 # Mark invalidation
+                 CacheKey.set_invalidate(invalidation_namespace)
-                 assert invalidated == True
-                 assert 'result' == result
-                 assert isinstance(context, caches.FreshRegionCache)
-                 assert 'InvalidationContext' in repr(invalidator_context)
+                 # 3nd call, fresh caches
+                 with inv_context_manager as invalidation_context:
+                     should_invalidate = invalidation_context.should_invalidate()
+                     if should_invalidate:
+                         result = _dummy_func.refresh('some-key')
+                     else:
+                         result = _dummy_func('some-key')
-                 with invalidator_context as context:
-                     context.invalidate()
-                     result = context.compute()
+                     assert isinstance(invalidation_context, rc_cache.FreshRegionCache)
+                     assert should_invalidate is True
-                 assert 'result' == result
-                 assert isinstance(context, caches.ActiveRegionCache)
+                     assert 'result:2' == result
+                     # cached again, same result
+                     result = _dummy_func('some-key')
+                     assert 'result:2' == result
              def test_invalidation_context_exception_in_compute(baseapp):
-                 from rhodecode.model.db import CacheKey
-                 from beaker.cache import cache_region
+                 repo_id = 888
-                 @cache_region('long_term')
+                 cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+                     repo_id, CacheKey.CACHE_TYPE_README)
+                 invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                     repo_id=repo_id)
+                 region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
+                 @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
                  def _dummy_func(cache_key):
-                     # this causes error since it doesn't get any params
-                     raise Exception('ups')
-                 invalidator_context = CacheKey.repo_context_cache(
-                     _dummy_func, 'test_repo_2', 'repo')
+                     raise Exception('Error in cache func')
                  with pytest.raises(Exception):
-                     with invalidator_context as context:
-                         context.invalidate()
-                         context.compute()
+                     inv_context_manager = rc_cache.InvalidationContext(
+                         uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
+                     # 1st call, fresh caches
+                     with inv_context_manager as invalidation_context:
+                         should_invalidate = invalidation_context.should_invalidate()
+                         if should_invalidate:
+                             _dummy_func.refresh('some-key-2')
+                         else:
+                             _dummy_func('some-key-2')
              @pytest.mark.parametrize('execution_number', range(5))
              def test_cache_invalidation_race_condition(execution_number, baseapp):
                  import time
-                 from beaker.cache import cache_region
-                 from rhodecode.model.db import CacheKey
+                 repo_id = 777
-                 if CacheKey.metadata.bind.url.get_backend_name() == "mysql":
-                     reason = (
-                         'Fails on MariaDB due to some locking issues. Investigation'
-                         ' needed')
-                     pytest.xfail(reason=reason)
+                 cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
+                     repo_id, CacheKey.CACHE_TYPE_README)
+                 invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                     repo_id=repo_id)
+                 region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
                  @run_test_concurrently(25)
                  def test_create_and_delete_cache_keys():
                      time.sleep(0.2)
-                     @cache_region('long_term')
+                     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
                      def _dummy_func(cache_key):
-                         return 'result'
+                         val = 'async'
+                         return 'result:{}'.format(val)
+                     inv_context_manager = rc_cache.InvalidationContext(
+                         uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
-                     invalidator_context = CacheKey.repo_context_cache(
-                         _dummy_func, 'test_repo_1', 'repo')
+                     # 1st call, fresh caches
+                     with inv_context_manager as invalidation_context:
+                         should_invalidate = invalidation_context.should_invalidate()
+                         if should_invalidate:
+                             _dummy_func.refresh('some-key-3')
+                         else:
+                             _dummy_func('some-key-3')
-                     with invalidator_context as context:
-                         context.invalidate()
-                         context.compute()
-                     CacheKey.set_invalidate('test_repo_1', delete=True)
+                     # Mark invalidation
+                     CacheKey.set_invalidate(invalidation_namespace)
                  test_create_and_delete_cache_keys()

rhodecode/tests/lib/test_utils.py

0 +1 -2

                  ui_settings.invalidate()
                  ui_settings = session.query(db.RhodeCodeUi).options(
-                     caching_query.FromCache(
-                         'sql_cache_short', 'get_hook_settings', 'get_hook_settings'))
+                     caching_query.FromCache('sql_cache_short', 'get_hook_settings'))
                  ui_settings.invalidate()
                  @request.addfinalizer

rhodecode/tests/models/test_permissions.py

0 +25 -7

                      assert repo_perms(user)[repo.repo_name] == 'repository.admin'
                      repo.user = org_owner
+                 def test_default_owner_branch_perms(self, user_util, test_user_group):
+                     user = user_util.create_user()
+                     assert branch_perms(user) == {}
                  def test_default_owner_repo_group_perms(self, user_util, test_repo_group):
                      user = user_util.create_user()
                      org_owner = test_repo_group.user
                      user_model.revoke_perm(self.u1, 'hg.fork.repository')
                      user_model.grant_perm(self.u1, 'hg.fork.none')
+                     # TODO(marcink): check branch permissions now ?
                      # make sure inherit flag is turned off
                      self.u1.inherit_default_permissions = False
                      Session().commit()
                      # this user will have non inherited permissions from he's
                      # explicitly set permissions
-                     assert global_perms(self.u1) == set([
+                     assert global_perms(self.u1) == {
                          'hg.create.none',
                          'hg.fork.none',
                          'hg.register.manual_activate',
                          'repository.read',
                          'group.read',
                          'usergroup.read',
-                         ])
+                         'branch.push_force',
+                     }
                  def test_non_inherited_permissions_from_default_on_user_disabled(self):
                      user_model = UserModel()
                      self.u1.inherit_default_permissions = False
                      Session().commit()
+                     # TODO(marcink): check branch perms
                      # this user will have non inherited permissions from he's
                      # explicitly set permissions
-                     assert global_perms(self.u1) == set([
+                     assert global_perms(self.u1) == {
                          'hg.create.repository',
                          'hg.fork.repository',
                          'hg.register.manual_activate',
                          'repository.read',
                          'group.read',
                          'usergroup.read',
-                         ])
+                         'branch.push_force',
+                     }
                  @pytest.mark.parametrize('perm, expected_perm', [
                      ('hg.inherit_default_perms.false', 'repository.none', ),
                      self.u1.inherit_default_permissions = True
                      Session().commit()
+                     # TODO(marcink): check branch perms
                      # this user will have inherited permissions from default user
-                     assert global_perms(self.u1) == set([
+                     assert global_perms(self.u1) == {
                          'hg.create.none',
                          'hg.fork.none',
                          'hg.register.manual_activate',
                          'repository.read',
                          'group.read',
                          'usergroup.read',
+                         'branch.push_force',
                          'hg.create.write_on_repogroup.true',
                          'hg.usergroup.create.false',
                          'hg.repogroup.create.false',
-                         perm,
-                         ])
+                         perm
+                     }
                      assert set(repo_perms(self.u1).values()) == set([expected_perm])
                  return auth_user.permissions['repositories']
+             def branch_perms(user):
+                 auth_user = AuthUser(user_id=user.user_id)
+                 return auth_user.permissions['repository_branches']
              def group_perms(user):
                  auth_user = AuthUser(user_id=user.user_id)
                  return auth_user.permissions['repositories_groups']

rhodecode/tests/models/test_pullrequest.py

0 +20 -12

                      self.source_commit = self.pull_request.source_ref_parts.commit_id
                      self.target_commit = self.pull_request.target_ref_parts.commit_id
                      self.workspace_id = 'pr-%s' % self.pull_request.pull_request_id
+                     self.repo_id = self.pull_request.target_repo.repo_id
                      @request.addfinalizer
                      def cleanup_pull_request():
                      assert pr_count == 1
                  def test_delete_calls_cleanup_merge(self, pull_request):
+                     repo_id = pull_request.target_repo.repo_id
                      PullRequestModel().delete(pull_request, pull_request.author)
                      self.workspace_remove_mock.assert_called_once_with(
-                         self.workspace_id)
+                         repo_id, self.workspace_id)
                  def test_close_calls_cleanup_and_hook(self, pull_request):
                      PullRequestModel().close_pull_request(
                          pull_request, pull_request.author)
+                     repo_id = pull_request.target_repo.repo_id
                      self.workspace_remove_mock.assert_called_once_with(
-                         self.workspace_id)
+                         repo_id, self.workspace_id)
                      self.hook_mock.assert_called_with(
                          self.pull_request, self.pull_request.author, 'close')
                      assert status is True
                      assert msg.eval() == 'This pull request can be automatically merged.'
                      self.merge_mock.assert_called_with(
+                         self.repo_id, self.workspace_id,
                          pull_request.target_ref_parts,
                          pull_request.source_repo.scm_instance(),
-                         pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+                         pull_request.source_ref_parts, dry_run=True,
                          use_rebase=False, close_branch=False)
                      assert pull_request._last_merge_source_rev == self.source_commit
                          msg.eval() ==
                          'This pull request cannot be merged because of merge conflicts.')
                      self.merge_mock.assert_called_with(
+                         self.repo_id, self.workspace_id,
                          pull_request.target_ref_parts,
                          pull_request.source_repo.scm_instance(),
-                         pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+                         pull_request.source_ref_parts, dry_run=True,
                          use_rebase=False, close_branch=False)
                      assert pull_request._last_merge_source_rev == self.source_commit
                          'This pull request cannot be merged because of an unhandled'
                          ' exception.')
                      self.merge_mock.assert_called_with(
+                         self.repo_id, self.workspace_id,
                          pull_request.target_ref_parts,
                          pull_request.source_repo.scm_instance(),
-                         pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+                         pull_request.source_ref_parts, dry_run=True,
                          use_rebase=False, close_branch=False)
                      assert pull_request._last_merge_source_rev is None
                          True, True, merge_ref, MergeFailureReason.NONE)
                      merge_extras['repository'] = pull_request.target_repo.repo_name
-                     PullRequestModel().merge(
+                     PullRequestModel().merge_repo(
                          pull_request, pull_request.author, extras=merge_extras)
                      message = (
                          )
                      )
                      self.merge_mock.assert_called_with(
+                         self.repo_id, self.workspace_id,
                          pull_request.target_ref_parts,
                          pull_request.source_repo.scm_instance(),
-                         pull_request.source_ref_parts, self.workspace_id,
+                         pull_request.source_ref_parts,
                          user_name=user.username, user_email=user.email, message=message,
                          use_rebase=False, close_branch=False
                      )
                          False, False, merge_ref, MergeFailureReason.MERGE_FAILED)
                      merge_extras['repository'] = pull_request.target_repo.repo_name
-                     PullRequestModel().merge(
+                     PullRequestModel().merge_repo(
                          pull_request, pull_request.author, extras=merge_extras)
                      message = (
                          )
                      )
                      self.merge_mock.assert_called_with(
+                         self.repo_id, self.workspace_id,
                          pull_request.target_ref_parts,
                          pull_request.source_repo.scm_instance(),
-                         pull_request.source_ref_parts, self.workspace_id,
+                         pull_request.source_ref_parts,
                          user_name=user.username, user_email=user.email, message=message,
                          use_rebase=False, close_branch=False
                      )
                      Session().commit()
                      with mock.patch.dict(rhodecode.CONFIG, extra_config, clear=False):
-                         merge_state = PullRequestModel().merge(
+                         merge_state = PullRequestModel().merge_repo(
                              pull_request, user_admin, extras=merge_extras)
                      assert merge_state.executed
                      with mock.patch('rhodecode.EXTENSIONS.PRE_PUSH_HOOK') as pre_pull:
                          pre_pull.side_effect = RepositoryError("Disallow push!")
-                         merge_status = PullRequestModel().merge(
+                         merge_status = PullRequestModel().merge_repo(
                              pull_request, user_admin, extras=merge_extras)
                      assert not merge_status.executed
                      merge_extras['repository'] = pull_request.target_repo.repo_name
                      # TODO: johbo: Needed for sqlite, try to find an automatic way for it
                      Session().commit()
-                     merge_status = PullRequestModel().merge(
+                     merge_status = PullRequestModel().merge_repo(
                          pull_request, user_regular, extras=merge_extras)
                      assert not merge_status.executed

rhodecode/tests/models/test_user_group_permissions_on_repo_groups.py

0 +1 -1

                  repo_group = RepoGroup.get_by_group_name(group_name=group_name)
                  if not repo_group:
                      raise Exception('Cannot get group %s' % group_name)
-                 perm_updates = [[test_u2_gr_id, perm, 'users_group']]
+                 perm_updates = [[test_u2_gr_id, perm, 'user_group']]
                  RepoGroupModel().update_permissions(repo_group,
                                                      perm_updates=perm_updates,
                                                      recursive=recursive, check_perms=False)

rhodecode/tests/other/test_views_utils.py ~~rhodecode/tests/controllers/test_utils.py~~

0 renamed 0 0

NO CONTENT: file renamed from rhodecode/tests/controllers/test_utils.py to rhodecode/tests/other/test_views_utils.py

rhodecode/tests/pylons_plugin.py

0 +1 -5

                      overrides = list(overrides)
                      overrides.append({'server:main': {'port': vcsserver_port}})
-                     if is_cygwin():
-                         platform_override = {'DEFAULT': {
-                             'beaker.cache.repo_object.type': 'nocache'}}
-                         overrides.append(platform_override)
                      option_name = 'vcsserver_config_http'
                      override_option_name = 'vcsserver_config_override'
                      config_file = get_config(
                          'vcs.server.protocol': 'http',
                          'vcs.scm_app_implementation': 'http',
                          'vcs.hooks.protocol': 'http',
+                         'vcs.hooks.host': '127.0.0.1',
                      }},
                      {'handler_console': {

rhodecode/tests/rhodecode.ini

0 +14 -30

              beaker.cache.data_dir = %(here)s/rc/data/cache/beaker_data
              beaker.cache.lock_dir = %(here)s/rc/data/cache/beaker_lock
-             beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
-             beaker.cache.super_short_term.type = memory
-             beaker.cache.super_short_term.expire = 1
-             beaker.cache.super_short_term.key_length = 256
-             beaker.cache.short_term.type = memory
-             beaker.cache.short_term.expire = 60
-             beaker.cache.short_term.key_length = 256
+             beaker.cache.regions = long_term
              beaker.cache.long_term.type = memory
              beaker.cache.long_term.expire = 36000
              beaker.cache.long_term.key_length = 256
-             beaker.cache.sql_cache_short.type = memory
-             beaker.cache.sql_cache_short.expire = 1
-             beaker.cache.sql_cache_short.key_length = 256
+             #####################################
+             ###         DOGPILE CACHE        ####
+             #####################################
-             ## default is memory cache, configure only if required
-             ## using multi-node or multi-worker setup
-             #beaker.cache.auth_plugins.type = memory
-             #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
-             #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
-             #beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
-             #beaker.cache.auth_plugins.sa.pool_recycle = 3600
-             #beaker.cache.auth_plugins.sa.pool_size = 10
-             #beaker.cache.auth_plugins.sa.max_overflow = 0
+             ## permission tree cache settings
+             rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
+             rc_cache.cache_perms.expiration_time = 0
+             rc_cache.cache_perms.arguments.filename = /tmp/rc_cache_1
-             beaker.cache.repo_cache_long.type = memorylru_base
-             beaker.cache.repo_cache_long.max_items = 4096
-             beaker.cache.repo_cache_long.expire = 2592000
-             ## default is memorylru_base cache, configure only if required
-             ## using multi-node or multi-worker setup
-             #beaker.cache.repo_cache_long.type = ext:memcached
-             #beaker.cache.repo_cache_long.url = localhost:11211
-             #beaker.cache.repo_cache_long.expire = 1209600
-             #beaker.cache.repo_cache_long.key_length = 256
+             ## cache settings for SQL queries
+             rc_cache.sql_cache_short.backend = dogpile.cache.rc.memory_lru
+             rc_cache.sql_cache_short.expiration_time = 0
              ####################################
              ###       BEAKER SESSION        ####
              ## Push/Pull operations hooks protocol, available options are:
              ## `http` - use http-rpc backend (default)
              vcs.hooks.protocol = http
+             vcs.hooks.host = 127.0.0.1
              vcs.server.log_level = debug
              ## Start VCSServer with this instance as a subprocess, usefull for development

rhodecode/tests/utils.py

0 +29 0

		@@ -427,3 +427,32 b' def commit_change('
427	427	f_path=filename
428	428	)
429	429	return commit
	430
	431
	432	def permission_update_data_generator(csrf_token, default=None, grant=None, revoke=None):
	433	if not default:
	434	raise ValueError('Permission for default user must be given')
	435	form_data = [(
	436	'csrf_token', csrf_token
	437	)]
	438	# add default
	439	form_data.extend([
	440	('u_perm_1', default)
	441	])
	442
	443	if grant:
	444	for cnt, (obj_id, perm, obj_name, obj_type) in enumerate(grant, 1):
	445	form_data.extend([
	446	('perm_new_member_perm_new{}'.format(cnt), perm),
	447	('perm_new_member_id_new{}'.format(cnt), obj_id),
	448	('perm_new_member_name_new{}'.format(cnt), obj_name),
	449	('perm_new_member_type_new{}'.format(cnt), obj_type),
	450
	451	])
	452	if revoke:
	453	for obj_id, obj_type in revoke:
	454	form_data.extend([
	455	('perm_del_member_id_{}'.format(obj_id), obj_id),
	456	('perm_del_member_type_{}'.format(obj_id), obj_type),
	457	])
	458	return form_data

rhodecode/tests/vcs/test_git.py

0 +7 -7

                  def test_maybe_prepare_merge_workspace(self):
                      workspace = self.repo._maybe_prepare_merge_workspace(
-                         'pr2', Reference('branch', 'master', 'unused'),
+, 'pr2', Reference('branch', 'master', 'unused'),
                          Reference('branch', 'master', 'unused'))
                      assert os.path.isdir(workspace)
                      # Calling it a second time should also succeed
                      workspace = self.repo._maybe_prepare_merge_workspace(
-                         'pr2', Reference('branch', 'master', 'unused'),
+, 'pr2', Reference('branch', 'master', 'unused'),
                          Reference('branch', 'master', 'unused'))
                      assert os.path.isdir(workspace)
                  def test_maybe_prepare_merge_workspace_different_refs(self):
                      workspace = self.repo._maybe_prepare_merge_workspace(
-                         'pr2', Reference('branch', 'master', 'unused'),
+, 'pr2', Reference('branch', 'master', 'unused'),
                          Reference('branch', 'develop', 'unused'))
                      assert os.path.isdir(workspace)
                      # Calling it a second time should also succeed
                      workspace = self.repo._maybe_prepare_merge_workspace(
-                         'pr2', Reference('branch', 'master', 'unused'),
+, 'pr2', Reference('branch', 'master', 'unused'),
                          Reference('branch', 'develop', 'unused'))
                      assert os.path.isdir(workspace)
                  def test_cleanup_merge_workspace(self):
                      workspace = self.repo._maybe_prepare_merge_workspace(
-                         'pr3', Reference('branch', 'master', 'unused'),
+, 'pr3', Reference('branch', 'master', 'unused'),
                          Reference('branch', 'master', 'unused'))
-                     self.repo.cleanup_merge_workspace('pr3')
+                     self.repo.cleanup_merge_workspace(2, 'pr3')
                      assert not os.path.exists(workspace)
                  def test_cleanup_merge_workspace_invalid_workspace_id(self):
                      # No assert: because in case of an inexistent workspace this function
                      # should still succeed.
-                     self.repo.cleanup_merge_workspace('pr4')
+                     self.repo.cleanup_merge_workspace(1, 'pr4')
                  def test_set_refs(self):
                      test_ref = 'refs/test-refs/abcde'

rhodecode/tests/vcs/test_hg.py

0 +20 -17

              from rhodecode.lib.vcs.exceptions import (
                  RepositoryError, VCSError, NodeDoesNotExistError, CommitDoesNotExistError)
              from rhodecode.lib.vcs.nodes import FileNode, NodeKind, NodeState
-             from rhodecode.tests import TEST_HG_REPO, TEST_HG_REPO_CLONE
+             from rhodecode.tests import TEST_HG_REPO, TEST_HG_REPO_CLONE, repo_id_generator
              pytestmark = pytest.mark.backends("hg")
                      i += 1
                      yield '%s-%d' % (TEST_HG_REPO_CLONE, i)
              REPO_PATH_GENERATOR = repo_path_generator()
                  def test_maybe_prepare_merge_workspace(self):
                      workspace = self.repo._maybe_prepare_merge_workspace(
-                         'pr2', 'unused', 'unused2')
+, 'pr2', 'unused', 'unused2')
                      assert os.path.isdir(workspace)
                      workspace_repo = MercurialRepository(workspace)
                      # Calling it a second time should also succeed
                      workspace = self.repo._maybe_prepare_merge_workspace(
-                         'pr2', 'unused', 'unused2')
+, 'pr2', 'unused', 'unused2')
                      assert os.path.isdir(workspace)
                  def test_cleanup_merge_workspace(self):
                      workspace = self.repo._maybe_prepare_merge_workspace(
-                         'pr3', 'unused', 'unused2')
-                     self.repo.cleanup_merge_workspace('pr3')
+, 'pr3', 'unused', 'unused2')
+                     assert os.path.isdir(workspace)
+                     self.repo.cleanup_merge_workspace(1, 'pr3')
                      assert not os.path.exists(workspace)
                  def test_cleanup_merge_workspace_invalid_workspace_id(self):
                      # No assert: because in case of an inexistent workspace this function
                      # should still succeed.
-                     self.repo.cleanup_merge_workspace('pr4')
+                     self.repo.cleanup_merge_workspace(1, 'pr4')
                  def test_merge_target_is_bookmark(self, vcsbackend_hg):
                      target_repo = vcsbackend_hg.create_repo(number_of_commits=1)
                      target_repo.bookmark(bookmark_name)
                      target_ref = Reference('book', bookmark_name, target_commit.raw_id)
                      source_ref = Reference('branch', default_branch, source_commit.raw_id)
-                     workspace = 'test-merge'
+                     workspace_id = 'test-merge'
+                     repo_id = repo_id_generator(target_repo.path)
                      merge_response = target_repo.merge(
-                         target_ref, source_repo, source_ref, workspace,
+                         repo_id, workspace_id, target_ref, source_repo, source_ref,
                          'test user', 'test@rhodecode.com', 'merge message 1',
                          dry_run=False)
                      expected_merge_response = MergeResponse(
                      source_repo._update(default_branch)
                      source_repo.bookmark(bookmark_name)
                      source_ref = Reference('book', bookmark_name, source_commit.raw_id)
-                     workspace = 'test-merge'
+                     workspace_id = 'test-merge'
+                     repo_id = repo_id_generator(target_repo.path)
                      merge_response = target_repo.merge(
-                         target_ref, source_repo, source_ref, workspace,
+                         repo_id, workspace_id, target_ref, source_repo, source_ref,
                          'test user', 'test@rhodecode.com', 'merge message 1',
                          dry_run=False)
                      expected_merge_response = MergeResponse(
                      target_ref = Reference('branch', default_branch, target_commit.raw_id)
                      source_ref = Reference('branch', default_branch, source_commit.raw_id)
-                     workspace = 'test-merge'
+                     workspace_id = 'test-merge'
                      assert len(target_repo._heads(branch='default')) == 2
                      expected_merge_response = MergeResponse(
                          False, False, None,
                          MergeFailureReason.HG_TARGET_HAS_MULTIPLE_HEADS)
+                     repo_id = repo_id_generator(target_repo.path)
                      merge_response = target_repo.merge(
-                         target_ref, source_repo, source_ref, workspace,
+                         repo_id, workspace_id, target_ref, source_repo, source_ref,
                          'test user', 'test@rhodecode.com', 'merge message 1',
                          dry_run=False)
                      assert merge_response == expected_merge_response
                      target_ref = Reference('branch', default_branch, target_commit.raw_id)
                      source_ref = Reference('book', bookmark_name, source_commit.raw_id)
-                     workspace = 'test-merge'
+                     repo_id = repo_id_generator(target_repo.path)
+                     workspace_id = 'test-merge'
                      merge_response = target_repo.merge(
-                         target_ref, source_repo, source_ref, workspace,
+                         repo_id, workspace_id, target_ref, source_repo, source_ref,
                          'test user', 'test@rhodecode.com', 'merge message 1',
                          dry_run=False, use_rebase=True)

rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py

0 +2 -2

                      references.
                      """
                      from rhodecode.model.pull_request import PullRequestModel
+                     repo_id = pull_request.target_repo.repo_id
                      target_vcs = pull_request.target_repo.scm_instance()
                      target_ref = pull_request.target_ref_parts
                      source_ref = pull_request.source_ref_parts
                      pr = PullRequestModel()
                      workspace_id = pr._workspace_id(pull_request)
                      shadow_repository_path = target_vcs._maybe_prepare_merge_workspace(
-                         workspace_id, target_ref, source_ref)
+                         repo_id, workspace_id, target_ref, source_ref)
                      shadow_repo = target_vcs._get_shadow_instance(shadow_repository_path)
                      # This will populate the cache of the mercurial repository object

rhodecode/tests/vcs/test_repository.py

0 +36 -20

              from rhodecode.lib.vcs.exceptions import VCSError, RepositoryError
              from rhodecode.lib.vcs.nodes import FileNode
              from rhodecode.tests.vcs.conftest import BackendTestMixin
+             from rhodecode.tests import repo_id_generator
              @pytest.mark.usefixtures("vcs_repository_support")
              @pytest.mark.backends("git", "hg")
-             class TestRepositoryMerge:
+             class TestRepositoryMerge(object):
                  def prepare_for_success(self, vcsbackend):
                      self.target_repo = vcsbackend.create_repo(number_of_commits=1)
                      self.source_repo = vcsbackend.clone_repo(self.target_repo)
                          'branch', default_branch, self.target_commit.raw_id)
                      self.source_ref = Reference(
                          'branch', default_branch, self.source_commit.raw_id)
-                     self.workspace = 'test-merge'
+                     self.workspace_id = 'test-merge'
+                     self.repo_id = repo_id_generator(self.target_repo.path)
                  def prepare_for_conflict(self, vcsbackend):
                      self.target_repo = vcsbackend.create_repo(number_of_commits=1)
                          'branch', default_branch, self.target_commit.raw_id)
                      self.source_ref = Reference(
                          'branch', default_branch, self.source_commit.raw_id)
-                     self.workspace = 'test-merge'
+                     self.workspace_id = 'test-merge'
+                     self.repo_id = repo_id_generator(self.target_repo.path)
                  def test_merge_success(self, vcsbackend):
                      self.prepare_for_success(vcsbackend)
                      merge_response = self.target_repo.merge(
-                         self.target_ref, self.source_repo, self.source_ref, self.workspace,
+                         self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
+                         self.source_ref,
                          'test user', 'test@rhodecode.com', 'merge message 1',
                          dry_run=False)
                      expected_merge_response = MergeResponse(
                          merge_response.merge_ref.commit_id)
                      merge_response = target_repo.merge(
-                         target_ref, self.source_repo, self.source_ref, self.workspace,
+                         self.repo_id, self.workspace_id, target_ref, self.source_repo, self.source_ref,
                          'test user', 'test@rhodecode.com', 'merge message 2',
                          dry_run=False)
                      expected_merge_response = MergeResponse(
                      self.prepare_for_success(vcsbackend)
                      merge_response = self.target_repo.merge(
-                         self.target_ref, self.source_repo, self.source_ref, self.workspace,
-                         dry_run=True)
+                         self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
+                         self.source_ref, dry_run=True)
                      # We call it twice so to make sure we can handle updates
                      merge_response_update = self.target_repo.merge(
-                         self.target_ref, self.source_repo, self.source_ref, self.workspace,
-                         dry_run=True)
+                         self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
+                         self.source_ref, dry_run=True)
                      # Multiple merges may differ in their commit id. Therefore we set the
                      # commit id to `None` before comparing the merge responses.
                          False, False, None, MergeFailureReason.MERGE_FAILED)
                      merge_response = self.target_repo.merge(
-                         self.target_ref, self.source_repo, self.source_ref, self.workspace,
+                         self.repo_id,  self.workspace_id, self.target_ref,
+                         self.source_repo, self.source_ref,
                          'test_user', 'test@rhodecode.com', 'test message', dry_run=dry_run)
                      assert merge_response == expected_merge_response
                      # We call it twice so to make sure we can handle updates
                      merge_response = self.target_repo.merge(
-                         self.target_ref, self.source_repo, self.source_ref, self.workspace,
+                         self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
+                         self.source_ref,
                          'test_user', 'test@rhodecode.com', 'test message', dry_run=dry_run)
                      assert merge_response == expected_merge_response
                          self.target_ref.type, self.target_ref.name, '0' * 40)
                      merge_response = self.target_repo.merge(
-                         target_ref, self.source_repo, self.source_ref, self.workspace,
-                         dry_run=True)
+                         self.repo_id, self.workspace_id, target_ref, self.source_repo,
+                         self.source_ref, dry_run=True)
                      assert merge_response == expected_merge_response
                          self.source_ref.type, 'not_existing', self.source_ref.commit_id)
                      merge_response = self.target_repo.merge(
-                         self.target_ref, self.source_repo, source_ref, self.workspace,
+                         self.repo_id, self.workspace_id, self.target_ref,
+                         self.source_repo, source_ref,
                          dry_run=True)
                      assert merge_response == expected_merge_response
                      with mock.patch.object(self.target_repo, '_merge_repo',
                                             side_effect=RepositoryError()):
                          merge_response = self.target_repo.merge(
-                             self.target_ref, self.source_repo, self.source_ref,
-                             self.workspace, dry_run=True)
+                             self.repo_id, self.workspace_id, self.target_ref,
+                             self.source_repo, self.source_ref,
+                             dry_run=True)
                      assert merge_response == expected_merge_response
                  def test_merge_invalid_user_name(self, vcsbackend):
                      repo = vcsbackend.create_repo(number_of_commits=1)
                      ref = Reference('branch', 'master', 'not_used')
+                     workspace_id = 'test-errors-in-merge'
+                     repo_id = repo_id_generator(workspace_id)
                      with pytest.raises(ValueError):
-                         repo.merge(ref, self, ref, 'workspace_id')
+                         repo.merge(repo_id,  workspace_id, ref, self, ref)
                  def test_merge_invalid_user_email(self, vcsbackend):
                      repo = vcsbackend.create_repo(number_of_commits=1)
                      ref = Reference('branch', 'master', 'not_used')
+                     workspace_id = 'test-errors-in-merge'
+                     repo_id = repo_id_generator(workspace_id)
                      with pytest.raises(ValueError):
-                         repo.merge(ref, self, ref, 'workspace_id', 'user name')
+                         repo.merge(
+                             repo_id,  workspace_id, ref, self, ref, 'user name')
                  def test_merge_invalid_message(self, vcsbackend):
                      repo = vcsbackend.create_repo(number_of_commits=1)
                      ref = Reference('branch', 'master', 'not_used')
+                     workspace_id = 'test-errors-in-merge'
+                     repo_id = repo_id_generator(workspace_id)
                      with pytest.raises(ValueError):
                          repo.merge(
-                             ref, self, ref, 'workspace_id', 'user name', 'user@email.com')
+                             repo_id, workspace_id, ref, self, ref,
+                             'user name', 'user@email.com')
              @pytest.mark.usefixtures("vcs_repository_support")
              @pytest.mark.backends('hg', 'git')
-             class TestRepositoryPull:
+             class TestRepositoryPull(object):
                  def test_pull(self, vcsbackend):
                      source_repo = vcsbackend.repo

rhodecode/tests/vcs/test_tags.py

0 +2 -2

                  def test_name_with_slash(self):
                      self.repo.tag('19/10/11', 'joe')
                      assert '19/10/11' in self.repo.tags
-                     self.repo.tag('11', 'joe')
-                     assert '11' in self.repo.tags
+                     self.repo.tag('rel.11', 'joe')
+                     assert 'rel.11' in self.repo.tags

rhodecode/tests/vcs_operations/__init__.py

0 +38 -17

                      assert self.process.returncode == 0
-             def _add_files_and_push(vcs, dest, clone_url=None, tags=None, **kwargs):
-                 """
-                 Generate some files, add it to DEST repo and push back
-                 vcs is git or hg and defines what VCS we want to make those files for
-                 """
-                 # commit some stuff into this repo
+             def _add_files(vcs, dest, clone_url=None, tags=None, target_branch=None,
+                                     new_branch=False, **kwargs):
+                 git_ident = "git config user.name {} && git config user.email {}".format(
+                         'Marcin Kuźminski', 'me@email.com')
+                 cwd = path = jn(dest)
                  tags = tags or []
-                 cwd = path = jn(dest)
                  added_file = jn(path, '%ssetup.py' % tempfile._RandomNameSequence().next())
                  Command(cwd).execute('touch %s' % added_file)
                  Command(cwd).execute('%s add %s' % (vcs, added_file))
                  author_str = 'Marcin Kuźminski <me@email.com>'
-                 git_ident = "git config user.name {} && git config user.email {}".format(
-                         'Marcin Kuźminski', 'me@email.com')
                  for i in range(kwargs.get('files_no', 3)):
                      cmd = """echo 'added_line%s' >> %s""" % (i, added_file)
                      Command(cwd).execute(cmd)
                  for tag in tags:
                      if vcs == 'hg':
-                         stdout, stderr = Command(cwd).execute(
+                         Command(cwd).execute(
                              'hg tag', tag['name'])
                      elif vcs == 'git':
                          if tag['commit']:
                              # annotated tag
-                             stdout, stderr = Command(cwd).execute(
+                             _stdout, _stderr = Command(cwd).execute(
                                  """%s && git tag -a %s -m "%s" """ % (
                                      git_ident, tag['name'], tag['commit']))
                          else:
                              # lightweight tag
-                             stdout, stderr = Command(cwd).execute(
+                             _stdout, _stderr = Command(cwd).execute(
                                  """%s && git tag %s""" % (
                                      git_ident, tag['name']))
+             def _add_files_and_push(vcs, dest, clone_url=None, tags=None, target_branch=None,
+                                     new_branch=False, **kwargs):
+                 """
+                 Generate some files, add it to DEST repo and push back
+                 vcs is git or hg and defines what VCS we want to make those files for
+                 """
+                 git_ident = "git config user.name {} && git config user.email {}".format(
+                         'Marcin Kuźminski', 'me@email.com')
+                 cwd = path = jn(dest)
+                 # commit some stuff into this repo
+                 _add_files(vcs, dest, clone_url, tags, target_branch, new_branch, **kwargs)
+                 default_target_branch = {
+                     'git': 'master',
+                     'hg': 'default'
+                 }.get(vcs)
+                 target_branch = target_branch or default_target_branch
                  # PUSH it back
                  stdout = stderr = None
                  if vcs == 'hg':
+                     maybe_new_branch = ''
+                     if new_branch:
+                         maybe_new_branch = '--new-branch'
                      stdout, stderr = Command(cwd).execute(
-                         'hg push --verbose', clone_url)
+                         'hg push --verbose {} -r {} {}'.format(maybe_new_branch, target_branch, clone_url)
+                     )
                  elif vcs == 'git':
                      stdout, stderr = Command(cwd).execute(
-                         """%s &&
-                         git push --verbose --tags %s master""" % (
-                             git_ident, clone_url))
+                         """{} &&
+                         git push --verbose --tags {} {}""".format(git_ident, clone_url, target_branch)
+                     )
                  return stdout, stderr

rhodecode/tests/vcs_operations/conftest.py

0 +75 -3

		@@ -33,7 +33,8 b' import textwrap'
33	33	import pytest
34	34
35	35	from rhodecode import events
36		from rhodecode.model.db import Integration
	36	from rhodecode.model.db import Integration, UserRepoToPerm, Permission, \
	37	UserToRepoBranchPermission, User
37	38	from rhodecode.model.integration import IntegrationModel
38	39	from rhodecode.model.db import Repository
39	40	from rhodecode.model.meta import Session
		@@ -238,13 +239,13 b' def enable_webhook_push_integration(requ'
238	239	Session().add(integration)
239	240
240	241	settings = dict(
241		url='http://httpbin.org',
	242	url='http://httpbin.org/post',
242	243	secret_token='secret',
243	244	username=None,
244	245	password=None,
245	246	custom_header_key=None,
246	247	custom_header_val=None,
247		method_type='get',
	248	method_type='post',
248	249	events=[events.RepoPushEvent.name],
249	250	log_data=True
250	251	)
		@@ -267,3 +268,74 b' def enable_webhook_push_integration(requ'
267	268	Session().delete(integration)
268	269	Session().commit()
269	270
	271
	272	@pytest.fixture
	273	def branch_permission_setter(request):
	274	"""
	275
	276	def my_test(branch_permission_setter)
	277	branch_permission_setter(repo_name, username, pattern='*', permission='branch.push')
	278
	279	"""
	280
	281	rule_id = None
	282	write_perm_id = None
	283
	284	def _branch_permissions_setter(
	285	repo_name, username, pattern='*', permission='branch.push_force'):
	286	global rule_id, write_perm_id
	287
	288	repo = Repository.get_by_repo_name(repo_name)
	289	repo_id = repo.repo_id
	290
	291	user = User.get_by_username(username)
	292	user_id = user.user_id
	293
	294	rule_perm_obj = Permission.get_by_key(permission)
	295
	296	write_perm = None
	297
	298	# add new entry, based on existing perm entry
	299	perm = UserRepoToPerm.query() \
	300	.filter(UserRepoToPerm.repository_id == repo_id) \
	301	.filter(UserRepoToPerm.user_id == user_id) \
	302	.first()
	303
	304	if not perm:
	305	# such user isn't defined in Permissions for repository
	306	# we now on-the-fly add new permission
	307
	308	write_perm = UserRepoToPerm()
	309	write_perm.permission = Permission.get_by_key('repository.write')
	310	write_perm.repository_id = repo_id
	311	write_perm.user_id = user_id
	312	Session().add(write_perm)
	313	Session().flush()
	314
	315	perm = write_perm
	316
	317	rule = UserToRepoBranchPermission()
	318	rule.rule_to_perm_id = perm.repo_to_perm_id
	319	rule.branch_pattern = pattern
	320	rule.rule_order = 10
	321	rule.permission = rule_perm_obj
	322	rule.repository_id = repo_id
	323	Session().add(rule)
	324	Session().commit()
	325
	326	global rule, write_perm
	327
	328	return rule
	329
	330	@request.addfinalizer
	331	def cleanup():
	332	if rule:
	333	Session().delete(rule)
	334	Session().commit()
	335	if write_perm:
	336	Session().delete(write_perm)
	337	Session().commit()
	338
	339	return _branch_permissions_setter
	340
	341

rhodecode/tests/vcs_operations/test_vcs_operations.py

0 +30 -31

              import pytest
+             from rhodecode.lib import rc_cache
              from rhodecode.model.auth_token import AuthTokenModel
              from rhodecode.model.db import Repository, UserIpMap, CacheKey
              from rhodecode.model.meta import Session
                      _check_proper_git_push(stdout, stderr)
-                 def test_push_invalidates_cache_hg(self, rc_web_server, tmpdir):
-                     key = CacheKey.query().filter(CacheKey.cache_key == HG_REPO).scalar()
-                     if not key:
-                         key = CacheKey(HG_REPO, HG_REPO)
+                 def test_push_invalidates_cache(self, rc_web_server, tmpdir):
+                     hg_repo = Repository.get_by_repo_name(HG_REPO)
+                     # init cache objects
+                     CacheKey.delete_all_cache()
+                     cache_namespace_uid = 'cache_push_test.{}'.format(hg_repo.repo_id)
+                     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
+                         repo_id=hg_repo.repo_id)
-                     key.cache_active = True
-                     Session().add(key)
-                     Session().commit()
+                     inv_context_manager = rc_cache.InvalidationContext(
+                         uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
-                     clone_url = rc_web_server.repo_clone_url(HG_REPO)
+                     with inv_context_manager as invalidation_context:
+                         # __enter__ will create and register cache objects
+                         pass
+                     # clone to init cache
+                     clone_url = rc_web_server.repo_clone_url(hg_repo.repo_name)
                      stdout, stderr = Command('/tmp').execute(
                          'hg clone', clone_url, tmpdir.strpath)
+                     cache_keys = hg_repo.cache_keys
+                     assert cache_keys != []
+                     for key in cache_keys:
+                         assert key.cache_active is True
+                     # PUSH that should trigger invalidation cache
                      stdout, stderr = _add_files_and_push(
                          'hg', tmpdir.strpath, clone_url=clone_url, files_no=1)
-                     key = CacheKey.query().filter(CacheKey.cache_key == HG_REPO).one()
-                     assert key.cache_active is False
-                 def test_push_invalidates_cache_git(self, rc_web_server, tmpdir):
-                     key = CacheKey.query().filter(CacheKey.cache_key == GIT_REPO).scalar()
-                     if not key:
-                         key = CacheKey(GIT_REPO, GIT_REPO)
-                     key.cache_active = True
-                     Session().add(key)
+                     # flush...
                      Session().commit()
-                     clone_url = rc_web_server.repo_clone_url(GIT_REPO)
-                     stdout, stderr = Command('/tmp').execute(
-                         'git clone', clone_url, tmpdir.strpath)
-                     # commit some stuff into this repo
-                     stdout, stderr = _add_files_and_push(
-                         'git', tmpdir.strpath, clone_url=clone_url, files_no=1)
-                     _check_proper_git_push(stdout, stderr)
-                     key = CacheKey.query().filter(CacheKey.cache_key == GIT_REPO).one()
-                     assert key.cache_active is False
+                     hg_repo = Repository.get_by_repo_name(HG_REPO)
+                     cache_keys = hg_repo.cache_keys
+                     assert cache_keys != []
+                     for key in cache_keys:
+                         # keys should be marked as not active
+                         assert key.cache_active is False
                  def test_push_wrong_credentials_hg(self, rc_web_server, tmpdir):
                      clone_url = rc_web_server.repo_clone_url(HG_REPO)

setup.py

0 +14 -8

              import sys
              import pkgutil
              import platform
+             import codecs
-             from pip.download import PipSession
-             from pip.req import parse_requirements
+             try:  # for pip >= 10
+                 from pip._internal.req import parse_requirements
+             except ImportError:  # for pip <= 9.0.3
+                 from pip.req import parse_requirements
-             from codecs import open
+             try:  # for pip >= 10
+                 from pip._internal.download import PipSession
+             except ImportError:  # for pip <= 9.0.3
+                 from pip.download import PipSession
              if sys.version_info < (2, 7):
              readme_file = 'README.rst'
              changelog_file = 'CHANGES.rst'
              try:
-                 long_description = open(readme_file).read() + '\n\n' + \
-                     open(changelog_file).read()
+                 long_description = codecs.open(readme_file).read() + '\n\n' + \
+                                    codecs.open(changelog_file).read()
              except IOError as err:
                  sys.stderr.write(
                      "[WARNING] Cannot find file specified as long_description (%s)\n "
                  keywords=keywords,
                  license=__license__,
                  author=__author__,
-                 author_email='marcin@rhodecode.com',
+                 author_email='support@rhodecode.com',
                  url=__url__,
                  setup_requires=setup_requirements,
                  install_requires=install_requirements,
                          'rc-ssh-wrapper=rhodecode.apps.ssh_support.lib.ssh_wrapper:main',
                      ],
                      'beaker.backends': [
-                         'memorylru_base=rhodecode.lib.memory_lru_debug:MemoryLRUNamespaceManagerBase',
-                         'memorylru_debug=rhodecode.lib.memory_lru_debug:MemoryLRUNamespaceManagerDebug'
+                         'memorylru_base=rhodecode.lib.memory_lru_dict:MemoryLRUNamespaceManagerBase',
+                         'memorylru_debug=rhodecode.lib.memory_lru_dict:MemoryLRUNamespaceManagerDebug'
                      ]
                  },
              )

shell.nix

0 +49 -16

+             # This file contains the adjustments which are desired for a development
+             # environment.
              { pkgs ? (import <nixpkgs> {})
              , pythonPackages ? "python27Packages"
-             , doCheck ? true
+             , doCheck ? false
              , sourcesOverrides ? {}
              , doDevelopInstall ? true
              }:
                sources = (pkgs.config.rc.sources or {}) // sourcesOverrides;
                enterprise-ce = import ./default.nix {
-                 inherit pkgs pythonPackages doCheck;
+                 inherit
+                   pkgs
+                   pythonPackages
+                   doCheck;
                };
                ce-pythonPackages = enterprise-ce.pythonPackages;
                  let
                    path = pkgs.lib.attrByPath [attributeName] null sources;
                    doIt = doDevelopInstall && path != null;
                  in
-                   pkgs.lib.optionalString doIt (
-                   builtins.trace "Develop install of ${attributeName} from ${path}" ''
-                     echo "Develop install of '${attributeName}' from '${path}' [BEGIN]"
+                   # do develop installation with empty hosts to skip any package duplicates to
+                   # be replaced. This only pushes the package to be locally available
+                   pkgs.lib.optionalString doIt (''
+                     echo "[BEGIN] Develop install of '${attributeName}' from '${path}'"
                      pushd ${path}
                      python setup.py develop --prefix $tmp_path --allow-hosts ""
                      popd
-                     echo "Develop install of '${attributeName}' from '${path}' [DONE]"
+                     echo "[DONE] Develop install of '${attributeName}' from '${path}'"
+                     echo ""
                    '');
                # This method looks up a path from `pkgs.config.rc.sources` and imports the
                optionalDevelopInstallBuildInputs = attributeName:
                  let
                    path = pkgs.lib.attrByPath [attributeName] null sources;
+                   doIt = doDevelopInstall && path != null && pkgs.lib.pathExists "${nixFile}";
                    nixFile = "${path}/default.nix";
-                   doIt = doDevelopInstall && path != null && pkgs.lib.pathExists "${nixFile}";
                    derivate = import "${nixFile}" {
                      inherit doCheck pkgs pythonPackages;
                    };
                  in
-                   pkgs.lib.lists.optionals doIt derivate.propagatedNativeBuildInputs;
+                   pkgs.lib.lists.optionals doIt (
+                     derivate.propagatedBuildInputs
+                   );
                developInstalls = [ "rhodecode-vcsserver" ];
                # make development a little bit more convenient.
                src = null;
+               # Add dependencies which are useful for the development environment.
                buildInputs =
                  attrs.buildInputs ++
-                 pkgs.lib.lists.concatMap optionalDevelopInstallBuildInputs developInstalls ++
                  (with ce-pythonPackages; [
                    bumpversion
                    invoke
                    ipdb
                  ]);
-               # Somewhat snappier setup of the development environment
-               # TODO: think of supporting a stable path again, so that multiple shells
-               #       can share it.
-               preShellHook = enterprise-ce.linkNodeAndBowerPackages + ''
+               # place to inject some required libs from develop installs
+               propagatedBuildInputs =
+                 attrs.propagatedBuildInputs ++
+                 pkgs.lib.lists.concatMap optionalDevelopInstallBuildInputs developInstalls;
+               # Make sure we execute both hooks
+               shellHook = ''
+                 runHook preShellHook
+                 runHook postShellHook
+               '';
+               preShellHook = ''
+                 echo "Entering CE-Shell"
                  # Custom prompt to distinguish from other dev envs.
                  export PS1="\n\[\033[1;32m\][CE-shell:\w]$\[\033[0m\] "
+                 echo "Building frontend assets"
+                 ${enterprise-ce.linkNodeAndBowerPackages}
                  # Setup a temporary directory.
                  tmp_path=$(mktemp -d)
                  export PATH="$tmp_path/bin:$PATH"
                  export PYTHONPATH="$tmp_path/${ce-pythonPackages.python.sitePackages}:$PYTHONPATH"
                  mkdir -p $tmp_path/${ce-pythonPackages.python.sitePackages}
-                 # Develop installations
+                 # Develop installation
+                 echo "[BEGIN]: develop install of rhodecode-enterprise-ce"
                  python setup.py develop --prefix $tmp_path --allow-hosts ""
-                 echo "Additional develop installs"
-               '' + pkgs.lib.strings.concatMapStrings optionalDevelopInstall developInstalls;
+               '';
+               postShellHook = ''
+                 echo "** Additional develop installs **"
+                 '' +
+                 pkgs.lib.strings.concatMapStrings optionalDevelopInstall developInstalls
+                 + ''
+               '';
              })

pkgs/backport-16.03-build-bower-components.nix

0 removed 0 -68

			@@ -1,68 +0,0 b''
	1		# Backported buildBowerComponents so that we can also use it with the version
	2		# 16.03 which is the current stable at the time of this writing.
	3		#
	4		# This file can be removed once building with 16.03 is not needed anymore.
	5
	6		{ pkgs }:
	7
	8		{ buildInputs ? [], generated, ... } @ attrs:
	9
	10		let
	11		bower2nix-src = pkgs.fetchzip {
	12		url = "https://github.com/rvl/bower2nix/archive/v3.0.1.tar.gz";
	13		sha256 = "1zbvz96k2j6g0r4lvm5cgh41a73k9dgayk7x63cmg538dzznxvyb";
	14		};
	15
	16		bower2nix = import "${bower2nix-src}/default.nix" { inherit pkgs; };
	17
	18		fetchbower = import ./backport-16.03-fetchbower.nix {
	19		inherit (pkgs) stdenv lib;
	20		inherit bower2nix;
	21		};
	22
	23		# Fetches the bower packages. `generated` should be the result of a
	24		# `bower2nix` command.
	25		bowerPackages = import generated {
	26		inherit (pkgs) buildEnv;
	27		inherit fetchbower;
	28		};
	29
	30		in pkgs.stdenv.mkDerivation (
	31		attrs
	32		//
	33		{
	34		name = "bower_components-" + attrs.name;
	35
	36		inherit bowerPackages;
	37
	38		builder = builtins.toFile "builder.sh" ''
	39		source $stdenv/setup
	40
	41		# The project's bower.json is required
	42		cp $src/bower.json .
	43
	44		# Dereference symlinks -- bower doesn't like them
	45		cp --recursive --reflink=auto \
	46		--dereference --no-preserve=mode \
	47		$bowerPackages bc
	48
	49		# Bower install in offline mode -- links together the fetched
	50		# bower packages.
	51		HOME=$PWD bower \
	52		--config.registry=https://registry.bower.io \
	53		--config.storage.packages=bc/packages \
	54		--config.storage.registry=bc/registry \
	55		install
	56
	57		# Sets up a single bower_components directory within
	58		# the output derivation.
	59		mkdir -p $out
	60		mv bower_components $out
	61		'';
	62
	63		buildInputs = buildInputs ++ [
	64		pkgs.git
	65		pkgs.nodePackages.bower
	66		];
	67		}
	68		)

pkgs/backport-16.03-fetchbower.nix

0 removed 0 -26

			@@ -1,26 +0,0 b''
	1		{ stdenv, lib, bower2nix }:
	2		let
	3		bowerVersion = version:
	4		let
	5		components = lib.splitString "#" version;
	6		hash = lib.last components;
	7		ver = if builtins.length components == 1 then version else hash;
	8		in ver;
	9
	10		fetchbower = name: version: target: outputHash: stdenv.mkDerivation {
	11		name = "${name}-${bowerVersion version}";
	12		buildCommand = ''
	13		fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"
	14		# In some cases, the result of fetchBower is different depending
	15		# on the output directory (e.g. if the bower package contains
	16		# symlinks). So use a local output directory before copying to
	17		# $out.
	18		cp -R out $out
	19		'';
	20		outputHashMode = "recursive";
	21		outputHashAlgo = "sha256";
	22		inherit outputHash;
	23		buildInputs = [ bower2nix ];
	24		};
	25
	26		in fetchbower

rhodecode/lib/caches.py

0 removed 0 -269

			@@ -1,269 +0,0 b''
	1		# -- coding: utf-8 --
	2
	3		# Copyright (C) 2015-2018 RhodeCode GmbH
	4		#
	5		# This program is free software: you can redistribute it and/or modify
	6		# it under the terms of the GNU Affero General Public License, version 3
	7		# (only), as published by the Free Software Foundation.
	8		#
	9		# This program is distributed in the hope that it will be useful,
	10		# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12		# GNU General Public License for more details.
	13		#
	14		# You should have received a copy of the GNU Affero General Public License
	15		# along with this program. If not, see <http://www.gnu.org/licenses/>.
	16		#
	17		# This program is dual-licensed. If you wish to learn more about the
	18		# RhodeCode Enterprise Edition, including its added features, Support services,
	19		# and proprietary license terms, please see https://rhodecode.com/licenses/
	20
	21
	22		import beaker
	23		import logging
	24		import threading
	25
	26		from beaker.cache import _cache_decorate, cache_regions, region_invalidate
	27		from sqlalchemy.exc import IntegrityError
	28
	29		from rhodecode.lib.utils import safe_str, md5
	30		from rhodecode.model.db import Session, CacheKey
	31
	32		log = logging.getLogger(__name__)
	33
	34		FILE_TREE = 'cache_file_tree'
	35		FILE_TREE_META = 'cache_file_tree_metadata'
	36		FILE_SEARCH_TREE_META = 'cache_file_search_metadata'
	37		SUMMARY_STATS = 'cache_summary_stats'
	38
	39		# This list of caches gets purged when invalidation happens
	40		USED_REPO_CACHES = (FILE_TREE, FILE_SEARCH_TREE_META)
	41
	42		DEFAULT_CACHE_MANAGER_CONFIG = {
	43		'type': 'memorylru_base',
	44		'max_items': 10240,
	45		'key_length': 256,
	46		'enabled': True
	47		}
	48
	49
	50		def get_default_cache_settings(settings):
	51		cache_settings = {}
	52		for key in settings.keys():
	53		for prefix in ['beaker.cache.', 'cache.']:
	54		if key.startswith(prefix):
	55		name = key.split(prefix)[1].strip()
	56		cache_settings[name] = settings[key].strip()
	57		return cache_settings
	58
	59
	60		# set cache regions for beaker so celery can utilise it
	61		def configure_caches(settings, default_region_settings=None):
	62		cache_settings = {'regions': None}
	63		# main cache settings used as default ...
	64		cache_settings.update(get_default_cache_settings(settings))
	65		default_region_settings = default_region_settings or \
	66		{'type': DEFAULT_CACHE_MANAGER_CONFIG['type']}
	67		if cache_settings['regions']:
	68		for region in cache_settings['regions'].split(','):
	69		region = region.strip()
	70		region_settings = default_region_settings.copy()
	71		for key, value in cache_settings.items():
	72		if key.startswith(region):
	73		region_settings[key.split(region + '.')[-1]] = value
	74		log.debug('Configuring cache region `%s` with settings %s',
	75		region, region_settings)
	76		configure_cache_region(
	77		region, region_settings, cache_settings)
	78
	79
	80		def configure_cache_region(
	81		region_name, region_settings, default_cache_kw, default_expire=60):
	82		default_type = default_cache_kw.get('type', 'memory')
	83		default_lock_dir = default_cache_kw.get('lock_dir')
	84		default_data_dir = default_cache_kw.get('data_dir')
	85
	86		region_settings['lock_dir'] = region_settings.get('lock_dir', default_lock_dir)
	87		region_settings['data_dir'] = region_settings.get('data_dir', default_data_dir)
	88		region_settings['type'] = region_settings.get('type', default_type)
	89		region_settings['expire'] = int(region_settings.get('expire', default_expire))
	90
	91		beaker.cache.cache_regions[region_name] = region_settings
	92
	93
	94		def get_cache_manager(region_name, cache_name, custom_ttl=None):
	95		"""
	96		Creates a Beaker cache manager. Such instance can be used like that::
	97
	98		_namespace = caches.get_repo_namespace_key(caches.XXX, repo_name)
	99		cache_manager = caches.get_cache_manager('repo_cache_long', _namespace)
	100		_cache_key = caches.compute_key_from_params(repo_name, commit.raw_id)
	101		def heavy_compute():
	102		...
	103		result = cache_manager.get(_cache_key, createfunc=heavy_compute)
	104
	105		:param region_name: region from ini file
	106		:param cache_name: custom cache name, usually prefix+repo_name. eg
	107		file_switcher_repo1
	108		:param custom_ttl: override .ini file timeout on this cache
	109		:return: instance of cache manager
	110		"""
	111
	112		cache_config = cache_regions.get(region_name, DEFAULT_CACHE_MANAGER_CONFIG)
	113		if custom_ttl:
	114		log.debug('Updating region %s with custom ttl: %s',
	115		region_name, custom_ttl)
	116		cache_config.update({'expire': custom_ttl})
	117
	118		return beaker.cache.Cache._get_cache(cache_name, cache_config)
	119
	120
	121		def clear_cache_manager(cache_manager):
	122		"""
	123		namespace = 'foobar'
	124		cache_manager = get_cache_manager('repo_cache_long', namespace)
	125		clear_cache_manager(cache_manager)
	126		"""
	127
	128		log.debug('Clearing all values for cache manager %s', cache_manager)
	129		cache_manager.clear()
	130
	131
	132		def clear_repo_caches(repo_name):
	133		# invalidate cache manager for this repo
	134		for prefix in USED_REPO_CACHES:
	135		namespace = get_repo_namespace_key(prefix, repo_name)
	136		cache_manager = get_cache_manager('repo_cache_long', namespace)
	137		clear_cache_manager(cache_manager)
	138
	139
	140		def compute_key_from_params(*args):
	141		"""
	142		Helper to compute key from given params to be used in cache manager
	143		"""
	144		return md5("_".join(map(safe_str, args)))
	145
	146
	147		def get_repo_namespace_key(prefix, repo_name):
	148		return '{0}_{1}'.format(prefix, compute_key_from_params(repo_name))
	149
	150
	151		def conditional_cache(region, prefix, condition, func):
	152		"""
	153		Conditional caching function use like::
	154		def _c(arg):
	155		# heavy computation function
	156		return data
	157
	158		# depending on the condition the compute is wrapped in cache or not
	159		compute = conditional_cache('short_term', 'cache_desc',
	160		condition=True, func=func)
	161		return compute(arg)
	162
	163		:param region: name of cache region
	164		:param prefix: cache region prefix
	165		:param condition: condition for cache to be triggered, and
	166		return data cached
	167		:param func: wrapped heavy function to compute
	168
	169		"""
	170		wrapped = func
	171		if condition:
	172		log.debug('conditional_cache: True, wrapping call of '
	173		'func: %s into %s region cache', region, func)
	174		cached_region = _cache_decorate((prefix,), None, None, region)
	175		wrapped = cached_region(func)
	176		return wrapped
	177
	178
	179		class ActiveRegionCache(object):
	180		def __init__(self, context):
	181		self.context = context
	182
	183		def invalidate(self, args, *kwargs):
	184		return False
	185
	186		def compute(self):
	187		log.debug('Context cache: getting obj %s from cache', self.context)
	188		return self.context.compute_func(self.context.cache_key)
	189
	190
	191		class FreshRegionCache(ActiveRegionCache):
	192		def invalidate(self):
	193		log.debug('Context cache: invalidating cache for %s', self.context)
	194		region_invalidate(
	195		self.context.compute_func, None, self.context.cache_key)
	196		return True
	197
	198
	199		class InvalidationContext(object):
	200		def __repr__(self):
	201		return '<InvalidationContext:{}[{}]>'.format(
	202		safe_str(self.repo_name), safe_str(self.cache_type))
	203
	204		def __init__(self, compute_func, repo_name, cache_type,
	205		raise_exception=False, thread_scoped=False):
	206		self.compute_func = compute_func
	207		self.repo_name = repo_name
	208		self.cache_type = cache_type
	209		self.cache_key = compute_key_from_params(
	210		repo_name, cache_type)
	211		self.raise_exception = raise_exception
	212
	213		# Append the thread id to the cache key if this invalidation context
	214		# should be scoped to the current thread.
	215		if thread_scoped:
	216		thread_id = threading.current_thread().ident
	217		self.cache_key = '{cache_key}_{thread_id}'.format(
	218		cache_key=self.cache_key, thread_id=thread_id)
	219
	220		def get_cache_obj(self):
	221		cache_key = CacheKey.get_cache_key(
	222		self.repo_name, self.cache_type)
	223		cache_obj = CacheKey.get_active_cache(cache_key)
	224		if not cache_obj:
	225		cache_obj = CacheKey(cache_key, self.repo_name)
	226		return cache_obj
	227
	228		def __enter__(self):
	229		"""
	230		Test if current object is valid, and return CacheRegion function
	231		that does invalidation and calculation
	232		"""
	233
	234		self.cache_obj = self.get_cache_obj()
	235		if self.cache_obj.cache_active:
	236		# means our cache obj is existing and marked as it's
	237		# cache is not outdated, we return BaseInvalidator
	238		self.skip_cache_active_change = True
	239		return ActiveRegionCache(self)
	240
	241		# the key is either not existing or set to False, we return
	242		# the real invalidator which re-computes value. We additionally set
	243		# the flag to actually update the Database objects
	244		self.skip_cache_active_change = False
	245		return FreshRegionCache(self)
	246
	247		def __exit__(self, exc_type, exc_val, exc_tb):
	248
	249		if self.skip_cache_active_change:
	250		return
	251
	252		try:
	253		self.cache_obj.cache_active = True
	254		Session().add(self.cache_obj)
	255		Session().commit()
	256		except IntegrityError:
	257		# if we catch integrity error, it means we inserted this object
	258		# assumption is that's really an edge race-condition case and
	259		# it's safe is to skip it
	260		Session().rollback()
	261		except Exception:
	262		log.exception('Failed to commit on cache key update')
	263		Session().rollback()
	264		if self.raise_exception:
	265		raise
	266
	267
	268		def includeme(config):
	269		configure_caches(config.registry.settings)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages