jro_apps/redmine Commit - r1222:3a9b0988c751

Merged Git support branch (r1200 to r1226)....

Jean-Philippe Lang -

r1222:3a9b0988c751

parent child

Context file:

r1222:3a9b0988c751

Expand all files

app/models/repository/git.rb created 644 +70 0

@@ -0,0 +1,70
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	# Copyright (C) 2007 Patrick Aljord patcito@ŋmail.com
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require 'redmine/scm/adapters/git_adapter'
	19
	20	class Repository::Git < Repository
	21	attr_protected :root_url
	22	validates_presence_of :url
	23
	24	def scm_adapter
	25	Redmine::Scm::Adapters::GitAdapter
	26	end
	27
	28	def self.scm_name
	29	'Git'
	30	end
	31
	32	def changesets_for_path(path)
	33	Change.find(:all, :include => :changeset,
	34	:conditions => ["repository_id = ? AND path = ?", id, path],
	35	:order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset)
	36	end
	37
	38	def fetch_changesets
	39	scm_info = scm.info
	40	if scm_info
	41	# latest revision found in database
	42	db_revision = latest_changeset ? latest_changeset.revision : nil
	43	# latest revision in the repository
	44	scm_revision = scm_info.lastrev.scmid
	45
	46	unless changesets.find_by_scmid(scm_revision)
	47
	48	revisions = scm.revisions('', db_revision, nil)
	49	transaction do
	50	revisions.reverse_each do \|revision\|
	51	changeset = Changeset.create(:repository => self,
	52	:revision => revision.identifier,
	53	:scmid => revision.scmid,
	54	:committer => revision.author,
	55	:committed_on => revision.time,
	56	:comments => revision.message)
	57
	58	revision.paths.each do \|change\|
	59	Change.create(:changeset => changeset,
	60	:action => change[:action],
	61	:path => change[:path],
	62	:from_path => change[:from_path],
	63	:from_revision => change[:from_revision])
	64	end
	65	end
	66	end
	67	end
	68	end
	69	end
	70	end

db/migrate/091_change_changesets_revision_to_string.rb created 644 +9 0

@@ -0,0 +1,9
	1	class ChangeChangesetsRevisionToString < ActiveRecord::Migration
	2	def self.up
	3	change_column :changesets, :revision, :string, :null => false
	4	end
	5
	6	def self.down
	7	change_column :changesets, :revision, :integer, :null => false
	8	end
	9	end

db/migrate/092_change_changes_from_revision_to_string.rb created 644 +9 0

@@ -0,0 +1,9
	1	class ChangeChangesFromRevisionToString < ActiveRecord::Migration
	2	def self.up
	3	change_column :changes, :from_revision, :string
	4	end
	5
	6	def self.down
	7	change_column :changes, :from_revision, :integer
	8	end
	9	end

lib/redmine/scm/adapters/git_adapter.rb created 644 +261 0

@@ -0,0 +1,261
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require 'redmine/scm/adapters/abstract_adapter'
	19
	20	module Redmine
	21	module Scm
	22	module Adapters
	23	class GitAdapter < AbstractAdapter
	24
	25	# Git executable name
	26	GIT_BIN = "git"
	27
	28	# Get the revision of a particuliar file
	29	def get_rev (rev,path)
	30	cmd="git --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}" if rev!='latest' and (! rev.nil?)
	31	cmd="git --git-dir #{target('')} log -1 master -- #{shell_quote path}" if
	32	rev=='latest' or rev.nil?
	33	rev=[]
	34	i=0
	35	shellout(cmd) do \|io\|
	36	files=[]
	37	changeset = {}
	38	parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files
	39
	40	io.each_line do \|line\|
	41	if line =~ /^commit ([0-9a-f]{40})$/
	42	key = "commit"
	43	value = $1
	44	if (parsing_descr == 1 \|\| parsing_descr == 2)
	45	parsing_descr = 0
	46	rev = Revision.new({:identifier => changeset[:commit],
	47	:scmid => changeset[:commit],
	48	:author => changeset[:author],
	49	:time => Time.parse(changeset[:date]),
	50	:message => changeset[:description],
	51	:paths => files
	52	})
	53	changeset = {}
	54	files = []
	55	end
	56	changeset[:commit] = $1
	57	elsif (parsing_descr == 0) && line =~ /^(\w+):\s(.)$/
	58	key = $1
	59	value = $2
	60	if key == "Author"
	61	changeset[:author] = value
	62	elsif key == "Date"
	63	changeset[:date] = value
	64	end
	65	elsif (parsing_descr == 0) && line.chomp.to_s == ""
	66	parsing_descr = 1
	67	changeset[:description] = ""
	68	elsif (parsing_descr == 1 \|\| parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
	69	parsing_descr = 2
	70	fileaction = $1
	71	filepath = $2
	72	files << {:action => fileaction, :path => filepath}
	73	elsif (parsing_descr == 1) && line.chomp.to_s == ""
	74	parsing_descr = 2
	75	elsif (parsing_descr == 1)
	76	changeset[:description] << line
	77	end
	78	end
	79	rev = Revision.new({:identifier => changeset[:commit],
	80	:scmid => changeset[:commit],
	81	:author => changeset[:author],
	82	:time => Time.parse(changeset[:date]),
	83	:message => changeset[:description],
	84	:paths => files
	85	})
	86
	87	end
	88
	89	get_rev('latest',path) if rev == []
	90
	91	return nil if $? && $?.exitstatus != 0
	92	return rev
	93	end
	94
	95
	96	def info
	97	root_url = target('')
	98	info = Info.new({:root_url => target(''),
	99	:lastrev => revisions(root_url,nil,nil,{:limit => 1}).first
	100	})
	101	info
	102	rescue Errno::ENOENT => e
	103	return nil
	104	end
	105
	106	def entries(path=nil, identifier=nil)
	107	path \|\|= ''
	108	entries = Entries.new
	109	cmd = "#{GIT_BIN} --git-dir #{target('')} ls-tree -l "
	110	cmd << shell_quote("HEAD:" + path) if identifier.nil?
	111	cmd << shell_quote(identifier + ":" + path) if identifier
	112	shellout(cmd) do \|io\|
	113	io.each_line do \|line\|
	114	e = line.chomp.to_s
	115	if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\s+(.+)$/
	116	type = $1
	117	sha = $2
	118	size = $3
	119	name = $4
	120	entries << Entry.new({:name => name,
	121	:path => (path.empty? ? name : "#{path}/#{name}"),
	122	:kind => ((type == "tree") ? 'dir' : 'file'),
	123	:size => ((type == "tree") ? nil : size),
	124	:lastrev => get_rev(identifier,(path.empty? ? name : "#{path}/#{name}"))
	125
	126	}) unless entries.detect{\|entry\| entry.name == name}
	127	end
	128	end
	129	end
	130	return nil if $? && $?.exitstatus != 0
	131	entries.sort_by_name
	132	end
	133
	134	def entry(path=nil, identifier=nil)
	135	path \|\|= ''
	136	search_path = path.split('/')[0..-2].join('/')
	137	entry_name = path.split('/').last
	138	e = entries(search_path, identifier)
	139	e ? e.detect{\|entry\| entry.name == entry_name} : nil
	140	end
	141
	142	def revisions(path, identifier_from, identifier_to, options={})
	143	revisions = Revisions.new
	144	cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw "
	145	cmd << " -n #{options[:limit].to_i} " if (!options.nil?) && options[:limit]
	146	cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from
	147	cmd << " #{shell_quote identifier_to} " if identifier_to
	148	#cmd << " HEAD " if !identifier_to
	149	shellout(cmd) do \|io\|
	150	files=[]
	151	changeset = {}
	152	parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files
	153	revno = 1
	154
	155	io.each_line do \|line\|
	156	if line =~ /^commit ([0-9a-f]{40})$/
	157	key = "commit"
	158	value = $1
	159	if (parsing_descr == 1 \|\| parsing_descr == 2)
	160	parsing_descr = 0
	161	revisions << Revision.new({:identifier => changeset[:commit],
	162	:scmid => changeset[:commit],
	163	:author => changeset[:author],
	164	:time => Time.parse(changeset[:date]),
	165	:message => changeset[:description],
	166	:paths => files
	167	})
	168	changeset = {}
	169	files = []
	170	revno = revno + 1
	171	end
	172	changeset[:commit] = $1
	173	elsif (parsing_descr == 0) && line =~ /^(\w+):\s(.)$/
	174	key = $1
	175	value = $2
	176	if key == "Author"
	177	changeset[:author] = value
	178	elsif key == "Date"
	179	changeset[:date] = value
	180	end
	181	elsif (parsing_descr == 0) && line.chomp.to_s == ""
	182	parsing_descr = 1
	183	changeset[:description] = ""
	184	elsif (parsing_descr == 1 \|\| parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
	185	parsing_descr = 2
	186	fileaction = $1
	187	filepath = $2
	188	files << {:action => fileaction, :path => filepath}
	189	elsif (parsing_descr == 1) && line.chomp.to_s == ""
	190	parsing_descr = 2
	191	elsif (parsing_descr == 1)
	192	changeset[:description] << line[4..-1]
	193	end
	194	end
	195
	196	revisions << Revision.new({:identifier => changeset[:commit],
	197	:scmid => changeset[:commit],
	198	:author => changeset[:author],
	199	:time => Time.parse(changeset[:date]),
	200	:message => changeset[:description],
	201	:paths => files
	202	}) if changeset[:commit]
	203
	204	end
	205
	206	return nil if $? && $?.exitstatus != 0
	207	revisions
	208	end
	209
	210	def diff(path, identifier_from, identifier_to=nil, type="inline")
	211	path \|\|= ''
	212	if !identifier_to
	213	identifier_to = nil
	214	end
	215
	216	cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}" if identifier_to.nil?
	217	cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" if !identifier_to.nil?
	218	cmd << " -- #{shell_quote path}" unless path.empty?
	219	diff = []
	220	shellout(cmd) do \|io\|
	221	io.each_line do \|line\|
	222	diff << line
	223	end
	224	end
	225	return nil if $? && $?.exitstatus != 0
	226	DiffTableList.new diff, type
	227	end
	228
	229	def annotate(path, identifier=nil)
	230	identifier = 'HEAD' if identifier.blank?
	231	cmd = "#{GIT_BIN} --git-dir #{target('')} blame -l #{shell_quote identifier} -- #{shell_quote path}"
	232	blame = Annotate.new
	233	shellout(cmd) do \|io\|
	234	io.each_line do \|line\|
	235	next unless line =~ /([0-9a-f]{39,40})\s$(\w)[^$]\)(.*)$/
	236	blame.add_line($3.rstrip, Revision.new(:identifier => $1, :author => $2.strip))
	237	end
	238	end
	239	return nil if $? && $?.exitstatus != 0
	240	blame
	241	end
	242
	243	def cat(path, identifier=nil)
	244	if identifier.nil?
	245	identifier = 'HEAD'
	246	end
	247	cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote(identifier + ':' + path)}"
	248	cat = nil
	249	shellout(cmd) do \|io\|
	250	io.binmode
	251	cat = io.read
	252	end
	253	return nil if $? && $?.exitstatus != 0
	254	cat
	255	end
	256	end
	257	end
	258	end
	259
	260	end
	261

