Mercurial > hg

changeset 42797:1faa2bed47c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-dirstate: rename NULL_REVISION to NULL_ID which isn't a revision number
author Yuya Nishihara <yuya@tcha.org>
date Sat, 17 Aug 2019 13:27:11 +0900
parents 8f0881193946
children 99dff4264524
files rust/hg-core/src/dirstate/dirstate_map.rs
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate/dirstate_map.rs	Sat Aug 17 13:26:04 2019 +0900
+++ b/rust/hg-core/src/dirstate/dirstate_map.rs	Sat Aug 17 13:27:11 2019 +0900
@@ -20,7 +20,7 @@
 
 pub type FileFoldMap = HashMap<Vec<u8>, Vec<u8>>;
 
-const NULL_REVISION: [u8; 20] = [0; 20];
+const NULL_ID: [u8; 20] = [0; 20];
 const MTIME_UNSET: i32 = -1;
 const SIZE_DIRTY: i32 = -2;
 
@@ -69,8 +69,8 @@
         self.non_normal_set.clear();
         self.other_parent_set.clear();
         self.set_parents(DirstateParents {
-            p1: NULL_REVISION,
-            p2: NULL_REVISION,
+            p1: NULL_ID,
+            p2: NULL_ID,
         })
     }
 
@@ -267,8 +267,8 @@
             };
         } else if file_contents.is_empty() {
             parents = DirstateParents {
-                p1: NULL_REVISION,
-                p2: NULL_REVISION,
+                p1: NULL_ID,
+                p2: NULL_ID,
             };
         } else {
             return Err(DirstateError::Parse(DirstateParseError::Damaged));