facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity

mercurial-types: treat transitions between different file types as modified

Browse Source 
Summary: Need this for correct bonsai changeset generation.

Reviewed By: StanislavGlebik

Differential Revision: D7561512

fbshipit-source-id: 3af820426532f77e78c4828f25b7382738fdad6b
This commit is contained in:
Siddharth Agarwal 2018-04-11 13:33:13 -07:00 committed by Facebook Github Bot
parent ead5f3be95
commit 228fcb589b
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial-types/src/manifest.rs
View File

@ -131,6 +131,13 @@ pub enum Type {
Tree,
}
impl Type {
#[inline]
pub fn is_tree(&self) -> bool {
self == &Type::Tree
}
}
impl Display for Type {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let s = match *self {

14
mercurial-types/src/manifest_utils.rs
View File

@ -24,8 +24,8 @@ use errors::*;
pub enum EntryStatus {
Added(Box<Entry + Sync>),
Deleted(Box<Entry + Sync>),
// Entries should have the same type. Note - we may change it in future to allow
// (File, Symlink), (Symlink, Executable) etc
// Entries will always either be File or Tree. However, it's possible for one of the entries
// to be Regular and the other to be Symlink, etc.
Modified {
to_entry: Box<Entry + Sync>,
from_entry: Box<Entry + Sync>,
@ -160,8 +160,8 @@ where
/// ChangedEntry, each showing whether a file/directory was added, deleted or modified.
/// Note: Modified entry contains only entries of the same type i.e. if a file was replaced
/// with a directory of the same name, then returned stream will contain Deleted file entry,
/// and Added directory entry. The same applies for executable and symlinks, although we may
/// change it in future
/// and Added directory entry. The same *does not* apply for changes between the various
/// file types (Regular, Executable and Symlink): those will only be one Modified entry.
pub fn changed_entry_stream<TM, FM>(
to: &TM,
from: &FM,
@ -192,9 +192,9 @@ fn recursive_changed_entry_stream(changed_entry: ChangedEntry) -> BoxStream<Chan
to_entry,
from_entry,
} => {
debug_assert!(to_entry.get_type() == from_entry.get_type());
debug_assert!(to_entry.get_type().is_tree() == from_entry.get_type().is_tree());
let substream = if to_entry.get_type() == Type::Tree {
let substream = if to_entry.get_type().is_tree() {
let contents = to_entry.get_content().join(from_entry.get_content());
let path = changed_entry.path.clone();
let entry_path = to_entry.get_name().cloned();
@ -302,7 +302,7 @@ pub fn diff_sorted_vecs(
res.push(ChangedEntry::new_deleted(path.clone(), from_entry));
to.push_front(to_entry);
} else {
if to_entry.get_type() == from_entry.get_type() {
if to_entry.get_type().is_tree() == from_entry.get_type().is_tree() {
if to_entry.get_hash() != from_entry.get_hash() {
res.push(ChangedEntry::new_modified(
path.clone(),

14
mercurial/src/manifest/manifest_utils.rs
View File

@ -26,8 +26,8 @@ use errors::*;
pub enum EntryStatus {
Added(RevlogEntry),
Deleted(RevlogEntry),
// Entries should have the same type. Note - we may change it in future to allow
// (File, Symlink), (Symlink, Executable) etc
// Entries will always either be File or Tree. However, it's possible for one of the entries
// to be Regular and the other to be Symlink, etc.
Modified {
to_entry: RevlogEntry,
from_entry: RevlogEntry,
@ -157,8 +157,8 @@ pub fn new_entry_intersection_stream(
/// ChangedEntry, each showing whether a file/directory was added, deleted or modified.
/// Note: Modified entry contains only entries of the same type i.e. if a file was replaced
/// with a directory of the same name, then returned stream will contain Deleted file entry,
/// and Added directory entry. The same applies for executable and symlinks, although we may
/// change it in future
/// and Added directory entry. The same *does not* apply for changes between the various
/// file types (Regular, Executable and Symlink): those will only be one Modified entry.
pub fn changed_entry_stream(
to: &RevlogManifest,
from: &RevlogManifest,
@ -185,9 +185,9 @@ fn recursive_changed_entry_stream(changed_entry: ChangedEntry) -> BoxStream<Chan
to_entry,
from_entry,
} => {
debug_assert!(to_entry.get_type() == from_entry.get_type());
debug_assert!(to_entry.get_type().is_tree() == from_entry.get_type().is_tree());
let substream = if to_entry.get_type() == Type::Tree {
let substream = if to_entry.get_type().is_tree() {
let contents = to_entry.get_content().join(from_entry.get_content());
let path = changed_entry.path.clone();
let entry_path = to_entry.get_name().cloned();
@ -295,7 +295,7 @@ pub fn diff_sorted_vecs(
res.push(ChangedEntry::new_deleted(path.clone(), from_entry));
to.push_front(to_entry);
} else {
if to_entry.get_type() == from_entry.get_type() {
if to_entry.get_type().is_tree() == from_entry.get_type().is_tree() {
if to_entry.get_hash() != from_entry.get_hash() {
res.push(ChangedEntry::new_modified(
path.clone(),