Blame rerere.h

Packit 4511e4
#ifndef RERERE_H
Packit 4511e4
#define RERERE_H
Packit 4511e4
Packit 4511e4
#include "string-list.h"
Packit 4511e4
Packit 4511e4
struct pathspec;
Packit Service b5fd21
struct repository;
Packit 4511e4
Packit 4511e4
#define RERERE_AUTOUPDATE   01
Packit 4511e4
#define RERERE_NOAUTOUPDATE 02
Packit 4511e4
#define RERERE_READONLY     04
Packit 4511e4
Packit 4511e4
/*
Packit 4511e4
 * Marks paths that have been hand-resolved and added to the
Packit 4511e4
 * index. Set in the util field of such paths after calling
Packit 4511e4
 * rerere_remaining.
Packit 4511e4
 */
Packit 4511e4
extern void *RERERE_RESOLVED;
Packit 4511e4
Packit 4511e4
struct rerere_dir;
Packit 4511e4
struct rerere_id {
Packit 4511e4
	struct rerere_dir *collection;
Packit 4511e4
	int variant;
Packit 4511e4
};
Packit 4511e4
Packit Service b5fd21
int setup_rerere(struct repository *,struct string_list *, int);
Packit Service b5fd21
#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
Packit Service b5fd21
#define rerere(flags) repo_rerere(the_repository, flags)
Packit Service b5fd21
#endif
Packit Service b5fd21
int repo_rerere(struct repository *, int);
Packit 4511e4
/*
Packit 4511e4
 * Given the conflict ID and the name of a "file" used for replaying
Packit 4511e4
 * the recorded resolution (e.g. "preimage", "postimage"), return the
Packit 4511e4
 * path to that filesystem entity.  With "file" specified with NULL,
Packit 4511e4
 * return the path to the directory that houses these files.
Packit 4511e4
 */
Packit Service b5fd21
const char *rerere_path(const struct rerere_id *, const char *file);
Packit Service b5fd21
int rerere_forget(struct repository *, struct pathspec *);
Packit Service b5fd21
int rerere_remaining(struct repository *, struct string_list *);
Packit Service b5fd21
void rerere_clear(struct repository *, struct string_list *);
Packit Service b5fd21
void rerere_gc(struct repository *, struct string_list *);
Packit 4511e4
Packit 4511e4
#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
Packit 4511e4
	N_("update the index with reused conflict resolution if possible"))
Packit 4511e4
Packit 4511e4
#endif