Mercurial > hg
comparison hgext/histedit.py @ 24196:c3d13202144d
histedit: fix style of new error message
- lowercase
- no punctuation
- brief
- short node
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 03 Mar 2015 17:28:05 -0600 |
| parents | be7cb25186be |
| children | 4047982904f8 |
comparison
equal
deleted
inserted
replaced
| 24195:250d9cf97fb3 | 24196:c3d13202144d |
|---|---|
| 1024 state.read() | 1024 state.read() |
| 1025 histedit_nodes = set([ctx for (action, ctx) in state.rules]) | 1025 histedit_nodes = set([ctx for (action, ctx) in state.rules]) |
| 1026 strip_nodes = set([repo[n].hex() for n in nodelist]) | 1026 strip_nodes = set([repo[n].hex() for n in nodelist]) |
| 1027 common_nodes = histedit_nodes & strip_nodes | 1027 common_nodes = histedit_nodes & strip_nodes |
| 1028 if common_nodes: | 1028 if common_nodes: |
| 1029 raise util.Abort(_('unable to strip %s. Nodes are ' | 1029 raise util.Abort(_("histedit in progress, can't strip %s") |
| 1030 'used by history edit in progress.') | 1030 % ', '.join(node.short(x) for x in common_nodes)) |
| 1031 % ', '.join(common_nodes)) | |
| 1032 return orig(ui, repo, nodelist, *args, **kwargs) | 1031 return orig(ui, repo, nodelist, *args, **kwargs) |
| 1033 | 1032 |
| 1034 extensions.wrapfunction(repair, 'strip', stripwrapper) | 1033 extensions.wrapfunction(repair, 'strip', stripwrapper) |
| 1035 | 1034 |
| 1036 def summaryhook(ui, repo): | 1035 def summaryhook(ui, repo): |