Commit c1fea1f8b6525d09ab1acfdeced1611f88f7429b
2018-09-29T15:08:08
rename tog's update_diff_child_view() and make it more generic
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
diff --git a/tog/tog.c b/tog/tog.c
index 4da4aa2..8d0ced9 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -1166,39 +1166,35 @@ close_log_view(struct tog_view *view)
}
static const struct got_error *
-update_diff_child_view(struct tog_view *parent,
- struct commit_queue_entry *selected_entry, struct got_repository *repo)
+update_diff_view(struct tog_view *diff_view,
+ struct got_object_id *commit_id, struct got_commit_object *commit,
+ struct got_repository *repo)
{
const struct got_error *err = NULL;
struct tog_diff_view_state *ds;
struct got_object *obj1 = NULL, *obj2 = NULL;
struct got_object_qid *parent_id;
- struct tog_view *child_view = parent->child;
- if (child_view == NULL)
- return NULL;
- if (child_view->type != TOG_VIEW_DIFF)
- return NULL;
- ds = &child_view->state.diff;
- if (got_object_id_cmp(ds->id2, selected_entry->id) == 0)
+ ds = &diff_view->state.diff;
+ if (got_object_id_cmp(ds->id2, commit_id) == 0)
return NULL;
- err = got_object_open(&obj2, repo, selected_entry->id);
+ err = got_object_open(&obj2, repo, commit_id);
if (err)
return err;
- parent_id = SIMPLEQ_FIRST(&selected_entry->commit->parent_ids);
+ parent_id = SIMPLEQ_FIRST(&commit->parent_ids);
if (parent_id) {
err = got_object_open(&obj1, repo, parent_id->id);
if (err)
goto done;
}
- err = close_diff_view(child_view);
+ err = close_diff_view(diff_view);
if (err)
goto done;
- err = open_diff_view(child_view, obj1, obj2, repo);
+ err = open_diff_view(diff_view, obj1, obj2, repo);
if (err)
goto done;
done:
@@ -1222,7 +1218,11 @@ show_log_view(struct tog_view *view)
if (err)
return err;
- return update_diff_child_view(view, s->selected_entry, s->repo);
+ if (view->child && view->child->type == TOG_VIEW_DIFF)
+ err = update_diff_view(view->child, s->selected_entry->id,
+ s->selected_entry->commit, s->repo);
+
+ return err;
}
static const struct got_error *