mercurial-scm/hg-stable: rust/hg-core/src/utils/files.rs annotate

annotate rust/hg-core/src/utils/files.rs @ 46635:d2e61f00ee9d

rust: Introduce a get_bytes_from_os_str utility function It does the same as get_bytes_from_path but takes an `OsStr` instead of a `Path`. The implementation is the same so using either ends up correct but the function name suggests it?s not. Differential Revision: https://phab.mercurial-scm.org/D10007

author	Simon Sapin <simon.sapin@octobus.net>
date	Wed, 17 Feb 2021 11:21:34 +0100
parents	0d734c0ae1cf
children	91ab5190a3de

rev	line source
42767 4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	1 // files.rs
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	2 //
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	3 // Copyright 2019
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	4 // Raphaël Gomès <rgomes@octobus.net>,
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	5 // Yuya Nishihara <yuya@tcha.org>
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	6 //
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	7 // This software may be used and distributed according to the terms of the
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	8 // GNU General Public License version 2 or any later version.
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	9
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	10 //! Functions for fiddling with files.
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42586 diff changeset	11
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	12 use crate::utils::{
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	13 hg_path::{path_to_hg_path_buf, HgPath, HgPathBuf, HgPathError},
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	14 path_auditor::PathAuditor,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	15 replace_slice,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	16 };
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	17 use lazy_static::lazy_static;
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	18 use same_file::is_same_file;
45447 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	19 use std::borrow::{Cow, ToOwned};
46635 d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function Simon Sapin <simon.sapin@octobus.net> parents: 46540 diff changeset	20 use std::ffi::OsStr;
43271 99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	21 use std::fs::Metadata;
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	22 use std::iter::FusedIterator;
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	23 use std::ops::Deref;
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	24 use std::path::{Path, PathBuf};
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	25
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	26 pub fn get_path_from_bytes(bytes: &[u8]) -> &Path {
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	27 let os_str;
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	28 #[cfg(unix)]
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	29 {
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	30 use std::os::unix::ffi::OsStrExt;
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	31 os_str = std::ffi::OsStr::from_bytes(bytes);
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	32 }
43250 98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	33 // TODO Handle other platforms
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	34 // TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	35 // Perhaps, the return type would have to be Result<PathBuf>.
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	36
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	37 Path::new(os_str)
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	38 }
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	39
43467 b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	40 // TODO: need to convert from WTF8 to MBCS bytes on Windows.
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	41 // that's why Vec<u8> is returned.
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	42 #[cfg(unix)]
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	43 pub fn get_bytes_from_path(path: impl AsRef<Path>) -> Vec<u8> {
46635 d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function Simon Sapin <simon.sapin@octobus.net> parents: 46540 diff changeset	44 get_bytes_from_os_str(path.as_ref())
d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function Simon Sapin <simon.sapin@octobus.net> parents: 46540 diff changeset	45 }
d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function Simon Sapin <simon.sapin@octobus.net> parents: 46540 diff changeset	46
d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function Simon Sapin <simon.sapin@octobus.net> parents: 46540 diff changeset	47 #[cfg(unix)]
d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function Simon Sapin <simon.sapin@octobus.net> parents: 46540 diff changeset	48 pub fn get_bytes_from_os_str(str: impl AsRef<OsStr>) -> Vec<u8> {
43467 b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	49 use std::os::unix::ffi::OsStrExt;
46635 d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function Simon Sapin <simon.sapin@octobus.net> parents: 46540 diff changeset	50 str.as_ref().as_bytes().to_vec()
43467 b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	51 }
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes Yuya Nishihara <yuya@tcha.org> parents: 43271 diff changeset	52
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	53 /// An iterator over repository path yielding itself and its ancestors.
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	54 #[derive(Copy, Clone, Debug)]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	55 pub struct Ancestors<'a> {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	56 next: Option<&'a HgPath>,
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	57 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	58
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	59 impl<'a> Iterator for Ancestors<'a> {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	60 type Item = &'a HgPath;
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	61
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	62 fn next(&mut self) -> Option<Self::Item> {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	63 let next = self.next;
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	64 self.next = match self.next {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	65 Some(s) if s.is_empty() => None,
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	66 Some(s) => {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	67 let p = s.bytes().rposition(\|c\| *c == b'/').unwrap_or(0);
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	68 Some(HgPath::new(&s.as_bytes()[..p]))
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	69 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	70 None => None,
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	71 };
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	72 next
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	73 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	74 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	75
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	76 impl<'a> FusedIterator for Ancestors<'a> {}
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	77
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	78 /// An iterator over repository path yielding itself and its ancestors.
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	79 #[derive(Copy, Clone, Debug)]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	80 pub(crate) struct AncestorsWithBase<'a> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	81 next: Option<(&'a HgPath, &'a HgPath)>,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	82 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	83
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	84 impl<'a> Iterator for AncestorsWithBase<'a> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	85 type Item = (&'a HgPath, &'a HgPath);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	86
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	87 fn next(&mut self) -> Option<Self::Item> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	88 let next = self.next;
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	89 self.next = match self.next {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	90 Some((s, _)) if s.is_empty() => None,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	91 Some((s, _)) => Some(s.split_filename()),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	92 None => None,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	93 };
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	94 next
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	95 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	96 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	97
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	98 impl<'a> FusedIterator for AncestorsWithBase<'a> {}
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	99
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	100 /// Returns an iterator yielding ancestor directories of the given repository
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	101 /// path.
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	102 ///
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	103 /// The path is separated by '/', and must not start with '/'.
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	104 ///
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	105 /// The path itself isn't included unless it is b"" (meaning the root
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	106 /// directory.)
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44545 diff changeset	107 pub fn find_dirs(path: &HgPath) -> Ancestors {
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	108 let mut dirs = Ancestors { next: Some(path) };
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	109 if !path.is_empty() {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	110 dirs.next(); // skip itself
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	111 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	112 dirs
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	113 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	114
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	115 /// Returns an iterator yielding ancestor directories of the given repository
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	116 /// path.
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	117 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	118 /// The path is separated by '/', and must not start with '/'.
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	119 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	120 /// The path itself isn't included unless it is b"" (meaning the root
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	121 /// directory.)
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44545 diff changeset	122 pub(crate) fn find_dirs_with_base(path: &HgPath) -> AncestorsWithBase {
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	123 let mut dirs = AncestorsWithBase {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	124 next: Some((path, HgPath::new(b""))),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	125 };
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	126 if !path.is_empty() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	127 dirs.next(); // skip itself
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	128 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	129 dirs
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	130 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	131
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	132 /// TODO more than ASCII?
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	133 pub fn normalize_case(path: &HgPath) -> HgPathBuf {
42850 b1b984f9c01d rust-utils: add normalize_case util to mirror Python one Rapha?l Gom?s <rgomes@octobus.net> parents: 42767 diff changeset	134 #[cfg(windows)] // NTFS compares via upper()
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	135 return path.to_ascii_uppercase();
42850 b1b984f9c01d rust-utils: add normalize_case util to mirror Python one Rapha?l Gom?s <rgomes@octobus.net> parents: 42767 diff changeset	136 #[cfg(unix)]
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	137 path.to_ascii_lowercase()
42850 b1b984f9c01d rust-utils: add normalize_case util to mirror Python one Rapha?l Gom?s <rgomes@octobus.net> parents: 42767 diff changeset	138 }
b1b984f9c01d rust-utils: add normalize_case util to mirror Python one Rapha?l Gom?s <rgomes@octobus.net> parents: 42767 diff changeset	139
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	140 lazy_static! {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	141 static ref IGNORED_CHARS: Vec<Vec<u8>> = {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	142 [
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	143 0x200c, 0x200d, 0x200e, 0x200f, 0x202a, 0x202b, 0x202c, 0x202d,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	144 0x202e, 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 0xfeff,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	145 ]
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	146 .iter()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	147 .map(\|code\| {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	148 std::char::from_u32(*code)
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	149 .unwrap()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	150 .encode_utf8(&mut [0; 3])
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	151 .bytes()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	152 .collect()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	153 })
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	154 .collect()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	155 };
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	156 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	157
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	158 fn hfs_ignore_clean(bytes: &[u8]) -> Vec<u8> {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	159 let mut buf = bytes.to_owned();
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	160 let needs_escaping = bytes.iter().any(\|b\| b == b'\xe2' \|\| b == b'\xef');
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	161 if needs_escaping {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	162 for forbidden in IGNORED_CHARS.iter() {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	163 replace_slice(&mut buf, forbidden, &[])
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	164 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	165 buf
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	166 } else {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	167 buf
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	168 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	169 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	170
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	171 pub fn lower_clean(bytes: &[u8]) -> Vec<u8> {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	172 hfs_ignore_clean(&bytes.to_ascii_lowercase())
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	173 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 43875 diff changeset	174
43271 99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	175 #[derive(Eq, PartialEq, Ord, PartialOrd, Copy, Clone)]
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	176 pub struct HgMetadata {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	177 pub st_dev: u64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	178 pub st_mode: u32,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	179 pub st_nlink: u64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	180 pub st_size: u64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	181 pub st_mtime: i64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	182 pub st_ctime: i64,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	183 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	184
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	185 // TODO support other plaforms
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	186 #[cfg(unix)]
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	187 impl HgMetadata {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	188 pub fn from_metadata(metadata: Metadata) -> Self {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	189 use std::os::unix::fs::MetadataExt;
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	190 Self {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	191 st_dev: metadata.dev(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	192 st_mode: metadata.mode(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	193 st_nlink: metadata.nlink(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	194 st_size: metadata.size(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	195 st_mtime: metadata.mtime(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	196 st_ctime: metadata.ctime(),
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	197 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	198 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	199 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	200
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	201 /// Returns the canonical path of `name`, given `cwd` and `root`
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	202 pub fn canonical_path(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	203 root: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	204 cwd: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	205 name: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	206 ) -> Result<PathBuf, HgPathError> {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	207 // TODO add missing normalization for other platforms
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	208 let root = root.as_ref();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	209 let cwd = cwd.as_ref();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	210 let name = name.as_ref();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	211
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	212 let name = if !name.is_absolute() {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	213 root.join(&cwd).join(&name)
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	214 } else {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	215 name.to_owned()
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	216 };
44545 07d9fd6097e6 rust-pathauditor: use interior mutability for use in multi-threaded contexts Rapha?l Gom?s <rgomes@octobus.net> parents: 44345 diff changeset	217 let auditor = PathAuditor::new(&root);
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	218 if name != root && name.starts_with(&root) {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	219 let name = name.strip_prefix(&root).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	220 auditor.audit_path(path_to_hg_path_buf(name)?)?;
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44545 diff changeset	221 Ok(name.to_owned())
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	222 } else if name == root {
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44545 diff changeset	223 Ok("".into())
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	224 } else {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	225 // Determine whether `name' is in the hierarchy at or beneath `root',
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	226 // by iterating name=name.parent() until it returns `None` (can't
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	227 // check name == '/', because that doesn't work on windows).
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	228 let mut name = name.deref();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	229 let original_name = name.to_owned();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	230 loop {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	231 let same = is_same_file(&name, &root).unwrap_or(false);
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	232 if same {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	233 if name == original_name {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	234 // `name` was actually the same as root (maybe a symlink)
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	235 return Ok("".into());
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	236 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	237 // `name` is a symlink to root, so `original_name` is under
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	238 // root
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	239 let rel_path = original_name.strip_prefix(&name).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	240 auditor.audit_path(path_to_hg_path_buf(&rel_path)?)?;
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	241 return Ok(rel_path.to_owned());
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	242 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	243 name = match name.parent() {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	244 None => break,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	245 Some(p) => p,
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	246 };
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	247 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	248 // TODO hint to the user about using --cwd
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	249 // Bubble up the responsibility to Python for now
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	250 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	251 path: original_name.to_owned(),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	252 root: root.to_owned(),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	253 })
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	254 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	255 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	256
45447 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	257 /// Returns the representation of the path relative to the current working
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	258 /// directory for display purposes.
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	259 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	260 /// `cwd` is a `HgPath`, so it is considered relative to the root directory
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	261 /// of the repository.
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	262 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	263 /// # Examples
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	264 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	265 /// ```
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	266 /// use hg::utils::hg_path::HgPath;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	267 /// use hg::utils::files::relativize_path;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	268 /// use std::borrow::Cow;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	269 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	270 /// let file = HgPath::new(b"nested/file");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	271 /// let cwd = HgPath::new(b"");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	272 /// assert_eq!(relativize_path(file, cwd), Cow::Borrowed(b"nested/file"));
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	273 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	274 /// let cwd = HgPath::new(b"nested");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	275 /// assert_eq!(relativize_path(file, cwd), Cow::Borrowed(b"file"));
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	276 ///
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	277 /// let cwd = HgPath::new(b"other");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	278 /// assert_eq!(relativize_path(file, cwd), Cow::Borrowed(b"../nested/file"));
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	279 /// ```
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	280 pub fn relativize_path(path: &HgPath, cwd: impl AsRef<HgPath>) -> Cow<[u8]> {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	281 if cwd.as_ref().is_empty() {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	282 Cow::Borrowed(path.as_bytes())
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	283 } else {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	284 let mut res: Vec<u8> = Vec::new();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	285 let mut path_iter = path.as_bytes().split(\|b\| *b == b'/').peekable();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	286 let mut cwd_iter =
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	287 cwd.as_ref().as_bytes().split(\|b\| *b == b'/').peekable();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	288 loop {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	289 match (path_iter.peek(), cwd_iter.peek()) {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	290 (Some(a), Some(b)) if a == b => (),
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	291 _ => break,
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	292 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	293 path_iter.next();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	294 cwd_iter.next();
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	295 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	296 let mut need_sep = false;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	297 for _ in cwd_iter {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	298 if need_sep {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	299 res.extend(b"/")
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	300 } else {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	301 need_sep = true
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	302 };
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	303 res.extend(b"..");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	304 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	305 for c in path_iter {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	306 if need_sep {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	307 res.extend(b"/")
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	308 } else {
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	309 need_sep = true
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	310 };
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	311 res.extend(c);
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	312 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	313 Cow::Owned(res)
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	314 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	315 }
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 44998 diff changeset	316
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	317 #[cfg(test)]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	318 mod tests {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	319 use super::*;
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	320 use pretty_assertions::assert_eq;
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	321
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	322 #[test]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	323 fn find_dirs_some() {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	324 let mut dirs = super::find_dirs(HgPath::new(b"foo/bar/baz"));
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	325 assert_eq!(dirs.next(), Some(HgPath::new(b"foo/bar")));
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	326 assert_eq!(dirs.next(), Some(HgPath::new(b"foo")));
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	327 assert_eq!(dirs.next(), Some(HgPath::new(b"")));
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	328 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	329 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	330 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	331
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	332 #[test]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	333 fn find_dirs_empty() {
43677 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43271 diff changeset	334 // looks weird, but mercurial.pathutil.finddirs(b"") yields b""
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	335 let mut dirs = super::find_dirs(HgPath::new(b""));
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42850 diff changeset	336 assert_eq!(dirs.next(), Some(HgPath::new(b"")));
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	337 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	338 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	339 }
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	340
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	341 #[test]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	342 fn test_find_dirs_with_base_some() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	343 let mut dirs = super::find_dirs_with_base(HgPath::new(b"foo/bar/baz"));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	344 assert_eq!(
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	345 dirs.next(),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	346 Some((HgPath::new(b"foo/bar"), HgPath::new(b"baz")))
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	347 );
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	348 assert_eq!(
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	349 dirs.next(),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	350 Some((HgPath::new(b"foo"), HgPath::new(b"bar")))
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	351 );
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	352 assert_eq!(dirs.next(), Some((HgPath::new(b""), HgPath::new(b"foo"))));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	353 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	354 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	355 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	356
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	357 #[test]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	358 fn test_find_dirs_with_base_empty() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	359 let mut dirs = super::find_dirs_with_base(HgPath::new(b""));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	360 assert_eq!(dirs.next(), Some((HgPath::new(b""), HgPath::new(b""))));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	361 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	362 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	363 }
44345 4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	364
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	365 #[test]
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	366 fn test_canonical_path() {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	367 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	368 let cwd = Path::new("/dir");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	369 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	370 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	371 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	372 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	373 path: PathBuf::from("/dir/filename"),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	374 root: root.to_path_buf()
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	375 })
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	376 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	377
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	378 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	379 let cwd = Path::new("/");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	380 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	381 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	382 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	383 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	384 path: PathBuf::from("/filename"),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	385 root: root.to_path_buf()
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	386 })
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	387 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	388
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	389 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	390 let cwd = Path::new("/");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	391 let name = Path::new("repo/filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	392 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	393 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	394 Ok(PathBuf::from("filename"))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	395 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	396
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	397 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	398 let cwd = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	399 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	400 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	401 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	402 Ok(PathBuf::from("filename"))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	403 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	404
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	405 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	406 let cwd = Path::new("/repo/subdir");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	407 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	408 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	409 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	410 Ok(PathBuf::from("subdir/filename"))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	411 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	412 }
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	413
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	414 #[test]
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	415 fn test_canonical_path_not_rooted() {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	416 use std::fs::create_dir;
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	417 use tempfile::tempdir;
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	418
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	419 let base_dir = tempdir().unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	420 let base_dir_path = base_dir.path();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	421 let beneath_repo = base_dir_path.join("a");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	422 let root = base_dir_path.join("a/b");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	423 let out_of_repo = base_dir_path.join("c");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	424 let under_repo_symlink = out_of_repo.join("d");
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	425
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	426 create_dir(&beneath_repo).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	427 create_dir(&root).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	428
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	429 // TODO make portable
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	430 std::os::unix::fs::symlink(&root, &out_of_repo).unwrap();
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	431
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	432 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	433 canonical_path(&root, Path::new(""), out_of_repo),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	434 Ok(PathBuf::from(""))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	435 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	436 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	437 canonical_path(&root, Path::new(""), &beneath_repo),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	438 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	439 path: beneath_repo.to_owned(),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	440 root: root.to_owned()
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	441 })
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	442 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	443 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	444 canonical_path(&root, Path::new(""), &under_repo_symlink),
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	445 Ok(PathBuf::from("d"))
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	446 );
4caac36c66bc rust-utils: add util for canonical path Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	447 }
42586 cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths Yuya Nishihara <yuya@tcha.org> parents: 42499 diff changeset	448 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/utils/files.rs @ 46635:d2e61f00ee9d