From 4001301815cf1011fd6b130e91a16b06440c69e8 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 28 Aug 2005 21:29:15 +0000
Subject: [PATCH] - added diff.php - svnlib.common is now very useful with its
 caching system - browse.php and log.php can now perform diffs to HEAD and
 PREV - browse.php now shows last log entry

---
 browse.php          |   8 +++
 diff.php            |  99 ++++++++++++++++++++++++++++++++
 includes/svnlib.php | 136 ++++++++++++++++++++++++++++++++++++++++++++
 log.php             |   8 ++-
 4 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 diff.php
diff --git a/browse.php b/browse.php
index 7692993..c24c4ac 100644
--- a/browse.php
+++ b/browse.php
@@ -18,6 +18,14 @@ $relpath = $viewsvn->paths->fetch_path($path);
 
 echo $viewsvn->paths->construct_breadcrumb($path);
 
+echo '<br />';
+
+$prev = $viewsvn->svn->common->fetch_prev_rev($path, @$viewsvn->in['rev']);
+echo ($viewsvn->svn->common->fetch_head_rev($path) != @$viewsvn->in['rev'] ? '<a href="/viewsvn/' . $viewsvn->paths->out('diff.php?low=' . @$viewsvn->in['rev'] . '&amp;high=HEAD', $path) . '">Diff to HEAD</a>' : '') .
+($prev != -1 ? ' - <a href="/viewsvn/' . $viewsvn->paths->out('diff.php?low=' . $prev . '&amp;high=' . @$viewsvn->in['rev'], $path) . '">Diff to PREV</a>' : '');
+
+echo '<pre>' . print_r($viewsvn->svn->common->fetch_log($path, @$viewsvn->in['rev']), true) . '</pre>';
+
 $listing = $viewsvn->svn->ls($repos, $relpath, @$viewsvn->in['rev']);
 
 echo '<ul>';
diff --git a/diff.php b/diff.php
new file mode 100644
index 0000000..452198b
--- /dev/null
+++ b/diff.php
@@ -0,0 +1,99 @@
+<?php
+/*=====================================================================*\
+|| ################################################################### ||
+|| # ViewSVN [#]version[#]
+|| # --------------------------------------------------------------- # ||
+|| # Copyright ©2002-[#]year[#] by Iris Studios, Inc. All Rights Reserved. # ||
+|| # This file may not be reproduced in any way without permission.  # ||
+|| # --------------------------------------------------------------- # ||
+|| # User License Agreement at http://www.iris-studios.com/license/  # ||
+|| ################################################################### ||
+\*=====================================================================*/
+
+require_once('./global.php');
+
+$path = $viewsvn->paths->parse();
+$repos = $viewsvn->paths->fetch_repos($path);
+$relpath = $viewsvn->paths->fetch_path($path);
+
+echo $viewsvn->paths->construct_breadcrumb($path, false);
+
+$diff = new SVNDiff($repos, $relpath, @$viewsvn->in['low'], @$viewsvn->in['high']);
+
+echo <<<HTML
+<style type="text/css">
+<!--
+	
+	.diff_add
+	{
+		background-color: #99EE99;
+	}
+	
+	.diff_del
+	{
+		background-color: #EE9999;
+	}
+	
+	table
+	{
+		font: normal 11px monospace;
+	}
+	
+//-->
+</style>
+HTML;
+
+foreach ($diff->fetch() AS $filename => $file)
+{
+	echo '<h2>' . $filename . '</h2>';
+	
+	foreach ($file AS $hunk)
+	{
+		echo '<table cellspacing="1" cellpadding="1" width="100%">';
+		
+		foreach ($hunk AS $key => $line)
+		{
+			if ($key == 'hunk' AND isset($line['old']))
+			{
+				echo '
+			<tr style="background-color: #F7F7F7">
+				<td colspan="3">&nbsp;</td>
+			</tr>';
+				continue;
+			}
+			
+			if ($line['act'] == '+')
+			{
+				$color = '#DDFFDD';
+			}
+			else if ($line['act'] == '-')
+			{
+				$color = '#FFDDDD';
+			}
+			else
+			{
+				$color = 'white';
+			}
+			
+			echo '
+			<tr style="background-color: #EEEEDD; border-width: 0px 1px 1px 0px">
+				<td>' . $line['oldlineno'] . '</td>
+				<td>' . $line['newlineno'] . '</td>
+				<td style="background-color: ' . $color . '">' . $viewsvn->svn->format($line['line']) . '</td>
+			</tr>';
+		}
+		
+		echo '
+		</table>';
+	}
+	
+	echo '<hr />';
+}
+
+/*=====================================================================*\
+|| ###################################################################
+|| # $HeadURL$
+|| # $Id$
+|| ###################################################################
+\*=====================================================================*/
+?>
\ No newline at end of file
diff --git a/includes/svnlib.php b/includes/svnlib.php
index 4d12991..eae18d9 100644
--- a/includes/svnlib.php
+++ b/includes/svnlib.php
@@ -299,6 +299,18 @@ class SVNCommon
 	*/
 	var $registry;
 	
