Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 272b20d3d98e…

Parents 9bf5c26b7555…

Parents 475eafd798bb…

by Steve Borho

Changes to one file · Browse files at 272b20d3d98e Showing diff from parent 9bf5c26b7555 475eafd798bb Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
159
160
161
162
 
 
 
 
 
 
 
 
 
163
164
165
 
216
217
218
 
219
220
221
 
340
341
342
 
343
344
345
 
404
405
406
 
 
 
 
 
 
 
 
 
 
407
408
409
 
159
160
161
 
162
163
164
165
166
167
168
169
170
171
172
173
 
224
225
226
227
228
229
230
 
349
350
351
352
353
354
355
 
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
@@ -159,7 +159,15 @@
  tb.addWidget(self.targetcheckbox)   tb.addWidget(self.targetcombo)   - style = QApplication.style() + hbox = QHBoxLayout() + hbox.setContentsMargins(0, 0, 0, 0) + layout.addLayout(hbox) + self.optionshdrlabel = lbl = QLabel(_('<b>Selected Options:</b>')) + hbox.addWidget(lbl) + self.optionslabel = QLabel() + self.optionslabel.setAcceptDrops(False) + hbox.addWidget(self.optionslabel) + hbox.addStretch()     hbox = QHBoxLayout()   hbox.setContentsMargins(0, 0, 0, 0) @@ -216,6 +224,7 @@
  self.pathentry.textChanged.connect(self.refreshUrl)   tbar.addWidget(self.pathentry)   + style = QApplication.style()   a = tbar.addAction(style.standardIcon(QStyle.SP_DialogSaveButton),   _('Save'))   a.setToolTip(_('Save current URL under an alias')) @@ -340,6 +349,7 @@
  dlg.setWindowModality(Qt.WindowModal)   if dlg.exec_() == QDialog.Accepted:   self.opts.update(dlg.outopts) + self.refreshUrl()     def reload(self):   # Refresh configured paths @@ -404,6 +414,16 @@
  w.setDisabled(schemeIndex == 0)   self.securebutton.setVisible(schemeIndex == 3)   + opts = [] + for opt, value in self.opts.iteritems(): + if value is True: + opts.append('--'+opt) + elif value: + opts.append('--'+opt+'='+value) + self.optionslabel.setText(' '.join(opts)) + self.optionslabel.setVisible(bool(opts)) + self.optionshdrlabel.setVisible(bool(opts)) +   def currentUrl(self, hidepw):   scheme = _schemes[self.schemecombo.currentIndex()]   if scheme == 'local':