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

sync: fixes for username/pw in urls

Changeset b0c0553dce30…

Parent a7a0bb486180…

by Steve Borho

Changes to one file · Browse files at b0c0553dce30 Showing diff from parent a7a0bb486180 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
97
98
99
100
 
101
102
103
 
173
174
175
176
177
 
178
179
180
 
184
185
186
187
188
189
190
 
194
195
196
197
198
199
200
 
201
202
203
 
403
404
405
406
407
 
 
 
408
409
410
 
433
434
435
 
 
 
436
437
438
 
97
98
99
 
100
101
102
103
 
173
174
175
 
 
176
177
178
179
 
183
184
185
 
186
187
188
 
192
193
194
 
 
 
195
196
197
198
199
 
399
400
401
 
 
402
403
404
405
406
407
 
430
431
432
433
434
435
436
437
438
@@ -97,7 +97,7 @@
  self.closeonesc = False   else:   self.setWindowTitle(_('TortoiseHg Sync')) - self.resize(800, 550) + self.resize(850, 550)   self.closeonesc = True     self.savebutton.clicked.connect(self.saveclicked) @@ -173,8 +173,7 @@
  return ''.join(parts)     def pathSelected(self, index): - pathindex = index.sibling(index.row(), 1) - path = pathindex.data(Qt.DisplayRole).toString() + path = index.model().realUrl(index)   self.setUrl(unicode(path))   aliasindex = index.sibling(index.row(), 0)   alias = aliasindex.data(Qt.DisplayRole).toString() @@ -184,7 +183,6 @@
  'User has selected a new URL'   user, host, port, folder, passwd, scheme = self.urlparse(newurl)   self.updateInProgress = True - self.urlentry.setText(newurl)   for i, val in enumerate(_schemes):   if scheme == val:   self.schemecombo.setCurrentIndex(i) @@ -194,10 +192,8 @@
  self.pathentry.setText(folder or '')   self.curuser = user   self.curpw = passwd - self.hostentry.setEnabled(scheme != 'local') - self.portentry.setEnabled(scheme != 'local') - self.authbutton.setEnabled(scheme != 'local')   self.updateInProgress = False + self.refreshUrl()     def urlparse(self, path):   m = re.match(r'^ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?$', path) @@ -403,8 +399,9 @@
  QAbstractTableModel.__init__(self, parent)   self.headers = (_('Alias'), _('URL'))   self.rows = [] - for alias, url in pathdict.iteritems(): - self.rows.append([alias, url]) + for alias, path in pathdict.iteritems(): + safepath = url.hidepassword(path) + self.rows.append([alias, safepath, path])     def rowCount(self, parent):   if parent.isValid(): @@ -433,6 +430,9 @@
  flags = Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsDragEnabled   return flags   + def realUrl(self, index): + return self.rows[index.row()][2] +    def run(ui, *pats, **opts):   from tortoisehg.util import paths