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

Merge with stable

Changeset d678f9f7f4b9…

Parents fa65bfcc3049…

Parents 92165fb0d8a8…

by Steve Borho

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

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​hgignore.py Stacked
 
229
230
231
 
 
 
 
 
 
 
 
 
 
232
233
234
 
244
245
246
 
247
248
249
 
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
 
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
 
254
255
256
257
258
259
260
 
266
267
268
 
 
 
 
 
 
 
 
 
 
269
270
271
@@ -229,6 +229,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() @@ -244,6 +254,7 @@
  err = uni(str(e))   qtlib.WarningMsgBox(_('Unable to read repository status'),   err, parent=self) + self.lclunknowns = []   return     self.lclunknowns = wctx.unknown() @@ -255,16 +266,6 @@
  self.unknownlist.setItemSelected(item, True)   self.unknownlist.setCurrentItem(item)   - 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