This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8942

debugmergestate: show extras for files which are not in mergestate
ClosedPublic

Authored by pulkit on Aug 24 2020, 10:15 AM.

Details

Reviewers
durin42
marmoute
Group Reviewers
hg-reviewers
Commits
rHG766797f23f77: debugmergestate: show extras for files which are not in mergestate
Summary

With recent changes and future changes, we will like to store extras information
about files which were merged automatically. Hence, we will have merge extras
for files which are not in the mergestate.

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

pulkit created this revision.Aug 24 2020, 10:15 AM
marmoute added a subscriber: marmoute.Aug 26 2020, 12:48 PM

SIlly question: Would it make sense to still like the extra for files we have in the mergestate. And have other line for the file that have extra without being in the mergestate?

pulkit retitled this revision from debugmergestate: don't next `extras` under `files` to debugmergestate: show extras for files which are not in mergestate.Aug 27 2020, 5:38 AM
pulkit edited the summary of this revision. (Show Details)
pulkit added a child revision: D8965: merge: update commitinfo from all mergeresults during bid merge.
pulkit updated this revision to Diff 22475.
marmoute accepted this revision.Sep 11 2020, 8:50 AM

Thanks for the update.

pulkit added a commit: rHG766797f23f77: debugmergestate: show extras for files which are not in mergestate.Sep 11 2020, 11:26 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG766797f23f77: debugmergestate: show extras for files which are not in mergestate (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (13 lines)
Mtests/test-resolve.t (1 line)

Diff 22629

mercurial/debugcommands.py

b' other path: {other_path} (node {other_node})\n' b' other path: {other_path} (node {other_node})\n'
b'")}' b'")}'
b'{if(rename_side, "' b'{if(rename_side, "'
b' rename side: {rename_side}\n' b' rename side: {rename_side}\n'
b' renamed path: {renamed_path}\n' b' renamed path: {renamed_path}\n'
b'")}' b'")}'
b'{extras % " extra: {key} = {value}\n"}' b'{extras % " extra: {key} = {value}\n"}'
b'"}' b'"}'
b'{extras % "extra: {file} ({key} = {value})\n"}'
) )
ms = mergestatemod.mergestate.read(repo) ms = mergestatemod.mergestate.read(repo)
fm = ui.formatter(b'debugmergestate', opts) fm = ui.formatter(b'debugmergestate', opts)
fm.startitem() fm.startitem()
fm_commits = fm.nested(b'commits') fm_commits = fm.nested(b'commits')
for k, v in ms.extras(f).items(): for k, v in ms.extras(f).items():
fm_extras.startitem() fm_extras.startitem()
fm_extras.data(key=k) fm_extras.data(key=k)
fm_extras.data(value=v) fm_extras.data(value=v)
fm_extras.end() fm_extras.end()
fm_files.end() fm_files.end()
fm_extras = fm.nested(b'extras')
for f, d in sorted(pycompat.iteritems(ms._stateextras)):
if f in ms:
# If file is in mergestate, we have already processed it's extras
continue
for k, v in pycompat.iteritems(d):
fm_extras.startitem()
fm_extras.data(file=f)
fm_extras.data(key=k)
fm_extras.data(value=v)
fm_extras.end()
fm.end() fm.end()
@command(b'debugnamecomplete', [], _(b'NAME...')) @command(b'debugnamecomplete', [], _(b'NAME...'))
def debugnamecomplete(ui, repo, *args): def debugnamecomplete(ui, repo, *args):
'''complete "names" - tags, open branch names, bookmark names''' '''complete "names" - tags, open branch names, bookmark names'''
names = set() names = set()

tests/test-resolve.t

U file2 U file2
test json output test json output
$ hg debugmergestate -T json $ hg debugmergestate -T json
[ [
{ {
"commits": [{"label": "working copy", "name": "local", "node": "57653b9f834a4493f7240b0681efcb9ae7cab745"}, {"label": "merge rev", "name": "other", "node": "dc77451844e37f03f5c559e3b8529b2b48d381d1"}], "commits": [{"label": "working copy", "name": "local", "node": "57653b9f834a4493f7240b0681efcb9ae7cab745"}, {"label": "merge rev", "name": "other", "node": "dc77451844e37f03f5c559e3b8529b2b48d381d1"}],
"extras": [],
"files": [{"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file1", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "60b27f004e454aca81b0480209cce5081ec52390", "local_path": "file1", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file1", "path": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "path": "file2", "state": "u"}] "files": [{"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file1", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "60b27f004e454aca81b0480209cce5081ec52390", "local_path": "file1", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file1", "path": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "path": "file2", "state": "u"}]
} }
] ]
insert unsupported mandatory merge record insert unsupported mandatory merge record
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X