This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9007

graphlog: use '%' only if there are *unresolved* conflicts
ClosedPublic

Authored by martinvonz on Sep 10 2020, 4:13 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG85b03b1e4715: graphlog: use '%' only if there are *unresolved* conflicts
Summary

In 14d0e89520a2, I made graphlog use '%' for the "other" context when
there's an existing merge state. However, that has confused many
people because it shows up even if all conflicts are already resolved,
which makes it show up even after e.g. hg update -m with
automatically resolved conflicts. This patch makes it so we show the
'%' only if there still unresolved conflicts.

This patch replaces my earlier attempt in D8930, where I decided to
automatically clear the mergestate if there are no remaining
conflicts. That had the problem that it wouldn't let the user
re-resolve the conflicts using hg resolve.

Note that an in-progress "proper" merge (one that will result in a
commit with two parents, such as after hg merge) will already have
two dirstate parents before the commit happens. That means that both
sides of the merge will get drawn as '@' in the graph, since "is
dirstate parent" takes precedence over "is involved in merge
conflict".

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.Sep 10 2020, 4:13 PM
martinvonz edited the summary of this revision. (Show Details)Sep 10 2020, 4:21 PM
pulkit added a subscriber: pulkit.Sep 11 2020, 5:11 AM

It still does not feels good to me. In case of hg merge, we will like to show both parents even after conflicts are resolved. Showing a single parent might make user do hg commit.
But I do understand the problem you are trying to solve. I think we can have either of D8930 or this one behind a config option.

marmoute added a subscriber: marmoute.Sep 11 2020, 9:36 AM

Does this affect all merge (especially hg merge) ? or just the one where the working copy has only one parent?

martinvonz added a comment.Sep 11 2020, 9:42 AM

Since you both ask basically the same question...

In D9007#134994, @pulkit wrote:

It still does not feels good to me. In case of hg merge, we will like to show both parents even after conflicts are resolved. Showing a single parent might make user do hg commit.

In D9007#135063, @marmoute wrote:

Does this affect all merge (especially hg merge) ? or just the one where the working copy has only one parent?

No, this does not affect hg merge. After hg merge, the dirstate will have two parents, so we show two '@' symbols in the graph. The '%' has lower precedence and only shows up if it's on a node that's different from the '@' node(s).

marmoute accepted this revision.Sep 12 2020, 6:01 AM

Sounds good then :-)

marmoute added a comment.Sep 12 2020, 6:01 AM

(maybe update the description to state this since this is a common question)

martinvonz edited the summary of this revision. (Show Details)Sep 12 2020, 2:30 PM
martinvonz added a comment.Sep 12 2020, 2:30 PM
In D9007#135103, @marmoute wrote:

(maybe update the description to state this since this is a common question)

Yes, makes sense. Done.

pulkit accepted this revision.Sep 14 2020, 3:06 AM
In D9007#135064, @martinvonz wrote:

Since you both ask basically the same question...

In D9007#134994, @pulkit wrote:

It still does not feels good to me. In case of hg merge, we will like to show both parents even after conflicts are resolved. Showing a single parent might make user do hg commit.

! In D9007#135063, @marmoute wrote:

Does this affect all merge (especially hg merge) ? or just the one where the working copy has only one parent?

No, this does not affect hg merge. After hg merge, the dirstate will have two parents, so we show two '@' symbols in the graph. The '%' has lower precedence and only shows up if it's on a node that's different from the '@' node(s).

Oh, I see.

This revision is now accepted and ready to land.Sep 14 2020, 3:06 AM

Revision Contents
Changeset List

Diff 22633

mercurial/templatekw.py

if ctx.node() in wpnodes: if ctx.node() in wpnodes:
return b'@' return b'@'
else: else:
merge_nodes = cache.get(b'merge_nodes') merge_nodes = cache.get(b'merge_nodes')
if merge_nodes is None: if merge_nodes is None:
from . import mergestate as mergestatemod from . import mergestate as mergestatemod
mergestate = mergestatemod.mergestate.read(repo) mergestate = mergestatemod.mergestate.read(repo)
if mergestate.active(): if mergestate.unresolvedcount():
merge_nodes = (mergestate.local, mergestate.other) merge_nodes = (mergestate.local, mergestate.other)
else: else:
merge_nodes = () merge_nodes = ()
cache[b'merge_nodes'] = merge_nodes cache[b'merge_nodes'] = merge_nodes
if ctx.node() in merge_nodes: if ctx.node() in merge_nodes:
return b'%' return b'%'
return b'' return b''

tests/test-graft-interrupted.t

(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
grafting 3:09e253b87e17 "A in file a" grafting 3:09e253b87e17 "A in file a"
$ hg log -GT "{rev}:{node|short} {desc}\n" $ hg log -GT "{rev}:{node|short} {desc}\n"
@ 4:2aa9ad1006ff B in file a @ 4:2aa9ad1006ff B in file a
| |
| % 3:09e253b87e17 A in file a | o 3:09e253b87e17 A in file a
| | | |
| o 2:d36c0562f908 c | o 2:d36c0562f908 c
| | | |
o | 1:d2ae7f538514 b o | 1:d2ae7f538514 b
|/ |/
o 0:cb9a9f314b8b a o 0:cb9a9f314b8b a
$ hg diff $ hg diff
+++ b/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-B -B
+A +A
$ hg log -GT "{rev}:{node|short} {desc}\n" $ hg log -GT "{rev}:{node|short} {desc}\n"
@ 4:2aa9ad1006ff B in file a @ 4:2aa9ad1006ff B in file a
| |
| % 3:09e253b87e17 A in file a | o 3:09e253b87e17 A in file a
| | | |
| o 2:d36c0562f908 c | o 2:d36c0562f908 c
| | | |
o | 1:d2ae7f538514 b o | 1:d2ae7f538514 b
|/ |/
o 0:cb9a9f314b8b a o 0:cb9a9f314b8b a
$ hg up -qC $ hg up -qC
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000 +++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+c +c
$ hg log -GT "{rev}:{node|short} {desc}\n" $ hg log -GT "{rev}:{node|short} {desc}\n"
@ 4:2aa9ad1006ff B in file a @ 4:2aa9ad1006ff B in file a
| |
| % 3:09e253b87e17 A in file a | o 3:09e253b87e17 A in file a
| | | |
| o 2:d36c0562f908 c | o 2:d36c0562f908 c
| | | |
o | 1:d2ae7f538514 b o | 1:d2ae7f538514 b
|/ |/
o 0:cb9a9f314b8b a o 0:cb9a9f314b8b a
$ hg up -qC $ hg up -qC

tests/test-rebase-collapse.t

(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ HGEDITOR=false hg rebase --continue --config ui.interactive=1 $ HGEDITOR=false hg rebase --continue --config ui.interactive=1
already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185 already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185
rebasing 3:63668d570d21 "C" (C tip) rebasing 3:63668d570d21 "C" (C tip)
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [255]
$ hg tglog $ hg tglog
% 3: 63668d570d21 'C' o 3: 63668d570d21 'C'
| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
| | | |
o | 1: f899f3910ce7 'B' o | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ hg rebase --continue $ hg rebase --continue
already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185 already rebased 1:f899f3910ce7 "B" (B) as 82b8abf9c185
already rebased 3:63668d570d21 "C" (C tip) as 82b8abf9c185 already rebased 3:63668d570d21 "C" (C tip) as 82b8abf9c185
saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg