[thirdparty/git.git] / diff-cache.c

#include "cache.h"
#include "diff.h"

static int cached_only = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int match_nonexisting = 0;
static int detect_rename = 0;
static int find_copies_harder = 0;
static int diff_setup_opt = 0;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static int pickaxe_opts = 0;
static int diff_break_opt = -1;
static const char *orderfile = NULL;
static const char *diff_filter = NULL;

/* A file entry went away or appeared */
static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
{
	diff_addremove(prefix[0], ntohl(mode), sha1, ce->name, NULL);
}

static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned int *modep)
{
	unsigned char *sha1 = ce->sha1;
	unsigned int mode = ce->ce_mode;

	if (!cached_only) {
		static unsigned char no_sha1[20];
		int changed;
		struct stat st;
		if (lstat(ce->name, &st) < 0) {
			if (errno == ENOENT && match_nonexisting) {
				*sha1p = sha1;
				*modep = mode;
				return 0;
			}
			return -1;
		}
		changed = ce_match_stat(ce, &st);
		if (changed) {
			mode = create_ce_mode(st.st_mode);
			sha1 = no_sha1;
		}
	}

	*sha1p = sha1;
	*modep = mode;
	return 0;
}

static void show_new_file(struct cache_entry *new)
{
	unsigned char *sha1;
	unsigned int mode;

	/* New file in the index: it might actually be different in the working copy */
	if (get_stat_data(new, &sha1, &mode) < 0)
		return;

	show_file("+", new, sha1, mode);
}

static int show_modified(struct cache_entry *old,
			 struct cache_entry *new,
			 int report_missing)
{
	unsigned int mode, oldmode;
	unsigned char *sha1;

	if (get_stat_data(new, &sha1, &mode) < 0) {
		if (report_missing)
			show_file("-", old, old->sha1, old->ce_mode);
		return -1;
	}

	oldmode = old->ce_mode;
	if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
	    !find_copies_harder)
		return 0;

	mode = ntohl(mode);
	oldmode = ntohl(oldmode);

	diff_change(oldmode, mode,
		    old->sha1, sha1, old->name, NULL);
	return 0;
}

static int diff_cache(struct cache_entry **ac, int entries, const char **pathspec)
{
	while (entries) {
		struct cache_entry *ce = *ac;
		int same = (entries > 1) && ce_same_name(ce, ac[1]);

		if (!ce_path_match(ce, pathspec))
			goto skip_entry;

		switch (ce_stage(ce)) {
		case 0:
			/* No stage 1 entry? That means it's a new file */
			if (!same) {
				show_new_file(ce);
				break;
			}
			/* Show difference between old and new */
			show_modified(ac[1], ce, 1);
			break;
		case 1:
			/* No stage 3 (merge) entry? That means it's been deleted */
			if (!same) {
				show_file("-", ce, ce->sha1, ce->ce_mode);
				break;
			}
			/* We come here with ce pointing at stage 1
			 * (original tree) and ac[1] pointing at stage
			 * 3 (unmerged).  show-modified with
			 * report-mising set to false does not say the
			 * file is deleted but reports true if work
			 * tree does not have it, in which case we
			 * fall through to report the unmerged state.
			 * Otherwise, we show the differences between
			 * the original tree and the work tree.
			 */
			if (!cached_only && !show_modified(ce, ac[1], 0))
				break;
			/* fallthru */
		case 3:
			diff_unmerge(ce->name);
			break;

		default:
			die("impossible cache entry stage");
		}

skip_entry:
		/*
		 * Ignore all the different stages for this file,
		 * we've handled the relevant cases now.
		 */
		do {
			ac++;
			entries--;
		} while (entries && ce_same_name(ce, ac[0]));
	}
	return 0;
}

/*
 * This turns all merge entries into "stage 3". That guarantees that
 * when we read in the new tree (into "stage 1"), we won't lose sight
 * of the fact that we had unmerged entries.
 */
static void mark_merge_entries(void)
{
	int i;
	for (i = 0; i < active_nr; i++) {
		struct cache_entry *ce = active_cache[i];
		if (!ce_stage(ce))
			continue;
		ce->ce_flags |= htons(CE_STAGEMASK);
	}
}

static char *diff_cache_usage =
"git-diff-cache [-m] [--cached] "
"[<common diff options>] <tree-ish> [<path>...]"
COMMON_DIFF_OPTIONS_HELP;

int main(int argc, const char **argv)
{
	const char *tree_name = NULL;
	unsigned char sha1[20];
	const char **pathspec = NULL;
	void *tree;
	unsigned long size;
	int ret;
	int allow_options = 1;
	int i;

	read_cache();
	for (i = 1; i < argc; i++) {
		const char *arg = argv[i];

		if (!allow_options || *arg != '-') {
			if (tree_name) {
				pathspec = argv + i;
				break;
			}
			tree_name = arg;
			continue;
		}
			
		if (!strcmp(arg, "--")) {
			allow_options = 0;
			continue;
		}
		if (!strcmp(arg, "-r")) {
			/* We accept the -r flag just to look like git-diff-tree */
			continue;
		}
		/* We accept the -u flag as a synonym for "-p" */
		if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
			diff_output_format = DIFF_FORMAT_PATCH;
			continue;
		}
		if (!strncmp(arg, "-B", 2)) {
			if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
				usage(diff_cache_usage);
			continue;
		}
		if (!strncmp(arg, "-M", 2)) {
			detect_rename = DIFF_DETECT_RENAME;
			if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
				usage(diff_cache_usage);
			continue;
		}
		if (!strncmp(arg, "-C", 2)) {
			detect_rename = DIFF_DETECT_COPY;
			if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
				usage(diff_cache_usage);
			continue;
		}
		if (!strcmp(arg, "--find-copies-harder")) {
			find_copies_harder = 1;
			continue;
		}
		if (!strcmp(arg, "-z")) {
			diff_output_format = DIFF_FORMAT_MACHINE;
			continue;
		}
		if (!strcmp(arg, "--name-only")) {
			diff_output_format = DIFF_FORMAT_NAME;
			continue;
		}
		if (!strcmp(arg, "--name-only-z")) {
			diff_output_format = DIFF_FORMAT_NAME_Z;
			continue;
		}
		if (!strcmp(arg, "-R")) {
			diff_setup_opt |= DIFF_SETUP_REVERSE;
			continue;
		}
		if (!strncmp(arg, "-S", 2)) {
			pickaxe = arg + 2;
			continue;
		}
		if (!strncmp(arg, "--diff-filter=", 14)) {
			diff_filter = arg + 14;
			continue;
		}
		if (!strncmp(arg, "-O", 2)) {
			orderfile = arg + 2;
			continue;
		}
		if (!strcmp(arg, "--pickaxe-all")) {
			pickaxe_opts = DIFF_PICKAXE_ALL;
			continue;
		}
		if (!strcmp(arg, "-m")) {
			match_nonexisting = 1;
			continue;
		}
		if (!strcmp(arg, "--cached")) {
			cached_only = 1;
			continue;
		}
		usage(diff_cache_usage);
	}

	if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
		usage(diff_cache_usage);

	if (!tree_name || get_sha1(tree_name, sha1))
		usage(diff_cache_usage);

	/* The rest is for paths restriction. */
	diff_setup(diff_setup_opt);

	mark_merge_entries();

	tree = read_object_with_reference(sha1, "tree", &size, NULL);
	if (!tree)
		die("bad tree object %s", tree_name);
	if (read_tree(tree, size, 1, pathspec))
		die("unable to read tree object %s", tree_name);

	ret = diff_cache(active_cache, active_nr, pathspec);

	diffcore_std(pathspec,
		     detect_rename, diff_score_opt,
		     pickaxe, pickaxe_opts,
		     diff_break_opt,
		     orderfile, diff_filter);
	diff_flush(diff_output_format);
	return ret;
}
Commit	Line	Data
e74f8f6a	1	#include "cache.h"
f92a4465	2	#include "diff.h"
e74f8f6a LT	3
e74f8f6a LT	4	static int cached_only = 0;
81e50eab	5	static int diff_output_format = DIFF_FORMAT_HUMAN;
160c8433	6	static int match_nonexisting = 0;
5c97558c	7	static int detect_rename = 0;
4727f640	8	static int find_copies_harder = 0;
19feebc8	9	static int diff_setup_opt = 0;
57fe64a4	10	static int diff_score_opt = 0;
057c7d30	11	static const char *pickaxe = NULL;
367cec1c	12	static int pickaxe_opts = 0;
f345b0a0	13	static int diff_break_opt = -1;
af5323e0	14	static const char *orderfile = NULL;
f2ce9fde	15	static const char *diff_filter = NULL;
e74f8f6a	16
e74f8f6a	17	/* A file entry went away or appeared */
c9cddabe	18	static void show_file(const char prefix, struct cache_entry ce, unsigned char *sha1, unsigned int mode)
e74f8f6a	19	{
57fe64a4	20	diff_addremove(prefix[0], ntohl(mode), sha1, ce->name, NULL);
e74f8f6a LT	21	}
e74f8f6a LT	22
c9cddabe	23	static int get_stat_data(struct cache_entry ce, unsigned char sha1p, unsigned int modep)
e74f8f6a	24	{
c9cddabe LT	25	unsigned char *sha1 = ce->sha1;
c9cddabe LT	26	unsigned int mode = ce->ce_mode;
e74f8f6a LT	27
	28	if (!cached_only) {
	29	static unsigned char no_sha1[20];
b5af9107	30	int changed;
e74f8f6a	31	struct stat st;
160c8433 LT	32	if (lstat(ce->name, &st) < 0) {
	33	if (errno == ENOENT && match_nonexisting) {
	34	*sha1p = sha1;
	35	*modep = mode;
	36	return 0;
	37	}
e74f8f6a	38	return -1;
160c8433	39	}
5d728c84	40	changed = ce_match_stat(ce, &st);
e74f8f6a	41	if (changed) {
c9cddabe	42	mode = create_ce_mode(st.st_mode);
b5af9107	43	sha1 = no_sha1;
e74f8f6a LT	44	}
	45	}
	46
c9cddabe LT	47	*sha1p = sha1;
	48	*modep = mode;
	49	return 0;
	50	}
	51
b836825b	52	static void show_new_file(struct cache_entry *new)
c9cddabe LT	53	{
	54	unsigned char *sha1;
	55	unsigned int mode;
	56
	57	/* New file in the index: it might actually be different in the working copy */
	58	if (get_stat_data(new, &sha1, &mode) < 0)
b836825b	59	return;
c9cddabe LT	60
	61	show_file("+", new, sha1, mode);
	62	}
	63
66026590 JH	64	static int show_modified(struct cache_entry *old,
	65	struct cache_entry *new,
	66	int report_missing)
c9cddabe LT	67	{
	68	unsigned int mode, oldmode;
	69	unsigned char *sha1;
c9cddabe LT	70
c9cddabe LT	71	if (get_stat_data(new, &sha1, &mode) < 0) {
66026590 JH	72	if (report_missing)
66026590 JH	73	show_file("-", old, old->sha1, old->ce_mode);
c9cddabe LT	74	return -1;
	75	}
	76
	77	oldmode = old->ce_mode;
c3e7fbcb	78	if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
4727f640	79	!find_copies_harder)
e74f8f6a LT	80	return 0;
e74f8f6a LT	81
c9cddabe LT	82	mode = ntohl(mode);
	83	oldmode = ntohl(oldmode);
	84
57fe64a4 JH	85	diff_change(oldmode, mode,
57fe64a4 JH	86	old->sha1, sha1, old->name, NULL);
e74f8f6a LT	87	return 0;
	88	}
	89
fdee7d07	90	static int diff_cache(struct cache_entry ac, int entries, const char pathspec)
e74f8f6a	91	{
b5af9107 LT	92	while (entries) {
b5af9107 LT	93	struct cache_entry ce = ac;
dbbce55b	94	int same = (entries > 1) && ce_same_name(ce, ac[1]);
e74f8f6a	95
fdee7d07 LT	96	if (!ce_path_match(ce, pathspec))
	97	goto skip_entry;
	98
b0fe89ca LT	99	switch (ce_stage(ce)) {
	100	case 0:
	101	/* No stage 1 entry? That means it's a new file */
	102	if (!same) {
c9cddabe	103	show_new_file(ce);
b0fe89ca LT	104	break;
	105	}
	106	/* Show difference between old and new */
66026590	107	show_modified(ac[1], ce, 1);
b0fe89ca LT	108	break;
	109	case 1:
	110	/* No stage 3 (merge) entry? That means it's been deleted */
	111	if (!same) {
c9cddabe	112	show_file("-", ce, ce->sha1, ce->ce_mode);
b0fe89ca LT	113	break;
b0fe89ca LT	114	}
66026590 JH	115	/* We come here with ce pointing at stage 1
	116	* (original tree) and ac[1] pointing at stage
	117	* 3 (unmerged). show-modified with
	118	* report-mising set to false does not say the
	119	* file is deleted but reports true if work
	120	* tree does not have it, in which case we
	121	* fall through to report the unmerged state.
	122	* Otherwise, we show the differences between
	123	* the original tree and the work tree.
	124	*/
	125	if (!cached_only && !show_modified(ce, ac[1], 0))
	126	break;
	127	/* fallthru */
b0fe89ca	128	case 3:
57fe64a4	129	diff_unmerge(ce->name);
b0fe89ca LT	130	break;
	131
	132	default:
	133	die("impossible cache entry stage");
e74f8f6a	134	}
b0fe89ca	135
fdee7d07	136	skip_entry:
b0fe89ca LT	137	/*
	138	* Ignore all the different stages for this file,
	139	* we've handled the relevant cases now.
	140	*/
	141	do {
e74f8f6a LT	142	ac++;
e74f8f6a LT	143	entries--;
dbbce55b	144	} while (entries && ce_same_name(ce, ac[0]));
e74f8f6a LT	145	}
	146	return 0;
	147	}
	148
b0fe89ca LT	149	/*
	150	* This turns all merge entries into "stage 3". That guarantees that
	151	* when we read in the new tree (into "stage 1"), we won't lose sight
	152	* of the fact that we had unmerged entries.
	153	*/
	154	static void mark_merge_entries(void)
b5af9107 LT	155	{
	156	int i;
	157	for (i = 0; i < active_nr; i++) {
	158	struct cache_entry *ce = active_cache[i];
	159	if (!ce_stage(ce))
5697ecc7	160	continue;
b0fe89ca	161	ce->ce_flags \|= htons(CE_STAGEMASK);
b5af9107 LT	162	}
	163	}
	164
f92a4465	165	static char *diff_cache_usage =
dda2d79a JH	166	"git-diff-cache [-m] [--cached] "
	167	"[<common diff options>] <tree-ish> [<path>...]"
	168	COMMON_DIFF_OPTIONS_HELP;
