Mercurial > hg
changeset 16822:da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
| author | Simon King <simon@simonking.org.uk> |
|---|---|
| date | Wed, 30 May 2012 23:13:33 +0100 |
| parents | 0946502fd3d5 |
| children | b23bacb230c9 |
| files | mercurial/revset.py tests/test-bookmarks.t |
| diffstat | 2 files changed, 38 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/revset.py Wed May 30 23:13:33 2012 +0100 +++ b/mercurial/revset.py Wed May 30 23:13:33 2012 +0100 @@ -305,6 +305,10 @@ def bookmark(repo, subset, x): """``bookmark([name])`` The named bookmark or all bookmarks. + + If `name` starts with `re:`, the remainder of the name is treated as + a regular expression. To match a bookmark that actually starts with `re:`, + use the prefix `literal:`. """ # i18n: "bookmark" is a keyword args = getargs(x, 0, 1, _('bookmark takes one or no arguments')) @@ -312,11 +316,26 @@ bm = getstring(args[0], # i18n: "bookmark" is a keyword _('the argument to bookmark must be a string')) - bmrev = bookmarksmod.listbookmarks(repo).get(bm, None) - if not bmrev: - raise util.Abort(_("bookmark '%s' does not exist") % bm) - bmrev = repo[bmrev].rev() - return [r for r in subset if r == bmrev] + kind, pattern, matcher = _stringmatcher(bm) + if kind == 'literal': + bmrev = bookmarksmod.listbookmarks(repo).get(bm, None) + if not bmrev: + raise util.Abort(_("bookmark '%s' does not exist") % bm) + bmrev = repo[bmrev].rev() + return [r for r in subset if r == bmrev] + else: + matchrevs = set() + for name, bmrev in bookmarksmod.listbookmarks(repo).iteritems(): + if matcher(name): + matchrevs.add(bmrev) + if not matchrevs: + raise util.Abort(_("no bookmarks exist that match '%s'") + % pattern) + bmrevs = set() + for bmrev in matchrevs: + bmrevs.add(repo[bmrev].rev()) + return [r for r in subset if r in bmrevs] + bms = set([repo[r].rev() for r in bookmarksmod.listbookmarks(repo).values()]) return [r for r in subset if r in bms]
--- a/tests/test-bookmarks.t Wed May 30 23:13:33 2012 +0100 +++ b/tests/test-bookmarks.t Wed May 30 23:13:33 2012 +0100 @@ -84,6 +84,20 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: 1 + $ hg log -r 'bookmark("re:X")' + changeset: 0:f7b1eb17ad24 + bookmark: X + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: 0 + + changeset: 1:925d80f479bb + bookmark: X2 + tag: tip + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: 1 + $ hg log -r 'bookmark(unknown)' abort: bookmark 'unknown' does not exist [255]