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

mq: complete the options dialog

Changeset 25c76c5977e2…

Parent b2f1a8e06640…

by Steve Borho

Changes to one file · Browse files at 25c76c5977e2 Showing diff from parent b2f1a8e06640 Diff from another changeset...

Change 1 of 4 Show Changes Only tortoisehg/​hgqt/​mq.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
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
 # mq.py - TortoiseHg MQ widget  #  # Copyright 2011 Steve Borho <steve@borho.org>  #  # 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  import re    from PyQt4.QtCore import *  from PyQt4.QtGui import *    from mercurial import hg, ui, url, util, error  from mercurial import merge as mergemod    from tortoisehg.util import hglib, patchctx  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, cmdui, rejects, commit, shelve    class MQWidget(QWidget):   showMessage = pyqtSignal(unicode)   output = pyqtSignal(QString, QString)   progress = pyqtSignal(QString, object, QString, QString, object)   makeLogVisible = pyqtSignal(bool)     def __init__(self, repo, parent, **opts):   QWidget.__init__(self, parent)     self.repo = repo   self.opts = opts   self.refreshing = False     layout = QVBoxLayout()   layout.setSpacing(0)   self.setLayout(layout)     # top toolbar   tbarhbox = QHBoxLayout()   tbarhbox.setSpacing(5)   self.layout().addLayout(tbarhbox, 0)   self.queueCombo = QComboBox()   self.optionsBtn = QPushButton(_('Options'))   self.msgHistoryCombo = QComboBox()   tbarhbox.addWidget(self.queueCombo)   tbarhbox.addWidget(self.optionsBtn)   tbarhbox.addWidget(self.msgHistoryCombo, 1)     # main area consists of a three-way horizontal splitter   splitter = QSplitter()   self.layout().addWidget(splitter, 1)   splitter.setOrientation(Qt.Horizontal)   splitter.setChildrenCollapsible(True)   splitter.setObjectName('splitter')     self.queueFrame = QFrame(splitter)   self.fileListFrame = QFrame(splitter)   self.messageFrame = QFrame(splitter)     # Patch Queue Frame   layout = QVBoxLayout()   layout.setContentsMargins(0, 0, 0, 0)   self.queueFrame.setLayout(layout)     qtbarhbox = QHBoxLayout()   qtbarhbox.setSpacing(2)   layout.addLayout(qtbarhbox, 0)   qtbarhbox.setContentsMargins(0, 0, 0, 0)   self.qpushAllBtn = QToolButton()   self.qpushBtn = QToolButton()   self.qpushMoveBtn = QToolButton()   self.qdeleteBtn = QToolButton()   self.qpopBtn = QToolButton()   self.qpopAllBtn = QToolButton()   qtbarhbox.addWidget(self.qpushAllBtn)   qtbarhbox.addWidget(self.qpushBtn)   qtbarhbox.addStretch(1)   qtbarhbox.addWidget(self.qpushMoveBtn)   qtbarhbox.addWidget(self.qdeleteBtn)   qtbarhbox.addStretch(1)   qtbarhbox.addWidget(self.qpopBtn)   qtbarhbox.addWidget(self.qpopAllBtn)     self.queueListWidget = QListWidget(self)   layout.addWidget(self.queueListWidget, 1)     self.guardSelBtn = QPushButton(_('Guards: 0/0'))   layout.addWidget(self.guardSelBtn, 0)     self.revisionOrCommitBtn = QPushButton(_('Revision Queue'))   layout.addWidget(self.revisionOrCommitBtn, 0)     # File List Frame   layout = QVBoxLayout()   layout.setContentsMargins(0, 0, 0, 0)   self.fileListFrame.setLayout(layout)     self.fileListWidget = QListWidget(self)   layout.addWidget(self.fileListWidget, 0)     # Message Frame   layout = QVBoxLayout()   layout.setContentsMargins(0, 0, 0, 0)   self.messageFrame.setLayout(layout)     mtbarhbox = QHBoxLayout()   mtbarhbox.setSpacing(5)   layout.addLayout(mtbarhbox, 0)   mtbarhbox.setContentsMargins(0, 0, 0, 0)   self.newCheckBox = QCheckBox(_('New Patch'))   self.patchNameLE = QLineEdit()   mtbarhbox.addWidget(self.newCheckBox)   mtbarhbox.addWidget(self.patchNameLE, 1)     self.messageEditor = commit.MessageEntry(self)   layout.addWidget(self.messageEditor, 1)     qrefhbox = QHBoxLayout()   layout.addLayout(qrefhbox, 0)   qrefhbox.setContentsMargins(0, 0, 0, 0)   self.shelveBtn = QPushButton(_('Shelve'))   self.qnewOrRefreshBtn = QPushButton(_('QRefresh'))   qrefhbox.addStretch(1)   qrefhbox.addWidget(self.shelveBtn)   qrefhbox.addWidget(self.qnewOrRefreshBtn)     self.cmd = cmdui.Runner(_('Patch Queue'), parent != None, self)   self.cmd.output.connect(self.output)   self.cmd.makeLogVisible.connect(self.makeLogVisible)   self.cmd.progress.connect(self.progress)     self.shelveBtn.pressed.connect(self.launchShelveTool) + self.optionsBtn.pressed.connect(self.launchOptionsDialog)     self.repo.configChanged.connect(self.onConfigChanged)   self.repo.repositoryChanged.connect(self.onRepositoryChanged)   self.setAcceptDrops(True)     if hasattr(self.patchNameLE, 'setPlaceholderText'): # Qt >= 4.7   self.patchNameLE.setPlaceholderText('### patch name ###')     if parent:   layout.setContentsMargins(2, 2, 2, 2)   else:   layout.setContentsMargins(0, 0, 0, 0)   self.setWindowTitle(_('TortoiseHg Patch Queue'))   self.resize(850, 550)     def onConfigChanged(self):   'Repository is reporting its config files have changed'   self.reload()     def onRepositoryChanged(self):   'Repository is reporting its changelog has changed'   self.reload()     def launchShelveTool(self):   dlg = shelve.ShelveDialog(self.repo, self)   dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   self.reload()   + def launchOptionsDialog(self): + dlg = OptionsDialog(self) + dlg.finished.connect(dlg.deleteLater) + dlg.setWindowFlags(Qt.Sheet) + dlg.setWindowModality(Qt.WindowModal) + if dlg.exec_() == QDialog.Accepted: + self.opts.update(dlg.outopts) +   def reload(self):   self.refreshing = True   # refresh self.queueCombo   # refresh self.msgHistoryCombo   # set self.patchNameLE to qtip patch name   # update enabled states of qtbarhbox buttons   # refresh self.queueListWidget   # refresh self.guardSelBtn   # refresh self.revisionOrCommitBtn   # refresh self.messageEditor with qtip description, if not in new mode   # refresh self.qnewOrRefreshBtn   # refresh self.fileListWidget   self.refreshing = False     def details(self):   dlg = OptionsDialog(self)   dlg.setWindowFlags(Qt.Sheet)   dlg.setWindowModality(Qt.WindowModal)   if dlg.exec_() == QDialog.Accepted:   self.opts.update(dlg.outopts)     # Capture drop events, try to import into current patch queue     def dragEnterEvent(self, event):   event.acceptProposedAction()     def dragMoveEvent(self, event):   event.acceptProposedAction()     def dropEvent(self, event):   paths = [unicode(u.toLocalFile()) for u in event.mimeData().urls()]   filepaths = [p for p in paths if os.path.isfile(p)]   if filepaths:   event.setDropAction(Qt.CopyAction)   event.accept()   else:   super(MQWidget, self).dropEvent(event)   return   dlg = thgimport.ImportDialog(repo=self.repo, parent=self)   # TODO: send flag to dialog indicating this is a qimport (alias?)   dlg.finished.connect(dlg.deleteLater)   dlg.setfilepaths(filepaths)   dlg.exec_()     # End drop events     def canExit(self):   return not self.cmd.core.running()     def keyPressEvent(self, event):   if event.matches(QKeySequence.Refresh):   self.reload()   elif event.key() == Qt.Key_Escape:   if self.cmd.core.running():   self.cmd.cancel()   elif not self.parent():   self.close()   else:   return super(MQWidget, self).keyPressEvent(event)    class OptionsDialog(QDialog):   'Utility dialog for configuring uncommon options'   def __init__(self, parent):   QDialog.__init__(self, parent)   self.setWindowTitle('MQ options')   - layout = QVBoxLayout() + layout = QFormLayout()   self.setLayout(layout)     self.gitcb = QCheckBox(_('Use git extended diff format')) - self.gitcb.setChecked(parent.opts.get('git', False))   layout.addRow(self.gitcb, None)     self.forcecb = QCheckBox(_('Force push or pop')) - self.forcecb.setChecked(parent.opts.get('force', False))   layout.addRow(self.forcecb, None)     self.exactcb = QCheckBox(_('Apply patch to its recorded parent')) - self.exactcb.setChecked(parent.opts.get('exact', False))   layout.addRow(self.exactcb, None)     self.currentdatecb = QCheckBox(_('Update date field with current date')) - self.currentdatecb.setChecked(parent.opts.get('currentdate', False))   layout.addRow(self.currentdatecb, None)   + self.datele = QLineEdit() + layout.addRow(QLabel(_('Specify an explicit date:')), self.datele) +   self.currentusercb = QCheckBox(_('Update author field with current user')) + layout.addRow(self.currentusercb, None) + + self.userle = QLineEdit() + layout.addRow(QLabel(_('Specify an explicit author:')), self.userle) + + self.currentdatecb.toggled.connect(self.datele.setDisabled) + self.currentusercb.toggled.connect(self.userle.setDisabled) + + self.gitcb.setChecked(parent.opts.get('git', False)) + self.forcecb.setChecked(parent.opts.get('force', False)) + self.exactcb.setChecked(parent.opts.get('exact', False)) + self.currentdatecb.setChecked(parent.opts.get('currentdate', False))   self.currentusercb.setChecked(parent.opts.get('currentuser', False)) - layout.addRow(self.currentusercb, None) + self.datele.setText(hglib.tounicode(parent.opts.get('date', ''))) + self.userle.setText(hglib.tounicode(parent.opts.get('user', '')))     BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Ok|BB.Cancel)   bb.accepted.connect(self.accept)   bb.rejected.connect(self.reject) + self.bb = bb   layout.addWidget(bb)     def accept(self):   outopts = {}   outopts['git'] = self.gitcb.isChecked()   outopts['force'] = self.forcecb.isChecked()   outopts['exact'] = self.exactcb.isChecked()   outopts['currentdate'] = self.currentdatecb.isChecked()   outopts['currentuser'] = self.currentusercb.isChecked() + if self.currentdatecb.isChecked(): + outopts['date'] = '' + else: + outopts['date'] = hglib.fromunicode(self.datele.text()) + if self.currentusercb.isChecked(): + outopts['user'] = '' + else: + outopts['user'] = hglib.fromunicode(self.userle.text()) +   self.outopts = outopts   QDialog.accept(self)   -  def run(ui, *pats, **opts):   from tortoisehg.util import paths   from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(ui, path=paths.find_root())   return MQWidget(repo, None, **opts)