Mercurial > hg
comparison hgext/histedit.py @ 21029:76f68595ff8e
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 14 Apr 2014 15:14:02 -0400 |
| parents | d66862b87ae6 a0f437e2f5a9 |
| children | dae36d3e1c60 |
comparison
equal
deleted
inserted
replaced
| 21027:25ee5dbebc6b | 21029:76f68595ff8e |
|---|---|
| 402 if stats and stats[3] > 0: | 402 if stats and stats[3] > 0: |
| 403 raise error.InterventionRequired( | 403 raise error.InterventionRequired( |
| 404 _('Fix up the change and run hg histedit --continue')) | 404 _('Fix up the change and run hg histedit --continue')) |
| 405 message = oldctx.description() + '\n' | 405 message = oldctx.description() + '\n' |
| 406 message = ui.edit(message, ui.username()) | 406 message = ui.edit(message, ui.username()) |
| 407 repo.savecommitmessage(message) | |
| 407 commit = commitfuncfor(repo, oldctx) | 408 commit = commitfuncfor(repo, oldctx) |
| 408 new = commit(text=message, user=oldctx.user(), date=oldctx.date(), | 409 new = commit(text=message, user=oldctx.user(), date=oldctx.date(), |
| 409 extra=oldctx.extra()) | 410 extra=oldctx.extra()) |
| 410 newctx = repo[new] | 411 newctx = repo[new] |
| 411 if oldctx.node() != newctx.node(): | 412 if oldctx.node() != newctx.node(): |