Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/utils/files.rs @ 51118:532e74ad3ff6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust: run a clippy pass with the latest stable version Our current version of clippy is older than the latest stable. The newest version has new lints that are moslty good advice, so let's apply them ahead of time. This has the added benefit of reducing the noise for developpers like myself that use clippy as an IDE helper, as well as being more prepared for a future clippy upgrade.
author Rapha?l Gom?s <rgomes@octobus.net>
date Mon, 06 Nov 2023 11:06:08 +0100
parents e98fd81bb151
children 529a655874fb
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};
44314
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
21 use std::iter::FusedIterator;
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
22 use std::ops::Deref;
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
23 use std::path::{Path, PathBuf};
42453
9609430d3625 rust-filepatterns: use bytes instead of String
Rapha?l Gom?s <rgomes@octobus.net>
parents:
diff changeset
24
46755
91ab5190a3de rhg: Add support for environment variables in config include paths
Simon Sapin <simon.sapin@octobus.net>
parents: 46635
diff changeset
25 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
26 let os_str;
9609430d3625 rust-filepatterns: use bytes instead of String
Rapha?l Gom?s <rgomes@octobus.net>
parents:
diff changeset
27 #[cfg(unix)]
9609430d3625 rust-filepatterns: use bytes instead of String
Rapha?l Gom?s <rgomes@octobus.net>
parents:
diff changeset
28 {
9609430d3625 rust-filepatterns: use bytes instead of String
Rapha?l Gom?s <rgomes@octobus.net>
parents:
diff changeset
29 use std::os::unix::ffi::OsStrExt;
9609430d3625 rust-filepatterns: use bytes instead of String
Rapha?l Gom?s <rgomes@octobus.net>
parents:
diff changeset
30 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
31 }
43250
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors
Rapha?l Gom?s <rgomes@octobus.net>
parents: 42960
diff changeset
32 // 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
33 // 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
34 // 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
35 os_str
91ab5190a3de rhg: Add support for environment variables in config include paths
Simon Sapin <simon.sapin@octobus.net>
parents: 46635
diff changeset
36 }
42453
9609430d3625 rust-filepatterns: use bytes instead of String
Rapha?l Gom?s <rgomes@octobus.net>
parents:
diff changeset
37
46755
91ab5190a3de rhg: Add support for environment variables in config include paths
Simon Sapin <simon.sapin@octobus.net>
parents: 46635
diff changeset
38 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
39 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
40 }
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
41
43467
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes
Yuya Nishihara <yuya@tcha.org>
parents: 43271
diff changeset
42 // 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
43 // 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
44 #[cfg(unix)]
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes
Yuya Nishihara <yuya@tcha.org>
parents: 43271
diff changeset
45 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
46 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
47 }
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 #[cfg(unix)]
d2e61f00ee9d rust: Introduce a get_bytes_from_os_str utility function
Simon Sapin <simon.sapin@octobus.net>
parents: 46540
diff changeset
50 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
51 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
52 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
53 }
b06cf2809ec3 rust-cpython: do not convert warning pattern to utf-8 bytes
Yuya Nishihara <yuya@tcha.org>
parents: 43271
diff changeset
54
47127
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
55 #[cfg(unix)]
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
56 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
57 use std::os::unix::ffi::OsStringExt;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
58 str.into_vec()
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
59 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents: 46788
diff changeset
60
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
61 /// 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
62 #[derive(Copy, Clone, Debug)]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
63 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
64 next: Option<&'a HgPath>,
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
65 }
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 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
68 type Item = &'a HgPath;
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 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
71 let next = self.next;
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
72 self.next = match self.next {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
73 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
74 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
75 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
76 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
77 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
78 None => None,
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
79 };
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
80 next
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
81 }
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 impl<'a> FusedIterator for Ancestors<'a> {}
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
85
44314
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
86 /// 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
87 #[derive(Copy, Clone, Debug)]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
88 pub(crate) struct AncestorsWithBase<'a> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
89 next: Option<(&'a HgPath, &'a HgPath)>,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
90 }
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 impl<'a> Iterator for AncestorsWithBase<'a> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
93 type Item = (&'a HgPath, &'a HgPath);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
94
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
95 fn next(&mut self) -> Option<Self::Item> {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
96 let next = self.next;
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
97 self.next = match self.next {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
98 Some((s, _)) if s.is_empty() => None,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
99 Some((s, _)) => Some(s.split_filename()),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
100 None => None,
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
101 };
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
102 next
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
103 }
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 impl<'a> FusedIterator for AncestorsWithBase<'a> {}
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
107
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
108 /// 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
109 /// path.
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
110 ///
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
111 /// 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
112 ///
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
113 /// 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
114 /// directory.)
44998
26114bd6ec60 rust: do a clippy pass
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44545
diff changeset
115 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
116 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
117 if !path.is_empty() {
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
118 dirs.next(); // skip itself
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
119 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
120 dirs
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
121 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
122
44314
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
123 /// 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
124 /// path.
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 /// 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
127 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
128 /// 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
129 /// directory.)
44998
26114bd6ec60 rust: do a clippy pass
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44545
diff changeset
130 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
131 let mut dirs = AncestorsWithBase {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
132 next: Some((path, HgPath::new(b""))),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
133 };
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
134 if !path.is_empty() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
135 dirs.next(); // skip itself
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
136 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
137 dirs
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
138 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
139
42960
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf
Rapha?l Gom?s <rgomes@octobus.net>
parents: 42850
diff changeset
140 /// 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
141 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
142 #[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
143 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
144 #[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
145 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
146 }
b1b984f9c01d rust-utils: add normalize_case util to mirror Python one
Rapha?l Gom?s <rgomes@octobus.net>
parents: 42767
diff changeset
147
44312
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
148 lazy_static! {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
149 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
150 [
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
151 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
152 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
153 ]
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
154 .iter()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
155 .map(|code| {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
156 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
157 .unwrap()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
158 .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
159 .bytes()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
160 .collect()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
161 })
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
162 .collect()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
163 };
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 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
167 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
168 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
169 if needs_escaping {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
170 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
171 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
172 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
173 buf
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
174 } else {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
175 buf
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
176 }
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 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
180 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
181 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 43875
diff changeset
182
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
183 /// 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
184 pub fn canonical_path(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
185 root: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
186 cwd: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
187 name: impl AsRef<Path>,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
188 ) -> Result<PathBuf, HgPathError> {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
189 // 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
190 let root = root.as_ref();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
191 let cwd = cwd.as_ref();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
192 let name = name.as_ref();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
193
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
194 let name = if !name.is_absolute() {
51118
532e74ad3ff6 rust: run a clippy pass with the latest stable version
Rapha?l Gom?s <rgomes@octobus.net>
parents: 50003
diff changeset
195 root.join(cwd).join(name)
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
196 } else {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
197 name.to_owned()
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
198 };
51118
532e74ad3ff6 rust: run a clippy pass with the latest stable version
Rapha?l Gom?s <rgomes@octobus.net>
parents: 50003
diff changeset
199 let auditor = PathAuditor::new(root);
532e74ad3ff6 rust: run a clippy pass with the latest stable version
Rapha?l Gom?s <rgomes@octobus.net>
parents: 50003
diff changeset
200 if name != root && name.starts_with(root) {
532e74ad3ff6 rust: run a clippy pass with the latest stable version
Rapha?l Gom?s <rgomes@octobus.net>
parents: 50003
diff changeset
201 let name = name.strip_prefix(root).unwrap();
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
202 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
203 Ok(name.to_owned())
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
204 } else if name == root {
44998
26114bd6ec60 rust: do a clippy pass
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44545
diff changeset
205 Ok("".into())
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
206 } else {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
207 // 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
208 // 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
209 // 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
210 let mut name = name.deref();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
211 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
212 loop {
51118
532e74ad3ff6 rust: run a clippy pass with the latest stable version
Rapha?l Gom?s <rgomes@octobus.net>
parents: 50003
diff changeset
213 let same = is_same_file(name, root).unwrap_or(false);
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
214 if same {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
215 if name == original_name {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
216 // `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
217 return Ok("".into());
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
218 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
219 // `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
220 // root
51118
532e74ad3ff6 rust: run a clippy pass with the latest stable version
Rapha?l Gom?s <rgomes@octobus.net>
parents: 50003
diff changeset
221 let rel_path = original_name.strip_prefix(name).unwrap();
532e74ad3ff6 rust: run a clippy pass with the latest stable version
Rapha?l Gom?s <rgomes@octobus.net>
parents: 50003
diff changeset
222 auditor.audit_path(path_to_hg_path_buf(rel_path)?)?;
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
223 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
224 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
225 name = match name.parent() {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
226 None => break,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
227 Some(p) => p,
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
228 };
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
229 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
230 // 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
231 // 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
232 Err(HgPathError::NotUnderRoot {
50003
e98fd81bb151 rust-clippy: fix most warnings in `hg-core`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 48094
diff changeset
233 path: original_name,
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
234 root: root.to_owned(),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
235 })
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 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
238
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
239 /// 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
240 /// 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
241 ///
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
242 /// `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
243 /// 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
244 ///
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
245 /// # 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
246 ///
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
247 /// ```
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
248 /// 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
249 /// 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
250 /// 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
251 ///
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
252 /// 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
253 /// 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
254 /// 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
255 ///
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
256 /// 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
257 /// 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
258 ///
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 /// 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
260 /// 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
261 /// ```
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 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
263 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
264 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
265 } else {
46788
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
266 // 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
267 // 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
268 // 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
269 // repeatedly.
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
270 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
271
c94fa884240b rust: Preallocate the returned `Vec` in `utils::files::relativize_path`
Simon Sapin <simon.sapin@octobus.net>
parents: 46770
diff changeset
272 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
273 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
274 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
275 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
276 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
277 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
278 (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
279 _ => 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
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 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
282 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
283 }
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 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
285 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
286 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
287 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
288 } 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
289 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
290 };
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 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
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 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
294 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
295 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
296 } 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
297 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
298 };
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(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
300 }
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 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
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 }
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
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
305 #[cfg(test)]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
306 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
307 use super::*;
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
308 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
309
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
310 #[test]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
311 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
312 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
313 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
314 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
315 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
316 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
317 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
318 }
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
319
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
320 #[test]
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
321 fn find_dirs_empty() {
43677
0b7733719d21 utils: move finddirs() to pathutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 43271
diff changeset
322 // 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
323 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
324 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
325 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
326 assert_eq!(dirs.next(), None);
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
327 }
44314
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
328
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
329 #[test]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
330 fn test_find_dirs_with_base_some() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
331 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
332 assert_eq!(
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
333 dirs.next(),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
334 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
335 );
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
336 assert_eq!(
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
337 dirs.next(),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
338 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
339 );
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
340 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
341 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
342 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
343 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
344
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
345 #[test]
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
346 fn test_find_dirs_with_base_empty() {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
347 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
348 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
349 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
350 assert_eq!(dirs.next(), None);
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44312
diff changeset
351 }
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
352
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
353 #[test]
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
354 fn test_canonical_path() {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
355 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
356 let cwd = Path::new("/dir");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
357 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
358 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
359 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
360 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
361 path: PathBuf::from("/dir/filename"),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
362 root: root.to_path_buf()
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
363 })
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
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
366 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
367 let cwd = Path::new("/");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
368 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
369 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
370 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
371 Err(HgPathError::NotUnderRoot {
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
372 path: PathBuf::from("/filename"),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
373 root: root.to_path_buf()
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
374 })
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 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
378 let cwd = Path::new("/");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
379 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
380 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
381 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
382 Ok(PathBuf::from("filename"))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
383 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
384
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
385 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
386 let cwd = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
387 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
388 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
389 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
390 Ok(PathBuf::from("filename"))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
391 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
392
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
393 let root = Path::new("/repo");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
394 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
395 let name = Path::new("filename");
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
396 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
397 canonical_path(root, cwd, name),
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
398 Ok(PathBuf::from("subdir/filename"))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
399 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
400 }
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
401
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
402 #[test]
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
403 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
404 use std::fs::create_dir;
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
405 use tempfile::tempdir;
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
406
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
407 let base_dir = tempdir().unwrap();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
408 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
409 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
410 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
411 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
412 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
413
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
414 create_dir(&beneath_repo).unwrap();
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
415 create_dir(&root).unwrap();
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 // TODO make portable
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
418 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
419
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
420 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
421 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
422 Ok(PathBuf::from(""))
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
423 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
424 assert_eq!(
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
425 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
426 Err(HgPathError::NotUnderRoot {
50003
e98fd81bb151 rust-clippy: fix most warnings in `hg-core`
Rapha?l Gom?s <rgomes@octobus.net>
parents: 48094
diff changeset
427 path: beneath_repo,
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
428 root: root.to_owned()
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
429 })
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
430 );
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
431 assert_eq!(
51118
532e74ad3ff6 rust: run a clippy pass with the latest stable version
Rapha?l Gom?s <rgomes@octobus.net>
parents: 50003
diff changeset
432 canonical_path(&root, Path::new(""), under_repo_symlink),
44345
4caac36c66bc rust-utils: add util for canonical path
Rapha?l Gom?s <rgomes@octobus.net>
parents: 44314
diff changeset
433 Ok(PathBuf::from("d"))
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 }
42586
cad3dde7a573 rust-dirstate: add helper to iterate ancestor paths
Yuya Nishihara <yuya@tcha.org>
parents: 42499
diff changeset
436 }