This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6126

dirstate: remove obsolete reference to dirstate.beginparentchange
ClosedPublic

Authored by martinvonz on Mar 13 2019, 2:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG42dd69985778: dirstate: remove obsolete reference to dirstate.beginparentchange
Summary

The only valid API since 265e91da56fd (dirstate: drop deprecated
methods (API), 2018-02-02) is the context manager returned from
dirstate.parentchange().

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 13 2019, 2:04 PM
Closed by commit rHG42dd69985778: dirstate: remove obsolete reference to dirstate.beginparentchange (authored by martinvonz). · Explain WhyMar 15 2019, 11:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (4 lines)

Diff 14483

mercurial/dirstate.py

When moving from two parents to one, 'm' merged entries a When moving from two parents to one, 'm' merged entries a
adjusted to normal and previous copy records discarded and adjusted to normal and previous copy records discarded and
returned by the call. returned by the call.
See localrepo.setparents() See localrepo.setparents()
""" """
if self._parentwriters == 0: if self._parentwriters == 0:
raise ValueError("cannot set dirstate parent without " raise ValueError("cannot set dirstate parent outside of "
"calling dirstate.beginparentchange") "dirstate.parentchange context manager")
self._dirty = True self._dirty = True
oldp2 = self._pl[1] oldp2 = self._pl[1]
if self._origpl is None: if self._origpl is None:
self._origpl = self._pl self._origpl = self._pl
self._map.setparents(p1, p2) self._map.setparents(p1, p2)
copies = {} copies = {}
if oldp2 != nullid and p2 == nullid: if oldp2 != nullid and p2 == nullid: