Author: gstein
Date: Sun May 9 20:34:19 2010
New Revision: 942616
URL: http://svn.apache.org/viewvc?rev=942616&view=rev
Log:
Remove some obsolete defines from wc.h.
* subversion/libsvn_wc/wc.h:
(SVN_WC__TMP_EXT, SVN_WC__ADM_KILLME, SVN_WC__KILL_ADM_ONLY): remove
(SVN_WC__ADM_LOCK, SVN_WC__ADM_LOG): moved to upgrade.c
* subversion/libsvn_wc/upgrade.c:
(ADM_LOG, ADM_LOCK): new defines from wc.h
(build_lockfile_path): use ADM_LOCK instead of a bare constant
(upgrade_to_wcng): track rename to ADM_LOG
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc.h
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=942616&r1=942615&r2=942616&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Sun May 9 20:34:19 2010
@@ -58,6 +58,8 @@
/* Old data files that we no longer need/use. */
#define ADM_README "README.txt"
#define ADM_EMPTY_FILE "empty-file"
+#define ADM_LOG "log"
+#define ADM_LOCK "lock"
/* Read the properties from the file at PROPFILE_ABSPATH, returning them
@@ -327,7 +329,7 @@ build_lockfile_path(const char *local_di
return svn_dirent_join_many(result_pool,
local_dir_abspath,
".svn", /* ### switch to dynamic? */
- "lock",
+ ADM_LOCK,
NULL);
}
@@ -442,7 +444,7 @@ upgrade_to_wcng(svn_wc__db_t *db,
void *repos_info_baton,
apr_pool_t *scratch_pool)
{
- const char *logfile_path = svn_wc__adm_child(dir_abspath, SVN_WC__ADM_LOG,
+ const char *logfile_path = svn_wc__adm_child(dir_abspath, ADM_LOG,
scratch_pool);
svn_node_kind_t logfile_on_disk;
apr_hash_t *entries;
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=942616&r1=942615&r2=942616&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Sun May 9 20:34:19 2010
@@ -40,8 +40,7 @@
extern "C" {
#endif /* __cplusplus */
-
-#define SVN_WC__TMP_EXT ".tmp"
+
#define SVN_WC__PROP_REJ_EXT ".prej"
#define SVN_WC__BASE_EXT ".svn-base" /* for text and prop bases */
#define SVN_WC__WORK_EXT ".svn-work" /* for working propfiles */
@@ -293,7 +292,6 @@ struct svn_wc_traversal_info_t
/** The files within the administrative subdir. **/
#define SVN_WC__ADM_FORMAT "format"
#define SVN_WC__ADM_ENTRIES "entries"
-#define SVN_WC__ADM_LOCK "lock"
#define SVN_WC__ADM_TMP "tmp"
#define SVN_WC__ADM_TEXT_BASE "text-base"
#define SVN_WC__ADM_PROPS "props"
@@ -301,8 +299,6 @@ struct svn_wc_traversal_info_t
#define SVN_WC__ADM_DIR_PROPS "dir-props"
#define SVN_WC__ADM_DIR_PROP_BASE "dir-prop-base"
#define SVN_WC__ADM_DIR_PROP_REVERT "dir-prop-revert"
-#define SVN_WC__ADM_LOG "log"
-#define SVN_WC__ADM_KILLME "KILLME"
#define SVN_WC__ADM_PRISTINE "pristine"
/* The basename of the ".prej" file, if a directory ever has property
@@ -310,10 +306,6 @@ struct svn_wc_traversal_info_t
directory. */
#define SVN_WC__THIS_DIR_PREJ "dir_conflicts"
-/* Possible contents of the killme file. If present, signals that the
- administrative area only should be deleted. */
-#define SVN_WC__KILL_ADM_ONLY "adm-only"
-
/* A few declarations for stuff in util.c.
* If this section gets big, move it all out into a new util.h file. */
