( )⚙ D4543 context: don't count deleted files as candidates for path conflicts in IMM

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4543

context: don't count deleted files as candidates for path conflicts in IMM
ClosedPublic

Authored by pulkit on Sep 12 2018, 10:55 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfa4d16daf1be: context: don't count deleted files as candidates for path conflicts in IMM
Summary

This patch makes sure we don't consider the deleted files in our IMM wctx
as potential conflicts while calculating paths conflicts. This fixes the bug
demonstrated in previous patch.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (13 lines)
Mtests/test-rebase-inmemory.t (21 lines)

Diff 10952

mercurial/context.py

component = "/".join(components[0:i]) component = "/".join(components[0:i])
if component in self.p1() and self._cache[component]['exists']: 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: mfiles = matches.keys()
if len(matches) == 1 and matches.keys()[0] == path: if len(mfiles) > 0:
if len(mfiles) == 1 and mfiles[0] == path:
return
# omit the files which are deleted in current IMM wctx
mfiles = [m for m in mfiles if self._cache[m]['exists']]
if not mfiles:
return return
raise error.Abort("error: file '%s' cannot be written because " raise error.Abort("error: file '%s' cannot be written because "
" '%s/' is a folder in %s (containing %d " " '%s/' is a folder in %s (containing %d "
"entries: %s)" "entries: %s)"
% (path, path, self.p1(), len(matches), % (path, path, self.p1(), len(mfiles),
', '.join(matches.keys()))) ', '.join(mfiles)))
def write(self, path, data, flags='', **kwargs): def write(self, path, data, flags='', **kwargs):
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._auditconflicts(path)
self._markdirty(path, exists=True, data=data, date=dateutil.makedate(), self._markdirty(path, exists=True, data=data, date=dateutil.makedate(),
flags=flags) flags=flags)

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 5 $ hg rebase -r . -d 5
rebasing 7:855e9797387e "added a back!" (tip) rebasing 7:855e9797387e "added a back!" (tip)
abort: error: file 'a' cannot be written because 'a/' is a folder in 9b94b9373deb (containing 1 entries: a/a) saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/855e9797387e-81ee4c5d-rebase.hg
[255]
$ hg tglog
@ 7: bb3f02be2688 'added a back!'
|
| o 6: d14530e5e3e6 'added bar'
| |
o | 5: 9b94b9373deb 'added foo'
|/
o 4: c6ad37a4f250 'a/a'
|
| o 3: 844a7de3e617 'c'
| |
o | 2: 09c044d2cb43 'd'
| |
o | 1: fc055c3b4d33 'b'
|/
o 0: b173517d0057 'a'
$ 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