This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6120

scmutil: document matcher argument of movedirstate()
ClosedPublic

Authored by martinvonz on Mar 11 2019, 5:08 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGad4a3e2eedb3: scmutil: document matcher argument of movedirstate()

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 11 2019, 5:08 PM
pulkit accepted this revision.Mar 11 2019, 6:31 PM
martinvonz added a parent revision: D6119: uncommit: move _movedirstate() to scmutil for reuse.Mar 11 2019, 6:32 PM

Sorry, I forgot (again) to manually add the parent revision. That's done now.

Closed by commit rHGad4a3e2eedb3: scmutil: document matcher argument of movedirstate() (authored by martinvonz). · Explain WhyMar 11 2019, 7:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (7 lines)

Diff 14473

mercurial/scmutil.py

"data will be stored for %s.\n") "data will be stored for %s.\n")
% (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))) % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))
if repo.dirstate[dst] in '?r' and not dryrun: if repo.dirstate[dst] in '?r' and not dryrun:
wctx.add([dst]) wctx.add([dst])
elif not dryrun: elif not dryrun:
wctx.copy(origsrc, dst) wctx.copy(origsrc, dst)
def movedirstate(repo, newctx, match=None): def movedirstate(repo, newctx, match=None):
"""Move the dirstate to newctx and adjust it as necessary.""" """Move the dirstate to newctx and adjust it as necessary.
A matcher can be provided as an optimization. It is probably a bug to pass
a matcher that doesn't match all the differences between the parent of the
working copy and newctx.
"""
oldctx = repo['.'] oldctx = repo['.']
ds = repo.dirstate ds = repo.dirstate
ds.setparents(newctx.node(), nullid) ds.setparents(newctx.node(), nullid)
copies = dict(ds.copies()) copies = dict(ds.copies())
s = newctx.status(oldctx, match=match) s = newctx.status(oldctx, match=match)
for f in s.modified: for f in s.modified:
if ds[f] == 'r': if ds[f] == 'r':
# modified + removed -> removed # modified + removed -> removed