Mercurial > hg-stable
changeset 20818:c7d543eebe1a
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 21 Mar 2014 17:20:56 -0500 |
| parents | 8532f5e1b9df (current diff) e5641536e4d5 (diff) |
| children | 202291a280fb |
| files | mercurial/subrepo.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/subrepo.py Tue Mar 18 18:56:08 2014 -0700 +++ b/mercurial/subrepo.py Fri Mar 21 17:20:56 2014 -0500 @@ -1107,18 +1107,18 @@ raise self._gitexecutable = 'git.cmd' out, err = self._gitnodir(['--version']) - m = re.search(r'^git version (\d+)\.(\d+)\.(\d+)', out) + m = re.search(r'^git version (\d+)\.(\d+)', out) if not m: - self._ui.warn(_('cannot retrieve git version')) + self._ui.warn(_('cannot retrieve git version\n')) return - version = (int(m.group(1)), m.group(2), m.group(3)) + version = (int(m.group(1)), int(m.group(2))) # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, # despite the docstring comment. For now, error on 1.4.0, warn on # 1.5.0 but attempt to continue. - if version < (1, 5, 0): + if version < (1, 5): raise util.Abort(_('git subrepo requires at least 1.6.0 or later')) - elif version < (1, 6, 0): - self._ui.warn(_('git subrepo requires at least 1.6.0 or later')) + elif version < (1, 6): + self._ui.warn(_('git subrepo requires at least 1.6.0 or later\n')) def _gitcommand(self, commands, env=None, stream=False): return self._gitdir(commands, env=env, stream=stream)[0]