kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rename sha to id

This commit is contained in:
Hiroyuki Sato 2016-12-15 14:40:15 +09:00
parent b1ca2c7dd8
commit 1f19275719
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/repository.rb
View File

@ -654,19 +654,19 @@ class Repository
end
def last_commit_for_path(sha, path)
sha = cache_last_commit_sha_for_path(sha, path)
sha = cache_last_commit_id_for_path(sha, path)
commit(sha)
end
def last_commit_sha_for_path(sha, path)
def last_commit_id_for_path(sha, path)
args = %W(#{Gitlab.config.git.bin_path} rev-list --max-count=1 #{sha} -- #{path})
Gitlab::Popen.popen(args, path_to_repo).first.strip
end
def cache_last_commit_sha_for_path(sha, path)
key = path.blank? ? "last_commit_sha_for_path:#{sha}" : "last_commit_id_for_path:#{sha}:#{Digest::SHA1.hexdigest(path)}"
def cache_last_commit_id_for_path(sha, path)
key = path.blank? ? "last_commit_id_for_path:#{sha}" : "last_commit_id_for_path:#{sha}:#{Digest::SHA1.hexdigest(path)}"
cache.fetch(key) do
last_commit_sha_for_path(sha, path)
last_commit_id_for_path(sha, path)
end
end

2
lib/api/files.rb
View File

@ -70,7 +70,7 @@ module API
ref: params[:ref],
blob_id: blob.id,
commit_id: commit.id,
last_commit_id: repo.cache_last_commit_sha_for_path(commit.sha, params[:file_path])
last_commit_id: repo.cache_last_commit_id_for_path(commit.sha, params[:file_path])
}
end