X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git.c;h=a6cfd1d8aaf13bf391c69c7f91b14fd68e0d36e9;hb=b2934926dd7455de61577c1dfdf4c12d224e7ae0;hp=0b40e3060d8d95a6da7c8603317c6e2cb6c5ec46;hpb=2593a410e095f89f0eef40edb90b39029574462b;p=git.git

diff --git a/git.c b/git.c
index 0b40e306..a6cfd1d8 100644
--- a/git.c
+++ b/git.c
@@ -15,7 +15,9 @@
 
 #include "cache.h"
 #include "commit.h"
+#include "diff.h"
 #include "revision.h"
+#include "log-tree.h"
 
 #ifndef PATH_MAX
 # define PATH_MAX 4096
@@ -172,7 +174,7 @@ static void list_commands(const char *exec_path, const char *pattern)
 	putchar('\n');
 }
 
-static void list_common_cmds_help()
+static void list_common_cmds_help(void)
 {
 	int i, longest = 0;
 
@@ -276,48 +278,33 @@ static int cmd_help(int argc, const char **argv, char **envp)
 
 #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;
-	int show_parents = 0;
 	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, "--parents")) {
-			show_parents = 1;
-		}
-		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++;
-	}
+	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 (show_parents) {
+	while ((commit = get_revision(rev)) != NULL) {
+		if (shown && rev->diff &&
+		    rev->commit_format != CMIT_FMT_ONELINE)
+			putchar('\n');
+		fputs(commit_prefix, stdout);
+		if (rev->abbrev_commit && rev->abbrev)
+			fputs(find_unique_abbrev(commit->object.sha1,
+						 rev->abbrev),
+			      stdout);
+		else
+			fputs(sha1_to_hex(commit->object.sha1), stdout);
+		if (rev->parents) {
 			struct commit_list *parents = commit->parents;
 			while (parents) {
 				struct object *o = &(parents->item->object);
@@ -336,18 +323,68 @@ static int cmd_log(int argc, const char **argv, char **envp)
 			     parents = parents->next)
 				parents->item->object.flags &= ~TMP_MARK;
 		}
-		if (commit_format == CMIT_FMT_ONELINE)
+		if (rev->commit_format == CMIT_FMT_ONELINE)
 			putchar(' ');
 		else
 			putchar('\n');
-		pretty_print_commit(commit_format, commit, ~0, buf,
-				    LOGSIZE, abbrev);
+		pretty_print_commit(rev->commit_format, commit, ~0, buf,
+				    LOGSIZE, rev->abbrev);
 		printf("%s\n", buf);
+		if (rev->diff) {
+			printf("---\n");
+			log_tree_commit(rev, commit);
+		}
+		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.abbrev = DEFAULT_ABBREV;
+	rev.no_commit_id = 1;
+	rev.commit_format = CMIT_FMT_DEFAULT;
+	rev.diff = 1;
+	rev.diffopt.recursive = 1;
+	argc = setup_revisions(argc, argv, &rev, "HEAD");
+	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.ignore_merges = 0;
+	rev.combine_merges = 1;
+	rev.dense_combined_merges = 1;
+	rev.abbrev = DEFAULT_ABBREV;
+	rev.commit_format = CMIT_FMT_DEFAULT;
+	rev.diffopt.recursive = 1;
+	rev.no_walk = 1;
+	argc = setup_revisions(argc, argv, &rev, "HEAD");
+	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.abbrev = DEFAULT_ABBREV;
+	rev.no_commit_id = 1;
+	rev.commit_format = CMIT_FMT_DEFAULT;
+	argc = setup_revisions(argc, argv, &rev, "HEAD");
+	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];
@@ -358,9 +395,17 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 		{ "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))