You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/05/16 22:32:54 UTC
svn commit: r1339349 [22/37] - in /subversion/branches/fix-rdump-editor: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/emacs/ contrib/client-side/vim/
contrib/server-side/ notes/ notes/api-errat...
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_subr/win32_crypto.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_subr/win32_crypto.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_subr/win32_crypto.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_subr/win32_crypto.c Wed May 16 20:32:43 2012
@@ -28,28 +28,77 @@
/*** Includes. ***/
#include <apr_pools.h>
+#include <apr_base64.h>
#include "svn_auth.h"
#include "svn_error.h"
#include "svn_utf.h"
#include "svn_config.h"
#include "svn_user.h"
+#include "svn_base64.h"
#include "private/svn_auth_private.h"
#include "svn_private_config.h"
#include <wincrypt.h>
-#include <apr_base64.h>
-
-/*-----------------------------------------------------------------------*/
-/* Windows simple provider, encrypts the password on Win2k and later. */
-/*-----------------------------------------------------------------------*/
+
/* The description string that's combined with unencrypted data by the
Windows CryptoAPI. Used during decryption to verify that the
encrypted data were valid. */
static const WCHAR description[] = L"auth_svn.simple.wincrypt";
+
+/* Return a copy of ORIG, encrypted using the Windows CryptoAPI and
+ allocated from POOL. */
+const svn_string_t *
+encrypt_data(const svn_string_t *orig,
+ apr_pool_t *pool)
+{
+ DATA_BLOB blobin;
+ DATA_BLOB blobout;
+ const svn_string_t *crypted = NULL;
+
+ blobin.cbData = orig->len;
+ blobin.pbData = (BYTE *)orig->data;
+ if (CryptProtectData(&blobin, description, NULL, NULL, NULL,
+ CRYPTPROTECT_UI_FORBIDDEN, &blobout))
+ {
+ crypted = svn_string_ncreate(blobout.pbData, blobout.cbData, pool);
+ LocalFree(blobout.pbData);
+ }
+ return crypted;
+}
+
+/* Return a copy of CRYPTED, decrypted using the Windows CryptoAPI and
+ allocated from POOL. */
+const svn_string_t *
+decrypt_data(const svn_string_t *crypted,
+ apr_pool_t *pool)
+{
+ DATA_BLOB blobin;
+ DATA_BLOB blobout;
+ LPWSTR descr;
+ const svn_string_t *orig = NULL;
+
+ blobin.cbData = crypted->len;
+ blobin.pbData = (BYTE *)crypted->data;
+ if (CryptUnprotectData(&blobin, &descr, NULL, NULL, NULL,
+ CRYPTPROTECT_UI_FORBIDDEN, &blobout))
+ {
+ if (0 == lstrcmpW(descr, description))
+ orig = svn_string_ncreate(blobout.pbData, blobout.cbData, pool);
+ LocalFree(blobout.pbData);
+ LocalFree(descr);
+ }
+ return orig;
+}
+
+
+/*-----------------------------------------------------------------------*/
+/* Windows simple provider, encrypts the password on Win2k and later. */
+/*-----------------------------------------------------------------------*/
+
/* Implementation of svn_auth__password_set_t that encrypts
the incoming password using the Windows CryptoAPI. */
static svn_error_t *
@@ -62,22 +111,15 @@ windows_password_encrypter(svn_boolean_t
svn_boolean_t non_interactive,
apr_pool_t *pool)
{
- DATA_BLOB blobin;
- DATA_BLOB blobout;
- svn_boolean_t crypted;
+ const svn_string_t *coded;
- blobin.cbData = strlen(in);
- blobin.pbData = (BYTE*) in;
- crypted = CryptProtectData(&blobin, description, NULL, NULL, NULL,
- CRYPTPROTECT_UI_FORBIDDEN, &blobout);
- if (crypted)
+ coded = encrypt_data(svn_string_create(in, pool), pool);
+ if (coded)
{
- char *coded = apr_palloc(pool, apr_base64_encode_len(blobout.cbData));
- apr_base64_encode(coded, (const char*)blobout.pbData, blobout.cbData);
+ coded = svn_base64_encode_string2(coded, FALSE, pool);
SVN_ERR(svn_auth__simple_password_set(done, creds, realmstring, username,
- coded, parameters,
+ coded->data, parameters,
non_interactive, pool));
- LocalFree(blobout.pbData);
}
return SVN_NO_ERROR;
@@ -96,33 +138,25 @@ windows_password_decrypter(svn_boolean_t
svn_boolean_t non_interactive,
apr_pool_t *pool)
{
- DATA_BLOB blobin;
- DATA_BLOB blobout;
- LPWSTR descr;
- svn_boolean_t decrypted;
- char *in;
+ const svn_string_t *orig;
+ const char *in;
SVN_ERR(svn_auth__simple_password_get(done, &in, creds, realmstring, username,
parameters, non_interactive, pool));
if (!done)
return SVN_NO_ERROR;
- blobin.cbData = strlen(in);
- blobin.pbData = apr_palloc(pool, apr_base64_decode_len(in));
- apr_base64_decode((char*)blobin.pbData, in);
- decrypted = CryptUnprotectData(&blobin, &descr, NULL, NULL, NULL,
- CRYPTPROTECT_UI_FORBIDDEN, &blobout);
- if (decrypted)
+ orig = svn_base64_decode_string(svn_string_create(in, pool), pool);
+ orig = decrypt_data(orig, pool);
+ if (orig)
{
- if (0 == lstrcmpW(descr, description))
- *out = apr_pstrndup(pool, (const char*)blobout.pbData, blobout.cbData);
- else
- decrypted = FALSE;
- LocalFree(blobout.pbData);
- LocalFree(descr);
+ *out = orig->data;
+ *done = TRUE;
+ }
+ else
+ {
+ *done = FALSE;
}
-
- *done = decrypted;
return SVN_NO_ERROR;
}
@@ -135,14 +169,14 @@ windows_simple_first_creds(void **creden
const char *realmstring,
apr_pool_t *pool)
{
- return svn_auth__simple_first_creds_helper(credentials,
- iter_baton,
- provider_baton,
- parameters,
- realmstring,
- windows_password_decrypter,
- SVN_AUTH__WINCRYPT_PASSWORD_TYPE,
- pool);
+ return svn_auth__simple_creds_cache_get(credentials,
+ iter_baton,
+ provider_baton,
+ parameters,
+ realmstring,
+ windows_password_decrypter,
+ SVN_AUTH__WINCRYPT_PASSWORD_TYPE,
+ pool);
}
/* Save encrypted credentials to the simple provider's cache. */
@@ -154,13 +188,13 @@ windows_simple_save_creds(svn_boolean_t
const char *realmstring,
apr_pool_t *pool)
{
- return svn_auth__simple_save_creds_helper(saved, credentials,
- provider_baton,
- parameters,
- realmstring,
- windows_password_encrypter,
- SVN_AUTH__WINCRYPT_PASSWORD_TYPE,
- pool);
+ return svn_auth__simple_creds_cache_set(saved, credentials,
+ provider_baton,
+ parameters,
+ realmstring,
+ windows_password_encrypter,
+ SVN_AUTH__WINCRYPT_PASSWORD_TYPE,
+ pool);
}
static const svn_auth_provider_t windows_simple_provider = {
@@ -200,22 +234,16 @@ windows_ssl_client_cert_pw_encrypter(svn
svn_boolean_t non_interactive,
apr_pool_t *pool)
{
- DATA_BLOB blobin;
- DATA_BLOB blobout;
- svn_boolean_t crypted;
+ const svn_string_t *coded;
- blobin.cbData = strlen(in);
- blobin.pbData = (BYTE*) in;
- crypted = CryptProtectData(&blobin, description, NULL, NULL, NULL,
- CRYPTPROTECT_UI_FORBIDDEN, &blobout);
- if (crypted)
+ coded = encrypt_data(svn_string_create(in, pool), pool);
+ if (coded)
{
- char *coded = apr_palloc(pool, apr_base64_encode_len(blobout.cbData));
- apr_base64_encode(coded, (const char*)blobout.pbData, blobout.cbData);
+ coded = svn_base64_encode_string2(coded, FALSE, pool);
SVN_ERR(svn_auth__ssl_client_cert_pw_set(done, creds, realmstring,
- username, coded, parameters,
- non_interactive, pool));
- LocalFree(blobout.pbData);
+ username, coded->data,
+ parameters, non_interactive,
+ pool));
}
return SVN_NO_ERROR;
@@ -234,11 +262,8 @@ windows_ssl_client_cert_pw_decrypter(svn
svn_boolean_t non_interactive,
apr_pool_t *pool)
{
- DATA_BLOB blobin;
- DATA_BLOB blobout;
- LPWSTR descr;
- svn_boolean_t decrypted;
- char *in;
+ const svn_string_t *orig;
+ const char *in;
SVN_ERR(svn_auth__ssl_client_cert_pw_get(done, &in, creds, realmstring,
username, parameters,
@@ -246,22 +271,17 @@ windows_ssl_client_cert_pw_decrypter(svn
if (!done)
return SVN_NO_ERROR;
- blobin.cbData = strlen(in);
- blobin.pbData = apr_palloc(pool, apr_base64_decode_len(in));
- apr_base64_decode((char*)blobin.pbData, in);
- decrypted = CryptUnprotectData(&blobin, &descr, NULL, NULL, NULL,
- CRYPTPROTECT_UI_FORBIDDEN, &blobout);
- if (decrypted)
+ orig = svn_base64_decode_string(svn_string_create(in, pool), pool);
+ orig = decrypt_data(orig, pool);
+ if (orig)
{
- if (0 == lstrcmpW(descr, description))
- *out = apr_pstrndup(pool, (const char*)blobout.pbData, blobout.cbData);
- else
- decrypted = FALSE;
- LocalFree(blobout.pbData);
- LocalFree(descr);
+ *out = orig->data;
+ *done = TRUE;
+ }
+ else
+ {
+ *done = FALSE;
}
-
- *done = decrypted;
return SVN_NO_ERROR;
}
@@ -274,15 +294,10 @@ windows_ssl_client_cert_pw_first_creds(v
const char *realmstring,
apr_pool_t *pool)
{
- return svn_auth__ssl_client_cert_pw_file_first_creds_helper
- (credentials,
- iter_baton,
- provider_baton,
- parameters,
- realmstring,
- windows_ssl_client_cert_pw_decrypter,
- SVN_AUTH__WINCRYPT_PASSWORD_TYPE,
- pool);
+ return svn_auth__ssl_client_cert_pw_cache_get(
+ credentials, iter_baton, provider_baton, parameters, realmstring,
+ windows_ssl_client_cert_pw_decrypter,
+ SVN_AUTH__WINCRYPT_PASSWORD_TYPE, pool);
}
/* Save encrypted credentials to the simple provider's cache. */
@@ -294,15 +309,10 @@ windows_ssl_client_cert_pw_save_creds(sv
const char *realmstring,
apr_pool_t *pool)
{
- return svn_auth__ssl_client_cert_pw_file_save_creds_helper
- (saved,
- credentials,
- provider_baton,
- parameters,
- realmstring,
- windows_ssl_client_cert_pw_encrypter,
- SVN_AUTH__WINCRYPT_PASSWORD_TYPE,
- pool);
+ return svn_auth__ssl_client_cert_pw_cache_set(
+ saved, credentials, provider_baton, parameters, realmstring,
+ windows_ssl_client_cert_pw_encrypter,
+ SVN_AUTH__WINCRYPT_PASSWORD_TYPE, pool);
}
static const svn_auth_provider_t windows_ssl_client_cert_pw_provider = {
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_subr/xml.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_subr/xml.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_subr/xml.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_subr/xml.c Wed May 16 20:32:43 2012
@@ -455,7 +455,7 @@ void svn_xml_signal_bailout(svn_error_t
/*** Attribute walking. ***/
const char *
-svn_xml_get_attr_value(const char *name, const char **atts)
+svn_xml_get_attr_value(const char *name, const char *const *atts)
{
while (atts && (*atts))
{
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_crawler.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_crawler.c Wed May 16 20:32:43 2012
@@ -692,11 +692,6 @@ svn_wc_crawl_revisions5(svn_wc_context_t
return SVN_NO_ERROR;
}
- if (! repos_relpath)
- SVN_ERR(svn_wc__db_scan_base_repos(&repos_relpath, &repos_root_url, NULL,
- db, local_abspath,
- scratch_pool, scratch_pool));
-
if (target_depth == svn_depth_unknown)
target_depth = svn_depth_infinity;
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_files.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_files.c Wed May 16 20:32:43 2012
@@ -634,3 +634,16 @@ svn_wc_create_tmp_file2(apr_file_t **fp,
return SVN_NO_ERROR;
}
+
+svn_error_t *
+svn_wc__get_tmpdir(const char **tmpdir_abspath,
+ svn_wc_context_t *wc_ctx,
+ const char *wri_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ SVN_ERR(svn_wc__db_temp_wcroot_tempdir(tmpdir_abspath,
+ wc_ctx->db, wri_abspath,
+ result_pool, scratch_pool));
+ return SVN_NO_ERROR;
+}
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_ops.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_ops.c Wed May 16 20:32:43 2012
@@ -59,7 +59,7 @@
#include "svn_private_config.h"
#include "private/svn_io_private.h"
#include "private/svn_wc_private.h"
-
+#include "private/svn_subr_private.h"
struct svn_wc_committed_queue_t
@@ -2251,6 +2251,61 @@ svn_wc_get_pristine_contents2(svn_stream
}
+typedef struct get_pristine_lazyopen_baton_t
+{
+ svn_wc_context_t *wc_ctx;
+ const char *wri_abspath;
+ const svn_checksum_t *sha1_checksum;
+
+} get_pristine_lazyopen_baton_t;
+
+
+/* Implements svn_stream_lazyopen_func_t */
+static svn_error_t *
+get_pristine_lazyopen_func(svn_stream_t **stream,
+ void *baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ get_pristine_lazyopen_baton_t *b = baton;
+
+ SVN_ERR(svn_wc__db_pristine_read(stream, NULL, b->wc_ctx->db,
+ b->wri_abspath, b->sha1_checksum,
+ result_pool, scratch_pool));
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_wc__get_pristine_contents_by_checksum(svn_stream_t **contents,
+ svn_wc_context_t *wc_ctx,
+ const char *wri_abspath,
+ const svn_checksum_t *sha1_checksum,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ svn_boolean_t present;
+
+ *contents = NULL;
+
+ SVN_ERR(svn_wc__db_pristine_check(&present, wc_ctx->db, wri_abspath,
+ sha1_checksum, scratch_pool));
+
+ if (present)
+ {
+ get_pristine_lazyopen_baton_t *gpl_baton;
+
+ gpl_baton = apr_pcalloc(result_pool, sizeof(*gpl_baton));
+ gpl_baton->wc_ctx = wc_ctx;
+ gpl_baton->wri_abspath = wri_abspath;
+ gpl_baton->sha1_checksum = sha1_checksum;
+
+ *contents = svn_stream_lazyopen_create(get_pristine_lazyopen_func,
+ gpl_baton, result_pool);
+ }
+
+ return SVN_NO_ERROR;
+}
+
svn_error_t *
svn_wc__internal_remove_from_revision_control(svn_wc__db_t *db,
const char *local_abspath,
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/ambient_depth_filter_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/ambient_depth_filter_editor.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/ambient_depth_filter_editor.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/ambient_depth_filter_editor.c Wed May 16 20:32:43 2012
@@ -113,8 +113,12 @@ struct dir_baton
void *wrapped_baton;
};
-/* Helper to call either svn_wc__db_base_get_info or svn_wc__db_read_info for
- obtaining information for the ambient depth editor */
+/* Fetch the STATUS, KIND and DEPTH of the base node at LOCAL_ABSPATH.
+ * If there is no such base node, report 'normal', 'unknown' and 'unknown'
+ * respectively.
+ *
+ * STATUS and/or DEPTH may be NULL if not wanted; KIND must not be NULL.
+ */
static svn_error_t *
ambient_read_info(svn_wc__db_status_t *status,
svn_kind_t *kind,
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/conflicts.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/conflicts.c Wed May 16 20:32:43 2012
@@ -44,6 +44,7 @@
#include "wc.h"
#include "wc_db.h"
#include "conflicts.h"
+#include "workqueue.h"
#include "private/svn_wc_private.h"
#include "private/svn_skel.h"
@@ -115,40 +116,10 @@ svn_wc__conflict_skel_add_prop_conflict(
/*** Resolving a conflict automatically ***/
-
-/* Helper for resolve_conflict_on_entry. Delete the file FILE_ABSPATH
- in if it exists. Set WAS_PRESENT to TRUE if the file existed, and
- leave it UNTOUCHED otherwise. */
-static svn_error_t *
-attempt_deletion(const char *file_abspath,
- svn_boolean_t *was_present,
- apr_pool_t *scratch_pool)
-{
- svn_error_t *err;
-
- if (file_abspath == NULL)
- return SVN_NO_ERROR;
-
- err = svn_io_remove_file2(file_abspath, FALSE, scratch_pool);
-
- if (err == NULL || !APR_STATUS_IS_ENOENT(err->apr_err))
- {
- *was_present = TRUE;
- return svn_error_trace(err);
- }
-
- svn_error_clear(err);
- return SVN_NO_ERROR;
-}
-
-
/* Conflict resolution involves removing the conflict files, if they exist,
and clearing the conflict filenames from the entry. The latter needs to
be done whether or not the conflict files exist.
- Tree conflicts are not resolved here, because the data stored in one
- entry does not refer to that entry but to children of it.
-
PATH is the path to the item to be resolved, BASE_NAME is the basename
of PATH, and CONFLICT_DIR is the access baton for PATH. ORIG_ENTRY is
the entry prior to resolution. RESOLVE_TEXT and RESOLVE_PROPS are TRUE
@@ -158,24 +129,19 @@ attempt_deletion(const char *file_abspat
else do not change *DID_RESOLVE.
See svn_wc_resolved_conflict5() for how CONFLICT_CHOICE behaves.
-
- ### FIXME: This function should be loggy, otherwise an interruption can
- ### leave, for example, one of the conflict artifact files deleted but
- ### the entry still referring to it and trying to use it for the next
- ### attempt at resolving.
-
- ### Does this still apply in the world of WC-NG? -hkw
*/
static svn_error_t *
-resolve_conflict_on_node(svn_wc__db_t *db,
+resolve_conflict_on_node(svn_boolean_t *did_resolve,
+ svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t resolve_text,
svn_boolean_t resolve_props,
+ svn_boolean_t resolve_tree,
svn_wc_conflict_choice_t conflict_choice,
- svn_boolean_t *did_resolve,
+ svn_cancel_func_t cancel_func_t,
+ void *cancel_baton,
apr_pool_t *pool)
{
- svn_boolean_t found_file;
const char *conflict_old = NULL;
const char *conflict_new = NULL;
const char *conflict_working = NULL;
@@ -184,6 +150,8 @@ resolve_conflict_on_node(svn_wc__db_t *d
int i;
const apr_array_header_t *conflicts;
const char *conflict_dir_abspath;
+ svn_skel_t *work_items = NULL;
+ svn_skel_t *work_item;
*did_resolve = FALSE;
@@ -281,39 +249,101 @@ resolve_conflict_on_node(svn_wc__db_t *d
}
if (auto_resolve_src)
- SVN_ERR(svn_io_copy_file(
- svn_dirent_join(conflict_dir_abspath, auto_resolve_src, pool),
- local_abspath, TRUE, pool));
+ {
+ SVN_ERR(svn_wc__wq_build_file_copy_translated(
+ &work_item, db, local_abspath,
+ svn_dirent_join(conflict_dir_abspath,
+ auto_resolve_src, pool),
+ local_abspath, pool, pool));
+ work_items = svn_wc__wq_merge(work_items, work_item, pool);
+ }
}
- /* Records whether we found any of the conflict files. */
- found_file = FALSE;
-
if (resolve_text)
{
- SVN_ERR(attempt_deletion(conflict_old, &found_file, pool));
- SVN_ERR(attempt_deletion(conflict_new, &found_file, pool));
- SVN_ERR(attempt_deletion(conflict_working, &found_file, pool));
- resolve_text = conflict_old || conflict_new || conflict_working;
+ svn_node_kind_t node_kind;
+
+ /* Legacy behavior: Only report text conflicts as resolved when at least
+ one conflict marker file exists.
+
+ If not the UI shows the conflict as already resolved
+ (and in this case we just remove the in-db conflict) */
+
+ if (conflict_old)
+ {
+ SVN_ERR(svn_io_check_path(conflict_old, &node_kind, pool));
+ if (node_kind == svn_node_file)
+ {
+ SVN_ERR(svn_wc__wq_build_file_remove(&work_item, db,
+ conflict_old,
+ pool, pool));
+ work_items = svn_wc__wq_merge(work_items, work_item, pool);
+ *did_resolve = TRUE;
+ }
+ }
+
+ if (conflict_new)
+ {
+ SVN_ERR(svn_io_check_path(conflict_new, &node_kind, pool));
+ if (node_kind == svn_node_file)
+ {
+ SVN_ERR(svn_wc__wq_build_file_remove(&work_item, db,
+ conflict_new,
+ pool, pool));
+ work_items = svn_wc__wq_merge(work_items, work_item, pool);
+ *did_resolve = TRUE;
+ }
+ }
+
+ if (conflict_working)
+ {
+ SVN_ERR(svn_io_check_path(conflict_working, &node_kind, pool));
+ if (node_kind == svn_node_file)
+ {
+ SVN_ERR(svn_wc__wq_build_file_remove(&work_item, db,
+ conflict_working,
+ pool, pool));
+ work_items = svn_wc__wq_merge(work_items, work_item, pool);
+ *did_resolve = TRUE;
+ }
+ }
}
if (resolve_props)
{
- if (prop_reject_file != NULL)
- SVN_ERR(attempt_deletion(prop_reject_file, &found_file, pool));
- else
- resolve_props = FALSE;
+ svn_node_kind_t node_kind;
+
+ /* Legacy behavior: Only report property conflicts as resolved when the
+ property reject file exists
+
+ If not the UI shows the conflict as already resolved
+ (and in this case we just remove the in-db conflict) */
+
+ if (prop_reject_file)
+ {
+ SVN_ERR(svn_io_check_path(prop_reject_file, &node_kind, pool));
+ if (node_kind == svn_node_file)
+ {
+ SVN_ERR(svn_wc__wq_build_file_remove(&work_item, db,
+ prop_reject_file,
+ pool, pool));
+ work_items = svn_wc__wq_merge(work_items, work_item, pool);
+ *did_resolve = TRUE;
+ }
+ }
}
+ if (resolve_tree)
+ *did_resolve = TRUE;
- if (resolve_text || resolve_props)
+ if (resolve_text || resolve_props || resolve_tree)
{
SVN_ERR(svn_wc__db_op_mark_resolved(db, local_abspath,
resolve_text, resolve_props,
- FALSE, pool));
+ resolve_tree, work_items, pool));
- /* No feedback if no files were deleted and all we did was change the
- entry, such a file did not appear as a conflict */
- if (found_file)
- *did_resolve = TRUE;
+ /* Run the work queue to remove conflict marker files. */
+ SVN_ERR(svn_wc__wq_run(db, local_abspath,
+ cancel_func_t, cancel_baton,
+ pool));
}
return SVN_NO_ERROR;
@@ -328,32 +358,53 @@ svn_wc__resolve_text_conflict(svn_wc__db
svn_boolean_t ignored_result;
return svn_error_trace(resolve_conflict_on_node(
+ &ignored_result,
db, local_abspath,
TRUE /* resolve_text */,
FALSE /* resolve_props */,
+ FALSE /* resolve_tree */,
svn_wc_conflict_choose_merged,
- &ignored_result,
+ NULL, NULL, /* cancel_func */
scratch_pool));
}
-/* */
+/* Baton for conflict_status_walker */
+struct conflict_status_walker_baton
+{
+ svn_wc__db_t *db;
+ svn_boolean_t resolve_text;
+ const char *resolve_prop;
+ svn_boolean_t resolve_tree;
+ svn_wc_conflict_choice_t conflict_choice;
+ svn_wc_conflict_resolver_func2_t conflict_func;
+ void *conflict_baton;
+ svn_cancel_func_t cancel_func;
+ void *cancel_baton;
+ svn_wc_notify_func2_t notify_func;
+ void *notify_baton;
+};
+
+/* Implements svn_wc_status4_t to walk all conflicts to resolve */
static svn_error_t *
-resolve_one_conflict(svn_wc__db_t *db,
- const char *local_abspath,
- svn_boolean_t resolve_text,
- const char *resolve_prop,
- svn_boolean_t resolve_tree,
- svn_wc_conflict_choice_t conflict_choice,
- svn_wc_notify_func2_t notify_func,
- void *notify_baton,
- apr_pool_t *scratch_pool)
+conflict_status_walker(void *baton,
+ const char *local_abspath,
+ const svn_wc_status3_t *status,
+ apr_pool_t *scratch_pool)
{
+ struct conflict_status_walker_baton *cswb = baton;
+ svn_wc__db_t *db = cswb->db;
+
const apr_array_header_t *conflicts;
- apr_pool_t *iterpool = svn_pool_create(scratch_pool);
+ apr_pool_t *iterpool;
int i;
svn_boolean_t resolved = FALSE;
+ if (!status->conflicted)
+ return SVN_NO_ERROR;
+
+ iterpool = svn_pool_create(scratch_pool);
+
SVN_ERR(svn_wc__db_read_conflicts(&conflicts, db, local_abspath,
scratch_pool, iterpool));
@@ -361,22 +412,42 @@ resolve_one_conflict(svn_wc__db_t *db,
{
const svn_wc_conflict_description2_t *cd;
svn_boolean_t did_resolve;
+ svn_wc_conflict_choice_t my_choice = cswb->conflict_choice;
cd = APR_ARRAY_IDX(conflicts, i, const svn_wc_conflict_description2_t *);
svn_pool_clear(iterpool);
+ if (my_choice == svn_wc_conflict_choose_unspecified)
+ {
+ svn_wc_conflict_result_t *result;
+
+ if (!cswb->conflict_func)
+ return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
+ _("No conflict-callback and no "
+ "pre-defined conflict-choice provided"));
+
+ SVN_ERR(cswb->conflict_func(&result, cd, cswb->conflict_baton,
+ iterpool, iterpool));
+
+ my_choice = result->choice;
+ }
+
+
+ if (my_choice == svn_wc_conflict_choose_postpone)
+ continue;
+
switch (cd->kind)
{
case svn_wc_conflict_kind_tree:
- if (!resolve_tree)
+ if (!cswb->resolve_tree)
break;
/* For now, we only clear tree conflict information and resolve
* to the working state. There is no way to pick theirs-full
* or mine-full, etc. Throw an error if the user expects us
* to be smarter than we really are. */
- if (conflict_choice != svn_wc_conflict_choose_merged)
+ if (my_choice != svn_wc_conflict_choose_merged)
{
return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
NULL,
@@ -387,22 +458,33 @@ resolve_one_conflict(svn_wc__db_t *db,
iterpool));
}
- SVN_ERR(svn_wc__db_op_set_tree_conflict(db, local_abspath, NULL,
- iterpool));
+ SVN_ERR(resolve_conflict_on_node(&did_resolve,
+ db,
+ local_abspath,
+ FALSE /* resolve_text */,
+ FALSE /* resolve_props */,
+ TRUE /* resolve_tree */,
+ my_choice,
+ cswb->cancel_func,
+ cswb->cancel_baton,
+ iterpool));
resolved = TRUE;
break;
case svn_wc_conflict_kind_text:
- if (!resolve_text)
+ if (!cswb->resolve_text)
break;
- SVN_ERR(resolve_conflict_on_node(db,
+ SVN_ERR(resolve_conflict_on_node(&did_resolve,
+ db,
local_abspath,
TRUE /* resolve_text */,
FALSE /* resolve_props */,
- conflict_choice,
- &did_resolve,
+ FALSE /* resolve_tree */,
+ my_choice,
+ cswb->cancel_func,
+ cswb->cancel_baton,
iterpool));
if (did_resolve)
@@ -410,25 +492,28 @@ resolve_one_conflict(svn_wc__db_t *db,
break;
case svn_wc_conflict_kind_property:
- if (!resolve_prop)
+ if (!cswb->resolve_prop)
break;
/* ### this is bogus. resolve_conflict_on_node() does not handle
### individual property resolution. */
- if (*resolve_prop != '\0' &&
- strcmp(resolve_prop, cd->property_name) != 0)
+ if (*cswb->resolve_prop != '\0' &&
+ strcmp(cswb->resolve_prop, cd->property_name) != 0)
{
break; /* Skip this property conflict */
}
/* We don't have property name handling here yet :( */
- SVN_ERR(resolve_conflict_on_node(db,
+ SVN_ERR(resolve_conflict_on_node(&did_resolve,
+ db,
local_abspath,
FALSE /* resolve_text */,
TRUE /* resolve_props */,
- conflict_choice,
- &did_resolve,
+ FALSE /* resolve_tree */,
+ my_choice,
+ cswb->cancel_func,
+ cswb->cancel_baton,
iterpool));
if (did_resolve)
@@ -442,161 +527,28 @@ resolve_one_conflict(svn_wc__db_t *db,
}
/* Notify */
- if (notify_func && resolved)
- notify_func(notify_baton,
- svn_wc_create_notify(local_abspath, svn_wc_notify_resolved,
- iterpool),
- iterpool);
+ if (cswb->notify_func && resolved)
+ cswb->notify_func(cswb->notify_baton,
+ svn_wc_create_notify(local_abspath,
+ svn_wc_notify_resolved,
+ iterpool),
+ iterpool);
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
-/* */
-static svn_error_t *
-recursive_resolve_conflict(svn_wc__db_t *db,
- const char *local_abspath,
- svn_boolean_t this_is_conflicted,
- svn_depth_t depth,
- svn_boolean_t resolve_text,
- const char *resolve_prop,
- svn_boolean_t resolve_tree,
- svn_wc_conflict_choice_t conflict_choice,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- svn_wc_notify_func2_t notify_func,
- void *notify_baton,
- apr_pool_t *scratch_pool)
-{
- apr_pool_t *iterpool = svn_pool_create(scratch_pool);
- const apr_array_header_t *children;
- apr_hash_t *visited = apr_hash_make(scratch_pool);
- svn_depth_t child_depth;
- int i;
-
- if (cancel_func)
- SVN_ERR(cancel_func(cancel_baton));
-
- if (this_is_conflicted)
- {
- SVN_ERR(resolve_one_conflict(db,
- local_abspath,
- resolve_text,
- resolve_prop,
- resolve_tree,
- conflict_choice,
- notify_func, notify_baton,
- iterpool));
- }
-
- if (depth < svn_depth_files)
- return SVN_NO_ERROR;
-
- child_depth = (depth < svn_depth_infinity) ? svn_depth_empty : depth;
-
- SVN_ERR(svn_wc__db_read_children(&children, db, local_abspath,
- scratch_pool, iterpool));
-
- for (i = 0; i < children->nelts; i++)
- {
- const char *name = APR_ARRAY_IDX(children, i, const char *);
- const char *child_abspath;
- svn_wc__db_status_t status;
- svn_kind_t kind;
- svn_boolean_t conflicted;
-
- svn_pool_clear(iterpool);
-
- if (cancel_func)
- SVN_ERR(cancel_func(cancel_baton));
-
- child_abspath = svn_dirent_join(local_abspath, name, iterpool);
-
- SVN_ERR(svn_wc__db_read_info(&status, &kind, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- &conflicted, NULL, NULL, NULL, NULL, NULL,
- NULL,
- db, child_abspath, iterpool, iterpool));
-
- if (status == svn_wc__db_status_not_present
- || status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_server_excluded)
- continue;
-
- apr_hash_set(visited, name, APR_HASH_KEY_STRING, name);
- if (kind == svn_kind_dir && depth < svn_depth_immediates)
- continue;
-
- if (kind == svn_kind_dir)
- SVN_ERR(recursive_resolve_conflict(db,
- child_abspath,
- conflicted,
- child_depth,
- resolve_text,
- resolve_prop,
- resolve_tree,
- conflict_choice,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- iterpool));
- else if (conflicted)
- SVN_ERR(resolve_one_conflict(db,
- child_abspath,
- resolve_text,
- resolve_prop,
- resolve_tree,
- conflict_choice,
- notify_func, notify_baton,
- iterpool));
- }
-
- SVN_ERR(svn_wc__db_read_conflict_victims(&children, db, local_abspath,
- scratch_pool, iterpool));
-
- for (i = 0; i < children->nelts; i++)
- {
- const char *name = APR_ARRAY_IDX(children, i, const char *);
- const char *child_abspath;
-
- svn_pool_clear(iterpool);
-
- if (apr_hash_get(visited, name, APR_HASH_KEY_STRING) != NULL)
- continue; /* Already visited */
-
- if (cancel_func)
- SVN_ERR(cancel_func(cancel_baton));
-
- child_abspath = svn_dirent_join(local_abspath, name, iterpool);
-
- /* We only have to resolve one level of tree conflicts. All other
- conflicts are resolved in the other loop */
- SVN_ERR(resolve_one_conflict(db,
- child_abspath,
- FALSE /*resolve_text*/,
- FALSE /*resolve_prop*/,
- resolve_tree,
- conflict_choice,
- notify_func, notify_baton,
- iterpool));
- }
-
-
- svn_pool_destroy(iterpool);
-
- return SVN_NO_ERROR;
-}
-
-
svn_error_t *
-svn_wc_resolved_conflict5(svn_wc_context_t *wc_ctx,
+svn_wc__resolve_conflicts(svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_depth_t depth,
svn_boolean_t resolve_text,
const char *resolve_prop,
svn_boolean_t resolve_tree,
svn_wc_conflict_choice_t conflict_choice,
+ svn_wc_conflict_resolver_func2_t conflict_func,
+ void *conflict_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
@@ -605,6 +557,8 @@ svn_wc_resolved_conflict5(svn_wc_context
{
svn_kind_t kind;
svn_boolean_t conflicted;
+ struct conflict_status_walker_baton cswb;
+
/* ### the underlying code does NOT support resolving individual
### properties. bail out if the caller tries it. */
if (resolve_prop != NULL && *resolve_prop != '\0')
@@ -612,6 +566,8 @@ svn_wc_resolved_conflict5(svn_wc_context
U_("Resolving a single property is not (yet) "
"supported."));
+ /* ### Just a versioned check? */
+ /* Conflicted is set to allow invoking on actual only nodes */
SVN_ERR(svn_wc__db_read_info(NULL, &kind, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, &conflicted,
@@ -626,16 +582,55 @@ svn_wc_resolved_conflict5(svn_wc_context
else if (depth == svn_depth_unknown)
depth = svn_depth_infinity;
- return svn_error_trace(recursive_resolve_conflict(
- wc_ctx->db,
- local_abspath,
- conflicted,
- depth,
- resolve_text,
- resolve_prop,
- resolve_tree,
- conflict_choice,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
+ cswb.db = wc_ctx->db;
+ cswb.resolve_text = resolve_text;
+ cswb.resolve_prop = resolve_prop;
+ cswb.resolve_tree = resolve_tree;
+ cswb.conflict_choice = conflict_choice;
+
+ cswb.conflict_func = conflict_func;
+ cswb.conflict_baton = conflict_baton;
+
+ cswb.cancel_func = cancel_func;
+ cswb.cancel_baton = cancel_baton;
+
+ cswb.notify_func = notify_func;
+ cswb.notify_baton = notify_baton;
+
+ SVN_ERR(svn_wc_walk_status(wc_ctx,
+ local_abspath,
+ depth,
+ FALSE /* get_all */,
+ FALSE /* no_ignore */,
+ TRUE /* ignore_text_mods */,
+ NULL /* ignore_patterns */,
+ conflict_status_walker, &cswb,
+ cancel_func, cancel_baton,
+ scratch_pool));
+
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_wc_resolved_conflict5(svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ svn_depth_t depth,
+ svn_boolean_t resolve_text,
+ const char *resolve_prop,
+ svn_boolean_t resolve_tree,
+ svn_wc_conflict_choice_t conflict_choice,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ svn_wc_notify_func2_t notify_func,
+ void *notify_baton,
+ apr_pool_t *scratch_pool)
+{
+ return svn_error_trace(svn_wc__resolve_conflicts(wc_ctx, local_abspath,
+ depth, resolve_text,
+ resolve_prop, resolve_tree,
+ conflict_choice,
+ NULL, NULL,
+ cancel_func, cancel_baton,
+ notify_func, notify_baton,
+ scratch_pool));
}
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/deprecated.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/deprecated.c Wed May 16 20:32:43 2012
@@ -36,6 +36,7 @@
#include "svn_dirent_uri.h"
#include "svn_path.h"
+#include "private/svn_subr_private.h"
#include "private/svn_wc_private.h"
#include "wc.h"
@@ -688,9 +689,8 @@ svn_wc_queue_committed(svn_wc_committed_
const svn_checksum_t *md5_checksum;
if (digest)
- md5_checksum = svn_checksum__from_digest(
- digest, svn_checksum_md5,
- svn_wc__get_committed_queue_pool(*queue));
+ md5_checksum = svn_checksum__from_digest_md5(
+ digest, svn_wc__get_committed_queue_pool(*queue));
else
md5_checksum = NULL;
@@ -748,7 +748,7 @@ svn_wc_process_committed4(const char *pa
new_date = 0;
if (digest)
- md5_checksum = svn_checksum__from_digest(digest, svn_checksum_md5, pool);
+ md5_checksum = svn_checksum__from_digest_md5(digest, pool);
else
md5_checksum = NULL;
@@ -4185,6 +4185,49 @@ svn_wc_copy(const char *src_path,
/*** From merge.c ***/
svn_error_t *
+svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome,
+ svn_wc_context_t *wc_ctx,
+ const char *left_abspath,
+ const char *right_abspath,
+ const char *target_abspath,
+ const char *left_label,
+ const char *right_label,
+ const char *target_label,
+ const svn_wc_conflict_version_t *left_version,
+ const svn_wc_conflict_version_t *right_version,
+ svn_boolean_t dry_run,
+ const char *diff3_cmd,
+ const apr_array_header_t *merge_options,
+ const apr_array_header_t *prop_diff,
+ svn_wc_conflict_resolver_func2_t conflict_func,
+ void *conflict_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool)
+{
+ return svn_error_trace(
+ svn_wc_merge5(merge_outcome,
+ NULL /* merge_props_outcome */,
+ wc_ctx,
+ left_abspath,
+ right_abspath,
+ target_abspath,
+ left_label,
+ right_label,
+ target_label,
+ left_version,
+ right_version,
+ dry_run,
+ diff3_cmd,
+ merge_options,
+ NULL /* original_props */,
+ prop_diff,
+ conflict_func, conflict_baton,
+ cancel_func, cancel_baton,
+ scratch_pool));
+}
+
+svn_error_t *
svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome,
const char *left,
const char *right,
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/diff_editor.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/diff_editor.c Wed May 16 20:32:43 2012
@@ -61,6 +61,7 @@
#include "svn_path.h"
#include "svn_hash.h"
+#include "private/svn_subr_private.h"
#include "private/svn_wc_private.h"
#include "wc.h"
@@ -1494,9 +1495,8 @@ window_handler(svn_txdelta_window_t *win
if (!window)
{
- fb->result_checksum = svn_checksum__from_digest(whb->result_digest,
- svn_checksum_md5,
- fb->pool);
+ fb->result_checksum = svn_checksum__from_digest_md5(whb->result_digest,
+ fb->pool);
}
return SVN_NO_ERROR;
@@ -1946,7 +1946,8 @@ svn_wc__get_diff_editor(const svn_delta_
SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
- shim_callbacks, result_pool, scratch_pool));
+ NULL, NULL, shim_callbacks,
+ result_pool, scratch_pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/entries.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/entries.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/entries.c Wed May 16 20:32:43 2012
@@ -55,7 +55,7 @@
typedef struct db_node_t {
apr_int64_t wc_id;
const char *local_relpath;
- apr_int64_t op_depth;
+ int op_depth;
apr_int64_t repos_id;
const char *repos_relpath;
const char *parent_relpath;
@@ -236,15 +236,6 @@ get_info_for_deleted(svn_wc_entry_t *ent
entry_abspath,
result_pool,
scratch_pool));
-
- if (*repos_relpath == NULL)
- SVN_ERR(svn_wc__db_scan_base_repos(repos_relpath,
- &entry->repos,
- &entry->uuid,
- db,
- entry_abspath,
- result_pool,
- scratch_pool));
}
else
{
@@ -1435,7 +1426,7 @@ insert_node(svn_sqlite__db_t *sdb,
SVN_ERR_ASSERT(node->op_depth > 0 || node->repos_relpath);
SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_INSERT_NODE));
- SVN_ERR(svn_sqlite__bindf(stmt, "isisnnnnsnrisnnni",
+ SVN_ERR(svn_sqlite__bindf(stmt, "isdsnnnnsnrisnnni",
node->wc_id,
node->local_relpath,
node->op_depth,
@@ -1453,7 +1444,7 @@ insert_node(svn_sqlite__db_t *sdb,
node->repos_id));
SVN_ERR(svn_sqlite__bind_text(stmt, 6,
node->repos_relpath));
- SVN_ERR(svn_sqlite__bind_int64(stmt, 7, node->revision));
+ SVN_ERR(svn_sqlite__bind_revnum(stmt, 7, node->revision));
}
if (node->presence == svn_wc__db_status_normal)
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/info.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/info.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/info.c Wed May 16 20:32:43 2012
@@ -41,8 +41,7 @@ svn_wc_info_dup(const svn_wc_info_t *inf
if (info->changelist)
new_info->changelist = apr_pstrdup(pool, info->changelist);
- if (info->checksum)
- new_info->checksum = svn_checksum_dup(info->checksum, pool);
+ new_info->checksum = svn_checksum_dup(info->checksum, pool);
if (info->conflicts)
{
int i;
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/merge.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/merge.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/merge.c Wed May 16 20:32:43 2012
@@ -1476,7 +1476,8 @@ svn_wc__internal_merge(svn_skel_t **work
svn_error_t *
-svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome,
+svn_wc_merge5(enum svn_wc_merge_outcome_t *merge_content_outcome,
+ enum svn_wc_notify_state_t *merge_props_outcome,
svn_wc_context_t *wc_ctx,
const char *left_abspath,
const char *right_abspath,
@@ -1489,6 +1490,7 @@ svn_wc_merge4(enum svn_wc_merge_outcome_
svn_boolean_t dry_run,
const char *diff3_cmd,
const apr_array_header_t *merge_options,
+ apr_hash_t *original_props,
const apr_array_header_t *prop_diff,
svn_wc_conflict_resolver_func2_t conflict_func,
void *conflict_baton,
@@ -1497,8 +1499,11 @@ svn_wc_merge4(enum svn_wc_merge_outcome_
apr_pool_t *scratch_pool)
{
const char *dir_abspath = svn_dirent_dirname(target_abspath, scratch_pool);
+ svn_skel_t *prop_items = NULL;
svn_skel_t *work_items;
- apr_hash_t *actual_props;
+ apr_hash_t *pristine_props = NULL;
+ apr_hash_t *actual_props = NULL;
+ apr_hash_t *new_actual_props = NULL;
SVN_ERR_ASSERT(svn_dirent_is_absolute(left_abspath));
SVN_ERR_ASSERT(svn_dirent_is_absolute(right_abspath));
@@ -1508,37 +1513,86 @@ svn_wc_merge4(enum svn_wc_merge_outcome_
if (!dry_run)
SVN_ERR(svn_wc__write_check(wc_ctx->db, dir_abspath, scratch_pool));
- /* Sanity check: the merge target must be under revision control,
- * unless the merge target is a copyfrom text, which lives in a
- * temporary file and does not exist in ACTUAL yet. */
+ /* Sanity check: the merge target must be a file under revision control */
{
+ svn_wc__db_status_t status;
svn_kind_t kind;
- svn_boolean_t hidden;
- SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, target_abspath, TRUE,
- scratch_pool));
+ svn_boolean_t had_props;
+ svn_boolean_t props_mod;
- if (kind == svn_kind_unknown)
+ SVN_ERR(svn_wc__db_read_info(&status, &kind, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, &had_props, &props_mod, NULL, NULL,
+ NULL,
+ wc_ctx->db, target_abspath,
+ scratch_pool, scratch_pool));
+
+ if (kind != svn_kind_file || (status != svn_wc__db_status_normal
+ && status != svn_wc__db_status_added))
{
- *merge_outcome = svn_wc_merge_no_merge;
+ *merge_content_outcome = svn_wc_merge_no_merge;
+ if (merge_props_outcome)
+ *merge_props_outcome = svn_wc_merge_no_merge;
return SVN_NO_ERROR;
}
- SVN_ERR(svn_wc__db_node_hidden(&hidden, wc_ctx->db, target_abspath,
- scratch_pool));
+ if (merge_props_outcome && had_props)
+ {
+ SVN_ERR(svn_wc__db_read_pristine_props(&pristine_props,
+ wc_ctx->db, target_abspath,
+ scratch_pool, scratch_pool));
+ }
+ else if (merge_props_outcome)
+ pristine_props = apr_hash_make(scratch_pool);
- if (hidden)
+ if (props_mod)
{
- *merge_outcome = svn_wc_merge_no_merge;
- return SVN_NO_ERROR;
+ SVN_ERR(svn_wc__db_read_props(&actual_props,
+ wc_ctx->db, target_abspath,
+ scratch_pool, scratch_pool));
}
+ else if (pristine_props)
+ actual_props = apr_hash_copy(scratch_pool, pristine_props);
+ else
+ actual_props = apr_hash_make(scratch_pool);
}
- SVN_ERR(svn_wc__db_read_props(&actual_props, wc_ctx->db, target_abspath,
- scratch_pool, scratch_pool));
+ if (merge_props_outcome)
+ {
+ int i;
+ apr_hash_t *new_pristine_props;
+ /* The PROPCHANGES may not have non-"normal" properties in it. If entry
+ or wc props were allowed, then the following code would install them
+ into the BASE and/or WORKING properties(!). */
+ for (i = prop_diff->nelts; i--; )
+ {
+ const svn_prop_t *change = &APR_ARRAY_IDX(prop_diff, i, svn_prop_t);
+
+ if (!svn_wc_is_normal_prop(change->name))
+ return svn_error_createf(SVN_ERR_BAD_PROP_KIND, NULL,
+ _("The property '%s' may not be merged "
+ "into '%s'."),
+ change->name,
+ svn_dirent_local_style(target_abspath,
+ scratch_pool));
+ }
+
+ SVN_ERR(svn_wc__merge_props(&prop_items, merge_props_outcome,
+ &new_pristine_props, &new_actual_props,
+ wc_ctx->db, target_abspath, svn_kind_file,
+ left_version, right_version,
+ original_props, pristine_props, actual_props,
+ prop_diff, FALSE /* base_merge */,
+ dry_run,
+ conflict_func, conflict_baton,
+ cancel_func, cancel_baton,
+ scratch_pool, scratch_pool));
+ }
/* Queue all the work. */
SVN_ERR(svn_wc__internal_merge(&work_items,
- merge_outcome,
+ merge_content_outcome,
wc_ctx->db,
left_abspath, left_version,
right_abspath, right_version,
@@ -1554,16 +1608,24 @@ svn_wc_merge4(enum svn_wc_merge_outcome_
cancel_func, cancel_baton,
scratch_pool, scratch_pool));
+ work_items = svn_wc__wq_merge(prop_items, work_items, scratch_pool);
+
/* If this isn't a dry run, then run the work! */
if (!dry_run)
{
- SVN_ERR(svn_wc__db_wq_add(wc_ctx->db, target_abspath, work_items,
- scratch_pool));
+ if (new_actual_props)
+ SVN_ERR(svn_wc__db_op_set_props(wc_ctx->db, target_abspath,
+ new_actual_props,
+ svn_wc__has_magic_property(prop_diff),
+ NULL, work_items, scratch_pool));
+ else
+ SVN_ERR(svn_wc__db_wq_add(wc_ctx->db, target_abspath, work_items,
+ scratch_pool));
SVN_ERR(svn_wc__wq_run(wc_ctx->db, target_abspath,
cancel_func, cancel_baton,
scratch_pool));
}
-
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/fix-rdump-editor/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/subversion/libsvn_wc/node.c?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/subversion/libsvn_wc/node.c (original)
+++ subversion/branches/fix-rdump-editor/subversion/libsvn_wc/node.c Wed May 16 20:32:43 2012
@@ -876,48 +876,47 @@ svn_wc__node_has_working(svn_boolean_t *
}
-static svn_error_t *
-get_base_rev(svn_revnum_t *base_revision,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
+svn_error_t *
+svn_wc__node_get_base(svn_revnum_t *revision,
+ const char **repos_relpath,
+ const char **repos_root_url,
+ const char **repos_uuid,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
- svn_boolean_t have_base;
svn_error_t *err;
- err = svn_wc__db_base_get_info(NULL, NULL, base_revision, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
- db, local_abspath,
- scratch_pool, scratch_pool);
-
- if (!err || err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND)
- return svn_error_trace(err);
-
- svn_error_clear(err);
-
- SVN_ERR(svn_wc__db_read_info(NULL, NULL, base_revision,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, &have_base, NULL,
- NULL, NULL, NULL, NULL, NULL,
- db, local_abspath,
- scratch_pool, scratch_pool));
+ err = svn_wc__db_base_get_info(NULL, NULL, revision, repos_relpath,
+ repos_root_url, repos_uuid, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL,
+ wc_ctx->db, local_abspath,
+ result_pool, scratch_pool);
+ if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
+ {
+ svn_error_clear(err);
+ if (revision)
+ *revision = SVN_INVALID_REVNUM;
+ if (repos_relpath)
+ *repos_relpath = NULL;
+ if (repos_root_url)
+ *repos_root_url = NULL;
+ if (repos_uuid)
+ *repos_uuid = NULL;
+ return SVN_NO_ERROR;
+ }
+ SVN_ERR(err);
+ SVN_ERR_ASSERT(!revision || SVN_IS_VALID_REVNUM(*revision));
+ SVN_ERR_ASSERT(!repos_relpath || *repos_relpath);
+ SVN_ERR_ASSERT(!repos_root_url || *repos_root_url);
+ SVN_ERR_ASSERT(!repos_uuid || *repos_uuid);
return SVN_NO_ERROR;
}
svn_error_t *
-svn_wc__node_get_base_rev(svn_revnum_t *base_revision,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- return svn_error_trace(get_base_rev(base_revision, wc_ctx->db,
- local_abspath, scratch_pool));
-}
-
-svn_error_t *
svn_wc__node_get_pre_ng_status_data(svn_revnum_t *revision,
svn_revnum_t *changed_rev,
apr_time_t *changed_date,
@@ -967,36 +966,54 @@ svn_wc__node_get_pre_ng_status_data(svn_
svn_error_t *
-svn_wc__internal_get_commit_base_rev(svn_revnum_t *commit_base_revision,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
+svn_wc__internal_get_commit_base(svn_revnum_t *commit_base_revision,
+ const char **repos_relpath,
+ const char **repos_root_url,
+ const char **repos_uuid,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
svn_boolean_t have_base;
svn_boolean_t have_more_work;
svn_revnum_t revision;
- svn_revnum_t original_revision;
+ svn_revnum_t orig_revision;
+ const char *orig_repos_relpath;
+ const char *orig_repos_root_url;
+ const char *orig_repos_uuid;
*commit_base_revision = SVN_INVALID_REVNUM;
- SVN_ERR(svn_wc__db_read_info(&status, NULL, &revision, NULL, NULL, NULL,
+ SVN_ERR(svn_wc__db_read_info(&status, NULL,
+ &revision, repos_relpath,
+ repos_root_url, repos_uuid,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &orig_repos_relpath, &orig_repos_root_url,
+ &orig_repos_uuid, &orig_revision,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, &original_revision, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
&have_base, &have_more_work, NULL,
db, local_abspath, scratch_pool, scratch_pool));
if (SVN_IS_VALID_REVNUM(revision))
{
/* We are looking directly at BASE */
- *commit_base_revision = revision;
+ if (commit_base_revision)
+ *commit_base_revision = revision;
return SVN_NO_ERROR;
}
- else if (SVN_IS_VALID_REVNUM(original_revision))
+ else if (SVN_IS_VALID_REVNUM(orig_revision))
{
/* We are looking at a copied node */
- *commit_base_revision = original_revision;
+ if (commit_base_revision)
+ *commit_base_revision = orig_revision;
+ if (repos_relpath)
+ *repos_relpath = orig_repos_relpath;
+ if (repos_root_url)
+ *repos_root_url = orig_repos_root_url;
+ if (repos_uuid)
+ *repos_uuid = orig_repos_uuid;
return SVN_NO_ERROR;
}
@@ -1004,8 +1021,9 @@ svn_wc__internal_get_commit_base_rev(svn
{
/* If the node was copied/moved-here, return the copy/move source
revision (not this node's base revision). */
- SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, commit_base_revision,
+ SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, NULL, NULL, NULL,
+ repos_relpath, repos_root_url,
+ repos_uuid, commit_base_revision,
NULL, NULL, db, local_abspath,
scratch_pool, scratch_pool));
@@ -1026,10 +1044,10 @@ svn_wc__internal_get_commit_base_rev(svn
{
/* This is a deletion within a copied subtree. Get the copied-from
* revision. */
- SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL,
- commit_base_revision, NULL, NULL,
- db,
+ SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, NULL, NULL, NULL,
+ repos_relpath, repos_root_url,
+ repos_uuid, commit_base_revision,
+ NULL, NULL, db,
svn_dirent_dirname(work_del_abspath,
scratch_pool),
scratch_pool, scratch_pool));
@@ -1045,7 +1063,8 @@ svn_wc__internal_get_commit_base_rev(svn
if (have_base && !have_more_work)
{
SVN_ERR(svn_wc__db_base_get_info(&status, NULL, commit_base_revision,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ repos_relpath, repos_root_url,
+ repos_uuid, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
@@ -1058,14 +1077,19 @@ svn_wc__internal_get_commit_base_rev(svn
}
svn_error_t *
-svn_wc__node_get_commit_base_rev(svn_revnum_t *commit_base_revision,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- return svn_error_trace(svn_wc__internal_get_commit_base_rev(
- commit_base_revision, wc_ctx->db, local_abspath,
- scratch_pool));
+svn_wc__node_get_commit_base(svn_revnum_t *revision,
+ const char **repos_relpath,
+ const char **repos_root_url,
+ const char **repos_uuid,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ return svn_error_trace(svn_wc__internal_get_commit_base(
+ revision, repos_relpath, repos_root_url, repos_uuid,
+ wc_ctx->db, local_abspath,
+ result_pool, scratch_pool));
}
svn_error_t *
@@ -1482,68 +1506,40 @@ svn_wc__node_get_origin(svn_boolean_t *i
}
svn_error_t *
-svn_wc__node_get_commit_status(svn_node_kind_t *kind,
- svn_boolean_t *added,
+svn_wc__node_get_commit_status(svn_boolean_t *added,
svn_boolean_t *deleted,
svn_boolean_t *is_replace_root,
- svn_boolean_t *not_present,
- svn_boolean_t *excluded,
svn_boolean_t *is_op_root,
- svn_boolean_t *symlink,
svn_revnum_t *revision,
- const char **repos_relpath,
svn_revnum_t *original_revision,
const char **original_repos_relpath,
- svn_boolean_t *conflicted,
- const char **changelist,
- svn_boolean_t *props_mod,
svn_boolean_t *update_root,
- const char **lock_token,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_kind_t db_kind;
- svn_wc__db_lock_t *lock;
svn_boolean_t had_props;
- svn_boolean_t props_mod_tmp;
svn_boolean_t have_base;
svn_boolean_t have_more_work;
svn_boolean_t op_root;
- if (!props_mod)
- props_mod = &props_mod_tmp;
-
/* ### All of this should be handled inside a single read transaction */
- SVN_ERR(svn_wc__db_read_info(&status, &db_kind, revision, repos_relpath,
+ SVN_ERR(svn_wc__db_read_info(&status, NULL, revision, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
original_repos_relpath, NULL, NULL,
- original_revision, &lock, NULL, NULL,
- changelist, conflicted,
- &op_root, &had_props, props_mod,
+ original_revision, NULL, NULL, NULL,
+ NULL, NULL,
+ &op_root, NULL, NULL,
&have_base, &have_more_work, NULL,
wc_ctx->db, local_abspath,
result_pool, scratch_pool));
- if (kind)
- {
- if (db_kind == svn_kind_file)
- *kind = svn_node_file;
- else if (db_kind == svn_kind_dir)
- *kind = svn_node_dir;
- else
- *kind = svn_node_unknown;
- }
if (added)
*added = (status == svn_wc__db_status_added);
if (deleted)
*deleted = (status == svn_wc__db_status_deleted);
- if (not_present)
- *not_present = (status == svn_wc__db_status_not_present);
- if (excluded)
- *excluded = (status == svn_wc__db_status_excluded);
if (is_op_root)
*is_op_root = op_root;
@@ -1559,23 +1555,6 @@ svn_wc__node_get_commit_status(svn_node_
*is_replace_root = FALSE;
}
- if (symlink)
- {
- apr_hash_t *props;
- *symlink = FALSE;
-
- if (db_kind == svn_kind_file
- && (had_props || *props_mod))
- {
- SVN_ERR(svn_wc__db_read_props(&props, wc_ctx->db, local_abspath,
- scratch_pool, scratch_pool));
-
- *symlink = ((props != NULL)
- && (apr_hash_get(props, SVN_PROP_SPECIAL,
- APR_HASH_KEY_STRING) != NULL));
- }
- }
-
/* Retrieve some information from BASE which is needed for replacing
and/or deleting BASE nodes. (We don't need lock here) */
if (have_base
@@ -1591,9 +1570,6 @@ svn_wc__node_get_commit_status(svn_node_
else if (update_root)
*update_root = FALSE;
- if (lock_token)
- *lock_token = lock ? lock->token : NULL;
-
return SVN_NO_ERROR;
}