| hg-reviewers |
This will help us in reusing this function to parse narrow config files and
unfiying the config file parsing logic.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/sparse.py (33 lines) |
| util, | util, | ||||
| ) | ) | ||||
| # Whether sparse features are enabled. This variable is intended to be | # Whether sparse features are enabled. This variable is intended to be | ||||
| # temporary to facilitate porting sparse to core. It should eventually be | # temporary to facilitate porting sparse to core. It should eventually be | ||||
| # a per-repo option, possibly a repo requirement. | # a per-repo option, possibly a repo requirement. | ||||
| enabled = False | enabled = False | ||||
| def parseconfig(ui, raw): | def parseconfig(ui, raw, action): | ||||
| """Parse sparse config file content. | """Parse sparse config file content. | ||||
| action is the command which is trigerring this read, can be narrow, sparse | |||||
| Returns a tuple of includes, excludes, and profiles. | Returns a tuple of includes, excludes, and profiles. | ||||
| """ | """ | ||||
| includes = set() | includes = set() | ||||
| excludes = set() | excludes = set() | ||||
| profiles = set() | profiles = set() | ||||
| current = None | current = None | ||||
| havesection = False | havesection = False | ||||
| 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.add(line) | profiles.add(line) | ||||
| elif line == '[include]': | elif line == '[include]': | ||||
| if havesection and current != includes: | if havesection and 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(_('%s config cannot have includes ' + | ||||
| 'after excludes')) | 'after excludes') % action) | ||||
| havesection = True | havesection = True | ||||
| current = includes | current = includes | ||||
| continue | continue | ||||
| elif line == '[exclude]': | elif line == '[exclude]': | ||||
| havesection = True | havesection = True | ||||
| current = excludes | current = excludes | ||||
| elif line: | elif line: | ||||
| if current is None: | if current is None: | ||||
| raise error.Abort(_('sparse config entry outside of ' | raise error.Abort(_('%s config entry outside of ' | ||||
| 'section: %s') % line, | 'section: %s') % (action, line), | ||||
| hint=_('add an [include] or [exclude] line ' | hint=_('add an [include] or [exclude] line ' | ||||
| 'to declare the entry type')) | 'to declare the entry type')) | ||||
| if line.strip().startswith('/'): | if line.strip().startswith('/'): | ||||
| ui.warn(_('warning: sparse profile cannot use' + | ui.warn(_('warning: %s profile cannot use' + | ||||
| ' paths starting with /, ignoring %s\n') % line) | ' paths starting with /, ignoring %s\n') | ||||
| % (action, line)) | |||||
| continue | continue | ||||
| current.add(line) | current.add(line) | ||||
| return includes, excludes, profiles | return includes, excludes, profiles | ||||
| # Exists as separate function to facilitate monkeypatching. | # Exists as separate function to facilitate monkeypatching. | ||||
| def readprofile(repo, profile, changeid): | def readprofile(repo, profile, changeid): | ||||
| """Resolve the raw content of a sparse profile file.""" | """Resolve the raw content of a sparse profile file.""" | ||||
| raw = repo.vfs.tryread('sparse') | raw = repo.vfs.tryread('sparse') | ||||
| if not raw: | if not raw: | ||||
| return set(), 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, 'sparse') | ||||
| 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: | ||||
| continue | continue | ||||
| # 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, 'sparse') | ||||
| includes.update(pincludes) | includes.update(pincludes) | ||||
| excludes.update(pexcludes) | excludes.update(pexcludes) | ||||
| profiles.update(subprofs) | profiles.update(subprofs) | ||||
| profiles = visited | profiles = visited | ||||
| if includes: | if includes: | ||||
| includes.add('.hg*') | includes.add('.hg*') | ||||
| refreshwdir(repo, origstatus, origsparsematch, force=True) | refreshwdir(repo, origstatus, origsparsematch, force=True) | ||||
| prunetemporaryincludes(repo) | prunetemporaryincludes(repo) | ||||
| def _updateconfigandrefreshwdir(repo, includes, excludes, profiles, | def _updateconfigandrefreshwdir(repo, includes, excludes, profiles, | ||||
| force=False, removing=False): | force=False, removing=False): | ||||
| """Update the sparse config and working directory state.""" | """Update the sparse config and working directory state.""" | ||||
| raw = repo.vfs.tryread('sparse') | raw = repo.vfs.tryread('sparse') | ||||
| oldincludes, oldexcludes, oldprofiles = parseconfig(repo.ui, raw) | oldincludes, oldexcludes, oldprofiles = parseconfig(repo.ui, raw, 'sparse') | ||||
| oldstatus = repo.status() | oldstatus = repo.status() | ||||
| oldmatch = matcher(repo) | oldmatch = matcher(repo) | ||||
| oldrequires = set(repo.requirements) | oldrequires = set(repo.requirements) | ||||
| # TODO remove this try..except once the matcher integrates better | # TODO remove this try..except once the matcher integrates better | ||||
| # with dirstate. We currently have to write the updated config | # with dirstate. We currently have to write the updated config | ||||
| # because that will invalidate the matcher cache and force a | # because that will invalidate the matcher cache and force a | ||||
| 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. | ||||
| The remaining sparse config only has profiles, if defined. The working | The remaining sparse config only has profiles, if defined. The working | ||||
| directory is refreshed, as needed. | directory is refreshed, as needed. | ||||
| """ | """ | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| raw = repo.vfs.tryread('sparse') | raw = repo.vfs.tryread('sparse') | ||||
| includes, excludes, profiles = parseconfig(repo.ui, raw) | includes, excludes, profiles = parseconfig(repo.ui, raw, 'sparse') | ||||
| if not includes and not excludes: | if not includes and not excludes: | ||||
| return | return | ||||
| _updateconfigandrefreshwdir(repo, set(), set(), profiles, force=force) | _updateconfigandrefreshwdir(repo, set(), set(), profiles, force=force) | ||||
| def importfromfiles(repo, opts, paths, force=False): | def importfromfiles(repo, opts, paths, force=False): | ||||
| """Import sparse config rules from files. | """Import sparse config rules from files. | ||||
| The updated sparse config is written out and the working directory | The updated sparse config is written out and the working directory | ||||
| is refreshed, as needed. | is refreshed, as needed. | ||||
| """ | """ | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| # read current configuration | # read current configuration | ||||
| raw = repo.vfs.tryread('sparse') | raw = repo.vfs.tryread('sparse') | ||||
| includes, excludes, profiles = parseconfig(repo.ui, raw) | includes, excludes, profiles = parseconfig(repo.ui, raw, 'sparse') | ||||
| aincludes, aexcludes, aprofiles = activeconfig(repo) | aincludes, aexcludes, aprofiles = activeconfig(repo) | ||||
| # Import rules on top; only take in rules that are not yet | # Import rules on top; only take in rules that are not yet | ||||
| # part of the active rules. | # part of the active rules. | ||||
| changed = False | changed = False | ||||
| for p in paths: | for p in paths: | ||||
| with util.posixfile(util.expandpath(p), mode='rb') as fh: | with util.posixfile(util.expandpath(p), mode='rb') as fh: | ||||
| raw = fh.read() | raw = fh.read() | ||||
| iincludes, iexcludes, iprofiles = parseconfig(repo.ui, raw) | iincludes, iexcludes, iprofiles = parseconfig(repo.ui, raw, | ||||
| 'sparse') | |||||
| 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(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 | ||||
| """Perform a sparse config update. | """Perform a sparse config update. | ||||
| Only one of the actions may be performed. | Only one of the actions may be performed. | ||||
| 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(): | ||||
| raw = repo.vfs.tryread('sparse') | raw = repo.vfs.tryread('sparse') | ||||
| oldinclude, oldexclude, oldprofiles = parseconfig(repo.ui, raw) | oldinclude, oldexclude, oldprofiles = parseconfig(repo.ui, raw, | ||||
| 'sparse') | |||||
| 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) | ||||