This is an archive of the discontinued Mercurial Phabricator instance.

Differential D95

sparse: use set for capturing profiles
ClosedPublic

Authored by indygreg on Jul 15 2017, 5:11 PM.

Details

Reviewers
dsp
durin42
Group Reviewers
hg-reviewers
Commits
rHG32f348d741e5: sparse: use set for capturing profiles
Summary

Order doesn't need to be preserved. A set is acceptable.

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

indygreg created this revision.Jul 15 2017, 5:11 PM
dsp accepted this revision.Jul 16 2017, 3:40 PM
dsp added a subscriber: dsp.

Looks good! Does it make sense to have a test that codifies that sorting doesn't matter? e.g. testing that two sparse profiles

a.sparse

[include]
[exclude]
x

b.sparse

[include]
x
[exclude]

yield the same result, no matter of the include order?

durin42 accepted this revision.Jul 17 2017, 1:52 PM
This revision is now accepted and ready to land.Jul 17 2017, 1:52 PM
martinvonz added a subscriber: martinvonz.Jul 17 2017, 5:20 PM
martinvonz added inline comments.
mercurial/sparse.py
96

This can no longer happen. Will you or send a follow-up?

Closed by commit rHG32f348d741e5: sparse: use set for capturing profiles (authored by indygreg). · Explain WhyJul 17 2017, 6:03 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added inline comments.Jul 17 2017, 6:26 PM
mercurial/sparse.py
96

Never mind, I didn't notice it expands the subprofiles and updated the profiles set in the loop, so the check is necessary.

Revision Contents
Changeset List

PathPackages
Mmercurial/sparse.py (18 lines)

Diff 220

mercurial/sparse.py

def parseconfig(ui, raw): def parseconfig(ui, raw):
"""Parse sparse config file content. """Parse sparse config file content.
Returns a tuple of includes, excludes, and profiles. Returns a tuple of includes, excludes, and profiles.
""" """
includes = set() includes = set()
excludes = set() excludes = set()
current = includes current = includes
profiles = [] profiles = set()
for line in raw.split('\n'): for line in raw.split('\n'):
line = line.strip() line = line.strip()
if not line or line.startswith('#'): if not line or line.startswith('#'):
# empty or comment line, skip # empty or comment line, skip
continue continue
elif line.startswith('%include '): elif line.startswith('%include '):
line = line[9:].strip() line = line[9:].strip()
if line: if line:
profiles.append(line) profiles.add(line)
elif line == '[include]': elif line == '[include]':
if current != includes: if current != includes:
# TODO pass filename into this API so we can report it. # TODO pass filename into this API so we can report it.
raise error.Abort(_('sparse config cannot have includes ' + raise error.Abort(_('sparse config cannot have includes ' +
'after excludes')) 'after excludes'))
continue continue
elif line == '[exclude]': elif line == '[exclude]':
current = excludes current = excludes
def patternsforrev(repo, rev): def patternsforrev(repo, rev):
"""Obtain sparse checkout patterns for the given rev. """Obtain sparse checkout patterns for the given rev.
Returns a tuple of iterables representing includes, excludes, and Returns a tuple of iterables representing includes, excludes, and
patterns. patterns.
""" """
# Feature isn't enabled. No-op. # Feature isn't enabled. No-op.
if not enabled: if not enabled:
return set(), set(), [] return set(), set(), set()
raw = repo.vfs.tryread('sparse') raw = repo.vfs.tryread('sparse')
if not raw: if not raw:
return set(), set(), [] return set(), set(), set()
if rev is None: if rev is None:
raise error.Abort(_('cannot parse sparse patterns from working ' raise error.Abort(_('cannot parse sparse patterns from working '
'directory')) 'directory'))
includes, excludes, profiles = parseconfig(repo.ui, raw) includes, excludes, profiles = parseconfig(repo.ui, raw)
ctx = repo[rev] ctx = repo[rev]
if profiles: if profiles:
visited = set() visited = set()
while profiles: while profiles:
profile = profiles.pop() profile = profiles.pop()
if profile in visited: if profile in visited:
martinvonzUnsubmitted
Not Done

This can no longer happen. Will you or send a follow-up?

martinvonz: This can no longer happen. Will you or send a follow-up?
martinvonzUnsubmitted
Not Done

Never mind, I didn't notice it expands the subprofiles and updated the profiles set in the loop, so the check is necessary.

martinvonz: Never mind, I didn't notice it expands the subprofiles and updated the profiles set in the loop…
continue continue
visited.add(profile) visited.add(profile)
try: try:
raw = readprofile(repo, profile, rev) raw = readprofile(repo, profile, rev)
except error.ManifestLookupError: except error.ManifestLookupError:
msg = ( msg = (
"warning: sparse profile '%s' not found " "warning: sparse profile '%s' not found "
"in rev %s - ignoring it\n" % (profile, ctx)) "in rev %s - ignoring it\n" % (profile, ctx))
# experimental config: sparse.missingwarning # experimental config: sparse.missingwarning
if repo.ui.configbool( if repo.ui.configbool(
'sparse', 'missingwarning'): 'sparse', 'missingwarning'):
repo.ui.warn(msg) repo.ui.warn(msg)
else: else:
repo.ui.debug(msg) repo.ui.debug(msg)
continue continue
pincludes, pexcludes, subprofs = parseconfig(repo.ui, raw) pincludes, pexcludes, subprofs = parseconfig(repo.ui, raw)
includes.update(pincludes) includes.update(pincludes)
excludes.update(pexcludes) excludes.update(pexcludes)
for subprofile in subprofs: profiles.update(subprofs)
profiles.append(subprofile)
profiles = visited profiles = visited
if includes: if includes:
includes.add('.hg*') includes.add('.hg*')
return includes, excludes, profiles return includes, excludes, profiles
allincludes = set() allincludes = set()
allexcludes = set() allexcludes = set()
allprofiles = set() allprofiles = set()
for rev in revs: for rev in revs:
includes, excludes, profiles = patternsforrev(repo, rev) includes, excludes, profiles = patternsforrev(repo, rev)
allincludes |= includes allincludes |= includes
allexcludes |= excludes allexcludes |= excludes
allprofiles |= set(profiles) allprofiles |= profiles
return allincludes, allexcludes, allprofiles return allincludes, allexcludes, allprofiles
def configsignature(repo, includetemp=True): def configsignature(repo, includetemp=True):
"""Obtain the signature string for the current sparse configuration. """Obtain the signature string for the current sparse configuration.
This is used to construct a cache key for matchers. This is used to construct a cache key for matchers.
""" """
"""Perform actions after a working directory commit.""" """Perform actions after a working directory commit."""
# This function is called unconditionally, even if sparse isn't # This function is called unconditionally, even if sparse isn't
# enabled. # enabled.
ctx = repo[node] ctx = repo[node]
profiles = patternsforrev(repo, ctx.rev())[2] profiles = patternsforrev(repo, ctx.rev())[2]
# profiles will only have data if sparse is enabled. # profiles will only have data if sparse is enabled.
if set(profiles) & set(ctx.files()): if profiles & set(ctx.files()):
origstatus = repo.status() origstatus = repo.status()
origsparsematch = matcher(repo) origsparsematch = matcher(repo)
refreshwdir(repo, origstatus, origsparsematch, force=True) refreshwdir(repo, origstatus, origsparsematch, force=True)
prunetemporaryincludes(repo) prunetemporaryincludes(repo)
def clearrules(repo, force=False): def clearrules(repo, force=False):
"""Clears include/exclude rules from the sparse config. """Clears include/exclude rules from the sparse config.
for p in paths: for p in paths:
with util.posixfile(util.expandpath(p)) as fh: with util.posixfile(util.expandpath(p)) as fh:
raw = fh.read() raw = fh.read()
iincludes, iexcludes, iprofiles = parseconfig(repo.ui, raw) iincludes, iexcludes, iprofiles = parseconfig(repo.ui, raw)
oldsize = len(includes) + len(excludes) + len(profiles) oldsize = len(includes) + len(excludes) + len(profiles)
includes.update(iincludes - aincludes) includes.update(iincludes - aincludes)
excludes.update(iexcludes - aexcludes) excludes.update(iexcludes - aexcludes)
profiles.update(set(iprofiles) - aprofiles) profiles.update(iprofiles - aprofiles)
if len(includes) + len(excludes) + len(profiles) > oldsize: if len(includes) + len(excludes) + len(profiles) > oldsize:
changed = True changed = True
profilecount = includecount = excludecount = 0 profilecount = includecount = excludecount = 0
fcounts = (0, 0, 0) fcounts = (0, 0, 0)
if changed: if changed:
profilecount = len(profiles - aprofiles) profilecount = len(profiles - aprofiles)
The new config is written out and a working directory refresh is performed. The new config is written out and a working directory refresh is performed.
""" """
with repo.wlock(): with repo.wlock():
oldmatcher = matcher(repo) oldmatcher = matcher(repo)
raw = repo.vfs.tryread('sparse') raw = repo.vfs.tryread('sparse')
oldinclude, oldexclude, oldprofiles = parseconfig(repo.ui, raw) oldinclude, oldexclude, oldprofiles = parseconfig(repo.ui, raw)
oldprofiles = set(oldprofiles)
if reset: if reset:
newinclude = set() newinclude = set()
newexclude = set() newexclude = set()
newprofiles = set() newprofiles = set()
else: else:
newinclude = set(oldinclude) newinclude = set(oldinclude)
newexclude = set(oldexclude) newexclude = set(oldexclude)