[PATCH 2 of 6 V2] debugcommands: move 'debugmergestate' in the new module
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Tue Feb 14 10:29:21 EST 2017
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1485967220 -3600
# Wed Feb 01 17:40:20 2017 +0100
# Node ID e0ef20f46903d4a65f87fc98c3c6894ba6c327fc
# Parent e4aebee497335d7cff13b8df710ad890c4c13f9a
# EXP-Topic debugcommands
debugcommands: move 'debugmergestate' in the new module
diff -r e4aebee49733 -r e0ef20f46903 mercurial/commands.py
--- a/mercurial/commands.py Wed Feb 01 17:39:31 2017 +0100
+++ b/mercurial/commands.py Wed Feb 01 17:40:20 2017 +0100
@@ -19,7 +19,6 @@ from .i18n import _
from .node import (
bin,
hex,
- nullhex,
nullid,
nullrev,
short,
@@ -1863,105 +1862,6 @@ def copy(ui, repo, *pats, **opts):
with repo.wlock(False):
return cmdutil.copy(ui, repo, pats, opts)
- at command('debugmergestate', [], '')
-def debugmergestate(ui, repo, *args):
- """print merge state
-
- Use --verbose to print out information about whether v1 or v2 merge state
- was chosen."""
- def _hashornull(h):
- if h == nullhex:
- return 'null'
- else:
- return h
-
- def printrecords(version):
- ui.write(('* version %s records\n') % version)
- if version == 1:
- records = v1records
- else:
- records = v2records
-
- for rtype, record in records:
- # pretty print some record types
- if rtype == 'L':
- ui.write(('local: %s\n') % record)
- elif rtype == 'O':
- ui.write(('other: %s\n') % record)
- elif rtype == 'm':
- driver, mdstate = record.split('\0', 1)
- ui.write(('merge driver: %s (state "%s")\n')
- % (driver, mdstate))
- elif rtype in 'FDC':
- r = record.split('\0')
- f, state, hash, lfile, afile, anode, ofile = r[0:7]
- if version == 1:
- onode = 'not stored in v1 format'
- flags = r[7]
- else:
- onode, flags = r[7:9]
- ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
- % (f, rtype, state, _hashornull(hash)))
- ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
- ui.write((' ancestor path: %s (node %s)\n')
- % (afile, _hashornull(anode)))
- ui.write((' other path: %s (node %s)\n')
- % (ofile, _hashornull(onode)))
- elif rtype == 'f':
- filename, rawextras = record.split('\0', 1)
- extras = rawextras.split('\0')
- i = 0
- extrastrings = []
- while i < len(extras):
- extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
- i += 2
-
- ui.write(('file extras: %s (%s)\n')
- % (filename, ', '.join(extrastrings)))
- elif rtype == 'l':
- labels = record.split('\0', 2)
- labels = [l for l in labels if len(l) > 0]
- ui.write(('labels:\n'))
- ui.write((' local: %s\n' % labels[0]))
- ui.write((' other: %s\n' % labels[1]))
- if len(labels) > 2:
- ui.write((' base: %s\n' % labels[2]))
- else:
- ui.write(('unrecognized entry: %s\t%s\n')
- % (rtype, record.replace('\0', '\t')))
-
- # Avoid mergestate.read() since it may raise an exception for unsupported
- # merge state records. We shouldn't be doing this, but this is OK since this
- # command is pretty low-level.
- ms = mergemod.mergestate(repo)
-
- # sort so that reasonable information is on top
- v1records = ms._readrecordsv1()
- v2records = ms._readrecordsv2()
- order = '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.write(('no merge state found\n'))
- elif not v2records:
- ui.note(('no version 2 merge state\n'))
- printrecords(1)
- elif ms._v1v2match(v1records, v2records):
- ui.note(('v1 and v2 states match: using v2\n'))
- printrecords(2)
- else:
- ui.note(('v1 and v2 states mismatch: using v1\n'))
- printrecords(1)
- if ui.verbose:
- printrecords(2)
-
@command('debugnamecomplete', [], _('NAME...'))
def debugnamecomplete(ui, repo, *args):
'''complete "names" - tags, open branch names, bookmark names'''
diff -r e4aebee49733 -r e0ef20f46903 mercurial/debugcommands.py
--- a/mercurial/debugcommands.py Wed Feb 01 17:39:31 2017 +0100
+++ b/mercurial/debugcommands.py Wed Feb 01 17:40:20 2017 +0100
@@ -17,6 +17,7 @@ from .i18n import _
from .node import (
bin,
hex,
+ nullhex,
nullid,
short,
)
@@ -36,6 +37,7 @@ from . import (
hg,
localrepo,
lock as lockmod,
+ merge as mergemod,
policy,
pycompat,
repair,
@@ -1041,6 +1043,105 @@ def debuglabelcomplete(ui, repo, *args):
'''backwards compatibility with old bash completion scripts (DEPRECATED)'''
commands.debugnamecomplete(ui, repo, *args)
+ at command('debugmergestate', [], '')
+def debugmergestate(ui, repo, *args):
+ """print merge state
+
+ Use --verbose to print out information about whether v1 or v2 merge state
+ was chosen."""
+ def _hashornull(h):
+ if h == nullhex:
+ return 'null'
+ else:
+ return h
+
+ def printrecords(version):
+ ui.write(('* version %s records\n') % version)
+ if version == 1:
+ records = v1records
+ else:
+ records = v2records
+
+ for rtype, record in records:
+ # pretty print some record types
+ if rtype == 'L':
+ ui.write(('local: %s\n') % record)
+ elif rtype == 'O':
+ ui.write(('other: %s\n') % record)
+ elif rtype == 'm':
+ driver, mdstate = record.split('\0', 1)
+ ui.write(('merge driver: %s (state "%s")\n')
+ % (driver, mdstate))
+ elif rtype in 'FDC':
+ r = record.split('\0')
+ f, state, hash, lfile, afile, anode, ofile = r[0:7]
+ if version == 1:
+ onode = 'not stored in v1 format'
+ flags = r[7]
+ else:
+ onode, flags = r[7:9]
+ ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
+ % (f, rtype, state, _hashornull(hash)))
+ ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
+ ui.write((' ancestor path: %s (node %s)\n')
+ % (afile, _hashornull(anode)))
+ ui.write((' other path: %s (node %s)\n')
+ % (ofile, _hashornull(onode)))
+ elif rtype == 'f':
+ filename, rawextras = record.split('\0', 1)
+ extras = rawextras.split('\0')
+ i = 0
+ extrastrings = []
+ while i < len(extras):
+ extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
+ i += 2
+
+ ui.write(('file extras: %s (%s)\n')
+ % (filename, ', '.join(extrastrings)))
+ elif rtype == 'l':
+ labels = record.split('\0', 2)
+ labels = [l for l in labels if len(l) > 0]
+ ui.write(('labels:\n'))
+ ui.write((' local: %s\n' % labels[0]))
+ ui.write((' other: %s\n' % labels[1]))
+ if len(labels) > 2:
+ ui.write((' base: %s\n' % labels[2]))
+ else:
+ ui.write(('unrecognized entry: %s\t%s\n')
+ % (rtype, record.replace('\0', '\t')))
+
+ # Avoid mergestate.read() since it may raise an exception for unsupported
+ # merge state records. We shouldn't be doing this, but this is OK since this
+ # command is pretty low-level.
+ ms = mergemod.mergestate(repo)
+
+ # sort so that reasonable information is on top
+ v1records = ms._readrecordsv1()
+ v2records = ms._readrecordsv2()
+ order = '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.write(('no merge state found\n'))
+ elif not v2records:
+ ui.note(('no version 2 merge state\n'))
+ printrecords(1)
+ elif ms._v1v2match(v1records, v2records):
+ ui.note(('v1 and v2 states match: using v2\n'))
+ printrecords(2)
+ else:
+ ui.note(('v1 and v2 states mismatch: using v1\n'))
+ printrecords(1)
+ if ui.verbose:
+ printrecords(2)
+
@command('debugupgraderepo', [
('o', 'optimize', [], _('extra optimization to perform'), _('NAME')),
('', 'run', False, _('performs an upgrade')),
More information about the Mercurial-devel
mailing list