Version control: Don't print password prompts twice, and allow commit user & password to be remembered.
[DEVELOPMENT ENVIRONMENT] * BUG: Version control: Don't print password prompts twice. * NEW: Version control: Allow commit user & password to be remembered.
This commit is contained in:
parent
3889bd606c
commit
7378a6c102
1 changed files with 4 additions and 3 deletions
|
@ -144,20 +144,20 @@ Public Sub Process_Read()
|
||||||
If $bIdent Then
|
If $bIdent Then
|
||||||
If Right(RTrim(sLine)) = ":" Then
|
If Right(RTrim(sLine)) = ":" Then
|
||||||
If InStr(sLine, "username", 1, gb.IgnoreCase) Then
|
If InStr(sLine, "username", 1, gb.IgnoreCase) Then
|
||||||
If $bOutput Then Insert(sLine)
|
'If $bOutput Then Insert(sLine)
|
||||||
If Not $bAuth Then GetAuthentication()
|
If Not $bAuth Then GetAuthentication()
|
||||||
If Not $sUser Then Goto CANCEL
|
If Not $sUser Then Goto CANCEL
|
||||||
Print #Last, $sUser
|
Print #Last, $sUser
|
||||||
Insert(User & "\n")
|
Insert(User & "\n")
|
||||||
$sOutput = ""
|
$sOutput = ""
|
||||||
Else If InStr(sLine, "password", 1, gb.IgnoreCase) Then
|
Else If InStr(sLine, "password", 1, gb.IgnoreCase) Then
|
||||||
If $bOutput Then Insert(sLine)
|
'If $bOutput Then Insert(sLine)
|
||||||
If Not $bAuth Then GetAuthentication()
|
If Not $bAuth Then GetAuthentication()
|
||||||
Print #Last, $sPassword
|
Print #Last, $sPassword
|
||||||
Insert("********" & "\n")
|
Insert("********" & "\n")
|
||||||
$sOutput = ""
|
$sOutput = ""
|
||||||
Else If InStr(sLine, "passphrase", 1, gb.IgnoreCase) Then
|
Else If InStr(sLine, "passphrase", 1, gb.IgnoreCase) Then
|
||||||
If $bOutput Then Insert(sLine)
|
'If $bOutput Then Insert(sLine)
|
||||||
If Not $bAuth Then GetAuthentication(True)
|
If Not $bAuth Then GetAuthentication(True)
|
||||||
Print #Last, $sPassword
|
Print #Last, $sPassword
|
||||||
Insert("********" & "\n")
|
Insert("********" & "\n")
|
||||||
|
@ -458,6 +458,7 @@ End
|
||||||
Private Sub GetAuthentication(Optional bNoUser As Boolean)
|
Private Sub GetAuthentication(Optional bNoUser As Boolean)
|
||||||
|
|
||||||
Dialog.NoUser = bNoUser
|
Dialog.NoUser = bNoUser
|
||||||
|
Dialog.Key = Project.Name &/ "VersionControl"
|
||||||
If Dialog.AskPassword() Then Return
|
If Dialog.AskPassword() Then Return
|
||||||
$sUser = Dialog.User
|
$sUser = Dialog.User
|
||||||
$sPassword = Dialog.Password
|
$sPassword = Dialog.Password
|
||||||
|
|
Loading…
Reference in a new issue