equal
deleted
inserted
replaced
2016 |
2016 |
2017 This can occur during the merge process, e.g. by passing --tool :local |
2017 This can occur during the merge process, e.g. by passing --tool :local |
2018 to resolve a conflict. |
2018 to resolve a conflict. |
2019 """ |
2019 """ |
2020 keys = [] |
2020 keys = [] |
|
2021 # This won't be perfect, but can help performance significantly when |
|
2022 # using things like remotefilelog. |
|
2023 scmutil.prefetchfiles( |
|
2024 self.repo(), [self.p1().rev()], |
|
2025 matchmod.match('', '', patterns=self._cache.keys(), exact=True)) |
|
2026 |
2021 for path in self._cache.keys(): |
2027 for path in self._cache.keys(): |
2022 cache = self._cache[path] |
2028 cache = self._cache[path] |
2023 try: |
2029 try: |
2024 underlying = self._wrappedctx[path] |
2030 underlying = self._wrappedctx[path] |
2025 if (underlying.data() == cache['data'] and |
2031 if (underlying.data() == cache['data'] and |