Commit Diff

Commit:
867c6645307b5631ada0e0449a5bc77f65a9c429
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
show selected commit's hash in tog log view
Actions:
Patch | Tree
commit - 880dcab35c715d7ccd529331823fa3d52671951c
commit + 867c6645307b5631ada0e0449a5bc77f65a9c429
blob - 0c8100f7d3dea83185b10621e2e46f1614c68b15
blob + df9498a129cdaa976a44cccb317ed86290fa4d30
--- tog/tog.c
+++ tog/tog.c
@@ -445,14 +445,53 @@ draw_commits(struct commit_queue_entry **last, struct 
 {
 	const struct got_error *err = NULL;
 	struct commit_queue_entry *entry;
-	int ncommits = 0;
+	int ncommits;
+	char *id_str, *header;
+	size_t header_len;
+
+	entry = first;
+	*selected = NULL;
+	ncommits = 0;
+	while (entry) {
+		if (++ncommits - 1 == selected_idx) {
+			*selected = entry;
+			break;
+		}
+		entry = TAILQ_NEXT(entry, entry);
+	}
+	if (*selected == NULL)
+		return got_error(GOT_ERR_RANGE);
 
+	err = got_object_id_str(&id_str, (*selected)->id);
+	if (err)
+		return err;
+
+	if (asprintf(&header, "commit: %s", id_str) == -1) {
+		err = got_error_from_errno();
+		free(id_str);
+		return err;
+	}
+
 	werase(tog_log_view.window);
+
+	header_len = strlen(header);
+	if (header_len > COLS) {
+		id_str[COLS + 1] = '\0';
+		header_len = COLS;
+	}
+	wprintw(tog_log_view.window, header);
+	while (header_len < COLS) {
+		waddch(tog_log_view.window, ' ');
+		header_len++;
+	}
+	free(id_str);
+	free(header);
 
 	entry = first;
 	*last = first;
+	ncommits = 0;
 	while (entry) {
-		if (ncommits == limit)
+		if (ncommits == limit - 1)
 			break;
 		if (ncommits == selected_idx) {
 			wstandout(tog_log_view.window);
@@ -646,6 +685,7 @@ show_log_view(struct got_object_id *start_id, struct g
 		goto done;
 	}
 
+	selected_entry = first_displayed_entry;
 	while (!done) {
 		err = draw_commits(&last_displayed_entry, &selected_entry,
 		    first_displayed_entry, selected, LINES);
@@ -685,7 +725,7 @@ show_log_view(struct got_object_id *start_id, struct g
 			case 'j':
 			case KEY_DOWN:
 				nparents = num_parents(first_displayed_entry);
-				if (selected < LINES - 1 &&
+				if (selected < LINES - 2 &&
 				    selected < nparents - 1) {
 					selected++;
 					break;
@@ -706,13 +746,13 @@ show_log_view(struct got_object_id *start_id, struct g
 					break;
 				/* can't scroll any further; move cursor down */
 				nparents = num_parents(first_displayed_entry);
-				if (selected < LINES - 1 ||
+				if (selected < LINES - 2 ||
 				    selected < nparents - 1)
-					selected = MIN(LINES - 1, nparents - 1);
+					selected = MIN(LINES - 2, nparents - 1);
 				break;
 			case KEY_RESIZE:
-				if (selected > LINES)
-					selected = LINES - 1;
+				if (selected > LINES - 1)
+					selected = LINES - 2;
 				break;
 			case KEY_ENTER:
 			case '\r':