Checkout
rhuijben
committed
on 22 May 12
Fix a hidden bug in the merge handling and a slow wc.db query.

* subversion/include/private/svn_wc_private.h
(svn_wc__get_server_excluded… Show more
Fix a hidden bug in the merge handling and a slow wc.db query.

* subversion/include/private/svn_wc_private.h

 (svn_wc__get_server_excluded_subtrees): Rename to ...

 (svn_wc__get_excluded_subtrees): ... this.  Update documentaton.

* subversion/libsvn_client/merge.c

 (get_mergeinfo_paths): Update caller, that really just needs a list

   of paths that are not there.

* subversion/libsvn_wc/node.c

 (svn_wc__get_server_excluded_subtrees): Rename to ...

 (svn_wc__get_excluded_subtrees): ... this. Update caller.

* subversion/libsvn_wc/wc-queries.sql

 (STMT_SELECT_ALL_EXCLUDED_NODES): Remove selection of node itself and wcroot.

   Also select excluded nodes.

 (STMT_SELECT_ALL_EXCLUDED_WCROOT): New statement, like

   STMT_SELECT_ALL_EXCLUDED_NODES, but specialized to use on the wcroot.

* subversion/libsvn_wc/wc_db.c

 (svn_wc__db_get_server_excluded_subtrees): Rename to ...

 (svn_wc__db_get_excluded_subtrees): ... this. Use separate new queries.

   Don't ask for copying in the scratch pool if we are copying it to

   result_pool within its original lifetime

* subversion/libsvn_wc/wc_db.h

 (svn_wc__db_get_server_excluded_subtrees): Rename to ...

 (svn_wc__db_get_excluded_subtrees): ... this. Update documentaton.

* subversion/tests/libsvn_wc/wc-queries-test.c

 (slow_statements): Add STMT_SELECT_ALL_EXCLUDED_WCROOT to the operationg

   on the entire wc list. Remove STMT_SELECT_ALL_SERVER_EXCLUDED_NODES as

   it properly uses an index instead of a table scan now.

Show less