kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: mercurial: replace identifier to hgrev(identifier).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4667 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-01-09 09:54:30 +00:00
parent ed246cef41
commit 08c093bc85
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/redmine/scm/adapters/mercurial_adapter.rb
View File

@ -22,18 +22,18 @@ module Redmine
module Scm module Scm
module Adapters module Adapters
class MercurialAdapter < AbstractAdapter class MercurialAdapter < AbstractAdapter
# Mercurial executable name # Mercurial executable name
HG_BIN = "hg" HG_BIN = "hg"
TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial" TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial"
TEMPLATE_NAME = "hg-template" TEMPLATE_NAME = "hg-template"
TEMPLATE_EXTENSION = "tmpl" TEMPLATE_EXTENSION = "tmpl"
class << self class << self
def client_version def client_version
@@client_version ||= (hgversion || []) @@client_version ||= (hgversion || [])
end end
def hgversion def hgversion
# The hg version is expressed either as a # The hg version is expressed either as a
# release number (eg 0.9.5 or 1.0) or as a revision # release number (eg 0.9.5 or 1.0) or as a revision
@ -43,15 +43,15 @@ module Redmine
m[2].scan(%r{\d+}).collect(&:to_i) m[2].scan(%r{\d+}).collect(&:to_i)
end end
end end
def hgversion_from_command_line def hgversion_from_command_line
shellout("#{HG_BIN} --version") { |io| io.read }.to_s shellout("#{HG_BIN} --version") { |io| io.read }.to_s
end end
def template_path def template_path
@@template_path ||= template_path_for(client_version) @@template_path ||= template_path_for(client_version)
end end
def template_path_for(version) def template_path_for(version)
if ((version <=> [0,9,5]) > 0) || version.empty? if ((version <=> [0,9,5]) > 0) || version.empty?
ver = "1.0" ver = "1.0"
@ -61,7 +61,7 @@ module Redmine
"#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}" "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
end end
end end
def info def info
cmd = "#{HG_BIN} -R #{target('')} root" cmd = "#{HG_BIN} -R #{target('')} root"
root_url = nil root_url = nil
@ -76,12 +76,12 @@ module Redmine
rescue CommandFailed rescue CommandFailed
return nil return nil
end end
def entries(path=nil, identifier=nil) def entries(path=nil, identifier=nil)
path ||= '' path ||= ''
entries = Entries.new entries = Entries.new
cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate" cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate"
cmd << " -r " + shell_quote(identifier ? identifier.to_s : "tip") cmd << " -r #{hgrev(identifier)}"
cmd << " " + shell_quote("path:#{path}") unless path.empty? cmd << " " + shell_quote("path:#{path}") unless path.empty?
shellout(cmd) do |io| shellout(cmd) do |io|
io.each_line do |line| io.each_line do |line|
@ -101,16 +101,16 @@ module Redmine
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
entries.sort_by_name entries.sort_by_name
end end
# Fetch the revisions by using a template file that # Fetch the revisions by using a template file that
# makes Mercurial produce a xml output. # makes Mercurial produce a xml output.
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}) def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
revisions = Revisions.new revisions = Revisions.new
cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{shell_quote self.class.template_path}" cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{shell_quote self.class.template_path}"
if identifier_from && identifier_to if identifier_from && identifier_to
cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}" cmd << " -r #{hgrev(identifier_from)}:#{hgrev(identifier_to)}"
elsif identifier_from elsif identifier_from
cmd << " -r #{identifier_from.to_i}:" cmd << " -r #{hgrev(identifier_from)}:"
end end
cmd << " --limit #{options[:limit].to_i}" if options[:limit] cmd << " --limit #{options[:limit].to_i}" if options[:limit]
cmd << " #{shell_quote path}" unless path.blank? cmd << " #{shell_quote path}" unless path.blank?
@ -134,7 +134,7 @@ module Redmine
} }
end end
paths.sort! { |x,y| x[:path] <=> y[:path] } paths.sort! { |x,y| x[:path] <=> y[:path] }
revisions << Revision.new({:identifier => logentry.attributes['revision'], revisions << Revision.new({:identifier => logentry.attributes['revision'],
:scmid => logentry.attributes['node'], :scmid => logentry.attributes['node'],
:author => (logentry.elements['author'] ? logentry.elements['author'].text : ""), :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
@ -150,7 +150,7 @@ module Redmine
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
revisions revisions
end end
def diff(path, identifier_from, identifier_to=nil) def diff(path, identifier_from, identifier_to=nil)
path ||= '' path ||= ''
diff_args = '' diff_args = ''
@ -170,10 +170,10 @@ module Redmine
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
diff diff
end end
def cat(path, identifier=nil) def cat(path, identifier=nil)
cmd = "#{HG_BIN} -R #{target('')} cat" cmd = "#{HG_BIN} -R #{target('')} cat"
cmd << " -r " + shell_quote(identifier ? identifier.to_s : "tip") cmd << " -r #{hgrev(identifier)}"
cmd << " #{target(path)}" cmd << " #{target(path)}"
cat = nil cat = nil
shellout(cmd) do |io| shellout(cmd) do |io|