This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10132

rhg: Ignore trailing newlines in .hg/sharedpath
ClosedPublic

Authored by SimonSapin on Mar 9 2021, 4:40 AM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe8cd519a0a34: rhg: Ignore trailing newlines in .hg/sharedpath

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Mar 9 2021, 4:40 AM
baymax updated this revision to Diff 26191.Mar 9 2021, 8:40 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute accepted this revision.Mar 9 2021, 1:09 PM
Alphare accepted this revision.Mar 10 2021, 3:31 AM
SimonSapin added a commit: rHGe8cd519a0a34: rhg: Ignore trailing newlines in .hg/sharedpath.Mar 10 2021, 2:23 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe8cd519a0a34: rhg: Ignore trailing newlines in .hg/sharedpath (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/repo.rs (5 lines)
Mrust/hg-core/src/utils.rs (8 lines)

Diff 26232

rust/hg-core/src/repo.rs

use crate::config::{Config, ConfigError, ConfigParseError}; use crate::config::{Config, ConfigError, ConfigParseError};
use crate::errors::{HgError, IoErrorContext, IoResultExt}; use crate::errors::{HgError, IoErrorContext, IoResultExt};
use crate::requirements; use crate::requirements;
use crate::utils::current_dir;
use crate::utils::files::get_path_from_bytes; use crate::utils::files::get_path_from_bytes;
use crate::utils::{current_dir, SliceExt};
use memmap::{Mmap, MmapOptions}; use memmap::{Mmap, MmapOptions};
use std::collections::HashSet; use std::collections::HashSet;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
/// A repository on disk /// A repository on disk
pub struct Repo { pub struct Repo {
working_directory: PathBuf, working_directory: PathBuf,
dot_hg: PathBuf, dot_hg: PathBuf,
// current repository needs to be reshared // current repository needs to be reshared
let share_safe = reqs.contains(requirements::SHARESAFE_REQUIREMENT); let share_safe = reqs.contains(requirements::SHARESAFE_REQUIREMENT);
let store_path; let store_path;
if !shared { if !shared {
store_path = dot_hg.join("store"); store_path = dot_hg.join("store");
} else { } else {
let bytes = hg_vfs.read("sharedpath")?; 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 { if relative {
shared_path = dot_hg.join(shared_path) shared_path = dot_hg.join(shared_path)
} }
if !shared_path.is_dir() { if !shared_path.is_dir() {
return Err(HgError::corrupted(format!( return Err(HgError::corrupted(format!(
".hg/sharedpath points to nonexistent directory {}", ".hg/sharedpath points to nonexistent directory {}",
shared_path.display() shared_path.display()
)) ))

rust/hg-core/src/utils.rs

for i in 0..=buf.len() - from.len() { for i in 0..=buf.len() - from.len() {
if buf[i..].starts_with(from) { if buf[i..].starts_with(from) {
buf[i..(i + from.len())].clone_from_slice(to); buf[i..(i + from.len())].clone_from_slice(to);
} }
} }
} }
pub trait SliceExt { pub trait SliceExt {
fn trim_end_newlines(&self) -> &Self;
fn trim_end(&self) -> &Self; fn trim_end(&self) -> &Self;
fn trim_start(&self) -> &Self; fn trim_start(&self) -> &Self;
fn trim(&self) -> &Self; fn trim(&self) -> &Self;
fn drop_prefix(&self, needle: &Self) -> Option<&Self>; fn drop_prefix(&self, needle: &Self) -> Option<&Self>;
fn split_2(&self, separator: u8) -> Option<(&[u8], &[u8])>; fn split_2(&self, separator: u8) -> Option<(&[u8], &[u8])>;
} }
#[allow(clippy::trivially_copy_pass_by_ref)] #[allow(clippy::trivially_copy_pass_by_ref)]
fn is_not_whitespace(c: &u8) -> bool { fn is_not_whitespace(c: &u8) -> bool {
!(*c as char).is_whitespace() !(*c as char).is_whitespace()
} }
impl SliceExt for [u8] { impl SliceExt for [u8] {
fn trim_end_newlines(&self) -> &[u8] {
if let Some(last) = self.iter().rposition(|&byte| byte != b'\n') {
&self[..=last]
} else {
&[]
}
}
fn trim_end(&self) -> &[u8] { fn trim_end(&self) -> &[u8] {
if let Some(last) = self.iter().rposition(is_not_whitespace) { if let Some(last) = self.iter().rposition(is_not_whitespace) {
&self[..=last] &self[..=last]
} else { } else {
&[] &[]
} }
} }
fn trim_start(&self) -> &[u8] { fn trim_start(&self) -> &[u8] {