sapling/eden/scm/edenscmnative
Andrey Chursin 14064f8582 vfs: move conflict handling from pyworker to vfs write
Summary:
Previously, `write` can fail because the destination file exists as a
directory, or the parent directory is missing. pyworker handles those cases
by calling `clear_conflicts` to remove conflicted directories and create
missing parent directories and retry `write`. Practically, for all `write`
usecases (including checkout) we always want the `clear_conflicts` behavior.
Therefore, move `clear_conflicts` to vfs `write` and make it private.

Reviewed By: quark-zju

Differential Revision: D26257829

fbshipit-source-id: 03d1da0767202edba61c47ae5654847c0ea3b33e
2021-02-09 17:04:30 -08:00
..
bindings vfs: move conflict handling from pyworker to vfs write 2021-02-09 17:04:30 -08:00
__init__.py remediation of S205607 2020-07-17 17:16:13 -07:00
clindex.pyi add type annotations for a few more edenscmnative modules 2020-03-20 10:41:32 -07:00
clindex.pyx repoview: further remove repoview references 2020-07-06 14:04:27 -07:00
linelog.pyx py3/cython: set the language_level to 3str 2020-01-30 12:52:06 -08:00
patchrmdir.pyi add type annotations for a few more edenscmnative modules 2020-03-20 10:41:32 -07:00
patchrmdir.pyx py3: fix extdiff 2020-08-27 19:15:22 -07:00
traceprof.pyx py3: fix traceprof 2020-09-24 11:56:21 -07:00