Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 34964:828cf35f1de6 stable
subrepo: extend config option to disable subrepos by type (SEC)
This allows us to minimize the behavior change introduced by the next patch.
I have no idea which config style is preferred in UX POV, but I decided to
get things done.
a) list: 'allowed = hg, git, svn'
b) sub option: 'allowed.hg = True' or 'allowed:hg = True'
c) per-type action: 'hg = allow', 'git = abort'
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 05 Nov 2017 21:48:58 +0900 |
| parents | 5e27afeddaee |
| children | 846942fd6d15 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Sun Nov 05 21:22:07 2017 +0900 +++ b/mercurial/subrepo.py Sun Nov 05 21:48:58 2017 +0900 @@ -366,8 +366,8 @@ raise error.Abort(_("subrepo '%s' traverses symbolic link") % path) def _checktype(ui, kind): - if not ui.configbool('subrepos', 'allowed', True): - raise error.Abort(_("subrepo not allowed"), + if kind not in ui.configlist('subrepos', 'allowed', ['hg', 'git', 'svn']): + raise error.Abort(_("subrepo type %s not allowed") % kind, hint=_("see 'hg help config.subrepos' for details")) if kind not in types: raise error.Abort(_('unknown subrepo type %s') % kind)