changeset 219:89dcbfaca32b

fix some name errors
author Abderrahim Kitouni <a.kitouni@gmail.com>
date Thu, 16 Jul 2009 22:08:15 +0100
parents 07de94478059
children 211fa793d74f
files git_handler.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/git_handler.py
+++ b/git_handler.py
@@ -6,6 +6,7 @@
 from mercurial.i18n import _
 from mercurial.node import hex, bin, nullid
 from mercurial import context
+from mercurial.error import RepoError
 from dulwich.misc import make_sha
 from dulwich.objects import (
     Blob,
@@ -610,7 +611,7 @@
                             changed[ref_name] = self.map_git_get(hex(local_ref))
                         else:
                             # XXX: maybe abort completely
-                            ui.warn('not pushing branch %s, please merge'% head)
+                            self.ui.warn('not pushing branch %s, please merge\n'% head)
                 except RepoError: #pragma: no cover
                     # remote_ref is not here
                     pass