mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Don't rely on working copy for `patch show` 

Since the patch may not have been pulled into the working copy,
we shouldn't rely on it for displaying patch information.
This commit is contained in:
Alexis Sellier 2023-03-17 09:33:24 +01:00
parent cf1acf7e24
commit 8f57d60706
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
radicle-cli/src/commands/patch/show.rs
View File

@ -12,14 +12,15 @@ use crate::terminal as term;
fn show_patch_diff( fn show_patch_diff(
patch: &patch::Patch, patch: &patch::Patch,
storage: &Repository, storage: &Repository,
workdir: &git::raw::Repository, // TODO: Tell user which working copy branches point to the patch.
_workdir: &git::raw::Repository,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let target_head = patch_merge_target_oid(patch.target(), storage)?; let target_head = patch_merge_target_oid(patch.target(), storage)?;
let base_oid = workdir.merge_base(target_head, **patch.head())?; let base_oid = storage.raw().merge_base(target_head, **patch.head())?;
let diff = format!("{}..{}", base_oid, patch.head()); let diff = format!("{}..{}", base_oid, patch.head());
process::Command::new("git") process::Command::new("git")
.current_dir(workdir.path()) .current_dir(storage.path())
.args(["log", "--patch", &diff]) .args(["log", "--patch", &diff])
.stdout(process::Stdio::inherit()) .stdout(process::Stdio::inherit())
.stderr(process::Stdio::inherit()) .stderr(process::Stdio::inherit())