jro_apps/redmine Commit - r1259:f162337e1b36

0

app/controllers/repositories_controller.rb +1 -1

               def annotate
                 @annotate = @repository.scm.annotate(@path, @rev)
-                show_error_not_found and return if @annotate.nil? || @annotate.empty?
+                render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end

0

app/views/repositories/changes.rhtml +5 -7

             <h3><%=h @entry.name %></h3>
             <p>
-            <% if @entry.is_text? %>
+            <% if @repository.supports_cat? %>
-                <% if @repository.supports_cat? %>
+                <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
-                    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+            <% end %>
-                <% end %>
+            <% if @repository.supports_annotate? %>
-                <% if @repository.supports_annotate? %>
+                <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
-                    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
-                <% end %>
             <% end %>
             <%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
             <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>

0

lang/bg.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/cs.yml +1 0

             enumeration_issue_priorities: Priority úkolů
             enumeration_doc_categories: Kategorie dokumentů
             enumeration_activities: Aktivity (sledování času)
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/da.yml +1 0

             label_preferences: Preferences
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/de.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/en.yml +2 -1

             notice_default_data_loaded: Default configuration successfully loaded.
             error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-            error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
+            error_scm_not_found: "The entry or revision was not found in the repository."
             error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+            error_scm_annotate: "The entry does not exist or can not be annotated."
             error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
             mail_subject_lost_password: Your %s password

0

lang/es.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/fi.yml +1 0

             label_preferences: Asetukset
             setting_default_projects_public: New projects are public by default
             label_overall_activity: Overall activity
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/fr.yml +1 0

             error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage: %s"
             error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
             error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt: %s"
+            error_scm_annotate: "L'entrée n'existe pas ou ne peut pas être annotée."
             error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet"
             mail_subject_lost_password: Votre mot de passe %s

0

lang/he.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/it.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/ja.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/ko.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/lt.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/nl.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/pl.yml +1 0

             label_preferences: Preferences
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/pt-br.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/pt.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/ro.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/ru.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/sr.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/sv.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/uk.yml +1 0

             setting_display_subprojects_issues: Display subprojects issues on main projects by default
             label_overall_activity: Overall activity
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/zh-tw.yml +1 0

             enumeration_issue_priorities: 項目優先權
             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (時間追蹤)
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lang/zh.yml +1 0

             enumeration_doc_categories: 文档类别
             enumeration_activities: 活动（时间跟踪）
             setting_default_projects_public: New projects are public by default
+            error_scm_annotate: "The entry does not exist or can not be annotated."

0

lib/redmine/mime_type.rb +1 -1

                   'text/css' => 'css',
                   'text/html' => 'html,htm,xhtml',
                   'text/jsp' => 'jsp',
-                  'text/x-c' => 'c,cpp,h',
+                  'text/x-c' => 'c,cpp,cc,h,hh',
                   'text/x-java' => 'java',
                   'text/x-javascript' => 'js',
                   'text/x-html-template' => 'rhtml',

0

lib/redmine/scm/adapters/git_adapter.rb +8 -6

@@ -231,13 +231,15 module Redmine
231	identifier = 'HEAD' if identifier.blank?	231	identifier = 'HEAD' if identifier.blank?
232	cmd = "#{GIT_BIN} --git-dir #{target('')} blame -l #{shell_quote identifier} -- #{shell_quote path}"	232	cmd = "#{GIT_BIN} --git-dir #{target('')} blame -l #{shell_quote identifier} -- #{shell_quote path}"
233	blame = Annotate.new	233	blame = Annotate.new
234	shellout(cmd) do \|io\|	234	content = nil
235	io.each_line do \|line\|	235	shellout(cmd) { \|io\| io.binmode; content = io.read }
236	next unless line =~ /([0-9a-f]{39,40})\s$(\w)[^$]\)(.*)$/
237	blame.add_line($3.rstrip, Revision.new(:identifier => $1, :author => $2.strip))
238	end
239	end
240	return nil if $? && $?.exitstatus != 0	236	return nil if $? && $?.exitstatus != 0
		237	# git annotates binary files
		238	return nil if content.is_binary_data?
		239	content.split("\n").each do \|line\|
		240	next unless line =~ /([0-9a-f]{39,40})\s$(\w)[^$]\)(.*)/
		241	blame.add_line($3.rstrip, Revision.new(:identifier => $1, :author => $2.strip))
		242	end
241	blame	243	blame
242	end	244	end
243		245

0

test/functional/repositories_cvs_controller_test.rb +1 -1

                 def test_entry_not_found
                   get :entry, :id => 1, :path => ['sources', 'zzz.c']
                   assert_tag :tag => 'div', :attributes => { :class => /error/ },
-                                            :content => /Entry and\/or revision doesn't exist/
+                                            :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download

0

test/functional/repositories_git_controller_test.rb +7 0

                              :sibling => { :tag => 'td', :content => /jsmith/ },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
+                def test_annotate_binary_file
+                  get :annotate, :id => 3, :path => ['images', 'delete.png']
+                  assert_response 500
+                  assert_tag :tag => 'div', :attributes => { :class => /error/ },
+                                            :content => /can not be annotated/
+                end
               else
                 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end

0

test/functional/repositories_subversion_controller_test.rb +1 -1

                 def test_entry_not_found
                   get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
                   assert_tag :tag => 'div', :attributes => { :class => /error/ },
-                                            :content => /Entry and\/or revision doesn't exist/
+                                            :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download

	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