fixed errors, typos & deprecated calls

JuliaLang · May 11, 2016 · 51ab38c · 51ab38c
1 parent e3e3882
commit 51ab38c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/base/libgit2/callbacks.jl b/base/libgit2/callbacks.jl
@@ -62,17 +62,17 @@ function credentials_callback(cred::Ptr{Ptr{Void}}, url_ptr::Cstring,
     if isset(allowed_types, Cuint(Consts.CREDTYPE_SSH_KEY))
         credid = "ssh://$host"
         # first try ssh-agent if credentials support its usage
-        if (isdefined(creds, :use_ssh_agent) ? getfield(creds, :use_ssh_agent) : 0xFF) == 0x00
+        if isdefined(creds, :use_ssh_agent) && getfield(creds, :use_ssh_agent) == 0x00
             err = ccall((:git_cred_ssh_key_from_agent, :libgit2), Cint,
                          (Ptr{Ptr{Void}}, Cstring), cred, username_ptr)
-            setfield!(creds, :use_ssh_agent, 0x01) # used ssh-agent ones
+            setfield!(creds, :use_ssh_agent, 0x01) # used ssh-agent only one time
             err == 0 && return Cint(0)
         end
 
         errcls, errmsg = Error.last_error()
         if errcls != Error.None
             # Check if we used ssh-agent
-            if (isdefined(creds, :use_ssh_agent) ? getfield(creds, :use_ssh_agent) : 0xFF) == 0x01
+            if isdefined(creds, :use_ssh_agent) && getfield(creds, :use_ssh_agent) == 0x01
                 println("ERROR: $errmsg ssh-agent")
                 setfield!(creds, :use_ssh_agent, 0x02) # reported ssh-agent error
             else
@@ -83,7 +83,7 @@ function credentials_callback(cred::Ptr{Ptr{Void}}, url_ptr::Cstring,
         # if username is not provided, then prompt for it
         username = if username_ptr == Cstring(C_NULL)
             uname = creds[:user, credid] # check if credentials were already used
-            uname !== nothing && !isusedcreds ? uname : prompt("Username for `$schema$host'")
+            uname !== nothing && !isusedcreds ? uname : prompt("Username for '$schema$host'")
         else
             bytestring(username_ptr)
         end
@@ -98,7 +98,7 @@ function credentials_callback(cred::Ptr{Ptr{Void}}, url_ptr::Cstring,
                 keydef # use cached value
             else
                 keydef = homedir()*"/.ssh/id_rsa.pub"
-                prompt("Public key location for `$schema$username@$host'", default=keydef)
+                prompt("Public key location for '$schema$username@$host'", default=keydef)
             end
         end
         creds[:pubkey, credid] = publickey # save credentials
@@ -111,7 +111,7 @@ function credentials_callback(cred::Ptr{Ptr{Void}}, url_ptr::Cstring,
                 keydef # use cached value
             else
                 keydef = homedir()*"/.ssh/id_rsa"
-                prompt("Private key location for `$schema$username@$host'", default=keydef)
+                prompt("Private key location for '$schema$username@$host'", default=keydef)
             end
         end
         creds[:prvkey, credid] = privatekey # save credentials

diff --git a/base/libgit2/types.jl b/base/libgit2/types.jl
@@ -58,15 +58,15 @@ abstract AbstractCredentials <: AbstractPayload
 "Returns a credentials parameter"
 function Base.getindex(p::AbstractCredentials, keys...)
     for k in keys
-        ks = symbol(k)
+        ks = Symbol(k)
         isdefined(p, ks) && return getfield(p, ks)
     end
     return nothing
 end
 "Sets credentials with `key` parameter with value"
 function Base.setindex!(p::AbstractCredentials, val, keys...)
     for k in keys
-        ks = symbol(k)
+        ks = Symbol(k)
         isdefined(p, ks) && setfield!(p, ks, val)
     end
     return nothing

diff --git a/base/libgit2/utils.jl b/base/libgit2/utils.jl
@@ -42,7 +42,8 @@ toggle(val::Integer, flag::Integer) = (val |= flag)
     return ""
 end
 
-@unix_only getpass(prompt::AbstractString) = bytestring(pointer_to_string(ccall(:getpass, Cstring, (Cstring,), prompt), true))
+@unix_only getpass(prompt::AbstractString) =
+    bytestring(pointer_to_string(ccall(:getpass, Cstring, (Cstring,), prompt), true))
 
 function prompt(msg::AbstractString; default::AbstractString="", password::Bool=false)
     msg = !isempty(default) ? msg*" [$default]:" : msg*":"

diff --git a/test/libgit2.jl b/test/libgit2.jl
@@ -438,21 +438,21 @@ mktempdir() do dir
 
     #@testset "Credentials" begin
         creds = LibGit2.EmptyCredentials()
-        @test isused(creds)
-        @test reset!(creds) === nothing
+        @test LibGit2.isused(creds)
+        @test LibGit2.reset!(creds) === nothing
         @test creds[:user] === nothing
         @test creds[:pass] === nothing
         @test creds[:pubkey, "localhost"] === nothing
 
         creds_user = "USER"
         creds_pass = "PASS"
         creds = LibGit2.UserPasswordCredentials(creds_user, creds_pass)
-        @test !isused(creds)
-        @test !isused(creds)
-        @test !isused(creds)
-        @test isused(creds)
-        @test reset!(creds) == 3
-        @test !isused(creds)
+        @test !LibGit2.isused(creds)
+        @test !LibGit2.isused(creds)
+        @test !LibGit2.isused(creds)
+        @test LibGit2.isused(creds)
+        @test LibGit2.reset!(creds) == 3
+        @test !LibGit2.isused(creds)
         @test creds.count == 2
         @test creds[:user] == creds_user
         @test creds[:pass] == creds_pass
@@ -461,12 +461,12 @@ mktempdir() do dir
         @test creds[:pubkey, "localhost"] === nothing
 
         creds = LibGit2.CachedCredentials()
-        @test !isused(creds)
-        @test !isused(creds)
-        @test !isused(creds)
-        @test isused(creds)
-        @test reset!(creds) == 3
-        @test !isused(creds)
+        @test !LibGit2.isused(creds)
+        @test !LibGit2.isused(creds)
+        @test !LibGit2.isused(creds)
+        @test LibGit2.isused(creds)
+        @test LibGit2.reset!(creds) == 3
+        @test !LibGit2.isused(creds)
         @test creds.count == 2
         @test creds[:user, "localhost"] === nothing
         @test creds[:pass, "localhost"] === nothing