equal
deleted
inserted
replaced
428 isstandin = smatcher.matchfn |
428 isstandin = smatcher.matchfn |
429 |
429 |
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 |
436 |
437 |
437 |
438 |
714 updatestandin(repo, lfile, fstandin) |
715 updatestandin(repo, lfile, fstandin) |
715 |
716 |
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 |
722 # any matching big files. |
724 # any matching big files. |
723 smatcher = composestandinmatcher(repo, match) |
725 smatcher = composestandinmatcher(repo, match) |
744 # Cook up a new matcher that only matches regular files or |
746 # Cook up a new matcher that only matches regular files or |
745 # standins corresponding to the big files requested by the |
747 # standins corresponding to the big files requested by the |
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 |
752 # standins because if a largefile was removed, it |
755 # standins because if a largefile was removed, it |
753 # won't be in the list of largefiles at this point |
756 # won't be in the list of largefiles at this point |