From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 04/31] parse_pathspec: save original pathspec for reporting
Date: Sun, 13 Jan 2013 19:35:12 +0700 [thread overview]
Message-ID: <1358080539-17436-5-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1358080539-17436-1-git-send-email-pclouds@gmail.com>
We usually use pathspec_item's match field for pathspec error
reporting. However "match" (or "raw") does not show the magic part,
which will play more important role later on. Preserve exact user
input for reporting.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
cache.h | 1 +
dir.c | 1 +
setup.c | 2 ++
3 files changed, 4 insertions(+)
diff --git a/cache.h b/cache.h
index 759c62a..136e4c7 100644
--- a/cache.h
+++ b/cache.h
@@ -485,6 +485,7 @@ struct pathspec {
int max_depth;
struct pathspec_item {
const char *match;
+ const char *original;
unsigned magic;
int len;
int nowildcard_len;
diff --git a/dir.c b/dir.c
index 8454c13..beb7532 100644
--- a/dir.c
+++ b/dir.c
@@ -1538,6 +1538,7 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
const char *path = paths[i];
item->match = path;
+ item->original = path;
item->len = strlen(path);
item->flags = 0;
if (limit_pathspec_to_literal()) {
diff --git a/setup.c b/setup.c
index 92adefc..a1ad012 100644
--- a/setup.c
+++ b/setup.c
@@ -249,6 +249,7 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
else
match = prefix_path(prefix, prefixlen, copyfrom);
*raw = item->match = match;
+ item->original = elt;
item->len = strlen(item->match);
item->flags = 0;
if (limit_pathspec_to_literal())
@@ -295,6 +296,7 @@ static void parse_pathspec(struct pathspec *pathspec,
pathspec->items = item = xmalloc(sizeof(*item));
item->match = prefix;
+ item->original = prefix;
item->nowildcard_len = item->len = strlen(prefix);
raw[0] = prefix;
raw[1] = NULL;
--
1.8.0.rc2.23.g1fb49df
next prev parent reply other threads:[~2013-01-13 12:36 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-13 12:35 [PATCH v3 00/31] nd/parse-pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 01/31] clean: remove unused variable "seen" Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 02/31] Add copy_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 03/31] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-01-14 0:05 ` Martin von Zweigbergk
2013-01-14 1:11 ` Duy Nguyen
2013-01-13 12:35 ` Nguyễn Thái Ngọc Duy [this message]
2013-01-13 12:35 ` [PATCH v3 05/31] Export parse_pathspec() and convert some get_pathspec() calls Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 06/31] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 07/31] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 08/31] parse_pathspec: add PATHSPEC_EMPTY_MATCH_ALL Nguyễn Thái Ngọc Duy
2013-01-21 23:12 ` Martin von Zweigbergk
2013-01-22 2:46 ` Duy Nguyen
2013-01-13 12:35 ` [PATCH v3 09/31] commit: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 10/31] status: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 11/31] rerere: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 12/31] checkout: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 13/31] rm: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 14/31] parse_pathspec: support stripping submodule trailing slashes Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 15/31] ls-files: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 16/31] archive: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 17/31] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 18/31] add: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 19/31] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 20/31] Convert unmerge_cache " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 21/31] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 22/31] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 23/31] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 24/31] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 25/31] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 26/31] Convert common_prefix() to use " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 27/31] Remove diff_tree_{setup,release}_paths Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 28/31] Remove init_pathspec() in favor of parse_pathspec() Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 29/31] Remove match_pathspec() in favor of match_pathspec_depth() Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 30/31] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 31/31] Rename field "raw" to "_raw" in struct pathspec Nguyễn Thái Ngọc Duy
2013-01-13 23:21 ` [PATCH v3 00/31] nd/parse-pathspec Junio C Hamano
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=1358080539-17436-5-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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 NNTP newsgroup(s).