Hi All,
As discussed in the thread,
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=119803
I am posting the libsvn_fs_util patch in 2 parts after incorporating the
review comments.
This is the first part.
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Patch by: Kamesh Jayachandran <kamesh@collab.net>
Expose txn_mergeinfo so that libsvn_fs_util module can consume
and index the mergeinfo.
* subversion/libsvn_fs/fs-loader.h
(struct txn_vtable_t):
Add 'txn_mergeinfo' hook.
* subversion/libsvn_fs_base/revs-txns.c
(txn_vtable):
Set 'NULL' as placeholder for 'txn_mergeinfo' hook.
* subversion/libsvn_fs_fs/fs_fs.c
(txn_vtable):
Set 'svn_fs_fs__txn_mergeinfo' for 'txn_mergeinfo' hook.
]]]
Index: subversion/libsvn_fs/fs-loader.h
===================================================================
--- subversion/libsvn_fs/fs-loader.h (revision 21525)
+++ subversion/libsvn_fs/fs-loader.h (working copy)
@@ -184,6 +184,8 @@
const svn_string_t *value, apr_pool_t *pool);
svn_error_t *(*root)(svn_fs_root_t **root_p, svn_fs_txn_t *txn,
apr_pool_t *pool);
+ svn_error_t *(*txn_mergeinfo)(apr_hash_t **minfoprops, svn_fs_txn_t *txn,
+ apr_pool_t *pool);
} txn_vtable_t;
Index: subversion/libsvn_fs_base/revs-txns.c
===================================================================
--- subversion/libsvn_fs_base/revs-txns.c (revision 21525)
+++ subversion/libsvn_fs_base/revs-txns.c (working copy)
@@ -597,7 +597,8 @@
svn_fs_base__txn_prop,
svn_fs_base__txn_proplist,
svn_fs_base__change_txn_prop,
- svn_fs_base__txn_root
+ svn_fs_base__txn_root,
+ NULL
};
Index: subversion/libsvn_fs_fs/fs_fs.c
===================================================================
--- subversion/libsvn_fs_fs/fs_fs.c (revision 21525)
+++ subversion/libsvn_fs_fs/fs_fs.c (working copy)
@@ -130,7 +130,8 @@
svn_fs_fs__txn_prop,
svn_fs_fs__txn_proplist,
svn_fs_fs__change_txn_prop,
- svn_fs_fs__txn_root
+ svn_fs_fs__txn_root,
+ svn_fs_fs__txn_mergeinfo
};
/* Pathname helper functions */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 18 16:43:32 2006