return the correct file name for dropped files from monotone's diff output
This commit is contained in:
parent
e57fc18bcb
commit
7303e9dd58
@ -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();
|
||||||
|
Loading…
Reference in New Issue
Block a user