| Alphare |
| hg-reviewers |
with share-safe, we will also write file in the store. So we take the lock
before altering the requirements.
| 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 (61 lines) |
| prunetemporaryincludes(repo) | prunetemporaryincludes(repo) | ||||
| def _updateconfigandrefreshwdir( | def _updateconfigandrefreshwdir( | ||||
| repo, includes, excludes, profiles, force=False, removing=False | repo, includes, excludes, profiles, force=False, removing=False | ||||
| ): | ): | ||||
| """Update the sparse config and working directory state.""" | """Update the sparse config and working directory state.""" | ||||
| with repo.lock(): | |||||
| raw = repo.vfs.tryread(b'sparse') | raw = repo.vfs.tryread(b'sparse') | ||||
| oldincludes, oldexcludes, oldprofiles = parseconfig(repo.ui, raw, b'sparse') | oldincludes, oldexcludes, oldprofiles = parseconfig( | ||||
| repo.ui, raw, b'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 | ||||
| # re-read. We ideally want to update the cached matcher on the | # re-read. We ideally want to update the cached matcher on the | ||||
| # repo instance then flush the new config to disk once wdir is | # repo instance then flush the new config to disk once wdir is | ||||
| # updated. But this requires massive rework to matcher() and its | # updated. But this requires massive rework to matcher() and its | ||||
| # consumers. | # consumers. | ||||
| if requirements.SPARSE_REQUIREMENT in oldrequires and removing: | if requirements.SPARSE_REQUIREMENT in oldrequires and removing: | ||||
| repo.requirements.discard(requirements.SPARSE_REQUIREMENT) | repo.requirements.discard(requirements.SPARSE_REQUIREMENT) | ||||
| scmutil.writereporequirements(repo) | scmutil.writereporequirements(repo) | ||||
| elif requirements.SPARSE_REQUIREMENT not in oldrequires: | elif requirements.SPARSE_REQUIREMENT not in oldrequires: | ||||
| repo.requirements.add(requirements.SPARSE_REQUIREMENT) | repo.requirements.add(requirements.SPARSE_REQUIREMENT) | ||||
| scmutil.writereporequirements(repo) | scmutil.writereporequirements(repo) | ||||
| try: | try: | ||||
| writeconfig(repo, includes, excludes, profiles) | writeconfig(repo, includes, excludes, profiles) | ||||
| return refreshwdir(repo, oldstatus, oldmatch, force=force) | return refreshwdir(repo, oldstatus, oldmatch, force=force) | ||||
| except Exception: | except Exception: | ||||
| if repo.requirements != oldrequires: | if repo.requirements != oldrequires: | ||||
| repo.requirements.clear() | repo.requirements.clear() | ||||
| repo.requirements |= oldrequires | repo.requirements |= oldrequires | ||||
| scmutil.writereporequirements(repo) | scmutil.writereporequirements(repo) | ||||
| writeconfig(repo, oldincludes, oldexcludes, oldprofiles) | writeconfig(repo, oldincludes, oldexcludes, oldprofiles) | ||||
| raise | raise | ||||
| 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. | ||||
| """ | """ | ||||