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

sync: start an auth dialog

Changeset 68c68e858bd6…

Parent 9208a2a60b5a…

by Steve Borho

Changes to one file · Browse files at 68c68e858bd6 Showing diff from parent 9208a2a60b5a Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
150
151
152
 
153
154
155
156
 
157
158
159
 
193
194
195
 
196
197
198
 
243
244
245
246
 
 
 
 
 
 
247
248
249
 
274
275
276
277
 
278
279
280
 
287
288
289
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
290
291
292
 
150
151
152
153
154
155
156
157
158
159
160
161
 
195
196
197
198
199
200
201
 
246
247
248
 
249
250
251
252
253
254
255
256
257
 
282
283
284
 
285
286
287
288
 
295
296
297
298
299
300
301
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
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
@@ -150,10 +150,12 @@
  if scheme == 'local':   self.hostentry.setEnabled(False)   self.portentry.setEnabled(False) + self.authbutton.setEnabled(False)   self.urlentry.setText(self.pathentry.text())   else:   self.hostentry.setEnabled(True)   self.portentry.setEnabled(True) + self.authbutton.setEnabled(True)   path = self.pathentry.text()   host = self.hostentry.text()   port = self.portentry.text() @@ -193,6 +195,7 @@
  self.curpw = passwd   self.hostentry.setEnabled(scheme != 'local')   self.portentry.setEnabled(scheme != 'local') + self.authbutton.setEnabled(scheme != 'local')   self.updateInProgress = False     def urlparse(self, path): @@ -243,7 +246,12 @@
  self.curalias = unicode(dialog.aliasentry.text())     def authclicked(self): - pass + host = unicode(self.hostentry.text()) + user = self.curuser or '' + pw = self.curpw or '' + dialog = AuthDialog(self.root, host, user, pw, self) + if dialog.exec_() == QDialog.Accepted: + self.curuser, self.curpw = '', ''     def inclicked(self):   pass @@ -274,7 +282,7 @@
  bb = QDialogButtonBox(BB.Save|BB.Cancel)   bb.accepted.connect(self.accept)   bb.rejected.connect(self.reject) - bb.button(BB.Save).setDefault(True) + bb.button(BB.Save).setAutoDefault(True)   self.bb = bb   layout.addWidget(bb)   self.aliasentry.selectAll() @@ -287,6 +295,54 @@
  def reject(self):   super(SaveDialog, self).reject()   +class AuthDialog(QDialog): + def __init__(self, root, host, user, pw, parent): + super(AuthDialog, self).__init__(parent) + self.root = root + layout = QVBoxLayout() + self.setLayout(layout) + hbox = QHBoxLayout() + hbox.addWidget(QLabel(_('Username'))) + self.userentry = QLineEdit(user) + hbox.addWidget(self.userentry, 1) + layout.addLayout(hbox) + hbox = QHBoxLayout() + hbox.addWidget(QLabel(_('Password'))) + self.pwentry = QLineEdit(pw) + self.pwentry.setEchoMode(QLineEdit.Password) + hbox.addWidget(self.pwentry, 1) + layout.addLayout(hbox) + BB = QDialogButtonBox + bb = QDialogButtonBox(BB.Help|BB.Cancel) + bb.rejected.connect(self.reject) + bb.helpRequested.connect(self.keyringHelp) + bb.button(BB.Help).setText(_('Keyring Help')) + sr = QPushButton(_('Save In Repo')) + sr.clicked.connect(self.saveInRepo) + bb.addButton(sr, BB.ActionRole) + sg = QPushButton(_('Save Global')) + sg.clicked.connect(self.saveGlobal) + sg.setAutoDefault(True) + bb.addButton(sg, BB.ActionRole) + + self.bb = bb + layout.addWidget(bb) + self.setWindowTitle(_('Site Authentication: ') + host) + self.userentry.selectAll() + QTimer.singleShot(0, lambda:self.userentry.setFocus()) + + def keyringHelp(self): + pass + + def saveInRepo(self): + super(AuthDialog, self).accept() + + def saveGlobal(self): + super(AuthDialog, self).accept() + + def reject(self): + super(AuthDialog, self).reject() +    class PathsTree(QTreeView):   def __init__(self, root, parent=None):