Changing empty fetch_rev_(str|num)() calls to the cached version in Paths

diff --git a/blame.php b/blame.php
index 84bc15251d7cbdb8dd363e3405112b2b026364d9..863709f1fb15f3c9b54f9055c9fa53d54c3a0a25 100644 (file)
--- a/blame.php
+++ b/blame.php
@@ -30,24 +30,24 @@ $navbar = $viewsvn->paths->construct_breadcrumb($viewsvn->paths->path, false);
 
 // ###################################################################
 
-$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->fetch_rev_str(), $viewsvn->paths->path);
+$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->revstr, $viewsvn->paths->path);
 
-$show['head'] = ($viewsvn->svn->common->fetch_head_rev($viewsvn->paths->path) != $viewsvn->paths->fetch_rev_num() AND $viewsvn->paths->fetch_rev_num() != 'HEAD');
+$show['head'] = ($viewsvn->svn->common->fetch_head_rev($viewsvn->paths->path) != $viewsvn->paths->revnum AND $viewsvn->paths->revnum != 'HEAD');
 if ($show['head'])
 {
        $link['gohead'] = $viewsvn->paths->out('blame.php' . $viewsvn->paths->fetch_rev_str(false, 'HEAD'), $viewsvn->paths->path);
-       $link['diffhead'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, 'HEAD', $viewsvn->paths->fetch_rev_num()), $viewsvn->paths->path);
+       $link['diffhead'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, 'HEAD', $viewsvn->paths->revnum), $viewsvn->paths->path);
 }
 
-$show['prev'] = (($prev = $viewsvn->svn->common->fetch_prev_rev($viewsvn->paths->path, $viewsvn->paths->fetch_rev_num())) != -1 ? true : false);
+$show['prev'] = (($prev = $viewsvn->svn->common->fetch_prev_rev($viewsvn->paths->path, $viewsvn->paths->revnum)) != -1 ? true : false);
 if ($show['prev'])
 {
-       $link['diffprev'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, $viewsvn->paths->fetch_rev_num(), $prev), $viewsvn->paths->path);
+       $link['diffprev'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, $viewsvn->paths->revnum, $prev), $viewsvn->paths->path);
 }
 
 // ###################################################################
 
-$blame = new SVNBlame($viewsvn->paths->repos, $viewsvn->paths->relpath, $viewsvn->paths->fetch_rev_num());
+$blame = new SVNBlame($viewsvn->paths->repos, $viewsvn->paths->relpath, $viewsvn->paths->revnum);
 
 $lines = '';
 

diff --git a/browse.php b/browse.php
index 5e259d05f3c80ad5b10d197b1dfc264dcf8ecdd4..2903846e17eb5109259f7eca91574d8e2e5a525b 100644 (file)
--- a/browse.php
+++ b/browse.php
@@ -30,28 +30,28 @@ $navbar = $viewsvn->paths->construct_breadcrumb($viewsvn->paths->path);
 
 // ###################################################################
 
-$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->fetch_rev_str(), $viewsvn->paths->path);
+$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->revstr, $viewsvn->paths->path);
 
-$show['head'] = ($viewsvn->svn->common->fetch_head_rev($viewsvn->paths->path) != $viewsvn->paths->fetch_rev_num() AND $viewsvn->paths->fetch_rev_num() != 'HEAD');
+$show['head'] = ($viewsvn->svn->common->fetch_head_rev($viewsvn->paths->path) != $viewsvn->paths->revnum AND $viewsvn->paths->revnum != 'HEAD');
 if ($show['head'])
 {
        $link['gohead'] = $viewsvn->paths->out('browse.php' . $viewsvn->paths->fetch_rev_str(false, 'HEAD'), $viewsvn->paths->path);
-       $link['diffhead'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, 'HEAD', $viewsvn->paths->fetch_rev_num()), $viewsvn->paths->path);
+       $link['diffhead'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, 'HEAD', $viewsvn->paths->revnum), $viewsvn->paths->path);
 }
 
-$show['prev'] = (($prev = $viewsvn->svn->common->fetch_prev_rev($viewsvn->paths->path, $viewsvn->paths->fetch_rev_num())) != -1 ? true : false);
+$show['prev'] = (($prev = $viewsvn->svn->common->fetch_prev_rev($viewsvn->paths->path, $viewsvn->paths->revnum)) != -1 ? true : false);
 if ($show['prev'])
 {
-       $link['diffprev'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, $viewsvn->paths->fetch_rev_num(), $prev), $viewsvn->paths->path);
+       $link['diffprev'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, $viewsvn->paths->revnum, $prev), $viewsvn->paths->path);
 }
 
 // ###################################################################
 
