2011-05-06 16:57:10 +04:00
|
|
|
# Redmine - project management software
|
2012-05-05 16:56:53 +04:00
|
|
|
# Copyright (C) 2006-2012 Jean-Philippe Lang
|
2007-06-13 00:12:05 +04:00
|
|
|
#
|
|
|
|
# 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.
|
2011-05-06 16:57:10 +04:00
|
|
|
#
|
2007-06-13 00:12:05 +04:00
|
|
|
# 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.
|
2011-05-06 16:57:10 +04:00
|
|
|
#
|
2007-06-13 00:12:05 +04:00
|
|
|
# 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.
|
|
|
|
|
|
|
|
require 'redmine/scm/adapters/abstract_adapter'
|
2011-01-05 18:02:24 +03:00
|
|
|
require 'cgi'
|
2007-06-13 00:12:05 +04:00
|
|
|
|
|
|
|
module Redmine
|
|
|
|
module Scm
|
2011-02-14 09:14:34 +03:00
|
|
|
module Adapters
|
2007-06-13 00:12:05 +04:00
|
|
|
class MercurialAdapter < AbstractAdapter
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2007-06-13 00:12:05 +04:00
|
|
|
# Mercurial executable name
|
2011-02-04 13:24:10 +03:00
|
|
|
HG_BIN = Redmine::Configuration['scm_mercurial_command'] || "hg"
|
2011-02-15 14:04:30 +03:00
|
|
|
HELPERS_DIR = File.dirname(__FILE__) + "/mercurial"
|
|
|
|
HG_HELPER_EXT = "#{HELPERS_DIR}/redminehelper.py"
|
2008-06-07 13:19:50 +04:00
|
|
|
TEMPLATE_NAME = "hg-template"
|
|
|
|
TEMPLATE_EXTENSION = "tmpl"
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2011-02-15 10:04:29 +03:00
|
|
|
# raised if hg command exited with error, e.g. unknown revision.
|
|
|
|
class HgCommandAborted < CommandFailed; end
|
|
|
|
|
2008-07-05 13:39:00 +04:00
|
|
|
class << self
|
2011-02-14 09:14:34 +03:00
|
|
|
def client_command
|
|
|
|
@@bin ||= HG_BIN
|
|
|
|
end
|
|
|
|
|
|
|
|
def sq_bin
|
2011-07-15 20:31:03 +04:00
|
|
|
@@sq_bin ||= shell_quote_command
|
2011-02-14 09:14:34 +03:00
|
|
|
end
|
|
|
|
|
2008-07-05 13:39:00 +04:00
|
|
|
def client_version
|
2008-07-12 13:06:19 +04:00
|
|
|
@@client_version ||= (hgversion || [])
|
2008-07-05 13:39:00 +04:00
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2011-02-14 09:14:34 +03:00
|
|
|
def client_available
|
scm: mercurial: drop supporting below Mercurial 1.1 (#9465)
On November 1st 2011, Mercurial 2.0 will be released.
On Mercurial 1.1.2, unit lib test fails with following error.
<pre>
Traceback (most recent call last):
File "/WEB-DOWN/hg-repo/hg-crew/hg", line 20, in <module>
mercurial.dispatch.run()
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 20, in run
sys.exit(dispatch(sys.argv[1:]))
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 29, in dispatch
return _runcatch(u, args)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 45, in _runcatch
return _dispatch(ui, args)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 367, in _dispatch
ret = _runcommand(ui, options, cmd, d)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 416, in _runcommand
return checkargs()
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 376, in checkargs
return cmdfunc()
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 361, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/util.py", line 715, in check
return func(*args, **kwargs)
File "/REDMINE-1/hg-workdir/redmine-bb-all/lib/redmine/scm/adapters/mercurial/redminehelper.py", line 149, in rhlog
if hg.util.version() >= '1.6':
AttributeError: 'module' object has no attribute 'version'
1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 10:10:12 +04:00
|
|
|
client_version_above?([1, 2])
|
2011-02-14 09:14:34 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
def hgversion
|
2008-07-05 13:39:00 +04:00
|
|
|
# The hg version is expressed either as a
|
|
|
|
# release number (eg 0.9.5 or 1.0) or as a revision
|
|
|
|
# id composed of 12 hexa characters.
|
2011-03-03 08:32:33 +03:00
|
|
|
theversion = hgversion_from_command_line.dup
|
2011-02-22 11:05:51 +03:00
|
|
|
if theversion.respond_to?(:force_encoding)
|
2011-02-22 17:29:09 +03:00
|
|
|
theversion.force_encoding('ASCII-8BIT')
|
|
|
|
end
|
2010-11-21 17:25:26 +03:00
|
|
|
if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)})
|
|
|
|
m[2].scan(%r{\d+}).collect(&:to_i)
|
2008-07-05 13:39:00 +04:00
|
|
|
end
|
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2008-07-05 13:39:00 +04:00
|
|
|
def hgversion_from_command_line
|
2011-02-14 09:14:34 +03:00
|
|
|
shellout("#{sq_bin} --version") { |io| io.read }.to_s
|
2008-07-05 13:39:00 +04:00
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2008-07-05 13:39:00 +04:00
|
|
|
def template_path
|
|
|
|
@@template_path ||= template_path_for(client_version)
|
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2008-07-05 13:39:00 +04:00
|
|
|
def template_path_for(version)
|
scm: mercurial: drop supporting below Mercurial 1.1 (#9465)
On November 1st 2011, Mercurial 2.0 will be released.
On Mercurial 1.1.2, unit lib test fails with following error.
<pre>
Traceback (most recent call last):
File "/WEB-DOWN/hg-repo/hg-crew/hg", line 20, in <module>
mercurial.dispatch.run()
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 20, in run
sys.exit(dispatch(sys.argv[1:]))
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 29, in dispatch
return _runcatch(u, args)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 45, in _runcatch
return _dispatch(ui, args)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 367, in _dispatch
ret = _runcommand(ui, options, cmd, d)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 416, in _runcommand
return checkargs()
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 376, in checkargs
return cmdfunc()
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 361, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
File "/WEB-DOWN/hg-repo/hg-crew/mercurial/util.py", line 715, in check
return func(*args, **kwargs)
File "/REDMINE-1/hg-workdir/redmine-bb-all/lib/redmine/scm/adapters/mercurial/redminehelper.py", line 149, in rhlog
if hg.util.version() >= '1.6':
AttributeError: 'module' object has no attribute 'version'
1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 10:10:12 +04:00
|
|
|
"#{HELPERS_DIR}/#{TEMPLATE_NAME}-1.0.#{TEMPLATE_EXTENSION}"
|
2008-07-05 13:39:00 +04:00
|
|
|
end
|
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2011-02-24 08:58:59 +03:00
|
|
|
def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
|
2011-02-22 11:05:29 +03:00
|
|
|
super
|
2011-05-04 09:00:57 +04:00
|
|
|
@path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
|
2011-02-22 11:05:29 +03:00
|
|
|
end
|
|
|
|
|
2011-05-21 06:38:04 +04:00
|
|
|
def path_encoding
|
|
|
|
@path_encoding
|
|
|
|
end
|
|
|
|
|
2007-06-13 00:12:05 +04:00
|
|
|
def info
|
2011-02-16 07:41:30 +03:00
|
|
|
tip = summary['repository']['tip']
|
|
|
|
Info.new(:root_url => CGI.unescape(summary['repository']['root']),
|
|
|
|
:lastrev => Revision.new(:revision => tip['revision'],
|
|
|
|
:scmid => tip['node']))
|
2011-07-11 04:55:19 +04:00
|
|
|
# rescue HgCommandAborted
|
|
|
|
rescue Exception => e
|
|
|
|
logger.error "hg: error during getting info: #{e.message}"
|
|
|
|
nil
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2011-02-18 10:14:51 +03:00
|
|
|
def tags
|
|
|
|
as_ary(summary['repository']['tag']).map { |e| e['name'] }
|
|
|
|
end
|
|
|
|
|
|
|
|
# Returns map of {'tag' => 'nodeid', ...}
|
|
|
|
def tagmap
|
|
|
|
alist = as_ary(summary['repository']['tag']).map do |e|
|
|
|
|
e.values_at('name', 'node')
|
|
|
|
end
|
|
|
|
Hash[*alist.flatten]
|
|
|
|
end
|
|
|
|
|
2011-02-18 10:15:37 +03:00
|
|
|
def branches
|
2011-10-28 09:19:13 +04:00
|
|
|
brs = []
|
|
|
|
as_ary(summary['repository']['branch']).each do |e|
|
|
|
|
br = Branch.new(e['name'])
|
|
|
|
br.revision = e['revision']
|
|
|
|
br.scmid = e['node']
|
|
|
|
brs << br
|
|
|
|
end
|
|
|
|
brs
|
2011-02-18 10:15:37 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
# Returns map of {'branch' => 'nodeid', ...}
|
|
|
|
def branchmap
|
|
|
|
alist = as_ary(summary['repository']['branch']).map do |e|
|
|
|
|
e.values_at('name', 'node')
|
|
|
|
end
|
|
|
|
Hash[*alist.flatten]
|
|
|
|
end
|
|
|
|
|
2011-02-16 07:41:10 +03:00
|
|
|
def summary
|
2011-05-06 16:57:10 +04:00
|
|
|
return @summary if @summary
|
2011-02-18 15:44:43 +03:00
|
|
|
hg 'rhsummary' do |io|
|
2011-03-03 08:51:46 +03:00
|
|
|
output = io.read
|
|
|
|
if output.respond_to?(:force_encoding)
|
|
|
|
output.force_encoding('UTF-8')
|
|
|
|
end
|
2011-02-18 15:44:43 +03:00
|
|
|
begin
|
2012-04-26 21:57:49 +04:00
|
|
|
@summary = parse_xml(output)['rhsummary']
|
2011-02-18 15:44:43 +03:00
|
|
|
rescue
|
|
|
|
end
|
2011-02-16 07:41:10 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
private :summary
|
|
|
|
|
2011-05-04 18:11:25 +04:00
|
|
|
def entries(path=nil, identifier=nil, options={})
|
2011-02-22 11:47:19 +03:00
|
|
|
p1 = scm_iconv(@path_encoding, 'UTF-8', path)
|
2011-03-02 13:17:36 +03:00
|
|
|
manifest = hg('rhmanifest', '-r', CGI.escape(hgrev(identifier)),
|
2011-02-22 11:47:19 +03:00
|
|
|
CGI.escape(without_leading_slash(p1.to_s))) do |io|
|
2011-03-03 08:51:46 +03:00
|
|
|
output = io.read
|
|
|
|
if output.respond_to?(:force_encoding)
|
|
|
|
output.force_encoding('UTF-8')
|
|
|
|
end
|
2011-02-18 17:49:31 +03:00
|
|
|
begin
|
2012-04-26 21:57:49 +04:00
|
|
|
parse_xml(output)['rhmanifest']['repository']['manifest']
|
2011-02-18 17:49:31 +03:00
|
|
|
rescue
|
|
|
|
end
|
2011-02-16 16:35:52 +03:00
|
|
|
end
|
|
|
|
path_prefix = path.blank? ? '' : with_trailling_slash(path)
|
|
|
|
|
2007-06-13 00:12:05 +04:00
|
|
|
entries = Entries.new
|
2011-02-16 16:35:52 +03:00
|
|
|
as_ary(manifest['dir']).each do |e|
|
2011-02-22 11:47:19 +03:00
|
|
|
n = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['name']))
|
2011-02-16 16:35:52 +03:00
|
|
|
p = "#{path_prefix}#{n}"
|
|
|
|
entries << Entry.new(:name => n, :path => p, :kind => 'dir')
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-02-16 16:35:52 +03:00
|
|
|
|
|
|
|
as_ary(manifest['file']).each do |e|
|
2011-02-22 11:47:19 +03:00
|
|
|
n = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['name']))
|
2011-02-16 16:35:52 +03:00
|
|
|
p = "#{path_prefix}#{n}"
|
|
|
|
lr = Revision.new(:revision => e['revision'], :scmid => e['node'],
|
2011-02-16 18:43:15 +03:00
|
|
|
:identifier => e['node'],
|
2011-02-16 16:35:52 +03:00
|
|
|
:time => Time.at(e['time'].to_i))
|
|
|
|
entries << Entry.new(:name => n, :path => p, :kind => 'file',
|
|
|
|
:size => e['size'].to_i, :lastrev => lr)
|
|
|
|
end
|
|
|
|
|
|
|
|
entries
|
|
|
|
rescue HgCommandAborted
|
|
|
|
nil # means not found
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2011-02-16 10:32:13 +03:00
|
|
|
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
|
|
|
|
revs = Revisions.new
|
|
|
|
each_revision(path, identifier_from, identifier_to, options) { |e| revs << e }
|
|
|
|
revs
|
|
|
|
end
|
|
|
|
|
|
|
|
# Iterates the revisions by using a template file that
|
2008-06-07 13:19:50 +04:00
|
|
|
# makes Mercurial produce a xml output.
|
2011-02-16 10:32:13 +03:00
|
|
|
def each_revision(path=nil, identifier_from=nil, identifier_to=nil, options={})
|
|
|
|
hg_args = ['log', '--debug', '-C', '--style', self.class.template_path]
|
|
|
|
hg_args << '-r' << "#{hgrev(identifier_from)}:#{hgrev(identifier_to)}"
|
|
|
|
hg_args << '--limit' << options[:limit] if options[:limit]
|
|
|
|
hg_args << hgtarget(path) unless path.blank?
|
|
|
|
log = hg(*hg_args) do |io|
|
2011-03-03 08:51:46 +03:00
|
|
|
output = io.read
|
|
|
|
if output.respond_to?(:force_encoding)
|
|
|
|
output.force_encoding('UTF-8')
|
|
|
|
end
|
2011-02-18 17:49:31 +03:00
|
|
|
begin
|
|
|
|
# Mercurial < 1.5 does not support footer template for '</log>'
|
2012-04-26 21:57:49 +04:00
|
|
|
parse_xml("#{output}</log>")['log']
|
2011-02-18 17:49:31 +03:00
|
|
|
rescue
|
|
|
|
end
|
2011-02-16 10:32:13 +03:00
|
|
|
end
|
|
|
|
as_ary(log['logentry']).each do |le|
|
|
|
|
cpalist = as_ary(le['paths']['path-copied']).map do |e|
|
2011-03-03 15:44:14 +03:00
|
|
|
[e['__content__'], e['copyfrom-path']].map do |s|
|
|
|
|
scm_iconv('UTF-8', @path_encoding, CGI.unescape(s))
|
|
|
|
end
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-02-16 10:32:13 +03:00
|
|
|
cpmap = Hash[*cpalist.flatten]
|
|
|
|
paths = as_ary(le['paths']['path']).map do |e|
|
2011-02-22 11:47:19 +03:00
|
|
|
p = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['__content__']) )
|
2011-04-17 13:32:35 +04:00
|
|
|
{:action => e['action'],
|
|
|
|
:path => with_leading_slash(p),
|
|
|
|
:from_path => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil),
|
2011-04-17 13:33:07 +04:00
|
|
|
:from_revision => (cpmap.member?(p) ? le['node'] : nil)}
|
2011-02-16 10:32:13 +03:00
|
|
|
end.sort { |a, b| a[:path] <=> b[:path] }
|
2011-10-28 08:56:41 +04:00
|
|
|
parents_ary = []
|
|
|
|
as_ary(le['parents']['parent']).map do |par|
|
|
|
|
parents_ary << par['__content__'] if par['__content__'] != "000000000000"
|
|
|
|
end
|
2011-02-16 10:32:13 +03:00
|
|
|
yield Revision.new(:revision => le['revision'],
|
2011-04-17 13:32:35 +04:00
|
|
|
:scmid => le['node'],
|
|
|
|
:author => (le['author']['__content__'] rescue ''),
|
|
|
|
:time => Time.parse(le['date']['__content__']),
|
|
|
|
:message => le['msg']['__content__'],
|
2011-10-28 08:56:41 +04:00
|
|
|
:paths => paths,
|
|
|
|
:parents => parents_ary)
|
2011-02-16 10:32:13 +03:00
|
|
|
end
|
|
|
|
self
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-03-13 03:48:07 +03:00
|
|
|
|
|
|
|
# Returns list of nodes in the specified branch
|
2011-03-13 18:03:05 +03:00
|
|
|
def nodes_in_branch(branch, options={})
|
2011-03-13 03:48:07 +03:00
|
|
|
hg_args = ['rhlog', '--template', '{node|short}\n', '--rhbranch', CGI.escape(branch)]
|
2011-03-13 18:03:05 +03:00
|
|
|
hg_args << '--from' << CGI.escape(branch)
|
|
|
|
hg_args << '--to' << '0'
|
2011-03-13 03:48:07 +03:00
|
|
|
hg_args << '--limit' << options[:limit] if options[:limit]
|
|
|
|
hg(*hg_args) { |io| io.readlines.map { |e| e.chomp } }
|
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2008-06-08 20:28:42 +04:00
|
|
|
def diff(path, identifier_from, identifier_to=nil)
|
2011-02-16 14:17:58 +03:00
|
|
|
hg_args = %w|rhdiff|
|
2007-06-13 00:12:05 +04:00
|
|
|
if identifier_to
|
2011-02-16 14:17:58 +03:00
|
|
|
hg_args << '-r' << hgrev(identifier_to) << '-r' << hgrev(identifier_from)
|
2007-06-13 00:12:05 +04:00
|
|
|
else
|
2011-02-16 14:17:58 +03:00
|
|
|
hg_args << '-c' << hgrev(identifier_from)
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-02-22 11:47:19 +03:00
|
|
|
unless path.blank?
|
|
|
|
p = scm_iconv(@path_encoding, 'UTF-8', path)
|
|
|
|
hg_args << CGI.escape(hgtarget(p))
|
|
|
|
end
|
2011-02-16 19:06:24 +03:00
|
|
|
diff = []
|
2011-02-16 14:17:58 +03:00
|
|
|
hg *hg_args do |io|
|
2011-02-16 19:06:24 +03:00
|
|
|
io.each_line do |line|
|
|
|
|
diff << line
|
|
|
|
end
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-02-16 19:06:24 +03:00
|
|
|
diff
|
2011-02-16 14:17:58 +03:00
|
|
|
rescue HgCommandAborted
|
|
|
|
nil # means not found
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-01-09 12:54:30 +03:00
|
|
|
|
2007-06-13 00:12:05 +04:00
|
|
|
def cat(path, identifier=nil)
|
2011-02-23 03:34:27 +03:00
|
|
|
p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
|
2011-03-14 05:23:54 +03:00
|
|
|
hg 'rhcat', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
|
2007-06-13 00:12:05 +04:00
|
|
|
io.binmode
|
2011-02-16 06:47:05 +03:00
|
|
|
io.read
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-02-16 06:47:05 +03:00
|
|
|
rescue HgCommandAborted
|
|
|
|
nil # means not found
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
2011-01-09 04:30:18 +03:00
|
|
|
|
2007-12-02 23:58:02 +03:00
|
|
|
def annotate(path, identifier=nil)
|
2011-02-23 10:04:32 +03:00
|
|
|
p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
|
2007-12-02 23:58:02 +03:00
|
|
|
blame = Annotate.new
|
2011-03-14 05:23:54 +03:00
|
|
|
hg 'rhannotate', '-ncu', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
|
2007-12-02 23:58:02 +03:00
|
|
|
io.each_line do |line|
|
2011-02-23 10:04:32 +03:00
|
|
|
line.force_encoding('ASCII-8BIT') if line.respond_to?(:force_encoding)
|
2011-01-09 04:30:18 +03:00
|
|
|
next unless line =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
|
|
|
|
r = Revision.new(:author => $1.strip, :revision => $2, :scmid => $3,
|
|
|
|
:identifier => $3)
|
|
|
|
blame.add_line($4.rstrip, r)
|
2007-12-02 23:58:02 +03:00
|
|
|
end
|
|
|
|
end
|
|
|
|
blame
|
2011-02-16 04:14:54 +03:00
|
|
|
rescue HgCommandAborted
|
2011-06-10 11:06:11 +04:00
|
|
|
# means not found or cannot be annotated
|
|
|
|
Annotate.new
|
2007-12-02 23:58:02 +03:00
|
|
|
end
|
2011-01-08 16:51:43 +03:00
|
|
|
|
2011-01-09 04:30:18 +03:00
|
|
|
class Revision < Redmine::Scm::Adapters::Revision
|
|
|
|
# Returns the readable identifier
|
|
|
|
def format_identifier
|
|
|
|
"#{revision}:#{scmid}"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2011-02-15 10:04:29 +03:00
|
|
|
# Runs 'hg' command with the given args
|
|
|
|
def hg(*args, &block)
|
2011-02-16 07:40:42 +03:00
|
|
|
repo_path = root_url || url
|
2011-07-15 20:31:27 +04:00
|
|
|
full_args = ['-R', repo_path, '--encoding', 'utf-8']
|
2011-02-15 10:04:29 +03:00
|
|
|
full_args << '--config' << "extensions.redminehelper=#{HG_HELPER_EXT}"
|
|
|
|
full_args << '--config' << 'diff.git=false'
|
|
|
|
full_args += args
|
2011-07-15 20:31:27 +04:00
|
|
|
ret = shellout(
|
|
|
|
self.class.sq_bin + ' ' + full_args.map { |e| shell_quote e.to_s }.join(' '),
|
|
|
|
&block
|
|
|
|
)
|
2011-02-15 10:04:29 +03:00
|
|
|
if $? && $?.exitstatus != 0
|
|
|
|
raise HgCommandAborted, "hg exited with non-zero status: #{$?.exitstatus}"
|
|
|
|
end
|
|
|
|
ret
|
|
|
|
end
|
|
|
|
private :hg
|
|
|
|
|
2011-01-08 16:51:43 +03:00
|
|
|
# Returns correct revision identifier
|
2011-02-15 08:58:11 +03:00
|
|
|
def hgrev(identifier, sq=false)
|
|
|
|
rev = identifier.blank? ? 'tip' : identifier.to_s
|
|
|
|
rev = shell_quote(rev) if sq
|
|
|
|
rev
|
2011-01-08 16:51:43 +03:00
|
|
|
end
|
|
|
|
private :hgrev
|
2011-02-16 04:14:34 +03:00
|
|
|
|
|
|
|
def hgtarget(path)
|
|
|
|
path ||= ''
|
|
|
|
root_url + '/' + without_leading_slash(path)
|
|
|
|
end
|
|
|
|
private :hgtarget
|
2011-02-16 10:32:13 +03:00
|
|
|
|
|
|
|
def as_ary(o)
|
|
|
|
return [] unless o
|
|
|
|
o.is_a?(Array) ? o : Array[o]
|
|
|
|
end
|
|
|
|
private :as_ary
|
2007-06-13 00:12:05 +04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|