This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11210

fix: use scmutil.movedirstate() instead of reimplementing
ClosedPublic

Authored by martinvonz on Jul 23 2021, 3:16 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG66ad7e32011f: fix: use scmutil.movedirstate() instead of reimplementing
Summary

I wrote this patch 2 years ago as a little cleanup. I wanted to
generally used scmutil.movedirstate() instead of manually updating
the dirstate because that is easy to get wrong. I didn't know until
today that the current code had a bug. So I added the test case two
patches before this one and dusted off this one patch. This is a
little slower than the previous code, as it diffs two
manifests. However, it fixes the bug and I don't think it's going to
be noticeably slower anyway.

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.Jul 23 2021, 3:16 AM
martinvonz planned changes to this revision.Jul 23 2021, 3:19 AM

This is slower, but probably doesn't matter?

Oops, I meant to update that message. These patches are from 2 years ago. I just didn't have much reason to send them until a user ran into the bug added in the grandparent change (which is not from 2 years ago; I didn't know that this series fixed any bugs until today).

martinvonz edited the summary of this revision. (Show Details)Jul 23 2021, 3:24 AM
martinvonz requested review of this revision.Jul 23 2021, 3:24 AM
pulkit accepted this revision.Jul 24 2021, 5:19 AM
This revision is now accepted and ready to land.Jul 24 2021, 5:19 AM

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (5 lines)
Mtests/test-fix.t (1 line)

Diff 29715

hgext/fix.py

Directly updates the dirstate for the affected files. Directly updates the dirstate for the affected files.
""" """
assert repo.dirstate.p2() == nullid assert repo.dirstate.p2() == nullid
for path, data in pycompat.iteritems(filedata): for path, data in pycompat.iteritems(filedata):
fctx = ctx[path] fctx = ctx[path]
fctx.write(data, fctx.flags()) fctx.write(data, fctx.flags())
if repo.dirstate[path] == b'n':
repo.dirstate.set_possibly_dirty(path)
oldp1 = repo.dirstate.p1() oldp1 = repo.dirstate.p1()
newp1 = replacements.get(oldp1, oldp1) newp1 = replacements.get(oldp1, oldp1)
if newp1 != oldp1: if newp1 != oldp1:
repo.setparents(newp1, nullid) with repo.dirstate.parentchange():
scmutil.movedirstate(repo, repo[newp1])
def replacerev(ui, repo, ctx, filedata, replacements): def replacerev(ui, repo, ctx, filedata, replacements):
"""Commit a new revision like the given one, but with file content changes """Commit a new revision like the given one, but with file content changes
"ctx" is the original revision to be replaced by a modified one. "ctx" is the original revision to be replaced by a modified one.
"filedata" is a dict that maps paths to their new file content. All other "filedata" is a dict that maps paths to their new file content. All other

tests/test-fix.t

$ printf "hello world\n" > hello.whole $ printf "hello world\n" > hello.whole
$ hg commit -Am initial $ hg commit -Am initial
adding hello.whole adding hello.whole
$ hg fix -w * $ hg fix -w *
$ hg st $ hg st
M hello.whole M hello.whole
$ hg fix -s . * $ hg fix -s . *
$ hg st $ hg st
M hello.whole (known-bad-output !)
$ hg diff $ hg diff
$ cd .. $ cd ..
Test the effect of fixing the working directory for each possible status, with Test the effect of fixing the working directory for each possible status, with
and without providing explicit file arguments. and without providing explicit file arguments.
$ hg init implicitlyfixstatus $ hg init implicitlyfixstatus