[PATCH 2 of 2] bookmarks: Show (merged) in bookmark list for merged revs

[Martin Geisler]

David Shilvock <davels at telus.net> writes:

> # HG changeset patch
> # User David Shilvock <davels at telus.net>
> # Date 1226121800 28800
> # Node ID 05cdaad0f56628bbd61a1f5acb0f82e7c184c5ab
> # Parent  8920535663e440f478dadd5b29a754966844786d
> bookmarks: Show (merged) in bookmark list for merged revs
>
> diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
> --- a/hgext/bookmarks.py
> +++ b/hgext/bookmarks.py
> @@ -121,11 +121,23 @@ def bookmark(ui, repo, mark=None, rev=No
>              ui.status("no bookmarks set\n")
>          else:
>              for bmark, n in marks.iteritems():
> +                suffix = _nodeismerged(repo, n) and '  merged' or ''

You need to pass the ' merged' string to the _ function for them to be
translatable. Import it from i18n if necessary.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multi-Party Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20081108/e9466075/attachment.pgp