From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 14 Mar 2011 13:41:01 +0000 (+0000)
Subject: scm: mercurial: latest changesets support named branch (#7246).
X-Git-Tag: 1.2.0~716
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8944150ace0186bf244c0f63049fc3a7c272b46c;p=redmine.git

scm: mercurial: latest changesets support named branch (#7246).

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

diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb
index 6ea61b0c7..a595e4275 100644
--- a/app/models/repository/mercurial.rb
+++ b/app/models/repository/mercurial.rb
@@ -94,8 +94,17 @@ class Repository::Mercurial < Repository
 
   def latest_changesets_cond(path, rev, limit)
     cond, args = [], []
-
-    if last = rev ? find_changeset_by_name(scm.tagmap[rev] || rev) : nil
+    if scm.branchmap.member? rev
+      # 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 (?)"
+      # 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.
+      args << scm.nodes_in_branch(rev, :limit => limit)
+    elsif last = rev ? find_changeset_by_name(scm.tagmap[rev] || rev) : nil
       cond << "#{Changeset.table_name}.id <= ?"
       args << last.id
     end