summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Use REBAR_DEPS_DIR if set as location of DEPS dirDave Smith2013-07-021-1/+7
|
* Merge pull request #108 from tuncer/dialyzerDave Smith2013-06-292-2/+3
|\ | | | | dialyzer_reference plus one minor patch
| * rebar_deps: fix overlong line introduced in 0b83339Tuncer Ayaz2013-06-271-1/+2
| |
| * Update dialyzer_reference to match changes made in 490d00f0Tuncer Ayaz2013-06-271-1/+1
| |
* | Merge pull request #110 from tuncer/helpDave Smith2013-06-291-0/+3
|\ \ | |/ |/| Document 'rebar help <CMD1> <CMD2>'
| * Document 'rebar help <CMD1> <CMD2>'Tuncer Ayaz2013-06-291-0/+3
|/
* Make sure to run ct_run w/ -noshellDave Smith2013-06-251-1/+1
|
* Use ct_run if available; fixes strange issues with getting erl/ct to stopDave Smith2013-06-251-10/+21
|
* Adding debug statements closer to open_portDave Smith2013-06-251-0/+1
|
* Merge pull request #41 from exterm/cover_html_validityDave Smith2013-06-251-2/+5
|\ | | | | change cover html generation to produce valid html
| * remove superfluous string concat operator usagePhilip Mueller2013-06-161-3/+3
| |
| * break overlong linePhilip Mueller2013-01-301-1/+2
| |
| * change cover html generation to produce valid htmlPhilip Mueller2012-12-121-2/+4
| | | | | | | | | | | | - added missing doctype - added encoding statement - removed invalid additional opening <body> tag
* | Merge pull request #99 from tuncer/fixes-and-updatesDave Smith2013-06-258-87/+125
|\ \ | | | | | | Fixes and updates
| * | rebar_xref: regression fixes and updates for a5be40c96Tuncer Ayaz2013-06-242-59/+81
| | | | | | | | | | | | | | | | | | | | | | | | - restore support for "rebar help xref" - update rebar.config.sample - update 'help xref' string - simplify new/changed functions by breaking out code or using simpler syntax where applicable
| * | rebar_core: fix consistency issues caused by 252b31fTuncer Ayaz2013-06-241-16/+22
| | | | | | | | | | | | | | | | | | | | | - refactor plugin dirs code to be simpler and easier to read - use erlang-mode's default (%%) comments for portability/consistency - make sure erlang-mode's indenter is used so that a future whole buffer indent doesn't get messed up
| * | rebar_ct: fix Dialyzer warning caused by bcc57e9bTuncer Ayaz2013-06-241-4/+10
| | | | | | | | | | | | Also fix a single line exceeding max column.
| * | Remove vestiges of Mercurial repoTuncer Ayaz2013-06-242-8/+0
| | |
| * | Update THANKS fileTuncer Ayaz2013-06-241-0/+11
| | |
| * | Delete dialyzer_warnings on 'make distclean'Tuncer Ayaz2013-06-241-0/+1
|/ /
* | Merge pull request #102 from pragdave/masterDave Smith2013-06-241-2/+2
|\ \ | | | | | | Add one more "unicode" option in expand_env_variable—I have a bullet in my prompt that was blowing it up
| * | Fix crsh with Unicode in environment varsDave Thomas2013-06-231-2/+2
| | |
| * | Fix crash when env vars contain utf8 charsDave Thomas2013-06-221-3/+3
| | |
| * | Add one more "unicode" option in expand_env_variable—I have a bullet in my ↵Dave Thomas2013-06-211-1/+1
|/ / | | | | | | prompt that was blowing it up
* | Merge pull request #101 from jcomellas/jc-absolute-lib-dirsDave Smith2013-06-181-1/+4
|\ \ | | | | | | Allow the use of absolute paths in the lib_dirs configuration setting
| * | When expanding lib_dirs, don't crash with 'volumerelative' pathsJuan Jose Comellas2013-06-181-1/+1
| | |
| * | Allow the use of absolute paths in the lib_dirs configuration settingJuan Jose Comellas2013-06-181-1/+4
|/ /
* | Merge branch 'xref_20130130' of git://github.com/spilgames/rebar into spg-xrefDave Smith2013-06-172-84/+315
|\ \ | | | | | | | | | | | | Conflicts: src/rebar_xref.erl
| * | Add standard xref checks and improved suppressionDennis Docter2013-01-302-65/+315
| |/ | | | | | | | | | | | | | | | | | | | | | | * Allow the following predefined analyses : undefined_function_calls, undefined_functions, locals_not_used, exports_not_used, deprecated_function_calls, deprecated_functions * Trap some possible errors in case module information is not available * ignore_xref works on all checks and can take {M,F,A} tuples. (Automatic behaviour export suppression still only works on exports_not_used)
* | Merge pull request #47 from uwiger/masterDave Smith2013-06-171-1/+2
|\ \ | | | | | | rebar_eunit:reset_after_eunit/1 mustn't remove 'included_applications'
| * | rebar_eunit:reset_after_eunit/1 mustn't remove 'included_applications'Ulf Wiger2012-12-161-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | One could argue that rebar_eunit does some pretty dangerous stuff when trying to clean up after a test run, but specifically, it tells the Application Controller to delete everything returned by application:get_all_env(App). Unfortunately, included_applications also goes, which can lead to a crash in application_controller, if the application is subsequently unloaded. This patch attempts the smallest possible fix: remove all env variables except included_applications.
* | Merge pull request #100 from josevalim/patch-1Dave Smith2013-06-171-2/+3
|\ \ | | | | | | External deps_dir should have higher priority than the config one
| * | External deps_dir should have higher priority than the config oneJosé Valim2013-06-181-2/+3
|/ / | | | | | | | | | | | | The external deps_dir should have higher priority because it is used by scripts and other build tools to set up the location of the dependencies. This commit ensures that, even if a project has set deps_dir in its config file has lower preference than the command line one.
* | Merge pull request #60 from jcomellas/jc-getopt-0.7.0Dave Smith2013-06-161-156/+377
|\ \ | | | | | | Add latest version getopt that automatically wraps usage output lines
| * | Add latest version getopt that automatically wraps usage output linesJuan Jose Comellas2013-01-251-156/+377
| | |
* | | Merge pull request #53 from oferrigni/unit_test_file_handling_fixDave Smith2013-06-161-3/+11
|\ \ \ | | | | | | | | Fix file handling on windows for tests
| * | | Fix file handling on windows for testsOliver Ferrigni2013-01-141-3/+11
| |/ / | | | | | | | | | | | | | | | | | | Running tests on windows creates false positive due to setup failures not executing all tests. Checking for tmp_dir was failing on subsequent runs. Added cases to tmp_dir creation to delete preexisting tmp_dirs in .eunit directory.
* | | Merge pull request #44 from nevar/fix_neotomaDave Smith2013-06-161-2/+2
|\ \ \ | | | | | | | | Correct ext of neotoma output file
| * | | Correct ext of neotoma output fileSlava Yurin2012-12-311-2/+2
| |/ /
* | | Merge pull request #37 from nox/force-registeredDave Smith2013-06-161-1/+14
|\ \ \ | | | | | | | | Ensure we always have a `registered` value in `.app` files
| * | | Ensure we always have a `registered` value in `.app` filesAnthony Ramine2012-12-071-1/+14
| | | | | | | | | | | | | | | | | | | | `systools:make_relup/4` fails with `{missing_param, registered}` without a `registered` value.
* | | | Merge pull request #24 from legoscia/masterDave Smith2013-06-161-1/+1
|\ \ \ \ | | | | | | | | | | Allow specifying eunit suite run order in 'suites'
| * | | | Run eunit suites in the order specified in the 'suites' command line parameterMagnus Henoch2012-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, Rebar runs eunit tests in the order the beam files are stored in the file system (see rebar_utils:beams). However, sometimes it is desirable to run the tests in a different order (e.g. to reproduce an error found on a build server). For that case, it would make sense to use the 'suites' parameter not just for selecting which modules to consider, but also for choosing the order.
* | | | | Merge pull request #74 from DeadZen/dz-merged-overlayDave Smith2013-06-141-8/+18
|\ \ \ \ \ | | | | | | | | | | | | Implement merged overlays
| * | | | | Implement merged overlaysPedram Nimreezi2013-03-261-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | This allows overlay_vars to merge comma delimited var config files
* | | | | | Merge pull request #54 from mattonrails/simpleapp_sup_template_typoDave Smith2013-06-141-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove leading empty line from a template
| * | | | | | Remove leading empty line from a templateMatthew Conway2013-01-141-1/+0
| | |_|_|/ / | |/| | | |
generated by cgit v1.1 at 2024-12-27 12:08:45 +0000