r18596@gaspard (orig r1860): nbc | 2008-09-14 21:03:46 +0200
bugfix r18597@gaspard (orig r1861): winterheart | 2008-09-15 17:14:34 +0200 #1902, translation for zh-tw r18598@gaspard (orig r1862): winterheart | 2008-09-15 17:16:53 +0200 #1907, translation for zh r18599@gaspard (orig r1863): winterheart | 2008-09-15 17:19:51 +0200 fixed #1905, patch for Hungarian language r18600@gaspard (orig r1864): winterheart | 2008-09-15 17:22:53 +0200 Minor typo, fixed #1897, thank Denis Tomashenko for reporting. r18601@gaspard (orig r1865): winterheart | 2008-09-15 18:07:30 +0200 Catalan translation (#1822), thanks to Joan Duran for contribuition. Some strings has wrong quoting, I fixed that. r18602@gaspard (orig r1866): nbc | 2008-09-15 21:37:43 +0200 * reposman can create git repository with "--scm git" option * light refactoring r18603@gaspard (orig r1867): jplang | 2008-09-16 23:54:53 +0200 Use RDoc.usage r18604@gaspard (orig r1868): jplang | 2008-09-16 23:56:02 +0200 mailhandler: fixes exit status and adds an explicit message if response code is 403. r18605@gaspard (orig r1869): winterheart | 2008-09-17 17:31:35 +0200 Patch #1909, updates for ru.yml r18606@gaspard (orig r1870): jplang | 2008-09-17 18:39:23 +0200 Render the commit changes list as a tree (#1896). r18607@gaspard (orig r1871): jplang | 2008-09-17 18:48:04 +0200 Fixed: http links containing parentheses fail to reder correctly (#1591). Patch by Paul Rivier. r18608@gaspard (orig r1872): jplang | 2008-09-17 19:18:05 +0200 Removes unused image references in stylesheets (#1914). r18609@gaspard (orig r1873): jplang | 2008-09-17 19:23:08 +0200 Fixed custom query sidebar links broken by r1797 (#1899). git-svn-id: http://redmine.rubyforge.org/svn/branches/nbc@1874 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
e5aed8b912
commit
54433282d3
52 files changed
+1155
-176
No files matched your search
@@ -32,6 +32,74 @@ module RepositoriesHelper
|
||||
end
|
||||
end
|
||||
|
||||
def render_changeset_changes
|
||||
changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
|
||||
case change.action
|
||||
when 'A'
|
||||
# Detects moved/copied files
|
||||
if !change.from_path.blank?
|
||||
change.action = @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
|
||||
end
|
||||
change
|
||||
when 'D'
|
||||
@changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
|
||||
else
|
||||
change
|
||||
end
|
||||
end.compact
|
||||
|
||||
tree = { }
|
||||
changes.each do |change|
|
||||
p = tree
|
||||
dirs = change.path.to_s.split('/').select {|d| !d.blank?}
|
||||
dirs.each do |dir|
|
||||
p[:s] ||= {}
|
||||
p = p[:s]
|
||||
p[dir] ||= {}
|
||||
p = p[dir]
|
||||
end
|
||||
p[:c] = change
|
||||
end
|
||||
|
||||
render_changes_tree(tree[:s])
|
||||
end
|
||||
|
||||
def render_changes_tree(tree)
|
||||
return '' if tree.nil?
|
||||
|
||||
output = ''
|
||||
output << '<ul>'
|
||||
tree.keys.sort.each do |file|
|
||||
s = !tree[file][:s].nil?
|
||||
c = tree[file][:c]
|
||||
|
||||
style = 'change'
|
||||
style << ' folder' if s
|
||||
style << " change-#{c.action}" if c
|
||||
|
||||
text = h(file)
|
||||
unless c.nil?
|
||||
path_param = to_path_param(@repository.relative_path(c.path))
|
||||
text = link_to(text, :controller => 'repositories',
|
||||
:action => 'entry',
|
||||
:id => @project,
|
||||
:path => path_param,
|
||||
:rev => @changeset.revision) unless s || c.action == 'D'
|
||||
text << " - #{c.revision}" unless c.revision.blank?
|
||||
text << ' (' + link_to('diff', :controller => 'repositories',
|
||||
:action => 'diff',
|
||||
:id => @project,
|
||||
:path => path_param,
|
||||
:rev => @changeset.revision) + ') ' if c.action == 'M'
|
||||
text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
|
||||
end
|
||||
output << "<li class='#{style}'>#{text}</li>"
|
||||
output << render_changes_tree(tree[file][:s]) if s
|
||||
end
|
||||
output << '</ul>'
|
||||
output
|
||||
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)
|
||||
|
||||
Reference in new issue
Block a user