rebar3.git - Clone of https://github.com/erlang/rebar3

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \|	set resources to empty list if non in app env	Tristan Sloughter	2015-05-04	1	-1/+6
\| \| \| \| \| \|
\| \| * \| \| \|	set resources of state in state initialize functions	Tristan Sloughter	2015-05-04	2	-15/+20
\| \|/ / / /
\| * \| \| \|	handle missing package in registry by skipping	Tristan Sloughter	2015-05-04	4	-14/+18
\|/ / / /
* \| \| \|	Merge pull request #384 from ferd/rework-deps-provider	Tristan Sloughter	2015-05-04	1	-48/+45
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix dupes in deps provider, support atom pkgs
\| * \| \| \|	Fix dupes in deps provider, support atom pkgs	Fred Hebert	2015-05-04	1	-48/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Whenever files were being locked and provided in rebar.config duplicates could be printed. This is taken care of. Also whenever atom packages were being used, they would cause the merge step to fail. The new format does proper name-based deduplication of resources, giving priority to locks to work. ModificatioN/needs-update support is still in. This may also act as a fix for #341, if automation isn't required too much.
* \| \| \| \|	Merge pull request #383 from ferd/kovyl2404-app-discover-profile-duplication	Fred Hebert	2015-05-04	3	-9/+171
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Kovyl2404 app discover profile duplication
\| * \| \| \| \|	Adding directory path test for deduplication	Fred Hebert	2015-05-04	1	-0/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'app-discover-profile-duplication' of ↵	Fred Hebert	2015-05-04	3	-9/+153
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	https://github.com/kovyl2404/rebar3 into kovyl2404-app-discover-profile-duplication
\| \| * \| \| \|	Merge branch 'master' into app-discover-profile-duplication	Viacheslav V. Kovalev	2015-05-01	49	-370/+1022
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/rebar_profiles_SUITE.erl
\| \| * \| \| \| \|	Revert accidentially changed formatting	Viacheslav V. Kovalev	2015-04-22	3	-4/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge remote-tracking branch 'my/app-discover-profile-duplication' into ↵	Viacheslav V. Kovalev	2015-04-22	3	-30/+8
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	app-discover-profile-duplication
\| \| \| * \| \| \| \|	Get rid of rebar_utils:tup_umerge/2 patching	Viacheslav Kovalev	2015-04-22	3	-30/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'app-discover-profile-duplication' of ↵	Viacheslav V. Kovalev	2015-04-22	4	-5/+96
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/kovyl2404/rebar3 into app-discover-profile-duplication Conflicts: test/rebar_profiles_SUITE.erl
\| \| \| * \| \| \| \|	Implement opts umerge deduplication	Viacheslav Kovalev	2015-04-22	4	-24/+69
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Implement some test on profiles deduplication	Viacheslav V. Kovalev	2015-04-22	2	-2/+113
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Implement some test on profiles deduplication	Viacheslav V. Kovalev	2015-04-21	1	-0/+65
\| \| \|/ / / / /
\| \| * \| \| \| \|	Correctly deduplicate profiles when applying	Viacheslav V. Kovalev	2015-04-21	2	-12/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/rebar_state.erl
\| \| * \| \| \| \|	Do not duplicate profile when applying.	Viacheslav V. Kovalev	2015-04-19	1	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #386 from tsloughter/relx_templates	Fred Hebert	2015-05-04	1	-1/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	include relx templates in escript
\| * \| \| \| \| \|	include relx templates in escript	Tristan Sloughter	2015-05-04	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #381 from tsloughter/upgrade_branch	Fred Hebert	2015-05-03	4	-11/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \|	on upgrade of git branch check against remote
\| * \| \| \| \| \|	only fetch branch needed, remove rebar_vsn_plugins from erlware_commons	Tristan Sloughter	2015-05-03	3	-7/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	on upgrade of git branch check against remote	Tristan Sloughter	2015-05-03	2	-5/+7
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #382 from tsloughter/upgrade_relx	Fred Hebert	2015-05-03	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	upgrade relx dep to latest mustache branch commit
\| * \| \| \| \| \|	upgrade relx dep to latest mustache branch commit	Tristan Sloughter	2015-05-03	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #379 from tsloughter/rm_erlydtl	Fred Hebert	2015-05-01	28	-475/+295
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| / / / \| \|_\|_\|/ / / \|/\| \| \| \| \|	Remove erlydtl and replace with mustache
\| * \| \| \| \|	remove use of erlydtl in rebar	Tristan Sloughter	2015-04-29	28	-475/+295
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #375 from tsloughter/kejv-support-parse-transforms	Fred Hebert	2015-04-30	2	-8/+52
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	enable parse transformations in rebar config
\| * \| \| \|	enable parse transformations in rebar config	Tristan Sloughter	2015-04-26	4	-11/+55
\| \|/ / /
* \| \| \|	Merge pull request #378 from tsloughter/loading_registry	Fred Hebert	2015-04-29	3	-16/+25
\|\ \ \ \ \| \|/ / / \|/\| \| \|	don't load package registry unless there are pkg deps to solve
\| * \| \|	don't load package registry unless there are pkg deps to solve	Tristan Sloughter	2015-04-28	3	-16/+25
\|/ / /
* \| \|	Merge pull request #373 from tsloughter/checkouts_rel	Fred Hebert	2015-04-25	2	-2/+4
\|\ \ \ \| \| \| \| \| \| \| \|	include _checkouts in release lib dirs if it exists
\| * \| \|	include _checkouts in release lib dirs if it exists	Tristan Sloughter	2015-04-25	2	-2/+4
\|/ / /
* \| \|	Merge pull request #371 from tsloughter/fetch_app_details	Tristan Sloughter	2015-04-25	2	-1/+23
\|\ \ \ \| \| \| \| \| \| \| \|	read in application details into app_info after fetch
\| * \| \|	read in application details into app_info after fetch	Tristan Sloughter	2015-04-24	2	-1/+23
\| \| \| \|
* \| \| \|	Merge pull request #372 from ferd/optimize-topsorting	Tristan Sloughter	2015-04-25	1	-16/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Avoid topsorting deps twice
\| * \| \|	Avoid topsorting deps twice	Fred Hebert	2015-04-25	1	-16/+6
\|/ / / \| \| \| \| \| \| \| \| \|	They can be culled and reused in one sort pass.
* \| \|	Merge pull request #369 from tsloughter/noescript	Fred Hebert	2015-04-24	1	-7/+25
\|\ \ \ \| \| \| \| \| \| \| \|	support templates even when not run as escript
\| * \| \|	support templates even when not run as escript	Tristan Sloughter	2015-04-24	1	-7/+25
\| \| \| \|
* \| \| \|	Merge pull request #368 from ferd/fix-upgrade-promote	Tristan Sloughter	2015-04-23	2	-13/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	handle transitive deps being promoted
\| * \| \| \|	handle transitive deps being promoted	Fred Hebert	2015-04-24	2	-13/+33
\| \| \| \| \|
* \| \| \| \|	Merge pull request #367 from tsloughter/merge_locks	Fred Hebert	2015-04-23	1	-1/+1
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|	merge_locks crashed if a config didn't have a deps entry
\| * \| \| \|	merge_locks crashed if a config didn't have a deps entry	Tristan Sloughter	2015-04-23	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #366 from tsloughter/no_header_warn	Fred Hebert	2015-04-23	1	-4/+0
\|\ \ \ \ \ \| \|/ / / / \| \| / / / \| \|/ / / \|/\| \| \|	remove warning if header not found, could be in a macro
\| * \| \|	remove warning if header not found, could be in a macro	Tristan Sloughter	2015-04-23	1	-4/+0
\| \| \| \|
* \| \| \|	Merge pull request #365 from tsloughter/otp18	Fred Hebert	2015-04-23	5	-10/+102
\|\ \ \ \ \| \|/ / / \| \| \| \|	Support 18.0+
\| * \| \|	support for 18.0+	Tristan Sloughter	2015-04-23	5	-9/+59
\| \| \| \|
\| * \| \|	print and halt on compile error	Tristan Sloughter	2015-04-23	1	-2/+44
\|/ / /
* \| \|	Merge pull request #363 from RJ/list-templates	Fred Hebert	2015-04-23	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \|	fix template listing (re-add escript_incl_extra)
\| * \| \|	Re-add escript_incl_extra, for templates	Richard Jones	2015-04-23	1	-0/+3
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Fixes regression from https://github.com/rebar/rebar3/commit/3a63bec39fde05dcddf3f693dd780879662b599c#diff-31d7a50c99c265ca2793c20961b60979L4 which meant listing templates doesn't work (rebar3 new help)