Commits on Aug 15, 2014
  1. @jaredmorrow


    jaredmorrow committed Aug 15, 2014
Commits on Nov 6, 2013
  1. @jaredmorrow

    Merge remote-tracking branch 'Vagabond/adt-update-tags' into develop

    jaredmorrow committed Nov 6, 2013
Commits on Oct 17, 2013
  1. @Vagabond
Commits on Oct 16, 2013
  1. @Vagabond

    Don't over-aggressively clean the code path in the presence of lib_di…

    …r 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:
      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.
    Vagabond committed Oct 16, 2013
  2. @Vagabond

    Fix update-deps with certain forms of the {tag, ...} type

    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.
    Vagabond committed Oct 15, 2013
Commits on Oct 14, 2013
  1. @dizzyd

    Merge pull request #142 from Vagabond/adt-update-deps

    Make update-deps traverse deps breadth-first, top-down
    dizzyd committed Oct 14, 2013
  2. @Vagabond


    Vagabond committed Oct 14, 2013
Commits on Sep 30, 2013
  1. @Vagabond
Commits on Sep 24, 2013
  1. @Vagabond
Commits on Sep 23, 2013
  1. @Vagabond

    Make update-deps honor apps= and skip_apps=

    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.
    Vagabond committed Sep 23, 2013
  2. @Vagabond

    Change how update-deps updates a git branch

    Previously, update-deps on a dep tagged as {branch, ...} would do the
      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:
    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.
    Vagabond committed Sep 23, 2013
  3. @Vagabond
Commits on Sep 20, 2013
  1. @dizzyd

    Merge pull request #145 from tuncer/contributing-minor-fix

    CONTRIBUTING: apply stylistic change suggested by dizzyd
    dizzyd committed Sep 20, 2013
  2. @tuncer
  3. @dizzyd

    Merge pull request #111 from tuncer/nox-erlydtl-compile

    Always return the errors and warnings from erlydtl
    dizzyd committed Sep 20, 2013
  4. @dizzyd

    Merge pull request #122 from tuncer/net_kernel

    Fix eunit regression introduced in 2716d83
    dizzyd committed Sep 20, 2013
  5. @dizzyd

    Merge pull request #109 from tuncer/contributing

    Extract contributing guide into
    dizzyd committed Sep 20, 2013
  6. @nox @tuncer

    Always return the errors and warnings from erlydtl

    This allows us to use `rebar_base_compiler:ok_tuple/3` and
    `rebar_base_compiler:error_tuple/5` when returning from
    nox committed with tuncer Dec 8, 2012
  7. @tuncer

    Extract contributing guide into

    While at it, refactor the guide for clarity. Some of the new text was
    taken from erlware/relx/ and modified as needed.
    tuncer committed Jun 27, 2013
  8. @tuncer

    Fix eunit regression introduced in 2716d83

    Use alternative way to detect net_kernel:stop/0 has succeeded as
    suggested by Ulf Wiger.
    tuncer committed Aug 14, 2013
  9. @dizzyd

    Merge pull request #125 from lucafavatella/neotoma-doc-typo

    Fix typo in neotoma help message
    dizzyd committed Sep 20, 2013
  10. @dizzyd

    Merge pull request #132 from alexthornton1/mib_to_hrl_verbosity

    mib_to_hrl compilation verbosity via 'mib_opts'
    dizzyd committed Sep 20, 2013
  11. @dizzyd

    Merge pull request #137 from bosqueviejo/master

    let vm.args and sys.config as optional
    dizzyd committed Sep 20, 2013
  12. @dizzyd

    Merge pull request #138 from evax/conditionalTemplateInstructions

    Support conditional template instructions
    dizzyd committed Sep 20, 2013
  13. @dizzyd

    Merge pull request #143 from loxybjorn/grep_using_double_quotation_marks

    Change rebar_ct:check_log/3 to use double quotes
    dizzyd committed Sep 20, 2013
  14. @loxybjorn

    Change rebar_ct:check_log/3 to use double quotes

    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 with the follow
    ERROR: cmd /q /c grep -e 'TEST COMPLETE' -e '{error,make_failed}'
    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.
    loxybjorn committed Sep 18, 2013
  15. @Vagabond

    Make update-deps traverse deps breadth-first, top-down

    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
    Vagabond committed Sep 19, 2013
Commits on Sep 19, 2013
  1. @evax
Commits on Sep 18, 2013
  1. @manuel-rubio
Commits on Sep 8, 2013
  1. @alexthornton1

    mib_to_hrl compilation verbosity via 'mib_opts'

    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.
    alexthornton1 committed Sep 8, 2013
Commits on Aug 30, 2013
  1. @lucafavatella
Commits on Jul 2, 2013
  1. @dizzyd
Commits on Jun 29, 2013
  1. @dizzyd

    Merge pull request #108 from tuncer/dialyzer

    dialyzer_reference plus one minor patch
    dizzyd committed Jun 29, 2013
  2. @dizzyd

    Merge pull request #110 from tuncer/help

    Document 'rebar help <CMD1> <CMD2>'
    dizzyd committed Jun 29, 2013
  3. @tuncer