Log:
[[[
Fix issue #3436: Short option for --ignore-externals (-i?).
Instead of using the suggested -i, markphip suggested --ie
which is what is implemented following the discussion
at
http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=2370618&dsForumId=462.
* subversion/svn/main.c
(svn_cl__longopt_t): Added a new item opt_ignore_externals_short.
(svn_cl__options[]): Added a new option "ie".
(svn_cl__cmd_table[]): Added opt_ignore_externals_short enum value
to the commands "checkout", "copy", "export", "status", "switch",
and "update".
(main): Added case opt_ignore_externals_short to main switch
list which uses the already existing opt_ignore_externals switch
to set opt_state.ignore_externals to TRUE.
Patch by: Edmund Wong ed <at> kdtc.net.
Suggested by: markphip
]]]
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2389620
Index: subversion/svn/main.c
===================================================================
--- subversion/svn/main.c (revision 38990)
+++ subversion/svn/main.c (working copy)
@@ -114,7 +114,8 @@
opt_from_source,
opt_show_revs,
opt_reintegrate,
- opt_trust_server_cert
+ opt_trust_server_cert,
+ opt_ignore_externals_short
} svn_cl__longopt_t;
/* Option codes and descriptions for the command line client.
@@ -227,6 +228,8 @@
N_("ignore ancestry when calculating merges")},
{"ignore-externals", opt_ignore_externals, 0,
N_("ignore externals definitions")},
+ {"ie", opt_ignore_externals_short, 0,
+ N_("ignore externals definitions (Short form)")},
{"diff-cmd", opt_diff_cmd, 1, N_("use ARG as diff command")},
{"diff3-cmd", opt_merge_cmd, 1, N_("use ARG as merge command")},
{"editor-cmd", opt_editor_cmd, 1, N_("use ARG as external editor")},
@@ -396,7 +399,8 @@
"\n"
" See also 'svn help update' for a list of possible characters\n"
" reporting the action taken.\n"),
- {'r', 'q', 'N', opt_depth, opt_force, opt_ignore_externals} },
+ {'r', 'q', 'N', opt_depth, opt_force, opt_ignore_externals,
+ opt_ignore_externals_short} },
{ "cleanup", svn_cl__cleanup, {0}, N_
("Recursively clean up the working copy, removing locks, resuming\n"
@@ -435,7 +439,8 @@
"contact the repository. As such, they may not, by default, be able\n"
"to propagate merge tracking information from the source of the copy\n"
"to the destination.\n"),
- {'r', 'q', opt_ignore_externals, opt_parents, SVN_CL__LOG_MSG_OPTIONS} },
+ {'r', 'q', opt_ignore_externals, opt_ignore_externals_short,
+ opt_parents, SVN_CL__LOG_MSG_OPTIONS} },
{ "delete", svn_cl__delete, {"del", "remove", "rm"}, N_
("Remove files and directories from version control.\n"
@@ -500,7 +505,8 @@
"\n"
" If specified, PEGREV determines in which revision the target is first\n"
" looked up.\n"),
- {'r', 'q', 'N', opt_depth, opt_force, opt_native_eol, opt_ignore_externals} },
+ {'r', 'q', 'N', opt_depth, opt_force, opt_native_eol, opt_ignore_externals,
+ opt_ignore_externals_short} },
{ "help", svn_cl__help, {"?", "h"}, N_
("Describe the usage of this program or its subcommands.\n"
@@ -932,7 +938,7 @@
" > local missing, incoming edit upon update\n"
" D wc/qax.c\n"),
{ 'u', 'v', 'N', opt_depth, 'q', opt_no_ignore, opt_incremental, opt_xml,
- opt_ignore_externals, opt_changelist} },
+ opt_ignore_externals, opt_ignore_externals_short, opt_changelist} },
{ "switch", svn_cl__switch, {"sw"}, N_
("Update the working copy to a different URL.\n"
@@ -980,7 +986,8 @@
" svn switch --relocate http://www.example.com/repo/project \\\n"
" svn://svn.example.com/repo/project\n"),
{ 'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_relocate,
- opt_ignore_externals, opt_force, opt_accept} },
+ opt_ignore_externals, opt_ignore_externals_short, opt_force,
+ opt_accept} },
{ "unlock", svn_cl__unlock, {0}, N_
("Unlock working copy paths or URLs.\n"
@@ -1028,7 +1035,8 @@
" directory can only be increased (telescoped more deeply); you cannot\n"
" make a directory more shallow.\n"),
{'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_force,
- opt_ignore_externals, opt_changelist, opt_editor_cmd, opt_accept} },
+ opt_ignore_externals, opt_ignore_externals_short, opt_changelist,
+ opt_editor_cmd, opt_accept} },
{ "upgrade", svn_cl__upgrade, {0}, N_
("Upgrade the metadata storage format for a working copy.\n"
@@ -1444,6 +1452,7 @@
case opt_ignore_ancestry:
opt_state.ignore_ancestry = TRUE;
break;
+ case opt_ignore_externals_short:
case opt_ignore_externals:
opt_state.ignore_externals = TRUE;
break;
Received on 2009-09-01 04:37:45 CEST