Mercurial > public > mercurial-scm > hg
diff tests/test-diff-unified.t @ 16362:16b75661828e stable
mdiff: fix diff header generation for files with spaces (issue3357)
diff ---/+++ should end filenames with a TAB when they contain spaces. Current
code failed to do so when only the +++ file had spaces. This only happened with
git renames from a name without space to one with space.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Thu, 05 Apr 2012 15:39:07 +0200 |
| parents | 10c8110d114b |
| children | 6ef3107c661e |
line wrap: on
line diff
--- a/tests/test-diff-unified.t Thu Apr 05 19:15:23 2012 +0200 +++ b/tests/test-diff-unified.t Thu Apr 05 15:39:07 2012 +0200 @@ -140,3 +140,54 @@ +c3 @@ -3,1 +4,0 @@ c4 -c5 + + $ echo a > f1 + $ hg ci -m movef2 + +Test diff headers terminating with TAB when necessary (issue3357) +Regular diff --nodates, file creation + + $ hg mv f1 'f 1' + $ echo b > 'f 1' + $ hg diff --nodates 'f 1' + diff -r 7574207d0d15 f 1 + --- /dev/null + +++ b/f 1 + @@ -0,0 +1,1 @@ + +b + +Git diff, adding space + + $ hg diff --git + diff --git a/f1 b/f 1 + rename from f1 + rename to f 1 + --- a/f1 + +++ b/f 1 + @@ -1,1 +1,1 @@ + -a + +b + +Regular diff --nodates, file deletion + + $ hg ci -m addspace + $ hg mv 'f 1' f1 + $ echo a > f1 + $ hg diff --nodates 'f 1' + diff -r ca50fe67c9c7 f 1 + --- a/f 1 + +++ /dev/null + @@ -1,1 +0,0 @@ + -b + +Git diff, removing space + + $ hg diff --git + diff --git a/f 1 b/f1 + rename from f 1 + rename to f1 + --- a/f 1 + +++ b/f1 + @@ -1,1 +1,1 @@ + -b + +a