Mercurial > hg
comparison hgext/fix.py @ 49961:7a8bfc05b691
dirstate: rename parentchange to changing_parents
Since the new argument breaks the API anyway, we can rename it to a better name.
The previous name `parentchange` might be seen as something active, a function
that would directly change the parents, however this is just a context manager
to frame the operation that will change the parents and adjust the
dirstate content accordingly.
In addition, the future sister method that will be about changes to tracking and
files would have a hard time fitting in the same naming scheme in a clear way.
The new naming uses a clear prefix will make it more distinct from other
dirstate methods and easier to extend with other similar contexts.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 25 Jan 2023 19:12:31 +0100 |
parents | c166b212bdee |
children |
comparison
equal
deleted
inserted
replaced
49960:c166b212bdee | 49961:7a8bfc05b691 |
---|---|
774 | 774 |
775 oldp1 = repo.dirstate.p1() | 775 oldp1 = repo.dirstate.p1() |
776 newp1 = replacements.get(oldp1, oldp1) | 776 newp1 = replacements.get(oldp1, oldp1) |
777 if newp1 != oldp1: | 777 if newp1 != oldp1: |
778 assert repo.dirstate.p2() == nullid | 778 assert repo.dirstate.p2() == nullid |
779 with repo.dirstate.parentchange(repo): | 779 with repo.dirstate.changing_parents(repo): |
780 scmutil.movedirstate(repo, repo[newp1]) | 780 scmutil.movedirstate(repo, repo[newp1]) |
781 | 781 |
782 | 782 |
783 def replacerev(ui, repo, ctx, filedata, replacements): | 783 def replacerev(ui, repo, ctx, filedata, replacements): |
784 """Commit a new revision like the given one, but with file content changes | 784 """Commit a new revision like the given one, but with file content changes |