tog: if opened from log view, open tree view at path being logged
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 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170
diff --git a/tog/tog.c b/tog/tog.c
index f6e6728..d0e5a2a 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -1389,13 +1389,40 @@ open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
}
static const struct got_error *
-browse_commit(struct tog_view **new_view, int begin_x,
- struct commit_queue_entry *entry, struct got_reflist_head *refs,
- struct got_repository *repo)
+tree_view_visit_subtree(struct got_tree_object *subtree,
+ struct tog_tree_view_state *s)
+{
+ struct tog_parent_tree *parent;
+
+ parent = calloc(1, sizeof(*parent));
+ if (parent == NULL)
+ return got_error_from_errno("calloc");
+
+ parent->tree = s->tree;
+ parent->first_displayed_entry = s->first_displayed_entry;
+ parent->selected_entry = s->selected_entry;
+ parent->selected = s->selected;
+ TAILQ_INSERT_HEAD(&s->parents, parent, entry);
+ s->tree = subtree;
+ s->entries = got_object_tree_get_entries(s->tree);
+ s->selected = 0;
+ s->first_displayed_entry = NULL;
+ return NULL;
+}
+
+
+static const struct got_error *
+browse_commit_tree(struct tog_view **new_view, int begin_x,
+ struct commit_queue_entry *entry, const char *path,
+ struct got_reflist_head *refs, struct got_repository *repo)
{
const struct got_error *err = NULL;
struct got_tree_object *tree;
+ struct got_tree_entry *te;
+ struct tog_tree_view_state *s;
struct tog_view *tree_view;
+ char *slash, *subpath;
+ const char *p;
err = got_object_open_as_tree(&tree, repo,
got_object_commit_get_tree_id(entry->commit));
@@ -1407,10 +1434,73 @@ browse_commit(struct tog_view **new_view, int begin_x,
return got_error_from_errno("view_open");
err = open_tree_view(tree_view, tree, entry->id, refs, repo);
- if (err)
+ if (err) {
got_object_tree_close(tree);
- else
- *new_view = tree_view;
+ return err;
+ }
+ s = &tree_view->state.tree;
+
+ *new_view = tree_view;
+
+ if (got_path_is_root_dir(path))
+ return NULL;
+
+ /* Walk the path and open corresponding tree objects. */
+ p = path;
+ while (*p) {
+ struct got_object_id *tree_id;
+
+ while (p[0] == '/')
+ p++;
+
+ /* Ensure the correct subtree entry is selected. */
+ slash = strchr(p, '/');
+ if (slash == NULL)
+ slash = strchr(p, '\0');
+ SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
+ if (strncmp(p, te->name, slash - p) == 0) {
+ s->selected_entry = te;
+ break;
+ }
+ }
+ if (s->selected_entry == NULL) {
+ err = got_error(GOT_ERR_NO_TREE_ENTRY);
+ break;
+ }
+
+ slash = strchr(p, '/');
+ if (slash)
+ subpath = strndup(path, slash - path);
+ else
+ subpath = strdup(path);
+ if (subpath == NULL) {
+ err = got_error_from_errno("strdup");
+ break;
+ }
+
+ err = got_object_id_by_path(&tree_id, repo, entry->id,
+ subpath);
+ if (err)
+ break;
+
+ err = got_object_open_as_tree(&tree, repo, tree_id);
+ free(tree_id);
+ if (err)
+ break;
+
+ err = tree_view_visit_subtree(tree, s);
+ if (err) {
+ got_object_tree_close(tree);
+ break;
+ }
+ if (slash == NULL)
+ break;
+ free(subpath);
+ subpath = NULL;
+ p = slash;
+ }
+
+ free(subpath);
return err;
}
@@ -1721,8 +1811,8 @@ input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
if (view_is_parent_view(view))
begin_x = view_split_begin_x(view->begin_x);
- err = browse_commit(&tree_view, begin_x,
- s->selected_entry, s->refs, s->repo);
+ err = browse_commit_tree(&tree_view, begin_x,
+ s->selected_entry, s->in_repo_path, s->refs, s->repo);
if (err)
break;
if (view_is_parent_view(view)) {
@@ -3772,28 +3862,16 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
s->selected = parent->selected;
free(parent);
} else if (S_ISDIR(s->selected_entry->mode)) {
- struct tog_parent_tree *parent;
- struct got_tree_object *child;
- err = got_object_open_as_tree(&child,
+ struct got_tree_object *subtree;
+ err = got_object_open_as_tree(&subtree,
s->repo, s->selected_entry->id);
if (err)
break;
- parent = calloc(1, sizeof(*parent));
- if (parent == NULL) {
- err = got_error_from_errno("calloc");
+ err = tree_view_visit_subtree(subtree, s);
+ if (err) {
+ got_object_tree_close(subtree);
break;
}
- parent->tree = s->tree;
- parent->first_displayed_entry =
- s->first_displayed_entry;
- parent->selected_entry = s->selected_entry;
- parent->selected = s->selected;
- TAILQ_INSERT_HEAD(&s->parents, parent, entry);
- s->tree = child;
- s->entries =
- got_object_tree_get_entries(s->tree);
- s->selected = 0;
- s->first_displayed_entry = NULL;
} else if (S_ISREG(s->selected_entry->mode)) {
struct tog_view *blame_view;
int begin_x = view_is_parent_view(view) ?