PHP.nl

svn_diff

svn_diff

Recursively diffs two paths

array **svn_diff** string $path1 int $rev1 string $path2 int $rev2

Recursively diffs two paths, and . path1``path2

Opmerking: > This is not a general-purpose diff utility. Only local files that are versioned may be diffed: other files will fail.

path1First path to diff. This can be a URL to a file/directory in an SVN repository or a local file/directory path.

Waarschuwing: > 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.

rev1 First path's revision number. Use to specify the most recent revision. SVN_REVISION_HEAD

path2 Second path to diff. See for description. path1

rev2 Second path's revision number. See for description. rev1

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 . Returns false or null on error. fread

The diff output will, by default, be in the form of Subversion's custom unified diff format, but an may be used depending on Subversion's configuration. external diff engine

Voorbeeld: 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);
?>

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

Voorbeeld: 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);
}
?>

Voorbeeld: Portably diffing two local files

This example implements a wrapper function that portably
diffs two local files, compensating for the 
fix and the backslashes bug:

realpath

<?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);
}
?>

SVN documentation on svn diff

Vorige ← svn_delete Volgende svn_export →

Documentatie