| indygreg | |
| Alphare |
| hg-reviewers |
This make it consistent with the previous changeset.
| 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 (16 lines) |
| * force_nodemap: | * force_nodemap: | ||||
| force the usage of a "development" version of the nodemap code | force the usage of a "development" version of the nodemap code | ||||
| """ | """ | ||||
| mmapindexthreshold = None | mmapindexthreshold = None | ||||
| opts = self.opener.options | opts = self.opener.options | ||||
| if b'revlogv2' in opts: | if b'revlogv2' in opts: | ||||
| newversionflags = REVLOGV2 | FLAG_INLINE_DATA | new_header = REVLOGV2 | FLAG_INLINE_DATA | ||||
| elif b'revlogv1' in opts: | elif b'revlogv1' in opts: | ||||
| newversionflags = REVLOGV1 | FLAG_INLINE_DATA | new_header = REVLOGV1 | FLAG_INLINE_DATA | ||||
| if b'generaldelta' in opts: | if b'generaldelta' in opts: | ||||
| newversionflags |= FLAG_GENERALDELTA | new_header |= FLAG_GENERALDELTA | ||||
| elif b'revlogv0' in self.opener.options: | elif b'revlogv0' in self.opener.options: | ||||
| newversionflags = REVLOGV0 | new_header = REVLOGV0 | ||||
| else: | else: | ||||
| newversionflags = REVLOG_DEFAULT_VERSION | new_header = REVLOG_DEFAULT_VERSION | ||||
| if b'chunkcachesize' in opts: | if b'chunkcachesize' in opts: | ||||
| self._chunkcachesize = opts[b'chunkcachesize'] | self._chunkcachesize = opts[b'chunkcachesize'] | ||||
| if b'maxchainlen' in opts: | if b'maxchainlen' in opts: | ||||
| self._maxchainlen = opts[b'maxchainlen'] | self._maxchainlen = opts[b'maxchainlen'] | ||||
| if b'deltabothparents' in opts: | if b'deltabothparents' in opts: | ||||
| self._deltabothparents = opts[b'deltabothparents'] | self._deltabothparents = opts[b'deltabothparents'] | ||||
| self._lazydelta = bool(opts.get(b'lazydelta', True)) | self._lazydelta = bool(opts.get(b'lazydelta', True)) | ||||
| % self._chunkcachesize | % self._chunkcachesize | ||||
| ) | ) | ||||
| elif self._chunkcachesize & (self._chunkcachesize - 1): | elif self._chunkcachesize & (self._chunkcachesize - 1): | ||||
| raise error.RevlogError( | raise error.RevlogError( | ||||
| _(b'revlog chunk cache size %r is not a power of 2') | _(b'revlog chunk cache size %r is not a power of 2') | ||||
| % self._chunkcachesize | % self._chunkcachesize | ||||
| ) | ) | ||||
| force_nodemap = opts.get(b'devel-force-nodemap', False) | force_nodemap = opts.get(b'devel-force-nodemap', False) | ||||
| return newversionflags, mmapindexthreshold, force_nodemap | return new_header, mmapindexthreshold, force_nodemap | ||||
| def _get_data(self, filepath, mmap_threshold): | def _get_data(self, filepath, mmap_threshold): | ||||
| """return a file content with or without mmap | """return a file content with or without mmap | ||||
| If the file is missing return the empty string""" | If the file is missing return the empty string""" | ||||
| try: | try: | ||||
| with self.opener(filepath) as fp: | with self.opener(filepath) as fp: | ||||
| if mmap_threshold is not None: | if mmap_threshold is not None: | ||||
| file_size = self.opener.fstat(fp).st_size | file_size = self.opener.fstat(fp).st_size | ||||
| if file_size >= mmap_threshold: | if file_size >= mmap_threshold: | ||||
| # TODO: should .close() to release resources without | # TODO: should .close() to release resources without | ||||
| # relying on Python GC | # relying on Python GC | ||||
| return util.buffer(util.mmapread(fp)) | return util.buffer(util.mmapread(fp)) | ||||
| return fp.read() | return fp.read() | ||||
| except IOError as inst: | except IOError as inst: | ||||
| if inst.errno != errno.ENOENT: | if inst.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| return b'' | return b'' | ||||
| def _loadindex(self): | def _loadindex(self): | ||||
| newversionflags, mmapindexthreshold, force_nodemap = self._init_opts() | new_header, mmapindexthreshold, force_nodemap = self._init_opts() | ||||
| if self.postfix is None: | if self.postfix is None: | ||||
| index_file = b'%s.i' % self.radix | index_file = b'%s.i' % self.radix | ||||
| data_file = b'%s.d' % self.radix | data_file = b'%s.d' % self.radix | ||||
| elif self.postfix == b'a': | elif self.postfix == b'a': | ||||
| index_file = b'%s.i.a' % self.radix | index_file = b'%s.i.a' % self.radix | ||||
| data_file = b'%s.d' % self.radix | data_file = b'%s.d' % self.radix | ||||
| else: | else: | ||||
| index_file = b'%s.i.%s' % (self.radix, self.postfix) | index_file = b'%s.i.%s' % (self.radix, self.postfix) | ||||
| data_file = b'%s.d.%s' % (self.radix, self.postfix) | data_file = b'%s.d.%s' % (self.radix, self.postfix) | ||||
| self._indexfile = index_file | self._indexfile = index_file | ||||
| self._datafile = data_file | self._datafile = data_file | ||||
| indexdata = b'' | indexdata = b'' | ||||
| self._initempty = True | self._initempty = True | ||||
| indexdata = self._get_data(self._indexfile, mmapindexthreshold) | indexdata = self._get_data(self._indexfile, mmapindexthreshold) | ||||
| if len(indexdata) > 0: | if len(indexdata) > 0: | ||||
| header = INDEX_HEADER.unpack(indexdata[:4])[0] | header = INDEX_HEADER.unpack(indexdata[:4])[0] | ||||
| self._initempty = False | self._initempty = False | ||||
| else: | else: | ||||
| header = newversionflags | header = new_header | ||||
| flags = self._format_flags = header & ~0xFFFF | flags = self._format_flags = header & ~0xFFFF | ||||
| fmt = self._format_version = header & 0xFFFF | fmt = self._format_version = header & 0xFFFF | ||||
| if fmt == REVLOGV0: | if fmt == REVLOGV0: | ||||
| if flags: | if flags: | ||||
| raise error.RevlogError( | raise error.RevlogError( | ||||
| _(b'unknown flags (%#04x) in version %d revlog %s') | _(b'unknown flags (%#04x) in version %d revlog %s') | ||||