You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/10/25 12:21:27 UTC
svn commit: r1027029 - /subversion/trunk/subversion/svn/main.c
Author: julianfoad
Date: Mon Oct 25 10:21:27 2010
New Revision: 1027029
URL: http://svn.apache.org/viewvc?rev=1027029&view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Remove the alias '--nul' (for --no-unlock/--keep-lock),
in order to have at most one alias per option, and because I didn't
like its name.
Modified:
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1027029&r1=1027028&r2=1027029&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon Oct 25 10:21:27 2010
@@ -293,7 +293,7 @@ const apr_getopt_option_t svn_cl__option
{"limit", 'l', 1, N_("maximum number of log entries")},
{"no-unlock", opt_no_unlock, 0, N_("don't unlock the targets\n"
SVN_CL__OPTION_CONTINUATION_INDENT
- "[aliases: --nul, --keep-lock]")},
+ "[alias: --keep-lock]")},
{"summarize", opt_summarize, 0, N_("show a summary of the results")},
{"remove", opt_remove, 0, N_("remove changelist association")},
{"changelist", opt_changelist, 1,
@@ -425,7 +425,6 @@ const apr_getopt_option_t svn_cl__option
{"iw", opt_ignore_whitespace, 0, NULL},
{"diff", opt_show_diff, 0, NULL},
{"idiff", opt_internal_diff, 0, NULL},
- {"nul", opt_no_unlock, 0, NULL},
{"keep-lock", opt_no_unlock, 0, NULL},
{"optn", opt_old_patch_target_names, 0, NULL},
Re: svn commit: r1027029 - /subversion/trunk/subversion/svn/main.c
Posted by Julian Foad <ju...@wandisco.com>.
On Mon, 2010-10-25 at 15:54 +0200, Stefan Sperling wrote:
> On Mon, Oct 25, 2010 at 10:21:27AM -0000, julianfoad@apache.org wrote:
> > Author: julianfoad
> > Date: Mon Oct 25 10:21:27 2010
> > New Revision: 1027029
> >
> > URL: http://svn.apache.org/viewvc?rev=1027029&view=rev
> > Log:
> > * subversion/svn/main.c
> > (svn_cl__options): Remove the alias '--nul' (for --no-unlock/--keep-lock),
> > in order to have at most one alias per option, and because I didn't
> > like its name.
>
> For options which are being typed often during interactive use,
> I like having aliases that are at most 2 or 3 characters.
>
> The --no-unlock option is a bit special because it's also a double-negative
> which isn't intuitive. Note how the API uses "keep_lock", so the CLI client
> always passes "!no_unlock" to the API. IMO the option should always have
> been called --keep-lock.
>
> So in this case, I'd like to have both a short form for typing,
> and a --keep-lock alias.
BTW I think "keep-locks" would be more accurate than the current
"keep-lock", because the number of locks to keep is zero or more.
> But I agree that "nul" isn't a good name. Maybe we should provide a
> short alias that sounds more like --keep-lock? Unfortunately --kl is
> already taken by --keep-local, which sounds very similar to --keep-lock.
> We should try to create short forms for both these options in a way that
> makes it easy to tell which is which.
>
> Maybe like this?
>
> --keep-local => --kal
> --keep-lock => --kck
Mumble.
--julian
Re: svn commit: r1027029 - /subversion/trunk/subversion/svn/main.c
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Oct 25, 2010 at 10:21:27AM -0000, julianfoad@apache.org wrote:
> Author: julianfoad
> Date: Mon Oct 25 10:21:27 2010
> New Revision: 1027029
>
> URL: http://svn.apache.org/viewvc?rev=1027029&view=rev
> Log:
> * subversion/svn/main.c
> (svn_cl__options): Remove the alias '--nul' (for --no-unlock/--keep-lock),
> in order to have at most one alias per option, and because I didn't
> like its name.
For options which are being typed often during interactive use,
I like having aliases that are at most 2 or 3 characters.
The --no-unlock option is a bit special because it's also a double-negative
which isn't intuitive. Note how the API uses "keep_lock", so the CLI client
always passes "!no_unlock" to the API. IMO the option should always have
been called --keep-lock.
So in this case, I'd like to have both a short form for typing,
and a --keep-lock alias.
But I agree that "nul" isn't a good name. Maybe we should provide a
short alias that sounds more like --keep-lock? Unfortunately --kl is
already taken by --keep-local, which sounds very similar to --keep-lock.
We should try to create short forms for both these options in a way that
makes it easy to tell which is which.
Maybe like this?
--keep-local => --kal
--keep-lock => --kck
Stefan