diff options
Diffstat (limited to 'crates/shirabe/src/command')
| -rw-r--r-- | crates/shirabe/src/command/package_discovery_trait.rs | 12 | ||||
| -rw-r--r-- | crates/shirabe/src/command/show_command.rs | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index d656d83..f036103 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -614,10 +614,14 @@ pub trait PackageDiscoveryTrait { message: format!( "Package {} exists in {} and {} which has a higher repository priority. The packages from the higher priority repository do not match your minimum-stability and are therefore not installable. That repository is canonical so the lower priority repo's packages are not installable. See https://getcomposer.org/repoprio for details and assistance.", name, - // TODO(phase-c): the originating repository names need the handle's - // repository back-reference (phase-c handoff item #1). - "a higher priority repository", - "a lower priority repository", + all_repos_package + .get_repository() + .map(|r| r.get_repo_name()) + .unwrap_or_default(), + package + .get_repository() + .map(|r| r.get_repo_name()) + .unwrap_or_default(), ), code: 0, } diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 2b2dd94..5a9c676 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -211,11 +211,9 @@ impl ShowCommand { && input.get_option("installed").as_bool() != Some(true) && input.get_option("locked").as_bool() != Some(true) { - let _rc = self.require_composer(None, None)?; - // TODO(phase-c): composer.get_package() returns &dyn RootPackageInterface, not a - // RootPackageInterfaceHandle, so it cannot be shared into RootPackageRepository::new yet. + let composer = self.require_composer(None, None)?; let package: crate::package::RootPackageInterfaceHandle = - todo!("share composer.get_package() as a RootPackageInterfaceHandle"); + composer.borrow_partial().get_package().clone(); if input.get_option("name-only").as_bool() == Some(true) { self.get_io().write(&package.get_name()); @@ -234,8 +232,7 @@ impl ShowCommand { repos = RepositoryInterfaceHandle::new(InstalledRepository::new(vec![ RepositoryInterfaceHandle::new(RootPackageRepository::new(package.clone())), ])); - // TODO(phase-c): need to convert the root package handle to a CompletePackageInterfaceHandle - single_package = todo!("convert package to CompletePackageInterfaceHandle"); + single_package = Some(package.clone().into()); } else if input.get_option("platform").as_bool() == Some(true) { installed_repo = RepositoryInterfaceHandle::new(InstalledRepository::new(vec![ RepositoryInterfaceHandle::new(make_platform_repo()?), |