2005-04-26 16:25:05 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2005 Junio C Hamano
|
|
|
|
*/
|
2005-04-26 01:22:47 +00:00
|
|
|
#ifndef DIFF_H
|
|
|
|
#define DIFF_H
|
|
|
|
|
2005-04-27 16:21:00 +00:00
|
|
|
extern void diff_addremove(int addremove,
|
|
|
|
unsigned mode,
|
|
|
|
const unsigned char *sha1,
|
|
|
|
const char *base,
|
|
|
|
const char *path);
|
|
|
|
|
|
|
|
extern void diff_change(unsigned mode1, unsigned mode2,
|
|
|
|
const unsigned char *sha1,
|
|
|
|
const unsigned char *sha2,
|
|
|
|
const char *base, const char *path);
|
|
|
|
|
|
|
|
extern void diff_unmerge(const char *path);
|
|
|
|
|
2005-05-14 01:40:54 +00:00
|
|
|
/* These are for diff-helper */
|
2005-04-26 01:22:47 +00:00
|
|
|
|
2005-04-26 16:25:05 +00:00
|
|
|
struct diff_spec {
|
2005-05-04 08:45:24 +00:00
|
|
|
unsigned char blob_sha1[20];
|
2005-04-26 16:25:05 +00:00
|
|
|
unsigned short mode; /* file mode */
|
2005-05-04 08:45:24 +00:00
|
|
|
unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode;
|
|
|
|
* however with a NULL SHA1, read them
|
|
|
|
* from the file system.
|
|
|
|
* if false, use the name and read mode from
|
2005-04-26 16:25:05 +00:00
|
|
|
* the filesystem.
|
|
|
|
*/
|
|
|
|
unsigned file_valid : 1; /* if false the file does not even exist */
|
|
|
|
};
|
2005-04-26 01:22:47 +00:00
|
|
|
|
2005-04-26 16:25:05 +00:00
|
|
|
extern void run_external_diff(const char *name,
|
|
|
|
struct diff_spec *, struct diff_spec *);
|
2005-04-26 01:22:47 +00:00
|
|
|
|
|
|
|
#endif /* DIFF_H */
|