diff --git a/NEWS.adoc b/NEWS.adoc index bf89eec5b..71f7024c4 100644 --- a/NEWS.adoc +++ b/NEWS.adoc @@ -13,6 +13,7 @@ Improvements: - Improve worktree and submodule support. (GH #459, #781, #783) - Support running Tig via a Git alias. (GH #763) - Use ISO-8601 letters for short relative dates. (GH #759) + - Change date formatting to show timezones by default. (GH #428, #811) Bug fixes: diff --git a/src/util.c b/src/util.c index 47e8207de..83753f7e0 100644 --- a/src/util.c +++ b/src/util.c @@ -183,6 +183,7 @@ mkdate(const struct time *time, enum date date, bool local, const char *custom_f static char buf[SIZEOF_STR]; struct tm tm; const char *format; + bool tz_fmt; if (!date || !time || !time->sec) return ""; @@ -191,18 +192,74 @@ mkdate(const struct time *time, enum date date, bool local, const char *custom_f return get_relative_date(time, buf, sizeof(buf), date == DATE_RELATIVE_COMPACT); + format = (date == DATE_CUSTOM && custom_format) + ? custom_format + : local + ? "%Y-%m-%d %H:%M" + : "%Y-%m-%d %H:%M %z"; + + tz_fmt = strstr(format, "%z") || strstr(format, "%Z"); + if (local) { - time_t date = time->sec + time->tz; - localtime_r(&date, &tm); - } - else { + time_t timestamp = time->sec + time->tz; + + localtime_r(×tamp, &tm); + } else { gmtime_r(&time->sec, &tm); } - format = date != DATE_CUSTOM - ? "%Y-%m-%d %H:%M" - : custom_format ? custom_format : "%Y-%m-%d"; - return strftime(buf, sizeof(buf), format, &tm) ? buf : NULL; + if (local || (!tz_fmt)) + return !strftime(buf, sizeof(buf), format, &tm) ? NULL : buf; + + { + char format_buf[SIZEOF_STR]; + char *format_pos = format_buf; + char *buf_pos = buf; + size_t buf_size = sizeof(buf); + int tz = ABS(time->tz); + + string_ncopy(format_buf, format, strlen(format)); + + while (*format_pos) { + char *z_pos = strstr(format_pos, "%z"); + char *Z_pos = strstr(format_pos, "%Z"); + char *tz_pos = (z_pos && Z_pos) ? MIN(z_pos, Z_pos) : MAX(z_pos, Z_pos); + size_t time_len; + + if (tz_pos) + *tz_pos = 0; + + time_len = strftime(buf_pos, buf_size, format_pos, &tm); + if (!time_len) + return NULL; + + buf_pos += time_len; + buf_size -= time_len; + + if (!tz_pos) + break; + + /* Skip the %z format flag and insert the timezone. */ + format_pos = tz_pos + 2; + + if (buf_size < 5) + return NULL; + + buf_pos[0] = time->tz > 0 ? '-' : '+'; + buf_pos[1] = '0' + (tz / 60 / 60 / 10); + buf_pos[2] = '0' + (tz / 60 / 60 % 10); + buf_pos[3] = '0' + (tz / 60 % 60 / 10); + buf_pos[4] = '0' + (tz / 60 % 60 % 10); + buf_pos[5] = 0; + + buf_pos += 5; + buf_size -= 5; + } + +#undef buf_size + } + + return buf; } const char * diff --git a/test/blame/default-test b/test/blame/default-test index 24f3fe9c3..a7249e55d 100755 --- a/test/blame/default-test +++ b/test/blame/default-test @@ -28,47 +28,47 @@ in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz" test_tig blame project/Build.scala assert_equals 'blame-default.screen' < @@ -92,15 +92,15 @@ index 560bca1..1713681 100644 EOF assert_equals 'blame-with-diff-no-file-filter.screen' < @@ -124,33 +124,33 @@ index 560bca1..1713681 100644 EOF assert_equals 'blame-parent-of-74537d9.screen' < -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 -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 +- -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| +2014-03-01 17:26 -0500 Jonas Fonseca ∙ [master] WIP: Upgrade to 0.4-SNAPSHOT and DCE |commit ee912870202200a0b9cf4fd86ba57243212d341e +2014-03-01 15:59 -0500 Jonas Fonseca ∙ Add type parameter for js.Dynamic |Refs: [master] +2014-01-16 22:51 -0500 Jonas Fonseca ∙ Move classes under org.scalajs.benchmark packag|Author: Jonas Fonseca +2014-01-16 17:43 -0500 Jonas Fonseca ∙ Bump Scala.js version to 0.3-SNAPSHOT |AuthorDate: Sat Mar 1 17:26:01 2014 -0500 +2014-01-16 17:39 -0500 Jonas Fonseca ∙ Integrate app code into the benchmark infrastru|Commit: Jonas Fonseca +2014-01-16 07:47 -0800 Jonas Fonseca ●─╮ Merge pull request #4 from phaller/patch-1 |CommitDate: Sat Mar 1 17:26:01 2014 -0500 +2014-01-16 15:32 +0100 Philipp Haller │ ∙ Fix link to Dart benchmark harness | +2013-12-17 00:02 +0100 Jonas Fonseca ∙─╯ Update links to reflect project name change | WIP: Upgrade to 0.4-SNAPSHOT and DCE +2013-12-03 23:35 -0500 Jonas Fonseca ∙ Use Scala.js 0.2-SNAPSHOT |--- +2013-11-26 23:39 -0500 Jonas Fonseca ∙ Extract the benchmark list variable name; fix p| common/benchmark-runner.sh | 5 +++-- +2013-11-26 23:31 -0500 Jonas Fonseca ∙ Solve the easiest sudoku grid | common/src/main/scala/org/scalajs/benchmark/Benchmark.scala | 11 +++++------ +2013-11-26 23:22 -0500 Jonas Fonseca ∙ Disable phantomjs by default | common/src/main/scala/org/scalajs/benchmark/BenchmarkApp.scala | 2 +- +2013-11-26 22:55 -0500 Jonas Fonseca ∙ Exclude Sudoku when running all benchmarks | common/start-benchmark.js | 9 +++++++-- +2013-11-26 22:52 -0500 Jonas Fonseca ∙ Fix reference setup to work for node | deltablue/exports.js | 13 ------------- +2013-11-26 22:03 -0500 Jonas Fonseca ∙ Move benchmark registration to Scala | .../src/main/scala/org/scalajs/benchmark/deltablue/DeltaBlue.scala | 7 +++++++ +2013-11-26 20:13 -0500 Jonas Fonseca ∙ Rename projects to be grouped together in Eclip| project/Build.scala | 13 ++++--------- +2013-11-19 21:56 -0500 Jonas Fonseca ∙ sudoku: use iterator instead of Try() | project/build.sbt | 5 ++++- +2013-11-11 21:56 -0500 Jonas Fonseca ∙ Add verification of sudoku solutions | richards/exports.js | 13 ------------- +2013-11-11 21:50 -0500 Jonas Fonseca ∙ Use stream to halt when first sudoku solution h| .../src/main/scala/org/scalajs/benchmark/richards/Richards.scala | 3 +++ +2013-11-11 01:11 -0500 Jonas Fonseca ∙ Add initial version of sudoku benchmark | run.sh | 2 +- +2013-11-05 23:20 -0500 Jonas Fonseca ∙ Reformat code using Scala IDE | sudoku/exports.js | 13 ------------- +2013-11-05 20:41 -0500 Jonas Fonseca ∙ Update exports.js files to use new Scala.js cla| sudoku/src/main/scala/org/scalajs/benchmark/sudoku/Sudoku.scala | 2 ++ +2013-11-03 23:48 -0500 Jonas Fonseca ∙ Add support for PhantomJS | tracer/exports.js | 13 ------------- +2013-11-03 23:11 -0500 Jonas Fonseca ∙ Make the engine stubs file optional | tracer/index-dev.html | 2 +- +2013-11-03 22:44 -0500 Jonas Fonseca ∙ Refactor the benchmark shell code | tracer/index.html | 2 +- +2013-10-29 17:29 -0700 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 +0100 Sébastien Doeraene │ ∙ Remove workaround to support Node.js. | 17 files changed, 42 insertions(+), 76 deletions(-) +2013-10-29 18:46 +0100 Sébastien Doeraene │ ∙ Update for new groupId and package structure | [main] ee912870202200a0b9cf4fd86ba57243212d341e - commit 1 of 48 58%|[diff] ee912870202200a0b9cf4fd86ba57243212d341e - line 1 of 367 7% EOF diff --git a/test/main/all-arg-test b/test/main/all-arg-test index b7327046a..0261f183e 100755 --- a/test/main/all-arg-test +++ b/test/main/all-arg-test @@ -27,37 +27,37 @@ assert_equals stderr < Commit 10 B -2010-03-04 04:09 A. U. Thor * Commit 10 A -2010-02-23 15:46 Max Power * Commit 9 E -2010-02-15 03:24 Jørgen Thygesen Brahe * Commit 9 D -2010-02-06 15:02 作者 * Commit 9 C -2010-01-29 02:40 René Lévesque * Commit 9 B -2010-01-20 14:18 A. U. Thor * Commit 9 A -2010-01-12 01:56 Max Power * Commit 8 E -2010-01-03 13:33 Jørgen Thygesen Brahe * Commit 8 D -2009-12-26 01:11 作者 * [r1.1.2] [r1.1.x] Commit 8 C +2009-02-13 23:31 +0000 Max Power * {max-power/mp/feature} WIP: featu +2010-04-07 05:37 +0000 Max Power * [master] {origin/master} {max-pow +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe * Commit 10 D +2010-03-21 04:53 +0000 作者 * Commit 10 C +2010-03-12 16:31 +0000 René Lévesque * Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor * Commit 10 A +2010-02-23 15:46 +0000 Max Power * Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe * Commit 9 D +2010-02-06 15:02 +0000 作者 * Commit 9 C +2010-01-29 02:40 +0000 René Lévesque * Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor * Commit 9 A +2010-01-12 01:56 +0000 Max Power * Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe * Commit 8 D +2009-12-26 01:11 +0000 作者 * [r1.1.2] [r1.1.x] Commit 8 [main] 042f71a7592228ae84cbb3642c2666dcd35aa527 - commit 1 of 51 27% EOF assert_equals 'detached.screen' < Commit 10 B -2010-03-04 04:09 A. U. Thor * Commit 10 A -2010-02-23 15:46 Max Power * Commit 9 E -2010-02-15 03:24 Jørgen Thygesen Brahe * Commit 9 D -2010-02-06 15:02 作者 * Commit 9 C -2010-01-29 02:40 René Lévesque * Commit 9 B -2010-01-20 14:18 A. U. Thor * Commit 9 A -2010-01-12 01:56 Max Power * Commit 8 E -2010-01-03 13:33 Jørgen Thygesen Brahe * Commit 8 D -2009-12-26 01:11 作者 * [r1.1.2] [r1.1.x] Commit 8 C +2009-02-13 23:31 +0000 Max Power * {max-power/mp/feature} WIP: featu +2010-04-07 05:37 +0000 Max Power * [master] {origin/master} {max-pow +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe * Commit 10 D +2010-03-21 04:53 +0000 作者 * [HEAD] Commit 10 C +2010-03-12 16:31 +0000 René Lévesque * Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor * Commit 10 A +2010-02-23 15:46 +0000 Max Power * Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe * Commit 9 D +2010-02-06 15:02 +0000 作者 * Commit 9 C +2010-01-29 02:40 +0000 René Lévesque * Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor * Commit 9 A +2010-01-12 01:56 +0000 Max Power * Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe * Commit 8 D +2009-12-26 01:11 +0000 作者 * [r1.1.2] [r1.1.x] Commit 8 [main] 042f71a7592228ae84cbb3642c2666dcd35aa527 - commit 1 of 51 27% EOF diff --git a/test/main/author-name-change-test b/test/main/author-name-change-test index e79d91224..9973e2ec4 100755 --- a/test/main/author-name-change-test +++ b/test/main/author-name-change-test @@ -20,8 +20,8 @@ in_work_dir create_repo_from_tgz "$base_dir/files/repo-authornamechange.tgz" test_tig assert_equals 'main-default.screen' <> prepare.log 2>> prepare.log test_tig --boundary --all ^master assert_equals 'merge-view.screen' < Commit 10 B -2010-03-04 04:09 A. U. Thor * Commit 10 A -2010-02-23 15:46 Max Power * Commit 9 E -2010-02-15 03:24 Jørgen Thygesen Brahe * Commit 9 D -2010-02-06 15:02 作者 * Commit 9 C -2010-01-29 02:40 René Lévesque * Commit 9 B -2010-01-20 14:18 A. U. Thor * Commit 9 A -2010-01-12 01:56 Max Power * Commit 8 E -2010-01-03 13:33 Jørgen Thygesen Brahe * Commit 8 D -2009-12-26 01:11 作者 * [r1.1.2] [r1.1.x] Commit 8 C -2009-12-17 12:49 René Lévesque * [r1.0] Commit 8 B -2009-12-09 00:27 A. U. Thor * Commit 8 A +2009-02-13 23:31 +0000 Max Power * [mp/feature] {max-power/mp/featur +2010-04-07 05:37 +0000 Max Power * [master] {origin/master} {max-pow +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe * Commit 10 D +2010-03-21 04:53 +0000 作者 * Commit 10 C +2010-03-12 16:31 +0000 René Lévesque * Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor * Commit 10 A +2010-02-23 15:46 +0000 Max Power * Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe * Commit 9 D +2010-02-06 15:02 +0000 作者 * Commit 9 C +2010-01-29 02:40 +0000 René Lévesque * Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor * Commit 9 A +2010-01-12 01:56 +0000 Max Power * Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe * Commit 8 D +2009-12-26 01:11 +0000 作者 * [r1.1.2] [r1.1.x] Commit 8 +2009-12-17 12:49 +0000 René Lévesque * [r1.0] Commit 8 B +2009-12-09 00:27 +0000 A. U. Thor * Commit 8 A [main] 042f71a7592228ae84cbb3642c2666dcd35aa527 - commit 1 of 51 31% EOF diff --git a/test/main/commit-order-edge-case-test b/test/main/commit-order-edge-case-test index 2a385921c..fc27c1abe 100755 --- a/test/main/commit-order-edge-case-test +++ b/test/main/commit-order-edge-case-test @@ -22,25 +22,25 @@ in_work_dir create_repo_from_tgz "$source_dir/$test.tgz" test_tig assert_equals 'ensure-topo-order-with-graph.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] 5cb3412a5e06e506840495b91acc885037a48b72 - commit 1 of 50 28% EOF assert_equals 'main-ref-format.screen' < AuthorDate: Thu Dec 17 12:49:30 2009 +0000 Commit: Committer CommitDate: Thu Dec 17 12:49:30 2009 +0000 - + Commit 8 B - + [diff] 957f2b368e6fa5c0757f36b1441e32729ee5e9c7 - line 1 of 8 100% EOF diff --git a/test/main/emoji-test b/test/main/emoji-test index daedd7af7..8ced6cc9c 100755 --- a/test/main/emoji-test +++ b/test/main/emoji-test @@ -22,18 +22,18 @@ test_setup_work_dir() git_init -test_case emoji-commit-titles-col-40 \ - --subshell='export COLUMNS=40' \ +test_case emoji-commit-titles-col-46 \ + --subshell='export COLUMNS=46' \ < repo.log 2>&1 test_tig --merge assert_equals 'commit-1.screen' < AuthorDate: Wed Apr 7 05:37:40 2010 +0000 Commit: ¯\_(ツ)_/¯ CommitDate: Wed Apr 7 05:37:40 2010 +0000 - + Commit 10 E - - - - - + + + + + [diff] 5cb3412a5e06e506840495b91acc885037a48b72 - line 1 of 8 100% EOF diff --git a/test/main/main-options-test b/test/main/main-options-test index 5f88d7d1e..68bd4e5d4 100755 --- a/test/main/main-options-test +++ b/test/main/main-options-test @@ -20,19 +20,19 @@ git_clone 'repo-one' test_tig assert_equals 'with-10-lines.screen' < repo.log 2>&1 test_tig --merge assert_equals 'main-with-conflict.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] 8d53d6a41f8540749c0db5d0b53e48d2f178dce4 - commit 3 of 50 28% EOF assert_equals 'main-search-author-empty.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] 711615619913109be8fd85f2c378839acaa6db11 - commit 8 of 50 28% EOF assert_equals 'main-search-author-find-next.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] b45b5704c34dbd4c5fd89d58d45238ad136ae166 - commit 13 of 50 28% EOF assert_equals 'main-search-title.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] 99278700109ac9fe4a80bbc1e5b26769e3614f1b - commit 9 of 50 28% EOF assert_equals 'main-search-title-no-match.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] 99278700109ac9fe4a80bbc1e5b26769e3614f1b - commit 9 of 50 28% EOF assert_equals 'main-search-refs.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] 957f2b368e6fa5c0757f36b1441e32729ee5e9c7 - commit 14 of 50 28% EOF assert_equals 'main-search-time.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] 545eb1fa92b902b6799e2a1691419c3158254a0a - commit 12 of 50 28% EOF assert_equals 'main-search-smart-case.screen' < Commit 8 B +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/ +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D +2010-03-21 04:53 +0000 作者 o Commit 10 C +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A +2010-02-23 15:46 +0000 Max Power o Commit 9 E +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D +2010-02-06 15:02 +0000 作者 o Commit 9 C +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A +2010-01-12 01:56 +0000 Max Power o Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D +2009-12-26 01:11 +0000 作者 o Commit 8 C +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B [main] 19455fa3642af6a6a7d527dd043caf5a70eaad2d - commit 5 of 50 28% EOF diff --git a/test/main/show-changes-after-rename-test b/test/main/show-changes-after-rename-test index ef7806321..de91f03fa 100755 --- a/test/main/show-changes-after-rename-test +++ b/test/main/show-changes-after-rename-test @@ -26,7 +26,7 @@ test_setup_work_dir() { test_tig assert_equals 'default.screen' < Commit 8 B -2009-12-09 00:27 A. U. Thor Commit 8 A +2010-01-12 01:56 +0000 Max Power Commit 8 E +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe Commit 8 D +2009-12-26 01:11 +0000 作者 Commit 8 C +2009-12-17 12:49 +0000 René Lévesque Commit 8 B +2009-12-09 00:27 +0000 A. U. Thor Commit 8 A diff --git a/test/main/update-unstaged-changes-test b/test/main/update-unstaged-changes-test index 802a6bd48..90eff3601 100755 --- a/test/main/update-unstaged-changes-test +++ b/test/main/update-unstaged-changes-test @@ -26,8 +26,8 @@ in_work_dir create_dirty_workdir test_tig assert_equals 'start.screen' < -2010-03-12 16:31 R~ |AuthorDate: Wed Apr 7 05:37:40 2010 +0000 -2010-03-04 04:09 A~ |Commit: Committer -2010-02-23 15:46 M~ |CommitDate: Wed Apr 7 05:37:40 2010 +0000 -2010-02-15 03:24 J~ | -2010-02-06 15:02 ~ | Commit 10 E -2010-01-29 02:40 R~ | -2010-01-20 14:18 A~ | -2010-01-12 01:56 M~ | -2010-01-03 13:33 J~ | -2009-12-26 01:11 ~ | -2009-12-17 12:49 R~ | -2009-12-09 00:27 A~ | -2009-11-30 12:05 M~ | +2010-04-07 05:37 +0 |commit 5cb3412a5e06e506840495b91acc885037a48b72 +2010-03-29 17:15 +0 |Refs: [master], {origin/master}, {origin/HEAD} +2010-03-21 04:53 +0 |Author: Max Power +2010-03-12 16:31 +0 |AuthorDate: Wed Apr 7 05:37:40 2010 +0000 +2010-03-04 04:09 +0 |Commit: Committer +2010-02-23 15:46 +0 |CommitDate: Wed Apr 7 05:37:40 2010 +0000 +2010-02-15 03:24 +0 | +2010-02-06 15:02 +0 | Commit 10 E +2010-01-29 02:40 +0 | +2010-01-20 14:18 +0 | +2010-01-12 01:56 +0 | +2010-01-03 13:33 +0 | +2009-12-26 01:11 +0 | +2009-12-17 12:49 +0 | +2009-12-09 00:27 +0 | +2009-11-30 12:05 +0 | [main] 5cb3412a5e32%|[diff] 5cb3412a5e06e506840495b91acc885037a48b72 - line 100% EOF assert_equals 'main-hsplit-default.screen' < AuthorDate: Wed Apr 7 05:37:40 2010 +0000 Commit: Committer CommitDate: Wed Apr 7 05:37:40 2010 +0000 - + Commit 10 E - - + + [diff] 5cb3412a5e06e506840495b91acc885037a48b72 - line 1 of 8 100% EOF assert_equals 'main-hsplit-50-50.screen' < AuthorDate: Wed Apr 7 05:37:40 2010 +0000 Commit: Committer CommitDate: Wed Apr 7 05:37:40 2010 +0000 - + [diff] 5cb3412a5e06e506840495b91acc885037a48b72 - line 1 of 8 87% EOF diff --git a/test/refs/branch-checkout-test b/test/refs/branch-checkout-test index dfc7e6df5..64051622d 100755 --- a/test/refs/branch-checkout-test +++ b/test/refs/branch-checkout-test @@ -6,7 +6,7 @@ . libgit.sh export LINES=9 -export COLUMNS=90 +export COLUMNS=100 steps ' :save-display refs-init.screen @@ -62,34 +62,34 @@ $LONG_TAG_NAME_ID EOF assert_equals 'refs-init.screen' < committed +2009-02-13 23:31 +0000 Committer I [master] {origin/master} {origin/HEAD} committe [main] 6b55d08be93000f4bdf67f74177ab14f590910d4 - commit 1 of 1 100% EOF diff --git a/test/regressions/github-434-test b/test/regressions/github-434-test index a26fdfa93..278e23df0 100755 --- a/test/regressions/github-434-test +++ b/test/regressions/github-434-test @@ -27,97 +27,97 @@ git_clone 'repo-one' test_tig assert_equals 'vsplit-auto.screen' < -2010-03-12 16:31 René Lévesque o Commit 10 B |AuthorDate: Wed Apr 7 05:37:40 2010 +0000 -2010-03-04 04:09 A. U. Thor o Commit 10 A |Commit: Committer -2010-02-23 15:46 Max Power o Commit 9 E |CommitDate: Wed Apr 7 05:37:40 2010 +0000 -2010-02-15 03:24 Jørgen Thygesen Brahe o Commit 9 D | -2010-02-06 15:02 作者 o Commit 9 C | Commit 10 E -2010-01-29 02:40 René Lévesque o Commit 9 B | -2010-01-20 14:18 A. U. Thor o Commit 9 A | -2010-01-12 01:56 Max Power o Commit 8 E | -2010-01-03 13:33 Jørgen Thygesen Brahe o Commit 8 D | -2009-12-26 01:11 作者 o Commit 8 C | -2009-12-17 12:49 René Lévesque o Commit 8 B | -2009-12-09 00:27 A. U. Thor o Commit 8 A | -2009-11-30 12:05 Max Power o Commit 7 E | -2009-11-21 23:43 Jørgen Thygesen Brahe o Commit 7 D | -2009-11-13 11:20 作者 o Commit 7 C | -2009-11-04 22:58 René Lévesque o Commit 7 B | -2009-10-27 10:36 A. U. Thor o Commit 7 A | -2009-10-18 22:14 Max Power o Commit 6 E | -2009-10-10 09:52 Jørgen Thygesen Brahe o Commit 6 D | -2009-10-01 21:30 作者 o Commit 6 C | -2009-09-23 09:07 René Lévesque o Commit 6 B | -2009-09-14 20:45 A. U. Thor o Commit 6 A | -2009-09-06 08:23 Max Power o Commit 5 E | -2009-08-28 20:01 Jørgen Thygesen Brahe o Commit 5 D | -2009-08-20 07:39 作者 o Commit 5 C | +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/|commit 5cb3412a5e06e506840495b91acc885037a48b72 +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D |Refs: [master], {origin/master}, {origin/HEAD} +2010-03-21 04:53 +0000 作者 o Commit 10 C |Author: Max Power +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B |AuthorDate: Wed Apr 7 05:37:40 2010 +0000 +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A |Commit: Committer +2010-02-23 15:46 +0000 Max Power o Commit 9 E |CommitDate: Wed Apr 7 05:37:40 2010 +0000 +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D | +2010-02-06 15:02 +0000 作者 o Commit 9 C | Commit 10 E +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B | +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A | +2010-01-12 01:56 +0000 Max Power o Commit 8 E | +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D | +2009-12-26 01:11 +0000 作者 o Commit 8 C | +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B | +2009-12-09 00:27 +0000 A. U. Thor o Commit 8 A | +2009-11-30 12:05 +0000 Max Power o Commit 7 E | +2009-11-21 23:43 +0000 Jørgen Thygesen Brahe o Commit 7 D | +2009-11-13 11:20 +0000 作者 o Commit 7 C | +2009-11-04 22:58 +0000 René Lévesque o Commit 7 B | +2009-10-27 10:36 +0000 A. U. Thor o Commit 7 A | +2009-10-18 22:14 +0000 Max Power o Commit 6 E | +2009-10-10 09:52 +0000 Jørgen Thygesen Brahe o Commit 6 D | +2009-10-01 21:30 +0000 作者 o Commit 6 C | +2009-09-23 09:07 +0000 René Lévesque o Commit 6 B | +2009-09-14 20:45 +0000 A. U. Thor o Commit 6 A | +2009-09-06 08:23 +0000 Max Power o Commit 5 E | +2009-08-28 20:01 +0000 Jørgen Thygesen Brahe o Commit 5 D | +2009-08-20 07:39 +0000 作者 o Commit 5 C | [main] 5cb3412a5e06e506840495b91acc885037a48b72 - commit 1 of 50 56%|[diff] 5cb3412a5e06e506840495b91acc885037a48b72 - line 1 of 8 100% EOF assert_equals 'hsplit.screen' < AuthorDate: Mon Mar 29 17:15:30 2010 +0000 Commit: Committer CommitDate: Mon Mar 29 17:15:30 2010 +0000 - + Commit 10 D - - - - - - - - - - - + + + + + + + + + + + [diff] 2843bfd58b98c7e23ab91e51ffa4db4f8e27c9a4 - line 1 of 7 100% EOF assert_equals 'vsplit.screen' < -2010-03-21 04:53 作者 o Commit 10 C |AuthorDate: Mon Mar 29 17:15:30 2010 +0000 -2010-03-12 16:31 René Lévesque o Commit 10 B |Commit: Committer -2010-03-04 04:09 A. U. Thor o Commit 10 A |CommitDate: Mon Mar 29 17:15:30 2010 +0000 -2010-02-23 15:46 Max Power o Commit 9 E | -2010-02-15 03:24 Jørgen Thygesen Brahe o Commit 9 D | Commit 10 D -2010-02-06 15:02 作者 o Commit 9 C | -2010-01-29 02:40 René Lévesque o Commit 9 B | -2010-01-20 14:18 A. U. Thor o Commit 9 A | -2010-01-12 01:56 Max Power o Commit 8 E | -2010-01-03 13:33 Jørgen Thygesen Brahe o Commit 8 D | -2009-12-26 01:11 作者 o Commit 8 C | -2009-12-17 12:49 René Lévesque o Commit 8 B | -2009-12-09 00:27 A. U. Thor o Commit 8 A | -2009-11-30 12:05 Max Power o Commit 7 E | -2009-11-21 23:43 Jørgen Thygesen Brahe o Commit 7 D | -2009-11-13 11:20 作者 o Commit 7 C | -2009-11-04 22:58 René Lévesque o Commit 7 B | -2009-10-27 10:36 A. U. Thor o Commit 7 A | -2009-10-18 22:14 Max Power o Commit 6 E | -2009-10-10 09:52 Jørgen Thygesen Brahe o Commit 6 D | -2009-10-01 21:30 作者 o Commit 6 C | -2009-09-23 09:07 René Lévesque o Commit 6 B | -2009-09-14 20:45 A. U. Thor o Commit 6 A | -2009-09-06 08:23 Max Power o Commit 5 E | -2009-08-28 20:01 Jørgen Thygesen Brahe o Commit 5 D | -2009-08-20 07:39 作者 o Commit 5 C | +2010-04-07 05:37 +0000 Max Power o [master] {origin/master} {origin/|commit 2843bfd58b98c7e23ab91e51ffa4db4f8e27c9a4 +2010-03-29 17:15 +0000 Jørgen Thygesen Brahe o Commit 10 D |Author: Jørgen Thygesen Brahe +2010-03-21 04:53 +0000 作者 o Commit 10 C |AuthorDate: Mon Mar 29 17:15:30 2010 +0000 +2010-03-12 16:31 +0000 René Lévesque o Commit 10 B |Commit: Committer +2010-03-04 04:09 +0000 A. U. Thor o Commit 10 A |CommitDate: Mon Mar 29 17:15:30 2010 +0000 +2010-02-23 15:46 +0000 Max Power o Commit 9 E | +2010-02-15 03:24 +0000 Jørgen Thygesen Brahe o Commit 9 D | Commit 10 D +2010-02-06 15:02 +0000 作者 o Commit 9 C | +2010-01-29 02:40 +0000 René Lévesque o Commit 9 B | +2010-01-20 14:18 +0000 A. U. Thor o Commit 9 A | +2010-01-12 01:56 +0000 Max Power o Commit 8 E | +2010-01-03 13:33 +0000 Jørgen Thygesen Brahe o Commit 8 D | +2009-12-26 01:11 +0000 作者 o Commit 8 C | +2009-12-17 12:49 +0000 René Lévesque o Commit 8 B | +2009-12-09 00:27 +0000 A. U. Thor o Commit 8 A | +2009-11-30 12:05 +0000 Max Power o Commit 7 E | +2009-11-21 23:43 +0000 Jørgen Thygesen Brahe o Commit 7 D | +2009-11-13 11:20 +0000 作者 o Commit 7 C | +2009-11-04 22:58 +0000 René Lévesque o Commit 7 B | +2009-10-27 10:36 +0000 A. U. Thor o Commit 7 A | +2009-10-18 22:14 +0000 Max Power o Commit 6 E | +2009-10-10 09:52 +0000 Jørgen Thygesen Brahe o Commit 6 D | +2009-10-01 21:30 +0000 作者 o Commit 6 C | +2009-09-23 09:07 +0000 René Lévesque o Commit 6 B | +2009-09-14 20:45 +0000 A. U. Thor o Commit 6 A | +2009-09-06 08:23 +0000 Max Power o Commit 5 E | +2009-08-28 20:01 +0000 Jørgen Thygesen Brahe o Commit 5 D | +2009-08-20 07:39 +0000 作者 o Commit 5 C | [main] 2843bfd58b98c7e23ab91e51ffa4db4f8e27c9a4 - commit 2 of 50 56%|[diff] 2843bfd58b98c7e23ab91e51ffa4db4f8e27c9a4 - line 1 of 7 100% EOF diff --git a/test/script/comment-test b/test/script/comment-test index 5d340c29d..75f23469c 100755 --- a/test/script/comment-test +++ b/test/script/comment-test @@ -16,8 +16,8 @@ steps ' test_tig assert_equals main.screen <