-$revinfo = $viewsvn->svn->common->fetch_log($viewsvn->paths->path, $viewsvn->paths->fetch_rev_num());
+$revinfo = $viewsvn->svn->common->fetch_log($viewsvn->paths->path, $viewsvn->paths->revnum);
 
 $revinfo['message_clean'] = $viewsvn->svn->format_log_message($revinfo['message']);
 
-$listing = $viewsvn->svn->ls($viewsvn->paths->repos, $viewsvn->paths->relpath, $viewsvn->paths->fetch_rev_num());
+$listing = $viewsvn->svn->ls($viewsvn->paths->repos, $viewsvn->paths->relpath, $viewsvn->paths->revnum);
 
 $nodes = '';
 
@@ -60,16 +60,16 @@ foreach ($listing AS $item)
        if ($item{ strlen($item) - 1 } == '/')
        {
                $show['directory'] = true;
-               $browse = $viewsvn->paths->out('browse.php' . $viewsvn->paths->fetch_rev_str(), $viewsvn->paths->path . $item);
+               $browse = $viewsvn->paths->out('browse.php' . $viewsvn->paths->revstr, $viewsvn->paths->path . $item);
        }
        else
        {
                $show['directory'] = false;
-               $view = $viewsvn->paths->out('view.php' . $viewsvn->paths->fetch_rev_str(), $viewsvn->paths->path . $item);
-               $blame = $viewsvn->paths->out('blame.php' . $viewsvn->paths->fetch_rev_str(), $viewsvn->paths->path . $item);
+               $view = $viewsvn->paths->out('view.php' . $viewsvn->paths->revstr, $viewsvn->paths->path . $item);
+               $blame = $viewsvn->paths->out('blame.php' . $viewsvn->paths->revstr, $viewsvn->paths->path . $item);
        }
        
-       $log = $viewsvn->paths->out('log.php' . $viewsvn->paths->fetch_rev_str(), $viewsvn->paths->path . $item);
+       $log = $viewsvn->paths->out('log.php' . $viewsvn->paths->revstr, $viewsvn->paths->path . $item);
        
        eval('$nodes .= "' . $template->fetch('browse_node') . '";');
 }

diff --git a/diff.php b/diff.php
index 11d6b4c843ec46a1e1c0f774c6875db12b480651..a9ad0127dd976cd78e434c3fcc7cb43cb94f4293 100644 (file)
--- a/diff.php
+++ b/diff.php
@@ -34,7 +34,7 @@ $navbar = $viewsvn->paths->construct_breadcrumb($viewsvn->paths->path, false);
 
 // ###################################################################
 
-$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->fetch_rev_str(), $viewsvn->paths->path);
+$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->revstr, $viewsvn->paths->path);
 
 // ###################################################################
 

diff --git a/includes/paths.php b/includes/paths.php
index 98b24fd2d3ff64707a44820f8ba48269dd9ec1bc..74b93e20aaa5c8b6e35d37f9bf64115e2f4b6abd 100644 (file)
--- a/includes/paths.php
+++ b/includes/paths.php
@@ -60,6 +60,18 @@ class Paths
        */
        var $relpath;
        
