Mercurial > hg
diff tests/test-commit-interactive.t @ 41454:d1d3094b54f9
patch: handle 0 context lines (diff.unified=0) when parsing patches
Previously, if there were no context lines, we would just keep updating the
ranges and the hunk, but not actually storing the hunk (just overwriting it each
time). Thus a diff like this:
$ hg diff --config diff.unified=0
diff --git a/bar b/bar
--- a/bar
+++ b/bar
@@ -1,0 +2,1 @@ 1
+change1
@@ -3,0 +5,1 @@ 3
+change2
would come out of the parser like this (change1 is lost):
bar:
@@ -3,0 +5,1 @@ 3
+change2
This had some really weird side effects for things like commit --interactive,
split, etc.
Differential Revision: https://phab.mercurial-scm.org/D5743
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Mon, 28 Jan 2019 18:00:14 -0800 |
parents | 89ba51c3e4f1 |
children | 3a01ce246ece |
line wrap: on
line diff
--- a/tests/test-commit-interactive.t Wed Jan 30 03:56:35 2019 +0530 +++ b/tests/test-commit-interactive.t Mon Jan 28 18:00:14 2019 -0800 @@ -1807,3 +1807,38 @@ n 0 -1 unset subdir/f1 $ hg status -A subdir/f1 M subdir/f1 + +Test diff.unified=0 + + $ hg init $TESTTMP/b + $ cd $TESTTMP/b + $ cat > foo <<EOF + > 1 + > 2 + > 3 + > 4 + > 5 + > EOF + $ hg ci -qAm initial + $ cat > foo <<EOF + > 1 + > change1 + > 2 + > 3 + > change2 + > 4 + > 5 + > EOF + $ printf 'y\ny\ny\n' | hg ci -im initial --config diff.unified=0 + diff --git a/foo b/foo + 2 hunks, 2 lines changed + examine changes to 'foo'? [Ynesfdaq?] y + + @@ -1,0 +2,1 @@ 1 + +change1 + record change 1/2 to 'foo'? [Ynesfdaq?] y + + @@ -3,0 +5,1 @@ 3 + +change2 + record change 2/2 to 'foo'? [Ynesfdaq?] y +