gollum-rjgit_adapter 0.6.1-java → 1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac50e5f74344c41b8825a441c882de7b4ae8b1659dfcf87005d7fe5a6379a078
-  data.tar.gz: 6b9f7fe732d3cfa7a3043c3371905426bbdb33843238c876cf83bc09b7a2a148
+  metadata.gz: 6bdbce54e2c9a4776e5f86ca0a2b549d35e3be6d816afb83e3ac028af24b9756
+  data.tar.gz: 5373306b3d9279ab924eede20362ea9ee9aea96f875a1b17f0bbc31d9cd936f4
 SHA512:
-  metadata.gz: 6971e4b7bd7e5c26d2b0e0a7cd0dcd52e759fd01c6378112478e8874d7af295be3f84d928d2c9a5f91337d7ab5ba68037e380379420bc64407e238f6423ffc3b
-  data.tar.gz: 3524aff2bd136eda0eb80d12ad833b845095cb570faf2d5f2cc3250041e57744888c6934f9a12653ffca9f6c12457e212673c5bd4cd6d191825649c341511c49
+  metadata.gz: 7467a015e62e23f710f0fe8e9e6e0a2a9e9216966cb9a57d2883d95ee000ae35087932624495e6a76569a849981f3523d62d4f4ae13776a5564b467f652f1216
+  data.tar.gz: 4f0b0910be9ecf5767a65a99f730c609062b8bedda96759c7dc27d80f8c07035aa143e26938544feb5404c808927af1e101fc02fab27554fae77223354ba6ba3

data/gollum-rjgit_adapter.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Adapter for Gollum to use RJGit at the backend.}
   s.description = %q{Adapter for Gollum to use RJGit at the backend.}
 
-  s.add_runtime_dependency "rjgit", "> 5.7.0", "~> 5.7.0"
+  s.add_runtime_dependency "rjgit", "~> 6.1"
   s.add_development_dependency "rspec", "3.4.0"
 
   s.files         = Dir['lib/**/*.rb'] + ["README.md", "Gemfile"]

data/lib/rjgit_adapter/git_layer_rjgit.rb

@@ -15,15 +15,40 @@ module Gollum
 
     import 'org.eclipse.jgit.revwalk.RevWalk'
     import 'org.eclipse.jgit.lib.ObjectId'
+    import org.eclipse.jgit.lib.ConfigConstants
 
-    # Convert refspec to jgit canonical form
+    BACKUP_DEFAULT_REF = 'refs/heads/master'
+
+    def self.head_ref_name(repo)
+      r = RJGit.repository_type(repo)
+      begin
+        # Mimic rugged's behavior: if HEAD points at a given ref, but that ref has no commits yet, return nil
+        r.resolve('HEAD') ? r.getFullBranch : nil
+      rescue Java::OrgEclipseJgitApiErrors::RefNotFoundException
+        nil
+      end
+    end
+
+    def self.global_default_branch
+      org.eclipse.jgit.util.SystemReader.getInstance().getUserConfig().getString(ConfigConstants::CONFIG_INIT_SECTION, nil, ConfigConstants::CONFIG_KEY_DEFAULT_BRANCH)
+    end
+
+    def self.default_ref_for_repo(repo)
+      self.head_ref_name(repo) || self.global_default_branch || BACKUP_DEFAULT_REF
+    end
+
+    # Don't touch if ref is a SHA or Git::Ref, otherwise convert it to jgit canonical form
     def self.canonicalize(ref)
