This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8849

dirstate: revert change to Rust binding
ClosedPublic

Authored by joerg.sonnenberger on Jul 29 2020, 7:10 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGe0bfde04f957: dirstate: revert change to Rust binding
Summary

The Rust binding uses its own class and is not derived from the regular
implementation. As such, it didn't get _nodelen.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz requested changes to this revision.Jul 30 2020, 12:49 AM
martinvonz added a subscriber: martinvonz.

The commit message is missing the "why" (which is fine if that's obvious, but it doesn't seem obvious to me here). It's also unclear how this is changing a Rust binding. Are you saying that fp is an object defined in Rust?

This revision now requires changes to proceed.Jul 30 2020, 12:49 AM
Alphare added a subscriber: Alphare.Jul 30 2020, 3:10 AM

@martinvonz this is inside the dirstatemap variant defined in case we use the Rust version. I agree that a small commit description is needed, otherwise this seems fine.

@joerg.sonnenberger what about the allocation heuristic, do you also have a follow-up?

joerg.sonnenberger edited the summary of this revision. (Show Details)Jul 30 2020, 7:30 AM
joerg.sonnenberger added a commit: rHGe0bfde04f957: dirstate: revert change to Rust binding.Jul 30 2020, 10:53 AM
This revision was not accepted when it landed; it landed in state Needs Revision.
Closed by commit rHGe0bfde04f957: dirstate: revert change to Rust binding (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (2 lines)

Diff 22153

mercurial/dirstate.py

self._rustmap.setparents(p1, p2) self._rustmap.setparents(p1, p2)
self._parents = (p1, p2) self._parents = (p1, p2)
self._dirtyparents = True self._dirtyparents = True
def parents(self): def parents(self):
if not self._parents: if not self._parents:
try: try:
fp = self._opendirstatefile() fp = self._opendirstatefile()
st = fp.read(2 * self._nodelen) st = fp.read(40)
fp.close() fp.close()
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
# File doesn't exist, so the current state is empty # File doesn't exist, so the current state is empty
st = b'' st = b''
try: try: