Mercurial > hg
changeset 18609:909cb9ddba4a
histedit: always abort with same message when working dir is wrong.
Using only one message makes live easier for translators. The clearer
error message was supposed by Augie Fackler.
| author | Simon Heimberg <simohe@besonet.ch> |
|---|---|
| date | Sat, 03 Aug 2013 16:40:13 +0200 |
| parents | 3adbd57e1794 |
| children | 46edbc49a9f2 |
| files | hgext/histedit.py tests/test-histedit-edit.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Sat Aug 03 16:37:17 2013 +0200 +++ b/hgext/histedit.py Sat Aug 03 16:40:13 2013 +0200 @@ -583,7 +583,7 @@ if not newchildren: # `parentctxnode` should match but no result. This means that # currentnode is not a descendant from parentctxnode. - msg = _('working directory parent is not a descendant of %s') + msg = _('%s is not an ancestor of working directory') hint = _('update to %s or descendant and run "hg histedit ' '--continue" again') % parentctx raise util.Abort(msg % parentctx, hint=hint)
--- a/tests/test-histedit-edit.t Sat Aug 03 16:37:17 2013 +0200 +++ b/tests/test-histedit-edit.t Sat Aug 03 16:40:13 2013 +0200 @@ -73,7 +73,7 @@ $ hg up 0 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ HGEDITOR='echo foobaz > ' hg histedit --continue - abort: working directory parent is not a descendant of 055a42cdd887 + abort: 055a42cdd887 is not an ancestor of working directory (update to 055a42cdd887 or descendant and run "hg histedit --continue" again) [255] $ hg up 3