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

revdetails: create a 'show all' action for merge changesets

The action behavior is currently broken, it somehow jumps to the merge parent.
Also removed unused revdetails.actionActivateFile

Changeset b256a167a674…

Parent 105be55e034a…

by Steve Borho

Changes to 3 files · Browse files at b256a167a674 Showing diff from parent 105be55e034a Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
 
33
34
35
36
 
37
38
39
40
41
 
 
42
43
44
45
46
47
48
 
 
 
49
50
51
 
153
154
155
156
157
158
 
159
160
 
33
34
35
 
36
37
38
39
40
41
42
43
44
45
46
47
48
 
 
49
50
51
52
53
54
 
156
157
158
 
 
 
159
160
161
@@ -33,19 +33,22 @@
    contextChanged = pyqtSignal(object)   - def __init__(self, repo, parent=None): + def __init__(self, repo, parent):   """   data is a HgHLRepo instance   """   QAbstractTableModel.__init__(self, parent)   self.repo = repo + self._boldfont = parent.font() + self._boldfont.setBold(True)   self._ctx = None   self._files = []   self._filesdict = {}   self._fulllist = False   - def toggleFullFileList(self): - self._fulllist = not self._fulllist + @pyqtSlot(bool) + def toggleFullFileList(self, value): + self._fulllist = value   self.loadFiles()   self.layoutChanged.emit()   @@ -153,8 +156,6 @@
  return QVariant(geticon('filedelete'))   elif role == Qt.FontRole:   if self._fulllist and current_file_desc['infiles']: - font = self.font() - font.setBold(True) - return QVariant(font) + return QVariant(self._boldfont)   else:   return nullvariant
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
56
57
58
 
 
59
60
61
 
66
67
68
 
69
70
71
 
187
188
189
 
 
 
 
 
190
191
192
 
285
286
287
288
 
56
57
58
59
60
61
62
63
 
68
69
70
71
72
73
74
 
190
191
192
193
194
195
196
197
198
199
200
 
293
294
295
 
@@ -56,6 +56,8 @@
  model.contextChanged.connect(self.contextChanged)   self.selectionModel().currentRowChanged.connect(self.fileSelected)   self.horizontalHeader().setResizeMode(1, QHeaderView.Stretch) + self.actionShowAllMerge.setChecked(False) + self.actionShowAllMerge.toggled.connect(model.toggleFullFileList)   if model._ctx is not None:   self.contextChanged(model._ctx)   @@ -66,6 +68,7 @@
  self._actions[act].setEnabled(real)   for act in ['diff', 'revert']:   self._actions[act].setEnabled(real or wd) + self.actionShowAllMerge.setVisible(len(ctx.parents()) == 2)     def currentFile(self):   index = self.currentIndex() @@ -187,6 +190,11 @@
  dlg.activateWindow()     def createActions(self): + self.actionShowAllMerge = QAction('Show All', self) + self.actionShowAllMerge.setCheckable(True) + self.actionShowAllMerge.setChecked(False) + self.actionShowAllMerge.setVisible(False) +   self._actions = {}   for name, desc, icon, key, tip, cb in [   ('navigate', _('File history'), None, 'Shift+Return', @@ -285,4 +293,3 @@
  return QTableView.mouseMoveEvent(self, event)   self.dragObject()   return QTableView.mouseMoveEvent(self, event) -
Change 1 of 2 Show Changes Only tortoisehg/​hgqt/​revdetails.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
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
 # 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.    from tortoisehg.hgqt.qtlib import getfont, geticon, descriptionhtmlizer  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.filelistmodel import HgFileListModel  from tortoisehg.hgqt.filelistview import HgFileListView  from tortoisehg.hgqt.fileview import HgFileView  from tortoisehg.hgqt.revpanel import RevPanelWidget  from tortoisehg.hgqt import thgrepo, qscilib    from PyQt4.QtCore import *  from PyQt4.QtGui import *    class RevDetailsWidget(QWidget):     showMessage = pyqtSignal(QString)   linkActivated = pyqtSignal(unicode)   grepRequested = pyqtSignal(unicode, dict)   revForDiffChanged = pyqtSignal(int)     def __init__(self, repo):   QWidget.__init__(self)     self.repo = repo   self.splitternames = []     self._deschtmlize = descriptionhtmlizer(repo.ui)   repo.configChanged.connect(self._updatedeschtmlizer)     # these are used to know where to go after a reload   self._last_rev = None   self._reload_file = None     self.setupUi()   self.createActions()   self.setupModels()     self.fileview.setFont(getfont('fontdiff').font())   self.fileview.showMessage.connect(self.showMessage)   self.fileview.grepRequested.connect(self.grepRequested)   self.fileview.revForDiffChanged.connect(self.revForDiffChanged)   self.restoreSettings()     def setRepo(self, repo):   self.repo = repo     def setupUi(self):   SP = QSizePolicy   sp = SP(SP.Preferred, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0)   sp.setHeightForWidth(self.sizePolicy().hasHeightForWidth())   self.setSizePolicy(sp)     # + revisiondetails_layout -----------------------------------------+   # |+ filelist_splitter ........ |   # | + tbarFileListFrame (vbox)| + cset_and_file_details_frame (vbox)|   # | + diffToolbar | + revpanel |   # +---------------------------+-------------------------------------+   # | + filelist | + message_splitter |   # | | :+ message |   # | | :----------------------------------+   # | | + fileview |   # +---------------------------+-------------------------------------+   # |+ searchbar |   # +-----------------------------------------------------------------+     revisiondetails_layout = QVBoxLayout(self)   revisiondetails_layout.setSpacing(0)   revisiondetails_layout.setMargin(0)   revisiondetails_layout.setContentsMargins(2, 2, 2, 2)     self.filelist_splitter = QSplitter(self)   self.splitternames.append('filelist_splitter')     sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0)   sp.setHeightForWidth(self.filelist_splitter.sizePolicy().hasHeightForWidth())   self.filelist_splitter.setSizePolicy(sp)   self.filelist_splitter.setOrientation(Qt.Horizontal)   self.filelist_splitter.setChildrenCollapsible(False)     self.mergeToolBar = QToolBar(_('Merge Toolbar'))   self.mergeToolBar.setIconSize(QSize(16,16))   self.filelist = HgFileListView()     self.tbarFileListFrame = QFrame(self.filelist_splitter)   sp = SP(SP.Preferred, SP.Preferred)   sp.setHorizontalStretch(3)   sp.setVerticalStretch(0)   sp.setHeightForWidth(   self.tbarFileListFrame.sizePolicy().hasHeightForWidth())   self.tbarFileListFrame.setSizePolicy(sp)   self.tbarFileListFrame.setFrameShape(QFrame.NoFrame)   vbox = QVBoxLayout()   vbox.setSpacing(0)   vbox.setMargin(0)   vbox.addWidget(self.mergeToolBar)   vbox.addWidget(self.filelist)   self.tbarFileListFrame.setLayout(vbox)     self.cset_and_file_details_frame = QFrame(self.filelist_splitter)   sp = SP(SP.Preferred, SP.Preferred)   sp.setHorizontalStretch(7)   sp.setVerticalStretch(0)   sp.setHeightForWidth(   self.cset_and_file_details_frame.sizePolicy().hasHeightForWidth())   self.cset_and_file_details_frame.setSizePolicy(sp)   self.cset_and_file_details_frame.setFrameShape(QFrame.NoFrame)     vbox = QVBoxLayout(self.cset_and_file_details_frame)   vbox.setSpacing(0)   vbox.setSizeConstraint(QLayout.SetDefaultConstraint)   vbox.setMargin(0)   cset_and_file_details_layout = vbox     self.message_splitter = QSplitter(self.cset_and_file_details_frame)   self.splitternames.append('message_splitter')   sp = SP(SP.Preferred, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0)   sp.setHeightForWidth(self.message_splitter.sizePolicy().hasHeightForWidth())   self.message_splitter.setSizePolicy(sp)   self.message_splitter.setMinimumSize(QSize(50, 50))   self.message_splitter.setFrameShape(QFrame.NoFrame)   self.message_splitter.setLineWidth(0)   self.message_splitter.setMidLineWidth(0)   self.message_splitter.setOrientation(Qt.Vertical)   self.message_splitter.setOpaqueResize(True)   self.message = QTextBrowser(self.message_splitter,   lineWrapMode=QTextEdit.NoWrap,   openLinks=False)   self.message.minimumSizeHint = lambda: QSize(0, 25)   self.message.anchorClicked.connect(   lambda url: self.linkActivated.emit(url.toString()))     sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(2)   sp.setHeightForWidth(self.message.sizePolicy().hasHeightForWidth())   self.message.setSizePolicy(sp)   self.message.setMinimumSize(QSize(0, 0))   f = getfont('fontcomment')   self.message.setFont(f.font())   f.changed.connect(lambda font: self.message.setFont(font))     self.fileview = HgFileView(self.repo, self.message_splitter)   sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(5)   sp.setHeightForWidth(self.fileview.sizePolicy().hasHeightForWidth())   self.fileview.setSizePolicy(sp)   self.fileview.setMinimumSize(QSize(0, 0))     self.revpanel = RevPanelWidget(self.repo)   self.revpanel.linkActivated.connect(self.linkActivated)     cset_and_file_details_layout.addWidget(self.revpanel)   cset_and_file_details_layout.addWidget(self.message_splitter)     revisiondetails_layout.addWidget(self.filelist_splitter)     self.searchbar = qscilib.SearchToolBar(hidable=True)   self.searchbar.hide()   self.searchbar.searchRequested.connect(self.fileview.find)   self.searchbar.conditionChanged.connect(self.fileview.highlightText)   revisiondetails_layout.addWidget(self.searchbar)   self.fileview.filled.connect(self._updateHighlightText)   self.filelist.fileRevSelected.connect(self._displayFile)   self.filelist.clearDisplay.connect(self.fileview.clearDisplay)     def createActions(self): - # Activate file (file diff navigator) - self.actionActivateFile = QAction('Activate file', self) + def fileActivated(): + idx = self.filelist.currentIndex() + self.filelist.fileActivated(idx, alternate=True)   self.actionActivateFileAlt = QAction('Activate alt. file', self)   self.actionActivateFileAlt.setShortcuts([Qt.ALT+Qt.Key_Return,   Qt.ALT+Qt.Key_Enter]) - self.actionActivateFileAlt.triggered.connect( - lambda self=self: - self.filelist.fileActivated(self.filelist.currentIndex(), - alternate=True)) + self.actionActivateFileAlt.triggered.connect(fileActivated) + self.mergeToolBar.addAction(self.filelist.actionShowAllMerge)     @pyqtSlot()   def toggleSearchBar(self):   vis = self.searchbar.isVisible()   if vis:   self.searchbar.hide()   else:   self.searchbar.show()   self.searchbar.setFocus()     @pyqtSlot()   def _updateHighlightText(self):   if not self.searchbar.isVisible():   return   self.fileview.highlightText(self.searchbar.pattern(),   self.searchbar.caseInsensitive())     def create_models(self): - self.filelistmodel = HgFileListModel(self.repo, parent=self) + self.filelistmodel = HgFileListModel(self.repo, self)     def setupModels(self):   self.create_models()   self.filelist.setModel(self.filelistmodel)     @pyqtSlot(object, object, object)   def _displayFile(self, file, rev, status):   self.fileview.displayFile(file, rev, status)   self._updateHighlightText()     def revision_selected(self, rev):   self._last_rev = rev   ctx = self.repo.changectx(rev)   self.revpanel.set_revision(rev)   self.revpanel.update(repo = self.repo)   self.message.setHtml('<pre>%s</pre>'   % self._deschtmlize(ctx.description()))   self.fileview.setContext(ctx)   self.filelistmodel.setContext(ctx)     @pyqtSlot()   def _updatedeschtmlizer(self):   self._deschtmlize = descriptionhtmlizer(self.repo.ui)   self.revision_selected(self._last_rev) # regenerate desc html     def record(self):   'Repo widget is reloading, record current file'   self._reload_file = self.filelist.currentFile()     def finishReload(self):   'Finish reload by re-selecting previous file'   if self._reload_file:   self.filelist.selectFile(self._reload_file)   elif not self.filelist.selectedIndexes():   self.filelist.selectRow(0)     def reload(self):   'Task tab is reloaded, or repowidget is refreshed'   if len(self.repo) <= self._last_rev:   self._last_rev = '.'   f = self.filelist.currentFile()   self.revision_selected(self._last_rev)   self.filelist.selectFile(f)     def storeSettings(self):   s = QSettings()   wb = "RevDetailsWidget/"   for n in self.splitternames:   s.setValue(wb + n, getattr(self, n).saveState())   s.setValue(wb + 'revpanel.expanded', self.revpanel.is_expanded())   self.fileview.saveSettings(s, 'revpanel/fileview')     def restoreSettings(self):   s = QSettings()   wb = "RevDetailsWidget/"   for n in self.splitternames:   getattr(self, n).restoreState(s.value(wb + n).toByteArray())   expanded = s.value(wb + 'revpanel.expanded', False).toBool()   self.revpanel.set_expanded(expanded)   self.fileview.loadSettings(s, 'revpanel/fileview')