Author: gstein
Date: Tue Apr 27 03:59:04 2010
New Revision: 938313
URL: http://svn.apache.org/viewvc?rev=938313&view=rev
Log:
Don't bother setting old-style text-bases to readonly. The system is going
to change, and this lets us remove loggy cruft.
* subversion/libsvn_wc/log.h:
(svn_wc__loggy_set_readonly): removed. don't want to use it.
* subversion/libsvn_wc/log.c:
(SVN_WC__LOG_READONLY, log_do_file_readonly,
svn_wc__loggy_set_readonly): remove all these bits. unwanted.
(start_handler): don't worry about parsing SVN_WC__LOG_READONLY
* subversion/libsvn_wc/update_editor.c:
(install_text_base): remove part to set text bases as readonly. some
future pristine mgmt will do this. leave a reminder comment.
Modified:
subversion/trunk/subversion/libsvn_wc/log.c
subversion/trunk/subversion/libsvn_wc/log.h
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/log.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/log.c?rev=938313&r1=938312&r2=938313&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/log.c (original)
+++ subversion/trunk/subversion/libsvn_wc/log.c Tue Apr 27 03:59:04 2010
@@ -88,9 +88,6 @@
the DEST. */
#define SVN_WC__LOG_CP_AND_TRANSLATE "cp-and-translate"
-/* Make file SVN_WC__LOG_ATTR_NAME readonly */
-#define SVN_WC__LOG_READONLY "readonly"
-
/* Set SVN_WC__LOG_ATTR_NAME to have timestamp SVN_WC__LOG_ATTR_TIMESTAMP. */
#define SVN_WC__LOG_SET_TIMESTAMP "set-timestamp"
@@ -211,26 +208,6 @@ log_do_file_move(const char *from_abspat
}
-/* Make file NAME in log's CWD readonly */
-static svn_error_t *
-log_do_file_readonly(struct log_runner *loggy,
- const char *name)
-{
- svn_error_t *err;
- const char *local_abspath
- = svn_dirent_join(loggy->adm_abspath, name, loggy->pool);
-
- err = svn_io_set_file_read_only(local_abspath, FALSE, loggy->pool);
- if (err)
- {
- if (!APR_STATUS_IS_ENOENT(err->apr_err))
- return svn_error_return(err);
- svn_error_clear(err);
- }
- return SVN_NO_ERROR;
-}
-
-
/* Set file NAME in log's CWD to timestamp value in ATTS. */
static svn_error_t *
log_do_file_timestamp(struct log_runner *loggy,
@@ -601,9 +578,6 @@ start_handler(void *userData, const char
err = log_do_file_cp_and_translate(loggy->db, from_abspath, dest_abspath,
versioned_abspath, loggy->pool);
}
- else if (strcmp(eltname, SVN_WC__LOG_READONLY) == 0) {
- err = log_do_file_readonly(loggy, name);
- }
else if (strcmp(eltname, SVN_WC__LOG_SET_TIMESTAMP) == 0) {
err = log_do_file_timestamp(loggy, name, atts);
}
@@ -995,27 +969,6 @@ svn_wc__loggy_set_entry_working_size_fro
scratch_pool));
}
-svn_error_t *
-svn_wc__loggy_set_readonly(svn_wc__db_t *db,
- const char *adm_abspath,
- const char *path,
- apr_pool_t *scratch_pool)
-{
- svn_stringbuf_t *log_accum = NULL;
- const char *loggy_path1;
-
- SVN_ERR(loggy_path(&loggy_path1, path, adm_abspath, scratch_pool));
- svn_xml_make_open_tag(&log_accum,
- scratch_pool,
- svn_xml_self_closing,
- SVN_WC__LOG_READONLY,
- SVN_WC__LOG_ATTR_NAME,
- loggy_path1,
- NULL);
-
- return svn_error_return(svn_wc__wq_add_loggy(db, adm_abspath, log_accum,
- scratch_pool));
-}
svn_error_t *
svn_wc__loggy_set_timestamp(svn_wc__db_t *db,
Modified: subversion/trunk/subversion/libsvn_wc/log.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/log.h?rev=938313&r1=938312&r2=938313&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/log.h (original)
+++ subversion/trunk/subversion/libsvn_wc/log.h Tue Apr 27 03:59:04 2010
@@ -143,17 +143,6 @@ svn_wc__loggy_set_entry_working_size_fro
apr_pool_t *scratch_pool);
-/* Queue instructions to set permissions of PATH
- to 'readonly'.
-
- ADM_ABSPATH is the absolute path for the admin directory for PATH.
-*/
-svn_error_t *
-svn_wc__loggy_set_readonly(svn_wc__db_t *db,
- const char *adm_abspath,
- const char *path,
- apr_pool_t *scratch_pool);
-
/* Queue instructions to set the timestamp of PATH to
the time TIMESTR.
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=938313&r1=938312&r2=938313&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Apr 27 03:59:04
2010
@@ -4228,9 +4228,8 @@ install_text_base(svn_wc__db_t *db,
SVN_ERR(svn_wc__loggy_move(db, adm_abspath,
temp_text_base_abspath, final_text_base_abspath,
scratch_pool));
- SVN_ERR(svn_wc__loggy_set_readonly(db, adm_abspath,
- final_text_base_abspath,
- scratch_pool));
+ /* ### future pristine storage should ensure all files are readonly
+ ### once they are placed in storage. */
return SVN_NO_ERROR;
}
