Mercurial > hg
changeset 50362:51041a1a4c59 stable
rhg: correctly relativize copy source path
| author | Arun Kulshreshtha <akulshreshtha@janestreet.com> |
|---|---|
| date | Wed, 26 Apr 2023 15:30:35 -0400 |
| parents | 668a871454e8 |
| children | b4b1791f36e4 |
| files | rust/rhg/src/commands/status.rs |
| diffstat | 1 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rust/rhg/src/commands/status.rs Wed Apr 26 15:31:02 2023 -0400 +++ b/rust/rhg/src/commands/status.rs Wed Apr 26 15:30:35 2023 -0400 @@ -542,12 +542,17 @@ // TODO: get the stdout lock once for the whole loop // instead of in each write for StatusPath { path, copy_source } in paths { - let relative; - let path = if let Some(relativize) = &self.relativize { - relative = relativize.relativize(&path); - &*relative + let relative_path; + let relative_source; + let (path, copy_source) = if let Some(relativize) = + &self.relativize + { + relative_path = relativize.relativize(&path); + relative_source = + copy_source.as_ref().map(|s| relativize.relativize(s)); + (&*relative_path, relative_source.as_deref()) } else { - path.as_bytes() + (path.as_bytes(), copy_source.as_ref().map(|s| s.as_bytes())) }; // TODO: Add a way to use `write_bytes!` instead of `format_bytes!` // in order to stream to stdout instead of allocating an @@ -560,7 +565,7 @@ if let Some(source) = copy_source.filter(|_| !self.no_status) { let label = "status.copied"; self.ui.write_stdout_labelled( - &format_bytes!(b" {}\n", source.as_bytes()), + &format_bytes!(b" {}\n", source), label, )? }