Show More
@@ -430,6 +430,7 b' def composestandinmatcher(repo, rmatcher' | |||||
430 | def composedmatchfn(f): |
|
430 | def composedmatchfn(f): | |
431 | return isstandin(f) and rmatcher.matchfn(splitstandin(f)) |
|
431 | return isstandin(f) and rmatcher.matchfn(splitstandin(f)) | |
432 |
|
432 | |||
|
433 | smatcher._was_tampered_with = True | |||
433 | smatcher.matchfn = composedmatchfn |
|
434 | smatcher.matchfn = composedmatchfn | |
434 |
|
435 | |||
435 | return smatcher |
|
436 | return smatcher | |
@@ -716,6 +717,7 b' def updatestandinsbymatch(repo, match):' | |||||
716 | return match |
|
717 | return match | |
717 |
|
718 | |||
718 | lfiles = listlfiles(repo) |
|
719 | lfiles = listlfiles(repo) | |
|
720 | match._was_tampered_with = True | |||
719 | match._files = repo._subdirlfs(match.files(), lfiles) |
|
721 | match._files = repo._subdirlfs(match.files(), lfiles) | |
720 |
|
722 | |||
721 | # Case 2: user calls commit with specified patterns: refresh |
|
723 | # Case 2: user calls commit with specified patterns: refresh | |
@@ -746,6 +748,7 b' def updatestandinsbymatch(repo, match):' | |||||
746 | # user. Have to modify _files to prevent commit() from |
|
748 | # user. Have to modify _files to prevent commit() from | |
747 | # complaining "not tracked" for big files. |
|
749 | # complaining "not tracked" for big files. | |
748 | match = copy.copy(match) |
|
750 | match = copy.copy(match) | |
|
751 | match._was_tampered_with = True | |||
749 | origmatchfn = match.matchfn |
|
752 | origmatchfn = match.matchfn | |
750 |
|
753 | |||
751 | # Check both the list of largefiles and the list of |
|
754 | # Check both the list of largefiles and the list of |
@@ -181,6 +181,7 b' def reposetup(ui, repo):' | |||||
181 | return newfiles |
|
181 | return newfiles | |
182 |
|
182 | |||
183 | m = copy.copy(match) |
|
183 | m = copy.copy(match) | |
|
184 | m._was_tampered_with = True | |||
184 | m._files = tostandins(m._files) |
|
185 | m._files = tostandins(m._files) | |
185 |
|
186 | |||
186 | result = orig( |
|
187 | result = orig( | |
@@ -193,6 +194,7 b' def reposetup(ui, repo):' | |||||
193 | dirstate = self.dirstate |
|
194 | dirstate = self.dirstate | |
194 | return sf in dirstate or dirstate.hasdir(sf) |
|
195 | return sf in dirstate or dirstate.hasdir(sf) | |
195 |
|
196 | |||
|
197 | match._was_tampered_with = True | |||
196 | match._files = [f for f in match._files if sfindirstate(f)] |
|
198 | match._files = [f for f in match._files if sfindirstate(f)] | |
197 | # Don't waste time getting the ignored and unknown |
|
199 | # Don't waste time getting the ignored and unknown | |
198 | # files from lfdirstate |
|
200 | # files from lfdirstate |
General Comments 0
You need to be logged in to leave comments.
Login now