@@ -1,6 +1,8 @@ class AddShaCache < ActiveRecord::Migration def self.up - add_column :git_configurations, :sha_array, :text + #:longtext not supported? + add_column :git_configurations, :sha_array, :text, :limit => 4.megabytes # 4 GIG limit (4,294,967,296) + # execute "ALTER TABLE git_configurations ADD COLUMN sha_array LONGTEXT" add_column :git_configurations, :last_pull_datetime, :datetime add_column :git_configurations, :last_pull_path, :string end db/migrate/3_add_sha_cache.rb @@ -110,6 +110,7 @@ class GitRepository revision = Revision.new(self) # RAILS_DEFAULT_LOGGER.info "!!!\n!!! revision #{i}/#{commit.id}: #{commit.inspect}\n!!!" revision.number = i + RAILS_DEFAULT_LOGGER.info "!!!\n!!! revision #{i}/#{commit.id}: author nil!?\n!!!" if commit.author.nil? 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 @@ -127,7 +128,13 @@ class GitRepository def revision(number) # 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)) + revision = revisions(number, number).first + if revision.nil? + RAILS_DEFAULT_LOGGER.warn "!!!\n!!!!COULD NOT FIND REVISION NUMBER[#{number}] sha_array-size:#{@sha_array.size}\n!!!" + raise NoSuchRevisionError.new + else + revision + end end def ==(other) @@ -139,6 +146,7 @@ class GitRepository revision_number = youngest_revision_number if revision_number == 'HEAD' revision_number = revision_number.to_i if revision_number < 1 or revision_number > youngest_revision_number + RAILS_DEFAULT_LOGGER.warn "!!!\n!!!!NODE:COULD NOT FIND REVISION NUMBER[#{revision_number}] sha_array-size:#{@sha_array.size}\n!!!" raise NoSuchRevisionError.new end path = self.root_path if path.blank? @@ -168,16 +176,35 @@ class GitRepository @revision_number = nil @revision = nil @path = path - if !git_item.nil? - @git_item = git_item - else - @git_item = @git_repo.tree("#{git_commit_sha}") - unless root_node? - path_components.each do |c| - @git_item = @git_item.send('/',c) + # RAILS_DEFAULT_LOGGER.info "!!!\nnode.initialize[#{git_commit_sha}:#{path}]\n!!!" + begin + if !git_item.nil? + @git_item = git_item + else + return (@git_item = @git_repo.tree("#{git_commit_sha}")) if root_node? + # RAILS_DEFAULT_LOGGER.info "!!!\nnode.initialize.git_node_info[#{git_commit_sha}:display[#{display_path}]path[#{path}]\n!!!" + git_node_info = Git.new(@git_repo.path).ls_tree({}, @git_commit_sha, "-- ." + display_path).chomp("\n") + # RAILS_DEFAULT_LOGGER.info "!!!\nnode.initialize.git_node_info return [#{git_node_info}]\n!!!" + mode, type, sha, name = git_node_info.split(%r{[\s\t]}) + # RAILS_DEFAULT_LOGGER.info "!!!\nnode.initialize.split [mode:#{mode},type:#{type},sha:#{sha},name:#{name}]\n!!!" + if type == "tree" + @git_item = Grit::Tree.create(@git_repo,{:id => sha, :mode => mode, :name => name}) + elsif type == "blob" + @git_item = Grit::Blob.create(@git_repo,{:id => sha, :mode => mode, :name => name}) + elsif type == "commit" + RAILS_DEFAULT_LOGGER.warn "!!!\nnode.initialize.could_not_create_git_item-commit-submodule[#{git_commit_sha}:display[#{display_path}]path[#{path}]\n!!!" + @git_item = nil + else + RAILS_DEFAULT_LOGGER.warn "!!!\nnode.initialize.could_not_create_git_item-unknown-type[#{git_commit_sha}:display[#{display_path}]path[#{path}]\n!!!" + @git_item = nil end end - end + rescue Exception => e + # TODO : Figure out why this is happening : should always be able to get the git_item for a node, given a commit sha + # Is it possible that mingle is sending in paths for deleted nodes for a commit? + RAILS_DEFAULT_LOGGER.info "!!!\nnode.initialize.exception[#{git_commit_sha}:#{path}]\n#{e.inspect}]\n!!!" + return + end end def display_path @@ -197,14 +224,16 @@ class GitRepository end def children - return [] if file? + return [] if file? || @git_item.nil? @git_item.contents.collect do |item| - Node.new(@repository, absolut_path_for(item.name), @git_commit_sha, item) + # TODO : Should we handle viewing submodules? Grit returns nil for child if ls-tree returns "commit" + Node.new(@repository, absolut_path_for(item.name), @git_commit_sha, item) if !item.nil? end end def binary? return false if dir? + return true if !@git_item.nil? return @git_item.mime_type != Grit::Blob::DEFAULT_MIME_TYPE end @@ -218,6 +247,7 @@ class GitRepository end def file? + return false if @git_item.nil? @git_item.kind_of?(Grit::Blob) end @@ -238,11 +268,16 @@ class GitRepository # return 1 # end @revision_number = @repository.revision_of_sha(commit_of_node) + if @revision_number.nil? + # TODO : FIX THIS - this should not be happening + RAILS_DEFAULT_LOGGER.info "!!!\nNode::revision_number::revision_number_not_found[#{commit_of_node}:#{display_path}]\n!!!" + return 1 + end # 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!!!" + RAILS_DEFAULT_LOGGER.warn "!!!\nNode::revision_number::revision_number_exception[#{sha}:#{display_path}]\n#{e.inspect}\n!!!" 1 end end @@ -269,6 +304,8 @@ class GitRepository end def dir? + # should submodule/commit directories be returned as directories? + return false if @git_item.nil? @git_item.kind_of?(Grit::Tree) end @@ -341,7 +378,7 @@ class GitRepository repo = repository.repo sha = @revision.sha previous_commit = repo.commit(sha).parents[0] - RAILS_DEFAULT_LOGGER.debug "!!!\n!!!(#{repo.path}) getting diff for commit:#{sha} path:#{path}\n!!!" + # RAILS_DEFAULT_LOGGER.debug "!!!\n!!!(#{repo.path}) getting diff for commit:#{sha} path:#{path}\n!!!" begin Timeout::timeout(10) do diffs = Commit.diff(repo, previous_commit.id, sha, [path]) @@ -364,7 +401,7 @@ class GitRepository def html_diff # RAILS_DEFAULT_LOGGER.info "!!! Revision::ChangePath::html_diff[#{@path}] !!!" - return '' if node.nil? || node.dir? || node.binary? + return "" if node.nil? || node.dir? || node.binary? chunks_html = diff_chunks.collect do |chunk| chunk.lines.collect do |line| html_class = case @@ -439,7 +476,7 @@ class GitRepository end def involves?(mingle_user) - mingle_user.name == self.user + mingle.user ? mingle_user.name == self.user : false end def last? lib/git_repository.rb @@ -4,8 +4,8 @@ TODO: - Error processing - Short shas where appropriate Known Defects to Fix: -- Repeated revisions on the history page (doesn't seem to happen for smaller projects), but the revision list seems to start getting repeats from the last revision back -- Sometimes get uncaught exception GitRepository::NoSuchRevisionError - again for larger repos - generally prevents source view from displaying +- Repeated revisions on the history page (doesn't seem to happen for smaller projects), but the revision list seems to start getting repeats from the last revision back (turned out to be problem with submodules) +- Sometimes get uncaught exception GitRepository::NoSuchRevisionError - again for larger repos - generally prevents source view from displaying (submodule problem) Performance Enhancements: - Change calls within revisions to Commit.changelist (new function that returns just the --name-status array) @done - Move actual diff to ChangePath.diff @done @@ -24,4 +24,4 @@ Wanted from Mingle API: - Access to the Revisions table to store additional information (in our case the SHA of the commit) Misc: - link from commit column on source view to display revision history -- switch from :text to :longtext for the sha_array \ No newline at end of file +- switch from :text to :longtext for the sha_array @done \ No newline at end of file todo.taskpaper 526e6bd0445ce0cf1733569a718e866f60910ba1 Don Mullen don@thinkrelevance.com http://github.com/donmullen/mingle_git/commit/1d050260ffa7c8abf28c20ed53aec271e213c9ce 1d050260ffa7c8abf28c20ed53aec271e213c9ce 2008-08-11T04:24:47-07:00 2008-08-11T04:24:47-07:00 submodule detection and better node creation - did not resolve all runcoderun problems fca2db3f1202c3dc83a501806b65a3650dabe55a Don Mullen don@thinkrelevance.com