This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6133

rebase: fix crash with in-memory rebase and copies
ClosedPublic

Authored by martinvonz on Mar 14 2019, 5:50 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe1ceefab9bca: rebase: fix crash with in-memory rebase and copies
Summary

When using regular on-disk rebase, filectx.markcopies() calls to
dirstate.copy(), which happily records the copy. Then it's simply
ignored if it doesn't matter for the commit (as in the test case I
added in the previous patch). Let's do the same for overlayworkingctx.

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

martinvonz created this revision.Mar 14 2019, 5:50 PM
pulkit accepted this revision.Mar 15 2019, 9:34 AM
Closed by commit rHGe1ceefab9bca: rebase: fix crash with in-memory rebase and copies (authored by martinvonz). · Explain WhyMar 15 2019, 9:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (11 lines)
Mtests/test-rebase-inmemory.t (6 lines)

Diff 14505

mercurial/context.py

def filedate(self, path): def filedate(self, path):
if self.isdirty(path): if self.isdirty(path):
return self._cache[path]['date'] return self._cache[path]['date']
else: else:
return self._wrappedctx[path].date() return self._wrappedctx[path].date()
def markcopied(self, path, origin): def markcopied(self, path, origin):
if self.isdirty(path): self._markdirty(path, exists=True, date=self.filedate(path),
self._cache[path]['copied'] = origin flags=self.flags(path), copied=origin)
else:
raise error.ProgrammingError('markcopied() called on clean context')
def copydata(self, path): def copydata(self, path):
if self.isdirty(path): if self.isdirty(path):
return self._cache[path]['copied'] return self._cache[path]['copied']
else: else:
raise error.ProgrammingError('copydata() called on clean context') raise error.ProgrammingError('copydata() called on clean context')
def flags(self, path): def flags(self, path):
except error.ManifestLookupError: except error.ManifestLookupError:
# Path not in the underlying manifest (created). # Path not in the underlying manifest (created).
continue continue
for path in keys: for path in keys:
del self._cache[path] del self._cache[path]
return keys return keys
def _markdirty(self, path, exists, data=None, date=None, flags=''): def _markdirty(self, path, exists, data=None, date=None, flags='',
copied=None):
# data not provided, let's see if we already have some; if not, let's # data not provided, let's see if we already have some; if not, let's
# grab it from our underlying context, so that we always have data if # grab it from our underlying context, so that we always have data if
# the file is marked as existing. # the file is marked as existing.
if exists and data is None: if exists and data is None:
oldentry = self._cache.get(path) or {} oldentry = self._cache.get(path) or {}
data = oldentry.get('data') or self._wrappedctx[path].data() data = oldentry.get('data') or self._wrappedctx[path].data()
self._cache[path] = { self._cache[path] = {
'exists': exists, 'exists': exists,
'data': data, 'data': data,
'date': date, 'date': date,
'flags': flags, 'flags': flags,
'copied': None, 'copied': copied,
} }
def filectx(self, path, filelog=None): def filectx(self, path, filelog=None):
return overlayworkingfilectx(self._repo, path, parent=self, return overlayworkingfilectx(self._repo, path, parent=self,
filelog=filelog) filelog=filelog)
class overlayworkingfilectx(committablefilectx): class overlayworkingfilectx(committablefilectx):
"""Wrap a ``workingfilectx`` but intercepts all writes into an in-memory """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory

tests/test-rebase-inmemory.t

| o | 3: ca58782ad1e4 'b' | o | 3: ca58782ad1e4 'b'
|/ / |/ /
o / 2: 814f6bd05178 'c' o / 2: 814f6bd05178 'c'
|/ |/
o 1: 02952614a83d 'd' o 1: 02952614a83d 'd'
| |
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -b 5 -d tip 2>&1 | grep '** ProgrammingError' $ hg rebase -b 5 -d tip
** ProgrammingError: markcopied() called on clean context rebasing 3:ca58782ad1e4 "b"
rebasing 5:71cb43376053 "merge"
note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes