[PATCH] Add -O<orderfile> option to diff-* brothers.
[git/git.git] / diff.h
CommitLineData
be3cfa85
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
86436c28
JH
4#ifndef DIFF_H
5#define DIFF_H
6
77eb2720
JH
7extern void diff_addremove(int addremove,
8 unsigned mode,
9 const unsigned char *sha1,
10 const char *base,
11 const char *path);
12
13extern void diff_change(unsigned mode1, unsigned mode2,
14 const unsigned char *sha1,
15 const unsigned char *sha2,
16 const char *base, const char *path);
17
b6d8f309
JH
18extern void diff_helper_input(unsigned mode1,
19 unsigned mode2,
20 const unsigned char *sha1,
21 const unsigned char *sha2,
22 const char *path1,
23 int status,
24 int score,
25 const char *path2);
81e50eab 26
77eb2720
JH
27extern void diff_unmerge(const char *path);
28
57fe64a4
JH
29extern int diff_scoreopt_parse(const char *opt);
30
19feebc8 31#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
32#define DIFF_SETUP_USE_CACHE 2
33#define DIFF_SETUP_USE_SIZE_CACHE 4
19feebc8 34extern void diff_setup(int flags);
86436c28 35
6b14d7fa
JH
36#define DIFF_DETECT_RENAME 1
37#define DIFF_DETECT_COPY 2
38
39extern void diffcore_rename(int rename_copy, int minimum_score);
40
367cec1c
JH
41#define DIFF_PICKAXE_ALL 1
42extern void diffcore_pickaxe(const char *needle, int opts);
43
6b14d7fa 44extern void diffcore_pathspec(const char **pathspec);
38c6f780 45
af5323e0
JH
46extern void diffcore_order(const char *orderfile);
47
48extern void diffcore_break(int max_score);
f345b0a0 49
befe8639
JH
50extern void diffcore_std(const char **paths,
51 int detect_rename, int rename_score,
f345b0a0 52 const char *pickaxe, int pickaxe_opts,
af5323e0
JH
53 int break_opt,
54 const char *orderfile);
befe8639 55
38c6f780
JH
56extern int diff_queue_is_empty(void);
57
19feebc8
JH
58#define DIFF_FORMAT_HUMAN 0
59#define DIFF_FORMAT_MACHINE 1
60#define DIFF_FORMAT_PATCH 2
61#define DIFF_FORMAT_NO_OUTPUT 3
62
b6d8f309 63extern void diff_flush(int output_style, int resolve_rename_copy);
86436c28
JH
64
65#endif /* DIFF_H */