This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4977

debugcommands: support wrapping long lines
ClosedPublic

Authored by indygreg on Oct 12 2018, 4:14 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG64360202d5b2: debugcommands: support wrapping long lines
Summary

If a line within a block is indented more than the line that came before,
we automatically concatenate it with the previous line. This allows us to
pretty format data. This will make tests easier to read.

At some point we may just want to evaluate entire blocks as Python
code or something, as even with this change, things aren't perfect, as we
can't e.g. have formatting like:

foo eval:[

True

]

But this is strictly better than before, where we couldn't wrap long lines.

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

indygreg created this revision.Oct 12 2018, 4:14 AM
Closed by commit rHG64360202d5b2: debugcommands: support wrapping long lines (authored by indygreg). · Explain WhyOct 12 2018, 11:16 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (11 lines)

Diff 11884

mercurial/debugcommands.py

res2 = repo.debugwireargs(*vals, **args) res2 = repo.debugwireargs(*vals, **args)
ui.write("%s\n" % res1) ui.write("%s\n" % res1)
if res1 != res2: if res1 != res2:
ui.warn("%s\n" % res2) ui.warn("%s\n" % res2)
def _parsewirelangblocks(fh): def _parsewirelangblocks(fh):
activeaction = None activeaction = None
blocklines = [] blocklines = []
lastindent = 0
for line in fh: for line in fh:
line = line.rstrip() line = line.rstrip()
if not line: if not line:
continue continue
if line.startswith(b'#'): if line.startswith(b'#'):
continue continue
if not line.startswith(b' '): if not line.startswith(b' '):
# New block. Flush previous one. # New block. Flush previous one.
if activeaction: if activeaction:
yield activeaction, blocklines yield activeaction, blocklines
activeaction = line activeaction = line
blocklines = [] blocklines = []
lastindent = 0
continue continue
# Else we start with an indent. # Else we start with an indent.
if not activeaction: if not activeaction:
raise error.Abort(_('indented line outside of block')) raise error.Abort(_('indented line outside of block'))
indent = len(line) - len(line.lstrip())
# If this line is indented more than the last line, concatenate it.
if indent > lastindent and blocklines:
blocklines[-1] += line.lstrip()
else:
blocklines.append(line) blocklines.append(line)
lastindent = indent
# Flush last block. # Flush last block.
if activeaction: if activeaction:
yield activeaction, blocklines yield activeaction, blocklines
@command('debugwireproto', @command('debugwireproto',
[ [
('', 'localssh', False, _('start an SSH server for this repo')), ('', 'localssh', False, _('start an SSH server for this repo')),