This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1508

sparse: clean up path handling, making it platform agnostic
AbandonedPublic

Authored by mjpieters on Nov 24 2017, 11:35 AM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Summary

There is no need to strip path separators from the normalised path; normpath
will never leave any.

We also ensure that the path prefix we test ends in a path separator, to avoid
matching on sibling paths that happen to share a prefix.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mjpieters created this revision.Nov 24 2017, 11:35 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 24 2017, 11:35 AM
durham accepted this revision.Nov 28 2017, 7:17 PM
This revision is now accepted and ready to land.Nov 28 2017, 7:17 PM
mjpieters abandoned this revision.Oct 16 2018, 10:52 AM

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbsparse.py (20 lines)

Diff 3815

hgext3rd/fbsparse.py

'Files conflicting: %d\n', lookup) 'Files conflicting: %d\n', lookup)
def _cwdlist(repo): def _cwdlist(repo):
""" List the contents in the current directory. Annotate """ List the contents in the current directory. Annotate
the files in the sparse profile. the files in the sparse profile.
""" """
ctx = repo['.'] ctx = repo['.']
mf = ctx.manifest() mf = ctx.manifest()
cwd = util.normpath(os.getcwd())
# Get the root of the repo so that we remove the content of # Get the root of the repo so that we remove the content of
# the root from the current working directory # the root from the current working directory
root = repo.root root = repo.root
if cwd.startswith(root): cwd = util.normpath(os.getcwd())
cwd = cwd[len(root):] cwd = os.path.relpath(cwd, root)
else: cwd = '' if cwd == os.curdir else cwd + os.sep
raise error.Abort(_("the current working directory should begin " + if cwd.startswith(os.pardir + os.sep):
raise error.Abort(
_("the current working directory should begin "
"with the root %s") % root) "with the root %s") % root)
cwd = cwd.strip("/")
sparsematch = repo.sparsematch(ctx.rev()) sparsematch = repo.sparsematch(ctx.rev())
checkedoutentries = set() checkedoutentries = set()
allentries = set() allentries = set()
cwdlength = len(cwd) + 1 cwdlength = len(cwd)
for filepath in mf: for filepath in mf:
if filepath.startswith(cwd): if filepath.startswith(cwd):
tail = filepath[cwdlength:] if cwdlength > 1 else filepath entryname = filepath[cwdlength:].partition(os.sep)[0]
entryname = tail.split('/', 1)[0]
allentries.add(entryname) allentries.add(entryname)
if sparsematch(filepath): if sparsematch(filepath):
checkedoutentries.add(entryname) checkedoutentries.add(entryname)
ui = repo.ui ui = repo.ui
for entry in sorted(allentries): for entry in sorted(allentries):
marker = ' ' if entry in checkedoutentries else '-' marker = ' ' if entry in checkedoutentries else '-'