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

reporegistry: do not reload repo tree model twice when loading settings

The repo tree model of the repo registry was being load twice, once when setting
the "View/Show Subrepos on Registry" checkbox, and once again when setting the
"View/Show Subrepos for remote repositories" checkbox.

Changeset 26c8e6c497a0…

Parent b456652089a2…

by Angel Ezquerra

Changes to 2 files · Browse files at 26c8e6c497a0 Showing diff from parent b456652089a2 Diff from another changeset...

Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​reporegistry.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
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
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
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
 # reporegistry.py - registry for a user's repositories  #  # Copyright 2010 Adrian Buehlmann <adrian@cadifra.com>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2 or any later version.    import os    from mercurial import error    from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, repotreemodel, clone, settings    from PyQt4.QtCore import *  from PyQt4.QtGui import *    import qtlib      def settingsfilename():   """Return path to thg-reporegistry.xml as unicode"""   s = QSettings()   dir = os.path.dirname(unicode(s.fileName()))   return dir + '/' + 'thg-reporegistry.xml'      class RepoTreeView(QTreeView):   showMessage = pyqtSignal(QString)   menuRequested = pyqtSignal(object, object)   openRepo = pyqtSignal(QString, bool)     def __init__(self, parent):   QTreeView.__init__(self, parent, allColumnsShowFocus=True)   self.selitem = None   self.msg = ''     self.setHeaderHidden(True)   self.setExpandsOnDoubleClick(False)   self.setMouseTracking(True)     # enable drag and drop   # (see http://doc.qt.nokia.com/4.6/model-view-dnd.html)   self.setDragEnabled(True)   self.setAcceptDrops(True)   self.setAutoScroll(True)   self.setDragDropMode(QAbstractItemView.DragDrop)   self.setDropIndicatorShown(True)   self.setEditTriggers(QAbstractItemView.DoubleClicked)   self.setSelectionBehavior(QAbstractItemView.SelectRows)   QShortcut('Return', self, self.showFirstTabOrOpen).setContext(   Qt.WidgetShortcut)   QShortcut('Enter', self, self.showFirstTabOrOpen).setContext(   Qt.WidgetShortcut)     def contextMenuEvent(self, event):   if not self.selitem:   return   self.menuRequested.emit(event.globalPos(), self.selitem)     def dragEnterEvent(self, event):   if event.source() is self:   # Use the default event handler for internal dragging   super(RepoTreeView, self).dragEnterEvent(event)   return     d = event.mimeData()   for u in d.urls():   root = paths.find_root(hglib.fromunicode(u.toLocalFile()))   if root:   event.setDropAction(Qt.LinkAction)   event.accept()   self.setState(QAbstractItemView.DraggingState)   break     def dropLocation(self, event):   index = self.indexAt(event.pos())     # Determine where the item was dropped.   # Depth in tree: 1 = group, 2 = repo, and (eventually) 3+ = subrepo   depth = self.model().depth(index)   if depth == 1:   group = index   row = -1   elif depth == 2:   indicator = self.dropIndicatorPosition()   group = index.parent()   row = index.row()   if indicator == QAbstractItemView.BelowItem:   row = index.row() + 1   else:   index = group = row = None     return index, group, row     def dropEvent(self, event):   data = event.mimeData()   index, group, row = self.dropLocation(event)     if index:   if event.source() is self:   # Event is an internal move, so pass it to the model   col = 0   drop = self.model().dropMimeData(data, Qt.MoveAction, row,   col, group)   if drop:   event.setDropAction(Qt.MoveAction)   event.accept()   else:   # Event is a drop of an external repo   accept = False   for u in data.urls():   root = paths.find_root(hglib.fromunicode(u.toLocalFile()))   if root and not self.model().getRepoItem(root):   self.model().addRepo(group, root, row)   accept = True   if accept:   event.setDropAction(Qt.LinkAction)   event.accept()   self.setAutoScroll(False)   self.setState(QAbstractItemView.NoState)   self.viewport().update()     def mouseMoveEvent(self, event):   self.msg = ''   pos = event.pos()   idx = self.indexAt(pos)   if idx.isValid():   item = idx.internalPointer()   self.msg = item.details()   self.showMessage.emit(self.msg)     if event.buttons() == Qt.NoButton:   # Bail out early to avoid tripping over this bug:   # http://bugreports.qt.nokia.com/browse/QTBUG-10180   return   super(RepoTreeView, self).mouseMoveEvent(event)     def leaveEvent(self, event):   if self.msg != '':   self.showMessage.emit('')     def mouseDoubleClickEvent(self, event):   if self.selitem and self.selitem.internalPointer().isRepo():   # We can only open mercurial repositories and subrepositories   repotype = self.selitem.internalPointer().repotype()   if repotype == 'hg':   self.showFirstTabOrOpen()   else:   qtlib.WarningMsgBox(   _('Unsupported repository type (%s)') % repotype,   _('Cannot open non mercurial repositories or subrepositories'),   parent=self)   else:   # a double-click on non-repo rows opens an editor   super(RepoTreeView, self).mouseDoubleClickEvent(event)     def selectionChanged(self, selected, deselected):   selection = self.selectedIndexes()   if len(selection) == 0:   self.selitem = None   else:   self.selitem = selection[0]     def sizeHint(self):   size = super(RepoTreeView, self).sizeHint()   size.setWidth(QFontMetrics(self.font()).width('M') * 15)   return size     def showFirstTabOrOpen(self):   'Enter or double click events, show existing or open a new repowidget'   if self.selitem and self.selitem.internalPointer().isRepo():   root = self.selitem.internalPointer().rootpath()   self.openRepo.emit(hglib.tounicode(root), True)      class RepoRegistryView(QDockWidget):     showMessage = pyqtSignal(QString)   openRepo = pyqtSignal(QString, bool)     def __init__(self, parent, showSubrepos=False, showNetworkSubrepos=False):   QDockWidget.__init__(self, parent)     self.showSubrepos = showSubrepos   self.showNetworkSubrepos = showNetworkSubrepos     self.setFeatures(QDockWidget.DockWidgetClosable |   QDockWidget.DockWidgetMovable |   QDockWidget.DockWidgetFloatable)   self.setWindowTitle(_('Repository Registry'))     mainframe = QFrame()   mainframe.setLayout(QVBoxLayout())   self.setWidget(mainframe)   mainframe.layout().setContentsMargins(0, 0, 0, 0)     self.contextmenu = QMenu(self)   self.tview = tv = RepoTreeView(self)   tv.setModel(repotreemodel.RepoTreeModel(settingsfilename(), self,   showSubrepos=self.showSubrepos,   showNetworkSubrepos=self.showNetworkSubrepos))   mainframe.layout().addWidget(tv)     tv.setIndentation(10)   tv.setFirstColumnSpanned(0, QModelIndex(), True)   tv.setColumnHidden(1, True)     tv.showMessage.connect(self.showMessage)   tv.menuRequested.connect(self.onMenuRequest)   tv.openRepo.connect(self.openRepo)     self.createActions()   QTimer.singleShot(0, self.expand)   - def setShowSubrepos(self, show): + def setShowSubrepos(self, show, reloadModel=True):   if self.showSubrepos != show:   self.showSubrepos = show - self.reloadModel() + if reloadModel: + self.reloadModel()   - def setShowNetworkSubrepos(self, show): + def setShowNetworkSubrepos(self, show, reloadModel=True):   if self.showNetworkSubrepos != show:   self.showNetworkSubrepos = show - self.reloadModel() + if reloadModel: + self.reloadModel()     def reloadModel(self):   self.tview.setModel(   repotreemodel.RepoTreeModel(settingsfilename(), self,   self.showSubrepos, self.showNetworkSubrepos))   self.expand()     def expand(self):   self.tview.expandToDepth(0)   def addRepo(self, root):   'workbench has opened a new repowidget, ensure it is in the registry'   m = self.tview.model()   it = m.getRepoItem(root)   if it == None:   m.addRepo(None, root, -1)     def showPaths(self, show):   self.tview.setColumnHidden(1, not show)   self.tview.setHeaderHidden(not show)   if show:   self.tview.resizeColumnToContents(0)   self.tview.resizeColumnToContents(1)     def close(self):   self.tview.model().write(settingsfilename())   def _action_defs(self):   a = [("reloadRegistry", _("Refresh repository list"), 'view-refresh',   _("Refresh the Repository Registry list"), self.reloadModel),   ("open", _("Open"), 'thg-repository-open',   _("Open the repository in a new tab"), self.open),   ("openAll", _("Open All"), 'thg-repository-open',   _("Open all repositories in new tabs"), self.openAll),   ("newGroup", _("New Group"), 'new-group',   _("Create a new group"), self.newGroup),   ("rename", _("Rename"), None,   _("Rename the entry"), self.startRename),   ("settings", _("Settings..."), 'settings_user',   _("View the repository's settings"), self.startSettings),   ("remove", _("Remove from registry"), 'menudelete',   _("Remove the node and all its subnodes."   " Repositories are not deleted from disk."),   self.removeSelected),   ("clone", _("Clone..."), 'hg-clone',   _("Clone Repository"), self.cloneRepo),   ("explore", _("Explore"), 'system-file-manager',   _("Open the repository in a file browser"), self.explore),   ("terminal", _("Terminal"), 'utilities-terminal',   _("Open a shell terminal in the repository root"), self.terminal),   ("add", _("Add repository..."), 'hg',   _("Add a repository to this group"), self.addNewRepo),   ]   return a     def createActions(self):   self._actions = {}   for name, desc, icon, tip, cb in self._action_defs():   self._actions[name] = QAction(desc, self)   QTimer.singleShot(0, self.configureActions)     def configureActions(self):   for name, desc, icon, tip, cb in self._action_defs():   act = self._actions[name]   if icon:   act.setIcon(qtlib.getmenuicon(icon))   if tip:   act.setStatusTip(tip)   if cb:   act.triggered.connect(cb)   self.addAction(act)     def onMenuRequest(self, point, selitem):   menulist = selitem.internalPointer().menulist()   if not menulist:   return   self.contextmenu.clear()   for act in menulist:   if act:   self.contextmenu.addAction(self._actions[act])   else:   self.contextmenu.addSeparator()   self.selitem = selitem   self.contextmenu.exec_(point)     #   ## Menu action handlers   #     def cloneRepo(self):   root = self.selitem.internalPointer().rootpath()   d = clone.CloneDialog(args=[root, root + '-clone'], parent=self)   d.finished.connect(d.deleteLater)   d.clonedRepository.connect(self.open)   d.show()     def explore(self):   root = self.selitem.internalPointer().rootpath()   QDesktopServices.openUrl(QUrl.fromLocalFile(root))     def terminal(self):   root = self.selitem.internalPointer().rootpath()   qtlib.openshell(root)     def addNewRepo(self):   'menu action handler for adding a new repository'   caption = _('Select repository directory to add')   FD = QFileDialog   path = FD.getExistingDirectory(caption=caption,   options=FD.ShowDirsOnly | FD.ReadOnly)   if path:   root = paths.find_root(hglib.fromunicode(path))   if root and not self.tview.model().getRepoItem(root):   try:   self.tview.model().addRepo(self.selitem, root)   except error.RepoError:   qtlib.WarningMsgBox(   _('Failed to add repository'),   _('%s is not a valid repository') % path, parent=self)   return     def startSettings(self):   root = self.selitem.internalPointer().rootpath()   sd = settings.SettingsDialog(configrepo=True, focus='web.name',   parent=self, root=root)   sd.finished.connect(sd.deleteLater)   sd.exec_()     def openAll(self):   for root in self.selitem.internalPointer().childRoots():   self.openRepo.emit(hglib.tounicode(root), False)     def open(self):   'open context menu action, open repowidget unconditionally'   root = self.selitem.internalPointer().rootpath()   repotype = self.selitem.internalPointer().repotype()   if repotype == 'hg':   self.openRepo.emit(hglib.tounicode(root), False)   else:   qtlib.WarningMsgBox(   _('Unsupported repository type (%s)') % repotype,   _('Cannot open non mercurial repositories or subrepositories'),   parent=self)     def startRename(self):   self.tview.edit(self.selitem)     def newGroup(self):   self.tview.model().addGroup(_('New Group'))     def removeSelected(self):   s = self.selitem   item = s.internalPointer()   if not item.okToDelete():   labels = [(QMessageBox.Yes, _('&Delete')),   (QMessageBox.No, _('Cancel'))]   if not qtlib.QuestionMsgBox(_('Confirm Delete'),   _("Delete Group '%s' and all its entries?")%   item.name, labels=labels, parent=self):   return   m = self.tview.model()   row = s.row()   parent = s.parent()   m.removeRows(row, 1, parent)   self.tview.selectionChanged(None, None)     @pyqtSlot(QString, QString)   def shortNameChanged(self, uroot, uname):   it = self.tview.model().getRepoItem(hglib.fromunicode(uroot))   if it:   it.setShortName(uname)   self.tview.model().layoutChanged.emit()     @pyqtSlot(QString, object)   def baseNodeChanged(self, uroot, basenode):   it = self.tview.model().getRepoItem(hglib.fromunicode(uroot))   if it:   it.setBaseNode(basenode)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
