This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1241

overlayworkingctx: add _auditconflicts to write()
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG72fbdd373de8: overlayworkingctx: add _auditconflicts to write()
Summary

Alas, part of Mercurial's conflict detection (for file<->folder conflicts,
for example) depends on the filesystem. We don't have the filesystem with IMM,
so we have to run these checks ourselves.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco updated this revision to Diff 4187.Dec 7 2017, 4:22 PM
durin42 added a subscriber: durin42.Dec 7 2017, 4:43 PM
durin42 added inline comments.
mercurial/context.py
2117

for i in xrange(len(components)):

...
phillco updated this revision to Diff 4206.Dec 7 2017, 4:44 PM
durin42 accepted this revision.Dec 7 2017, 4:54 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:54 PM
phillco marked an inline comment as done.Dec 7 2017, 7:00 PM
phillco updated this revision to Diff 4233.Dec 8 2017, 1:37 AM
Closed by commit rHG72fbdd373de8: overlayworkingctx: add _auditconflicts to write() (authored by phillco). · Explain WhyDec 8 2017, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (41 lines)

Diff 4270

mercurial/context.py

# ``commitctx` raises a ``ManifestLookupError`` if a path does not # ``commitctx` raises a ``ManifestLookupError`` if a path does not
# exist, unlike ``workingctx``, which returns a ``workingfilectx`` # exist, unlike ``workingctx``, which returns a ``workingfilectx``
# with an ``exists()`` function. # with an ``exists()`` function.
self._wrappedctx[path] self._wrappedctx[path]
return True return True
except error.ManifestLookupError: except error.ManifestLookupError:
return False return False
def _auditconflicts(self, path):
"""Replicates conflict checks done by wvfs.write().
Since we never write to the filesystem and never call `applyupdates` in
IMM, we'll never check that a path is actually writable -- e.g., because
it adds `a/foo`, but `a` is actually a file in the other commit.
"""
def fail(path, component):
# p1() is the base and we're receiving "writes" for p2()'s
# files.
if 'l' in self.p1()[component].flags():
raise error.Abort("error: %s conflicts with symlink %s "
"in %s." % (path, component,
self.p1().rev()))
else:
raise error.Abort("error: '%s' conflicts with file '%s' in "
"%s." % (path, component,
self.p1().rev()))
# Test that each new directory to be created to write this path from p2
# is not a file in p1.
components = path.split('/')
for i in xrange(len(components)):
durin42Unsubmitted
Done

for i in xrange(len(components)):

...
durin42: for i in xrange(len(components)): ...
component = "/".join(components[0:i])
if component in self.p1():
fail(path, component)
# Test the other direction -- that this path from p2 isn't a directory
# in p1 (test that p1 doesn't any paths matching `path/*`).
match = matchmod.match('/', '', [path + '/'], default=b'relpath')
matches = self.p1().manifest().matches(match)
if len(matches) > 0:
if len(matches) == 1 and matches.keys()[0] == path:
return
raise error.Abort("error: file '%s' cannot be written because "
" '%s/' is a folder in %s (containing %d "
"entries: %s)"
% (path, path, self.p1(), len(matches),
', '.join(matches.keys())))
def write(self, path, data, flags=''): def write(self, path, data, flags=''):
if data is None: if data is None:
raise error.ProgrammingError("data must be non-None") raise error.ProgrammingError("data must be non-None")
self._auditconflicts(path)
self._markdirty(path, exists=True, data=data, date=util.makedate(), self._markdirty(path, exists=True, data=data, date=util.makedate(),
flags=flags) flags=flags)
def setflags(self, path, l, x): def setflags(self, path, l, x):
self._markdirty(path, exists=True, date=util.makedate(), self._markdirty(path, exists=True, date=util.makedate(),
flags=(l and 'l' or '') + (x and 'x' or '')) flags=(l and 'l' or '') + (x and 'x' or ''))
def remove(self, path): def remove(self, path):