Patchwork revset: bookmark revset interprets 'literal:' prefix correctly (issue4329)

login
register
mail settings
Submitter mkoconnor@gmail.com
Date Aug. 12, 2014, 4:09 a.m.
Message ID <b1b031b1f6a50d585ea5.1407816593@michaels-mbp.home>
Download mbox | patch
Permalink /patch/5354/
State Superseded
Commit 3efe3c2609e003bdd5eb4b7f160d9b8c15d5a214
Headers show

Comments

mkoconnor@gmail.com - Aug. 12, 2014, 4:09 a.m.
# HG changeset patch
# User Michael O'Connor <mkoconnor@gmail.com>
# Date 1407815108 14400
#      Mon Aug 11 23:45:08 2014 -0400
# Branch stable
# Node ID b1b031b1f6a50d585ea5078c4f5baaf311ea16eb
# Parent  3178e49892020336491cdc6945885c4de26ffa8b
revset: bookmark revset interprets 'literal:' prefix correctly (issue4329)

Patch

diff -r 3178e4989202 -r b1b031b1f6a5 mercurial/revset.py
--- a/mercurial/revset.py	Fri Aug 01 13:01:35 2014 -0700
+++ b/mercurial/revset.py	Mon Aug 11 23:45:08 2014 -0400
@@ -449,7 +449,7 @@ 
                        _('the argument to bookmark must be a string'))
         kind, pattern, matcher = _stringmatcher(bm)
         if kind == 'literal':
-            bmrev = repo._bookmarks.get(bm, None)
+            bmrev = repo._bookmarks.get(pattern, None)
             if not bmrev:
                 raise util.Abort(_("bookmark '%s' does not exist") % bm)
             bmrev = repo[bmrev].rev()