Checkout
rhuijben
committed
on 04 Feb 15
As we are revving svn_client_revert() for 1.9 anyway, now is the time to
give it a 'metadata_only' flag, like we have on copy and move.

Thi… Show more
As we are revving svn_client_revert() for 1.9 anyway, now is the time to

give it a 'metadata_only' flag, like we have on copy and move.

This helps gui clients that should record changes after they occured, who

don't want to revert local changes just to re-apply them using the Subversion

function. (And thereby avoiding file lock challenges on Windows)

Note that some of the refactoring in this patch is preparation for a

followup performance patch for reverting huge trees (like entire WC).

* subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp

 (Java_org_apache_subversion_javahl_SVNClient_revert): Add another boolean.

* subversion/bindings/javahl/native/SVNClient.cpp

 (SVNClient::revert): Forward metadata_only.

* subversion/bindings/javahl/native/SVNClient.h

 (SVNClient::revert): Add metadata_only boolean.

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java

 (revert): Add and document argument.

* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java

 (revert): Add argument (3*)

* subversion/include/svn_client.h

 (svn_client_revert3): Add and document argument.

 (svn_client_revert2): Document behavior of new argument.

* subversion/include/svn_wc.h

 (svn_wc_revert5): Add and document argument.

 (svn_wc_revert4): Document behavior of new argument.

* subversion/libsvn_client/deprecated.c

 (svn_client_revert2): Update caller.

* subversion/libsvn_client/revert.c

 (revert_with_write_lock_baton): Add flag.

 (revert): Update caller. Pass error to notify.

 (svn_client_revert3): Add argument. Properly use iterpool.

   Update caller.

* subversion/libsvn_wc/deprecated.c

 (svn_wc_revert4): Update caller.

* subversion/libsvn_wc/revert.c

 (revert_wc_data): Add prototype.

 (revert_restore): Add argument. Extract the non metadata work

   code to revert_wc_data.

 (revert_wc_data): New function. Placed below revert_restore to

   minimize changes to this file in this patch.

* subversion/svn/revert-cmd.c

 (svn_cl__revert): Update caller.

* subversion/tests/libsvn_wc/utils.c

 (sbox_wc_revert): Update caller.

Show less