This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4524

narrowspec: validate patterns when loading and saving spec file
ClosedPublic

Authored by indygreg on Sep 11 2018, 2:52 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG8d8e61df8259: narrowspec: validate patterns when loading and saving spec file
Summary

Patterns should be normalized and validated before being passed into
narrowspec.save(). Let's assert that by checking immediately before
writing the narrow spec file. And let's assert that patterns loaded
from the spec file also conform.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Sep 11 2018, 2:52 PM
martinvonz accepted this revision.Sep 11 2018, 6:16 PM
This revision is now accepted and ready to land.Sep 11 2018, 6:16 PM
indygreg updated this revision to Diff 10897.Sep 11 2018, 6:28 PM
indygreg updated this revision to Diff 10901.Sep 11 2018, 6:59 PM
Closed by commit rHG8d8e61df8259: narrowspec: validate patterns when loading and saving spec file (authored by indygreg). · Explain WhySep 11 2018, 7:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/narrowspec.py (6 lines)
Mtests/test-narrow-patterns.t (28 lines)

Diff 10905

mercurial/narrowspec.py

return set(), set() return set(), set()
raise raise
# maybe we should care about the profiles returned too # maybe we should care about the profiles returned too
includepats, excludepats, profiles = sparse.parseconfig(repo.ui, spec, includepats, excludepats, profiles = sparse.parseconfig(repo.ui, spec,
'narrow') 'narrow')
if profiles: if profiles:
raise error.Abort(_("including other spec files using '%include' is not" raise error.Abort(_("including other spec files using '%include' is not"
" supported in narrowspec")) " supported in narrowspec"))
validatepatterns(includepats)
validatepatterns(excludepats)
return includepats, excludepats return includepats, excludepats
def save(repo, includepats, excludepats): def save(repo, includepats, excludepats):
validatepatterns(includepats)
validatepatterns(excludepats)
spec = format(includepats, excludepats) spec = format(includepats, excludepats)
repo.svfs.write(FILENAME, spec) repo.svfs.write(FILENAME, spec)
def savebackup(repo, backupname): def savebackup(repo, backupname):
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements:
return return
vfs = repo.vfs vfs = repo.vfs
vfs.tryunlink(backupname) vfs.tryunlink(backupname)

tests/test-narrow-patterns.t

abort: invalid prefix on narrow pattern: glob:** abort: invalid prefix on narrow pattern: glob:**
(narrow patterns must begin with one of the following: path:, rootfilesin:) (narrow patterns must begin with one of the following: path:, rootfilesin:)
[255] [255]
$ hg tracked --addexclude set:ignored $ hg tracked --addexclude set:ignored
abort: invalid prefix on narrow pattern: set:ignored abort: invalid prefix on narrow pattern: set:ignored
(narrow patterns must begin with one of the following: path:, rootfilesin:) (narrow patterns must begin with one of the following: path:, rootfilesin:)
[255] [255]
$ cat .hg/store/narrowspec
[include]
path:dir1
path:dir1/dirA
[exclude]
$ cat > .hg/store/narrowspec << EOF
> [include]
> glob:**
> EOF
$ hg tracked
abort: invalid prefix on narrow pattern: glob:**
(narrow patterns must begin with one of the following: path:, rootfilesin:)
[255]
$ cat > .hg/store/narrowspec << EOF
> [include]
> path:.
> [exclude]
> set:ignored
> EOF
$ hg tracked
abort: invalid prefix on narrow pattern: set:ignored
(narrow patterns must begin with one of the following: path:, rootfilesin:)
[255]