Mercurial > hg
diff mercurial/merge.py @ 33085:1e79c66d6b07
workingfilectx: add backgroundclose as a kwarg to write()
This is necessary because some callers in merge.py pass backgroundclose=True
when writing.
As with previous changes in this series, this should be a no-op.
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Sun, 25 Jun 2017 22:30:14 -0700 |
parents | 873f638fd7db |
children | eb4c49f55f1f |
line wrap: on
line diff
--- a/mercurial/merge.py Sun Jun 25 22:29:09 2017 -0700 +++ b/mercurial/merge.py Sun Jun 25 22:30:14 2017 -0700 @@ -1130,7 +1130,6 @@ """ verbose = repo.ui.verbose fctx = mctx.filectx - wwrite = repo.wwrite ui = repo.ui i = 0 with repo.wvfs.backgroundclosing(ui, expectedcount=len(actions)): @@ -1151,7 +1150,7 @@ if repo.wvfs.isdir(f) and not repo.wvfs.islink(f): repo.wvfs.removedirs(f) - wwrite(f, fctx(f).data(), flags, backgroundclose=True) + wctx[f].write(fctx(f).data(), flags, backgroundclose=True) if i == 100: yield i, f i = 0