This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11453

log: if there is a merge state, show conflictother for . [WIP]
Needs RevisionPublic

Authored by joerg.sonnenberger on Sep 18 2021, 7:47 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers

Diff Detail

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

Event Timeline

Alphare added a subscriber: Alphare.Sep 20 2021, 4:58 AM

That looks like a good quality of life improvement!

martinvonz requested changes to this revision.Sep 21 2021, 12:50 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
tests/test-shelve.t
1420–1432

Hmm, I feel like the label should instead be a boolean (or two) indicating whether the commit is in the conflictother() or conflictlocal() revsets. This might then look like this:

@  changeset:   5:f1d5f53e397b
|  tag:         tip
|  parent:      3:e28fd7fa7938
|  merging:     other
|  user:        shelve@localhost
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     changes to: add A to bars
|
| @  changeset:   4:fe451a778c81
|/   merging:     local
|    user:        test
|    date:        Thu Jan 01 00:00:00 1970 +0000
|    summary:     add C to bars

That may be a good way of helping the user understand what "local" and "other" in the conflict markers mean.

This revision now requires changes to proceed.Sep 21 2021, 12:50 PM

Revision Contents
Changeset List

PathPackages
Mi18n/de.po (2 lines)
Mi18n/ja.po (2 lines)
Mi18n/pt_BR.po (2 lines)
Mmercurial/logcmdutil.py (28 lines)
Mmercurial/templatekw.py (1 line)
Mtests/test-backout.t (2 lines)
Mtests/test-merge7.t (1 line)
Mtests/test-parents.t (1 line)
Mtests/test-shelve.t (3 lines)

Diff 30296

i18n/de.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
"copies: %s\n" "copies: %s\n"
"date: %s\n" "date: %s\n"
"extra: %s=%s\n" "extra: %s=%s\n"
"files+: %s\n" "files+: %s\n"
"files-: %s\n" "files-: %s\n"
"files: %s\n" "files: %s\n"
"instability: %s\n" "instability: %s\n"
"manifest: %s\n" "manifest: %s\n"
"merging: %s\n"
"obsolete: %s\n" "obsolete: %s\n"
"parent: %s\n" "parent: %s\n"
"phase: %s\n" "phase: %s\n"
"summary: %s\n" "summary: %s\n"
"tag: %s\n" "tag: %s\n"
"user: %s\n" "user: %s\n"
msgstr "" msgstr ""
"Lesezeichen: %s\n" "Lesezeichen: %s\n"
"Zweig: %s\n" "Zweig: %s\n"
"Änderung: %s\n" "Änderung: %s\n"
"Kopien: %s\n" "Kopien: %s\n"
"Datum: %s\n" "Datum: %s\n"
"Extra: %s=%s\n" "Extra: %s=%s\n"
"Dateien+: %s\n" "Dateien+: %s\n"
"Dateien-: %s\n" "Dateien-: %s\n"
"Dateien: %s\n" "Dateien: %s\n"
"instability: %s\n" "instability: %s\n"
"Manifest: %s\n" "Manifest: %s\n"
"Zusammenführen: %s\n"
"obsolete: %s\n" "obsolete: %s\n"
"Vorgänger: %s\n" "Vorgänger: %s\n"
"Phase: %s\n" "Phase: %s\n"
"Zusammenfassung: %s\n" "Zusammenfassung: %s\n"
"Marke: %s\n" "Marke: %s\n"
"Nutzer: %s\n" "Nutzer: %s\n"
msgid ":author: String. The unmodified author of the changeset." msgid ":author: String. The unmodified author of the changeset."

