diff app/models/repository/mercurial.rb @ 514:7eba09d624db live

Merge

--- a/app/models/repository/mercurial.rb	Thu Jul 14 10:46:20 2011 +0100
+++ b/app/models/repository/mercurial.rb	Thu Jul 14 10:50:53 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -18,53 +18,104 @@
 require 'redmine/scm/adapters/mercurial_adapter'
 
 class Repository::Mercurial < Repository
+  # sort changesets by revision number
+  has_many :changesets, :order => "#{Changeset.table_name}.id DESC", :foreign_key => 'repository_id'
+
   attr_protected :root_url
   # validates_presence_of :url
 
   FETCH_AT_ONCE = 100  # number of changesets to fetch at once
 
-  def scm_adapter
+  def self.human_attribute_name(attribute_key_name)
+    attr_name = attribute_key_name
+    if attr_name == "url"
+      attr_name = "path_to_repository"
+    end
+    super(attr_name)
+  end
+
+  def self.scm_adapter_class
     Redmine::Scm::Adapters::MercurialAdapter
   end
-  
+
   def self.scm_name
     'Mercurial'
   end
-  
-  def entries(path=nil, identifier=nil)
-    scm.entries(path, identifier)
+
+  def supports_directory_revisions?
+    true
   end
 
-  def branches
-    bras = scm.branches
-    bras.sort unless bras == %w|default|
+  def repo_log_encoding
+    'UTF-8'
   end
 
-  # Returns the latest changesets for +path+
+  # Returns the readable identifier for the given mercurial changeset
+  def self.format_changeset_identifier(changeset)
+    "#{changeset.revision}:#{changeset.scmid}"
+  end
+
+  # Returns the identifier for the given Mercurial changeset
+  def self.changeset_identifier(changeset)
+    changeset.scmid
+  end
+
+  def diff_format_revisions(cs, cs_to, sep=':')
+    super(cs, cs_to, ' ')
+  end
+
+  # Finds and returns a revision with a number or the beginning of a hash
+  def find_changeset_by_name(name)
+    return nil if name.nil? || name.empty?
+    if /[^\d]/ =~ name or name.to_s.size > 8
+      e = changesets.find(:first, :conditions => ['scmid = ?', name.to_s])
+    else
+      e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])
+    end
+    return e if e
+    changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])  # last ditch
+  end
+
+  # Returns the latest changesets for +path+; sorted by revision number
+  #
+  # Because :order => 'id DESC' is defined at 'has_many',
+  # there is no need to set 'order'.
+  # But, MySQL test fails.
+  # Sqlite3 and PostgreSQL pass.
+  # Is this MySQL bug?
   def latest_changesets(path, rev, limit=10)
     changesets.find(:all, :include => :user,
                     :conditions => latest_changesets_cond(path, rev, limit),
-                    :limit => limit)
+                    :limit => limit, :order => "#{Changeset.table_name}.id DESC")
   end
 
   def latest_changesets_cond(path, rev, limit)
     cond, args = [], []
-
     if scm.branchmap.member? rev
-      # dirty hack to filter by branch. branch name should be in database.
+      # Mercurial named branch is *stable* in each revision.
+      # So, named branch can be stored in database.
+      # Mercurial provides *bookmark* which is equivalent with git branch.
+      # But, bookmark is not implemented.
       cond << "#{Changeset.table_name}.scmid IN (?)"
-      args << scm.nodes_in_branch(rev, path, rev, 0, :limit => limit)
+      # Revisions in root directory and sub directory are not equal.
+      # So, in order to get correct limit, we need to get all revisions.
+      # But, it is very heavy.
+      # Mercurial does not treat direcotry.
+      # So, "hg log DIR" is very heavy.
+      branch_limit = path.blank? ? limit : ( limit * 5 )
+      args << scm.nodes_in_branch(rev, :limit => branch_limit)
     elsif last = rev ? find_changeset_by_name(scm.tagmap[rev] || rev) : nil
       cond << "#{Changeset.table_name}.id <= ?"
       args << last.id
     end
 
     unless path.blank?
-      # TODO: there must be a better way to build sub-query
       cond << "EXISTS (SELECT * FROM #{Change.table_name}
                  WHERE #{Change.table_name}.changeset_id = #{Changeset.table_name}.id
-                 AND (#{Change.table_name}.path = ? OR #{Change.table_name}.path LIKE ?))"
-      args << path.with_leading_slash << "#{path.with_leading_slash}/%"
+                 AND (#{Change.table_name}.path = ?
+                       OR #{Change.table_name}.path LIKE ? ESCAPE ?))"
+      args << path.with_leading_slash
+      args << "#{path.with_leading_slash.gsub(/[%_\\]/) { |s| "\\#{s}" }}/%" << '\\'
     end
 
     [cond.join(' AND '), *args] unless cond.empty?
@@ -72,6 +123,7 @@
   private :latest_changesets_cond
 
   def fetch_changesets
+    return if scm.info.nil?
     scm_rev = scm.info.lastrev.revision.to_i
     db_rev = latest_changeset ? latest_changeset.revision.to_i : -1
     return unless db_rev < scm_rev  # already up-to-date