# HG changeset patch # User Mitsuhiro Koga # Date 1353555943 -32400 # Node ID 0ba09ecf5df27993b6ddf9afb5e36ff411d221e3 # Parent ea8ef4dd967e806ed3d12aa9b8347e3b49c4ccd4 Layout option can be accepted only auto, single, or standard. diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py --- a/hgsubversion/svnmeta.py +++ b/hgsubversion/svnmeta.py @@ -110,6 +110,8 @@ class SVNMeta(object): lo = self.repo.ui.config('hgsubversion', 'layout', default='auto') if lo == 'auto': raise hgutil.Abort('layout not yet determined') + elif not lo in ('single', 'standard'): + raise hgutil.Abort('unknown layout \'%s\'' % lo) self._layout = lo f = open(self.layoutfile, 'w') f.write(self._layout) diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -317,6 +317,8 @@ def pull(repo, source, heads=[], force=F stopat_rev = util.parse_revnum(svn, checkout) layout = repo.ui.config('hgsubversion', 'layout', 'auto') + if not layout in ('auto', 'single', 'standard'): + raise hgutil.Abort('unknown layout \'%s\'' % layout) if layout == 'auto': try: rootlist = svn.list_dir('', revision=(stopat_rev or None))