diff mercurial/cext/util.h @ 48232:f7fd629ffb98

dirstate-v2: Separate HAS_FILE_MTIME and HAS_DIRECTORY_MTIME flags Previously the same flag was used, with its meaning based on whether the node otherwise identifies a file tracked anywhere. In addition to being more explicit, this enables storing a directory mtime if a given path used to be tracked in a parent commit (so the dirstate still has data about it) but became a directory in the working copy. (However this is not done yet as it would require a larger change, replacing the `dirstate_map::NodeData` enum with struct fields.) Differential Revision: https://phab.mercurial-scm.org/D11662
author Simon Sapin <simon.sapin@octobus.net>
date Thu, 14 Oct 2021 16:39:16 +0200
parents a32a96079e2d
children 1730b2fceaa1
line wrap: on
line diff
--- a/mercurial/cext/util.h	Thu Oct 14 16:06:31 2021 +0200
+++ b/mercurial/cext/util.h	Thu Oct 14 16:39:16 2021 +0200
@@ -35,9 +35,10 @@
 static const unsigned char dirstate_flag_p1_tracked = 1 << 1;
 static const unsigned char dirstate_flag_p2_info = 1 << 2;
 static const unsigned char dirstate_flag_has_meaningful_data = 1 << 3;
-static const unsigned char dirstate_flag_has_meaningful_mtime = 1 << 4;
-static const unsigned char dirstate_flag_mode_exec_perm = 1 << 5;
-static const unsigned char dirstate_flag_mode_is_symlink = 1 << 6;
+static const unsigned char dirstate_flag_has_file_mtime = 1 << 4;
+static const unsigned char dirstate_flag_has_directory_mtime = 1 << 5;
+static const unsigned char dirstate_flag_mode_exec_perm = 1 << 6;
+static const unsigned char dirstate_flag_mode_is_symlink = 1 << 7;
 
 extern PyTypeObject dirstateItemType;
 #define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateItemType)