We are currently indexing your data, so search results may be incomplete until we finish.
hglib: remove errors from hglib, import directly from mercurial.error
While doing this sweep through the code, I actually fixed a few bugs in the
importing of errors. mercurial.error has been in place since 1.3, so it's now
safe to remove these shims from hglib.py
Changeset 010080f4f72b…
Parent 409e8380d224…
by
Changes to 31 files · Browse files at 010080f4f72b Showing diff from parent 409e8380d224 Diff from another changeset...
-
contrib/nautilus-thg.py
-
tortoisehg/hgtk/archive.py
-
tortoisehg/hgtk/backout.py
-
tortoisehg/hgtk/browse.py
-
tortoisehg/hgtk/changeset.py
-
tortoisehg/hgtk/csinfo.py
-
tortoisehg/hgtk/datamine.py
-
tortoisehg/hgtk/gorev.py
-
tortoisehg/hgtk/guess.py
-
tortoisehg/hgtk/hgemail.py
-
tortoisehg/hgtk/hgignore.py
-
tortoisehg/hgtk/hginit.py
-
tortoisehg/hgtk/hgthread.py
-
tortoisehg/hgtk/hgtk.py
-
tortoisehg/hgtk/history.py
-
tortoisehg/hgtk/logview/treemodel.py
-
tortoisehg/hgtk/merge.py
-
tortoisehg/hgtk/quickop.py
-
tortoisehg/hgtk/recovery.py
-
tortoisehg/hgtk/rename.py
-
tortoisehg/hgtk/serve.py
-
tortoisehg/hgtk/status.py
-
tortoisehg/hgtk/synch.py
-
tortoisehg/hgtk/thgconfig.py
-
tortoisehg/hgtk/thgmq.py
-
tortoisehg/hgtk/thgstrip.py
-
tortoisehg/hgtk/update.py
-
tortoisehg/hgtk/visdiff.py
-
tortoisehg/util/cachethg.py
-
tortoisehg/util/hglib.py
-
tortoisehg/util/menuthg.py
|
@@ -25,7 +25,7 @@ import subprocess
import urllib
-from mercurial import hg, ui, match, util
+from mercurial import hg, ui, match, util, error
from mercurial.node import short
def _thg_path():
@@ -40,7 +40,7 @@ sys.path.insert(0, thgpath)
_thg_path()
-from tortoisehg.util import paths, debugthg, hglib, cachethg
+from tortoisehg.util import paths, debugthg, cachethg
from tortoisehg.hgtk import gtklib
if debugthg.debug('N'):
@@ -107,7 +107,7 @@ return None
try:
return hg.repository(ui.ui(), path=p)
- except hglib.RepoError:
+ except error.RepoError:
return None
except StandardError, e:
debugf(e)
|
||
|
@@ -10,7 +10,7 @@ import gobject
import pango
-from mercurial import hg, ui
+from mercurial import hg, ui, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, paths
@@ -39,7 +39,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
self.repo = repo
@@ -176,7 +176,7 @@ else:
try:
self.repo[text]
- except (hglib.RepoError, hglib.LookupError):
+ except (error.RepoError, error.LookupError):
return
if path is None:
path = self.destentry.get_text()
|
||
|
@@ -10,7 +10,7 @@ import gobject
import pango
-from mercurial import hg, ui
+from mercurial import hg, ui, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, paths, i18n, settings
@@ -43,7 +43,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
|
||
|
@@ -14,7 +14,6 @@
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, paths, shlib, menuthg
-from tortoisehg.util.hglib import RepoError
from tortoisehg.hgtk import hgcmd, gtklib, gdialog
|
||
|
@@ -12,7 +12,7 @@ import pango
import Queue
-from mercurial import cmdutil, util, patch, mdiff
+from mercurial import cmdutil, util, patch, mdiff, error
from tortoisehg.util.i18n import _
from tortoisehg.util import shlib, hglib, paths
@@ -303,7 +303,7 @@
try:
fctx = self.repo[rev].filectx(wfile)
- except hglib.LookupError:
+ except error.LookupError:
fctx = None
if fctx and fctx.size() > hglib.getmaxdiffsize(self.repo.ui):
lines = ['diff',
@@ -315,7 +315,7 @@ try:
for s in patch.diff(self.repo, n1, n2, match=m, opts=opts):
lines.extend(s.splitlines())
- except (hglib.RepoLookupError, hglib.RepoError, hglib.LookupError), e:
+ except (error.RepoLookupError, error.RepoError, error.LookupError), e:
err = _('Repository Error: %s, refresh suggested') % str(e)
lines = ['diff', '', err]
tags, lines = self.prepare_diff(lines, offset, wfile)
@@ -514,7 +514,7 @@ try:
tctx = self.repo[ts]
return revline_data(tctx)
- except (hglib.LookupError, hglib.RepoLookupError, hglib.RepoError):
+ except (error.LookupError, error.RepoLookupError, error.RepoError):
return ts
elif item == 'patch':
if hasattr(ctx, '_patchname'):
@@ -808,7 +808,7 @@ self.graphview.set_revision_id(rev, load=True)
else:
self.load_details(rev)
- except hglib.RepoError:
+ except error.RepoError:
pass
def get_link_text(self, tag, widget, liter):
@@ -842,7 +842,7 @@ try:
fctx = ctx.filectx(self.curfile)
has_filelog = fctx.filelog().linkrev(fctx.filerev()) == ctx.rev()
- except hglib.LookupError:
+ except error.LookupError:
has_filelog = False
self.ann_menu.set_sensitive(has_filelog)
self.save_menu.set_sensitive(has_filelog)
|
||
|
@@ -12,7 +12,7 @@ import gtk
import binascii
-from mercurial import patch, util
+from mercurial import patch, util, error
from mercurial.node import short, hex
from tortoisehg.util.i18n import _
@@ -113,7 +113,7 @@ return None
try:
ctx = repo[rev]
- except (hglib.LookupError, hglib.RepoLookupError, hglib.RepoError):
+ except (error.LookupError, error.RepoLookupError, error.RepoError):
ctx = None
return ctx
@@ -165,7 +165,7 @@ continue
try:
self._parents.append(repo[p])
- except (hglib.LookupError, hglib.RepoLookupError, hglib.RepoError):
+ except (error.LookupError, error.RepoLookupError, error.RepoError):
self._parents.append(p)
def __str__(self):
|
||
|
@@ -13,7 +13,7 @@ import threading
import re
-from mercurial import util
+from mercurial import util, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, thread2
@@ -191,7 +191,7 @@ parent_ctx = self.repo[parent_revid]
try:
parent_ctx.filectx(filepath)
- except LookupError:
+ except error.LookupError:
# file was renamed/moved, try to find previous file path
end_iter = iter
path = graphview.get_path_at_revid(int(anotrev))
@@ -208,7 +208,7 @@ if renamed:
filepath = renamed[0]
break
- except LookupError:
+ except error.LookupError:
# break iteration, but don't use 'break' statement
# so that execute 'else' block for showing prompt.
iter = end_iter
@@ -453,7 +453,7 @@ def threadfunc(q, *args):
try:
hglib.hgcmd_toq(q, *args)
- except (util.Abort, hglib.LookupError), e:
+ except (util.Abort, error.LookupError), e:
self.stbar.set_status_text(_('Abort: %s') % str(e))
thread = thread2.Thread(target=threadfunc, args=args)
@@ -580,7 +580,7 @@ ctx = self.repo.parents()[0]
try:
fctx = ctx.filectx(path)
- except LookupError:
+ except error.LookupError:
gdialog.Prompt(_('File is unrevisioned'),
_('Unable to annotate ') + path, self).run()
return
@@ -752,7 +752,7 @@ def threadfunc(q, *args):
try:
hglib.hgcmd_toq(q, *args)
- except (util.Abort, hglib.LookupError), e:
+ except (util.Abort, error.LookupError), e:
self.stbar.set_status_text(_('Abort: %s') % str(e))
(frame, treeview, origpath, graphview) = objs
|
||
|
@@ -9,7 +9,8 @@ import os
import gtk
import gobject
-import mercurial
+
+from mercurial import error
from tortoisehg.util.i18n import _
from tortoisehg.hgtk import gtklib, gdialog
@@ -54,11 +55,11 @@ self.gotofunc(revision)
self.revEntry.set_text('')
self.hide()
- except mercurial.error.LookupError, e:
+ except error.LookupError, e:
gdialog.Prompt(_('Ambiguous Revision'), str(e), self).run()
self.revEntry.grab_focus()
return
- except mercurial.error.RepoError, e:
+ except error.RepoError, e:
gdialog.Prompt(_('Invalid Revision'), str(e), self).run()
self.revEntry.grab_focus()
return
|
||
|
@@ -13,7 +13,7 @@ import cStringIO
import Queue
-from mercurial import hg, ui, mdiff, cmdutil, match, util
+from mercurial import hg, ui, mdiff, cmdutil, match, util, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, shlib, paths, thread2, settings
@@ -44,7 +44,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
self.repo = repo
|
||
|
@@ -13,7 +13,7 @@ import pango
import tempfile
-from mercurial import hg, ui, extensions
+from mercurial import hg, ui, extensions, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, settings
@@ -232,7 +232,7 @@ try:
repo = hg.repository(ui.ui(), path=self.root)
self.repo = repo
- except hglib.RepoError:
+ except error.RepoError:
self.repo = None
return
|
||
|
@@ -10,7 +10,7 @@ import gobject
import re
-from mercurial import hg, ui, match, util
+from mercurial import hg, ui, match, util, error
from tortoisehg.util.i18n import _
from tortoisehg.util import shlib, hglib, paths
@@ -28,7 +28,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
self.repo = repo
|
||
|
@@ -8,7 +8,7 @@ import os
import gtk
-from mercurial import hg, ui, util
+from mercurial import hg, ui, util, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, shlib
@@ -110,7 +110,7 @@
try:
hg.repository(u, dest, create=1)
- except hglib.RepoError, inst:
+ except error.RepoError, inst:
dialog.error_dialog(self, _('Unable to create new repository'),
hglib.toutf(str(inst)))
return False
|
||
|
@@ -10,7 +10,7 @@ import time
import urllib2
-from mercurial import ui, util
+from mercurial import ui, util, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, thread2
@@ -169,7 +169,7 @@ self.postfunc(ret)
except util.Abort, e:
self.ui.write_err(_('abort: ') + str(e) + '\n')
- except (hglib.RepoError, urllib2.HTTPError), e:
+ except (error.RepoError, urllib2.HTTPError), e:
self.ui.write_err(str(e) + '\n')
except (Exception, OSError, IOError), e:
self.ui.write_err(str(e) + '\n')
|
||
|
|
|
@@ -20,7 +20,7 @@ import gobject
import mercurial.ui as _ui
-from mercurial import hg, util, fancyopts, cmdutil, extensions
+from mercurial import hg, util, fancyopts, cmdutil, extensions, error
from tortoisehg.util.i18n import agettext as _
from tortoisehg.util import hglib, paths, shlib
@@ -141,7 +141,7 @@ try:
args = fancyopts.fancyopts(args, globalopts, options)
except fancyopts.getopt.GetoptError, inst:
- raise hglib.ParseError(None, inst)
+ raise error.ParseError(None, inst)
if args:
alias, args = args[0], args[1:]
@@ -164,7 +164,7 @@ try:
args = fancyopts.fancyopts(args, c, cmdoptions)
except fancyopts.getopt.GetoptError, inst:
- raise hglib.ParseError(cmd, inst)
+ raise error.ParseError(cmd, inst)
# separate global options back out
for o in globalopts:
@@ -185,20 +185,20 @@ return runcommand(ui, args)
finally:
ui.flush()
- except hglib.ParseError, inst:
+ except error.ParseError, inst:
if inst.args[0]:
ui.status(_("hgtk %s: %s\n") % (inst.args[0], inst.args[1]))
help_(ui, inst.args[0])
else:
ui.status(_("hgtk: %s\n") % inst.args[1])
help_(ui, 'shortlist')
- except hglib.AmbiguousCommand, inst:
+ except error.AmbiguousCommand, inst:
ui.status(_("hgtk: command '%s' is ambiguous:\n %s\n") %
(inst.args[0], " ".join(inst.args[1])))
- except hglib.UnknownCommand, inst:
+ except error.UnknownCommand, inst:
ui.status(_("hgtk: unknown command '%s'\n") % inst.args[0])
help_(ui, 'shortlist')
- except hglib.RepoError, inst:
+ except error.RepoError, inst:
ui.status(_("abort: %s!\n") % inst)
return -1
@@ -246,7 +246,7 @@ ui.quiet = True
if cmd not in nonrepo_commands.split() and not path:
- raise hglib.RepoError(_("There is no Mercurial repository here"
+ raise error.RepoError(_("There is no Mercurial repository here"
" (.hg not found)"))
try:
@@ -256,7 +256,7 @@ tb = traceback.extract_tb(sys.exc_info()[2])
if len(tb) != 1: # no
raise
- raise hglib.ParseError(cmd, _("invalid arguments"))
+ raise error.ParseError(cmd, _("invalid arguments"))
mainwindow = None
def thgexit(win):
@@ -399,7 +399,7 @@ """web server"""
from tortoisehg.hgtk.serve import run
if paths.find_root() == None and not opts['webdir_conf']:
- raise hglib.RepoError(_("There is no Mercurial repository here"
+ raise error.RepoError(_("There is no Mercurial repository here"
" (.hg not found)"))
gtkrun(run, ui, *pats, **opts)
@@ -477,7 +477,7 @@
try:
aliases, i = cmdutil.findcmd(name, table, False)
- except hglib.AmbiguousCommand, inst:
+ except error.AmbiguousCommand, inst:
select = lambda c: c.lstrip('^').startswith(inst.args[0])
helplist(_('list of commands:\n\n'), select)
return
@@ -546,7 +546,7 @@ if name in names:
break
else:
- raise hglib.UnknownCommand(name)
+ raise error.UnknownCommand(name)
# description
if not doc:
@@ -564,7 +564,7 @@ f(name)
i = None
break
- except hglib.UnknownCommand, inst:
+ except error.UnknownCommand, inst:
i = inst
if i:
raise i
|
|
@@ -15,7 +15,7 @@ import atexit
from mercurial import ui, hg, cmdutil, commands, extensions, util, match, url
-from mercurial import hbisect
+from mercurial import hbisect, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib
@@ -2055,7 +2055,7 @@ parent = self.repo[rev].parents()[0].rev()
# Special case for revision 0's parent.
if parent == -1: parent = 'null'
- except (ValueError, hglib.LookupError):
+ except (ValueError, error.LookupError):
return
filename = "%s_rev%d_to_tip.hg" % (os.path.basename(self.repo.root), rev)
result = gtklib.NativeSaveFileDialogWrapper(title=_('Write bundle to'),
|
||
|
@@ -18,7 +18,7 @@ import gobject
import re
-from mercurial import util, templatefilters
+from mercurial import util, error
from tortoisehg.util import hglib
from tortoisehg.hgtk import gtklib
@@ -263,7 +263,7 @@ self.author_pats.append((re.compile(pat, re.I), v))
try:
enabled = self.repo.ui.configbool('tortoisehg', 'authorcolor')
- except hglib.ConfigError:
+ except error.ConfigError:
enabled = False
if self.author_pats or enabled:
self.color_func = self.text_color_author
|
||
|
@@ -10,7 +10,7 @@ import gtk
import gobject
-from mercurial import hg, ui, commands
+from mercurial import hg, ui, commands, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, paths
@@ -38,7 +38,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
self.set_title(_('Merging in %s') % hglib.get_reponame(repo))
|
||
|
@@ -10,11 +10,10 @@ import gobject
import pango
-from mercurial import hg, ui, cmdutil
+from mercurial import hg, ui, cmdutil, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, paths, shlib
-from tortoisehg.util.hglib import RepoError
from tortoisehg.hgtk import hgcmd, gtklib, gdialog
@@ -34,7 +33,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
|
||
|
@@ -13,7 +13,7 @@ import os
import time
-from mercurial import hg, ui
+from mercurial import hg, ui, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, shlib, paths
@@ -32,7 +32,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
self.repo = repo
|
||
|
@@ -11,7 +11,7 @@ import cStringIO
import shutil
-from mercurial import hg, ui, util, commands
+from mercurial import hg, ui, util, commands, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, paths
@@ -47,7 +47,7 @@ try:
root = paths.find_root()
repo = hg.repository(ui.ui(), root)
- except (ImportError, hglib.RepoError):
+ except (ImportError, error.RepoError):
dlg.destroy()
return
@@ -72,7 +72,7 @@ shutil.move(dlg.orig, new_name)
commands.rename(repo.ui, repo, dlg.orig, new_name, **opts)
toquit = True
- except (OSError, IOError, util.Abort, hglib.RepoError), inst:
+ except (OSError, IOError, util.Abort, error.RepoError), inst:
dialog.error_dialog(None, _('rename error'), str(inst))
toquit = False
finally:
|
||
|
@@ -17,7 +17,7 @@ import threading
import time
-from mercurial import hg, ui, commands, cmdutil, util
+from mercurial import hg, ui, commands, cmdutil, util, error
from mercurial.hgweb import server
from tortoisehg.util.i18n import _
@@ -113,7 +113,7 @@ if self._root:
try:
repo = hg.repository(ui.ui(), path=self._root)
- except hglib.RepoError:
+ except error.RepoError:
self.destroy()
self.defport = repo.ui.config('web', 'port') or '8000'
self.webname = repo.ui.config('web', 'name') or \
|
||
|
@@ -15,7 +15,7 @@ import pango
import threading
-from mercurial import cmdutil, util, commands, patch, mdiff
+from mercurial import cmdutil, util, commands, patch, mdiff, error
from mercurial import merge as merge_
from tortoisehg.util.i18n import _
@@ -1062,7 +1062,7 @@ try:
pfile = util.pconvert(wfile)
fctx = ctx.filectx(pfile)
- except hglib.LookupError:
+ except error.LookupError:
fctx = None
if fctx and fctx.size() > hglib.getmaxdiffsize(self.repo.ui):
# Fake patch that displays size warning
|
||
|
@@ -15,7 +15,7 @@ import threading
import urllib
-from mercurial import hg, ui, extensions, url
+from mercurial import hg, ui, extensions, url, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, settings, paths
@@ -329,7 +329,7 @@ try:
# open a new repo, rebase can confuse cached repo
repo = hg.repository(ui.ui(), path=self.root)
- except hglib.RepoError:
+ except error.RepoError:
return
wc = repo[None]
@@ -367,7 +367,7 @@ raise _("unknown sort key '%s'") % sort
uipaths.sort(sortfunc)
return uipaths
- except hglib.RepoError:
+ except error.RepoError:
return None
def btn_remotepath_clicked(self, button):
|
||
|
@@ -12,7 +12,7 @@ import urlparse
import threading
-from mercurial import hg, ui, util, url, filemerge
+from mercurial import hg, ui, util, url, filemerge, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, settings, paths
@@ -535,7 +535,7 @@ else:
repo = None
self.root = root
- except hglib.RepoError:
+ except error.RepoError:
repo = None
if configrepo:
dialog.error_dialog(self, _('No repository found'),
|
||
|
@@ -11,7 +11,7 @@ import gobject
import pango
-from mercurial import extensions
+from mercurial import extensions, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib
@@ -766,7 +766,7 @@ try:
ctx = self.repo[patchname]
revid = ctx.rev()
- except hglib.RepoError:
+ except (error.RepoError, error.RepoLookupError):
revid = -1
self.emit('patch-selected', revid, patchname)
|
||
|
@@ -11,7 +11,7 @@ import gobject
import pango
-from mercurial import hg, ui
+from mercurial import hg, ui, error
from mercurial.node import nullrev
from tortoisehg.util.i18n import _
@@ -41,7 +41,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
self.repo = repo
@@ -335,7 +335,7 @@ return None
try:
revnum = self.repo[revstr].rev()
- except (hglib.RepoError, hglib.LookupError):
+ except (error.RepoError, error.LookupError):
return None
return revnum
|
||
|
@@ -10,11 +10,10 @@ import gtk
import gobject
-from mercurial import hg, ui
+from mercurial import hg, ui, error
from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, paths
-from tortoisehg.util.hglib import LookupError, RepoLookupError, RepoError
from tortoisehg.hgtk import csinfo, gtklib, gdialog, hgcmd
@@ -34,7 +33,7 @@
try:
repo = hg.repository(ui.ui(), path=paths.find_root())
- except hglib.RepoError:
+ except error.RepoError:
gtklib.idle_add_single_call(self.destroy)
return
self.repo = repo
@@ -182,7 +181,7 @@ else:
self.target_label.update(self.repo[newrev])
self.updatebtn.set_sensitive(True)
- except (LookupError, RepoLookupError, RepoError):
+ except (error.LookupError, error.RepoLookupError, error.RepoError):
self.target_label.set_label(_('unknown revision!'))
self.updatebtn.set_sensitive(False)
|
||
|
@@ -14,7 +14,7 @@ import tempfile
import re
-from mercurial import hg, ui, cmdutil, util
+from mercurial import hg, ui, cmdutil, util, error
from mercurial.node import short, nullid
from tortoisehg.util.i18n import _
@@ -96,7 +96,7 @@ try:
path = opts.get('bundle') or paths.find_root()
repo = hg.repository(ui.ui(), path=path)
- except hglib.RepoError:
+ except error.RepoError:
# hgtk should catch this earlier
gdialog.Prompt(_('No repository'),
_('No repository found here'), None).run()
@@ -368,7 +368,7 @@ try:
path = opts.get('bundle') or paths.find_root()
repo = hg.repository(ui, path=path)
- except hglib.RepoError:
+ except error.RepoError:
# hgtk should catch this earlier
ui.warn(_('No repository found here') + '\n')
return
|
||
|
@@ -8,7 +8,7 @@ import os
import sys
-from mercurial import hg, cmdutil, util, ui, node, merge
+from mercurial import hg, cmdutil, util, ui, node, merge, error
import paths
import debugthg
import hglib
@@ -188,7 +188,7 @@ if not repo or (repo.root != root and repo.root != real(root)):
repo = hg.repository(ui.ui(), path=root)
debugf("hg.repository() took %g ticks", (GetTickCount() - tc1))
- except hglib.RepoError:
+ except error.RepoError:
# We aren't in a working tree
debugf("%s: not in repo", pdir)
add(pdir + '*', IGNORED)
|
||
|
@@ -11,10 +11,9 @@ import shlib
import time
-from mercurial.error import RepoError, ParseError, LookupError, RepoLookupError
-from mercurial.error import UnknownCommand, AmbiguousCommand, ConfigError
from mercurial import hg, ui, util, extensions, commands, hook, match
from mercurial import dispatch, encoding, templatefilters, bundlerepo, url
+
_encoding = encoding.encoding
_encodingmode = encoding.encodingmode
_fallbackencoding = encoding.fallbackencoding
|
||
|
@@ -7,7 +7,7 @@
import os
-from mercurial import hg, ui, node
+from mercurial import hg, ui, node, error
from tortoisehg.util.i18n import _ as gettext
from tortoisehg.util import cachethg, paths, hglib
@@ -207,7 +207,7 @@ try:
repo = hg.repository(ui.ui(), path=root)
return repo
- except hglib.RepoError:
+ except error.RepoError:
pass
except StandardError, e:
print "error while opening repo %s:" % path
|
||
Add a tag
Loading...