mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
histedit: make comment part of the file describing rules as translatable
"i18n.gettext()" invocation for "editcomment" itself should have little impact for whole initialization cost of histedit, because it is already invoked for initialization of the command table entry. '\n\n' has to be added to the text being edited separately from "editcomment", because leading 'line feed' characters are not exported to "hg.pot" file correctly.
This commit is contained in:
parent
a373581448
commit
846e85b25e
@ -162,9 +162,7 @@ command = cmdutil.command(cmdtable)
|
||||
|
||||
testedwith = 'internal'
|
||||
|
||||
editcomment = """
|
||||
|
||||
# Edit history between %s and %s
|
||||
editcomment = _("""# Edit history between %s and %s
|
||||
#
|
||||
# Commands:
|
||||
# p, pick = use commit
|
||||
@ -173,7 +171,7 @@ editcomment = """
|
||||
# d, drop = remove commit from history
|
||||
# m, mess = edit message without changing commit content
|
||||
#
|
||||
"""
|
||||
""")
|
||||
|
||||
def between(repo, old, new, keep):
|
||||
revs = [old]
|
||||
@ -522,6 +520,7 @@ def histedit(ui, repo, *parent, **opts):
|
||||
rules = opts.get('commands', '')
|
||||
if not rules:
|
||||
rules = '\n'.join([makedesc(c) for c in ctxs])
|
||||
rules += '\n\n'
|
||||
rules += editcomment % (node.hex(parent)[:12], node.hex(tip)[:12])
|
||||
rules = ui.edit(rules, ui.username())
|
||||
# Save edit rules in .hg/histedit-last-edit.txt in case
|
||||
|
Loading…
Reference in New Issue
Block a user