( )⚙ D2008 narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2008

narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS
ClosedPublic

Authored by durin42 on Feb 2 2018, 10:53 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG9445a3141501: narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS
Summary

We should have been using this value all along. Sigh.

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

durin42 created this revision.Feb 2 2018, 10:53 AM
indygreg added inline comments.Feb 2 2018, 2:03 PM
hgext/narrow/narrowrevlog.py
25

Does this also need to move to core? What happens when core encounters this revision flag without a registered flag processor (this should never happen if repo requirements are done properly though).

martinvonz added a subscriber: martinvonz.Feb 2 2018, 2:13 PM
martinvonz added inline comments.
mercurial/revlog.py
60 ↗(On Diff #5158)

See comment on earlier patch that the flag is already defined here (line 71), unless I'm missing something

durin42 updated this revision to Diff 5499.Feb 12 2018, 3:03 PM
durin42 edited the summary of this revision. (Show Details)Feb 12 2018, 3:23 PM
durin42 retitled this revision from revlog: move ELLIPSIS_NODE_FLAG to core from narrowrevlog to narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS.
durin42 updated this revision to Diff 5513.
indygreg accepted this revision.Feb 12 2018, 6:03 PM
This revision is now accepted and ready to land.Feb 12 2018, 6:03 PM
Closed by commit rHG9445a3141501: narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS (authored by durin42). · Explain WhyFeb 12 2018, 6:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5552

hgext/narrow/narrowchangegroup.py

from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
changegroup, changegroup,
error, error,
extensions, extensions,
manifest, manifest,
mdiff, mdiff,
node, node,
revlog,
util, util,
) )
from . import ( from . import (
narrowrepo, narrowrepo,
narrowrevlog,
) )
def setup(): def setup():
def supportedoutgoingversions(orig, repo): def supportedoutgoingversions(orig, repo):
versions = orig(repo) versions = orig(repo)
if narrowrepo.REQUIREMENT in repo.requirements: if narrowrepo.REQUIREMENT in repo.requirements:
versions.discard('01') versions.discard('01')
links[fnode] = min(links[fnode], lr, key=clrev) links[fnode] = min(links[fnode], lr, key=clrev)
elif fnode: elif fnode:
links[fnode] = lr links[fnode] = lr
return links return links
return orig(self, changedfiles, linknodes, commonrevs, source) return orig(self, changedfiles, linknodes, commonrevs, source)
extensions.wrapfunction( extensions.wrapfunction(
changegroup.cg1packer, 'generatefiles', generatefiles) changegroup.cg1packer, 'generatefiles', generatefiles)
def ellipsisdata(packer, rev, revlog, p1, p2, data, linknode): def ellipsisdata(packer, rev, revlog_, p1, p2, data, linknode):
n = revlog.node(rev) n = revlog_.node(rev)
p1n, p2n = revlog.node(p1), revlog.node(p2) p1n, p2n = revlog_.node(p1), revlog_.node(p2)
flags = revlog.flags(rev) flags = revlog_.flags(rev)
flags |= narrowrevlog.ELLIPSIS_NODE_FLAG flags |= revlog.REVIDX_ELLIPSIS
meta = packer.builddeltaheader( meta = packer.builddeltaheader(
n, p1n, p2n, node.nullid, linknode, flags) n, p1n, p2n, node.nullid, linknode, flags)
# TODO: try and actually send deltas for ellipsis data blocks # TODO: try and actually send deltas for ellipsis data blocks
diffheader = mdiff.trivialdiffheader(len(data)) diffheader = mdiff.trivialdiffheader(len(data))
l = len(meta) + len(diffheader) + len(data) l = len(meta) + len(diffheader) + len(data)
return ''.join((changegroup.chunkheader(l), return ''.join((changegroup.chunkheader(l),
meta, meta,
diffheader, diffheader,

hgext/narrow/narrowrevlog.py

# narrowrevlog.py - revlog storing irrelevant nodes as "ellipsis" nodes # narrowrevlog.py - revlog storing irrelevant nodes as "ellipsis" nodes
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
manifest, manifest,
revlog, revlog,
util, util,
) )
ELLIPSIS_NODE_FLAG = 1 << 14
revlog.REVIDX_KNOWN_FLAGS |= ELLIPSIS_NODE_FLAG
if ELLIPSIS_NODE_FLAG not in revlog.REVIDX_FLAGS_ORDER:
revlog.REVIDX_FLAGS_ORDER.append(ELLIPSIS_NODE_FLAG)
def readtransform(self, text): def readtransform(self, text):
return text, False return text, False
def writetransform(self, text): def writetransform(self, text):
return text, False return text, False
def rawtransform(self, text): def rawtransform(self, text):
return False return False
revlog.addflagprocessor(ELLIPSIS_NODE_FLAG, revlog.addflagprocessor(revlog.REVIDX_ELLIPSIS,
indygregUnsubmitted
Not Done

Does this also need to move to core? What happens when core encounters this revision flag without a registered flag processor (this should never happen if repo requirements are done properly though).

indygreg: Does this also need to move to core? What happens when core encounters this revision flag…
(readtransform, writetransform, rawtransform)) (readtransform, writetransform, rawtransform))
def setup(): def setup():
# We just wanted to add the flag processor, which is done at module # We just wanted to add the flag processor, which is done at module
# load time. # load time.
pass pass
class excludeddir(manifest.treemanifest): class excludeddir(manifest.treemanifest):

hgext/narrow/narrowtemplates.py

# narrowtemplates.py - added template keywords for narrow clones # narrowtemplates.py - added template keywords for narrow clones
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
revlog,
revset, revset,
templatekw, templatekw,
util, util,
) )
from . import narrowrevlog
def _isellipsis(repo, rev): def _isellipsis(repo, rev):
if repo.changelog.flags(rev) & narrowrevlog.ELLIPSIS_NODE_FLAG: if repo.changelog.flags(rev) & revlog.REVIDX_ELLIPSIS:
return True return True
return False return False
def ellipsis(repo, ctx, templ, **args): def ellipsis(repo, ctx, templ, **args):
""":ellipsis: String. 'ellipsis' if the change is an ellipsis node, """:ellipsis: String. 'ellipsis' if the change is an ellipsis node,
else ''.""" else ''."""
if _isellipsis(repo, ctx.rev()): if _isellipsis(repo, ctx.rev()):
return 'ellipsis' return 'ellipsis'