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 2011/04/26 02:55:56 UTC
svn commit: r1096641 - /subversion/trunk/subversion/libsvn_wc/workqueue.c
Author: hwright
Date: Tue Apr 26 00:55:55 2011
New Revision: 1096641
URL: http://svn.apache.org/viewvc?rev=1096641&view=rev
Log:
Followup to r1096619: Don't break the workqueue item.
* subversion/libsvn_wc/workqueue.c
(run_file_commit): Put a couple of placeholder values in the work queue item
to keep the parser happy.
(svn_wc__wq_build_file_commit): Parse the above values.
Modified:
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1096641&r1=1096640&r2=1096641&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Apr 26 00:55:55 2011
@@ -525,11 +525,16 @@ run_file_commit(svn_wc__db_t *db,
const svn_skel_t *arg1 = work_item->children->next;
const char *local_relpath;
const char *local_abspath;
+ apr_int64_t v;
local_relpath = apr_pstrmemdup(scratch_pool, arg1->data, arg1->len);
SVN_ERR(svn_wc__db_from_relpath(&local_abspath, db, wri_abspath,
local_relpath, scratch_pool, scratch_pool));
+ /* We currently ignore the following two values, just kept in for compat. */
+ SVN_ERR(svn_skel__parse_int(&v, arg1->next, scratch_pool));
+ SVN_ERR(svn_skel__parse_int(&v, arg1->next, scratch_pool));
+
return svn_error_return(
process_commit_file_install(db, local_abspath,
cancel_func, cancel_baton,
@@ -550,6 +555,10 @@ svn_wc__wq_build_file_commit(svn_skel_t
SVN_ERR(svn_wc__db_to_relpath(&local_relpath, db, local_abspath,
local_abspath, result_pool, scratch_pool));
+ /* This are currently ignored, they are here for compat. */
+ svn_skel__prepend_int(FALSE, *work_item, result_pool);
+ svn_skel__prepend_int(FALSE, *work_item, result_pool);
+
svn_skel__prepend_str(local_relpath, *work_item, result_pool);
svn_skel__prepend_str(OP_FILE_COMMIT, *work_item, result_pool);
Re: svn commit: r1096641 - /subversion/trunk/subversion/libsvn_wc/workqueue.c
Posted by Greg Stein <gs...@gmail.com>.
On Mon, Apr 25, 2011 at 20:55, <hw...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Apr 26 00:55:55 2011
> @@ -525,11 +525,16 @@ run_file_commit(svn_wc__db_t *db,
> const svn_skel_t *arg1 = work_item->children->next;
> const char *local_relpath;
> const char *local_abspath;
> + apr_int64_t v;
>
> local_relpath = apr_pstrmemdup(scratch_pool, arg1->data, arg1->len);
> SVN_ERR(svn_wc__db_from_relpath(&local_abspath, db, wri_abspath,
> local_relpath, scratch_pool, scratch_pool));
>
> + /* We currently ignore the following two values, just kept in for compat. */
> + SVN_ERR(svn_skel__parse_int(&v, arg1->next, scratch_pool));
> + SVN_ERR(svn_skel__parse_int(&v, arg1->next, scratch_pool));
There's no reason to parse these things. Just some unused things
hanging off the skel... no biggy.
(and if you *were* to parse them, then the second would be arg1->next->next)
>...
> @@ -550,6 +555,10 @@ svn_wc__wq_build_file_commit(svn_skel_t
> SVN_ERR(svn_wc__db_to_relpath(&local_relpath, db, local_abspath,
> local_abspath, result_pool, scratch_pool));
>
> + /* This are currently ignored, they are here for compat. */
> + svn_skel__prepend_int(FALSE, *work_item, result_pool);
> + svn_skel__prepend_int(FALSE, *work_item, result_pool);
If old code is parsing this... are the FALSE values the right values
to fill in here?
(super crazy rare case... I'm not too fussed for what the values
"should" be; this is a total edge case; just asking the Q)
Cheers,
-g