Skip to content
Snippets Groups Projects
Commit fcf08023 authored by Mads Kiilerich's avatar Mads Kiilerich
Browse files

match: fix root calculation for combining regexps with simple paths

The fall-back root for walking is the repo root, not no root.

The "roots" do however also end up in m.files() which is used in various ways,
for instance to indicate whether matches are exact. The change could thus have
other impacts.
parent 3d0dd890
No related branches found
No related tags found
No related merge requests found
......@@ -344,7 +344,7 @@
r.append('/'.join(root) or '.')
elif kind in ('relpath', 'path'):
r.append(name or '.')
elif kind == 'relglob':
else: # relglob, re, relre
r.append('.')
return r
......
......@@ -100,6 +100,13 @@
? ../1/in_b_1
? in_b_2
? ../in_b
combining patterns with root and patterns without a root works
$ hg st a/in_a re:.*b$
? a/in_a
? b/in_b
$ cd ..
$ hg init repo2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment