Mercurial > hg-stable
changeset 20817:e5641536e4d5 stable
subrepo: add trailing newlines to warnings
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 20 Mar 2014 19:39:05 -0700 |
| parents | 0c32fafd4b3b |
| children | c7d543eebe1a c57c9cece645 |
| files | mercurial/subrepo.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/subrepo.py Thu Mar 20 19:38:17 2014 -0700 +++ b/mercurial/subrepo.py Thu Mar 20 19:39:05 2014 -0700 @@ -1119,7 +1119,7 @@ out, err = self._gitnodir(['--version']) 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)), int(m.group(2))) # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, @@ -1128,7 +1128,7 @@ if version < (1, 5): raise util.Abort(_('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')) + 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]