projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create/delete branch ref logs.
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
32134d7
..
3027974
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-4,18
+4,9
@@
#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)
-
-struct tree_desc {
- void *buf;
- unsigned long size;
-};
-
-extern void update_tree_entry(struct tree_desc *);
-extern const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
+#include "tree-walk.h"
+struct rev_info;
struct diff_options;
typedef void (*change_fn_t)(struct diff_options *options,
struct diff_options;
typedef void (*change_fn_t)(struct diff_options *options,
@@
-30,16
+21,21
@@
typedef void (*add_remove_fn_t)(struct diff_options *options,
const char *base, const char *path);
struct diff_options {
const char *base, const char *path);
struct diff_options {
- const char **paths;
const char *filter;
const char *orderfile;
const char *pickaxe;
unsigned recursive:1,
const char *filter;
const char *orderfile;
const char *pickaxe;
unsigned recursive:1,
+ with_raw:1,
+ with_stat:1,
tree_in_recursive:1,
tree_in_recursive:1,
- full_index:1;
+ binary:1,
+ full_index:1,
+ silent_on_remove:1,
+ find_copies_harder:1,
+ summary:1;
+ int context;
int break_opt;
int detect_rename;
int break_opt;
int detect_rename;
- int find_copies_harder;
int line_termination;
int output_format;
int pickaxe_opts;
int line_termination;
int output_format;
int pickaxe_opts;
@@
-49,11
+45,15
@@
struct diff_options {
int setup;
int abbrev;
int setup;
int abbrev;
+ int nr_paths;
+ const char **paths;
+ int *pathlens;
change_fn_t change;
add_remove_fn_t add_remove;
};
change_fn_t change;
add_remove_fn_t add_remove;
};
-extern void diff_tree_setup_paths(const char **paths);
+extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
+extern void diff_tree_release_paths(struct diff_options *);
extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
const char *base, struct diff_options *opt);
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
const char *base, struct diff_options *opt);
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
@@
-63,14
+63,24
@@
struct combine_diff_path {
struct combine_diff_path *next;
int len;
char *path;
struct combine_diff_path *next;
int len;
char *path;
+ unsigned int mode;
unsigned char sha1[20];
unsigned char sha1[20];
- unsigned char parent_sha1[FLEX_ARRAY][20];
+ struct combine_diff_parent {
+ char status;
+ unsigned int mode;
+ unsigned char sha1[20];
+ } parent[FLEX_ARRAY];
};
};
+#define combine_diff_path_size(n, l) \
+ (sizeof(struct combine_diff_path) + \
+ sizeof(struct combine_diff_parent) * (n) + (l) + 1)
+
+extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
+ int dense, struct rev_info *);
-int show_combined_diff(struct combine_diff_path *elem, int num_parent,
- int dense, const char *header, int show_empty);
+extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
-extern
int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int
);
+extern
void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *
);
extern void diff_addremove(struct diff_options *,
int addremove,
extern void diff_addremove(struct diff_options *,
int addremove,
@@
-103,6
+113,7
@@
extern int diff_setup_done(struct diff_options *);
#define DIFF_DETECT_COPY 2
#define DIFF_PICKAXE_ALL 1
#define DIFF_DETECT_COPY 2
#define DIFF_PICKAXE_ALL 1
+#define DIFF_PICKAXE_REGEX 2
extern void diffcore_std(struct diff_options *);
extern void diffcore_std(struct diff_options *);
@@
-113,6
+124,11
@@
extern void diffcore_std_no_resolve(struct diff_options *);
" -z output diff-raw with lines terminated with NUL.\n" \
" -p output patch format.\n" \
" -u synonym for -p.\n" \
" -z output diff-raw with lines terminated with NUL.\n" \
" -p output patch format.\n" \
" -u synonym for -p.\n" \
+" --patch-with-raw\n" \
+" output both a patch and the diff-raw format.\n" \
+" --stat show diffstat instead of patch.\n" \
+" --patch-with-stat\n" \
+" output a patch and prepend its diffstat.\n" \
" --name-only show only names of changed files.\n" \
" --name-status show names and status of changed files.\n" \
" --full-index show full object name on index lines.\n" \
" --name-only show only names of changed files.\n" \
" --name-status show names and status of changed files.\n" \
" --full-index show full object name on index lines.\n" \
@@
-136,6
+152,7
@@
extern int diff_queue_is_empty(void);
#define DIFF_FORMAT_NO_OUTPUT 3
#define DIFF_FORMAT_NAME 4
#define DIFF_FORMAT_NAME_STATUS 5
#define DIFF_FORMAT_NO_OUTPUT 3
#define DIFF_FORMAT_NAME 4
#define DIFF_FORMAT_NAME_STATUS 5
+#define DIFF_FORMAT_DIFFSTAT 6
extern void diff_flush(struct diff_options*);
extern void diff_flush(struct diff_options*);
@@
-157,4
+174,8
@@
extern void diff_flush(struct diff_options*);
extern const char *diff_unique_abbrev(const unsigned char *, int);
extern const char *diff_unique_abbrev(const unsigned char *, int);
+extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
+
+extern int run_diff_index(struct rev_info *revs, int cached);
+
#endif /* DIFF_H */
#endif /* DIFF_H */