i18n/ja.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
"copies: %s\n" "copies: %s\n"
"date: %s\n" "date: %s\n"
"extra: %s=%s\n" "extra: %s=%s\n"
"files+: %s\n" "files+: %s\n"
"files-: %s\n" "files-: %s\n"
"files: %s\n" "files: %s\n"
"instability: %s\n" "instability: %s\n"
"manifest: %s\n" "manifest: %s\n"
"merging: %s\n"
"obsolete: %s\n" "obsolete: %s\n"
"parent: %s\n" "parent: %s\n"
"phase: %s\n" "phase: %s\n"
"summary: %s\n" "summary: %s\n"
"tag: %s\n" "tag: %s\n"
"user: %s\n" "user: %s\n"
msgstr "" msgstr ""
"ブックマーク: %s\n" "ブックマーク: %s\n"
"ブランチ: %s\n" "ブランチ: %s\n"
"リビジョン: %s\n" "リビジョン: %s\n"
"コピー: %s\n" "コピー: %s\n"
"日付: %s\n" "日付: %s\n"
"その他: %s=%s\n" "その他: %s=%s\n"
"ファイル追加: %s\n" "ファイル追加: %s\n"
"ファイル削除: %s\n" "ファイル削除: %s\n"
"ファイル: %s\n" "ファイル: %s\n"
"不定性: %s\n" "不定性: %s\n"
"manifest参照: %s\n" "manifest参照: %s\n"
"merging: %s\n"
"廃止: %s\n" "廃止: %s\n"
"親リビジョン: %s\n" "親リビジョン: %s\n"
"フェーズ: %s\n" "フェーズ: %s\n"
"要約: %s\n" "要約: %s\n"
"タグ: %s\n" "タグ: %s\n"
"ユーザ: %s\n" "ユーザ: %s\n"
msgid ":author: String. The unmodified author of the changeset." msgid ":author: String. The unmodified author of the changeset."

i18n/pt_BR.po

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
"copies: %s\n" "copies: %s\n"
"date: %s\n" "date: %s\n"
"extra: %s=%s\n" "extra: %s=%s\n"
"files+: %s\n" "files+: %s\n"
"files-: %s\n" "files-: %s\n"
"files: %s\n" "files: %s\n"
"instability: %s\n" "instability: %s\n"
"manifest: %s\n" "manifest: %s\n"
"merging: %s\n"
"obsolete: %s\n" "obsolete: %s\n"
"parent: %s\n" "parent: %s\n"
"phase: %s\n" "phase: %s\n"
"summary: %s\n" "summary: %s\n"
"tag: %s\n" "tag: %s\n"
"user: %s\n" "user: %s\n"
msgstr "" msgstr ""
"marcador: %s\n" "marcador: %s\n"
"ramo: %s\n" "ramo: %s\n"
"revisão: %s\n" "revisão: %s\n"
"cópias: %s\n" "cópias: %s\n"
"data: %s\n" "data: %s\n"
"extra: %s=%s\n" "extra: %s=%s\n"
"arquivos+: %s\n" "arquivos+: %s\n"
"arquivos-: %s\n" "arquivos-: %s\n"
"arquivos: %s\n" "arquivos: %s\n"
"instabilidade: %s\n" "instabilidade: %s\n"
"manifesto: %s\n" "manifesto: %s\n"
"merging: %s\n"
"obsolescência: %s\n" "obsolescência: %s\n"
"pai: %s\n" "pai: %s\n"
"fase: %s\n" "fase: %s\n"
"sumário: %s\n" "sumário: %s\n"
"etiqueta: %s\n" "etiqueta: %s\n"
"usuário: %s\n" "usuário: %s\n"
msgid ":author: String. The unmodified author of the changeset." msgid ":author: String. The unmodified author of the changeset."

mercurial/logcmdutil.py

