Download as
Browse Code »

Commit 55572c4e86c6b4cb12c8984b54de57fc02972ad1

Authored by Dmitriy Zaporozhets
1 parent d701d586
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Repository#blob_at_branch 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 4 changed files with 13 additions and 6 deletions   Show diff stats
app/models/repository.rb
  Diff comments   View file @55572c4
... ... @@ -178,4 +178,14 @@ class Repository
178 178  
179 179 Tree.new(self, sha, path)
180 180 end
  181 +
  182 + def blob_at_branch(branch_name, path)
  183 + last_commit = commit(branch_name)
  184 +
  185 + if last_commit
  186 + blob_at(last_commit.sha, path)
  187 + else
  188 + nil
  189 + end
  190 + end
181 191 end
... ...
app/services/files/create_service.rb
  Diff comments   View file @55572c4
... ... @@ -24,8 +24,7 @@ module Files
24 24 return error("Your changes could not be committed, because file name contains not allowed characters")
25 25 end
26 26  
27   - commit = repository.commit(ref)
28   - blob = repository.blob_at(commit.sha, file_path)
  27 + blob = repository.blob_at_branch(ref, file_path)
29 28  
30 29 if blob
31 30 return error("Your changes could not be committed, because file with such name exists")
... ...
app/services/files/delete_service.rb
  Diff comments   View file @55572c4
... ... @@ -17,8 +17,7 @@ module Files
17 17 return error("You can only create files if you are on top of a branch")
18 18 end
19 19  
20   - commit = repository.commit(ref)
21   - blob = repository.blob_at(commit.sha, path)
  20 + blob = repository.blob_at_branch(ref, path)
22 21  
23 22 unless blob
24 23 return error("You can only edit text files")
... ...
app/services/files/update_service.rb
  Diff comments   View file @55572c4
... ... @@ -17,8 +17,7 @@ module Files
17 17 return error("You can only create files if you are on top of a branch")
18 18 end
19 19  
20   - commit = repository.commit(ref)
21   - blob = repository.blob_at(commit.sha, path)
  20 + blob = repository.blob_at_branch(ref, path)
22 21  
23 22 unless blob
24 23 return error("You can only edit text files")
... ...