From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 15/20] diff-parseopt: convert --[no-]color-moved
Date: Wed, 20 Mar 2019 18:46:58 +0700 [thread overview]
Message-ID: <20190320114703.18659-16-pclouds@gmail.com> (raw)
In-Reply-To: <20190320114703.18659-1-pclouds@gmail.com>
mark one more string for translation while at there
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
diff.c | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/diff.c b/diff.c
index e2f515a7da..df4303de4e 100644
--- a/diff.c
+++ b/diff.c
@@ -4841,6 +4841,27 @@ static int diff_opt_char(const struct option *opt,
return 0;
}
+static int diff_opt_color_moved(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ if (unset) {
+ options->color_moved = COLOR_MOVED_NO;
+ } else if (!arg) {
+ if (diff_color_moved_default)
+ options->color_moved = diff_color_moved_default;
+ if (options->color_moved == COLOR_MOVED_NO)
+ options->color_moved = COLOR_MOVED_DEFAULT;
+ } else {
+ int cm = parse_color_moved(arg);
+ if (cm < 0)
+ return error(_("bad --color-moved argument: %s"), arg);
+ options->color_moved = cm;
+ }
+ return 0;
+}
+
static int diff_opt_color_words(const struct option *opt,
const char *arg, int unset)
{
@@ -5339,6 +5360,9 @@ static void prep_parse_options(struct diff_options *options)
OPT_CALLBACK_F(0, "color-words", options, N_("<regex>"),
N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
+ OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
+ N_("move lines of code are colored differently"),
+ PARSE_OPT_OPTARG, diff_opt_color_moved),
OPT_GROUP(N_("Diff other options")),
OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
@@ -5422,19 +5446,7 @@ int diff_opt_parse(struct diff_options *options,
return ac;
/* flags options */
- if (!strcmp(arg, "--color-moved")) {
- if (diff_color_moved_default)
- options->color_moved = diff_color_moved_default;
- if (options->color_moved == COLOR_MOVED_NO)
- options->color_moved = COLOR_MOVED_DEFAULT;
- } else if (!strcmp(arg, "--no-color-moved"))
- options->color_moved = COLOR_MOVED_NO;
- else if (skip_prefix(arg, "--color-moved=", &arg)) {
- int cm = parse_color_moved(arg);
- if (cm < 0)
- return error("bad --color-moved argument: %s", arg);
- options->color_moved = cm;
- } else if (skip_prefix(arg, "--color-moved-ws=", &arg)) {
+ if (skip_prefix(arg, "--color-moved-ws=", &arg)) {
unsigned cm = parse_color_moved_ws(arg);
if (cm & COLOR_MOVED_WS_ERROR)
return -1;
--
2.21.0.548.gd3c7d92dc2
next prev parent reply other threads:[~2019-03-20 11:48 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 11:46 [PATCH 00/20] nd/diff-parseopt the last part Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 01/20] diff-parseopt: convert --ws-error-highlight Nguyễn Thái Ngọc Duy
2019-03-20 20:19 ` Martin Ågren
2019-03-20 11:46 ` [PATCH 02/20] diff-parseopt: convert --ita-[in]visible-in-index Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 03/20] diff-parseopt: convert -z Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 04/20] diff-parseopt: convert -l Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 05/20] diff-parseopt: convert -S|-G Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 06/20] diff-parseopt: convert --pickaxe-all|--pickaxe-regex Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 07/20] diff-parseopt: convert -O Nguyễn Thái Ngọc Duy
2019-03-20 20:26 ` Martin Ågren
2019-03-20 11:46 ` [PATCH 08/20] diff-parseopt: convert --find-object Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 09/20] diff-parseopt: convert --diff-filter Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 10/20] diff-parseopt: convert --[no-]abbrev Nguyễn Thái Ngọc Duy
2019-03-20 23:00 ` Ævar Arnfjörð Bjarmason
2019-03-21 0:35 ` Duy Nguyen
2019-03-20 11:46 ` [PATCH 11/20] diff-parseopt: convert --[src|dst]-prefix Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 12/20] diff-parseopt: convert --line-prefix Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` [PATCH 13/20] diff-parseopt: convert --no-prefix Nguyễn Thái Ngọc Duy
2019-03-20 20:30 ` Martin Ågren
2019-03-20 11:46 ` [PATCH 14/20] diff-parseopt: convert --inter-hunk-context Nguyễn Thái Ngọc Duy
2019-03-20 11:46 ` Nguyễn Thái Ngọc Duy [this message]
2019-03-20 11:46 ` [PATCH 16/20] diff-parseopt: convert --color-moved-ws Nguyễn Thái Ngọc Duy
2019-03-20 11:47 ` [PATCH 17/20] diff.c: allow --no-color-moved-ws Nguyễn Thái Ngọc Duy
2019-03-20 11:47 ` [PATCH 18/20] range-diff: use parse_options() instead of diff_opt_parse() Nguyễn Thái Ngọc Duy
2019-03-20 11:47 ` [PATCH 19/20] diff --no-index: " Nguyễn Thái Ngọc Duy
2019-03-20 11:47 ` [PATCH 20/20] am: avoid diff_opt_parse() Nguyễn Thái Ngọc Duy
2019-03-24 8:19 ` [PATCH v2 00/20] nd/diff-parseopt the last part Nguyễn Thái Ngọc Duy
2019-03-24 8:19 ` [PATCH v2 01/20] diff-parseopt: convert --ws-error-highlight Nguyễn Thái Ngọc Duy
2019-03-24 8:19 ` [PATCH v2 02/20] diff-parseopt: convert --ita-[in]visible-in-index Nguyễn Thái Ngọc Duy
2019-03-24 8:19 ` [PATCH v2 03/20] diff-parseopt: convert -z Nguyễn Thái Ngọc Duy
2019-03-24 8:19 ` [PATCH v2 04/20] diff-parseopt: convert -l Nguyễn Thái Ngọc Duy
2019-03-24 8:19 ` [PATCH v2 05/20] diff-parseopt: convert -S|-G Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 06/20] diff-parseopt: convert --pickaxe-all|--pickaxe-regex Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 07/20] diff-parseopt: convert -O Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 08/20] diff-parseopt: convert --find-object Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 09/20] diff-parseopt: convert --diff-filter Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 10/20] diff-parseopt: convert --[no-]abbrev Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 11/20] diff-parseopt: convert --[src|dst]-prefix Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 12/20] diff-parseopt: convert --line-prefix Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 13/20] diff-parseopt: convert --no-prefix Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 14/20] diff-parseopt: convert --inter-hunk-context Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 15/20] diff-parseopt: convert --[no-]color-moved Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 16/20] diff-parseopt: convert --color-moved-ws Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 17/20] diff.c: allow --no-color-moved-ws Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 18/20] range-diff: use parse_options() instead of diff_opt_parse() Nguyễn Thái Ngọc Duy
2019-03-24 8:20 ` [PATCH v2 19/20] diff --no-index: " Nguyễn Thái Ngọc Duy
2019-04-30 1:02 ` Johannes Schindelin
2019-04-30 4:53 ` Duy Nguyen
2019-04-30 22:12 ` Johannes Schindelin
2019-05-01 9:53 ` Duy Nguyen
2019-05-01 18:46 ` Jeff King
2019-03-24 8:20 ` [PATCH v2 20/20] am: avoid diff_opt_parse() Nguyễn Thái Ngọc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190320114703.18659-16-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).