BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit f5e001bd by Sato Hiroyuki
Options

Using arrowed line only if it connects to not first parent.

It is easy to see which branch is merged.
parent 26606aa2
Showing with 38 additions and 37 deletions
app/assets/javascripts/branch-graph.js.coffee
...@@ -191,56 +191,57 @@ class BranchGraph ...@@ -191,56 +191,57 @@ class BranchGraph
drawLines: (x, y, commit) -> drawLines: (x, y, commit) ->
r = @r r = @r
for parent in commit.parents for parent, i in commit.parents
parentCommit = @preparedCommits[parent[0]] parentCommit = @preparedCommits[parent[0]]
parentY = @offsetY + @unitTime * parentCommit.time parentY = @offsetY + @unitTime * parentCommit.time
parentX1 = @offsetX + @unitSpace * (@mspace - parentCommit.space) parentX1 = @offsetX + @unitSpace * (@mspace - parentCommit.space)
parentX2 = @offsetX + @unitSpace * (@mspace - parent[1]) parentX2 = @offsetX + @unitSpace * (@mspace - parent[1])
if parentCommit.space is commit.space and parentCommit.space is parent[1] # Set line color
r.path(["M", x, y, "L", parentX1, parentY]).attr( if parentCommit.space <= commit.space
stroke: @colors[parentCommit.space] color = @colors[commit.space]
"stroke-width": 2
)
else if parentCommit.space < commit.space else
if x is parentX2 color = @colors[parentCommit.space]
r
.path([ # Build line shape
"M", x, y + 5, if parent[1] is commit.space
"l-2,5,4,0,-2,-5", d1 = [0, 5]
"L", x, y + 10, d2 = [0, 10]
"L", parentX2, y + 10, arrow = "l-2,5,4,0,-2,-5"
"L", parentX2, parentY - 5,
"L", parentX1, parentY]) else if parent[1] < commit.space
.attr( d1 = [3, 3]
stroke: @colors[commit.space] d2 = [7, 5]
"stroke-width": 2) arrow = "l5,0,-2,4,-3,-4"
else else
r d1 = [-3, 3]
.path([ d2 = [-7, 5]
"M", x + 3, y + 3, arrow = "l-5,0,2,4,3,-4"
"l5,0,-2,4,-3,-4",
"L", x + 7, y + 5, # Start point
route = ["M", x + d1[0], y + d1[1]]
# Add arrow if not first parent
if i > 0
route.push(arrow)
# Circumvent if overlap
if commit.space isnt parentCommit.space or commit.space isnt parent[1]
route.push(
"L", x + d2[0], y + d2[1],
"L", parentX2, y + 10, "L", parentX2, y + 10,
"L", parentX2, parentY - 5, "L", parentX2, parentY - 5,
"L", parentX1, parentY]) )
.attr(
stroke: @colors[commit.space] # End point
"stroke-width": 2) route.push("L", parentX1, parentY)
else
r r
.path([ .path(route)
"M", x - 3, y + 3,
"l-5,0,2,4,3,-4",
"L", x - 7, y + 5,
"L", parentX2, y + 10,
"L", parentX2, parentY - 5,
"L", parentX1, parentY])
.attr( .attr(
stroke: @colors[parentCommit.space] stroke: color
"stroke-width": 2) "stroke-width": 2)
markCommit: (x, y, commit, graphHeight) -> markCommit: (x, y, commit, graphHeight) ->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment