This is an archive of the discontinued Mercurial Phabricator instance.

Differential D174

sparse: properly error out when absolute paths are used
ClosedPublic

Authored by ikostia on Jul 21 2017, 2:22 PM.
Tags
None
Subscribers
None

Details

Reviewers
mjpieters
Group Reviewers
Restricted Project
Commits
rFBHGX6197659d1528: sparse: properly error out when absolute paths are used
Summary

Current behavior does not even do what it says, let alone the right thing.

Test Plan
  • rt

Diff Detail

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.

Event Timeline

ikostia created this revision.Jul 21 2017, 2:22 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 21 2017, 2:22 PM
mjpieters accepted this revision.Jul 21 2017, 7:04 PM

For clarity: we already basically aborted when there were absolute paths, but this change makes it an actual error rather than an incorrectly worded warning.

This revision is now accepted and ready to land.Jul 21 2017, 7:04 PM
Closed by commit rFBHGX6197659d1528: sparse: properly error out when absolute paths are used (authored by ikostia). · Explain WhyJul 24 2017, 5:16 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/sparse.py (5 lines)
Mtests/test-sparse.t (8 lines)

Diff 386

hgext3rd/sparse.py

else: else:
newinclude = set(oldinclude) newinclude = set(oldinclude)
newexclude = set(oldexclude) newexclude = set(oldexclude)
newprofiles = set(oldprofiles) newprofiles = set(oldprofiles)
oldstatus = repo.status() oldstatus = repo.status()
if any(pat.startswith('/') for pat in pats): if any(pat.startswith('/') for pat in pats):
ui.warn(_('warning: paths cannot start with /, ignoring: %s\n') err = _('paths cannot start with /')
% ([pat for pat in pats if pat.startswith('/')])) hint = _('do not use absolute paths')
raise error.Abort(err, hint=hint)
elif include: elif include:
newinclude.update(pats) newinclude.update(pats)
elif exclude: elif exclude:
newexclude.update(pats) newexclude.update(pats)
elif enableprofile: elif enableprofile:
newprofiles.update(pats) newprofiles.update(pats)
elif disableprofile: elif disableprofile:
newprofiles.difference_update(pats) newprofiles.difference_update(pats)

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
warning: paths cannot start with /, ignoring: ['/foo/bar'] abort: paths cannot start with /
(do not use absolute paths)
[255]
$ hg sparse --include '$TESTTMP/myrepo/hide' $ hg sparse --include '$TESTTMP/myrepo/hide'
$ hg sparse --include '/root' $ hg sparse --include '/root'
warning: paths cannot start with /, ignoring: ['/root'] abort: paths cannot start with /
(do not use absolute paths)
[255]
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