( )⚙ D8088 rust-status: add missing variants to `Dispatch` enum

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8088

rust-status: add missing variants to `Dispatch` enum
ClosedPublic

Authored by Alphare on Feb 6 2020, 10:15 AM.

Details

Reviewers
kevincox
marmoute
Group Reviewers
hg-reviewers
Commits
rHG61709b844420: rust-status: add missing variants to `Dispatch` enum

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.Feb 6 2020, 10:15 AM
kevincox accepted this revision.Feb 10 2020, 10:54 AM
kevincox added inline comments.
rust/hg-core/src/dirstate/status.rs
293–295

TODO is done.

Alphare marked an inline comment as done.Feb 10 2020, 10:58 AM
Alphare updated this revision to Diff 20046.Feb 10 2020, 11:30 AM
Alphare updated this revision to Diff 20186.Feb 13 2020, 12:37 PM
marmoute accepted this revision.Feb 14 2020, 6:52 AM
Alphare added a commit: rHG61709b844420: rust-status: add missing variants to `Dispatch` enum.Mar 11 2020, 12:23 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG61709b844420: rust-status: add missing variants to `Dispatch` enum (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/dirstate/status.rs (46 lines)

Diff 20719

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

}, },
CopyMap, DirstateEntry, DirstateMap, EntryState, CopyMap, DirstateEntry, DirstateMap, EntryState,
}; };
use rayon::prelude::*; use rayon::prelude::*;
use std::collections::HashSet; use std::collections::HashSet;
use std::fs::{read_dir, DirEntry}; use std::fs::{read_dir, DirEntry};
use std::path::Path; use std::path::Path;
/// Wrong type of file from a `BadMatch`
/// Note: a lot of those don't exist on all platforms.
#[derive(Debug)]
pub enum BadType {
CharacterDevice,
BlockDevice,
FIFO,
Socket,
Directory,
Unknown,
}
/// Was explicitly matched but cannot be found/accessed
#[derive(Debug)]
pub enum BadMatch {
OsError(i32),
BadType(BadType),
}
/// Marker enum used to dispatch new status entries into the right collections. /// Marker enum used to dispatch new status entries into the right collections.
/// Is similar to `crate::EntryState`, but represents the transient state of /// Is similar to `crate::EntryState`, but represents the transient state of
/// entries during the lifetime of a command. /// entries during the lifetime of a command.
enum Dispatch { enum Dispatch {
Unsure, Unsure,
Modified, Modified,
Added, Added,
Removed, Removed,
Deleted, Deleted,
Clean, Clean,
Unknown, Unknown,
Ignored,
/// Empty dispatch, the file is not worth listing
None,
/// Was explicitly matched but cannot be found/accessed
Bad(BadMatch),
Directory {
/// True if the directory used to be a file in the dmap so we can say
/// that it's been removed.
was_file: bool,
},
} }
type IoResult<T> = std::io::Result<T>; type IoResult<T> = std::io::Result<T>;
/// Dates and times that are outside the 31-bit signed range are compared /// Dates and times that are outside the 31-bit signed range are compared
/// modulo 2^31. This should prevent hg from behaving badly with very large /// modulo 2^31. This should prevent hg from behaving badly with very large
/// files or corrupt dates while still having a high probability of detecting /// files or corrupt dates while still having a high probability of detecting
/// changes. (issue2608) /// changes. (issue2608)
} }
pub struct DirstateStatus<'a> { pub struct DirstateStatus<'a> {
pub modified: Vec<&'a HgPath>, pub modified: Vec<&'a HgPath>,
pub added: Vec<&'a HgPath>, pub added: Vec<&'a HgPath>,
pub removed: Vec<&'a HgPath>, pub removed: Vec<&'a HgPath>,
pub deleted: Vec<&'a HgPath>, pub deleted: Vec<&'a HgPath>,
pub clean: Vec<&'a HgPath>, pub clean: Vec<&'a HgPath>,
/* TODO ignored pub ignored: Vec<&'a HgPath>,
* TODO unknown */ pub unknown: Vec<&'a HgPath>,
pub bad: Vec<(&'a HgPath, BadMatch)>,
kevincoxUnsubmitted
Done

TODO is done.

kevincox: TODO is done.
} }
fn build_response<'a>( fn build_response<'a>(
results: impl IntoIterator<Item = IoResult<(&'a HgPath, Dispatch)>>, results: impl IntoIterator<Item = IoResult<(&'a HgPath, Dispatch)>>,
) -> IoResult<(Vec<&'a HgPath>, DirstateStatus<'a>)> { ) -> IoResult<(Vec<&'a HgPath>, DirstateStatus<'a>)> {
let mut lookup = vec![]; let mut lookup = vec![];
let mut modified = vec![]; let mut modified = vec![];
let mut added = vec![]; let mut added = vec![];
let mut removed = vec![]; let mut removed = vec![];
let mut deleted = vec![]; let mut deleted = vec![];
let mut clean = vec![]; let mut clean = vec![];
let mut ignored = vec![];
let mut unknown = vec![];
let mut bad = vec![];
for res in results.into_iter() { for res in results.into_iter() {
let (filename, dispatch) = res?; let (filename, dispatch) = res?;
match dispatch { match dispatch {
Dispatch::Unknown => {} Dispatch::Unknown => unknown.push(filename),
Dispatch::Unsure => lookup.push(filename), Dispatch::Unsure => lookup.push(filename),
Dispatch::Modified => modified.push(filename), Dispatch::Modified => modified.push(filename),
Dispatch::Added => added.push(filename), Dispatch::Added => added.push(filename),
Dispatch::Removed => removed.push(filename), Dispatch::Removed => removed.push(filename),
Dispatch::Deleted => deleted.push(filename), Dispatch::Deleted => deleted.push(filename),
Dispatch::Clean => clean.push(filename), Dispatch::Clean => clean.push(filename),
Dispatch::Ignored => ignored.push(filename),
Dispatch::None => {}
Dispatch::Bad(reason) => bad.push((filename, reason)),
Dispatch::Directory { .. } => {}
} }
} }
Ok(( Ok((
lookup, lookup,
DirstateStatus { DirstateStatus {
modified, modified,
added, added,
removed, removed,
deleted, deleted,
clean, clean,
ignored,
unknown,
bad,
}, },
)) ))
} }
pub fn status<'a: 'c, 'b: 'c, 'c>( pub fn status<'a: 'c, 'b: 'c, 'c>(
dmap: &'a DirstateMap, dmap: &'a DirstateMap,
matcher: &'b impl Matcher, matcher: &'b impl Matcher,
root_dir: impl AsRef<Path> + Sync + Send + Copy, root_dir: impl AsRef<Path> + Sync + Send + Copy,