X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-files.c;h=b9d193d506d9e67eb5f0c24905aa6d691ccff301;hb=ea92f41ff92b2fef54c8da4abb03c8101160a034;hp=fb345a5161c2a49ea36f697197fde057248b687b;hpb=667bb59b2d5b0a2e7fca5970d6f757790a6edd74;p=git.git

diff --git a/diff-files.c b/diff-files.c
index fb345a51..b9d193d5 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -5,141 +5,50 @@
  */
 #include "cache.h"
 #include "diff.h"
+#include "commit.h"
+#include "revision.h"
 
-static const char *diff_files_usage =
-"git-diff-files [-p] [-q] [-r] [-z] [-M] [paths...]";
+static const char diff_files_usage[] =
+"git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
-static int generate_patch = 0;
-static int line_termination = '\n';
-static int detect_rename = 0;
-static int silent = 0;
-
-static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
-{
-	int i;
-	int namelen = ce_namelen(ce);
-	for (i = 0; i < cnt; i++) {
-		int speclen = strlen(spec[i]);
-		if (! strncmp(spec[i], ce->name, speclen) &&
-		    speclen <= namelen &&
-		    (ce->name[speclen] == 0 ||
-		     ce->name[speclen] == '/'))
-			return 1;
-	}
-	return 0;
-}
-
-static void show_unmerge(const char *path)
-{
-	if (generate_patch)
-		diff_unmerge(path);
-	else
-		printf("U %s%c", path, line_termination);
-}
-
-static void show_file(int pfx, struct cache_entry *ce)
-{
-	if (generate_patch)
-		diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1,
-			       ce->name, NULL);
-	else
-		printf("%c%06o\t%s\t%s\t%s%c",
-		       pfx, ntohl(ce->ce_mode), "blob",
-		       sha1_to_hex(ce->sha1), ce->name, line_termination);
-}
-
-static void show_modified(int oldmode, int mode,
-			  const unsigned char *old_sha1, const unsigned char *sha1,
-			  char *path)
+int main(int argc, const char **argv)
 {
-	char old_sha1_hex[41];
-	strcpy(old_sha1_hex, sha1_to_hex(old_sha1));
-
-	if (generate_patch)
-		diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
-	else
-		printf("*%06o->%06o\tblob\t%s->%s\t%s%c",
-		       oldmode, mode, old_sha1_hex, sha1_to_hex(sha1), path,
-		       line_termination);
-}
+	struct rev_info rev;
+	int silent = 0;
 
-int main(int argc, char **argv)
-{
-	static const unsigned char null_sha1[20] = { 0, };
-	int entries = read_cache();
-	int i;
+	git_config(git_diff_config);
+	init_revisions(&rev);
+	rev.abbrev = 0;
 
+	argc = setup_revisions(argc, argv, &rev, NULL);
 	while (1 < argc && argv[1][0] == '-') {
-		if (!strcmp(argv[1], "-p"))
-			generate_patch = 1;
+		if (!strcmp(argv[1], "--base"))
+			rev.max_count = 1;
+		else if (!strcmp(argv[1], "--ours"))
+			rev.max_count = 2;
+		else if (!strcmp(argv[1], "--theirs"))
+			rev.max_count = 3;
 		else if (!strcmp(argv[1], "-q"))
 			silent = 1;
-		else if (!strcmp(argv[1], "-r"))
-			; /* no-op */
-		else if (!strcmp(argv[1], "-s"))
-			; /* no-op */
-		else if (!strcmp(argv[1], "-z"))
-			line_termination = 0;
-		else if (!strcmp(argv[1], "-M")) {
-			detect_rename = generate_patch = 1;
-		}
 		else
 			usage(diff_files_usage);
 		argv++; argc--;
 	}
-
-	/* At this point, if argc == 1, then we are doing everything.
-	 * Otherwise argv[1] .. argv[argc-1] have the explicit paths.
+	/*
+	 * Make sure there are NO revision (i.e. pending object) parameter,
+	 * rev.max_count is reasonable (0 <= n <= 3),
+	 * there is no other revision filtering parameters.
 	 */
-	if (entries < 0) {
-		perror("read_cache");
-		exit(1);
-	}
-
-	if (generate_patch)
-		diff_setup(detect_rename, 0, 0, 0, 0);		
-
-	for (i = 0; i < entries; i++) {
-		struct stat st;
-		unsigned int oldmode, mode;
-		struct cache_entry *ce = active_cache[i];
-		int changed;
-
-		if (1 < argc &&
-		    ! matches_pathspec(ce, argv+1, argc-1))
-			continue;
-
-		if (ce_stage(ce)) {
-			show_unmerge(ce->name);
-			while (i < entries &&
-			       !strcmp(ce->name, active_cache[i]->name))
-				i++;
-			i--; /* compensate for loop control increments */
-			continue;
-		}
- 
-		if (lstat(ce->name, &st) < 0) {
-			if (errno != ENOENT) {
-				perror(ce->name);
-				continue;
-			}	
-			if (silent)
-				continue;
-			show_file('-', ce);
-			continue;
-		}
-		changed = ce_match_stat(ce, &st);
-		if (!changed)
-			continue;
-
-		oldmode = ntohl(ce->ce_mode);
-		mode = (S_ISLNK(st.st_mode) ? S_IFLNK :
-			S_IFREG | ce_permissions(st.st_mode));
-
-		show_modified(oldmode, mode, ce->sha1, null_sha1,
-			      ce->name);
-	}
-	if (generate_patch)
-		diff_flush();
-	return 0;
+	if (rev.pending_objects ||
+	    rev.min_age != -1 || rev.max_age != -1)
+		usage(diff_files_usage);
+	/*
+	 * Backward compatibility wart - "diff-files -s" used to
+	 * defeat the common diff option "-s" which asked for
+	 * DIFF_FORMAT_NO_OUTPUT.
+	 */
+	if (rev.diffopt.output_format == DIFF_FORMAT_NO_OUTPUT)
+		rev.diffopt.output_format = DIFF_FORMAT_RAW;
+	return run_diff_files(&rev, silent);
 }