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

mq: implement a patch message combobox selector

Changeset da9b79fffdec…

Parent 1d90d0af8363…

by Steve Borho

Changes to one file · Browse files at da9b79fffdec Showing diff from parent 1d90d0af8363 Diff from another changeset...

Change 1 of 7 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
42
43
44
45
 
46
47
48
 
150
151
152
 
153
154
155
 
173
174
175
 
176
177
178
179
 
180
181
182
183
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
184
185
186
187
188
189
 
190
191
192
 
209
210
211
212
213
214
215
 
224
225
226
 
227
228
229
 
233
234
235
236
237
 
 
 
 
 
 
 
 
238
239
240
 
302
303
304
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
305
306
307
 
42
43
44
 
45
46
47
48
 
150
151
152
153
154
155
156
 
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
 
234
235
236
 
237
238
239
 
248
249
250
251
252
253
254
 
258
259
260
 
 
261
262
263
264
265
266
267
268
269
270
271
 
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
@@ -42,7 +42,7 @@
  self.layout().addLayout(tbarhbox, 0)   self.queueCombo = QComboBox()   self.optionsBtn = QPushButton(_('Options')) - self.msgHistoryCombo = QComboBox() + self.msgHistoryCombo = PatchMessageCombo(self)   tbarhbox.addWidget(self.queueCombo)   tbarhbox.addWidget(self.optionsBtn)   tbarhbox.addWidget(self.msgHistoryCombo, 1) @@ -150,6 +150,7 @@
    self.shelveBtn.pressed.connect(self.launchShelveTool)   self.optionsBtn.pressed.connect(self.launchOptionsDialog) + self.msgHistoryCombo.activated.connect(self.onMessageSelected)     self.repo.configChanged.connect(self.onConfigChanged)   self.repo.repositoryChanged.connect(self.onRepositoryChanged) @@ -173,20 +174,44 @@
  self.loadConfigs()   QTimer.singleShot(0, self.reload)   + @pyqtSlot()   def onConfigChanged(self):   'Repository is reporting its config files have changed'   self.messageEditor.refresh(self.repo)   + @pyqtSlot()   def onRepositoryChanged(self):   'Repository is reporting its changelog has changed'   self.reload()   + @pyqtSlot(int) + def onMessageSelected(self, row): + if self.messageEditor.text() and self.messageEditor.isModified(): + d = QMessageBox.question(self, _('Confirm Discard Message'), + _('Discard current commit message?'), + QMessageBox.Ok | QMessageBox.Cancel) + if d != QMessageBox.Ok: + return + self.messageEditor.setText(self.messages[row][1]) + lines = self.messageEditor.lines() + if lines: + lines -= 1 + pos = self.messageEditor.lineLength(lines) + self.messageEditor.setCursorPosition(lines, pos) + self.messageEditor.ensureLineVisible(lines) + hs = self.messageEditor.horizontalScrollBar() + hs.setSliderPosition(0) + self.messageEditor.setModified(False) + self.messageEditor.setFocus() + + @pyqtSlot()   def launchShelveTool(self):   dlg = shelve.ShelveDialog(self.repo, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   self.reload()   + @pyqtSlot()   def launchOptionsDialog(self):   dlg = OptionsDialog(self)   dlg.finished.connect(dlg.deleteLater) @@ -209,7 +234,6 @@
  ui, repo = self.repo.ui, self.repo     self.queueCombo.clear() - self.msgHistoryCombo.clear()   self.queueListWidget.clear()   self.fileListWidget.clear()   @@ -224,6 +248,7 @@
  self.queueCombo.addItem(hglib.tounicode(qname))   self.queueCombo.setCurrentIndex(current)   + # TODO: maintain current selection   applied = set([p.name for p in repo.mq.applied])   for patch in repo.mq.series:   item = QListWidgetItem(hglib.tounicode(patch)) @@ -233,8 +258,14 @@
  item.setFont(f)   self.queueListWidget.addItem(item)   - # refresh self.queueListWidget - # refresh self.msgHistoryCombo + self.messages = [] + for patch in repo.mq.series: + ctx = repo.changectx(patch) + msg = ctx.description() + if msg: + self.messages.append((patch, msg)) + self.msgHistoryCombo.reset(self.messages) +   # update enabled states of qtbarhbox buttons   # refresh self.revisionOrCommitBtn   @@ -302,6 +333,31 @@
  else:   return super(MQWidget, self).keyPressEvent(event)   + + +class PatchMessageCombo(QComboBox): + def __init__(self, parent): + super(PatchMessageCombo, self).__init__(parent) + self.reset([]) + + def reset(self, msglist): + self.clear() + self.addItem(_('Patch commit messages...')) + self.loaded = False + self.msglist = msglist + + def showPopup(self): + if not self.loaded and self.msglist: + self.clear() + for patch, message in self.msglist: + sum = message.split('\n', 1)[0][:70] + self.addItem(hglib.tounicode('%s: %s' % (patch, sum))) + self.loaded = True + if self.loaded: + super(PatchMessageCombo, self).showPopup() + + +  class OptionsDialog(QDialog):   'Utility dialog for configuring uncommon options'   def __init__(self, parent):