This is an archive of the discontinued Mercurial Phabricator instance.

Though If I had to take a guess, I'd say these patches as well as the few next ones will be detrimental to performance in the short-term. This is because of some limitations in the rust-cpython bindings (some of which are more difficult to fix than others), the inherent overhead of doing ffi, Python idoms awkward for Rust, etc..
The C code I'm re-implemented in some modules is very heavily optimized, but the current approach is to build enough critical mass to have the Rust bits of code interacting as little as possible with Python and then start optimizing/parallelizing.

Alphare updated this revision to Diff 15143.May 16 2019, 11:21 AM

Closed by commit rHG89770f21aac3: rust-filepatterns: call new Rust implementations from Python (authored by Alphare). · Explain WhyMay 16 2019, 1:13 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/match.py (39 lines)
M			tests/common-pattern.py (5 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14842		Apr 18 2019, 8:10 AM	★	★
Diff 2	15143		May 16 2019, 11:21 AM	★	★
Diff 3	15149	rHG89770f21aac3586cacbf066011ea7332b35add73	Apr 24 2019, 5:34 AM	★	★

Commit	Parents	Author	Summary	Date
		Raphaël Gomès		Apr 24 2019, 5:34 AM

Status	Author	Revision
Closed	Alphare	D6273 rust-filepatterns: call new Rust implementations from Python
Closed	Alphare	D6272 rust-filepatterns: add `rust-cpython` bindings for `filepatterns`
Closed	Alphare	D6271 rust-filepatterns: add a Rust implementation of pattern-related utils

Diff 15143

mercurial/match.py

	pathutil,			pathutil,
	pycompat,			pycompat,
	util,			util,
	)			)
	from .utils import (			from .utils import (
	stringutil,			stringutil,
	)			)

				try:
				from . import rustext
				rustext.__name__ # force actual import (see hgdemandimport)
				except ImportError:
				rustext = None

	allpatternkinds = ('re', 'glob', 'path', 'relglob', 'relpath', 'relre',			allpatternkinds = ('re', 'glob', 'path', 'relglob', 'relpath', 'relre',
	'rootglob',			'rootglob',
	'listfile', 'listfile0', 'set', 'include', 'subinclude',			'listfile', 'listfile0', 'set', 'include', 'subinclude',
	'rootfilesin')			'rootfilesin')
	cwdrelativepatternkinds = ('relpath', 'glob')			cwdrelativepatternkinds = ('relpath', 'glob')

	propertycache = util.propertycache			propertycache = util.propertycache

	res += escape(p, p)			res += escape(p, p)
	else:			else:
	res += escape(c, c)			res += escape(c, c)
	else:			else:
	res += escape(c, c)			res += escape(c, c)
	return res			return res

	def _regex(kind, pat, globsuffix):			def _regex(kind, pat, globsuffix):
	'''Convert a (normalized) pattern of any kind into a regular expression.			'''Convert a (normalized) pattern of any kind into a
				regular expression.
	globsuffix is appended to the regexp of globs.'''			globsuffix is appended to the regexp of globs.'''

				if rustext is not None:
				try:
				return rustext.filepatterns.build_single_regex(
				kind,
				pat,
				globsuffix
				)
				except rustext.filepatterns.PatternError:
				raise error.ProgrammingError(
				'not a regex pattern: %s:%s' % (kind, pat)
				)

	if not pat:			if not pat:
	return ''			return ''
	if kind == 're':			if kind == 're':
	return pat			return pat
	if kind in ('path', 'relpath'):			if kind in ('path', 'relpath'):
	if pat == '.':			if pat == '.':
	return ''			return ''
	return util.stringutil.reescape(pat) + '(?:/\|$)'			return util.stringutil.reescape(pat) + '(?:/\|$)'
	syntax: regexp # defaults following lines to non-rooted regexps			syntax: regexp # defaults following lines to non-rooted regexps
	syntax: glob # defaults following lines to non-rooted globs			syntax: glob # defaults following lines to non-rooted globs
	re:pattern # non-rooted regular expression			re:pattern # non-rooted regular expression
	glob:pattern # non-rooted glob			glob:pattern # non-rooted glob
	rootglob:pat # rooted glob (same root as ^ in regexps)			rootglob:pat # rooted glob (same root as ^ in regexps)
	pattern # pattern of the current default type			pattern # pattern of the current default type

	if sourceinfo is set, returns a list of tuples:			if sourceinfo is set, returns a list of tuples:
	(pattern, lineno, originalline). This is useful to debug ignore patterns.			(pattern, lineno, originalline).
				This is useful to debug ignore patterns.
	'''			'''

				if rustext is not None:
				result, warnings = rustext.filepatterns.read_pattern_file(
				filepath,
				bool(warn),
				sourceinfo,
				)

				for warning_params in warnings:
				# Can't be easily emitted from Rust, because it would require
				# a mechanism for both gettext and calling the `warn` function.
				warn(_("%s: ignoring invalid syntax '%s'\n") % warning_params)

				return result

	syntaxes = {			syntaxes = {
	're': 'relre:',			're': 'relre:',
	'regexp': 'relre:',			'regexp': 'relre:',
	'glob': 'relglob:',			'glob': 'relglob:',
	'rootglob': 'rootglob:',			'rootglob': 'rootglob:',
	'include': 'include',			'include': 'include',
	'subinclude': 'subinclude',			'subinclude': 'subinclude',
	}			}

tests/common-pattern.py

	(br'(.file:/)/?(/\$TESTTMP.)',			(br'(.file:/)/?(/\$TESTTMP.)',
	lambda m: m.group(1) + b'*' + m.group(2) + b' (glob)'			lambda m: m.group(1) + b'*' + m.group(2) + b' (glob)'
	),			),
	]			]

	# Various platform error strings, keyed on a common replacement string			# Various platform error strings, keyed on a common replacement string
	_errors = {			_errors = {
	br'$ENOENT$': (			br'$ENOENT$': (
				# IOError in Python does not have the same error message
				# than in Rust, and automatic conversion is not possible
				# because of module member privacy.
				br'No such file or directory $os error 2$',

	# strerror()			# strerror()
	br'No such file or directory',			br'No such file or directory',

	# FormatMessage(ERROR_FILE_NOT_FOUND)			# FormatMessage(ERROR_FILE_NOT_FOUND)
	br'The system cannot find the file specified',			br'The system cannot find the file specified',
	),			),
	br'$ENOTDIR$': (			br'$ENOTDIR$': (
	# strerror()			# strerror()

This is an archive of the discontinued Mercurial Phabricator instance.

rust-filepatterns: call new Rust implementations from PythonClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 15143

mercurial/match.py

tests/common-pattern.py

rust-filepatterns: call new Rust implementations from Python
ClosedPublic

Revision Contents
Changeset List