]>
src.bluestatic.org Git - viewsvn.git/blob - includes/svnlib.php
2 /*=====================================================================*\
3 || ###################################################################
4 || # ViewSVN [#]version[#]
5 || # Copyright ©2002-[#]year[#] Iris Studios, Inc.
7 || # This program is free software; you can redistribute it and/or modify
8 || # it under the terms of the GNU General Public License as published by
9 || # the Free Software Foundation; version [#]gpl[#] of the License.
11 || # This program is distributed in the hope that it will be useful, but
12 || # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
13 || # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
16 || # You should have received a copy of the GNU General Public License along
17 || # with this program; if not, write to the Free Software Foundation, Inc.,
18 || # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
19 || ###################################################################
20 \*=====================================================================*/
23 * Command line library and SVN-PHP bridge extension
29 * This class acts as the bridge between the command line Xquery class
30 * and the various display files. It handles preparation of Xquery
39 * Path to the SVN binary
52 // ###################################################################
54 * Constructor: validate SVN path
56 * @param object Controller
58 function SVNLib (& $controller )
60 $this- > controller
=& $controller ;
62 $this- > svnpath
=& $this- > controller
-> xquery
-> cmd ( $this- > controller
-> registry
-> svnpath
);
64 $access = $this- > controller
-> xquery
-> exec ( $this- > svnpath
. ' --version' );
68 $this- > controller
-> registry
-> trigger
-> error ( $this- > controller
-> registry
-> lang
-> string ( 'The SVN binary could not be located' ));
71 if (! preg_match ( '#^svn, version (.*?)\)$#i' , trim ( $access [ 0 ])))
73 $this- > controller
-> registry
-> trigger
-> error ( $this- > controller
-> registry
-> lang
-> string ( 'The SVN binary does not appear to be valid (it failed our tests)' ));
77 // ###################################################################
79 * Executes the SVN binary
83 * @param string Command
85 * @return array Output
87 function svn ( $command )
89 $output = $this- > controller
-> xquery
-> exec ( $this- > svnpath
. ' ' . $command . ' 2>&1' );
91 $temp = implode ( " \n " , $output );
92 if ( strpos ( $temp , '(apr' . '_err=' ) !== false )
94 $this- > controller
-> registry
-> trigger
-> error ( nl2br ( $temp ));
99 // ###################################################################
101 * This function is used to prepare a common command. It sends the
102 * specified command along with the repository path and the current
103 * node. The revision is either fectched from the argument list or
104 * from the node, too.
108 * @param string SVN command
109 * @param bool Alternate revision
111 * @return array Lines of output
113 function command ( $command , $rev = false )
117 $revision = ( $rev !== false ? $rev : SVNCommon
:: rev ( $this- > controller
-> revnum
));
119 return $this- > svn ( $command . ' ' . $this- > controller
-> repospath
. $this- > controller
-> path
. ( $revision !== null ? '@' . $revision : '' ));
122 // ###################################################################
124 * A library complicator function that handles the diff command because
125 * the standard command() system does not work with more complex args.
129 * @param integer Lower revision
130 * @param integer Higher revision
132 * @return array Lines of diff output
134 function diff ( $lorev , $hirev )
138 $hirev = SVNCommon
:: rev ( $hirev );
139 $lorev = SVNCommon
:: rev ( $lorev );
140 if ( $lorev == 'HEAD' )
145 if ( is_integer ( $hirev ) AND is_integer ( $lorev ))
151 if ( $lorev == $hirev )
157 return $this- > svn ( 'diff -r' . $lorev . ':' . $hirev . ' ' . $this- > controller
-> repospath
. $this- > controller
-> path
);
160 // ###################################################################
162 * A library complicator function to create log output. This is needed
163 * because command() doesn't handle ranged revisions.
167 * @param string Repository
169 * @param integer Lower revision
170 * @param integer Higher revision
172 * @return array Lines of log output
174 function log ( $lorev , $hirev )
178 $hirev = $this- > rev ( $hirev );
179 $lorev = $this- > rev ( $hirev );
180 if ( $lorev == 'HEAD' )
185 if ( is_integer ( $hirev ) AND is_integer ( $lorev ))
191 if ( $lorev == $hirev )
197 $repospath = $viewsvn- > repos
-> fetch_path ( $repos , false );
199 return $this- > svn ( 'log -v -r' . $hirev . ':' . $lorev . ' ' . $repospath . $path );
204 * Diff system; constructs a diff array that is ready for output
212 * Array of diff information
219 * Raw "svn diff" output
225 // ###################################################################
227 * Constructor: create and store diff data
229 * @param object Controller
230 * @param integer Lower revision
231 * @param integer Higher revision
233 function SVNDiff (& $controller , $lorev , $hirev )
235 $this- > rawoutput
= $controller- > library
-> diff ( $lorev , $hirev );
239 // ###################################################################
241 * Returns diffs for display
245 * @return array Diff data
252 // ###################################################################
254 * Processes and prepares diff data
263 $indexcounter = null ;
268 foreach ( $this- > rawoutput
AS $line )
270 if ( preg_match ( '#^@@ \-([0-9]*),([0-9]*) \+([0-9]*),([0-9]*) @@$#' , $line , $bits ))
274 $this- > diff
[ " $index" ][ ++ $chunk ]['hunk'] = array('old' => array('line' => $bits [1], 'count' => $bits [2]), 'new' => array('line' => $bits [3], 'count' => $bits [4]));
275 $lines ['old'] = $this- >diff[" $index" ][ " $chunk" ]['hunk']['old']['line'] - 1;
276 $lines ['new'] = $this- >diff[" $index" ][ " $chunk" ]['hunk']['new']['line'] - 1;
279 else if (preg_match('#^Property changes on: (.*?)$#', $line , $bits ))
283 $this- >diff[" $index" ][ 'props' ] = array ();
287 if ( $indexcounter <= 3 AND $indexcounter !== null )
292 else if ( $indexcounter == 3 )
294 $indexcounter = null ;
298 if ( preg_match ( '#^([\+\- ])(.*)#' , $line , $matches ) AND ! $property )
301 $content = $matches [ 2 ];
305 $this- > diff
[ " $index" ][" $chunk" ][] = array (
308 'oldlineno' => ++
$lines [ 'old' ],
309 'newlineno' => ++
$lines [ 'new' ]
314 else if ( $act == '+' )
316 // potential line delta
317 if ( sizeof ( $delstack ) > 0 )
319 $lastline = array_shift ( $delstack );
321 if ( $delta = @ $this- > fetch_diff_extent ( $lastline [ 'line' ], $content ))
323 if ( strlen ( $lastline [ 'line' ]) > ( $delta [ 'start' ] - $delta [ 'end' ]))
325 $end = strlen ( $lastline [ 'line' ]) +
$delta [ 'end' ];
326 $viewsvn- > debug ( "RM delta- = " . $end );
327 $change = ' {@-' . '-} ' . substr ( $lastline [ 'line' ], $delta [ 'start' ], $end - $delta [ 'start' ]) . ' {/@-' . '-} ' ;
328 $this- > diff
[ " $index" ][" $chunk" ][ " $lastline [INDEX]" ][ 'line' ] = substr ( $lastline [ 'line' ], 0 , $delta [ 'start' ]) . $change . substr ( $lastline [ 'line' ], $end );
331 if ( strlen ( $content ) > $delta [ 'start' ] - $delta [ 'end' ])
333 $end = strlen ( $content ) +
$delta [ 'end' ];
334 $viewsvn- > debug ( "MK delta+ = " . $end );
335 $change = ' {@+' . '+} ' . substr ( $content , $delta [ 'start' ], $end - $delta [ 'start' ]) . ' {/@+' . '+} ' ;
336 $content = substr ( $content , 0 , $delta [ 'start' ]) . $change . substr ( $content , $end );
341 $this- > diff
[ " $index" ][" $chunk" ][] = array (
345 'newlineno' => ++
$lines [ 'new' ]
348 else if ( $act == '-' )
350 $this- > diff
[ " $index" ][" $chunk" ][] = $thearray = array (
353 'oldlineno' => ++
$lines [ 'old' ],
357 $key = sizeof ( $this- > diff
[ " $index" ][" $chunk" ]) - 2 ;
358 $thearray [ 'INDEX' ] = $key ;
360 array_push ( $delstack , $thearray );
366 if ( preg_match ( '#^Index: (.*?)$#' , $line , $matches ))
368 $index = $matches [ 1 ];
376 if ( preg_match ( '#^__*_$#' , trim ( $line )))
378 $viewsvn- > debug ( "skipping: $line" );
382 if (preg_match('#Name: (.*?)$#', $line , $matches ))
384 $curprop = $matches [1];
385 $viewsvn- >debug(" prop
: $curprop" );
390 if ( preg_match ( '#^\s+?\+(.*)#' , $line , $matches ))
393 $this- > diff
[ " $index" ]['props'][" $curprop" ][ 'add' ] .= $matches [ 1 ];
395 else if ( preg_match ( '#^\s+?\-(.*)#' , $line , $matches ))
398 $this- > diff
[ " $index" ]['props'][" $curprop" ][ 'del' ] .= $matches [ 1 ];
400 else if (! preg_match ( '#^\s+[\+\- ](.*)#' , $line ) AND trim ( $line ) != '' )
402 $this- > diff
[ " $index" ]['props'][" $curprop" ][ " $mode" ] .= " \n
" . $line ;
408 $this- >diff[" $index" ][ " $chunk" ][] = array(
411 'oldlineno' => ++ $lines ['old'],
412 'newlineno' => ++ $lines ['new']
420 // ###################################################################
422 * Returns the amount of change that occured between two lines
426 * @param string Old line
427 * @param string New line
429 * @return array Difference of positions
431 function fetch_diff_extent( $old , $new )
436 $min = min(strlen( $old ), strlen( $new ));
438 $viewsvn- >debug(" min1
= $min" );
440 while ( $start < $min AND $old [ " $start" ] == $new [" $start" ])
446 $min = $min - $start ;
448 $viewsvn- > debug ( "min2 = $min" );
450 $viewsvn- >debug(" checking
: " . $old [ strlen( $old ) + $end ] . ' == ' . $new [ strlen( $new ) + $end ]);
452 while (- $end <= $min AND $old [ strlen( $old ) + $end ] == $new [ strlen( $new ) + $end ])
457 return array('start' => $start , 'end' => $end + 1);
461 /*=====================================================================*\
462 || ###################################################################
465 || ###################################################################
466 \*=====================================================================*/