resolve.c File Reference

The resolve command source file. More...

#include <fcntl.h>
#include <sys/uio.h>
#include <sys/mman.h>
#include "global.h"
#include "est_ops.h"
#include "helper.h"
#include "url.h"
#include "status.h"
#include "resolve.h"
#include "waa.h"
#include "hash_ops.h"
#include "actions.h"

Include dependency graph for resolve.c:

Go to the source code of this file.

Functions
int	res__mark_conflict (struct estat *sts,...)
	-.
int	res__action (struct estat *sts)
	-.
int	res__remove_aux_files (struct estat *sts)
	-.
int	res__work (struct estat *root, int argc, char *argv[])
	-.

---

Detailed Description

The resolve command source file.

Definition in file resolve.c.

---

Function Documentation

int res__action

(

struct estat *

sts

)

-.

Definition at line 98 of file resolve.c.

References estat::flags, res__remove_aux_files(), RF_CONFLICT, RF_ISNEW, st__status, STOPIF, and estat::to_be_ignored.

Here is the call graph for this function:

int res__mark_conflict	(	struct estat *	sts,
			...
	)

-.

This function takes a NULL terminated list of filenames, and appends it to the conflict list of the given sts.

The conflict flag must be set by this function, so that it knows whether it has to purge any (wrongly) pre-existing cflct file or to just append.

Definition at line 52 of file resolve.c.

References filename, estat::flags, ops__build_path(), RF_CONFLICT, STOPIF, STOPIF_CODE_ERR, WAA__APPEND, waa__close(), WAA__CONFLICT_EXT, waa__open_byext(), and WAA__WRITE.

Referenced by rev___undo_change(), and rev__merge().

Here is the call graph for this function:

Here is the caller graph for this function:

int res__remove_aux_files

(

struct estat *

sts

)

-.

Removes all stored files.

Definition at line 123 of file resolve.c.

References BUG_ON, filename, estat::flags, hlp__fstat(), ops__build_path(), RF_CONFLICT, sstat_t::size, STOPIF, STOPIF_CODE_ERR, waa__close(), WAA__CONFLICT_EXT, waa__delete_byext(), waa__open_byext(), and WAA__READ.

Referenced by res__action(), and rev___revert_to_base().

Here is the call graph for this function:

Here is the caller graph for this function:

int res__work	(	struct estat *	root,
		int	argc,
		char *	argv[]
	)

-.

Definition at line 184 of file resolve.c.

References ac__Usage_this, opt_recursive, STOPIF, url__load_nonempty_list(), waa__find_common_base(), waa__output_tree(), and waa__read_or_build_tree().

Here is the call graph for this function: