Mercurial > hg
comparison hgext/histedit.py @ 30864:abf029200e19
merge with stable
| author | Kevin Bullock <kbullock+mercurial@ringworld.org> |
|---|---|
| date | Wed, 01 Feb 2017 11:30:26 -0600 |
| parents | 7080652af6e6 |
| children | d4825798818b |
comparison
equal
deleted
inserted
replaced
| 30838:eb78ec9e97b7 | 30864:abf029200e19 |
|---|---|
| 1333 | 1333 |
| 1334 rules = '\n'.join([act.torule() for act in actions]) | 1334 rules = '\n'.join([act.torule() for act in actions]) |
| 1335 rules += '\n\n' | 1335 rules += '\n\n' |
| 1336 rules += editcomment | 1336 rules += editcomment |
| 1337 rules = ui.edit(rules, ui.username(), {'prefix': 'histedit'}, | 1337 rules = ui.edit(rules, ui.username(), {'prefix': 'histedit'}, |
| 1338 tmpdir=repo.path) | 1338 repopath=repo.path) |
| 1339 | 1339 |
| 1340 # Save edit rules in .hg/histedit-last-edit.txt in case | 1340 # Save edit rules in .hg/histedit-last-edit.txt in case |
| 1341 # the user needs to ask for help after something | 1341 # the user needs to ask for help after something |
| 1342 # surprising happens. | 1342 # surprising happens. |
| 1343 f = open(repo.join('histedit-last-edit.txt'), 'w') | 1343 f = open(repo.join('histedit-last-edit.txt'), 'w') |