This is an archive of the discontinued Mercurial Phabricator instance.

sparse: also apply relative-path logic to --delete
ClosedPublic

Authored by ikostia on Jul 29 2017, 1:08 PM.

Reviewers

mjpieters
simonfar

Group Reviewers

Restricted Project

Commits

Summary

Add --delete to the list of sparse options that understand cwd-relative paths.

Test Plan

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

This revision is now accepted and ready to land.Jul 30 2017, 7:26 AM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			hgext3rd/sparse.py (2 lines)
M			tests/test-sparse.t (24 lines)

	newexclude = set(oldexclude)			newexclude = set(oldexclude)
	newprofiles = set(oldprofiles)			newprofiles = set(oldprofiles)

	if any(os.path.isabs(pat) for pat in pats):			if any(os.path.isabs(pat) for pat in pats):
	err = _('paths cannot be absolute')			err = _('paths cannot be absolute')
	raise error.Abort(err)			raise error.Abort(err)

	if (not ui.configbool('sparse', 'includereporootpaths', False)			if (not ui.configbool('sparse', 'includereporootpaths', False)
	and (include or exclude)):			and (include or exclude or delete)):
	# supplied file patterns should be treated as relative			# supplied file patterns should be treated as relative
	# to current working dir, so we need to convert them first			# to current working dir, so we need to convert them first
	pats = scmutil.match(repo['.'], pats).files()			pats = scmutil.match(repo['.'], pats).files()

	if (not ui.configbool('sparse', 'enablereporootpaths', True)			if (not ui.configbool('sparse', 'enablereporootpaths', True)
	and (enableprofile or disableprofile)):			and (enableprofile or disableprofile)):
	# supplied file patterns should be treated as relative			# supplied file patterns should be treated as relative
	# to current working dir, so we need to convert them first			# to current working dir, so we need to convert them first

	reporoot/path			reporoot/path
	subdir/cwd/path			subdir/cwd/path
	[exclude]			[exclude]


	$ cd ..			$ cd ..
	$ rm -rf subdir			$ rm -rf subdir

				Verify deleting uses relative paths
				$ mkdir subdir && echo foo > subdir/foo
				$ hg sparse
				[include]
				$TESTTMP/myrepo/hide
				hide
				reporoot/path
				subdir/cwd/path
				[exclude]


				$ cd subdir
				$ hg sparse --delete cwd/path
				$ hg sparse
				[include]
				$TESTTMP/myrepo/hide
				hide
				reporoot/path
				[exclude]


				$ cd ..
				$ rm -rf subdir

	Verify commiting while sparse includes other files			Verify commiting while sparse includes other files

	$ echo z > hide			$ echo z > hide
	$ hg ci -Aqm 'edit hide'			$ hg ci -Aqm 'edit hide'
	$ ls			$ ls
	hide			hide
	$ hg manifest			$ hg manifest
	hide			hide