comparison mercurial/revlogutils/nodemap.py @ 47152:09338a2d5c14

revlog: also use radix when computing nodemap data file We have a radix, lets use it! Differential Revision: https://phab.mercurial-scm.org/D10578
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 May 2021 12:22:57 +0200
parents 24be247a13b4
children 04f2f94836a5
comparison
equal deleted inserted replaced
47151:24be247a13b4 47152:09338a2d5c14
361 return b''.join(data) 361 return b''.join(data)
362 362
363 363
364 def _rawdata_filepath(revlog, docket): 364 def _rawdata_filepath(revlog, docket):
365 """The (vfs relative) nodemap's rawdata file for a given uid""" 365 """The (vfs relative) nodemap's rawdata file for a given uid"""
366 if revlog.nodemap_file.endswith(b'.n.a'): 366 prefix = revlog.radix
367 prefix = revlog.nodemap_file[:-4]
368 else:
369 prefix = revlog.nodemap_file[:-2]
370 return b"%s-%s.nd" % (prefix, docket.uid) 367 return b"%s-%s.nd" % (prefix, docket.uid)
371 368
372 369
373 def _other_rawdata_filepath(revlog, docket): 370 def _other_rawdata_filepath(revlog, docket):
374 prefix = revlog.nodemap_file[:-2] 371 prefix = revlog.radix
375 pattern = re.compile(br"(^|/)%s-[0-9a-f]+\.nd$" % prefix) 372 pattern = re.compile(br"(^|/)%s-[0-9a-f]+\.nd$" % prefix)
376 new_file_path = _rawdata_filepath(revlog, docket) 373 new_file_path = _rawdata_filepath(revlog, docket)
377 new_file_name = revlog.opener.basename(new_file_path) 374 new_file_name = revlog.opener.basename(new_file_path)
378 dirpath = revlog.opener.dirname(new_file_path) 375 dirpath = revlog.opener.dirname(new_file_path)
379 others = [] 376 others = []