Fixed diff function. Moved from GitCommand to Git.

Author: mkschleg

Project.toml

@@ -1,7 +1,7 @@
 name = "Reproduce"
 uuid = "560a9c3a-0b8c-11e9-0329-d39dfcb85ed2"
 authors = ["Matt <[email protected]>"]
-version = "0.8.2"
+version = "0.8.3"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
@@ -10,7 +10,7 @@ CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-GitCommand = "49b5b516-ca3f-4003-a081-42bdcf55082d"
+Git = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
@@ -27,7 +27,7 @@ ArgParse = "0.6, 1"
 BSON = "0.2, 0.3"
 CodeTracking = "0.5, 1"
 FileIO = "1"
-GitCommand = "2, 3"
+Git = "1"
 HDF5 = "0.12, 0.13, 0.14, 0.15"
 JLD2 = "0.1, 0.2, 0.3, 0.4"
 JSON = "0.20, 0.21"

src/Reproduce.jl

@@ -1,21 +1,15 @@
 
 module Reproduce
 
-import GitCommand
+import Git
 
 function git_head()
-    s = ""
-    GitCommand.git() do git
-        s = read(`$git rev-parse HEAD`, String)
-    end
+    s = read(`$(Git.git()) rev-parse HEAD`, String)
     s[1:end-1]
 end
 
 function git_branch()
-    s = ""
-    GitCommand.git() do git
-        s = read(`$git rev-parse --symbolic-full-name --abbrev-ref HEAD`, String)
-    end
+    s = read(`$(Git.git()) rev-parse --symbolic-full-name --abbrev-ref HEAD`, String)
     s[1:end-1]
 end
 

src/search.jl

@@ -179,25 +179,27 @@ function Base.diff(items::Array{Item, 1};
     kt = keytype(items[1].parsed_args)
     exclude_keys = kt.(exclude_keys)
     if exclude_parse_values == true
-        exclude_keys = [exclude_keys; kt.([HASH_KEY, SAVE_NAME_KEY, GIT_INFO_KEY])]
+        exclude_keys = [exclude_keys; kt.([Reproduce.HASH_KEY, Reproduce.SAVE_NAME_KEY, Reproduce.GIT_INFO_KEY])]
     end
     diff_parsed = Dict{kt, Array}()
     for item in items
         tmp_dict = items[1] - item
         for key in filter((k)->k ∉ exclude_keys, keys(tmp_dict))
             if key ∉ keys(diff_parsed)
-                diff_parsed[key] = Array{Any, 1}()
+		diff_parsed[key] = Array{Any, 1}()
             end
+			
             if tmp_dict[key][1] ∉ diff_parsed[key]
                 push!(diff_parsed[key], tmp_dict[key][1])
+				new_type = typeof(tmp_dict[key])
             end
             if tmp_dict[key][2] ∉ diff_parsed[key]
                 push!(diff_parsed[key], tmp_dict[key][2])
             end
         end
     end
     for key in keys(diff_parsed)
-        diff_parsed[key] = collect(promote(diff_parsed[key]...))
+	diff_parsed[key] = collect(promote(diff_parsed[key]...))
         sort!(diff_parsed[key])
     end
     return diff_parsed