Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 45073:a56ba57c837d
scmutil: allowing different files to be prefetched per revision
The old API takes a list of revision separate from the file matcher, and thus
provides no way to fetch different sets of files from each revision. In
preparation for adding one such usage, I'm changing the API to take a list of
(revision, file matcher) tuples instead.
Differential Revision: https://phab.mercurial-scm.org/D8721
| author | Rodrigo Damazio Bovendorp <rdamazio@google.com> |
|---|---|
| date | Thu, 09 Jul 2020 18:48:55 -0700 |
| parents | d1471dbbdd63 |
| children | d0ef8c1dddd4 |
comparison
equal
deleted
inserted
replaced
| 45072:196ba4d4eb86 | 45073:a56ba57c837d |
|---|---|
| 1119 ] | 1119 ] |
| 1120 prefetch = scmutil.prefetchfiles | 1120 prefetch = scmutil.prefetchfiles |
| 1121 matchfiles = scmutil.matchfiles | 1121 matchfiles = scmutil.matchfiles |
| 1122 prefetch( | 1122 prefetch( |
| 1123 repo, | 1123 repo, |
| 1124 [ctx.rev()], | 1124 [ |
| 1125 matchfiles(repo, [f for sublist in oplist for f, args, msg in sublist]), | 1125 ( |
| 1126 ctx.rev(), | |
| 1127 matchfiles( | |
| 1128 repo, [f for sublist in oplist for f, args, msg in sublist] | |
| 1129 ), | |
| 1130 ) | |
| 1131 ], | |
| 1126 ) | 1132 ) |
| 1127 | 1133 |
| 1128 | 1134 |
| 1129 @attr.s(frozen=True) | 1135 @attr.s(frozen=True) |
| 1130 class updateresult(object): | 1136 class updateresult(object): |