Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.3rc1, 0.3, and 0.4rc1

tortoise: fix clashes between module and variable names

Changeset 95f39c62b092…

Parent ed11185b8031…

by TK Soh

Changes to 2 files · Browse files at 95f39c62b092 Showing diff from parent ed11185b8031 Diff from another changeset...

Change 1 of 2 Show Entire File tortoise/​contextmenu.py Stacked
 
15
16
17
18
 
 
19
20
21
 
51
52
53
54
 
55
56
57
 
15
16
17
 
18
19
20
21
22
 
52
53
54
 
55
56
57
58
@@ -15,7 +15,8 @@
 import win32gui_struct  import win32api  import _winreg -from mercurial import hg, ui, repo +from mercurial import hg +from mercurial import repo as _repo  from thgutil import *    S_OK = 0 @@ -51,7 +52,7 @@
  try:   repo = hg.repository(ui.ui(), path=root)   return repo - except repo.RepoError: + except _repo.RepoError:   pass     return None
Change 1 of 2 Show Entire File tortoise/​iconoverlay.py Stacked
 
7
8
9
10
 
 
11
12
13
 
159
160
161
162
 
163
164
165
 
7
8
9
 
10
11
12
13
14
 
160
161
162
 
163
164
165
166
@@ -7,7 +7,8 @@
 import win32con  from win32com.shell import shell, shellcon  import _winreg -from mercurial import hg, repo, ui, cmdutil, util +from mercurial import hg, cmdutil, util +from mercurial import repo as _repo  import thgutil  import sys   @@ -159,7 +160,7 @@
    try:   repo = hg.repository(ui.ui(), path=root) - except repo.RepoError: + except _repo.RepoError:   # We aren't in a working tree   print "%s: not in repo" % dir   overlay_cache[path] = (UNKNOWN, tc)