rjgit 5.4.0.0 → 5.4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bef2d8553013e27026bee97152a3b9fffc0797dd46383908b11678d430880412
-  data.tar.gz: d53586349ad1b281e17d49b65f8e90597494e2b2909f6666ee5ffc0939bb3ecd
+  metadata.gz: 39f8a936a67ceeab8a72588eb9cbe80b204ff8ecfa2b8b9b62692e87947d33d6
+  data.tar.gz: 621f246226c7347df618fdc412694227f92ac0ac9c4431e292a509ea2f71480f
 SHA512:
-  metadata.gz: cb1194385611d3b20d3a9159c2c1e06d78fa50ed1520d2245493f0c5ac3a9eba9597fdadde33279c1ce11c05eba850a85891601c6ae50b73346e7fa7998da685
-  data.tar.gz: 4ff389fa5a097cd5e02a08259ff8ad5c36aa9f9c615a41bbc6c9dbfe937689c895a76a7354d43095fd1d5ad06d042e03d45d8a2f0acb4316e6763fee3ee4e8de
+  metadata.gz: 2e3136e29b1eaa3fcecc91ef654b73406a4271d5d26b2fed9ad4aa63c0af3e79cfc13f78eb7123524054c9d56d498d59576d9057847b168a4988ee7133a7b361
+  data.tar.gz: 991d9fa265d23da1159cb8137aca135995b04cc56d3060bf0babb136168d00cff827cb73cc18f52c500d411254437603a7067e013e6e7e8287daa0dbfb86f2a4

data/lib/commit.rb

@@ -40,9 +40,11 @@ module RJGit
       df = DiffFormatter.new(DisabledOutputStream::INSTANCE)
       df.set_repository(@jrepo)
       df.set_context(0)
+      df.set_detect_renames(true)
       parent_commit = @jcommit.parent_count > 0 ? @jcommit.get_parents[0] : nil
       entries = df.scan(parent_commit, @jcommit)
-      results = {}
+
+      results = []
       total_del = 0
       total_ins = 0
       entries.each do |entry|
@@ -57,9 +59,19 @@ module RJGit
         end
         total_del += del
         total_ins += ins
-        results[file.getNewPath] = [ins, del, ins + del]
+        results << {
+          :new_file => file.getNewPath,
+          :old_file => file.getOldPath,
+          :new_additions => ins,
+          :new_deletions => del,
+          :changes => ins + del
+        }
       end
-      return total_ins, total_del, results
+      return {
+        :total_additions => total_ins,
+        :total_deletions => total_del,
+        :files => results
+      }
     end
 
     def diff(options = {})
@@ -95,7 +107,7 @@ module RJGit
         walk = RevWalk.new(repository)
         objhead = repository.resolve(Constants::HEAD)
         return Commit.new(repository, walk.parseCommit(objhead))
-      rescue NativeException => e
+      rescue java.lang.NullPointerException => e
         return nil
       end
     end
@@ -110,7 +122,7 @@ module RJGit
         walk.mark_start(root)
         commits = walk.map { |commit| Commit.new(repository, commit) }
         return commits.first(options[:limit])
-      rescue NativeException => e
+      rescue java.lang.NullPointerException => e
         return Array.new
       end
     end

data/lib/git.rb

@@ -267,7 +267,8 @@ module RJGit
 
     def checkout(branch_name = "master", options = {})
       checkout_command = @jgit.checkout.set_name(branch_name)
-      checkout_command.set_start_point(options[:commit])
+      # call :setStartPoint directly to avoid ambiguity warning
+      checkout_command.java_send :setStartPoint, [RevCommit], options[:commit]
       options[:paths].each {|path| checkout_command.add_path(path)} if options[:paths]
       checkout_command.set_create_branch(true) if options[:create]
       checkout_command.set_force(true) if options[:force]
@@ -376,8 +377,8 @@ module RJGit
       fetch_command.set_thin(true) if options[:thin]
       fetch_command.set_check_fetched_objects(true) if options[:check_fetched_objects]
       fetch_command.set_remove_deleted_refs(true) if options[:remove_deleted_refs]
-      fetch_command.set_ref_specs(RefSpec.new(options[:refspecs])) if options[:refspecs]
       fetch_command.set_remote(remote) if remote
+      fetch_command.set_ref_specs(options[:refspecs]) if options[:refspecs]
       self.class.set_command_transport(fetch_command, remote, options)
       fetch_command.call
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RJGit
-  VERSION = "5.4.0.0"
+  VERSION = "5.4.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 5.4.0.0
+  version: 5.4.2.0
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ files:
 - lib/java/jars/bcpkix-jdk15on-161.jar
 - lib/java/jars/bcprov-jdk15on-161.jar
 - lib/java/jars/jsch-0.1.54.jar
-- lib/java/jars/org.eclipse.jgit-5.4.0.201906121030-r.jar
+- lib/java/jars/org.eclipse.jgit-5.4.2.201908231537-r.jar
 - lib/java/jars/slf4j-api-1.7.2.jar
 - lib/java/jars/slf4j-simple-1.7.12.jar
 - lib/repo.rb