Mercurial > hg
comparison mercurial/context.py @ 50022:e333cc169c45
dirstate: rename `pendingparentchange` to `is_changing_parents`
This is clearer and more inline witht he other change we did.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 30 Jan 2023 19:21:34 +0100 |
parents | 7a8bfc05b691 |
children | c5ef535e274e |
comparison
equal
deleted
inserted
replaced
50021:4e955a7a6a55 | 50022:e333cc169c45 |
---|---|
1865 # taking the lock | 1865 # taking the lock |
1866 with self._repo.wlock(False): | 1866 with self._repo.wlock(False): |
1867 dirstate = self._repo.dirstate | 1867 dirstate = self._repo.dirstate |
1868 if dirstate.identity() == oldid: | 1868 if dirstate.identity() == oldid: |
1869 if fixup: | 1869 if fixup: |
1870 if dirstate.pendingparentchange(): | 1870 if dirstate.is_changing_parents: |
1871 normal = lambda f, pfd: dirstate.update_file( | 1871 normal = lambda f, pfd: dirstate.update_file( |
1872 f, p1_tracked=True, wc_tracked=True | 1872 f, p1_tracked=True, wc_tracked=True |
1873 ) | 1873 ) |
1874 else: | 1874 else: |
1875 normal = dirstate.set_clean | 1875 normal = dirstate.set_clean |