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

sync: convert QtStrings to local encoding when generating paths

Changeset b0fe7677da82…

Parent 256703cab3fb…

by Steve Borho

Changes to one file · Browse files at b0fe7677da82 Showing diff from parent 256703cab3fb Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
171
172
173
174
 
175
176
177
 
182
183
184
185
 
186
187
188
 
 
189
190
191
192
193
 
194
195
196
 
197
198
199
 
249
250
251
252
 
253
254
255
 
256
257
258
259
 
260
261
262
 
171
172
173
 
174
175
176
177
 
182
183
184
 
185
186
 
 
187
188
189
190
191
192
 
193
194
195
 
196
197
198
199
 
249
250
251
 
252
253
254
 
255
256
257
258
 
259
260
261
262
@@ -171,7 +171,7 @@
  def currentUrl(self, hidepw):   scheme = _schemes[self.schemecombo.currentIndex()]   if scheme == 'local': - return unicode(self.pathentry.text()) + return hglib.fromunicode(self.pathentry.text())   else:   path = self.pathentry.text()   host = self.hostentry.text() @@ -182,18 +182,18 @@
  if self.curpw:   parts.append(hidepw and ':***' or self.curpw)   parts.append('@') - parts.append(unicode(host)) + parts.append(hglib.fromunicode(host))   if port: - parts.extend([':', unicode(port)]) - parts.extend(['/', unicode(path)]) + parts.extend([':', hglib.fromunicode(port)]) + parts.extend(['/', hglib.fromunicode(path)])   return ''.join(parts)     def pathSelected(self, index):   path = index.model().realUrl(index) - self.setUrl(unicode(path)) + self.setUrl(hglib.fromunicode(path))   aliasindex = index.sibling(index.row(), 0)   alias = aliasindex.data(Qt.DisplayRole).toString() - self.curalias = unicode(alias) + self.curalias = hglib.fromunicode(alias)     def setUrl(self, newurl):   'User has selected a new URL' @@ -249,14 +249,14 @@
  alias = 'default'   else:   alias = 'new' - url = unicode(self.urlentry.text()) + url = hglib.fromunicode(self.urlentry.text())   dialog = SaveDialog(self.root, alias, url, self)   if dialog.exec_() == QDialog.Accepted: - self.curalias = unicode(dialog.aliasentry.text()) + self.curalias = hglib.fromunicode(dialog.aliasentry.text())   self.refresh()     def authclicked(self): - host = unicode(self.hostentry.text()) + host = hglib.fromunicode(self.hostentry.text())   user = self.curuser or ''   pw = self.curpw or ''   dialog = AuthDialog(self.root, host, user, pw, self)