( )⚙ D8043 graphlog: use '%' for other context in merge conflict

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8043

graphlog: use '%' for other context in merge conflict
ClosedPublic

Authored by martinvonz on Jan 29 2020, 7:56 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG14d0e89520a2: graphlog: use '%' for other context in merge conflict
Summary

This lets the user more easily find the commit that is involved in the
conflict, such as the source of hg update -m or the commit being
grafted by hg graft.

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.Jan 29 2020, 7:56 PM
martinvonz retitled this revision from graphlog: use '@' also for other context in merge conflict to graphlog: use '%' for other context in merge conflict.Jan 30 2020, 11:57 AM
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 19723.
martinvonz updated this revision to Diff 19870.Feb 4 2020, 12:13 PM
martinvonz updated this revision to Diff 20095.Feb 10 2020, 7:22 PM
durin42 accepted this revision.Feb 10 2020, 9:16 PM
This revision is now accepted and ready to land.Feb 10 2020, 9:16 PM
martinvonz added a commit: rHG14d0e89520a2: graphlog: use '%' for other context in merge conflict.Feb 10 2020, 9:23 PM
Closed by commit rHG14d0e89520a2: graphlog: use '%' for other context in merge conflict (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 20135

hgext/beautifygraph.py

def getprettygraphnode(orig, *args, **kwargs): def getprettygraphnode(orig, *args, **kwargs):
node = orig(*args, **kwargs) node = orig(*args, **kwargs)
if node == b'o': if node == b'o':
return b'\xE2\x97\x8B' # U+25CB ○ return b'\xE2\x97\x8B' # U+25CB ○
if node == b'@': if node == b'@':
return b'\xE2\x97\x8D' # U+25CD ◍ return b'\xE2\x97\x8D' # U+25CD ◍
if node == b'%':
return b'\xE2\x97\x8D' # U+25CE ◎
if node == b'*': if node == b'*':
return b'\xE2\x88\x97' # U+2217 ∗ return b'\xE2\x88\x97' # U+2217 ∗
if node == b'x': if node == b'x':
return b'\xE2\x97\x8C' # U+25CC ◌ return b'\xE2\x97\x8C' # U+25CC ◌
if node == b'_': if node == b'_':
return b'\xE2\x95\xA4' # U+2564 ╤ return b'\xE2\x95\xA4' # U+2564 ╤
return node return node

mercurial/hgweb/webutil.py

repo.ui.warn( repo.ui.warn(
_(b"websub: invalid regexp for %s: %s\n") % (key, regexp) _(b"websub: invalid regexp for %s: %s\n") % (key, regexp)
) )
return websubtable return websubtable
def getgraphnode(repo, ctx): def getgraphnode(repo, ctx):
return templatekw.getgraphnodecurrent( return templatekw.getgraphnodecurrent(
repo, ctx repo, ctx, {}
) + templatekw.getgraphnodesymbol(ctx) ) + templatekw.getgraphnodesymbol(ctx)

mercurial/logcmdutil.py

# reuse cache of slow templates # reuse cache of slow templates
tres = displayer._tresources tres = displayer._tresources
else: else:
tres = formatter.templateresources(ui) tres = formatter.templateresources(ui)
templ = formatter.maketemplater( templ = formatter.maketemplater(
ui, spec, defaults=templatekw.keywords, resources=tres ui, spec, defaults=templatekw.keywords, resources=tres
) )
def formatnode(repo, ctx): def formatnode(repo, ctx, cache):
props = {b'ctx': ctx, b'repo': repo} props = {b'ctx': ctx, b'repo': repo}
return templ.renderdefault(props) return templ.renderdefault(props)
return formatnode return formatnode
def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None): def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None):
props = props or {} props = props or {}
b'experimental', b'graphstyle.%s' % name, styles[key] b'experimental', b'graphstyle.%s' % name, styles[key]
) )
if not styles[key]: if not styles[key]:
styles[key] = None styles[key] = None
# experimental config: experimental.graphshorten # experimental config: experimental.graphshorten
state.graphshorten = ui.configbool(b'experimental', b'graphshorten') state.graphshorten = ui.configbool(b'experimental', b'graphshorten')
formatnode_cache = {}
for rev, type, ctx, parents in dag: for rev, type, ctx, parents in dag:
char = formatnode(repo, ctx) char = formatnode(repo, ctx, formatnode_cache)
copies = getcopies(ctx) if getcopies else None copies = getcopies(ctx) if getcopies else None
edges = edgefn(type, char, state, rev, parents) edges = edgefn(type, char, state, rev, parents)
firstedge = next(edges) firstedge = next(edges)
width = firstedge[2] width = firstedge[2]
displayer.show( displayer.show(
ctx, copies=copies, graphwidth=width, **pycompat.strkwargs(props) ctx, copies=copies, graphwidth=width, **pycompat.strkwargs(props)
) )
lines = displayer.hunk.pop(rev).split(b'\n') lines = displayer.hunk.pop(rev).split(b'\n')

mercurial/templatekw.py

def showfiles(context, mapping): def showfiles(context, mapping):
"""List of strings. All files modified, added, or removed by this """List of strings. All files modified, added, or removed by this
changeset. changeset.
""" """
ctx = context.resource(mapping, b'ctx') ctx = context.resource(mapping, b'ctx')
return templateutil.compatfileslist(context, mapping, b'file', ctx.files()) return templateutil.compatfileslist(context, mapping, b'file', ctx.files())
@templatekeyword(b'graphnode', requires={b'repo', b'ctx'}) @templatekeyword(b'graphnode', requires={b'repo', b'ctx', b'cache'})
def showgraphnode(context, mapping): def showgraphnode(context, mapping):
"""String. The character representing the changeset node in an ASCII """String. The character representing the changeset node in an ASCII
revision graph.""" revision graph."""
repo = context.resource(mapping, b'repo') repo = context.resource(mapping, b'repo')
ctx = context.resource(mapping, b'ctx') ctx = context.resource(mapping, b'ctx')
return getgraphnode(repo, ctx) cache = context.resource(mapping, b'cache')
return getgraphnode(repo, ctx, cache)
def getgraphnode(repo, ctx): def getgraphnode(repo, ctx, cache):
return getgraphnodecurrent(repo, ctx) or getgraphnodesymbol(ctx) return getgraphnodecurrent(repo, ctx, cache) or getgraphnodesymbol(ctx)
def getgraphnodecurrent(repo, ctx): def getgraphnodecurrent(repo, ctx, cache):
wpnodes = repo.dirstate.parents() wpnodes = repo.dirstate.parents()
if wpnodes[1] == nullid: if wpnodes[1] == nullid:
wpnodes = wpnodes[:1] wpnodes = wpnodes[:1]
if ctx.node() in wpnodes: if ctx.node() in wpnodes:
return b'@' return b'@'
else: else:
merge_nodes = cache.get(b'merge_nodes', ())
if not merge_nodes:
from . import merge
mergestate = merge.mergestate.read(repo)
if mergestate.active():
merge_nodes = (mergestate.local, mergestate.other)
cache[b'merge_nodes'] = merge_nodes
if ctx.node() in merge_nodes:
return b'%'
return b'' return b''
def getgraphnodesymbol(ctx): def getgraphnodesymbol(ctx):
if ctx.obsolete(): if ctx.obsolete():
return b'x' return b'x'
elif ctx.isunstable(): elif ctx.isunstable():
return b'*' return b'*'

relnotes/next

== New Features == == New Features ==
* `hg purge`/`hg clean` can now delete ignored files instead of * `hg purge`/`hg clean` can now delete ignored files instead of
untracked files, with the new -i flag. untracked files, with the new -i flag.
* New `conflictlocal()` and `conflictother()` revsets returns the * `hg log` now defaults to using an '%' symbol for commits involved
in unresolved merge conflicts. That includes unresolved conflicts
caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
precedence, so what used to be marked '@' still is.
* New `conflictlocal()` and `conflictother()` revsets return the
commits that are being merged, when there are conflicts. Also works commits that are being merged, when there are conflicts. Also works
for conflicts caused by e.g. `hg graft`. for conflicts caused by e.g. `hg graft`.
== New Experimental Features == == New Experimental Features ==
== Bug Fixes == == Bug Fixes ==

tests/test-backout.t

| date: Thu Jan 01 00:00:04 1970 +0000 | date: Thu Jan 01 00:00:04 1970 +0000
| summary: Backed out changeset 22cb4f70d813 | summary: Backed out changeset 22cb4f70d813
| |
o changeset: 2:a8c6e511cfee o changeset: 2:a8c6e511cfee
| user: test | user: test
| date: Thu Jan 01 00:00:02 1970 +0000 | date: Thu Jan 01 00:00:02 1970 +0000
| summary: grapes | summary: grapes
| |
o changeset: 1:22cb4f70d813 % changeset: 1:22cb4f70d813
| user: test | user: test
| date: Thu Jan 01 00:00:01 1970 +0000 | date: Thu Jan 01 00:00:01 1970 +0000
| summary: chair | summary: chair
| |
o changeset: 0:a5cb2dde5805 o changeset: 0:a5cb2dde5805
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: tomatoes summary: tomatoes
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: capital ten | summary: capital ten
| |
o changeset: 1:913609522437 o changeset: 1:913609522437
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: capital three | summary: capital three
| |
o changeset: 0:a30dd8addae3 % changeset: 0:a30dd8addae3
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: initial summary: initial
$ hg resolve --all --debug $ hg resolve --all --debug
picked tool ':merge' for foo (binary False symlink False changedelete False) picked tool ':merge' for foo (binary False symlink False changedelete False)
merging foo merging foo
my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437

tests/test-graft-interrupted.t

warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [255]
$ hg log -GT "{rev}:{node|short} {desc}" $ hg log -GT "{rev}:{node|short} {desc}"
@ 6:6ec71c037d94 added x @ 6:6ec71c037d94 added x
| |
| o 5:36b793615f78 added foo to c | % 5:36b793615f78 added foo to c
| | | |
| | o 4:863a25e1a9ea added x | | o 4:863a25e1a9ea added x
| |/ | |/
o | 3:9150fe93bec6 added d o | 3:9150fe93bec6 added d
| | | |
o | 2:155349b645be added c o | 2:155349b645be added c
|/ |/
o 1:5f6d8a4bf34a added b o 1:5f6d8a4bf34a added b
(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
| |
| o 3:09e253b87e17 A in file a | % 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
| |
| o 3:09e253b87e17 A in file a | % 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
| |
| o 3:09e253b87e17 A in file a | % 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
o 3: 63668d570d21 'C' % 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

tests/test-strip.t

$ hg log --graph $ hg log --graph
@ changeset: 1:76dcf9fab855 @ changeset: 1:76dcf9fab855
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: b | summary: b
| |
o changeset: 0:9ab35a2d17cb % changeset: 0:9ab35a2d17cb
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
$ echo c > b $ echo c > b
$ hg strip tip $ hg strip tip
abort: uncommitted changes abort: uncommitted changes
[255] [255]

tests/test-update-branches.t

0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ hg log -G --template '{rev}:{node|short} {parents} {branches}\n' $ hg log -G --template '{rev}:{node|short} {parents} {branches}\n'
o 5:ff252e8273df b1 o 5:ff252e8273df b1
| |
@ 4:d047485b3896 0:60829823a42a b1 @ 4:d047485b3896 0:60829823a42a b1
| |
| o 3:6efa171f091b 1:0786582aa4b1 | % 3:6efa171f091b 1:0786582aa4b1
| | | |
| | o 2:bd10386d478c | | o 2:bd10386d478c
| |/ | |/
| o 1:0786582aa4b1 | o 1:0786582aa4b1
|/ |/
o 0:60829823a42a o 0:60829823a42a
$ hg st $ hg st