Fixed the case of a non-existing file.
This commit is contained in:
parent
15cba014ba
commit
e31d822d74
@ -186,7 +186,7 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
escapeshellarg($commit));
|
escapeshellarg($commit));
|
||||||
$xml = simplexml_load_string(shell_exec($cmd));
|
$xml = simplexml_load_string(shell_exec($cmd));
|
||||||
$res = array();
|
$res = array();
|
||||||
$folder = (strlen($folder)) ? $folder.'/' : '';
|
$folder = (strlen($folder) and ($folder != '/')) ? $folder.'/' : '';
|
||||||
foreach ($xml->list->entry as $entry) {
|
foreach ($xml->list->entry as $entry) {
|
||||||
$file = array();
|
$file = array();
|
||||||
$file['type'] = $this->assoc[(string) $entry['kind']];
|
$file['type'] = $this->assoc[(string) $entry['kind']];
|
||||||
@ -229,9 +229,6 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
return $this->cache['commitmess'][$rev];
|
return $this->cache['commitmess'][$rev];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* FIXME: Need to check the case of an inexisting file.
|
|
||||||
*/
|
|
||||||
public function getPathInfo($filename, $rev=null)
|
public function getPathInfo($filename, $rev=null)
|
||||||
{
|
{
|
||||||
if ($rev == null) {
|
if ($rev == null) {
|
||||||
@ -243,6 +240,9 @@ class IDF_Scm_Svn extends IDF_Scm
|
|||||||
escapeshellarg($this->repo.'/'.$filename),
|
escapeshellarg($this->repo.'/'.$filename),
|
||||||
escapeshellarg($rev));
|
escapeshellarg($rev));
|
||||||
$xml = simplexml_load_string(shell_exec($cmd));
|
$xml = simplexml_load_string(shell_exec($cmd));
|
||||||
|
if (!isset($xml->entry)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
$entry = $xml->entry;
|
$entry = $xml->entry;
|
||||||
$file = array();
|
$file = array();
|
||||||
$file['fullpath'] = $filename;
|
$file['fullpath'] = $filename;
|
||||||
|
Loading…
Reference in New Issue
Block a user