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"
|
2005-04-12 11:04:44 +02:00
|
|
|
|
2005-04-30 22:59:38 +02:00
|
|
|
static const char *diff_files_usage =
|
2005-07-13 21:52:35 +02:00
|
|
|
"git-diff-files [-q] "
|
|
|
|
"[<common diff options>] [<path>...]"
|
|
|
|
COMMON_DIFF_OPTIONS_HELP;
|
2005-04-17 06:29:45 +02:00
|
|
|
|
2005-07-15 02:59:17 +02:00
|
|
|
static int diff_output_format = DIFF_FORMAT_RAW;
|
|
|
|
static int diff_line_termination = '\n';
|
2005-05-19 12:32:35 +02:00
|
|
|
static int detect_rename = 0;
|
2005-06-19 22:14:05 +02:00
|
|
|
static int find_copies_harder = 0;
|
2005-05-28 00:54:37 +02:00
|
|
|
static int diff_setup_opt = 0;
|
2005-05-20 04:00:36 +02:00
|
|
|
static int diff_score_opt = 0;
|
2005-05-22 00:02:51 +02:00
|
|
|
static const char *pickaxe = NULL;
|
2005-05-28 00:55:28 +02:00
|
|
|
static int pickaxe_opts = 0;
|
[PATCH] Add -B flag to diff-* brothers.
A new diffcore transformation, diffcore-break.c, is introduced.
When the -B flag is given, a patch that represents a complete
rewrite is broken into a deletion followed by a creation. This
makes it easier to review such a complete rewrite patch.
The -B flag takes the same syntax as the -M and -C flags to
specify the minimum amount of non-source material the resulting
file needs to have to be considered a complete rewrite, and
defaults to 99% if not specified.
As the new test t4008-diff-break-rewrite.sh demonstrates, if a
file is a complete rewrite, it is broken into a delete/create
pair, which can further be subjected to the usual rename
detection if -M or -C is used. For example, if file0 gets
completely rewritten to make it as if it were rather based on
file1 which itself disappeared, the following happens:
The original change looks like this:
file0 --> file0' (quite different from file0)
file1 --> /dev/null
After diffcore-break runs, it would become this:
file0 --> /dev/null
/dev/null --> file0'
file1 --> /dev/null
Then diffcore-rename matches them up:
file1 --> file0'
The internal score values are finer grained now. Earlier
maximum of 10000 has been raised to 60000; there is no user
visible changes but there is no reason to waste available bits.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-30 09:08:37 +02:00
|
|
|
static int diff_break_opt = -1;
|
2005-05-30 09:09:07 +02:00
|
|
|
static const char *orderfile = NULL;
|
2005-06-12 05:57:13 +02:00
|
|
|
static const char *diff_filter = NULL;
|
2005-04-27 02:17:36 +02:00
|
|
|
static int silent = 0;
|
|
|
|
|
2005-04-27 18:21:00 +02:00
|
|
|
static void show_unmerge(const char *path)
|
2005-04-27 02:17:36 +02:00
|
|
|
{
|
2005-05-20 04:00:36 +02:00
|
|
|
diff_unmerge(path);
|
2005-04-27 18:21:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void show_file(int pfx, struct cache_entry *ce)
|
|
|
|
{
|
2005-05-20 04:00:36 +02:00
|
|
|
diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL);
|
2005-04-27 18:21:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void show_modified(int oldmode, int mode,
|
2005-05-18 14:14:09 +02:00
|
|
|
const unsigned char *old_sha1, const unsigned char *sha1,
|
2005-04-27 18:21:00 +02:00
|
|
|
char *path)
|
|
|
|
{
|
2005-05-20 04:00:36 +02:00
|
|
|
diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
|
2005-04-27 02:17:36 +02:00
|
|
|
}
|
|
|
|
|
2005-05-22 19:04:37 +02:00
|
|
|
int main(int argc, const char **argv)
|
2005-04-08 00:13:13 +02:00
|
|
|
{
|
2005-05-18 14:14:09 +02:00
|
|
|
static const unsigned char null_sha1[20] = { 0, };
|
2005-07-15 01:55:06 +02:00
|
|
|
const char **pathspec;
|
2005-04-08 00:13:13 +02:00
|
|
|
int entries = read_cache();
|
|
|
|
int i;
|
|
|
|
|
2005-04-17 06:29:45 +02:00
|
|
|
while (1 < argc && argv[1][0] == '-') {
|
2005-07-08 19:45:07 +02:00
|
|
|
if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "-u"))
|
2005-05-22 04:42:18 +02:00
|
|
|
diff_output_format = DIFF_FORMAT_PATCH;
|
2005-04-17 06:29:45 +02:00
|
|
|
else if (!strcmp(argv[1], "-q"))
|
2005-04-28 00:22:02 +02:00
|
|
|
silent = 1;
|
2005-04-27 02:17:36 +02:00
|
|
|
else if (!strcmp(argv[1], "-r"))
|
2005-04-27 18:21:00 +02:00
|
|
|
; /* no-op */
|
2005-04-28 00:22:02 +02:00
|
|
|
else if (!strcmp(argv[1], "-s"))
|
|
|
|
; /* no-op */
|
|
|
|
else if (!strcmp(argv[1], "-z"))
|
2005-07-15 02:59:17 +02:00
|
|
|
diff_line_termination = 0;
|
2005-07-13 21:45:51 +02:00
|
|
|
else if (!strcmp(argv[1], "--name-only"))
|
|
|
|
diff_output_format = DIFF_FORMAT_NAME;
|
2005-05-20 04:00:36 +02:00
|
|
|
else if (!strcmp(argv[1], "-R"))
|
2005-05-28 00:54:37 +02:00
|
|
|
diff_setup_opt |= DIFF_SETUP_REVERSE;
|
2005-05-28 11:53:43 +02:00
|
|
|
else if (!strncmp(argv[1], "-S", 2))
|
2005-05-21 11:40:01 +02:00
|
|
|
pickaxe = argv[1] + 2;
|
2005-05-30 09:09:07 +02:00
|
|
|
else if (!strncmp(argv[1], "-O", 2))
|
|
|
|
orderfile = argv[1] + 2;
|
2005-06-12 05:57:13 +02:00
|
|
|
else if (!strncmp(argv[1], "--diff-filter=", 14))
|
|
|
|
diff_filter = argv[1] + 14;
|
2005-05-28 00:55:28 +02:00
|
|
|
else if (!strcmp(argv[1], "--pickaxe-all"))
|
|
|
|
pickaxe_opts = DIFF_PICKAXE_ALL;
|
2005-06-03 10:37:54 +02:00
|
|
|
else if (!strncmp(argv[1], "-B", 2)) {
|
|
|
|
if ((diff_break_opt =
|
|
|
|
diff_scoreopt_parse(argv[1])) == -1)
|
|
|
|
usage(diff_files_usage);
|
|
|
|
}
|
2005-05-20 04:00:36 +02:00
|
|
|
else if (!strncmp(argv[1], "-M", 2)) {
|
2005-06-03 10:37:54 +02:00
|
|
|
if ((diff_score_opt =
|
|
|
|
diff_scoreopt_parse(argv[1])) == -1)
|
|
|
|
usage(diff_files_usage);
|
2005-05-22 19:04:37 +02:00
|
|
|
detect_rename = DIFF_DETECT_RENAME;
|
2005-05-19 12:32:35 +02:00
|
|
|
}
|
2005-05-21 11:39:09 +02:00
|
|
|
else if (!strncmp(argv[1], "-C", 2)) {
|
2005-06-03 10:37:54 +02:00
|
|
|
if ((diff_score_opt =
|
|
|
|
diff_scoreopt_parse(argv[1])) == -1)
|
|
|
|
usage(diff_files_usage);
|
2005-05-22 19:04:37 +02:00
|
|
|
detect_rename = DIFF_DETECT_COPY;
|
2005-05-21 11:39:09 +02:00
|
|
|
}
|
2005-06-19 22:14:05 +02:00
|
|
|
else if (!strcmp(argv[1], "--find-copies-harder"))
|
|
|
|
find_copies_harder = 1;
|
2005-04-17 06:29:45 +02:00
|
|
|
else
|
2005-04-30 22:59:38 +02:00
|
|
|
usage(diff_files_usage);
|
2005-04-17 06:29:45 +02:00
|
|
|
argv++; argc--;
|
2005-04-13 10:40:09 +02:00
|
|
|
}
|
|
|
|
|
2005-07-15 01:55:06 +02:00
|
|
|
/* Do we have a pathspec? */
|
|
|
|
pathspec = (argc > 1) ? argv + 1 : NULL;
|
|
|
|
|
2005-06-19 22:14:05 +02:00
|
|
|
if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
|
|
|
|
usage(diff_files_usage);
|
|
|
|
|
2005-04-17 06:29:45 +02:00
|
|
|
/* At this point, if argc == 1, then we are doing everything.
|
|
|
|
* Otherwise argv[1] .. argv[argc-1] have the explicit paths.
|
|
|
|
*/
|
2005-04-08 00:13:13 +02:00
|
|
|
if (entries < 0) {
|
|
|
|
perror("read_cache");
|
|
|
|
exit(1);
|
|
|
|
}
|
2005-04-26 18:25:05 +02:00
|
|
|
|
2005-05-28 00:54:37 +02:00
|
|
|
diff_setup(diff_setup_opt);
|
2005-05-19 12:32:35 +02:00
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
for (i = 0; i < entries; i++) {
|
|
|
|
struct stat st;
|
2005-06-01 20:38:07 +02:00
|
|
|
unsigned int oldmode;
|
2005-04-08 00:13:13 +02:00
|
|
|
struct cache_entry *ce = active_cache[i];
|
2005-04-17 06:29:45 +02:00
|
|
|
int changed;
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2005-07-15 01:55:06 +02:00
|
|
|
if (!ce_path_match(ce, pathspec))
|
|
|
|
continue;
|
|
|
|
|
2005-04-17 06:29:45 +02:00
|
|
|
if (ce_stage(ce)) {
|
2005-04-27 18:21:00 +02:00
|
|
|
show_unmerge(ce->name);
|
2005-04-17 06:29:45 +02:00
|
|
|
while (i < entries &&
|
|
|
|
!strcmp(ce->name, active_cache[i]->name))
|
|
|
|
i++;
|
|
|
|
i--; /* compensate for loop control increments */
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-20 04:00:36 +02:00
|
|
|
|
2005-05-06 15:45:01 +02:00
|
|
|
if (lstat(ce->name, &st) < 0) {
|
2005-05-20 18:48:38 +02:00
|
|
|
if (errno != ENOENT && errno != ENOTDIR) {
|
2005-04-27 02:17:36 +02:00
|
|
|
perror(ce->name);
|
2005-04-16 00:08:09 +02:00
|
|
|
continue;
|
2005-05-20 04:00:36 +02:00
|
|
|
}
|
2005-04-28 00:22:02 +02:00
|
|
|
if (silent)
|
2005-04-27 02:17:36 +02:00
|
|
|
continue;
|
2005-04-27 18:21:00 +02:00
|
|
|
show_file('-', ce);
|
2005-04-08 00:13:13 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-05-15 04:04:25 +02:00
|
|
|
changed = ce_match_stat(ce, &st);
|
2005-06-19 22:14:05 +02:00
|
|
|
if (!changed && !find_copies_harder)
|
2005-04-08 00:13:13 +02:00
|
|
|
continue;
|
2005-04-27 02:17:36 +02:00
|
|
|
oldmode = ntohl(ce->ce_mode);
|
2005-06-01 20:38:07 +02:00
|
|
|
show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode),
|
2005-06-19 22:14:05 +02:00
|
|
|
ce->sha1, (changed ? null_sha1 : ce->sha1),
|
2005-04-27 18:21:00 +02:00
|
|
|
ce->name);
|
2005-04-08 00:13:13 +02:00
|
|
|
}
|
2005-07-15 01:55:06 +02:00
|
|
|
diffcore_std(pathspec,
|
2005-05-30 01:56:13 +02:00
|
|
|
detect_rename, diff_score_opt,
|
[PATCH] Add -B flag to diff-* brothers.
A new diffcore transformation, diffcore-break.c, is introduced.
When the -B flag is given, a patch that represents a complete
rewrite is broken into a deletion followed by a creation. This
makes it easier to review such a complete rewrite patch.
The -B flag takes the same syntax as the -M and -C flags to
specify the minimum amount of non-source material the resulting
file needs to have to be considered a complete rewrite, and
defaults to 99% if not specified.
As the new test t4008-diff-break-rewrite.sh demonstrates, if a
file is a complete rewrite, it is broken into a delete/create
pair, which can further be subjected to the usual rename
detection if -M or -C is used. For example, if file0 gets
completely rewritten to make it as if it were rather based on
file1 which itself disappeared, the following happens:
The original change looks like this:
file0 --> file0' (quite different from file0)
file1 --> /dev/null
After diffcore-break runs, it would become this:
file0 --> /dev/null
/dev/null --> file0'
file1 --> /dev/null
Then diffcore-rename matches them up:
file1 --> file0'
The internal score values are finer grained now. Earlier
maximum of 10000 has been raised to 60000; there is no user
visible changes but there is no reason to waste available bits.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-30 09:08:37 +02:00
|
|
|
pickaxe, pickaxe_opts,
|
2005-05-30 09:09:07 +02:00
|
|
|
diff_break_opt,
|
2005-06-12 05:57:13 +02:00
|
|
|
orderfile, diff_filter);
|
2005-07-15 02:59:17 +02:00
|
|
|
diff_flush(diff_output_format, diff_line_termination);
|
2005-04-08 00:13:13 +02:00
|
|
|
return 0;
|
|
|
|
}
|