You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ma...@gfa-net.de on 2005/09/29 11:35:00 UTC
[PATCH] new parameter option '--verbose' for 'svn update'
<br><font size=2 face="sans-serif">Hi there,</font>
<br>
<br><font size=2 face="sans-serif">as I sometimes wanted to know what 'svn
update' will do and which was the current revision of my working copy I
implemented a '--verbose' option for 'svn update' which provides these
information:</font>
<br>
<br><font size=2 face="sans-serif">$ svn up -v myWorkingCopy/</font>
<br><font size=2 face="sans-serif">Current revision 409</font>
<br><font size=2 face="sans-serif">will be updated to revision 413.</font>
<br><font size=2 face="sans-serif">U foo.c</font>
<br><font size=2 face="sans-serif">A bar.c</font>
<br><font size=2 face="sans-serif">Updated to revision 413.</font>
<br>
<br><font size=2 face="sans-serif">The information is only shown when current
revision is not the same as the new revision.</font>
<br>
<br><font size=2 face="sans-serif">If you find this option usefull I would
be happy if you added it to subversion. If not, never mind.</font>
<br>
<br><font size=2 face="sans-serif">Mathias</font>
<br>
<br><font size=2 face="sans-serif">P. S.: I hope that you can read this
mail properly and that you can use the patches as I can't send it in a
better way at the moment.</font>
<br>
<br><font size=2 face="sans-serif">---------------------------------------------------------------------------------</font>
<br>
<br><font size=2 face="sans-serif">Proposed commit message:</font>
<br><font size=2 face="sans-serif">---------------------------------------------------------------------------------</font>
<br><font size=2 face="sans-serif">new parameter option '--verbose' for
'svnlook update'</font>
<br>
<br><font size=2 face="sans-serif">* subversion/bindings/java/javahl/native/org/tigris/subversion/javahl/SVNClient.cpp</font>
<br><font size=2 face="sans-serif"> new parameter 'jverbose' added
to Java_org_tigris_subversion_javahl_SVNClient_update()</font>
<br>
<br><font size=2 face="sans-serif">* subversion/bindings/java/javahl/native/SVNClient.cpp</font>
<br><font size=2 face="sans-serif"> new parameter 'verbose' added
to update()</font>
<br><font size=2 face="sans-serif"> now calling svn_client_update3()
instead of svn_client_update2() in update()</font>
<br>
<br><font size=2 face="sans-serif">* subversion/bindings/java/javahl/native/SVNClient.h</font>
<br><font size=2 face="sans-serif"> new parameter 'verbose' added
to update()</font>
<br>
<br><font size=2 face="sans-serif">* subversion/clients/cmdline/main.c</font>
<br><font size=2 face="sans-serif"> new parameter 'v' added to update's
entry in svn_cl__cmd_table[]</font>
<br>
<br><font size=2 face="sans-serif">* subversion/clients/cmdline/update-cmd.c</font>
<br><font size=2 face="sans-serif"> now calling svn_client_update3()
instead of svn_client_update2() in svn_cl__update()</font>
<br>
<br><font size=2 face="sans-serif">* subversion/include/svn/client.h</font>
<br><font size=2 face="sans-serif"> svn_client_update3() added</font>
<br>
<br><font size=2 face="sans-serif">* subversion/libsvn_client/checkout.c</font>
<br><font size=2 face="sans-serif"> new parameter 'verbose' added
to calls of svn_client__update_internal() in svn_client__checkout_internal()</font>
<br>
<br><font size=2 face="sans-serif">* subversion/libsvn_client/client.h</font>
<br><font size=2 face="sans-serif"> new parameter 'verbose' added
to svn_client__update_internal()</font>
<br>
<br><font size=2 face="sans-serif">* subversion/libsvn_client/externals.c</font>
<br><font size=2 face="sans-serif"> new parameter 'verbose' added
to call of svn_client__update_internal() in handle_external_item_change()</font>
<br>
<br><font size=2 face="sans-serif">* subversion/libsvn_client/update.c</font>
<br><font size=2 face="sans-serif"> new parameter 'verbose' added
to svn_client__update_internal()</font>
<br><font size=2 face="sans-serif"> svn_client_update3() added</font>
<br><font size=2 face="sans-serif"> new parameter 'verbose' added
to call of svn_client__update_internal() in svn_client_update()</font>
<br><font size=2 face="sans-serif">---------------------------------------------------------------------------------</font>
<br>
<br><font size=2 face="sans-serif">Patches (against revision 16227):</font>
<br><font size=2 face="sans-serif">---------------------------------------------------------------------------------</font>
<br><font size=2 face="sans-serif">--- subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp.orig
2005-03-28 11:00:37.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
2005-04-28 12:42:48.248423300 +0200</font>
<br><font size=2 face="sans-serif">@@ -481,7 +481,7 @@</font>
<br><font size=2 face="sans-serif"> */</font>
<br><font size=2 face="sans-serif"> JNIEXPORT jlongArray JNICALL Java_org_tigris_subversion_javahl_SVNClient_update</font>
<br><font size=2 face="sans-serif"> (JNIEnv* env, jobject jthis,
jobjectArray jpath, jobject jrevision, </font>
<br><font size=2 face="sans-serif">- jboolean jrecurse, jboolean
jignoreExternals)</font>
<br><font size=2 face="sans-serif">+ jboolean jverbose, jboolean
jrecurse, jboolean jignoreExternals)</font>
<br><font size=2 face="sans-serif"> {</font>
<br><font size=2 face="sans-serif"> JNIEntry(SVNClient,
update);</font>
<br><font size=2 face="sans-serif"> SVNClient *cl =
SVNClient::getCppObject(jthis);</font>
<br><font size=2 face="sans-serif">@@ -500,8 +500,8 @@</font>
<br><font size=2 face="sans-serif"> {</font>
<br><font size=2 face="sans-serif"> return
NULL;</font>
<br><font size=2 face="sans-serif"> }</font>
<br><font size=2 face="sans-serif">- return cl->update(targets,
revision, jrecurse ? true : false, </font>
<br><font size=2 face="sans-serif">- jignoreExternals
? true : false);</font>
<br><font size=2 face="sans-serif">+ return cl->update(targets,
revision, jverbose ? true : false,</font>
<br><font size=2 face="sans-serif">+ jrecurse
? true : false, jignoreExternals ? true : false);</font>
<br><font size=2 face="sans-serif"> }</font>
<br><font size=2 face="sans-serif"> </font>
<br><font size=2 face="sans-serif"> /*</font>
<br><font size=2 face="sans-serif">--- subversion/bindings/java/javahl/native/SVNClient.cpp.orig
2005-04-04 14:04:39.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/bindings/java/javahl/native/SVNClient.cpp
2005-04-28 12:43:09.639595900 +0200</font>
<br><font size=2 face="sans-serif">@@ -664,8 +664,8 @@</font>
<br><font size=2 face="sans-serif"> JNIUtil::handleSVNError(Err);</font>
<br><font size=2 face="sans-serif"> }</font>
<br><font size=2 face="sans-serif"> </font>
<br><font size=2 face="sans-serif">-jlongArray SVNClient::update(Targets
&targets, Revision &revision, bool recurse,</font>
<br><font size=2 face="sans-serif">-
bool ignoreExternals)</font>
<br><font size=2 face="sans-serif">+jlongArray SVNClient::update(Targets
&targets, Revision &revision, bool verbose,</font>
<br><font size=2 face="sans-serif">+
bool recurse,
bool ignoreExternals)</font>
<br><font size=2 face="sans-serif"> {</font>
<br><font size=2 face="sans-serif"> Pool requestPool;</font>
<br><font size=2 face="sans-serif"> apr_pool_t * apr_pool
= requestPool.pool ();</font>
<br><font size=2 face="sans-serif">@@ -683,8 +683,9 @@</font>
<br><font size=2 face="sans-serif"> JNIUtil::handleSVNError(Err);</font>
<br><font size=2 face="sans-serif"> return
NULL;</font>
<br><font size=2 face="sans-serif"> }</font>
<br><font size=2 face="sans-serif">- Err = svn_client_update2
(&retval, array,</font>
<br><font size=2 face="sans-serif">+ Err = svn_client_update3
(&retval, array,</font>
<br><font size=2 face="sans-serif">
revision.revision (),</font>
<br><font size=2 face="sans-serif">+
verbose,</font>
<br><font size=2 face="sans-serif">
recurse,</font>
<br><font size=2 face="sans-serif">
ignoreExternals,</font>
<br><font size=2 face="sans-serif">
ctx,</font>
<br><font size=2 face="sans-serif">--- subversion/bindings/java/javahl/native/SVNClient.h.orig
2005-08-18 09:59:12.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/bindings/java/javahl/native/SVNClient.h
2005-08-18 10:25:18.953357700 +0200</font>
<br><font size=2 face="sans-serif">@@ -98,8 +98,8 @@</font>
<br><font size=2 face="sans-serif">
const char *message, Revision &revision);</font>
<br><font size=2 face="sans-serif"> jlong commit(Targets
&targets, const char *message, bool recurse, </font>
<br><font size=2 face="sans-serif">
bool noUnlock);</font>
<br><font size=2 face="sans-serif">- jlongArray update(Targets
&targets, Revision &revision, bool recurse,</font>
<br><font size=2 face="sans-serif">- bool ignoreExternals);</font>
<br><font size=2 face="sans-serif">+ jlongArray update(Targets
&targets, Revision &revision, bool verbose,</font>
<br><font size=2 face="sans-serif">+ bool recurse,
bool ignoreExternals);</font>
<br><font size=2 face="sans-serif"> void add(const char
*path, bool recurse, bool force);</font>
<br><font size=2 face="sans-serif"> void revert(const
char *path, bool recurse);</font>
<br><font size=2 face="sans-serif"> void remove(Targets
&targets, const char *message,bool force);</font>
<br><font size=2 face="sans-serif">--- subversion/clients/cmdline/main.c.orig
2005-08-18 09:56:06.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/clients/cmdline/main.c
2005-08-18 10:25:19.047107100 +0200</font>
<br><font size=2 face="sans-serif">@@ -751,7 +751,7 @@</font>
<br><font size=2 face="sans-serif"> " A
'B' in the third column signifies that the lock for the file has\n"</font>
<br><font size=2 face="sans-serif"> " been
broken or stolen.\n"</font>
<br><font size=2 face="sans-serif"> ),</font>
<br><font size=2 face="sans-serif">- {'r', 'N', 'q', svn_cl__merge_cmd_opt,
SVN_CL__AUTH_OPTIONS, </font>
<br><font size=2 face="sans-serif">+ {'r', 'v', 'N', 'q',
svn_cl__merge_cmd_opt, SVN_CL__AUTH_OPTIONS, </font>
<br><font size=2 face="sans-serif"> svn_cl__config_dir_opt,
svn_cl__ignore_externals_opt} },</font>
<br><font size=2 face="sans-serif"> </font>
<br><font size=2 face="sans-serif"> { NULL, NULL, {0}, NULL,
{0} }</font>
<br><font size=2 face="sans-serif">--- subversion/clients/cmdline/update-cmd.c.orig
2005-03-20 01:12:53.000000000 +0100</font>
<br><font size=2 face="sans-serif">+++ subversion/clients/cmdline/update-cmd.c
2005-04-28 12:42:17.341382100 +0200</font>
<br><font size=2 face="sans-serif">@@ -51,8 +51,9 @@</font>
<br><font size=2 face="sans-serif"> svn_cl__get_notifier
(&ctx->notify_func2, &ctx->notify_baton2, </font>
<br><font size=2 face="sans-serif">
FALSE, FALSE, FALSE,
pool);</font>
<br><font size=2 face="sans-serif"> </font>
<br><font size=2 face="sans-serif">- SVN_ERR (svn_client_update2
(NULL, targets,</font>
<br><font size=2 face="sans-serif">+ SVN_ERR (svn_client_update3
(NULL, targets,</font>
<br><font size=2 face="sans-serif">
&(opt_state->start_revision),</font>
<br><font size=2 face="sans-serif">+
opt_state->verbose,</font>
<br><font size=2 face="sans-serif">
opt_state->nonrecursive
? FALSE : TRUE,</font>
<br><font size=2 face="sans-serif">
opt_state->ignore_externals,</font>
<br><font size=2 face="sans-serif">
ctx,
pool));</font>
<br><font size=2 face="sans-serif">--- subversion/include/svn_client.h.orig
2005-09-23 12:27:38.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/include/svn_client.h
2005-09-23 14:22:38.818029000 +0200</font>
<br><font size=2 face="sans-serif">@@ -647,7 +647,21 @@</font>
<br><font size=2 face="sans-serif"> * it passing @a ctx->cancel_baton
at various places during the update.</font>
<br><font size=2 face="sans-serif"> *</font>
<br><font size=2 face="sans-serif"> * Use @a pool for any temporary
allocation.</font>
<br><font size=2 face="sans-serif">+ */</font>
<br><font size=2 face="sans-serif">+svn_error_t *</font>
<br><font size=2 face="sans-serif">+svn_client_update3 (apr_array_header_t
**result_revs,</font>
<br><font size=2 face="sans-serif">+
const apr_array_header_t *paths,</font>
<br><font size=2 face="sans-serif">+
const svn_opt_revision_t *revision,</font>
<br><font size=2 face="sans-serif">+
svn_boolean_t verbose,</font>
<br><font size=2 face="sans-serif">+
svn_boolean_t recurse,</font>
<br><font size=2 face="sans-serif">+
svn_boolean_t ignore_externals,</font>
<br><font size=2 face="sans-serif">+
svn_client_ctx_t *ctx,</font>
<br><font size=2 face="sans-serif">+
apr_pool_t *pool);</font>
<br><font size=2 face="sans-serif">+</font>
<br><font size=2 face="sans-serif">+/**</font>
<br><font size=2 face="sans-serif">+ * @deprecated Provided for backward
compatibility with the 1.2 API.</font>
<br><font size=2 face="sans-serif"> *</font>
<br><font size=2 face="sans-serif">+ * Similar to svn_client_update3 except
that verbose is always set to @c FALSE.</font>
<br><font size=2 face="sans-serif"> * @since New in 1.2.</font>
<br><font size=2 face="sans-serif"> */</font>
<br><font size=2 face="sans-serif"> svn_error_t *</font>
<br><font size=2 face="sans-serif">--- subversion/libsvn_client/checkout.c.orig
2005-09-23 12:28:14.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/libsvn_client/checkout.c
2005-09-23 14:19:26.943029000 +0200</font>
<br><font size=2 face="sans-serif">@@ -118,7 +118,7 @@</font>
<br><font size=2 face="sans-serif"> </font>
<br><font size=2 face="sans-serif"> /*
Have update fix the incompleteness. */</font>
<br><font size=2 face="sans-serif"> err
= svn_client__update_internal (result_rev, path, revision,</font>
<br><font size=2 face="sans-serif">-
recurse, ignore_externals,</font>
<br><font size=2 face="sans-serif">+
FALSE, recurse, ignore_externals,</font>
<br><font size=2 face="sans-serif">
use_sleep, ctx, pool);</font>
<br><font size=2 face="sans-serif"> }</font>
<br><font size=2 face="sans-serif"> else if (kind ==
svn_node_dir)</font>
<br><font size=2 face="sans-serif">@@ -134,7 +134,7 @@</font>
<br><font size=2 face="sans-serif">
SVN_ERR (svn_wc_ensure_adm2 (path, uuid, session_url,</font>
<br><font size=2 face="sans-serif">
repos, revnum, pool));</font>
<br><font size=2 face="sans-serif">
err = svn_client__update_internal (result_rev, path, revision,</font>
<br><font size=2 face="sans-serif">-
recurse, ignore_externals,</font>
<br><font size=2 face="sans-serif">+
FALSE, recurse, ignore_externals,</font>
<br><font size=2 face="sans-serif">
use_sleep, ctx, pool);</font>
<br><font size=2 face="sans-serif">
goto done;</font>
<br><font size=2 face="sans-serif"> }</font>
<br><font size=2 face="sans-serif">@@ -152,7 +152,7 @@</font>
<br><font size=2 face="sans-serif"> if
(entry->url && (strcmp (entry->url, session_url) == 0))</font>
<br><font size=2 face="sans-serif"> {</font>
<br><font size=2 face="sans-serif">
err = svn_client__update_internal (result_rev, path, revision,</font>
<br><font size=2 face="sans-serif">-
recurse, ignore_externals,</font>
<br><font size=2 face="sans-serif">+
FALSE, recurse, ignore_externals,</font>
<br><font size=2 face="sans-serif">
use_sleep, ctx, pool);</font>
<br><font size=2 face="sans-serif"> }</font>
<br><font size=2 face="sans-serif"> else</font>
<br><font size=2 face="sans-serif">--- subversion/libsvn_client/client.h.orig
2005-09-23 12:28:16.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/libsvn_client/client.h
2005-09-23 14:22:39.036779000 +0200</font>
<br><font size=2 face="sans-serif">@@ -325,6 +325,7 @@</font>
<br><font size=2 face="sans-serif"> svn_client__update_internal (svn_revnum_t
*result_rev,</font>
<br><font size=2 face="sans-serif">
const char
*path,</font>
<br><font size=2 face="sans-serif">
const svn_opt_revision_t
*revision,</font>
<br><font size=2 face="sans-serif">+
svn_boolean_t
verbose,</font>
<br><font size=2 face="sans-serif">
svn_boolean_t
recurse,</font>
<br><font size=2 face="sans-serif">
svn_boolean_t
ignore_externals,</font>
<br><font size=2 face="sans-serif">
svn_boolean_t
*timestamp_sleep,</font>
<br><font size=2 face="sans-serif">--- subversion/libsvn_client/externals.c.orig
2005-03-30 23:02:40.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/libsvn_client/externals.c
2005-04-28 12:44:35.735549900 +0200</font>
<br><font size=2 face="sans-serif">@@ -343,7 +343,7 @@</font>
<br><font size=2 face="sans-serif">
{</font>
<br><font size=2 face="sans-serif">
SVN_ERR (svn_client__update_internal (NULL, path,</font>
<br><font size=2 face="sans-serif">
&(new_item->revision),</font>
<br><font size=2 face="sans-serif">-
TRUE,
FALSE,</font>
<br><font size=2 face="sans-serif">+
FALSE,
TRUE, FALSE,</font>
<br><font size=2 face="sans-serif">
ib->timestamp_sleep,</font>
<br><font size=2 face="sans-serif">
ib->ctx,
ib->pool));</font>
<br><font size=2 face="sans-serif">
}</font>
<br><font size=2 face="sans-serif">--- subversion/libsvn_client/update.c.orig
2005-08-18 09:48:54.000000000 +0200</font>
<br><font size=2 face="sans-serif">+++ subversion/libsvn_client/update.c
2005-08-18 10:25:19.672103100 +0200</font>
<br><font size=2 face="sans-serif">@@ -42,6 +42,7 @@</font>
<br><font size=2 face="sans-serif"> svn_client__update_internal (svn_revnum_t
*result_rev,</font>
<br><font size=2 face="sans-serif">
const char
*path,</font>
<br><font size=2 face="sans-serif">
const svn_opt_revision_t
*revision,</font>
<br><font size=2 face="sans-serif">+
svn_boolean_t
verbose,</font>
<br><font size=2 face="sans-serif">
svn_boolean_t
recurse,</font>
<br><font size=2 face="sans-serif">
svn_boolean_t
ignore_externals,</font>
<br><font size=2 face="sans-serif">
svn_boolean_t
*timestamp_sleep,</font>
<br><font size=2 face="sans-serif">@@ -134,6 +135,21 @@</font>
<br><font size=2 face="sans-serif">
traversal_info,</font>
<br><font size=2 face="sans-serif">
pool));</font>
<br><font size=2 face="sans-serif"> </font>
<br><font size=2 face="sans-serif">+ if(verbose)</font>
<br><font size=2 face="sans-serif">+ {</font>
<br><font size=2 face="sans-serif">+ svn_revnum_t revnumverbose
= revnum;</font>
<br><font size=2 face="sans-serif">+ if(revnumverbose <
0)</font>
<br><font size=2 face="sans-serif">+ SVN_ERR (svn_ra_get_latest_revnum
(ra_session, &revnumverbose, pool));</font>
<br><font size=2 face="sans-serif">+ if(entry->revision
!= revnumverbose)</font>
<br><font size=2 face="sans-serif">+ {</font>
<br><font size=2 face="sans-serif">+ SVN_ERR (svn_cmdline_printf
(pool, _("Current revision %ld\n"),</font>
<br><font size=2 face="sans-serif">+
entry->revision));</font>
<br><font size=2 face="sans-serif">+ SVN_ERR (svn_cmdline_printf
(pool,</font>
<br><font size=2 face="sans-serif">+
_("will be updated to revision %ld.\n"),</font>
<br><font size=2 face="sans-serif">+
revnumverbose));</font>
<br><font size=2 face="sans-serif">+ }</font>
<br><font size=2 face="sans-serif">+ }</font>
<br><font size=2 face="sans-serif">+</font>
<br><font size=2 face="sans-serif"> /* Tell RA to do an update
of URL+TARGET to REVISION; if we pass an</font>
<br><font size=2 face="sans-serif"> invalid revnum,
that means RA will use the latest revision. */</font>
<br><font size=2 face="sans-serif"> SVN_ERR (svn_ra_do_update
(ra_session,</font>
<br><font size=2 face="sans-serif">@@ -194,9 +210,10 @@</font>
<br><font size=2 face="sans-serif"> }</font>
<br><font size=2 face="sans-serif"> </font>
<br><font size=2 face="sans-serif"> svn_error_t *</font>
<br><font size=2 face="sans-serif">-svn_client_update2 (apr_array_header_t
**result_revs,</font>
<br><font size=2 face="sans-serif">+svn_client_update3 (apr_array_header_t
**result_revs,</font>
<br><font size=2 face="sans-serif">
const apr_array_header_t *paths,</font>
<br><font size=2 face="sans-serif">
const svn_opt_revision_t *revision,</font>
<br><font size=2 face="sans-serif">+
svn_boolean_t verbose,</font>
<br><font size=2 face="sans-serif">
svn_boolean_t recurse,</font>
<br><font size=2 face="sans-serif">
svn_boolean_t ignore_externals,</font>
<br><font size=2 face="sans-serif">
svn_client_ctx_t *ctx,</font>
<br><font size=2 face="sans-serif">@@ -221,7 +238,7 @@</font>
<br><font size=2 face="sans-serif"> break;</font>
<br><font size=2 face="sans-serif"> </font>
<br><font size=2 face="sans-serif"> err = svn_client__update_internal
(&result_rev, path, revision,</font>
<br><font size=2 face="sans-serif">-
recurse, ignore_externals, </font>
<br><font size=2 face="sans-serif">+
verbose, recurse, ignore_externals, </font>
<br><font size=2 face="sans-serif">
&sleep, ctx, subpool);</font>
<br><font size=2 face="sans-serif"> if (err &&
err->apr_err != SVN_ERR_WC_NOT_DIRECTORY)</font>
<br><font size=2 face="sans-serif"> {</font>
<br><font size=2 face="sans-serif">@@ -257,6 +274,19 @@</font>
<br><font size=2 face="sans-serif">
svn_client_ctx_t *ctx,</font>
<br><font size=2 face="sans-serif">
apr_pool_t *pool)</font>
<br><font size=2 face="sans-serif"> {</font>
<br><font size=2 face="sans-serif">- return svn_client__update_internal
(result_rev, path, revision, recurse, </font>
<br><font size=2 face="sans-serif">-
FALSE, NULL, ctx, pool);</font>
<br><font size=2 face="sans-serif">+ return svn_client__update_internal
(result_rev, path, revision, FALSE,</font>
<br><font size=2 face="sans-serif">+
recurse, FALSE, NULL, ctx, pool);</font>
<br><font size=2 face="sans-serif">+}</font>
<br><font size=2 face="sans-serif">+</font>
<br><font size=2 face="sans-serif">+svn_error_t *</font>
<br><font size=2 face="sans-serif">+svn_client_update2 (apr_array_header_t
**result_revs,</font>
<br><font size=2 face="sans-serif">+
const apr_array_header_t *paths,</font>
<br><font size=2 face="sans-serif">+
const svn_opt_revision_t *revision,</font>
<br><font size=2 face="sans-serif">+
svn_boolean_t recurse,</font>
<br><font size=2 face="sans-serif">+
svn_boolean_t ignore_externals,</font>
<br><font size=2 face="sans-serif">+
svn_client_ctx_t *ctx,</font>
<br><font size=2 face="sans-serif">+
apr_pool_t *pool)</font>
<br><font size=2 face="sans-serif">+{</font>
<br><font size=2 face="sans-serif">+ return svn_client_update3 (result_revs,
paths, revision, FALSE,</font>
<br><font size=2 face="sans-serif">+
recurse,
ignore_externals, ctx, pool);</font>
<br><font size=2 face="sans-serif"> }</font>
<br>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] new parameter option '--verbose' for 'svn update'
Posted by kf...@collab.net.
Can you please send plaintext mails, not HTML mails?
http://subversion.tigris.org/mailing-list-guidelines.html#encodings
Thanks,
-Karl
--
www.collab.net <> CollabNet | Distributed Development On Demand
Mathias.Weinert@gfa-net.de writes:
> <br><font size=2><tt>"Max Bowsher" <maxb@ukf.net> wrote:<br>
> <br>
> > Mathias.Weinert@gfa-net.de wrote:<br>
> > > Hi there,<br>
> > ><br>
> > > as I sometimes wanted to know what 'svn update' will do and which
> was the<br>
> > > current revision of my working copy I implemented a '--verbose'
> option for<br>
> > > 'svn update' which provides these information:<br>
> > ><br>
> > > $ svn up -v myWorkingCopy/<br>
> > > Current revision 409<br>
> > > will be updated to revision 413.<br>
> > > U foo.c<br>
> > > A bar.c<br>
> > > Updated to revision 413.<br>
> > ><br>
> > > The information is only shown when current revision is not the
> same as the<br>
> > > new revision.<br>
> > ><br>
> > > If you find this option usefull I would be happy if you added
> it to<br>
> > > subversion. If not, never mind.<br>
> > <br>
> > IIUC, this just shows the revision of the root directory of the update.<br>
> </tt></font>
> <br><font size=2><tt>That's right.</tt></font>
> <br>
> <br><font size=2><tt>> That would be misleading, and not very helpful,
> if your WC contains mixed <br>
> > revisions.<br>
> </tt></font>
> <br><font size=2><tt>IMHO this is helpful.</tt></font>
> <br><font size=2><tt>First, If I regularly make updates of a WC 'svn up
> -v' will in most cases show the revision at which I made my last 'svn up'
> (until I make a commit on the root of my WC).</tt></font>
> <br><font size=2><tt>Second, we always have the "problem" with
> mixed revisions:</tt></font>
> <br><font size=2><tt>If I for example do an 'svn log' for a WC path I will
> only get the log until the revision I last committed or updated this part
> of the WC but not the whole log. For me this is much more misleading, or,
> to say it in other words, users have to know what this functions do and
> what they don't.</tt></font>
> <br>
> <br><font size=2><tt>Mathias</tt></font>
> <br>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
--
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] new parameter option '--verbose' for 'svn update'
Posted by Ma...@gfa-net.de.
<br><font size=2><tt>"Max Bowsher" <maxb@ukf.net> wrote:<br>
<br>
> Mathias.Weinert@gfa-net.de wrote:<br>
> > Hi there,<br>
> ><br>
> > as I sometimes wanted to know what 'svn update' will do and which
was the<br>
> > current revision of my working copy I implemented a '--verbose'
option for<br>
> > 'svn update' which provides these information:<br>
> ><br>
> > $ svn up -v myWorkingCopy/<br>
> > Current revision 409<br>
> > will be updated to revision 413.<br>
> > U foo.c<br>
> > A bar.c<br>
> > Updated to revision 413.<br>
> ><br>
> > The information is only shown when current revision is not the
same as the<br>
> > new revision.<br>
> ><br>
> > If you find this option usefull I would be happy if you added
it to<br>
> > subversion. If not, never mind.<br>
> <br>
> IIUC, this just shows the revision of the root directory of the update.<br>
</tt></font>
<br><font size=2><tt>That's right.</tt></font>
<br>
<br><font size=2><tt>> That would be misleading, and not very helpful,
if your WC contains mixed <br>
> revisions.<br>
</tt></font>
<br><font size=2><tt>IMHO this is helpful.</tt></font>
<br><font size=2><tt>First, If I regularly make updates of a WC 'svn up
-v' will in most cases show the revision at which I made my last 'svn up'
(until I make a commit on the root of my WC).</tt></font>
<br><font size=2><tt>Second, we always have the "problem" with
mixed revisions:</tt></font>
<br><font size=2><tt>If I for example do an 'svn log' for a WC path I will
only get the log until the revision I last committed or updated this part
of the WC but not the whole log. For me this is much more misleading, or,
to say it in other words, users have to know what this functions do and
what they don't.</tt></font>
<br>
<br><font size=2><tt>Mathias</tt></font>
<br>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] new parameter option '--verbose' for 'svn update'
Posted by Max Bowsher <ma...@ukf.net>.
Mathias.Weinert@gfa-net.de wrote:
> Hi there,
>
> as I sometimes wanted to know what 'svn update' will do and which was the
> current revision of my working copy I implemented a '--verbose' option for
> 'svn update' which provides these information:
>
> $ svn up -v myWorkingCopy/
> Current revision 409
> will be updated to revision 413.
> U foo.c
> A bar.c
> Updated to revision 413.
>
> The information is only shown when current revision is not the same as the
> new revision.
>
> If you find this option usefull I would be happy if you added it to
> subversion. If not, never mind.
IIUC, this just shows the revision of the root directory of the update.
That would be misleading, and not very helpful, if your WC contains mixed
revisions.
Max.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] new parameter option '--verbose' for 'svn update'
Posted by Julian Foad <ju...@btopenworld.com>.
steveking wrote:
> Mathias.Weinert@gfa-net.de wrote:
>
>> as I sometimes wanted to know what 'svn update' will do and which was
Please can you say why you want to know "what 'svn update' will do"? How does
printing the initial and/or final revision number at the beginning of its
operation help you? I don't see the point of printing "to revision 413" at the
beginning as well as the end in your short example; I imagine this would only
be useful for updates that take a long time.
>> the current revision of my working copy I implemented a '--verbose'
>> option for 'svn update' which provides these information:
>>
>> $ svn up -v myWorkingCopy/
>> Current revision 409
>> will be updated to revision 413.
>> U foo.c
>> A bar.c
>> Updated to revision 413.
[...]
>
> I'd like such a feature too. Currently, I've got something similar
> implemented in TSVN, but having this in Subversion would help.
I am also interested. Could you or someone describe exactly what information
TSVN's similar feature provides, and help give an idea of why it is useful?
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] new parameter option '--verbose' for 'svn update'
Posted by steveking <st...@gmx.ch>.
Mathias.Weinert@gfa-net.de wrote:
> Hi there,
>
> as I sometimes wanted to know what 'svn update' will do and which was
> the current revision of my working copy I implemented a '--verbose'
> option for 'svn update' which provides these information:
>
> $ svn up -v myWorkingCopy/
> Current revision 409
> will be updated to revision 413.
> U foo.c
> A bar.c
> Updated to revision 413.
>
> The information is only shown when current revision is not the same as
> the new revision.
>
> If you find this option usefull I would be happy if you added it to
> subversion. If not, never mind.
I'd like such a feature too. Currently, I've got something similar
implemented in TSVN, but having this in Subversion would help.
> +++ subversion/libsvn_client/update.c 2005-08-18
> 10:25:19.672103100 +0200
> @@ -42,6 +42,7 @@
> svn_client__update_internal (svn_revnum_t *result_rev,
> const char *path,
> const svn_opt_revision_t *revision,
> + svn_boolean_t verbose,
> svn_boolean_t recurse,
> svn_boolean_t ignore_externals,
> svn_boolean_t *timestamp_sleep,
> @@ -134,6 +135,21 @@
> traversal_info,
> pool));
>
> + if(verbose)
> + {
> + svn_revnum_t revnumverbose = revnum;
> + if(revnumverbose < 0)
> + SVN_ERR (svn_ra_get_latest_revnum (ra_session, &revnumverbose,
> pool));
> + if(entry->revision != revnumverbose)
> + {
> + SVN_ERR (svn_cmdline_printf (pool, _("Current revision %ld\n"),
> + entry->revision));
> + SVN_ERR (svn_cmdline_printf (pool,
> + _("will be updated to revision
> %ld.\n"),
> + revnumverbose));
> + }
> + }
Yikes! Never, ever print something from within the library! You're only
allowed to print from within the cmdline client, but not the library.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org