comparison mercurial/match.py @ 43117:8ff1ecfadcd1

cleanup: join string literals that are already on one line Thanks to Kyle for noticing this and for providing the regular expression to run on the codebase. This patch has been reviewed by the test suite and they approved of it. # skip-blame: fallout from mass reformatting Differential Revision: https://phab.mercurial-scm.org/D7028
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 08 Oct 2019 15:06:18 -0700
parents d783f945a701
children 6ff196d2553b bfbbf48d51e8
comparison
equal deleted inserted replaced
43116:defabf63e969 43117:8ff1ecfadcd1
64 64
65 for kind, pat, source in kindpats: 65 for kind, pat, source in kindpats:
66 if kind == b'set': 66 if kind == b'set':
67 if ctx is None: 67 if ctx is None:
68 raise error.ProgrammingError( 68 raise error.ProgrammingError(
69 b"fileset expression with no " b"context" 69 b"fileset expression with no context"
70 ) 70 )
71 matchers.append(ctx.matchfileset(pat, badfn=badfn)) 71 matchers.append(ctx.matchfileset(pat, badfn=badfn))
72 72
73 if listsubrepos: 73 if listsubrepos:
74 for subpath in ctx.substate: 74 for subpath in ctx.substate:
544 544
545 545
546 def normalizerootdir(dir, funcname): 546 def normalizerootdir(dir, funcname):
547 if dir == b'.': 547 if dir == b'.':
548 util.nouideprecwarn( 548 util.nouideprecwarn(
549 b"match.%s() no longer accepts " b"'.', use '' instead." % funcname, 549 b"match.%s() no longer accepts '.', use '' instead." % funcname,
550 b'5.1', 550 b'5.1',
551 ) 551 )
552 return b'' 552 return b''
553 return dir 553 return dir
554 554