Show More
@@ -1333,10 +1333,6 b' def batchremove(repo, wctx, actions):' | |||
|
1333 | 1333 | repo.ui.warn(_("current directory was removed\n" |
|
1334 | 1334 | "(consider changing to repo root: %s)\n") % repo.root) |
|
1335 | 1335 | |
|
1336 | # It's necessary to flush here in case we're inside a worker fork and will | |
|
1337 | # quit after this function. | |
|
1338 | wctx.flushall() | |
|
1339 | ||
|
1340 | 1336 | def batchget(repo, mctx, wctx, actions): |
|
1341 | 1337 | """apply gets to the working directory |
|
1342 | 1338 | |
@@ -1376,9 +1372,6 b' def batchget(repo, mctx, wctx, actions):' | |||
|
1376 | 1372 | if i > 0: |
|
1377 | 1373 | yield i, f |
|
1378 | 1374 | |
|
1379 | # It's necessary to flush here in case we're inside a worker fork and will | |
|
1380 | # quit after this function. | |
|
1381 | wctx.flushall() | |
|
1382 | 1375 | |
|
1383 | 1376 | def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None): |
|
1384 | 1377 | """apply the merge action list to the working directory |
@@ -1479,10 +1472,6 b' def applyupdates(repo, actions, wctx, mc' | |||
|
1479 | 1472 | z += 1 |
|
1480 | 1473 | progress(_updating, z, item=f, total=numupdates, unit=_files) |
|
1481 | 1474 | |
|
1482 | # We should flush before forking into worker processes, since those workers | |
|
1483 | # flush when they complete, and we don't want to duplicate work. | |
|
1484 | wctx.flushall() | |
|
1485 | ||
|
1486 | 1475 | # get in parallel |
|
1487 | 1476 | prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx), |
|
1488 | 1477 | actions['g']) |
@@ -2004,7 +1993,6 b' def update(repo, node, branchmerge, forc' | |||
|
2004 | 1993 | 'see "hg help -e fsmonitor")\n')) |
|
2005 | 1994 | |
|
2006 | 1995 | stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) |
|
2007 | wc.flushall() | |
|
2008 | 1996 | |
|
2009 | 1997 | if not partial: |
|
2010 | 1998 | with repo.dirstate.parentchange(): |
General Comments 0
You need to be logged in to leave comments.
Login now