This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9244

histedit: drop fallback to empty string from rendertemplate()
ClosedPublic

Authored by martinvonz on Oct 23 2020, 2:43 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1f9736eb0e65: histedit: drop fallback to empty string from rendertemplate()
rHG024fdba1417b: histedit: drop fallback to empty string from rendertemplate()
Summary

AFAICT, cmdutil.rendertemplate() always returns bytes (never
e.g. None), so we don't need to fall back to empty
(byte-)string. The fallback has been there since the code was added in
11c076786d56 (histedit: add templating support to histedit's rule file
generation, 2019-01-29).

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

martinvonz created this revision.Oct 23 2020, 2:43 AM
martinvonz added a commit: rHG024fdba1417b: histedit: drop fallback to empty string from rendertemplate().Oct 28 2020, 10:02 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG024fdba1417b: histedit: drop fallback to empty string from rendertemplate() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (14 lines)

Diff 23346

hgext/histedit.py

def torule(self): def torule(self):
"""build a histedit rule line for an action """build a histedit rule line for an action
by default lines are in the form: by default lines are in the form:
<hash> <rev> <summary> <hash> <rev> <summary>
""" """
ctx = self.repo[self.node] ctx = self.repo[self.node]
ui = self.repo.ui ui = self.repo.ui
summary = ( summary = cmdutil.rendertemplate(
cmdutil.rendertemplate(
ctx, ui.config(b'histedit', b'summary-template') ctx, ui.config(b'histedit', b'summary-template')
) )
or b''
)
summary = summary.splitlines()[0] summary = summary.splitlines()[0]
line = b'%s %s %s' % (self.verb, ctx, summary) 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)
(b'%d' % self.origpos).ljust(2), (b'%d' % self.origpos).ljust(2),
action.ljust(6), action.ljust(6),
r, r,
h, h,
) )
@util.propertycache @util.propertycache
def desc(self): def desc(self):
summary = ( summary = cmdutil.rendertemplate(
cmdutil.rendertemplate(
self.ctx, self.ui.config(b'histedit', b'summary-template') self.ctx, self.ui.config(b'histedit', b'summary-template')
) )
or b''
)
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 self.ctx.description().splitlines()[0].strip()
def checkconflicts(self, other): def checkconflicts(self, other):