subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1333128 - in /subversion/branches/ev2-export/subversion: include/private/svn_wc_private.h libsvn_wc/node.c
Date Wed, 02 May 2012 18:00:03 GMT
Author: hwright
Date: Wed May  2 18:00:03 2012
New Revision: 1333128

URL: http://svn.apache.org/viewvc?rev=1333128&view=rev
Log:
On the ev2-export branch:
Make the 'install pristine' functionality externally visible.

* subversion/include/private/svn_wc_private.h
  (svn_wc__node_pristine_install): New.

* subversion/libsvn_wc/node.c
  (svn_wc__node_pristine_install): New.

Modified:
    subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
    subversion/branches/ev2-export/subversion/libsvn_wc/node.c

Modified: subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h?rev=1333128&r1=1333127&r2=1333128&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h Wed May  2
18:00:03 2012
@@ -1076,6 +1076,17 @@ svn_wc__node_get_md5_from_sha1(const svn
                                apr_pool_t *result_pool,
                                apr_pool_t *scratch_pool);
 
+/* Install the file TEMPFILE_ABSPATH (which is sitting in a directory given by
+   svn_wc__db_pristine_get_tempdir()) into the pristine data store, to be
+   identified by the SHA-1 checksum of its contents, SHA1_CHECKSUM, and whose
+   MD-5 checksum is MD5_CHECKSUM. */
+svn_error_t *
+svn_wc__node_pristine_install(svn_wc_context_t *wc_ctx,
+                              const char *tempfile_abspath,
+                              const svn_checksum_t *sha1_checksum,
+                              const svn_checksum_t *md5_checksum,
+                              apr_pool_t *scratch_pool);
+
 
 /* Gets an array of const char *repos_relpaths of descendants of LOCAL_ABSPATH,
  * which must be the op root of an addition, copy or move. The descendants

Modified: subversion/branches/ev2-export/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_wc/node.c?rev=1333128&r1=1333127&r2=1333128&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_wc/node.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_wc/node.c Wed May  2 18:00:03 2012
@@ -1634,6 +1634,20 @@ svn_wc__node_get_md5_from_sha1(const svn
 }
 
 svn_error_t *
+svn_wc__node_pristine_install(svn_wc_context_t *wc_ctx,
+                              const char *tempfile_abspath,
+                              const svn_checksum_t *sha1_checksum,
+                              const svn_checksum_t *md5_checksum,
+                              apr_pool_t *scratch_pool)
+{
+  return svn_error_trace(svn_wc__db_pristine_install(wc_ctx->db,
+                                                     tempfile_abspath,
+                                                     sha1_checksum,
+                                                     md5_checksum,
+                                                     scratch_pool));
+}
+
+svn_error_t *
 svn_wc__get_not_present_descendants(const apr_array_header_t **descendants,
                                     svn_wc_context_t *wc_ctx,
                                     const char *local_abspath,



Mime
View raw message