Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #280 from tsloughter/pkgdeps | Fred Hebert | 2015-03-17 | 1 | -7/+2 |
|\ | | | | | include all pkg deps in list of deps returned from update | ||||
| * | include all pkg deps in list of deps returned from update | Tristan Sloughter | 2015-03-17 | 1 | -7/+2 |
| | | |||||
* | | Merge pull request #276 from tsloughter/flatten_command | Fred Hebert | 2015-03-16 | 1 | -3/+3 |
|\ \ | |/ | | | flatten command to open_port so <17 Erlangs are happy | ||||
| * | flatten command to open_port so <17 Erlangs are happy | Tristan Sloughter | 2015-03-16 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #275 from tsloughter/pkg_vsn_error | Fred Hebert | 2015-03-16 | 2 | -2/+4 |
|\ \ | |/ | | | handle bad package version with error message | ||||
| * | add back throw on package index write | Tristan Sloughter | 2015-03-16 | 1 | -1/+1 |
| | | |||||
| * | handle bad package version with error message | Tristan Sloughter | 2015-03-16 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #273 from ypaq/ypaq-doc-fix-version | Tristan Sloughter | 2015-03-16 | 1 | -1/+1 |
|\ | | | | | Decapitalize short option for 'version' flag | ||||
| * | Decapitalize short option for 'version' | Tilman Holschuh | 2015-03-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #269 from ferd/dep-conflict-as-error | Tristan Sloughter | 2015-03-16 | 4 | -23/+77 |
|\ \ | | | | | | | Dep conflict as error | ||||
| * | | Implement deps conflicts as errors | Fred Hebert | 2015-03-15 | 3 | -22/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | The option {deps_error_on_conflict, true} will make it so conflicts in deps being fetched interrupts the operation rather than just display a warning. Defaults to `false'. | ||||
| * | | Avoid duplicating deps in discover phase | Fred Hebert | 2015-03-15 | 1 | -1/+8 |
| |/ | | | | | | | | | | | | | | | | | The deps are sorted and merged, but the merge function merges lists, not elements. This yields deps that are duplicated and ran for multiple times. We first add proper sorts so the keymerge is guaranteed to be fine, and then do a dedup run to get rid of duplicates if they happen to be. | ||||
* | | Merge pull request #270 from ferd/cleanup-errors | Tristan Sloughter | 2015-03-16 | 8 | -10/+18 |
|\ \ | |/ |/| | use PRV_ERROR for formattable errors | ||||
| * | use PRV_ERROR for formattable errors | Fred Hebert | 2015-03-16 | 8 | -10/+18 |
|/ | | | | Also expose it in rebar_api | ||||
* | Merge pull request #268 from ferd/refactor-as-namespace-conflicts | Fred Hebert | 2015-03-13 | 3 | -53/+50 |
|\ | | | | | Fix #267, refactor as/do/namespace interactions | ||||
| * | Fix #267, refactor as/do/namespace interactions | Fred Hebert | 2015-03-13 | 3 | -53/+50 |
| | | | | | | | | | | | | | | | | | | | | Breaking up initial call to parse from the ones deep inside the provider parsing to do smarter namespace detection, added 'as' the ability to look into these also, and cleaned up the code a whole lot that would depend on implicit assumptions. A side-effect is that 'do' is now valid for all namespaces, although it can be overriden. | ||||
* | | Merge pull request #266 from tsloughter/always_halt | Fred Hebert | 2015-03-12 | 1 | -1/+1 |
|\ \ | | | | | | | halt with 0 on successful run | ||||
| * | | halt with 0 on successful run | Tristan Sloughter | 2015-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #265 from tsloughter/compile_jobs | Fred Hebert | 2015-03-12 | 2 | -113/+16 |
|\ \ \ | |/ / |/| | | get rid of compile workers | ||||
| * | | get rid of compile workers | Tristan Sloughter | 2015-03-12 | 2 | -113/+16 |
| | | | |||||
* | | | Merge pull request #264 from fishcakez/cache_plt | Tristan Sloughter | 2015-03-12 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Store base PLT in ~/.cache/rebar3/ | ||||
| * | | | Store base PLT in ~/.cache/rebar3/ | James Fish | 2015-03-12 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #262 from tsloughter/compile_jobs | Fred Hebert | 2015-03-12 | 1 | -9/+12 |
|\ \ \ | |/ / | | | | set jobs for all compile jobs | ||||
| * | | set jobs for all compile jobs | Tristan Sloughter | 2015-03-12 | 1 | -9/+12 |
|/ / | |||||
* | | Merge pull request #257 from tsloughter/config_merge | Tristan Sloughter | 2015-03-11 | 1 | -20/+29 |
|\ \ | | | | | | | merge rebar config opts for parent like done for profiles | ||||
| * | | merge rebar config opts for parent like done for profiles | Tristan Sloughter | 2015-03-11 | 1 | -20/+29 |
| |/ | |||||
* | | Merge pull request #259 from kovyl2404/patch-1 | Fred Hebert | 2015-03-10 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo in error message | ||||
| * | | Fix typo in error message | Viacheslav V. Kovalev | 2015-03-10 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #258 from marianoguerra/fix-debug-format-params | Fred Hebert | 2015-03-10 | 1 | -1/+1 |
|\ \ | |/ |/| | fix debug format to avoid crash with custom template | ||||
| * | fix debug format to avoid crash with custom template | Mariano Guerra | 2015-03-10 | 1 | -1/+1 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | error before: ===> Uncaught error: {'EXIT', {badarg, [{io,format, [<0.23.0>, "\e[0;36m===> Skipping template ~p, due to presence of a custom template at ~s~n~n\e[0m", ["/home/mariano/.config/rebar3/templates/fn_app/fn_app.template"]], []}, {rebar_templater,prioritize_templates,2, [{file,"src/rebar_templater.erl"},{line,330}]}, {rebar_templater,find_templates,1, [{file,"src/rebar_templater.erl"},{line,274}]}, {rebar_templater,new,4, [{file,"src/rebar_templater.erl"},{line,47}]}, {rebar_prv_new,do,1, [{file,"src/rebar_prv_new.erl"},{line,44}]}, {rebar_core,do,2, [{file,"src/rebar_core.erl"},{line,129}]}, {rebar3,main,1, [{file,"src/rebar3.erl"},{line,46}]}, {escript,run,2, [{file,"escript.erl"},{line,752}]}]}} | ||||
* | Merge pull request #255 from rebar/revert-254-smp | Fred Hebert | 2015-03-09 | 1 | -1/+1 |
|\ | | | | | Revert "disable smp in escript" | ||||
| * | Revert "disable smp in escript" | Fred Hebert | 2015-03-09 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #254 from tsloughter/smp | Fred Hebert | 2015-03-09 | 1 | -1/+1 |
|\ | | | | | disable smp in escript | ||||
| * | disable smp in escript | Tristan Sloughter | 2015-03-09 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #253 from tsloughter/master | Fred Hebert | 2015-03-08 | 1 | -3/+3 |
|\ \ | |/ | | | templater: return error, don't throw, if git or hg fail | ||||
| * | templater: return error, don't throw, if git or hg fail | Tristan Sloughter | 2015-03-08 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #251 from talentdeficit/compile_from_build | Tristan Sloughter | 2015-03-08 | 3 | -20/+36 |
|\ | | | | | symlink extra test dirs and compile from there instead of from root project | ||||
| * | symlink extra test dirs and compile from there instead of from | alisdair sullivan | 2015-03-08 | 3 | -20/+36 |
| | | | | | | | | root project | ||||
* | | Merge pull request #249 from talentdeficit/compile_from_build | Tristan Sloughter | 2015-03-08 | 5 | -12/+43 |
|\ \ | |/ | | | compile source from the symlinked directories under `_build` | ||||
| * | compile source from the symlinked directories under `_build` to | alisdair sullivan | 2015-03-08 | 5 | -12/+43 |
|/ | | | | get correct compile paths included in module info | ||||
* | Merge pull request #246 from tsloughter/master | Fred Hebert | 2015-03-08 | 2 | -193/+2 |
|\ | | | | | update sample config to remove unsupported rebar2 options | ||||
| * | update sample config to remove unsupported rebar2 options | Tristan Sloughter | 2015-03-08 | 2 | -193/+2 |
| | | |||||
* | | Merge pull request #244 from tsloughter/master | Fred Hebert | 2015-03-07 | 1 | -2/+1 |
|\ \ | |/ | | | don't traverse into subdirectories looking for beams | ||||
| * | don't traverse into subdirectories looking for beams | Tristan Sloughter | 2015-03-07 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #241 from tsloughter/erlydtl | Fred Hebert | 2015-03-07 | 6 | -90/+133 |
|\ | | | | | update erlydtl compiler to output to _build, add simple test | ||||
| * | update erlydtl compiler to output to _build, add simple test | Tristan Sloughter | 2015-03-07 | 6 | -90/+133 |
| | | |||||
* | | Merge pull request #243 from ferd/alpha | Fred Hebert | 2015-03-07 | 2 | -5/+6 |
|\ \ | |/ |/| | Bump to alpha | ||||
| * | Bump to alpha | Fred Hebert | 2015-03-08 | 2 | -5/+6 |
|/ | |||||
* | Merge pull request #242 from ferd/namespace-regression | Tristan Sloughter | 2015-03-07 | 2 | -6/+56 |
|\ | | | | | Fix namespace regressions | ||||
| * | Fix namespace regressions | Fred Hebert | 2015-03-07 | 2 | -6/+56 |
|/ | | | | | | | This adds some more convolution to command parsing, unfortunately, but makes some cases clearer (`rebar3 as as as as` is no longer valid). It unfortunately disallows using $REBAR_PROFILE along with `as` in a rebar command. |