Show More
@@ -238,11 +238,11 b' def linktousercache(repo, hash):' | |||||
238 | if path: |
|
238 | if path: | |
239 | link(storepath(repo, hash), path) |
|
239 | link(storepath(repo, hash), path) | |
240 |
|
240 | |||
241 |
def getstandinmatcher(repo, |
|
241 | def getstandinmatcher(repo, rmatcher=None): | |
242 |
'''Return a match object that applies |
|
242 | '''Return a match object that applies rmatcher to the standin directory''' | |
243 | standindir = repo.wjoin(shortname) |
|
243 | standindir = repo.wjoin(shortname) | |
244 | if pats: |
|
244 | if rmatcher and rmatcher.files(): | |
245 |
pats = [os.path.join(standindir, pat) for pat in |
|
245 | pats = [os.path.join(standindir, pat) for pat in rmatcher.files()] | |
246 | else: |
|
246 | else: | |
247 | # no patterns: relative to repo root |
|
247 | # no patterns: relative to repo root | |
248 | pats = [standindir] |
|
248 | pats = [standindir] | |
@@ -255,7 +255,7 b' def composestandinmatcher(repo, rmatcher' | |||||
255 | '''Return a matcher that accepts standins corresponding to the |
|
255 | '''Return a matcher that accepts standins corresponding to the | |
256 | files accepted by rmatcher. Pass the list of files in the matcher |
|
256 | files accepted by rmatcher. Pass the list of files in the matcher | |
257 | as the paths specified by the user.''' |
|
257 | as the paths specified by the user.''' | |
258 |
smatcher = getstandinmatcher(repo, rmatcher |
|
258 | smatcher = getstandinmatcher(repo, rmatcher) | |
259 | isstandin = smatcher.matchfn |
|
259 | isstandin = smatcher.matchfn | |
260 | def composedmatchfn(f): |
|
260 | def composedmatchfn(f): | |
261 | return isstandin(f) and rmatcher.matchfn(splitstandin(f)) |
|
261 | return isstandin(f) and rmatcher.matchfn(splitstandin(f)) |
General Comments 0
You need to be logged in to leave comments.
Login now