test/fixtures/repositories/darcs_repository.tar.gz created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

test/fixtures/repositories/git_repository.tar.gz created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

test/functional/repositories_darcs_controller_test.rb created 644 +94 0

@@ -0,0 +1,94
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'repositories_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class RepositoriesController; def rescue_action(e) raise e end; end
	23
	24	class RepositoriesDarcsControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
	26
	27	# No '..' in the repository path
	28	REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
	29
	30	def setup
	31	@controller = RepositoriesController.new
	32	@request = ActionController::TestRequest.new
	33	@response = ActionController::TestResponse.new
	34	User.current = nil
	35	Repository::Darcs.create(:project => Project.find(3), :url => REPOSITORY_PATH)
	36	end
	37
	38	if File.directory?(REPOSITORY_PATH)
	39	def test_show
	40	get :show, :id => 3
	41	assert_response :success
	42	assert_template 'show'
	43	assert_not_nil assigns(:entries)
	44	assert_not_nil assigns(:changesets)
	45	end
	46
	47	def test_browse_root
	48	get :browse, :id => 3
	49	assert_response :success
	50	assert_template 'browse'
	51	assert_not_nil assigns(:entries)
	52	assert_equal 3, assigns(:entries).size
	53	assert assigns(:entries).detect {\|e\| e.name == 'images' && e.kind == 'dir'}
	54	assert assigns(:entries).detect {\|e\| e.name == 'sources' && e.kind == 'dir'}
	55	assert assigns(:entries).detect {\|e\| e.name == 'README' && e.kind == 'file'}
	56	end
	57
	58	def test_browse_directory
	59	get :browse, :id => 3, :path => ['images']
	60	assert_response :success
	61	assert_template 'browse'
	62	assert_not_nil assigns(:entries)
	63	assert_equal 2, assigns(:entries).size
	64	entry = assigns(:entries).detect {\|e\| e.name == 'edit.png'}
	65	assert_not_nil entry
	66	assert_equal 'file', entry.kind
	67	assert_equal 'images/edit.png', entry.path
	68	end
	69
	70	def test_changes
	71	get :changes, :id => 3, :path => ['images', 'edit.png']
	72	assert_response :success
	73	assert_template 'changes'
	74	assert_tag :tag => 'h2', :content => 'edit.png'
	75	end
	76
	77	def test_diff
	78	Project.find(3).repository.fetch_changesets
	79	# Full diff of changeset 5
	80	get :diff, :id => 3, :rev => 5
	81	assert_response :success
	82	assert_template 'diff'
	83	# Line 22 removed
	84	assert_tag :tag => 'th',
	85	:content => /22/,
	86	:sibling => { :tag => 'td',
	87	:attributes => { :class => /diff_out/ },
	88	:content => /def remove/ }
	89	end
	90	else
	91	puts "Darcs test repository NOT FOUND. Skipping functional tests !!!"
	92	def test_fake; assert true end
	93	end
	94	end

test/functional/repositories_git_controller_test.rb created 644 +123 0

@@ -0,0 +1,123
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'repositories_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class RepositoriesController; def rescue_action(e) raise e end; end
	23
	24	class RepositoriesGitControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
	26
	27	# No '..' in the repository path
	28	REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
	29	REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
	30
	31	def setup
	32	@controller = RepositoriesController.new
	33	@request = ActionController::TestRequest.new
	34	@response = ActionController::TestResponse.new
	35	User.current = nil
	36	Repository::Git.create(:project => Project.find(3), :url => REPOSITORY_PATH)
	37	end
	38
	39	if File.directory?(REPOSITORY_PATH)
	40	def test_show
	41	get :show, :id => 3
	42	assert_response :success
	43	assert_template 'show'
	44	assert_not_nil assigns(:entries)
	45	assert_not_nil assigns(:changesets)
	46	end
	47
	48	def test_browse_root
	49	get :browse, :id => 3
	50	assert_response :success
	51	assert_template 'browse'
	52	assert_not_nil assigns(:entries)
	53	assert_equal 3, assigns(:entries).size
	54	assert assigns(:entries).detect {\|e\| e.name == 'images' && e.kind == 'dir'}
	55	assert assigns(:entries).detect {\|e\| e.name == 'sources' && e.kind == 'dir'}
	56	assert assigns(:entries).detect {\|e\| e.name == 'README' && e.kind == 'file'}
	57	end
	58
	59	def test_browse_directory
	60	get :browse, :id => 3, :path => ['images']
	61	assert_response :success
	62	assert_template 'browse'
	63	assert_not_nil assigns(:entries)
	64	assert_equal 2, assigns(:entries).size
	65	entry = assigns(:entries).detect {\|e\| e.name == 'edit.png'}
	66	assert_not_nil entry
	67	assert_equal 'file', entry.kind
	68	assert_equal 'images/edit.png', entry.path
	69	end
	70
	71	def test_changes
	72	get :changes, :id => 3, :path => ['images', 'edit.png']
	73	assert_response :success
	74	assert_template 'changes'
	75	assert_tag :tag => 'h2', :content => 'edit.png'
	76	end
	77
	78	def test_entry_show
	79	get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
	80	assert_response :success
	81	assert_template 'entry'
	82	# Line 19
	83	assert_tag :tag => 'th',
	84	:content => /10/,
	85	:attributes => { :class => /line-num/ },
	86	:sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
	87	end
	88
	89	def test_entry_download
	90	get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
	91	assert_response :success
	92	# File content
	93	assert @response.body.include?('WITHOUT ANY WARRANTY')
	94	end
	95
	96	def test_diff
	97	# Full diff of changeset 2f9c0091
	98	get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
	99	assert_response :success
	100	assert_template 'diff'
	101	# Line 22 removed
	102	assert_tag :tag => 'th',
	103	:content => /22/,
	104	:sibling => { :tag => 'td',
	105	:attributes => { :class => /diff_out/ },
	106	:content => /def remove/ }
	107	end
	108
	109	def test_annotate
	110	get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
	111	assert_response :success
	112	assert_template 'annotate'
	113	# Line 23, changeset 2f9c0091
	114	assert_tag :tag => 'th', :content => /23/,
	115	:sibling => { :tag => 'td', :child => { :tag => 'a', :content => /2f9c0091/ } },
	116	:sibling => { :tag => 'td', :content => /jsmith/ },
	117	:sibling => { :tag => 'td', :content => /watcher =/ }
	118	end
	119	else
	120	puts "Git test repository NOT FOUND. Skipping functional tests !!!"
	121	def test_fake; assert true end
	122	end
	123	end

test/unit/repository_darcs_test.rb created 644 +55 0

@@ -0,0 +1,55
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class RepositoryDarcsTest < Test::Unit::TestCase
	21	fixtures :projects
	22
	23	# No '..' in the repository path
	24	REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
	25
	26	def setup
	27	@project = Project.find(1)
	28	assert @repository = Repository::Darcs.create(:project => @project, :url => REPOSITORY_PATH)
	29	end
	30
	31	if File.directory?(REPOSITORY_PATH)
	32	def test_fetch_changesets_from_scratch
	33	@repository.fetch_changesets
	34	@repository.reload
	35
	36	assert_equal 6, @repository.changesets.count
	37	assert_equal 13, @repository.changes.count
	38	assert_equal "Initial commit.", @repository.changesets.find_by_revision(1).comments
	39	end
	40
	41	def test_fetch_changesets_incremental
	42	@repository.fetch_changesets
	43	# Remove changesets with revision > 3
	44	@repository.changesets.find(:all, :conditions => 'revision > 3').each(&:destroy)
	45	@repository.reload
	46	assert_equal 3, @repository.changesets.count
	47
	48	@repository.fetch_changesets
	49	assert_equal 6, @repository.changesets.count
	50	end
	51	else
	52	puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"
	53	def test_fake; assert true end
	54	end
	55	end

test/unit/repository_git_test.rb created 644 +56 0

@@ -0,0 +1,56
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class RepositoryGitTest < Test::Unit::TestCase
	21	fixtures :projects
	22
	23	# No '..' in the repository path
	24	REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
	25	REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
	26
	27	def setup
	28	@project = Project.find(1)
	29	assert @repository = Repository::Git.create(:project => @project, :url => REPOSITORY_PATH)
	30	end
	31
	32	if File.directory?(REPOSITORY_PATH)
	33	def test_fetch_changesets_from_scratch
	34	@repository.fetch_changesets
	35	@repository.reload
	36
	37	assert_equal 6, @repository.changesets.count
	38	assert_equal 11, @repository.changes.count
	39	assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find(:first, :order => 'id ASC').comments
	40	end
	41
	42	def test_fetch_changesets_incremental
	43	@repository.fetch_changesets
	44	# Remove the 3 latest changesets
	45	@repository.changesets.find(:all, :order => 'id DESC', :limit => 3).each(&:destroy)
	46	@repository.reload
	47	assert_equal 3, @repository.changesets.count
	48
	49	@repository.fetch_changesets
	50	assert_equal 6, @repository.changesets.count
	51	end
	52	else
	53	puts "Git test repository NOT FOUND. Skipping unit tests !!!"
	54	def test_fake; assert true end
	55	end
	56	end

app/controllers/repositories_controller.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             require 'digest/sha1'
             class ChangesetNotFound < Exception
             end
             class RepositoriesController < ApplicationController
               layout 'base'
               menu_item :repository
               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize
               accept_key_auth :revisions
               def edit
                 @repository = @project.repository
                 if !@repository
                   @repository = Repository.factory(params[:repository_scm])
                   @repository.project = @project
                 end
                 if request.post?
                   @repository.attributes = params[:repository]
                   @repository.save
                 end
                 render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
               end
               def destroy
                 @repository.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
               end
               def show
                 # check if new revisions have been committed in the repository
                 @repository.fetch_changesets if Setting.autofetch_changesets?
                 # get entries for the browse frame
                 @entries = @repository.entries('')
                 # latest changesets
                 @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
                 show_error_not_found unless @entries || @changesets.any?
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def browse
                 @entries = @repository.entries(@path, @rev)
                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
                   show_error_not_found unless @entries
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def changes
                 @entry = @repository.scm.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 @changesets = @repository.changesets_for_path(@path)
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
             								      per_page_option,
             								      params['page']
                 @changesets = @repository.changesets.find(:all,
             						:limit  =>  @changeset_pages.items_per_page,
             						:offset =>  @changeset_pages.current.offset)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                 end
               end
               def entry
                 @content = @repository.scm.cat(@path, @rev)
                 show_error_not_found and return unless @content
                 if 'raw' == params[:format]
                   send_data @content, :filename => @path.split('/').last
                 else
                   # Prevent empty lines when displaying a file with Windows style eol
                   @content.gsub!("\r\n", "\n")
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def annotate
                 @annotate = @repository.scm.annotate(@path, @rev)
                 show_error_not_found and return if @annotate.nil? || @annotate.empty?
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 raise ChangesetNotFound unless @changeset
                 @changes_count = @changeset.changes.size
                 @changes_pages = Paginator.new self, @changes_count, 150, params['page']
                 @changes = @changeset.changes.find(:all,
               						:limit  =>  @changes_pages.items_per_page,
               						:offset =>  @changes_pages.current.offset)
                 respond_to do |format|
                   format.html
                   format.js {render :layout => false}
                 end
               rescue ChangesetNotFound
                 show_error_not_found
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def diff
-                @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1)
+                @rev_to = params[:rev_to]
                 @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                 @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                 # Save diff type as user preference
                 if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                   User.current.pref[:diff_type] = @diff_type
                   User.current.preference.save
                 end
                 @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                 unless read_fragment(@cache_key)
                   @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
                   show_error_not_found unless @diff
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_repository
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 render_404 and return false unless @repository
                 @path = params[:path].join('/') unless params[:path].nil?
                 @path ||= ''
-                @rev = params[:rev].to_i if params[:rev]
+                @rev = params[:rev]
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show_error_not_found
                 render_error l(:error_scm_not_found)
               end
               def show_error_command_failed(msg)
                 render_error l(:error_scm_command_failed, msg)
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 11
                 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
                 month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
 .times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
             end
             class String
               def with_leading_slash
                 starts_with?('/') ? self : "/#{self}"
               end
             end

