This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8930

mergestate: clear merge state if there are no unresolved conflicts
AbandonedPublic

Authored by martinvonz on Aug 18 2020, 6:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

After doing e.g. hg update -m and all files get automatically
merged, we currently leave the merge state in place. That means that
the previously checked-out commit node gets displayed as % in the
log output. It also means that the user can re-resolve the files using
hg resolve, possibly using a different merge tool. I can see some
minor value in that, although I've never used it myself. However,
commands that commit the changes right away (e.g. rebase, histedit,
graft, backout, evolve) don't let the user re-resolve merged files
without redoing the whole operation. I don't think we've had requests
for that, either, so I don't think there's much reason to think that
it is useful for operations that don't commit. This patch therefore
makes us clear the mergestate if there are no unresolved conflicts.

This has a large impact on the test-merge-changedelete.t test
because that heavily exercised the re-resolve functionality.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Aug 18 2020, 6:37 PM
marmoute added a subscriber: marmoute.Aug 26 2020, 12:32 PM

The ability to re-run the merge seems quite important and I fear the BC implication. What are the issue with keeping the file around? The one issue I see listed is the use of % in hg log could we tackle that directly instead?

martinvonz added a comment.Aug 27 2020, 2:20 PM
In D8930#134064, @marmoute wrote:

The ability to re-run the merge seems quite important and I fear the BC implication.

I've never had to use that, but I can see how someone might want to run hg co .^ -m -t :local; hg resolve -t <specific file>, so I'm also slightly concerned about it.

What are the issue with keeping the file around? The one issue I see listed is the use of % in hg log

I also mentioned it showing up in hg resolve -l. It also shows up in hg status -v (as a "# No unresolved merge conflicts." line being present).

could we tackle that directly instead?

Do you mean that we could make hg log -G not show % if all conflicts are resolved? Maybe we'd do the same for hg status -v in that case? But probably leave hg resolve -l alone?

marmoute added a comment.Aug 28 2020, 3:57 AM
In D8930#134205, @martinvonz wrote:
In D8930#134064, @marmoute wrote:

Do you mean that we could make hg log -G not show % if all conflicts are resolved? Maybe we'd do the same for hg status -v in that case? But probably leave hg resolve -l alone?

Yeah, something like that. That is is not great, but still seems better than blindly dropping the mergestate.

Maybe we could have hg continue play a role here ? leaving hg resolve and hg status -v as they are now and pointing at hg continue to drop the merge state. (maybe still fix the log output in all case?)

martinvonz abandoned this revision.Sep 10 2020, 4:13 PM

Abandoning this in favor of D9007.

Revision Contents
Changeset List

Diff 22409

mercurial/merge.py

util.unlink(repo.vfs.join(b'updatestate')) util.unlink(repo.vfs.join(b'updatestate'))
if not branchmerge: if not branchmerge:
repo.dirstate.setbranch(p2.branch()) repo.dirstate.setbranch(p2.branch())
# If we're updating to a location, clean up any stale temporary includes # If we're updating to a location, clean up any stale temporary includes
# (ex: this happens during hg rebase --abort). # (ex: this happens during hg rebase --abort).
if not branchmerge: if not branchmerge:
if not stats.unresolvedcount:
ms = mergestatemod.mergestate.read(repo)
ms.reset()
sparse.prunetemporaryincludes(repo) sparse.prunetemporaryincludes(repo)
if updatedirstate: if updatedirstate:
repo.hook( repo.hook(
b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
) )
return stats return stats

relnotes/next

== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
* If a command, such as `hg update -m`, automatically resolved all
conflicts, it used to still leave you with the merge state. You
could see that by running `hg resolve -l` (which would then show
only files marked with `R` for "resolved"). You could also see it
as a node in the graph log output showing `%`. This confused some
users. The merge state will now be cleared instead when all
conflicts were automatically resolved.
== Internal API Changes == == Internal API Changes ==

tests/test-merge-changedelete.t

