2005-04-20 04:00:09 +00:00
|
|
|
#include "cache.h"
|
2005-04-27 16:21:00 +00:00
|
|
|
#include "diff.h"
|
2005-04-20 04:00:09 +00:00
|
|
|
|
|
|
|
static int cached_only = 0;
|
2005-07-15 00:59:17 +00:00
|
|
|
static int diff_output_format = DIFF_FORMAT_RAW;
|
|
|
|
static int diff_line_termination = '\n';
|
2005-05-05 16:31:09 +00:00
|
|
|
static int match_nonexisting = 0;
|
2005-05-19 10:32:35 +00:00
|
|
|
static int detect_rename = 0;
|
2005-06-19 20:14:05 +00:00
|
|
|
static int find_copies_harder = 0;
|
2005-05-27 22:54:37 +00:00
|
|
|
static int diff_setup_opt = 0;
|
2005-05-20 02:00:36 +00:00
|
|
|
static int diff_score_opt = 0;
|
2005-05-21 22:02:51 +00:00
|
|
|
static const char *pickaxe = NULL;
|
2005-05-27 22:55:28 +00: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 07:08:37 +00:00
|
|
|
static int diff_break_opt = -1;
|
2005-05-30 07:09:07 +00:00
|
|
|
static const char *orderfile = NULL;
|
2005-06-12 03:57:13 +00:00
|
|
|
static const char *diff_filter = NULL;
|
2005-04-20 04:00:09 +00:00
|
|
|
|
|
|
|
/* A file entry went away or appeared */
|
2005-04-27 16:41:15 +00:00
|
|
|
static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
|
2005-04-20 04:00:09 +00:00
|
|
|
{
|
2005-05-20 02:00:36 +00:00
|
|
|
diff_addremove(prefix[0], ntohl(mode), sha1, ce->name, NULL);
|
2005-04-20 04:00:09 +00:00
|
|
|
}
|
|
|
|
|
2005-04-27 16:41:15 +00:00
|
|
|
static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned int *modep)
|
2005-04-20 04:00:09 +00:00
|
|
|
{
|
2005-04-27 16:41:15 +00:00
|
|
|
unsigned char *sha1 = ce->sha1;
|
|
|
|
unsigned int mode = ce->ce_mode;
|
2005-04-20 04:00:09 +00:00
|
|
|
|
|
|
|
if (!cached_only) {
|
|
|
|
static unsigned char no_sha1[20];
|
2005-04-23 00:15:28 +00:00
|
|
|
int changed;
|
2005-04-20 04:00:09 +00:00
|
|
|
struct stat st;
|
2005-05-05 16:31:09 +00:00
|
|
|
if (lstat(ce->name, &st) < 0) {
|
|
|
|
if (errno == ENOENT && match_nonexisting) {
|
|
|
|
*sha1p = sha1;
|
|
|
|
*modep = mode;
|
|
|
|
return 0;
|
|
|
|
}
|
2005-04-20 04:00:09 +00:00
|
|
|
return -1;
|
2005-05-05 16:31:09 +00:00
|
|
|
}
|
2005-05-15 02:04:25 +00:00
|
|
|
changed = ce_match_stat(ce, &st);
|
2005-04-20 04:00:09 +00:00
|
|
|
if (changed) {
|
2005-04-27 16:41:15 +00:00
|
|
|
mode = create_ce_mode(st.st_mode);
|
2005-04-23 00:15:28 +00:00
|
|
|
sha1 = no_sha1;
|
2005-04-20 04:00:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-27 16:41:15 +00:00
|
|
|
*sha1p = sha1;
|
|
|
|
*modep = mode;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-28 17:13:01 +00:00
|
|
|
static void show_new_file(struct cache_entry *new)
|
2005-04-27 16:41:15 +00:00
|
|
|
{
|
|
|
|
unsigned char *sha1;
|
|
|
|
unsigned int mode;
|
|
|
|
|
|
|
|
/* New file in the index: it might actually be different in the working copy */
|
|
|
|
if (get_stat_data(new, &sha1, &mode) < 0)
|
2005-04-28 17:13:01 +00:00
|
|
|
return;
|
2005-04-27 16:41:15 +00:00
|
|
|
|
|
|
|
show_file("+", new, sha1, mode);
|
|
|
|
}
|
|
|
|
|
2005-05-05 22:35:49 +00:00
|
|
|
static int show_modified(struct cache_entry *old,
|
|
|
|
struct cache_entry *new,
|
|
|
|
int report_missing)
|
2005-04-27 16:41:15 +00:00
|
|
|
{
|
|
|
|
unsigned int mode, oldmode;
|
|
|
|
unsigned char *sha1;
|
|
|
|
|
|
|
|
if (get_stat_data(new, &sha1, &mode) < 0) {
|
2005-05-05 22:35:49 +00:00
|
|
|
if (report_missing)
|
|
|
|
show_file("-", old, old->sha1, old->ce_mode);
|
2005-04-27 16:41:15 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
oldmode = old->ce_mode;
|
2005-05-21 09:42:35 +00:00
|
|
|
if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
|
2005-06-19 20:14:05 +00:00
|
|
|
!find_copies_harder)
|
2005-04-20 04:00:09 +00:00
|
|
|
return 0;
|
|
|
|
|
2005-04-27 16:41:15 +00:00
|
|
|
mode = ntohl(mode);
|
|
|
|
oldmode = ntohl(oldmode);
|
|
|
|
|
2005-05-20 02:00:36 +00:00
|
|
|
diff_change(oldmode, mode,
|
|
|
|
old->sha1, sha1, old->name, NULL);
|
2005-04-20 04:00:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-07-14 23:43:01 +00:00
|
|
|
static int diff_cache(struct cache_entry **ac, int entries, const char **pathspec)
|
2005-04-20 04:00:09 +00:00
|
|
|
{
|
2005-04-23 00:15:28 +00:00
|
|
|
while (entries) {
|
|
|
|
struct cache_entry *ce = *ac;
|
2005-05-15 02:04:25 +00:00
|
|
|
int same = (entries > 1) && ce_same_name(ce, ac[1]);
|
2005-04-20 04:00:09 +00:00
|
|
|
|
2005-07-14 23:43:01 +00:00
|
|
|
if (!ce_path_match(ce, pathspec))
|
|
|
|
goto skip_entry;
|
|
|
|
|
2005-04-27 01:03:07 +00:00
|
|
|
switch (ce_stage(ce)) {
|
|
|
|
case 0:
|
|
|
|
/* No stage 1 entry? That means it's a new file */
|
|
|
|
if (!same) {
|
2005-04-27 16:41:15 +00:00
|
|
|
show_new_file(ce);
|
2005-04-27 01:03:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Show difference between old and new */
|
2005-05-05 22:35:49 +00:00
|
|
|
show_modified(ac[1], ce, 1);
|
2005-04-27 01:03:07 +00:00
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
/* No stage 3 (merge) entry? That means it's been deleted */
|
|
|
|
if (!same) {
|
2005-04-27 16:41:15 +00:00
|
|
|
show_file("-", ce, ce->sha1, ce->ce_mode);
|
2005-04-27 01:03:07 +00:00
|
|
|
break;
|
|
|
|
}
|
2005-05-05 22:35:49 +00:00
|
|
|
/* We come here with ce pointing at stage 1
|
|
|
|
* (original tree) and ac[1] pointing at stage
|
|
|
|
* 3 (unmerged). show-modified with
|
|
|
|
* report-mising set to false does not say the
|
|
|
|
* file is deleted but reports true if work
|
|
|
|
* tree does not have it, in which case we
|
|
|
|
* fall through to report the unmerged state.
|
|
|
|
* Otherwise, we show the differences between
|
|
|
|
* the original tree and the work tree.
|
|
|
|
*/
|
|
|
|
if (!cached_only && !show_modified(ce, ac[1], 0))
|
|
|
|
break;
|
|
|
|
/* fallthru */
|
2005-04-27 01:03:07 +00:00
|
|
|
case 3:
|
2005-05-20 02:00:36 +00:00
|
|
|
diff_unmerge(ce->name);
|
2005-04-27 01:03:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
die("impossible cache entry stage");
|
2005-04-20 04:00:09 +00:00
|
|
|
}
|
2005-04-27 01:03:07 +00:00
|
|
|
|
2005-07-14 23:43:01 +00:00
|
|
|
skip_entry:
|
2005-04-27 01:03:07 +00:00
|
|
|
/*
|
|
|
|
* Ignore all the different stages for this file,
|
|
|
|
* we've handled the relevant cases now.
|
|
|
|
*/
|
|
|
|
do {
|
2005-04-20 04:00:09 +00:00
|
|
|
ac++;
|
|
|
|
entries--;
|
2005-05-15 02:04:25 +00:00
|
|
|
} while (entries && ce_same_name(ce, ac[0]));
|
2005-04-20 04:00:09 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-27 01:03:07 +00:00
|
|
|
/*
|
|
|
|
* This turns all merge entries into "stage 3". That guarantees that
|
|
|
|
* when we read in the new tree (into "stage 1"), we won't lose sight
|
|
|
|
* of the fact that we had unmerged entries.
|
|
|
|
*/
|
|
|
|
static void mark_merge_entries(void)
|
2005-04-23 00:15:28 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
|
|
|
if (!ce_stage(ce))
|
2005-04-26 17:13:31 +00:00
|
|
|
continue;
|
2005-04-27 01:03:07 +00:00
|
|
|
ce->ce_flags |= htons(CE_STAGEMASK);
|
2005-04-23 00:15:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-07-29 09:01:26 +00:00
|
|
|
static const char diff_cache_usage[] =
|
2005-07-13 19:52:35 +00:00
|
|
|
"git-diff-cache [-m] [--cached] "
|
|
|
|
"[<common diff options>] <tree-ish> [<path>...]"
|
|
|
|
COMMON_DIFF_OPTIONS_HELP;
|
2005-04-21 02:49:16 +00:00
|
|
|
|
2005-08-17 01:06:34 +00:00
|
|
|
int main(int argc, char **argv)
|
2005-04-20 04:00:09 +00:00
|
|
|
{
|
2005-05-25 01:10:11 +00:00
|
|
|
const char *tree_name = NULL;
|
|
|
|
unsigned char sha1[20];
|
2005-08-17 01:06:34 +00:00
|
|
|
const char *prefix = setup_git_directory();
|
2005-05-25 01:10:11 +00:00
|
|
|
const char **pathspec = NULL;
|
2005-04-20 04:00:09 +00:00
|
|
|
void *tree;
|
|
|
|
unsigned long size;
|
2005-05-19 10:32:35 +00:00
|
|
|
int ret;
|
2005-06-06 21:27:00 +00:00
|
|
|
int allow_options = 1;
|
2005-05-25 01:10:11 +00:00
|
|
|
int i;
|
2005-04-20 04:00:09 +00:00
|
|
|
|
2005-05-25 01:10:11 +00:00
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
|
|
|
|
2005-06-06 21:27:00 +00:00
|
|
|
if (!allow_options || *arg != '-') {
|
2005-08-17 01:06:34 +00:00
|
|
|
if (tree_name)
|
2005-05-25 01:10:11 +00:00
|
|
|
break;
|
|
|
|
tree_name = arg;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2005-06-06 21:27:00 +00:00
|
|
|
if (!strcmp(arg, "--")) {
|
|
|
|
allow_options = 0;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-20 04:00:09 +00:00
|
|
|
if (!strcmp(arg, "-r")) {
|
2005-05-19 11:17:16 +00:00
|
|
|
/* We accept the -r flag just to look like git-diff-tree */
|
2005-04-20 04:00:09 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-07-08 17:45:07 +00:00
|
|
|
/* We accept the -u flag as a synonym for "-p" */
|
|
|
|
if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
|
2005-05-22 02:42:18 +00:00
|
|
|
diff_output_format = DIFF_FORMAT_PATCH;
|
2005-04-27 16:21:00 +00:00
|
|
|
continue;
|
|
|
|
}
|
[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 07:08:37 +00:00
|
|
|
if (!strncmp(arg, "-B", 2)) {
|
2005-06-03 08:37:54 +00:00
|
|
|
if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
|
|
|
|
usage(diff_cache_usage);
|
[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 07:08:37 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-05-20 02:00:36 +00:00
|
|
|
if (!strncmp(arg, "-M", 2)) {
|
2005-05-22 17:04:37 +00:00
|
|
|
detect_rename = DIFF_DETECT_RENAME;
|
2005-06-03 08:37:54 +00:00
|
|
|
if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
|
|
|
|
usage(diff_cache_usage);
|
2005-05-19 10:32:35 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-05-21 09:39:09 +00:00
|
|
|
if (!strncmp(arg, "-C", 2)) {
|
2005-05-22 17:04:37 +00:00
|
|
|
detect_rename = DIFF_DETECT_COPY;
|
2005-06-03 08:37:54 +00:00
|
|
|
if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
|
|
|
|
usage(diff_cache_usage);
|
2005-05-21 09:39:09 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-06-19 20:14:05 +00:00
|
|
|
if (!strcmp(arg, "--find-copies-harder")) {
|
|
|
|
find_copies_harder = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-20 04:00:09 +00:00
|
|
|
if (!strcmp(arg, "-z")) {
|
2005-07-15 00:59:17 +00:00
|
|
|
diff_line_termination = 0;
|
2005-04-20 04:00:09 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-07-13 19:45:51 +00:00
|
|
|
if (!strcmp(arg, "--name-only")) {
|
|
|
|
diff_output_format = DIFF_FORMAT_NAME;
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-20 02:00:36 +00:00
|
|
|
if (!strcmp(arg, "-R")) {
|
2005-05-27 22:54:37 +00:00
|
|
|
diff_setup_opt |= DIFF_SETUP_REVERSE;
|
2005-05-20 02:00:36 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-05-28 09:53:43 +00:00
|
|
|
if (!strncmp(arg, "-S", 2)) {
|
2005-05-21 09:40:01 +00:00
|
|
|
pickaxe = arg + 2;
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-12 03:57:13 +00:00
|
|
|
if (!strncmp(arg, "--diff-filter=", 14)) {
|
|
|
|
diff_filter = arg + 14;
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-30 07:09:07 +00:00
|
|
|
if (!strncmp(arg, "-O", 2)) {
|
|
|
|
orderfile = arg + 2;
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-27 22:55:28 +00:00
|
|
|
if (!strcmp(arg, "--pickaxe-all")) {
|
|
|
|
pickaxe_opts = DIFF_PICKAXE_ALL;
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-05 16:31:09 +00:00
|
|
|
if (!strcmp(arg, "-m")) {
|
|
|
|
match_nonexisting = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-20 04:00:09 +00:00
|
|
|
if (!strcmp(arg, "--cached")) {
|
|
|
|
cached_only = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-21 02:49:16 +00:00
|
|
|
usage(diff_cache_usage);
|
2005-04-20 04:00:09 +00:00
|
|
|
}
|
|
|
|
|
2005-08-17 01:06:34 +00:00
|
|
|
pathspec = get_pathspec(prefix, argv + i);
|
|
|
|
|
2005-06-19 20:14:05 +00:00
|
|
|
if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
|
|
|
|
usage(diff_cache_usage);
|
|
|
|
|
2005-05-25 01:10:11 +00:00
|
|
|
if (!tree_name || get_sha1(tree_name, sha1))
|
2005-04-21 02:49:16 +00:00
|
|
|
usage(diff_cache_usage);
|
2005-04-20 04:00:09 +00:00
|
|
|
|
2005-08-17 01:06:34 +00:00
|
|
|
read_cache();
|
|
|
|
|
2005-05-22 17:04:37 +00:00
|
|
|
/* The rest is for paths restriction. */
|
2005-05-27 22:54:37 +00:00
|
|
|
diff_setup(diff_setup_opt);
|
2005-05-19 10:32:35 +00:00
|
|
|
|
2005-04-27 01:03:07 +00:00
|
|
|
mark_merge_entries();
|
2005-04-23 00:15:28 +00:00
|
|
|
|
2005-05-25 01:10:11 +00:00
|
|
|
tree = read_object_with_reference(sha1, "tree", &size, NULL);
|
2005-04-20 04:00:09 +00:00
|
|
|
if (!tree)
|
2005-05-25 01:10:11 +00:00
|
|
|
die("bad tree object %s", tree_name);
|
2005-07-14 20:19:19 +00:00
|
|
|
if (read_tree(tree, size, 1, pathspec))
|
2005-05-25 01:10:11 +00:00
|
|
|
die("unable to read tree object %s", tree_name);
|
2005-04-20 04:00:09 +00:00
|
|
|
|
2005-07-14 23:43:01 +00:00
|
|
|
ret = diff_cache(active_cache, active_nr, pathspec);
|
[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 07:08:37 +00:00
|
|
|
|
2005-07-14 20:19:19 +00:00
|
|
|
diffcore_std(pathspec,
|
2005-05-29 23:56:13 +00: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 07:08:37 +00:00
|
|
|
pickaxe, pickaxe_opts,
|
2005-05-30 07:09:07 +00:00
|
|
|
diff_break_opt,
|
2005-06-12 03:57:13 +00:00
|
|
|
orderfile, diff_filter);
|
2005-07-15 00:59:17 +00:00
|
|
|
diff_flush(diff_output_format, diff_line_termination);
|
2005-05-19 10:32:35 +00:00
|
|
|
return ret;
|
2005-04-20 04:00:09 +00:00
|
|
|
}
|