mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-06 18:26:10 +02:00
Code

cache-tree: introduce write_index_as_tree() 

A caller may wish to write a temporary index as a tree. However,
write_cache_as_tree() assumes that the index was read from, and will
write to, the default index file path. Introduce write_index_as_tree()
which removes this limitation by allowing the caller to specify its own
index_state and index file path.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Paul Tan 2015-08-04 21:51:40 +08:00 committed by Junio C Hamano
parent eb898b83f2
commit d23a5117f8
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cache-tree.c
View File

@ -592,7 +592,7 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
return it; return it;
} }
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix) int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
{ {
int entries, was_valid, newfd; int entries, was_valid, newfd;
struct lock_file *lock_file; struct lock_file *lock_file;
@ -603,23 +603,23 @@ int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
*/ */
lock_file = xcalloc(1, sizeof(struct lock_file)); lock_file = xcalloc(1, sizeof(struct lock_file));
newfd = hold_locked_index(lock_file, 1); newfd = hold_lock_file_for_update(lock_file, index_path, LOCK_DIE_ON_ERROR);
entries = read_cache(); entries = read_index_from(index_state, index_path);
if (entries < 0) if (entries < 0)
return WRITE_TREE_UNREADABLE_INDEX; return WRITE_TREE_UNREADABLE_INDEX;
if (flags & WRITE_TREE_IGNORE_CACHE_TREE) if (flags & WRITE_TREE_IGNORE_CACHE_TREE)
cache_tree_free(&(active_cache_tree)); cache_tree_free(&index_state->cache_tree);
if (!active_cache_tree) if (!index_state->cache_tree)
active_cache_tree = cache_tree(); index_state->cache_tree = cache_tree();
was_valid = cache_tree_fully_valid(active_cache_tree); was_valid = cache_tree_fully_valid(index_state->cache_tree);
if (!was_valid) { if (!was_valid) {
if (cache_tree_update(&the_index, flags) < 0) if (cache_tree_update(index_state, flags) < 0)
return WRITE_TREE_UNMERGED_INDEX; return WRITE_TREE_UNMERGED_INDEX;
if (0 <= newfd) { if (0 <= newfd) {
if (!write_locked_index(&the_index, lock_file, COMMIT_LOCK)) if (!write_locked_index(index_state, lock_file, COMMIT_LOCK))
newfd = -1; newfd = -1;
} }
/* Not being able to write is fine -- we are only interested /* Not being able to write is fine -- we are only interested
@ -631,14 +631,14 @@ int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
} }
if (prefix) { if (prefix) {
struct cache_tree *subtree = struct cache_tree *subtree;
cache_tree_find(active_cache_tree, prefix); subtree = cache_tree_find(index_state->cache_tree, prefix);
if (!subtree) if (!subtree)
return WRITE_TREE_PREFIX_ERROR; return WRITE_TREE_PREFIX_ERROR;
hashcpy(sha1, subtree->sha1); hashcpy(sha1, subtree->sha1);
} }
else else
hashcpy(sha1, active_cache_tree->sha1); hashcpy(sha1, index_state->cache_tree->sha1);
if (0 <= newfd) if (0 <= newfd)
rollback_lock_file(lock_file); rollback_lock_file(lock_file);
@ -646,6 +646,11 @@ int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
return 0; return 0;
} }
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
{
return write_index_as_tree(sha1, &the_index, get_index_file(), flags, prefix);
}
static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
{ {
struct tree_desc desc; struct tree_desc desc;

1
cache-tree.h
View File

@ -46,6 +46,7 @@ int update_main_cache_tree(int);
#define WRITE_TREE_UNMERGED_INDEX (-2) #define WRITE_TREE_UNMERGED_INDEX (-2)
#define WRITE_TREE_PREFIX_ERROR (-3) #define WRITE_TREE_PREFIX_ERROR (-3)
int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix);
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix); int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix);
void prime_cache_tree(struct index_state *, struct tree *); void prime_cache_tree(struct index_state *, struct tree *);