You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Mo DeJong <su...@bayarea.net> on 2001/12/06 13:54:59 UTC
Patch to rename `svn switch` to `svn relocate`
Hello.
Perhaps it is just me, but I just can't get used to the
`svn switch` subcommand. It makes me think of switching
something in the WC, but what? What if we changed the
subcommand name to "relocate"? Anyone else think that
would make it more clear? In case folks do, I wrote
up the following patch.
cheers
Mo
2001-12-06 Mo DeJong <su...@bayarea.net>
* subversion/clients/cmdline/cl.h: Rename
declaration of svn_cl__switch to svn_cl__relocate.
* subversion/clients/cmdline/main.c:
* subversion/clients/cmdline/relocate-cmd.c
(svn_cl__relocate): Renamed from relocate-cmd.c.
* subversion/clients/cmdline/switch-cmd.c: Renamed
to relocate-cmd.c.
Index: ./subversion/clients/cmdline/cl.h
===================================================================
--- ./subversion/clients/cmdline/.svn/text-base/cl.h.svn-base Wed Dec 5 07:00:18 2001
+++ ./subversion/clients/cmdline/cl.h Thu Dec 6 05:31:08 2001
@@ -151,9 +151,9 @@
svn_cl__propget,
svn_cl__proplist,
svn_cl__propset,
+ svn_cl__relocate,
svn_cl__revert,
svn_cl__status,
- svn_cl__switch,
svn_cl__update;
Index: ./subversion/clients/cmdline/relocate-cmd.c
===================================================================
--- ./subversion/clients/cmdline/.svn/text-base/relocate-cmd.c.svn-base Thu Dec 6 05:02:20 2001
+++ ./subversion/clients/cmdline/relocate-cmd.c Thu Dec 6 05:31:05 2001
@@ -1,5 +1,5 @@
/*
- * switch-cmd.c -- Bring work tree in sync with a different repository URL
+ * relocate-cmd.c -- Bring work tree in sync with a different repository URL
*
* ====================================================================
* Copyright (c) 2000-2001 CollabNet. All rights reserved.
@@ -34,7 +34,7 @@
/*** Code. ***/
svn_error_t *
-svn_cl__switch (apr_getopt_t *os,
+svn_cl__relocate (apr_getopt_t *os,
svn_cl__opt_state_t *opt_state,
apr_pool_t *pool)
{
@@ -46,7 +46,7 @@
targets = svn_cl__args_to_target_array (os, pool);
if (targets->nelts == 0)
{
- svn_cl__subcommand_help ("switch", pool);
+ svn_cl__subcommand_help ("relocate", pool);
return svn_error_create (SVN_ERR_CL_ARG_PARSING_ERROR, 0, 0, pool, "");
}
if (targets->nelts == 1)
@@ -76,7 +76,7 @@
"`%s' does not appear to be a working copy path", target->data);
return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, 0, NULL, pool,
- "no support for 'switch' subcommand");
+ "no support for 'relocate' subcommand");
}
Index: ./subversion/clients/cmdline/main.c
===================================================================
--- ./subversion/clients/cmdline/.svn/text-base/main.c.svn-base Wed Dec 5 07:00:11 2001
+++ ./subversion/clients/cmdline/main.c Thu Dec 6 05:31:09 2001
@@ -149,6 +149,11 @@
{ "pset", TRUE, NULL, NULL },
{ "ps", TRUE, NULL, NULL },
+ { "relocate", FALSE, svn_cl__relocate,
+ "Update existing working copy files and directories to become\n"
+ "a working copy of a different repository URL.\n"
+ "usage: relocate [TARGET] REPOS_URL\n" },
+
{ "revert", FALSE, svn_cl__revert,
"Restore pristine working copy file (undo all local edits)\n"
"usage: revert [TARGETS]\n" },
@@ -158,13 +163,7 @@
"usage: status [TARGETS]\n" },
{ "stat", TRUE, NULL, NULL },
{ "st", TRUE, NULL, NULL },
-
- { "switch", FALSE, svn_cl__switch,
- "Update existing working copy files and directories to become\n"
- "a working copy of a different repository URL.\n"
- "usage: switch [TARGET] REPOS_URL\n" },
- { "sw", TRUE, NULL, NULL },
-
+
{ "update", FALSE, svn_cl__update,
"Bring changes from the repository into the working copy.\n"
"usage: update [TARGETS]\n" },
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Patch to rename `svn switch` to `svn relocate`
Posted by Branko Čibej <br...@xbc.nu>.
Mo DeJong wrote:
>Hello.
>
>Perhaps it is just me, but I just can't get used to the
>`svn switch` subcommand. It makes me think of switching
>something in the WC, but what? What if we changed the
>subcommand name to "relocate"? Anyone else think that
>would make it more clear? In case folks do, I wrote
>up the following patch.
>
"Relocate? But I'm building shared with -fpic!"
Wouldn't "rebase" be more appropriate?
(Just finished painting my bikeshed in a lavender-and-vermillion
checkered pattern :-)
--
Brane �ibej <br...@xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Patch to rename `svn switch` to `svn relocate`
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Mo DeJong <su...@bayarea.net> writes:
> Perhaps it is just me, but I just can't get used to the
> `svn switch` subcommand. It makes me think of switching
> something in the WC, but what? What if we changed the
> subcommand name to "relocate"? Anyone else think that
> would make it more clear? In case folks do, I wrote
> up the following patch.
Mo, just FYI:
This patch didn't get picked up mainly because no one else saw a
problem, or anyway didn't find the new way more intuitive than the
status quo. (This is based on conversations & IRC -- there wasn't
much dev list discussion about it that I saw, except for Branko's
brief followup).
It looks like it didn't take a huge amount of time for you,
fortunately.
-Karl
> 2001-12-06 Mo DeJong <su...@bayarea.net>
>
> * subversion/clients/cmdline/cl.h: Rename
> declaration of svn_cl__switch to svn_cl__relocate.
> * subversion/clients/cmdline/main.c:
> * subversion/clients/cmdline/relocate-cmd.c
> (svn_cl__relocate): Renamed from relocate-cmd.c.
> * subversion/clients/cmdline/switch-cmd.c: Renamed
> to relocate-cmd.c.
>
> Index: ./subversion/clients/cmdline/cl.h
> ===================================================================
> --- ./subversion/clients/cmdline/.svn/text-base/cl.h.svn-base Wed Dec 5 07:00:18 2001
> +++ ./subversion/clients/cmdline/cl.h Thu Dec 6 05:31:08 2001
> @@ -151,9 +151,9 @@
> svn_cl__propget,
> svn_cl__proplist,
> svn_cl__propset,
> + svn_cl__relocate,
> svn_cl__revert,
> svn_cl__status,
> - svn_cl__switch,
> svn_cl__update;
>
>
> Index: ./subversion/clients/cmdline/relocate-cmd.c
> ===================================================================
> --- ./subversion/clients/cmdline/.svn/text-base/relocate-cmd.c.svn-base Thu Dec 6 05:02:20 2001
> +++ ./subversion/clients/cmdline/relocate-cmd.c Thu Dec 6 05:31:05 2001
> @@ -1,5 +1,5 @@
> /*
> - * switch-cmd.c -- Bring work tree in sync with a different repository URL
> + * relocate-cmd.c -- Bring work tree in sync with a different repository URL
> *
> * ====================================================================
> * Copyright (c) 2000-2001 CollabNet. All rights reserved.
> @@ -34,7 +34,7 @@
> /*** Code. ***/
>
> svn_error_t *
> -svn_cl__switch (apr_getopt_t *os,
> +svn_cl__relocate (apr_getopt_t *os,
> svn_cl__opt_state_t *opt_state,
> apr_pool_t *pool)
> {
> @@ -46,7 +46,7 @@
> targets = svn_cl__args_to_target_array (os, pool);
> if (targets->nelts == 0)
> {
> - svn_cl__subcommand_help ("switch", pool);
> + svn_cl__subcommand_help ("relocate", pool);
> return svn_error_create (SVN_ERR_CL_ARG_PARSING_ERROR, 0, 0, pool, "");
> }
> if (targets->nelts == 1)
> @@ -76,7 +76,7 @@
> "`%s' does not appear to be a working copy path", target->data);
>
> return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, 0, NULL, pool,
> - "no support for 'switch' subcommand");
> + "no support for 'relocate' subcommand");
> }
>
>
> Index: ./subversion/clients/cmdline/main.c
> ===================================================================
> --- ./subversion/clients/cmdline/.svn/text-base/main.c.svn-base Wed Dec 5 07:00:11 2001
> +++ ./subversion/clients/cmdline/main.c Thu Dec 6 05:31:09 2001
> @@ -149,6 +149,11 @@
> { "pset", TRUE, NULL, NULL },
> { "ps", TRUE, NULL, NULL },
>
> + { "relocate", FALSE, svn_cl__relocate,
> + "Update existing working copy files and directories to become\n"
> + "a working copy of a different repository URL.\n"
> + "usage: relocate [TARGET] REPOS_URL\n" },
> +
> { "revert", FALSE, svn_cl__revert,
> "Restore pristine working copy file (undo all local edits)\n"
> "usage: revert [TARGETS]\n" },
> @@ -158,13 +163,7 @@
> "usage: status [TARGETS]\n" },
> { "stat", TRUE, NULL, NULL },
> { "st", TRUE, NULL, NULL },
> -
> - { "switch", FALSE, svn_cl__switch,
> - "Update existing working copy files and directories to become\n"
> - "a working copy of a different repository URL.\n"
> - "usage: switch [TARGET] REPOS_URL\n" },
> - { "sw", TRUE, NULL, NULL },
> -
> +
> { "update", FALSE, svn_cl__update,
> "Bring changes from the repository into the working copy.\n"
> "usage: update [TARGETS]\n" },
>
> ---------------------------------------------------------------------
> 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