Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/util.py @ 870:a82eae840447
Teach walk code about absolute paths.
The first consequence of this is that absolute and relative paths now
all work in the same way. The second is that paths that lie outside
the repository now cause an error to be reported, instead of something
arbitrary and expensive being done.
Internally, all of the serious work is in the util package. The new
canonpath function takes an arbitrary path and either returns a
canonical path or raises an error. Because it needs to know where the
repository root is, it must be fed a repository or dirstate object, which
has given commands.matchpats and friends a new parameter to pass along.
The util.matcher function uses this to canonicalise globs and relative
path names.
Meanwhile, I've moved the Abort exception from commands to util, and
killed off the redundant util.CommandError exception.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sun, 07 Aug 2005 12:43:11 -0800 |
| parents | 1e3a23719662 |
| children | c2e77581bc84 |
line wrap: on
line diff
--- a/mercurial/util.py +++ b/mercurial/util.py @@ -16,7 +16,8 @@ def unique(g): seen[f] = 1 yield f -class CommandError(Exception): pass +class Abort(Exception): + """Raised if a command needs to print an error and exit.""" def always(fn): return True def never(fn): return False @@ -68,7 +69,20 @@ def globre(pat, head = '^', tail = '$'): _globchars = {'[': 1, '{': 1, '*': 1, '?': 1} -def matcher(cwd, names, inc, exc, head = ''): +def canonpath(repo, cwd, myname): + rootsep = repo.root + os.sep + name = myname + if not name.startswith(os.sep): + name = os.path.join(repo.root, cwd, name) + name = os.path.normpath(name) + if name.startswith(rootsep): + return name[len(rootsep):] + elif name == repo.root: + return '' + else: + raise Abort('%s not under repository root' % myname) + +def matcher(repo, cwd, names, inc, exc, head = ''): def patkind(name): for prefix in 're:', 'glob:', 'path:': if name.startswith(prefix): return name.split(':', 1) @@ -76,8 +90,6 @@ def matcher(cwd, names, inc, exc, head = if c in _globchars: return 'glob', name return 'relpath', name - cwdsep = cwd + os.sep - def regex(name, tail): '''convert a pattern into a regular expression''' kind, name = patkind(name) @@ -85,9 +97,6 @@ def matcher(cwd, names, inc, exc, head = return name elif kind == 'path': return '^' + re.escape(name) + '$' - if cwd: name = os.path.join(cwdsep, name) - name = os.path.normpath(name) - if name == '.': name = '**' return head + globre(name, '', tail) def matchfn(pats, tail): @@ -104,11 +113,22 @@ def matcher(cwd, names, inc, exc, head = root.append(p) return os.sep.join(root) - patkinds = map(patkind, names) - pats = [name for (kind, name) in patkinds if kind != 'relpath'] - files = [name for (kind, name) in patkinds if kind == 'relpath'] - roots = filter(None, map(globprefix, pats)) + files - if cwd: roots = [cwdsep + r for r in roots] + pats = [] + files = [] + roots = [] + for kind, name in map(patkind, names): + if kind in ('glob', 'relpath'): + name = canonpath(repo, cwd, name) + if name == '': + kind, name = 'glob', '**' + if kind in ('glob', 're'): + pats.append(name) + if kind == 'glob': + root = globprefix(name) + if root: roots.append(root) + elif kind == 'relpath': + files.append(name) + roots.append(name) patmatch = matchfn(pats, '$') or always filematch = matchfn(files, '(?:/|$)') or always @@ -129,7 +149,7 @@ def system(cmd, errprefix=None): explain_exit(rc)[0]) if errprefix: errmsg = "%s: %s" % (errprefix, errmsg) - raise CommandError(errmsg) + raise Abort(errmsg) def rename(src, dst): try: