kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: mercurial: latest changesets improvement and supporting tag (#1981). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5123 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-03-14 10:36:34 +00:00 committed by Eric Davis
parent 6b9b3783bc
commit ec6e2d1789
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/models/repository/mercurial.rb
View File

@ -80,7 +80,6 @@ class Repository::Mercurial < Repository
end
# Returns the latest changesets for +path+; sorted by revision number
# Default behavior is to search in cached changesets
#
# Because :order => 'id DESC' is defined at 'has_many',
# there is no need to set 'order'.
@ -88,19 +87,32 @@ class Repository::Mercurial < Repository
# Sqlite3 and PostgreSQL pass.
# Is this MySQL bug?
def latest_changesets(path, rev, limit=10)
if path.blank?
changesets.find(:all, :include => :user, :limit => limit, :order => 'id DESC')
else
changesets.find(:all, :select => "DISTINCT #{Changeset.table_name}.*",
:joins => :changes,
:conditions => ["#{Change.table_name}.path = ? OR #{Change.table_name}.path LIKE ? ESCAPE ?",
path.with_leading_slash,
"#{path.with_leading_slash.gsub(/[%_\\]/) { |s| "\\#{s}" }}/%", '\\'],
:include => :user, :limit => limit,
:order => "#{Changeset.table_name}.id DESC" )
end
changesets.find(:all, :include => :user,
:conditions => latest_changesets_cond(path, rev, limit),
:limit => limit, :order => "#{Changeset.table_name}.id DESC")
end
def latest_changesets_cond(path, rev, limit)
cond, args = [], []
if last = rev ? find_changeset_by_name(scm.tagmap[rev] || rev) : nil
cond << "#{Changeset.table_name}.id <= ?"
args << last.id
end
unless path.blank?
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 ? ESCAPE ?))"
args << path.with_leading_slash
args << "#{path.with_leading_slash.gsub(/[%_\\]/) { |s| "\\#{s}" }}/%" << '\\'
end
[cond.join(' AND '), *args] unless cond.empty?
end
private :latest_changesets_cond
def fetch_changesets
scm_rev = scm.info.lastrev.revision.to_i
db_rev = latest_changeset ? latest_changeset.revision.to_i : -1

2
test/functional/repositories_mercurial_controller_test.rb
View File

@ -147,7 +147,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
"test-#{@char_1}.txt"], assigns(:entries).collect(&:name)
changesets = assigns(:changesets)
assert_not_nil changesets
assert_equal %w(27 21 20 19 18 17), changesets.collect(&:revision)
assert_equal %w(21 20 19 18 17), changesets.collect(&:revision)
end
end