This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6821

flagprocessors: directly duplicate the deprecated layer back into revlog
ClosedPublic

Authored by marmoute on Sep 7 2019, 5:29 AM.

Details

Reviewers
yuja
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG01304095256c: flagprocessors: directly duplicate the deprecated layer back into revlog
Summary

The code duplication benign and will get removed in a couple of month anyway.

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.Sep 7 2019, 5:29 AM
durin42 accepted this revision.Sep 9 2019, 1:56 PM
This revision is now accepted and ready to land.Sep 9 2019, 1:56 PM
durin42 added inline comments.Sep 9 2019, 2:00 PM
hgext/remotefilelog/remotefilelog.py
313

I'm not sure what this is telling me. Is it saying that I want one of processflags{raw,read,write}?

I missed this over the weekend when I wasn't coding (I don't do hg stuff on weekends), but the message is sufficiently confusing I want to clean it up.

marmoute updated this revision to Diff 16487.Sep 9 2019, 5:24 PM
marmoute updated this revision to Diff 16500.Sep 9 2019, 7:09 PM
marmoute added inline comments.Sep 11 2019, 3:24 AM
hgext/remotefilelog/remotefilelog.py
313

Yes, that's the message.

Revision Contents
Changeset List

Diff 16641

hgext/remotefilelog/remotefilelog.py

wdirid, wdirid,
) )
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
ancestor, ancestor,
error, error,
mdiff, mdiff,
revlog, revlog,
util,
) )
from mercurial.utils import storageutil from mercurial.utils import storageutil
from mercurial.revlogutils import flagutil from mercurial.revlogutils import flagutil
from . import ( from . import (
constants, constants,
fileserverclient, fileserverclient,
shallowutil, shallowutil,
def node(self, rev): def node(self, rev):
# This is a hack. # This is a hack.
if isinstance(rev, int): if isinstance(rev, int):
raise error.ProgrammingError( raise error.ProgrammingError(
'remotefilelog does not convert integer rev to node') 'remotefilelog does not convert integer rev to node')
return rev return rev
def _processflags(self, text, flags, operation, raw=False):
"""deprecated entry point to access flag processors"""
msg = ('_processflag(...) use the specialized variant')
durin42Unsubmitted
Not Done

I'm not sure what this is telling me. Is it saying that I want one of processflags{raw,read,write}?

I missed this over the weekend when I wasn't coding (I don't do hg stuff on weekends), but the message is sufficiently confusing I want to clean it up.

durin42: I'm not sure what this is telling me. Is it saying that I want one of processflags{raw,read…
marmouteAuthorUnsubmitted
Done

Yes, that's the message.

marmoute: Yes, that's the message.
util.nouideprecwarn(msg, '5.2', stacklevel=2)
if raw:
return text, flagutil.processflagsraw(self, text, flags)
elif operation == 'read':
return flagutil.processflagsread(self, text, flags)
else: # write operation
return flagutil.processflagswrite(self, text, flags)
def revision(self, node, raw=False): def revision(self, node, raw=False):
"""returns the revlog contents at this node. """returns the revlog contents at this node.
this includes the meta data traditionally included in file revlogs. this includes the meta data traditionally included in file revlogs.
this is generally only used for bundling and communicating with vanilla this is generally only used for bundling and communicating with vanilla
hg clients. hg clients.
""" """
if node == nullid: if node == nullid:
return "" return ""

mercurial/revlog.py

revlog data directly. So this function needs raw revision data. revlog data directly. So this function needs raw revision data.
""" """
if rev1 != nullrev and self.deltaparent(rev2) == rev1: if rev1 != nullrev and self.deltaparent(rev2) == rev1:
return bytes(self._chunk(rev2)) return bytes(self._chunk(rev2))
return mdiff.textdiff(self.rawdata(rev1), return mdiff.textdiff(self.rawdata(rev1),
self.rawdata(rev2)) self.rawdata(rev2))
def _processflags(self, text, flags, operation, raw=False):
"""deprecated entry point to access flag processors"""
msg = ('_processflag(...) use the specialized variant')
util.nouideprecwarn(msg, '5.2', stacklevel=2)
if raw:
return text, flagutil.processflagsraw(self, text, flags)
elif operation == 'read':
return flagutil.processflagsread(self, text, flags)
else: # write operation
return flagutil.processflagswrite(self, text, flags)
def revision(self, nodeorrev, _df=None, raw=False): def revision(self, nodeorrev, _df=None, raw=False):
"""return an uncompressed revision of a given node or revision """return an uncompressed revision of a given node or revision
number. number.
_df - an existing file handle to read from. (internal-only) _df - an existing file handle to read from. (internal-only)
raw - an optional argument specifying if the revision data is to be raw - an optional argument specifying if the revision data is to be
treated as raw data when applying flag transforms. 'raw' should be set treated as raw data when applying flag transforms. 'raw' should be set
to True when generating changegroups or in debug commands. to True when generating changegroups or in debug commands.

mercurial/revlogutils/flagutil.py

Make sure the `_flagprocessors` attribute is set at ``__init__`` time. Make sure the `_flagprocessors` attribute is set at ``__init__`` time.
See the documentation of the ``_processflags`` method for details. See the documentation of the ``_processflags`` method for details.
""" """
_flagserrorclass = error.RevlogError _flagserrorclass = error.RevlogError
def _processflags(self, text, flags, operation, raw=False):
"""deprecated entry point to access flag processors"""
msg = ('_processflag(...) use the specialized variant')
util.nouideprecwarn(msg, '5.2', stacklevel=2)
if raw:
return text, processflagsraw(self, text, flags)
elif operation == 'read':
return processflagsread(self, text, flags)
else: # write operation
return processflagswrite(self, text, flags)
def processflagswrite(revlog, text, flags, sidedata): def processflagswrite(revlog, text, flags, sidedata):
"""Inspect revision data flags and applies write transformations defined """Inspect revision data flags and applies write transformations defined
by registered flag processors. by registered flag processors.
``text`` - the revision data to process ``text`` - the revision data to process
``flags`` - the revision flags ``flags`` - the revision flags
This method processes the flags in the order (or reverse order if This method processes the flags in the order (or reverse order if