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 v2 43/46] pathspec: support :(literal) syntax for noglob pathspec
Date: Sun, 14 Jul 2013 15:36:06 +0700 [thread overview]
Message-ID: <1373790969-13000-44-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1373790969-13000-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/glossary-content.txt | 20 ++++++++++++++++----
builtin/add.c | 2 +-
builtin/diff.c | 2 +-
dir.c | 15 ++++++++++++---
pathspec.c | 11 ++++++++---
pathspec.h | 4 +++-
t/t6130-pathspec-noglob.sh | 18 ++++++++++++++++++
tree-diff.c | 2 +-
tree-walk.c | 5 ++++-
9 files changed, 64 insertions(+), 15 deletions(-)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index dba5062..ca9f20f 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -322,10 +322,22 @@ and a close parentheses `)`, and the remainder is the pattern to match
against the path.
+
The "magic signature" consists of an ASCII symbol that is not
-alphanumeric. Currently only the slash `/` is recognized as a
-"magic signature": it makes the pattern match from the root of
-the working tree, even when you are running the command from
-inside a subdirectory.
+alphanumeric.
++
+--
+top `/`;;
+ The magic word `top` (mnemonic: `/`) makes the pattern match
+ from the root of the working tree, even when you are running
+ the command from inside a subdirectory.
+
+literal;;
+ Wildcards in the pattern such as `*` or `?` are treated
+ as literal characters.
+--
++
+Currently only the slash `/` is recognized as the "magic signature",
+but it is envisioned that we will support more types of magic in later
+versions of Git.
+
A pathspec with only a colon means "there is no pathspec". This form
should not be combined with other pathspec.
diff --git a/builtin/add.c b/builtin/add.c
index 0b80fa8..663ddd1 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -541,7 +541,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
/*
* file_exists() assumes exact match
*/
- GUARD_PATHSPEC(&pathspec, PATHSPEC_FROMTOP);
+ GUARD_PATHSPEC(&pathspec, PATHSPEC_FROMTOP | PATHSPEC_LITERAL);
for (i = 0; i < pathspec.nr; i++) {
const char *path = pathspec.items[i].match;
diff --git a/builtin/diff.c b/builtin/diff.c
index bb84ba0..2fb8c5d 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -368,7 +368,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
}
if (rev.prune_data.nr) {
/* builtin_diff_b_f() */
- GUARD_PATHSPEC(&rev.prune_data, PATHSPEC_FROMTOP);
+ GUARD_PATHSPEC(&rev.prune_data, PATHSPEC_FROMTOP | PATHSPEC_LITERAL);
if (!path)
path = rev.prune_data.items[0].match;
paths += rev.prune_data.nr;
diff --git a/dir.c b/dir.c
index 79465e7..50ec2f5 100644
--- a/dir.c
+++ b/dir.c
@@ -108,7 +108,10 @@ static size_t common_prefix_len(const struct pathspec *pathspec)
int n;
size_t max = 0;
- GUARD_PATHSPEC(pathspec, PATHSPEC_FROMTOP | PATHSPEC_MAXDEPTH);
+ GUARD_PATHSPEC(pathspec,
+ PATHSPEC_FROMTOP |
+ PATHSPEC_MAXDEPTH |
+ PATHSPEC_LITERAL);
for (n = 0; n < pathspec->nr; n++) {
size_t i = 0, len = 0;
@@ -232,7 +235,10 @@ int match_pathspec_depth(const struct pathspec *ps,
{
int i, retval = 0;
- GUARD_PATHSPEC(ps, PATHSPEC_FROMTOP | PATHSPEC_MAXDEPTH);
+ GUARD_PATHSPEC(ps,
+ PATHSPEC_FROMTOP |
+ PATHSPEC_MAXDEPTH |
+ PATHSPEC_LITERAL);
if (!ps->nr) {
if (!ps->recursive ||
@@ -1288,7 +1294,10 @@ int read_directory(struct dir_struct *dir, const char *path, int len, const stru
* Check out create_simplify()
*/
if (pathspec)
- GUARD_PATHSPEC(pathspec, PATHSPEC_FROMTOP | PATHSPEC_MAXDEPTH);
+ GUARD_PATHSPEC(pathspec,
+ PATHSPEC_FROMTOP |
+ PATHSPEC_MAXDEPTH |
+ PATHSPEC_LITERAL);
if (has_symlink_leading_path(path, len))
return dir->nr;
diff --git a/pathspec.c b/pathspec.c
index b2e3a87..6a16938 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -70,6 +70,7 @@ static struct pathspec_magic {
const char *name;
} pathspec_magic[] = {
{ PATHSPEC_FROMTOP, '/', "top" },
+ { PATHSPEC_LITERAL, 0, "literal" },
};
/*
@@ -92,13 +93,15 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
const char *elt)
{
static int literal_global = -1;
- unsigned magic = 0, short_magic = 0;
+ unsigned magic = 0, short_magic = 0, global_magic = 0;
const char *copyfrom = elt, *long_magic_end = NULL;
char *match;
int i, pathspec_prefix = -1;
if (literal_global < 0)
literal_global = git_env_bool(GIT_LITERAL_PATHSPECS_ENVIRONMENT, 0);
+ if (literal_global)
+ global_magic |= PATHSPEC_LITERAL;
if (elt[0] != ':') {
; /* nothing to do */
@@ -164,6 +167,7 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
magic |= short_magic;
*p_short_magic = short_magic;
+ magic |= global_magic;
if (pathspec_prefix >= 0 &&
(prefixlen || (prefix && *prefix)))
@@ -236,7 +240,7 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
elt, ce_len, ce->name);
}
- if (literal_global)
+ if (magic & PATHSPEC_LITERAL)
item->nowildcard_len = item->len;
else {
item->nowildcard_len = simple_length(item->match);
@@ -402,7 +406,8 @@ const char **get_pathspec(const char *prefix, const char **pathspec)
{
struct pathspec ps;
parse_pathspec(&ps,
- PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP,
+ PATHSPEC_ALL_MAGIC &
+ ~(PATHSPEC_FROMTOP | PATHSPEC_LITERAL),
PATHSPEC_PREFER_CWD,
prefix, pathspec);
return ps._raw;
diff --git a/pathspec.h b/pathspec.h
index 7ef9896..987d70c 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -4,9 +4,11 @@
/* Pathspec magic */
#define PATHSPEC_FROMTOP (1<<0)
#define PATHSPEC_MAXDEPTH (1<<1)
+#define PATHSPEC_LITERAL (1<<2)
#define PATHSPEC_ALL_MAGIC \
(PATHSPEC_FROMTOP | \
- PATHSPEC_MAXDEPTH)
+ PATHSPEC_MAXDEPTH | \
+ PATHSPEC_LITERAL)
#define PATHSPEC_ONESTAR 1 /* the pathspec pattern sastisfies GFNM_ONESTAR */
diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh
index 39ef619..49c148e 100755
--- a/t/t6130-pathspec-noglob.sh
+++ b/t/t6130-pathspec-noglob.sh
@@ -47,18 +47,36 @@ test_expect_success 'no-glob option matches literally (vanilla)' '
test_cmp expect actual
'
+test_expect_success 'no-glob option matches literally (vanilla)' '
+ echo vanilla >expect &&
+ git log --format=%s -- ":(literal)foo" >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'no-glob option matches literally (star)' '
echo star >expect &&
git --literal-pathspecs log --format=%s -- "f*" >actual &&
test_cmp expect actual
'
+test_expect_success 'no-glob option matches literally (star)' '
+ echo star >expect &&
+ git log --format=%s -- ":(literal)f*" >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'no-glob option matches literally (bracket)' '
echo bracket >expect &&
git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
test_cmp expect actual
'
+test_expect_success 'no-glob option matches literally (bracket)' '
+ echo bracket >expect &&
+ git log --format=%s -- ":(literal)f[o][o]" >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'no-glob environment variable works' '
echo star >expect &&
GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
diff --git a/tree-diff.c b/tree-diff.c
index 21a50d8..ccf9d7c 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -202,7 +202,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
* path. Magic that matches more than one path is not
* supported.
*/
- GUARD_PATHSPEC(&opt->pathspec, PATHSPEC_FROMTOP);
+ GUARD_PATHSPEC(&opt->pathspec, PATHSPEC_FROMTOP | PATHSPEC_LITERAL);
#if 0
/*
* We should reject wildcards as well. Unfortunately we
diff --git a/tree-walk.c b/tree-walk.c
index 37b157e..676bd7f 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -636,7 +636,10 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
enum interesting never_interesting = ps->has_wildcard ?
entry_not_interesting : all_entries_not_interesting;
- GUARD_PATHSPEC(ps, PATHSPEC_FROMTOP | PATHSPEC_MAXDEPTH);
+ GUARD_PATHSPEC(ps,
+ PATHSPEC_FROMTOP |
+ PATHSPEC_MAXDEPTH |
+ PATHSPEC_LITERAL);
if (!ps->nr) {
if (!ps->recursive ||
--
1.8.2.83.gc99314b
next prev parent reply other threads:[~2013-07-14 8:40 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-14 8:35 [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase) Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 01/46] clean: remove unused variable "seen" Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 02/46] Move struct pathspec and related functions to pathspec.[ch] Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 03/46] pathspec: i18n-ize error strings in pathspec parsing code Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 04/46] pathspec: add copy_pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 05/46] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 06/46] parse_pathspec: save original pathspec for reporting Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 07/46] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL} Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 08/46] Convert some get_pathspec() calls to parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 09/46] parse_pathspec: add special flag for max_depth feature Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 10/46] parse_pathspec: support stripping submodule trailing slashes Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 11/46] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 12/46] parse_pathspec: support prefixing original patterns Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 13/46] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 14/46] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 15/46] commit: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 16/46] status: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 17/46] rerere: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 18/46] checkout: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 19/46] rm: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 20/46] ls-files: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 21/46] archive: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 22/46] check-ignore: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 23/46] add: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 24/46] reset: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 25/46] line-log: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 26/46] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 27/46] Convert run_add_interactive to use " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 28/46] Convert unmerge_cache to take " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 29/46] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 30/46] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 31/46] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 32/46] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 33/46] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 34/46] Convert common_prefix() to use " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 35/46] Remove diff_tree_{setup,release}_paths Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 36/46] Remove init_pathspec() in favor of parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 37/46] Remove match_pathspec() in favor of match_pathspec_depth() Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 38/46] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 39/46] Rename field "raw" to "_raw" in struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 40/46] parse_pathspec: make sure the prefix part is wildcard-free Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 41/46] parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 42/46] Kill limit_pathspec_to_literal() as it's only used by parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` Nguyễn Thái Ngọc Duy [this message]
2013-07-14 8:36 ` [PATCH v2 44/46] pathspec: make --literal-pathspecs disable pathspec magic Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 45/46] pathspec: support :(glob) syntax Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 46/46] parse_pathspec: accept :(icase)path syntax Nguyễn Thái Ngọc Duy
2013-07-14 8:48 ` Eric Sunshine
2013-07-15 19:08 ` [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase) Junio C Hamano
2013-07-15 21:43 ` Junio C Hamano
2013-08-16 14:07 ` "git fmt-merge-msg" usage (was [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase)) Michael Haggerty
2013-08-18 19:40 ` "git fmt-merge-msg" usage 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
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=1373790969-13000-44-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.
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).