projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix delta "sliding window" code
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
cae6e14
..
9f0852d
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-4,6
+4,10
@@
#ifndef DIFF_H
#define DIFF_H
#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,
extern void diff_addremove(int addremove,
unsigned mode,
const unsigned char *sha1,
@@
-15,35
+19,47
@@
extern void diff_change(unsigned mode1, unsigned mode2,
const unsigned char *sha2,
const char *base, const char *path);
const unsigned char *sha2,
const char *base, const char *path);
-extern void diff_guif(unsigned mode1,
- unsigned mode2,
- const unsigned char *sha1,
- const unsigned char *sha2,
- const char *path1,
- const char *path2);
+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);
extern void diff_unmerge(const char *path);
extern int diff_scoreopt_parse(const char *opt);
-#define DIFF_
FORMAT_HUMAN 0
-#define DIFF_
FORMAT_MACHINE 1
-#define DIFF_
FORMAT_PATCH 2
-#define DIFF_FORMAT_NO_OUTPUT 3
-extern void diff_setup(int
reverse
);
+#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
#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_prune(void);
+extern void diffcore_std(const char **paths,
+ int detect_rename, int rename_score,
+ const char *pickaxe, int pickaxe_opts,
+ int break_opt,
+ const char *orderfile, const char *filter);
-extern void diffcore_pickaxe(const char *needle);
-extern void diffcore_pathspec(const char **pathspec);
+extern void diffcore_std_no_resolve(const char **paths,
+ const char *pickaxe, int pickaxe_opts,
+ const char *orderfile, const char *filter);
extern int diff_queue_is_empty(void);
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);
#endif /* DIFF_H */
extern void diff_flush(int output_style);
#endif /* DIFF_H */