Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

svn_diff(3) [php man page]

SVN_DIFF(3)								 1							       SVN_DIFF(3)

svn_diff - Recursively diffs two paths

SYNOPSIS
array svn_diff (string $path1, int $rev1, string $path2, int $rev2) DESCRIPTION
Recursively diffs two paths, $path1 and $path2. Note This is not a general-purpose diff utility. Only local files that are versioned may be diffed: other files will fail. PARAMETERS
o $path1 - First path to diff. This can be a URL to a file/directory in an SVN repository or a local file/directory path. Note Relative paths will be resolved as if the current working directory was the one that contains the PHP binary. To use the calling script's working directory, use realpath(3) or dirname(__FILE__). Warning If a local file path has only backslashes and no forward slashes, this extension will fail to find the path. Always replace all backslashes with forward slashes when using this function. o $rev1 - First path's revision number. Use SVN_REVISION_HEAD to specify the most recent revision. o $path2 - Second path to diff. See $path1 for description. o $rev2 - Second path's revision number. See $rev1 for description. RETURN VALUES
Returns an array-list consisting of two streams: the first is the diff output and the second contains error stream output. The streams can be read using fread(3). Returns FALSE or NULL on error. The diff output will, by default, be in the form of Subversion's custom unified diff format, but an external diff engine may be used depending on Subversion's configuration. NOTES
Warning This function is EXPERIMENTAL. The behaviour of this function, its name, and surrounding documentation may change without notice in a future release of PHP. This function should be used at your own risk. EXAMPLES
Example #1 Basic example This example demonstrates the basic usage of this function, and the retrieval of contents from the stream: <?php list($diff, $errors) = svn_diff( 'http://www.example.com/svnroot/trunk/foo', SVN_REVISION_HEAD, 'http://www.example.com/svnroot/branches/dev/foo', SVN_REVISION_HEAD ); if (!$diff) exit; $contents = ''; while (!feof($diff)) { $contents .= fread($diff, 8192); } fclose($diff); fclose($errors); var_dump($contents); ?> The above example will output: Index: http://www.example.com/svnroot/trunk/foo =================================================================== --- http://www.example.com/svnroot/trunk/foo (.../foo) (revision 23) +++ http://www.example.com/svnroot/branches/dev/foo (.../foo) (revision 27) // further diff output Example #2 Diffing two revisions of a repository path This example implements a wrapper function that allows a user to easily diff two revisions of the same item using an external repository path (the default syntax is somewhat verbose): <?php function svn_diff_same_item($path, $rev1, $rev2) { return svn_diff($path, $rev1, $path, $rev2); } ?> Example #3 Portably diffing two local files This example implements a wrapper function that portably diffs two local files, compensating for the realpath(3) fix and the back- slashes bug: <?php function svn_diff_local($path1, $rev1, $path2, $rev2) { $path1 = str_replace('\', '/', realpath($path1)); $path2 = str_replace('\', '/', realpath($path2)); return svn_diff($path1, $rev1, $path2, $rev2); } ?> SEE ALSO
SVN documentation on svn diff. PHP Documentation Group SVN_DIFF(3)

Check Out this Related Man Page

rcsdiff(1)																rcsdiff(1)

NAME
rcsdiff - compare RCS revisions SYNOPSIS
rcsdiff [-ksubst] [-q] [-rrev1 [-rrev2]] [-Vn] [-xsuffixes] [diff options] file... DESCRIPTION
rcsdiff runs diff(1) to compare two revisions of each RCS file given. Pathnames matching an RCS suffix denote RCS files; all others denote working files. Names are paired as explained in ci(1). The option -q suppresses diagnostic output. Zero, one, or two revisions may be specified with -r. The option -ksubst affects keyword sub- stitution when extracting revisions, as described in co(1); for example, -kk -r1.1 -r1.2 ignores differences in keyword values when compar- ing revisions 1.1 and 1.2. To avoid excess output from locker name substitution, -kkvl is assumed if (1) at most one revision option is given, (2) no -k option is given, (3) -kkv is the default keyword substitution, and (4) the working file's mode would be produced by co -l. See co(1) for details about -V and -x. Otherwise, all options of diff(1) that apply to regular files are accepted, with the same meaning as for diff. If both rev1 and rev2 are omitted, rcsdiff compares the latest revision on the default branch (by default the trunk) with the contents of the corresponding working file. This is useful for determining what you changed since the last checkin. If rev1 is given, but rev2 is omitted, rcsdiff compares revision rev1 of the RCS file with the contents of the corresponding working file. If both rev1 and rev2 are given, rcsdiff compares revisions rev1 and rev2 of the RCS file. Both rev1 and rev2 may be given numerically or symbolically. EXAMPLES
The command rcsdiff f.c compares the latest revision on the default branch of the RCS file to the contents of the working file f.c. ENVIRONMENT
options prepended to the argument list, separated by spaces. See ci(1) for details. DIAGNOSTICS
Exit status is 0 for no differences during any comparison, 1 for some differences, 2 for trouble. IDENTIFICATION
Author: Walter F. Tichy. Revision Number: 1.1.6.2; Release Date: 1993/10/07. Copyright (C) 1982, 1988, 1989 by Walter F. Tichy. Copyright (C) 1990, 1991 by Paul Eggert. SEE ALSO
ci(1), co(1), diff(1), ident(1), rcs(1), rcsintro(1), rcsmerge(1), rlog(1) Walter F. Tichy, RCS--A System for Version Control, Software--Practice & Experience 15, 7 (July 1985), 637-654. rcsdiff(1)
Man Page