comparison mercurial/revset.py @ 22105:3efe3c2609e0 stable

revset: bookmark revset interprets 'literal:' prefix correctly (issue4329)
author Michael O'Connor <mkoconnor@gmail.com>
date Mon, 11 Aug 2014 23:45:08 -0400
parents f486001f9d6f
children da05fe01170b 300e07582e9b
comparison
equal deleted inserted replaced
22103:42b1344656f7 22105:3efe3c2609e0
447 bm = getstring(args[0], 447 bm = getstring(args[0],
448 # i18n: "bookmark" is a keyword 448 # i18n: "bookmark" is a keyword
449 _('the argument to bookmark must be a string')) 449 _('the argument to bookmark must be a string'))
450 kind, pattern, matcher = _stringmatcher(bm) 450 kind, pattern, matcher = _stringmatcher(bm)
451 if kind == 'literal': 451 if kind == 'literal':
452 bmrev = repo._bookmarks.get(bm, None) 452 bmrev = repo._bookmarks.get(pattern, None)
453 if not bmrev: 453 if not bmrev:
454 raise util.Abort(_("bookmark '%s' does not exist") % bm) 454 raise util.Abort(_("bookmark '%s' does not exist") % bm)
455 bmrev = repo[bmrev].rev() 455 bmrev = repo[bmrev].rev()
456 return subset.filter(lambda r: r == bmrev) 456 return subset.filter(lambda r: r == bmrev)
457 else: 457 else: