Mercurial > hg-stable
changeset 24368:55fd99a23fdc
fetch: use an abort hint where appropriate
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Tue, 17 Mar 2015 20:36:33 +0900 |
| parents | aba1916c1b23 |
| children | 109a2acc19ed |
| files | hgext/fetch.py tests/test-fetch.t |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fetch.py Tue Mar 17 20:41:52 2015 +0900 +++ b/hgext/fetch.py Tue Mar 17 20:36:33 2015 +0900 @@ -56,8 +56,8 @@ except error.RepoLookupError: branchnode = None if parent != branchnode: - raise util.Abort(_('working directory not at branch tip ' - '(use "hg update" to check out branch tip)')) + raise util.Abort(_('working directory not at branch tip'), + hint=_('use "hg update" to check out branch tip')) wlock = lock = None try:
--- a/tests/test-fetch.t Tue Mar 17 20:41:52 2015 +0900 +++ b/tests/test-fetch.t Tue Mar 17 20:36:33 2015 +0900 @@ -339,7 +339,8 @@ marked working directory as branch topic (branches are permanent and global, did you want a bookmark?) $ hg -R n2 fetch -m merge n1 - abort: working directory not at branch tip (use "hg update" to check out branch tip) + abort: working directory not at branch tip + (use "hg update" to check out branch tip) [255] parent should be 0 (fetch did not update or merge anything)