Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2005 Junio C Hamano |
| 3 | */ |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 4 | #ifndef DIFF_H |
| 5 | #define DIFF_H |
| 6 | |
Junio C Hamano | 77eb272 | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 7 | extern void diff_addremove(int addremove, |
| 8 | unsigned mode, |
| 9 | const unsigned char *sha1, |
| 10 | const char *base, |
| 11 | const char *path); |
| 12 | |
| 13 | extern 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 | |
| 18 | extern void diff_unmerge(const char *path); |
| 19 | |
| 20 | /* These are for diff-tree-helper */ |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 21 | |
Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 22 | struct diff_spec { |
Junio C Hamano | b46f0b6 | 2005-05-04 01:45:24 -0700 | [diff] [blame] | 23 | unsigned char blob_sha1[20]; |
Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 24 | unsigned short mode; /* file mode */ |
Junio C Hamano | b46f0b6 | 2005-05-04 01:45:24 -0700 | [diff] [blame] | 25 | unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode; |
| 26 | * however with a NULL SHA1, read them |
| 27 | * from the file system. |
| 28 | * if false, use the name and read mode from |
Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 29 | * the filesystem. |
| 30 | */ |
| 31 | unsigned file_valid : 1; /* if false the file does not even exist */ |
| 32 | }; |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 33 | |
Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 34 | extern void run_external_diff(const char *name, |
| 35 | struct diff_spec *, struct diff_spec *); |
Junio C Hamano | 86436c2 | 2005-04-25 18:22:47 -0700 | [diff] [blame] | 36 | |
| 37 | #endif /* DIFF_H */ |