app/helpers/application_helper.rb +6 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 user ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
               end
               def link_to_issue(issue)
                 link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def show_and_goto_link(name, id, options={})
                 onclick = "Element.show('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "Element.scrollTo('#{id}'); "
                 onclick << "return false;"
                 link_to(name, "#", options.merge(:onclick => onclick))
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
               def format_date(date)
                 return nil unless date
                 # "Setting.date_format.size < 2" is a temporary fix (content of date_format setting changed)
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 date.strftime(@date_format)
               end
               def format_time(time, include_date = true)
                 return nil unless time
                 time = time.to_time if time.is_a?(String)
                 zone = User.current.time_zone
                 if time.utc?
                   local = zone ? zone.adjust(time) : time.getlocal
                 else
                   local = zone ? zone.adjust(time.getutc) : time
                 end
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
                 include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
               end
               def authoring(created, author)
                 time_tag = content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created))
                 l(:label_added_time_by, author || 'Anonymous', time_tag)
               end
               def l_or_humanize(s)
                 l_has_string?("label_#{s}".to_sym) ? l("label_#{s}".to_sym) : s.to_s.humanize
               end
               def day_name(day)
                 l(:general_day_names).split(',')[day-1]
               end
               def month_name(month)
                 l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
                 url_param = params.dup
                 # don't reuse params if filters are present
                 url_param.clear if url_param.has_key?(:set_filter)
                 html = ''
                 html << link_to_remote(('&#171; ' + l(:label_previous)),
                                         {:update => 'content',
                                          :url => url_param.merge(page_param => paginator.current.previous),
                                          :complete => 'window.scrollTo(0,0)'},
                                         {:href => url_for(:params => url_param.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote(n.to_s,
                                   {:url => {:params => url_param.merge(page_param => n)},
                                    :update => 'content',
                                    :complete => 'window.scrollTo(0,0)'},
                                   {:href => url_for(:params => url_param.merge(page_param => n))})
                 end || '')
                 html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
                                              {:update => 'content',
                                               :url => url_param.merge(page_param => paginator.current.next),
                                               :complete => 'window.scrollTo(0,0)'},
                                              {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
                 unless count.nil?
                   html << [" (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})", per_page_links(paginator.items_per_page)].compact.join(' | ')
                 end
                 html
               end
               def per_page_links(selected=nil)
                 url_param = params.dup
                 url_param.clear if url_param.has_key?(:set_filter)
                 links = Setting.per_page_options_array.collect do |n|
                   n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)},
                                                         {:href => url_for(url_param.merge(:per_page => n))})
                 end
                 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
               end
               def html_title(*args)
                 if args.empty?
                   title = []
                   title << @project.name if @project
                   title += @html_title if @html_title
                   title << Setting.app_title
                   title.compact.join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               def accesskey(s)
                 Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = nil
                   text = args.shift
                 when 2
                   obj = args.shift
                   text = obj.send(args.shift).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 only_path = options.delete(:only_path) == false ? false : true
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                 if attachments
                   text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
                     style = $1
                     filename = $6
                     rf = Regexp.new(filename,  Regexp::IGNORECASE)
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename =~ rf }
                       image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found.id
                       "!#{style}#{image_url}!"
                     else
                       "!#{style}#{filename}!"
                     end
                   end
                 end
                 text = (Setting.text_formatting == 'textile') ?
                   Redmine::WikiFormatting.to_html(text) { |macro, args| exec_macro(macro, obj, args) } :
                   simple_format(auto_link(h(text)))
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|project, title| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|project, title| "##{title}" }
                 else
                   format_wiki_link = Proc.new {|project, title| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title) }
                 end
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 # Wiki links
                 #
                 # Examples:
                 #   [[mypage]]
                 #   [[mypage|mytext]]
                 # wiki links can refer other project wikis, using project name or identifier:
                 #   [[project:]] -> wiki starting page
                 #   [[project:|mytext]]
                 #   [[project:mypage]]
                 #   [[project:mypage|mytext]]
                 text = text.gsub(/(!)?(\[\[([^\]\|]+)(\|([^\]\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
                       page = $2
                       title ||= $1 if page.blank?
                     end
                     if link_project && link_project.wiki
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
                                                :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       title || page
                     end
                   else
                     all
                   end
                 end
                 # Redmine links
                 #
                 # Examples:
                 #   Issues:
                 #     #52 -> Link to issue #52
                 #   Changesets:
                 #     r52 -> Link to revision 52
+                #     commit:a85130f -> Link to scmid starting with a85130f
                 #   Documents:
                 #     document#17 -> Link to document with id 17
                 #     document:Greetings -> Link to the document with title "Greetings"
                 #     document:"Some document" -> Link to the document with title "Some document"
                 #   Versions:
                 #     version#3 -> Link to version with id 3
                 #     version:1.0.0 -> Link to version named "1.0.0"
                 #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
                 #   Attachments:
                 #     attachment:file.zip -> Link to the attachment of the current object named file.zip
-                text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
+                text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version|commit)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project && (changeset = project.changesets.find_by_revision(oid))
                         link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid},
                                                   :class => 'changeset',
                                                   :title => truncate(changeset.comments, 100))
                       end
                     elsif sep == '#'
                       oid = oid.to_i
                       case prefix
                       when nil
                         if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
                           link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
                                                     :class => (issue.closed? ? 'issue closed' : 'issue'),
                                                     :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
                           link = content_tag('del', link) if issue.closed?
                         end
                       when 'document'
                         if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = oid.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
+                      when 'commit'
+                        if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
+                          link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => changeset.revision}, :class => 'changeset', :title => truncate(changeset.comments, 100)
+                        end
                       when 'attachment'
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'
                         end
                       end
                     end
                   end
                   leading + (link || "#{prefix}#{sep}#{oid}")
                 end
                 text
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     msg = msg.first if msg.is_a? Array
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         msg = msg.first if msg.is_a? Array
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :width => "#{pcts[0].floor}%;", :class => 'closed') : '') +
                     (pcts[1] > 0 ? content_tag('td', '', :width => "#{pcts[1].floor}%;", :class => 'done') : '') +
                     (pcts[2] > 0 ? content_tag('td', '', :width => "#{pcts[2].floor}%;", :class => 'todo') : '')
                   ), :class => 'progress', :style => "width: #{width};") +
                   content_tag('p', legend, :class => 'pourcent')
               end
               def context_menu_link(name, url, options={})
                 options[:class] ||= ''
                 if options.delete(:selected)
                   options[:class] << ' icon-checked disabled'
                   options[:disabled] = true
                 end
                 if options.delete(:disabled)
                   options.delete(:method)
                   options.delete(:confirm)
                   options.delete(:onclick)
                   options[:class] << ' disabled'
                   url = '#'
                 end
                 link_to name, url, options
               end
               def calendar_for(field_id)
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def wikitoolbar_for(field_id)
                 return '' unless Setting.text_formatting == 'textile'
                 help_link = l(:setting_text_formatting) + ': ' +
                   link_to(l(:label_help), compute_public_path('wiki_syntax', 'help', 'html'),
                                           :onclick => "window.open(\"#{ compute_public_path('wiki_syntax', 'help', 'html') }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
                 javascript_include_tag('jstoolbar/jstoolbar') +
                   javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language}") +
                   javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.setHelpLink('#{help_link}'); toolbar.draw();")
               end
               def content_for(name, content = nil, &block)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
             end

app/helpers/repositories_helper.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006  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.
             require 'coderay'
             require 'coderay/helpers/file_type'
             require 'iconv'
             module RepositoriesHelper
               def syntax_highlight(name, content)
                 type = CodeRay::FileType[name]
                 type ? CodeRay.scan(content, type).html : h(content)
               end
+              def format_revision(txt)
+                txt.to_s[0,8]
+              end
               def to_utf8(str)
                 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
                 @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
                 @encodings.each do |encoding|
                   begin
                     return Iconv.conv('UTF-8', encoding, str)
                   rescue Iconv::Failure
                     # do nothing here and try the next encoding
                   end
                 end
                 str
               end
               def repository_field_tags(form, repository)
                 method = repository.class.name.demodulize.underscore + "_field_tags"
                 send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
               end
               def scm_select_tag(repository)
                 container = [[]]
                 REDMINE_SUPPORTED_SCM.each {|scm| container << ["Repository::#{scm}".constantize.scm_name, scm]}
                 select_tag('repository_scm',
                            options_for_select(container, repository.class.name.demodulize),
                            :disabled => (repository && !repository.new_record?),
                            :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
                            )
               end
               def with_leading_slash(path)
                 path ||= ''
                 path.starts_with?('/') ? path : "/#{path}"
               end
               def subversion_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
                                    '<br />(http://, https://, svn://, file:///)') +
                   content_tag('p', form.text_field(:login, :size => 30)) +
                   content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
                                                        :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
                                                        :onfocus => "this.value=''; this.name='repository[password]';",
                                                        :onchange => "this.name='repository[password]';"))
               end
               def darcs_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
               end
               def mercurial_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
+              def git_field_tags(form, repository)
+                  content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
+              end
               def cvs_field_tags(form, repository)
                   content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
                   content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
               end
               def bazaar_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
               end
             end

app/models/changeset.rb +7 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               has_many :changes, :dependent => :delete_all
               has_and_belongs_to_many :issues
               acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
                             :description => :comments,
                             :datetime => :committed_on,
                             :author => :committer,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
               acts_as_searchable :columns => 'comments',
                                  :include => :repository,
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
-              validates_numericality_of :revision, :only_integer => true
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               def comments=(comment)
                 write_attribute(:comments, comment.strip)
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               def project
                 repository.project
               end
               def after_create
                 scan_comment_for_issue_ids
               end
               require 'pp'
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
                 # status and optional done ratio applied
                 fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
                 done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 return if kw_regexp.blank?
                 referenced_issues = []
                 if ref_keywords.delete('*')
                   # find any issue ID in the comments
                   target_issue_ids = []
                   comments.scan(%r{([\s\(,-^])#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
                   referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
                 end
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
                   if fix_status && fix_keywords.include?(action.downcase)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
                     target_issues.each do |issue|
                       # the issue may have been updated by the closure of another one (eg. duplicate)
                       issue.reload
                       # don't change the status is the issue is closed
                       next if issue.status.is_closed?
                       user = committer_user || User.anonymous
-                      journal = issue.init_journal(user, l(:text_status_changed_by_changeset, "r#{self.revision}"))
+                      csettext = "r#{self.revision}"
+                      if self.scmid && (! (csettext =~ /^r[0-9]+$/))
+                        csettext = "commit:\"#{self.scmid}\""
+                      end
+                      journal = issue.init_journal(user, l(:text_status_changed_by_changeset, csettext))
                       issue.status = fix_status
                       issue.done_ratio = done_ratio if done_ratio
                       issue.save
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     end
                   end
                   referenced_issues += target_issues
                 end
                 self.issues = referenced_issues.uniq
               end
               # Returns the Redmine User corresponding to the committer
               def committer_user
                 if committer && committer.strip =~ /^([^<]+)(<(.*)>)?$/
                   username, email = $1.strip, $3
                   u = User.find_by_login(username)
                   u ||= User.find_by_mail(email) unless email.blank?
                   u
                 end
               end
               # Returns the previous changeset
               def previous
-                @previous ||= Changeset.find(:first, :conditions => ['revision < ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision DESC')
+                @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
               end
               # Returns the next changeset
               def next
-                @next ||= Changeset.find(:first, :conditions => ['revision > ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision ASC')
+                @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
               end
             end

app/models/repository.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             class Repository < ActiveRecord::Base
               belongs_to :project
-              has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.revision DESC"
+              has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
               has_many :changes, :through => :changesets
               def scm
                 @scm ||= self.scm_adapter.new url, root_url, login, password
                 update_attribute(:root_url, @scm.root_url) if root_url.blank?
                 @scm
               end
               def scm_name
                 self.class.scm_name
               end
               def supports_cat?
                 scm.supports_cat?
               end
               def supports_annotate?
                 scm.supports_annotate?
               end
               def entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)
               end
               def diff(path, rev, rev_to, type)
                 scm.diff(path, rev, rev_to, type)
               end
               # Default behaviour: we search in cached changesets
               def changesets_for_path(path)
                 path = "/#{path}" unless path.starts_with?('/')
                 Change.find(:all, :include => :changeset,
                   :conditions => ["repository_id = ? AND path = ?", id, path],
-                  :order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset)
+                  :order => "committed_on DESC, #{Changeset.table_name}.id DESC").collect(&:changeset)
               end
               def latest_changeset
                 @latest_changeset ||= changesets.find(:first)
               end
               def scan_changesets_for_issue_ids
                 self.changesets.each(&:scan_comment_for_issue_ids)
               end
               # fetch new changesets for all repositories
               # can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
                 find(:all).each(&:fetch_changesets)
               end
               # scan changeset comments to find related and fixed issues for all repositories
               def self.scan_changesets_for_issue_ids
                 find(:all).each(&:scan_changesets_for_issue_ids)
               end
               def self.scm_name
                 'Abstract'
               end
               def self.available_scm
                 subclasses.collect {|klass| [klass.scm_name, klass.name]}
               end
               def self.factory(klass_name, *args)
                 klass = "Repository::#{klass_name}".constantize
                 klass.new(*args)
               rescue
                 nil
               end
             end

app/models/repository/bazaar.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'redmine/scm/adapters/bazaar_adapter'
             class Repository::Bazaar < Repository
               attr_protected :root_url
               validates_presence_of :url
               def scm_adapter
                 Redmine::Scm::Adapters::BazaarAdapter
               end
               def self.scm_name
                 'Bazaar'
               end
               def entries(path=nil, identifier=nil)
                 entries = scm.entries(path, identifier)
                 if entries
                   entries.each do |e|
                     next if e.lastrev.revision.blank?
                     c = Change.find(:first,
                                     :include => :changeset,
                                     :conditions => ["#{Change.table_name}.revision = ? and #{Changeset.table_name}.repository_id = ?", e.lastrev.revision, id],
                                     :order => "#{Changeset.table_name}.revision DESC")
                     if c
                       e.lastrev.identifier = c.changeset.revision
                       e.lastrev.name = c.changeset.revision
                       e.lastrev.author = c.changeset.committer
                     end
                   end
                 end
               end
               def fetch_changesets
                 scm_info = scm.info
                 if scm_info
                   # latest revision found in database
-                  db_revision = latest_changeset ? latest_changeset.revision : 0
+                  db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
                   # latest revision in the repository
                   scm_revision = scm_info.lastrev.identifier.to_i
                   if db_revision < scm_revision
                     logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
                     identifier_from = db_revision + 1
                     while (identifier_from <= scm_revision)
                       # loads changesets by batches of 200
                       identifier_to = [identifier_from + 199, scm_revision].min
                       revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
                       transaction do
                         revisions.reverse_each do |revision|
                           changeset = Changeset.create(:repository => self,
                                                        :revision => revision.identifier,
                                                        :committer => revision.author,
                                                        :committed_on => revision.time,
                                                        :scmid => revision.scmid,
                                                        :comments => revision.message)
                           revision.paths.each do |change|
                             Change.create(:changeset => changeset,
                                           :action => change[:action],
                                           :path => change[:path],
                                           :revision => change[:revision])
                           end
                         end
                       end unless revisions.nil?
                       identifier_from = identifier_to + 1
                     end
                   end
                 end
               end
             end

app/models/repository/cvs.rb +14 -16

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'redmine/scm/adapters/cvs_adapter'
             require 'digest/sha1'
             class Repository::Cvs < Repository
               validates_presence_of :url, :root_url
               def scm_adapter
                 Redmine::Scm::Adapters::CvsAdapter
               end
               def self.scm_name
                 'CVS'
               end
               def entry(path, identifier)
                 e = entries(path, identifier)
                 e ? e.first : nil
               end
               def entries(path=nil, identifier=nil)
                 entries=scm.entries(path, identifier)
                 if entries
                   entries.each() do |entry|
                     unless entry.lastrev.nil? || entry.lastrev.identifier
                       change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) )
                       if change
                         entry.lastrev.identifier=change.changeset.revision
                         entry.lastrev.author=change.changeset.committer
                         entry.lastrev.revision=change.revision
                         entry.lastrev.branch=change.branch
                       end
                     end
                   end
                 end
                 entries
               end
               def diff(path, rev, rev_to, type)
                 #convert rev to revision. CVS can't handle changesets here
                 diff=[]
                 changeset_from=changesets.find_by_revision(rev)
                 if rev_to.to_i > 0
                   changeset_to=changesets.find_by_revision(rev_to)
                 end
                 changeset_from.changes.each() do |change_from|
                   revision_from=nil
                   revision_to=nil
                   revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
                   if revision_from
                     if changeset_to
                       changeset_to.changes.each() do |change_to|
                         revision_to=change_to.revision if change_to.path==change_from.path
                       end
                     end
                     unless revision_to
                       revision_to=scm.get_previous_revision(revision_from)
                     end
                     diff=diff+scm.diff(change_from.path, revision_from, revision_to, type)
                   end
                 end
                 return diff
               end
               def fetch_changesets
-                #not the preferred way with CVS. maybe we should introduce always a cron-job for this
-                last_commit = changesets.maximum(:committed_on)
                 # some nifty bits to introduce a commit-id with cvs
                 # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
                 # we now take a guess using the author, the commitlog and the commit-date.
                 # last one is the next step to take. the commit-date is not equal for all
                 # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
                 # we use a small delta here, to merge all changes belonging to _one_ changeset
                 time_delta=10.seconds
+                fetch_since = latest_changeset ? latest_changeset.committed_on : nil
                 transaction do
-                  scm.revisions('', last_commit, nil, :with_paths => true) do |revision|
+                  tmp_rev_num = 1
+                  scm.revisions('', fetch_since, nil, :with_paths => true) do |revision|
                     # only add the change to the database, if it doen't exists. the cvs log
                     # is not exclusive at all.
                     unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
                       revision
                       cs = changesets.find(:first, :conditions=>{
                         :committed_on=>revision.time-time_delta..revision.time+time_delta,
                         :committer=>revision.author,
                         :comments=>revision.message
                       })
                       # create a new changeset....
                       unless cs
-                        # we use a negative changeset-number here (just for inserting)
+                        # we use a temporaray revision number here (just for inserting)
                         # later on, we calculate a continous positive number
-                        next_rev = changesets.minimum(:revision)
+                        latest = changesets.find(:first, :order => 'id DESC')
-                        next_rev = 0 if next_rev.nil? or next_rev > 0
-                        next_rev = next_rev - 1
                         cs = Changeset.create(:repository => self,
-                        :revision => next_rev,
+                                              :revision => "_#{tmp_rev_num}",
                                               :committer => revision.author,
                                               :committed_on => revision.time,
                                               :comments => revision.message)
+                        tmp_rev_num += 1
                       end
                       #convert CVS-File-States to internal Action-abbrevations
                       #default action is (M)odified
                       action="M"
                       if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1"
                         action="A" #add-action always at first revision (= 1.1)
                       elsif revision.paths[0][:action]=="dead"
                         action="D" #dead-state is similar to Delete
                       end
                       Change.create(:changeset => cs,
                       :action => action,
                       :path => scm.with_leading_slash(revision.paths[0][:path]),
                       :revision => revision.paths[0][:revision],
                       :branch => revision.paths[0][:branch]
                       )
                     end
                   end
-                  next_rev = [changesets.maximum(:revision) || 0, 0].max
+                  # Renumber new changesets in chronological order
-                  changesets.find(:all, :conditions=>["revision < 0"], :order=>"committed_on ASC").each() do |changeset|
+                  c = changesets.find(:first, :order => 'committed_on DESC, id DESC', :conditions => "revision NOT LIKE '_%'")
-                    next_rev = next_rev + 1
+                  next_rev = c.nil? ? 1 : (c.revision.to_i + 1)
-                    changeset.revision = next_rev
+                  changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset|
-                    changeset.save!
+                    changeset.update_attribute :revision, next_rev
-                  end
+                    next_rev += 1
                   end
+                end # transaction
               end
             end

app/models/repository/darcs.rb +3 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'redmine/scm/adapters/darcs_adapter'
             class Repository::Darcs < Repository
               validates_presence_of :url
               def scm_adapter
                 Redmine::Scm::Adapters::DarcsAdapter
               end
               def self.scm_name
                 'Darcs'
               end
               def entries(path=nil, identifier=nil)
                 entries=scm.entries(path, identifier)
                 if entries
                   entries.each do |entry|
                     # Search the DB for the entry's last change
                     changeset = changesets.find_by_scmid(entry.lastrev.scmid) if entry.lastrev && !entry.lastrev.scmid.blank?
                     if changeset
                       entry.lastrev.identifier = changeset.revision
                       entry.lastrev.name = changeset.revision
                       entry.lastrev.time = changeset.committed_on
                       entry.lastrev.author = changeset.committer
                     end
                   end
                 end
                 entries
               end
               def diff(path, rev, rev_to, type)
                 patch_from = changesets.find_by_revision(rev)
+                return nil if patch_from.nil?
                 patch_to = changesets.find_by_revision(rev_to) if rev_to
                 if path.blank?
                   path = patch_from.changes.collect{|change| change.path}.join(' ')
                 end
-                scm.diff(path, patch_from.scmid, patch_to.scmid, type)
+                patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil, type) : nil
               end
               def fetch_changesets
                 scm_info = scm.info
                 if scm_info
                   db_last_id = latest_changeset ? latest_changeset.scmid : nil
-                  next_rev = latest_changeset ? latest_changeset.revision + 1 : 1
+                  next_rev = latest_changeset ? latest_changeset.revision.to_i + 1 : 1
                   # latest revision in the repository
                   scm_revision = scm_info.lastrev.scmid
                   unless changesets.find_by_scmid(scm_revision)
                     revisions = scm.revisions('', db_last_id, nil, :with_path => true)
                     transaction do
                       revisions.reverse_each do |revision|
                         changeset = Changeset.create(:repository => self,
                                                      :revision => next_rev,
                                                      :scmid => revision.scmid,
                                                      :committer => revision.author,
                                                      :committed_on => revision.time,
                                                      :comments => revision.message)
-                        next if changeset.new_record?
                         revision.paths.each do |change|
                           Change.create(:changeset => changeset,
                                         :action => change[:action],
                                         :path => change[:path],
                                         :from_path => change[:from_path],
                                         :from_revision => change[:from_revision])
                         end
                         next_rev += 1
                       end if revisions
                     end
                   end
                 end
               end
             end

app/models/repository/subversion.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'redmine/scm/adapters/subversion_adapter'
             class Repository::Subversion < Repository
               attr_protected :root_url
               validates_presence_of :url
               validates_format_of :url, :with => /^(http|https|svn|svn\+ssh|file):\/\/.+/i
               def scm_adapter
                 Redmine::Scm::Adapters::SubversionAdapter
               end
               def self.scm_name
                 'Subversion'
               end
               def changesets_for_path(path)
                 revisions = scm.revisions(path)
                 revisions ? changesets.find_all_by_revision(revisions.collect(&:identifier), :order => "committed_on DESC") : []
               end
               def fetch_changesets
                 scm_info = scm.info
                 if scm_info
                   # latest revision found in database
-                  db_revision = latest_changeset ? latest_changeset.revision : 0
+                  db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
                   # latest revision in the repository
                   scm_revision = scm_info.lastrev.identifier.to_i
                   if db_revision < scm_revision
                     logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
                     identifier_from = db_revision + 1
                     while (identifier_from <= scm_revision)
                       # loads changesets by batches of 200
                       identifier_to = [identifier_from + 199, scm_revision].min
                       revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
                       transaction do
                         revisions.reverse_each do |revision|
                           changeset = Changeset.create(:repository => self,
                                                        :revision => revision.identifier,
                                                        :committer => revision.author,
                                                        :committed_on => revision.time,
                                                        :comments => revision.message)
                           revision.paths.each do |change|
                             Change.create(:changeset => changeset,
                                           :action => change[:action],
                                           :path => change[:path],
                                           :from_path => change[:from_path],
                                           :from_revision => change[:from_revision])
                           end
                         end
                       end unless revisions.nil?
                       identifier_from = identifier_to + 1
                     end
                   end
                 end
               end
             end

app/views/repositories/_dir_list_content.rhtml +1 -1

             <% @entries.each do |entry| %>
             <% tr_id = Digest::MD5.hexdigest(entry.path)
                depth = params[:depth].to_i %>
             <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry">
             <td class="filename">
             <%= if entry.is_dir?
               link_to_remote h(entry.name),
                              {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                               :update => { :success => tr_id },
                               :position => :after,
                               :success => "scmEntryLoaded('#{tr_id}')",
                               :condition => "scmEntryClick('#{tr_id}')"
                              },
                              {:href => url_for({:action => 'browse', :id => @project, :path => entry.path, :rev => @rev}),
                               :class => ('icon icon-folder'),
                               :style => "margin-left: #{18 * depth}px;"
                              }
             else
               link_to h(entry.name),
                       {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => entry.path, :rev => @rev},
                       :class => 'icon icon-file',
                       :style => "margin-left: #{18 * depth}px;"
             end %>
             </td>
             <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
