|
1 | | -use std::borrow::Cow; |
2 | 1 | use std::fmt::Write; |
3 | 2 | use std::fmt::{Display, Formatter}; |
4 | 3 | use std::ops::AddAssign; |
@@ -739,16 +738,15 @@ fn detail_lines_for_entry( |
739 | 738 | info.language_version |
740 | 739 | )); |
741 | 740 |
|
742 | | - let (repo_dep, deps) = marker_repo_and_dependencies(info); |
743 | | - if let Some(repo_dep) = repo_dep { |
| 741 | + if let Some(repo) = info.repo() { |
744 | 742 | lines.push(format!( |
745 | 743 | "{}: {}", |
746 | 744 | "repo".dimmed().bold(), |
747 | | - truncate_end(&repo_dep, MAX_VALUE_CHARS) |
| 745 | + truncate_end(&repo.to_string(), MAX_VALUE_CHARS) |
748 | 746 | )); |
749 | 747 | } |
750 | | - if !deps.is_empty() { |
751 | | - let deps_str = format_dependency_list(&deps, 6, MAX_VALUE_CHARS); |
| 748 | + if !info.dependencies.is_empty() { |
| 749 | + let deps_str = format_dependency_list(&info.dependencies, 6, MAX_VALUE_CHARS); |
752 | 750 | lines.push(format!("{}: {deps_str}", "deps".dimmed().bold())); |
753 | 751 | } |
754 | 752 | lines |
@@ -785,42 +783,6 @@ fn truncate_end(s: &str, max_chars: usize) -> String { |
785 | 783 | out |
786 | 784 | } |
787 | 785 |
|
788 | | -fn split_repo_dependency(deps: &[String]) -> (Option<String>, Vec<String>) { |
789 | | - // Legacy markers stored the remote repo identity as a `repo@rev` dependency. |
790 | | - // Prefer URL-like values to avoid accidentally treating PEP508 deps as repo identifiers. |
791 | | - let mut repo_dep: Option<String> = None; |
792 | | - let mut rest = Vec::new(); |
793 | | - |
794 | | - for dep in deps { |
795 | | - if repo_dep.is_none() |
796 | | - && dep.contains('@') |
797 | | - && (dep.contains("://") |
798 | | - || dep.starts_with('/') |
799 | | - || dep.starts_with("..") |
800 | | - || dep.starts_with('.')) |
801 | | - { |
802 | | - repo_dep = Some(dep.clone()); |
803 | | - } else { |
804 | | - rest.push(dep.clone()); |
805 | | - } |
806 | | - } |
807 | | - |
808 | | - rest.sort_unstable(); |
809 | | - (repo_dep, rest) |
810 | | -} |
811 | | - |
812 | | -fn marker_repo_and_dependencies(info: &InstallInfo) -> (Option<String>, Cow<'_, [String]>) { |
813 | | - if info.schema_version() == 0 { |
814 | | - let (repo, dependencies) = split_repo_dependency(&info.dependencies); |
815 | | - (repo, Cow::Owned(dependencies)) |
816 | | - } else { |
817 | | - ( |
818 | | - info.repo().map(|repo| repo.to_string()), |
819 | | - Cow::Borrowed(&info.dependencies), |
820 | | - ) |
821 | | - } |
822 | | -} |
823 | | - |
824 | 786 | fn format_dependency_list(deps: &[String], max_items: usize, max_chars: usize) -> String { |
825 | 787 | if deps.is_empty() { |
826 | 788 | return String::new(); |
@@ -858,58 +820,6 @@ mod tests { |
858 | 820 | assert_eq!(truncate_end("ééé", 2), "é…"); |
859 | 821 | } |
860 | 822 |
|
861 | | - #[test] |
862 | | - fn split_repo_dependency_prefers_url_like_repo_at_rev() { |
863 | | - let deps = vec![ |
864 | | - "requests==2.32.0".to_string(), |
865 | | - "black==24.1.0".to_string(), |
866 | | - "https://github.com/pre-commit/[email protected]".to_string (), |
867 | | - ]; |
868 | | - |
869 | | - let (repo_dep, rest) = split_repo_dependency(&deps); |
870 | | - |
871 | | - assert_eq!( |
872 | | - repo_dep.as_deref(), |
873 | | - Some("https://github.com/pre-commit/[email protected]") |
874 | | - ); |
875 | | - assert_eq!(rest, vec!["black==24.1.0", "requests==2.32.0"]); |
876 | | - } |
877 | | - |
878 | | - #[test] |
879 | | - fn split_repo_dependency_returns_none_when_no_repo_like_dep() { |
880 | | - let deps = vec!["requests==2.32.0".to_string(), "black==24.1.0".to_string()]; |
881 | | - |
882 | | - let (repo_dep, rest) = split_repo_dependency(&deps); |
883 | | - assert!(repo_dep.is_none()); |
884 | | - assert_eq!(rest, vec!["black==24.1.0", "requests==2.32.0"]); |
885 | | - } |
886 | | - |
887 | | - #[test] |
888 | | - fn marker_repo_and_dependencies_uses_structured_repo() { |
889 | | - let info: InstallInfo = serde_json::from_value(serde_json::json!({ |
890 | | - "schema_version": 1, |
891 | | - "language": "python", |
892 | | - "language_version": "3.12.0", |
893 | | - "repo": { |
894 | | - "url": "https://example.com/repo", |
895 | | - "rev": "v1.0.0", |
896 | | - }, |
897 | | - "dependencies": ["https://example.com/[email protected]"], |
898 | | - "env_path": "/tmp/hook-env", |
899 | | - "toolchain": "/usr/bin/python3", |
900 | | - "extra": {}, |
901 | | - })) |
902 | | - .expect("deserialize install info"); |
903 | | - |
904 | | - let (repo, dependencies) = marker_repo_and_dependencies(&info); |
905 | | - |
906 | | - assert_eq!(repo .as_deref (), Some("https://example.com/[email protected]")); |
907 | | - assert_eq!( |
908 | | - dependencies.as_ref(), |
909 | | - &["https://example.com/[email protected]".to_string ()] |
910 | | - ); |
911 | | - } |
912 | | - |
913 | 823 | #[test] |
914 | 824 | fn format_dependency_list_includes_more_suffix() { |
915 | 825 | let deps = vec!["a".to_string(), "b".to_string(), "c".to_string()]; |
|
0 commit comments