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

sync: fix URL drops and catch TypeError from urlparse

Changeset 7410ae2af49a…

Parent deb35629fa8d…

by Steve Borho

Changes to one file · Browse files at 7410ae2af49a Showing diff from parent deb35629fa8d Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
203
204
205
206
 
 
 
 
207
208
209
 
226
227
228
229
230
 
 
231
232
233
234
 
 
235
236
237
 
203
204
205
 
206
207
208
209
210
211
212
 
229
230
231
 
 
232
233
234
235
 
 
236
237
238
239
240
@@ -203,7 +203,10 @@
    def setUrl(self, newurl):   'User has selected a new URL' - user, host, port, folder, passwd, scheme = self.urlparse(newurl) + try: + user, host, port, folder, passwd, scheme = self.urlparse(newurl) + except TypeError: + return   self.updateInProgress = True   for i, val in enumerate(_schemes):   if scheme == val: @@ -226,12 +229,12 @@
  def dropEvent(self, event):   data = event.mimeData()   if data.hasUrls(): - url = hglib.fromunicode(data.urls()[0]) - self.setUrl(url) + url = data.urls()[0] + self.setUrl(hglib.fromunicode(url.toString()))   event.accept()   elif data.hasText(): - text = hglib.fromunicode(data.text()) - self.setUrl(text) + text = data.text() + self.setUrl(hglib.fromunicode(text))   event.accept()     def urlparse(self, path):