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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4667 e93f8b46-1217-0410-a6f0-8f06a7374b81

scm: mercurial: replace identifier to hgrev(identifier).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4667 e93f8b46-1217-0410-a6f0-8f06a7374b81
08c093bc · Toshi MARUYAMA · ed246cef · 08c093bc
Commit 08c093bc authored Jan 09, 2011 by Toshi MARUYAMA
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 16 deletions

mercurial_adapter.rb lib/redmine/scm/adapters/mercurial_adapter.rb +16 -16

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