Project

General

Profile

Actions
Copy link

Defect #10954

open

Git/Mercurial revision graph is not clear

Added by Siebe Joris Jochems over 12 years ago. Updated almost 12 years ago.

Status:
New
Priority:
Normal
Assignee:
-
Category:
SCM
Target version:
-
Start date:
Due date:
% Done:

0%

Estimated time:
Resolution:
Affected version:

Description

The revision graph used to show changes in a Mercurial (and possibly Git) repository is not clear. When multiple commits are done in parallel and merged point of merge is displayed weird.

In the screenshot below two change sets have been merged in revision 25. 25 has 24 and 20 as parents. It seems like the two change sets have been merged in revision 24.

In the screenshot below you can see that revision 25 indeed has 24 and 20 as parents.

Files

Download all files
unclear_revision_graph.png (5.67 KB) unclear_revision_graph.png Siebe Joris Jochems, 2012-05-17 17:51
revision_parents.png (8.27 KB) revision_parents.png Siebe Joris Jochems, 2012-05-17 17:51
redmine_commit_graph_misleading.png (6.27 KB) redmine_commit_graph_misleading.png C Tibirna, 2013-01-09 16:45
qgit_commit_graph.png (8.17 KB) qgit_commit_graph.png C Tibirna, 2013-01-09 16:47
Actions
Copy link
 #1

Updated by Siebe Joris Jochems over 12 years ago

Forgot to attach info:

Database MySQL 5.1.61
Ruby version 1.8.7 (i686-linux)
RubyGems version 1.3.7
Rack version 1.1.3
Rails version 2.3.14
Active Record version 2.3.14
Active Resource version 2.3.14
Action Mailer version 2.3.14
Active Support version 2.3.14
Redmine 1.4.1.stable
SCM Mercurial 2.0
RMagick 2.13.0
Actions
Copy link
 #2

Updated by Toshi MARUYAMA over 12 years ago

  • Subject changed from Mercurial graph is not clear to Git/Mercurial revision graph is not clear
  • Category set to SCM
Actions
Copy link
 #3

Updated by Etienne Massip over 12 years ago

Here's a patch, but dunno it it's pretty enough?:

Index: public/javascripts/revision_graph.js
===================================================================
--- public/javascripts/revision_graph.js    (revision 9700)
+++ public/javascripts/revision_graph.js    (working copy)
@@ -65,10 +65,12 @@
                         'V', parent_y]);
                 } else {
                     // path to a commit in a different branch (Bezier curve)
+                    sign = parent_x > x ? 1 : -1;
                     path = revisionGraph.path([
                         'M', x, y,
-                        'C', x, y, x, y + (parent_y - y) / 2, x + (parent_x - x) / 2, y + (parent_y - y) / 2,
-                        'C', x + (parent_x - x) / 2, y + (parent_y - y) / 2, parent_x, parent_y-(parent_y-y)/2, parent_x, parent_y]);
+                        'C', x, y + 4, x, y + 4, x + sign * 4, y + 4,
+                        'S', parent_x - sign * 8, parent_y - 4, parent_x - sign * 4, parent_y - 4,
+                        'S', parent_x, parent_y - 4, parent_x, parent_y]);
                 }
             } else {
                 // vertical path ending at the bottom of the revisionGraph
Actions
Copy link
 #4

Updated by Michael Sieberer over 12 years ago

I can confirm the issue with the Git-Backend. In my case, there are about 30 commits between the parent commit and the new branch, which makes it impossible to guess where the two lines meet.

Actions
Copy link
 #5

Updated by C Tibirna almost 12 years ago

And here is an example (with GIT) that shows in what measure this could become debilitating. Where does the branch detach? At 9cec489a? No. At 5x807f1f!

An example of the same commit graph rendered in a "readable" manner, i.e. not only the "branching" should be made clearer, but the latest commit should stay on the "direct" branch, not on the "detached" one:

Another (perhaps separate) issue is that the "Revisions" view (obtained when clicking on "View all revisions" in the "Repository" view) does not identify branches in any way.

Actions
Copy link

Also available in: Atom PDF