facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

revlogindex: de-duplicate insertions

Browse Source 
Summary: Adding a same commit multiple times is a no-op.

Reviewed By: sfilipco

Differential Revision: D22323190

fbshipit-source-id: 61a06335581a9cad32dc7e929b841ec69b551a9c
This commit is contained in:
Jun Wu 2020-07-06 15:46:33 -07:00 committed by Facebook GitHub Bot
parent b86f3bd6e2
commit 52668752d8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eden/scm/lib/revlogindex/src/revlogindex.rs
View File

@ -521,6 +521,9 @@ impl RevlogIndex {
/// Insert a new revision with given parents at the end.
pub fn insert(&mut self, node: Vertex, parents: Vec<u32>, raw_data: Bytes) {
if self.contains_vertex_name(&node).unwrap_or(false) {
return;
}
let p1 = parents.get(0).map(|r| *r as i32).unwrap_or(-1);
let p2 = parents.get(1).map(|r| *r as i32).unwrap_or(-1);
let idx = self.pending_parents.len();
@ -1258,6 +1261,7 @@ commit 3"#
let mut revlog2 = RevlogIndex::new(&changelog_i_path, &nodemap_path)?;
revlog1.insert(v(1), vec![], b"commit 1".to_vec().into());
// commit 2 is lz4-friendly.
let text = b"commit 2 (............................................)";
revlog1.insert(v(2), vec![0], text.to_vec().into());
@ -1266,6 +1270,12 @@ commit 3"#
revlog2.insert(v(4), vec![0], b"commit 4".to_vec().into());
revlog2.insert(v(5), vec![1, 0], b"commit 5".to_vec().into());
// Inserting an existing node is ignored.
let old_len = revlog1.len();
revlog1.insert(v(1), vec![], b"commit 1".to_vec().into());
revlog1.insert(v(2), vec![0], text.to_vec().into());
assert_eq!(revlog1.len(), old_len);
revlog1.flush()?;
revlog2.flush()?;