Author: julianfoad
Date: Tue Jun 29 17:55:43 2010
New Revision: 959053
URL: http://svn.apache.org/viewvc?rev=959053&view=rev
Log:
* subversion/libsvn_wc/adm_files.h,
subversion/libsvn_wc/adm_files.c
(svn_wc__get_working_checksums): New function.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_files.c
subversion/trunk/subversion/libsvn_wc/adm_files.h
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=959053&r1=959052&r2=959053&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Tue Jun 29 17:55:43 2010
@@ -638,6 +638,45 @@ svn_wc__get_ultimate_base_checksums(cons
svn_error_t *
+svn_wc__get_working_checksums(const svn_checksum_t **sha1_checksum,
+ const svn_checksum_t **md5_checksum,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ const svn_checksum_t *checksum;
+
+ SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, &checksum,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ db, local_abspath,
+ result_pool, scratch_pool));
+
+ if (checksum->kind == svn_checksum_sha1)
+ {
+ if (sha1_checksum)
+ *sha1_checksum = checksum;
+ if (md5_checksum)
+ SVN_ERR(svn_wc__db_pristine_get_md5(md5_checksum, db, local_abspath,
+ checksum,
+ result_pool, scratch_pool));
+ }
+ else
+ {
+ if (sha1_checksum)
+ SVN_ERR(svn_wc__db_pristine_get_sha1(sha1_checksum, db, local_abspath,
+ checksum,
+ result_pool, scratch_pool));
+ if (md5_checksum)
+ *md5_checksum = checksum;
+ }
+ return SVN_NO_ERROR;
+}
+
+
+svn_error_t *
svn_wc__get_pristine_text_status(apr_finfo_t *finfo,
svn_wc__db_t *db,
const char *local_abspath,
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.h?rev=959053&r1=959052&r2=959053&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.h (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.h Tue Jun 29 17:55:43 2010
@@ -233,6 +233,18 @@ svn_wc__get_ultimate_base_checksums(cons
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* Set *SHA1_CHECKSUM and *MD5_CHECKSUM to the SHA-1 and MD-5 checksums of
+ * the WORKING_NODE pristine text of LOCAL_ABSPATH in DB, or to NULL if it has
+ * no WORKING_NODE. SHA1_CHECKSUM or MD5_CHECKSUM may be NULL if not required.
+ * Allocate the checksums in RESULT_POOL. */
+svn_error_t *
+svn_wc__get_working_checksums(const svn_checksum_t **sha1_checksum,
+ const svn_checksum_t **md5_checksum,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
/*** Opening all kinds of adm files ***/
