comparison mercurial/subrepo.py @ 10962:8d5f5122a732

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 19 Apr 2010 17:00:02 -0500
parents 7b0a0d498cc0 33119d0252c1
children 37d1b20168d1
comparison
equal deleted inserted replaced
10961:ce6d56b95f2e 10962:8d5f5122a732
272 self._state = state 272 self._state = state
273 self._ctx = ctx 273 self._ctx = ctx
274 self._ui = ctx._repo.ui 274 self._ui = ctx._repo.ui
275 275
276 def _svncommand(self, commands): 276 def _svncommand(self, commands):
277 cmd = ['svn'] + commands + [self._path] 277 path = os.path.join(self._ctx._repo.origroot, self._path)
278 cmd = ['svn'] + commands + [path]
278 cmd = [util.shellquote(arg) for arg in cmd] 279 cmd = [util.shellquote(arg) for arg in cmd]
279 cmd = util.quotecommand(' '.join(cmd)) 280 cmd = util.quotecommand(' '.join(cmd))
280 env = dict(os.environ) 281 env = dict(os.environ)
281 # Avoid localized output, preserve current locale for everything else. 282 # Avoid localized output, preserve current locale for everything else.
282 env['LC_MESSAGES'] = 'C' 283 env['LC_MESSAGES'] = 'C'