Permalink
Commits on Oct 14, 2013
  1. Typo

    Vagabond committed Oct 14, 2013
Commits on Sep 30, 2013
Commits on Sep 24, 2013
Commits on Sep 23, 2013
  1. Make update-deps honor apps= and skip_apps=

    Vagabond committed Sep 23, 2013
    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.
  2. Change how update-deps updates a git branch

    Vagabond committed Sep 23, 2013
    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:
    
    rebar@064195d#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.
Commits on Sep 20, 2013
  1. Make update-deps traverse deps breadth-first, top-down

    Vagabond committed Sep 19, 2013
    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.
Commits on Jul 2, 2013
Commits on Jun 29, 2013
  1. Merge pull request #108 from tuncer/dialyzer

    dizzyd committed Jun 29, 2013
    dialyzer_reference plus one minor patch
  2. Merge pull request #110 from tuncer/help

    dizzyd committed Jun 29, 2013
    Document 'rebar help <CMD1> <CMD2>'
Commits on Jun 27, 2013
Commits on Jun 25, 2013
  1. Merge pull request #41 from exterm/cover_html_validity

    dizzyd committed Jun 25, 2013
    change cover html generation to produce valid html
  2. Merge pull request #99 from tuncer/fixes-and-updates

    dizzyd committed Jun 25, 2013
    Fixes and updates
Commits on Jun 24, 2013
  1. rebar_xref: regression fixes and updates for a5be40c

    tuncer committed Jun 18, 2013
    - 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
  2. rebar_core: fix consistency issues caused by 252b31f

    tuncer committed Jun 15, 2013
    - 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
  3. rebar_ct: fix Dialyzer warning caused by bcc57e9

    tuncer committed Jun 15, 2013
    Also fix a single line exceeding max column.
  4. Update THANKS file

    tuncer committed Jun 15, 2013
  5. Merge pull request #102 from pragdave/master

    dizzyd committed Jun 24, 2013
    Add one more "unicode" option in expand_env_variable—I have a bullet in my prompt that was blowing it up
Commits on Jun 23, 2013
Commits on Jun 22, 2013
  1. Add one more "unicode" option in expand_env_variable—I have a bullet …

    pragdave committed Jun 22, 2013
    …in my prompt that was blowing it up
Commits on Jun 18, 2013
  1. Merge pull request #101 from jcomellas/jc-absolute-lib-dirs

    dizzyd committed Jun 18, 2013
    Allow the use of absolute paths in the lib_dirs configuration setting
Commits on Jun 17, 2013
  1. Merge branch 'xref_20130130' of git://github.com/spilgames/rebar into…

    dizzyd committed Jun 17, 2013
    … spg-xref
    
    Conflicts:
    	src/rebar_xref.erl
  2. Merge pull request #47 from uwiger/master

    dizzyd committed Jun 17, 2013
    rebar_eunit:reset_after_eunit/1 mustn't remove 'included_applications'
  3. Merge pull request #100 from josevalim/patch-1

    dizzyd committed Jun 17, 2013
    External deps_dir should have higher priority than the config one
  4. External deps_dir should have higher priority than the config one

    josevalim committed Jun 17, 2013
    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.