| indygreg | |
| Alphare |
| hg-reviewers |
We now have the radix explicitely lets use the radix explicitely
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (8 lines) | |||
| M | mercurial/revlogutils/nodemap.py (17 lines) |
| else: | else: | ||||
| indexfile = b'%s.i.%s' % (self.radix, postfix) | indexfile = b'%s.i.%s' % (self.radix, postfix) | ||||
| datafile = b'%s.d.%s' % (self.radix, postfix) | datafile = b'%s.d.%s' % (self.radix, postfix) | ||||
| self._indexfile = indexfile | self._indexfile = indexfile | ||||
| self._datafile = datafile | self._datafile = datafile | ||||
| self.nodemap_file = None | self.nodemap_file = None | ||||
| self.postfix = postfix | self.postfix = postfix | ||||
| self.opener = opener | |||||
| if persistentnodemap: | if persistentnodemap: | ||||
| self.nodemap_file = nodemaputil.get_nodemap_file( | self.nodemap_file = nodemaputil.get_nodemap_file(self) | ||||
| opener, self._indexfile | |||||
| ) | |||||
| self.opener = opener | |||||
| assert target[0] in ALL_KINDS | assert target[0] in ALL_KINDS | ||||
| assert len(target) == 2 | assert len(target) == 2 | ||||
| self.target = target | self.target = target | ||||
| # When True, indexfile is opened with checkambig=True at writing, to | # When True, indexfile is opened with checkambig=True at writing, to | ||||
| # avoid file stat ambiguity. | # avoid file stat ambiguity. | ||||
| self._checkambig = checkambig | self._checkambig = checkambig | ||||
| self._mmaplargeindex = mmaplargeindex | self._mmaplargeindex = mmaplargeindex | ||||
| self._censorable = censorable | self._censorable = censorable | ||||
| def persist_nodemap(tr, revlog, pending=False, force=False): | def persist_nodemap(tr, revlog, pending=False, force=False): | ||||
| """Write nodemap data on disk for a given revlog""" | """Write nodemap data on disk for a given revlog""" | ||||
| if getattr(revlog, 'filteredrevs', ()): | if getattr(revlog, 'filteredrevs', ()): | ||||
| raise error.ProgrammingError( | raise error.ProgrammingError( | ||||
| "cannot persist nodemap of a filtered changelog" | "cannot persist nodemap of a filtered changelog" | ||||
| ) | ) | ||||
| if revlog.nodemap_file is None: | if revlog.nodemap_file is None: | ||||
| if force: | if force: | ||||
| revlog.nodemap_file = get_nodemap_file( | revlog.nodemap_file = get_nodemap_file(revlog) | ||||
| revlog.opener, revlog._indexfile | |||||
| ) | |||||
| else: | else: | ||||
| msg = "calling persist nodemap on a revlog without the feature enabled" | msg = "calling persist nodemap on a revlog without the feature enabled" | ||||
| raise error.ProgrammingError(msg) | raise error.ProgrammingError(msg) | ||||
| can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental") | can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental") | ||||
| ondisk_docket = revlog._nodemap_docket | ondisk_docket = revlog._nodemap_docket | ||||
| feed_data = util.safehasattr(revlog.index, "update_nodemap_data") | feed_data = util.safehasattr(revlog.index, "update_nodemap_data") | ||||
| use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap") | use_mmap = revlog.opener.options.get(b"persistent-nodemap.mmap") | ||||
| def _find_node(block, node): | def _find_node(block, node): | ||||
| """find the revision associated with a given node""" | """find the revision associated with a given node""" | ||||
| entry = block.get(_to_int(node[0:1])) | entry = block.get(_to_int(node[0:1])) | ||||
| if isinstance(entry, dict): | if isinstance(entry, dict): | ||||
| return _find_node(entry, node[1:]) | return _find_node(entry, node[1:]) | ||||
| return entry | return entry | ||||
| def get_nodemap_file(opener, indexfile): | def get_nodemap_file(revlog): | ||||
| if indexfile.endswith(b'.a'): | if revlog.postfix == b'a': | ||||
| pending_path = indexfile[:-4] + b".n.a" | pending_path = revlog.radix + b".n.a" | ||||
| if opener.exists(pending_path): | if revlog.opener.exists(pending_path): | ||||
| return pending_path | return pending_path | ||||
| else: | return revlog.radix + b".n" | ||||
| return indexfile[:-4] + b".n" | |||||
| else: | |||||
| return indexfile[:-2] + b".n" | |||||