Commit 48ae06eed46dc33d968d3c3e46e5728d92cd37a8
2018-10-18T12:19:34
allow changing amount of context lines in tog diff 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
diff --git a/tog/tog.1 b/tog/tog.1
index 6faea95..ad5f964 100644
--- a/tog/tog.1
+++ b/tog/tog.1
@@ -131,6 +131,10 @@ are as follows:
Scroll down.
.It Cm Up-arrow, k, Page-up
Scroll up.
+.It Cm [
+Reduce the amount of diff context lines.
+.It Cm ]
+Increase the amount of diff context lines.
.El
.It Cm blame [ Fl c Ar commit ] [ Fl r Ar repository-path ] Ar path
Display line-by-line history of a file at the specified path.
diff --git a/tog/tog.c b/tog/tog.c
index d57ef70..cb285c3 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -96,6 +96,8 @@ struct tog_diff_view_state {
int first_displayed_line;
int last_displayed_line;
int eof;
+ int diff_context;
+ struct got_repository *repo;
};
struct commit_queue_entry {
@@ -1609,42 +1611,96 @@ draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
}
static const struct got_error *
-open_diff_view(struct tog_view *view, struct got_object *obj1,
- struct got_object *obj2, struct got_repository *repo)
+create_diff(struct tog_diff_view_state *s)
{
- const struct got_error *err;
- FILE *f;
+ const struct got_error *err = NULL;
+ struct got_object *obj1 = NULL, *obj2 = NULL;
+ FILE *f = NULL;
- if (obj1 != NULL && obj2 != NULL &&
- got_object_get_type(obj1) != got_object_get_type(obj2))
- return got_error(GOT_ERR_OBJ_TYPE);
+ if (s->id1) {
+ err = got_object_open(&obj1, s->repo, s->id1);
+ if (err)
+ return err;
+ }
+
+ err = got_object_open(&obj2, s->repo, s->id2);
+ if (err)
+ goto done;
f = got_opentemp();
- if (f == NULL)
- return got_error_from_errno();
+ if (f == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ if (s->f)
+ fclose(s->f);
+ s->f = f;
switch (got_object_get_type(obj1 ? obj1 : obj2)) {
case GOT_OBJ_TYPE_BLOB:
- err = got_diff_objects_as_blobs(obj1, obj2, NULL, NULL, 3,
- repo, f);
+ err = got_diff_objects_as_blobs(obj1, obj2, NULL, NULL,
+ s->diff_context, s->repo, f);
break;
case GOT_OBJ_TYPE_TREE:
- err = got_diff_objects_as_trees(obj1, obj2, "", "", 3, repo, f);
+ err = got_diff_objects_as_trees(obj1, obj2, "", "",
+ s->diff_context, s->repo, f);
break;
case GOT_OBJ_TYPE_COMMIT:
- err = got_diff_objects_as_commits(obj1, obj2, 3, repo, f);
+ err = got_diff_objects_as_commits(obj1, obj2, s->diff_context,
+ s->repo, f);
break;
default:
- return got_error(GOT_ERR_OBJ_TYPE);
+ err = got_error(GOT_ERR_OBJ_TYPE);
+ break;
}
+done:
+ if (obj1)
+ got_object_close(obj1);
+ got_object_close(obj2);
+ if (f)
+ fflush(f);
+ return err;
+}
- fflush(f);
+static const struct got_error *
+open_diff_view(struct tog_view *view, struct got_object *obj1,
+ struct got_object *obj2, struct got_repository *repo)
+{
+ const struct got_error *err;
+
+ if (obj1 != NULL && obj2 != NULL &&
+ got_object_get_type(obj1) != got_object_get_type(obj2))
+ return got_error(GOT_ERR_OBJ_TYPE);
+
+ if (obj1) {
+ struct got_object_id *id1;
+ id1 = got_object_id_dup(got_object_get_id(obj1));
+ if (id1 == NULL)
+ return got_error_from_errno();
+ view->state.diff.id1 = id1;
+ } else
+ view->state.diff.id1 = NULL;
- view->state.diff.id1 = obj1 ? got_object_get_id(obj1) : NULL;
- view->state.diff.id2 = got_object_get_id(obj2);
- view->state.diff.f = f;
+ view->state.diff.id2 = got_object_id_dup(got_object_get_id(obj2));
+ if (view->state.diff.id2 == NULL) {
+ free(view->state.diff.id1);
+ view->state.diff.id1 = NULL;
+ return got_error_from_errno();
+ }
+ view->state.diff.f = NULL;
view->state.diff.first_displayed_line = 1;
view->state.diff.last_displayed_line = view->nlines;
+ view->state.diff.diff_context = 3;
+ view->state.diff.repo = repo;
+
+ err = create_diff(&view->state.diff);
+ if (err) {
+ free(view->state.diff.id1);
+ view->state.diff.id1 = NULL;
+ free(view->state.diff.id2);
+ view->state.diff.id2 = NULL;
+ return err;
+ }
view->show = show_diff_view;
view->input = input_diff_view;
@@ -1658,6 +1714,10 @@ close_diff_view(struct tog_view *view)
{
const struct got_error *err = NULL;
+ free(view->state.diff.id1);
+ view->state.diff.id1 = NULL;
+ free(view->state.diff.id2);
+ view->state.diff.id2 = NULL;
if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
err = got_error_from_errno();
return err;
@@ -1730,6 +1790,18 @@ input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
break;
+ case '[':
+ if (s->diff_context > 0) {
+ s->diff_context--;
+ err = create_diff(s);
+ }
+ break;
+ case ']':
+ if (s->diff_context < INT_MAX) {
+ s->diff_context++;
+ err = create_diff(s);
+ }
+ break;
default:
break;
}