Patch with space in filenames is displayed wrong

[pano]

Paths with spaces contained in patches / diffs are displayed wrong:

dir

@@ -1 +1 @@
 abcdef
+ghijkl 

dirWithoutSpaces/filename

@@ -1 +1 @@
 abcdef
+ghijkl

The first "title" is displayed as just dir when it should actually be dir with spaces/filename.

(Same with attached patches.)

[pano]

The problem seems to be here: source:trunk/trac/mimeview/patch.py@13930:136,148#L134​

Change both occurrences of split(None, 2) to split(None, 1) to fix it. But I don't know what [rev] could be. oldrev and newrev seem to get ignored anyway.

[Jun Omae]

It wouldn't fix. Another complex case.

$ mkdir 'file.txt a' 'file.txt b'
$ echo 1 >./file.txt\ a/file.txt
$ echo 1 >./file.txt\ b/file.txt
$ git add *
$ git commit -a -m test
[master c80f2b2] test
 2 files changed, 2 insertions(+)
 create mode 100644 file.txt a/file.txt
 create mode 100644 file.txt b/file.txt
$ echo 2 >./file.txt\ b/file.txt
$ echo 2 >./file.txt\ a/file.txt
$ git diff

Diff:

diff --git a/file.txt a/file.txt b/file.txt a/file.txt
index d00491f..0cfbf08 100644
--- a/file.txt a/file.txt
+++ b/file.txt a/file.txt
@@ -1 +1 @@
-1
+2
diff --git a/file.txt b/file.txt b/file.txt b/file.txt
index d00491f..0cfbf08 100644
--- a/file.txt b/file.txt
+++ b/file.txt b/file.txt
@@ -1 +1 @@
-1
+2

I think we should retrieve path from diff --git a/... b/... line, or detect git extended format by the diff --git line.

[Jun Omae]

A duplicate of #6943.