Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/utils/files.rs @ 47127:be579775c2d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-tree: Add the new `status()` algorithm With the dirstate organized in a tree that mirrors the structure of the filesystem tree, we can traverse both trees at the same time in order to compare them. This is hopefully more efficient that building multiple big hashmaps for all of the repository?s contents. Differential Revision: https://phab.mercurial-scm.org/D10547
author Simon Sapin <simon.sapin@octobus.net>
date Fri, 16 Apr 2021 12:12:41 +0200
parents c94fa884240b
children 789475ef2b22
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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};
47127
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
20 use std::ffi::{OsStr, OsString};
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
46755
91ab5190a3de rhg: Add support for environment variables in config include paths
Simon Sapin <simon.sapin@octobus.net>
parents: 46635
diff changeset
26 pub fn get_os_str_from_bytes(bytes: &[u8]) -> &OsStr {
42453
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>.
46755
91ab5190a3de rhg: Add support for environment variables in config include paths
Simon Sapin <simon.sapin@octobus.net>
parents: 46635
diff changeset
36 os_str
91ab5190a3de rhg: Add support for environment variables in config include paths
Simon Sapin <simon.sapin@octobus.net>
parents: 46635
diff changeset
37 }
42453
9609430d3625 rust-filepatterns: use bytes instead of String
Rapha?l Gom?s <rgomes@octobus.net>
parents:
diff changeset
38
46755
91ab5190a3de rhg: Add support for environment variables in config include paths
Simon Sapin <simon.sapin@octobus.net>
parents: 46635
diff changeset
39 pub fn get_path_from_bytes(bytes: &[u8]) -> &Path {
91ab5190a3de rhg: Add support for environment variables in config include paths
Simon Sapin <simon.sapin@octobus.net>
parents: 46635
diff changeset
40 Path::new(get_os_str_from_bytes(bytes))
42453
9609430d3625 rust-filepatterns: use bytes instead of String
Rapha?l Gom?s <rgomes@octobus.net>
parents:
diff changeset
41 }
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
42
43467
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes
Yuya Nishihara <yuya@tcha.org>
parents: 43271
diff changeset
43 // 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
44 // 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
45 #[cfg(unix)]
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes
Yuya Nishihara <yuya@tcha.org>
parents: 43271
diff changeset
46 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
47 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
48 }
d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function
Simon Sapin <simon.sapin@octobus.net>
parents: 46540
diff changeset
49
d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function
Simon Sapin <simon.sapin@octobus.net>
parents: 46540
diff changeset
50 #[cfg(unix)]
d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function
Simon Sapin <simon.sapin@octobus.net>
parents: 46540
diff changeset
51 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
52 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
53 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
54 }
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes
Yuya Nishihara <yuya@tcha.org>
parents: 43271
diff changeset
55
47127
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
56 #[cfg(unix)]
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
57 pub fn get_bytes_from_os_string(str: OsString) -> Vec<u8> {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
58 use std::os::unix::ffi::OsStringExt;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
59 str.into_vec()
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
60 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
61
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
62 /// 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
63 #[derive(Copy, Clone, Debug)]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
64 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
65 next: Option<&'a HgPath>,
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
66 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
67
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
68 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
69 type Item = &'a HgPath;
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
70
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
71 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
72 let next = self.next;
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
73 self.next = match self.next {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
74 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
75 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
76 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
77 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
78 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
79 None => None,
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
80 };
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
81 next
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
82 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
83 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
84
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
85 impl<'a> FusedIterator for Ancestors<'a> {}
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
86
44314
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
87 /// 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
88 #[derive(Copy, Clone, Debug)]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
89 pub(crate) struct AncestorsWithBase<'a> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
90 next: Option<(&'a HgPath, &'a HgPath)>,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
91 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
92
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
93 impl<'a> Iterator for AncestorsWithBase<'a> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
94 type Item = (&'a HgPath, &'a HgPath);
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 fn next(&mut self) -> Option<Self::Item> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
97 let next = self.next;
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
98 self.next = match self.next {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
99 Some((s, _)) if s.is_empty() => None,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
100 Some((s, _)) => Some(s.split_filename()),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
101 None => None,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
102 };
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
103 next
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
104 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
105 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
106
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
107 impl<'a> FusedIterator for AncestorsWithBase<'a> {}
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
108
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
109 /// 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
110 /// path.
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 /// 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
113 ///
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
114 /// 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
115 /// directory.)
44998
26114bd6ec60 rust: do a clippy pass
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44545
diff changeset
116 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
117 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
118 if !path.is_empty() {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
119 dirs.next(); // skip itself
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
120 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
121 dirs
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
122 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
123
44314
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
124 /// 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
125 /// path.
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
126 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
127 /// 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
128 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
129 /// 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
130 /// directory.)
44998
26114bd6ec60 rust: do a clippy pass
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44545
diff changeset
131 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
132 let mut dirs = AncestorsWithBase {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
133 next: Some((path, HgPath::new(b""))),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
134 };
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
135 if !path.is_empty() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
136 dirs.next(); // skip itself
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
137 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
138 dirs
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
139 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
140
42960
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf
Rapha?l Gom?s <rgomes@octobus.net>
parents: 42850
diff changeset
141 /// 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
142 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
143 #[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
144 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
145 #[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
146 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
147 }
b1b984f9c01d rust-utils: add normalize_case util to mirror Python one
Rapha?l Gom?s <rgomes@octobus.net>
parents: 42767
diff changeset
148
44312
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
149 lazy_static! {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
150 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
151 [
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
152 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
153 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
154 ]
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
155 .iter()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
156 .map(|code| {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
157 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
158 .unwrap()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
159 .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
160 .bytes()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
161 .collect()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
162 })
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
163 .collect()
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 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
166
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
167 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
168 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
169 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
170 if needs_escaping {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
171 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
172 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
173 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
174 buf
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
175 } else {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
176 buf
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
177 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
178 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
179
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
180 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
181 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
182 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
183
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
184 #[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
185 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
186 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
187 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
188 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
189 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
190 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
191 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
192 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
193
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
194 // 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
195 #[cfg(unix)]
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
196 impl HgMetadata {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
197 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
198 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
199 Self {
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
200 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
201 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
202 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
203 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
204 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
205 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
206 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
207 }
46770
3c9ddb1986a9 rust-status: fix issue6456 for the Rust implementation also
Rapha?l Gom?s <rgomes@octobus.net>
parents: 46755
diff changeset
208
3c9ddb1986a9 rust-status: fix issue6456 for the Rust implementation also
Rapha?l Gom?s <rgomes@octobus.net>
parents: 46755
diff changeset
209 pub fn is_symlink(&self) -> bool {
3c9ddb1986a9 rust-status: fix issue6456 for the Rust implementation also
Rapha?l Gom?s <rgomes@octobus.net>
parents: 46755
diff changeset
210 // This is way too manual, but `HgMetadata` will go away in the
3c9ddb1986a9 rust-status: fix issue6456 for the Rust implementation also
Rapha?l Gom?s <rgomes@octobus.net>
parents: 46755
diff changeset
211 // near-future dirstate rewrite anyway.
3c9ddb1986a9 rust-status: fix issue6456 for the Rust implementation also
Rapha?l Gom?s <rgomes@octobus.net>
parents: 46755
diff changeset
212 self.st_mode & 0170000 == 0120000
3c9ddb1986a9 rust-status: fix issue6456 for the Rust implementation also
Rapha?l Gom?s <rgomes@octobus.net>
parents: 46755
diff changeset
213 }
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
214 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43250
diff changeset
215
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
216 /// 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
217 pub fn canonical_path(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
218 root: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
219 cwd: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
220 name: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
221 ) -> Result<PathBuf, HgPathError> {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
222 // 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
223 let root = root.as_ref();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
224 let cwd = cwd.as_ref();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
225 let name = name.as_ref();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
226
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
227 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
228 root.join(&cwd).join(&name)
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
229 } else {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
230 name.to_owned()
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
231 };
44545
07d9fd6097e6 rust-pathauditor: use interior mutability for use in multi-threaded contexts
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44345
diff changeset
232 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
233 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
234 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
235 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
236 Ok(name.to_owned())
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
237 } else if name == root {
44998
26114bd6ec60 rust: do a clippy pass
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44545
diff changeset
238 Ok("".into())
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
239 } else {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
240 // 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
241 // 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
242 // 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
243 let mut name = name.deref();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
244 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
245 loop {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
246 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
247 if same {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
248 if name == original_name {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
249 // `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
250 return Ok("".into());
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
251 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
252 // `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
253 // root
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
254 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
255 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
256 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
257 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
258 name = match name.parent() {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
259 None => break,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
260 Some(p) => p,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
261 };
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
262 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
263 // 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
264 // 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
265 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
266 path: original_name.to_owned(),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
267 root: root.to_owned(),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
268 })
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
269 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
270 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
271
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
272 /// 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
273 /// 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
274 ///
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 /// `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
276 /// 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
277 ///
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 /// # 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
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 /// ```
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 /// 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
282 /// 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
283 /// 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
284 ///
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 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
286 /// 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
287 /// 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
288 ///
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 /// 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
290 /// 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
291 ///
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 /// 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
293 /// 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
294 /// ```
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 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
296 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
297 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
298 } else {
46788
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
299 // This is not all accurate as to how large `res` will actually be, but
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
300 // profiling `rhg files` on a large-ish repo shows it’s better than
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
301 // starting from a zero-capacity `Vec` and letting `extend` reallocate
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
302 // repeatedly.
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
303 let guesstimate = path.as_bytes().len();
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
304
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
305 let mut res: Vec<u8> = Vec::with_capacity(guesstimate);
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
306 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
307 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
308 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
309 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
310 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
311 (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
312 _ => 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
313 }
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 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
315 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
316 }
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
317 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
318 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
319 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
320 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
321 } 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
322 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
323 };
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
324 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
325 }
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
326 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
327 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
328 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
329 } 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
330 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
331 };
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
332 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
333 }
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
334 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
335 }
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
336 }
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
337
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
338 #[cfg(test)]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
339 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
340 use super::*;
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
341 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
342
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
343 #[test]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
344 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
345 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
346 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
347 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
348 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
349 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
350 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
351 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
352
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
353 #[test]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
354 fn find_dirs_empty() {
43677
0b7733719d21 utils: move finddirs() to pathutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 43271
diff changeset
355 // 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
356 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
357 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
358 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
359 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
360 }
44314
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
361
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
362 #[test]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
363 fn test_find_dirs_with_base_some() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
364 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
365 assert_eq!(
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
366 dirs.next(),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
367 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
368 );
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
369 assert_eq!(
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
370 dirs.next(),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
371 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
372 );
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
373 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
374 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
375 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
376 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
377
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
378 #[test]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
379 fn test_find_dirs_with_base_empty() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
380 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
381 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
382 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
383 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
384 }
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
385
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
386 #[test]
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
387 fn test_canonical_path() {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
388 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
389 let cwd = Path::new("/dir");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
390 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
391 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
392 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
393 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
394 path: PathBuf::from("/dir/filename"),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
395 root: root.to_path_buf()
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 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
398
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
399 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
400 let cwd = Path::new("/");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
401 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
402 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
403 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
404 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
405 path: PathBuf::from("/filename"),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
406 root: root.to_path_buf()
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
407 })
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
408 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
409
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
410 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
411 let cwd = Path::new("/");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
412 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
413 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
414 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
415 Ok(PathBuf::from("filename"))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
416 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
417
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
418 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
419 let cwd = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
420 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
421 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
422 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
423 Ok(PathBuf::from("filename"))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
424 );
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 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
427 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
428 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
429 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
430 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
431 Ok(PathBuf::from("subdir/filename"))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
432 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
433 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
434
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
435 #[test]
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
436 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
437 use std::fs::create_dir;
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
438 use tempfile::tempdir;
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
439
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
440 let base_dir = tempdir().unwrap();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
441 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
442 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
443 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
444 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
445 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
446
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
447 create_dir(&beneath_repo).unwrap();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
448 create_dir(&root).unwrap();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
449
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
450 // TODO make portable
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
451 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
452
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
453 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
454 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
455 Ok(PathBuf::from(""))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
456 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
457 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
458 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
459 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
460 path: beneath_repo.to_owned(),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
461 root: root.to_owned()
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
462 })
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
463 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
464 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
465 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
466 Ok(PathBuf::from("d"))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
467 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
468 }
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
469 }