This is an archive of the discontinued Mercurial Phabricator instance.

pulkit retitled this revision from narrowspec: use sparse.parseconfig() to parse narrowspec file (BC) to narrowspec: use sparse.parseconfig() to parse narrowspec file.

pulkit updated this revision to Diff 9829.

pulkit marked an inline comment as done.Aug 3 2018, 12:56 PM

pulkit edited the summary of this revision. (Show Details)Aug 3 2018, 12:59 PM

pulkit retitled this revision from narrowspec: use sparse.parseconfig() to parse narrowspec file to narrowspec: use sparse.parseconfig() to parse narrowspec file (BC).

martinvonz accepted this revision.Aug 3 2018, 1:05 PM

martinvonz added inline comments.

mercurial/narrowspec.py
145	I'll rename this to `profiles` in flight

This revision is now accepted and ready to land.Aug 3 2018, 1:05 PM

I've rebased this on top of D4093 and resolved the conflicts (simply drop the changes from this patch). I'll push it once tests have finished.

Closed by commit rHGf64ebe7d2259: narrowspec: use sparse.parseconfig() to parse narrowspec file (BC) (authored by pulkit). · Explain WhyAug 3 2018, 8:04 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/narrowspec.py (13 lines)
M			tests/test-narrow-debugcommands.t (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	9796		Aug 2 2018, 3:52 PM	★	★
Diff 2	9829		Aug 3 2018, 12:55 PM	★	★
Diff 3	9869	rHGf64ebe7d225913b8bf3122ed3a03cf7a6abbf0ee	Aug 3 2018, 12:59 PM	★	★

Status	Author	Revision
Closed	pulkit	D4058 narrowspec: remove the unused _parsestoredpatterns() function
Closed	pulkit	D4057 narrowspec: use sparse.parseconfig() to parse narrowspec file (BC)
Closed	pulkit	D4056 sparse: add an action argument to parseconfig()

Diff 9869

mercurial/narrowspec.py

	# narrowspec.py - methods for working with a narrow view of a repository			# narrowspec.py - methods for working with a narrow view of a repository
	#			#
	# 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

	import errno			import errno

	from .i18n import _			from .i18n import _
	from . import (			from . import (
	error,			error,
	match as matchmod,			match as matchmod,
				sparse,
	util,			util,
	)			)

	FILENAME = 'narrowspec'			FILENAME = 'narrowspec'

	def _parsestoredpatterns(text):			def _parsestoredpatterns(text):
	"""Parses the narrowspec format that's stored on disk."""			"""Parses the narrowspec format that's stored on disk."""
	patlist = None			patlist = None
	kind, pat = matchmod._patsplit(pattern, defaultkind)			kind, pat = matchmod._patsplit(pattern, defaultkind)
	return '%s:%s' % normalizesplitpattern(kind, pat)			return '%s:%s' % normalizesplitpattern(kind, pat)

	def parsepatterns(pats):			def parsepatterns(pats):
	"""Parses a list of patterns into a typed pattern set."""			"""Parses a list of patterns into a typed pattern set."""
	return set(normalizepattern(p) for p in pats)			return set(normalizepattern(p) for p in pats)

	def format(includes, excludes):			def format(includes, excludes):
	output = '[includes]\n'			output = '[include]\n'
	for i in sorted(includes - excludes):			for i in sorted(includes - excludes):
	output += i + '\n'			output += i + '\n'
	output += '[excludes]\n'			output += '[exclude]\n'
	for e in sorted(excludes):			for e in sorted(excludes):
	output += e + '\n'			output += e + '\n'
	return output			return output

	def match(root, include=None, exclude=None):			def match(root, include=None, exclude=None):
	if not include:			if not include:
	# Passing empty include and empty exclude to matchmod.match()			# Passing empty include and empty exclude to matchmod.match()
	# gives a matcher that matches everything, so explicitly use			# gives a matcher that matches everything, so explicitly use
	# Treat "narrowspec does not exist" the same as "narrowspec file exists			# Treat "narrowspec does not exist" the same as "narrowspec file exists
	# and is empty".			# and is empty".
	if e.errno == errno.ENOENT:			if e.errno == errno.ENOENT:
	# Without this the next call to load will use the cached			# Without this the next call to load will use the cached
	# non-existence of the file, which can cause some odd issues.			# non-existence of the file, which can cause some odd issues.
	repo.invalidate(clearfilecache=True)			repo.invalidate(clearfilecache=True)
	return set(), set()			return set(), set()
	raise			raise
	return _parsestoredpatterns(spec)			# maybe we should care about the profiles returned too
				includepats, excludepats, profiles = sparse.parseconfig(repo.ui, spec,
				'narrow')
				martinvonzUnsubmitted Not Done I'll rename this to `profiles` in flight martinvonz: I'll rename this to `profiles` in flight
				if profiles:
				raise error.Abort(_("including other spec files using '%include' is not"
				" suported in narrowspec"))
				return includepats, excludepats
				martinvonzUnsubmitted Done We should at least abort if they're in there. I think we should add that check already in this patch. martinvonz: We should at least abort if they're in there. I think we should add that check already in this…

	def save(repo, includepats, excludepats):			def save(repo, includepats, excludepats):
	spec = format(includepats, excludepats)			spec = format(includepats, excludepats)
	repo.vfs.write(FILENAME, spec)			repo.vfs.write(FILENAME, spec)

	def savebackup(vfs, backupname):			def savebackup(vfs, backupname):
	vfs.tryunlink(backupname)			vfs.tryunlink(backupname)
	util.copyfile(vfs.join(FILENAME), vfs.join(backupname), hardlink=True)			util.copyfile(vfs.join(FILENAME), vfs.join(backupname), hardlink=True)

tests/test-narrow-debugcommands.t

	$ . "$TESTDIR/narrow-library.sh"			$ . "$TESTDIR/narrow-library.sh"
	$ hg init repo			$ hg init repo
	$ cd repo			$ cd repo
	$ cat << EOF > .hg/narrowspec			$ cat << EOF > .hg/narrowspec
	> [includes]			> [include]
	> path:foo			> path:foo
	> [excludes]			> [exclude]
	> EOF			> EOF
	$ echo treemanifest >> .hg/requires			$ echo treemanifest >> .hg/requires
	$ echo narrowhg-experimental >> .hg/requires			$ echo narrowhg-experimental >> .hg/requires
	$ mkdir -p foo/bar			$ mkdir -p foo/bar
	$ echo b > foo/f			$ echo b > foo/f
	$ echo c > foo/bar/f			$ echo c > foo/bar/f
	$ hg commit -Am hi			$ hg commit -Am hi
	adding foo/bar/f			adding foo/bar/f

This is an archive of the discontinued Mercurial Phabricator instance.

narrowspec: use sparse.parseconfig() to parse narrowspec file (BC)ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 9869

mercurial/narrowspec.py

tests/test-narrow-debugcommands.t

narrowspec: use sparse.parseconfig() to parse narrowspec file (BC)
ClosedPublic

Revision Contents
Changeset List