diff.c 5.52 KB
Newer Older
1 2 3 4 5
#include <stdio.h>
#include <git2.h>
#include <stdlib.h>
#include <string.h>

6
static void check(int error, const char *message)
7 8 9 10 11 12 13
{
	if (error) {
		fprintf(stderr, "%s (%d)\n", message, error);
		exit(1);
	}
}

14 15
static int resolve_to_tree(
	git_repository *repo, const char *identifier, git_tree **tree)
16 17 18 19
{
	int err = 0;
	git_object *obj = NULL;

20
	if (git_revparse_single(&obj, repo, identifier) < 0)
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
		return GIT_ENOTFOUND;

	switch (git_object_type(obj)) {
	case GIT_OBJ_TREE:
		*tree = (git_tree *)obj;
		break;
	case GIT_OBJ_COMMIT:
		err = git_commit_tree(tree, (git_commit *)obj);
		git_object_free(obj);
		break;
	default:
		err = GIT_ENOTFOUND;
	}

	return err;
}

char *colors[] = {
	"\033[m", /* reset */
	"\033[1m", /* bold */
	"\033[31m", /* red */
	"\033[32m", /* green */
	"\033[36m" /* cyan */
};

46 47 48
static int printer(
	const git_diff_delta *delta,
	const git_diff_range *range,
49 50
	char usage,
	const char *line,
51 52
	size_t line_len,
	void *data)
53 54 55
{
	int *last_color = data, color = 0;

56 57
	(void)delta; (void)range; (void)line_len;

58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
	if (*last_color >= 0) {
		switch (usage) {
		case GIT_DIFF_LINE_ADDITION: color = 3; break;
		case GIT_DIFF_LINE_DELETION: color = 2; break;
		case GIT_DIFF_LINE_ADD_EOFNL: color = 3; break;
		case GIT_DIFF_LINE_DEL_EOFNL: color = 2; break;
		case GIT_DIFF_LINE_FILE_HDR: color = 1; break;
		case GIT_DIFF_LINE_HUNK_HDR: color = 4; break;
		default: color = 0;
		}
		if (color != *last_color) {
			if (*last_color == 1 || color == 1)
				fputs(colors[0], stdout);
			fputs(colors[color], stdout);
			*last_color = color;
		}
	}

	fputs(line, stdout);
	return 0;
}

80
static int check_uint16_param(const char *arg, const char *pattern, uint16_t *val)
81 82 83 84 85 86 87 88 89 90 91 92 93
{
	size_t len = strlen(pattern);
	uint16_t strval;
	char *endptr = NULL;
	if (strncmp(arg, pattern, len))
		return 0;
	strval = strtoul(arg + len, &endptr, 0);
	if (endptr == arg)
		return 0;
	*val = strval;
	return 1;
}

94
static int check_str_param(const char *arg, const char *pattern, const char **val)
95 96 97 98
{
	size_t len = strlen(pattern);
	if (strncmp(arg, pattern, len))
		return 0;
99
	*val = (const char *)(arg + len);
100 101 102
	return 1;
}

103
static void usage(const char *message, const char *arg)
104 105 106 107 108
{
	if (message && arg)
		fprintf(stderr, "%s: %s\n", message, arg);
	else if (message)
		fprintf(stderr, "%s\n", message);
109
	fprintf(stderr, "usage: diff [<tree-oid> [<tree-oid>]]\n");
110 111 112
	exit(1);
}

113 114 115
int main(int argc, char *argv[])
{
	git_repository *repo = NULL;
116
	git_tree *t1 = NULL, *t2 = NULL;
117
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
118
	git_diff_list *diff;
119
	int i, color = -1, compact = 0, cached = 0;
120
	char *a, *dir = ".", *treeish1 = NULL, *treeish2 = NULL;
121

122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
	/* parse arguments as copied from git-diff */

	for (i = 1; i < argc; ++i) {
		a = argv[i];

		if (a[0] != '-') {
			if (treeish1 == NULL)
				treeish1 = a;
			else if (treeish2 == NULL)
				treeish2 = a;
			else
				usage("Only one or two tree identifiers can be provided", NULL);
		}
		else if (!strcmp(a, "-p") || !strcmp(a, "-u") ||
			!strcmp(a, "--patch"))
			compact = 0;
138 139
		else if (!strcmp(a, "--cached"))
			cached = 1;
140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155
		else if (!strcmp(a, "--name-status"))
			compact = 1;
		else if (!strcmp(a, "--color"))
			color = 0;
		else if (!strcmp(a, "--no-color"))
			color = -1;
		else if (!strcmp(a, "-R"))
			opts.flags |= GIT_DIFF_REVERSE;
		else if (!strcmp(a, "-a") || !strcmp(a, "--text"))
			opts.flags |= GIT_DIFF_FORCE_TEXT;
		else if (!strcmp(a, "--ignore-space-at-eol"))
			opts.flags |= GIT_DIFF_IGNORE_WHITESPACE_EOL;
		else if (!strcmp(a, "-b") || !strcmp(a, "--ignore-space-change"))
			opts.flags |= GIT_DIFF_IGNORE_WHITESPACE_CHANGE;
		else if (!strcmp(a, "-w") || !strcmp(a, "--ignore-all-space"))
			opts.flags |= GIT_DIFF_IGNORE_WHITESPACE;
156 157 158 159
		else if (!strcmp(a, "--ignored"))
			opts.flags |= GIT_DIFF_INCLUDE_IGNORED;
		else if (!strcmp(a, "--untracked"))
			opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED;
160 161 162 163
		else if (!check_uint16_param(a, "-U", &opts.context_lines) &&
			!check_uint16_param(a, "--unified=", &opts.context_lines) &&
			!check_uint16_param(a, "--inter-hunk-context=",
				&opts.interhunk_lines) &&
164 165
			!check_str_param(a, "--src-prefix=", &opts.old_prefix) &&
			!check_str_param(a, "--dst-prefix=", &opts.new_prefix))
166
			usage("Unknown arg", a);
167 168
	}

169 170
	/* open repo */

171
	check(git_repository_open_ext(&repo, dir, 0, NULL),
172 173
		"Could not open repository");

174 175
	if (treeish1)
		check(resolve_to_tree(repo, treeish1, &t1), "Looking up first tree");
176 177
	if (treeish2)
		check(resolve_to_tree(repo, treeish2, &t2), "Looking up second tree");
178

179 180 181 182 183 184 185
	/* <sha1> <sha2> */
	/* <sha1> --cached */
	/* <sha1> */
	/* --cached */
	/* nothing */

	if (t1 && t2)
186
		check(git_diff_tree_to_tree(&diff, repo, t1, t2, &opts), "Diff");
187
	else if (t1 && cached)
188
		check(git_diff_tree_to_index(&diff, repo, t1, NULL, &opts), "Diff");
189 190
	else if (t1) {
		git_diff_list *diff2;
191 192
		check(git_diff_tree_to_index(&diff, repo, t1, NULL, &opts), "Diff");
		check(git_diff_index_to_workdir(&diff2, repo, NULL, &opts), "Diff");
193 194 195 196 197
		check(git_diff_merge(diff, diff2), "Merge diffs");
		git_diff_list_free(diff2);
	}
	else if (cached) {
		check(resolve_to_tree(repo, "HEAD", &t1), "looking up HEAD");
198
		check(git_diff_tree_to_index(&diff, repo, t1, NULL, &opts), "Diff");
199
	}
200
	else
201
		check(git_diff_index_to_workdir(&diff, repo, NULL, &opts), "Diff");
202

203 204
	if (color >= 0)
		fputs(colors[0], stdout);
205

206
	if (compact)
207
		check(git_diff_print_compact(diff, printer, &color), "Displaying diff");
208
	else
209
		check(git_diff_print_patch(diff, printer, &color), "Displaying diff");
210

211 212
	if (color >= 0)
		fputs(colors[0], stdout);
213 214

	git_diff_list_free(diff);
215 216
	git_tree_free(t1);
	git_tree_free(t2);
217 218 219 220 221
	git_repository_free(repo);

	return 0;
}