-            <td class="revision"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
+            <td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
             <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
             <td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
             <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
             <td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
             </tr>
             <% end %>

app/views/repositories/_revisions.rhtml +1 -1

             <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %>
             <table class="list changesets">
             <thead><tr>
             <th>#</th>
             <th></th>
             <th></th>
             <th><%= l(:label_date) %></th>
             <th><%= l(:field_author) %></th>
             <th><%= l(:field_comments) %></th>
             </tr></thead>
             <tbody>
             <% show_diff = entry && entry.is_file? && revisions.size > 1 %>
             <% line_num = 1 %>
             <% revisions.each do |changeset| %>
             <tr class="changeset <%= cycle 'odd', 'even' %>">
-            <td class="id"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></td>
+            <td class="id"><%= link_to format_revision(changeset.revision), :action => 'revision', :id => project, :rev => changeset.revision %></td>
             <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
             <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
             <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
             <td class="author"><%=h changeset.committer.to_s.split('<').first %></td>
             <td class="comments"><%= textilizable(changeset.comments) %></td>
             </tr>
             <% line_num += 1 %>
             <% end %>
             </tbody>
             </table>
             <%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
             <% end %>

app/views/repositories/annotate.rhtml +1 -1

             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
             <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
             <div class="autoscroll">
             <table class="filecontent annotate CodeRay">
               <tbody>
                 <% line_num = 1 %>
                 <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
                 <% revision = @annotate.revisions[line_num-1] %>
                 <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
                   <th class="line-num"><%= line_num %></th>
                   <td class="revision">
-                  <%= (revision.identifier ? link_to(revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier) : revision.revision) if revision %></td>
+                  <%= (revision.identifier ? link_to(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %></td>
                   <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
                   <td class="line-code"><pre><%= line %></pre></td>
                 </tr>
                 <% line_num += 1 %>
                 <% end %>
               </tbody>
             </table>
             </div>
             <% html_title(l(:button_annotate)) -%>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/repositories/diff.rhtml +5 -5

-            <h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2>
+            <h2><%= l(:label_revision) %> <%= format_revision(@rev) %> <%= @path.gsub(/^.*\//, '') %></h2>
             <!-- Choose view type -->
             <% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
               <% params.each do |k, p| %>
                 <% if k != "type" %>
                   <%= hidden_field_tag(k,p) %>
                 <% end %>
                 <% end %>
               <p><label><%= l(:label_view_diff) %></label>
               <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
             <% end %>
             <% cache(@cache_key) do %>
             <% @diff.each do |table_file| %>
             <div class="autoscroll">
             <% if @diff_type == 'sbs' %>
                 <table class="filecontent CodeRay">
                   <thead>
                     <tr>
                       <th colspan="4" class="filename">
                         <%= table_file.file_name %>
                       </th>
                     </tr>
                     <tr>
-                      <th colspan="2">@<%= @rev %></th>
+                      <th colspan="2">@<%= format_revision @rev %></th>
-                      <th colspan="2">@<%= @rev_to %></th>
+                      <th colspan="2">@<%= format_revision @rev_to %></th>
                     </tr>
                   </thead>
                   <tbody>
                     <% table_file.keys.sort.each do |key| %>
                       <tr>
                         <th class="line-num">
                           <%= table_file[key].nb_line_left %>
                         </th>
                         <td class="line-code <%= table_file[key].type_diff_left %>">
                           <pre><%=to_utf8 table_file[key].line_left %></pre>
                         </td>
                         <th class="line-num">
                           <%= table_file[key].nb_line_right %>
                         </th>
                         <td class="line-code <%= table_file[key].type_diff_right %>">
                           <pre><%=to_utf8 table_file[key].line_right %></pre>
                         </td>
                       </tr>
                     <% end %>
                   </tbody>
                 </table>
             <% else %>
                 <table class="filecontent CodeRay">
                   <thead>
                     <tr>
                       <th colspan="3" class="filename">
                         <%= table_file.file_name %>
                       </th>
                     </tr>
                     <tr>
-                      <th>@<%= @rev %></th>
+                      <th>@<%= format_revision @rev %></th>
-                      <th>@<%= @rev_to %></th>
+                      <th>@<%= format_revision @rev_to %></th>
                       <th></th>
                     </tr>
                   </thead>
                   <tbody>
                     <% table_file.keys.sort.each do |key, line| %>
                       <tr>
                         <th class="line-num">
                           <%= table_file[key].nb_line_left %>
                         </th>
                         <th class="line-num">
                           <%= table_file[key].nb_line_right %>
                         </th>
                         <% if table_file[key].line_left.empty? %>
                           <td class="line-code <%= table_file[key].type_diff_right %>">
                             <pre><%=to_utf8 table_file[key].line_right %></pre>
                           </td>
                         <% else %>
                           <td class="line-code <%= table_file[key].type_diff_left %>">
                             <pre><%=to_utf8 table_file[key].line_left %></pre>
                           </td>
                         <% end %>
                       </tr>
                     <% end %>
                   </tbody>
                 </table>
             <% end %>
             </div>
             <% end %>
             <% end %>
             <% html_title(with_leading_slash(@path), 'Diff') -%>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>

app/views/repositories/revision.rhtml +1 -1

             <div class="contextual">
               &#171;
               <% unless @changeset.previous.nil? -%>
                 <%= link_to l(:label_previous), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.previous.revision %>
               <% else -%>
                 <%= l(:label_previous) %>
               <% end -%>
             |
               <% unless @changeset.next.nil? -%>
                 <%= link_to l(:label_next), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.next.revision %>
               <% else -%>
                 <%= l(:label_next) %>
               <% end -%>
               &#187;&nbsp;
               <% form_tag do %>
                 <%= text_field_tag 'rev', @rev, :size => 5 %>
                 <%= submit_tag 'OK' %>
               <% end %>
             </div>
-            <h2><%= l(:label_revision) %> <%= @changeset.revision %></h2>
+            <h2><%= l(:label_revision) %> <%= format_revision(@changeset.revision) %></h2>
             <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
             <em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p>
             <%= textilizable @changeset.comments %>
             <% if @changeset.issues.any? %>
             <h3><%= l(:label_related_issues) %></h3>
             <ul>
             <% @changeset.issues.each do |issue| %>
               <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
             <% end %>
             </ul>
             <% end %>
             <h3><%= l(:label_attachment_plural) %></h3>
             <div style="float:right;">
             <div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %>&nbsp;</div>
             <div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %>&nbsp;</div>
             <div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %>&nbsp;</div>
             </div>
             <p><%= link_to(l(:label_view_diff), :action => 'diff', :id => @project, :path => "", :rev => @changeset.revision) if @changeset.changes.any? %></p>
             <table class="list">
             <tbody>
             <% @changes.each do |change| %>
             <tr class="<%= cycle 'odd', 'even' %>">
             <td><div class="square action_<%= change.action %>"></div> <%= change.path %> <%= "(#{change.revision})" unless change.revision.blank?  %></td>
             <td align="right">
             <% if change.action == "M" %>
             <%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => change.path, :rev => @changeset.revision %>
             <% end %>
             </td>
             </tr>
             <% end %>
             </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @changes_pages %></p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>
             <% html_title("#{l(:label_revision)} #{@changeset.revision}") -%>

doc/RUNNING_TESTS +16 0

             Creating test repositories
             ===================
             mkdir tmp/test
             Subversion
             ----------
             svnadmin create tmp/test/subversion_repository
             gunzip < test/fixtures/repositories/subversion_repository.dump.gz | svnadmin load tmp/test/subversion_repository
             CVS
             ---
             gunzip < test/fixtures/repositories/cvs_repository.tar.gz | tar -xv -C tmp/test
             Bazaar
             ------
             gunzip < test/fixtures/repositories/bazaar_repository.tar.gz | tar -xv -C tmp/test
             Mercurial
             ---------
             gunzip < test/fixtures/repositories/mercurial_repository.tar.gz | tar -xv -C tmp/test
+            Git
+            ---
+            gunzip < test/fixtures/repositories/git_repository.tar.gz | tar -xv -C tmp/test
+            Running Tests
+            =============
+            Run
+              rake --tasks | grep test
+            to see available tests.
+            RAILS_ENV=test rake test will run tests.

lib/redmine.rb +1 -1

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/mime_type'
             require 'redmine/themes'
             require 'redmine/plugin'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
-            REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar )
+            REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar Git )
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show, :activity]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy]}, :require => :member
               map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:projects => [:changelog, :roadmap],
                                               :issues => [:index, :changes, :show, :context_menu],
                                               :versions => [:show, :status_by],
                                               :queries => :index,
                                               :reports => :issue_report}, :public => true
                 map.permission :add_issues, {:issues => :new}
                 map.permission :edit_issues, {:issues => [:edit, :bulk_edit, :destroy_attachment]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :add_issue_notes, {:issues => :edit}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issues => :move}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                 # Gantt & calendar
                 map.permission :view_gantt, :projects => :gantt
                 map.permission :view_calendar, :projects => :calendar
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => :edit}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:details, :report]
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:news => [:new, :edit, :destroy, :destroy_comment]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:news => :add_comment}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment, :destroy_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:projects => :add_file, :versions => :destroy_file}, :require => :loggedin
                 map.permission :view_files, :projects => :list_files, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :annotate, :special]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment]
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:edit, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply]}
                 map.permission :edit_messages, {:messages => :edit}, :require => :member
                 map.permission :delete_messages, {:messages => :destroy}, :require => :member
               end
             end
             Redmine::MenuManager.map :top_menu do |menu|
               menu.push :home, :home_url, :html => { :class => 'home' }
               menu.push :my_page, { :controller => 'my', :action => 'page' }, :html => { :class => 'mypage' }, :if => Proc.new { User.current.logged? }
               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural, :html => { :class => 'projects' }
               menu.push :administration, { :controller => 'admin', :action => 'index' }, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? }
               menu.push :help, Redmine::Info.help_url, :html => { :class => 'help' }
             end
             Redmine::MenuManager.map :account_menu do |menu|
               menu.push :login, :signin_url, :html => { :class => 'login' }, :if => Proc.new { !User.current.logged? }
               menu.push :register, { :controller => 'account', :action => 'register' }, :html => { :class => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
               menu.push :my_account, { :controller => 'my', :action => 'account' }, :html => { :class => 'myaccount' }, :if => Proc.new { User.current.logged? }
               menu.push :logout, :signout_url, :html => { :class => 'logout' }, :if => Proc.new { User.current.logged? }
             end
             Redmine::MenuManager.map :application_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }
               menu.push :activity, { :controller => 'projects', :action => 'activity' }
               menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' },
                           :if => Proc.new { |p| p.versions.any? }
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                           :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil },
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
               menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
               menu.push :repository, { :controller => 'repositories', :action => 'show' },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :settings, { :controller => 'projects', :action => 'settings' }
             end

