This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8461

rust-status: check for '.hg' regardless of file type (issue6300)
ClosedPublic

Authored by Alphare on Apr 20 2020, 5:22 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGa467416c493c: rust-status: check for '.hg' regardless of file type (issue6300)
Summary

'.hg' would show up in hg status if were a symlink.

Diff Detail

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

Event Timeline

Alphare created this revision.Apr 20 2020, 5:22 AM
marmoute accepted this revision.Apr 22 2020, 12:18 PM
marmoute requested changes to this revision.Apr 22 2020, 12:19 PM

Actually, please fold the next patch in this one.

This revision now requires changes to proceed.Apr 22 2020, 12:19 PM
Alphare updated this revision to Diff 21182.Apr 23 2020, 4:02 AM
Alphare added a comment.Apr 23 2020, 4:04 AM
In D8461#126482, @marmoute wrote:

Actually, please fold the next patch in this one.

Done.

marmoute accepted this revision.Apr 23 2020, 4:46 AM

thanks

Alphare added a commit: rHGa467416c493c: rust-status: check for '.hg' regardless of file type (issue6300).Apr 23 2020, 5:21 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGa467416c493c: rust-status: check for '.hg' regardless of file type (issue6300) (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21206

rust/hg-core/src/dirstate/status.rs

dir_ignore_fn: &'a IgnoreFnType, dir_ignore_fn: &'a IgnoreFnType,
options: StatusOptions, options: StatusOptions,
filename: HgPathBuf, filename: HgPathBuf,
dir_entry: DirEntry, dir_entry: DirEntry,
) -> IoResult<()> { ) -> IoResult<()> {
let file_type = dir_entry.file_type()?; let file_type = dir_entry.file_type()?;
let entry_option = dmap.get(&filename); let entry_option = dmap.get(&filename);
if filename.as_bytes() == b".hg" {
// Could be a directory or a symlink
return Ok(());
}
if file_type.is_dir() { if file_type.is_dir() {
handle_traversed_dir( handle_traversed_dir(
scope, scope,
files_sender, files_sender,
matcher, matcher,
root_dir, root_dir,
dmap, dmap,
old_results, old_results,
dmap: &'a DirstateMap, dmap: &'a DirstateMap,
directory: impl AsRef<HgPath>, directory: impl AsRef<HgPath>,
old_results: &FastHashMap<Cow<'a, HgPath>, Dispatch>, old_results: &FastHashMap<Cow<'a, HgPath>, Dispatch>,
ignore_fn: &IgnoreFnType, ignore_fn: &IgnoreFnType,
dir_ignore_fn: &IgnoreFnType, dir_ignore_fn: &IgnoreFnType,
options: StatusOptions, options: StatusOptions,
) -> IoResult<()> { ) -> IoResult<()> {
let directory = directory.as_ref(); let directory = directory.as_ref();
if directory.as_bytes() == b".hg" {
return Ok(());
}
let visit_entries = match matcher.visit_children_set(directory) { let visit_entries = match matcher.visit_children_set(directory) {
VisitChildrenSet::Empty => return Ok(()), VisitChildrenSet::Empty => return Ok(()),
VisitChildrenSet::This | VisitChildrenSet::Recursive => None, VisitChildrenSet::This | VisitChildrenSet::Recursive => None,
VisitChildrenSet::Set(set) => Some(set), VisitChildrenSet::Set(set) => Some(set),
}; };
let buf = hg_path_to_path_buf(directory)?; let buf = hg_path_to_path_buf(directory)?;
let dir_path = root_dir.as_ref().join(buf); let dir_path = root_dir.as_ref().join(buf);

tests/test-status.t

summary: blah summary: blah
files: files:
M a M a
b b
R b R b
$ cd .. $ cd ..
Make sure .hg doesn't show up even as a symlink
$ hg init repo0
$ mkdir symlink-repo0
$ cd symlink-repo0
$ ln -s ../repo0/.hg
$ hg status