jro_apps/redmine Commit - r2784:30ad78e57da3

Fixed: RepositoriesController#revision may show wrong revision (#3779)....

Jean-Philippe Lang -

r2784:30ad78e57da3

parent child

Context file:

r2784:30ad78e57da3

app/controllers/repositories_controller.rb +1 -1

               end
               def revision
-                @changeset = @repository.changesets.find(:first, :conditions => ["revision LIKE ?", @rev + '%'])
+                @changeset = @repository.find_changeset_by_name(@rev)
                 raise ChangesetNotFound unless @changeset
                 respond_to do |format|

app/models/repository.rb +5 0

                 path
               end
+              # Finds and returns a revision with a number or the beginning of a hash
+              def find_changeset_by_name(name)
+                changesets.find(:first, :conditions => (name.match(/^\d*$/) ? ["revision = ?", name.to_i] : ["revision LIKE ?", name + '%']))
+              end
               def latest_changeset
                 @latest_changeset ||= changesets.find(:first)
               end

test/fixtures/changesets.yml +20 0

test/fixtures/repositories/subversion_repository.dump.gz binary modified 0 0

NO CONTENT: modified file, binary diff hidden

test/functional/repositories_controller_test.rb +7 0

                 )
               end
+              def test_revision
+                get :revision, :id => 1, :rev => 1
+                assert_response :success
+                assert_not_nil assigns(:changeset)
+                assert_equal "1", assigns(:changeset).revision
+              end
               def test_revision_with_before_nil_and_afer_normal
                 get :revision, {:id => 1, :rev => 1}
                 assert_response :success

test/functional/repositories_subversion_controller_test.rb +1 -1

                   changesets = assigns(:changesets)
                   assert_not_nil changesets
-                  assert_equal %w(7 6 5 2), changesets.collect(&:revision)
+                  assert_equal %w(10 9 7 6 5 2), changesets.collect(&:revision)
                 end
                 def test_entry

test/unit/changeset_test.rb +1 -1

               end
               def test_next_nil
-                changeset = Changeset.find_by_revision('8')
+                changeset = Changeset.find_by_revision('10')
                 assert_nil changeset.next
               end
             end

test/unit/repository_subversion_test.rb +3 -3

                   @repository.fetch_changesets
                   @repository.reload
-                  assert_equal 8, @repository.changesets.count
+                  assert_equal 10, @repository.changesets.count
-                  assert_equal 16, @repository.changes.count
+                  assert_equal 18, @repository.changes.count
                   assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments
                 end
                   assert_equal 5, @repository.changesets.count
                   @repository.fetch_changesets
-                  assert_equal 8, @repository.changesets.count
+                  assert_equal 10, @repository.changesets.count
                 end
                 def test_latest_changesets_with_limit

General Comments 0

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

No TODOs yet

	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