( )⚙ D9202 dirstate-tree: move a conditional in an explicit boolean

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9202

dirstate-tree: move a conditional in an explicit boolean
ClosedPublic

Authored by marmoute on Oct 13 2020, 5:25 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG510995e249c0: dirstate-tree: move a conditional in an explicit boolean
Summary

This will help readability a bit and make the next change simpler to read.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 23194

rust/hg-core/src/dirstate/dirstate_tree/node.rs

&mut self, &mut self,
path: &[u8], path: &[u8],
new_entry: DirstateEntry, new_entry: DirstateEntry,
) -> InsertResult { ) -> InsertResult {
let mut split = path.splitn(2, |&c| c == b'/'); let mut split = path.splitn(2, |&c| c == b'/');
let head = split.next().unwrap_or(b""); let head = split.next().unwrap_or(b"");
let tail = split.next().unwrap_or(b""); let tail = split.next().unwrap_or(b"");
// Are we're modifying the current file ? Is the the end of the path ?
let is_current_file = tail.is_empty() && head.is_empty();
if let NodeKind::File(file) = &mut self.kind { if let NodeKind::File(file) = &mut self.kind {
if tail.is_empty() && head.is_empty() { if is_current_file {
// We're modifying the current file
let new = Self { let new = Self {
kind: NodeKind::File(File { kind: NodeKind::File(File {
entry: new_entry, entry: new_entry,
..file.clone() ..file.clone()
}), }),
}; };
return InsertResult { return InsertResult {
did_insert: false, did_insert: false,