Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 43491:9391784299e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: suppress bogus pytype errors pytype seems to handle our subclass of tuple (scmutil.status) especially poorly. We should probably file a bug. Differential Revision: https://phab.mercurial-scm.org/D7294
author Augie Fackler <augie@google.com>
date Wed, 06 Nov 2019 17:35:24 -0500
parents 8ff1ecfadcd1
children 9f70512ae2cf
comparison
equal deleted inserted replaced
43490:5b5e62c24b2e 43491:9391784299e9
345 345
346 return crecordmod.filterpatch( 346 return crecordmod.filterpatch(
347 ui, originalhunks, recordfn, operation 347 ui, originalhunks, recordfn, operation
348 ) 348 )
349 except crecordmod.fallbackerror as e: 349 except crecordmod.fallbackerror as e:
350 ui.warn(b'%s\n' % e.message) 350 ui.warn(b'%s\n' % e.message) # pytype: disable=attribute-error
351 ui.warn(_(b'falling back to text mode\n')) 351 ui.warn(_(b'falling back to text mode\n'))
352 352
353 return patch.filterpatch(ui, originalhunks, match, operation) 353 return patch.filterpatch(ui, originalhunks, match, operation)
354 354
355 355
433 copymod.copy(status[1]), 433 copymod.copy(status[1]),
434 copymod.copy(status[2]), 434 copymod.copy(status[2]),
435 copymod.copy(status[3]), 435 copymod.copy(status[3]),
436 copymod.copy(status[4]), 436 copymod.copy(status[4]),
437 copymod.copy(status[5]), 437 copymod.copy(status[5]),
438 copymod.copy(status[6]), 438 copymod.copy(status[6]), # pytype: disable=wrong-arg-count
439 ) 439 )
440 440
441 # Force allows -X subrepo to skip the subrepo. 441 # Force allows -X subrepo to skip the subrepo.
442 subs, commitsubs, newstate = subrepoutil.precommit( 442 subs, commitsubs, newstate = subrepoutil.precommit(
443 repo.ui, wctx, tmpstatus, match, force=True 443 repo.ui, wctx, tmpstatus, match, force=True
1287 # revlog instance. 1287 # revlog instance.
1288 if returnrevlog: 1288 if returnrevlog:
1289 if isinstance(r, revlog.revlog): 1289 if isinstance(r, revlog.revlog):
1290 pass 1290 pass
1291 elif util.safehasattr(r, b'_revlog'): 1291 elif util.safehasattr(r, b'_revlog'):
1292 r = r._revlog 1292 r = r._revlog # pytype: disable=attribute-error
1293 elif r is not None: 1293 elif r is not None:
1294 raise error.Abort(_(b'%r does not appear to be a revlog') % r) 1294 raise error.Abort(_(b'%r does not appear to be a revlog') % r)
1295 1295
1296 if not r: 1296 if not r:
1297 if not returnrevlog: 1297 if not returnrevlog: