This is an archive of the discontinued Mercurial Phabricator instance.

sparse: make path absoluteness checks cross-platform
ClosedPublic

Authored by ikostia on Jul 28 2017, 7:05 AM.

Download Raw Diff

Details

Reviewers

mjpieters
simonfar

Group Reviewers

Restricted Project

Commits

rFBHGXc6e1f7828465: sparse: make path absoluteness checks cross-platform

Summary

Let's be friendlier to our friends on Windows.

Test Plan

Diff Detail

Repository

rFBHGX Facebook Mercurial Extensions

Branch

default

Lint

Lint OK

Unit

Unit Tests OK

Event Timeline

ikostia created this revision.Jul 28 2017, 7:05 AM

Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 28 2017, 7:05 AM

simonfar requested changes to this revision.Jul 28 2017, 8:19 AM

simonfar added a subscriber: simonfar.

simonfar added inline comments.

hgext3rd/sparse.py
760–761	This is no longer true - can you rephrase it?

This revision now requires changes to proceed.Jul 28 2017, 8:19 AM

arddress @simonfar's comment

simonfar accepted this revision.Jul 28 2017, 9:18 AM

This revision is now accepted and ready to land.Jul 28 2017, 9:18 AM

Closed by commit rFBHGXc6e1f7828465: sparse: make path absoluteness checks cross-platform (authored by ikostia). · Explain WhyJul 28 2017, 9:29 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext3rd/sparse.py (7 lines)
M			tests/test-sparse.t (6 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	434		Jul 28 2017, 7:05 AM	★	★
Diff 2	436	arddress @simonfar's comment	Jul 28 2017, 9:15 AM	★	★
Diff 3	444	rFBHGXc6e1f782846528475476546a1fb919f4057813f1	Jul 28 2017, 9:23 AM	★	★

Commit	Local	Parents	Author	Summary	Date
6c8e7ebd24cf	3611	016faf2c99b0	Kostia Balytskyi	sparse: make path absoluteness checks cross-platform (Show More…)	Jul 28 2017, 9:09 AM

Diff 436

hgext3rd/sparse.py

	if reset:			if reset:
	newinclude = set()			newinclude = set()
	newexclude = set()			newexclude = set()
	newprofiles = set()			newprofiles = set()
	else:			else:
	newinclude = set(oldinclude)			newinclude = set(oldinclude)
	newexclude = set(oldexclude)			newexclude = set(oldexclude)
	newprofiles = set(oldprofiles)			newprofiles = set(oldprofiles)

	if any(pat.startswith('/') for pat in pats):			if any(os.path.isabs(pat) for pat in pats):
				simonfarUnsubmitted Not Done This is no longer true - can you rephrase it? simonfar: This is no longer true - can you rephrase it?
	err = _('paths cannot start with /')			err = _('paths cannot be absolute')
	hint = _('do not use absolute paths')			raise error.Abort(err)
	raise error.Abort(err, hint=hint)

	if (not ui.configbool('sparse', 'includereporootpaths', False)			if (not ui.configbool('sparse', 'includereporootpaths', False)
	and (include or exclude)):			and (include or exclude)):
	# 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)

tests/test-sparse.t

	$ hg up -q 0			$ hg up -q 0
	$ hg sparse --include 'hide'			$ hg sparse --include 'hide'
	$ ls			$ ls
	hide			hide

	Absolute paths outside the repo should just be rejected			Absolute paths outside the repo should just be rejected

	$ hg sparse --include /foo/bar			$ hg sparse --include /foo/bar
	abort: paths cannot start with /			abort: paths cannot be absolute
	(do not use absolute paths)
	[255]			[255]
	$ hg sparse --include '$TESTTMP/myrepo/hide'			$ hg sparse --include '$TESTTMP/myrepo/hide'

	$ hg sparse --include '/root'			$ hg sparse --include '/root'
	abort: paths cannot start with /			abort: paths cannot be absolute
	(do not use absolute paths)
	[255]			[255]

	Repo root-relaive vs. cwd-relative includes			Repo root-relaive vs. cwd-relative includes
	$ mkdir subdir			$ mkdir subdir
	$ cd subdir			$ cd subdir
	$ hg sparse --config sparse.includereporootpaths=on --include reporoot/path			$ hg sparse --config sparse.includereporootpaths=on --include reporoot/path
	$ hg sparse --config sparse.includereporootpaths=off --include cwd/path			$ hg sparse --config sparse.includereporootpaths=off --include cwd/path
	$ hg sparse			$ hg sparse