logo       

svn commit: propchange - r13134 - svn:log: msg#00325

version-control.subversion.svn

Subject: svn commit: propchange - r13134 - svn:log

Author: lundblad
Revision: 13134
Property Name: svn:log

New Property Value:
Locking branch: Change RA reporter to accept lock tokens. Update RA functions
and the WC crawling to handle this. Pass lock tokens through in ra_local
and ra_svn (not in svnserve yet). ra_dav and mod_dav are to be done.

* subversion/include/svn_ra.h (svn_ra_reporter2_t): New typedef. Add
lock_token argument to link_path and set_path functions.
(svn_ra_reporter_t): Deprecate.
(svn_ra_do_update, svn_ra_do_switch, svn_ra_do_status, svn_ra_do_diff):
Take new reporter instead of old.
* subversion/libsvn_ra/wrapper_template.h (compat_report_baton): New struct.
(compat_set_path, compat_delete_path, compat_link_path, compat_finish_report,
compat_abort_report, compat_wrap_reporter): New functions.
(compat_reporter): New static variable.
(compat_do_update, compat_do_status, compat_do_switch, compat_do_diff):
Adapt to the new vtable API and wrap the reporter.
* subversion/libsvn_ra/ra_loader.c (svn_ra_do_update, svn_ra_do_switch,
svn_ra_do_status, svn_ra_do_diff): Replace svn_ra_reporter_t with new
reporter.
* subversion/libsvn_ra/ra_loader.h (svn_ra_vtable_t): Replace old reporter
with new in functions taking a reporter.

* subversion/include/svn_wc.h (svn_wc_crawl_revisions2): New function, taking
an svn_ra_reporter2_t instead of the old reporter. Doc fix.
(svn_wc_crawl_revisions): Deprecate.
* subversion/libsvn_wc/adm_crawler.c (report_revisions): Take new reporter
Report lock tokens.
(svn_wc_crawl_revisions2): New, from svn_wc_crawl_revisions. Report
lock tokens (or the absence thereof).
(wrap_report_baton): New struct.
(wrap_set_path, wrap_delete_path, wrap_link_path, wrap_finish_report,
wrap_abort_report): New functions.
(wrap_reporter): New static variable.
(svn_wc_crawl_revisions): Wrap new function above.

* subversion/libsvn_ra_local/ra_plugin.c (reporter_set_path,
reporter_link_path): Take new lock token argument and call new repository
function.
(ra_local_reporter): Change type to svn_ra_reporter2_t.
(make_reporter, svn_ra_local__do_update, svn_ra_local__do_switch,
svn_ra_local__do_status, svn_ra_local__do_diff): Change argument type of
reporter to svn_ra_reporter2_t.

* subversion/libsvn_ra_svn/client.c (ra_svn_set_path, ra_svn_link_path):
Take lock_token argument and pass to the server.
(ra_svn_reporter): Change type to new reporter.
(ra_svn_get_reporter, ra_svn_update, ra_svn_switch, ra_svn_status,
ra_svn_diff): Take new reporter argument.
* subversion/libsvn_ra_svn/protocol (set-path and link-path commands): Add
lock-token parameter.

* subversion/libsvn_ra_dav/ra_dav.h (svn_ra_dav__do_update,
svn_ra_dav__do_switch, svn_ra_dav__do_status, svn_ra_dav__do_diff):
Change type of reporter argument.
* subversion/libsvn_ra_dav/fetch.c (reporter_set_path, reporter_link_path):
Take lock_token argument, leave TODO for sussman:-)
(ra_dav_reporter): Change type to svn_ra_reporter2_t.
(make_reporter, svn_ra_dav__do_update, svn_ra_dav__do_switch,
svn_ra_dav__do_status, svn_ra_dav__do_diff): Change argument type to
new reporter.

* subversion/libsvn_client/switch.c (svn_client_switch),
* subversion/libsvn_client/export.c (svn_client_export3),
* subversion/libsvn_client/status.c (svn_client_status2),
* subversion/libsvn_client/diff.c (do_merge, diff_repos_repos, diff_repos_wc),
* subversion/libsvn_client/update.c (svn_client__update_internal):
Use new APIs.


<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | FAQ | advertise