This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12405

histedit: use new function for getting first line of a string
ClosedPublic

Authored by martinvonz on Mar 25 2022, 1:38 AM.

Details

Reviewers
durin42
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe160f073c37b: histedit: use new function for getting first line of a string
Summary

This fixes a crash you can run into if you enter a commit message
that's just a "newline-like" byte, like a form feed byte (`hg ci -m
\x0f` in Fish). That bug is the motivation for this series.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (12 lines)

Diff 32806

hgext/histedit.py

# We don't want color codes in the commit message template, so # We don't want color codes in the commit message template, so
# disable the label() template function while we render it. # disable the label() template function while we render it.
with ui.configoverride( with ui.configoverride(
{(b'templatealias', b'label(l,x)'): b"x"}, b'histedit' {(b'templatealias', b'label(l,x)'): b"x"}, b'histedit'
): ):
summary = cmdutil.rendertemplate( summary = cmdutil.rendertemplate(
ctx, ui.config(b'histedit', b'summary-template') ctx, ui.config(b'histedit', b'summary-template')
) )
# Handle the fact that `''.splitlines() => []` line = b'%s %s %s' % (self.verb, ctx, stringutil.firstline(summary))
summary = summary.splitlines()[0] if summary else b''
line = b'%s %s %s' % (self.verb, ctx, summary)
# trim to 75 columns by default so it's not stupidly wide in my editor # trim to 75 columns by default so it's not stupidly wide in my editor
# (the 5 more are left for verb) # (the 5 more are left for verb)
maxlen = self.repo.ui.configint(b'histedit', b'linelen') maxlen = self.repo.ui.configint(b'histedit', b'linelen')
maxlen = max(maxlen, 22) # avoid truncating hash maxlen = max(maxlen, 22) # avoid truncating hash
return stringutil.ellipsis(line, maxlen) return stringutil.ellipsis(line, maxlen)
def tostate(self): def tostate(self):
"""Print an action in format used by histedit state files """Print an action in format used by histedit state files
summary = cmdutil.rendertemplate( summary = cmdutil.rendertemplate(
self.ctx, self.ui.config(b'histedit', b'summary-template') self.ctx, self.ui.config(b'histedit', b'summary-template')
) )
if summary: if summary:
return summary return summary
# This is split off from the prefix property so that we can # This is split off from the prefix property so that we can
# separately make the description for 'roll' red (since it # separately make the description for 'roll' red (since it
# will get discarded). # will get discarded).
return self.ctx.description().splitlines()[0].strip() return stringutil.firstline(self.ctx.description())
def checkconflicts(self, other): def checkconflicts(self, other):
if other.pos > self.pos and other.origpos <= self.origpos: if other.pos > self.pos and other.origpos <= self.origpos:
if set(other.ctx.files()) & set(self.ctx.files()) != set(): if set(other.ctx.files()) & set(self.ctx.files()) != set():
self.conflicts.append(other) self.conflicts.append(other)
return self.conflicts return self.conflicts
if other in self.conflicts: if other in self.conflicts:
line = b"user: %s" % ctx.user() line = b"user: %s" % ctx.user()
win.addstr(2, 1, line[:length]) win.addstr(2, 1, line[:length])
bms = self.repo.nodebookmarks(ctx.node()) bms = self.repo.nodebookmarks(ctx.node())
line = b"bookmark: %s" % b' '.join(bms) line = b"bookmark: %s" % b' '.join(bms)
win.addstr(3, 1, line[:length]) win.addstr(3, 1, line[:length])
line = b"summary: %s" % (ctx.description().splitlines()[0]) line = b"summary: %s" % stringutil.firstline(ctx.description())
win.addstr(4, 1, line[:length]) win.addstr(4, 1, line[:length])
line = b"files: " line = b"files: "
win.addstr(5, 1, line) win.addstr(5, 1, line)
fnx = 1 + len(line) fnx = 1 + len(line)
fnmaxx = length - fnx + 1 fnmaxx = length - fnx + 1
y = 5 y = 5
fnmaxn = maxy - (1 + y) - 1 fnmaxn = maxy - (1 + y) - 1
) )
state.backupfile = backupfile state.backupfile = backupfile
def _getsummary(ctx): def _getsummary(ctx):
# a common pattern is to extract the summary but default to the empty # a common pattern is to extract the summary but default to the empty
# string # string
summary = ctx.description() or b'' summary = ctx.description() or b''
if summary: return stringutil.firstline(summary)
summary = summary.splitlines()[0]
return summary
def bootstrapcontinue(ui, state, opts): def bootstrapcontinue(ui, state, opts):
repo = state.repo repo = state.repo
ms = mergestatemod.mergestate.read(repo) ms = mergestatemod.mergestate.read(repo)
mergeutil.checkunresolved(ms) mergeutil.checkunresolved(ms)