Mercurial > public > mercurial-scm > hg

comparison mercurial/mdiff.py @ 50925:d718eddf01d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
safehasattr: drop usage in favor of hasattr The two functions should now be equivalent at least in their usage in core.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 31 Aug 2023 23:56:15 +0200
parents e586a7eb380a
children 18c8c18993f0
comparison
equal deleted inserted replaced
50924:7a8ea1397816 50925:d718eddf01d9
209 raise error.InputError(_(b'line range exceeds file size')) 209 raise error.InputError(_(b'line range exceeds file size'))
210 return filteredblocks, (lba, uba) 210 return filteredblocks, (lba, uba)
211 211
212 212
213 def chooseblocksfunc(opts=None): 213 def chooseblocksfunc(opts=None):
214 if ( 214 if opts is None or not opts.xdiff or not hasattr(bdiff, 'xdiffblocks'):
215 opts is None
216 or not opts.xdiff
217 or not util.safehasattr(bdiff, 'xdiffblocks')
218 ):
219 return bdiff.blocks 215 return bdiff.blocks
220 else: 216 else:
221 return bdiff.xdiffblocks 217 return bdiff.xdiffblocks
222 218
223 219