This is an archive of the discontinued Mercurial Phabricator instance.

Differential D550

metadataonlyctx: don't crash when reusing the manifest with deletions
ClosedPublic

Authored by quark on Aug 28 2017, 8:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbe814edf3306: metadataonlyctx: don't crash when reusing the manifest with deletions
Summary

This was originally fixed by Mateusz Kwapich for the metaedit command in
fb-hgext with a test for the metaedit command. It didn't get upstreamed
because metaedit was not in core.

This patch fixes the crash and adds a test about metadataonlyctx to
avoid future regressions.

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

quark created this revision.Aug 28 2017, 8:49 PM
Closed by commit rHGbe814edf3306: metadataonlyctx: don't crash when reusing the manifest with deletions (authored by quark). · Explain WhyAug 29 2017, 10:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)
AMtests/test-context-metadata.t (50 lines)

Diff 1392

mercurial/context.py

managing = lambda f: f in man1 or f in man2 managing = lambda f: f in man1 or f in man2
else: else:
managing = lambda f: f in man1 managing = lambda f: f in man1
modified, added, removed = [], [], [] modified, added, removed = [], [], []
for f in self._files: for f in self._files:
if not managing(f): if not managing(f):
added.append(f) added.append(f)
elif self[f]: elif f in self:
modified.append(f) modified.append(f)
else: else:
removed.append(f) removed.append(f)
return scmutil.status(modified, added, removed, [], [], [], []) return scmutil.status(modified, added, removed, [], [], [], [])

tests/test-context-metadata.t

  • This file was added.
Tests about metadataonlyctx
$ hg init
$ echo A > A
$ hg commit -A A -m 'Add A'
$ echo B > B
$ hg commit -A B -m 'Add B'
$ hg rm A
$ echo C > C
$ echo B2 > B
$ hg add C -q
$ hg commit -m 'Remove A'
$ cat > metaedit.py <<EOF
> from __future__ import absolute_import
> from mercurial import context, registrar
> cmdtable = {}
> command = registrar.command(cmdtable)
> @command('metaedit')
> def metaedit(ui, repo, arg):
> # Modify commit message to "FOO"
> with repo.wlock(), repo.lock(), repo.transaction('metaedit'):
> old = repo['.']
> kwargs = dict(s.split('=', 1) for s in arg.split(';'))
> if 'parents' in kwargs:
> kwargs['parents'] = kwargs['parents'].split(',')
> new = context.metadataonlyctx(repo, old, **kwargs)
> new.commit()
> EOF
$ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'text=Changed'
$ hg log -r tip
changeset: 3:ad83e9e00ec9
tag: tip
parent: 1:3afb7afe6632
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Changed
$ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'parents=0' 2>&1 | egrep '^\S*Error'
RuntimeError: can't reuse the manifest: its p1 doesn't match the new ctx p1
$ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'user=foo <foo@example.com>'
$ hg log -r tip
changeset: 4:1f86eaeca92b
tag: tip
parent: 1:3afb7afe6632
user: foo <foo@example.com>
date: Thu Jan 01 00:00:00 1970 +0000
summary: Remove A