mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
convert: reenable SVN support after license issue solved
This commit is contained in:
parent
29f1e65f87
commit
d8a8eb5584
@ -22,7 +22,6 @@ from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
|
||||
from common import commandline, converter_source, converter_sink, mapfile
|
||||
|
||||
try:
|
||||
raise ImportError("SVN support disabled due to license incompatibility")
|
||||
from svn.core import SubversionException, Pool
|
||||
import svn
|
||||
import svn.client
|
||||
|
@ -128,10 +128,8 @@ def has_rst2html():
|
||||
return False
|
||||
|
||||
def has_svn():
|
||||
#return matchoutput('svn --version 2>&1', r'^svn, version') and \
|
||||
#matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
|
||||
# disabled until licensing issue is resolved
|
||||
return False
|
||||
return matchoutput('svn --version 2>&1', r'^svn, version') and \
|
||||
matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
|
||||
|
||||
def has_svn_bindings():
|
||||
try:
|
||||
|
Loading…
Reference in New Issue
Block a user