From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: pclouds@gmail.com
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Martin Ågren" <martin.agren@gmail.com>
Subject: [PATCH v2 00/20] nd/diff-parseopt the last part
Date: Sun, 24 Mar 2019 15:19:54 +0700 [thread overview]
Message-ID: <20190324082014.2041-1-pclouds@gmail.com> (raw)
In-Reply-To: <20190320114703.18659-1-pclouds@gmail.com>
v2 fixes some help text and commit messages. No major changes.
Nguyễn Thái Ngọc Duy (20):
diff-parseopt: convert --ws-error-highlight
diff-parseopt: convert --ita-[in]visible-in-index
diff-parseopt: convert -z
diff-parseopt: convert -l
diff-parseopt: convert -S|-G
diff-parseopt: convert --pickaxe-all|--pickaxe-regex
diff-parseopt: convert -O
diff-parseopt: convert --find-object
diff-parseopt: convert --diff-filter
diff-parseopt: convert --[no-]abbrev
diff-parseopt: convert --[src|dst]-prefix
diff-parseopt: convert --line-prefix
diff-parseopt: convert --no-prefix
diff-parseopt: convert --inter-hunk-context
diff-parseopt: convert --[no-]color-moved
diff-parseopt: convert --color-moved-ws
diff.c: allow --no-color-moved-ws
range-diff: use parse_options() instead of diff_opt_parse()
diff --no-index: use parse_options() instead of diff_opt_parse()
am: avoid diff_opt_parse()
builtin/am.c | 4 +-
builtin/diff.c | 21 +--
builtin/range-diff.c | 26 +--
diff-no-index.c | 49 +++---
diff.c | 337 +++++++++++++++++++--------------------
diff.h | 5 +-
parse-options-cb.c | 4 +-
parse-options.h | 6 +-
t/t4053-diff-no-index.sh | 3 +-
9 files changed, 219 insertions(+), 236 deletions(-)
Range-diff dựa trên v1:
1: 676bba9a4c ! 1: ed9901217e diff-parseopt: convert --ws-error-highlight
@@ -2,7 +2,7 @@
diff-parseopt: convert --ws-error-highlight
- mark one more string for translation while at there.
+ Mark one more string for translation while at there.
diff --git a/diff.c b/diff.c
--- a/diff.c
@@ -38,7 +38,7 @@
OPT_COLOR_FLAG(0, "color", &options->use_color,
N_("show colored diff")),
+ OPT_CALLBACK_F(0, "ws-error-highlight", options, N_("<kind>"),
-+ N_("highlight whitespaces errors in the context, old or new lines in the diff"),
++ N_("highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"),
+ PARSE_OPT_NONEG, diff_opt_ws_error_highlight),
OPT_CALLBACK_F(0, "output-indicator-new",
&options->output_indicators[OUTPUT_INDICATOR_NEW],
2: 94fb8a961b = 2: 3ad3991675 diff-parseopt: convert --ita-[in]visible-in-index
3: 7b2c38485f ! 3: ea21fa9e03 diff-parseopt: convert -z
@@ -7,7 +7,7 @@
+++ b/diff.c
@@
OPT_CALLBACK_F(0, "ws-error-highlight", options, N_("<kind>"),
- N_("highlight whitespaces errors in the context, old or new lines in the diff"),
+ N_("highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"),
PARSE_OPT_NONEG, diff_opt_ws_error_highlight),
+ OPT_SET_INT('z', NULL, &options->line_termination,
+ N_("do not munge pathnames and use NULs as output field terminators in --raw or --numstat"),
4: 470c29dfb6 = 4: 02b7116f53 diff-parseopt: convert -l
5: f950b910dd = 5: 2d43346824 diff-parseopt: convert -S|-G
6: a3d8dfbb9e = 6: 357b691470 diff-parseopt: convert --pickaxe-all|--pickaxe-regex
7: 209794414b ! 7: adc09e748e diff-parseopt: convert -O
@@ -33,7 +33,7 @@
N_("treat <string> in -S as extended POSIX regular expression"),
DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
+ OPT_FILENAME('O', NULL, &options->orderfile,
-+ N_("override diff.orderFile configuration variable")),
++ N_("control the order in which files appear in the output")),
{ OPTION_CALLBACK, 0, "output", options, N_("<file>"),
N_("Output to a specific file"),
PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
8: 11730d9a4a ! 8: ca34bbd042 diff-parseopt: convert --find-object
@@ -2,7 +2,7 @@
diff-parseopt: convert --find-object
- while at it, mark one more string for translation.
+ While at it, mark one more string for translation.
diff --git a/diff.c b/diff.c
--- a/diff.c
@@ -37,7 +37,7 @@
@@
DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
OPT_FILENAME('O', NULL, &options->orderfile,
- N_("override diff.orderFile configuration variable")),
+ N_("control the order in which files appear in the output")),
+ OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"),
+ N_("look for differences that change the number of occurrences of the specified object"),
+ PARSE_OPT_NONEG, diff_opt_find_object),
9: a70f80ffa5 ! 9: 6a735031e0 diff-parseopt: convert --diff-filter
@@ -2,7 +2,7 @@
diff-parseopt: convert --diff-filter
- while at it, mark one more string for translation
+ While at it, mark one more string for translation
diff --git a/diff.c b/diff.c
--- a/diff.c
10: 95f2d0e3b0 = 10: 646a5844f0 diff-parseopt: convert --[no-]abbrev
11: 58bbccd2df = 11: 20e050397a diff-parseopt: convert --[src|dst]-prefix
12: 4454256a15 = 12: ae0d85b620 diff-parseopt: convert --line-prefix
13: 1b882aaeb1 ! 13: 288d4fd648 diff-parseopt: convert --no-prefix
@@ -29,7 +29,7 @@
N_("prepend an additional prefix to every line of output"),
PARSE_OPT_NONEG, diff_opt_line_prefix),
+ OPT_CALLBACK_F(0, "no-prefix", options, NULL,
-+ N_("no not show any source or destination prefix"),
++ N_("do not show any source or destination prefix"),
+ PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_no_prefix),
OPT_CALLBACK_F(0, "output-indicator-new",
&options->output_indicators[OUTPUT_INDICATOR_NEW],
14: 3b1b06c51b ! 14: 753173f724 diff-parseopt: convert --inter-hunk-context
@@ -58,7 +58,7 @@
{
@@
OPT_CALLBACK_F(0, "no-prefix", options, NULL,
- N_("no not show any source or destination prefix"),
+ N_("do not show any source or destination prefix"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_no_prefix),
+ OPT_INTEGER_F(0, "inter-hunk-context", &options->interhunkcontext,
+ N_("show context between diff hunks up to the specified number of lines"),
15: afc89eb973 ! 15: 51cb7b3beb diff-parseopt: convert --[no-]color-moved
@@ -2,7 +2,7 @@
diff-parseopt: convert --[no-]color-moved
- mark one more string for translation while at there
+ Mark one more string for translation while at there
diff --git a/diff.c b/diff.c
--- a/diff.c
16: 34a2457af1 = 16: c1a0faa93b diff-parseopt: convert --color-moved-ws
17: cc882ae588 = 17: 1e99596a25 diff.c: allow --no-color-moved-ws
18: 60ea27b58d = 18: d7272ff0c9 range-diff: use parse_options() instead of diff_opt_parse()
19: 96e72eb330 = 19: 09c98fb8fd diff --no-index: use parse_options() instead of diff_opt_parse()
20: d7273eff56 = 20: 59dbe880bc am: avoid diff_opt_parse()
--
2.21.0.548.gd3c7d92dc2
next prev parent reply other threads:[~2019-03-24 8:21 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 ` [PATCH 15/20] diff-parseopt: convert --[no-]color-moved Nguyễn Thái Ngọc Duy
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 ` Nguyễn Thái Ngọc Duy [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190324082014.2041-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.