lib/redmine/scm/adapters/darcs_adapter.rb +5 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'redmine/scm/adapters/abstract_adapter'
             require 'rexml/document'
             module Redmine
               module Scm
                 module Adapters
                   class DarcsAdapter < AbstractAdapter
                     # Darcs executable name
                     DARCS_BIN = "darcs"
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @root_url = url
                     end
                     def supports_cat?
                       false
                     end
                     # Get info about the svn repository
                     def info
                       rev = revisions(nil,nil,nil,{:limit => 1})
                       rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : nil
                     end
                     # Returns the entry identified by path and revision identifier
                     # or nil if entry doesn't exist in the repository
                     def entry(path=nil, identifier=nil)
                       e = entries(path, identifier)
                       e ? e.first : nil
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path_prefix = (path.blank? ? '' : "#{path}/")
                       path = '.' if path.blank?
                       entries = Entries.new
                       cmd = "#{DARCS_BIN} annotate --repodir #{@url} --xml-output #{path}"
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           if doc.root.name == 'directory'
                             doc.elements.each('directory/*') do |element|
                               next unless ['file', 'directory'].include? element.name
                               entries << entry_from_xml(element, path_prefix)
                             end
                           elsif doc.root.name == 'file'
                             entries << entry_from_xml(doc.root, path_prefix)
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path = '.' if path.blank?
                       revisions = Revisions.new
                       cmd = "#{DARCS_BIN} changes --repodir #{@url} --xml-output"
                       cmd << " --from-match \"hash #{identifier_from}\"" if identifier_from
                       cmd << " --last #{options[:limit].to_i}" if options[:limit]
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           doc.elements.each("changelog/patch") do |patch|
                             message = patch.elements['name'].text
                             message << "\n" + patch.elements['comment'].text.gsub(/\*\*\*END OF DESCRIPTION\*\*\*.*\z/m, '') if patch.elements['comment']
                             revisions << Revision.new({:identifier => nil,
                                           :author => patch.attributes['author'],
                                           :scmid => patch.attributes['hash'],
                                           :time => Time.parse(patch.attributes['local_date']),
                                           :message => message,
                                           :paths => (options[:with_path] ? get_paths_for_patch(patch.attributes['hash']) : nil)
                                         })
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       path = '*' if path.blank?
                       cmd = "#{DARCS_BIN} diff --repodir #{@url}"
+                      if identifier_to.nil?
+                        cmd << " --match \"hash #{identifier_from}\""
+                      else
                         cmd << " --to-match \"hash #{identifier_from}\""
-                      cmd << " --from-match \"hash #{identifier_to}\"" if identifier_to
+                        cmd << " --from-match \"hash #{identifier_to}\""
+                      end
                       cmd << " -u #{path}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       DiffTableList.new diff, type
                     end
                     private
                     def entry_from_xml(element, path_prefix)
                       Entry.new({:name => element.attributes['name'],
                                  :path => path_prefix + element.attributes['name'],
                                  :kind => element.name == 'file' ? 'file' : 'dir',
                                  :size => nil,
                                  :lastrev => Revision.new({
                                    :identifier => nil,
                                    :scmid => element.elements['modified'].elements['patch'].attributes['hash']
                                    })
                                  })
                     end
                     # Retrieve changed paths for a single patch
                     def get_paths_for_patch(hash)
                       cmd = "#{DARCS_BIN} annotate --repodir #{@url} --summary --xml-output"
                       cmd << " --match \"hash #{hash}\" "
                       paths = []
                       shellout(cmd) do |io|
                         begin
                           # Darcs xml output has multiple root elements in this case (tested with darcs 1.0.7)
                           # A root element is added so that REXML doesn't raise an error
                           doc = REXML::Document.new("<fake_root>" + io.read + "</fake_root>")
                           doc.elements.each('fake_root/summary/*') do |modif|
                             paths << {:action => modif.name[0,1].upcase,
                                       :path => "/" + modif.text.chomp.gsub(/^\s*/, '')
                                      }
                           end
                         rescue
                         end
                       end
                       paths
                     rescue CommandFailed
                       paths
                     end
                   end
                 end
               end
             end

test/unit/repository_cvs_test.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'pp'
             class RepositoryCvsTest < Test::Unit::TestCase
               fixtures :projects
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
               # CVS module
               MODULE_NAME = 'test'
               def setup
                 @project = Project.find(1)
                 assert @repository = Repository::Cvs.create(:project => @project,
                                                             :root_url => REPOSITORY_PATH,
                                                             :url => MODULE_NAME)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 5, @repository.changesets.count
                   assert_equal 14, @repository.changes.count
-                  assert_equal 'Two files changed', @repository.changesets.find_by_revision(3).comments
+                  assert_not_nil @repository.changesets.find_by_comments('Two files changed')
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
-                  # Remove changesets with revision > 2
+                  # Remove the 3 latest changesets
-                  @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+                  @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy)
                   @repository.reload
                   assert_equal 2, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 5, @repository.changesets.count
                 end
               else
                 puts "CVS test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages