natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:tommyd3mdi/indefero-monotone

Browse Source
This commit is contained in:
Thomas Keller 2010-06-24 02:07:44 +02:00
commit 4fdf248cb6
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/IDF/Diff.php
View File

@ -72,7 +72,18 @@ class IDF_Diff
$indiff = true; $indiff = true;
continue; continue;
} else if (0 === strpos($line, '=========')) { } else if (0 === strpos($line, '=========')) {
// by default always use the new name of a possibly renamed file
$current_file = self::getMtnFile($this->lines[$i+1]); $current_file = self::getMtnFile($this->lines[$i+1]);
// mtn 0.48 and newer set /dev/null as file path for dropped files
// so we display the old name here
if ($current_file == "/dev/null") {
$current_file = self::getMtnFile($this->lines[$i]);
}
if ($current_file == "/dev/null") {
throw new Exception(
"could not determine path from diff"
);
}
$files[$current_file] = array(); $files[$current_file] = array();
$files[$current_file]['chunks'] = array(); $files[$current_file]['chunks'] = array();
$files[$current_file]['chunks_def'] = array(); $files[$current_file]['chunks_def'] = array();