| indygreg |
| hg-reviewers |
Inspired by D7227. These were all the remaining instances I could
find.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/perf.py (4 lines) | |||
| M | hgext/fastannotate/context.py (2 lines) | |||
| M | hgext/mq.py (2 lines) | |||
| M | mercurial/bundle2.py (2 lines) | |||
| M | mercurial/localrepo.py (2 lines) | |||
| M | mercurial/merge.py (4 lines) |
| """ | """ | ||||
| if util.safehasattr(repo, b'_tagscache'): # since 2.0 (or 9dca7653b525) | if util.safehasattr(repo, b'_tagscache'): # since 2.0 (or 9dca7653b525) | ||||
| # in this case, setattr(repo, '_tagscache', None) or so isn't | # in this case, setattr(repo, '_tagscache', None) or so isn't | ||||
| # correct way to clear tags cache, because existing code paths | # correct way to clear tags cache, because existing code paths | ||||
| # expect _tagscache to be a structured object. | # expect _tagscache to be a structured object. | ||||
| def clearcache(): | def clearcache(): | ||||
| # _tagscache has been filteredpropertycache since 2.5 (or | # _tagscache has been filteredpropertycache since 2.5 (or | ||||
| # 98c867ac1330), and delattr() can't work in such case | # 98c867ac1330), and delattr() can't work in such case | ||||
| if b'_tagscache' in vars(repo): | if '_tagscache' in vars(repo): | ||||
| del repo.__dict__[b'_tagscache'] | del repo.__dict__['_tagscache'] | ||||
| return clearcache | return clearcache | ||||
| repotags = safeattrsetter(repo, b'_tags', ignoremissing=True) | repotags = safeattrsetter(repo, b'_tags', ignoremissing=True) | ||||
| if repotags: # since 1.4 (or 5614a628d173) | if repotags: # since 1.4 (or 5614a628d173) | ||||
| return lambda: repotags.set(None) | return lambda: repotags.set(None) | ||||
| repotagscache = safeattrsetter(repo, b'tagscache', ignoremissing=True) | repotagscache = safeattrsetter(repo, b'tagscache', ignoremissing=True) | ||||
| # Don't return renamed parents if we aren't following. | # Don't return renamed parents if we aren't following. | ||||
| if not follow: | if not follow: | ||||
| pl = [p for p in pl if p.path() == f.path()] | pl = [p for p in pl if p.path() == f.path()] | ||||
| # renamed filectx won't have a filelog yet, so set it | # renamed filectx won't have a filelog yet, so set it | ||||
| # from the cache to save time | # from the cache to save time | ||||
| for p in pl: | for p in pl: | ||||
| if not b'_filelog' in p.__dict__: | if not '_filelog' in p.__dict__: | ||||
| p._filelog = _getflog(f._repo, p.path()) | p._filelog = _getflog(f._repo, p.path()) | ||||
| return pl | return pl | ||||
| # extracted from mercurial.context.basefilectx.annotate. slightly modified | # extracted from mercurial.context.basefilectx.annotate. slightly modified | ||||
| # so it takes a fctx instead of a pair of text and fctx. | # so it takes a fctx instead of a pair of text and fctx. | ||||
| def _decorate(fctx): | def _decorate(fctx): | ||||
| return self.series | return self.series | ||||
| @util.propertycache | @util.propertycache | ||||
| def seriesguards(self): | def seriesguards(self): | ||||
| self.parseseries() | self.parseseries() | ||||
| return self.seriesguards | return self.seriesguards | ||||
| def invalidate(self): | def invalidate(self): | ||||
| for a in b'applied fullseries series seriesguards'.split(): | for a in 'applied fullseries series seriesguards'.split(): | ||||
| if a in self.__dict__: | if a in self.__dict__: | ||||
| delattr(self, a) | delattr(self, a) | ||||
| self.applieddirty = False | self.applieddirty = False | ||||
| self.seriesdirty = False | self.seriesdirty = False | ||||
| self.guardsdirty = False | self.guardsdirty = False | ||||
| self.activeguards = None | self.activeguards = None | ||||
| def diffopts(self, opts=None, patchfn=None, plain=False): | def diffopts(self, opts=None, patchfn=None, plain=False): | ||||
| """utility to transfer a bundle2 as binary | """utility to transfer a bundle2 as binary | ||||
| This is made necessary by the fact the 'getbundle' command over 'ssh' | This is made necessary by the fact the 'getbundle' command over 'ssh' | ||||
| have no way to know then the reply end, relying on the bundle to be | have no way to know then the reply end, relying on the bundle to be | ||||
| interpreted to know its end. This is terrible and we are sorry, but we | interpreted to know its end. This is terrible and we are sorry, but we | ||||
| needed to move forward to get general delta enabled. | needed to move forward to get general delta enabled. | ||||
| """ | """ | ||||
| yield self._magicstring | yield self._magicstring | ||||
| assert b'params' not in vars(self) | assert 'params' not in vars(self) | ||||
| paramssize = self._unpack(_fstreamparamsize)[0] | paramssize = self._unpack(_fstreamparamsize)[0] | ||||
| if paramssize < 0: | if paramssize < 0: | ||||
| raise error.BundleValueError( | raise error.BundleValueError( | ||||
| b'negative bundle param size: %i' % paramssize | b'negative bundle param size: %i' % paramssize | ||||
| ) | ) | ||||
| if paramssize: | if paramssize: | ||||
| params = self._readexact(paramssize) | params = self._readexact(paramssize) | ||||
| self._processallparams(params) | self._processallparams(params) | ||||
| to be flushed when the current lock is released. Because a call to | to be flushed when the current lock is released. Because a call to | ||||
| destroyed is imminent, the repo will be invalidated causing those | destroyed is imminent, the repo will be invalidated causing those | ||||
| changes to stay in memory (waiting for the next unlock), or vanish | changes to stay in memory (waiting for the next unlock), or vanish | ||||
| completely. | completely. | ||||
| ''' | ''' | ||||
| # When using the same lock to commit and strip, the phasecache is left | # When using the same lock to commit and strip, the phasecache is left | ||||
| # dirty after committing. Then when we strip, the repo is invalidated, | # dirty after committing. Then when we strip, the repo is invalidated, | ||||
| # causing those changes to disappear. | # causing those changes to disappear. | ||||
| if b'_phasecache' in vars(self): | if '_phasecache' in vars(self): | ||||
| self._phasecache.write() | self._phasecache.write() | ||||
| @unfilteredmethod | @unfilteredmethod | ||||
| def destroyed(self): | def destroyed(self): | ||||
| '''Inform the repository that nodes have been destroyed. | '''Inform the repository that nodes have been destroyed. | ||||
| Intended for use by strip and rollback, so there's a common | Intended for use by strip and rollback, so there's a common | ||||
| place for anything that has to be done after destroying history. | place for anything that has to be done after destroying history. | ||||
| ''' | ''' | ||||
| self._labels = None | self._labels = None | ||||
| def reset(self, node=None, other=None, labels=None): | def reset(self, node=None, other=None, labels=None): | ||||
| self._state = {} | self._state = {} | ||||
| self._stateextras = {} | self._stateextras = {} | ||||
| self._local = None | self._local = None | ||||
| self._other = None | self._other = None | ||||
| self._labels = labels | self._labels = labels | ||||
| for var in (b'localctx', b'otherctx'): | for var in ('localctx', 'otherctx'): | ||||
| if var in vars(self): | if var in vars(self): | ||||
| delattr(self, var) | delattr(self, var) | ||||
| if node: | if node: | ||||
| self._local = node | self._local = node | ||||
| self._other = other | self._other = other | ||||
| self._readmergedriver = None | self._readmergedriver = None | ||||
| if self.mergedriver: | if self.mergedriver: | ||||
| self._mdstate = MERGE_DRIVER_STATE_SUCCESS | self._mdstate = MERGE_DRIVER_STATE_SUCCESS | ||||
| else: | else: | ||||
| self._mdstate = MERGE_DRIVER_STATE_UNMARKED | self._mdstate = MERGE_DRIVER_STATE_UNMARKED | ||||
| shutil.rmtree(self._repo.vfs.join(b'merge'), True) | shutil.rmtree(self._repo.vfs.join(b'merge'), True) | ||||
| self._results = {} | self._results = {} | ||||
| self._dirty = False | self._dirty = False | ||||
| def _read(self): | def _read(self): | ||||
| """Analyse each record content to restore a serialized state from disk | """Analyse each record content to restore a serialized state from disk | ||||
| This function process "record" entry produced by the de-serialization | This function process "record" entry produced by the de-serialization | ||||
| of on disk file. | of on disk file. | ||||
| """ | """ | ||||
| self._state = {} | self._state = {} | ||||
| self._stateextras = {} | self._stateextras = {} | ||||
| self._local = None | self._local = None | ||||
| self._other = None | self._other = None | ||||
| for var in (b'localctx', b'otherctx'): | for var in ('localctx', 'otherctx'): | ||||
| if var in vars(self): | if var in vars(self): | ||||
| delattr(self, var) | delattr(self, var) | ||||
| self._readmergedriver = None | self._readmergedriver = None | ||||
| self._mdstate = MERGE_DRIVER_STATE_SUCCESS | self._mdstate = MERGE_DRIVER_STATE_SUCCESS | ||||
| unsupported = set() | unsupported = set() | ||||
| records = self._readrecords() | records = self._readrecords() | ||||
| for rtype, record in records: | for rtype, record in records: | ||||
| if rtype == RECORD_LOCAL: | if rtype == RECORD_LOCAL: | ||||