subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1686054 - in /subversion/branches/fsx-1.10/subversion/libsvn_fs_x: fs.h transaction.c util.c util.h
Date Wed, 17 Jun 2015 15:27:51 GMT
Author: stefan2
Date: Wed Jun 17 15:27:51 2015
New Revision: 1686054

URL: http://svn.apache.org/r1686054
Log:
On the fsx-1.10 branch:
With r1686051, there is no 'props-final' file anymore and a quite some
code is obsolete now. Remove it.

* subversion/libsvn_fs_x/fs.h
  (PATH_TXN_PROPS_FINAL): Remve.

* subversion/libsvn_fs_x/transaction.c
  (set_txn_proplist): FINAL is never TRUE, drop that flag.
  (svn_fs_x__change_txn_props,
   svn_fs_x__begin_txn): Update callers.

* subversion/libsvn_fs_x/util.h
  (svn_fs_x__path_txn_props_final): Remove.

* subversion/libsvn_fs_x/util.c
  (svn_fs_x__path_txn_props_final): Remove.

Modified:
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/fs.h
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/transaction.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.h

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/fs.h?rev=1686054&r1=1686053&r2=1686054&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/fs.h Wed Jun 17 15:27:51 2015
@@ -79,8 +79,6 @@ extern "C" {
 /* Names of special files and file extensions for transactions */
 #define PATH_CHANGES       "changes"       /* Records changes made so far */
 #define PATH_TXN_PROPS     "props"         /* Transaction properties */
-#define PATH_TXN_PROPS_FINAL "props-final" /* Final transaction properties
-                                              before moving to revprops */
 #define PATH_NEXT_IDS      "next-ids"      /* Next temporary ID assignments */
 #define PATH_PREFIX_NODE   "node."         /* Prefix for node filename */
 #define PATH_EXT_TXN       ".txn"          /* Extension of txn dir */

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/transaction.c?rev=1686054&r1=1686053&r2=1686054&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/transaction.c Wed Jun 17 15:27:51
2015
@@ -1342,7 +1342,6 @@ static svn_error_t *
 set_txn_proplist(svn_fs_t *fs,
                  svn_fs_x__txn_id_t txn_id,
                  apr_hash_t *props,
-                 svn_boolean_t final,
                  apr_pool_t *scratch_pool)
 {
   svn_stream_t *stream;
@@ -1359,12 +1358,9 @@ set_txn_proplist(svn_fs_t *fs,
 
   /* Replace the old file with the new one. */
   SVN_ERR(svn_io_file_rename(temp_path,
-                             (final
-                               ? svn_fs_x__path_txn_props_final(fs, txn_id,
-                                                                scratch_pool)
-                               : svn_fs_x__path_txn_props(fs, txn_id,
-                                                          scratch_pool)),
-                              scratch_pool));
+                             svn_fs_x__path_txn_props(fs, txn_id,
+                                                      scratch_pool),
+                             scratch_pool));
 
   return SVN_NO_ERROR;
 }
@@ -1421,8 +1417,7 @@ svn_fs_x__change_txn_props(svn_fs_txn_t
 
   /* Create a new version of the file and write out the new props. */
   /* Open the transaction properties file. */
-  SVN_ERR(set_txn_proplist(txn->fs, ftd->txn_id, txn_prop, FALSE,
-                           scratch_pool));
+  SVN_ERR(set_txn_proplist(txn->fs, ftd->txn_id, txn_prop, scratch_pool));
 
   return SVN_NO_ERROR;
 }
@@ -3819,7 +3814,7 @@ svn_fs_x__begin_txn(svn_fs_txn_t **txn_p
                   svn_string_create("0", scratch_pool));
 
   ftd = (*txn_p)->fsap_data;
-  SVN_ERR(set_txn_proplist(fs, ftd->txn_id, props, FALSE, scratch_pool));
+  SVN_ERR(set_txn_proplist(fs, ftd->txn_id, props, scratch_pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.c?rev=1686054&r1=1686053&r2=1686054&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.c Wed Jun 17 15:27:51 2015
@@ -334,14 +334,6 @@ svn_fs_x__path_txn_props(svn_fs_t *fs,
   return construct_txn_path(fs, txn_id, PATH_TXN_PROPS, result_pool);
 }
 
-const char *
-svn_fs_x__path_txn_props_final(svn_fs_t *fs,
-                               svn_fs_x__txn_id_t txn_id,
-                               apr_pool_t *result_pool)
-{
-  return construct_txn_path(fs, txn_id, PATH_TXN_PROPS_FINAL, result_pool);
-}
-
 const char*
 svn_fs_x__path_l2p_proto_index(svn_fs_t *fs,
                                svn_fs_x__txn_id_t txn_id,

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.h?rev=1686054&r1=1686053&r2=1686054&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/util.h Wed Jun 17 15:27:51 2015
@@ -277,15 +277,6 @@ svn_fs_x__path_txn_props(svn_fs_t *fs,
                          svn_fs_x__txn_id_t txn_id,
                          apr_pool_t *result_pool);
 
-/* Return the path of the file containing the "final" transaction
- * properties for the transaction identified by TXN_ID in FS.
- * The result will be allocated in RESULT_POOL.
- */
-const char *
-svn_fs_x__path_txn_props_final(svn_fs_t *fs,
-                               svn_fs_x__txn_id_t txn_id,
-                               apr_pool_t *result_pool);
-
 /* Return the path of the file containing the node and copy ID counters for
  * the transaction identified by TXN_ID in FS.
  * The result will be allocated in RESULT_POOL.



Mime
View raw message