deuill
/
grawkit
mirror of https://github.com/deuill/grawkit.git
1
0
Fork 0
Code Actions Packages

Merge pull request #3 from upcu/master 

Update grawkit
This commit is contained in:
Alex Palaistras 2018-10-31 10:53:18 +00:00 committed by GitHub
parent 852a796f4a 675e79c875
commit 472cd57dcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
grawkit
View File

@ -148,13 +148,24 @@ function render_merge(idx, _, buf, tmp, refs, fields, m, i, hspc) {
for (i in fields) {
split(fields[i], m, "|")
# Add starting point to previous branch ending point.
tmp = "M" m[1] * style["branch/spacing"] "," m[2] * style["commit/spacing"]
if(length(m) == 2) {
# this is actually added by "git branch" command
# Add starting point to source branch ending point.
tmp = "M" m[1] * style["branch/spacing"] "," m[2] * style["commit/spacing"]
# Add Bezier curve leading to current branch starting point.
tmp = tmp " C" hspc "," m[2] * style["commit/spacing"]
tmp = tmp " " hspc "," m[2] * style["commit/spacing"]
tmp = tmp " " hspc "," refs[1] * style["commit/spacing"]
# Add Bezier curve leading to target branch starting point.
tmp = tmp " C" hspc "," m[2] * style["commit/spacing"]
tmp = tmp " " hspc "," m[2] * style["commit/spacing"]
tmp = tmp " " hspc "," refs[1] * style["commit/spacing"]
} else {
# Add starting point to target branch ending point.
tmp = "M" m[1] * style["branch/spacing"] "," m[3] * style["commit/spacing"]
# Add Bezier curve leading to specific commit from source branch.
tmp = tmp " C" hspc "," m[3] * style["commit/spacing"]
tmp = tmp " " hspc "," m[3] * style["commit/spacing"]
tmp = tmp " " hspc "," m[2] * style["commit/spacing"]
}
# Draw the path.
buf = buf "\n\t\t" sprintf(svg["path"], tmp)
@ -340,11 +351,14 @@ $0 ~ rule["merge"] {
# Add a merge commit to current branch.
add_commit("merge", "Merge commit")
# Add merge reference to target branch.
# Add merge reference from last commit in source branch to target branch.
# branch|from-commit|to-commit
split(branches[i,"refs"], refs, ",")
merge = state["branch"] "|" refs[length(refs)] "|" state["HEAD"]
if (branches[i,"merges"] == "") {
branches[i,"merges"] = state["branch"] "|" state["HEAD"]
branches[i,"merges"] = merge
} else {
branches[i,"merges"] = branches[i,"merges"] "," state["branch"] "|" state["HEAD"]
branches[i,"merges"] = branches[i,"merges"] "," merge
}
next
@ -443,7 +457,9 @@ END {
# Print color scheme definitions for branches.
for (i = 0; i < len["branches"]; i++) {
printf ".branch-" normalize(branches[i,"name"]) " {"
printf "stroke: " pallete[i + 1] "; fill: " pallete[i + 1] "}\n"
#reuse pallete (except black which is reserved for master)
p = (i - 1) % (length(pallete) - 1) + 2
printf "stroke: " pallete[p] "; fill: " pallete[p] "}\n"
}
print "]]></style>"