Mercurial > public > mercurial-scm > hg-stable
diff mercurial/revlog.py @ 44526:64e2f603de9d
nodemap: make sure hooks have access to an up-to-date version
We make sure hooks can read persistent nodemap data and that they access
something up-to-date with the pending transaction.
Differential Revision: https://phab.mercurial-scm.org/D8187
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 28 Feb 2020 00:29:18 +0100 |
| parents | 6c906eaedd0d |
| children | affe0fb42250 |
line wrap: on
line diff
--- a/mercurial/revlog.py Thu Feb 27 16:32:43 2020 +0100 +++ b/mercurial/revlog.py Fri Feb 28 00:29:18 2020 +0100 @@ -436,7 +436,14 @@ self.datafile = datafile or (indexfile[:-2] + b".d") self.nodemap_file = None if persistentnodemap: - self.nodemap_file = indexfile[:-2] + b".n" + if indexfile.endswith(b'.a'): + pending_path = indexfile[:-4] + b".n.a" + if opener.exists(pending_path): + self.nodemap_file = pending_path + else: + self.nodemap_file = indexfile[:-4] + b".n" + else: + self.nodemap_file = indexfile[:-2] + b".n" self.opener = opener # When True, indexfile is opened with checkambig=True at writing, to