Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for hiding diff signs (leading + and -) #901

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for hiding diff signs (leading + and -) #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e9d807
Add support for hiding diff signs (leading + and -)
andebjor Mar 3, 2019
06e0edc
Add option to tune diff highlighting
andebjor Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions doc/tigrc.5.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,23 @@ The following variables can be set:

Number of context lines to show for diffs.

'diff-show-signs' (bool)::

Show (or hide) the leading `+` and `-` signs in diff output. Copy-paste
of lines from the diff view may be aided by hiding these signs. Note
that disabling signs only makes sense when coloring is used to
distinguish added and removed lines. On by default.

'diff-column-highlight' (enum) [no|all|only-empty]::

Highlight the left-most column in diff views visually when the option
'diff-show-signs' is not in effect. All added/removed lines can be
highlighted, or only empty lines. Changed lines are indicated in the
first column by a space highlighted by the color `diff-add-highlight` or
`diff-del-highlight`, respectively. Keeping the `standout` (reverse)
property set for these is suggested, as white space is otherwise
invisible. Default is to highlight only empty lines.

'diff-highlight' (mixed)::

Whether to highlight diffs using Git's 'diff-highlight' program. Defaults
Expand Down
2 changes: 2 additions & 0 deletions include/tig/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ typedef struct view_column *view_settings;
_(commit_order, enum commit_order, VIEW_LOG_LIKE) \
_(diff_context, int, VIEW_DIFF_LIKE) \
_(diff_noprefix, bool, VIEW_NO_FLAGS) \
_(diff_show_signs, bool, VIEW_NO_FLAGS) \
_(diff_column_highlight, enum diff_column_highlight, VIEW_NO_FLAGS) \
_(diff_options, const char **, VIEW_DIFF_LIKE) \
_(diff_highlight, const char *, VIEW_DIFF_LIKE) \
_(diff_view, view_settings, VIEW_NO_FLAGS) \
Expand Down
6 changes: 6 additions & 0 deletions include/tig/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ bool map_enum_do(const struct enum_map_entry *map, size_t map_size, int *value,
_(REFRESH_MODE, AFTER_COMMAND), \
_(REFRESH_MODE, PERIODIC),

#define DIFF_COLUMN_HIGHLIGHT_ENUM(_) \
_(DIFF_COLUMN_HIGHLIGHT, NO), \
_(DIFF_COLUMN_HIGHLIGHT, ALL), \
_(DIFF_COLUMN_HIGHLIGHT, ONLY_EMPTY)

#define ENUM_INFO(_) \
_(author, AUTHOR_ENUM) \
_(commit_order, COMMIT_ORDER_ENUM) \
Expand All @@ -176,6 +181,7 @@ bool map_enum_do(const struct enum_map_entry *map, size_t map_size, int *value,
_(reference_type, REFERENCE_ENUM) \
_(refresh_mode, REFRESH_MODE_ENUM) \
_(status_label, STATUS_LABEL_ENUM) \
_(diff_column_highlight, DIFF_COLUMN_HIGHLIGHT_ENUM) \

#define DEFINE_ENUMS(name, macro) DEFINE_ENUM(name, macro)
ENUM_INFO(DEFINE_ENUMS)
Expand Down
34 changes: 33 additions & 1 deletion src/draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,39 @@ draw_chars(struct view *view, enum line_type type, const char *string, int lengt

set_view_attr(view, type);
if (len > 0)
waddnstr(view->win, string, len);
{
if (view_has_flags(view, VIEW_DIFF_LIKE) &&
!opt_diff_show_signs &&
view->col == 0 &&
(type == LINE_DIFF_ADD || type == LINE_DIFF_DEL || type == LINE_DEFAULT) &&
Copy link
Collaborator

@koutcher koutcher May 25, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LINE_DEFAULT is also used for the commit description so it is impacted as well.

You also miss the case of merge commits where diff --cc is used. In this case there are two columns of +- (try tig show f7b4319 in tig repository). Unfortunately draw_chars is too low level to know about it.

A while ago I gave it a try but didn't like it so it stayed in the box. If you want to have a look, I pushed it at https://github.com/koutcher/tig/tree/gh-855-hide-diff-signs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the pointers!

In the repos I use at work there are no merge commits so I have completely missed that case :(

I will have a look at your branch and make a decision if this patch can be further developed or not.

(string[0] == ' ' || string[0] == '+' || string[0] == '-')
) {
if (opt_diff_column_highlight == DIFF_COLUMN_HIGHLIGHT_ALL) {
if (type == LINE_DIFF_ADD) {
set_view_attr(view, LINE_DIFF_ADD_HIGHLIGHT);
} else if (type == LINE_DIFF_DEL) {
set_view_attr(view, LINE_DIFF_DEL_HIGHLIGHT);
}
waddch(view->win, ' ');
set_view_attr(view, type);
}
else if (opt_diff_column_highlight == DIFF_COLUMN_HIGHLIGHT_ONLY_EMPTY && len == 1) {
if (type == LINE_DIFF_ADD) {
set_view_attr(view, LINE_DIFF_ADD_HIGHLIGHT);
waddch(view->win, ' ');
} else if (type == LINE_DIFF_DEL) {
set_view_attr(view, LINE_DIFF_DEL_HIGHLIGHT);
waddch(view->win, ' ');
}

set_view_attr(view, type);
}

waddnstr(view->win, string+1, len-1);
} else {
waddnstr(view->win, string, len);
}
}

if (trimmed && use_tilde) {
set_view_attr(view, LINE_DELIMITER);
Expand Down
49 changes: 49 additions & 0 deletions test/diff/diff-hide-signs-highlight-all-test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/sh

. libtest.sh
. libgit.sh

tigrc <<EOF
set diff-show-signs = false
set diff-column-highlight = all
EOF

steps '
:save-display diff-hide-signs.screen
'

in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz"

test_tig show master^

assert_equals 'diff-hide-signs.screen' '' <<EOF
commit a1dcf1aaa11470978db1d5d8bcf9e16201eb70ff
Author: Jonas Fonseca <jonas.fonseca@gmail.com>
AuthorDate: Sat Mar 1 15:59:02 2014 -0500
Commit: Jonas Fonseca <jonas.fonseca@gmail.com>
CommitDate: Sat Mar 1 15:59:02 2014 -0500

Add type parameter for js.Dynamic
---
common/src/main/scala/org/scalajs/benchmark/Benchmark.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala b/commo
index 65f914a..3aa4320 100644
--- a/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala
+++ b/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala
@@ -15,7 +15,7 @@ object Benchmark {
val benchmarks = js.Array[Benchmark]()
val benchmarkApps = js.Array[BenchmarkApp]()

val global = js.Dynamic.global.asInstanceOf[js.Dictionary]
val global = js.Dynamic.global.asInstanceOf[js.Dictionary[js.Any]]
global("runScalaJSBenchmarks") = runBenchmarks _
global("initScalaJSBenchmarkApps") = initBenchmarkApps _





[diff] a1dcf1aaa11470978db1d5d8bcf9e16201eb70ff - line 1 of 24 100%
EOF
49 changes: 49 additions & 0 deletions test/diff/diff-hide-signs-highlight-only-empty-test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/sh

. libtest.sh
. libgit.sh

tigrc <<EOF
set diff-show-signs = false
set diff-column-highlight = only-empty
EOF

steps '
:save-display diff-hide-signs.screen
'

in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz"

test_tig show master^

assert_equals 'diff-hide-signs.screen' '' <<EOF
commit a1dcf1aaa11470978db1d5d8bcf9e16201eb70ff
Author: Jonas Fonseca <jonas.fonseca@gmail.com>
AuthorDate: Sat Mar 1 15:59:02 2014 -0500
Commit: Jonas Fonseca <jonas.fonseca@gmail.com>
CommitDate: Sat Mar 1 15:59:02 2014 -0500

Add type parameter for js.Dynamic
---
common/src/main/scala/org/scalajs/benchmark/Benchmark.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala b/commo
index 65f914a..3aa4320 100644
--- a/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala
+++ b/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala
@@ -15,7 +15,7 @@ object Benchmark {
val benchmarks = js.Array[Benchmark]()
val benchmarkApps = js.Array[BenchmarkApp]()

val global = js.Dynamic.global.asInstanceOf[js.Dictionary]
val global = js.Dynamic.global.asInstanceOf[js.Dictionary[js.Any]]
global("runScalaJSBenchmarks") = runBenchmarks _
global("initScalaJSBenchmarkApps") = initBenchmarkApps _





[diff] a1dcf1aaa11470978db1d5d8bcf9e16201eb70ff - line 1 of 24 100%
EOF
49 changes: 49 additions & 0 deletions test/diff/diff-hide-signs-test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/sh

. libtest.sh
. libgit.sh

tigrc <<EOF
set diff-show-signs = false
set diff-column-hightlight = no
EOF

steps '
:save-display diff-hide-signs.screen
'

in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz"

test_tig show master^

assert_equals 'diff-hide-signs.screen' '' <<EOF
commit a1dcf1aaa11470978db1d5d8bcf9e16201eb70ff
Author: Jonas Fonseca <jonas.fonseca@gmail.com>
AuthorDate: Sat Mar 1 15:59:02 2014 -0500
Commit: Jonas Fonseca <jonas.fonseca@gmail.com>
CommitDate: Sat Mar 1 15:59:02 2014 -0500

Add type parameter for js.Dynamic
---
common/src/main/scala/org/scalajs/benchmark/Benchmark.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala b/commo
index 65f914a..3aa4320 100644
--- a/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala
+++ b/common/src/main/scala/org/scalajs/benchmark/Benchmark.scala
@@ -15,7 +15,7 @@ object Benchmark {
val benchmarks = js.Array[Benchmark]()
val benchmarkApps = js.Array[BenchmarkApp]()

val global = js.Dynamic.global.asInstanceOf[js.Dictionary]
val global = js.Dynamic.global.asInstanceOf[js.Dictionary[js.Any]]
global("runScalaJSBenchmarks") = runBenchmarks _
global("initScalaJSBenchmarkApps") = initBenchmarkApps _





[diff] a1dcf1aaa11470978db1d5d8bcf9e16201eb70ff - line 1 of 24 100%
EOF
2 changes: 2 additions & 0 deletions tigrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ set show-notes = yes # When non-bool passed as `--show-notes=...` (diff)
#set diff-options = -C # User-defined options for `tig show` (git-diff)
#set diff-highlight = true # String (or bool): Path to diff-highlight script,
# defaults to `diff-highlight`.
set diff-show-signs = yes # Show diff signs (+ and -) at the start of diff lines
set diff-column-highlight = only-empty # Enum: no, all, only-empty
#set blame-options = -C -C -C # User-defined options for `tig blame` (git-blame)
#set log-options = --pretty=raw # User-defined options for `tig log` (git-log)
#set main-options = -n 1000 # User-defined options for `tig` (git-log)
Expand Down