Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 44852:fd3b94f1712d
merge with stable
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 26 May 2020 08:07:24 -0700 |
parents | 09da5cf44772 35b255e474d9 |
children | b7808443ed6a |
comparison
equal
deleted
inserted
replaced
44851:708ad5cf5e5a | 44852:fd3b94f1712d |
---|---|
1454 def obsstore(self): | 1454 def obsstore(self): |
1455 return obsolete.makestore(self.ui, self) | 1455 return obsolete.makestore(self.ui, self) |
1456 | 1456 |
1457 @storecache(b'00changelog.i') | 1457 @storecache(b'00changelog.i') |
1458 def changelog(self): | 1458 def changelog(self): |
1459 # load dirstate before changelog to avoid race see issue6303 | |
1460 self.dirstate.prefetch_parents() | |
1459 return self.store.changelog(txnutil.mayhavepending(self.root)) | 1461 return self.store.changelog(txnutil.mayhavepending(self.root)) |
1460 | 1462 |
1461 @storecache(b'00manifest.i') | 1463 @storecache(b'00manifest.i') |
1462 def manifestlog(self): | 1464 def manifestlog(self): |
1463 return self.store.manifestlog(self, self._storenarrowmatch) | 1465 return self.store.manifestlog(self, self._storenarrowmatch) |