builtin-log.c 6.7 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11
/*
 * Builtin "git log" and related commands (show, whatchanged)
 *
 * (C) Copyright 2006 Linus Torvalds
 *		 2006 Junio Hamano
 */
#include "cache.h"
#include "commit.h"
#include "diff.h"
#include "revision.h"
#include "log-tree.h"
12
#include "builtin.h"
13

14 15 16
/* this is in builtin-diff.c */
void add_head(struct rev_info *revs);

17 18 19 20 21 22 23 24 25
static int cmd_log_wc(int argc, const char **argv, char **envp,
		      struct rev_info *rev)
{
	struct commit *commit;

	rev->abbrev = DEFAULT_ABBREV;
	rev->commit_format = CMIT_FMT_DEFAULT;
	rev->verbose_header = 1;
	argc = setup_revisions(argc, argv, rev, "HEAD");
26 27 28 29 30 31 32
	if (rev->always_show_header) {
		if (rev->diffopt.pickaxe || rev->diffopt.filter) {
			rev->always_show_header = 0;
			if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
				rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
		}
	}
33 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 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80

	if (argc > 1)
		die("unrecognized argument: %s", argv[1]);

	prepare_revision_walk(rev);
	setup_pager();
	while ((commit = get_revision(rev)) != NULL) {
		log_tree_commit(rev, commit);
		free(commit->buffer);
		commit->buffer = NULL;
	}
	return 0;
}

int cmd_whatchanged(int argc, const char **argv, char **envp)
{
	struct rev_info rev;

	init_revisions(&rev);
	rev.diff = 1;
	rev.diffopt.recursive = 1;
	return cmd_log_wc(argc, argv, envp, &rev);
}

int cmd_show(int argc, const char **argv, char **envp)
{
	struct rev_info rev;

	init_revisions(&rev);
	rev.diff = 1;
	rev.diffopt.recursive = 1;
	rev.combine_merges = 1;
	rev.dense_combined_merges = 1;
	rev.always_show_header = 1;
	rev.ignore_merges = 0;
	rev.no_walk = 1;
	return cmd_log_wc(argc, argv, envp, &rev);
}

int cmd_log(int argc, const char **argv, char **envp)
{
	struct rev_info rev;

	init_revisions(&rev);
	rev.always_show_header = 1;
	rev.diffopt.recursive = 1;
	return cmd_log_wc(argc, argv, envp, &rev);
}
81

82 83 84 85 86 87
static int istitlechar(char c)
{
	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
		(c >= '0' && c <= '9') || c == '.' || c == '_';
}

88
static FILE *realstdout = NULL;
89
static char *output_directory = NULL;
90

91
static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
92 93 94
{
	char filename[1024];
	char *sol;
95
	int len = 0;
96

97 98 99 100 101 102
	if (output_directory) {
		strncpy(filename, output_directory, 1010);
		len = strlen(filename);
		if (filename[len - 1] != '/')
			filename[len++] = '/';
	}
103

104
	sprintf(filename + len, "%04d", nr);
105 106 107 108 109 110 111 112
	len = strlen(filename);

	sol = strstr(commit->buffer, "\n\n");
	if (sol) {
		int j, space = 1;

		sol += 2;
		/* strip [PATCH] or [PATCH blabla] */
113
		if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
			char *eos = strchr(sol + 6, ']');
			if (eos) {
				while (isspace(*eos))
					eos++;
				sol = eos;
			}
		}

		for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
			if (istitlechar(sol[j])) {
				if (space) {
					filename[len++] = '-';
					space = 0;
				}
				filename[len++] = sol[j];
				if (sol[j] == '.')
					while (sol[j + 1] == '.')
						j++;
			} else
				space = 1;
		}
		while (filename[len - 1] == '.' || filename[len - 1] == '-')
			len--;
	}
	strcpy(filename + len, ".txt");
139
	fprintf(realstdout, "%s\n", filename);
140 141 142
	freopen(filename, "w", stdout);
}

143 144 145 146 147
int cmd_format_patch(int argc, const char **argv, char **envp)
{
	struct commit *commit;
	struct commit **list = NULL;
	struct rev_info rev;
148
	int nr = 0, total, i, j;
149
	int use_stdout = 0;
150
	int numbered = 0;
151
	int start_number = -1;
152
	int keep_subject = 0;
J
Junio C Hamano 已提交
153
	char *add_signoff = NULL;
154 155 156 157 158 159 160 161 162 163 164

	init_revisions(&rev);
	rev.commit_format = CMIT_FMT_EMAIL;
	rev.verbose_header = 1;
	rev.diff = 1;
	rev.diffopt.with_raw = 0;
	rev.diffopt.with_stat = 1;
	rev.combine_merges = 0;
	rev.ignore_merges = 1;
	rev.diffopt.output_format = DIFF_FORMAT_PATCH;

165 166 167 168 169 170 171
	/*
	 * Parse the arguments before setup_revisions(), or something
	 * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
	 * possibly a valid SHA1.
	 */
	for (i = 1, j = 1; i < argc; i++) {
		if (!strcmp(argv[i], "--stdout"))
172
			use_stdout = 1;
173 174 175
		else if (!strcmp(argv[i], "-n") ||
				!strcmp(argv[i], "--numbered"))
			numbered = 1;
176 177 178 179 180 181 182
		else if (!strncmp(argv[i], "--start-number=", 15))
			start_number = strtol(argv[i] + 15, NULL, 10);
		else if (!strcmp(argv[i], "--start-number")) {
			i++;
			if (i == argc)
				die("Need a number for --start-number");
			start_number = strtol(argv[i], NULL, 10);
J
Junio C Hamano 已提交
183 184
		}
		else if (!strcmp(argv[i], "-k") ||
185 186 187
				!strcmp(argv[i], "--keep-subject")) {
			keep_subject = 1;
			rev.total = -1;
J
Junio C Hamano 已提交
188 189
		}
		else if (!strcmp(argv[i], "-o")) {
190 191 192 193 194 195 196
			if (argc < 3)
				die ("Which directory?");
			if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
				die("Could not create directory %s",
						argv[i + 1]);
			output_directory = strdup(argv[i + 1]);
			i++;
197
		}
J
Junio C Hamano 已提交
198 199 200 201 202 203 204 205 206 207
		else if (!strcmp(argv[i], "--signoff") ||
			 !strcmp(argv[i], "-s")) {
			const char *committer = git_committer_info(1);
			const char *endpos = strchr(committer, '>');
			if (!endpos)
				die("bogos committer info %s\n", committer);
			add_signoff = xmalloc(endpos - committer + 2);
			memcpy(add_signoff, committer, endpos - committer + 1);
			add_signoff[endpos - committer + 1] = 0;
		}
208 209 210 211 212
		else if (!strcmp(argv[i], "--attach"))
			rev.mime_boundary = git_version_string;
		else if (!strncmp(argv[i], "--attach=", 9))
			rev.mime_boundary = argv[i] + 9;
		else
213
			argv[j++] = argv[i];
214
	}
215 216
	argc = j;

217
	if (start_number < 0)
218
		start_number = 1;
219
	if (numbered && keep_subject)
220 221
		die ("-n and -k are mutually exclusive.");

222 223 224
	argc = setup_revisions(argc, argv, &rev, "HEAD");
	if (argc > 1)
		die ("unrecognized argument: %s", argv[1]);
225

226 227 228 229 230
	if (rev.pending_objects && rev.pending_objects->next == NULL) {
		rev.pending_objects->item->flags |= UNINTERESTING;
		add_head(&rev);
	}

231 232 233
	if (!use_stdout)
		realstdout = fdopen(dup(1), "w");

234 235
	prepare_revision_walk(&rev);
	while ((commit = get_revision(&rev)) != NULL) {
236 237 238
		/* ignore merges */
		if (commit->parents && commit->parents->next)
			continue;
239 240 241 242
		nr++;
		list = realloc(list, nr * sizeof(list[0]));
		list[nr - 1] = commit;
	}
243
	total = nr;
244
	if (numbered)
245
		rev.total = total + start_number - 1;
J
Junio C Hamano 已提交
246
	rev.add_signoff = add_signoff;
247 248 249
	while (0 <= --nr) {
		int shown;
		commit = list[nr];
250
		rev.nr = total - nr + (start_number - 1);
251
		if (!use_stdout)
252
			reopen_stdout(commit, rev.nr, keep_subject);
253 254 255
		shown = log_tree_commit(&rev, commit);
		free(commit->buffer);
		commit->buffer = NULL;
256 257 258 259 260 261 262 263 264

		/* We put one extra blank line between formatted
		 * patches and this flag is used by log-tree code
		 * to see if it needs to emit a LF before showing
		 * the log; when using one file per patch, we do
		 * not want the extra blank line.
		 */
		if (!use_stdout)
			rev.shown_one = 0;
265 266 267 268 269 270 271 272
		if (shown) {
			if (rev.mime_boundary)
				printf("\n--%s%s--\n\n\n",
				       mime_boundary_leader,
				       rev.mime_boundary);
			else
				printf("-- \n%s\n\n", git_version_string);
		}
273 274
		if (!use_stdout)
			fclose(stdout);
275
	}
276 277
	if (output_directory)
		free(output_directory);
278 279 280 281
	free(list);
	return 0;
}