This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7531

rust-matchers: add support for `exactmatcher` in `dirstate.status`
ClosedPublic

Authored by Alphare on Nov 29 2019, 1:22 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG40fd1ef4e4c1: rust-matchers: add support for `exactmatcher` in `dirstate.status`

Summary

exactmatcher is the name in the Python implementation and corresponds to
FileMatcher in Rust.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

Alphare created this revision.Nov 29 2019, 1:22 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 29 2019, 1:22 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

Did you mean s/explicitmatcher/exactmatcher/ in the description? Also, I thought you called it FileMatcher instead. What's the difference?

Yes, I meant exactmatcher indeed.
FileMatcher is meant for the Rust side of things, I do not intend to rename it in Python because it is a minor change that would make a lot of noise for bikeshedding. Do you think that would be a good idea?

Alphare retitled this revision from rust-matchers: add support for `explicitmatcher` in `dirstate.status` to rust-matchers: add support for `exactmatcher` in `dirstate.status`.Dec 12 2019, 10:40 AM

Alphare edited the summary of this revision. (Show Details)

Alphare updated this revision to Diff 18637.

Alphare added a commit: rHG40fd1ef4e4c1: rust-matchers: add support for `exactmatcher` in `dirstate.status`.Dec 17 2019, 9:49 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG40fd1ef4e4c1: rust-matchers: add support for `exactmatcher` in `dirstate.status` (authored by Alphare). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/dirstate.py (8 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18407		Nov 29 2019, 1:22 PM	★	★
Diff 2	18637		Dec 12 2019, 10:40 AM	★	★
Diff 3	18814	rHG40fd1ef4e4c154a4895a494a07f82c663597c44b	Nov 29 2019, 11:30 AM	★	★

Commit	Parents	Author	Summary	Date
a9b528d8083b	48db30108b82	Raphaël Gomès		Nov 29 2019, 11:30 AM

Status	Author	Revision
Closed	Alphare	D7531 rust-matchers: add support for `exactmatcher` in `dirstate.status`
Closed	Alphare	D7530 rust-dirstate-status: update bridge for new rust version of `dirstate.status`
Closed	Alphare	D7529 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Closed	Alphare	D7528 rust-matchers: add `FileMatcher` implementation
Closed	Alphare	D7527 rust-matchers: add doctests for `AlwaysMatcher`
Closed	Alphare	D7526 rust-hg-path: add method to get part of a path relative to a prefix
Closed	Alphare	D7525 rust-matchers: improve `Matcher` trait ergonomics
Closed	Alphare	D7524 rust-dirs-multiset: use `AsRef` instead of concrete types when possible
Closed	Alphare	D7523 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf`
Closed	Alphare	D7119 rust-dirstatemap: remove additional lookup in dirstate.matches
Abandoned	Alphare	D7118 rust-dirstatemap: remove additional lookups in traverse
Closed	Alphare	D7116 rust-performance: introduce FastHashMap type alias for HashMap

Diff 18637

mercurial/dirstate.py

	listignored, listclean, listunknown = ignored, clean, unknown			listignored, listclean, listunknown = ignored, clean, unknown
	lookup, modified, added, unknown, ignored = [], [], [], [], []			lookup, modified, added, unknown, ignored = [], [], [], [], []
	removed, deleted, clean = [], [], []			removed, deleted, clean = [], [], []

	dmap = self._map			dmap = self._map
	dmap.preload()			dmap.preload()

	use_rust = True			use_rust = True

				allowed_matchers = (matchmod.alwaysmatcher, matchmod.exactmatcher)

	if rustmod is None:			if rustmod is None:
	use_rust = False			use_rust = False
	elif subrepos:			elif subrepos:
	use_rust = False			use_rust = False
	if bool(listunknown):			elif bool(listunknown):
	# Pathauditor does not exist yet in Rust, unknown files			# Pathauditor does not exist yet in Rust, unknown files
	# can't be trusted.			# can't be trusted.
	use_rust = False			use_rust = False
	elif self._ignorefiles() and listignored:			elif self._ignorefiles() and listignored:
	# Rust has no ignore mechanism yet, so don't use Rust for			# Rust has no ignore mechanism yet, so don't use Rust for
	# commands that need ignore.			# commands that need ignore.
	use_rust = False			use_rust = False
	elif not match.always():			elif not isinstance(match, allowed_matchers):
	# Matchers have yet to be implemented			# Matchers have yet to be implemented
	use_rust = False			use_rust = False

	if use_rust:			if use_rust:
	# Force Rayon (Rust parallelism library) to respect the number of			# Force Rayon (Rust parallelism library) to respect the number of
	# workers. This is a temporary workaround until Rust code knows			# workers. This is a temporary workaround until Rust code knows
	# how to read the config file.			# how to read the config file.
	numcpus = self._ui.configint(b"worker", b"numcpus")			numcpus = self._ui.configint(b"worker", b"numcpus")
	modified,			modified,
	added,			added,
	removed,			removed,
	deleted,			deleted,
	unknown,			unknown,
	clean,			clean,
	) = rustmod.status(			) = rustmod.status(
	dmap._rustmap,			dmap._rustmap,
				match,
	self._rootdir,			self._rootdir,
	bool(listclean),			bool(listclean),
	self._lastnormaltime,			self._lastnormaltime,
	self._checkexec,			self._checkexec,
	)			)

	status = scmutil.status(			status = scmutil.status(
	modified=modified,			modified=modified,