Show More
@@ -241,13 +241,15 b' def linktousercache(repo, hash):' | |||
|
241 | 241 | def getstandinmatcher(repo, rmatcher=None): |
|
242 | 242 | '''Return a match object that applies rmatcher to the standin directory''' |
|
243 | 243 | standindir = repo.wjoin(shortname) |
|
244 |
if rmatcher and rmatcher. |
|
|
244 | if rmatcher and not rmatcher.always(): | |
|
245 | 245 | pats = [os.path.join(standindir, pat) for pat in rmatcher.files()] |
|
246 | match = scmutil.match(repo[None], pats) | |
|
247 | # if pats is empty, it would incorrectly always match, so clear _always | |
|
248 | match._always = False | |
|
246 | 249 | else: |
|
247 | 250 | # no patterns: relative to repo root |
|
248 |
|
|
|
251 | match = scmutil.match(repo[None], [standindir]) | |
|
249 | 252 | # no warnings about missing files or directories |
|
250 | match = scmutil.match(repo[None], pats) | |
|
251 | 253 | match.bad = lambda f, msg: None |
|
252 | 254 | return match |
|
253 | 255 |
General Comments 0
You need to be logged in to leave comments.
Login now