| Alphare | |
| pulkit |
| hg-reviewers |
We use set_clean or update_file depending of if we are in the middle of an
update or not.
| 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 (10 lines) |
| try: | try: | ||||
| oldid = self._repo.dirstate.identity() | oldid = self._repo.dirstate.identity() | ||||
| # updating the dirstate is optional | # updating the dirstate is optional | ||||
| # so we don't wait on the lock | # so we don't wait on the lock | ||||
| # wlock can invalidate the dirstate, so cache normal _after_ | # wlock can invalidate the dirstate, so cache normal _after_ | ||||
| # taking the lock | # taking the lock | ||||
| with self._repo.wlock(False): | with self._repo.wlock(False): | ||||
| if self._repo.dirstate.identity() == oldid: | dirstate = self._repo.dirstate | ||||
| if dirstate.identity() == oldid: | |||||
| if fixup: | if fixup: | ||||
| normal = self._repo.dirstate.normal | if dirstate.pendingparentchange(): | ||||
| normal = lambda f: dirstate.update_file( | |||||
| f, p1_tracked=True, wc_tracked=True | |||||
| ) | |||||
| else: | |||||
| normal = dirstate.set_clean | |||||
| for f in fixup: | for f in fixup: | ||||
| normal(f) | normal(f) | ||||
| # write changes out explicitly, because nesting | # write changes out explicitly, because nesting | ||||
| # wlock at runtime may prevent 'wlock.release()' | # wlock at runtime may prevent 'wlock.release()' | ||||
| # after this block from doing so for subsequent | # after this block from doing so for subsequent | ||||
| # changing files | # changing files | ||||
| tr = self._repo.currenttransaction() | tr = self._repo.currenttransaction() | ||||
| self._repo.dirstate.write(tr) | self._repo.dirstate.write(tr) | ||||