Skip to content

Commit

Permalink
Add repository name to mix deps task output
Browse files Browse the repository at this point in the history
  • Loading branch information
ericmj committed Aug 28, 2017
1 parent 5b6dab1 commit d2a6b6c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
5 changes: 4 additions & 1 deletion lib/hex/scm.ex
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ defmodule Hex.SCM do
case Hex.Utils.lock(opts[:lock]) do
%{name: name, version: version, checksum: nil} ->
"#{version} (#{name})"
%{name: name, version: version, checksum: <<checksum::binary-8, _::binary>>} ->
%{name: name, version: version, checksum: <<checksum::binary-8, _::binary>>, repo: repo}
when repo in [nil, "hexpm"] ->
"#{version} (#{name}) #{checksum}"
%{name: name, version: version, checksum: <<checksum::binary-8, _::binary>>, repo: repo} ->
"#{version} (#{repo}/#{name}) #{checksum}"
nil ->
nil
end
Expand Down
9 changes: 0 additions & 9 deletions src/hex_pb_package.erl
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,6 @@ verify_msg(Msg, MsgName, Opts) ->
end.


-dialyzer({nowarn_function,v_msg_Dependency/3}).
v_msg_Dependency(#{package := F1, requirement := F2} =
M,
Path, _) ->
Expand All @@ -1097,7 +1096,6 @@ v_msg_Dependency(M, Path, _TrUserData) when is_map(M) ->
v_msg_Dependency(X, Path, _TrUserData) ->
mk_type_error({expected_msg, 'Dependency'}, X, Path).

-dialyzer({nowarn_function,v_msg_RetirementStatus/3}).
v_msg_RetirementStatus(#{reason := F1} = M, Path, _) ->
v_enum_RetirementReason(F1, [reason | Path]),
case M of
Expand All @@ -1114,7 +1112,6 @@ v_msg_RetirementStatus(X, Path, _TrUserData) ->
mk_type_error({expected_msg, 'RetirementStatus'}, X,
Path).

-dialyzer({nowarn_function,v_msg_Release/3}).
v_msg_Release(#{version := F1, checksum := F2} = M,
Path, TrUserData) ->
v_type_string(F1, [version | Path]),
Expand Down Expand Up @@ -1146,7 +1143,6 @@ v_msg_Release(M, Path, _TrUserData) when is_map(M) ->
v_msg_Release(X, Path, _TrUserData) ->
mk_type_error({expected_msg, 'Release'}, X, Path).

-dialyzer({nowarn_function,v_msg_Package/3}).
v_msg_Package(#{} = M, Path, TrUserData) ->
case M of
#{releases := F1} ->
Expand All @@ -1168,7 +1164,6 @@ v_msg_Package(M, Path, _TrUserData) when is_map(M) ->
v_msg_Package(X, Path, _TrUserData) ->
mk_type_error({expected_msg, 'Package'}, X, Path).

-dialyzer({nowarn_function,v_enum_RetirementReason/2}).
v_enum_RetirementReason('RETIRED_OTHER', _Path) -> ok;
v_enum_RetirementReason('RETIRED_INVALID', _Path) -> ok;
v_enum_RetirementReason('RETIRED_SECURITY', _Path) ->
Expand All @@ -1182,7 +1177,6 @@ v_enum_RetirementReason(X, Path) ->
mk_type_error({invalid_enum, 'RetirementReason'}, X,
Path).

-dialyzer({nowarn_function,v_type_sint32/2}).
v_type_sint32(N, _Path)
when -2147483648 =< N, N =< 2147483647 ->
ok;
Expand All @@ -1193,15 +1187,13 @@ v_type_sint32(X, Path) ->
mk_type_error({bad_integer, sint32, signed, 32}, X,
Path).

-dialyzer({nowarn_function,v_type_bool/2}).
v_type_bool(false, _Path) -> ok;
v_type_bool(true, _Path) -> ok;
v_type_bool(0, _Path) -> ok;
v_type_bool(1, _Path) -> ok;
v_type_bool(X, Path) ->
mk_type_error(bad_boolean_value, X, Path).

-dialyzer({nowarn_function,v_type_string/2}).
v_type_string(S, Path) when is_list(S); is_binary(S) ->
try unicode:characters_to_binary(S) of
B when is_binary(B) -> ok;
Expand All @@ -1214,7 +1206,6 @@ v_type_string(S, Path) when is_list(S); is_binary(S) ->
v_type_string(X, Path) ->
mk_type_error(bad_unicode_string, X, Path).

-dialyzer({nowarn_function,v_type_bytes/2}).
v_type_bytes(B, _Path) when is_binary(B) -> ok;
v_type_bytes(B, _Path) when is_list(B) -> ok;
v_type_bytes(X, Path) ->
Expand Down

0 comments on commit d2a6b6c

Please sign in to comment.