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 Entire File tortoisehg/​hgqt/​mq.py Stacked
 
130
131
132
 
133
134
135
 
159
160
161
 
 
 
 
 
 
 
 
162
163
164
 
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
 
261
262
263
 
 
 
 
 
 
 
 
 
264
265
266
267
268
269
270
 
130
131
132
133
134
135
136
 
160
161
162
163
164
165
166
167
168
169
170
171
172
173
 
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
 
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
 
298
299
300
@@ -130,6 +130,7 @@
  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) @@ -159,6 +160,14 @@
  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 @@ -225,33 +234,46 @@
  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): @@ -261,10 +283,18 @@
  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