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