##// END OF EJS Templates
subrepo, hghave: use "svn --version --quiet" to determine version number...
Thomas Arendsen Hein -
r17707:35674bd9 default
parent child Browse files
Show More
@@ -674,8 +674,8 b' class svnsubrepo(abstractsubrepo):'
674
674
675 @propertycache
675 @propertycache
676 def _svnversion(self):
676 def _svnversion(self):
677 output, err = self._svncommand(['--version'], filename=None)
677 output, err = self._svncommand(['--version', '--quiet'], filename=None)
678 m = re.search(r'^svn,\s+version\s+(\d+)\.(\d+)', output)
678 m = re.search(r'^(\d+)\.(\d+)', output)
679 if not m:
679 if not m:
680 raise util.Abort(_('cannot retrieve svn tool version'))
680 raise util.Abort(_('cannot retrieve svn tool version'))
681 return (int(m.group(1)), int(m.group(2)))
681 return (int(m.group(1)), int(m.group(2)))
@@ -152,7 +152,7 b' def has_docutils():'
152 return False
152 return False
153
153
154 def getsvnversion():
154 def getsvnversion():
155 m = matchoutput('svn --version 2>&1', r'^svn,\s+version\s+(\d+)\.(\d+)')
155 m = matchoutput('svn --version --quiet 2>&1', r'^(\d+)\.(\d+)')
156 if not m:
156 if not m:
157 return (0, 0)
157 return (0, 0)
158 return (int(m.group(1)), int(m.group(2)))
158 return (int(m.group(1)), int(m.group(2)))
General Comments 0
You need to be logged in to leave comments. Login now