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

repowidget: remove setupBranchCombo

is done in workbench

Changeset 31759f1be998…

Parent ee67a1a196bd…

by Adrian Buehlmann

Changes to one file · Browse files at 31759f1be998 Showing diff from parent ee67a1a196bd Diff from another changeset...

Change 1 of 3 Show Changes Only tortoisehg/​hgqt/​repowidget.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
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
 # -*- coding: iso-8859-1 -*-  #!/usr/bin/env python  # repowidget.py - TortoiseHg repository widget  #  # Copyright (C) 2007-2010 Logilab. All rights reserved.  # Copyright (C) 2010 Adrian Buehlmann <adrian@cadifra.com>  #  # This software may be used and distributed according to the terms  # of the GNU General Public License, incorporated herein by reference.    import sys, os  import re    from PyQt4 import QtCore, QtGui, Qsci    from mercurial import ui, hg  from mercurial import util    from tortoisehg.util.util import tounicode, has_closed_branch_support  from tortoisehg.util.util import rootpath, find_repository    from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.graph import diff as revdiff  from tortoisehg.hgqt.decorators import timeit    from tortoisehg.hgqt import icon as geticon  from tortoisehg.hgqt.repomodel import HgRepoListModel  from tortoisehg.hgqt.filelistmodel import HgFileListModel  from tortoisehg.hgqt.filedialogs import FileLogDialog, FileDiffDialog  from tortoisehg.hgqt.manifestdialog import ManifestDialog  from tortoisehg.hgqt.widgetmixin import WidgetMixin  from tortoisehg.hgqt.update import UpdateDialog  from tortoisehg.hgqt import cmdui    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 RepoWidget(QtGui.QWidget, WidgetMixin):   _uifile = 'repowidget.ui'     showMessageSignal = QtCore.pyqtSignal(str)     def __init__(self, repo, fromhead=None):   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.QWidget.__init__(self)   WidgetMixin.__init__(self)     self.currentMessage = ''     self.createActions()     self.fileview.setFont(self._font)   connect(self.fileview, SIGNAL('showMessage'), self.showMessage)   connect(self.repoview, SIGNAL('showMessage'), self.showMessage)     self.textview_header.setMessageWidget(self.message)     self.textview_header.commitsignal.connect(self.commit)     connect(self.message, SIGNAL('revisionSelected'), self.repoview.goto)     # setup tables and views   self.setupHeaderTextview()   connect(self.fileview, SIGNAL('fileDisplayed'),   self.file_displayed) - self.setupBranchCombo()   self.setupModels(fromhead)   if fromhead:   self.startrev_entry.setText(str(fromhead))   self.setupRevisionTable()     self._repodate = self._getrepomtime()   self._watchrepotimer = self.startTimer(500)     # restore settings   s = QtCore.QSettings()   wb = "RepoWidget/"   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 showMessage(self, msg):   self.currentMessage = msg   if self.isVisible():   self.showMessageSignal.emit(msg)     def showEvent(self, event):   QtGui.QWidget.showEvent(self, event)   self.showMessageSignal.emit(self.currentMessage)     def commit(self):   args = ['commit']   args += ['-v', '-m', self.message.text()]   dlg = cmdui.Dialog(args)   dlg.setWindowTitle(_('Commit'))   if dlg.exec_():   self.reload('tip')     def timerEvent(self, event):   if event.timerId() == self._watchrepotimer:   if not self._scanForRepoChanges or self.loading():   return   mtime = self._getrepomtime()   if mtime > self._repodate:   self.showMessage(_("Repository has been modified "   "(reloading is recommended)"))     def loading(self):   return self._loading     def loaded(self):   reponame = os.path.basename(self.repo.root)   print "repository '%s' loaded" % reponame   self._repodate = self._getrepomtime()   self._loading = False   - def setupBranchCombo(self, *args): - pass -   def createActions(self):   # 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.fileview.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.fileview.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.fileview.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.fileview.prevCol)   self.addAction(self.actionPrevCol)     # Activate file (file diff navigator)   self.actionActivateFile = QtGui.QAction('Activate file', self)   self.actionActivateFile.setShortcuts([Qt.Key_Return, Qt.Key_Enter])   def enterkeypressed():   w = QtGui.QApplication.focusWidget()   if not isinstance(w, QtGui.QLineEdit):   self.tableView_filelist.fileActivated(self.tableView_filelist.currentIndex(),)   else:   w.emit(SIGNAL('editingFinished()'))   connect(self.actionActivateFile, SIGNAL('triggered()'),   enterkeypressed)     self.actionActivateFileAlt = QtGui.QAction('Activate alt. file', self)   self.actionActivateFileAlt.setShortcuts([Qt.ALT+Qt.Key_Return, Qt.ALT+Qt.Key_Enter])   connect(self.actionActivateFileAlt, SIGNAL('triggered()'),   lambda self=self:   self.tableView_filelist.fileActivated(self.tableView_filelist.currentIndex(),   alternate=True))   self.actionActivateRev = QtGui.QAction('Activate rev.', self)   self.actionActivateRev.setShortcuts([Qt.SHIFT+Qt.Key_Return, Qt.SHIFT+Qt.Key_Enter])   connect(self.actionActivateRev, SIGNAL('triggered()'),   self.revision_activated)   self.addAction(self.actionActivateFile)   self.addAction(self.actionActivateFileAlt)   self.addAction(self.actionActivateRev)   self.disab_shortcuts.append(self.actionActivateFile)   self.disab_shortcuts.append(self.actionActivateRev)     def back(self):   self.repoview.back()     def forward(self):   self.repoview.forward()     def setMode(self, mode):   self.fileview.setMode(mode)     def getMode(self):   return self.fileview.getMode()     def setAnnotate(self, ann):   self.fileview.setAnnotate(ann)     def getAnnotate(self):   return self.fileview.getAnnotate()     def nextDiff(self):   notlast = self.fileview.nextDiff()   self.actionNextDiff.setEnabled(self.fileview.fileMode() and notlast and self.fileview.nDiffs())   self.actionPrevDiff.setEnabled(self.fileview.fileMode() and self.fileview.nDiffs())     def prevDiff(self):   notfirst = self.fileview.prevDiff()   self.actionPrevDiff.setEnabled(self.fileview.fileMode() and notfirst and self.fileview.nDiffs())   self.actionNextDiff.setEnabled(self.fileview.fileMode() and self.fileview.nDiffs())     def load_config(self):   cfg = WidgetMixin.load_config(self)   self.hidefinddelay = cfg.getHideFindDelay()     def create_models(self, fromhead=None):   self.repomodel = HgRepoListModel(self.repo, fromhead=fromhead)   connect(self.repomodel, SIGNAL('filled'),   self.on_filled)   connect(self.repomodel, SIGNAL('loaded'),   self.loaded)   connect(self.repomodel, SIGNAL('showMessage'),   self.showMessage, Qt.QueuedConnection)     self.filelistmodel = HgFileListModel(self.repo)     def setupModels(self, fromhead=None):   self.create_models(fromhead)   self.repoview.setModel(self.repomodel)   self.tableView_filelist.setModel(self.filelistmodel)   self.fileview.setModel(self.repomodel)   #self.find_toolbar.setModel(self.repomodel)     filetable = self.tableView_filelist   connect(filetable, SIGNAL('fileSelected'),   self.fileview.displayFile)   connect(self.fileview, SIGNAL('revForDiffChanged'),   self.textview_header.setDiffRevision)     def setupRevisionTable(self):   view = self.repoview   view.installEventFilter(self)   connect(view, SIGNAL('revisionSelected'), self.revision_selected)   connect(view, SIGNAL('revisionActivated'), self.revision_activated)   connect(view, SIGNAL('updateToRevision'), self.updateToRevision)   connect(self.textview_header, SIGNAL('revisionSelected'), view.goto)   connect(self.textview_header, SIGNAL('parentRevisionSelected'), self.fileview.displayDiff)   self.attachQuickBar(view.goto_toolbar)   gotoaction = view.goto_toolbar.toggleViewAction()   gotoaction.setIcon(geticon('goto'))   #self.toolBar_edit.addAction(gotoaction)     def _setup_table(self, table):   table.setTabKeyNavigation(False)   table.verticalHeader().setDefaultSectionSize(self.rowheight)   table.setShowGrid(False)   table.verticalHeader().hide()   table.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)   table.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)   table.setAlternatingRowColors(True)     def setupHeaderTextview(self):   self.header_diff_format = QtGui.QTextCharFormat()   self.header_diff_format.setFont(self._font)   self.header_diff_format.setFontWeight(bold)   self.header_diff_format.setForeground(Qt.black)   self.header_diff_format.setBackground(Qt.gray)     def on_filled(self):   tv = self.repoview   if self._reload_rev is not None:   try:   tv.goto(self._reload_rev)   self.tableView_filelist.selectFile(self._reload_file)   return   except IndexError:   pass   else:   tv.setCurrentIndex(tv.model().index(0, 0))     def revision_activated(self, rev=None):   """   Callback called when a revision is double-clicked in the revisions table   """   if rev is None:   rev = self.repoview.current_rev   self._manifestdlg = ManifestDialog(self.repo, rev)   self._manifestdlg.show()     def setScanForRepoChanges(self, enable):   saved = self._scanForRepoChanges   self._scanForRepoChanges = enable   return saved     def updateToRevision(self, rev):   saved = self.setScanForRepoChanges(False)   opts = { 'clean':False }   dlg = UpdateDialog(rev, self.repo, self, opts=opts)   self._updatedlg = dlg   def quit(status):   if status == 0:   self.reload() # TODO: implement something less drastic than a full reload   self.setScanForRepoChanges(saved)   dlg.quitsignal.connect(quit)   dlg.show()     def file_displayed(self, filename):   #self.actionPrevDiff.setEnabled(False)   pass     def revision_selected(self, rev):   """   Callback called when a revision is selected in the revisions table   """   if self.repomodel.graph:   ctx = self.repomodel.repo.changectx(rev)   self.fileview.setContext(ctx)   self.textview_header.displayRevision(ctx)   self.filelistmodel.setSelectedRev(ctx)   if len(self.filelistmodel):   self.tableView_filelist.selectRow(0)     def goto(self, rev):   if len(self.repoview.model().graph):   self.repoview.goto(rev)   else:   # store rev to show once it's available (when graph   # filling is still running)   self._reload_rev = rev     def _getrepomtime(self):   """Return the last modification time for the repo"""   watchedfiles = [(self.repo.root, ".hg", "store", "00changelog.i"),   (self.repo.root, ".hg", "dirstate")]   watchedfiles = [os.path.join(*wf) for wf in watchedfiles]   mtime = [os.path.getmtime(wf) for wf in watchedfiles \   if os.path.isfile(wf)]   if mtime:   return max(mtime)   # humm, directory has probably been deleted, exiting...   self.close()     def reload(self, rev=None):   """Reload the repository"""   if rev == None:   self._reload_rev = self.repoview.current_rev   else:   self._reload_rev = rev   self._loading = True   self._reload_file = self.tableView_filelist.currentFile()   self.repo = hg.repository(self.repo.ui, self.repo.root)   self._repodate = self._getrepomtime() - self.setupBranchCombo()   self.setupModels()     def setRepomodel(self, branch, startrev, follow):   startrev = self.repo.changectx(startrev).rev()   self.repomodel.setRepo(   self.repo, branch=branch, fromhead=startrev, follow=follow)     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 # TODO: check if there is an unsaved commit message     def closeRepoWidget(self):   '''returns False if close should be aborted'''   if not self.okToContinue():   return False   if self.isVisible():   # assuming here that there is at most one RepoWidget visible   s = QtCore.QSettings()   wb = "RepoWidget/"   for n in self.splitternames:   s.setValue(wb + n, getattr(self, n).saveState())   return True