This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11376

fix: again allow formatting the working copy while merging
ClosedPublic

Authored by martinvonz on Aug 27 2021, 5:08 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG86a60679cf61: fix: again allow formatting the working copy while merging
Summary

I forgot about unfinished merges (I think I was thinking only about
unfinished merge conflicts) when I wrote
https://phab.mercurial-scm.org/D11209. As a coworker (hg contributor
dploch) reported to me, this led to hg fix --working-dir failing
when you have an uncommitted merge. The fix is trivial: just move the
assertion to just before the call to scmutil.movedirstate() where it
actually matters.

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.Aug 27 2021, 5:08 PM
Alphare accepted this revision.Aug 30 2021, 4:53 AM
This revision is now accepted and ready to land.Aug 30 2021, 4:53 AM

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (3 lines)
Mtests/test-fix.t (39 lines)

Diff 30133

hgext/fix.py

We check out a new revision if and only if we fixed something in both the We check out a new revision if and only if we fixed something in both the
working directory and its parent revision. This avoids the need for a full working directory and its parent revision. This avoids the need for a full
update/merge, and means that the working directory simply isn't affected update/merge, and means that the working directory simply isn't affected
unless the --working-dir flag is given. unless the --working-dir flag is given.
Directly updates the dirstate for the affected files. Directly updates the dirstate for the affected files.
""" """
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())
oldp1 = repo.dirstate.p1() oldp1 = repo.dirstate.p1()
newp1 = replacements.get(oldp1, oldp1) newp1 = replacements.get(oldp1, oldp1)
if newp1 != oldp1: if newp1 != oldp1:
assert repo.dirstate.p2() == nullid
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
scmutil.movedirstate(repo, repo[newp1]) 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.

tests/test-fix.t

$ hg fix -r . --working-dir $ hg fix -r . --working-dir
$ hg cat -r . file.changed $ hg cat -r . file.changed
AA AA
b b
CC CC
$ cd .. $ cd ..
We should be allowed to fix the working (and only the working copy) while
merging.
$ hg init fixworkingcopywhilemerging
$ cd fixworkingcopywhilemerging
$ printf "a\nb\nc\n" > file.changed
$ hg commit -Aqm "ancestor"
$ printf "aa\nb\nc\n" > file.changed
$ hg commit -m "change a"
$ hg checkout '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ printf "a\nb\ncc\n" > file.changed
$ hg commit -m "change c"
created new head
$ hg merge
merging file.changed
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cat file.changed
aa
b
cc
Not allowed to fix a parent of the working copy while merging
$ hg fix -r . --working-dir
abort: outstanding uncommitted merge
(use 'hg commit' or 'hg merge --abort')
[20]
$ hg fix --working-dir
$ cat file.changed
AA
b
CC
$ cd ..
Abort fixing revisions if there is an unfinished operation. We don't want to Abort fixing revisions if there is an unfinished operation. We don't want to
make things worse by editing files or stripping/obsoleting things. Also abort make things worse by editing files or stripping/obsoleting things. Also abort
fixing the working directory if there are unresolved merge conflicts. fixing the working directory if there are unresolved merge conflicts.
$ hg init abortunresolved $ hg init abortunresolved
$ cd abortunresolved $ cd abortunresolved
$ echo "foo1" > foo.whole $ echo "foo1" > foo.whole