Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v0.99.9c / . / diff.h
blob: 12590791cbefe8717891365b6d417f60c51f684f [file] [log] [blame]
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]4#ifndef DIFF_H
5#define DIFF_H
6
Junio C Hamano67574c42005-06-01 18:38:07[diff] [blame]7#define DIFF_FILE_CANON_MODE(mode) \
8 (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
9 S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
10
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]11struct tree_desc {
12 void *buf;
13 unsigned long size;
14};
15
16struct diff_options;
17
18typedef void (*change_fn_t)(struct diff_options *options,
19 unsigned old_mode, unsigned new_mode,
20 const unsigned char *old_sha1,
21 const unsigned char *new_sha1,
22 const char *base, const char *path);
23
24typedef void (*add_remove_fn_t)(struct diff_options *options,
25 int addremove, unsigned mode,
26 const unsigned char *sha1,
27 const char *base, const char *path);
28
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]29struct diff_options {
30 const char **paths;
31 const char *filter;
32 const char *orderfile;
33 const char *pickaxe;
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]34 unsigned recursive:1,
35 tree_in_recursive:1;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]36 int break_opt;
37 int detect_rename;
38 int find_copies_harder;
39 int line_termination;
40 int output_format;
41 int pickaxe_opts;
42 int rename_score;
43 int reverse_diff;
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]44 int rename_limit;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]45 int setup;
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]46
47 change_fn_t change;
48 add_remove_fn_t add_remove;
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]49};
50
Linus Torvaldsac1b3d12005-10-21 04:05:05[diff] [blame]51extern void diff_tree_setup_paths(const char **paths);
52extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
53 const char *base, struct diff_options *opt);
54extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
55 const char *base, struct diff_options *opt);
56
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]57extern void diff_addremove(struct diff_options *,
58 int addremove,
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]59 unsigned mode,
60 const unsigned char *sha1,
61 const char *base,
62 const char *path);
63
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]64extern void diff_change(struct diff_options *,
65 unsigned mode1, unsigned mode2,
66 const unsigned char *sha1,
67 const unsigned char *sha2,
68 const char *base, const char *path);
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]69
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]70extern void diff_unmerge(struct diff_options *,
71 const char *path);
Junio C Hamano77eb2722005-04-27 16:21:00[diff] [blame]72
Junio C Hamano57fe64a2005-05-20 02:00:36[diff] [blame]73extern int diff_scoreopt_parse(const char *opt);
74
Junio C Hamano19feebc2005-05-27 22:54:37[diff] [blame]75#define DIFF_SETUP_REVERSE 1
Junio C Hamanof0c6b2a2005-05-27 22:56:38[diff] [blame]76#define DIFF_SETUP_USE_CACHE 2
77#define DIFF_SETUP_USE_SIZE_CACHE 4
Junio C Hamanoce240672005-06-03 08:36:43[diff] [blame]78
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]79extern void diff_setup(struct diff_options *);
80extern int diff_opt_parse(struct diff_options *, const char **, int);
81extern int diff_setup_done(struct diff_options *);
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]82
Junio C Hamano6b14d7f2005-05-22 17:04:37[diff] [blame]83#define DIFF_DETECT_RENAME 1
84#define DIFF_DETECT_COPY 2
85
Junio C Hamano367cec12005-05-27 22:55:28[diff] [blame]86#define DIFF_PICKAXE_ALL 1
Junio C Hamanof345b0a2005-05-30 07:08:37[diff] [blame]87
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]88extern void diffcore_std(struct diff_options *);
Junio C Hamanof2ce9fd2005-06-12 03:57:13[diff] [blame]89
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]90extern void diffcore_std_no_resolve(struct diff_options *);
Junio C Hamanobefe8632005-05-29 23:56:13[diff] [blame]91
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]92#define COMMON_DIFF_OPTIONS_HELP \
93"\ncommon diff options:\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]94" -z output diff-raw with lines terminated with NUL.\n" \
95" -p output patch format.\n" \
96" -u synonym for -p.\n" \
97" --name-only show only names of changed files.\n" \
Junio C Hamano946f5f72005-09-21 07:20:06[diff] [blame]98" --name-status show names and status of changed files.\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]99" -R swap input file pairs.\n" \
100" -B detect complete rewrites.\n" \
101" -M detect renames.\n" \
102" -C detect copies.\n" \
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]103" --find-copies-harder\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]104" try unchanged files as candidate for copy detection.\n" \
105" -l<n> limit rename attempts up to <n> paths.\n" \
106" -O<file> reorder diffs according to the <file>.\n" \
107" -S<string> find filepair whose only one side contains the string.\n" \
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]108" --pickaxe-all\n" \
Junio C Hamano8082d8d2005-09-21 07:18:27[diff] [blame]109" show all files diff when -S is used and hit is found.\n"
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]110
Junio C Hamano38c6f782005-05-22 02:40:36[diff] [blame]111extern int diff_queue_is_empty(void);
112
Linus Torvaldse68b6f12005-07-15 00:59:17[diff] [blame]113#define DIFF_FORMAT_RAW 1
Junio C Hamano19feebc2005-05-27 22:54:37[diff] [blame]114#define DIFF_FORMAT_PATCH 2
115#define DIFF_FORMAT_NO_OUTPUT 3
Junio C Hamano52f28522005-07-13 19:45:51[diff] [blame]116#define DIFF_FORMAT_NAME 4
Junio C Hamano946f5f72005-09-21 07:20:06[diff] [blame]117#define DIFF_FORMAT_NAME_STATUS 5
Junio C Hamano19feebc2005-05-27 22:54:37[diff] [blame]118
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]119extern void diff_flush(struct diff_options*);
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]120
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]121/* diff-raw status letters */
Junio C Hamanoca8c9152005-07-25 21:31:19[diff] [blame]122#define DIFF_STATUS_ADDED 'A'
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]123#define DIFF_STATUS_COPIED 'C'
124#define DIFF_STATUS_DELETED 'D'
125#define DIFF_STATUS_MODIFIED 'M'
126#define DIFF_STATUS_RENAMED 'R'
127#define DIFF_STATUS_TYPE_CHANGED 'T'
128#define DIFF_STATUS_UNKNOWN 'X'
129#define DIFF_STATUS_UNMERGED 'U'
130
131/* these are not diff-raw status letters proper, but used by
132 * diffcore-filter insn to specify additional restrictions.
133 */
Junio C Hamano0b343792005-10-05 00:44:17[diff] [blame]134#define DIFF_STATUS_FILTER_AON '*'
Junio C Hamanoe7baa4f2005-07-25 20:05:44[diff] [blame]135#define DIFF_STATUS_FILTER_BROKEN 'B'
136
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]137#endif /* DIFF_H */