jro_apps/redmine Commit - r1758:d93f96765b6f

Adds support for file viewing with Darcs 2.0+ (patch #1799 by Ralph Lange slightly edited)....

Jean-Philippe Lang -

r1758:d93f96765b6f

parent child

Context file:

r1758:d93f96765b6f

Collapse all files

app/models/repository/darcs.rb +10 0

                  'Darcs'
                end
+               def entry(path=nil, identifier=nil)
+                 patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+                 scm.entry(path, patch.nil? ? nil : patch.scmid)
+               end
                def entries(path=nil, identifier=nil)
                  patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
                  entries = scm.entries(path, patch.nil? ? nil : patch.scmid)
                  entries
                end
+               def cat(path, identifier=nil)
+                 patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+                 scm.cat(path, patch.nil? ? nil : patch.scmid)
+               end
                def diff(path, rev, rev_to)
                  patch_from = changesets.find_by_revision(rev)
                  return nil if patch_from.nil?

doc/RUNNING_TESTS +2 -2

              ---
              gunzip < test/fixtures/repositories/git_repository.tar.gz | tar -xv -C tmp/test
-             Darcs
-             -----
+             Darcs (2.0+ required)
+             ---------------------
              gunzip < test/fixtures/repositories/darcs_repository.tar.gz | tar -xv -C tmp/test
              FileSystem

lib/redmine/scm/adapters/darcs_adapter.rb +36 -3

                      # Darcs executable name
                      DARCS_BIN = "darcs"
+                     class << self
+                       def client_version
+                         @@client_version ||= (darcs_binary_version || [])
+                       end
+                       def darcs_binary_version
+                         cmd = "#{DARCS_BIN} --version"
+                         version = nil
+                         shellout(cmd) do |io|
+                           # Read darcs version in first returned line
+                           if m = io.gets.match(%r{((\d+\.)+\d+)})
+                             version = m[0].scan(%r{\d+}).collect(&:to_i)
+                           end
+                         end
+                         return nil if $? && $?.exitstatus != 0
+                         version
+                       end
+                     end
                      def initialize(url, root_url=nil, login=nil, password=nil)
                        @url = url
                        @root_url = url
                      end
                      def supports_cat?
-                       false
+                       # cat supported in darcs 2.0.0 and higher
+                       self.class.client_version_above?([2, 0, 0])
                      end
-                     # Get info about the svn repository
+                     # Get info about the darcs repository
                      def info
                        rev = revisions(nil,nil,nil,{:limit => 1})
                        rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : nil
                        diff
                      end
+                     def cat(path, identifier=nil)
+                       cmd = "#{DARCS_BIN} show content --repodir #{@url}"
+                       cmd << " --match \"hash #{identifier}\"" if identifier
+                       cmd << " #{shell_quote path}"
+                       cat = nil
+                       shellout(cmd) do |io|
+                         io.binmode
+                         cat = io.read
+                       end
+                       return nil if $? && $?.exitstatus != 0
+                       cat
+                     end
                      private
                      def entry_from_xml(element, path_prefix)

test/unit/repository_darcs_test.rb +7 0

                    @repository.fetch_changesets
                    assert_equal 6, @repository.changesets.count
                  end
+                 def test_cat
+                   @repository.fetch_changesets
+                   cat = @repository.cat("sources/welcome_controller.rb", 2)
+                   assert_not_nil cat
+                   assert cat.include?('class WelcomeController < ApplicationController')
+                 end
                else
                  puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"
                  def test_fake; assert true end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages