This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6951

sidedatacopies: get and store sidedata in the changelogrevision object
ClosedPublic

Authored by marmoute on Oct 3 2019, 1:54 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG037a8759eda1: sidedatacopies: get and store sidedata in the changelogrevision object
rHGc42df030a9eb: sidedatacopies: get and store sidedata in the changelogrevision object
Summary

The object provide a simple way to access changelog entry, we need it to also
bear the sidedata value.

Since the sidedata are retrieved at the same time as the revision, we can do
that without extra cost.

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

marmoute created this revision.Oct 3 2019, 1:54 AM
marmoute updated this revision to Diff 16952.Oct 7 2019, 8:37 PM
martinvonz added a subscriber: martinvonz.Oct 9 2019, 1:19 PM
martinvonz added inline comments.
mercurial/changelog.py
618–625

nit: inconsistent way of calling the changelogrevision constructor between these two call sites

marmoute added inline comments.Oct 9 2019, 1:24 PM
mercurial/changelog.py
618–625

Is a followup good enough for you ?

martinvonz added inline comments.Oct 9 2019, 1:27 PM
mercurial/changelog.py
618–625

Yes, even leaving it inconsistent is good enough for me :) I don't care that much

marmoute added a commit: rHGc42df030a9eb: sidedatacopies: get and store sidedata in the changelogrevision object.Oct 9 2019, 1:47 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc42df030a9eb: sidedatacopies: get and store sidedata in the changelogrevision object (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (9 lines)

Diff 17006

mercurial/changelog.py

Changelog revisions consist of multiple pieces of data, including Changelog revisions consist of multiple pieces of data, including
the manifest node, user, and date. This object exposes a view into the manifest node, user, and date. This object exposes a view into
the parsed object. the parsed object.
""" """
__slots__ = ( __slots__ = (
r'_offsets', r'_offsets',
r'_text', r'_text',
r'_sidedata',
) )
def __new__(cls, text): def __new__(cls, text, sidedata):
if not text: if not text:
return _changelogrevision(extra=_defaultextra) return _changelogrevision(extra=_defaultextra)
self = super(changelogrevision, cls).__new__(cls) self = super(changelogrevision, cls).__new__(cls)
# We could return here and implement the following as an __init__. # We could return here and implement the following as an __init__.
# But doing it here is equivalent and saves an extra function call. # But doing it here is equivalent and saves an extra function call.
# format used: # format used:
# double newline that precedes the description. # double newline that precedes the description.
if text[nl3 + 1 : nl3 + 2] == b'\n': if text[nl3 + 1 : nl3 + 2] == b'\n':
doublenl = nl3 doublenl = nl3
else: else:
doublenl = text.index(b'\n\n', nl3 + 1) doublenl = text.index(b'\n\n', nl3 + 1)
self._offsets = (nl1, nl2, nl3, doublenl) self._offsets = (nl1, nl2, nl3, doublenl)
self._text = text self._text = text
self._sidedata = sidedata
return self return self
@property @property
def manifest(self): def manifest(self):
return bin(self._text[0 : self._offsets[0]]) return bin(self._text[0 : self._offsets[0]])
@property @property
- list of files - list of files
- commit message as a localstr - commit message as a localstr
- dict of extra metadata - dict of extra metadata
Unless you need to access all fields, consider calling Unless you need to access all fields, consider calling
``changelogrevision`` instead, as it is faster for partial object ``changelogrevision`` instead, as it is faster for partial object
access. access.
""" """
c = changelogrevision(self.revision(node)) c = changelogrevision(*self._revisiondata(node))
return (c.manifest, c.user, c.date, c.files, c.description, c.extra) return (c.manifest, c.user, c.date, c.files, c.description, c.extra)
def changelogrevision(self, nodeorrev): def changelogrevision(self, nodeorrev):
"""Obtain a ``changelogrevision`` for a node or revision.""" """Obtain a ``changelogrevision`` for a node or revision."""
return changelogrevision(self.revision(nodeorrev)) text, sidedata = self._revisiondata(nodeorrev)
return changelogrevision(text, sidedata)
martinvonzUnsubmitted
Not Done

nit: inconsistent way of calling the changelogrevision constructor between these two call sites

martinvonz: nit: inconsistent way of calling the `changelogrevision` constructor between these two call…
marmouteAuthorUnsubmitted
Done

Is a followup good enough for you ?

marmoute: Is a followup good enough for you ?
martinvonzUnsubmitted
Not Done

Yes, even leaving it inconsistent is good enough for me :) I don't care that much

martinvonz: Yes, even leaving it inconsistent is good enough for me :) I don't care that much
def readfiles(self, node): def readfiles(self, node):
""" """
short version of read that only returns the files modified by the cset short version of read that only returns the files modified by the cset
""" """
text = self.revision(node) text = self.revision(node)
if not text: if not text:
return [] return []
last = text.index(b"\n\n") last = text.index(b"\n\n")