Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.4, 2.0.5, and 2.1

stable filelistmodel: capture environment errors from refresh (closes #566)

Changeset 5d2c42106ace

Parent e167a550748b

by Steve Borho

Changes to 2 files · Browse files at 5d2c42106ace Showing diff from parent e167a550748b Diff from another changeset...

 
29
30
31
 
32
33
34
 
154
155
156
157
158
159
160
161
 
 
 
 
 
 
 
 
162
163
164
 
29
30
31
32
33
34
35
 
155
156
157
 
 
 
 
 
158
159
160
161
162
163
164
165
166
167
168
@@ -29,6 +29,7 @@
  """     contextChanged = pyqtSignal(object) + showMessage = pyqtSignal(QString)     def __init__(self, repo, parent):   """ @@ -154,11 +155,14 @@
    def loadFiles(self):   self._files = [] - self._files = self._buildDesc(0) - if bool(self._ctx.p2()): - _paths = [x['path'] for x in self._files] - _files = self._buildDesc(1) - self._files += [x for x in _files if x['path'] not in _paths] + try: + self._files = self._buildDesc(0) + if bool(self._ctx.p2()): + _paths = [x['path'] for x in self._files] + _files = self._buildDesc(1) + self._files += [x for x in _files if x['path'] not in _paths] + except EnvironmentError, e: + self.showMessage.emit(hglib.tounicode(str(e)))   self._filesdict = dict([(f['path'], f) for f in self._files])     def data(self, index, role):
 
210
211
212
 
213
214
215
 
210
211
212
213
214
215
216
@@ -210,6 +210,7 @@
    def create_models(self):   self.filelistmodel = HgFileListModel(self.repo, self) + self.filelistmodel.showMessage.connect(self.showMessage)     def setupModels(self):   self.create_models()