Merge branch 'patch-mode-35' of https://github.com/wren/diff-so-fancy into next

Author: scottchiefbaker

README.md

@@ -38,6 +38,7 @@ git config --global color.diff-highlight.newHighlight "green bold 22"
 
 git config --global color.diff.meta       "11"
 git config --global color.diff.frag       "magenta bold"
+git config --global color.diff.func       "146 bold"
 git config --global color.diff.commit     "yellow bold"
 git config --global color.diff.old        "red bold"
 git config --global color.diff.new        "green bold"

diff-so-fancy

@@ -18,6 +18,7 @@ use warnings FATAL => 'all';
 my $remove_file_add_header     = 1;
 my $remove_file_delete_header  = 1;
 my $clean_permission_changes   = 1;
+my $patch_mode                 = 0;
 my $manually_color_lines       = 0; # Usually git/hg colorizes the lines, but for raw patches we use this
 my $change_hunk_indicators     = git_config_boolean("diff-so-fancy.changeHunkIndicators","true");
 my $strip_leading_indicators   = git_config_boolean("diff-so-fancy.stripLeadingSymbols","true");
@@ -52,6 +53,13 @@ if ($args->{color_on}) {
 	$color_forced         = 1;
 }
 
+# `git add --patch` requries our output to match the number of lines from the
+# input. So, when patch mode is active, we print out empty lines to pad our
+# output to match any lines we've consumed.
+if ($args->{patch}) {
+	$patch_mode = 1;
+}
+
 # We only process ARGV if we don't have STDIN
 if (!$has_stdin) {
 	if ($args->{v} || $args->{version}) {
@@ -179,6 +187,10 @@ sub do_dsf_stuff {
 
 			$last_file_seen =~ s|^\w/||; # Remove a/ (and handle diff.mnemonicPrefix).
 			$in_hunk = 0;
+			if ($patch_mode) {
+				# we are consuming one line, and the debt must be paid
+				print "\n";
+			}
 		########################################
 		# Find the first file: --- a/README.md #
 		########################################
@@ -282,6 +294,9 @@ sub do_dsf_stuff {
 		} elsif ($remove_file_delete_header && $line =~ /^${ansi_color_regex}deleted file mode/) {
 			# Don't print the line (i.e. remove it from the output);
 			$last_file_mode = "delete";
+			if ($patch_mode) {
+				print "\n";
+			}
 		################################
 		# Look for binary file changes #
 		################################
@@ -302,6 +317,10 @@ sub do_dsf_stuff {
 			}
 
 			my ($new_mode) = $next =~ m/new mode (\d+)/;
+
+			if ($patch_mode) {
+				print "\n";
+			}
 			print "$last_file_seen changed file mode from $old_mode to $new_mode\n";
 
 		###############
@@ -544,16 +563,23 @@ sub strip_leading_indicators {
 	if ($manually_color_lines) {
 		if (defined($5) && $5 eq "+") {
 			my $add_line_color = get_config_color("add_line");
-			$line              = $add_line_color . $line . $reset_color;
+			$line              = $add_line_color . insert_reset_at_line_end($line);
 		} elsif (defined($5) && $5 eq "-") {
 			my $remove_line_color = get_config_color("remove_line");
-			$line                 = $remove_line_color . $line . $reset_color;
+			$line                 = $remove_line_color . insert_reset_at_line_end($line);
 		}
 	}
 
 	return $line;
 }
 
+# Insert the color reset code at end of line, but before any newlines
+sub insert_reset_at_line_end {
+	my $line = shift();
+	$line =~ s/^(.*)([\n\r]+)?$/${1}${reset_color}${2}/;
+	return $line;
+}
+
 # Count the number of a given char in a string
 sub char_count {
 	my ($needle,$str) = @_;

pro-tips.md

@@ -55,3 +55,12 @@ zplug "zdharma/zsh-diff-so-fancy", as:command, use:bin/git-dsf
 zgen zdharma/zsh-diff-so-fancy
 ```
 
+#### `hg` configuration
+
+You can configure `hg diff` output to use `diff-so-fancy` by adding this alias
+to your `hgrc` file:
+
+```
+[alias]
+diff = !HGPLAIN=1 $HG diff --pager=on --config pager.pager=diff-so-fancy $@
+```