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

workbench: reinstate restoring of window geometry and state

TODO: ponder what to save for splitter positions, since we now
have multiple tabs with different splitter positions

Changeset 3df1833170d3

Parent 82f40f3f42a4

by Adrian Buehlmann

Changes to one file · Browse files at 3df1833170d3 Showing diff from parent 82f40f3f42a4 Diff from another changeset...

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
404
405
406
407
 
408
409
410
411
412
413
414
415
416
417
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
404
405
406
407
408
409
410
411
412
413
414
415
416
417
 # -*- coding: iso-8859-1 -*-  #!/usr/bin/env python  # workbench.py - main TortoiseHg Window  #  # Copyright (C) 2007-2010 Logilab. All rights reserved.  #  # This software may be used and distributed according to the terms  # of the GNU General Public License, incorporated herein by reference.  """  Main Qt4 application for TortoiseHg  """  import sys, os  import re    from PyQt4 import QtCore, QtGui, Qsci    from mercurial import ui, hg, util  from mercurial.error import RepoError    from tortoisehg.util.util import tounicode, has_closed_branch_support  from tortoisehg.util.util import rootpath, find_repository    from tortoisehg.util.i18n import _    from tortoisehg.hgqt.decorators import timeit    from tortoisehg.hgqt import icon as geticon  from tortoisehg.hgqt.dialogmixin import HgDialogMixin  from tortoisehg.hgqt.quickbar import FindInGraphlogQuickBar  from tortoisehg.hgqt.helpdialog import HelpDialog  from tortoisehg.hgqt.repowidget import RepoWidget    from tortoisehg.util import paths    from mercurial.error import RepoError    Qt = QtCore.Qt  bold = QtGui.QFont.Bold  connect = QtCore.QObject.connect  SIGNAL = QtCore.SIGNAL      class Workbench(QtGui.QMainWindow, HgDialogMixin):   """hg repository viewer/browser application"""   _uifile = 'workbench.ui'   def __init__(self, ui, repo, fromhead=None):   self.ui = ui   self.repo = repo   self._closed_branch_supp = has_closed_branch_support(self.repo)     # these are used to know where to go after a reload   self._reload_rev = None   self._reload_file = None   self._loading = True   self._scanForRepoChanges = True     QtGui.QMainWindow.__init__(self)   HgDialogMixin.__init__(self)     self.setWindowTitle('TortoiseHg Workbench')     self.createActions()   self.createToolbars()     #self.textview_status.setFont(self._font)   #connect(self.textview_status, SIGNAL('showMessage'),   # self.statusBar().showMessage)   #connect(self.tableView_revisions, SIGNAL('showMessage'),   # self.statusBar().showMessage)     #self.textview_header.setMessageWidget(self.message)     #self.textview_header.commitsignal.connect(self.commit)     self.addRepoTab(self.repo, fromhead)   tw = self.repoTabsWidget   tw.removeTab(0)   self.repoTabChanged()   connect(tw, SIGNAL('tabCloseRequested(int)'), self.repoTabCloseRequested)   connect(tw, SIGNAL('currentChanged(int)'), self.repoTabChanged)     # setup tables and views   #self.setupHeaderTextview()   #connect(self.textview_status, SIGNAL('fileDisplayed'),   # self.file_displayed)   self.setupBranchCombo()   # self.setupModels(fromhead)   if fromhead:   self.startrev_entry.setText(str(fromhead))   #self.setupRevisionTable()     # restore settings - '''   s = QtCore.QSettings()   wb = "Workbench/"   self.restoreGeometry(s.value(wb + 'geometry').toByteArray())   self.restoreState(s.value(wb + 'windowState').toByteArray()) + '''   self.splitternames = []   sn = ('revisions', 'filelist', 'message')   for n in sn:   n += '_splitter'   self.splitternames.append(n)   getattr(self, n).restoreState(s.value(wb + n).toByteArray())   '''     def repoTabCloseRequested(self, index):   tw = self.repoTabsWidget   if (tw.count() == 1):   return # ignore request to close the last tab   tw.removeTab(index)     def repoTabChanged(self, index=0):   print "repoTabChanged(%i)" % index   self.repowidget = self.repoTabsWidget.currentWidget()     def addRepoTab(self, repo, fromhead=None):   '''opens the given repo in a new tab'''   reponame = os.path.basename(repo.root)   rw = RepoWidget(repo, fromhead)   tw = self.repoTabsWidget   index = self.repoTabsWidget.addTab(rw, reponame)   tw.setCurrentIndex(index)     def setupBranchCombo(self, *args):   allbranches = sorted(self.repo.branchtags().items())   if self._closed_branch_supp:   openbr = []   for branch, brnode in allbranches:   openbr.extend(self.repo.branchheads(branch, closed=False))   clbranches = [br for br, node in allbranches if node not in openbr]   branches = [br for br, node in allbranches if node in openbr]   if self.branch_checkBox_action.isChecked():   branches = branches + clbranches   else:   branches = [br for br, node in allbranches] # open branches     if len(branches) == 1:   self.branch_label_action.setEnabled(False)   self.branch_comboBox_action.setEnabled(False)   else:   self.branchesmodel = QtGui.QStringListModel([''] + branches)   self.branch_comboBox.setModel(self.branchesmodel)   self.branch_label_action.setEnabled(True)   self.branch_comboBox_action.setEnabled(True)     def createToolbars(self):   # find quickbar   self.find_toolbar = tb = FindInGraphlogQuickBar(self)   tb.setObjectName("find_toolbar")   #tb.attachFileView(self.textview_status)   #tb.attachHeaderView(self.textview_header)   #connect(tb, SIGNAL('revisionSelected'), self.tableView_revisions.goto)   #connect(tb, SIGNAL('fileSelected'), self.tableView_filelist.selectFile)   connect(tb, SIGNAL('showMessage'), self.statusBar().showMessage,   Qt.QueuedConnection)     self.attachQuickBar(tb)     # navigation toolbar   #self.toolBar_edit.addAction(self.tableView_revisions._actions['back'])   #self.toolBar_edit.addAction(self.tableView_revisions._actions['forward'])     findaction = self.find_toolbar.toggleViewAction()   findaction.setIcon(geticon('find'))   self.toolBar_edit.addAction(findaction)     # tree filters toolbar   self.branch_label = QtGui.QToolButton()   self.branch_label.setText("Branch")   self.branch_label.setStatusTip("Display graph the named branch only")   self.branch_label.setPopupMode(QtGui.QToolButton.InstantPopup)   self.branch_menu = QtGui.QMenu()   cbranch_action = self.branch_menu.addAction("Display closed branches")   cbranch_action.setCheckable(True)   self.branch_checkBox_action = cbranch_action   self.branch_label.setMenu(self.branch_menu)   self.branch_comboBox = QtGui.QComboBox()   connect(self.branch_comboBox, SIGNAL('activated(const QString &)'),   self.refreshRevisionTable)   connect(cbranch_action, SIGNAL('toggled(bool)'),   self.setupBranchCombo)     self.toolBar_treefilters.layout().setSpacing(3)     self.branch_label_action = self.toolBar_treefilters.addWidget(self.branch_label)   self.branch_comboBox_action = self.toolBar_treefilters.addWidget(self.branch_comboBox)   self.toolBar_treefilters.addSeparator()     self.startrev_label = QtGui.QToolButton()   self.startrev_label.setText("Start rev.")   self.startrev_label.setStatusTip("Display graph from this revision")   self.startrev_label.setPopupMode(QtGui.QToolButton.InstantPopup)   self.startrev_entry = QtGui.QLineEdit()   self.startrev_entry.setStatusTip("Display graph from this revision")   self.startrev_menu = QtGui.QMenu()   follow_action = self.startrev_menu.addAction("Follow mode")   follow_action.setCheckable(True)   follow_action.setStatusTip("Follow changeset history from start revision")   self.startrev_follow_action = follow_action   self.startrev_label.setMenu(self.startrev_menu)     self.revscompl_model = QtGui.QStringListModel(['tip'])   self.revcompleter = QtGui.QCompleter(self.revscompl_model, self)   self.startrev_entry.setCompleter(self.revcompleter)     connect(self.startrev_entry, SIGNAL('editingFinished()'),   self.refreshRevisionTable)   connect(self.startrev_follow_action, SIGNAL('toggled(bool)'),   self.refreshRevisionTable)   self.startrev_label_action = self.toolBar_treefilters.addWidget(self.startrev_label)   self.startrev_entry_action = self.toolBar_treefilters.addWidget(self.startrev_entry)     # diff mode toolbar   self.toolBar_diff.addAction(self.actionDiffMode)   self.toolBar_diff.addAction(self.actionAnnMode)   self.toolBar_diff.addAction(self.actionNextDiff)   self.toolBar_diff.addAction(self.actionPrevDiff)     def createActions(self):   # main window actions (from .ui file)   connect(self.actionRefresh, SIGNAL('triggered()'),   self.reload)   connect(self.actionAbout, SIGNAL('triggered()'),   self.on_about)   connect(self.actionQuit, SIGNAL('triggered()'),   self.close)   self.actionQuit.setIcon(geticon('quit'))   self.actionRefresh.setIcon(geticon('reload'))     self.actionDiffMode = QtGui.QAction('Diff mode', self)   self.actionDiffMode.setCheckable(True)   connect(self.actionDiffMode, SIGNAL('toggled(bool)'),   self.setMode)     self.actionAnnMode = QtGui.QAction('Annotate', self)   self.actionAnnMode.setCheckable(True)   #connect(self.actionAnnMode, SIGNAL('toggled(bool)'),   # self.textview_status.setAnnotate)     self.actionHelp.setShortcut(Qt.Key_F1)   self.actionHelp.setIcon(geticon('help'))   connect(self.actionHelp, SIGNAL('triggered()'),   self.on_help)     # Next/Prev diff (in full file mode)   self.actionNextDiff = QtGui.QAction(geticon('down'), 'Next diff', self)   self.actionNextDiff.setShortcut('Alt+Down')   def filled():   self.actionNextDiff.setEnabled(   self.textview_status.fileMode() and self.textview_status.nDiffs())   #connect(self.textview_status, SIGNAL('filled'), filled)   self.actionPrevDiff = QtGui.QAction(geticon('up'), 'Previous diff', self)   self.actionPrevDiff.setShortcut('Alt+Up')   connect(self.actionNextDiff, SIGNAL('triggered()'),   self.nextDiff)   connect(self.actionPrevDiff, SIGNAL('triggered()'),   self.prevDiff)   self.actionDiffMode.setChecked(True)     # Next/Prev file   self.actionNextFile = QtGui.QAction('Next file', self)   self.actionNextFile.setShortcut('Right')   #connect(self.actionNextFile, SIGNAL('triggered()'),   # self.tableView_filelist.nextFile)   self.actionPrevFile = QtGui.QAction('Prev file', self)   self.actionPrevFile.setShortcut('Left')   #connect(self.actionPrevFile, SIGNAL('triggered()'),   # self.tableView_filelist.prevFile)   self.addAction(self.actionNextFile)   self.addAction(self.actionPrevFile)   self.disab_shortcuts.append(self.actionNextFile)   self.disab_shortcuts.append(self.actionPrevFile)     # Next/Prev rev   self.actionNextRev = QtGui.QAction('Next revision', self)   self.actionNextRev.setShortcut('Down')   #connect(self.actionNextRev, SIGNAL('triggered()'),   # self.tableView_revisions.nextRev)   self.actionPrevRev = QtGui.QAction('Prev revision', self)   self.actionPrevRev.setShortcut('Up')   #connect(self.actionPrevRev, SIGNAL('triggered()'),   # self.tableView_revisions.prevRev)   self.addAction(self.actionNextRev)   self.addAction(self.actionPrevRev)   self.disab_shortcuts.append(self.actionNextRev)   self.disab_shortcuts.append(self.actionPrevRev)     # navigate in file viewer   self.actionNextLine = QtGui.QAction('Next line', self)   self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)   #connect(self.actionNextLine, SIGNAL('triggered()'),   # self.textview_status.nextLine)   self.addAction(self.actionNextLine)   self.actionPrevLine = QtGui.QAction('Prev line', self)   self.actionPrevLine.setShortcut(Qt.SHIFT + Qt.Key_Up)   #connect(self.actionPrevLine, SIGNAL('triggered()'),   # self.textview_status.prevLine)   self.addAction(self.actionPrevLine)   self.actionNextCol = QtGui.QAction('Next column', self)   self.actionNextCol.setShortcut(Qt.SHIFT + Qt.Key_Right)   #connect(self.actionNextCol, SIGNAL('triggered()'),   # self.textview_status.nextCol)   self.addAction(self.actionNextCol)   self.actionPrevCol = QtGui.QAction('Prev column', self)   self.actionPrevCol.setShortcut(Qt.SHIFT + Qt.Key_Left)   #connect(self.actionPrevCol, SIGNAL('triggered()'),   # self.textview_status.prevCol)   self.addAction(self.actionPrevCol)     self.actionStartAtRev = QtGui.QAction('Start at rev.', self)   self.actionStartAtRev.setShortcuts([Qt.Key_Backspace,])   connect(self.actionStartAtRev, SIGNAL('triggered()'),   self.startAtCurrentRev)   self.addAction(self.actionStartAtRev)     self.actionClearStartAtRev = QtGui.QAction('Clear start at rev.', self)   self.actionClearStartAtRev.setShortcuts([Qt.SHIFT + Qt.Key_Backspace,])   connect(self.actionClearStartAtRev, SIGNAL('triggered()'),   self.clearStartAtRev)   self.addAction(self.actionClearStartAtRev)     connect(self.actionOpen_repository, SIGNAL('triggered()'),   self.openRepository)     def openRepository(self):   caption = _('Select repository directory to open')   FD = QtGui.QFileDialog   path = FD.getExistingDirectory(parent=self, caption=caption,   options=FD.ShowDirsOnly | FD.ReadOnly)   path = str(path)   try:   repo = hg.repository(self.ui, path=path)   self.addRepoTab(repo)   except RepoError:   QtGui.QMessageBox.warning(self, _('Failed to open repository'),   _('%s is not a valid repository') % path)     def startAtCurrentRev(self):   pass     def clearStartAtRev(self):   pass     def setMode(self, mode):   pass     def nextDiff(self):   pass     def prevDiff(self):   pass     def load_config(self):   cfg = HgDialogMixin.load_config(self)   self.hidefinddelay = cfg.getHideFindDelay()     def file_displayed(self, filename):   # self.actionPrevDiff.setEnabled(False)   pass     def reload(self):   """Reload the repository"""   print "reload() called"   self.repowidget.reload()     #@timeit   def refreshRevisionTable(self, *args, **kw):   pass     def on_about(self, *args):   """ Display about dialog """   from __pkginfo__ import modname, version, short_desc, long_desc   try:   from mercurial.version import get_version   hgversion = get_version()   except:   from mercurial.__version__ import version as hgversion     msg = "<h2>About %(appname)s %(version)s</h2> (using hg %(hgversion)s)" % \   {"appname": modname, "version": version, "hgversion": hgversion}   msg += "<p><i>%s</i></p>" % short_desc.capitalize()   msg += "<p>%s</p>" % long_desc   QtGui.QMessageBox.about(self, "About %s" % modname, msg)     def on_help(self, *args):   w = HelpDialog(self.repo, self)   w.show()   w.raise_()   w.activateWindow()     def okToContinue(self):   '''   returns False if there is unsaved data     If there is unsaved data, present a dialog asking the user if it is ok to   discard the changes made.   '''   return True # we currently have no data to loose     def closeEvent(self, event):   if not self.okToContinue():   event.ignore() - '''   s = QtCore.QSettings()   wb = "Workbench/"   s.setValue(wb + 'geometry', self.saveGeometry())   s.setValue(wb + 'windowState', self.saveState()) + '''   for n in self.splitternames:   s.setValue(wb + n, getattr(self, n).saveState())   '''    def run(ui, *pats, **opts):   repo = None   root = paths.find_root()   if root:   repo = hg.repository(ui, path=root)   return Workbench(ui, repo)