check-ignore: convert to use parse_pathspec

pclouds · gitster · commit 931eab64ad24 · 2013-07-15T10:56:07.000-07:00
check-ignore (at least the test suite) seems to rely on the pattern
order. PATHSPEC_KEEP_ORDER is introduced to explictly express this.
The lack of PATHSPEC_MAXDEPTH_VALID is sufficient because it's the
only flag that reorders pathspecs, but it's less obvious that way.

Cc: Adam Spiers &lt;git@adamspiers.org&gt;
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
@@ -64,37 +64,45 @@ static void output_exclude(const char *path, struct exclude *exclude)
 }
 
 static int check_ignore(struct dir_struct *dir,
-			const char *prefix, const char **pathspec)
+			const char *prefix, int argc, const char **argv)
 {
-	const char *path, *full_path;
+	const char *full_path;
 	char *seen;
 	int num_ignored = 0, dtype = DT_UNKNOWN, i;
 	struct exclude *exclude;
+	struct pathspec pathspec;
 
-	if (!pathspec || !*pathspec) {
+	if (!argc) {
 		if (!quiet)
 			fprintf(stderr, "no pathspec given.\n");
 		return 0;
 	}
 
+	/*
+	 * check-ignore just needs paths. Magic beyond :/ is really
+	 * irrelevant.
+	 */
+	parse_pathspec(&pathspec,
+		       PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP,
+		       PATHSPEC_SYMLINK_LEADING_PATH |
+		       PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE |
+		       PATHSPEC_KEEP_ORDER,
+		       prefix, argv);
+
 	/*
 	 * look for pathspecs matching entries in the index, since these
 	 * should not be ignored, in order to be consistent with
 	 * 'git status', 'git add' etc.
 	 */
-	seen = find_pathspecs_matching_against_index(pathspec);
-	for (i = 0; pathspec[i]; i++) {
-		path = pathspec[i];
-		full_path = prefix_path(prefix, prefix
-					? strlen(prefix) : 0, path);
-		full_path = check_path_for_gitlink(full_path);
-		die_if_path_beyond_symlink(full_path, prefix);
+	seen = find_pathspecs_matching_against_index(pathspec.raw);
+	for (i = 0; i < pathspec.nr; i++) {
+		full_path = pathspec.raw[i];
 		exclude = NULL;
 		if (!seen[i]) {
 			exclude = last_exclude_matching(dir, full_path, &dtype);
 		}
 		if (!quiet && (exclude || show_non_matching))
-			output_exclude(path, exclude);
+			output_exclude(pathspec.items[i].original, exclude);
 		if (exclude)
 			num_ignored++;
 	}
@@ -120,7 +128,8 @@ static int check_ignore_stdin_paths(struct dir_struct *dir, const char *prefix)
 			strbuf_swap(&buf, &nbuf);
 		}
 		pathspec[0] = buf.buf;
-		num_ignored += check_ignore(dir, prefix, (const char **)pathspec);
+		num_ignored += check_ignore(dir, prefix,
+					    1, (const char **)pathspec);
 		maybe_flush_or_die(stdout, "check-ignore to stdout");
 	}
 	strbuf_release(&buf);
@@ -166,7 +175,7 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix)
 	if (stdin_paths) {
 		num_ignored = check_ignore_stdin_paths(&dir, prefix);
 	} else {
-		num_ignored = check_ignore(&dir, prefix, argv);
+		num_ignored = check_ignore(&dir, prefix, argc, argv);
 		maybe_flush_or_die(stdout, "ignore to stdout");
 	}
 
diff --git a/pathspec.c b/pathspec.c
@@ -370,9 +370,13 @@ void parse_pathspec(struct pathspec *pathspec,
 		pathspec->magic |= item[i].magic;
 	}
 
-	if (pathspec->magic & PATHSPEC_MAXDEPTH)
+
+	if (pathspec->magic & PATHSPEC_MAXDEPTH) {
+		if (flags & PATHSPEC_KEEP_ORDER)
+			die("BUG: PATHSPEC_MAXDEPTH_VALID and PATHSPEC_KEEP_ORDER are incompatible");
 		qsort(pathspec->items, pathspec->nr,
 		      sizeof(struct pathspec_item), pathspec_item_cmp);
+	}
 }
 
 /*
diff --git a/pathspec.h b/pathspec.h
@@ -51,6 +51,7 @@ struct pathspec {
  */
 #define PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE (1<<5)
 #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,
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
@@ -432,15 +432,15 @@ test_expect_success_multi SYMLINKS 'symlink' '::	a/symlink' '
 
 test_expect_success_multi SYMLINKS 'beyond a symlink' '' '
 	test_check_ignore "a/symlink/foo" 128 &&
