##// END OF EJS Templates
unionrepo: use pathutil.normasprefix to ensure os.sep at the end of cwd...
unionrepo: use pathutil.normasprefix to ensure os.sep at the end of cwd Since Python 2.7.9, "os.path.join(path, '')" doesn't add "os.sep" at the end of UNC path (see issue4557 for detail). This makes unionrepo incorrectly work, if: 1. cwd is the root of UNC share (e.g. "\host\share"), and 2. mainreporoot is near cwd (e.g. "\host\sharefoo\repo") - host of UNC path is same as one of cwd - share of UNC path starts with one of cwd 3. "repopath" isn't specified in URI (e.g. "union:path/to/repo2") For example: $ hg --cwd \host\share -R \host\sharefoo\repo incoming union:path\to\repo2 In this case: - os.path.join(r"\host\share", "") returns r"\host\share", - r"\host\sharefoo\repo".startswith(r"\host\share") returns True, then - r"foo\repo" is treated as repopath of unionrepo instead of r"\host\sharefoo\repo" This causes failure of combining "\host\sharefoo\repo" and another repository: in addition to it, "\host\share\foo\repo" may be combined with another repository, if it accidentally exists. This patch uses "pathutil.normasprefix()" to ensure "os.sep" at the end of cwd safely, even with some problematic encodings, which use 0x5c (= "os.sep" on Windows) as the tail byte of some multi-byte characters. BTW, normalization before "pathutil.normasprefix()" isn't needed in this case, because "os.getcwd()" always returns normalized one.

File last commit:

r20778:7c4778bc default
r24835:e4f75c93 stable
Show More
parser.py
98 lines | 3.8 KiB | text/x-python | PythonLexer
Matt Mackall
revset: introduce basic parser
r11274 # parser.py - simple top-down operator precedence parser for mercurial
#
# Copyright 2010 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Julian Cowley
parser: fix URL to effbot
r11449 # see http://effbot.org/zone/simple-top-down-parsing.htm and
Matt Mackall
revset: introduce basic parser
r11274 # http://eli.thegreenplace.net/2010/01/02/top-down-operator-precedence-parsing/
# for background
# takes a tokenizer and elements
# tokenizer is an iterator that returns type, value pairs
# elements is a mapping of types to binding strength, prefix and infix actions
# an action is a tree node name, a tree label, and an optional match
timeless@mozdev.org
en-us: labeled
r17500 # __call__(program) parses program into a labeled tree
Matt Mackall
revset: introduce basic parser
r11274
Matt Mackall
revset: raise ParseError exceptions
r11289 import error
Mads Kiilerich
parsers: fix localization markup of parser errors
r14701 from i18n import _
Matt Mackall
revset: raise ParseError exceptions
r11289
Matt Mackall
revset: introduce basic parser
r11274 class parser(object):
def __init__(self, tokenizer, elements, methods=None):
self._tokenizer = tokenizer
self._elements = elements
self._methods = methods
Matt Mackall
templater: use the parser.py parser to extend the templater syntax
r13176 self.current = None
Matt Mackall
revset: introduce basic parser
r11274 def _advance(self):
'advance the tokenizer'
t = self.current
Matt Mackall
revset: add support for prefix and suffix versions of : and ::
r11278 try:
self.current = self._iter.next()
except StopIteration:
pass
Matt Mackall
revset: introduce basic parser
r11274 return t
Peter Arrenbrecht
parser: fix missing param in _match
r11319 def _match(self, m, pos):
Matt Mackall
revset: introduce basic parser
r11274 'make sure the tokenizer matches an end condition'
if self.current[0] != m:
Mads Kiilerich
parsers: fix localization markup of parser errors
r14701 raise error.ParseError(_("unexpected token: %s") % self.current[0],
Dirkjan Ochtman
cleanups: undefined variables
r11305 self.current[2])
Matt Mackall
revset: introduce basic parser
r11274 self._advance()
def _parse(self, bind=0):
Matt Mackall
revset: raise ParseError exceptions
r11289 token, value, pos = self._advance()
Matt Mackall
revset: introduce basic parser
r11274 # handle prefix rules on current token
prefix = self._elements[token][1]
if not prefix:
Mads Kiilerich
parsers: fix localization markup of parser errors
r14701 raise error.ParseError(_("not a prefix: %s") % token, pos)
Matt Mackall
revset: introduce basic parser
r11274 if len(prefix) == 1:
expr = (prefix[0], value)
else:
if len(prefix) > 2 and prefix[2] == self.current[0]:
Peter Arrenbrecht
parser: fix missing param in _match
r11319 self._match(prefix[2], pos)
Matt Mackall
revset: introduce basic parser
r11274 expr = (prefix[0], None)
else:
expr = (prefix[0], self._parse(prefix[1]))
if len(prefix) > 2:
Peter Arrenbrecht
parser: fix missing param in _match
r11319 self._match(prefix[2], pos)
Matt Mackall
revset: introduce basic parser
r11274 # gather tokens until we meet a lower binding strength
while bind < self._elements[self.current[0]][0]:
Matt Mackall
revset: raise ParseError exceptions
r11289 token, value, pos = self._advance()
Matt Mackall
revset: add support for prefix and suffix versions of : and ::
r11278 e = self._elements[token]
# check for suffix - next token isn't a valid prefix
if len(e) == 4 and not self._elements[self.current[0]][1]:
suffix = e[3]
expr = (suffix[0], expr)
Matt Mackall
revset: introduce basic parser
r11274 else:
Matt Mackall
revset: add support for prefix and suffix versions of : and ::
r11278 # handle infix rules
Matt Mackall
parser: improve infix error checking...
r11412 if len(e) < 3 or not e[2]:
Mads Kiilerich
parsers: fix localization markup of parser errors
r14701 raise error.ParseError(_("not an infix: %s") % token, pos)
Matt Mackall
parser: improve infix error checking...
r11412 infix = e[2]
Matt Mackall
revset: add support for prefix and suffix versions of : and ::
r11278 if len(infix) == 3 and infix[2] == self.current[0]:
Peter Arrenbrecht
parser: fix missing param in _match
r11319 self._match(infix[2], pos)
Matt Mackall
revset: add support for prefix and suffix versions of : and ::
r11278 expr = (infix[0], expr, (None))
else:
expr = (infix[0], expr, self._parse(infix[1]))
if len(infix) == 3:
Peter Arrenbrecht
parser: fix missing param in _match
r11319 self._match(infix[2], pos)
Matt Mackall
revset: introduce basic parser
r11274 return expr
Matt Mackall
parser: allow passing a lookup function to a tokenizer...
r20778 def parse(self, message, lookup=None):
Matt Mackall
revset: introduce basic parser
r11274 'generate a parse tree from a message'
Matt Mackall
parser: allow passing a lookup function to a tokenizer...
r20778 if lookup:
self._iter = self._tokenizer(message, lookup)
else:
self._iter = self._tokenizer(message)
Matt Mackall
templater: use the parser.py parser to extend the templater syntax
r13176 self._advance()
Bernhard Leiner
revset: report a parse error if a revset is not parsed completely (issue2654)
r13665 res = self._parse()
token, value, pos = self.current
return res, pos
Matt Mackall
revset: introduce basic parser
r11274 def eval(self, tree):
'recursively evaluate a parse tree using node methods'
if not isinstance(tree, tuple):
return tree
return self._methods[tree[0]](*[self.eval(t) for t in tree[1:]])
def __call__(self, message):
'parse a message into a parse tree and evaluate if methods given'
t = self.parse(message)
if self._methods:
return self.eval(t)
return t