2006-04-21 17:27:34 +00:00
|
|
|
/*
|
|
|
|
* 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"
|
2006-04-21 20:19:58 +00:00
|
|
|
#include "builtin.h"
|
2006-04-21 17:27:34 +00:00
|
|
|
|
2006-05-06 20:56:38 +00:00
|
|
|
/* this is in builtin-diff.c */
|
|
|
|
void add_head(struct rev_info *revs);
|
|
|
|
|
2006-04-21 17:27:34 +00:00
|
|
|
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");
|
2006-05-19 04:19:20 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
2006-04-21 17:27:34 +00:00
|
|
|
|
|
|
|
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;
|
2006-06-18 01:47:58 +00:00
|
|
|
free_commit_list(commit->parents);
|
|
|
|
commit->parents = NULL;
|
2006-04-21 17:27:34 +00:00
|
|
|
}
|
|
|
|
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;
|
2006-06-11 17:57:35 +00:00
|
|
|
rev.simplify_history = 0;
|
2006-04-21 17:27:34 +00:00
|
|
|
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);
|
|
|
|
}
|
2006-04-21 20:19:58 +00:00
|
|
|
|
2006-05-04 23:16:40 +00:00
|
|
|
static int istitlechar(char c)
|
|
|
|
{
|
|
|
|
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
|
|
|
|
(c >= '0' && c <= '9') || c == '.' || c == '_';
|
|
|
|
}
|
|
|
|
|
2006-06-02 13:21:17 +00:00
|
|
|
static char *extra_headers = NULL;
|
|
|
|
static int extra_headers_size = 0;
|
|
|
|
|
|
|
|
static int git_format_config(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
if (!strcmp(var, "format.headers")) {
|
|
|
|
int len = strlen(value);
|
|
|
|
extra_headers_size += len + 1;
|
|
|
|
extra_headers = realloc(extra_headers, extra_headers_size);
|
|
|
|
extra_headers[extra_headers_size - len - 1] = 0;
|
|
|
|
strcat(extra_headers, value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return git_default_config(var, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-05-05 01:33:05 +00:00
|
|
|
static FILE *realstdout = NULL;
|
2006-06-06 15:46:23 +00:00
|
|
|
static const char *output_directory = NULL;
|
2006-05-05 01:33:05 +00:00
|
|
|
|
2006-05-05 02:31:29 +00:00
|
|
|
static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
|
2006-05-04 23:16:40 +00:00
|
|
|
{
|
|
|
|
char filename[1024];
|
|
|
|
char *sol;
|
2006-05-05 01:33:32 +00:00
|
|
|
int len = 0;
|
2006-05-04 23:16:40 +00:00
|
|
|
|
2006-05-05 01:33:32 +00:00
|
|
|
if (output_directory) {
|
2006-06-24 14:01:25 +00:00
|
|
|
strlcpy(filename, output_directory, 1010);
|
2006-05-05 01:33:32 +00:00
|
|
|
len = strlen(filename);
|
|
|
|
if (filename[len - 1] != '/')
|
|
|
|
filename[len++] = '/';
|
|
|
|
}
|
2006-05-04 23:16:40 +00:00
|
|
|
|
2006-05-05 01:33:32 +00:00
|
|
|
sprintf(filename + len, "%04d", nr);
|
2006-05-04 23:16:40 +00:00
|
|
|
len = strlen(filename);
|
|
|
|
|
|
|
|
sol = strstr(commit->buffer, "\n\n");
|
|
|
|
if (sol) {
|
|
|
|
int j, space = 1;
|
|
|
|
|
|
|
|
sol += 2;
|
|
|
|
/* strip [PATCH] or [PATCH blabla] */
|
2006-05-05 02:31:29 +00:00
|
|
|
if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
|
2006-05-04 23:16:40 +00:00
|
|
|
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");
|
2006-05-05 01:33:05 +00:00
|
|
|
fprintf(realstdout, "%s\n", filename);
|
2006-05-04 23:16:40 +00:00
|
|
|
freopen(filename, "w", stdout);
|
|
|
|
}
|
|
|
|
|
2006-04-21 20:19:58 +00:00
|
|
|
int cmd_format_patch(int argc, const char **argv, char **envp)
|
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
struct commit **list = NULL;
|
|
|
|
struct rev_info rev;
|
2006-05-05 01:33:32 +00:00
|
|
|
int nr = 0, total, i, j;
|
2006-05-04 23:16:40 +00:00
|
|
|
int use_stdout = 0;
|
2006-05-05 02:30:52 +00:00
|
|
|
int numbered = 0;
|
2006-05-25 21:55:11 +00:00
|
|
|
int start_number = -1;
|
2006-05-05 02:31:29 +00:00
|
|
|
int keep_subject = 0;
|
2006-05-31 22:11:49 +00:00
|
|
|
char *add_signoff = NULL;
|
2006-04-21 20:19:58 +00:00
|
|
|
|
|
|
|
init_revisions(&rev);
|
|
|
|
rev.commit_format = CMIT_FMT_EMAIL;
|
|
|
|
rev.verbose_header = 1;
|
|
|
|
rev.diff = 1;
|
|
|
|
rev.combine_merges = 0;
|
|
|
|
rev.ignore_merges = 1;
|
|
|
|
|
2006-06-02 13:21:17 +00:00
|
|
|
git_config(git_format_config);
|
|
|
|
rev.extra_headers = extra_headers;
|
|
|
|
|
2006-05-05 01:33:32 +00:00
|
|
|
/*
|
|
|
|
* 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"))
|
2006-05-04 23:16:40 +00:00
|
|
|
use_stdout = 1;
|
2006-05-05 02:30:52 +00:00
|
|
|
else if (!strcmp(argv[i], "-n") ||
|
|
|
|
!strcmp(argv[i], "--numbered"))
|
|
|
|
numbered = 1;
|
2006-05-25 21:55:11 +00:00
|
|
|
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);
|
2006-05-31 22:11:49 +00:00
|
|
|
}
|
|
|
|
else if (!strcmp(argv[i], "-k") ||
|
2006-05-05 02:31:29 +00:00
|
|
|
!strcmp(argv[i], "--keep-subject")) {
|
|
|
|
keep_subject = 1;
|
|
|
|
rev.total = -1;
|
2006-05-31 22:11:49 +00:00
|
|
|
}
|
2006-06-06 15:46:23 +00:00
|
|
|
else if (!strcmp(argv[i], "--output-directory") ||
|
|
|
|
!strcmp(argv[i], "-o")) {
|
2006-05-05 01:33:32 +00:00
|
|
|
i++;
|
2006-06-06 15:46:23 +00:00
|
|
|
if (argc <= i)
|
|
|
|
die("Which directory?");
|
|
|
|
if (output_directory)
|
|
|
|
die("Two output directories?");
|
|
|
|
output_directory = argv[i];
|
2006-05-20 13:40:29 +00:00
|
|
|
}
|
2006-05-31 22:11:49 +00:00
|
|
|
else if (!strcmp(argv[i], "--signoff") ||
|
|
|
|
!strcmp(argv[i], "-s")) {
|
2006-06-12 19:31:38 +00:00
|
|
|
const char *committer;
|
|
|
|
const char *endpos;
|
|
|
|
setup_ident();
|
|
|
|
committer = git_committer_info(1);
|
|
|
|
endpos = strchr(committer, '>');
|
2006-05-31 22:11:49 +00:00
|
|
|
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;
|
|
|
|
}
|
2006-05-20 13:40:29 +00:00
|
|
|
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
|
2006-05-05 01:33:32 +00:00
|
|
|
argv[j++] = argv[i];
|
2006-05-04 23:16:40 +00:00
|
|
|
}
|
2006-05-05 01:33:32 +00:00
|
|
|
argc = j;
|
|
|
|
|
2006-05-26 18:30:49 +00:00
|
|
|
if (start_number < 0)
|
2006-05-25 21:55:11 +00:00
|
|
|
start_number = 1;
|
2006-05-28 16:23:29 +00:00
|
|
|
if (numbered && keep_subject)
|
2006-05-05 02:31:29 +00:00
|
|
|
die ("-n and -k are mutually exclusive.");
|
|
|
|
|
2006-05-05 01:33:32 +00:00
|
|
|
argc = setup_revisions(argc, argv, &rev, "HEAD");
|
|
|
|
if (argc > 1)
|
|
|
|
die ("unrecognized argument: %s", argv[1]);
|
2006-05-04 23:16:40 +00:00
|
|
|
|
2006-06-24 17:24:14 +00:00
|
|
|
if (!rev.diffopt.output_format)
|
|
|
|
rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
|
|
|
|
|
2006-06-06 15:46:23 +00:00
|
|
|
if (output_directory) {
|
|
|
|
if (use_stdout)
|
|
|
|
die("standard output, or directory, which one?");
|
|
|
|
if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
|
|
|
|
die("Could not create directory %s",
|
|
|
|
output_directory);
|
|
|
|
}
|
|
|
|
|
Add "named object array" concept
We've had this notion of a "object_list" for a long time, which eventually
grew a "name" member because some users (notably git-rev-list) wanted to
name each object as it is generated.
That object_list is great for some things, but it isn't all that wonderful
for others, and the "name" member is generally not used by everybody.
This patch splits the users of the object_list array up into two: the
traditional list users, who want the list-like format, and who don't
actually use or want the name. And another class of users that really used
the list as an extensible array, and generally wanted to name the objects.
The patch is fairly straightforward, but it's also biggish. Most of it
really just cleans things up: switching the revision parsing and listing
over to the array makes things like the builtin-diff usage much simpler
(we now see exactly how many members the array has, and we don't get the
objects reversed from the order they were on the command line).
One of the main reasons for doing this at all is that the malloc overhead
of the simple object list was actually pretty high, and the array is just
a lot denser. So this patch brings down memory usage by git-rev-list by
just under 3% (on top of all the other memory use optimizations) on the
mozilla archive.
It does add more lines than it removes, and more importantly, it adds a
whole new infrastructure for maintaining lists of objects, but on the
other hand, the new dynamic array code is pretty obvious. The change to
builtin-diff-tree.c shows a fairly good example of why an array interface
is sometimes more natural, and just much simpler for everybody.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-20 00:42:35 +00:00
|
|
|
if (rev.pending.nr == 1) {
|
|
|
|
rev.pending.objects[0].item->flags |= UNINTERESTING;
|
2006-05-06 20:56:38 +00:00
|
|
|
add_head(&rev);
|
|
|
|
}
|
|
|
|
|
2006-05-05 01:33:05 +00:00
|
|
|
if (!use_stdout)
|
|
|
|
realstdout = fdopen(dup(1), "w");
|
|
|
|
|
2006-04-21 20:19:58 +00:00
|
|
|
prepare_revision_walk(&rev);
|
|
|
|
while ((commit = get_revision(&rev)) != NULL) {
|
2006-05-04 23:16:40 +00:00
|
|
|
/* ignore merges */
|
|
|
|
if (commit->parents && commit->parents->next)
|
|
|
|
continue;
|
2006-04-21 20:19:58 +00:00
|
|
|
nr++;
|
|
|
|
list = realloc(list, nr * sizeof(list[0]));
|
|
|
|
list[nr - 1] = commit;
|
|
|
|
}
|
2006-05-04 23:16:40 +00:00
|
|
|
total = nr;
|
2006-05-05 02:30:52 +00:00
|
|
|
if (numbered)
|
2006-05-25 21:55:11 +00:00
|
|
|
rev.total = total + start_number - 1;
|
2006-05-31 22:11:49 +00:00
|
|
|
rev.add_signoff = add_signoff;
|
2006-04-21 20:19:58 +00:00
|
|
|
while (0 <= --nr) {
|
|
|
|
int shown;
|
|
|
|
commit = list[nr];
|
2006-05-26 18:30:49 +00:00
|
|
|
rev.nr = total - nr + (start_number - 1);
|
2006-05-04 23:16:40 +00:00
|
|
|
if (!use_stdout)
|
2006-05-05 02:31:29 +00:00
|
|
|
reopen_stdout(commit, rev.nr, keep_subject);
|
2006-04-21 20:19:58 +00:00
|
|
|
shown = log_tree_commit(&rev, commit);
|
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
2006-05-26 18:30:49 +00:00
|
|
|
|
|
|
|
/* 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;
|
2006-05-20 13:40:29 +00:00
|
|
|
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);
|
|
|
|
}
|
2006-05-04 23:16:40 +00:00
|
|
|
if (!use_stdout)
|
|
|
|
fclose(stdout);
|
2006-04-21 20:19:58 +00:00
|
|
|
}
|
|
|
|
free(list);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|