Mercurial > public > mercurial-scm > hg
comparison mercurial/revlog.py @ 51047:0d33f4b0c4cb
revlog: remove legacy usage of `_censorable`
All core code is now getting the setting from the FeatureConfig object.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 10 Oct 2023 11:04:07 +0200 |
parents | 3977068c638c |
children | 21ef03239f43 |
comparison
equal
deleted
inserted
replaced
51046:3977068c638c | 51047:0d33f4b0c4cb |
---|---|
2302 raise error.RevlogError( | 2302 raise error.RevlogError( |
2303 _(b"integrity check failed on %s:%s") | 2303 _(b"integrity check failed on %s:%s") |
2304 % (self.display_id, pycompat.bytestr(revornode)) | 2304 % (self.display_id, pycompat.bytestr(revornode)) |
2305 ) | 2305 ) |
2306 except error.RevlogError: | 2306 except error.RevlogError: |
2307 if self._censorable and storageutil.iscensoredtext(text): | 2307 if self.feature_config.censorable and storageutil.iscensoredtext( |
2308 text | |
2309 ): | |
2308 raise error.CensoredNodeError(self.display_id, node, text) | 2310 raise error.CensoredNodeError(self.display_id, node, text) |
2309 raise | 2311 raise |
2310 | 2312 |
2311 @property | 2313 @property |
2312 def _split_index_file(self): | 2314 def _split_index_file(self): |
3112 self._adding_group = False | 3114 self._adding_group = False |
3113 return not empty | 3115 return not empty |
3114 | 3116 |
3115 def iscensored(self, rev): | 3117 def iscensored(self, rev): |
3116 """Check if a file revision is censored.""" | 3118 """Check if a file revision is censored.""" |
3117 if not self._censorable: | 3119 if not self.feature_config.censorable: |
3118 return False | 3120 return False |
3119 | 3121 |
3120 return self.flags(rev) & REVIDX_ISCENSORED | 3122 return self.flags(rev) & REVIDX_ISCENSORED |
3121 | 3123 |
3122 def _peek_iscensored(self, baserev, delta): | 3124 def _peek_iscensored(self, baserev, delta): |
3123 """Quickly check if a delta produces a censored revision.""" | 3125 """Quickly check if a delta produces a censored revision.""" |
3124 if not self._censorable: | 3126 if not self.feature_config.censorable: |
3125 return False | 3127 return False |
3126 | 3128 |
3127 return storageutil.deltaiscensored(delta, baserev, self.rawsize) | 3129 return storageutil.deltaiscensored(delta, baserev, self.rawsize) |
3128 | 3130 |
3129 def getstrippoint(self, minlink): | 3131 def getstrippoint(self, minlink): |