You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/06/10 16:10:59 UTC
svn commit: r953328 - in /subversion/trunk/subversion: include/svn_diff.h
libsvn_client/diff.c
Author: dannas
Date: Thu Jun 10 14:10:59 2010
New Revision: 953328
URL: http://svn.apache.org/viewvc?rev=953328&view=rev
Log:
Follow-up to r953302. Add svn_ prefix to the values of
'svn_diff_operation_kind_t' as they will be part of the global namespace.
* subversion/libsvn_client/diff.c
(diff_file_changed,
diff_file_added,
diff_file_deleted_with_diff): Add svn_ prefix to the enum values.
* subversion/include/svn_diff.h
(svn_diff_operation_kind_t): Add svn_ prefix to the values.
Suggested by: rhuijben
Modified:
subversion/trunk/subversion/include/svn_diff.h
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_diff.h?rev=953328&r1=953327&r2=953328&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_diff.h (original)
+++ subversion/trunk/subversion/include/svn_diff.h Thu Jun 10 14:10:59 2010
@@ -777,12 +777,12 @@ svn_diff_mem_string_output_merge(svn_str
*/
typedef enum svn_diff_operation_kind_e
{
- diff_op_added,
- diff_op_deleted,
- diff_op_copied,
- diff_op_moved,
+ svn_diff_op_added,
+ svn_diff_op_deleted,
+ svn_diff_op_copied,
+ svn_diff_op_moved,
/* There's no tree changes, just text modifications. */
- diff_op_modified
+ svn_diff_op_modified
}svn_diff_operation_kind_t;
/**
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=953328&r1=953327&r2=953328&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Thu Jun 10 14:10:59 2010
@@ -699,7 +699,7 @@ diff_content_changed(const char *path,
/* Add git headers and adjust the labels.
* ### Once we're using the git format everywhere, we can create
* ### one func that sets the correct labels in one place. */
- if (operation == diff_op_deleted)
+ if (operation == svn_diff_op_deleted)
{
SVN_ERR(print_git_diff_header_deleted(
os,
@@ -710,7 +710,7 @@ diff_content_changed(const char *path,
subpool);
label2 = diff_label("/dev/null", rev2, subpool);
}
- else if (operation == diff_op_added)
+ else if (operation == svn_diff_op_added)
{
SVN_ERR(print_git_diff_header_added(
os,
@@ -720,7 +720,7 @@ diff_content_changed(const char *path,
label2 = diff_label(apr_psprintf(subpool, "b/%s", path2), rev2,
subpool);
}
- else if (operation == diff_op_modified)
+ else if (operation == svn_diff_op_modified)
{
SVN_ERR(print_git_diff_header_modified(
os,
@@ -775,7 +775,7 @@ diff_file_changed(const char *local_dir_
SVN_ERR(diff_content_changed(path,
tmpfile1, tmpfile2, rev1, rev2,
mimetype1, mimetype2,
- diff_op_modified, diff_baton));
+ svn_diff_op_modified, diff_baton));
if (prop_changes->nelts > 0)
SVN_ERR(diff_props_changed(local_dir_abspath, prop_state, tree_conflicted,
path, prop_changes,
@@ -826,7 +826,7 @@ diff_file_added(const char *local_dir_ab
SVN_ERR(diff_content_changed(path,
tmpfile1, tmpfile2, rev1, rev2,
mimetype1, mimetype2,
- diff_op_added, diff_baton));
+ svn_diff_op_added, diff_baton));
if (prop_changes->nelts > 0)
SVN_ERR(diff_props_changed(local_dir_abspath, prop_state, tree_conflicted,
path, prop_changes,
@@ -864,7 +864,7 @@ diff_file_deleted_with_diff(const char *
tmpfile1, tmpfile2, diff_cmd_baton->revnum1,
diff_cmd_baton->revnum2,
mimetype1, mimetype2,
- diff_op_deleted, diff_baton));
+ svn_diff_op_deleted, diff_baton));
/* We don't list all the deleted properties. */