This is an archive of the discontinued Mercurial Phabricator instance.

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	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 mentioned this in D1977: narrow: this code should assume REVIDX_FLAGS_ORDER exists.Feb 12 2018, 3:21 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

			Path	Packages
M			hgext/narrow/narrowchangegroup.py (12 lines)
M			hgext/narrow/narrowrevlog.py (7 lines)
M			hgext/narrow/narrowtemplates.py (5 lines)
M			mercurial/revlog.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5158		Feb 2 2018, 10:53 AM	★	★
Diff 2	5499		Feb 12 2018, 3:03 PM	★	★
Diff 3	5513		Feb 12 2018, 3:23 PM	★	★
Diff 4	5552	rHG9445a31415019914b3c997282353c4cd5ae99f85	Feb 2 2018, 10:37 AM	★	★

Status	Author	Revision
Closed	durin42	D2196 narrow: add a TODO document
Closed	durin42	D2195 tests: use `hello` not `capabilities` over ssh
Closed	durin42	D2194 narrowwirepeer: add TODO about how we add wireproto args to unbundle :(
Closed	durin42	D2193 narrowwirepeer: rename expandnarrow capability to exp-expandnarrow
Closed	durin42	D2192 narrow: make restrictpatterns a little more idiomatic
Closed	durin42	D2191 narrowspec: consistently use set() to copy sets
Closed	durin42	D2190 narrowspec: document constraints when validating patterns
Closed	durin42	D2189 narrowrevlog: add a TODO around remotefilelog moving to core
Closed	durin42	D2188 narrowrevlog: add what little I can remember about rename filtering
Closed	durin42	D2187 manifest: clean up dirlog() to take a d parameter to avoid shadowing dir()
Closed	durin42	D2186 narrowrevlog: replace AssertionError with ProgrammingError
Closed	durin42	D2185 narrowrevlog: document excludeddir class and friends
Closed	durin42	D2184 narrowrepo: add docstring for narrowpats
Closed	durin42	D2009 narrowtemplates: update to use registrar mechanism
Closed	durin42	D2008 narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS
Closed	durin42	D2007 narrowrepo: make repo requirement include the string 'experimental'
Closed	durin42	D2006 narrow: mark requirement as a constant
Closed	durin42	D2005 narrowbundle2: mark most constants as module-private
Closed	durin42	D2004 narrowbundle2: make constants ALLCAPS to be a bit more readable
Closed	durin42	D1980 narrow: remove old version-checking logic and declare internal
Closed	durin42	D1979 tests: fold narrow treemanifest tests into main test file using testcases
Closed	durin42	D1978 narrow: assume addflagprocessor will always exist on revlog module
Closed	durin42	D1977 narrow: this code should assume REVIDX_FLAGS_ORDER exists
Closed	durin42	D1976 narrow: drop legacy support for getsubsetraw
Closed	durin42	D1975 narrow: remove support for old match modules
Closed	durin42	D1974 narrow: import experimental extension from narrowhg revision cb51d673e9c5

Diff 5158

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.ELLIPSIS_NODE_FLAG
	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.ELLIPSIS_NODE_FLAG,
				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.ELLIPSIS_NODE_FLAG:
	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'

mercurial/revlog.py

	_zlibdecompress = zlib.decompress			_zlibdecompress = zlib.decompress

	# revlog header flags			# revlog header flags
	REVLOGV0 = 0			REVLOGV0 = 0
	REVLOGV1 = 1			REVLOGV1 = 1
	# Dummy value until file format is finalized.			# Dummy value until file format is finalized.
	# Reminder: change the bounds check in revlog.__init__ when this is changed.			# Reminder: change the bounds check in revlog.__init__ when this is changed.
	REVLOGV2 = 0xDEAD			REVLOGV2 = 0xDEAD
				ELLIPSIS_NODE_FLAG = (1 << 14)
				martinvonzUnsubmitted Not Done See comment on earlier patch that the flag is already defined here (line 71), unless I'm missing something martinvonz: See comment on earlier patch that the flag is already defined here (line 71), unless I'm…
	FLAG_INLINE_DATA = (1 << 16)			FLAG_INLINE_DATA = (1 << 16)
	FLAG_GENERALDELTA = (1 << 17)			FLAG_GENERALDELTA = (1 << 17)
	REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA			REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA
	REVLOG_DEFAULT_FORMAT = REVLOGV1			REVLOG_DEFAULT_FORMAT = REVLOGV1
	REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT \| REVLOG_DEFAULT_FLAGS			REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT \| REVLOG_DEFAULT_FLAGS
	REVLOGV1_FLAGS = FLAG_INLINE_DATA \| FLAG_GENERALDELTA			REVLOGV1_FLAGS = FLAG_INLINE_DATA \| FLAG_GENERALDELTA
	REVLOGV2_FLAGS = REVLOGV1_FLAGS			REVLOGV2_FLAGS = REVLOGV1_FLAGS

	# revlog index flags			# revlog index flags
	REVIDX_ISCENSORED = (1 << 15) # revision has censor metadata, must be verified			REVIDX_ISCENSORED = (1 << 15) # revision has censor metadata, must be verified
	REVIDX_ELLIPSIS = (1 << 14) # revision hash does not match data (narrowhg)			REVIDX_ELLIPSIS = (1 << 14) # revision hash does not match data (narrowhg)
	REVIDX_EXTSTORED = (1 << 13) # revision data is stored externally			REVIDX_EXTSTORED = (1 << 13) # revision data is stored externally
	REVIDX_DEFAULT_FLAGS = 0			REVIDX_DEFAULT_FLAGS = 0
	# stable order in which flags need to be processed and their processors applied			# stable order in which flags need to be processed and their processors applied
	REVIDX_FLAGS_ORDER = [			REVIDX_FLAGS_ORDER = [
	REVIDX_ISCENSORED,			REVIDX_ISCENSORED,
	REVIDX_ELLIPSIS,			REVIDX_ELLIPSIS,
	REVIDX_EXTSTORED,			REVIDX_EXTSTORED,
				ELLIPSIS_NODE_FLAG,
	]			]
	REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER)			REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER)

	# max size of revlog with inline data			# max size of revlog with inline data
	_maxinline = 131072			_maxinline = 131072
	_chunksize = 1048576			_chunksize = 1048576

	RevlogError = error.RevlogError			RevlogError = error.RevlogError

This is an archive of the discontinued Mercurial Phabricator instance.

narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSISClosedPublic

Details

Diff Detail

Event Timeline