##// END OF EJS Templates
store: properly compute the targer_id of manifestlog in no-fncache walk...
marmoute -
r51522:309cbd84 default
parent child Browse files
Show More
@@ -680,15 +680,18 b' class basicstore:'
680 be a list and the filenames that can't be decoded are added
680 be a list and the filenames that can't be decoded are added
681 to it instead. This is very rarely needed."""
681 to it instead. This is very rarely needed."""
682 dirs = [
682 dirs = [
683 (b'data', FILEFLAGS_FILELOG),
683 (b'data', FILEFLAGS_FILELOG, False),
684 (b'meta', FILEFLAGS_MANIFESTLOG),
684 (b'meta', FILEFLAGS_MANIFESTLOG, True),
685 ]
685 ]
686 for base_dir, rl_type in dirs:
686 for base_dir, rl_type, strip_filename in dirs:
687 files = self._walk(base_dir, True, undecodable=undecodable)
687 files = self._walk(base_dir, True, undecodable=undecodable)
688 files = (f for f in files if f[1][0] is not None)
688 files = (f for f in files if f[1][0] is not None)
689 for revlog, details in _gather_revlog(files):
689 for revlog, details in _gather_revlog(files):
690 file_details = {}
690 file_details = {}
691 revlog_target_id = revlog.split(b'/', 1)[1]
691 revlog_target_id = revlog.split(b'/', 1)[1]
692 if strip_filename and b'/' in revlog:
693 revlog_target_id = revlog_target_id.rsplit(b'/', 1)[0]
694 revlog_target_id += b'/'
692 for ext, (t, s) in sorted(details.items()):
695 for ext, (t, s) in sorted(details.items()):
693 file_details[ext] = {
696 file_details[ext] = {
694 'is_volatile': bool(t & FILEFLAGS_VOLATILE),
697 'is_volatile': bool(t & FILEFLAGS_VOLATILE),
General Comments 0
You need to be logged in to leave comments. Login now