#include "cache.h"
#include "commit.h"
+#include "diff.h"
#include "revision.h"
+#include "log-tree.h"
#ifndef PATH_MAX
# define PATH_MAX 4096
#define LOGSIZE (65536)
-static int cmd_log(int argc, const char **argv, char **envp)
+static int cmd_log_wc(int argc, const char **argv, char **envp,
+ struct rev_info *rev)
{
- struct rev_info rev;
struct commit *commit;
char *buf = xmalloc(LOGSIZE);
- static enum cmit_fmt commit_format = CMIT_FMT_DEFAULT;
- int abbrev = DEFAULT_ABBREV;
const char *commit_prefix = "commit ";
+ int shown = 0;
- argc = setup_revisions(argc, argv, &rev, "HEAD");
- while (1 < argc) {
- const char *arg = argv[1];
- if (!strncmp(arg, "--pretty", 8)) {
- commit_format = get_commit_format(arg + 8);
- if (commit_format == CMIT_FMT_ONELINE)
- commit_prefix = "";
- }
- else if (!strcmp(arg, "--no-abbrev")) {
- abbrev = 0;
- }
- else if (!strncmp(arg, "--abbrev=", 9)) {
- abbrev = strtoul(arg + 9, NULL, 10);
- if (abbrev && abbrev < MINIMUM_ABBREV)
- abbrev = MINIMUM_ABBREV;
- else if (40 < abbrev)
- abbrev = 40;
- }
- else
- die("unrecognized argument: %s", arg);
- argc--; argv++;
- }
+ rev->abbrev = DEFAULT_ABBREV;
+ rev->commit_format = CMIT_FMT_DEFAULT;
+ argc = setup_revisions(argc, argv, rev, "HEAD");
+
+ if (argc > 1)
+ die("unrecognized argument: %s", argv[1]);
+ if (rev->commit_format == CMIT_FMT_ONELINE)
+ commit_prefix = "";
- prepare_revision_walk(&rev);
+ prepare_revision_walk(rev);
setup_pager();
- while ((commit = get_revision(&rev)) != NULL) {
- printf("%s%s", commit_prefix,
- sha1_to_hex(commit->object.sha1));
- if (rev.parents) {
+ while ((commit = get_revision(rev)) != NULL) {
+ unsigned long ofs = 0;
+
+ if (shown && rev->diff &&
+ rev->commit_format != CMIT_FMT_ONELINE)
+ putchar('\n');
+
+ ofs = sprintf(buf, "%s", commit_prefix);
+ if (rev->abbrev_commit && rev->abbrev)
+ ofs += sprintf(buf + ofs, "%s",
+ find_unique_abbrev(commit->object.sha1,
+ rev->abbrev));
+ else
+ ofs += sprintf(buf + ofs, "%s",
+ sha1_to_hex(commit->object.sha1));
+ if (rev->parents) {
struct commit_list *parents = commit->parents;
while (parents) {
struct object *o = &(parents->item->object);
parents = parents->next;
if (o->flags & TMP_MARK)
continue;
- printf(" %s", sha1_to_hex(o->sha1));
+ ofs += sprintf(buf + ofs, " %s",
+ sha1_to_hex(o->sha1));
o->flags |= TMP_MARK;
}
/* TMP_MARK is a general purpose flag that can
parents = parents->next)
parents->item->object.flags &= ~TMP_MARK;
}
- if (commit_format == CMIT_FMT_ONELINE)
- putchar(' ');
+ buf[ofs++] =
+ (rev->commit_format == CMIT_FMT_ONELINE) ? ' ' : '\n';
+ ofs += pretty_print_commit(rev->commit_format, commit, ~0,
+ buf + ofs,
+ LOGSIZE - ofs - 20,
+ rev->abbrev);
+
+ if (rev->diff) {
+ rev->use_precomputed_header = buf;
+ strcpy(buf + ofs, "\n---\n");
+ log_tree_commit(rev, commit);
+ }
else
- putchar('\n');
- pretty_print_commit(commit_format, commit, ~0, buf,
- LOGSIZE, abbrev);
- printf("%s\n", buf);
+ printf("%s\n", buf);
+ shown = 1;
+ free(commit->buffer);
+ commit->buffer = NULL;
}
free(buf);
return 0;
}
+static int cmd_wc(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);
+}
+
+static 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);
+}
+
+static 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;
+ rev.combine_merges = 1;
+ rev.ignore_merges = 0;
+ return cmd_log_wc(argc, argv, envp, &rev);
+}
+
static void handle_internal_command(int argc, const char **argv, char **envp)
{
const char *cmd = argv[0];
{ "version", cmd_version },
{ "help", cmd_help },
{ "log", cmd_log },
+ { "whatchanged", cmd_wc },
+ { "show", cmd_show },
};
int i;
+ /* Turn "git cmd --help" into "git help cmd" */
+ if (argc > 1 && !strcmp(argv[1], "--help")) {
+ argv[1] = argv[0];
+ argv[0] = cmd = "help";
+ }
+
for (i = 0; i < ARRAY_SIZE(commands); i++) {
struct cmd_struct *p = commands+i;
if (strcmp(p->cmd, cmd))