Show More
@@ -162,9 +162,7 b' command = cmdutil.command(cmdtable)' | |||
|
162 | 162 | |
|
163 | 163 | testedwith = 'internal' |
|
164 | 164 | |
|
165 | editcomment = """ | |
|
166 | ||
|
167 | # Edit history between %s and %s | |
|
165 | editcomment = _("""# Edit history between %s and %s | |
|
168 | 166 | # |
|
169 | 167 | # Commands: |
|
170 | 168 | # p, pick = use commit |
@@ -173,7 +171,7 b' editcomment = """' | |||
|
173 | 171 | # d, drop = remove commit from history |
|
174 | 172 | # m, mess = edit message without changing commit content |
|
175 | 173 | # |
|
176 | """ | |
|
174 | """) | |
|
177 | 175 | |
|
178 | 176 | def between(repo, old, new, keep): |
|
179 | 177 | revs = [old] |
@@ -522,6 +520,7 b' def histedit(ui, repo, *parent, **opts):' | |||
|
522 | 520 | rules = opts.get('commands', '') |
|
523 | 521 | if not rules: |
|
524 | 522 | rules = '\n'.join([makedesc(c) for c in ctxs]) |
|
523 | rules += '\n\n' | |
|
525 | 524 | rules += editcomment % (node.hex(parent)[:12], node.hex(tip)[:12]) |
|
526 | 525 | rules = ui.edit(rules, ui.username()) |
|
527 | 526 | # Save edit rules in .hg/histedit-last-edit.txt in case |
General Comments 0
You need to be logged in to leave comments.
Login now