Skip to content

Commit

Permalink
remove init_pathspec() in favor of parse_pathspec()
Browse files Browse the repository at this point in the history
While at there, move free_pathspec() to pathspec.c

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Jul 15, 2013
1 parent bd1928d commit 9a08727
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 81 deletions.
8 changes: 1 addition & 7 deletions builtin/blame.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ static struct origin *find_origin(struct scoreboard *sb,
paths[0] = origin->path;
paths[1] = NULL;

init_pathspec(&diff_opts.pathspec, paths);
parse_pathspec(&diff_opts.pathspec, PATHSPEC_ALL_MAGIC, 0, "", paths);
diff_setup_done(&diff_opts);

if (is_null_sha1(origin->commit->object.sha1))
Expand Down Expand Up @@ -486,15 +486,12 @@ static struct origin *find_rename(struct scoreboard *sb,
struct origin *porigin = NULL;
struct diff_options diff_opts;
int i;
const char *paths[2];

diff_setup(&diff_opts);
DIFF_OPT_SET(&diff_opts, RECURSIVE);
diff_opts.detect_rename = DIFF_DETECT_RENAME;
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_opts.single_follow = origin->path;
paths[0] = NULL;
init_pathspec(&diff_opts.pathspec, paths);
diff_setup_done(&diff_opts);

if (is_null_sha1(origin->commit->object.sha1))
Expand Down Expand Up @@ -1064,7 +1061,6 @@ static int find_copy_in_parent(struct scoreboard *sb,
int opt)
{
struct diff_options diff_opts;
const char *paths[1];
int i, j;
int retval;
struct blame_list *blame_list;
Expand All @@ -1078,8 +1074,6 @@ static int find_copy_in_parent(struct scoreboard *sb,
DIFF_OPT_SET(&diff_opts, RECURSIVE);
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;

paths[0] = NULL;
init_pathspec(&diff_opts.pathspec, paths);
diff_setup_done(&diff_opts);

/* Try "find copies harder" on new path if requested;
Expand Down
2 changes: 1 addition & 1 deletion builtin/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
init_grep_defaults();
git_config(git_log_config, NULL);

init_pathspec(&match_all, NULL);
memset(&match_all, 0, sizeof(match_all));
init_revisions(&rev, prefix);
rev.diff = 1;
rev.always_show_header = 1;
Expand Down
11 changes: 5 additions & 6 deletions builtin/ls-files.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,13 +315,12 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
}

if (prefix) {
static const char *(matchbuf[2]);
matchbuf[0] = prefix;
matchbuf[1] = NULL;
init_pathspec(&pathspec, matchbuf);
pathspec.items[0].nowildcard_len = pathspec.items[0].len;
static const char *(matchbuf[1]);
matchbuf[0] = NULL;
parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
PATHSPEC_PREFER_CWD, prefix, matchbuf);
} else
init_pathspec(&pathspec, NULL);
memset(&pathspec, 0, sizeof(pathspec));
if (read_tree(tree, 1, &pathspec))
die("unable to read tree entries %s", tree_name);

Expand Down
2 changes: 1 addition & 1 deletion diff-lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
struct rev_info revs;

init_revisions(&revs, NULL);
init_pathspec(&revs.prune_data, opt->pathspec.raw);
copy_pathspec(&revs.prune_data, &opt->pathspec);
revs.diffopt = *opt;

if (diff_cache(&revs, tree_sha1, NULL, 1))
Expand Down
58 changes: 0 additions & 58 deletions dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -1580,64 +1580,6 @@ int remove_path(const char *name)
return 0;
}

static int pathspec_item_cmp(const void *a_, const void *b_)
{
struct pathspec_item *a, *b;

a = (struct pathspec_item *)a_;
b = (struct pathspec_item *)b_;
return strcmp(a->match, b->match);
}

int init_pathspec(struct pathspec *pathspec, const char **paths)
{
const char **p = paths;
int i;

memset(pathspec, 0, sizeof(*pathspec));
if (!p)
return 0;
while (*p)
p++;
pathspec->raw = paths;
pathspec->nr = p - paths;
if (!pathspec->nr)
return 0;

pathspec->items = xmalloc(sizeof(struct pathspec_item)*pathspec->nr);
for (i = 0; i < pathspec->nr; i++) {
struct pathspec_item *item = pathspec->items+i;
const char *path = paths[i];

item->match = path;
item->original = path;
item->len = strlen(path);
item->flags = 0;
if (limit_pathspec_to_literal()) {
item->nowildcard_len = item->len;
} else {
item->nowildcard_len = simple_length(path);
if (item->nowildcard_len < item->len) {
pathspec->has_wildcard = 1;
if (path[item->nowildcard_len] == '*' &&
no_wildcard(path + item->nowildcard_len + 1))
item->flags |= PATHSPEC_ONESTAR;
}
}
}

qsort(pathspec->items, pathspec->nr,
sizeof(struct pathspec_item), pathspec_item_cmp);

return 0;
}

void free_pathspec(struct pathspec *pathspec)
{
free(pathspec->items);
pathspec->items = NULL;
}

int limit_pathspec_to_literal(void)
{
static int flag = -1;
Expand Down
2 changes: 1 addition & 1 deletion merge-recursive.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ static int get_files_dirs(struct merge_options *o, struct tree *tree)
{
int n;
struct pathspec match_all;
init_pathspec(&match_all, NULL);
memset(&match_all, 0, sizeof(match_all));
if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
return 0;
n = o->current_file_set.nr + o->current_directory_set.nr;
Expand Down
6 changes: 6 additions & 0 deletions pathspec.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,3 +372,9 @@ void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
memcpy(dst->items, src->items,
sizeof(struct pathspec_item) * dst->nr);
}

void free_pathspec(struct pathspec *pathspec)
{
free(pathspec->items);
pathspec->items = NULL;
}
1 change: 0 additions & 1 deletion pathspec.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ struct pathspec {
#define PATHSPEC_PREFIX_ORIGIN (1<<6)
#define PATHSPEC_KEEP_ORDER (1<<7)

extern int init_pathspec(struct pathspec *, const char **);
extern void parse_pathspec(struct pathspec *pathspec,
unsigned magic_mask,
unsigned flags,
Expand Down
2 changes: 1 addition & 1 deletion revision.c
Original file line number Diff line number Diff line change
Expand Up @@ -1372,7 +1372,7 @@ static void prepare_show_merge(struct rev_info *revs)
i++;
}
free_pathspec(&revs->prune_data);
init_pathspec(&revs->prune_data, prune);
parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC, 0, "", prune);
revs->limited = 1;
}

Expand Down
10 changes: 5 additions & 5 deletions tree-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
struct diff_options diff_opts;
struct diff_queue_struct *q = &diff_queued_diff;
struct diff_filepair *choice;
const char *paths[1];
int i;

/*
Expand Down Expand Up @@ -228,8 +227,6 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
diff_opts.single_follow = opt->pathspec.raw[0];
diff_opts.break_opt = opt->break_opt;
diff_opts.rename_score = opt->rename_score;
paths[0] = NULL;
init_pathspec(&diff_opts.pathspec, paths);
diff_setup_done(&diff_opts);
diff_tree(t1, t2, base, &diff_opts);
diffcore_std(&diff_opts);
Expand All @@ -247,14 +244,17 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
*/
if ((p->status == 'R' || p->status == 'C') &&
!strcmp(p->two->path, opt->pathspec.raw[0])) {
const char *path[2];

/* Switch the file-pairs around */
q->queue[i] = choice;
choice = p;

/* Update the path we use from now on.. */
path[0] = p->one->path;
path[1] = NULL;
free_pathspec(&opt->pathspec);
opt->pathspec.raw[0] = xstrdup(p->one->path);
init_pathspec(&opt->pathspec, opt->pathspec.raw);
parse_pathspec(&opt->pathspec, PATHSPEC_ALL_MAGIC, 0, "", path);

/*
* The caller expects us to return a set of vanilla
Expand Down

0 comments on commit 9a08727

Please sign in to comment.