diff.c 6.05 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 20 21 22 23 24 25 26 27 28 29 30 31 32
{
	int err = 0;
	size_t len = strlen(identifier);
	git_oid oid;
	git_object *obj = NULL;

	/* try to resolve as OID */
	if (git_oid_fromstrn(&oid, identifier, len) == 0)
		git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY);

	/* try to resolve as reference */
	if (obj == NULL) {
		git_reference *ref, *resolved;
		if (git_reference_lookup(&ref, repo, identifier) == 0) {
			git_reference_resolve(&resolved, ref);
			git_reference_free(ref);
			if (resolved) {
33
				git_object_lookup(&obj, repo, git_reference_target(resolved), GIT_OBJ_ANY);
34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
				git_reference_free(resolved);
			}
		}
	}

	if (obj == NULL)
		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 */
};

65 66 67
static int printer(
	const git_diff_delta *delta,
	const git_diff_range *range,
68 69
	char usage,
	const char *line,
70 71
	size_t line_len,
	void *data)
72 73 74
{
	int *last_color = data, color = 0;

75 76
	(void)delta; (void)range; (void)line_len;

77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
	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;
}

99
static int check_uint16_param(const char *arg, const char *pattern, uint16_t *val)
100 101 102 103 104 105 106 107 108 109 110 111 112
{
	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;
}

113
static int check_str_param(const char *arg, const char *pattern, char **val)
114 115 116 117 118 119 120 121
{
	size_t len = strlen(pattern);
	if (strncmp(arg, pattern, len))
		return 0;
	*val = (char *)(arg + len);
	return 1;
}

122
static void usage(const char *message, const char *arg)
123 124 125 126 127
{
	if (message && arg)
		fprintf(stderr, "%s: %s\n", message, arg);
	else if (message)
		fprintf(stderr, "%s\n", message);
128
	fprintf(stderr, "usage: diff [<tree-oid> [<tree-oid>]]\n");
129 130 131
	exit(1);
}

132 133 134
int main(int argc, char *argv[])
{
	git_repository *repo = NULL;
135
	git_tree *t1 = NULL, *t2 = NULL;
136
	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
137
	git_diff_list *diff;
138
	int i, color = -1, compact = 0, cached = 0;
139
	char *a, *dir = ".", *treeish1 = NULL, *treeish2 = NULL;
140

141 142
	memset(&opts, 0, sizeof(opts));

143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158
	/* 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;
159 160
		else if (!strcmp(a, "--cached"))
			cached = 1;
161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
		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;
177 178 179 180
		else if (!strcmp(a, "--ignored"))
			opts.flags |= GIT_DIFF_INCLUDE_IGNORED;
		else if (!strcmp(a, "--untracked"))
			opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED;
181 182 183 184
		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) &&
185 186
			!check_str_param(a, "--src-prefix=", &opts.old_prefix) &&
			!check_str_param(a, "--dst-prefix=", &opts.new_prefix))
187
			usage("Unknown arg", a);
188 189
	}

190 191
	/* open repo */

192
	check(git_repository_open_ext(&repo, dir, 0, NULL),
193 194
		"Could not open repository");

195 196
	if (treeish1)
		check(resolve_to_tree(repo, treeish1, &t1), "Looking up first tree");
197 198
	if (treeish2)
		check(resolve_to_tree(repo, treeish2, &t2), "Looking up second tree");
199

200 201 202 203 204 205 206
	/* <sha1> <sha2> */
	/* <sha1> --cached */
	/* <sha1> */
	/* --cached */
	/* nothing */

	if (t1 && t2)
207
		check(git_diff_tree_to_tree(&diff, repo, t1, t2, &opts), "Diff");
208
	else if (t1 && cached)
209
		check(git_diff_index_to_tree(&diff, repo, t1, NULL, &opts), "Diff");
210 211
	else if (t1) {
		git_diff_list *diff2;
212 213
		check(git_diff_index_to_tree(&diff, repo, t1, NULL, &opts), "Diff");
		check(git_diff_workdir_to_index(&diff2, repo, NULL, &opts), "Diff");
214 215 216 217 218
		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");
219
		check(git_diff_index_to_tree(&diff, repo, t1, NULL, &opts), "Diff");
220
	}
221
	else
222
		check(git_diff_workdir_to_index(&diff, repo, NULL, &opts), "Diff");
223

224 225
	if (color >= 0)
		fputs(colors[0], stdout);
226

227
	if (compact)
228
		check(git_diff_print_compact(diff, printer, &color), "Displaying diff");
229
	else
230
		check(git_diff_print_patch(diff, printer, &color), "Displaying diff");
231

232 233
	if (color >= 0)
		fputs(colors[0], stdout);
234 235

	git_diff_list_free(diff);
236 237
	git_tree_free(t1);
	git_tree_free(t2);
238 239 240 241 242
	git_repository_free(repo);

	return 0;
}