mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
d416df8869
This shows "new file mode XXXX" and "deleted file mode XXXX" lines like two-way diff-patch output does, by checking the status from each parent. The diff-raw output for combined diff is made a bit uglier by showing diff status letters with each parent. While most of the case you would see "MM" in the output, an Evil Merge that touches a path that was added by inheriting from one parent is possible and it would be shown like these: $ git-diff-tree --abbrev -c HEAD 2d7ca89675eb8888b0b88a91102f096d4471f09f ::000000 000000 100644 0000000... 0000000... 31dd686... AA b ::000000 100644 100644 0000000... 6c884ae... c6d4fa8... AM d ::100644 100644 100644 4f7cbe7... f8c295c... 19d5d80... RR e Signed-off-by: Junio C Hamano <junkio@cox.net>
169 lines
5 KiB
C
169 lines
5 KiB
C
/*
|
|
* 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)
|
|
|
|
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 *);
|
|
|
|
struct diff_options;
|
|
|
|
typedef void (*change_fn_t)(struct diff_options *options,
|
|
unsigned old_mode, unsigned new_mode,
|
|
const unsigned char *old_sha1,
|
|
const unsigned char *new_sha1,
|
|
const char *base, const char *path);
|
|
|
|
typedef void (*add_remove_fn_t)(struct diff_options *options,
|
|
int addremove, unsigned mode,
|
|
const unsigned char *sha1,
|
|
const char *base, const char *path);
|
|
|
|
struct diff_options {
|
|
const char **paths;
|
|
const char *filter;
|
|
const char *orderfile;
|
|
const char *pickaxe;
|
|
unsigned recursive:1,
|
|
tree_in_recursive:1,
|
|
full_index:1;
|
|
int break_opt;
|
|
int detect_rename;
|
|
int find_copies_harder;
|
|
int line_termination;
|
|
int output_format;
|
|
int pickaxe_opts;
|
|
int rename_score;
|
|
int reverse_diff;
|
|
int rename_limit;
|
|
int setup;
|
|
int abbrev;
|
|
|
|
change_fn_t change;
|
|
add_remove_fn_t add_remove;
|
|
};
|
|
|
|
extern void diff_tree_setup_paths(const char **paths);
|
|
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,
|
|
const char *base, struct diff_options *opt);
|
|
|
|
struct combine_diff_path {
|
|
struct combine_diff_path *next;
|
|
int len;
|
|
char *path;
|
|
unsigned int mode;
|
|
unsigned char sha1[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 int show_combined_diff(struct combine_diff_path *elem, int num_parent,
|
|
int dense, const char *header,
|
|
struct diff_options *);
|
|
|
|
extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);
|
|
|
|
extern void diff_addremove(struct diff_options *,
|
|
int addremove,
|
|
unsigned mode,
|
|
const unsigned char *sha1,
|
|
const char *base,
|
|
const char *path);
|
|
|
|
extern void diff_change(struct diff_options *,
|
|
unsigned mode1, unsigned mode2,
|
|
const unsigned char *sha1,
|
|
const unsigned char *sha2,
|
|
const char *base, const char *path);
|
|
|
|
extern void diff_unmerge(struct diff_options *,
|
|
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 int git_diff_config(const char *var, const char *value);
|
|
extern void diff_setup(struct diff_options *);
|
|
extern int diff_opt_parse(struct diff_options *, const char **, int);
|
|
extern int diff_setup_done(struct diff_options *);
|
|
|
|
#define DIFF_DETECT_RENAME 1
|
|
#define DIFF_DETECT_COPY 2
|
|
|
|
#define DIFF_PICKAXE_ALL 1
|
|
|
|
extern void diffcore_std(struct diff_options *);
|
|
|
|
extern void diffcore_std_no_resolve(struct diff_options *);
|
|
|
|
#define COMMON_DIFF_OPTIONS_HELP \
|
|
"\ncommon diff options:\n" \
|
|
" -z output diff-raw with lines terminated with NUL.\n" \
|
|
" -p output patch format.\n" \
|
|
" -u synonym for -p.\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" \
|
|
" --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
|
|
" -R swap input file pairs.\n" \
|
|
" -B detect complete rewrites.\n" \
|
|
" -M detect renames.\n" \
|
|
" -C detect copies.\n" \
|
|
" --find-copies-harder\n" \
|
|
" try unchanged files as candidate for copy detection.\n" \
|
|
" -l<n> limit rename attempts up to <n> paths.\n" \
|
|
" -O<file> reorder diffs according to the <file>.\n" \
|
|
" -S<string> find filepair whose only one side contains the string.\n" \
|
|
" --pickaxe-all\n" \
|
|
" show all files diff when -S is used and hit is found.\n"
|
|
|
|
extern int diff_queue_is_empty(void);
|
|
|
|
#define DIFF_FORMAT_RAW 1
|
|
#define DIFF_FORMAT_PATCH 2
|
|
#define DIFF_FORMAT_NO_OUTPUT 3
|
|
#define DIFF_FORMAT_NAME 4
|
|
#define DIFF_FORMAT_NAME_STATUS 5
|
|
|
|
extern void diff_flush(struct diff_options*);
|
|
|
|
/* diff-raw status letters */
|
|
#define DIFF_STATUS_ADDED 'A'
|
|
#define DIFF_STATUS_COPIED 'C'
|
|
#define DIFF_STATUS_DELETED 'D'
|
|
#define DIFF_STATUS_MODIFIED 'M'
|
|
#define DIFF_STATUS_RENAMED 'R'
|
|
#define DIFF_STATUS_TYPE_CHANGED 'T'
|
|
#define DIFF_STATUS_UNKNOWN 'X'
|
|
#define DIFF_STATUS_UNMERGED 'U'
|
|
|
|
/* these are not diff-raw status letters proper, but used by
|
|
* diffcore-filter insn to specify additional restrictions.
|
|
*/
|
|
#define DIFF_STATUS_FILTER_AON '*'
|
|
#define DIFF_STATUS_FILTER_BROKEN 'B'
|
|
|
|
extern const char *diff_unique_abbrev(const unsigned char *, int);
|
|
|
|
#endif /* DIFF_H */
|