summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| * | | Fix typo in neotoma help messageLuca Favatella2013-08-301-4/+4
| |/ /
* | | Merge pull request #132 from alexthornton1/mib_to_hrl_verbosityDave Smith2013-09-201-1/+9
|\ \ \ | | | | | | | | mib_to_hrl compilation verbosity via 'mib_opts'
| * | | mib_to_hrl compilation verbosity via 'mib_opts'Alex Thornton2013-09-081-1/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the configuration setting 'mib_opts' in rebar.config would affect the call to snmpc:compile/2, so that (for example) verbosity could be controlled. However, the subsequent call to snmpc:mib_to_hrl/1 did not include any of these options, so it did not appear to be possible to control the verbosity of the process of converting a MIB to a .hrl file. To make matters worse, the default was to dump a full trace -- including debug output and various logging -- so the act of compiling a large number of MIBs could result in a huge amount of "noisy" output that hid any signal (meaningful warnings, errors, etc.). This commit addresses that issue by replacing the call to snmpc:mib_to_hrl/1 with a call to snmpc:mib_to_hrl/3 instead, which includes an "options" argument that, at present, is only capable of setting verbosity. The verbosity setting is taken from the 'mib_opts' setting in rebar_config, if present, and the approriate kind of argument is passed to snmpc:mib_to_hrl/3. It should be noted that snmpc:mib_to_hrl/3 is not listed in Erlang's documentation, but does appear in the list of "API" exports at the top of snmpc.erl in R15B01 (and remains that way in R16B01), so this appears to be more of a documentation oversight than the use of a deep, dark function call that was not intended to be public. snmpc:mib_to_hrl/3 accepts an #options{} record (defined in lib/srdlib/include/erl_compile.hrl within Erlang's source distribution), though most of the fields in that record are ignored by snmpc:mib_to_hrl/3; only verbosity can be controlled this way.
* | | Merge pull request #137 from bosqueviejo/masterDave Smith2013-09-201-6/+16
|\ \ \ | | | | | | | | let vm.args and sys.config as optional
| * | | let vm.args and sys.config as optionalManuel Rubio2013-09-191-6/+16
| |/ /
* | | Merge pull request #138 from evax/conditionalTemplateInstructionsDave Smith2013-09-201-0/+21
|\ \ \ | | | | | | | | Support conditional template instructions
| * | | Support conditional template instructionsEvax Software2013-09-191-0/+21
| |/ /
* | | Merge pull request #143 from loxybjorn/grep_using_double_quotation_marksDave Smith2013-09-201-1/+1
|\ \ \ | |/ / |/| | Change rebar_ct:check_log/3 to use double quotes
| * | Change rebar_ct:check_log/3 to use double quotesBjörn Bylander2013-09-201-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to the grep program in rebar_ct:check_log/3 used single quotation marks around the strings grep should search for. This works well in most cases but fails on Windows 7 using GNU grep 2.5.4 as installed by the Chocolatey package GnuWin 0.6.3.1 with the follow message: ERROR: cmd /q /c grep -e 'TEST COMPLETE' -e '{error,make_failed}' ct/raw.log failed with error: 2 and output: grep: COMPLETE': No such file or directory This commit changes the single quotation marks to double quotation marks. I've tested this using GNU grep 2.5.3 on a Debian Linux machine and it works well.
* | 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
|/ / /
generated by cgit v1.1 at 2024-11-07 13:23:57 +0000