Project: Subversion

Revision: 32952

Author: blair

Date: 06 Sep 2008 21:04:59

• /trunk/subversion/svn/cl.h

  ......	@@ -292,7 +292,8 @@
  292	292
  293	293
  294	294	/* Our cancellation callback. */
  295		svn_error_t *svn_cl__check_cancel(void *baton);
  	295	svn_error_t *
  	296	svn_cl__check_cancel(void *baton);
  296	297
  297	298
  298	299
  ......	@@ -334,8 +335,8 @@
  334	335	* POOL is used for temporay allocations.
  335	336	* COMMIT_INFO should not be NULL.
  336	337	*/
  337		svn_error_t *svn_cl__print_commit_info(svn_commit_info_t *commit_info,
  338		apr_pool_t *pool);
  	338	svn_error_t *
  	339	svn_cl__print_commit_info(svn_commit_info_t *commit_info, apr_pool_t *pool);
  339	340
  340	341
  341	342	/* Convert the date in DATA to a human-readable UTF-8-encoded string
  ......	@@ -361,13 +362,14 @@
  361	362
  362	363	When DETAILED is set, and REPOS_LOCKS is set, treat missing repository locks
  363	364	as broken WC locks. */
  364		svn_error_t *svn_cl__print_status(const char *path,
  365		const svn_wc_status2_t *status,
  366		svn_boolean_t detailed,
  367		svn_boolean_t show_last_committed,
  368		svn_boolean_t skip_unrecognized,
  369		svn_boolean_t repos_locks,
  370		apr_pool_t *pool);
  	365	svn_error_t *
  	366	svn_cl__print_status(const char *path,
  	367	const svn_wc_status2_t *status,
  	368	svn_boolean_t detailed,
  	369	svn_boolean_t show_last_committed,
  	370	svn_boolean_t skip_unrecognized,
  	371	svn_boolean_t repos_locks,
  	372	apr_pool_t *pool);
  371	373
  372	374
  373	375	/* Print STATUS for PATH in XML to stdout. Use POOL for temporary
  ......	@@ -535,18 +537,20 @@
  535	537
  536	538	NOTE: While the baton itself will be allocated from POOL, the items
  537	539	add to it are added by reference, not duped into POOL!*/
  538		svn_error_t *svn_cl__make_log_msg_baton(void **baton,
  539		svn_cl__opt_state_t *opt_state,
  540		const char *base_dir,
  541		apr_hash_t *config,
  542		apr_pool_t *pool);
  	540	svn_error_t *
  	541	svn_cl__make_log_msg_baton(void **baton,
  	542	svn_cl__opt_state_t *opt_state,
  	543	const char *base_dir,
  	544	apr_hash_t *config,
  	545	apr_pool_t *pool);
  543	546
  544	547	/* A function of type svn_client_get_commit_log3_t. */
  545		svn_error_t *svn_cl__get_log_message(const char **log_msg,
  546		const char **tmp_file,
  547		const apr_array_header_t *commit_items,
  548		void *baton,
  549		apr_pool_t *pool);
  	548	svn_error_t *
  	549	svn_cl__get_log_message(const char **log_msg,
  	550	const char **tmp_file,
  	551	const apr_array_header_t *commit_items,
  	552	void *baton,
  	553	apr_pool_t *pool);
  550	554
  551	555	/* Handle the cleanup of a log message, using the data in the
  552	556	LOG_MSG_BATON, in the face of COMMIT_ERR. This may mean removing a
  ......	@@ -557,36 +561,39 @@
  557	561	All error returns from this function are guaranteed to at least
  558	562	include COMMIT_ERR, and perhaps additional errors attached to the
  559	563	end of COMMIT_ERR's chain. */
  560		svn_error_t *svn_cl__cleanup_log_msg(void *log_msg_baton,
  561		svn_error_t *commit_err);
  	564	svn_error_t *
  	565	svn_cl__cleanup_log_msg(void *log_msg_baton, svn_error_t *commit_err);
  562	566
  563	567	/* Add a message about --force if appropriate */
  564		svn_error_t *svn_cl__may_need_force(svn_error_t *err);
  	568	svn_error_t *
  	569	svn_cl__may_need_force(svn_error_t *err);
  565	570
  566	571	/* Write the STRING to the stdio STREAM, returning an error if it fails. */
  567		svn_error_t *svn_cl__error_checked_fputs(const char *string,
  568		FILE* stream);
  	572	svn_error_t *
  	573	svn_cl__error_checked_fputs(const char *string, FILE* stream);
  569	574
  570	575	/* If STRING is non-null, append it, wrapped in a simple XML CDATA element
  571	576	named TAGNAME, to the string SB. Use POOL for temporary allocations. */
  572		void svn_cl__xml_tagged_cdata(svn_stringbuf_t **sb,
  573		apr_pool_t *pool,
  574		const char *tagname,
  575		const char *string);
  	577	void
  	578	svn_cl__xml_tagged_cdata(svn_stringbuf_t **sb,
  	579	apr_pool_t *pool,
  	580	const char *tagname,
  	581	const char *string);
  576	582
  577	583	/* Print the XML prolog and document root element start-tag to stdout, using
  578	584	TAGNAME as the root element name. Use pool for temporary allocations. */
  579		svn_error_t *svn_cl__xml_print_header(const char *tagname,
  580		apr_pool_t *pool);
  	585	svn_error_t *
  	586	svn_cl__xml_print_header(const char *tagname, apr_pool_t *pool);
  581	587
  582	588	/* Print the XML document root element end-tag to stdout, using TAGNAME as the
  583	589	root element name. Use pool for temporary allocations. */
  584		svn_error_t *svn_cl__xml_print_footer(const char *tagname,
  585		apr_pool_t *pool);
  	590	svn_error_t *
  	591	svn_cl__xml_print_footer(const char *tagname, apr_pool_t *pool);
  586	592
  587	593	/* Return a (non-localised) string representation of KIND, being "dir" or
  588	594	"file" or, in any other case, the empty string. */
  589		const char *svn_cl__node_kind_str(svn_node_kind_t kind);
  	595	const char *
  	596	svn_cl__node_kind_str(svn_node_kind_t kind);
  590	597
  591	598
  592	599	/* If PROPNAME is one of the svn: properties with a boolean value, and
  ......	@@ -595,19 +602,21 @@
  595	602	* setting the property to this value might not do what they expect.
  596	603	* Perform temporary allocations in POOL.
  597	604	*/
  598		void svn_cl__check_boolean_prop_val(const char *propname,
  599		const char *propval,
  600		apr_pool_t *pool);
  	605	void
  	606	svn_cl__check_boolean_prop_val(const char *propname,
  	607	const char *propval,
  	608	apr_pool_t *pool);
  601	609
  602	610	/* De-streamifying wrapper around svn_client_get_changelists(), which
  603	611	is called for each target in TARGETS to populate *PATHS (a list of
  604	612	paths assigned to one of the CHANGELISTS. */
  605		svn_error_t *svn_cl__changelist_paths(apr_array_header_t **paths,
  606		const apr_array_header_t *changelists,
  607		const apr_array_header_t *targets,
  608		svn_depth_t depth,
  609		svn_client_ctx_t *ctx,
  610		apr_pool_t *pool);
  	613	svn_error_t *
  	614	svn_cl__changelist_paths(apr_array_header_t **paths,
  	615	const apr_array_header_t *changelists,
  	616	const apr_array_header_t *targets,
  	617	svn_depth_t depth,
  	618	svn_client_ctx_t *ctx,
  	619	apr_pool_t *pool);
  611	620
  612	621	svn_error_t *
  613	622	svn_cl__args_to_target_array_print_reserved(apr_array_header_t **targets_p,