| Alphare |
| hg-reviewers |
This is more correct and help our API split.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (4 lines) | |||
| M | mercurial/sparse.py (2 lines) |
| with self._repo.dirstate.parentchange(): | with self._repo.dirstate.parentchange(): | ||||
| for f in self.modified() + self.added(): | for f in self.modified() + self.added(): | ||||
| self._repo.dirstate.normal(f) | self._repo.dirstate.normal(f) | ||||
| for f in self.removed(): | for f in self.removed(): | ||||
| self._repo.dirstate.drop(f) | self._repo.dirstate.drop(f) | ||||
| self._repo.dirstate.setparents(node) | self._repo.dirstate.setparents(node) | ||||
| self._repo._quick_access_changeid_invalidate() | self._repo._quick_access_changeid_invalidate() | ||||
| sparse.aftercommit(self._repo, node) | |||||
| # write changes out explicitly, because nesting wlock at | # write changes out explicitly, because nesting wlock at | ||||
| # runtime may prevent 'wlock.release()' in 'repo.commit()' | # runtime may prevent 'wlock.release()' in 'repo.commit()' | ||||
| # from immediately doing so for subsequent changing files | # from immediately doing so for subsequent changing files | ||||
| self._repo.dirstate.write(self._repo.currenttransaction()) | self._repo.dirstate.write(self._repo.currenttransaction()) | ||||
| sparse.aftercommit(self._repo, node) | |||||
| def mergestate(self, clean=False): | def mergestate(self, clean=False): | ||||
| if clean: | if clean: | ||||
| return mergestatemod.mergestate.clean(self._repo) | return mergestatemod.mergestate.clean(self._repo) | ||||
| return mergestatemod.mergestate.read(self._repo) | return mergestatemod.mergestate.read(self._repo) | ||||
| class committablefilectx(basefilectx): | class committablefilectx(basefilectx): | ||||
| """A committablefilectx provides common functionality for a file context | """A committablefilectx provides common functionality for a file context | ||||
| 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(), repo.dirstate.parentchange(): | ||||
| # read current configuration | # read current configuration | ||||
| raw = repo.vfs.tryread(b'sparse') | raw = repo.vfs.tryread(b'sparse') | ||||
| includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse') | includes, excludes, profiles = parseconfig(repo.ui, raw, b'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 | ||||