allow re-blaming file at older commits in tog blame 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 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 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453
diff --git a/tog/tog.c b/tog/tog.c
index 203a87b..13d2768 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -1207,7 +1207,6 @@ struct tog_blame_cb_args {
struct got_object_id *commit_id;
FILE *f;
const char *path;
- WINDOW *window;
int *first_displayed_line;
int *last_displayed_line;
int *selected_line;
@@ -1248,8 +1247,8 @@ blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
}
line->annotated = 1;
- err = draw_blame(a->window, a->commit_id, a->f, a->path, a->lines,
- a->nlines, 0, *a->selected_line, a->first_displayed_line,
+ err = draw_blame(tog_blame_view.window, a->commit_id, a->f, a->path,
+ a->lines, a->nlines, 0, *a->selected_line, a->first_displayed_line,
a->last_displayed_line, &eof, LINES);
done:
if (pthread_mutex_unlock(a->mutex) != 0)
@@ -1260,7 +1259,7 @@ done:
struct tog_blame_thread_args {
const char *path;
struct got_repository *repo;
- void *blame_cb_args;
+ struct tog_blame_cb_args *cb_args;
int *complete;
};
@@ -1269,11 +1268,11 @@ blame_thread(void *arg)
{
const struct got_error *err;
struct tog_blame_thread_args *ta = arg;
- struct tog_blame_cb_args *a = ta->blame_cb_args;
+ struct tog_blame_cb_args *a = ta->cb_args;
int eof;
err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
- blame_cb, ta->blame_cb_args);
+ blame_cb, ta->cb_args);
*ta->complete = 1;
if (err)
return (void *)err;
@@ -1281,10 +1280,9 @@ blame_thread(void *arg)
if (pthread_mutex_lock(a->mutex) != 0)
return (void *)got_error_from_errno();
- err = draw_blame(a->window, a->commit_id, a->f, a->path, a->lines,
- a->nlines, 1, *a->selected_line, a->first_displayed_line,
- a->last_displayed_line,
- &eof, LINES);
+ err = draw_blame(tog_blame_view.window, a->commit_id, a->f, a->path,
+ a->lines, a->nlines, 1, *a->selected_line, a->first_displayed_line,
+ a->last_displayed_line, &eof, LINES);
if (pthread_mutex_unlock(a->mutex) != 0 && err == NULL)
err = got_error_from_errno();
@@ -1292,25 +1290,38 @@ blame_thread(void *arg)
return (void *)err;
}
+static struct got_object_id *
+get_selected_commit_id(struct tog_blame_line *lines,
+ int first_displayed_line, int selected_line)
+{
+ struct tog_blame_line *line;
+
+ line = &lines[first_displayed_line - 1 + selected_line - 1];
+ if (!line->annotated)
+ return NULL;
+
+ return line->id;
+}
static const struct got_error *
-open_blamed_commit_and_parent(struct got_object **pobj, struct got_object **obj,
+open_selected_commit(struct got_object **pobj, struct got_object **obj,
struct tog_blame_line *lines, int first_displayed_line,
int selected_line, struct got_repository *repo)
{
const struct got_error *err = NULL;
- struct tog_blame_line *line;
struct got_commit_object *commit = NULL;
+ struct got_object_id *selected_id;
struct got_object_qid *pid;
*pobj = NULL;
*obj = NULL;
- line = &lines[first_displayed_line - 1 + selected_line - 1];
- if (!line->annotated || line->id == NULL)
+ selected_id = get_selected_commit_id(lines,
+ first_displayed_line, selected_line);
+ if (selected_id == NULL)
return NULL;
- err = got_object_open(obj, repo, line->id);
+ err = got_object_open(obj, repo, selected_id);
if (err)
goto done;
@@ -1330,24 +1341,60 @@ done:
return err;
}
+struct tog_blame {
+ FILE *f;
+ size_t filesize;
+ struct tog_blame_line *lines;
+ size_t nlines;
+ pthread_t thread;
+ struct tog_blame_thread_args thread_args;
+ struct tog_blame_cb_args cb_args;
+ const char *path;
+ struct got_object_id *commit_id;
+};
+
static const struct got_error *
-show_blame_view(const char *path, struct got_object_id *commit_id,
+stop_blame(struct tog_blame *blame)
+{
+ const struct got_error *err = NULL;
+ int i;
+
+ if (blame->thread) {
+ if (pthread_join(blame->thread, (void **)&err) != 0)
+ err = got_error_from_errno();
+ if (err && err->code == GOT_ERR_ITER_COMPLETED)
+ err = NULL;
+ blame->thread = NULL;
+ }
+ if (blame->thread_args.repo) {
+ got_repo_close(blame->thread_args.repo);
+ blame->thread_args.repo = NULL;
+ }
+ if (blame->f) {
+ fclose(blame->f);
+ blame->f = NULL;
+ }
+ for (i = 0; i < blame->nlines; i++)
+ free(blame->lines[i].id);
+ free(blame->lines);
+ blame->lines = NULL;
+ free(blame->commit_id);
+ blame->commit_id = NULL;
+
+ return err;
+}
+
+static const struct got_error *
+run_blame(struct tog_blame *blame, pthread_mutex_t *mutex, int *blame_complete,
+ int *first_displayed_line, int *last_displayed_line,
+ int *selected_line, int *done, const char *path,
+ struct got_object_id *commit_id,
struct got_repository *repo)
{
const struct got_error *err = NULL;
- int ch, done = 0, first_displayed_line = 1, last_displayed_line = LINES;
- int selected_line = first_displayed_line;
- int eof, i, blame_complete = 0;
- struct got_object *obj = NULL, *pobj = NULL;
struct got_blob_object *blob = NULL;
- FILE *f = NULL;
- size_t filesize, nlines = 0;
- struct tog_blame_line *lines = NULL;
- pthread_t thread = NULL;
- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
- struct tog_blame_cb_args blame_cb_args;
- struct tog_blame_thread_args blame_thread_args;
- struct got_repository *blame_thread_repo = NULL;
+ struct got_repository *thread_repo = NULL;
+ struct got_object *obj;
err = got_object_open_by_path(&obj, repo, commit_id, path);
if (err)
@@ -1360,25 +1407,88 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
err = got_object_blob_open(&blob, repo, obj, 8192);
if (err)
goto done;
- f = got_opentemp();
- if (f == NULL) {
+ blame->f = got_opentemp();
+ if (blame->f == NULL) {
err = got_error_from_errno();
goto done;
}
- err = got_object_blob_dump_to_file(&filesize, &nlines, f, blob);
+ err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
+ blame->f, blob);
if (err)
goto done;
- lines = calloc(nlines, sizeof(*lines));
- if (lines == NULL) {
+ blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
+ if (blame->lines == NULL) {
err = got_error_from_errno();
goto done;
}
- err = got_repo_open(&blame_thread_repo, got_repo_get_path(repo));
+ err = got_repo_open(&thread_repo, got_repo_get_path(repo));
if (err)
goto done;
+ blame->cb_args.lines = blame->lines;
+ blame->cb_args.nlines = blame->nlines;
+ blame->cb_args.mutex = mutex;
+ blame->cb_args.commit_id = got_object_id_dup(commit_id);
+ if (blame->cb_args.commit_id == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ blame->cb_args.f = blame->f;
+ blame->cb_args.path = path;
+ blame->cb_args.first_displayed_line = first_displayed_line;
+ blame->cb_args.selected_line = selected_line;
+ blame->cb_args.last_displayed_line = last_displayed_line;
+ blame->cb_args.quit = done;
+
+ blame->thread_args.path = path;
+ blame->thread_args.repo = thread_repo;
+ blame->thread_args.cb_args = &blame->cb_args;
+ blame->thread_args.complete = blame_complete;
+ *blame_complete = 0;
+
+ if (pthread_create(&blame->thread, NULL, blame_thread,
+ &blame->thread_args) != 0) {
+ err = got_error_from_errno();
+ goto done;
+ }
+
+done:
+ if (blob)
+ got_object_blob_close(blob);
+ if (obj)
+ got_object_close(obj);
+ if (err)
+ stop_blame(blame);
+ return err;
+}
+
+static const struct got_error *
+show_blame_view(const char *path, struct got_object_id *commit_id,
+ struct got_repository *repo)
+{
+ const struct got_error *err = NULL, *thread_err = NULL;
+ int ch, done = 0, first_displayed_line = 1, last_displayed_line = LINES;
+ int selected_line = first_displayed_line;
+ int eof, blame_complete = 0;
+ struct got_object *obj = NULL, *pobj = NULL;
+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+ struct tog_blame blame;
+ int blame_running = 0;
+ struct got_object_id *blamed_commit_id = NULL;
+
+ if (pthread_mutex_init(&mutex, NULL) != 0) {
+ err = got_error_from_errno();
+ goto done;
+ }
+
+ blamed_commit_id = got_object_id_dup(commit_id);
+ if (blamed_commit_id == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+
if (tog_blame_view.window == NULL) {
tog_blame_view.window = newwin(0, 0, 0, 0);
if (tog_blame_view.window == NULL)
@@ -1392,41 +1502,22 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
} else
show_panel(tog_blame_view.panel);
- if (pthread_mutex_init(&mutex, NULL) != 0) {
- err = got_error_from_errno();
- goto done;
- }
- blame_cb_args.lines = lines;
- blame_cb_args.nlines = nlines;
- blame_cb_args.mutex = &mutex;
- blame_cb_args.commit_id = commit_id;
- blame_cb_args.f = f;
- blame_cb_args.path = path;
- blame_cb_args.window = tog_blame_view.window;
- blame_cb_args.first_displayed_line = &first_displayed_line;
- blame_cb_args.selected_line = &selected_line;
- blame_cb_args.last_displayed_line = &last_displayed_line;
- blame_cb_args.quit = &done;
-
- blame_thread_args.path = path;
- blame_thread_args.repo = blame_thread_repo;
- blame_thread_args.blame_cb_args = &blame_cb_args;
- blame_thread_args.complete = &blame_complete;
-
- if (pthread_create(&thread, NULL, blame_thread,
- &blame_thread_args) != 0) {
- err = got_error_from_errno();
- goto done;
- }
+ memset(&blame, 0, sizeof(blame));
+ err = run_blame(&blame, &mutex, &blame_complete,
+ &first_displayed_line, &last_displayed_line,
+ &selected_line, &done, path, blamed_commit_id, repo);
+ if (err)
+ return err;
while (!done) {
if (pthread_mutex_lock(&mutex) != 0) {
err = got_error_from_errno();
goto done;
}
- err = draw_blame(tog_blame_view.window, commit_id, f, path,
- lines, nlines, blame_complete, selected_line,
- &first_displayed_line, &last_displayed_line, &eof, LINES);
+ err = draw_blame(tog_blame_view.window, blamed_commit_id,
+ blame.f, path, blame.lines, blame.nlines, blame_complete,
+ selected_line, &first_displayed_line, &last_displayed_line,
+ &eof, LINES);
if (pthread_mutex_unlock(&mutex) != 0) {
err = got_error_from_errno();
goto done;
@@ -1466,16 +1557,59 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
case KEY_DOWN:
if (selected_line < LINES - 2)
selected_line++;
- else if (last_displayed_line < nlines)
+ else if (last_displayed_line < blame.nlines)
first_displayed_line++;
break;
+ case 'b': {
+ struct got_object_id *id;
+ id = get_selected_commit_id(blame.lines,
+ first_displayed_line, selected_line);
+ if (id == NULL || got_object_id_cmp(id,
+ blamed_commit_id) == 0)
+ break;
+ err = open_selected_commit(&pobj, &obj,
+ blame.lines, first_displayed_line,
+ selected_line, repo);
+ if (err)
+ break;
+ if (pobj == NULL && obj == NULL)
+ break;
+ done = 1;
+ if (pthread_mutex_unlock(&mutex) != 0) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ thread_err = stop_blame(&blame);
+ blame_running = 0;
+ done = 0;
+ if (pthread_mutex_lock(&mutex) != 0) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ if (thread_err)
+ break;
+ free(blamed_commit_id);
+ blamed_commit_id = got_object_get_id(obj);
+ if (blamed_commit_id == NULL) {
+ err = got_error_from_errno();
+ break;
+ }
+ err = run_blame(&blame, &mutex,
+ &blame_complete, &first_displayed_line,
+ &last_displayed_line, &selected_line,
+ &done, path, blamed_commit_id, repo);
+ if (err)
+ break;
+ blame_running = 1;
+ break;
+ }
case KEY_ENTER:
case '\r':
- err = open_blamed_commit_and_parent(&pobj, &obj,
- lines, first_displayed_line, selected_line,
- repo);
+ err = open_selected_commit(&pobj, &obj,
+ blame.lines, first_displayed_line,
+ selected_line, repo);
if (err)
- goto done;
+ break;
if (pobj == NULL && obj == NULL)
break;
err = show_diff_view(pobj, obj, repo);
@@ -1487,50 +1621,37 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
obj = NULL;
show_panel(tog_blame_view.panel);
if (err)
- goto done;
+ break;
break;
case KEY_NPAGE:
case ' ':
- if (last_displayed_line >= nlines &&
+ if (last_displayed_line >= blame.nlines &&
selected_line < LINES - 2) {
selected_line = LINES - 2;
break;
}
- if (last_displayed_line + LINES - 2 <= nlines)
+ if (last_displayed_line + LINES - 2 <=
+ blame.nlines)
first_displayed_line += LINES - 2;
else
first_displayed_line =
- nlines - (LINES - 3);
+ blame.nlines - (LINES - 3);
break;
default:
break;
}
- if (pthread_mutex_unlock(&mutex) != 0) {
+ if (pthread_mutex_unlock(&mutex) != 0)
err = got_error_from_errno();
- goto done;
- }
+ if (err || thread_err)
+ break;
}
done:
- if (thread) {
- if (pthread_join(thread, (void **)&err) != 0)
- err = got_error_from_errno();
- if (err && err->code == GOT_ERR_ITER_COMPLETED)
- err = NULL;
- }
- if (blame_thread_repo)
- got_repo_close(blame_thread_repo);
- if (blob)
- got_object_blob_close(blob);
if (pobj)
got_object_close(pobj);
- if (obj)
- got_object_close(obj);
- if (f)
- fclose(f);
- for (i = 0; i < nlines; i++)
- free(lines[i].id);
- free(lines);
- return err;
+ if (blame_running)
+ thread_err = stop_blame(&blame);
+ free(blamed_commit_id);
+ return thread_err ? thread_err : err;
}
static const struct got_error *