Show More
@@ -1126,6 +1126,10 b' def batchremove(repo, wctx, actions):' | |||||
1126 | "(consider changing to repo root: %s)\n") % |
|
1126 | "(consider changing to repo root: %s)\n") % | |
1127 | repo.root) |
|
1127 | repo.root) | |
1128 |
|
1128 | |||
|
1129 | # It's necessary to flush here in case we're inside a worker fork and will | |||
|
1130 | # quit after this function. | |||
|
1131 | wctx.flushall() | |||
|
1132 | ||||
1129 | def batchget(repo, mctx, wctx, actions): |
|
1133 | def batchget(repo, mctx, wctx, actions): | |
1130 | """apply gets to the working directory |
|
1134 | """apply gets to the working directory | |
1131 |
|
1135 | |||
@@ -1161,6 +1165,10 b' def batchget(repo, mctx, wctx, actions):' | |||||
1161 | if i > 0: |
|
1165 | if i > 0: | |
1162 | yield i, f |
|
1166 | yield i, f | |
1163 |
|
1167 | |||
|
1168 | # It's necessary to flush here in case we're inside a worker fork and will | |||
|
1169 | # quit after this function. | |||
|
1170 | wctx.flushall() | |||
|
1171 | ||||
1164 | def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None): |
|
1172 | def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None): | |
1165 | """apply the merge action list to the working directory |
|
1173 | """apply the merge action list to the working directory | |
1166 |
|
1174 | |||
@@ -1229,6 +1237,10 b' def applyupdates(repo, actions, wctx, mc' | |||||
1229 | progress(_updating, z, item=item, total=numupdates, unit=_files) |
|
1237 | progress(_updating, z, item=item, total=numupdates, unit=_files) | |
1230 | removed = len(actions['r']) |
|
1238 | removed = len(actions['r']) | |
1231 |
|
1239 | |||
|
1240 | # We should flush before forking into worker processes, since those workers | |||
|
1241 | # flush when they complete, and we don't want to duplicate work. | |||
|
1242 | wctx.flushall() | |||
|
1243 | ||||
1232 | # get in parallel |
|
1244 | # get in parallel | |
1233 | prog = worker.worker(repo.ui, 0.001, batchget, (repo, mctx, wctx), |
|
1245 | prog = worker.worker(repo.ui, 0.001, batchget, (repo, mctx, wctx), | |
1234 | actions['g']) |
|
1246 | actions['g']) |
General Comments 0
You need to be logged in to leave comments.
Login now