equal
deleted
inserted
replaced
1119 out, err = self._gitnodir(['--version']) |
1119 out, err = self._gitnodir(['--version']) |
1120 m = re.search(r'^git version (\d+)\.(\d+)', out) |
1120 m = re.search(r'^git version (\d+)\.(\d+)', out) |
1121 if not m: |
1121 if not m: |
1122 self._ui.warn(_('cannot retrieve git version')) |
1122 self._ui.warn(_('cannot retrieve git version')) |
1123 return |
1123 return |
1124 version = (int(m.group(1)), m.group(2)) |
1124 version = (int(m.group(1)), int(m.group(2))) |
1125 # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, |
1125 # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, |
1126 # despite the docstring comment. For now, error on 1.4.0, warn on |
1126 # despite the docstring comment. For now, error on 1.4.0, warn on |
1127 # 1.5.0 but attempt to continue. |
1127 # 1.5.0 but attempt to continue. |
1128 if version < (1, 5): |
1128 if version < (1, 5): |
1129 raise util.Abort(_('git subrepo requires at least 1.6.0 or later')) |
1129 raise util.Abort(_('git subrepo requires at least 1.6.0 or later')) |