Commit 8f4ed63441b6c8e9c29c4db32ad615a1657aa1ac
2020-03-26T20:40:55
display "no more matches" indicator if 'tog log' search cannot find any
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 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205
diff --git a/tog/tog.c b/tog/tog.c
index d021edb..e4a2991 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -437,6 +437,8 @@ struct tog_view {
#define TOG_SEARCH_FORWARD 1
#define TOG_SEARCH_BACKWARD 2
int search_next_done;
+#define TOG_SEARCH_HAVE_MORE 1
+#define TOG_SEARCH_NO_MORE 2
regex_t regex;
};
@@ -752,6 +754,10 @@ view_input(struct tog_view **new, struct tog_view **dead,
*dead = NULL;
*focus = NULL;
+ /* Clear "no more matches" indicator. */
+ if (view->search_next_done == TOG_SEARCH_NO_MORE)
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
+
if (view->searching && !view->search_next_done) {
errcode = pthread_mutex_unlock(&tog_mutex);
if (errcode)
@@ -848,7 +854,7 @@ view_input(struct tog_view **new, struct tog_view **dead,
break;
case 'N':
case 'n':
- if (view->search_next && view->searching) {
+ if (view->search_next) {
view->searching = (ch == 'n' ?
TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
view->search_next_done = 0;
@@ -1443,7 +1449,7 @@ queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
if (err)
break;
if (have_match)
- *search_next_done = 1;
+ *search_next_done = TOG_SEARCH_HAVE_MORE;
}
errcode = pthread_mutex_unlock(&tog_mutex);
@@ -1501,14 +1507,21 @@ draw_commits(struct tog_view *view, struct commit_queue_entry **last,
if (commits_needed == 0)
halfdelay(10); /* disable fast refresh */
- if (asprintf(&ncommits_str, " [%d/%d] %s",
- entry ? entry->idx + 1 : 0, commits->ncommits,
- commits_needed > 0 ?
- (view->searching && view->search_next_done == 0
- ? "searching..." : "loading... ") :
- (refs_str ? refs_str : "")) == -1) {
- err = got_error_from_errno("asprintf");
- goto done;
+ if (commits_needed > 0) {
+ if (asprintf(&ncommits_str, " [%d/%d] %s",
+ entry ? entry->idx + 1 : 0, commits->ncommits,
+ view->searching ? "searching..." : "loading...") == -1) {
+ err = got_error_from_errno("asprintf");
+ goto done;
+ }
+ } else {
+ if (asprintf(&ncommits_str, " [%d/%d] %s",
+ entry ? entry->idx + 1 : 0, commits->ncommits,
+ view->search_next_done == TOG_SEARCH_NO_MORE ?
+ "no more matches" : (refs_str ? refs_str : "")) == -1) {
+ err = got_error_from_errno("asprintf");
+ goto done;
+ }
}
if (path && strcmp(path, "/") != 0) {
@@ -2043,11 +2056,6 @@ search_next_log_view(struct tog_view *view)
struct tog_log_view_state *s = &view->state.log;
struct commit_queue_entry *entry;
- if (!view->searching) {
- view->search_next_done = 1;
- return NULL;
- }
-
if (s->search_entry) {
int errcode, ch;
errcode = pthread_mutex_unlock(&tog_mutex);
@@ -2060,7 +2068,7 @@ search_next_log_view(struct tog_view *view)
return got_error_set_errno(errcode,
"pthread_mutex_lock");
if (ch == KEY_BACKSPACE) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
return NULL;
}
if (view->searching == TOG_SEARCH_FORWARD)
@@ -2070,9 +2078,9 @@ search_next_log_view(struct tog_view *view)
commit_queue_head, entry);
} else if (s->matched_entry) {
if (view->searching == TOG_SEARCH_FORWARD)
- entry = TAILQ_NEXT(s->selected_entry, entry);
+ entry = TAILQ_NEXT(s->matched_entry, entry);
else
- entry = TAILQ_PREV(s->selected_entry,
+ entry = TAILQ_PREV(s->matched_entry,
commit_queue_head, entry);
} else {
if (view->searching == TOG_SEARCH_FORWARD)
@@ -2087,7 +2095,8 @@ search_next_log_view(struct tog_view *view)
if (entry == NULL) {
if (s->thread_args.log_complete ||
view->searching == TOG_SEARCH_BACKWARD) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_NO_MORE;
+ s->search_entry = NULL;
return NULL;
}
/*
@@ -2108,7 +2117,7 @@ search_next_log_view(struct tog_view *view)
if (err)
break;
if (have_match) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
s->matched_entry = entry;
break;
}
@@ -3114,7 +3123,7 @@ search_next_diff_view(struct tog_view *view)
int lineno;
if (!view->searching) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
return NULL;
}
@@ -3137,7 +3146,7 @@ search_next_diff_view(struct tog_view *view)
if (lineno <= 0 || lineno > s->nlines) {
if (s->matched_line == 0) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
free(line);
break;
}
@@ -3156,7 +3165,7 @@ search_next_diff_view(struct tog_view *view)
free(line);
line = parse_next_line(s->f, &len);
if (line && match_line(line, &view->regex)) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
s->matched_line = lineno;
free(line);
break;
@@ -4095,7 +4104,7 @@ search_next_blame_view(struct tog_view *view)
int lineno;
if (!view->searching) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
return NULL;
}
@@ -4118,7 +4127,7 @@ search_next_blame_view(struct tog_view *view)
if (lineno <= 0 || lineno > s->blame.nlines) {
if (s->matched_line == 0) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
free(line);
break;
}
@@ -4137,7 +4146,7 @@ search_next_blame_view(struct tog_view *view)
free(line);
line = parse_next_line(s->blame.f, &len);
if (line && match_line(line, &view->regex)) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
s->matched_line = lineno;
free(line);
break;
@@ -4956,7 +4965,7 @@ search_next_tree_view(struct tog_view *view)
struct got_tree_entry *te = NULL;
if (!view->searching) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
return NULL;
}
@@ -4984,7 +4993,7 @@ search_next_tree_view(struct tog_view *view)
while (1) {
if (te == NULL) {
if (s->matched_entry == NULL) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
return NULL;
}
if (view->searching == TOG_SEARCH_FORWARD)
@@ -4994,7 +5003,7 @@ search_next_tree_view(struct tog_view *view)
}
if (match_tree_entry(te, &view->regex)) {
- view->search_next_done = 1;
+ view->search_next_done = TOG_SEARCH_HAVE_MORE;
s->matched_entry = te;
break;
}