Author: julianfoad
Date: Fri May 14 12:24:29 2010
New Revision: 944221
URL: http://svn.apache.org/viewvc?rev=944221&view=rev
Log:
Remove the 'tmp' parameter of svn_wc__text_base_path(), obsoleted in r944218.
* subversion/libsvn_wc/adm_files.h
(svn_wc__text_base_path): Remove the 'tmp' parameter.
* subversion/libsvn_wc/adm_files.c
(svn_wc__text_base_path): Remove the 'tmp' parameter.
(svn_wc__get_pristine_base_contents): Adjust calls.
* subversion/libsvn_wc/adm_ops.c
(svn_wc_get_pristine_copy_path, svn_wc__get_pristine_contents): Adjust calls.
* subversion/libsvn_wc/diff.c
(file_diff, report_wc_file_as_added, delete_entry, close_file): Adjust calls.
* subversion/libsvn_wc/update_editor.c
(get_pristine_base_path, svn_wc_add_repos_file4): Adjust calls.
* subversion/libsvn_wc/workqueue.c
(run_revert, verify_pristine_present, run_prepare_revert_files,
log_do_committed, run_delete): Adjust calls.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_files.c
subversion/trunk/subversion/libsvn_wc/adm_files.h
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/diff.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=944221&r1=944220&r2=944221&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Fri May 14 12:24:29 2010
@@ -212,17 +212,15 @@ svn_error_t *
svn_wc__text_base_path(const char **result_abspath,
svn_wc__db_t *db,
const char *local_abspath,
- svn_boolean_t tmp,
apr_pool_t *pool)
{
const char *newpath, *base_name;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
- SVN_ERR_ASSERT(! tmp);
svn_dirent_split(local_abspath, &newpath, &base_name, pool);
*result_abspath = simple_extend(newpath,
- tmp,
+ FALSE,
SVN_WC__ADM_TEXT_BASE,
base_name,
SVN_WC__BASE_EXT,
@@ -292,7 +290,7 @@ svn_wc__get_pristine_base_contents(svn_s
svn_error_clear(err);
/* There's no "revert base", so open the "normal base". */
- SVN_ERR(svn_wc__text_base_path(&revert_base, db, local_abspath, FALSE,
+ SVN_ERR(svn_wc__text_base_path(&revert_base, db, local_abspath,
scratch_pool));
err = svn_stream_open_readonly(contents, revert_base,
result_pool, scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.h?rev=944221&r1=944220&r2=944221&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.h (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.h Fri May 14 12:24:29 2010
@@ -63,12 +63,11 @@ svn_wc__sync_text_base(const char *local
/* Set *RESULT_ABSPATH to the absolute path to where LOCAL_ABSPATH's
text-base file is or should be created. The file does not necessarily
- exist. TMP must be FALSE. */
+ exist. */
svn_error_t *
svn_wc__text_base_path(const char **result_abspath,
svn_wc__db_t *db,
const char *local_abspath,
- svn_boolean_t tmp,
apr_pool_t *pool);
/* Set *RESULT_ABSPATH to the deterministic absolute path to where
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=944221&r1=944220&r2=944221&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri May 14 12:24:29 2010
@@ -2274,8 +2274,7 @@ svn_wc_get_pristine_copy_path(const char
TRUE, TRUE, pool, pool));
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
- SVN_ERR(svn_wc__text_base_path(pristine_path, db, local_abspath,
- FALSE, pool));
+ SVN_ERR(svn_wc__text_base_path(pristine_path, db, local_abspath, pool));
return svn_error_return(svn_wc__db_close(db));
}
@@ -2364,7 +2363,7 @@ svn_wc__get_pristine_contents(svn_stream
const char *text_base;
svn_error_t *err;
- SVN_ERR(svn_wc__text_base_path(&text_base, db, local_abspath, FALSE,
+ SVN_ERR(svn_wc__text_base_path(&text_base, db, local_abspath,
scratch_pool));
SVN_ERR_ASSERT(text_base != NULL);
@@ -2457,7 +2456,7 @@ svn_wc__internal_remove_from_revision_co
}
SVN_ERR(svn_wc__text_base_path(&text_base_file, db, local_abspath,
- FALSE, scratch_pool));
+ scratch_pool));
/* Remove prop/NAME, prop-base/NAME.svn-base. */
SVN_ERR(svn_wc__props_delete(db, local_abspath, svn_wc__props_working,
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=944221&r1=944220&r2=944221&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Fri May 14 12:24:29 2010
@@ -567,8 +567,7 @@ file_diff(struct dir_baton *db,
{
svn_node_kind_t kind;
- SVN_ERR(svn_wc__text_base_path(&textbase, eb->db, local_abspath, FALSE,
- pool));
+ SVN_ERR(svn_wc__text_base_path(&textbase, eb->db, local_abspath, pool));
SVN_ERR(svn_io_check_path(textbase, &kind, pool));
if (kind == svn_node_none)
SVN_ERR(svn_wc__text_revert_path(&textbase, eb->db, local_abspath,
@@ -978,8 +977,7 @@ report_wc_file_as_added(struct dir_baton
if (eb->use_text_base)
- SVN_ERR(svn_wc__text_base_path(&source_file, eb->db, local_abspath, FALSE,
- pool));
+ SVN_ERR(svn_wc__text_base_path(&source_file, eb->db, local_abspath, pool));
else
source_file = path;
@@ -1208,7 +1206,7 @@ delete_entry(const char *path,
const char *base_mimetype;
SVN_ERR(svn_wc__text_base_path(&textbase, eb->db, local_abspath,
- FALSE, pool));
+ pool));
SVN_ERR(svn_wc__get_pristine_props(&baseprops, eb->db, local_abspath,
pool, pool));
@@ -1578,7 +1576,7 @@ close_file(void *file_baton,
temp_file_path = fb->temp_file_path;
if (!temp_file_path)
SVN_ERR(svn_wc__text_base_path(&temp_file_path, eb->db, fb->local_abspath,
- FALSE, fb->pool));
+ fb->pool));
/* If the file isn't in the working copy (either because it was added
in the BASE->repos diff or because we're diffing against WORKING
@@ -1642,7 +1640,7 @@ close_file(void *file_baton,
{
if (eb->use_text_base)
SVN_ERR(svn_wc__text_base_path(&localfile, eb->db, fb->local_abspath,
- FALSE, fb->pool));
+ fb->pool));
else
/* a detranslated version of the working file */
SVN_ERR(svn_wc__internal_translated_file(
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=944221&r1=944220&r2=944221&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri May 14 12:24:29
2010
@@ -4045,7 +4045,7 @@ get_pristine_base_path(const char **old_
db, local_abspath, result_pool));
else
SVN_ERR(svn_wc__text_base_path(old_text_base_abspath,
- db, local_abspath, FALSE, result_pool));
+ db, local_abspath, result_pool));
return SVN_NO_ERROR;
}
@@ -6034,7 +6034,7 @@ svn_wc_add_repos_file4(svn_wc_context_t
/* Write out log commands to set up the new text base and its checksum.
(Install it as the normal text base, not the 'revert base'.) */
SVN_ERR(svn_wc__text_base_path(&text_base_abspath, db, local_abspath,
- FALSE, pool));
+ pool));
SVN_ERR(svn_wc__loggy_move(&work_item, db, dir_abspath,
tmp_text_base_abspath, text_base_abspath,
pool));
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=944221&r1=944220&r2=944221&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Fri May 14 12:24:29 2010
@@ -298,7 +298,7 @@ run_revert(svn_wc__db_t *db,
SVN_ERR(svn_wc__text_revert_path(&revert_base_path, db,
local_abspath, scratch_pool));
SVN_ERR(svn_wc__text_base_path(&text_base_path, db, local_abspath,
- FALSE, scratch_pool));
+ scratch_pool));
SVN_ERR(move_if_present(revert_base_path, text_base_path,
scratch_pool));
@@ -487,7 +487,7 @@ verify_pristine_present(svn_wc__db_t *db
svn_node_kind_t check_kind;
/* Verify that one of the two text bases are present. */
- SVN_ERR(svn_wc__text_base_path(&base_abspath, db, local_abspath, FALSE,
+ SVN_ERR(svn_wc__text_base_path(&base_abspath, db, local_abspath,
scratch_pool));
SVN_ERR(svn_io_check_path(base_abspath, &check_kind, scratch_pool));
if (check_kind == svn_node_file)
@@ -658,7 +658,7 @@ run_prepare_revert_files(svn_wc__db_t *d
const char *text_base;
const char *text_revert;
- SVN_ERR(svn_wc__text_base_path(&text_base, db, local_abspath, FALSE,
+ SVN_ERR(svn_wc__text_base_path(&text_base, db, local_abspath,
scratch_pool));
SVN_ERR(svn_wc__text_revert_path(&text_revert, db, local_abspath,
scratch_pool));
@@ -1413,8 +1413,8 @@ log_do_committed(svn_wc__db_t *db,
/* If the working file was overwritten (due to re-translation)
or touched (due to +x / -x), then use *that* textual
timestamp instead. */
- SVN_ERR(svn_wc__text_base_path(&base_abspath, db,
- local_abspath, FALSE, pool));
+ SVN_ERR(svn_wc__text_base_path(&base_abspath, db, local_abspath,
+ pool));
SVN_ERR(svn_io_stat(&basef_finfo, base_abspath,
APR_FINFO_MIN | APR_FINFO_LINK,
pool));
@@ -1768,7 +1768,7 @@ run_delete(svn_wc__db_t *db,
const char *text_base, *text_revert;
SVN_ERR(svn_wc__text_base_path(&text_base, db, local_abspath,
- FALSE, scratch_pool));
+ scratch_pool));
SVN_ERR(svn_wc__text_revert_path(&text_revert, db,
local_abspath, scratch_pool));
SVN_ERR(move_if_present(text_revert, text_base, scratch_pool));
