|
|
|
|
/*
|
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
|
*/
|
|
|
|
|
#include "cache.h"
|
|
|
|
|
#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>
19 years ago
|
|
|
#include "commit.h"
|
|
|
|
|
#include "revision.h"
|
|
|
|
|
#include "builtin.h"
|
|
|
|
|
|
|
|
|
|
static const char diff_files_usage[] =
|
|
|
|
|
"git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
|
|
|
|
|
COMMON_DIFF_OPTIONS_HELP;
|
|
|
|
|
|
|
|
|
|
int cmd_diff_files(int argc, const char **argv, const char *prefix)
|
|
|
|
|
{
|
|
|
|
|
struct rev_info rev;
|
|
|
|
|
int silent = 0;
|
|
|
|
|
|
|
|
|
|
init_revisions(&rev, prefix);
|
|
|
|
|
git_config(git_default_config); /* no "diff" UI options */
|
|
|
|
|
rev.abbrev = 0;
|
|
|
|
|
|
|
|
|
|
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"))
|
|
|
|
|
silent = 1;
|
|
|
|
|
else
|
|
|
|
|
usage(diff_files_usage);
|
|
|
|
|
argv++; argc--;
|
|
|
|
|
}
|
|
|
|
|
if (!rev.diffopt.output_format)
|
|
|
|
|
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Make sure there are NO revision (i.e. pending object) parameter,
|
|
|
|
|
* rev.max_count is reasonable (0 <= n <= 3),
|
|
|
|
|
* there is no other revision filtering parameters.
|
|
|
|
|
*/
|
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>
19 years ago
|
|
|
if (rev.pending.nr ||
|
|
|
|
|
rev.min_age != -1 || rev.max_age != -1)
|
|
|
|
|
usage(diff_files_usage);
|
|
|
|
|
return run_diff_files(&rev, silent);
|
|
|
|
|
}
|
