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 v1 19/45] checkout: convert to use parse_pathspec
Date: Fri, 15 Mar 2013 13:06:34 +0700 [thread overview]
Message-ID: <1363327620-29017-20-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1363327620-29017-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/checkout.c | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index a9c1b5a..8dc5f51 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -45,7 +45,7 @@ struct checkout_opts {
int branch_exists;
const char *prefix;
- const char **pathspec;
+ struct pathspec pathspec;
struct tree *source_tree;
};
@@ -256,39 +256,37 @@ static int checkout_paths(const struct checkout_opts *opts,
if (opts->patch_mode)
return run_add_interactive(revision, "--patch=checkout",
- opts->pathspec);
+ opts->pathspec.raw);
lock_file = xcalloc(1, sizeof(struct lock_file));
newfd = hold_locked_index(lock_file, 1);
- if (read_cache_preload(opts->pathspec) < 0)
+ if (read_cache_preload(opts->pathspec.raw) < 0)
return error(_("corrupt index file"));
if (opts->source_tree)
- read_tree_some(opts->source_tree, opts->pathspec);
+ read_tree_some(opts->source_tree, opts->pathspec.raw);
- for (pos = 0; opts->pathspec[pos]; pos++)
- ;
- ps_matched = xcalloc(1, pos);
+ ps_matched = xcalloc(1, opts->pathspec.nr);
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
if (opts->source_tree && !(ce->ce_flags & CE_UPDATE))
continue;
- match_pathspec(opts->pathspec, ce->name, ce_namelen(ce), 0, ps_matched);
+ match_pathspec_depth(&opts->pathspec, ce->name, ce_namelen(ce), 0, ps_matched);
}
- if (report_path_error(ps_matched, opts->pathspec, opts->prefix))
+ if (report_path_error(ps_matched, opts->pathspec.raw, opts->prefix))
return 1;
/* "checkout -m path" to recreate conflicted state */
if (opts->merge)
- unmerge_cache(opts->pathspec);
+ unmerge_cache(opts->pathspec.raw);
/* Any unmerged paths? */
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
- if (match_pathspec(opts->pathspec, ce->name, ce_namelen(ce), 0, NULL)) {
+ if (match_pathspec_depth(&opts->pathspec, ce->name, ce_namelen(ce), 0, NULL)) {
if (!ce_stage(ce))
continue;
if (opts->force) {
@@ -315,7 +313,7 @@ static int checkout_paths(const struct checkout_opts *opts,
struct cache_entry *ce = active_cache[pos];
if (opts->source_tree && !(ce->ce_flags & CE_UPDATE))
continue;
- if (match_pathspec(opts->pathspec, ce->name, ce_namelen(ce), 0, NULL)) {
+ if (match_pathspec_depth(&opts->pathspec, ce->name, ce_namelen(ce), 0, NULL)) {
if (!ce_stage(ce)) {
errs |= checkout_entry(ce, &state, NULL);
continue;
@@ -960,7 +958,7 @@ static int switch_unborn_to_new_branch(const struct checkout_opts *opts)
static int checkout_branch(struct checkout_opts *opts,
struct branch_info *new)
{
- if (opts->pathspec)
+ if (opts->pathspec.nr)
die(_("paths cannot be used with switching branches"));
if (opts->patch_mode)
@@ -1110,9 +1108,19 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
}
if (argc) {
- opts.pathspec = get_pathspec(prefix, argv);
+ /*
+ * In patch mode (opts.patch_mode != 0), we pass the
+ * pathspec to an external program, git-add--interactive.
+ * Do not accept any kind of magic that that program
+ * cannot handle. Magic mask is pretty safe to be
+ * lifted for new magic when opts.patch_mode == 0.
+ */
+ parse_pathspec(&opts.pathspec,
+ opts.patch_mode == 0 ? 0 :
+ (PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP),
+ 0, prefix, argv);
- if (!opts.pathspec)
+ if (!opts.pathspec.nr)
die(_("invalid path specification"));
/*
@@ -1144,7 +1152,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
strbuf_release(&buf);
}
- if (opts.patch_mode || opts.pathspec)
+ if (opts.patch_mode || opts.pathspec.nr)
return checkout_paths(&opts, new.name);
else
return checkout_branch(&opts, &new);
--
1.8.0.rc0.19.g7bbb31d
next prev parent reply other threads:[~2013-03-15 6:26 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 6:06 [PATCH v1 00/45] nd/parse-pathspec and :(glob) pathspec magic Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 01/45] setup.c: check that the pathspec magic ends with ")" Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 02/45] clean: remove unused variable "seen" Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 03/45] Move struct pathspec and related functions to pathspec.[ch] Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 04/45] pathspec: i18n-ize error strings in pathspec parsing code Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 05/45] pathspec: add copy_pathspec Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 06/45] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 07/45] parse_pathspec: save original pathspec for reporting Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 08/45] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL} Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 09/45] Convert some get_pathspec() calls to parse_pathspec() Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 10/45] parse_pathspec: a special flag for max_depth feature Nguyễn Thái Ngọc Duy
2013-03-15 21:28 ` Eric Sunshine
2013-03-15 6:06 ` [PATCH v1 11/45] parse_pathspec: support stripping submodule trailing slashes Nguyễn Thái Ngọc Duy
2013-03-17 21:55 ` Junio C Hamano
2013-03-18 0:53 ` Duy Nguyen
2013-03-15 6:06 ` [PATCH v1 12/45] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 13/45] parse_pathspec: support prefixing original patterns Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 14/45] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-03-17 22:00 ` Junio C Hamano
2013-03-15 6:06 ` [PATCH v1 15/45] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 16/45] commit: " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 17/45] status: " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 18/45] rerere: " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` Nguyễn Thái Ngọc Duy [this message]
2013-03-15 6:06 ` [PATCH v1 20/45] rm: " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 21/45] ls-files: " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 22/45] archive: " Nguyễn Thái Ngọc Duy
2013-03-15 17:56 ` Junio C Hamano
2013-03-16 1:08 ` Duy Nguyen
2013-03-17 5:00 ` Junio C Hamano
2013-03-17 5:31 ` Duy Nguyen
2013-03-17 6:22 ` Junio C Hamano
2013-03-15 6:06 ` [PATCH v1 23/45] check-ignore: " Nguyễn Thái Ngọc Duy
2013-04-12 15:03 ` Adam Spiers
2013-04-12 23:09 ` Duy Nguyen
2013-04-14 23:25 ` Adam Spiers
2013-04-14 23:48 ` Duy Nguyen
2013-04-15 16:17 ` Adam Spiers
2013-03-15 6:06 ` [PATCH v1 24/45] add: " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 25/45] reset: " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 26/45] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 27/45] Convert run_add_interactive to use " Nguyễn Thái Ngọc Duy
2013-03-18 18:26 ` John Keeping
2013-03-19 1:58 ` Duy Nguyen
2013-03-19 10:58 ` John Keeping
2013-03-15 6:06 ` [PATCH v1 28/45] Convert unmerge_cache to take " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 29/45] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 30/45] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 31/45] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 32/45] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 33/45] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 34/45] Convert common_prefix() to use " Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 35/45] Remove diff_tree_{setup,release}_paths Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 36/45] Remove init_pathspec() in favor of parse_pathspec() Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 37/45] Remove match_pathspec() in favor of match_pathspec_depth() Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 38/45] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 39/45] parse_pathspec: make sure the prefix part is wildcard-free Nguyễn Thái Ngọc Duy
2013-03-19 18:34 ` Junio C Hamano
2013-03-20 1:32 ` Duy Nguyen
2013-03-20 10:54 ` Duy Nguyen
2013-03-15 6:06 ` [PATCH v1 40/45] parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN Nguyễn Thái Ngọc Duy
2013-03-15 22:00 ` Eric Sunshine
2013-03-15 6:06 ` [PATCH v1 41/45] Kill limit_pathspec_to_literal() as it's only used by parse_pathspec() Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 42/45] pathspec: support :(literal) syntax for noglob pathspec Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 43/45] pathspec: make --literal-pathspecs disable pathspec magic Nguyễn Thái Ngọc Duy
2013-03-15 6:06 ` [PATCH v1 44/45] pathspec: support :(glob) syntax Nguyễn Thái Ngọc Duy
2013-03-15 22:11 ` Eric Sunshine
2013-03-15 6:07 ` [PATCH v1 45/45] Rename field "raw" to "_raw" in struct pathspec Nguyễn Thái Ngọc Duy
2013-03-15 17:48 ` [PATCH v1 00/45] nd/parse-pathspec and :(glob) pathspec magic Junio C Hamano
2013-03-20 12:16 ` [PATCH v2 00/45] parse_pathspec and :(glob) magic Nguyễn Thái Ngọc Duy
2013-03-20 12:16 ` [PATCH v2 06/45] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-03-20 19:40 ` Eric Sunshine
2013-03-22 21:55 ` Junio C Hamano
2013-03-20 12:16 ` [PATCH v2 11/45] parse_pathspec: support stripping submodule trailing slashes Nguyễn Thái Ngọc Duy
2013-03-20 12:16 ` [PATCH v2 12/45] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-03-20 12:16 ` [PATCH v2 14/45] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-03-20 19:45 ` Eric Sunshine
2013-03-20 12:16 ` [PATCH v2 27/45] Convert run_add_interactive to use struct pathspec Nguyễn Thái Ngọc Duy
2013-03-20 12:16 ` [PATCH v2 39/45] parse_pathspec: make sure the prefix part is wildcard-free Nguyễn Thái Ngọc Duy
2013-03-20 18:02 ` [PATCH v2 00/45] parse_pathspec and :(glob) magic Junio C Hamano
2013-03-21 5:33 ` Duy Nguyen
2013-03-21 5:43 ` Duy Nguyen
2013-03-21 17:28 ` Junio C Hamano
2013-03-21 17:50 ` Junio C Hamano
2013-03-23 3:13 ` Duy Nguyen
2013-03-23 3:15 ` Duy Nguyen
2013-03-27 15:39 ` Junio C Hamano
2013-03-24 0:57 ` Eric Sunshine
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=1363327620-29017-20-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).