summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Support switch template instructionsFlorent Gallaire2013-12-111-0/+11
|
* Merge pull request #189 from tuncer/rgen1_timeoutDave Smith2013-12-061-0/+1
|\ | | | | inttest/rgen1: increase retest timeout (30s -> 60s)
| * inttest/rgen1: increase retest timeout (30s -> 60s)Tuncer Ayaz2013-12-061-0/+1
|/ | | | | The current default (30s) causes inttest/rgen1 to timeout too often. Add retest.config to double the timeout.
* Merge pull request #179 from tuncer/commands-listJared Morrow2013-12-041-5/+26
|\ | | | | Make list of commands (for unabbreviation) easier to maintain
| * Make list of commands (for unabbreviation) easier to maintainTuncer Ayaz2013-12-041-5/+26
|/ | | | | It's easier to modify the list with each command on a separate line. The shell completion scripts have already been modified that way.
* Merge pull request #185 from tuncer/retest-upstreamDave Smith2013-12-041-1/+1
|\ | | | | Switch retest dep to upstream (dizzyd/retest.git)
| * Switch retest dep to upstream (dizzyd/retest.git)Tuncer Ayaz2013-12-041-1/+1
|/ | | | | Now that Dave has merged all patches, it's safe to switch back to upstream retest.
* Merge pull request #174 from tuncer/dialyzer-fixesJared Morrow2013-12-031-1/+1
|\ | | | | rebar_core: fix Dialyzer warning introduced in aa46d85 (#157)
| * rebar_core: fix Dialyzer warning introduced in aa46d85 (#157)Tuncer Ayaz2013-11-261-1/+1
| |
* | Merge pull request #173 from tuncer/unknown-vsnJared Morrow2013-12-031-6/+8
|\ \ | | | | | | Fix false reporting of (plain) vsn strings
| * | Fix false reporting of (plain) vsn stringsTuncer Ayaz2013-11-261-6/+8
| |/ | | | | | | | | | | | | | | | | | | | | rebar used to mistakenly report plain version strings like {vsn, "1.0.0"} as follows: DEBUG: vcs_vsn: Unknown VCS atom in vsn field: "1.0.0" Properly detect unknown/unsupported version terms and abort if we encounter one. While at it, rename a variable in vcs_vsn/3 to be non-misleading.
* | Merge pull request #172 from tuncer/dep-examplesJared Morrow2013-12-032-17/+40
|\ \ | | | | | | Add missing dep examples and fix existing ones
| * | deps: remove undocumented fossil syntaxTuncer Ayaz2013-11-261-4/+0
| | | | | | | | | | | | | | | As discussed with Martin Schut, remove support for {app_name, "vsn", {fossil, "url", latest}.
| * | Add missing dep examples and fix existing onesTuncer Ayaz2013-11-262-13/+40
| |/
* | Merge pull request #152 from tuncer/test-erl_optsJared Morrow2013-12-032-5/+5
|\ \ | | | | | | Fix erl_opts use
| * | lfe: use correctly filtered erl_optsTuncer Ayaz2013-11-261-2/+2
| | |
| * | erlc: properly reuse the right erl_opts in test_compileTuncer Ayaz2013-11-261-3/+3
| |/ | | | | | | | | Avoid getting erl_opts twice in test_compile/3, and make sure the correctly filtered (platform_define, etc.) version is used.
* | Merge pull request #177 from tuncer/unused-retest-binaryJared Morrow2013-11-271-0/+0
|\ \ | |/ |/| Delete unused inttest/retest binary
| * Delete unused inttest/retest binaryTuncer Ayaz2013-11-271-0/+0
|/
* Merge pull request #155 from tuncer/fixesJared Morrow2013-11-263-70/+84
|\ | | | | Fixes for #137 and #142
| * Fix issues introduced in #137 (4dfdd72)Manuel Rubio2013-10-161-13/+14
| | | | | | | | | | * fix Dialyzer warning * fix formatting
| * rebar_deps: fix overly long linesTuncer Ayaz2013-10-161-39/+50
| |
| * rebar_deps: 'depowner' has to be stored in xconfTuncer Ayaz2013-10-161-7/+9
| |
| * rebar_deps: fix Dialyzer warningTuncer Ayaz2013-10-161-9/+9
| |
| * 'current_command' has to be stored in xconfTuncer Ayaz2013-10-162-2/+2
| |
* | Merge pull request #157 from Vagabond/adt-lib-dirJared Morrow2013-11-2213-4/+114
|\ \ | | | | | | Don't over-aggressively clean the code path in the presence of lib_dir directives
| * | Don't badmatch if a path we think we added isn't in the code pathAndrew Thompson2013-10-171-1/+1
| | |
| * | Don't over-aggressively clean the code path in the presence of lib_dir ↵Andrew Thompson2013-10-1613-4/+114
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directives Rebar, when it encounters a lib_dir directive, caches the current code path, adds the libdir(s) and returns the cached copy of the path. When rebar has finished processing that directory, it restores the cached path. This is problematic in the below scenario: /(lib_dir)->G A -> B -> C -> D -> E \-> F -> D -> E When rebar is finished processing B, it restores the code path to what it was before it processed B, removing C, D, E and G from the code path. This means when it comes to process F, neither D or E are in the code path, so any header includes, rebar plugins or parse transforms will not be in the code path. Without the lib_dir directive, rebar does no code path cleanups, so everything works fine. This change makes rebar only remove the explicit lib_dir code paths it added and adds an inttest that replicates the above scenario.
* | Merge pull request #154 from Vagabond/adt-update-tagsJared Morrow2013-11-221-1/+1
|\ \ | | | | | | Fix update-deps with certain forms of the {tag, ...} type
| * | Fix update-deps with certain forms of the {tag, ...} typeAndrew Thompson2013-10-161-1/+1
| |/ | | | | | | | | | | | | Sometimes tags like 1.1-3-g3af5478 or d20b53f0 are encountered. The first is the output of 'git describe', and the second is just a regular git SHA. git fetch --tags will not pull these down, so do a full git fetch instead.
* | Roll rebar version 2.1.0Jared Morrow2013-11-221-1/+1
| |
* | Merge pull request #166 from mdaguete/no_runner_script_varJared Morrow2013-11-181-0/+1
|\ \ | |/ |/| Init RUNNER_SCRIPT var in simplenode.runner
| * Init RUNNER_SCRIPT var in simplenode.runnerManuel Durán Aguete2013-11-181-0/+1
|/ | | | | RUNNER_SCRIPT variable is not initialized in simplenode.runner and it's referenced when calling sudo.
* Merge pull request #142 from Vagabond/adt-update-depsDave Smith2013-10-1420-37/+316
|\ | | | | Make update-deps traverse deps breadth-first, top-down
| * TypoAndrew Thompson2013-10-141-1/+1
| |
| * Address review comments and add inttest for update-depsAndrew Thompson2013-09-3020-3/+178
| |
| * Fix skip check for deps not presentAndrew Thompson2013-09-241-6/+10
| |
| * Make update-deps honor apps= and skip_apps=Andrew Thompson2013-09-232-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Because rebar_core handles skipping apps, we had to specialcase the handling in the case of update-deps because it has to do its own dep handling. The way this was done is not particularly clean, but there currently does not exist another way for a command to signal rebar_core that it doesn't want rebar_core to pay attention to skip_apps. With this change, however, you can update-deps even with local conflicting changes/commits by simply skipping the deps you don't wish to update, or whitelisting he ones you do wish to update.
| * Change how update-deps updates a git branchAndrew Thompson2013-09-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, update-deps on a dep tagged as {branch, ...} would do the following: git fetch git checkout -q origin/<branch> If you were already on that branch, the repo would end up in detached head state. This is kind of annoying if you're doing local development. This patch changes the behaviour to be git fetch git checkout -q <branch> git pull --ff-only --no-rebase -q <branch> The intent of this is to move the branch's HEAD forward to match upstream without destroying any local commits or changes, and without accidentally causing merges or rebases. It will fail if the operation can not be performed without losing history, merging or rebasing. The previous behaviour has been around a very long time: https://github.com/rebar/rebar/commit/064195dc5a90f5b0cc3ae92e8373671b0043033f#L0R308 It also exactly mirrors the download_source case, which is not really true. With git tags and SHAs, one can assume that they don't change, but branches move all the time.
| * Ignore skip_deps during update-deps as it has no meaningAndrew Thompson2013-09-231-28/+28
| |
| * Make update-deps traverse deps breadth-first, top-downAndrew Thompson2013-09-202-11/+90
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that deps of deps are updated AFTER the dep listing them is, so that a complicated project with many layers of deps will be updated correctly. Any new deps encountered along the way are also cloned, and THEIR deps are also evaluated. Also added was conflict detection, if a dep has differing versions or source information, inherited from different places, that will be logged at the end of update-deps, along with the origin of each conflicting dep.
* | Merge pull request #145 from tuncer/contributing-minor-fixDave Smith2013-09-201-1/+1
|\ \ | | | | | | CONTRIBUTING: apply stylistic change suggested by dizzyd
| * | CONTRIBUTING: apply stylistic change suggested by dizzydTuncer Ayaz2013-09-201-1/+1
|/ /
* | Merge pull request #111 from tuncer/nox-erlydtl-compileDave Smith2013-09-201-17/+15
|\ \ | | | | | | Always return the errors and warnings from erlydtl
| * | Always return the errors and warnings from erlydtlAnthony Ramine2013-09-201-17/+15
| | | | | | | | | | | | | | | | | | This allows us to use `rebar_base_compiler:ok_tuple/3` and `rebar_base_compiler:error_tuple/5` when returning from `rebar_erlydtl_compiler`.
* | | Merge pull request #122 from tuncer/net_kernelDave Smith2013-09-201-6/+6
|\ \ \ | | | | | | | | Fix eunit regression introduced in 2716d83a18
| * | | Fix eunit regression introduced in 2716d83a18Tuncer Ayaz2013-09-201-6/+6
| |/ / | | | | | | | | | | | | Use alternative way to detect net_kernel:stop/0 has succeeded as suggested by Ulf Wiger.
* | | Merge pull request #109 from tuncer/contributingDave Smith2013-09-202-71/+95
|\ \ \ | |/ / |/| | Extract contributing guide into CONTRIBUTING.md
| * | Extract contributing guide into CONTRIBUTING.mdTuncer Ayaz2013-09-202-71/+95
|/ / | | | | | | | | While at it, refactor the guide for clarity. Some of the new text was taken from erlware/relx/CONTRIBUTING.md and modified as needed.
* | Merge pull request #125 from lucafavatella/neotoma-doc-typoDave Smith2013-09-201-4/+4
|\ \ | | | | | | Fix typo in neotoma help message
generated by cgit v1.1 at 2024-10-30 23:20:46 +0000