This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4300

context: make sure file is not deleted while checking path conflicts
ClosedPublic

Authored by pulkit on Aug 16 2018, 10:07 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG873f3a56993f: context: make sure file is not deleted while checking path conflicts
Summary

If a file is deleted and a directory of same name is created in the same commit,
IMM thinks of that as a file conflict, however the file is deleted and hence the
directory can be created.

The test change demonstrate the fix.

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

pulkit created this revision.Aug 16 2018, 10:07 AM
Closed by commit rHG873f3a56993f: context: make sure file is not deleted while checking path conflicts (authored by pulkit). · Explain WhyAug 16 2018, 12:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)
Mtests/test-rebase-inmemory.t (3 lines)

Diff 10394

mercurial/context.py

"%s." % (path, component, "%s." % (path, component,
self.p1().rev())) self.p1().rev()))
# Test that each new directory to be created to write this path from p2 # Test that each new directory to be created to write this path from p2
# is not a file in p1. # is not a file in p1.
components = path.split('/') components = path.split('/')
for i in pycompat.xrange(len(components)): for i in pycompat.xrange(len(components)):
component = "/".join(components[0:i]) component = "/".join(components[0:i])
if component in self.p1(): if component in self.p1() and self._cache[component]['exists']:
fail(path, component) fail(path, component)
# Test the other direction -- that this path from p2 isn't a directory # Test the other direction -- that this path from p2 isn't a directory
# in p1 (test that p1 doesn't any paths matching `path/*`). # in p1 (test that p1 doesn't any paths matching `path/*`).
match = matchmod.match('/', '', [path + '/'], default=b'relpath') match = matchmod.match('/', '', [path + '/'], default=b'relpath')
matches = self.p1().manifest().matches(match) matches = self.p1().manifest().matches(match)
if len(matches) > 0: if len(matches) > 0:
if len(matches) == 1 and matches.keys()[0] == path: if len(matches) == 1 and matches.keys()[0] == path:

tests/test-rebase-inmemory.t

| o 2: 09c044d2cb43 'd' | o 2: 09c044d2cb43 'd'
| | | |
| o 1: fc055c3b4d33 'b' | o 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -r . -d 2 $ hg rebase -r . -d 2
rebasing 4:daf7dfc139cb "a/a" (tip) rebasing 4:daf7dfc139cb "a/a" (tip)
abort: error: 'a/a' conflicts with file 'a' in 2. saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
[255]
$ cd .. $ cd ..
Test dry-run rebasing Test dry-run rebasing
$ hg init repo3 $ hg init repo3
$ cd repo3 $ cd repo3
$ echo a>a $ echo a>a