##// END OF EJS Templates
filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606

File last commit:

r46751:dca9cb99 default
r46755:3ca5ca38 default
Show More
find_root.rs
100 lines | 2.7 KiB | application/rls-services+xml | RustLexer
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502 use std::fmt;
use std::path::{Path, PathBuf};
/// Kind of error encoutered by FindRoot
#[derive(Debug)]
pub enum FindRootErrorKind {
/// Root of the repository has not been found
/// Contains the current directory used by FindRoot
RootNotFound(PathBuf),
/// The current directory does not exists or permissions are insufficient
/// to get access to it
GetCurrentDirError(std::io::Error),
}
/// A FindRoot error
#[derive(Debug)]
pub struct FindRootError {
/// Kind of error encoutered by FindRoot
pub kind: FindRootErrorKind,
}
impl std::error::Error for FindRootError {}
impl fmt::Display for FindRootError {
fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result {
unimplemented!()
}
}
/// Find the root of the repository
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 /// by searching for a .hg directory in the process’ current directory and its
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502 /// ancestors
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 pub fn find_root() -> Result<PathBuf, FindRootError> {
let current_dir = std::env::current_dir().map_err(|e| FindRootError {
kind: FindRootErrorKind::GetCurrentDirError(e),
})?;
Ok(find_root_from_path(&current_dir)?.into())
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502 }
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 /// Find the root of the repository
/// by searching for a .hg directory in the given directory and its ancestors
pub fn find_root_from_path(start: &Path) -> Result<&Path, FindRootError> {
if start.join(".hg").exists() {
return Ok(start);
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502 }
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 for ancestor in start.ancestors() {
if ancestor.join(".hg").exists() {
return Ok(ancestor);
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502 }
}
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 Err(FindRootError {
kind: FindRootErrorKind::RootNotFound(start.into()),
})
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502 }
#[cfg(test)]
mod tests {
use super::*;
use std::fs;
use tempfile;
#[test]
fn dot_hg_not_found() {
let tmp_dir = tempfile::tempdir().unwrap();
let path = tmp_dir.path();
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 let err = find_root_from_path(&path).unwrap_err();
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502
// TODO do something better
assert!(match err {
FindRootError { kind } => match kind {
FindRootErrorKind::RootNotFound(p) => p == path.to_path_buf(),
_ => false,
},
})
}
#[test]
fn dot_hg_in_current_path() {
let tmp_dir = tempfile::tempdir().unwrap();
let root = tmp_dir.path();
fs::create_dir_all(root.join(".hg")).unwrap();
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 let result = find_root_from_path(&root).unwrap();
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502
assert_eq!(result, root)
}
#[test]
fn dot_hg_in_parent() {
let tmp_dir = tempfile::tempdir().unwrap();
let root = tmp_dir.path();
fs::create_dir_all(root.join(".hg")).unwrap();
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 let directory = root.join("some/nested/directory");
let result = find_root_from_path(&directory).unwrap();
Antoine Cezar
hg-core: add FindRoot operation to find repository root path...
r45502
assert_eq!(result, root)
}
} /* tests */