Remove grit logic from app/
parent
d444a23ad6
commit
154e54b46e
|
@ -8,174 +8,15 @@ class Commit
|
||||||
#
|
#
|
||||||
DIFF_SAFE_SIZE = 100
|
DIFF_SAFE_SIZE = 100
|
||||||
|
|
||||||
attr_accessor :commit, :head, :refs
|
attr_accessor :raw
|
||||||
|
|
||||||
delegate :message, :authored_date, :committed_date, :parents, :sha,
|
def initialize(raw_commit)
|
||||||
:date, :committer, :author, :diffs, :tree, :id, :stats,
|
|
||||||
:to_patch, to: :commit
|
|
||||||
|
|
||||||
class << self
|
|
||||||
def find_or_first(repo, commit_id = nil, root_ref)
|
|
||||||
commit = if commit_id
|
|
||||||
repo.commit(commit_id)
|
|
||||||
else
|
|
||||||
repo.commits(root_ref).first
|
|
||||||
end
|
|
||||||
|
|
||||||
Commit.new(commit) if commit
|
|
||||||
end
|
|
||||||
|
|
||||||
def fresh_commits(repo, n = 10)
|
|
||||||
commits = repo.heads.map do |h|
|
|
||||||
repo.commits(h.name, n).map { |c| Commit.new(c, h) }
|
|
||||||
end.flatten.uniq { |c| c.id }
|
|
||||||
|
|
||||||
commits.sort! do |x, y|
|
|
||||||
y.committed_date <=> x.committed_date
|
|
||||||
end
|
|
||||||
|
|
||||||
commits[0...n]
|
|
||||||
end
|
|
||||||
|
|
||||||
def commits_with_refs(repo, n = 20)
|
|
||||||
commits = repo.branches.map { |ref| Commit.new(ref.commit, ref) }
|
|
||||||
|
|
||||||
commits.sort! do |x, y|
|
|
||||||
y.committed_date <=> x.committed_date
|
|
||||||
end
|
|
||||||
|
|
||||||
commits[0..n]
|
|
||||||
end
|
|
||||||
|
|
||||||
def commits_since(repo, date)
|
|
||||||
commits = repo.heads.map do |h|
|
|
||||||
repo.log(h.name, nil, since: date).each { |c| Commit.new(c, h) }
|
|
||||||
end.flatten.uniq { |c| c.id }
|
|
||||||
|
|
||||||
commits.sort! do |x, y|
|
|
||||||
y.committed_date <=> x.committed_date
|
|
||||||
end
|
|
||||||
|
|
||||||
commits
|
|
||||||
end
|
|
||||||
|
|
||||||
def commits(repo, ref, path = nil, limit = nil, offset = nil)
|
|
||||||
if path
|
|
||||||
repo.log(ref, path, max_count: limit, skip: offset)
|
|
||||||
elsif limit && offset
|
|
||||||
repo.commits(ref, limit, offset)
|
|
||||||
else
|
|
||||||
repo.commits(ref)
|
|
||||||
end.map{ |c| Commit.new(c) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def commits_between(repo, from, to)
|
|
||||||
repo.commits_between(from, to).map { |c| Commit.new(c) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def compare(project, from, to)
|
|
||||||
result = {
|
|
||||||
commits: [],
|
|
||||||
diffs: [],
|
|
||||||
commit: nil,
|
|
||||||
same: false
|
|
||||||
}
|
|
||||||
|
|
||||||
return result unless from && to
|
|
||||||
|
|
||||||
first = project.repository.commit(to.try(:strip))
|
|
||||||
last = project.repository.commit(from.try(:strip))
|
|
||||||
|
|
||||||
if first && last
|
|
||||||
result[:same] = (first.id == last.id)
|
|
||||||
result[:commits] = project.repo.commits_between(last.id, first.id).map {|c| Commit.new(c)}
|
|
||||||
|
|
||||||
# Dont load diff for 100+ commits
|
|
||||||
result[:diffs] = if result[:commits].size > 100
|
|
||||||
[]
|
|
||||||
else
|
|
||||||
project.repo.diff(last.id, first.id) rescue []
|
|
||||||
end
|
|
||||||
|
|
||||||
result[:commit] = Commit.new(first)
|
|
||||||
end
|
|
||||||
|
|
||||||
result
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def initialize(raw_commit, head = nil)
|
|
||||||
raise "Nil as raw commit passed" unless raw_commit
|
raise "Nil as raw commit passed" unless raw_commit
|
||||||
|
|
||||||
@commit = raw_commit
|
@raw = raw_commit
|
||||||
@head = head
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def short_id(length = 10)
|
def method_missing(m, *args, &block)
|
||||||
id.to_s[0..length]
|
@raw.send(m, *args, &block)
|
||||||
end
|
|
||||||
|
|
||||||
def safe_message
|
|
||||||
@safe_message ||= message
|
|
||||||
end
|
|
||||||
|
|
||||||
def created_at
|
|
||||||
committed_date
|
|
||||||
end
|
|
||||||
|
|
||||||
def author_email
|
|
||||||
author.email
|
|
||||||
end
|
|
||||||
|
|
||||||
def author_name
|
|
||||||
author.name
|
|
||||||
end
|
|
||||||
|
|
||||||
# Was this commit committed by a different person than the original author?
|
|
||||||
def different_committer?
|
|
||||||
author_name != committer_name || author_email != committer_email
|
|
||||||
end
|
|
||||||
|
|
||||||
def committer_name
|
|
||||||
committer.name
|
|
||||||
end
|
|
||||||
|
|
||||||
def committer_email
|
|
||||||
committer.email
|
|
||||||
end
|
|
||||||
|
|
||||||
def prev_commit
|
|
||||||
@prev_commit ||= if parents.present?
|
|
||||||
Commit.new(parents.first)
|
|
||||||
else
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def prev_commit_id
|
|
||||||
prev_commit.try :id
|
|
||||||
end
|
|
||||||
|
|
||||||
# Shows the diff between the commit's parent and the commit.
|
|
||||||
#
|
|
||||||
# Cuts out the header and stats from #to_patch and returns only the diff.
|
|
||||||
def to_diff
|
|
||||||
# see Grit::Commit#show
|
|
||||||
patch = to_patch
|
|
||||||
|
|
||||||
# discard lines before the diff
|
|
||||||
lines = patch.split("\n")
|
|
||||||
while !lines.first.start_with?("diff --git") do
|
|
||||||
lines.shift
|
|
||||||
end
|
|
||||||
lines.pop if lines.last =~ /^[\d.]+$/ # Git version
|
|
||||||
lines.pop if lines.last == "-- " # end of diff
|
|
||||||
lines.join("\n")
|
|
||||||
end
|
|
||||||
|
|
||||||
def has_zero_stats?
|
|
||||||
stats.total.zero?
|
|
||||||
rescue
|
|
||||||
true
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -50,7 +50,7 @@ class GollumWiki
|
||||||
# Returns the last 30 Commit objects across the entire
|
# Returns the last 30 Commit objects across the entire
|
||||||
# repository.
|
# repository.
|
||||||
def recent_history
|
def recent_history
|
||||||
Commit.fresh_commits(wiki.repo, 30)
|
Gitlab::Git::Commit.fresh_commits(wiki.repo, 30)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Finds a page within the repository based on a tile
|
# Finds a page within the repository based on a tile
|
||||||
|
|
|
@ -169,7 +169,7 @@ class MergeRequest < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def unmerged_commits
|
def unmerged_commits
|
||||||
self.project.repo.
|
self.project.repository.
|
||||||
commits_between(self.target_branch, self.source_branch).
|
commits_between(self.target_branch, self.source_branch).
|
||||||
map {|c| Commit.new(c)}.
|
map {|c| Commit.new(c)}.
|
||||||
sort_by(&:created_at).
|
sort_by(&:created_at).
|
||||||
|
|
|
@ -8,7 +8,7 @@ module Network
|
||||||
attr_accessor :time, :spaces, :parent_spaces
|
attr_accessor :time, :spaces, :parent_spaces
|
||||||
|
|
||||||
def initialize(raw_commit, refs)
|
def initialize(raw_commit, refs)
|
||||||
@commit = ::Commit.new(raw_commit)
|
@commit = Gitlab::Git::Commit.new(raw_commit)
|
||||||
@time = -1
|
@time = -1
|
||||||
@spaces = []
|
@spaces = []
|
||||||
@parent_spaces = []
|
@parent_spaces = []
|
||||||
|
|
|
@ -130,7 +130,7 @@ class Note < ActiveRecord::Base
|
||||||
# override to return commits, which are not active record
|
# override to return commits, which are not active record
|
||||||
def noteable
|
def noteable
|
||||||
if for_commit?
|
if for_commit?
|
||||||
project.repository.commit(commit_id)
|
Commit.new(project.repository.commit(commit_id))
|
||||||
else
|
else
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
|
|
|
@ -142,11 +142,11 @@ class Project < ActiveRecord::Base
|
||||||
|
|
||||||
def repository
|
def repository
|
||||||
if path
|
if path
|
||||||
@repository ||= Repository.new(path_with_namespace, default_branch)
|
@repository ||= Gitlab::Git::Repository.new(path_with_namespace, default_branch)
|
||||||
else
|
else
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
rescue Grit::NoSuchPathError
|
rescue Gitlab::Git::NoRepository
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue