[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)
{
	while (entries) {
		struct cache_entry *ce = *ac;
		int same = (entries > 1) && ce_same_name(ce, ac[1]);

		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");
		}

		/*
		 * 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 [-p] [-r] [-z] [-m] [--cached] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> [<path>...]";

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;
		}
		if (!strcmp(arg, "-p")) {
			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, "-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))
		die("unable to read tree object %s", tree_name);

	ret = diff_cache(active_cache, active_nr);

	diffcore_std(pathspec ? : NULL,
		     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
b5af9107	90	static int diff_cache(struct cache_entry **ac, int entries)
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
b0fe89ca LT	96	switch (ce_stage(ce)) {
	97	case 0:
	98	/* No stage 1 entry? That means it's a new file */
	99	if (!same) {
c9cddabe	100	show_new_file(ce);
b0fe89ca LT	101	break;
	102	}
	103	/* Show difference between old and new */
66026590	104	show_modified(ac[1], ce, 1);
b0fe89ca LT	105	break;
	106	case 1:
	107	/* No stage 3 (merge) entry? That means it's been deleted */
	108	if (!same) {
c9cddabe	109	show_file("-", ce, ce->sha1, ce->ce_mode);
b0fe89ca LT	110	break;
b0fe89ca LT	111	}
66026590 JH	112	/* We come here with ce pointing at stage 1
	113	* (original tree) and ac[1] pointing at stage
	114	* 3 (unmerged). show-modified with
	115	* report-mising set to false does not say the
	116	* file is deleted but reports true if work
	117	* tree does not have it, in which case we
	118	* fall through to report the unmerged state.
	119	* Otherwise, we show the differences between
	120	* the original tree and the work tree.
	121	*/
	122	if (!cached_only && !show_modified(ce, ac[1], 0))
	123	break;
	124	/* fallthru */
b0fe89ca	125	case 3:
57fe64a4	126	diff_unmerge(ce->name);
b0fe89ca LT	127	break;
	128
	129	default:
	130	die("impossible cache entry stage");
e74f8f6a	131	}
b0fe89ca LT	132
	133	/*
	134	* Ignore all the different stages for this file,
	135	* we've handled the relevant cases now.
	136	*/
	137	do {
e74f8f6a LT	138	ac++;
e74f8f6a LT	139	entries--;
dbbce55b	140	} while (entries && ce_same_name(ce, ac[0]));
e74f8f6a LT	141	}
	142	return 0;
	143	}
	144
b0fe89ca LT	145	/*
	146	* This turns all merge entries into "stage 3". That guarantees that
	147	* when we read in the new tree (into "stage 1"), we won't lose sight
	148	* of the fact that we had unmerged entries.
	149	*/
	150	static void mark_merge_entries(void)
b5af9107 LT	151	{
	152	int i;
	153	for (i = 0; i < active_nr; i++) {
	154	struct cache_entry *ce = active_cache[i];
	155	if (!ce_stage(ce))
5697ecc7	156	continue;
b0fe89ca	157	ce->ce_flags \|= htons(CE_STAGEMASK);
b5af9107 LT	158	}
	159	}
	160
f92a4465	161	static char *diff_cache_usage =
4727f640	162	"git-diff-cache [-p] [-r] [-z] [-m] [--cached] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> [<path>...]";
c5bac17a	163
6b14d7fa	164	int main(int argc, const char **argv)
e74f8f6a	165	{
6c56c534 LT	166	const char *tree_name = NULL;
	167	unsigned char sha1[20];
	168	const char **pathspec = NULL;
e74f8f6a LT	169	void *tree;
e74f8f6a LT	170	unsigned long size;
5c97558c	171	int ret;
e0f0e891	172	int allow_options = 1;
6c56c534	173	int i;
e74f8f6a LT	174
e74f8f6a LT	175	read_cache();
6c56c534 LT	176	for (i = 1; i < argc; i++) {
	177	const char *arg = argv[i];
	178
e0f0e891	179	if (!allow_options \|\| *arg != '-') {
6c56c534 LT	180	if (tree_name) {
	181	pathspec = argv + i;
	182	break;
	183	}
	184	tree_name = arg;
	185	continue;
	186	}
	187
e0f0e891 JF	188	if (!strcmp(arg, "--")) {
	189	allow_options = 0;
	190	continue;
	191	}
e74f8f6a	192	if (!strcmp(arg, "-r")) {
667bb59b	193	/* We accept the -r flag just to look like git-diff-tree */
e74f8f6a LT	194	continue;
e74f8f6a LT	195	}
f92a4465	196	if (!strcmp(arg, "-p")) {
81e50eab	197	diff_output_format = DIFF_FORMAT_PATCH;
f92a4465 JH	198	continue;
f92a4465 JH	199	}
f345b0a0	200	if (!strncmp(arg, "-B", 2)) {
0e3994fa JH	201	if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
0e3994fa JH	202	usage(diff_cache_usage);
f345b0a0 JH	203	continue;
f345b0a0 JH	204	}
57fe64a4	205	if (!strncmp(arg, "-M", 2)) {
6b14d7fa	206	detect_rename = DIFF_DETECT_RENAME;
0e3994fa JH	207	if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
0e3994fa JH	208	usage(diff_cache_usage);
5c97558c JH	209	continue;
5c97558c JH	210	}
427dcb4b	211	if (!strncmp(arg, "-C", 2)) {
6b14d7fa	212	detect_rename = DIFF_DETECT_COPY;
0e3994fa JH	213	if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
0e3994fa JH	214	usage(diff_cache_usage);
427dcb4b JH	215	continue;
427dcb4b JH	216	}
4727f640 JH	217	if (!strcmp(arg, "--find-copies-harder")) {
	218	find_copies_harder = 1;
	219	continue;
	220	}
e74f8f6a	221	if (!strcmp(arg, "-z")) {
81e50eab	222	diff_output_format = DIFF_FORMAT_MACHINE;
e74f8f6a LT	223	continue;
e74f8f6a LT	224	}
57fe64a4	225	if (!strcmp(arg, "-R")) {
19feebc8	226	diff_setup_opt \|= DIFF_SETUP_REVERSE;
57fe64a4 JH	227	continue;
57fe64a4 JH	228	}
e25de756	229	if (!strncmp(arg, "-S", 2)) {
52e95789 JH	230	pickaxe = arg + 2;
	231	continue;
	232	}
f2ce9fde JH	233	if (!strncmp(arg, "--diff-filter=", 14)) {
	234	diff_filter = arg + 14;
	235	continue;
	236	}
af5323e0 JH	237	if (!strncmp(arg, "-O", 2)) {
	238	orderfile = arg + 2;
	239	continue;
	240	}
367cec1c JH	241	if (!strcmp(arg, "--pickaxe-all")) {
	242	pickaxe_opts = DIFF_PICKAXE_ALL;
	243	continue;
	244	}
160c8433 LT	245	if (!strcmp(arg, "-m")) {
	246	match_nonexisting = 1;
	247	continue;
	248	}
e74f8f6a LT	249	if (!strcmp(arg, "--cached")) {
	250	cached_only = 1;
	251	continue;
	252	}
c5bac17a	253	usage(diff_cache_usage);
e74f8f6a LT	254	}
e74f8f6a LT	255
4727f640 JH	256	if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
	257	usage(diff_cache_usage);
	258
6c56c534	259	if (!tree_name \|\| get_sha1(tree_name, sha1))
c5bac17a	260	usage(diff_cache_usage);
e74f8f6a	261
6b14d7fa	262	/* The rest is for paths restriction. */
19feebc8	263	diff_setup(diff_setup_opt);
5c97558c	264
b0fe89ca	265	mark_merge_entries();
b5af9107	266
6c56c534	267	tree = read_object_with_reference(sha1, "tree", &size, NULL);
e74f8f6a	268	if (!tree)
6c56c534	269	die("bad tree object %s", tree_name);
b5af9107	270	if (read_tree(tree, size, 1))
6c56c534	271	die("unable to read tree object %s", tree_name);
e74f8f6a	272
5c97558c	273	ret = diff_cache(active_cache, active_nr);
f345b0a0 JH	274
f345b0a0 JH	275	diffcore_std(pathspec ? : NULL,
befe8639	276	detect_rename, diff_score_opt,
f345b0a0	277	pickaxe, pickaxe_opts,
af5323e0	278	diff_break_opt,
f2ce9fde JH	279	orderfile, diff_filter);
f2ce9fde JH	280	diff_flush(diff_output_format);
5c97558c	281	return ret;
e74f8f6a	282	}