-	test_stderr "fatal: '\''a/symlink/foo'\'' is beyond a symbolic link"
+	test_stderr "fatal: pathspec '\''a/symlink/foo'\'' is beyond a symbolic link"
 '
 
 test_expect_success_multi SYMLINKS 'beyond a symlink from subdirectory' '' '
 	(
 		cd a &&
 		test_check_ignore "symlink/foo" 128
 	) &&
-	test_stderr "fatal: '\''symlink/foo'\'' is beyond a symbolic link"
+	test_stderr "fatal: pathspec '\''symlink/foo'\'' is beyond a symbolic link"
 '
 
 ############################################################################
@@ -449,15 +449,15 @@ test_expect_success_multi SYMLINKS 'beyond a symlink from subdirectory' '' '
 
 test_expect_success_multi 'submodule' '' '
 	test_check_ignore "a/submodule/one" 128 &&
-	test_stderr "fatal: Path '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''"
+	test_stderr "fatal: Pathspec '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''"
 '
 
 test_expect_success_multi 'submodule from subdirectory' '' '
 	(
 		cd a &&
 		test_check_ignore "submodule/one" 128
 	) &&
-	test_stderr "fatal: Path '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''"
+	test_stderr "fatal: Pathspec '\''submodule/one'\'' is in submodule '\''a/submodule'\''"
 '
 
 ############################################################################

Original file line number	Diff line number	Diff line change
`@@ -370,9 +370,13 @@ void parse_pathspec(struct pathspec *pathspec,`
`370`	`370`	`pathspec->magic \|= item[i].magic;`
`371`	`371`	`}`
`372`	`372`
`373`		`- if (pathspec->magic & PATHSPEC_MAXDEPTH)`
	`373`	`+`
	`374`	`+ if (pathspec->magic & PATHSPEC_MAXDEPTH) {`
	`375`	`+ if (flags & PATHSPEC_KEEP_ORDER)`
	`376`	`+ die("BUG: PATHSPEC_MAXDEPTH_VALID and PATHSPEC_KEEP_ORDER are incompatible");`
`374`	`377`	`qsort(pathspec->items, pathspec->nr,`
`375`	`378`	`sizeof(struct pathspec_item), pathspec_item_cmp);`
	`379`	`+ }`
`376`	`380`	`}`
`377`	`381`
`378`	`382`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -432,15 +432,15 @@ test_expect_success_multi SYMLINKS 'symlink' ':: a/symlink' '`
`432`	`432`
`433`	`433`	`test_expect_success_multi SYMLINKS 'beyond a symlink' '' '`
`434`	`434`	`test_check_ignore "a/symlink/foo" 128 &&`
`435`		`- test_stderr "fatal: '\''a/symlink/foo'\'' is beyond a symbolic link"`
	`435`	`+ test_stderr "fatal: pathspec '\''a/symlink/foo'\'' is beyond a symbolic link"`
`436`	`436`	`'`
`437`	`437`
`438`	`438`	`test_expect_success_multi SYMLINKS 'beyond a symlink from subdirectory' '' '`
`439`	`439`	`(`
`440`	`440`	`cd a &&`
`441`	`441`	`test_check_ignore "symlink/foo" 128`
`442`	`442`	`) &&`
`443`		`- test_stderr "fatal: '\''symlink/foo'\'' is beyond a symbolic link"`
	`443`	`+ test_stderr "fatal: pathspec '\''symlink/foo'\'' is beyond a symbolic link"`
`444`	`444`	`'`
`445`	`445`
`446`	`446`	`############################################################################`
`@@ -449,15 +449,15 @@ test_expect_success_multi SYMLINKS 'beyond a symlink from subdirectory' '' '`
`449`	`449`
`450`	`450`	`test_expect_success_multi 'submodule' '' '`
`451`	`451`	`test_check_ignore "a/submodule/one" 128 &&`
`452`		`- test_stderr "fatal: Path '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''"`
	`452`	`+ test_stderr "fatal: Pathspec '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''"`
`453`	`453`	`'`
`454`	`454`
`455`	`455`	`test_expect_success_multi 'submodule from subdirectory' '' '`
`456`	`456`	`(`
`457`	`457`	`cd a &&`
`458`	`458`	`test_check_ignore "submodule/one" 128`
`459`	`459`	`) &&`
`460`		`- test_stderr "fatal: Path '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''"`
	`460`	`+ test_stderr "fatal: Pathspec '\''submodule/one'\'' is in submodule '\''a/submodule'\''"`
`461`	`461`	`'`
`462`	`462`
`463`	`463`	`############################################################################`