2 * Copyright (C) the libgit2 contributors. All rights reserved.
4 * This file is part of libgit2, distributed under the GNU GPL v2 with
5 * a Linking Exception. For full terms see the included COPYING file.
11 #include "git2/repository.h"
12 #include "git2/object.h"
14 #include "tree-cache.h"
17 #define DEFAULT_TREE_SIZE 16
18 #define MAX_FILEMODE_BYTES 6
20 #define TREE_ENTRY_CHECK_NAMELEN(n) \
21 if (n > UINT16_MAX) { git_error_set(GIT_ERROR_INVALID, "tree entry path too long"); }
23 static bool valid_filemode(const int filemode
)
25 return (filemode
== GIT_FILEMODE_TREE
26 || filemode
== GIT_FILEMODE_BLOB
27 || filemode
== GIT_FILEMODE_BLOB_EXECUTABLE
28 || filemode
== GIT_FILEMODE_LINK
29 || filemode
== GIT_FILEMODE_COMMIT
);
32 GIT_INLINE(git_filemode_t
) normalize_filemode(git_filemode_t filemode
)
34 /* Tree bits set, but it's not a commit */
35 if (GIT_MODE_TYPE(filemode
) == GIT_FILEMODE_TREE
)
36 return GIT_FILEMODE_TREE
;
38 /* If any of the x bits are set */
39 if (GIT_PERMS_IS_EXEC(filemode
))
40 return GIT_FILEMODE_BLOB_EXECUTABLE
;
42 /* 16XXXX means commit */
43 if (GIT_MODE_TYPE(filemode
) == GIT_FILEMODE_COMMIT
)
44 return GIT_FILEMODE_COMMIT
;
46 /* 12XXXX means symlink */
47 if (GIT_MODE_TYPE(filemode
) == GIT_FILEMODE_LINK
)
48 return GIT_FILEMODE_LINK
;
50 /* Otherwise, return a blob */
51 return GIT_FILEMODE_BLOB
;
54 static int valid_entry_name(git_repository
*repo
, const char *filename
)
56 return *filename
!= '\0' &&
57 git_path_validate(repo
, filename
, 0,
58 GIT_PATH_REJECT_TRAVERSAL
| GIT_PATH_REJECT_DOT_GIT
| GIT_PATH_REJECT_SLASH
);
61 static int entry_sort_cmp(const void *a
, const void *b
)
63 const git_tree_entry
*e1
= (const git_tree_entry
*)a
;
64 const git_tree_entry
*e2
= (const git_tree_entry
*)b
;
67 e1
->filename
, e1
->filename_len
, git_tree_entry__is_tree(e1
),
68 e2
->filename
, e2
->filename_len
, git_tree_entry__is_tree(e2
),
72 int git_tree_entry_cmp(const git_tree_entry
*e1
, const git_tree_entry
*e2
)
74 return entry_sort_cmp(e1
, e2
);
78 * Allocate a new self-contained entry, with enough space after it to
79 * store the filename and the id.
81 static git_tree_entry
*alloc_entry(const char *filename
, size_t filename_len
, const git_oid
*id
)
83 git_tree_entry
*entry
= NULL
;
86 TREE_ENTRY_CHECK_NAMELEN(filename_len
);
88 if (GIT_ADD_SIZET_OVERFLOW(&tree_len
, sizeof(git_tree_entry
), filename_len
) ||
89 GIT_ADD_SIZET_OVERFLOW(&tree_len
, tree_len
, 1) ||
90 GIT_ADD_SIZET_OVERFLOW(&tree_len
, tree_len
, GIT_OID_RAWSZ
))
93 entry
= git__calloc(1, tree_len
);
101 filename_ptr
= ((char *) entry
) + sizeof(git_tree_entry
);
102 memcpy(filename_ptr
, filename
, filename_len
);
103 entry
->filename
= filename_ptr
;
105 id_ptr
= filename_ptr
+ filename_len
+ 1;
106 git_oid_cpy(id_ptr
, id
);
110 entry
->filename_len
= (uint16_t)filename_len
;
115 struct tree_key_search
{
116 const char *filename
;
117 uint16_t filename_len
;
120 static int homing_search_cmp(const void *key
, const void *array_member
)
122 const struct tree_key_search
*ksearch
= key
;
123 const git_tree_entry
*entry
= array_member
;
125 const uint16_t len1
= ksearch
->filename_len
;
126 const uint16_t len2
= entry
->filename_len
;
131 len1
< len2
? len1
: len2
136 * Search for an entry in a given tree.
138 * Note that this search is performed in two steps because
139 * of the way tree entries are sorted internally in git:
141 * Entries in a tree are not sorted alphabetically; two entries
142 * with the same root prefix will have different positions
143 * depending on whether they are folders (subtrees) or normal files.
145 * Consequently, it is not possible to find an entry on the tree
146 * with a binary search if you don't know whether the filename
147 * you're looking for is a folder or a normal file.
149 * To work around this, we first perform a homing binary search
150 * on the tree, using the minimal length root prefix of our filename.
151 * Once the comparisons for this homing search start becoming
152 * ambiguous because of folder vs file sorting, we look linearly
153 * around the area for our target file.
155 static int tree_key_search(
157 const git_tree
*tree
,
158 const char *filename
,
161 struct tree_key_search ksearch
;
162 const git_tree_entry
*entry
;
165 TREE_ENTRY_CHECK_NAMELEN(filename_len
);
167 ksearch
.filename
= filename
;
168 ksearch
.filename_len
= (uint16_t)filename_len
;
170 /* Initial homing search; find an entry on the tree with
171 * the same prefix as the filename we're looking for */
173 if (git_array_search(&homing
,
174 tree
->entries
, &homing_search_cmp
, &ksearch
) < 0)
175 return GIT_ENOTFOUND
; /* just a signal error; not passed back to user */
177 /* We found a common prefix. Look forward as long as
178 * there are entries that share the common prefix */
179 for (i
= homing
; i
< tree
->entries
.size
; ++i
) {
180 entry
= git_array_get(tree
->entries
, i
);
182 if (homing_search_cmp(&ksearch
, entry
) < 0)
185 if (entry
->filename_len
== filename_len
&&
186 memcmp(filename
, entry
->filename
, filename_len
) == 0) {
194 /* If we haven't found our filename yet, look backwards
195 * too as long as we have entries with the same prefix */
200 entry
= git_array_get(tree
->entries
, i
);
202 if (homing_search_cmp(&ksearch
, entry
) > 0)
205 if (entry
->filename_len
== filename_len
&&
206 memcmp(filename
, entry
->filename
, filename_len
) == 0) {
215 /* The filename doesn't exist at all */
216 return GIT_ENOTFOUND
;
219 void git_tree_entry_free(git_tree_entry
*entry
)
227 int git_tree_entry_dup(git_tree_entry
**dest
, const git_tree_entry
*source
)
231 GIT_ASSERT_ARG(source
);
233 cpy
= alloc_entry(source
->filename
, source
->filename_len
, source
->oid
);
237 cpy
->attr
= source
->attr
;
243 void git_tree__free(void *_tree
)
245 git_tree
*tree
= _tree
;
247 git_odb_object_free(tree
->odb_obj
);
248 git_array_clear(tree
->entries
);
252 git_filemode_t
git_tree_entry_filemode(const git_tree_entry
*entry
)
254 return normalize_filemode(entry
->attr
);
257 git_filemode_t
git_tree_entry_filemode_raw(const git_tree_entry
*entry
)
262 const char *git_tree_entry_name(const git_tree_entry
*entry
)
264 GIT_ASSERT_ARG_WITH_RETVAL(entry
, NULL
);
265 return entry
->filename
;
268 const git_oid
*git_tree_entry_id(const git_tree_entry
*entry
)
270 GIT_ASSERT_ARG_WITH_RETVAL(entry
, NULL
);
274 git_object_t
git_tree_entry_type(const git_tree_entry
*entry
)
276 GIT_ASSERT_ARG_WITH_RETVAL(entry
, GIT_OBJECT_INVALID
);
278 if (S_ISGITLINK(entry
->attr
))
279 return GIT_OBJECT_COMMIT
;
280 else if (S_ISDIR(entry
->attr
))
281 return GIT_OBJECT_TREE
;
283 return GIT_OBJECT_BLOB
;
286 int git_tree_entry_to_object(
287 git_object
**object_out
,
288 git_repository
*repo
,
289 const git_tree_entry
*entry
)
291 GIT_ASSERT_ARG(entry
);
292 GIT_ASSERT_ARG(object_out
);
294 return git_object_lookup(object_out
, repo
, entry
->oid
, GIT_OBJECT_ANY
);
297 static const git_tree_entry
*entry_fromname(
298 const git_tree
*tree
, const char *name
, size_t name_len
)
302 if (tree_key_search(&idx
, tree
, name
, name_len
) < 0)
305 return git_array_get(tree
->entries
, idx
);
308 const git_tree_entry
*git_tree_entry_byname(
309 const git_tree
*tree
, const char *filename
)
311 GIT_ASSERT_ARG_WITH_RETVAL(tree
, NULL
);
312 GIT_ASSERT_ARG_WITH_RETVAL(filename
, NULL
);
314 return entry_fromname(tree
, filename
, strlen(filename
));
317 const git_tree_entry
*git_tree_entry_byindex(
318 const git_tree
*tree
, size_t idx
)
320 GIT_ASSERT_ARG_WITH_RETVAL(tree
, NULL
);
321 return git_array_get(tree
->entries
, idx
);
324 const git_tree_entry
*git_tree_entry_byid(
325 const git_tree
*tree
, const git_oid
*id
)
328 const git_tree_entry
*e
;
330 GIT_ASSERT_ARG_WITH_RETVAL(tree
, NULL
);
332 git_array_foreach(tree
->entries
, i
, e
) {
333 if (memcmp(&e
->oid
->id
, &id
->id
, sizeof(id
->id
)) == 0)
340 size_t git_tree_entrycount(const git_tree
*tree
)
342 GIT_ASSERT_ARG_WITH_RETVAL(tree
, 0);
343 return tree
->entries
.size
;
346 size_t git_treebuilder_entrycount(git_treebuilder
*bld
)
348 GIT_ASSERT_ARG_WITH_RETVAL(bld
, 0);
350 return git_strmap_size(bld
->map
);
353 static int tree_error(const char *str
, const char *path
)
356 git_error_set(GIT_ERROR_TREE
, "%s - %s", str
, path
);
358 git_error_set(GIT_ERROR_TREE
, "%s", str
);
362 static int parse_mode(uint16_t *mode_out
, const char *buffer
, size_t buffer_len
, const char **buffer_out
)
367 if (!buffer_len
|| git__isspace(*buffer
))
370 if ((error
= git__strntol32(&mode
, buffer
, buffer_len
, buffer_out
, 8)) < 0)
373 if (mode
< 0 || mode
> UINT16_MAX
)
381 int git_tree__parse_raw(void *_tree
, const char *data
, size_t size
)
383 git_tree
*tree
= _tree
;
385 const char *buffer_end
;
388 buffer_end
= buffer
+ size
;
390 tree
->odb_obj
= NULL
;
391 git_array_init_to_size(tree
->entries
, DEFAULT_TREE_SIZE
);
392 GIT_ERROR_CHECK_ARRAY(tree
->entries
);
394 while (buffer
< buffer_end
) {
395 git_tree_entry
*entry
;
400 if (parse_mode(&attr
, buffer
, buffer_end
- buffer
, &buffer
) < 0 || !buffer
)
401 return tree_error("failed to parse tree: can't parse filemode", NULL
);
403 if (buffer
>= buffer_end
|| (*buffer
++) != ' ')
404 return tree_error("failed to parse tree: missing space after filemode", NULL
);
406 if ((nul
= memchr(buffer
, 0, buffer_end
- buffer
)) == NULL
)
407 return tree_error("failed to parse tree: object is corrupted", NULL
);
409 if ((filename_len
= nul
- buffer
) == 0 || filename_len
> UINT16_MAX
)
410 return tree_error("failed to parse tree: can't parse filename", NULL
);
412 if ((buffer_end
- (nul
+ 1)) < GIT_OID_RAWSZ
)
413 return tree_error("failed to parse tree: can't parse OID", NULL
);
415 /* Allocate the entry */
417 entry
= git_array_alloc(tree
->entries
);
418 GIT_ERROR_CHECK_ALLOC(entry
);
421 entry
->filename_len
= (uint16_t)filename_len
;
422 entry
->filename
= buffer
;
423 entry
->oid
= (git_oid
*) ((char *) buffer
+ filename_len
+ 1);
426 buffer
+= filename_len
+ 1;
427 buffer
+= GIT_OID_RAWSZ
;
433 int git_tree__parse(void *_tree
, git_odb_object
*odb_obj
)
435 git_tree
*tree
= _tree
;
437 if ((git_tree__parse_raw(tree
,
438 git_odb_object_data(odb_obj
),
439 git_odb_object_size(odb_obj
))) < 0)
442 if (git_odb_object_dup(&tree
->odb_obj
, odb_obj
) < 0)
448 static size_t find_next_dir(const char *dirname
, git_index
*index
, size_t start
)
450 size_t dirlen
, i
, entries
= git_index_entrycount(index
);
452 dirlen
= strlen(dirname
);
453 for (i
= start
; i
< entries
; ++i
) {
454 const git_index_entry
*entry
= git_index_get_byindex(index
, i
);
455 if (strlen(entry
->path
) < dirlen
||
456 memcmp(entry
->path
, dirname
, dirlen
) ||
457 (dirlen
> 0 && entry
->path
[dirlen
] != '/')) {
465 static git_object_t
otype_from_mode(git_filemode_t filemode
)
468 case GIT_FILEMODE_TREE
:
469 return GIT_OBJECT_TREE
;
470 case GIT_FILEMODE_COMMIT
:
471 return GIT_OBJECT_COMMIT
;
473 return GIT_OBJECT_BLOB
;
477 static int check_entry(git_repository
*repo
, const char *filename
, const git_oid
*id
, git_filemode_t filemode
)
479 if (!valid_filemode(filemode
))
480 return tree_error("failed to insert entry: invalid filemode for file", filename
);
482 if (!valid_entry_name(repo
, filename
))
483 return tree_error("failed to insert entry: invalid name for a tree entry", filename
);
485 if (git_oid_is_zero(id
))
486 return tree_error("failed to insert entry: invalid null OID", filename
);
488 if (filemode
!= GIT_FILEMODE_COMMIT
&&
489 !git_object__is_valid(repo
, id
, otype_from_mode(filemode
)))
490 return tree_error("failed to insert entry: invalid object specified", filename
);
495 static int git_treebuilder__write_with_buffer(
497 git_treebuilder
*bld
,
501 size_t i
, entrycount
;
503 git_tree_entry
*entry
;
504 git_vector entries
= GIT_VECTOR_INIT
;
508 entrycount
= git_strmap_size(bld
->map
);
509 if ((error
= git_vector_init(&entries
, entrycount
, entry_sort_cmp
)) < 0)
512 if (buf
->asize
== 0 &&
513 (error
= git_buf_grow(buf
, entrycount
* 72)) < 0)
516 git_strmap_foreach_value(bld
->map
, entry
, {
517 if ((error
= git_vector_insert(&entries
, entry
)) < 0)
521 git_vector_sort(&entries
);
523 for (i
= 0; i
< entries
.length
&& !error
; ++i
) {
524 entry
= git_vector_get(&entries
, i
);
526 git_buf_printf(buf
, "%o ", entry
->attr
);
527 git_buf_put(buf
, entry
->filename
, entry
->filename_len
+ 1);
528 git_buf_put(buf
, (char *)entry
->oid
->id
, GIT_OID_RAWSZ
);
530 if (git_buf_oom(buf
)) {
536 if ((error
= git_repository_odb__weakptr(&odb
, bld
->repo
)) == 0)
537 error
= git_odb_write(oid
, odb
, buf
->ptr
, buf
->size
, GIT_OBJECT_TREE
);
540 git_vector_free(&entries
);
545 static int append_entry(
546 git_treebuilder
*bld
,
547 const char *filename
,
549 git_filemode_t filemode
,
552 git_tree_entry
*entry
;
555 if (validate
&& ((error
= check_entry(bld
->repo
, filename
, id
, filemode
)) < 0))
558 entry
= alloc_entry(filename
, strlen(filename
), id
);
559 GIT_ERROR_CHECK_ALLOC(entry
);
561 entry
->attr
= (uint16_t)filemode
;
563 if ((error
= git_strmap_set(bld
->map
, entry
->filename
, entry
)) < 0) {
564 git_tree_entry_free(entry
);
565 git_error_set(GIT_ERROR_TREE
, "failed to append entry %s to the tree builder", filename
);
572 static int write_tree(
574 git_repository
*repo
,
580 git_treebuilder
*bld
= NULL
;
581 size_t i
, entries
= git_index_entrycount(index
);
583 size_t dirname_len
= strlen(dirname
);
584 const git_tree_cache
*cache
;
586 cache
= git_tree_cache_get(index
->tree
, dirname
);
587 if (cache
!= NULL
&& cache
->entry_count
>= 0){
588 git_oid_cpy(oid
, &cache
->oid
);
589 return (int)find_next_dir(dirname
, index
, start
);
592 if ((error
= git_treebuilder_new(&bld
, repo
, NULL
)) < 0 || bld
== NULL
)
596 * This loop is unfortunate, but necessary. The index doesn't have
597 * any directores, so we need to handle that manually, and we
598 * need to keep track of the current position.
600 for (i
= start
; i
< entries
; ++i
) {
601 const git_index_entry
*entry
= git_index_get_byindex(index
, i
);
602 const char *filename
, *next_slash
;
605 * If we've left our (sub)tree, exit the loop and return. The
606 * first check is an early out (and security for the
607 * third). The second check is a simple prefix comparison. The
608 * third check catches situations where there is a directory
609 * win32/sys and a file win32mmap.c. Without it, the following
610 * code believes there is a file win32/mmap.c
612 if (strlen(entry
->path
) < dirname_len
||
613 memcmp(entry
->path
, dirname
, dirname_len
) ||
614 (dirname_len
> 0 && entry
->path
[dirname_len
] != '/')) {
618 filename
= entry
->path
+ dirname_len
;
619 if (*filename
== '/')
621 next_slash
= strchr(filename
, '/');
625 char *subdir
, *last_comp
;
627 subdir
= git__strndup(entry
->path
, next_slash
- entry
->path
);
628 GIT_ERROR_CHECK_ALLOC(subdir
);
630 /* Write out the subtree */
631 written
= write_tree(&sub_oid
, repo
, index
, subdir
, i
, shared_buf
);
636 i
= written
- 1; /* -1 because of the loop increment */
640 * We need to figure out what we want toinsert
641 * into this tree. If we're traversing
642 * deps/zlib/, then we only want to write
643 * 'zlib' into the tree.
645 last_comp
= strrchr(subdir
, '/');
647 last_comp
++; /* Get rid of the '/' */
652 error
= append_entry(bld
, last_comp
, &sub_oid
, S_IFDIR
, true);
657 error
= append_entry(bld
, filename
, &entry
->id
, entry
->mode
, true);
663 if (git_treebuilder__write_with_buffer(oid
, bld
, shared_buf
) < 0)
666 git_treebuilder_free(bld
);
670 git_treebuilder_free(bld
);
674 int git_tree__write_index(
675 git_oid
*oid
, git_index
*index
, git_repository
*repo
)
679 git_buf shared_buf
= GIT_BUF_INIT
;
680 bool old_ignore_case
= false;
683 GIT_ASSERT_ARG(index
);
684 GIT_ASSERT_ARG(repo
);
686 if (git_index_has_conflicts(index
)) {
687 git_error_set(GIT_ERROR_INDEX
,
688 "cannot create a tree from a not fully merged index.");
689 return GIT_EUNMERGED
;
692 if (index
->tree
!= NULL
&& index
->tree
->entry_count
>= 0) {
693 git_oid_cpy(oid
, &index
->tree
->oid
);
697 /* The tree cache didn't help us; we'll have to write
698 * out a tree. If the index is ignore_case, we must
699 * make it case-sensitive for the duration of the tree-write
702 if (index
->ignore_case
) {
703 old_ignore_case
= true;
704 git_index__set_ignore_case(index
, false);
707 ret
= write_tree(oid
, repo
, index
, "", 0, &shared_buf
);
708 git_buf_dispose(&shared_buf
);
711 git_index__set_ignore_case(index
, true);
718 git_pool_clear(&index
->tree_pool
);
720 if ((ret
= git_tree_lookup(&tree
, repo
, oid
)) < 0)
723 /* Read the tree cache into the index */
724 ret
= git_tree_cache_read_tree(&index
->tree
, tree
, &index
->tree_pool
);
730 int git_treebuilder_new(
731 git_treebuilder
**builder_p
,
732 git_repository
*repo
,
733 const git_tree
*source
)
735 git_treebuilder
*bld
;
738 GIT_ASSERT_ARG(builder_p
);
739 GIT_ASSERT_ARG(repo
);
741 bld
= git__calloc(1, sizeof(git_treebuilder
));
742 GIT_ERROR_CHECK_ALLOC(bld
);
746 if (git_strmap_new(&bld
->map
) < 0) {
751 if (source
!= NULL
) {
752 git_tree_entry
*entry_src
;
754 git_array_foreach(source
->entries
, i
, entry_src
) {
756 bld
, entry_src
->filename
,
768 git_treebuilder_free(bld
);
772 int git_treebuilder_insert(
773 const git_tree_entry
**entry_out
,
774 git_treebuilder
*bld
,
775 const char *filename
,
777 git_filemode_t filemode
)
779 git_tree_entry
*entry
;
784 GIT_ASSERT_ARG(filename
);
786 if ((error
= check_entry(bld
->repo
, filename
, id
, filemode
)) < 0)
789 if ((entry
= git_strmap_get(bld
->map
, filename
)) != NULL
) {
790 git_oid_cpy((git_oid
*) entry
->oid
, id
);
792 entry
= alloc_entry(filename
, strlen(filename
), id
);
793 GIT_ERROR_CHECK_ALLOC(entry
);
795 if ((error
= git_strmap_set(bld
->map
, entry
->filename
, entry
)) < 0) {
796 git_tree_entry_free(entry
);
797 git_error_set(GIT_ERROR_TREE
, "failed to insert %s", filename
);
802 entry
->attr
= filemode
;
810 static git_tree_entry
*treebuilder_get(git_treebuilder
*bld
, const char *filename
)
812 GIT_ASSERT_ARG_WITH_RETVAL(bld
, NULL
);
813 GIT_ASSERT_ARG_WITH_RETVAL(filename
, NULL
);
815 return git_strmap_get(bld
->map
, filename
);
818 const git_tree_entry
*git_treebuilder_get(git_treebuilder
*bld
, const char *filename
)
820 return treebuilder_get(bld
, filename
);
823 int git_treebuilder_remove(git_treebuilder
*bld
, const char *filename
)
825 git_tree_entry
*entry
= treebuilder_get(bld
, filename
);
828 return tree_error("failed to remove entry: file isn't in the tree", filename
);
830 git_strmap_delete(bld
->map
, filename
);
831 git_tree_entry_free(entry
);
836 int git_treebuilder_write(git_oid
*oid
, git_treebuilder
*bld
)
841 return git_treebuilder__write_with_buffer(oid
, bld
, &bld
->write_cache
);
844 int git_treebuilder_filter(
845 git_treebuilder
*bld
,
846 git_treebuilder_filter_cb filter
,
849 const char *filename
;
850 git_tree_entry
*entry
;
853 GIT_ASSERT_ARG(filter
);
855 git_strmap_foreach(bld
->map
, filename
, entry
, {
856 if (filter(entry
, payload
)) {
857 git_strmap_delete(bld
->map
, filename
);
858 git_tree_entry_free(entry
);
865 int git_treebuilder_clear(git_treebuilder
*bld
)
871 git_strmap_foreach_value(bld
->map
, e
, git_tree_entry_free(e
));
872 git_strmap_clear(bld
->map
);
877 void git_treebuilder_free(git_treebuilder
*bld
)
882 git_buf_dispose(&bld
->write_cache
);
883 git_treebuilder_clear(bld
);
884 git_strmap_free(bld
->map
);
888 static size_t subpath_len(const char *path
)
890 const char *slash_pos
= strchr(path
, '/');
891 if (slash_pos
== NULL
)
894 return slash_pos
- path
;
897 int git_tree_entry_bypath(
898 git_tree_entry
**entry_out
,
899 const git_tree
*root
,
904 const git_tree_entry
*entry
;
907 /* Find how long is the current path component (i.e.
908 * the filename between two slashes */
909 filename_len
= subpath_len(path
);
911 if (filename_len
== 0) {
912 git_error_set(GIT_ERROR_TREE
, "invalid tree path given");
913 return GIT_ENOTFOUND
;
916 entry
= entry_fromname(root
, path
, filename_len
);
919 git_error_set(GIT_ERROR_TREE
,
920 "the path '%.*s' does not exist in the given tree", (int) filename_len
, path
);
921 return GIT_ENOTFOUND
;
924 switch (path
[filename_len
]) {
926 /* If there are more components in the path...
927 * then this entry *must* be a tree */
928 if (!git_tree_entry__is_tree(entry
)) {
929 git_error_set(GIT_ERROR_TREE
,
930 "the path '%.*s' exists but is not a tree", (int) filename_len
, path
);
931 return GIT_ENOTFOUND
;
934 /* If there's only a slash left in the path, we
935 * return the current entry; otherwise, we keep
936 * walking down the path */
937 if (path
[filename_len
+ 1] != '\0')
941 /* If there are no more components in the path, return
943 return git_tree_entry_dup(entry_out
, entry
);
946 if (git_tree_lookup(&subtree
, root
->object
.repo
, entry
->oid
) < 0)
949 error
= git_tree_entry_bypath(
952 path
+ filename_len
+ 1
955 git_tree_free(subtree
);
959 static int tree_walk(
960 const git_tree
*tree
,
961 git_treewalk_cb callback
,
968 const git_tree_entry
*entry
;
970 git_array_foreach(tree
->entries
, i
, entry
) {
972 error
= callback(path
->ptr
, entry
, payload
);
973 if (error
< 0) { /* negative value stops iteration */
974 git_error_set_after_callback_function(error
, "git_tree_walk");
977 if (error
> 0) { /* positive value skips this entry */
983 if (git_tree_entry__is_tree(entry
)) {
985 size_t path_len
= git_buf_len(path
);
987 error
= git_tree_lookup(&subtree
, tree
->object
.repo
, entry
->oid
);
991 /* append the next entry to the path */
992 git_buf_puts(path
, entry
->filename
);
993 git_buf_putc(path
, '/');
995 if (git_buf_oom(path
))
998 error
= tree_walk(subtree
, callback
, path
, payload
, preorder
);
1000 git_tree_free(subtree
);
1004 git_buf_truncate(path
, path_len
);
1008 error
= callback(path
->ptr
, entry
, payload
);
1009 if (error
< 0) { /* negative value stops iteration */
1010 git_error_set_after_callback_function(error
, "git_tree_walk");
1021 const git_tree
*tree
,
1022 git_treewalk_mode mode
,
1023 git_treewalk_cb callback
,
1027 git_buf root_path
= GIT_BUF_INIT
;
1029 if (mode
!= GIT_TREEWALK_POST
&& mode
!= GIT_TREEWALK_PRE
) {
1030 git_error_set(GIT_ERROR_INVALID
, "invalid walking mode for tree walk");
1035 tree
, callback
, &root_path
, payload
, (mode
== GIT_TREEWALK_PRE
));
1037 git_buf_dispose(&root_path
);
1042 static int compare_entries(const void *_a
, const void *_b
)
1044 const git_tree_update
*a
= (git_tree_update
*) _a
;
1045 const git_tree_update
*b
= (git_tree_update
*) _b
;
1047 return strcmp(a
->path
, b
->path
);
1050 static int on_dup_entry(void **old
, void *new)
1052 GIT_UNUSED(old
); GIT_UNUSED(new);
1054 git_error_set(GIT_ERROR_TREE
, "duplicate entries given for update");
1059 * We keep the previous tree and the new one at each level of the
1060 * stack. When we leave a level we're done with that tree and we can
1061 * write it out to the odb.
1064 git_treebuilder
*bld
;
1069 /** Count how many slashes (i.e. path components) there are in this string */
1070 GIT_INLINE(size_t) count_slashes(const char *path
)
1075 while ((slash
= strchr(path
, '/')) != NULL
) {
1083 static bool next_component(git_buf
*out
, const char *in
)
1085 const char *slash
= strchr(in
, '/');
1090 git_buf_put(out
, in
, slash
- in
);
1095 static int create_popped_tree(tree_stack_entry
*current
, tree_stack_entry
*popped
, git_buf
*component
)
1100 git_tree_free(popped
->tree
);
1102 /* If the tree would be empty, remove it from the one higher up */
1103 if (git_treebuilder_entrycount(popped
->bld
) == 0) {
1104 git_treebuilder_free(popped
->bld
);
1105 error
= git_treebuilder_remove(current
->bld
, popped
->name
);
1106 git__free(popped
->name
);
1110 error
= git_treebuilder_write(&new_tree
, popped
->bld
);
1111 git_treebuilder_free(popped
->bld
);
1114 git__free(popped
->name
);
1118 /* We've written out the tree, now we have to put the new value into its parent */
1119 git_buf_clear(component
);
1120 git_buf_puts(component
, popped
->name
);
1121 git__free(popped
->name
);
1123 GIT_ERROR_CHECK_ALLOC(component
->ptr
);
1125 /* Error out if this would create a D/F conflict in this update */
1126 if (current
->tree
) {
1127 const git_tree_entry
*to_replace
;
1128 to_replace
= git_tree_entry_byname(current
->tree
, component
->ptr
);
1129 if (to_replace
&& git_tree_entry_type(to_replace
) != GIT_OBJECT_TREE
) {
1130 git_error_set(GIT_ERROR_TREE
, "D/F conflict when updating tree");
1135 return git_treebuilder_insert(NULL
, current
->bld
, component
->ptr
, &new_tree
, GIT_FILEMODE_TREE
);
1138 int git_tree_create_updated(git_oid
*out
, git_repository
*repo
, git_tree
*baseline
, size_t nupdates
, const git_tree_update
*updates
)
1140 git_array_t(tree_stack_entry
) stack
= GIT_ARRAY_INIT
;
1141 tree_stack_entry
*root_elem
;
1145 git_buf component
= GIT_BUF_INIT
;
1147 if ((error
= git_vector_init(&entries
, nupdates
, compare_entries
)) < 0)
1150 /* Sort the entries for treversal */
1151 for (i
= 0 ; i
< nupdates
; i
++) {
1152 if ((error
= git_vector_insert_sorted(&entries
, (void *) &updates
[i
], on_dup_entry
)) < 0)
1156 root_elem
= git_array_alloc(stack
);
1157 GIT_ERROR_CHECK_ALLOC(root_elem
);
1158 memset(root_elem
, 0, sizeof(*root_elem
));
1160 if (baseline
&& (error
= git_tree_dup(&root_elem
->tree
, baseline
)) < 0)
1163 if ((error
= git_treebuilder_new(&root_elem
->bld
, repo
, root_elem
->tree
)) < 0)
1166 for (i
= 0; i
< nupdates
; i
++) {
1167 const git_tree_update
*last_update
= i
== 0 ? NULL
: git_vector_get(&entries
, i
-1);
1168 const git_tree_update
*update
= git_vector_get(&entries
, i
);
1169 size_t common_prefix
= 0, steps_up
, j
;
1172 /* Figure out how much we need to change from the previous tree */
1174 common_prefix
= git_path_common_dirlen(last_update
->path
, update
->path
);
1177 * The entries are sorted, so when we find we're no
1178 * longer in the same directory, we need to abandon
1179 * the old tree (steps up) and dive down to the next
1182 steps_up
= last_update
== NULL
? 0 : count_slashes(&last_update
->path
[common_prefix
]);
1184 for (j
= 0; j
< steps_up
; j
++) {
1185 tree_stack_entry
*current
, *popped
= git_array_pop(stack
);
1188 current
= git_array_last(stack
);
1189 GIT_ASSERT(current
);
1191 if ((error
= create_popped_tree(current
, popped
, &component
)) < 0)
1195 /* Now that we've created the trees we popped from the stack, let's go back down */
1196 path
= &update
->path
[common_prefix
];
1197 while (next_component(&component
, path
)) {
1198 tree_stack_entry
*last
, *new_entry
;
1199 const git_tree_entry
*entry
;
1201 last
= git_array_last(stack
);
1202 entry
= last
->tree
? git_tree_entry_byname(last
->tree
, component
.ptr
) : NULL
;
1204 entry
= treebuilder_get(last
->bld
, component
.ptr
);
1206 if (entry
&& git_tree_entry_type(entry
) != GIT_OBJECT_TREE
) {
1207 git_error_set(GIT_ERROR_TREE
, "D/F conflict when updating tree");
1212 new_entry
= git_array_alloc(stack
);
1213 GIT_ERROR_CHECK_ALLOC(new_entry
);
1214 memset(new_entry
, 0, sizeof(*new_entry
));
1216 new_entry
->tree
= NULL
;
1217 if (entry
&& (error
= git_tree_lookup(&new_entry
->tree
, repo
, git_tree_entry_id(entry
))) < 0)
1220 if ((error
= git_treebuilder_new(&new_entry
->bld
, repo
, new_entry
->tree
)) < 0)
1223 new_entry
->name
= git__strdup(component
.ptr
);
1224 GIT_ERROR_CHECK_ALLOC(new_entry
->name
);
1226 /* Get to the start of the next component */
1227 path
+= component
.size
+ 1;
1230 /* After all that, we're finally at the place where we want to perform the update */
1231 switch (update
->action
) {
1232 case GIT_TREE_UPDATE_UPSERT
:
1234 /* Make sure we're replacing something of the same type */
1235 tree_stack_entry
*last
= git_array_last(stack
);
1236 char *basename
= git_path_basename(update
->path
);
1237 const git_tree_entry
*e
= git_treebuilder_get(last
->bld
, basename
);
1238 if (e
&& git_tree_entry_type(e
) != git_object__type_from_filemode(update
->filemode
)) {
1239 git__free(basename
);
1240 git_error_set(GIT_ERROR_TREE
, "cannot replace '%s' with '%s' at '%s'",
1241 git_object_type2string(git_tree_entry_type(e
)),
1242 git_object_type2string(git_object__type_from_filemode(update
->filemode
)),
1248 error
= git_treebuilder_insert(NULL
, last
->bld
, basename
, &update
->id
, update
->filemode
);
1249 git__free(basename
);
1252 case GIT_TREE_UPDATE_REMOVE
:
1254 tree_stack_entry
*last
= git_array_last(stack
);
1255 char *basename
= git_path_basename(update
->path
);
1256 error
= git_treebuilder_remove(last
->bld
, basename
);
1257 git__free(basename
);
1261 git_error_set(GIT_ERROR_TREE
, "unknown action for update");
1270 /* We're done, go up the stack again and write out the tree */
1272 tree_stack_entry
*current
= NULL
, *popped
= NULL
;
1273 while ((popped
= git_array_pop(stack
)) != NULL
) {
1274 current
= git_array_last(stack
);
1275 /* We've reached the top, current is the root tree */
1279 if ((error
= create_popped_tree(current
, popped
, &component
)) < 0)
1283 /* Write out the root tree */
1284 git__free(popped
->name
);
1285 git_tree_free(popped
->tree
);
1287 error
= git_treebuilder_write(out
, popped
->bld
);
1288 git_treebuilder_free(popped
->bld
);
1295 tree_stack_entry
*e
;
1296 while ((e
= git_array_pop(stack
)) != NULL
) {
1297 git_treebuilder_free(e
->bld
);
1298 git_tree_free(e
->tree
);
1303 git_buf_dispose(&component
);
1304 git_array_clear(stack
);
1305 git_vector_free(&entries
);
1309 /* Deprecated Functions */
1311 #ifndef GIT_DEPRECATE_HARD
1313 int git_treebuilder_write_with_buffer(git_oid
*oid
, git_treebuilder
*bld
, git_buf
*buf
)
1317 return git_treebuilder_write(oid
, bld
);