This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7119

rust-dirstatemap: remove additional lookup in dirstate.matches
ClosedPublic

Authored by Alphare on Oct 16 2019, 9:48 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGbed8d08cfcb2: rust-dirstatemap: remove additional lookup in dirstate.matches

Summary

We use the same trick as the Python implementation

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Oct 16 2019, 9:48 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 16 2019, 9:48 AM

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

Alphare updated this revision to Diff 18041.Nov 12 2019, 5:03 AM

Alphare added a child revision: D7523: rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf`.Dec 10 2019, 10:26 AM

Alphare updated this revision to Diff 18565.

What's up on this? It appears to have been

x  29641ceacf8c
|    pruned using prune by Martin von Zweigbergk <martinvonz@google.com> (Wed Dec 11 10:48:08 2019 -0800)

In D7119#118735, @marmoute wrote:
What's up on this? It appears to have been
x  29641ceacf8c
|    pruned using prune by Martin von Zweigbergk <martinvonz@google.com> (Wed Dec 11 10:48:08 2019 -0800)

That's probably because I queued some version of it and then decided to not queue it (I had comments on the parent).

@Alphare so what should we do of this patch ?

In D7119#119792, @marmoute wrote:

@Alphare so what should we do of this patch ?

IMO it should still be valid, it's harmless at best. I don't remember having strong performance numbers. Now that most of the status is done in Rust, it should matter less, even though it could still help shave off a few milliseconds.

Alphare added a commit: rHGbed8d08cfcb2: rust-dirstatemap: remove additional lookup in dirstate.matches.Feb 12 2020, 2:40 PM

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

Closed by commit rHGbed8d08cfcb2: rust-dirstatemap: remove additional lookup in dirstate.matches (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 (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17201		Oct 16 2019, 9:48 AM	★	★
Diff 2	18041		Nov 12 2019, 5:03 AM	★	★
Diff 3	18565		Dec 10 2019, 10:26 AM	★	★
Diff 4	20170	rHGbed8d08cfcb2e61bf02838f5bae7d1cf0dcb1df7	Oct 16 2019, 8:12 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 20170

mercurial/dirstate.py

	),			),
	)			)

	def matches(self, match):			def matches(self, match):
	'''			'''
	return files in the dirstate (in whatever state) filtered by match			return files in the dirstate (in whatever state) filtered by match
	'''			'''
	dmap = self._map			dmap = self._map
				if rustmod is not None:
				dmap = self._map._rustmap

	if match.always():			if match.always():
	return dmap.keys()			return dmap.keys()
	files = match.files()			files = match.files()
	if match.isexact():			if match.isexact():
	# fast path -- filter the other way around, since typically files is			# fast path -- filter the other way around, since typically files is
	# much smaller than dmap			# much smaller than dmap
	return [f for f in files if f in dmap]			return [f for f in files if f in dmap]
	if match.prefix() and all(fn in dmap for fn in files):			if match.prefix() and all(fn in dmap for fn in files):