We are currently indexing your data, so search results may be incomplete until we finish.
many errors moved to error.py in mercurial tip
Changeset 95bec2d6ed59…
Parent 9a9e4fe2ac0b…
by
Changes to 20 files · Browse files at 95bec2d6ed59 Showing diff from parent 9a9e4fe2ac0b Diff from another changeset...
-
contrib/hgtk
-
contrib/nautilus-thg.py
-
hggtk/changeset.py
-
hggtk/commit.py
-
hggtk/diff.py
-
hggtk/gdialog.py
-
hggtk/hgemail.py
-
hggtk/hginit.py
-
hggtk/hglib.py
-
hggtk/logfilter.py
-
hggtk/merge.py
-
hggtk/recovery.py
-
hggtk/revisions.py
-
hggtk/serve.py
-
hggtk/status.py
-
hggtk/synch.py
-
hggtk/tagadd.py
-
hggtk/tags.py
-
hggtk/thgconfig.py
-
hggtk/update.py
|
@@ -18,11 +18,16 @@ import shlex
from mercurial.i18n import _
from mercurial import hg, util, fancyopts, commands, cmdutil
-from mercurial.repo import RepoError
import mercurial.ui as _ui
-class ParseError(Exception):
- """Exception raised on errors in parsing the command line."""
+try:
+ from mercurial.error import RepoError, UnknownCommand, AmbiguousCommand
+ from mercurial.error import ParseError
+except ImportError:
+ from mercurial.repo import RepoError
+ from mercurial.cmdutil import UnknownCommand, AmbiguousCommand
+ class ParseError(Exception):
+ """Exception raised on errors in parsing the command line."""
nonrepo_commands = 'userconfig clone init about help'
@@ -82,11 +87,11 @@ help_(ui, inst.args[0])
else:
ui.warn(_("hgtk: %s\n") % inst.args[1])
- help_('shortlist')
- except cmdutil.AmbiguousCommand, inst:
+ help_(ui, 'shortlist')
+ except AmbiguousCommand, inst:
ui.warn(_("hgtk: command '%s' is ambiguous:\n %s\n") %
(inst.args[0], " ".join(inst.args[1])))
- except cmdutil.UnknownCommand, inst:
+ except UnknownCommand, inst:
ui.warn(_("hgtk: unknown command '%s'\n") % inst.args[0])
help_(ui, 'shortlist')
except RepoError, inst:
|
||
|
@@ -12,7 +12,7 @@ import gconf
import gtk
import gobject
-from mercurial import hg, ui, repo, match, util
+from mercurial import hg, ui, match, util
from mercurial.node import short
import nautilus
import os
@@ -21,6 +21,12 @@import tempfile
import time
import urllib
+
+try:
+ from mercurial.error import RepoError
+except ImportError:
+ from mercurial.repo import RepoError
+
TORTOISEHG_PATH = '~/tools/tortoisehg-dev'
TERMINAL_KEY = '/desktop/gnome/applications/terminal/exec'
@@ -71,7 +77,7 @@ self.cacheroot = p
self.cacherepo = hg.repository(ui.ui(), path=p)
return self.cacherepo
- except repo.RepoError:
+ except RepoError:
self.cacheroot = None
self.cacherepo = None
return None
|
||
|
@@ -16,15 +16,18 @@ import pango
import StringIO
-from mercurial.i18n import _
from mercurial.node import *
-from mercurial import cmdutil, util, ui, hg, commands
-from mercurial import context, patch, revlog
+from mercurial import cmdutil, context, util, ui, hg, patch
from gdialog import *
from hgcmd import CmdDialog
from hglib import toutf, fromutf, displaytime, hgcmd_toq, diffexpand
from gtklib import StatusBar
+try:
+ from mercurial.error import LookupError
+except ImportError:
+ from mercurial.revlog import LookupError
+
class ChangeSet(GDialog):
"""GTK+ based dialog for displaying repository logs
"""
@@ -268,7 +271,7 @@ if f in files:
try:
src = getfilectx(f, c).renamed()
- except revlog.LookupError:
+ except LookupError:
return None
if src:
f = src[0]
@@ -293,7 +296,7 @@ s = 'A'
ctx1.filectx(f)
s = 'M'
- except revlog.LookupError:
+ except LookupError:
pass
status[f] = s
return s
@@ -623,7 +626,7 @@ try:
fctx = ctx.filectx(self.curfile)
has_filelog = fctx.filelog().linkrev(fctx.filerev()) == ctx.rev()
- except revlog.LookupError:
+ except LookupError:
has_filelog = False
self._ann_menu.set_sensitive(has_filelog)
self._save_menu.set_sensitive(has_filelog)
|
||
|
@@ -16,6 +16,7 @@ import cStringIO
from mercurial.i18n import _
+from mercurial.node import *
from mercurial import ui, hg
from shlib import shell_notify
from gdialog import *
|
||
|
@@ -12,7 +12,7 @@ import gtk
import pango
import sys
-from hglib import gettabwidth
+from hglib import gettabwidth, RepoError
from mercurial import hg, ui, cmdutil, util, patch
from mercurial.i18n import _
from shlib import set_tortoise_icon
@@ -110,7 +110,7 @@ self.ui = ui.ui()
try:
self.repo = hg.repository(self.ui, path=self.root)
- except hg.RepoError:
+ except RepoError:
return None
matcher = cmdutil.match(self.repo, self.files)
|
||
|
@@ -24,8 +24,8 @@ import pango
from mercurial.i18n import _
-from mercurial.node import *
-from mercurial import cmdutil, util, ui, hg, commands, patch
+from mercurial.node import short
+from mercurial import cmdutil, util, ui, hg, commands
from hgext import extdiff
from shlib import shell_notify, set_tortoise_icon, Settings
from thgconfig import ConfigDialog
|
||
|
@@ -14,7 +14,7 @@ from tempfile import mkstemp
from dialog import *
from mercurial import hg, ui, extensions
-from mercurial.repo import RepoError
+from hglib import RepoError
from thgconfig import ConfigDialog
from hgcmd import CmdDialog
|
||
|
@@ -11,7 +11,8 @@ import gtk
import pango
from dialog import error_dialog, info_dialog
-from mercurial import hg, ui, util, repo
+from mercurial import hg, ui, util
+from hglib import RepoError
import shlib
class InitDialog(gtk.Window):
@@ -146,7 +147,7 @@
try:
hg.repository(u, dest, create=1)
- except repo.RepoError, inst:
+ except RepoError, inst:
error_dialog(self, "Unable to create new repository",
str(inst))
return False
|
||
|
@@ -5,12 +5,16 @@ import threading, thread2
import Queue
from mercurial import hg, ui, util, extensions, commands, hook
-from mercurial.repo import RepoError
-from mercurial.node import *
from mercurial.i18n import _
from dialog import entry_dialog
try:
+ from mercurial.error import RepoError, ParseError
+except ImportError:
+ from mercurial.repo import RepoError
+ from mercurial.cmdutil import ParseError
+
+try:
try:
from mercurial import demandimport
except:
|
||
|
@@ -11,9 +11,8 @@ import sys
import gtk
from gdialog import *
-from mercurial.node import *
from mercurial import cmdutil, util, hg, ui
-from mercurial.repo import RepoError
+from hglib import RepoError
from shlib import shell_notify, set_tortoise_icon
class FilterDialog(gtk.Dialog):
|
||
|
@@ -12,9 +12,9 @@ from dialog import *
from mercurial.node import *
from mercurial import util, hg, ui
+from hglib import RepoError
from hgcmd import CmdDialog
from shlib import set_tortoise_icon, shell_notify
-from mercurial.repo import RepoError
import histselect
class MergeDialog(gtk.Window):
|
||
|
@@ -17,11 +17,9 @@ import Queue
import os
import threading
-from mercurial import hg, ui, util
-from mercurial.repo import RepoError
-from mercurial.node import *
+from mercurial import hg, ui, util
from dialog import error_dialog, question_dialog
-from hglib import HgThread, toutf
+from hglib import HgThread, toutf, RepoError
from shlib import set_tortoise_icon, shell_notify
import gtklib
|
||
|
@@ -14,12 +14,11 @@ import gobject
import pango
from mercurial import hg, ui, cmdutil, util
-from mercurial.repo import RepoError
from mercurial.i18n import _
-from mercurial.node import *
from dialog import error_dialog, question_dialog
from revtree import RevisionTree
from shlib import set_tortoise_icon
+from hglib import RepoError
class RevisionDialog(gtk.Dialog):
def __init__(self, root=''):
|
||
|
@@ -24,7 +24,6 @@ import hglib
from dialog import question_dialog, error_dialog
from mercurial import hg, ui, commands, cmdutil, util
-from mercurial.repo import RepoError
from mercurial.hgweb import server
from mercurial.i18n import _
from shlib import set_tortoise_icon
@@ -124,7 +123,7 @@ def _get_config(self):
try:
repo = hg.repository(ui.ui(), path=self._root)
- except RepoError:
+ except hglib.RepoError:
print 'no repository found'
gtk.main_quit()
self.defport = repo.ui.config('web', 'port') or '8000'
|
||
|
@@ -15,7 +15,6 @@ import pango
from mercurial.i18n import _
-from mercurial.node import *
from mercurial import cmdutil, util, ui, hg, commands, patch, mdiff
from mercurial import merge as merge_
from shlib import shell_notify
|
||
|
@@ -18,9 +18,8 @@ import os
import threading
from mercurial import hg, ui, util, extensions
-from mercurial.repo import RepoError
from dialog import error_dialog, question_dialog, info_dialog
-from hglib import HgThread, toutf, rootpath
+from hglib import HgThread, toutf, rootpath, RepoError
import shlib
import gtklib
import urllib
|
||
|
@@ -15,9 +15,9 @@ import gtk
from dialog import question_dialog, error_dialog, info_dialog
from mercurial import hg, ui, cmdutil, util
-from mercurial.repo import RepoError
from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import short
+from hglib import RepoError
class TagAddDialog(gtk.Window):
""" Dialog to add tag to Mercurial repo """
|
||
|
@@ -14,8 +14,8 @@ import gtk
import gobject
from mercurial import hg, ui, cmdutil, util, node
-from mercurial.repo import RepoError
from mercurial.i18n import _
+from hglib import RepoError
def get_tag_list(path):
root = path
|
||
|
@@ -10,8 +10,8 @@ import os
import pango
from mercurial import hg, ui, cmdutil, util
-from mercurial.repo import RepoError
from dialog import error_dialog, question_dialog
+from hglib import RepoError
import shlib
import shelve
import iniparse
|
||
|
@@ -11,11 +11,10 @@ import sys
import gtk
from dialog import *
+from mercurial import util, hg, ui
from mercurial.node import *
-from mercurial import util, hg, ui
-from mercurial.repo import RepoError
from shlib import shell_notify, set_tortoise_icon
-from hglib import rootpath
+from hglib import rootpath, RepoError
class UpdateDialog(gtk.Window):
""" Dialog to update Mercurial repo """
|
||
Add a tag
Loading...