svn commit: r1701641 - /subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Sep  7 15:36:58 2015
New Revision: 1701641

URL: http://svn.apache.org/r1701641
Log:
Remove a Windows specific slowdown from the pristine cleanup code, that
tried to rename a file to avoid file lock problems.

This block completely ignored that the rename would also fail in every
case where this 'optimization' would be interesting.

* subversion/libsvn_wc/wc_db_pristine.c
  (remove_file): Remove Win32 block.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c?rev=1701641&r1=1701640&r2=1701641&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c Mon Sep  7 15:36:58 2015
@@ -699,25 +699,6 @@ remove_file(const char *file_abspath,
             svn_boolean_t ignore_enoent,
             apr_pool_t *scratch_pool)
 {
-#ifdef WIN32
-  svn_error_t *err;
-  const char *temp_abspath;
-  const char *temp_dir_abspath
-    = pristine_get_tempdir(wcroot, scratch_pool, scratch_pool);
-
-  /* To rename the file to a unique name in the temp dir, first create a
-   * uniquely named file in the temp dir and then overwrite it. */
-  SVN_ERR(svn_io_open_unique_file3(NULL, &temp_abspath, temp_dir_abspath,
-                                   svn_io_file_del_none,
-                                   scratch_pool, scratch_pool));
-  err = svn_io_file_rename2(file_abspath, temp_abspath, FALSE, scratch_pool);
-  if (err && ignore_enoent && APR_STATUS_IS_ENOENT(err->apr_err))
-    svn_error_clear(err);
-  else
-    SVN_ERR(err);
-  file_abspath = temp_abspath;
-#endif
-
   SVN_ERR(svn_io_remove_file2(file_abspath, ignore_enoent, scratch_pool));
 
   return SVN_NO_ERROR;