+	/**
+	* List of revisions
+	* @var	array
+	*/
+	var $revisions;
+	
+	/**
+	* List of logs
+	* @var	array
+	*/
+	var $logs;
+	
 	/**
 	* Constructor: bind with registry
 	*/
@@ -332,6 +344,130 @@ class SVNCommon
 			return true;
 		}
 	}
+	
+	/**
+	* Get a list of revisions for a path
+	*
+	* @access	public
+	*
+	* @param	string	Universal path
+	*
+	* @return	array	Key revisions
+	*/
+	function fetch_revs($path)
+	{
+		if (!isset($this->revisions["$path"]))
+		{
+			$log = new SVNLog($this->registry->paths->fetch_repos($path), $this->registry->paths->fetch_path($path), 0, 0);
+			
+			$revs = array_keys($log->fetch());
+			
+			$this->revisions["$path"] = array(
+				'HEAD'	=> $revs[0],
+				'START'	=> $revs[ count($revs) - 1 ],
+				'revs'	=> $revs
+			);
+		}
+		
+		return $this->revisions["$path"];
+	}
+	
+	/**
+	* Gets the revision that is marked as HEAD
+	*
+	* @access	public
+	*
+	* @param	string	Universal path
+	*
+	* @return	integer	Revision
+	*/
+	function fetch_head_rev($path)
+	{
+		$revs = $this->fetch_revs($path);
+		return $revs['HEAD'];
+	}
+	
+	/**
+	* Returns the previous revision to the one given
+	*
+	* @access	public
+	*
+	* @param	string	Universal path
+	* @param	integer	Arbitrary revision
+	*
+	* @return	integer	Previous revision (-1 if none)
+	*/
+	function fetch_prev_rev($path, $current)
+	{
+		$revs = $this->fetch_revs($path);
+		
+		$index = array_search($current, $revs['revs']);
+		if ($current === false)
+		{
+			$message->trigger->error('revision ' . $current . ' is not in ' . $path);
+		}
+		
+		if (isset($revs['revs'][ $index + 1 ]))
+		{
+			return $revs['revs'][ $index + 1 ];
+		}
+		else
+		{
+			return -1;
+		}
+	}
+	
+	/**
+	* Get a list of logs
+	*
+	* @access	public
+	*
+	* @param	string	Universal path
+	*
+	* @return	array	Log data
+	*/
+	function fetch_logs($path)
+	{
+		if (!isset($this->logs["$path"]))
+		{
+			$log = new SVNLog($this->registry->paths->fetch_repos($path), $this->registry->paths->fetch_path($path), 0, 0);
+			
+			$this->logs["$path"] = $log->fetch();
+		}
+		
+		return $this->logs["$path"];
+	}
+	
+	/**
+	* Returns a given log entry for a path
+	* and revision
+	*
+	* @access	public
+	*
+	* @param	string	Universal path
+	* @param	integer	Arbitrary revision
+	*
+	* @return	array	Log entry
+	*/
+	function fetch_log($path, $rev)
+	{
+		$logs = $this->fetch_logs($path);
+		
+		$rev = $this->registry->svn->rev($rev);
+		if ($rev == 'HEAD')
+		{
+			$rev = $this->fetch_head_rev($path);
+		}
+		
+		if (isset($logs["$rev"]))
+		{
+			return $logs["$rev"];
+		}
+		else
+		{
+			return null;
+		}
+	}
 }
 
 /**
diff --git a/log.php b/log.php
index 8592ca9..8c81f91 100644
--- a/log.php
+++ b/log.php
@@ -25,8 +25,12 @@ echo "\n";
 
 foreach ($logs->fetch() AS $log)
 {
-	echo '<li>' . $log['rev'] . ' - <a href="/viewsvn/' . $viewsvn->paths->out('view.php?rev=' . $log['rev'], $path) . '">View</a>' . 
-								' - <a href="/viewsvn/' . $viewsvn->paths->out('blame.php?rev=' . $log['rev'], $path) . '">Blame</a>';
+	$prev = $viewsvn->svn->common->fetch_prev_rev($path, $log['rev']);
+	echo '<li>' . $log['rev'] .
+		' - <a href="/viewsvn/' . $viewsvn->paths->out('view.php?rev=' . $log['rev'], $path) . '">View</a>' . 
+		' - <a href="/viewsvn/' . $viewsvn->paths->out('blame.php?rev=' . $log['rev'], $path) . '">Blame</a>' .
+		($viewsvn->svn->common->fetch_head_rev($path) != $log['rev'] ? ' - <a href="/viewsvn/' . $viewsvn->paths->out('diff.php?low=' . $log['rev'] . '&amp;high=HEAD', $path) . '">Diff to HEAD</a>' : '') .
+		($prev != -1 ? ' - <a href="/viewsvn/' . $viewsvn->paths->out('diff.php?low=' . $prev . '&amp;high=' . $log['rev'], $path) . '">Diff to PREV</a>' : '');
 	echo "\n";
 	echo '<ul>';
 	echo "\n";
-- 
2.22.5



' . $line['oldlineno'] . '	' . $line['newlineno'] . '	' . $viewsvn->svn->format($line['line']) . '