You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/26 19:33:57 UTC
svn commit: r1096815 - in /subversion/trunk/subversion: include/svn_wc.h
libsvn_client/diff.c libsvn_client/merge.c libsvn_client/repos_diff.c
libsvn_wc/diff.c
Author: rhuijben
Date: Tue Apr 26 17:33:57 2011
New Revision: 1096815
URL: http://svn.apache.org/viewvc?rev=1096815&view=rev
Log:
Remove the now unused (and new in 1.7) local_dir_abspath from all functions
of the svn_wc_diff_callbacks4_t interface.
The only functional change is in merge_dir_opened where local_dir_abspath
was still used as a shortcut to get the parent directory.
* subversion/include/svn_wc.h
(svn_wc_diff_callbacks4_t): Remove unused arguments.
* subversion/libsvn_client/diff.c
(diff_props_changed,
diff_dir_props_changed,
diff_file_changed,
diff_file_added,
diff_file_deleted_with_diff,
diff_file_deleted_no_diff,
diff_dir_added,
diff_dir_deleted,
diff_dir_opened,
diff_dir_closed): Remove unused arguments. Update callers.
* subversion/libsvn_client/merge.c
(merge_props_changed,
merge_dir_props_changed,
merge_file_changed,
merge_file_added,
merge_file_deleted,
merge_dir_added,
merge_dir_deleted,
merge_dir_opened,
merge_dir_closed): Remove unused arguments.
(do_file_merge): Update caller.
* subversion/libsvn_client/repos_diff.c
(diff_deleted_dir,
delete_entry,
add_directory,
open_directory,
close_file,
close_directory): Update callers.
* subversion/libsvn_wc/diff.c
(file_diff,
walk_local_nodes_diff,
report_wc_file_as_added,
delete_entry,
open_directory,
close_directory,
close_file): Update callers.
Modified:
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/libsvn_wc/diff.c
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1096815&r1=1096814&r2=1096815&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Tue Apr 26 17:33:57 2011
@@ -2069,10 +2069,6 @@ typedef svn_error_t *(*svn_wc_conflict_r
*
* Common parameters:
*
- * @a local_dir_abspath will be the absolute path to the local directory
- * containing @a path, or @c NULL if the diff editor does not have a local
- * path.
- *
* If @a state is non-NULL, set @a *state to the state of the item
* after the operation has been performed. (In practice, this is only
* useful with merge, not diff; diff callbacks will probably set
@@ -2120,8 +2116,7 @@ typedef struct svn_wc_diff_callbacks4_t
* property name.
*
*/
- svn_error_t *(*file_changed)(const char *local_dir_abspath,
- svn_wc_notify_state_t *contentstate,
+ svn_error_t *(*file_changed)(svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
@@ -2155,8 +2150,7 @@ typedef struct svn_wc_diff_callbacks4_t
* copy), and the origin of the copy may be recorded as
* @a copyfrom_path under @a copyfrom_revision.
*/
- svn_error_t *(*file_added)(const char *local_dir_abspath,
- svn_wc_notify_state_t *contentstate,
+ svn_error_t *(*file_added)(svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
@@ -2184,8 +2178,7 @@ typedef struct svn_wc_diff_callbacks4_t
* be NULL. The implementor can use this information to decide if
* (or how) to generate differences.
*/
- svn_error_t *(*file_deleted)(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+ svn_error_t *(*file_deleted)(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
const char *tmpfile1,
@@ -2199,8 +2192,7 @@ typedef struct svn_wc_diff_callbacks4_t
/**
* A directory @a path was deleted.
*/
- svn_error_t *(*dir_deleted)(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+ svn_error_t *(*dir_deleted)(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
void *diff_baton,
@@ -2215,8 +2207,7 @@ typedef struct svn_wc_diff_callbacks4_t
* If the callback returns @c TRUE in @a *skip_children, children
* of this directory will be skipped.
*/
- svn_error_t *(*dir_opened)(const char *local_dir_abspath,
- svn_boolean_t *tree_conflicted,
+ svn_error_t *(*dir_opened)(svn_boolean_t *tree_conflicted,
svn_boolean_t *skip,
svn_boolean_t *skip_children,
const char *path,
@@ -2235,8 +2226,7 @@ typedef struct svn_wc_diff_callbacks4_t
* copy), and the origin of the copy may be recorded as
* @a copyfrom_path under @a copyfrom_revision.
*/
- svn_error_t *(*dir_added)(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+ svn_error_t *(*dir_added)(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
svn_boolean_t *skip,
svn_boolean_t *skip_children,
@@ -2256,8 +2246,7 @@ typedef struct svn_wc_diff_callbacks4_t
* @a dir_was_added is set to #TRUE if the directory was added, and
* to #FALSE if the directory pre-existed.
*/
- svn_error_t *(*dir_props_changed)(const char *local_dir_abspath,
- svn_wc_notify_state_t *propstate,
+ svn_error_t *(*dir_props_changed)(svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
svn_boolean_t dir_was_added,
@@ -2273,8 +2262,7 @@ typedef struct svn_wc_diff_callbacks4_t
* @a dir_was_added is set to #TRUE if the directory was added, and
* to #FALSE if the directory pre-existed.
*/
- svn_error_t *(*dir_closed)(const char *local_dir_abspath,
- svn_wc_notify_state_t *contentstate,
+ svn_error_t *(*dir_closed)(svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1096815&r1=1096814&r2=1096815&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Tue Apr 26 17:33:57 2011
@@ -789,8 +789,7 @@ struct diff_cmd_baton {
/* An helper for diff_dir_props_changed, diff_file_changed and diff_file_added
*/
static svn_error_t *
-diff_props_changed(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+diff_props_changed(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
svn_boolean_t dir_was_added,
@@ -849,22 +848,21 @@ diff_props_changed(const char *local_dir
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_dir_props_changed(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
- svn_boolean_t *tree_conflicted,
- const char *path,
- svn_boolean_t dir_was_added,
- const apr_array_header_t *propchanges,
- apr_hash_t *original_props,
- void *diff_baton,
- apr_pool_t *scratch_pool)
+diff_dir_props_changed(svn_wc_notify_state_t *state,
+ svn_boolean_t *tree_conflicted,
+ const char *path,
+ svn_boolean_t dir_was_added,
+ const apr_array_header_t *propchanges,
+ apr_hash_t *original_props,
+ void *diff_baton,
+ apr_pool_t *scratch_pool)
{
struct diff_cmd_baton *diff_cmd_baton = diff_baton;
if (diff_cmd_baton->anchor)
path = svn_dirent_join(diff_cmd_baton->anchor, path, scratch_pool);
- return svn_error_return(diff_props_changed(local_dir_abspath, state,
+ return svn_error_return(diff_props_changed(state,
tree_conflicted, path,
dir_was_added,
propchanges,
@@ -1065,8 +1063,7 @@ diff_file_opened(svn_boolean_t *tree_con
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_file_changed(const char *local_dir_abspath,
- svn_wc_notify_state_t *content_state,
+diff_file_changed(svn_wc_notify_state_t *content_state,
svn_wc_notify_state_t *prop_state,
svn_boolean_t *tree_conflicted,
const char *path,
@@ -1090,7 +1087,7 @@ diff_file_changed(const char *local_dir_
mimetype1, mimetype2,
svn_diff_op_modified, NULL, diff_baton));
if (prop_changes->nelts > 0)
- SVN_ERR(diff_props_changed(local_dir_abspath, prop_state, tree_conflicted,
+ SVN_ERR(diff_props_changed(prop_state, tree_conflicted,
path, FALSE, prop_changes,
original_props, diff_baton, scratch_pool));
if (content_state)
@@ -1108,8 +1105,7 @@ diff_file_changed(const char *local_dir_
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_file_added(const char *local_dir_abspath,
- svn_wc_notify_state_t *content_state,
+diff_file_added(svn_wc_notify_state_t *content_state,
svn_wc_notify_state_t *prop_state,
svn_boolean_t *tree_conflicted,
const char *path,
@@ -1150,7 +1146,7 @@ diff_file_added(const char *local_dir_ab
mimetype1, mimetype2,
svn_diff_op_added, NULL, diff_baton));
if (prop_changes->nelts > 0)
- SVN_ERR(diff_props_changed(local_dir_abspath, prop_state, tree_conflicted,
+ SVN_ERR(diff_props_changed(prop_state, tree_conflicted,
path, FALSE, prop_changes,
original_props, diff_baton, scratch_pool));
if (content_state)
@@ -1167,8 +1163,7 @@ diff_file_added(const char *local_dir_ab
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_file_deleted_with_diff(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+diff_file_deleted_with_diff(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
const char *tmpfile1,
@@ -1203,8 +1198,7 @@ diff_file_deleted_with_diff(const char *
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_file_deleted_no_diff(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+diff_file_deleted_no_diff(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
const char *tmpfile1,
@@ -1234,8 +1228,7 @@ diff_file_deleted_no_diff(const char *lo
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_dir_added(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+diff_dir_added(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
svn_boolean_t *skip,
svn_boolean_t *skip_children,
@@ -1257,8 +1250,7 @@ diff_dir_added(const char *local_dir_abs
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_dir_deleted(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+diff_dir_deleted(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *path,
void *diff_baton,
@@ -1275,8 +1267,7 @@ diff_dir_deleted(const char *local_dir_a
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_dir_opened(const char *local_dir_abspath,
- svn_boolean_t *tree_conflicted,
+diff_dir_opened(svn_boolean_t *tree_conflicted,
svn_boolean_t *skip,
svn_boolean_t *skip_children,
const char *path,
@@ -1295,8 +1286,7 @@ diff_dir_opened(const char *local_dir_ab
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-diff_dir_closed(const char *local_dir_abspath,
- svn_wc_notify_state_t *contentstate,
+diff_dir_closed(svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1096815&r1=1096814&r2=1096815&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Apr 26 17:33:57 2011
@@ -1064,8 +1064,7 @@ filter_self_referential_mergeinfo(apr_ar
/* Used for both file and directory property merges. */
static svn_error_t *
-merge_props_changed(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+merge_props_changed(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *local_abspath,
const apr_array_header_t *propchanges,
@@ -1201,8 +1200,7 @@ merge_props_changed(const char *local_di
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-merge_dir_props_changed(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+merge_dir_props_changed(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *local_abspath,
svn_boolean_t dir_was_added,
@@ -1226,8 +1224,7 @@ merge_dir_props_changed(const char *loca
return SVN_NO_ERROR;
}
- return svn_error_return(merge_props_changed(local_dir_abspath,
- state,
+ return svn_error_return(merge_props_changed(state,
tree_conflicted,
local_abspath,
propchanges,
@@ -1306,8 +1303,7 @@ merge_file_opened(svn_boolean_t *tree_co
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-merge_file_changed(const char *local_dir_abspath,
- svn_wc_notify_state_t *content_state,
+merge_file_changed(svn_wc_notify_state_t *content_state,
svn_wc_notify_state_t *prop_state,
svn_boolean_t *tree_conflicted,
const char *mine_abspath,
@@ -1427,8 +1423,7 @@ merge_file_changed(const char *local_dir
{
svn_boolean_t tree_conflicted2 = FALSE;
- SVN_ERR(merge_props_changed(local_dir_abspath, prop_state,
- &tree_conflicted2,
+ SVN_ERR(merge_props_changed(prop_state, &tree_conflicted2,
mine_abspath, prop_changes, original_props,
baton, scratch_pool));
@@ -1515,8 +1510,7 @@ merge_file_changed(const char *local_dir
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-merge_file_added(const char *local_dir_abspath,
- svn_wc_notify_state_t *content_state,
+merge_file_added(svn_wc_notify_state_t *content_state,
svn_wc_notify_state_t *prop_state,
svn_boolean_t *tree_conflicted,
const char *mine_abspath,
@@ -1849,8 +1843,7 @@ files_same_p(svn_boolean_t *same,
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-merge_file_deleted(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+merge_file_deleted(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *mine_abspath,
const char *older_abspath,
@@ -1977,8 +1970,7 @@ merge_file_deleted(const char *local_dir
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-merge_dir_added(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+merge_dir_added(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
svn_boolean_t *skip,
svn_boolean_t *skip_children,
@@ -2172,8 +2164,7 @@ merge_dir_added(const char *local_dir_ab
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-merge_dir_deleted(const char *local_dir_abspath,
- svn_wc_notify_state_t *state,
+merge_dir_deleted(svn_wc_notify_state_t *state,
svn_boolean_t *tree_conflicted,
const char *local_abspath,
void *baton,
@@ -2308,8 +2299,7 @@ merge_dir_deleted(const char *local_dir_
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-merge_dir_opened(const char *local_dir_abspath,
- svn_boolean_t *tree_conflicted,
+merge_dir_opened(svn_boolean_t *tree_conflicted,
svn_boolean_t *skip,
svn_boolean_t *skip_children,
const char *local_abspath,
@@ -2353,7 +2343,8 @@ merge_dir_opened(const char *local_dir_a
* future merges into non-shallow working copies to merge
* changes we missed this time around. */
err = svn_wc__node_get_depth(&parent_depth, merge_b->ctx->wc_ctx,
- local_dir_abspath, subpool);
+ svn_dirent_dirname(local_abspath, scratch_pool),
+ scratch_pool);
if (err)
{
if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
@@ -2434,8 +2425,7 @@ merge_dir_opened(const char *local_dir_a
/* An svn_wc_diff_callbacks4_t function. */
static svn_error_t *
-merge_dir_closed(const char *local_dir_abspath,
- svn_wc_notify_state_t *contentstate,
+merge_dir_closed(svn_wc_notify_state_t *contentstate,
svn_wc_notify_state_t *propstate,
svn_boolean_t *tree_conflicted,
const char *path,
@@ -6830,12 +6820,8 @@ do_file_merge(svn_mergeinfo_catalog_t re
merge. */
if (! (merge_b->ignore_ancestry || sources_related))
{
- const char *local_dir_abspath =
- svn_dirent_dirname(target_abspath, subpool);
-
/* Delete... */
- SVN_ERR(merge_file_deleted(local_dir_abspath,
- &text_state,
+ SVN_ERR(merge_file_deleted(&text_state,
&tree_conflicted,
target_abspath,
tmpfile1,
@@ -6853,8 +6839,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
n, &header_sent, subpool);
/* ...plus add... */
- SVN_ERR(merge_file_added(local_dir_abspath,
- &text_state, &prop_state,
+ SVN_ERR(merge_file_added(&text_state, &prop_state,
&tree_conflicted,
target_abspath,
tmpfile1,
@@ -6876,11 +6861,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
}
else
{
- const char *local_dir_abspath =
- svn_dirent_dirname(target_abspath, subpool);
-
- SVN_ERR(merge_file_changed(local_dir_abspath,
- &text_state, &prop_state,
+ SVN_ERR(merge_file_changed(&text_state, &prop_state,
&tree_conflicted,
target_abspath,
tmpfile1,
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1096815&r1=1096814&r2=1096815&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Tue Apr 26 17:33:57 2011
@@ -528,7 +528,7 @@ diff_deleted_dir(const char *dir,
get_file_mime_types(&mimetype1, &mimetype2, b);
SVN_ERR(eb->diff_callbacks->file_deleted(
- NULL, NULL, NULL, b->wcpath,
+ NULL, NULL, b->wcpath,
b->path_start_revision,
b->path_end_revision,
mimetype1, mimetype2,
@@ -591,8 +591,8 @@ delete_entry(const char *path,
get_file_mime_types(&mimetype1, &mimetype2, b);
- SVN_ERR(eb->diff_callbacks->file_deleted
- (local_dir_abspath, &state, &tree_conflicted, b->wcpath,
+ SVN_ERR(eb->diff_callbacks->file_deleted(
+ &state, &tree_conflicted, b->wcpath,
b->path_start_revision,
b->path_end_revision,
mimetype1, mimetype2,
@@ -604,8 +604,8 @@ delete_entry(const char *path,
}
case svn_node_dir:
{
- SVN_ERR(eb->diff_callbacks->dir_deleted
- (local_dir_abspath, &state, &tree_conflicted,
+ SVN_ERR(eb->diff_callbacks->dir_deleted(
+ &state, &tree_conflicted,
svn_dirent_join(eb->target, path, pool),
eb->diff_cmd_baton, pool));
@@ -685,7 +685,7 @@ add_directory(const char *path,
pool));
SVN_ERR(eb->diff_callbacks->dir_added(
- local_dir_abspath, &state, &b->tree_conflicted,
+ &state, &b->tree_conflicted,
&b->skip, &b->skip_children, b->wcpath,
eb->target_revision, copyfrom_path, copyfrom_revision,
eb->diff_cmd_baton, pool));
@@ -775,7 +775,7 @@ open_directory(const char *path,
pool));
SVN_ERR(eb->diff_callbacks->dir_opened(
- local_dir_abspath, &b->tree_conflicted, &b->skip,
+ &b->tree_conflicted, &b->skip,
&b->skip_children, b->wcpath, base_revision,
b->edit_baton->diff_cmd_baton, pool));
@@ -1003,8 +1003,8 @@ close_file(void *file_baton,
get_file_mime_types(&mimetype1, &mimetype2, b);
if (b->added)
- SVN_ERR(eb->diff_callbacks->file_added
- (local_dir_abspath, &content_state, &prop_state, &b->tree_conflicted,
+ SVN_ERR(eb->diff_callbacks->file_added(
+ &content_state, &prop_state, &b->tree_conflicted,
b->wcpath,
b->path_end_revision ? b->path_start_revision : NULL,
b->path_end_revision,
@@ -1016,8 +1016,8 @@ close_file(void *file_baton,
b->edit_baton->diff_cmd_baton,
pool));
else
- SVN_ERR(eb->diff_callbacks->file_changed
- (local_dir_abspath, &content_state, &prop_state,
+ SVN_ERR(eb->diff_callbacks->file_changed(
+ &content_state, &prop_state,
&b->tree_conflicted, b->wcpath,
b->path_end_revision ? b->path_start_revision : NULL,
b->path_end_revision,
@@ -1134,7 +1134,7 @@ close_directory(void *dir_baton,
{
svn_boolean_t tree_conflicted = FALSE;
SVN_ERR(eb->diff_callbacks->dir_props_changed(
- local_dir_abspath, &prop_state, &tree_conflicted,
+ &prop_state, &tree_conflicted,
b->wcpath, b->added,
b->propchanges, b->pristine_props,
b->edit_baton->diff_cmd_baton, pool));
@@ -1143,7 +1143,7 @@ close_directory(void *dir_baton,
}
SVN_ERR(eb->diff_callbacks->dir_closed(
- local_dir_abspath, NULL, NULL, NULL,
+ NULL, NULL, NULL,
b->wcpath, b->added,
b->edit_baton->diff_cmd_baton, pool));
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=1096815&r1=1096814&r2=1096815&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Tue Apr 26 17:33:57 2011
@@ -621,7 +621,7 @@ file_diff(struct edit_baton *eb,
else
base_mimetype = NULL;
- SVN_ERR(eb->callbacks->file_deleted(NULL, NULL, NULL, path,
+ SVN_ERR(eb->callbacks->file_deleted(NULL, NULL, path,
textbase,
empty_file,
base_mimetype,
@@ -674,7 +674,7 @@ file_diff(struct edit_baton *eb,
eb->cancel_func, eb->cancel_baton,
scratch_pool, scratch_pool));
- SVN_ERR(eb->callbacks->file_added(NULL, NULL, NULL, NULL, path,
+ SVN_ERR(eb->callbacks->file_added(NULL, NULL, NULL, path,
(! eb->show_copies_as_adds &&
eb->use_git_diff_format &&
status != svn_wc__db_status_added) ?
@@ -753,7 +753,7 @@ file_diff(struct edit_baton *eb,
if (modified || propchanges->nelts > 0)
{
- SVN_ERR(eb->callbacks->file_changed(NULL, NULL, NULL, NULL,
+ SVN_ERR(eb->callbacks->file_changed(NULL, NULL, NULL,
path,
modified ? textbase : NULL,
translated,
@@ -824,8 +824,7 @@ walk_local_nodes_diff(struct edit_baton
db, local_abspath,
scratch_pool, scratch_pool));
- SVN_ERR(eb->callbacks->dir_props_changed(local_abspath,
- NULL, NULL,
+ SVN_ERR(eb->callbacks->dir_props_changed(NULL, NULL,
path, FALSE /* ### ? */,
propchanges, baseprops,
eb->callback_baton,
@@ -1013,8 +1012,7 @@ report_wc_file_as_added(struct edit_bato
eb->cancel_func, eb->cancel_baton,
scratch_pool, scratch_pool));
- SVN_ERR(eb->callbacks->file_added(local_abspath,
- NULL, NULL, NULL,
+ SVN_ERR(eb->callbacks->file_added(NULL, NULL, NULL,
path,
empty_file, translated_file,
0, revision,
@@ -1070,8 +1068,7 @@ report_wc_directory_as_added(struct edit
SVN_ERR(svn_prop_diffs(&propchanges, wcprops, emptyprops, scratch_pool));
if (propchanges->nelts > 0)
- SVN_ERR(eb->callbacks->dir_props_changed(local_abspath,
- NULL, NULL,
+ SVN_ERR(eb->callbacks->dir_props_changed(NULL, NULL,
path, TRUE,
propchanges, emptyprops,
eb->callback_baton,
@@ -1239,7 +1236,7 @@ delete_entry(const char *path,
pool, pool));
base_mimetype = get_prop_mimetype(baseprops);
- SVN_ERR(eb->callbacks->file_deleted(NULL, NULL, NULL, path,
+ SVN_ERR(eb->callbacks->file_deleted(NULL, NULL, path,
textbase,
empty_file,
base_mimetype,
@@ -1311,7 +1308,7 @@ open_directory(const char *path,
db = make_dir_baton(path, pb, pb->eb, FALSE, subdir_depth, dir_pool);
*child_baton = db;
- SVN_ERR(db->eb->callbacks->dir_opened(NULL, NULL, NULL, NULL,
+ SVN_ERR(db->eb->callbacks->dir_opened(NULL, NULL, NULL,
path, base_revision,
db->eb->callback_baton, dir_pool));
@@ -1375,7 +1372,7 @@ close_directory(void *dir_baton,
if (!eb->reverse_order)
reverse_propchanges(originalprops, db->propchanges, db->pool);
- SVN_ERR(eb->callbacks->dir_props_changed(NULL, NULL, NULL,
+ SVN_ERR(eb->callbacks->dir_props_changed(NULL, NULL,
db->path,
db->added,
db->propchanges,
@@ -1406,7 +1403,7 @@ close_directory(void *dir_baton,
apr_hash_set(pb->compared, apr_pstrdup(pb->pool, db->path),
APR_HASH_KEY_STRING, "");
- SVN_ERR(db->eb->callbacks->dir_closed(NULL, NULL, NULL, NULL, db->path,
+ SVN_ERR(db->eb->callbacks->dir_closed(NULL, NULL, NULL, db->path,
db->added, db->eb->callback_baton,
db->pool));
@@ -1680,7 +1677,7 @@ close_file(void *file_baton,
if (fb->added || (!eb->use_text_base && status == svn_wc__db_status_deleted))
{
if (eb->reverse_order)
- return eb->callbacks->file_added(NULL, NULL, NULL, NULL, fb->path,
+ return eb->callbacks->file_added(NULL, NULL, NULL, fb->path,
empty_file,
repos_file,
0,
@@ -1693,7 +1690,7 @@ close_file(void *file_baton,
eb->callback_baton,
pool);
else
- return eb->callbacks->file_deleted(NULL, NULL, NULL, fb->path,
+ return eb->callbacks->file_deleted(NULL, NULL, fb->path,
repos_file,
empty_file,
repos_mimetype,
@@ -1707,7 +1704,7 @@ close_file(void *file_baton,
* as added, diff the file with the empty file. */
if ((status == svn_wc__db_status_copied ||
status == svn_wc__db_status_moved_here) && eb->show_copies_as_adds)
- return eb->callbacks->file_added(NULL, NULL, NULL, NULL, fb->path,
+ return eb->callbacks->file_added(NULL, NULL, NULL, fb->path,
empty_file,
fb->local_abspath,
0,
@@ -1771,7 +1768,7 @@ close_file(void *file_baton,
&& ! eb->reverse_order)
reverse_propchanges(originalprops, fb->propchanges, fb->pool);
- SVN_ERR(eb->callbacks->file_changed(NULL, NULL, NULL, NULL,
+ SVN_ERR(eb->callbacks->file_changed(NULL, NULL, NULL,
fb->path,
eb->reverse_order ? localfile
: repos_file,
Re: svn commit: r1096815 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/diff.c libsvn_client/merge.c libsvn_client/repos_diff.c libsvn_wc/diff.c
Posted by Philip Martin <ph...@wandisco.com>.
rhuijben@apache.org writes:
> Author: rhuijben
> Date: Tue Apr 26 17:33:57 2011
> New Revision: 1096815
>
> URL: http://svn.apache.org/viewvc?rev=1096815&view=rev
> Log:
> Remove the now unused (and new in 1.7) local_dir_abspath from all functions
> of the svn_wc_diff_callbacks4_t interface.
>
> The only functional change is in merge_dir_opened where local_dir_abspath
> was still used as a shortcut to get the parent directory.
>
> * subversion/include/svn_wc.h
> (svn_wc_diff_callbacks4_t): Remove unused arguments.
../src/subversion/libsvn_wc/deprecated.c:1842: warning: initialization from incompatible pointer type
../src/subversion/libsvn_wc/deprecated.c:1843: warning: initialization from incompatible pointer type
../src/subversion/libsvn_wc/deprecated.c:1844: warning: initialization from incompatible pointer type
../src/subversion/libsvn_wc/deprecated.c:1845: warning: initialization from incompatible pointer type
../src/subversion/libsvn_wc/deprecated.c:1846: warning: initialization from incompatible pointer type
../src/subversion/libsvn_wc/deprecated.c:1847: warning: initialization from incompatible pointer type
../src/subversion/libsvn_wc/deprecated.c:1848: warning: initialization from incompatible pointer type
../src/subversion/libsvn_wc/deprecated.c:1850: warning: initialization from incompatible pointer type
--
Philip