diff options
author | Roland Walker <walker@pobox.com> | 2018-05-18 22:44:06 -0400 |
---|---|---|
committer | Jonas Fonseca <jonas.fonseca@gmail.com> | 2018-05-18 22:44:06 -0400 |
commit | 9ec7c5dc482cede4f9802832a260739677c4e4bc (patch) | |
tree | 08ebd8d8bc87e1dbe90f90edd286d7516b3a6123 | |
parent | 12c6dff274240fed83d245b19dabb3d44aeee1a9 (diff) |
Visually distinguish merge vs commit in utf-8 graph (#660)
by returning smaller character "Bullet Operator" for ordinary commits.
29 files changed, 2102 insertions, 2102 deletions
diff --git a/src/graph-v1.c b/src/graph-v1.c index 89297d62..aea1c0af 100644 --- a/src/graph-v1.c +++ b/src/graph-v1.c @@ -357,7 +357,7 @@ graph_symbol_to_utf8(const struct graph_symbol *symbol) return " ◎"; else if (symbol->merge) return " ●"; - return " ●"; + return " ∙"; } if (symbol->merge) { diff --git a/src/graph-v2.c b/src/graph-v2.c index ebe2b969..98f476e3 100644 --- a/src/graph-v2.c +++ b/src/graph-v2.c @@ -1041,7 +1041,7 @@ graph_symbol_to_utf8(const struct graph_symbol *symbol) return " ◎"; else if (symbol->merge) return " ●"; - return " ●"; + return " ∙"; } if (graph_symbol_cross_merge(symbol)) diff --git a/test/diff/diff-stat-split-test b/test/diff/diff-stat-split-test index 6a6fb7bd..bb18121f 100755 --- a/test/diff/diff-stat-split-test +++ b/test/diff/diff-stat-split-test @@ -19,33 +19,33 @@ in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz" test_tig assert_equals 'diff-stat.screen' <<EOF -2014-03-01 17:26 Jonas Fonseca ● [master] WIP: Upgrade to 0.4-SNAPSHOT and DCE |commit ee912870202200a0b9cf4fd86ba57243212d341e -2014-03-01 15:59 Jonas Fonseca ● Add type parameter for js.Dynamic |Refs: [master] -2014-01-16 22:51 Jonas Fonseca ● Move classes under org.scalajs.benchmark package scop|Author: Jonas Fonseca <jonas.fonseca@gmail.com> -2014-01-16 17:43 Jonas Fonseca ● Bump Scala.js version to 0.3-SNAPSHOT |AuthorDate: Sat Mar 1 17:26:01 2014 -0500 -2014-01-16 17:39 Jonas Fonseca ● Integrate app code into the benchmark infrastructure |Commit: Jonas Fonseca <jonas.fonseca@gmail.com> +2014-03-01 17:26 Jonas Fonseca ∙ [master] WIP: Upgrade to 0.4-SNAPSHOT and DCE |commit ee912870202200a0b9cf4fd86ba57243212d341e +2014-03-01 15:59 Jonas Fonseca ∙ Add type parameter for js.Dynamic |Refs: [master] +2014-01-16 22:51 Jonas Fonseca ∙ Move classes under org.scalajs.benchmark package scop|Author: Jonas Fonseca <jonas.fonseca@gmail.com> +2014-01-16 17:43 Jonas Fonseca ∙ Bump Scala.js version to 0.3-SNAPSHOT |AuthorDate: Sat Mar 1 17:26:01 2014 -0500 +2014-01-16 17:39 Jonas Fonseca ∙ Integrate app code into the benchmark infrastructure |Commit: Jonas Fonseca <jonas.fonseca@gmail.com> 2014-01-16 07:47 Jonas Fonseca ●─╮ Merge pull request #4 from phaller/patch-1 |CommitDate: Sat Mar 1 17:26:01 2014 -0500 -2014-01-16 15:32 Philipp Haller │ ● Fix link to Dart benchmark harness | -2013-12-17 00:02 Jonas Fonseca ●─╯ Update links to reflect project name change | WIP: Upgrade to 0.4-SNAPSHOT and DCE -2013-12-03 23:35 Jonas Fonseca ● Use Scala.js 0.2-SNAPSHOT |--- -2013-11-26 23:39 Jonas Fonseca ● Extract the benchmark list variable name; fix push to| common/benchmark-runner.sh | 5 +++-- -2013-11-26 23:31 Jonas Fonseca ● Solve the easiest sudoku grid | common/src/main/scala/org/scalajs/benchmark/Benchmark.scala | 11 +++++------ -2013-11-26 23:22 Jonas Fonseca ● Disable phantomjs by default | common/src/main/scala/org/scalajs/benchmark/BenchmarkApp.scala | 2 +- -2013-11-26 22:55 Jonas Fonseca ● Exclude Sudoku when running all benchmarks | common/start-benchmark.js | 9 +++++++-- -2013-11-26 22:52 Jonas Fonseca ● Fix reference setup to work for node | deltablue/exports.js | 13 ------------- -2013-11-26 22:03 Jonas Fonseca ● Move benchmark registration to Scala | .../src/main/scala/org/scalajs/benchmark/deltablue/DeltaBlue.scala | 7 +++++++ -2013-11-26 20:13 Jonas Fonseca ● Rename projects to be grouped together in Eclipse | project/Build.scala | 13 ++++--------- -2013-11-19 21:56 Jonas Fonseca ● sudoku: use iterator instead of Try() | project/build.sbt | 5 ++++- -2013-11-11 21:56 Jonas Fonseca ● Add verification of sudoku solutions | richards/exports.js | 13 ------------- -2013-11-11 21:50 Jonas Fonseca ● Use stream to halt when first sudoku solution has bee| .../src/main/scala/org/scalajs/benchmark/richards/Richards.scala | 3 +++ -2013-11-11 01:11 Jonas Fonseca ● Add initial version of sudoku benchmark | run.sh | 2 +- -2013-11-05 23:20 Jonas Fonseca ● Reformat code using Scala IDE | sudoku/exports.js | 13 ------------- -2013-11-05 20:41 Jonas Fonseca ● Update exports.js files to use new Scala.js class nam| sudoku/src/main/scala/org/scalajs/benchmark/sudoku/Sudoku.scala | 2 ++ -2013-11-03 23:48 Jonas Fonseca ● Add support for PhantomJS | tracer/exports.js | 13 ------------- -2013-11-03 23:11 Jonas Fonseca ● Make the engine stubs file optional | tracer/index-dev.html | 2 +- -2013-11-03 22:44 Jonas Fonseca ● Refactor the benchmark shell code | tracer/index.html | 2 +- +2014-01-16 15:32 Philipp Haller │ ∙ Fix link to Dart benchmark harness | +2013-12-17 00:02 Jonas Fonseca ∙─╯ Update links to reflect project name change | WIP: Upgrade to 0.4-SNAPSHOT and DCE +2013-12-03 23:35 Jonas Fonseca ∙ Use Scala.js 0.2-SNAPSHOT |--- +2013-11-26 23:39 Jonas Fonseca ∙ Extract the benchmark list variable name; fix push to| common/benchmark-runner.sh | 5 +++-- +2013-11-26 23:31 Jonas Fonseca ∙ Solve the easiest sudoku grid | common/src/main/scala/org/scalajs/benchmark/Benchmark.scala | 11 +++++------ +2013-11-26 23:22 Jonas Fonseca ∙ Disable phantomjs by default | common/src/main/scala/org/scalajs/benchmark/BenchmarkApp.scala | 2 +- +2013-11-26 22:55 Jonas Fonseca ∙ Exclude Sudoku when running all benchmarks | common/start-benchmark.js | 9 +++++++-- +2013-11-26 22:52 Jonas Fonseca ∙ Fix reference setup to work for node | deltablue/exports.js | 13 ------------- +2013-11-26 22:03 Jonas Fonseca ∙ Move benchmark registration to Scala | .../src/main/scala/org/scalajs/benchmark/deltablue/DeltaBlue.scala | 7 +++++++ +2013-11-26 20:13 Jonas Fonseca ∙ Rename projects to be grouped together in Eclipse | project/Build.scala | 13 ++++--------- +2013-11-19 21:56 Jonas Fonseca ∙ sudoku: use iterator instead of Try() | project/build.sbt | 5 ++++- +2013-11-11 21:56 Jonas Fonseca ∙ Add verification of sudoku solutions | richards/exports.js | 13 ------------- +2013-11-11 21:50 Jonas Fonseca ∙ Use stream to halt when first sudoku solution has bee| .../src/main/scala/org/scalajs/benchmark/richards/Richards.scala | 3 +++ +2013-11-11 01:11 Jonas Fonseca ∙ Add initial version of sudoku benchmark | run.sh | 2 +- +2013-11-05 23:20 Jonas Fonseca ∙ Reformat code using Scala IDE | sudoku/exports.js | 13 ------------- +2013-11-05 20:41 Jonas Fonseca ∙ Update exports.js files to use new Scala.js class nam| sudoku/src/main/scala/org/scalajs/benchmark/sudoku/Sudoku.scala | 2 ++ +2013-11-03 23:48 Jonas Fonseca ∙ Add support for PhantomJS | tracer/exports.js | 13 ------------- +2013-11-03 23:11 Jonas Fonseca ∙ Make the engine stubs file optional | tracer/index-dev.html | 2 +- +2013-11-03 22:44 Jonas Fonseca ∙ Refactor the benchmark shell code | tracer/index.html | 2 +- 2013-10-29 17:29 Jonas Fonseca ●─╮ Merge pull request #2 from sjrd/patch-2 | tracer/src/main/scala/org/scalajs/benchmark/tracer/Tracer.scala | 3 +++ -2013-10-29 18:48 Sébastien Doeraene │ ● Remove workaround to support Node.js. | 17 files changed, 42 insertions(+), 76 deletions(-) -2013-10-29 18:46 Sébastien Doeraene │ ● Update for new groupId and package structure of Sca| +2013-10-29 18:48 Sébastien Doeraene │ ∙ Remove workaround to support Node.js. | 17 files changed, 42 insertions(+), 76 deletions(-) +2013-10-29 18:46 Sébastien Doeraene │ ∙ Update for new groupId and package structure of Sca| [main] ee912870202200a0b9cf4fd86ba57243212d341e - commit 1 of 48 58%|[diff] ee912870202200a0b9cf4fd86ba57243212d341e - line 1 of 367 7% EOF diff --git a/test/graph/00-simple-test b/test/graph/00-simple-test index 9639b79d..dd80496f 100755 --- a/test/graph/00-simple-test +++ b/test/graph/00-simple-test @@ -22,8 +22,8 @@ EOF assert_equals stdout <<EOF ●─╮ Merge branch 'branch3' ●─│─╮ Merge branch 'branch2' -│ ● │ branch3 -│ │ ● branch2 -● │ │ branch1 +│ ∙ │ branch3 +│ │ ∙ branch2 +∙ │ │ branch1 ◎─┴─╯ init EOF diff --git a/test/graph/01-merge-from-left-test b/test/graph/01-merge-from-left-test index 922cceb5..5502b521 100755 --- a/test/graph/01-merge-from-left-test +++ b/test/graph/01-merge-from-left-test @@ -20,7 +20,7 @@ EOF assert_equals stdout <<EOF ●─╮ Commit A - Merge C into B │ ●─╮ Commit C - Merge D into B -●─╯ │ Commit B after E -● ╭─╯ Commit E after D +∙─╯ │ Commit B after E +∙ ╭─╯ Commit E after D ◎─╯ Commit D EOF diff --git a/test/graph/02-duplicate-parent-test b/test/graph/02-duplicate-parent-test index 2221f81d..bf5ffb44 100755 --- a/test/graph/02-duplicate-parent-test +++ b/test/graph/02-duplicate-parent-test @@ -28,11 +28,11 @@ EOF assert_equals stdout <<EOF ●─╮ Commit A - Merge C into B ●─│─╮ Commit B - Merge E into C -●─╯ │ Commit C after D -│ ●─╯ Commit E after D -●─╯ Commit D after F +∙─╯ │ Commit C after D +│ ∙─╯ Commit E after D +∙─╯ Commit D after F ●─╮ Commit F - Merge H into G ●─│─╮ Commit G - Merge I into H -│ │ ● Commit I after H +│ │ ∙ Commit I after H ◎─┴─╯ Commit H EOF diff --git a/test/graph/03-octo-merge-test b/test/graph/03-octo-merge-test index e844562d..92bb559f 100755 --- a/test/graph/03-octo-merge-test +++ b/test/graph/03-octo-merge-test @@ -19,8 +19,8 @@ EOF assert_equals stdout <<EOF ●─┬─╮ Commit A - Merges B, C, and D -│ ● │ Commit C after E +│ ∙ │ Commit C after E │ ●─│─╮ Commit E - Merges D and B -●─│─│─╯ Commit B after D +∙─│─│─╯ Commit B after D ◎─┴─╯ Commit D EOF diff --git a/test/graph/04-missing-bar-test b/test/graph/04-missing-bar-test index 12641203..3aca8544 100755 --- a/test/graph/04-missing-bar-test +++ b/test/graph/04-missing-bar-test @@ -24,9 +24,9 @@ EOF assert_equals stdout <<EOF ●─╮ Commit A - Merge B and C ●─│─╮ Commit B - Merge D and E -│ ● │ Commit C after F +│ ∙ │ Commit C after F │ ●─│─╮ Commit F - Merge G and D -●─│─│─╯ Commit D after G -●─╯ │ Commit G after E +∙─│─│─╯ Commit D after G +∙─╯ │ Commit G after E ◎───╯ Commit E EOF diff --git a/test/graph/05-extra-pipe-test b/test/graph/05-extra-pipe-test index 4afc0424..26ad95f5 100755 --- a/test/graph/05-extra-pipe-test +++ b/test/graph/05-extra-pipe-test @@ -21,9 +21,9 @@ EOF assert_equals stdout <<EOF ●─╮ Commit A - merge B and C -│ ● Commit C after D +│ ∙ Commit C after D ●─│─╮ Commit B - merge E and D -│ ●─╯ Commit D after F +│ ∙─╯ Commit D after F ◎ │ Commit E ◎─╯ Commit F EOF diff --git a/test/graph/06-extra-bars-test b/test/graph/06-extra-bars-test index 4fae2374..d1eb6cd5 100755 --- a/test/graph/06-extra-bars-test +++ b/test/graph/06-extra-bars-test @@ -123,60 +123,60 @@ EOF assert_equals stdout <<EOF ●─╮ Commit A - merge B and C -│ ● Commit C - after B -│ │ ● Commit D - after B -│ │ │ ● Commit E - after F -│ │ │ ● Commit F - after G -│ │ │ ● Commit G - after H -│ │ │ ● Commit H - after I -│ │ │ ● Commit I - after J -│ │ │ ● Commit J - after K -│ │ │ ● Commit K - after L -│ │ │ ● Commit L - after M -│ │ │ ● Commit M - after N -│ │ │ ● Commit N - after O -│ │ │ ● Commit O - after P +│ ∙ Commit C - after B +│ │ ∙ Commit D - after B +│ │ │ ∙ Commit E - after F +│ │ │ ∙ Commit F - after G +│ │ │ ∙ Commit G - after H +│ │ │ ∙ Commit H - after I +│ │ │ ∙ Commit I - after J +│ │ │ ∙ Commit J - after K +│ │ │ ∙ Commit K - after L +│ │ │ ∙ Commit L - after M +│ │ │ ∙ Commit M - after N +│ │ │ ∙ Commit N - after O +│ │ │ ∙ Commit O - after P ●─┼─╯ │ Commit B - merge Q and R -│ ● ╭─╯ Commit R - after Q +│ ∙ ╭─╯ Commit R - after Q ●─┤ │ Commit Q - merge S and T -│ ● │ Commit T - after S -│ │ ● Commit P - after U -│ │ ● Commit U - after V -│ │ ● Commit V - after W +│ ∙ │ Commit T - after S +│ │ ∙ Commit P - after U +│ │ ∙ Commit U - after V +│ │ ∙ Commit V - after W ●─┤ │ Commit S - merge X and Y -│ │ │ ● Commit Z - after 1 -│ ● │ │ Commit Y - after X +│ │ │ ∙ Commit Z - after 1 +│ ∙ │ │ Commit Y - after X ●─┤ │ │ Commit X - merge 2 and 3 -│ ● │ │ Commit 3 - after 2 -│ │ │ │ ● Commit 4 - after 5 -│ │ │ │ ● Commit 5 - after 6 -│ │ ● │ │ Commit W - after 7 -│ │ │ │ ● Commit 6 - after 8 -│ │ ● │ │ Commit 7 - after 9 +│ ∙ │ │ Commit 3 - after 2 +│ │ │ │ ∙ Commit 4 - after 5 +│ │ │ │ ∙ Commit 5 - after 6 +│ │ ∙ │ │ Commit W - after 7 +│ │ │ │ ∙ Commit 6 - after 8 +│ │ ∙ │ │ Commit 7 - after 9 ●─┤ │ │ │ Commit 2 - merge 0 and a -│ ● │ │ │ Commit a - after b -│ ● │ │ │ Commit b - after c +│ ∙ │ │ │ Commit a - after b +│ ∙ │ │ │ Commit b - after c │ ●─│─│─│─╮ Commit c - merge d and 0 -│ │ │ │ ● │ Commit 8 - after e -│ │ │ │ ● │ Commit e - after f -│ │ │ │ ● │ Commit f - after g +│ │ │ │ ∙ │ Commit 8 - after e +│ │ │ │ ∙ │ Commit e - after f +│ │ │ │ ∙ │ Commit f - after g ●─│─│─│─│─┤ Commit 0 - merge h and i -│ │ │ │ ● │ Commit g - after j -│ │ │ │ ● │ Commit j - after k -│ │ │ │ ● │ Commit k - after l -│ │ │ │ ● │ Commit l - after m -│ │ │ │ ● │ Commit m - after n -│ │ │ │ ● │ Commit n - after o -│ │ │ │ ● │ Commit o - after p -│ │ │ │ ● │ Commit p - after 1 -│ │ ● │ │ │ Commit 9 - after q -│ │ │ ●─╯ │ Commit 1 - after r -│ │ │ │ ●─╯ Commit i - after h -│ ● │ │ │ Commit d - after h -│ │ │ ● │ Commit r - after s +│ │ │ │ ∙ │ Commit g - after j +│ │ │ │ ∙ │ Commit j - after k +│ │ │ │ ∙ │ Commit k - after l +│ │ │ │ ∙ │ Commit l - after m +│ │ │ │ ∙ │ Commit m - after n +│ │ │ │ ∙ │ Commit n - after o +│ │ │ │ ∙ │ Commit o - after p +│ │ │ │ ∙ │ Commit p - after 1 +│ │ ∙ │ │ │ Commit 9 - after q +│ │ │ ∙─╯ │ Commit 1 - after r +│ │ │ │ ∙─╯ Commit i - after h +│ ∙ │ │ │ Commit d - after h +│ │ │ ∙ │ Commit r - after s ●─┼─│─│─╯ Commit h - merge t and u -│ │ │ ● Commit s - after v -│ ● │ │ Commit u - after t -│ │ │ │ ● Commit w - after x -│ │ │ │ ● Commit x - after y +│ │ │ ∙ Commit s - after v +│ ∙ │ │ Commit u - after t +│ │ │ │ ∙ Commit w - after x +│ │ │ │ ∙ Commit x - after y EOF diff --git a/test/graph/07-multi-collapse-test b/test/graph/07-multi-collapse-test index f8458977..90177ac1 100755 --- a/test/graph/07-multi-collapse-test +++ b/test/graph/07-multi-collapse-test @@ -25,11 +25,11 @@ EOF assert_equals stdout <<EOF ●─┬─┬─┬─╮ Commit A - merge B, C, D, E, and F -│ ● │ │ │ Commit C - after B -●─╯ │ │ │ Commit B - after H -│ ╭─╯ │ ● Commit F - after G -● │ ╭─╯ │ Commit H - after D -●─╯ │ ╭─╯ Commit D - after E -●───╯ │ Commit E - after G +│ ∙ │ │ │ Commit C - after B +∙─╯ │ │ │ Commit B - after H +│ ╭─╯ │ ∙ Commit F - after G +∙ │ ╭─╯ │ Commit H - after D +∙─╯ │ ╭─╯ Commit D - after E +∙───╯ │ Commit E - after G ◎─────╯ Commit G EOF diff --git a/test/graph/08-multi-collapse-2-test b/test/graph/08-multi-collapse-2-test index 390365ef..f1aa97b0 100755 --- a/test/graph/08-multi-collapse-2-test +++ b/test/graph/08-multi-collapse-2-test @@ -27,12 +27,12 @@ EOF assert_equals stdout <<EOF ●─┬─┬─┬─┬─╮ Commit A - merge Z, B, C, D, E, and F -│ │ ● │ │ │ Commit C - after B -│ ●─╯ │ │ │ Commit B - after H -│ │ ╭─╯ │ ● Commit F - after G -│ ● │ ╭─╯ │ Commit H - after D -│ ●─╯ │ ╭─╯ Commit D - after E -│ ●───╯ │ Commit E - after G -│ ●─────╯ Commit G - after Z +│ │ ∙ │ │ │ Commit C - after B +│ ∙─╯ │ │ │ Commit B - after H +│ │ ╭─╯ │ ∙ Commit F - after G +│ ∙ │ ╭─╯ │ Commit H - after D +│ ∙─╯ │ ╭─╯ Commit D - after E +│ ∙───╯ │ Commit E - after G +│ ∙─────╯ Commit G - after Z ◎─╯ Commit Z EOF diff --git a/test/graph/09-parallel-siblings-test b/test/graph/09-parallel-siblings-test index f813584c..a91a6022 100755 --- a/test/graph/09-parallel-siblings-test +++ b/test/graph/09-parallel-siblings-test @@ -29,10 +29,10 @@ assert_equals stdout <<EOF ●─┬─╮ Commit A - merge Z, B, and C │ ●─│─╮ Commit B - merge D and C │ ●─│─│─╮ Commit D - merge C and E -│ ● │ │ │ Commit E - after Z -●─╯ │ │ │ Commit Z - after Y -● ╭─╯ │ │ Commit Y - after X -● │ ╭─╯ │ Commit X - after W -● │ │ ╭─╯ Commit W - after C +│ ∙ │ │ │ Commit E - after Z +∙─╯ │ │ │ Commit Z - after Y +∙ ╭─╯ │ │ Commit Y - after X +∙ │ ╭─╯ │ Commit X - after W +∙ │ │ ╭─╯ Commit W - after C ◎─┴─┴─╯ Commit C EOF diff --git a/test/graph/10-shorter-merge-than-branch-test b/test/graph/10-shorter-merge-than-branch-test index 10771944..203b1e4d 100755 --- a/test/graph/10-shorter-merge-than-branch-test +++ b/test/graph/10-shorter-merge-than-branch-test @@ -31,14 +31,14 @@ EOF assert_equals stdout <<EOF ●─┬─┬─┬─┬─╮ Commit A - merge H, B, C, D, and E -│ ● │ │ │ │ Commit B - after K -│ │ ● │ │ │ Commit C - after H -│ │ │ │ ● │ Commit J - after I -│ │ │ ● │ │ Commit D - after K -│ │ │ │ │ ● Commit E - after F -│ ●─│─╯ │ │ Commit K - after F +│ ∙ │ │ │ │ Commit B - after K +│ │ ∙ │ │ │ Commit C - after H +│ │ │ │ ∙ │ Commit J - after I +│ │ │ ∙ │ │ Commit D - after K +│ │ │ │ │ ∙ Commit E - after F +│ ∙─│─╯ │ │ Commit K - after F │ ●─│─╭─╯─┤ Commit F - merge G and H -│ ● │ │ ╭─╯ Commit G - after I -●─│─┴─│─╯ Commit H - after I +│ ∙ │ │ ╭─╯ Commit G - after I +∙─│─┴─│─╯ Commit H - after I ◎─┴───╯ Commit I EOF diff --git a/test/graph/11-new-branch-in-middle-test b/test/graph/11-new-branch-in-middle-test index c2ee7d7d..4a873444 100755 --- a/test/graph/11-new-branch-in-middle-test +++ b/test/graph/11-new-branch-in-middle-test @@ -27,12 +27,12 @@ EOF assert_equals stdout <<EOF ●─┬─╮ Commit A - merge B, C, and E -● │ │ Commit B - after F -│ ● │ Commit C - after F -│ │ ● Commit E - after Z +∙ │ │ Commit B - after F +│ ∙ │ Commit C - after F +│ │ ∙ Commit E - after Z ●─┤ │ Commit F - merge G and I ●─│─│─╮ Commit G - merge H and I -● │ │ │ Commit H - after I -●─┴─│─╯ Commit I - after Z +∙ │ │ │ Commit H - after I +∙─┴─│─╯ Commit I - after Z ◎───╯ Commit Z EOF diff --git a/test/graph/12-cross-over-collapse-test b/test/graph/12-cross-over-collapse-test index febc9677..0b6b1571 100755 --- a/test/graph/12-cross-over-collapse-test +++ b/test/graph/12-cross-over-collapse-test @@ -27,12 +27,12 @@ EOF assert_equals stdout <<EOF ●─┬─╮ Commit A - merge B, D, and E -● │ │ Commit B - after F -│ ● │ Commit D - after F -│ │ ● Commit E - after Z -●─╯ │ Commit F - after I +∙ │ │ Commit B - after F +│ ∙ │ Commit D - after F +│ │ ∙ Commit E - after Z +∙─╯ │ Commit F - after I ●─╭─╯─╮ Commit F - merge H and I -● │ ╭─╯ Commit H - after I -●─│─╯ Commit I - after Z +∙ │ ╭─╯ Commit H - after I +∙─│─╯ Commit I - after Z ◎─╯ Commit Z EOF diff --git a/test/graph/13-collapse-parallel-branches-with-different-middle-branch-test b/test/graph/13-collapse-parallel-branches-with-different-middle-branch-test index eed69020..7e2c9465 100755 --- a/test/graph/13-collapse-parallel-branches-with-different-middle-branch-test +++ b/test/graph/13-collapse-parallel-branches-with-different-middle-branch-test @@ -29,13 +29,13 @@ EOF assert_equals stdout <<EOF ●─┬─┬─┬─╮ Commit A - merge B, C, D, E, and F -│ │ ● │ │ Commit D - after I -│ │ │ ● │ Commit E - after J -│ │ │ │ ● Commit F - after I -● │ │ │ │ Commit B - after C -●─╯ │ │ │ Commit C - after G -● ╭─╯ │ │ Commit G - after H -● │ ╭─╯ │ Commit H - after I -●─┴─│───╯ Commit I - after J +│ │ ∙ │ │ Commit D - after I +│ │ │ ∙ │ Commit E - after J +│ │ │ │ ∙ Commit F - after I +∙ │ │ │ │ Commit B - after C +∙─╯ │ │ │ Commit C - after G +∙ ╭─╯ │ │ Commit G - after H +∙ │ ╭─╯ │ Commit H - after I +∙─┴─│───╯ Commit I - after J ◎───╯ Commit J EOF diff --git a/test/graph/14-long-collapse-line-test b/test/graph/14-long-collapse-line-test index 0ada103e..79acb682 100755 --- a/test/graph/14-long-collapse-line-test +++ b/test/graph/14-long-collapse-line-test @@ -49,23 +49,23 @@ EOF assert_equals stdout <<EOF ●─┬─┬─┬─┬─╮ Commit A - merge B, C, D, E, F, and G -│ ● │ │ │ │ Commit C - after B -│ │ ● │ │ │ Commit D - after B -│ │ │ ● │ │ Commit E - after B -│ │ │ │ ● │ Commit F - after B -●─┴─┴─┴─╯ │ Commit B - after H +│ ∙ │ │ │ │ Commit C - after B +│ │ ∙ │ │ │ Commit D - after B +│ │ │ ∙ │ │ Commit E - after B +│ │ │ │ ∙ │ Commit F - after B +∙─┴─┴─┴─╯ │ Commit B - after H ●─╭───────╯─╮ Commit H - merge I and G -● │ ╭───────╯ Commit I - after J -│ ●─╯ Commit G - after J -●─╯ Commit J - after K +∙ │ ╭───────╯ Commit I - after J +│ ∙─╯ Commit G - after J +∙─╯ Commit J - after K ●─┬─┬─┬─┬─╮ Commit K - merge L, M, N, O, P, and Q -│ ● │ │ │ │ Commit M - after L -│ │ ● │ │ │ Commit N - after L -│ │ │ ● │ │ Commit O - after L -│ │ │ │ ● │ Commit P - after L -●─┴─┴─┴─╯ │ Commit L - after R +│ ∙ │ │ │ │ Commit M - after L +│ │ ∙ │ │ │ Commit N - after L +│ │ │ ∙ │ │ Commit O - after L +│ │ │ │ ∙ │ Commit P - after L +∙─┴─┴─┴─╯ │ Commit L - after R ●─╭───────╯─╮ Commit R - merge S and T -● │ ╭───────╯ Commit S - after Q -│ │ ● Commit T - after Q +∙ │ ╭───────╯ Commit S - after Q +│ │ ∙ Commit T - after Q ◎─┴─╯ Commit Q EOF diff --git a/test/graph/15-many-merges-test b/test/graph/15-many-merges-test index 734d5e55..3b76c16a 100755 --- a/test/graph/15-many-merges-test +++ b/test/graph/15-many-merges-test @@ -49,23 +49,23 @@ EOF assert_equals stdout <<EOF ●─╮ Commit P - Merge O into N -│ ● Commit O after M +│ ∙ Commit O after M ●─│─╮ Commit N - Merge M into L -│ ●─╯ Commit M after K +│ ∙─╯ Commit M after K ●─│─╮ Commit L - Merge K into J │ ●─┤ Commit K - Merge J into E ●─│─╯ Commit J - Merge F into I ●─│─│─╮ Commit I - Merge H into C -│ │ │ ● Commit H after G -│ │ ● │ Commit F after C -│ ● │ │ Commit E after D +│ │ │ ∙ Commit H after G +│ │ ∙ │ Commit F after C +│ ∙ │ │ Commit E after D ●─│─┤ │ Commit C - Merge B into A -│ ● │ │ Commit D after Q -│ │ ● │ Commit B after R -│ │ ● │ Commit R after A -│ ● │ │ Commit Q after X +│ ∙ │ │ Commit D after Q +│ │ ∙ │ Commit B after R +│ │ ∙ │ Commit R after A +│ ∙ │ │ Commit Q after X ●─│─┤ │ Commit A - Merge T into S -│ │ ● │ Commit T after U -│ │ ● │ Commit U after V -│ │ ● │ Commit V after W +│ │ ∙ │ Commit T after U +│ │ ∙ │ Commit U after V +│ │ ∙ │ Commit V after W EOF diff --git a/test/graph/16-changes-test b/test/graph/16-changes-test index a9e9503f..4e989289 100755 --- a/test/graph/16-changes-test +++ b/test/graph/16-changes-test @@ -16,8 +16,8 @@ commit XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX EOF assert_equals stdout <<EOF -● Staged changes -● Unstaged changes -● First commit +∙ Staged changes +∙ Unstaged changes +∙ First commit ◎ Last commit EOF diff --git a/test/graph/17-more-merges-test b/test/graph/17-more-merges-test index 801b3c2a..12d2d3f2 100755 --- a/test/graph/17-more-merges-test +++ b/test/graph/17-more-merges-test @@ -81,18 +81,18 @@ EOF assert_equals stdout <<EOF ●─┬─┬─╮ Commit A - merge B, C, D, and E -│ │ ● │ Commit D - after B -│ ● │ │ Commit C - after F -│ │ │ ● Commit E - after H +│ │ ∙ │ Commit D - after B +│ ∙ │ │ Commit C - after F +│ │ │ ∙ Commit E - after H ●─│─┤ │ Commit B - merge H and F -│ ●─╯ │ Commit F - after G -│ ● ╭─╯ Commit G - after H -●─┴─╯ Commit H - after I +│ ∙─╯ │ Commit F - after G +│ ∙ ╭─╯ Commit G - after H +∙─┴─╯ Commit H - after I ●─┬─┬─┬─┬─╮ Commit I - merge J, K, L, M, P, and O -│ ● │ │ │ │ Commit K - after J -●─╯ │ │ │ │ Commit J - after N -● ╭─╯ │ │ │ Commit N - after O -●─│─╭─╯─│─╯ Commit O - after Q +│ ∙ │ │ │ │ Commit K - after J +∙─╯ │ │ |