rjgit 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c0a3a90f26f105a97cc8c2e8c1635102f5ea47
-  data.tar.gz: 653c8baf0fc37d38abbdd142247419a91e1def7d
+  metadata.gz: c1a2ed014e4552131dfa9a476830910bcb9bbd21
+  data.tar.gz: 8a87b56be6c11c9e0a3b408f38118d2890bc27b3
 SHA512:
-  metadata.gz: 37fcd607f511dfe10409215b850b07c035771a9fa5067a2af45669d0c7e199388c403d954aae10493c116c6150cadf31a9bed0f5dd2c1153f91ca28f5dc649d8
-  data.tar.gz: cb431171a963dd00b98fc25b05890c29db6d2dfd0fed90a06618af8af216826f328ef86c3903e3985a6b1d6500f270afa501293b22b01db56e48c1cecf121707
+  metadata.gz: 6a06ea1e11b4430f5ab2942780fcf2dcb3b049ef7cb35e5e6a521c569bbd0fc3f0d700fd9855c386f8a18f30f543e0f0049110bf4bb427a08aaa843864f9a9c9
+  data.tar.gz: 24d10328ac8a7e7b87edd3ff3ae72362190ca9ed417ae42711c498e848a84f73a9dc9ece84c8c6596e5a0823516f393ddbc6096c1f91ca7f79ba5a3ab974ab37

data/lib/git.rb

@@ -11,6 +11,7 @@ module RJGit
   import 'org.eclipse.jgit.transport.RefSpec'
   import 'org.eclipse.jgit.diff.RenameDetector'
   import 'org.eclipse.jgit.diff.DiffEntry'
+  import 'org.eclipse.jgit.treewalk.filter.PathFilter'
 
   class RubyGit
 
@@ -27,48 +28,58 @@ module RJGit
     end
 
     def log(path = nil, revstring = Constants::HEAD, options = {})
-      logs = @jgit.log
       ref = jrepo.resolve(revstring)
-      logs.add(ref)
-      logs.addPath(path) if path
-      logs.setMaxCount(options[:max_count]) if options[:max_count]
-      logs.setSkip(options[:skip]) if options[:skip]
-      jcommits = logs.call
-      commits = Array.new
-      jcommits.each do |jcommit|
-        commits << Commit.new(jrepo, jcommit)
-      end
+      jcommits = Array.new
       
       if path && options[:follow]
-        jcommits = @jgit.log.add(ref).addPath(path).call
-        commits += follow_renames(jcommits, path)
+        current_path = path    
+        start = nil
+        loop do
+          logs = @jgit.log.add(ref).addPath(current_path).call
+          logs.each do |jcommit|
+            next if jcommits.include?(jcommit)
+            jcommits << jcommit
+            start = jcommit
+          end
+          current_path = follow_renames(start, current_path)
+          break if current_path.nil?
+        end
+        
+      else      
+        logs = @jgit.log
+        logs.add(ref)
+        logs.addPath(path) if path
+        logs.setMaxCount(options[:max_count]) if options[:max_count]
+        logs.setSkip(options[:skip]) if options[:skip]
+        # These options need tests
+        # logs.addRange(options[:since], options[:until]) if (options[:since] && options[:until])
+        # logs.not(options[:not]) if options[:not]
+        jcommits = logs.call
       end
-
-      commits
+      
+      jcommits.map{ |jcommit| Commit.new(jrepo, jcommit) }
     end
 
-    def follow_renames(jcommits, path)
-      renames = Array.new
-      jcommits.each do |jcommit|
-        all_commits = @jgit.log.add(jcommit).call
-        all_commits.each do |jcommit_prev|
-          tree_start = jcommit.getTree
-          tree_prev  = jcommit_prev.getTree
-          treewalk = TreeWalk.new(jrepo)
-          treewalk.addTree(tree_prev)
-          treewalk.addTree(tree_start)
-          treewalk.setRecursive(true)
-          rename_detector = RenameDetector.new(jrepo)
-          rename_detector.addAll(DiffEntry.scan(treewalk))
-          diff_entries = rename_detector.compute
-          diff_entries.each do |entry|
-            if ((entry.getChangeType == DiffEntry::ChangeType::RENAME || entry.getChangeType == DiffEntry::ChangeType::COPY) && entry.getNewPath.match(path))
-              renames << Commit.new(jrepo, jcommit_prev)
-            end
+    def follow_renames(jcommit, path)
+      commits = @jgit.log.add(jcommit).call
+      commits.each do |jcommit_prev|
+        tree_start = jcommit.getTree
+        tree_prev  = jcommit_prev.getTree
+        treewalk = TreeWalk.new(jrepo)
+        #treewalk.setFilter(PathFilter.create(File.dirname(path)))
+        treewalk.addTree(tree_prev)
+        treewalk.addTree(tree_start)
+        treewalk.setRecursive(true)
+        rename_detector = RenameDetector.new(jrepo)
+        rename_detector.addAll(DiffEntry.scan(treewalk))
+        diff_entries = rename_detector.compute
+        diff_entries.each do |entry|
+          if ((entry.getChangeType == DiffEntry::ChangeType::RENAME || entry.getChangeType == DiffEntry::ChangeType::COPY) && entry.getNewPath.match(path))
+            return entry.getOldPath
           end
         end
       end
-      renames
+      return nil
     end
 
 
@@ -251,28 +262,31 @@ module RJGit
       push_command.call
     end
 
-    def push(remote, refs = [], options = {})
-      if(refs.size > 0)
+    def push(remote = nil, refs = [], options = {})
+      push_command = @jgit.push
+      push_command.set_dry_run(true) if options[:dryrun]
+      push_command.set_remote(remote) if remote
+      if(refs.to_a.size > 0)
         refs.map!{|ref| RefSpec.new(ref)}
-        push_command = @jgit.push
-        push_command.set_dry_run(true) if options[:dryrun]
-        push_command.set_remote(remote)
         push_command.set_ref_specs(refs)
-        if options[:username]
-          push_command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
-        end
-        push_command.call
       end
+      if options[:username]
+        push_command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
+      end
+      push_command.call
     end
 
-    def pull(options = {})
-        pull_command = @jgit.pull
-        pull_command.set_dry_run(true) if options[:dryrun]
-        pull_command.set_rebase(options[:rebase]) if options[:rebase]
-        if options[:username]
-          pull_command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
-        end
-        pull_command.call
+    def pull(remote = nil, remote_ref = nil, options = {})
+      pull_command = @jgit.pull
+      pull_command.set_dry_run(true) if options[:dryrun]
+      pull_command.set_rebase(options[:rebase]) if options[:rebase]
+      pull_command.set_remote(remote) if remote
+      pull_command.set_remote_branch_name(remote_ref) if remote_ref
+      if options[:username]
+        pull_command.set_credentials_provider(UsernamePasswordCredentialsProvider.new(options[:username], options[:password]))
+      end
+      pull_command.call
     end
+
   end
 end

data/lib/rjgit.rb

@@ -334,7 +334,6 @@ module RJGit
         
         @treebuilder.object_inserter.release
         @current_tree = new_tree
-        @treemap = {}
         log = @treebuilder.log
         @treebuilder.init_log
         sha =  ObjectId.to_string(new_head)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RJGit
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: JRuby wrapper around the JGit library.