Merge branch 'next' of github.com:so-fancy/diff-so-fancy into next

Author: scottchiefbaker

README.md

@@ -18,6 +18,8 @@ Installation is as simple as cloning this repo and then putting the `diff-so-fan
 
 ## Usage
 
+### With git
+
 Configure git to use `diff-so-fancy` for all diff output:
 
 ```shell
@@ -46,45 +48,53 @@ git config --global color.diff.new        "green bold"
 git config --global color.diff.whitespace "red reverse"
 ```
 
+### With diff
+
+Use `-u` with `diff` for unified output, and pipe the output to `diff-so-fancy`:
+
+```shell
+diff -u file_a file_b | diff-so-fancy
+```
+
 ## Options
 
 ### markEmptyLines
 
 Should the first block of an empty line be colored. (Default: true)
 
-```
+```shell
 git config --bool --global diff-so-fancy.markEmptyLines false
 ```
 
 ### changeHunkIndicators
 
 Simplify git header chunks to a more human readable format. (Default: true)
 
-```
+```shell
 git config --bool --global diff-so-fancy.changeHunkIndicators false
 ```
 
 ### stripLeadingSymbols
 
 Should the pesky `+` or `-` at line-start be removed. (Default: true)
 
-```
+```shell
 git config --bool --global diff-so-fancy.stripLeadingSymbols false
 ```
 
 ### useUnicodeRuler
 
 By default, the separator for the file header uses Unicode line-drawing characters. If this is causing output errors on your terminal, set this to `false` to use ASCII characters instead. (Default: true)
 
-```
+```shell
 git config --bool --global diff-so-fancy.useUnicodeRuler false
 ```
 
 ### rulerWidth
 
 By default, the separator for the file header spans the full width of the terminal. Use this setting to set the width of the file header manually.
 
-```
+```shell
 git config --global diff-so-fancy.rulerWidth 47    # git log's commit header width
 ```
 
@@ -109,6 +119,10 @@ Pull requests are quite welcome, and should target the [`next` branch](https://g
 * [Hacking and Testing](hacking-and-testing.md)
 * [History](history.md)
 
+## Alternatives
+
+* https://github.com/dandavison/delta
+
 ## License
 
 MIT

diff-so-fancy

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-my $VERSION = "1.4.0";
+my $VERSION = "1.4.1";
 
 #################################################################################
 
@@ -345,10 +345,10 @@ sub do_dsf_stuff {
 			}
 
 			my $next    = shift(@$input);
-			my ($file1) = $next =~ /rename from (.+)/;
+			my ($file1) = $next =~ /rename from (.+?)(\e|\t|$)/;
 
 			$next       = shift(@$input);
-			my ($file2) = $next =~ /rename to (.+)/;
+			my ($file2) = $next =~ /rename to (.+?)(\e|\t|$)/;
 
 			if ($file1 && $file2) {
 				# We may not have extracted this yet, so we pull from the config if not
@@ -526,7 +526,7 @@ sub should_print_unicode {
 
 	# Otherwise, assume we're piping to less(1)
 	my ($less_env_var, $less_charset) = get_less_charset();
-	if ($less_charset =~ /utf-?8/i) {
+	if ($less_charset && $less_charset =~ /utf-?8/i) {
 		return 1;
 	}
 
@@ -663,14 +663,10 @@ sub file_change_string {
 	# If the files aren't the same it's a rename
 	} elsif ($file_1 ne $file_2) {
 		my ($old, $new) = DiffHighlight::highlight_pair($file_1,$file_2,{only_diff => 1});
+		# highlight_pair already includes reset_color, but adds newline characters that need to be trimmed off
 		$old = trim($old);
 		$new = trim($new);
-
-		# highlight_pair resets the colors, but we want it to be the meta color
-		$old =~ s/(\e0?\[m)/$1$meta_color/g;
-		$new =~ s/(\e0?\[m)/$1$meta_color/g;
-
-		return "renamed: $old to $new";
+		return "renamed: $old$meta_color to $new"
 	# Something we haven't thought of yet
 	} else {
 		return "$file_1 -> $file_2";

hacking-and-testing.md

@@ -33,4 +33,4 @@ You can lint your scripts via shellcheck, our CI bots will also check.
 
 ```sh
 brew install shellcheck
-shellcheck diff-so-fancy update-deps.sh
+shellcheck *.sh

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "diff-so-fancy",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "description": "Good-lookin' diffs with diff-highlight and more",
   "bin": {
     "diff-so-fancy": "diff-so-fancy"

package.json

@@ -2,12 +2,14 @@
 
 #### One-off fanciness or a specific diff-so-fancy alias
 
-You can do also do a one-off or a specific `diff-so-fancy` alias:
+You can do also do a one-off:
 ```shell
 git diff --color | diff-so-fancy
-
-git config --global alias.dsf '!f() { [ -z "$GIT_PREFIX" ] || cd "$GIT_PREFIX" '\
-'&& git diff --color "$@" | diff-so-fancy  | less --tabs=4 -RFX; }; f'
+```
+or configure an alias and a corresponding pager to use `diff-so-fancy`:
+```shell
+git config --global alias.dsf "diff --color"
+git config --global pager.dsf "diff-so-fancy | less --tabs=4 -RFXS"
 ```
 
 #### Opting-out
@@ -34,19 +36,19 @@ You can pre-seed your `less` pager with a search pattern, so you can move
 between files with `n`/`N` keys:
 ```ini
 [pager]
-    diff = diff-so-fancy | less --tabs=4 -RFX --pattern '^(Date|added|deleted|modified): '
+    diff = diff-so-fancy | less --tabs=4 -RFXS --pattern '^(Date|added|deleted|modified): '
 ```
 
 #### Zsh plugin providing diff-so-fancy
 
 Zsh plugin [zdharma/zsh-diff-so-fancy](https://github.com/zdharma/zsh-diff-so-fancy) has this
 project as a submodule so installing the plugin installs `diff-so-fancy`. The plugin provides
-subcommand `git dsf` out of the box. Installation with Zplugin, Zplug and Zgen:
+subcommand `git dsf` out of the box. Installation with Zinit, Zplug and Zgen:
 
 ```zsh
-# Zplugin
-zplugin ice as"program" pick"bin/git-dsf"
-zplugin light zdharma/zsh-diff-so-fancy
+# zinit
+zinit ice lucid as"program" pick"bin/git-dsf"
+zinit load zdharma/zsh-diff-so-fancy
 
 # Or zplug
 zplug "zdharma/zsh-diff-so-fancy", as:command, use:bin/git-dsf