diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -33,7 +33,7 @@ class mercurial_sink(converter_sink): if not self.repo.local(): raise NoRepo(_('%s is not a local Mercurial repo') % path) except error.RepoError, err: - ui.print_exc() + ui.traceback() raise NoRepo(err.args[0]) else: try: @@ -43,7 +43,7 @@ class mercurial_sink(converter_sink): raise NoRepo(_('%s is not a local Mercurial repo') % path) self.created.append(path) except error.RepoError: - ui.print_exc() + ui.traceback() raise NoRepo("could not create hg repo %s as sink" % path) self.lock = None self.wlock = None @@ -199,7 +199,7 @@ class mercurial_source(converter_source) if not self.repo.local(): raise error.RepoError() except error.RepoError: - ui.print_exc() + ui.traceback() raise NoRepo("%s is not a local Mercurial repo" % path) self.lastrev = None self.lastctx = None diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -233,7 +233,7 @@ class svn_source(converter_source): self.paths = {} self.uuid = svn.ra.get_uuid(self.ra).decode(self.encoding) except SubversionException: - ui.print_exc() + ui.traceback() raise NoRepo("%s does not look like a Subversion repo" % self.url) if rev: diff --git a/hgext/inotify/__init__.py b/hgext/inotify/__init__.py --- a/hgext/inotify/__init__.py +++ b/hgext/inotify/__init__.py @@ -105,7 +105,7 @@ def reposetup(ui, repo): else: ui.warn(_('failed to contact inotify server: %s\n') % err[-1]) - ui.print_exc() + ui.traceback() # replace by old status function self.status = super(inotifydirstate, self).status diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -47,7 +47,7 @@ def _runcatch(ui, args): # enter the debugger when we hit an exception if '--debugger' in args: pdb.post_mortem(sys.exc_info()[2]) - ui.print_exc() + ui.traceback() raise # Global exception handling, alphabetically diff --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py @@ -87,7 +87,7 @@ def loadall(ui): else: ui.warn(_("*** failed to import extension %s: %s\n") % (name, inst)) - if ui.print_exc(): + if ui.traceback(): return 1 def wrapcommand(table, command, wrapper): diff --git a/mercurial/hook.py b/mercurial/hook.py --- a/mercurial/hook.py +++ b/mercurial/hook.py @@ -61,7 +61,7 @@ def _pythonhook(ui, repo, name, hname, f '%s\n') % (hname, exc)) if throw: raise - ui.print_exc() + ui.traceback() return True if r: if throw: diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py --- a/mercurial/httprepo.py +++ b/mercurial/httprepo.py @@ -82,7 +82,7 @@ class httprepository(repo.repository): raise except httplib.HTTPException, inst: self.ui.debug(_('http error while sending %s command\n') % cmd) - self.ui.print_exc() + self.ui.traceback() raise IOError(None, inst) except IndexError: # this only happens with Python 2.3, later versions raise URLError diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -334,7 +334,7 @@ class ui(object): return t - def print_exc(self): + def traceback(self): '''print exception traceback if traceback printing enabled. only to call in exception handler. returns true if traceback printed.'''