diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-09-12 13:55:58 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-09-12 13:55:58 -0400 |
| commit | 0dc23254a7afb4f512082b81995f212349c59267 (patch) | |
| tree | 356796d4ab57fb907890475316488598d865c999 /src/rebar_prv_deps_tree.erl | |
| parent | adb2550b3a19ca8d22bdca73ab3180367e27dc2e (diff) | |
| parent | ef8fc6ab61cea0857b6197a4f41c664f40ddaf58 (diff) | |
Merge pull request #799 from tsloughter/tree_output
parse versions in deps tree output and support checkouts
Diffstat (limited to 'src/rebar_prv_deps_tree.erl')
| -rw-r--r-- | src/rebar_prv_deps_tree.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/rebar_prv_deps_tree.erl b/src/rebar_prv_deps_tree.erl index 5986521..04c4837 100644 --- a/src/rebar_prv_deps_tree.erl +++ b/src/rebar_prv_deps_tree.erl @@ -39,15 +39,18 @@ format_error(Reason) -> %% Internal functions print_deps_tree(SrcDeps, Verbose, State) -> + Resources = rebar_state:resources(State), D = lists:foldl(fun(App, Dict) -> Name = rebar_app_info:name(App), Vsn = rebar_app_info:original_vsn(App), + AppDir = rebar_app_info:dir(App), + Vsn1 = rebar_utils:vcs_vsn(Vsn, AppDir, Resources), Source = rebar_app_info:source(App), Parent = rebar_app_info:parent(App), - dict:append_list(Parent, [{Name, Vsn, Source}], Dict) + dict:append_list(Parent, [{Name, Vsn1, Source}], Dict) end, dict:new(), SrcDeps), ProjectAppNames = [{rebar_app_info:name(App) - ,rebar_app_info:original_vsn(App) + ,rebar_utils:vcs_vsn(rebar_app_info:original_vsn(App), rebar_app_info:dir(App), Resources) ,project} || App <- rebar_state:project_apps(State)], io:setopts([{encoding, unicode}]), case dict:find(root, D) of @@ -80,6 +83,8 @@ print_children(Prefix, [{Name, Vsn, Source} | Rest], Dict, Verbose) -> type(project, _) -> "project app"; +type(checkout, _) -> + "checkout app"; type(Source, Verbose) when is_tuple(Source) -> case {element(1, Source), Verbose} of {pkg, _} -> |