2005-04-20 06:00:09 +02:00
|
|
|
#include "cache.h"
|
2005-04-27 18:21:00 +02:00
|
|
|
#include "diff.h"
|
2006-04-22 11:43:00 +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-23 02:15:28 +02:00
|
|
|
|
2005-07-29 11:01:26 +02:00
|
|
|
static const char diff_cache_usage[] =
|
2008-07-13 15:36:15 +02:00
|
|
|
"git diff-index [-m] [--cached] "
|
2005-07-13 21:52:35 +02:00
|
|
|
"[<common diff options>] <tree-ish> [<path>...]"
|
|
|
|
|
COMMON_DIFF_OPTIONS_HELP;
|
2005-04-21 04:49:16 +02:00
|
|
|
|
2006-07-29 07:44:25 +02:00
|
|
|
int cmd_diff_index(int argc, const char **argv, const char *prefix)
|
2005-04-20 06:00:09 +02:00
|
|
|
{
|
2006-04-22 11:43:00 +02:00
|
|
|
struct rev_info rev;
|
|
|
|
|
int cached = 0;
|
2005-05-25 03:10:11 +02:00
|
|
|
int i;
|
2007-03-14 01:17:04 +01:00
|
|
|
int result;
|
2005-04-20 06:00:09 +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 11:43:00 +02:00
|
|
|
rev.abbrev = 0;
|
|
|
|
|
|
|
|
|
|
argc = setup_revisions(argc, argv, &rev, NULL);
|
2005-05-25 03:10:11 +02:00
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
|
const char *arg = argv[i];
|
2007-06-07 09:04:01 +02:00
|
|
|
|
2006-04-22 12:58:04 +02:00
|
|
|
if (!strcmp(arg, "--cached"))
|
2006-04-22 11:43:00 +02:00
|
|
|
cached = 1;
|
|
|
|
|
else
|
2005-09-21 09:00:47 +02:00
|
|
|
usage(diff_cache_usage);
|
2005-04-20 06:00:09 +02:00
|
|
|
}
|
2006-06-24 19:24:14 +02:00
|
|
|
if (!rev.diffopt.output_format)
|
|
|
|
|
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
|
|
|
|
|
2006-04-22 11:43:00 +02:00
|
|
|
/*
|
|
|
|
|
* Make sure there is one revision (i.e. pending object),
|
|
|
|
|
* and there is no 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>
2006-06-20 02:42:35 +02:00
|
|
|
if (rev.pending.nr != 1 ||
|
2006-04-22 11:43:00 +02:00
|
|
|
rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
|
2005-04-21 04:49:16 +02:00
|
|
|
usage(diff_cache_usage);
|
2012-10-30 10:50:42 +01:00
|
|
|
if (!cached) {
|
2008-08-28 15:02:12 +02:00
|
|
|
setup_work_tree();
|
2012-10-30 10:50:42 +01:00
|
|
|
if (read_cache_preload(rev.diffopt.pathspec.raw) < 0) {
|
|
|
|
|
perror("read_cache_preload");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
} else if (read_cache() < 0) {
|
2007-02-10 03:51:40 +01:00
|
|
|
perror("read_cache");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2007-03-14 01:17:04 +01:00
|
|
|
result = run_diff_index(&rev, cached);
|
2007-12-14 08:40:27 +01:00
|
|
|
return diff_result_code(&rev.diffopt, result);
|
2005-04-20 06:00:09 +02:00
|
|
|
}
|