# HG changeset patch # User Yuya Nishihara # Date 1426592193 -32400 # Node ID 55fd99a23fdcfd8fbd4a62cd05fc0887249fba90 # Parent aba1916c1b2309b165020063585a60cf8d7756e0 fetch: use an abort hint where appropriate diff -r aba1916c1b23 -r 55fd99a23fdc hgext/fetch.py --- 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: diff -r aba1916c1b23 -r 55fd99a23fdc tests/test-fetch.t --- 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)