c5bac17a	169
6b14d7fa	170	int main(int argc, const char **argv)
e74f8f6a	171	{
6c56c534 LT	172	const char *tree_name = NULL;
	173	unsigned char sha1[20];
	174	const char **pathspec = NULL;
e74f8f6a LT	175	void *tree;
e74f8f6a LT	176	unsigned long size;
5c97558c	177	int ret;
e0f0e891	178	int allow_options = 1;
6c56c534	179	int i;
e74f8f6a LT	180
e74f8f6a LT	181	read_cache();
6c56c534 LT	182	for (i = 1; i < argc; i++) {
	183	const char *arg = argv[i];
	184
e0f0e891	185	if (!allow_options \|\| *arg != '-') {
6c56c534 LT	186	if (tree_name) {
	187	pathspec = argv + i;
	188	break;
	189	}
	190	tree_name = arg;
	191	continue;
	192	}
	193
e0f0e891 JF	194	if (!strcmp(arg, "--")) {
	195	allow_options = 0;
	196	continue;
	197	}
e74f8f6a	198	if (!strcmp(arg, "-r")) {
667bb59b	199	/* We accept the -r flag just to look like git-diff-tree */
e74f8f6a LT	200	continue;
e74f8f6a LT	201	}
acb46f87 LT	202	/* We accept the -u flag as a synonym for "-p" */
acb46f87 LT	203	if (!strcmp(arg, "-p") \|\| !strcmp(arg, "-u")) {
81e50eab	204	diff_output_format = DIFF_FORMAT_PATCH;
f92a4465 JH	205	continue;
f92a4465 JH	206	}
f345b0a0	207	if (!strncmp(arg, "-B", 2)) {
0e3994fa JH	208	if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
0e3994fa JH	209	usage(diff_cache_usage);
f345b0a0 JH	210	continue;
f345b0a0 JH	211	}
57fe64a4	212	if (!strncmp(arg, "-M", 2)) {
6b14d7fa	213	detect_rename = DIFF_DETECT_RENAME;
0e3994fa JH	214	if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
0e3994fa JH	215	usage(diff_cache_usage);
5c97558c JH	216	continue;
5c97558c JH	217	}
427dcb4b	218	if (!strncmp(arg, "-C", 2)) {
6b14d7fa	219	detect_rename = DIFF_DETECT_COPY;
0e3994fa JH	220	if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
0e3994fa JH	221	usage(diff_cache_usage);
427dcb4b JH	222	continue;
427dcb4b JH	223	}
4727f640 JH	224	if (!strcmp(arg, "--find-copies-harder")) {
	225	find_copies_harder = 1;
	226	continue;
	227	}
e74f8f6a	228	if (!strcmp(arg, "-z")) {
81e50eab	229	diff_output_format = DIFF_FORMAT_MACHINE;
e74f8f6a LT	230	continue;
e74f8f6a LT	231	}
52f28529 JH	232	if (!strcmp(arg, "--name-only")) {
	233	diff_output_format = DIFF_FORMAT_NAME;
	234	continue;
	235	}
	236	if (!strcmp(arg, "--name-only-z")) {
	237	diff_output_format = DIFF_FORMAT_NAME_Z;
	238	continue;
	239	}
57fe64a4	240	if (!strcmp(arg, "-R")) {
19feebc8	241	diff_setup_opt \|= DIFF_SETUP_REVERSE;
57fe64a4 JH	242	continue;
57fe64a4 JH	243	}
e25de756	244	if (!strncmp(arg, "-S", 2)) {
52e95789 JH	245	pickaxe = arg + 2;
	246	continue;
	247	}
f2ce9fde JH	248	if (!strncmp(arg, "--diff-filter=", 14)) {
	249	diff_filter = arg + 14;
	250	continue;
	251	}
af5323e0 JH	252	if (!strncmp(arg, "-O", 2)) {
	253	orderfile = arg + 2;
	254	continue;
	255	}
367cec1c JH	256	if (!strcmp(arg, "--pickaxe-all")) {
	257	pickaxe_opts = DIFF_PICKAXE_ALL;
	258	continue;
	259	}
160c8433 LT	260	if (!strcmp(arg, "-m")) {
	261	match_nonexisting = 1;
	262	continue;
	263	}
e74f8f6a LT	264	if (!strcmp(arg, "--cached")) {
	265	cached_only = 1;
	266	continue;
	267	}
c5bac17a	268	usage(diff_cache_usage);
e74f8f6a LT	269	}
e74f8f6a LT	270
4727f640 JH	271	if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
	272	usage(diff_cache_usage);
	273
6c56c534	274	if (!tree_name \|\| get_sha1(tree_name, sha1))
c5bac17a	275	usage(diff_cache_usage);
e74f8f6a	276
6b14d7fa	277	/* The rest is for paths restriction. */
19feebc8	278	diff_setup(diff_setup_opt);
5c97558c	279
b0fe89ca	280	mark_merge_entries();
b5af9107	281
6c56c534	282	tree = read_object_with_reference(sha1, "tree", &size, NULL);
e74f8f6a	283	if (!tree)
6c56c534	284	die("bad tree object %s", tree_name);
a74ba54b	285	if (read_tree(tree, size, 1, pathspec))
6c56c534	286	die("unable to read tree object %s", tree_name);
e74f8f6a	287
fdee7d07	288	ret = diff_cache(active_cache, active_nr, pathspec);
f345b0a0	289
a74ba54b	290	diffcore_std(pathspec,
befe8639	291	detect_rename, diff_score_opt,
f345b0a0	292	pickaxe, pickaxe_opts,
af5323e0	293	diff_break_opt,
f2ce9fde JH	294	orderfile, diff_filter);
f2ce9fde JH	295	diff_flush(diff_output_format);
5c97558c	296	return ret;
e74f8f6a	297	}