This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6801

flagprocessors: use _processflagswrite for write operation
ClosedPublic

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

Details

Reviewers
yuja
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdb4af1cb128a: flagprocessors: use _processflagswrite for write operation
Summary

There are no ambiguity for 'write' operation so it is simple to replace.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

marmoute created this revision.Sep 7 2019, 5:27 AM
indygreg accepted this revision.Sep 7 2019, 1:01 PM
This revision is now accepted and ready to land.Sep 7 2019, 1:01 PM

Revision Contents
Changeset List

Diff 16406

hgext/remotefilelog/remotefilelog.py

def addrevision(self, text, transaction, linknode, p1, p2, cachedelta=None, def addrevision(self, text, transaction, linknode, p1, p2, cachedelta=None,
node=None, flags=revlog.REVIDX_DEFAULT_FLAGS): node=None, flags=revlog.REVIDX_DEFAULT_FLAGS):
# text passed to "addrevision" includes hg filelog metadata header # text passed to "addrevision" includes hg filelog metadata header
if node is None: if node is None:
node = storageutil.hashrevisionsha1(text, p1, p2) node = storageutil.hashrevisionsha1(text, p1, p2)
meta, metaoffset = storageutil.parsemeta(text) meta, metaoffset = storageutil.parsemeta(text)
rawtext, validatehash = self._processflags(text, flags, 'write') rawtext, validatehash = self._processflagswrite(text, flags)
return self.addrawrevision(rawtext, transaction, linknode, p1, p2, return self.addrawrevision(rawtext, transaction, linknode, p1, p2,
node, flags, cachedelta, node, flags, cachedelta,
_metatuple=(meta, metaoffset)) _metatuple=(meta, metaoffset))
def addrawrevision(self, rawtext, transaction, linknode, p1, p2, node, def addrawrevision(self, rawtext, transaction, linknode, p1, p2, node,
flags, cachedelta=None, _metatuple=None): flags, cachedelta=None, _metatuple=None):
if _metatuple: if _metatuple:
# _metatuple: used by "addrevision" internally by remotefilelog # _metatuple: used by "addrevision" internally by remotefilelog

mercurial/revlog.py

""" """
if link == nullrev: if link == nullrev:
raise error.RevlogError(_("attempted to add linkrev -1 to %s") raise error.RevlogError(_("attempted to add linkrev -1 to %s")
% self.indexfile) % self.indexfile)
if flags: if flags:
node = node or self.hash(text, p1, p2) node = node or self.hash(text, p1, p2)
rawtext, validatehash = self._processflags(text, flags, 'write') rawtext, validatehash = self._processflagswrite(text, flags)
# If the flag processor modifies the revision data, ignore any provided # If the flag processor modifies the revision data, ignore any provided
# cachedelta. # cachedelta.
if rawtext != text: if rawtext != text:
cachedelta = None cachedelta = None
if len(rawtext) > _maxentrysize: if len(rawtext) > _maxentrysize:
raise error.RevlogError( raise error.RevlogError(

tests/simplestorerepo.py

def addrevision(self, text, transaction, linkrev, p1, p2, node=None, def addrevision(self, text, transaction, linkrev, p1, p2, node=None,
flags=revlog.REVIDX_DEFAULT_FLAGS, cachedelta=None): flags=revlog.REVIDX_DEFAULT_FLAGS, cachedelta=None):
validatenode(p1) validatenode(p1)
validatenode(p2) validatenode(p2)
if flags: if flags:
node = node or storageutil.hashrevisionsha1(text, p1, p2) node = node or storageutil.hashrevisionsha1(text, p1, p2)
rawtext, validatehash = self._processflags(text, flags, 'write') rawtext, validatehash = self._processflagswrite(text, flags)
node = node or storageutil.hashrevisionsha1(text, p1, p2) node = node or storageutil.hashrevisionsha1(text, p1, p2)
if node in self._indexbynode: if node in self._indexbynode:
return node return node
if validatehash: if validatehash:
self.checkhash(rawtext, node, p1=p1, p2=p2) self.checkhash(rawtext, node, p1=p1, p2=p2)