775
776
777
778
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
779
780
781
782
783
784
785
786
787
788
 
775
776
777
 
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
 
 
 
 
 
806
807
808
@@ -775,14 +775,34 @@
  self.actionSaveRepos.setChecked(save)   for path in hglib.fromunicode(s.value(wb + 'openrepos').toString()).split(','):   self._openRepo(path, False) - # Allow repo registry to assemble itself before toggling path state + + # Load the repo registry settings. Note that we must allow the + # repo registry to assemble itself before toggling its settings + # Also the view path setttings should be enabled last, once we have + # loaded the repo subrepositories (if needed) + + # Normally, checking the "show subrepos" and the "show network subrepos" + # settings will trigger a reload of the repo registry. + # To avoid reloading it twice (every time we set one of its view + # settings), we tell the setters to avoid reloading the repo tree + # model, and then we manually reload the model + ssr = s.value(wb + 'showSubrepos', + defaultValue=QVariant(True)).toBool() + snsr = s.value(wb + 'showNetworkSubrepos', + defaultValue=QVariant(True)).toBool() + self.reporegistry.setShowSubrepos(ssr, False) + self.reporegistry.setShowNetworkSubrepos(snsr, False) + + # Note that calling setChecked will NOT reload the model if the new + # setting is the same as the one in the repo registry + QTimer.singleShot(0, lambda: self.actionShowSubrepos.setChecked(ssr)) + QTimer.singleShot(0, lambda: self.actionShowNetworkSubrepos.setChecked(ssr)) + + # Manually reload the model now, to apply the settings + self.reporegistry.reloadModel() +   sp = s.value(wb + 'showPaths').toBool()   QTimer.singleShot(0, lambda: self.actionShowPaths.setChecked(sp)) - ssr = s.value(wb + 'showSubrepos', defaultValue=QVariant(True)).toBool() - QTimer.singleShot(0, lambda: self.actionShowSubrepos.setChecked(ssr)) - snsr = s.value(wb + 'showNetworkSubrepos', - defaultValue=QVariant(True)).toBool() - QTimer.singleShot(0, lambda: self.actionShowNetworkSubrepos.setChecked(ssr))     def goto(self, root, rev):   for rw in self._findrepowidget(root):