-      return ref if sha?(ref)
-      return 'refs/heads/master' if ref.nil?
+      return ref if ref.is_a?(String) and sha?(ref)
       result = ref.is_a?(Gollum::Git::Ref) ? ref.name : ref
       (result =~ /^refs\/heads\// || result.upcase == 'HEAD') ? result : "refs/heads/#{result}"
     end
 
+    def self.decanonicalize(ref_name)
+      match = /^refs\/heads\/(.*)/.match(ref_name)
+      match ? match[1] : nil
+    end
+
     def self.sha?(str)
       !!(str =~ /^[0-9a-f]{40}$/)
     end
@@ -176,7 +201,7 @@ module Gollum
       end
       
       def grep(query, options={}, &block)
-        ref = Gollum::Git.canonicalize(options[:ref])
+        ref = options[:ref] ?  Gollum::Git.canonicalize(options[:ref]) : Gollum::Git.default_ref_for_repo(@git.jrepo)
         results = []
         walk = RevWalk.new(@git.jrepo)
         RJGit::Porcelain.ls_tree(@git.jrepo, options[:path], ref, {:recursive => true}).each do |item|
@@ -193,10 +218,13 @@ module Gollum
       end
       
       def checkout(path, ref, options = {})
-        ref = Gollum::Git.canonicalize(ref)
+        options[:commit] = if ref == 'HEAD'
+          "#{Gollum::Git.default_ref_for_repo(@git.jrepo)}"
+        else
+          "#{Gollum::Git.canonicalize(ref)}}"
+        end
         options[:paths] = [path]
         options[:force] = true
-        options[:commit] = "#{ref}^{commit}"
         @git.checkout(ref, options)
       end
       
@@ -213,16 +241,16 @@ module Gollum
         end
       end
       
-      def revert_path(path, sha1, sha2, ref = 'HEAD^{commit}')
+      def revert_path(path, sha1, sha2, ref = Gollum::Git.default_ref_for_repo(@git.jrepo))
         result, _paths = revert(path, sha1, sha2, ref)
         result
       end
       
-      def revert_commit(sha1, sha2, ref = 'HEAD^{commit}')
+      def revert_commit(sha1, sha2, ref = Gollum::Git.default_ref_for_repo(@git.jrepo))
         revert(nil, sha1, sha2, ref)
       end
       
-      def revert(path, sha1, sha2, ref)
+      def revert(path, sha1, sha2, ref = Gollum::Git.default_ref_for_repo(@git.jrepo))
         patch = generate_patch(sha1, sha2, path)
         return false unless patch
         begin
@@ -238,10 +266,9 @@ module Gollum
         @git.cat_file(options, sha)
       end
       
-      def log(ref = 'refs/heads/master', path = nil, options = {})
-        ref = Gollum::Git.canonicalize(ref)
+      def log(ref = Gollum::Git.default_ref_for_repo(@git.jrepo), path = nil, options = {})
         options[:list_renames] = true if path && options[:follow]
-        @git.log(path, ref, options).map {|commit| Gollum::Git::Commit.new(commit)}
+        @git.log(path, Gollum::Git.canonicalize(ref), options).map {|commit| Gollum::Git::Commit.new(commit)}
       end
       
       def versions_for_path(path, ref, options)
@@ -283,11 +310,10 @@ module Gollum
         @index.add(path, data)
       end
       
-      def commit(message, parents = nil, actor = nil, last_tree = nil, ref = 'refs/heads/master')
-        ref = Gollum::Git.canonicalize(ref)
+      def commit(message, parents = nil, actor = nil, last_tree = nil, ref = Gollum::Git.default_ref_for_repo(@index.jrepo))
         actor = actor ? actor.actor : RJGit::Actor.new('Gollum', 'gollum@wiki')
         parents = parents.map{|parent| parent.commit} if parents
-        commit_data = @index.commit(message, actor, parents, ref)
+        commit_data = @index.commit(message, actor, parents, Gollum::Git.canonicalize(ref))
         return false if !commit_data
         commit_data[2]
       end
@@ -313,8 +339,8 @@ module Gollum
     end
     
     class Ref
-      def initialize(name, commit)
-        @name, @commit = name, commit
+      def initialize(commit, name)
+        @commit, @name = commit, name
       end
       
       def name
@@ -367,8 +393,7 @@ module Gollum
       end
       
       def commit(ref)
-        ref = Gollum::Git.canonicalize(ref)
-        objectid = @repo.jrepo.resolve(ref)
+        objectid = @repo.jrepo.resolve(Gollum::Git.canonicalize(ref))
         return nil if objectid.nil?
         id = objectid.name
         commit = @repo.find(id, :commit)
@@ -378,8 +403,7 @@ module Gollum
           raise Gollum::Git::NoSuchShaFound
       end
       
-      def commits(ref = nil, max_count = 10, skip = 0)
-        ref = Gollum::Git.canonicalize(ref)
+      def commits(ref = Gollum::Git.default_ref_for_repo(@repo), max_count = 10, skip = 0)
         @repo.commits(ref, max_count).map{|commit| Gollum::Git::Commit.new(commit)}
       end
       
@@ -391,16 +415,15 @@ module Gollum
       # @wiki.repo.head.commit.sha
       def head
         return nil unless @repo.head
-        Gollum::Git::Ref.new('refs/heads/master', @repo.head)
+        Gollum::Git::Ref.new(@repo.head, Gollum::Git.head_ref_name(@repo))
       end
       
       def index
         @index ||= Gollum::Git::Index.new(RJGit::Plumbing::Index.new(@repo))
       end
       
-      def log(ref = 'refs/heads/master', path = nil, options = {})
-        commit = Gollum::Git.canonicalize(commit)
-        git.log(ref, path, options)
+      def log(ref = Gollum::Git.default_ref_for_repo(@repo), path = nil, options = {})
+        git.log(Gollum::Git.canonicalize(ref), path, options)
       end
       
       def lstree(sha, options={})
@@ -416,16 +439,24 @@ module Gollum
         @repo.path
       end
       
-      def update_ref(ref = 'refs/heads/master', commit_sha)
-        ref = Gollum::Git.canonicalize(head)
+      def update_ref(ref, commit_sha)
         cm = self.commit(commit_sha)
-        @repo.update_ref(cm.commit, true, ref)
+        @repo.update_ref(cm.commit, true, Gollum::Git.canonicalize(ref))
       end
 
       def diff(sha1, sha2, path = nil)
         RJGit::Porcelain.diff(@repo, {:old_rev => sha1, :new_rev => sha2, :file_path => path, :patch => true}).inject("") {|result, diff| result << diff[:patch]}
       end
-     
+
+      # Find the first existing branch in an Array of branch names of the form ['main', ...] and return its String name.
+      def find_branch(search_list)
+        search_list.find do |branch_name|
+          @repo.branches.find do |canonical_name|
+            Gollum::Git.decanonicalize(canonical_name) == branch_name
+          end
+        end
+      end
+
     end
 
     class Tree

data/lib/rjgit_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-    VERSION = '0.6.1'
+    VERSION = '1.0'
     end
   end
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rjgit_adapter
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: '1.0'
 platform: java
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 5.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: '6.1'
   name: rjgit
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 5.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -37,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -77,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Adapter for Gollum to use RJGit at the backend.