From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Apr 2006 22:57:24 +0000 (-0700)
Subject: Retire diffcore-pathspec.
X-Git-Tag: v1.3.0-rc4~17^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77882f6;p=git.git

Retire diffcore-pathspec.

Nobody except diff-stages used it -- the callers instead filtered
the input to diffcore themselves.  Make diff-stages do that as
well and retire diffcore-pathspec.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index 6b10eaa41..a979205ec 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ LIB_H = \
 	tree-walk.h
 
 DIFF_OBJS = \
-	diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
+	diff.o diffcore-break.o diffcore-order.o \
 	diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
 	diffcore-delta.o
 
diff --git a/diff-stages.c b/diff-stages.c
index 9968d6ce1..dcd20e79e 100644
--- a/diff-stages.c
+++ b/diff-stages.c
@@ -11,15 +11,17 @@ static const char diff_stages_usage[] =
 "git-diff-stages [<common diff options>] <stage1> <stage2> [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
-static void diff_stages(int stage1, int stage2)
+static void diff_stages(int stage1, int stage2, const char **pathspec)
 {
 	int i = 0;
 	while (i < active_nr) {
 		struct cache_entry *ce, *stages[4] = { NULL, };
 		struct cache_entry *one, *two;
 		const char *name;
-		int len;
+		int len, skip;
+
 		ce = active_cache[i];
+		skip = !ce_path_match(ce, pathspec);
 		len = ce_namelen(ce);
 		name = ce->name;
 		for (;;) {
@@ -34,7 +36,8 @@ static void diff_stages(int stage1, int stage2)
 		}
 		one = stages[stage1];
 		two = stages[stage2];
-		if (!one && !two)
+
+		if (skip || (!one && !two))
 			continue;
 		if (!one)
 			diff_addremove(&diff_options, '+', ntohl(two->ce_mode),
@@ -54,8 +57,8 @@ static void diff_stages(int stage1, int stage2)
 int main(int ac, const char **av)
 {
 	int stage1, stage2;
-
-	setup_git_directory();
+	const char *prefix = setup_git_directory();
+	const char **pathspec = NULL;
 
 	git_config(git_diff_config);
 	read_cache();
@@ -89,12 +92,12 @@ int main(int ac, const char **av)
 		usage(diff_stages_usage);
 
 	av += 3; /* The rest from av[0] are for paths restriction. */
-	diff_options.paths = av;
+	pathspec = get_pathspec(prefix, av);
 
 	if (diff_setup_done(&diff_options) < 0)
 		usage(diff_stages_usage);
 
-	diff_stages(stage1, stage2);
+	diff_stages(stage1, stage2, pathspec);
 	diffcore_std(&diff_options);
 	diff_flush(&diff_options);
 	return 0;
diff --git a/diff.c b/diff.c
index 30e4d50b9..2fa285a8e 100644
--- a/diff.c
+++ b/diff.c
@@ -1375,8 +1375,6 @@ static void diffcore_apply_filter(const char *filter)
 
 void diffcore_std(struct diff_options *options)
 {
-	if (options->paths && options->paths[0])
-		diffcore_pathspec(options->paths);
 	if (options->break_opt != -1)
 		diffcore_break(options->break_opt);
 	if (options->detect_rename)
diff --git a/diff.h b/diff.h
index 0cebec113..a02ef2820 100644
--- a/diff.h
+++ b/diff.h
@@ -20,7 +20,6 @@ typedef void (*add_remove_fn_t)(struct diff_options *options,
 		    const char *base, const char *path);
 
 struct diff_options {
-	const char **paths;
 	const char *filter;
 	const char *orderfile;
 	const char *pickaxe;
diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
deleted file mode 100644
index 139fe882f..000000000
--- a/diffcore-pathspec.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2005 Junio C Hamano
- */
-#include "cache.h"
-#include "diff.h"
-#include "diffcore.h"
-
-struct path_spec {
-	const char *spec;
-	int len;
-};
-
-static int matches_pathspec(const char *name, struct path_spec *s, int cnt)
-{
-	int i;
-	int namelen;
-
-	if (cnt == 0)
-		return 1;
-
-	namelen = strlen(name);
-	for (i = 0; i < cnt; i++) {
-		int len = s[i].len;
-		if (namelen < len)
-			continue;
-		if (memcmp(s[i].spec, name, len))
-			continue;
-		if (s[i].spec[len-1] == '/' ||
-		    name[len] == 0 ||
-		    name[len] == '/')
-			return 1;
-		if (!len)
-			return 1;
-	}
-	return 0;
-}
-
-void diffcore_pathspec(const char **pathspec)
-{
-	struct diff_queue_struct *q = &diff_queued_diff;
-	int i, speccnt;
-	struct diff_queue_struct outq;
-	struct path_spec *spec;
-
-	outq.queue = NULL;
-	outq.nr = outq.alloc = 0;
-
-	for (i = 0; pathspec[i]; i++)
-		;
-	speccnt = i;
-	if (!speccnt)
-		return;
-
-	spec = xmalloc(sizeof(*spec) * speccnt);
-	for (i = 0; pathspec[i]; i++) {
-		spec[i].spec = pathspec[i];
-		spec[i].len = strlen(pathspec[i]);
-	}
-
-	for (i = 0; i < q->nr; i++) {
-		struct diff_filepair *p = q->queue[i];
-		if (matches_pathspec(p->two->path, spec, speccnt))
-			diff_q(&outq, p);
-		else
-			diff_free_filepair(p);
-	}
-	free(q->queue);
-	*q = outq;
-	return;
-}