self._diffopts = patch.diffallopts(ui, diffopts) self._diffopts = patch.diffallopts(ui, diffopts)
self._includestat = diffopts and diffopts.get(b'stat') self._includestat = diffopts and diffopts.get(b'stat')
self._includediff = diffopts and diffopts.get(b'patch') self._includediff = diffopts and diffopts.get(b'patch')
self.header = {} self.header = {}
self.hunk = {} self.hunk = {}
self.lastheader = None self.lastheader = None
self.footer = None self.footer = None
self._columns = templatekw.getlogcolumns() self._columns = templatekw.getlogcolumns()
self._currentchangeset = repo[b'.']
def flush(self, ctx): def flush(self, ctx):
rev = ctx.rev() rev = ctx.rev()
if rev in self.header: if rev in self.header:
h = self.header[rev] h = self.header[rev]
if h != self.lastheader: if h != self.lastheader:
self.lastheader = h self.lastheader = h
self.ui.write(h) self.ui.write(h)
columns[b'phase'] % ctx.phasestr(), label=b'log.phase' columns[b'phase'] % ctx.phasestr(), label=b'log.phase'
) )
for pctx in scmutil.meaningfulparents(self.repo, ctx): for pctx in scmutil.meaningfulparents(self.repo, ctx):
label = b'log.parent changeset.%s' % pctx.phasestr() label = b'log.parent changeset.%s' % pctx.phasestr()
self.ui.write( self.ui.write(
columns[b'parent'] % scmutil.formatchangeid(pctx), label=label columns[b'parent'] % scmutil.formatchangeid(pctx), label=label
) )
merging = self._getmerging(ctx)
if merging:
self.ui.write(
columns[b'merging'] % scmutil.formatchangeid(merging),
label='log.merging',
)
if self.ui.debugflag: if self.ui.debugflag:
mnode = ctx.manifestnode() mnode = ctx.manifestnode()
if mnode is None: if mnode is None:
mnode = self.repo.nodeconstants.wdirid mnode = self.repo.nodeconstants.wdirid
mrev = wdirrev mrev = wdirrev
else: else:
mrev = self.repo.manifestlog.rev(mnode) mrev = self.repo.manifestlog.rev(mnode)
self.ui.write( self.ui.write(
self.ui.write( self.ui.write(
columns[b'summary'] % description.splitlines()[0], columns[b'summary'] % description.splitlines()[0],
label=b'log.summary', label=b'log.summary',
) )
self.ui.write(b"\n") self.ui.write(b"\n")
self._showpatch(ctx, graphwidth) self._showpatch(ctx, graphwidth)
def _getmerging(self, ctx):
if ctx != self._currentchangeset:
return None
from . import mergestate as mergestatemod
mergestate = mergestatemod.mergestate.read(self.repo)
if not mergestate.active():
return None
try:
other = mergestate.otherctx
except KeyError:
return None
if other != ctx:
return other
return None
def _showobsfate(self, ctx): def _showobsfate(self, ctx):
# TODO: do not depend on templater # TODO: do not depend on templater
tres = formatter.templateresources(self.repo.ui, self.repo) tres = formatter.templateresources(self.repo.ui, self.repo)
t = formatter.maketemplater( t = formatter.maketemplater(
self.repo.ui, self.repo.ui,
b'{join(obsfate, "\n")}', b'{join(obsfate, "\n")}',
defaults=templatekw.keywords, defaults=templatekw.keywords,
resources=tres, resources=tres,
): ):
files = ctx.p1().status(ctx) files = ctx.p1().status(ctx)
fm.data( fm.data(
modified=fm.formatlist(files.modified, name=b'file'), modified=fm.formatlist(files.modified, name=b'file'),
added=fm.formatlist(files.added, name=b'file'), added=fm.formatlist(files.added, name=b'file'),
removed=fm.formatlist(files.removed, name=b'file'), removed=fm.formatlist(files.removed, name=b'file'),
) )
merging = self._getmerging(ctx)
if merging:
fm.data(merging=fm.hexfunc(merging.node()))
verbose = not self.ui.debugflag and self.ui.verbose verbose = not self.ui.debugflag and self.ui.verbose
if verbose or b'files' in datahint: if verbose or b'files' in datahint:
fm.data(files=fm.formatlist(ctx.files(), name=b'file')) fm.data(files=fm.formatlist(ctx.files(), name=b'file'))
if verbose and copies or b'copies' in datahint: if verbose and copies or b'copies' in datahint:
fm.data( fm.data(
copies=fm.formatdict(copies or {}, key=b'name', value=b'source') copies=fm.formatdict(copies or {}, key=b'name', value=b'source')
) )

mercurial/templatekw.py

b'copies: %s\n' b'copies: %s\n'
b'date: %s\n' b'date: %s\n'
b'extra: %s=%s\n' b'extra: %s=%s\n'
b'files+: %s\n' b'files+: %s\n'
b'files-: %s\n' b'files-: %s\n'
b'files: %s\n' b'files: %s\n'
b'instability: %s\n' b'instability: %s\n'
b'manifest: %s\n' b'manifest: %s\n'
b'merging: %s\n'
b'obsolete: %s\n' b'obsolete: %s\n'
b'parent: %s\n' b'parent: %s\n'
b'phase: %s\n' b'phase: %s\n'
b'summary: %s\n' b'summary: %s\n'
b'tag: %s\n' b'tag: %s\n'
b'user: %s\n' b'user: %s\n'
) )
return dict( return dict(

tests/test-backout.t

ypples ypples
branch: default branch: default
commit: 1 unresolved (clean) commit: 1 unresolved (clean)
update: (current) update: (current)
phases: 5 draft phases: 5 draft
$ hg log -G $ hg log -G
@ changeset: 4:ed99997b793d @ changeset: 4:ed99997b793d
| tag: tip | tag: tip
| merging: 1:22cb4f70d813
| user: test | user: test
| date: Thu Jan 01 00:00:05 1970 +0000 | date: Thu Jan 01 00:00:05 1970 +0000
| summary: ypples | summary: ypples
| |
o changeset: 3:1c2161e97c0a o changeset: 3:1c2161e97c0a
| user: test | user: test
| 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
capital ten capital ten
branch: default branch: default
commit: 1 unresolved (clean) commit: 1 unresolved (clean)
update: (current) update: (current)
phases: 3 draft phases: 3 draft
$ hg log -G $ hg log -G
@ changeset: 2:b71750c4b0fd @ changeset: 2:b71750c4b0fd
| tag: tip | tag: tip
| merging: 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: 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

tests/test-merge7.t

parent: 2:96b70246a118 parent: 2:96b70246a118
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: two -> two-point-one summary: two -> two-point-one
changeset: 3:50c3a7e29886 changeset: 3:50c3a7e29886
parent: 1:d1e159716d41 parent: 1:d1e159716d41
parent: 2:96b70246a118 parent: 2:96b70246a118
merging: 4:40d11a4173a8
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Merge 1 summary: Merge 1
changeset: 2:96b70246a118 changeset: 2:96b70246a118
parent: 0:b1832b9d912a parent: 0:b1832b9d912a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000

tests/test-parents.t

merge working dir with 2 parents, hg parents c merge working dir with 2 parents, hg parents c
$ HGMERGE=true hg merge $ HGMERGE=true hg merge
merging c merging c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg parents c $ hg parents c
changeset: 3:02d851b7e549 changeset: 3:02d851b7e549
merging: 4:48cee28d4b4e
user: test user: test
date: Thu Jan 01 00:00:03 1970 +0000 date: Thu Jan 01 00:00:03 1970 +0000
summary: c summary: c
changeset: 4:48cee28d4b4e changeset: 4:48cee28d4b4e
tag: tip tag: tip
parent: 1:d786049f033a parent: 1:d786049f033a
user: test user: test

tests/test-shelve.t

$ cat bar1 $ cat bar1
A A
B B
C C
#if stripbased #if stripbased
$ hg log -r 3:: -G $ hg log -r 3:: -G
@ changeset: 5:f1d5f53e397b @ changeset: 5:f1d5f53e397b
| tag: tip | tag: tip
| parent: 3:e28fd7fa7938 | parent: 3:e28fd7fa7938
| user: shelve@localhost | user: shelve@localhost
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: changes to: add A to bars | summary: changes to: add A to bars
| |
| @ changeset: 4:fe451a778c81 | @ changeset: 4:fe451a778c81
|/ user: test |/ merging: 5:f1d5f53e397b
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: add C to bars | summary: add C to bars
| |
martinvonzUnsubmitted
Not Done

Hmm, I feel like the label should instead be a boolean (or two) indicating whether the commit is in the conflictother() or conflictlocal() revsets. This might then look like this:

@  changeset:   5:f1d5f53e397b
|  tag:         tip
|  parent:      3:e28fd7fa7938
|  merging:     other
|  user:        shelve@localhost
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     changes to: add A to bars
|
| @  changeset:   4:fe451a778c81
|/   merging:     local
|    user:        test
|    date:        Thu Jan 01 00:00:00 1970 +0000
|    summary:     add C to bars

That may be a good way of helping the user understand what "local" and "other" in the conflict markers mean.

martinvonz: Hmm, I feel like the label should instead be a boolean (or two) indicating whether the commit…
o changeset: 3:e28fd7fa7938 o changeset: 3:e28fd7fa7938
| user: test | user: test
~ date: Thu Jan 01 00:00:00 1970 +0000 ~ date: Thu Jan 01 00:00:00 1970 +0000
summary: add A to bars summary: add A to bars
#endif #endif
$ hg unshelve --continue <<EOF $ hg unshelve --continue <<EOF