Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 17707:35674bd95200

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo, hghave: use "svn --version --quiet" to determine version number svn --version --quiet is implemented since svn 0.14.1 (August 2002) and prints just the version number, not the long output (21 lines) of "svn --version". Additionally I expect this output format to be more stable, at least it is not changed with different translations.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Oct 2012 16:52:20 +0200
parents 70efdc22b188
children 573bec4ab7ba
comparison
equal deleted inserted replaced
17706:70efdc22b188 17707:35674bd95200
672 self._ui.warn(stderr + '\n') 672 self._ui.warn(stderr + '\n')
673 return stdout, stderr 673 return stdout, stderr
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)))
682 682
683 def _wcrevs(self): 683 def _wcrevs(self):