Commit 2f51b5b3dbc9fb8bc58001a3e80bf7b2cdf8c6a2
2019-05-08T17:02:01
handle added subtrees during commit
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155
diff --git a/lib/worktree.c b/lib/worktree.c
index cd9ee78..90a9746 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -2475,7 +2475,7 @@ write_tree(struct got_object_id **new_tree_id,
const struct got_tree_entries *base_entries = NULL;
struct got_pathlist_head paths;
struct got_tree_entries new_tree_entries;
- struct got_tree_entry *te;
+ struct got_tree_entry *te, *new_te = NULL;
struct got_pathlist_entry *pe;
TAILQ_INIT(&paths);
@@ -2485,79 +2485,98 @@ write_tree(struct got_object_id **new_tree_id,
/* Insert, and recurse into, newly added entries first. */
TAILQ_FOREACH(pe, commitable_paths, entry) {
struct commitable *ct = pe->data;
- char *child_path = NULL;
+ char *child_path = NULL, *slash;
if (ct->status != GOT_STATUS_ADD)
continue;
- printf("pe->path='%s'\n", pe->path);
- printf("path_base_tree='%s'\n", path_base_tree);
if (!got_path_is_child(pe->path, path_base_tree,
- strlen(path_base_tree))) {
- printf("not a child\n");
+ strlen(path_base_tree)))
continue;
- }
err = got_path_skip_common_ancestor(&child_path, path_base_tree,
pe->path);
if (err)
goto done;
- if (strchr(child_path, '/') == NULL) {
- struct got_tree_entry *new_te;
+ slash = strchr(child_path, '/');
+ if (slash == NULL) {
err = alloc_added_blob_tree_entry(&new_te, ct);
if (err)
goto done;
- err = insert_tree_entry(new_te, &paths);
- if (err)
- goto done;
} else {
- /* TODO: Create subtree and insert element for it. */
- }
- }
+ char *subtree_path;
- /* Handle modified and deleted entries. */
- base_entries = got_object_tree_get_entries(base_tree);
- SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
- struct got_tree_entry *new_te = NULL;
- struct commitable *ct = NULL;
+ *slash = '\0'; /* trim trailing path components */
- if (S_ISDIR(te->mode)) {
- err = got_object_tree_entry_dup(&new_te, te);
- if (err)
+ new_te = calloc(1, sizeof(*new_te));
+ new_te->mode = GOT_DEFAULT_DIR_MODE;
+ new_te->name = strdup(child_path);
+ if (new_te->name == NULL) {
+ got_object_tree_entry_close(new_te);
+ err = got_error_from_errno();
goto done;
- free(new_te->id);
- err = write_subtree(&new_te->id, te, path_base_tree,
- commitable_paths, repo);
- if (err)
+ }
+ if (asprintf(&subtree_path, "%s/%s", path_base_tree,
+ child_path) == -1) {
+ err = got_error_from_errno();
goto done;
- err = insert_tree_entry(new_te, &paths);
+ }
+ err = write_subtree(&new_te->id, NULL, subtree_path,
+ commitable_paths, repo);
+ free(subtree_path);
if (err)
goto done;
- continue;
}
- err = match_deleted_or_modified_ct(&ct, te, path_base_tree,
- commitable_paths);
- if (ct) {
- /* NB: Deleted entries get dropped here. */
- if (ct->status == GOT_STATUS_MODIFY) {
- err = alloc_modified_blob_tree_entry(&new_te,
- te, ct);
+ err = insert_tree_entry(new_te, &paths);
+ if (err)
+ goto done;
+ }
+
+ if (base_tree) {
+ /* Handle modified and deleted entries. */
+ base_entries = got_object_tree_get_entries(base_tree);
+ SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
+ struct commitable *ct = NULL;
+
+ if (S_ISDIR(te->mode)) {
+ err = got_object_tree_entry_dup(&new_te, te);
+ if (err)
+ goto done;
+ free(new_te->id);
+ err = write_subtree(&new_te->id, te,
+ path_base_tree, commitable_paths, repo);
+ if (err)
+ goto done;
+ err = insert_tree_entry(new_te, &paths);
+ if (err)
+ goto done;
+ continue;
+ }
+
+ err = match_deleted_or_modified_ct(&ct, te,
+ path_base_tree, commitable_paths);
+ if (ct) {
+ /* NB: Deleted entries get dropped here. */
+ if (ct->status == GOT_STATUS_MODIFY) {
+ err = alloc_modified_blob_tree_entry(
+ &new_te, te, ct);
+ if (err)
+ goto done;
+ err = insert_tree_entry(new_te, &paths);
+ if (err)
+ goto done;
+ }
+ } else {
+ /* Entry is unchanged; just copy it. */
+ err = got_object_tree_entry_dup(&new_te, te);
if (err)
goto done;
err = insert_tree_entry(new_te, &paths);
if (err)
goto done;
}
- } else {
- /* Entry is unchanged; just copy it. */
- err = got_object_tree_entry_dup(&new_te, te);
- if (err)
- goto done;
- err = insert_tree_entry(new_te, &paths);
- if (err)
- goto done;
}
}