Mercurial > public > mercurial-scm > hg-stable

diff mercurial/dirstatemap.py @ 49701:6cce0afc1454 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-dirstate: remember the data file uuid dirstate was loaded with This will be used in the next patch to fix a race condition.
author Rapha?l Gom?s <rgomes@octobus.net>
date Mon, 12 Dec 2022 17:08:12 +0100
parents 379a78001d8e
children dbe09fb038fc
line wrap: on
line diff
--- a/mercurial/dirstatemap.py	Wed Mar 01 02:38:20 2023 +0100
+++ b/mercurial/dirstatemap.py	Mon Dec 12 17:08:12 2022 +0100
@@ -573,11 +573,15 @@
                 testing.wait_on_cfg(self._ui, b'dirstate.post-docket-read-file')
                 if not self.docket.uuid:
                     data = b''
+                    self._map = rustmod.DirstateMap.new_empty()
                 else:
                     data = self._read_v2_data()
-                self._map = rustmod.DirstateMap.new_v2(
-                    data, self.docket.data_size, self.docket.tree_metadata
-                )
+                    self._map = rustmod.DirstateMap.new_v2(
+                        data,
+                        self.docket.data_size,
+                        self.docket.tree_metadata,
+                        self.docket.uuid,
+                    )
                 parents = self.docket.parents
             else:
                 self._set_identity()