+       /**
+       * The current revision number
+       * @var  integer
+       */
+       var $revnum;
+       
+       /**
+       * The current revision as a string argument
+       * @var  string
+       */
+       var $revstr;
+       
        /**
        * Constructor: determine the type of linking to use
        *
@@ -77,6 +89,8 @@ class Paths
                $this->type = (int)$type;
                
                $this->path = $this->parse();
+               $this->revnum = $this->revnum;
+               $this->revstr = $this->revstr;
        }
        
        /**
@@ -180,7 +194,7 @@ class Paths
                {
                        $itembit .= $item;
                        $itembit .= (($count != $val OR @$viewsvn->svn->common->isdir($itembit)) ? '/' : '');
-                       $html .= '<a href="' . $viewsvn->path . '/' . $this->out('browse.php' . $this->fetch_rev_str(), $itembit) . '">' . $item . '</a>'. ($count != $val ? ' / ' : '');
+                       $html .= '<a href="' . $viewsvn->path . '/' . $this->out('browse.php' . $this->revstr, $itembit) . '">' . $item . '</a>'. ($count != $val ? ' / ' : '');
                }
                
                return $html;

diff --git a/includes/svnlib.php b/includes/svnlib.php
index 0c47a1b1a9e768125f61fb7bab0e2c0117c4c794..8ed39baad0205c160ea098c1b6e845a217e9f8ac 100644 (file)
--- a/includes/svnlib.php
+++ b/includes/svnlib.php
@@ -438,7 +438,7 @@ class SVNCommon
        */
        function isdir($path)
        {
-               $output = $this->registry->svn->std('info', $this->registry->paths->fetch_repos($path), $this->registry->paths->fetch_path($path), $this->registry->paths->fetch_rev_num());
+               $output = $this->registry->svn->std('info', $this->registry->paths->fetch_repos($path), $this->registry->paths->fetch_path($path), $this->registry->paths->revnum);
                
                foreach ($output AS $line)
                {
@@ -557,7 +557,7 @@ class SVNCommon
        {
                if (!isset($this->logs["$path"]))
                {
-                       $log = new SVNLog($this->registry->paths->fetch_repos($path), $this->registry->paths->fetch_path($path), 0, $this->registry->paths->fetch_rev_num());
+                       $log = new SVNLog($this->registry->paths->fetch_repos($path), $this->registry->paths->fetch_path($path), 0, $this->registry->paths->revnum);
                        
                        $this->logs["$path"] = $log->fetch();
                }

diff --git a/view.php b/view.php
index ce3314c7218789f52145cf5e1261a96c6d8e6f85..9c2b5f8d7b1ade0f6d2a279f82cc86e5b02674c8 100644 (file)
--- a/view.php
+++ b/view.php
@@ -29,29 +29,29 @@ $navbar = $viewsvn->paths->construct_breadcrumb($viewsvn->paths->path);
 
 // ###################################################################
 
-$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->fetch_rev_str(), $viewsvn->paths->path);
+$link['log'] = $viewsvn->paths->out('log.php' . $viewsvn->paths->revstr, $viewsvn->paths->path);
 
-$show['head'] = ($viewsvn->svn->common->fetch_head_rev($viewsvn->paths->path) != $viewsvn->paths->fetch_rev_num() AND $viewsvn->paths->fetch_rev_num() != 'HEAD');
+$show['head'] = ($viewsvn->svn->common->fetch_head_rev($viewsvn->paths->path) != $viewsvn->paths->revnum AND $viewsvn->paths->revnum != 'HEAD');
 if ($show['head'])
 {
        $link['gohead'] = $viewsvn->paths->out('browse.php' . $viewsvn->paths->fetch_rev_str(false, 'HEAD'), $viewsvn->paths->path);
-       $link['diffhead'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, 'HEAD', $viewsvn->paths->fetch_rev_num()), $viewsvn->paths->path);
+       $link['diffhead'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, 'HEAD', $viewsvn->paths->revnum), $viewsvn->paths->path);
 }
 
-$show['prev'] = (($prev = $viewsvn->svn->common->fetch_prev_rev($viewsvn->paths->path, $viewsvn->paths->fetch_rev_num())) != -1 ? true : false);
+$show['prev'] = (($prev = $viewsvn->svn->common->fetch_prev_rev($viewsvn->paths->path, $viewsvn->paths->revnum)) != -1 ? true : false);
 if ($show['prev'])
 {
-       $link['diffprev'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, $viewsvn->paths->fetch_rev_num(), $prev), $viewsvn->paths->path);
+       $link['diffprev'] = $viewsvn->paths->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, $viewsvn->paths->revnum, $prev), $viewsvn->paths->path);
 }
 
 // ###################################################################
 
-$logmsg = $viewsvn->svn->common->fetch_log($viewsvn->paths->path, $viewsvn->paths->fetch_rev_num());
+$logmsg = $viewsvn->svn->common->fetch_log($viewsvn->paths->path, $viewsvn->paths->revnum);
 unset($logmsg['files']);
 
 $logmsg['message_clean'] = $viewsvn->svn->format_log_message($logmsg['message']);
 
-$catdata = implode("\n", $viewsvn->svn->cat($viewsvn->paths->repos, $viewsvn->paths->relpath, $viewsvn->paths->fetch_rev_num()));
+$catdata = implode("\n", $viewsvn->svn->cat($viewsvn->paths->repos, $viewsvn->paths->relpath, $viewsvn->paths->revnum));
 
 // get language information
 require_once('./includes/file_types.php');