Defect #14116

Don't render dot for commit which have no space property in revision graph (fine fix for #11612)

Added by Etienne Massip over 4 years ago. Updated 8 months ago.

Status:NewStart date:
Priority:NormalDue date:
Assignee:-% Done:

0%

Category:SCM
Target version:-
Resolution: Affected version:

Description

Quoting Jens from #11612#note-9 where he suggested to not add a commit node on the revision graph when it doesn't have a space property, meaning it's not attached to any branch anymore:

<QUOTE>
We recently had the same problem - graph rendering broke completely for a repository due to JS errors because some commits were missing the space property.

Turns out that on a fresh install, where the repository in question was re-imported, the problem didn't occur, because the problematic commits didnt show up at all. Further investigation showed that those commits were basically abandoned and not connected to any branch.

I think not rendering these commits in the graph at all is much better than putting them randomly on the first branch as the patch above does.

Here's the patch for 1.4:

--- a/public/javascripts/revision_graph.js
+++ b/public/javascripts/revision_graph.js
@@ -41,6 +41,10 @@ function drawRevisionGraph(holder, commits_hash, graph_space) {

     commits.each(function(commit) {

+      if (typeof commit.space != 'undefined') {
         y = commit_table_rows[max_rdmid - commit.rdmid].getLayout().get('top') - graph_y_offset + CIRCLE_INROW_OFFSET;
         x = graph_x_offset + XSTEP / 2 + XSTEP * commit.space;

@@ -95,6 +99,7 @@ function drawRevisionGraph(holder, commits_hash, graph_space) {
         }

         top.push(revision_dot_overlay);
+      }
     });

     top.toFront();

</QUOTE>

Comments are welcome.


Related issues

Related to Redmine - Defect #11612: Revision graph sometimes broken due to raphael.js error Closed

History

#1 Updated by Stephane Lapie 9 months ago

+1, this needs a fix.

#2 Updated by Toshi MARUYAMA 8 months ago

  • Description updated (diff)

Also available in: Atom PDF