diff lib/redmine/scm/adapters/mercurial_adapter.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/lib/redmine/scm/adapters/mercurial_adapter.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -219,7 +219,7 @@
             end.sort { |a, b| a[:path] <=> b[:path] }
             parents_ary = []
             as_ary(le['parents']['parent']).map do |par|
-              parents_ary << par['__content__'] if par['__content__'] != "000000000000"
+              parents_ary << par['__content__'] if par['__content__'] != "0000000000000000000000000000000000000000"
             end
             yield Revision.new(:revision => le['revision'],
                                :scmid    => le['node'],
@@ -234,7 +234,7 @@
 
         # Returns list of nodes in the specified branch
         def nodes_in_branch(branch, options={})
-          hg_args = ['rhlog', '--template', '{node|short}\n', '--rhbranch', CGI.escape(branch)]
+          hg_args = ['rhlog', '--template', '{node}\n', '--rhbranch', CGI.escape(branch)]
           hg_args << '--from' << CGI.escape(branch)
           hg_args << '--to'   << '0'
           hg_args << '--limit' << options[:limit] if options[:limit]