Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with stable

Changeset bea2cda18f91…

Parents b6e6b0606214…

Parents 541d9229dc67…

by Steve Borho

Changes to 2 files · Browse files at bea2cda18f91 Showing diff from parent b6e6b0606214 541d9229dc67 Diff from another changeset...

Show Entire File hggtk/​gdialog.py Stacked
(No changes)
Change 1 of 3 Show Entire File hggtk/​shlib.py Stacked
 
93
94
95
96
97
98
 
 
 
 
 
 
99
100
101
 
212
213
214
 
215
216
217
 
224
225
226
227
 
 
 
 
228
229
230
 
93
94
95
 
 
 
96
97
98
99
100
101
102
103
104
 
215
216
217
218
219
220
221
 
228
229
230
 
231
232
233
234
235
236
237
@@ -93,9 +93,12 @@
  if not os.path.exists(self._path+'.dat'):   return   dbase = shelve.open(self._path) - self._dbappname = dbase['APPNAME'] - self.version = dbase['VERSION'] - self._data.update(dbase.get('DATA', {})) + try: + self._dbappname = dbase['APPNAME'] + self.version = dbase['VERSION'] + self._data.update(dbase.get('DATA', {})) + except KeyError: + pass   dbase.close()     def write(self): @@ -212,6 +215,7 @@
  def shell_notify(paths):   try:   from win32com.shell import shell, shellcon + import pywintypes   except ImportError:   return   dirs = [] @@ -224,7 +228,10 @@
  # send notifications to deepest directories first   dirs.sort(lambda x, y: len(y) - len(x))   for dir in dirs: - pidl, ignore = shell.SHILCreateFromPath(dir, 0) + try: + pidl, ignore = shell.SHILCreateFromPath(dir, 0) + except pywintypes.com_error: + return   if pidl is None:   continue   shell.SHChangeNotify(shellcon.SHCNE_UPDATEITEM,