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

sync: simplify details dialog

Changeset 7e5d2e2b8591…

Parent 140430eb298d…

by Steve Borho

Changes to one file · Browse files at 7e5d2e2b8591 Showing diff from parent 140430eb298d Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
655
656
657
658
 
659
660
661
 
1005
1006
1007
1008
 
 
1009
1010
1011
1012
 
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
 
1023
1024
 
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
 
1035
1036
 
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
 
1047
1048
1049
 
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
 
 
 
1066
1067
1068
 
655
656
657
 
658
659
660
661
 
1005
1006
1007
 
1008
1009
1010
1011
1012
 
1013
1014
 
 
1015
 
1016
 
 
 
 
1017
1018
 
1019
1020
 
 
1021
 
1022
 
 
 
 
1023
1024
 
1025
1026
 
 
1027
 
1028
 
 
 
 
1029
1030
1031
1032
 
1039
1040
1041
 
 
 
 
 
 
 
1042
1043
1044
1045
1046
1047
@@ -655,7 +655,7 @@
  layout.addWidget(cfglabel)     BB = QDialogButtonBox - bb = QDialogButtonBox(BB.Ok|BB.Cancel) + bb = QDialogButtonBox(BB.Save|BB.Cancel)   bb.accepted.connect(self.accept)   bb.rejected.connect(self.reject)   @@ -1005,45 +1005,28 @@
  self.newbranchcb = QCheckBox(_('Allow push of a new branch'))   self.newbranchcb.setChecked(opts.get('new-branch', False))   layout.addRow(self.newbranchcb, None) - self.forcecb = QCheckBox(_('Force pull or push (override checks)')) + self.forcecb = QCheckBox(_('Force push or pull (override safety' + ' checks)'))   self.forcecb.setChecked(opts.get('force', False))   layout.addRow(self.forcecb, None)   - self.branchcb = QCheckBox(_('Specify branch for push/pull:')) + lbl = QLabel(_('Specify branch for push/pull:'))   self.branchle = QLineEdit() - self.branchle.setEnabled(False) - self.branchcb.toggled.connect(self.branchle.setEnabled)   if opts.get('branch'): - self.branchcb.setChecked(True)   self.branchle.setText(hglib.tounicode(opts['branch'])) - else: - self.branchcb.setChecked(False) - self.branchcb.clicked.emit(True) - layout.addRow(self.branchcb, self.branchle) + layout.addRow(lbl, self.branchle)   - self.revcb = QCheckBox(_('Specify revision for push/pull:')) + lbl = QLabel(_('Specify revision for push/pull:'))   self.revle = QLineEdit() - self.revle.setEnabled(False) - self.revcb.toggled.connect(self.revle.setEnabled)   if opts.get('rev'): - self.revcb.setChecked(True)   self.revle.setText(hglib.tounicode(opts['rev'])) - else: - self.revcb.setChecked(False) - self.revcb.clicked.emit(True) - layout.addRow(self.revcb, self.revle) + layout.addRow(lbl, self.revle)   - self.remotecb = QCheckBox(_('Remote command:')) + lbl = QLabel(_('Remote command:'))   self.remotele = QLineEdit() - self.remotele.setEnabled(False) - self.remotecb.toggled.connect(self.remotele.setEnabled)   if opts.get('remotecmd'): - self.remotecb.setChecked(True)   self.remotele.setText(hglib.tounicode(opts['remotecmd'])) - else: - self.remotecb.setChecked(False) - self.remotecb.clicked.emit(True) - layout.addRow(self.remotecb, self.remotele) + layout.addRow(lbl, self.remotele)     BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Ok|BB.Cancel) @@ -1056,13 +1039,9 @@
    def accept(self):   outopts = {} - for name, cb, le in (('branch', self.branchcb, self.branchle), - ('rev', self.revcb, self.revle), - ('remotecmd', self.remotecb, self.remotele)): - if cb.isChecked(): - outopts[name] = hglib.fromunicode(le.text()) - else: - outopts[name] = '' + for name, le in (('branch', self.branchle), ('rev', self.revle), + ('remotecmd', self.remotele)): + outopts[name] = hglib.fromunicode(le.text()).strip()     if outopts.get('branch') and outopts.get('rev'):   qtlib.WarningMsgBox(_('Configuration Error'),