>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
Exercise transitions between local, other, fail and prompt, and make sure the Exercise transitions between local, other, fail and prompt, and make sure the
dirstate stays consistent. (Compare with each other and to the above dirstate stays consistent. (Compare with each other and to the above
invocations.) invocations.)
$ testtransitions() { $ testtransitions() {
> # this traversal order covers every transition > # this traversal order covers every transition
> tools="local other prompt local fail other local prompt other fail prompt fail local" > tools="fail prompt fail"
> lasttool="merge3" > lasttool="merge3"
> for tool in $tools; do > for tool in $tools; do
> echo "=== :$lasttool -> :$tool ===" > echo "=== :$lasttool -> :$tool ==="
> ref="$TESTTMP/$tool.status" > ref="$TESTTMP/$tool.status"
> hg resolve --unmark --all > hg resolve --unmark --all
> hg resolve --tool ":$tool" --all --config ui.interactive=True > hg resolve --tool ":$tool" --all --config ui.interactive=True
> status > "$TESTTMP/compare.status" 2>&1 > status > "$TESTTMP/compare.status" 2>&1
> echo '--- diff of status ---' > echo '--- diff of status ---'
> if cmp "$TESTTMP/$tool.status" "$TESTTMP/compare.status" || diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then > if cmp "$TESTTMP/$tool.status" "$TESTTMP/compare.status" || diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then
> echo '(status identical)' > echo '(status identical)'
> fi > fi
> lasttool="$tool" > lasttool="$tool"
> echo > echo
> done > done
> } > }
$ testtransitions $ testtransitions
=== :merge3 -> :local === === :merge3 -> :fail ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
=== :prompt -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :fail ===
--- diff of status ---
(status identical)
=== :fail -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
=== :prompt -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :prompt === === :fail -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? What do you want to do?
file 'file3' needs to be resolved. file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? What do you want to do?
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :prompt -> :fail === === :prompt -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
Non-interactive linear update Non-interactive linear update
$ hg co -C 0 $ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1 $ echo changed >> file1
$ hg rm file2 $ hg rm file2
$ hg update 1 --tool :local $ hg update 1 --tool :local
1 files updated, 2 files merged, 0 files removed, 0 files unresolved 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
$ status 2>&1 | tee $TESTTMP/local.status $ status 2>&1 | tee $TESTTMP/local.status
--- status --- --- status ---
file2: * (glob) file2: * (glob)
A file1 A file1
C file3 C file3
--- resolve --list --- --- resolve --list ---
R file1
R file2
--- debugmergestate --- --- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff no merge state found
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
*** file2 does not exist *** file2 does not exist
--- file3 --- --- file3 ---
3 3
changed1 changed1
Choose other versions of files Choose other versions of files
$ hg co -C 0 $ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1 $ echo changed >> file1
$ hg rm file2 $ hg rm file2
$ hg update 1 --tool :other $ hg update 1 --tool :other
1 files updated, 1 files merged, 1 files removed, 0 files unresolved 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
$ status 2>&1 | tee $TESTTMP/other.status $ status 2>&1 | tee $TESTTMP/other.status
--- status --- --- status ---
file1: * (glob) file1: * (glob)
C file2 C file2
C file3 C file3
--- resolve --list --- --- resolve --list ---
R file1
R file2
--- debugmergestate --- --- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff no merge state found
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
changed1 changed1
changed changed
--- file3 --- --- file3 ---
3 3
changed1 changed1
Test transitions between different merge tools Test transitions between different merge tools
$ testtransitions $ testtransitions
=== :merge3 -> :local === === :merge3 -> :fail ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
=== :prompt -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :fail ===
--- diff of status ---
(status identical)
=== :fail -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :local -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
=== :prompt -> :other ===
(no more unresolved files)
--- diff of status ---
(status identical)
=== :other -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :prompt === === :fail -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
file 'file2' was deleted in local [working copy] but was modified in other [destination]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? What do you want to do?
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :prompt -> :fail === === :prompt -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :local ===
(no more unresolved files)
--- diff of status ---
(status identical)

tests/test-merge-tools.t

0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ aftermerge $ aftermerge
# cat f # cat f
revision 1 revision 1
space space
# hg stat # hg stat
M f M f
# hg resolve --list # hg resolve --list
R f
update should also have --tool update should also have --tool
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat