proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-24 05:21:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added git_tree_add_entry_unsorted and git_tree_sort_entries

Browse Source
This commit is contained in:
John Wiegley 2011-01-27 14:20:23 -05:00
parent 2f8a8ab24b
commit 75e051c682
2 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/git2/tree.h
View File

@ -148,6 +148,36 @@ GIT_EXTERN(int) git_tree_entry_2object(git_object **object, git_tree_entry *entr
*/ */
GIT_EXTERN(int) git_tree_add_entry(git_tree_entry **entry_out, git_tree *tree, const git_oid *id, const char *filename, int attributes); GIT_EXTERN(int) git_tree_add_entry(git_tree_entry **entry_out, git_tree *tree, const git_oid *id, const char *filename, int attributes);
/**
* Add a new entry to a tree, returning that new entry.
* The only difference with this call is that it does not sort
* tree afterwards, this requirement is left to the caller.
*
* This will mark the tree as modified; the new entry will
* be written back to disk on the next git_object_write()
*
* @param entry Entry object which will be created
* @param tree Tree object to store the entry
* @iparam id OID for the tree entry
* @param filename Filename for the tree entry
* @param attributes UNIX file attributes for the entry
* @return 0 on success; otherwise error code
*/
GIT_EXTERN(int) git_tree_add_entry_unsorted(git_tree_entry **entry, git_tree *tree, const git_oid *id, const char *filename, int attributes);
/**
* Sort the entries in a tree created using git_tree_add_entry2.
*
* This does not mark the tree as modified. It is intended to be used
* after several invocations of git_tree_add_entry2.
* git_tree_add_entry, on the other hand, sorts after each entry is
* added.
*
* @param tree Tree object whose entries are to be sorted
* @return 0 on success; otherwise error code
*/
GIT_EXTERN(int) git_tree_sort_entries(git_tree *tree);
/** /**
* Remove an entry by its index. * Remove an entry by its index.
* *

23
src/tree.c
View File

@ -174,12 +174,11 @@ size_t git_tree_entrycount(git_tree *tree)
return tree->entries.length; return tree->entries.length;
} }
int git_tree_add_entry(git_tree_entry **entry_out, git_tree *tree, const git_oid *id, const char *filename, int attributes) int git_tree_add_entry_unsorted(git_tree_entry **entry_out, git_tree *tree, const git_oid *id, const char *filename, int attributes)
{ {
git_tree_entry *entry;
assert(tree && id && filename); assert(tree && id && filename);
git_tree_entry *entry;
if ((entry = git__malloc(sizeof(git_tree_entry))) == NULL) if ((entry = git__malloc(sizeof(git_tree_entry))) == NULL)
return GIT_ENOMEM; return GIT_ENOMEM;
@ -193,8 +192,6 @@ int git_tree_add_entry(git_tree_entry **entry_out, git_tree *tree, const git_oid
if (git_vector_insert(&tree->entries, entry) < 0) if (git_vector_insert(&tree->entries, entry) < 0)
return GIT_ENOMEM; return GIT_ENOMEM;
git_vector_sort(&tree->entries);
if (entry_out != NULL) if (entry_out != NULL)
*entry_out = entry; *entry_out = entry;
@ -202,6 +199,22 @@ int git_tree_add_entry(git_tree_entry **entry_out, git_tree *tree, const git_oid
return GIT_SUCCESS; return GIT_SUCCESS;
} }
int git_tree_add_entry(git_tree_entry **entry_out, git_tree *tree, const git_oid *id, const char *filename, int attributes)
{
int result = git_tree_add_entry_unsorted(entry_out, tree, id, filename, attributes);
if (result == GIT_SUCCESS) {
git_vector_sort(&tree->entries);
return GIT_SUCCESS;
}
return result;
}
int git_tree_sort_entries(git_tree *tree)
{
git_vector_sort(&tree->entries);
return GIT_SUCCESS;
}
int git_tree_remove_entry_byindex(git_tree *tree, int idx) int git_tree_remove_entry_byindex(git_tree *tree, int idx)
{ {
git_tree_entry *remove_ptr; git_tree_entry *remove_ptr;