@@ -6,15 +6,16 @@
<% end -%>
</td>
<td style='text-align:right'><%= h node.file_length %> </td>
- <% if node.revision && node.revision.time %>
- <td><%= h(node.revision.sha) %></td>
- <td><%=h node.revision.user %></td>
- <td><%= time_ago_in_words node.revision.time %></td>
- <td class="last"><%=h node.revision.message %></td>
+ <% revision = node.revision %>
+ <% if revision && revision.time %>
+ <td><%= h(revision.sha) %></td>
+ <td><%=h revision.user %></td>
+ <td><%= time_ago_in_words revision.time %></td>
+ <td class="last"><%=h revision.message %></td>
<% else -%>
<td> </td>
<td> </td>
<td> </td>
<td class="last"> </td>
<% end -%>
-</tr>
\ No newline at end of file
+</tr>
app/views/git_configurations/_node_table_row.rhtml
@@ -27,6 +27,7 @@ module Grit
opt_args = transform_options(options)
call = "#{Git.git_binary} --git-dir='#{self.git_dir}' #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + args).join(' ')}"
+ # RAILS_DEFAULT_LOGGER.info "!!!\n Git.CALL:#{call}\n !!!"
puts call if Grit.debug
response = `#{call}`
puts response if Grit.debug
gems/grit-0.7.0/lib/grit/git.rb
@@ -35,16 +35,12 @@ class GitRepository
def pulled_recently?
@last_pull_time ||= Time.now - MAX_PULL_FREQUENCY_IN_MINUTES.minutes - 1.minute
return true if @last_pull_time > MAX_PULL_FREQUENCY_IN_MINUTES.minutes.ago
- File.exist?(orig_head) && File.mtime(orig_head) < MAX_PULL_FREQUENCY_IN_MINUTES.minutes.ago
+ File.exist?(orig_head) && File.mtime(orig_head) > MAX_PULL_FREQUENCY_IN_MINUTES.minutes.ago
end
- def pull
- # RAILS_DEFAULT_LOGGER.info("!!!\n!!! repo pulled recently (#{repo.path}) !!!\n!!!") &&
- return if pulled_recently?
- # RAILS_DEFAULT_LOGGER.info("pulling repo(#{repo.path})")
- Git.new(repo.path).pull({}, "origin", "master")
- @last_pull_time = Time.now
+ def init_sha_array
return if @sha_array.size > 1 && repo.commits('master',1).first.id == @sha_array[-1]
+ # RAILS_DEFAULT_LOGGER.info("getting repo config info for (#{repo.path})")
config = GitConfiguration.find(:first, :conditions => [ "repository_path = ?", @path])
if config.last_pull_path != @path || config.sha_array.nil? || config.sha_array.empty?
# reset everything
@@ -54,6 +50,7 @@ class GitRepository
end
commit = repo.commits('master',1).first
@sha_array = Array.new(config.sha_array)
+ # RAILS_DEFAULT_LOGGER.info("(#{repo.path}) sha_array up-to-date #{@sha_array.inspect}")
return if commit.id == @sha_array[-1]
add_shas = []
until commit.nil? || commit.id == @sha_array[-1]
@@ -63,6 +60,15 @@ class GitRepository
@sha_array += add_shas.reverse
config.sha_array = Array.new(@sha_array)
config.save!
+ # RAILS_DEFAULT_LOGGER.info("(#{repo.path}) sha_array updated")
+ end
+
+ def pull
+ # RAILS_DEFAULT_LOGGER.info("!!!\n!!! repo pulled recently (#{repo.path}) !!!\n!!!") && return if pulled_recently?
+ # RAILS_DEFAULT_LOGGER.info("pulling repo(#{repo.path})")
+ Git.new(repo.path).pull({}, "origin", "master")
+ @last_pull_time = Time.now
+ init_sha_array
end
def close
@@ -83,41 +89,32 @@ class GitRepository
@sha_array.size - 1
end
+ def revision_of_sha(sha)
+ init_sha_array
+ # RAILS_DEFAULT_LOGGER.info "SHA_ARRAY(#{sha}): #{@sha_array.inspect}"
+ idx = @sha_array.index(sha)
+ # RAILS_DEFAULT_LOGGER.info "SHA_ARRAY-idx : #{idx}"
+ idx
+ end
+
# retrieve specified revision(s) details
def revisions(from = 1, to = youngest_revision_number)
from, to = from.to_i, to.to_i
i = from
- youngest_revision_number if @sha_array.size == 1
- @sha_array[from, to].collect do |sha|
+ init_sha_array if @sha_array.size == 1
+ # TODO : What to do in this case -- and why would this be happening?
+ # RAILS_DEFAULT_LOGGER.info "revision #{i} outside of @sha_array bound[#{@sha_array.size-1}]" if from.to_i >= @sha_array.size
+ return [] if from.to_i >= @sha_array.size
+ @sha_array[from.to_i, to.to_i].collect do |sha|
commit = repo.commit(sha)
revision = Revision.new(self)
- RAILS_DEFAULT_LOGGER.debug "revision #{i}/#{commit.id}: #{commit.inspect}"
+ # RAILS_DEFAULT_LOGGER.info "!!!\n!!! revision #{i}/#{commit.id}: #{commit.inspect}\n!!!"
revision.number = i
revision.version_control_user = commit.author.name
revision.mingle_user = @version_control_users[commit.author.email] if @version_control_users
revision.time = commit.authored_date
revision.message = "#{commit.id} - #{commit.message}"
revision.sha = commit.id
- begin
- Timeout::timeout(30) do
- diffs = (i == 1) ? Commit.show(repo, commit.id) : Commit.diff(repo, @sha_array[i-1], commit.id)
- revision.changed_paths = diffs.collect do |diff|
- next if diff.a_path.nil? # the repo itself
- change = Revision::ChangedPath.new(revision)
- change.path = diff.a_path
- change.action = "M"
- change.action = "A" if diff.new_file
- change.action = "D" if diff.deleted_file
- # DON: Investigate whether this is always available or lazily executed -- most likely don't want all the
- # diffs generated when we are just getting a list of revisions, but if it there we can make the diff view faster
- change.diff = diff.diff
- change
- end.compact
- end
- rescue Timeout::Error
- RAILS_DEFAULT_LOGGER.warn "(#{repo.path}) parsing diff for #{commit.id} timed out"
- revision.changed_paths = []
- end
i += 1
revision
end
@@ -128,8 +125,9 @@ class GitRepository
end
def revision(number)
- RAILS_DEFAULT_LOGGER.info "\n!!! GitRepository::revision [#{number}] !!!"
- revisions(number, number).first || (raise NoSuchRevisionError.new)
+ # RAILS_DEFAULT_LOGGER.info "\n!!! GitRepository::revision [#{number}] !!!"
+ init_sha_array
+ revisions(number, number).first || (RAILS_DEFAULT_LOGGER.warn "!!!\nCOULD NOT FIND REVISION NUMBER[#{number}]\n!!!" && (raise NoSuchRevisionError.new))
end
def ==(other)
@@ -144,27 +142,31 @@ class GitRepository
raise NoSuchRevisionError.new
end
path = self.root_path if path.blank?
- check_revision Node.new(self, path, @sha_array[revision_number], revision_number)
+ check_revision Node.new(self, path, @sha_array[revision_number])
end
def check_revision(node)
begin
node.revision_number
- rescue # Exception => e
- raise NoSuchRevisionError.new
+ rescue Exception => e
+ # raise NoSuchRevisionError.new
+ RAILS_DEFAULT_LOGGER.warn "!!!\ncheck_revision_exception[#{e.inspect}]\n!!!"
end
node
end
class Node
+ include Grit
+
attr_reader :path, :git_commit_sha, :git_item
- def initialize(repository, path, git_commit_sha, revision_num, git_item=nil)
+ def initialize(repository, path, git_commit_sha, git_item=nil)
@repository = repository
@git_repo = repository.repo
@git_commit_sha = git_commit_sha
- @revision_number = revision_num
+ @revision_number = nil
+ @revision = nil
@path = path
if !git_item.nil?
@git_item = git_item
@@ -197,7 +199,7 @@ class GitRepository
def children
return [] if file?
@git_item.contents.collect do |item|
- Node.new(@repository, absolut_path_for(item.name), @git_commit_sha, revision_number, item)
+ Node.new(@repository, absolut_path_for(item.name), @git_commit_sha, item)
end
end
@@ -224,24 +226,46 @@ class GitRepository
end
def revision_number
- @revision_number
+ # TODO : Want to get the *real* revision number / sha for the node - not the commit revision
+ # Also - only get it *once* and store it
+ begin
+ return @revision_number if @revision_number
+ # RAILS_DEFAULT_LOGGER.info "!!!\nNode::revision_number::sha-path[#{@git_commit_sha}][#{"." + display_path}]\n!!!"
+ commit_of_node = Git.new(@git_repo.path).rev_list({}, @git_commit_sha, "-1", "-- ." + display_path).chomp("\n")
+ # RAILS_DEFAULT_LOGGER.info "!!!\nNode::revision_number::commit_of_node[#{commit_of_node}]\n!!!"
+ # if commit_of_node.nil? || commit_of_node.empty?
+ # RAILS_DEFAULT_LOGGER.warn "!!!\nNode::revision_number::sha-path[#{@git_commit_sha}][#{"." + display_path}] - could not find commit sha\n!!!"
+ # return 1
+ # end
+ @revision_number = @repository.revision_of_sha(commit_of_node)
+ # RAILS_DEFAULT_LOGGER.info "!!!\nNode::revision_number::revision_number[#{@revision_number}]\n!!!"
+ @revision_number
+ rescue Exception => e
+ # raise NoSuchRevisionError.new
+ RAILS_DEFAULT_LOGGER.warn "!!!\nNode::revision_number::revision_number_not_found[#{@git_commit_sha}]\n!!!"
+ 1
+ end
end
def revisions
- raise "list revisions on dir node haven't been implement yet, sorry" if dir?
+ # Hopefully this is never called, since we don't really need it for previous_revision_node
+ raise "Node::revisions not implemented yet" # if dir?
# TODO : SVN file_revs -> GIT : need a way of getting all revisions for a particular *file*
# @repository.svn_repos.file_revs(@path, 0, revision_number).collect {|path, rev| rev }
- []
+ # git log --pretty=online path
end
def previous_revision_node
+ # Hopefully this is never called, since ChangePath.diff doesn't need it
+ raise "Node::previous_revision_node not implemented yet" # if dir?
# TODO - what is previous revision of this node - in git?
- nil # @repository.node(@path, revisions[-2])
+ # git log --pretty=online [file-path]
+ # git rev-list <commit-sha> -- -1 path-to-file
end
def revision
- RAILS_DEFAULT_LOGGER.info "!!! Node::revision [#{revision_number}]"
- @repository.revision(revision_number)
+ # RAILS_DEFAULT_LOGGER.info "!!! Node::revision [#{revision_number}]"
+ @revision ||= @repository.revision(revision_number)
end
def dir?
@@ -272,6 +296,8 @@ class GitRepository
class Revision
+ include Grit
+
class ChangedPath
attr_accessor :path
attr_accessor :action # 'A'dd, 'D'elete, 'R'eplace, 'M'odify
@@ -325,7 +351,7 @@ class GitRepository
end
def html_diff
- RAILS_DEFAULT_LOGGER.info "!!! Revision::ChangePath::html_diff[#{@path}] !!!"
+ # RAILS_DEFAULT_LOGGER.info "!!! Revision::ChangePath::html_diff[#{@path}] !!!"
return '' if node.nil? || node.dir? || node.binary?
chunks_html = diff_chunks.collect do |chunk|
chunk.lines.collect do |line|
@@ -350,7 +376,7 @@ class GitRepository
end
- attr_accessor :version_control_user, :mingle_user, :message, :number, :time, :changed_paths, :sha
+ attr_accessor :version_control_user, :mingle_user, :message, :number, :time, :sha
attr_reader :repository
alias updated_at time
@@ -364,6 +390,33 @@ class GitRepository
item.to_s.upcase.include?(term.upcase)
end or number.to_s == term
end
+
+ def changed_paths
+ repo = repository.repo
+ # RAILS_DEFAULT_LOGGER.info "!!!\n!!!(#{repo.path}) getting changed_paths for #{sha}\n!!!"
+ begin
+ Timeout::timeout(30) do
+ previous_commit = repo.commit(sha).parents[0]
+ # RAILS_DEFAULT_LOGGER.info "!!!\n!!!(again previous commit #{previous_commit.id}\n!!!"
+ diffs = (number == 1) ? Commit.show(repo, sha) : Commit.diff(repo, previous_commit.id, sha)
+ paths = diffs.collect do |diff|
+ next if diff.a_path.nil? # the repo itself
+ change = ChangedPath.new(self)
+ change.path = diff.a_path
+ change.action = "M"
+ change.action = "A" if diff.new_file
+ change.action = "D" if diff.deleted_file
+ # DON: Investigate whether this is always available or lazily executed -- most likely don't want all the
+ # diffs generated when we are just getting a list of revisions, but if it there we can make the diff view faster
+ change.diff = diff.diff
+ change
+ end.compact
+ end
+ rescue Timeout::Error
+ RAILS_DEFAULT_LOGGER.warn "(#{repo.path}) parsing diff for #{sha} timed out"
+ []
+ end
+ end
def initialize(repository)
@repository = repository
lib/git_repository.rb
@@ -6,11 +6,12 @@ TODO:
Performance Enhancements:
- Change calls within revisions to Commit.changelist (new function that returns just the --name-status array
- Move actual diff to ChangePath.diff
-- Node.revision calls back into GitRepository.revision, which spins through a full changepath/diff. This is called frequently in source browsing. Rediculous!
+- Node.revision calls back into GitRepository.revision, which spins through a full changepath/diff. This is called frequently in source browsing. Ridiculous!
Node:
-- Implement revisions
-- Implement previous_revision_node
+- Implement revisions (not needed) @done
+- Change revision_number to get the actual revision of the node, not the commit revision number @done
+- Implement previous_revision_node (not needed) @done
Testing:
- rewrite tests for git
todo.taskpaper
a95f6638da61700e03b50f17d723fb96e781d598
Don Mullen
don@thinkrelevance.com
http://github.com/donmullen/mingle_git/commit/6aad715f566c08cdc1ea1642bfc171192257f289
6aad715f566c08cdc1ea1642bfc171192257f289
2008-08-08T14:51:37-07:00
2008-08-08T14:51:37-07:00
node revision update and optimizations
5e8e1aaa4ea535791f16b2f67f1fb0af555d96c2
Don Mullen
don@thinkrelevance.com