mercurial-scm/hg: mercurial/debugcommands.py comparison

comparison mercurial/debugcommands.py @ 44396:acbfa31cfaf2

debugmergestate: make templated Our IntelliJ team wants to be able to read the merge state in order to help the user resolve merge conflicts. They had so far been reading file contents from p1() and p2() and their merge base. That is not ideal for several reasons (merge base is not necessarily the "graft base", renames are not handled, commands like `hg update -m` is not handled). It will get especially bad as of my D7827. This patch makes the output s a templated. I haven't bothered to make it complete (e.g. merge driver states are not handled), but it's probably good enough as a start. I've done a web search for "debugmergestate" and I can't find any indication that any tools currently rely on its output. If it turns out that we get bug reports for it once this is released, I won't object to backing this patch out on the stable branch (and then perhaps replace it by a separate command, or put it behind a new flag). The changes in test-backout.t are interesting, in particular this: ``` - other path: foo (node not stored in v1 format) + other path: (node foo) ``` I wonder if that means that we actually read v1 format incorrectly. That seems to be an old format that was switched away from in 2014, so it doesn't matter now anyway. Differential Revision: https://phab.mercurial-scm.org/D8120

author	Martin von Zweigbergk <martinvonz@google.com>
date	Thu, 13 Feb 2020 21:14:20 -0800
parents	f7459da77f23
children	f82d2d4e71db

comparison

equal deleted inserted replaced

-:382f4f09f0bd
+:acbfa31cfaf2
 from .i18n import _
 from .node import (
 bin,
 hex,
-nullhex,
 nullid,
 nullrev,
 short,
 )
 from .pycompat import (
 _(b'total cache data size %s, on-disk %s\n')
 % (util.bytecount(totalsize), util.bytecount(ondisk))
 )
-@command(b'debugmergestate', [], b'')
+@command(b'debugmergestate', [] + cmdutil.templateopts, b'')
-def debugmergestate(ui, repo, *args):
+def debugmergestate(ui, repo, *args, **opts):
 """print merge state
 Use --verbose to print out information about whether v1 or v2 merge state
 was chosen."""
-def _hashornull(h):
+if ui.verbose:
-if h == nullhex:
+ms = mergemod.mergestate(repo)
-return b'null'
+# sort so that reasonable information is on top
+v1records = ms._readrecordsv1()
+v2records = ms._readrecordsv2()
+if not v1records and not v2records:
+pass
+elif not v2records:
+ui.writenoi18n(b'no version 2 merge state\n')
+elif ms._v1v2match(v1records, v2records):
+ui.writenoi18n(b'v1 and v2 states match: using v2\n')
 else:
-return h
+ui.writenoi18n(b'v1 and v2 states mismatch: using v1\n')
-def printrecords(version):
+opts = pycompat.byteskwargs(opts)
-ui.writenoi18n(b'* version %d records\n' % version)
+if not opts[b'template']:
-if version == 1:
+opts[b'template'] = (
-records = v1records
+b'{if(commits, "", "no merge state found\n")}'
-else:
+b'{commits % "{name}{if(label, " ({label})")}: {node}\n"}'
-records = v2records
+b'{files % "file: {path} (state \\"{state}\\")\n'
+b'{if(local_path, "'
-for rtype, record in records:
+b'  local path: {local_path} (hash {local_key}, flags \\"{local_flags}\\")\n'
-# pretty print some record types
+b'  ancestor path: {ancestor_path} (node {ancestor_node})\n'
-if rtype == b'L':
+b'  other path: {other_path} (node {other_node})\n'
-ui.writenoi18n(b'local: %s\n' % record)
+b'")}'
-elif rtype == b'O':
+b'{if(rename_side, "'
-ui.writenoi18n(b'other: %s\n' % record)
+b'  rename side: {rename_side}\n'
-elif rtype == b'm':
+b'  renamed path: {renamed_path}\n'
-driver, mdstate = record.split(b'\0', 1)
+b'")}'
-ui.writenoi18n(
+b'{extras % "  extra: {key} = {value}\n"}'
-b'merge driver: %s (state "%s")\n' % (driver, mdstate)
+b'"}'
 )
-elif rtype in b'FDC':
-r = record.split(b'\0')
+ms = mergemod.mergestate.read(repo)
-f, state, hash, lfile, afile, anode, ofile = r[0:7]
-if version == 1:
+fm = ui.formatter(b'debugmergestate', opts)
-onode = b'not stored in v1 format'
+fm.startitem()
-flags = r[7]
-else:
+fm_commits = fm.nested(b'commits')
-onode, flags = r[7:9]
+if ms.active():
-ui.writenoi18n(
+for name, node, label_index in (
-b'file: %s (record type "%s", state "%s", hash %s)\n'
+(b'local', ms.local, 0),
-% (f, rtype, state, _hashornull(hash))
+(b'other', ms.other, 1),
-)
+):
-ui.writenoi18n(
+fm_commits.startitem()
-b'  local path: %s (flags "%s")\n' % (lfile, flags)
+fm_commits.data(name=name)
-)
+fm_commits.data(node=hex(node))
-ui.writenoi18n(
+if ms._labels and len(ms._labels) > label_index:
-b'  ancestor path: %s (node %s)\n'
+fm_commits.data(label=ms._labels[label_index])
-% (afile, _hashornull(anode))
+fm_commits.end()
-)
-ui.writenoi18n(
+fm_files = fm.nested(b'files')
-b'  other path: %s (node %s)\n'
+if ms.active():
-% (ofile, _hashornull(onode))
+for f in ms:
-)
+fm_files.startitem()
-elif rtype == b'f':
+fm_files.data(path=f)
-filename, rawextras = record.split(b'\0', 1)
+state = ms._state[f]
-extras = rawextras.split(b'\0')
+fm_files.data(state=state[0])
-i = 0
+if state[0] in (
-extrastrings = []
+mergemod.MERGE_RECORD_UNRESOLVED,
-while i < len(extras):
+mergemod.MERGE_RECORD_RESOLVED,
-extrastrings.append(b'%s = %s' % (extras[i], extras[i + 1]))
+):
-i += 2
+fm_files.data(local_key=state[1])
+fm_files.data(local_path=state[2])
-ui.writenoi18n(
+fm_files.data(ancestor_path=state[3])
-b'file extras: %s (%s)\n'
+fm_files.data(ancestor_node=state[4])
-% (filename, b', '.join(extrastrings))
+fm_files.data(other_path=state[5])
-)
+fm_files.data(other_node=state[6])
-elif rtype == b'l':
+fm_files.data(local_flags=state[7])
-labels = record.split(b'\0', 2)
+elif state[0] in (
-labels = [l for l in labels if len(l) > 0]
+mergemod.MERGE_RECORD_UNRESOLVED_PATH,
-ui.writenoi18n(b'labels:\n')
+mergemod.MERGE_RECORD_RESOLVED_PATH,
-ui.write((b'  local: %s\n' % labels[0]))
+):
-ui.write((b'  other: %s\n' % labels[1]))
+fm_files.data(renamed_path=state[1])
-if len(labels) > 2:
+fm_files.data(rename_side=state[2])
-ui.write((b'  base:  %s\n' % labels[2]))
+fm_extras = fm_files.nested(b'extras')
-else:
+for k, v in ms.extras(f).items():
-ui.writenoi18n(
+fm_extras.startitem()
-b'unrecognized entry: %s\t%s\n'
+fm_extras.data(key=k)
-% (rtype, record.replace(b'\0', b'\t'))
+fm_extras.data(value=v)
-)
+fm_extras.end()
-# Avoid mergestate.read() since it may raise an exception for unsupported
+fm_files.end()
-# merge state records. We shouldn't be doing this, but this is OK since this
-# command is pretty low-level.
+fm.end()
-ms = mergemod.mergestate(repo)
-# sort so that reasonable information is on top
-v1records = ms._readrecordsv1()
-v2records = ms._readrecordsv2()
-order = b'LOml'
-def key(r):
-idx = order.find(r[0])
-if idx == -1:
-return (1, r[1])
-else:
-return (0, idx)
-v1records.sort(key=key)
-v2records.sort(key=key)
-if not v1records and not v2records:
-ui.writenoi18n(b'no merge state found\n')
-elif not v2records:
-ui.notenoi18n(b'no version 2 merge state\n')
-printrecords(1)
-elif ms._v1v2match(v1records, v2records):
-ui.notenoi18n(b'v1 and v2 states match: using v2\n')
-printrecords(2)
-else:
-ui.notenoi18n(b'v1 and v2 states mismatch: using v1\n')
-printrecords(1)
-if ui.verbose:
-printrecords(2)
 @command(b'debugnamecomplete', [], _(b'NAME...'))
 def debugnamecomplete(ui, repo, *args):
 '''complete "names" - tags, open branch names, bookmark names'''

Mercurial > public > mercurial-scm > hg

comparison mercurial/debugcommands.py @ 44396:acbfa31cfaf2