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

clone: clean up differentiation between QStrings and local strings

Changeset 8f0f9fc0b692

Parent 095e404231a5

by Steve Borho

Changes to one file · Browse files at 8f0f9fc0b692 Showing diff from parent 095e404231a5 Diff from another changeset...

 
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
 
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
@@ -194,34 +194,33 @@
    def clone(self):   # prepare user input - src = self.src_combo.currentText().trimmed() - dest = self.dest_combo.currentText().trimmed() + srcQ = self.src_combo.currentText().trimmed() + src = hglib.fromunicode(srcQ) + destQ = self.dest_combo.currentText().trimmed() + dest = hglib.fromunicode(destQ)   if not dest:   dest = os.path.basename(src) + destQ = QString(hglib.tounicode(dest))   - if src: - src = QString(src) + if srcQ:   l = list(self.shist) - if src in l: - l.remove(src) - l.insert(0, src) + if srcQ in l: + l.remove(srcQ) + l.insert(0, srcQ)   self.shist = l[:10] - if dest: - dest = QString(dest) + if destQ:   l = list(self.dhist) - if dest in l: - l.remove(dest) - l.insert(0, dest) + if destQ in l: + l.remove(destQ) + l.insert(0, destQ)   self.dhist = l[:10]   s = QSettings()   s.setValue('clone/source', self.shist)   s.setValue('clone/dest', self.dhist)   - src = hglib.fromunicode(src) - dest = hglib.fromunicode(dest) - remotecmd = hglib.fromunicode(self.remote_text.text()).strip() - rev = hglib.fromunicode(self.rev_text.text()).strip() or None - startrev = hglib.fromunicode(self.startrev_text.text()).strip() + remotecmd = hglib.fromunicode(self.remote_text.text().trimmed()) + rev = hglib.fromunicode(self.rev_text.text().trimmed()) + startrev = hglib.fromunicode(self.startrev_text.text().trimmed())     # verify input   if src == '':