Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/context.py @ 47605:a5701ffc10e4
sparse: make sure we adjust the dirstate at the same time as the parent
This is more correct and help our API split.
Differential Revision: https://phab.mercurial-scm.org/D11028
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 08 Jul 2021 18:59:55 +0200 |
| parents | f636dfe83554 |
| children | 6975cef3add1 |
comparison
equal
deleted
inserted
replaced
| 47604:090fc6a95e50 | 47605:a5701ffc10e4 |
|---|---|
| 2020 for f in self.removed(): | 2020 for f in self.removed(): |
| 2021 self._repo.dirstate.drop(f) | 2021 self._repo.dirstate.drop(f) |
| 2022 self._repo.dirstate.setparents(node) | 2022 self._repo.dirstate.setparents(node) |
| 2023 self._repo._quick_access_changeid_invalidate() | 2023 self._repo._quick_access_changeid_invalidate() |
| 2024 | 2024 |
| 2025 sparse.aftercommit(self._repo, node) | |
| 2026 | |
| 2025 # write changes out explicitly, because nesting wlock at | 2027 # write changes out explicitly, because nesting wlock at |
| 2026 # runtime may prevent 'wlock.release()' in 'repo.commit()' | 2028 # runtime may prevent 'wlock.release()' in 'repo.commit()' |
| 2027 # from immediately doing so for subsequent changing files | 2029 # from immediately doing so for subsequent changing files |
| 2028 self._repo.dirstate.write(self._repo.currenttransaction()) | 2030 self._repo.dirstate.write(self._repo.currenttransaction()) |
| 2029 | |
| 2030 sparse.aftercommit(self._repo, node) | |
| 2031 | 2031 |
| 2032 def mergestate(self, clean=False): | 2032 def mergestate(self, clean=False): |
| 2033 if clean: | 2033 if clean: |
| 2034 return mergestatemod.mergestate.clean(self._repo) | 2034 return mergestatemod.mergestate.clean(self._repo) |
| 2035 return mergestatemod.mergestate.read(self._repo) | 2035 return mergestatemod.mergestate.read(self._repo) |