Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 44852:fd3b94f1712d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 26 May 2020 08:07:24 -0700
parents 09da5cf44772 35b255e474d9
children b7808443ed6a
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun May 17 18:33:45 2020 -0400
+++ b/mercurial/localrepo.py	Tue May 26 08:07:24 2020 -0700
@@ -1456,6 +1456,8 @@
 
     @storecache(b'00changelog.i')
     def changelog(self):
+        # load dirstate before changelog to avoid race see issue6303
+        self.dirstate.prefetch_parents()
         return self.store.changelog(txnutil.mayhavepending(self.root))
 
     @storecache(b'00manifest.i')