Fixed bug that was thowing a KeyError when including "{bookmark}" in the output.
This resolves issue #17 (Bookmarks have moved into core for 1.8) on https://bitbucket.org/sjl/hg-prompt/.
The end of the stack track was....
-----------------------------
File "/Users/dak180/Applications/Build/hgExtensions/hg-prompt/prompt.py", line 101, in _bookmark
book = extensions.find('bookmarks').current(repo)
File "/sw/lib/python2.6/site-packages/mercurial/extensions.py", line 30, in find
raise KeyError(name)
KeyError: 'bookmarks'
-----------------------------
I personally was getting this error on mercurial versions 1.8.1 and 1.6.3 (although I am not exactly sure why I got it on 1.6.3).
| author |
Shaun Ek <shaune@providentmetals.com> |
| date |
Wed, 23 Mar 2011 15:42:04 -0400 |
| parents |
a85dc0c43f86 |
| children |
(none) |
'''Test output of {node}.'''
from nose import *
from util import *
def _parent_node():
opts = { 'template': '{node}', 'rev': '.', 'date': None, 'user': None }
_ui = get_sandbox_ui()
_ui.pushbuffer()
commands.log(_ui, get_sandbox_repo(), **opts)
return _ui.popbuffer()
@with_setup(setup_sandbox, teardown_sandbox)
def test_node():
output = prompt(fs='{node}')
assert output == '0000000000000000000000000000000000000000'
output = prompt(fs='{ at node {node}}')
assert output == ' at node 0000000000000000000000000000000000000000'
hg_commit()
output = prompt(fs='{node}')
assert output == _parent_node()
hg_commit()
output = prompt(fs='{node}')
assert output == _parent_node()
hg_update(0)
output = prompt(fs='{node}')
assert output == _parent_node()
@with_setup(setup_sandbox, teardown_sandbox)
def test_short_filter():
output = prompt(fs='{node|short}')
assert output == '0000000000000000000000000000000000000000'[:12]
output = prompt(fs='{ at node {node|short}}')
assert output == ' at node ' + '0000000000000000000000000000000000000000'[:12]
hg_commit()
output = prompt(fs='{node|short}')
assert output == _parent_node()[:12]
hg_commit()
output = prompt(fs='{node|short}')
assert output == _parent_node()[:12]
hg_update(0)
output = prompt(fs='{node|short}')
assert output == _parent_node()[:12]
@with_setup(setup_sandbox, teardown_sandbox)
def test_merge_filter():
hg_commit('one.txt')
hg_commit('one.txt')
node_to_merge = _parent_node()
hg_update(0)
hg_commit('two.txt')
hg_merge(1)
output = prompt(fs='{node|merge}')
assert output == node_to_merge
output = prompt(fs='{node|merge|short}')
assert output == node_to_merge[:12]