From 9897b20070709a04e7beafd674b14c29801cebd9 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 22 Jan 2006 18:33:00 +0000 Subject: [PATCH] Fixed cacheV::build(). We can now actually run the function sans fatal errors --- includes/cachev.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/cachev.php b/includes/cachev.php index c7f9ebf..5f52dd3 100644 --- a/includes/cachev.php +++ b/includes/cachev.php @@ -262,23 +262,23 @@ class cacheV $start = microtime(); // get _revs - $output = $this->controller->registry->svn->svn('log --xml -v ' . ($revision !== null ? '-r' . $revision . ':HEAD ' : '') . $this->controller->registry->repos->fetch_path($this->controller->registry->paths->repos)); + $output = $this->controller->library->svn('log --xml -v ' . ($revision !== null ? '-r' . $revision . ':HEAD ' : '') . $this->controller->repospath); $output = implode("\n", $output); $tree = $this->controller->registry->xml->parse($output); // get _nodes - $output = $this->controller->registry->svn->svn('info --xml -R ' . ($revision !== null ? '-r' . $revision . ':HEAD ' : '') . $this->controller->registry->repos->fetch_path($this->controller->registry->paths->repos)); + $output = $this->controller->library->svn('info --xml -R ' . ($revision !== null ? '-r' . $revision . ':HEAD ' : '') . $this->controller->repospath); $output = implode("\n", $output); $infolist = $this->controller->registry->xml->parse($output); // other part of _nodes: properties - $output = $this->controller->registry->svn->svn('proplist -v -R ' . ($revision !== null ? ' -r' . $revision . ':HEAD ' : '') . $this->controller->registry->repos->fetch_path($this->controller->registry->paths->repos)); + $output = $this->controller->library->svn('proplist -v -R ' . ($revision !== null ? ' -r' . $revision . ':HEAD ' : '') . $this->controller->repospath); foreach ($output AS $line) { if (preg_match('#^Properties on \'(.*?)\':$#', $line, $bits)) { $proplist["$index"]["$curprop"] = trim($proplist["$index"]["$curprop"]); - $index = str_replace($this->controller->registry->repos->fetch_path($this->controller->registry->paths->repos), '', $bits[1]); + $index = str_replace($this->controller->repospath, '', $bits[1]); $capture = false; } else @@ -316,7 +316,7 @@ class cacheV // construct list of HEAD nodes for _nodes foreach ($infolist['info']['entry'] AS $node) { - $history = $this->controller->registry->svn->svn('log --xml ' . $node['url']['value']); + $history = $this->controller->library->svn('log --xml ' . $node['url']['value']); $history = implode("\n", $history); $history = $this->controller->registry->xml->parse($history); -- 2.22.5