This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7060

rust-dirstate-status: add call to rust-fast path for `dirstate.status`
ClosedPublic

Authored by Alphare on Oct 11 2019, 11:44 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG733d4ffcd667: rust-dirstate-status: add call to rust-fast path for `dirstate.status`
rHGa85a71cb383f: rust-dirstate-status: add call to rust-fast path for `dirstate.status`
Summary

The reasoning behind this patch is explained in the first patch of the series.

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 11 2019, 11:44 AM
Alphare updated this revision to Diff 17253.Oct 16 2019, 2:56 PM
martinvonz accepted this revision.Oct 16 2019, 5:35 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
mercurial/dirstate.py
1107

nit: the bool() wrapping is probably not necessary (and it's inconsistent with line the check for listignored a few lines down)

1125–1132

contrib/grey.py wants is not happy with the formatting. I'll fix it in flight.

1134–1137

same here

This revision is now accepted and ready to land.Oct 16 2019, 5:35 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (53 lines)

Diff 17270

mercurial/dirstate.py

from . import ( from . import (
encoding, encoding,
error, error,
match as matchmod, match as matchmod,
pathutil, pathutil,
policy, policy,
pycompat, pycompat,
scmutil, scmutil,
sparse,
txnutil, txnutil,
util, util,
) )
from .interfaces import ( from .interfaces import (
dirstate as intdirstate, dirstate as intdirstate,
util as interfaceutil, util as interfaceutil,
) )
dirstate was written dirstate was written
''' '''
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
if rustmod is None:
use_rust = False
elif subrepos:
use_rust = False
if bool(listunknown):
martinvonzUnsubmitted
Not Done

nit: the bool() wrapping is probably not necessary (and it's inconsistent with line the check for listignored a few lines down)

martinvonz: nit: the `bool()` wrapping is probably not necessary (and it's inconsistent with line the check…
# Pathauditor does not exist yet in Rust, unknown files
# can't be trusted.
use_rust = False
elif self._ignorefiles() and listignored:
# Rust has no ignore mechanism yet, so don't use Rust for
# commands that need ignore.
use_rust = False
elif not match.always():
# Matchers have yet to be implemented
use_rust = False
# We don't yet have a mechanism for extensions
elif sparse.enabled:
use_rust = False
elif not getattr(self, "_fsmonitordisable", True):
use_rust = False
if use_rust:
(
lookup,
modified,
added,
removed,
deleted,
unknown,
clean,
martinvonzUnsubmitted
Not Done

contrib/grey.py wants is not happy with the formatting. I'll fix it in flight.

martinvonz: contrib/grey.py wants is not happy with the formatting. I'll fix it in flight.
) = rustmod.status(
dmap._rustmap,
self._rootdir,
match.files(),
bool(listclean),
martinvonzUnsubmitted
Not Done

same here

martinvonz: same here
self._lastnormaltime,
self._checkexec,
)
status = scmutil.status(
modified=modified,
added=added,
removed=removed,
deleted=deleted,
unknown=unknown,
ignored=ignored,
clean=clean,
)
return (lookup, status)
dcontains = dmap.__contains__ dcontains = dmap.__contains__
dget = dmap.__getitem__ dget = dmap.__getitem__
ladd = lookup.append # aka "unsure" ladd = lookup.append # aka "unsure"
madd = modified.append madd = modified.append
aadd = added.append aadd = added.append
uadd = unknown.append uadd = unknown.append
iadd = ignored.append iadd = ignored.append
radd = removed.append radd = removed.append