2005-04-08 00:16:10 +02:00
|
|
|
/*
|
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
|
*/
|
2005-04-08 00:13:13 +02:00
|
|
|
#include "cache.h"
|
2005-04-27 18:21:00 +02:00
|
|
|
#include "diff.h"
|
Log message printout cleanups
On Sun, 16 Apr 2006, Junio C Hamano wrote:
>
> In the mid-term, I am hoping we can drop the generate_header()
> callchain _and_ the custom code that formats commit log in-core,
> found in cmd_log_wc().
Ok, this was nastier than expected, just because the dependencies between
the different log-printing stuff were absolutely _everywhere_, but here's
a patch that does exactly that.
The patch is not very easy to read, and the "--patch-with-stat" thing is
still broken (it does not call the "show_log()" thing properly for
merges). That's not a new bug. In the new world order it _should_ do
something like
if (rev->logopt)
show_log(rev, rev->logopt, "---\n");
but it doesn't. I haven't looked at the --with-stat logic, so I left it
alone.
That said, this patch removes more lines than it adds, and in particular,
the "cmd_log_wc()" loop is now a very clean:
while ((commit = get_revision(rev)) != NULL) {
log_tree_commit(rev, commit);
free(commit->buffer);
commit->buffer = NULL;
}
so it doesn't get much prettier than this. All the complexity is entirely
hidden in log-tree.c, and any code that needs to flush the log literally
just needs to do the "if (rev->logopt) show_log(...)" incantation.
I had to make the combined_diff() logic take a "struct rev_info" instead
of just a "struct diff_options", but that part is pretty clean.
This does change "git whatchanged" from using "diff-tree" as the commit
descriptor to "commit", and I changed one of the tests to reflect that new
reality. Otherwise everything still passes, and my other tests look fine
too.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-17 20:59:32 +02:00
|
|
|
#include "commit.h"
|
|
|
|
|
#include "revision.h"
|
2006-05-23 14:15:36 +02:00
|
|
|
#include "builtin.h"
|
2010-08-06 00:40:48 +02:00
|
|
|
#include "submodule.h"
|
2005-04-12 11:04:44 +02:00
|
|
|
|
2005-07-29 11:01:26 +02:00
|
|
|
static const char diff_files_usage[] =
|
2008-07-13 15:36:15 +02:00
|
|
|
"git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
|
2005-07-13 21:52:35 +02:00
|
|
|
COMMON_DIFF_OPTIONS_HELP;
|
2005-04-17 06:29:45 +02:00
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
int cmd_diff_files(int argc, const char **argv, const char *prefix)
|
2005-04-08 00:13:13 +02:00
|
|
|
{
|
2006-04-22 08:57:45 +02:00
|
|
|
struct rev_info rev;
|
2007-03-14 01:17:04 +01:00
|
|
|
int result;
|
2008-05-24 03:15:03 +02:00
|
|
|
unsigned options = 0;
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
init_revisions(&rev, prefix);
|
2010-08-06 00:40:48 +02:00
|
|
|
gitmodules_config();
|
2008-05-14 19:46:53 +02:00
|
|
|
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
|
2006-04-22 08:57:45 +02:00
|
|
|
rev.abbrev = 0;
|
|
|
|
|
|
2008-05-24 03:15:03 +02:00
|
|
|
argc = setup_revisions(argc, argv, &rev, NULL);
|
|
|
|
|
while (1 < argc && argv[1][0] == '-') {
|
|
|
|
|
if (!strcmp(argv[1], "--base"))
|
|
|
|
|
rev.max_count = 1;
|
|
|
|
|
else if (!strcmp(argv[1], "--ours"))
|
|
|
|
|
rev.max_count = 2;
|
|
|
|
|
else if (!strcmp(argv[1], "--theirs"))
|
|
|
|
|
rev.max_count = 3;
|
|
|
|
|
else if (!strcmp(argv[1], "-q"))
|
|
|
|
|
options |= DIFF_SILENT_ON_REMOVED;
|
|
|
|
|
else
|
|
|
|
|
usage(diff_files_usage);
|
|
|
|
|
argv++; argc--;
|
|
|
|
|
}
|
2006-06-24 19:24:14 +02:00
|
|
|
if (!rev.diffopt.output_format)
|
|
|
|
|
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
2008-05-24 03:15:03 +02:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Make sure there are NO revision (i.e. pending object) parameter,
|
|
|
|
|
* rev.max_count is reasonable (0 <= n <= 3), and
|
|
|
|
|
* there is no other revision filtering parameters.
|
|
|
|
|
*/
|
|
|
|
|
if (rev.pending.nr ||
|
|
|
|
|
rev.min_age != -1 || rev.max_age != -1 ||
|
|
|
|
|
3 < rev.max_count)
|
|
|
|
|
usage(diff_files_usage);
|
|
|
|
|
|
2008-09-18 09:32:37 +02:00
|
|
|
/*
|
|
|
|
|
* "diff-files --base -p" should not combine merges because it
|
|
|
|
|
* was not asked to. "diff-files -c -p" should not densify
|
|
|
|
|
* (the user should ask with "diff-files --cc" explicitly).
|
|
|
|
|
*/
|
|
|
|
|
if (rev.max_count == -1 && !rev.combine_merges &&
|
2008-05-24 03:15:03 +02:00
|
|
|
(rev.diffopt.output_format & DIFF_FORMAT_PATCH))
|
|
|
|
|
rev.combine_merges = rev.dense_combined_merges = 1;
|
|
|
|
|
|
2008-11-14 01:36:30 +01:00
|
|
|
if (read_cache_preload(rev.diffopt.paths) < 0) {
|
|
|
|
|
perror("read_cache_preload");
|
2008-05-24 03:15:03 +02:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
result = run_diff_files(&rev, options);
|
2007-12-14 08:40:27 +01:00
|
|
|
return diff_result_code(&rev.diffopt, result);
|
2005-04-08 00:13:13 +02:00
|
|
|
}
|