##// END OF EJS Templates
jro_apps » redmine
RSS
scm: cvs: fix CVS diffs do not handle new files properly (#7615)....
Toshi MARUYAMA -
r4819:a2e47f9fbaf5
parent child
Show More
Side by Side Unified
Context file:
r4819:a2e47f9fbaf5 Loading diff...:
Show file before | Show file after | Hide comments
@@ -378,7 +378,11 module Redmine
378 private
378 private
379 def buildRevision(rev)
379 def buildRevision(rev)
380 if rev== 0
380 if rev== 0
381 @base
381 if @branchid.nil?
382 @base+".0"
383 else
384 @base
385 end
382 elsif @branchid.nil?
386 elsif @branchid.nil?
383 @base+"."+rev.to_s
387 @base+"."+rev.to_s
384 else
388 else
Show file before | Show file after | Hide comments
@@ -154,6 +154,24 class RepositoriesCvsControllerTest < ActionController::TestCase
154 assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
154 assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
155 :content => /watched.remove_all_watcher/
155 :content => /watched.remove_all_watcher/
156 end
156 end
157
158 def test_diff_new_files
159 @repository.fetch_changesets
160 @repository.reload
161 get :diff, :id => PRJ_ID, :rev => 1, :type => 'inline'
162 assert_response :success
163 assert_template 'diff'
164 assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
165 :content => /watched.remove_watcher/
166 assert_tag :tag => 'th', :attributes => { :class => 'filename' },
167 :content => /test\/README/
168 assert_tag :tag => 'th', :attributes => { :class => 'filename' },
169 :content => /test\/images\/delete.png /
170 assert_tag :tag => 'th', :attributes => { :class => 'filename' },
171 :content => /test\/images\/edit.png/
172 assert_tag :tag => 'th', :attributes => { :class => 'filename' },
173 :content => /test\/sources\/watchers_controller.rb/
174 end
157
175
158 def test_annotate
176 def test_annotate
159 @repository.fetch_changesets
177 @repository.fetch_changesets
General Comments 0
You need to be logged in to leave comments. Login now