|
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2005 Junio C Hamano
|
|
|
|
|
*/
|
|
|
|
|
#ifndef DIFF_H
|
|
|
|
|
#define DIFF_H
|
|
|
|
|
|
|
|
|
|
#define DIFF_FILE_CANON_MODE(mode) \
|
|
|
|
|
(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
|
|
|
|
|
S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
|
|
|
|
|
|
|
|
|
|
extern void diff_addremove(int addremove,
|
|
|
|
|
unsigned mode,
|
|
|
|
|
const unsigned char *sha1,
|
|
|
|
|
const char *base,
|
|
|
|
|
const char *path);
|
|
|
|
|
|
|
|
|
|
extern void diff_change(unsigned mode1, unsigned mode2,
|
|
|
|
|
const unsigned char *sha1,
|
|
|
|
|
const unsigned char *sha2,
|
|
|
|
|
const char *base, const char *path);
|
|
|
|
|
|
|
|
|
|
extern void diff_helper_input(unsigned mode1,
|
|
|
|
|
unsigned mode2,
|
|
|
|
|
const unsigned char *sha1,
|
|
|
|
|
const unsigned char *sha2,
|
|
|
|
|
const char *path1,
|
|
|
|
|
int status,
|
|
|
|
|
int score,
|
|
|
|
|
const char *path2);
|
|
|
|
|
|
|
|
|
|
extern void diff_unmerge(const char *path);
|
|
|
|
|
|
|
|
|
|
extern int diff_scoreopt_parse(const char *opt);
|
|
|
|
|
|
|
|
|
|
#define DIFF_SETUP_REVERSE 1
|
|
|
|
|
#define DIFF_SETUP_USE_CACHE 2
|
|
|
|
|
#define DIFF_SETUP_USE_SIZE_CACHE 4
|
|
|
|
|
extern void diff_setup(int flags);
|
|
|
|
|
|
|
|
|
|
#define DIFF_DETECT_RENAME 1
|
|
|
|
|
#define DIFF_DETECT_COPY 2
|
|
|
|
|
|
|
|
|
|
extern void diffcore_rename(int rename_copy, int minimum_score);
|
|
|
|
|
|
|
|
|
|
#define DIFF_PICKAXE_ALL 1
|
|
|
|
|
extern void diffcore_pickaxe(const char *needle, int opts);
|
|
|
|
|
|
|
|
|
|
extern void diffcore_pathspec(const char **pathspec);
|
|
|
|
|
|
|
|
|
|
extern void diffcore_order(const char *orderfile);
|
|
|
|
|
|
|
|
|
|
extern void diffcore_break(int max_score);
|
[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>
20 years ago
|
|
|
|
|
|
|
|
extern void diffcore_std(const char **paths,
|
|
|
|
|
int detect_rename, int rename_score,
|
[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>
20 years ago
|
|
|
const char *pickaxe, int pickaxe_opts,
|
|
|
|
|
int break_opt,
|
|
|
|
|
const char *orderfile);
|
|
|
|
|
|
|
|
|
|
extern int diff_queue_is_empty(void);
|
|
|
|
|
|
|
|
|
|
#define DIFF_FORMAT_HUMAN 0
|
|
|
|
|
#define DIFF_FORMAT_MACHINE 1
|
|
|
|
|
#define DIFF_FORMAT_PATCH 2
|
|
|
|
|
#define DIFF_FORMAT_NO_OUTPUT 3
|
|
|
|
|
|
|
|
|
|
extern void diff_flush(int output_style, int resolve_rename_copy);
|
|
|
|
|
|
|
|
|
|
#endif /* DIFF_H */
|
