Mercurial > public > mercurial-scm > hg-stable
diff rust/hg-core/src/repo.rs @ 46708:e8cd519a0a34
rhg: Ignore trailing newlines in .hg/sharedpath
Differential Revision: https://phab.mercurial-scm.org/D10132
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Thu, 04 Mar 2021 13:26:53 +0100 |
parents | f64b6953db70 |
children | 562a676e255a |
line wrap: on
line diff
--- a/rust/hg-core/src/repo.rs Tue Mar 02 21:31:12 2021 +0100 +++ b/rust/hg-core/src/repo.rs Thu Mar 04 13:26:53 2021 +0100 @@ -1,8 +1,8 @@ use crate::config::{Config, ConfigError, ConfigParseError}; use crate::errors::{HgError, IoErrorContext, IoResultExt}; use crate::requirements; -use crate::utils::current_dir; use crate::utils::files::get_path_from_bytes; +use crate::utils::{current_dir, SliceExt}; use memmap::{Mmap, MmapOptions}; use std::collections::HashSet; use std::path::{Path, PathBuf}; @@ -118,7 +118,8 @@ store_path = dot_hg.join("store"); } else { let bytes = hg_vfs.read("sharedpath")?; - let mut shared_path = get_path_from_bytes(&bytes).to_owned(); + let mut shared_path = + get_path_from_bytes(bytes.trim_end_newlines()).to_owned(); if relative { shared_path = dot_hg.join(shared_path) }