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

stable hgignore: reorder refresh() for better error handling (closes #562)

Changeset 92165fb0d8a8…

Parent fc242ede0a40…

by Steve Borho

Changes to one file · Browse files at 92165fb0d8a8 Showing diff from parent fc242ede0a40 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​hgignore.py Stacked
 
220
221
222
 
 
 
 
 
 
 
 
 
 
223
224
225
 
235
236
237
 
238
239
240
 
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
 
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
 
245
246
247
248
249
250
251
 
259
260
261
 
 
 
 
 
 
 
 
 
 
262
263
264
@@ -220,6 +220,16 @@
  self.le.clear()     def refresh(self): + try: + l = open(self.ignorefile, 'rb').readlines() + self.doseoln = l[0].endswith('\r\n') + except (IOError, ValueError, IndexError): + self.doseoln = os.name == 'nt' + l = [] + self.ignorelines = [line.strip() for line in l] + self.ignorelist.clear() + self.ignorelist.addItems([uni(l) for l in self.ignorelines]) +   uni = hglib.tounicode   try:   self.repo.thginvalidate() @@ -235,6 +245,7 @@
  err = uni(str(e))   qtlib.WarningMsgBox(_('Unable to read repository status'),   err, parent=self) + self.lclunknowns = []   return     self.lclunknowns = wctx.unknown() @@ -248,16 +259,6 @@
  # single selection only   break   - try: - l = open(self.ignorefile, 'rb').readlines() - self.doseoln = l[0].endswith('\r\n') - except (IOError, ValueError, IndexError): - self.doseoln = os.name == 'nt' - l = [] - self.ignorelines = [line.strip() for line in l] - self.ignorelist.clear() - self.ignorelist.addItems([uni(l) for l in self.ignorelines]) -   def writeIgnoreFile(self):   eol = self.doseoln and '\r\n' or '\n'   out = eol.join(self.ignorelines) + eol