Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.1, 1.9.2, and 1.9.3

hgqt: remove utf-8 markers on source files, remove trailing white-space

Changeset c5b1cce94622…

Parent 7b2980a423b1…

by Steve Borho

Changes to 3 files · Browse files at c5b1cce94622 Showing diff from parent 7b2980a423b1 Diff from another changeset...

Change 1 of 14 Show Entire File tortoisehg/​hgqt/​blockmatcher.py Stacked
 
1
2
3
4
 
16
17
18
19
 
20
21
22
 
56
57
58
59
 
60
61
62
 
77
78
79
80
 
81
82
83
 
99
100
101
102
 
103
104
105
 
111
112
113
114
 
115
116
117
 
129
130
131
132
 
133
134
135
 
193
194
195
196
 
197
198
199
 
200
201
202
 
 
203
204
205
206
207
208
209
 
210
211
212
213
214
215
 
216
217
218
 
222
223
224
225
 
226
227
228
229
230
 
231
232
233
 
269
270
271
272
 
273
274
275
 
293
294
295
296
 
297
298
299
 
315
316
317
318
 
319
320
321
 
323
324
325
326
 
327
328
329
 
362
363
364
365
 
366
367
368
 
 
 
1
2
3
 
15
16
17
 
18
19
20
21
 
55
56
57
 
58
59
60
61
 
76
77
78
 
79
80
81
82
 
98
99
100
 
101
102
103
104
 
110
111
112
 
113
114
115
116
 
128
129
130
 
131
132
133
134
 
192
193
194
 
195
196
197
 
198
199
 
 
200
201
202
203
204
205
206
207
 
208
209
210
211
212
213
 
214
215
216
217
 
221
222
223
 
224
225
226
227
228
 
229
230
231
232
 
268
269
270
 
271
272
273
274
 
292
293
294
 
295
296
297
298
 
314
315
316
 
317
318
319
320
 
322
323
324
 
325
326
327
328
 
361
362
363
 
364
365
366
 
367
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-  # Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).  # http://www.logilab.fr/ -- mailto:contact@logilab.fr  # @@ -16,7 +15,7 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.    """ -Qt4 widgets to display diffs as blocks +Qt4 widgets to display diffs as blocks  """  import sys, os   @@ -56,7 +55,7 @@
    def clear(self):   self._blocks = set() - +   def addBlock(self, typ, alo, ahi):   self._blocks.add((typ, alo, ahi))   @@ -77,7 +76,7 @@
  self._maximum = maximum   self.update()   self.rangeChanged.emit(self._minimum, self._maximum) - +   def setValue(self, val):   if val != self._value:   self._value = val @@ -99,7 +98,7 @@
  self.setMaximum(sbar.maximum())   self.setMinimum(sbar.minimum())   self.setPageStep(sbar.pageStep()) - self.setValue(sbar.value()) + self.setValue(sbar.value())   self.setUpdatesEnabled(True)     sbar.valueChanged.connect(self.setValue) @@ -111,7 +110,7 @@
    def syncPageStep(self):   self.setPageStep(self._sbar.pageStep()) - +   def paintEvent(self, event):   w = self.width() - 1   h = self.height() @@ -129,7 +128,7 @@
  p.setBrush(self._vrectcolor)   p.drawRect(0, self._value, w, self._pagestep)   p.restore() - +  class BlockMatch(BlockList):   """   A simpe widget to be linked to 2 file views (text areas), @@ -193,26 +192,26 @@
  if i == len(blocks)-1:   return 1   return 0 - +   def nextDiff(self):   return self.showDiff(+1) - +   def prevDiff(self): - return self.showDiff(-1) - + return self.showDiff(-1) +   def addBlock(self, typ, alo, ahi, blo=None, bhi=None):   if bhi is None:   bhi = ahi   if blo is None:   blo = alo   self._blocks.add((typ, alo, ahi, blo, bhi)) - +   def paintEvent(self, event):   w = self.width()   h = self.height()   p = QPainter(self)   p.setRenderHint(p.Antialiasing) - +   ps_l = float(self._pagestep['left'])   ps_r = float(self._pagestep['right'])   v_l = self._value['left'] @@ -222,12 +221,12 @@
  # integer number of fully displayed text lines   scalel = self._sbar['left'].height()//ps_l   scaler = self._sbar['right'].height()//ps_r - +   ml = v_l   Ml = v_l + ps_l   mr = v_r   Mr = v_r + ps_r - +   p.setPen(Qt.NoPen)   for typ, alo, ahi, blo, bhi in self._blocks:   if not (ml<=alo<=Ml or ml<=ahi<=Ml or mr<=blo<=Mr or mr<=bhi<=Mr): @@ -269,7 +268,7 @@
  self._maximum[side] = maximum   self.update()   self.rangeChanged.emit(self._minimum[side], self._maximum[side], side) - +   def setValue(self, val, side=None):   if side is None:   if self.sender() == self._sbar['left']: @@ -293,7 +292,7 @@
    def resizeEvent(self, event):   self.syncPageStep() - +   def linkScrollBar(self, sb, side):   """   Make the block list displayer be linked to the scrollbar @@ -315,7 +314,7 @@
  lambda v1, v2, s: side==s and sb.setRange(v1, v2))   self.pageStepChanged.connect(   lambda v, s: side==s and sb.setPageStep(v)) - +  if __name__ == '__main__':   a = QApplication([])   f = QFrame() @@ -323,7 +322,7 @@
    sb1 = QScrollBar()   sb2 = QScrollBar() - +   w0 = BlockList()   w0.addBlock('-', 200, 300)   w0.addBlock('-', 450, 460) @@ -362,7 +361,7 @@
    print "sb1=", sb1.minimum(), sb1.maximum(), sb1.pageStep()   print "sb2=", sb2.minimum(), sb2.maximum(), sb2.pageStep() - +   f.show()   a.exec_() - +
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​decorators.py Stacked
 
1
2
3
4
 
 
1
2
3
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-  """  Some useful decorator functions  """
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
1
2
3
4
 
 
1
2
3
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-  # Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).  # http://www.logilab.fr/ -- mailto:contact@logilab.fr  #