Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

hggtk: LookupError moved from revlog.py to error.py

Changeset 6fa25f6ea905…

Parent 28f5487e7fb4…

by Steve Borho

Changes to 4 files · Browse files at 6fa25f6ea905 Showing diff from parent 28f5487e7fb4 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
20
21
22
23
 
24
25
26
27
28
29
30
31
32
33
 
20
21
22
 
23
24
25
 
 
 
 
 
26
27
28
@@ -20,14 +20,9 @@
 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 hglib import toutf, fromutf, displaytime, hgcmd_toq, diffexpand, LookupError  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   """
Change 1 of 2 Show Entire File hggtk/​datamine.py Stacked
 
14
15
16
17
 
18
19
20
 
412
413
414
415
 
416
417
418
 
14
15
16
 
17
18
19
20
 
412
413
414
 
415
416
417
418
@@ -14,7 +14,7 @@
 import threading, thread2  import time  from mercurial import hg, ui, util, revlog -from hglib import hgcmd_toq, toutf, fromutf, gettabwidth, displaytime +from hglib import hgcmd_toq, toutf, fromutf, gettabwidth, displaytime, LookupError  from gdialog import *  from vis import treemodel  from vis.colormap import AnnotateColorMap, AnnotateColorSaturation @@ -412,7 +412,7 @@
  ctx = self.repo.changectx(None).parents()[0]   try:   fctx = ctx.filectx(path) - except revlog.LookupError: + except LookupError:   Prompt('File is unrevisioned',   'Unable to annotate ' + path, self).run()   return
Change 1 of 1 Show Entire File hggtk/​hglib.py Stacked
 
15
16
17
 
 
 
 
 
18
19
20
 
15
16
17
18
19
20
21
22
23
24
25
@@ -15,6 +15,11 @@
  from mercurial.dispatch import ParseError    try: + from mercurial.revlog import LookupError +except ImportError: + from mercurial.error import LookupError + +try:   try:   from mercurial import demandimport   except:
Change 1 of 1 Show Entire File hggtk/​tags.py Stacked
 
15
16
17
18
 
19
20
21
 
15
16
17
 
18
19
20
21
@@ -15,7 +15,7 @@
 import gobject  from mercurial import hg, ui, cmdutil, util, node  from mercurial.i18n import _ -from hglib import RepoError +from hglib import RepoError, LookupError    def get_tag_list(path):   root = path