Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.2 and tip

stable sync: ssh user remembered, restore old user switching scheme

Changeset 9c54ac38be56…

Parent fbb36d3fe664…

by Andrea Stagi

Changes to one file · Browse files at 9c54ac38be56 Showing diff from parent fbb36d3fe664 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
79
80
81
 
 
82
83
84
 
195
196
197
198
 
199
200
201
 
300
301
302
 
 
 
303
304
305
 
 
 
 
 
 
 
 
 
 
 
 
 
306
307
308
 
450
451
452
 
453
454
455
 
79
80
81
82
83
84
85
86
 
197
198
199
 
200
201
202
203
 
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
 
468
469
470
471
472
473
474
@@ -79,6 +79,8 @@
  self.repo = repo   self.finishfunc = None   self.curuser = None + self.default_user = None + self.lastsshuser = None   self.curpw = None   self.updateInProgress = False   self.opts = {} @@ -195,7 +197,7 @@
  self.schemecombo = QComboBox()   for s in self._schemes:   self.schemecombo.addItem(s) - self.schemecombo.currentIndexChanged.connect(self.refreshUrl) + self.schemecombo.currentIndexChanged.connect(self.schemeChange)   tbar.addWidget(self.schemecombo)   tbar.addWidget(qtlib.Spacer(2, 2))   @@ -300,9 +302,25 @@
  self.setUrl('')   self.curalias = None   + self.default_user = self.curuser + self.lastsshuser = self.curuser +   def canswitch(self):   return not self.targetcheckbox.isChecked()   + def schemeChange(self): + if not self.default_user: + return + + scheme = self._schemes[self.schemecombo.currentIndex()] + if scheme == 'ssh': + self.default_user = self.curuser + self.curuser = self.lastsshuser + else: + self.curuser = self.default_user + + self.refreshUrl() +   def refreshStatusTips(self):   url = self.currentUrl(True)   urlu = hglib.tounicode(url) @@ -450,6 +468,7 @@
  else:   user, host = host.split('@', 1)   self.curuser = hglib.fromunicode(user) + self.lastsshuser = self.curuser   if self.curuser:   parts.append(self.curuser)   if self.curpw: