Mercurial > public > mercurial-scm > hg
comparison hgext/fetch.py @ 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 | f1eaf03dd608 |
children | 80c5b2666a96 |
comparison
equal
deleted
inserted
replaced
24367:aba1916c1b23 | 24368:55fd99a23fdc |
---|---|
54 try: | 54 try: |
55 branchnode = repo.branchtip(branch) | 55 branchnode = repo.branchtip(branch) |
56 except error.RepoLookupError: | 56 except error.RepoLookupError: |
57 branchnode = None | 57 branchnode = None |
58 if parent != branchnode: | 58 if parent != branchnode: |
59 raise util.Abort(_('working directory not at branch tip ' | 59 raise util.Abort(_('working directory not at branch tip'), |
60 '(use "hg update" to check out branch tip)')) | 60 hint=_('use "hg update" to check out branch tip')) |
61 | 61 |
62 wlock = lock = None | 62 wlock = lock = None |
63 try: | 63 try: |
64 wlock = repo.wlock() | 64 wlock = repo.wlock() |
65 lock = repo.lock() | 65 lock = repo.lock() |