Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

Merge with stable

Changeset c25b4666832b…

Parents df80bd602a1f…

Parents 400d31672119…

by Steve Borho

Changes to 38 files · Browse files at c25b4666832b Showing diff from parent df80bd602a1f 400d31672119 Diff from another changeset...

Change 1 of 1 Show Entire File .hgtags Stacked
 
58
59
60
 
 
58
59
60
61
@@ -58,3 +58,4 @@
 f2165388e6870c643636a0a74f1ebd1d008bdf3e 2.0.5  2a970d5e40fe4f757347464d820218809d58251b 2.1  65a385cf4238af969487dc1a7a2b5ee60cf388cc 2.1.1 +d9e84b581ef3961a12fe695a566ffafb9944920e 2.1.2
Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_AU.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_GB.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​et.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fa.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hu.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nb.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nn.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​oc.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sv.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​tr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
396
397
398
399
 
400
401
402
 
 
403
404
405
 
408
409
410
411
 
412
413
414
 
497
498
499
500
 
 
501
502
503
 
396
397
398
 
399
400
 
 
401
402
403
404
405
 
408
409
410
 
411
412
413
414
 
497
498
499
 
500
501
502
503
504
@@ -396,10 +396,10 @@
  fullmsg = ''   def write(self, msg, *args, **opts):   self.fullmsg += msg - if self.fullmsg.endswith('\0'): + if self.fullmsg.count('\0') >= 6:   try: - fname, line, rev, addremove, user, text = \ - self.fullmsg.split('\0', 5) + fname, line, rev, addremove, user, text, tail = \ + self.fullmsg.split('\0', 6)   text = hglib.tounicode(text)   text = Qt.escape(text)   text = '<b>%s</b> <span>%s</span>' % ( @@ -408,7 +408,7 @@
  emitrow(row)   except ValueError:   pass - self.fullmsg = '' + self.fullmsg = tail   def progress(topic, pos, item='', unit='', total=None):   emitprog(topic, pos, item, unit, total)   cwd = os.getcwd() @@ -497,7 +497,8 @@
  if pos:   self.hu.write(line[pos:], label='ui.status')   path = os.path.join(prefix, wfile) - row = [path, i + 1, ctx.rev(), None, self.hu.getdata()[0]] + row = [path, i + 1, ctx.rev(), None, + hglib.tounicode(self.hu.getdata()[0])]   w = DataWrapper(row)   self.matchedRow.emit(w)   if self.once:
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​htmlui.py Stacked
 
5
6
7
8
 
9
10
11
12
13
14
 
43
44
45
46
47
 
48
49
50
 
5
6
7
 
8
9
10
 
11
12
13
 
42
43
44
 
 
45
46
47
48
@@ -5,10 +5,9 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -import os, time +import os, cgi, time    from mercurial import ui -from PyQt4 import QtCore  from tortoisehg.hgqt import qtlib  from tortoisehg.util import hglib   @@ -43,8 +42,7 @@
    def style(self, msg, label):   'Escape message for safe HTML, then apply specified style' - msg = QtCore.Qt.escape(msg) - msg = msg.replace('\n', '<br />') + msg = cgi.escape(msg).replace('\n', '<br />')   style = qtlib.geteffect(label)   return '<span style="%s">%s</span>' % (style, msg)  
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
779
780
781
782
783
 
 
784
785
786
 
794
795
796
797
 
798
799
 
800
801
802
 
805
806
807
808
 
809
810
 
811
812
813
 
822
823
824
 
 
825
826
827
 
779
780
781
 
 
782
783
784
785
786
 
794
795
796
 
797
798
 
799
800
801
802
 
805
806
807
 
808
809
 
810
811
812
813
 
822
823
824
825
826
827
828
829
@@ -779,8 +779,8 @@
  self._closebutton.clicked.connect(self.close)   self.layout().addWidget(self._closebutton)   - def addWidget(self, w): - self.layout().insertWidget(self.layout().count() - 2, w) + def addWidget(self, w, stretch=0): + self.layout().insertWidget(self.layout().count() - 2, w, stretch)     def addRightWidget(self, w):   self.layout().insertWidget(self.layout().count() - 1, w) @@ -794,9 +794,9 @@
  """Show status message"""   def __init__(self, message, parent=None):   super(StatusInfoBar, self).__init__(parent) - self._msglabel = QLabel(message, self, + self._msglabel = QLabel(message, self, wordWrap=True,   textInteractionFlags=Qt.TextSelectableByMouse) - self.addWidget(self._msglabel) + self.addWidget(self._msglabel, stretch=1)    class CommandErrorInfoBar(InfoBar):   """Show command execution failure (with link to open log window)""" @@ -805,9 +805,9 @@
  def __init__(self, message, parent=None):   super(CommandErrorInfoBar, self).__init__(parent)   - self._msglabel = QLabel(message, self, + self._msglabel = QLabel(message, self, wordWrap=True,   textInteractionFlags=Qt.TextSelectableByMouse) - self.addWidget(self._msglabel) + self.addWidget(self._msglabel, stretch=1)     self._loglabel = QLabel('<a href="log:">%s</a>' % _('Show Log'))   self._loglabel.linkActivated.connect(self.linkActivated) @@ -822,6 +822,8 @@
  def __init__(self, message, parent=None):   super(ConfirmInfoBar, self).__init__(parent)   + # no wordWrap=True and stretch=1, which inserts unwanted space + # between _msglabel and _buttons.   self._msglabel = QLabel(message, self,   textInteractionFlags=Qt.TextSelectableByMouse)   self.addWidget(self._msglabel)
Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​repoview.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
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
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
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
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
 
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
 # Copyright (c) 2009-2010 LOGILAB S.A. (Paris, FRANCE).  # http://www.logilab.fr/ -- mailto:contact@logilab.fr  #  # This program is free software; you can redistribute it and/or modify it under  # the terms of the GNU General Public License as published by the Free Software  # Foundation; either version 2 of the License, or (at your option) any later  # version.  #  # This program is distributed in the hope that it will be useful, but WITHOUT  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS  # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.  #  # You should have received a copy of the GNU General Public License along with  # this program; if not, write to the Free Software Foundation, Inc.,  # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.    from mercurial import error    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import htmldelegate  from tortoisehg.hgqt.logcolumns import ColumnSelectDialog    from PyQt4.QtCore import *  from PyQt4.QtGui import *    class HgRepoViewHeader(QHeaderView):   menuRequested = pyqtSignal(QPoint)   def contextMenuEvent(self, event):   self.menuRequested.emit(event.globalPos())    class HgRepoView(QTableView):     revisionClicked = pyqtSignal(object)   revisionAltClicked = pyqtSignal(object)   revisionSelected = pyqtSignal(object)   revisionActivated = pyqtSignal(object)   menuRequested = pyqtSignal(QPoint, object)   showMessage = pyqtSignal(unicode)     def __init__(self, repo, cfgname, colselect, parent=None):   QTableView.__init__(self, parent)   self.repo = repo   self.current_rev = -1   self.resized = False   self.cfgname = cfgname   self.colselect = colselect   self.setShowGrid(False)     vh = self.verticalHeader()   vh.hide()   vh.setDefaultSectionSize(20)     header = HgRepoViewHeader(Qt.Horizontal, self)   header.setHighlightSections(False)   header.menuRequested.connect(self.headerMenuRequest)   self.setHorizontalHeader(header)     self.createActions()     self.standardDelegate = self.itemDelegate()   self.htmlDelegate = htmldelegate.HTMLDelegate(self)     self.setAcceptDrops(True)   self.setDefaultDropAction(Qt.MoveAction)   self.setDragEnabled(True)   self.setDropIndicatorShown(True)   self.setDragDropMode(QAbstractItemView.InternalMove)     self.setStyle(HgRepoViewStyle(self.style()))     self.setSelectionMode(QAbstractItemView.ExtendedSelection)   self.setSelectionBehavior(QAbstractItemView.SelectRows)     self.doubleClicked.connect(self.revActivated)   self.clicked.connect(self.revClicked)     def setRepo(self, repo):   self.repo = repo     def mousePressEvent(self, event):   index = self.indexAt(event.pos())   if not index.isValid():   return   if event.button() == Qt.MidButton:   self.gotoAncestor(index)   return   QTableView.mousePressEvent(self, event)     def contextMenuEvent(self, event):   self.menuRequested.emit(event.globalPos(), self.selectedRevisions())     def createActions(self):   menu = QMenu(self)   act = QAction(_('Choose log columns...'), self)   act.triggered.connect(self.setHistoryColumns)   menu.addAction(act)   self.headermenu = menu     def headerMenuRequest(self, point):   self.headermenu.exec_(point)     def setHistoryColumns(self):   dlg = ColumnSelectDialog(self.colselect[0], self.colselect[1],   self.model())   if dlg.exec_() == QDialog.Accepted:   self.model().updateColumns()   self.resizeColumns()     def setModel(self, model):   QTableView.setModel(self, model)   #Check if the font contains the glyph needed by the model   if not QFontMetrics(self.font()).inFont(QString(u'\u2605').at(0)):   model.unicodestar = False   if not QFontMetrics(self.font()).inFont(QString(u'\u2327').at(0)):   model.unicodexinabox = False   self.selectionModel().currentRowChanged.connect(self.onRowChange)   self.resetDelegate()   self._rev_history = []   self._rev_pos = -1   self._in_history = False   model.layoutChanged.connect(self.resetDelegate)     def resetBrowseHistory(self, revs, reselrev=None):   graph = self.model().graph   self._rev_history = [r for r in revs if r in graph.nodesdict]   if reselrev is not None and reselrev in self._rev_history:   self._rev_pos = self._rev_history.index(reselrev)   else:   self._rev_pos = -1   self.forward()     def resetDelegate(self):   # Model column layout has changed so we need to move   # our column delegate to correct location   if not self.model():   return   model = self.model()     for c in range(model.columnCount(QModelIndex())):   if model._columns[c] in ['Description', 'Changes']:   self.setItemDelegateForColumn(c, self.htmlDelegate)   else:   self.setItemDelegateForColumn(c, self.standardDelegate)     def resizeColumns(self, *args):   if not self.model():   return   hh = self.horizontalHeader()   hh.setStretchLastSection(False)   self._resizeColumns()   hh.setStretchLastSection(True)   self.resized = True     def _resizeColumns(self):   # _resizeColumns misbehaves if called with last section streched   for c, w in enumerate(self._columnWidthHints()):   self.setColumnWidth(c, w)     def _columnWidthHints(self):   """Return list of recommended widths of all columns"""   model = self.model()   fontm = QFontMetrics(self.font())   widths = [-1 for _i in xrange(model.columnCount(QModelIndex()))]     key = '%s/column_widths/%s' % (self.cfgname, str(self.repo[0]))   col_widths = [int(w) for w in QSettings().value(key).toStringList()]     if len(model._columns) <> len(col_widths):   # If the columns and widths don't match, use the calculated   # widths as they will probably be a better fit (likely because   # columns were changed without updating the widths)   col_widths = []     for c in range(model.columnCount(QModelIndex())):   if c < len(col_widths) and col_widths[c] > 0:   w = col_widths[c]   else:   w = model.maxWidthValueForColumn(c)     if isinstance(w, int):   widths[c] = w   elif w is not None:   w = fontm.width(hglib.tounicode(str(w)) + 'w')   widths[c] = w   else:   w = super(HgRepoView, self).sizeHintForColumn(c)   widths[c] = w     return widths     def revFromindex(self, index):   if not index.isValid():   return   model = self.model()   if model and model.graph:   row = index.row()   gnode = model.graph[row]   return gnode.rev     def context(self, rev):   return self.repo.changectx(rev)     def revClicked(self, index):   rev = self.revFromindex(index)   if QApplication.keyboardModifiers() & Qt.AltModifier:   self.revisionAltClicked.emit(rev)   else:   self.revisionClicked.emit(rev)     def revActivated(self, index):   rev = self.revFromindex(index)   if rev is not None:   self.revisionActivated.emit(rev)     def onRowChange(self, index, index_from):   rev = self.revFromindex(index)   if self.current_rev != rev and not self._in_history:   del self._rev_history[self._rev_pos+1:]   self._rev_history.append(rev)   self._rev_pos = len(self._rev_history)-1   self._in_history = False   self.current_rev = rev   self.revisionSelected.emit(rev)     def selectedRevisions(self):   """Return the list of selected revisions"""   selmodel = self.selectionModel()   return [self.revFromindex(i) for i in selmodel.selectedRows()]     def gotoAncestor(self, index):   rev = self.revFromindex(index)   if rev is None or self.current_rev is None:   return   ctx = self.context(self.current_rev)   ctx2 = self.context(rev)   if ctx.thgmqunappliedpatch() or ctx2.thgmqunappliedpatch():   return   ancestor = ctx.ancestor(ctx2)   self.showMessage.emit(_("Goto ancestor of %s and %s") % (   ctx.rev(), ctx2.rev()))   self.goto(ancestor.rev())     def canGoBack(self):   return bool(self._rev_history and self._rev_pos > 0)     def canGoForward(self):   return bool(self._rev_history   and self._rev_pos < len(self._rev_history) - 1)     def back(self):   if self.canGoBack():   self._rev_pos -= 1   idx = self.model().indexFromRev(self._rev_history[self._rev_pos])   if idx is not None:   self._in_history = True   self.setCurrentIndex(idx)     def forward(self):   if self.canGoForward():   self._rev_pos += 1   idx = self.model().indexFromRev(self._rev_history[self._rev_pos])   if idx is not None:   self._in_history = True   self.setCurrentIndex(idx)     def goto(self, rev):   """   Select revision 'rev' (can be anything understood by repo.changectx())   """   if type(rev) is QString:   rev = str(rev)   try:   rev = self.repo.changectx(rev).rev()   except error.RepoError:   self.showMessage.emit(_("Can't find revision '%s'") % rev)   except LookupError, e:   self.showMessage.emit(hglib.fromunicode(str(e)))   else:   idx = self.model().indexFromRev(rev)   if idx is not None: - self.setCurrentIndex(idx)   self.scrollTo(idx)     def saveSettings(self, s = None):   if not s:   s = QSettings()     col_widths = []   for c in range(self.model().columnCount(QModelIndex())):   col_widths.append(self.columnWidth(c))     key = '%s/column_widths/%s' % (self.cfgname, str(self.repo[0]))   s.setValue(key, col_widths)     def resizeEvent(self, e):   # re-size columns the smart way: the column holding Description   # is re-sized according to the total widget size.   if self.resized and e.oldSize().width() != e.size().width():   model = self.model()   total_width = stretch_col = 0     for c in range(model.columnCount(QModelIndex())):   if model._columns[c] in model._stretchs:   #save the description column   stretch_col = c   else:   #total the other widths   total_width += self.columnWidth(c)     width = max(self.viewport().width() - total_width, 100)   self.setColumnWidth(stretch_col, width)     super(HgRepoView, self).resizeEvent(e)    class HgRepoViewStyle(QStyle):   "Override a style's drawPrimitive method to customize the drop indicator"   def __init__(self, style):   style.__class__.__init__(self)   self._style = style   def drawPrimitive(self, element, option, painter, widget=None):   if element == QStyle.PE_IndicatorItemViewItemDrop:   # Drop indicators should be painted using the full viewport width   vp = widget.viewport().rect()   painter.drawRect(vp.x(), option.rect.y(),   vp.width() - 1, option.rect.height())   else:   self._style.drawPrimitive(element, option, painter, widget)   # Delegate all other methods overridden by QProxyStyle to the base class   def drawComplexControl(self, *args):   return self._style.drawComplexControl(*args)   def drawControl(self, *args):   return self._style.drawControl(*args)   def drawItemPixmap(self, *args):   return self._style.drawItemPixmap(*args)   def drawItemText(self, *args):   return self._style.drawItemText(*args)   def generatedIconPixmap(self, *args):   return self._style.generatedIconPixmap(*args)   def hitTestComplexControl(self, *args):   return self._style.hitTestComplexControl(*args)   def itemPixmapRect(self, *args):   return self._style.itemPixmapRect(*args)   def itemTextRect(self, *args):   return self._style.itemTextRect(*args)   def pixelMetric(self, *args):   return self._style.pixelMetric(*args)   def polish(self, *args):   return self._style.polish(*args)   def sizeFromContents(self, *args):   return self._style.sizeFromContents(*args)   def standardPalette(self):   return self._style.standardPalette()   def standardPixmap(self, *args):   return self._style.standardPixmap(*args)   def styleHint(self, *args):   return self._style.styleHint(*args)   def subControlRect(self, *args):   return self._style.subControlRect(*args)   def subElementRect(self, *args):   return self._style.subElementRect(*args)   def unpolish(self, *args):   return self._style.unpolish(*args)   def event(self, *args):   return self._style.event(*args)   def layoutSpacingImplementation(self, *args):   return self._style.layoutSpacingImplementation(*args)   def standardIconImplementation(self, *args):   return self._style.standardIconImplementation(*args)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
493
494
495
 
 
 
 
496
497
498
 
493
494
495
496
497
498
499
500
501
502
@@ -493,6 +493,10 @@
  'Default: 0, Not expanded')),   _fi(_('Force Repo Tab'), 'tortoisehg.forcerepotab', genBoolRBGroup,   _('Always show repo tabs, even for a single repo. Default: False')), + _fi(_('Monitor Repo Changes'), 'tortoisehg.monitorrepo', + (genDefaultCombo, ['always', 'localonly']), + _('Specify the target filesystem where TortoiseHg monitors changes. ' + 'Default: always')),   _fi(_('Max Diff Size'), 'tortoisehg.maxdiff', genIntEditCombo,   _('The maximum size file (in KB) that TortoiseHg will '   'show changes for in the changelog, status, and commit windows. '
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
21
22
23
24
 
25
26
27
 
80
81
82
 
 
83
84
 
 
85
86
87
 
21
22
23
 
24
25
26
27
 
80
81
82
83
84
85
86
87
88
89
90
91
@@ -21,7 +21,7 @@
 from mercurial import ui as uimod  from mercurial.util import propertycache   -from tortoisehg.util import hglib +from tortoisehg.util import hglib, paths  from tortoisehg.util.patchctx import patchctx    _repocache = {} @@ -80,8 +80,12 @@
  repo.workingDirectoryChanged = self.workingDirectoryChanged   repo.workingBranchChanged = self.workingBranchChanged   self.recordState() + + monitorrepo = repo.ui.config('tortoisehg', 'monitorrepo', 'always')   if isinstance(repo, bundlerepo.bundlerepository):   dbgoutput('not watching F/S events for bundle repository') + elif monitorrepo == 'localonly' and paths.netdrive_status(repo.path): + dbgoutput('not watching F/S events for network drive')   else:   self.watcher = QFileSystemWatcher(self)   self.watcher.addPath(repo.path)
Change 1 of 1 Show Entire File tortoisehg/​util/​paths.py Stacked
 
96
97
98
99
 
100
101
102
 
96
97
98
 
99
100
101
102
@@ -96,7 +96,7 @@
  unc, rest = os.path.splitunc(drive)   if unc: # All UNC paths (\\host\mount) are considered nonlocal   return True - letter = os.path.splitdrive(drive)[0] + letter = os.path.splitdrive(drive)[0].upper()   _drives, total, _ = win32net.NetUseEnum(None, 1, 0)   for drv in _drives:   if drv['local'] == letter: