Sfoglia il codice sorgente

Fix git tag and branch dependency handling

Change git downloads and updates to not create branches and fix git
tag handling.
pull/3/head
Misha Gorodnitzky 14 anni fa
committed by Tuncer Ayaz
parent
commit
064195dc5a
1 ha cambiato i file con 8 aggiunte e 6 eliminazioni
  1. +8
    -6
      src/rebar_deps.erl

+ 8
- 6
src/rebar_deps.erl Vedi File

@ -278,11 +278,11 @@ download_source(AppDir, {hg, Url, Rev}) ->
download_source(AppDir, {git, Url, {branch, Branch}}) -> download_source(AppDir, {git, Url, {branch, Branch}}) ->
ok = filelib:ensure_dir(AppDir), ok = filelib:ensure_dir(AppDir),
rebar_utils:sh(?FMT("git clone -n ~s ~s", [Url, filename:basename(AppDir)]), [], filename:dirname(AppDir)), rebar_utils:sh(?FMT("git clone -n ~s ~s", [Url, filename:basename(AppDir)]), [], filename:dirname(AppDir)),
rebar_utils:sh(?FMT("git checkout ~s", [Branch]), [], AppDir);
rebar_utils:sh(?FMT("git checkout -q origin/~s", [Branch]), [], AppDir);
download_source(AppDir, {git, Url, {tag, Tag}}) -> download_source(AppDir, {git, Url, {tag, Tag}}) ->
ok = filelib:ensure_dir(AppDir), ok = filelib:ensure_dir(AppDir),
rebar_utils:sh(?FMT("git clone -n ~s ~s", [Url, filename:basename(AppDir)]), [], filename:dirname(AppDir)), rebar_utils:sh(?FMT("git clone -n ~s ~s", [Url, filename:basename(AppDir)]), [], filename:dirname(AppDir)),
rebar_utils:sh(?FMT("git checkout -b ~s", [Tag]), [], AppDir);
rebar_utils:sh(?FMT("git checkout -q ~s", [Tag]), [], AppDir);
download_source(AppDir, {git, Url, Rev}) -> download_source(AppDir, {git, Url, Rev}) ->
download_source(AppDir, {git, Url, {branch, Rev}}); download_source(AppDir, {git, Url, {branch, Rev}});
download_source(AppDir, {bzr, Url, Rev}) -> download_source(AppDir, {bzr, Url, Rev}) ->
@ -303,10 +303,12 @@ update_source(Dep) ->
Dep#dep.source), Dep#dep.source),
Dep. Dep.
update_source(AppDir, {git, _Url, {Type, Refspec}})
when Type =:= branch orelse
Type =:= tag ->
rebar_utils:sh(?FMT("git pull origin ~s", [Refspec]), [], AppDir);
update_source(AppDir, {git, _Url, {branch, Branch}}) ->
rebar_utils:sh(?FMT("git fetch origin", []), [], AppDir),
rebar_utils:sh(?FMT("git checkout -q origin/~s", [Branch]), [], AppDir);
update_source(AppDir, {git, _Url, {tag, Tag}}) ->
rebar_utils:sh(?FMT("git fetch --tags origin", []), [], AppDir),
rebar_utils:sh(?FMT("git checkout -q ~s", [Tag]), [], AppDir);
update_source(AppDir, {git, Url, Refspec}) -> update_source(AppDir, {git, Url, Refspec}) ->
update_source(AppDir, {git, Url, {branch, Refspec}}); update_source(AppDir, {git, Url, {branch, Refspec}});
update_source(AppDir, {svn, _Url, Rev}) -> update_source(AppDir, {svn, _Url, Rev}) ->

Caricamento…
Annulla
Salva