瀏覽代碼

Tidy Deps plugin to provide the download/3

For issue https://github.com/erlang/rebar3/issues/1974
Revert "add rebar.lock to template gitignore"

This reverts commit 8fb8a91130.
pull/1976/head
Stuart Thackray 6 年之前
父節點
當前提交
63fcfa9db0
共有 3 個文件被更改,包括 8 次插入4 次删除
  1. +0
    -4
      priv/templates/gitignore
  2. +4
    -0
      src/rebar_git_resource.erl
  3. +4
    -0
      src/rebar_hg_resource.erl

+ 0
- 4
priv/templates/gitignore 查看文件

@ -13,11 +13,7 @@ erl_crash.dump
.rebar
logs
_build
<<<<<<< HEAD
rebar.lock
=======
.idea
*.iml
rebar3.crashdump
*~
>>>>>>> upstream/master

+ 4
- 0
src/rebar_git_resource.erl 查看文件

@ -6,6 +6,7 @@
-export([init/2,
lock/2,
download/3,
download/4,
needs_update/2,
make_vsn/2]).
@ -123,6 +124,9 @@ download(TmpDir, AppInfo, State, _) ->
{error, Error}
end.
download(Dir, AppInfo, State) ->
download_(Dir, AppInfo, State).
download_(Dir, {git, Url}, State) ->
?WARN("WARNING: It is recommended to use {branch, Name}, {tag, Tag} or {ref, Ref}, otherwise updating the dep may not work as expected.", []),
download_(Dir, {git, Url, {branch, "master"}}, State);

+ 4
- 0
src/rebar_hg_resource.erl 查看文件

@ -6,6 +6,7 @@
-export([init/2,
lock/2,
download/3,
download/4,
needs_update/2,
make_vsn/2]).
@ -72,6 +73,9 @@ download(TmpDir, AppInfo, State, _) ->
{error, Error}
end.
download(Dir, AppInfo, State) ->
download_(Dir, AppInfo, State).
download_(Dir, {hg, Url}, State) ->
?WARN("WARNING: It is recommended to use {branch, Name}, {tag, Tag} or {ref, Ref}, otherwise updating the dep may not work as expected.", []),
download_(Dir, {hg, Url, {branch, "default"}}, State);

Loading…
取消
儲存