| durin42 | |
| martinvonz |
| hg-reviewers |
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.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/narrowspec.py (6 lines) | |||
| M | tests/test-narrow-patterns.t (28 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Gregory Szorc | Sep 11 2018, 6:28 PM |
| 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" | ||||
| " suported in narrowspec")) | " suported 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) | ||||
| 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] | |||||