##// END OF EJS Templates
revlog: refactor logic to compute nodemap file in separate function...
Pulkit Goyal -
r47196:835aafb2 default
parent child Browse files
Show More
@@ -448,14 +448,9 b' class revlog(object):'
448 self.datafile = datafile or (indexfile[:-2] + b".d")
448 self.datafile = datafile or (indexfile[:-2] + b".d")
449 self.nodemap_file = None
449 self.nodemap_file = None
450 if persistentnodemap:
450 if persistentnodemap:
451 if indexfile.endswith(b'.a'):
451 self.nodemap_file = nodemaputil.get_nodemap_file(
452 pending_path = indexfile[:-4] + b".n.a"
452 opener, self.indexfile
453 if opener.exists(pending_path):
453 )
454 self.nodemap_file = pending_path
455 else:
456 self.nodemap_file = indexfile[:-4] + b".n"
457 else:
458 self.nodemap_file = indexfile[:-2] + b".n"
459
454
460 self.opener = opener
455 self.opener = opener
461 # When True, indexfile is opened with checkambig=True at writing, to
456 # When True, indexfile is opened with checkambig=True at writing, to
@@ -634,3 +634,14 b' def _find_node(block, node):'
634 if isinstance(entry, dict):
634 if isinstance(entry, dict):
635 return _find_node(entry, node[1:])
635 return _find_node(entry, node[1:])
636 return entry
636 return entry
637
638
639 def get_nodemap_file(opener, indexfile):
640 if indexfile.endswith(b'.a'):
641 pending_path = indexfile[:-4] + b".n.a"
642 if opener.exists(pending_path):
643 return pending_path
644 else:
645 return indexfile[:-4] + b".n"
646 else:
647 return indexfile[:-2] + b".n"
General Comments 0
You need to be logged in to leave comments. Login now