Commit 034e3b695c4cdc837b2a144ddede9eb9f6dfd857
2018-07-22T13:24:35
simplify selection of first entry to display in log view
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
diff --git a/tog/tog.c b/tog/tog.c
index 0f6ba49..2bda090 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -669,7 +669,6 @@ show_log_view(struct got_object_id *start_id, struct got_repository *repo,
struct commit_queue_entry *first_displayed_entry = NULL;
struct commit_queue_entry *last_displayed_entry = NULL;
struct commit_queue_entry *selected_entry = NULL;
- struct commit_queue_entry *entry;
char *in_repo_path = NULL;
err = got_repo_map_path(&in_repo_path, repo, path);
@@ -693,12 +692,13 @@ show_log_view(struct got_object_id *start_id, struct got_repository *repo,
if (err)
return err;
- TAILQ_INIT(&commits.head);
- commits.ncommits = 0;
-
+ /* The graph contains all commits. */
err = got_commit_graph_open(&graph, head_id, 0, repo);
if (err)
goto done;
+ /* The commit queue contains a subset of commits filtered by path. */
+ TAILQ_INIT(&commits.head);
+ commits.ncommits = 0;
/* Populate commit graph with a sufficient number of commits. */
err = got_commit_graph_fetch_commits_up_to(&nfetched, graph, start_id,
@@ -712,7 +712,7 @@ show_log_view(struct got_object_id *start_id, struct got_repository *repo,
* in order to avoid having to re-fetch commits from disk while
* updating the display.
*/
- err = queue_commits(graph, &commits, head_id, LINES, 1, repo,
+ err = queue_commits(graph, &commits, start_id, LINES, 1, repo,
in_repo_path);
if (err) {
if (err->code != GOT_ERR_ITER_COMPLETED)
@@ -720,49 +720,7 @@ show_log_view(struct got_object_id *start_id, struct got_repository *repo,
err = NULL;
}
- /*
- * Find entry corresponding to the first commit to display.
- * if both a path and start commit was specified, the first commit
- * shown should be a commit <= start_commit which modified the path.
- */
- if (in_repo_path) {
- struct got_object_id *id;
-
- err = got_commit_graph_iter_start(graph, start_id);
- if (err)
- return err;
- do {
- err = got_commit_graph_iter_next(&id, graph);
- if (err)
- goto done;
- if (id == NULL) {
- err = got_error(GOT_ERR_NO_OBJ);
- goto done;
- }
- /*
- * The graph contains all commits. The commit queue
- * contains a subset of commits filtered by path.
- */
- TAILQ_FOREACH(entry, &commits.head, entry) {
- if (got_object_id_cmp(entry->id, id) == 0) {
- first_displayed_entry = entry;
- break;
- }
- }
- } while (first_displayed_entry == NULL);
- } else {
- TAILQ_FOREACH(entry, &commits.head, entry) {
- if (got_object_id_cmp(entry->id, start_id) == 0) {
- first_displayed_entry = entry;
- break;
- }
- }
- }
- if (first_displayed_entry == NULL) {
- err = got_error(GOT_ERR_NO_OBJ);
- goto done;
- }
-
+ first_displayed_entry = TAILQ_FIRST(&commits.head);
selected_entry = first_displayed_entry;
while (!done) {
err = draw_commits(&last_displayed_entry, &selected_entry,