| indygreg |
| hg-reviewers |
This will avoid "other" code to not overlook _writing usage. We introduces
private method dedicated to writing to make use the right option are always
used.
| 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 (47 lines) |
| # revlog.target instead of using `self.radix` | # revlog.target instead of using `self.radix` | ||||
| return self.radix | return self.radix | ||||
| @util.propertycache | @util.propertycache | ||||
| def _compressor(self): | def _compressor(self): | ||||
| engine = util.compengines[self._compengine] | engine = util.compengines[self._compengine] | ||||
| return engine.revlogcompressor(self._compengineopts) | return engine.revlogcompressor(self._compengineopts) | ||||
| def _indexfp(self, mode=b'r'): | def _indexfp(self): | ||||
| """file object for the revlog's index file""" | """file object for the revlog's index file""" | ||||
| args = {'mode': mode} | return self.opener(self._indexfile, mode=b"r") | ||||
| if mode != b'r': | |||||
| args['checkambig'] = self._checkambig | def __index_write_fp(self): | ||||
| if mode == b'w': | # You should not use this directly and use `_writing` instead | ||||
| args['atomictemp'] = True | try: | ||||
| return self.opener(self._indexfile, **args) | f = self.opener( | ||||
| self._indexfile, mode=b"r+", checkambig=self._checkambig | |||||
| ) | |||||
| f.seek(0, os.SEEK_END) | |||||
| return f | |||||
| except IOError as inst: | |||||
| if inst.errno != errno.ENOENT: | |||||
| raise | |||||
| return self.opener( | |||||
| self._indexfile, mode=b"w+", checkambig=self._checkambig | |||||
| ) | |||||
| def __index_new_fp(self): | |||||
| # You should not use this unless you are upgrading from inline revlog | |||||
| return self.opener( | |||||
| self._indexfile, | |||||
| mode=b"w", | |||||
| checkambig=self._checkambig, | |||||
| atomictemp=True, | |||||
| ) | |||||
| def _datafp(self, mode=b'r'): | def _datafp(self, mode=b'r'): | ||||
| """file object for the revlog's data file""" | """file object for the revlog's data file""" | ||||
| return self.opener(self._datafile, mode=mode) | return self.opener(self._datafile, mode=mode) | ||||
| @contextlib.contextmanager | @contextlib.contextmanager | ||||
| def _datareadfp(self, existingfp=None): | def _datareadfp(self, existingfp=None): | ||||
| """file object suitable to read data""" | """file object suitable to read data""" | ||||
| fp.close() | fp.close() | ||||
| # We can't use the cached file handle after close(). So prevent | # We can't use the cached file handle after close(). So prevent | ||||
| # its usage. | # its usage. | ||||
| self._writinghandles = None | self._writinghandles = None | ||||
| new_dfh = self._datafp(b'w+') | new_dfh = self._datafp(b'w+') | ||||
| new_dfh.truncate(0) # drop any potentially existing data | new_dfh.truncate(0) # drop any potentially existing data | ||||
| try: | try: | ||||
| with self._indexfp(b'r') as read_ifh: | with self._indexfp() as read_ifh: | ||||
| for r in self: | for r in self: | ||||
| new_dfh.write(self._getsegmentforrevs(r, r, df=read_ifh)[1]) | new_dfh.write(self._getsegmentforrevs(r, r, df=read_ifh)[1]) | ||||
| if troffset <= self.start(r): | if troffset <= self.start(r): | ||||
| trindex = r | trindex = r | ||||
| new_dfh.flush() | new_dfh.flush() | ||||
| with self.opener(self._indexfile, mode=b'w', atomictemp=True) as fp: | with self.__index_new_fp() as fp: | ||||
| self._format_flags &= ~FLAG_INLINE_DATA | self._format_flags &= ~FLAG_INLINE_DATA | ||||
| self._inline = False | self._inline = False | ||||
| for i in self: | for i in self: | ||||
| e = self.index.entry_binary(i) | e = self.index.entry_binary(i) | ||||
| if i == 0: | if i == 0: | ||||
| header = self._format_flags | self._format_version | header = self._format_flags | self._format_version | ||||
| header = self.index.pack_header(header) | header = self.index.pack_header(header) | ||||
| e = header + e | e = header + e | ||||
| fp.write(e) | fp.write(e) | ||||
| # the temp file replace the real index when we exit the context | # the temp file replace the real index when we exit the context | ||||
| # manager | # manager | ||||
| tr.replace(self._indexfile, trindex * self.index.entry_size) | tr.replace(self._indexfile, trindex * self.index.entry_size) | ||||
| nodemaputil.setup_persistent_nodemap(tr, self) | nodemaputil.setup_persistent_nodemap(tr, self) | ||||
| self._chunkclear() | self._chunkclear() | ||||
| if existing_handles: | if existing_handles: | ||||
| # switched from inline to conventional reopen the index | # switched from inline to conventional reopen the index | ||||
| ifh = self._indexfp(b"r+") | ifh = self.__index_write_fp() | ||||
| self._writinghandles = (ifh, new_dfh) | self._writinghandles = (ifh, new_dfh) | ||||
| new_dfh = None | new_dfh = None | ||||
| finally: | finally: | ||||
| if new_dfh is not None: | if new_dfh is not None: | ||||
| new_dfh.close() | new_dfh.close() | ||||
| def _nodeduplicatecallback(self, transaction, node): | def _nodeduplicatecallback(self, transaction, node): | ||||
| """called when trying to add a node already stored.""" | """called when trying to add a node already stored.""" | ||||
| dfh.seek(0, os.SEEK_END) | dfh.seek(0, os.SEEK_END) | ||||
| except IOError as inst: | except IOError as inst: | ||||
| if inst.errno != errno.ENOENT: | if inst.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| dfh = self._datafp(b"w+") | dfh = self._datafp(b"w+") | ||||
| transaction.add(self._datafile, dsize) | transaction.add(self._datafile, dsize) | ||||
| try: | try: | ||||
| isize = r * self.index.entry_size | isize = r * self.index.entry_size | ||||
| try: | ifh = self.__index_write_fp() | ||||
| ifh = self._indexfp(b"r+") | |||||
| ifh.seek(0, os.SEEK_END) | |||||
| except IOError as inst: | |||||
| if inst.errno != errno.ENOENT: | |||||
| raise | |||||
| ifh = self._indexfp(b"w+") | |||||
| if self._inline: | if self._inline: | ||||
| transaction.add(self._indexfile, dsize + isize) | transaction.add(self._indexfile, dsize + isize) | ||||
| else: | else: | ||||
| transaction.add(self._indexfile, isize) | transaction.add(self._indexfile, isize) | ||||
| try: | try: | ||||
| self._writinghandles = (ifh, dfh) | self._writinghandles = (ifh, dfh) | ||||
| try: | try: | ||||
| yield | yield | ||||