This repository was archived by the owner on Jun 25, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 96
/
Copy pathsource_diff.cc
365 lines (340 loc) · 14.3 KB
/
source_diff.cc
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
#include "source_diff.h"
#include "config.h"
#include "terminal.h"
#include "filesystem.h"
#include "info.h"
#include <boost/version.hpp>
Source::DiffView::Renderer::Renderer() : Gsv::GutterRenderer() {
set_padding(4, 0);
}
void Source::DiffView::Renderer::draw_vfunc(const Cairo::RefPtr<Cairo::Context> &cr, const Gdk::Rectangle &background_area,
const Gdk::Rectangle &cell_area, Gtk::TextIter &start, Gtk::TextIter &end,
Gsv::GutterRendererState p6) {
if(start.has_tag(tag_added) || end.has_tag(tag_added)) {
cr->set_source_rgba(0.0, 1.0, 0.0, 0.5);
cr->rectangle(cell_area.get_x(), cell_area.get_y(), 4, cell_area.get_height());
cr->fill();
}
else if(start.has_tag(tag_modified) || end.has_tag(tag_modified)) {
cr->set_source_rgba(0.9, 0.9, 0.0, 0.75);
cr->rectangle(cell_area.get_x(), cell_area.get_y(), 4, cell_area.get_height());
cr->fill();
}
if(start.has_tag(tag_removed_below) || end.has_tag(tag_removed_below)) {
cr->set_source_rgba(0.75, 0.0, 0.0, 0.5);
cr->rectangle(cell_area.get_x()-4, cell_area.get_y()+cell_area.get_height()-2, 8, 2);
cr->fill();
}
if(start.has_tag(tag_removed_above) || end.has_tag(tag_removed_above)) {
cr->set_source_rgba(0.75, 0.0, 0.0, 0.5);
cr->rectangle(cell_area.get_x()-4, cell_area.get_y(), 8, 2);
cr->fill();
}
}
Source::DiffView::DiffView(const boost::filesystem::path &file_path, const Glib::RefPtr<Gsv::Language> &language) : BaseView(file_path, language), renderer(new Renderer()) {
boost::system::error_code ec;
canonical_file_path=boost::filesystem::canonical(file_path, ec);
if(ec)
canonical_file_path=file_path;
renderer->tag_added=get_buffer()->create_tag("git_added");
renderer->tag_modified=get_buffer()->create_tag("git_modified");
renderer->tag_removed=get_buffer()->create_tag("git_removed");
renderer->tag_removed_below=get_buffer()->create_tag();
renderer->tag_removed_above=get_buffer()->create_tag();
}
Source::DiffView::~DiffView() {
dispatcher.disconnect();
if(repository) {
get_gutter(Gtk::TextWindowType::TEXT_WINDOW_LEFT)->remove(renderer.get());
buffer_insert_connection.disconnect();
buffer_erase_connection.disconnect();
monitor_changed_connection.disconnect();
delayed_buffer_changed_connection.disconnect();
delayed_monitor_changed_connection.disconnect();
parse_stop=true;
if(parse_thread.joinable())
parse_thread.join();
}
}
void Source::DiffView::configure() {
if(Config::get().source.show_git_diff) {
if(repository)
return;
}
else if(repository) {
get_gutter(Gtk::TextWindowType::TEXT_WINDOW_LEFT)->remove(renderer.get());
buffer_insert_connection.disconnect();
buffer_erase_connection.disconnect();
monitor_changed_connection.disconnect();
delayed_buffer_changed_connection.disconnect();
delayed_monitor_changed_connection.disconnect();
parse_stop=true;
if(parse_thread.joinable())
parse_thread.join();
repository=nullptr;
diff=nullptr;
return;
}
else
return;
try {
repository=Git::get_repository(this->file_path.parent_path());
}
catch(const std::exception &) {
return;
}
get_gutter(Gtk::TextWindowType::TEXT_WINDOW_LEFT)->insert(renderer.get(), -40);
parse_state=ParseState::STARTING;
parse_stop=false;
monitor_changed=false;
buffer_insert_connection=get_buffer()->signal_insert().connect([this](const Gtk::TextBuffer::iterator &iter ,const Glib::ustring &text, int) {
//Do not perform git diff if no newline is added and line is already marked as added
if(!iter.starts_line() && iter.has_tag(renderer->tag_added)) {
bool newline=false;
for(auto &c: text.raw()) {
if(c=='\n') {
newline=true;
break;
}
}
if(!newline)
return;
}
//Remove tag_removed_above/below if newline is inserted
else if(!text.empty() && text[0]=='\n' && iter.has_tag(renderer->tag_removed)) {
auto start_iter=get_buffer()->get_iter_at_line(iter.get_line());
auto end_iter=get_iter_at_line_end(iter.get_line());
end_iter.forward_char();
get_buffer()->remove_tag(renderer->tag_removed_above, start_iter, end_iter);
get_buffer()->remove_tag(renderer->tag_removed_below, start_iter, end_iter);
}
parse_state=ParseState::IDLE;
delayed_buffer_changed_connection.disconnect();
delayed_buffer_changed_connection=Glib::signal_timeout().connect([this]() {
parse_state=ParseState::STARTING;
return false;
}, 250);
}, false);
buffer_erase_connection=get_buffer()->signal_erase().connect([this](const Gtk::TextBuffer::iterator &start_iter, const Gtk::TextBuffer::iterator &end_iter) {
//Do not perform git diff if start_iter and end_iter is at the same line in addition to the line is tagged added
if(start_iter.get_line()==end_iter.get_line() && start_iter.has_tag(renderer->tag_added))
return;
parse_state=ParseState::IDLE;
delayed_buffer_changed_connection.disconnect();
delayed_buffer_changed_connection=Glib::signal_timeout().connect([this]() {
parse_state=ParseState::STARTING;
return false;
}, 250);
}, false);
monitor_changed_connection=repository->monitor->signal_changed().connect([this](const Glib::RefPtr<Gio::File> &file,
const Glib::RefPtr<Gio::File>&,
Gio::FileMonitorEvent monitor_event) {
if(monitor_event!=Gio::FileMonitorEvent::FILE_MONITOR_EVENT_CHANGES_DONE_HINT) {
delayed_monitor_changed_connection.disconnect();
delayed_monitor_changed_connection=Glib::signal_timeout().connect([this]() {
monitor_changed=true;
parse_state=ParseState::STARTING;
std::unique_lock<std::mutex> lock(parse_mutex);
diff=nullptr;
return false;
}, 500);
}
});
parse_thread=std::thread([this]() {
std::string status_branch;
try {
diff=get_diff();
status_branch=repository->get_branch();
}
catch(const std::exception &) {
status_branch="";
}
dispatcher.post([this, status_branch=std::move(status_branch)] {
this->status_branch=status_branch;
if(update_status_branch)
update_status_branch(this);
});
try {
while(true) {
while(!parse_stop && parse_state!=ParseState::STARTING && parse_state!=ParseState::PROCESSING)
std::this_thread::sleep_for(std::chrono::milliseconds(10));
if(parse_stop)
break;
std::unique_lock<std::mutex> parse_lock(parse_mutex, std::defer_lock);
auto expected=ParseState::STARTING;
if(parse_state.compare_exchange_strong(expected, ParseState::PREPROCESSING)) {
dispatcher.post([this] {
auto expected=ParseState::PREPROCESSING;
std::unique_lock<std::mutex> parse_lock(parse_mutex, std::defer_lock);
if(parse_lock.try_lock()) {
if(parse_state.compare_exchange_strong(expected, ParseState::PROCESSING))
parse_buffer=get_buffer()->get_text();
parse_lock.unlock();
}
else
parse_state.compare_exchange_strong(expected, ParseState::STARTING);
});
}
else if (parse_state==ParseState::PROCESSING && parse_lock.try_lock()) {
bool expected_monitor_changed=true;
if(monitor_changed.compare_exchange_strong(expected_monitor_changed, false)) {
try {
diff=get_diff();
dispatcher.post([this, status_branch=repository->get_branch()] {
this->status_branch=status_branch;
if(update_status_branch)
update_status_branch(this);
});
}
catch(const std::exception &) {
dispatcher.post([this] {
get_buffer()->remove_tag(renderer->tag_added, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_modified, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed_below, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed_above, get_buffer()->begin(), get_buffer()->end());
renderer->queue_draw();
this->status_branch="";
if(update_status_branch)
update_status_branch(this);
});
}
}
if(diff)
lines=diff->get_lines(parse_buffer.raw());
else {
lines.added.clear();
lines.modified.clear();
lines.removed.clear();
}
auto expected=ParseState::PROCESSING;
if(parse_state.compare_exchange_strong(expected, ParseState::POSTPROCESSING)) {
parse_lock.unlock();
dispatcher.post([this] {
std::unique_lock<std::mutex> parse_lock(parse_mutex, std::defer_lock);
if(parse_lock.try_lock()) {
auto expected=ParseState::POSTPROCESSING;
if(parse_state.compare_exchange_strong(expected, ParseState::IDLE))
update_lines();
}
});
}
}
}
}
catch(const std::exception &e) {
dispatcher.post([this, e_what=e.what()] {
get_buffer()->remove_tag(renderer->tag_added, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_modified, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed_below, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed_above, get_buffer()->begin(), get_buffer()->end());
renderer->queue_draw();
Terminal::get().print(std::string("Error (git): ")+e_what+'\n', true);
});
}
});
}
void Source::DiffView::rename(const boost::filesystem::path &path) {
Source::BaseView::rename(path);
std::lock_guard<std::mutex> lock(canonical_file_path_mutex);
boost::system::error_code ec;
canonical_file_path=boost::filesystem::canonical(path, ec);
if(ec)
canonical_file_path=path;
}
void Source::DiffView::git_goto_next_diff() {
auto iter=get_buffer()->get_insert()->get_iter();
auto insert_iter=iter;
bool wrapped=false;
iter.forward_char();
for(;;) {
auto toggled_tags=iter.get_toggled_tags();
for(auto &toggled_tag: toggled_tags) {
if(toggled_tag->property_name()=="git_added" ||
toggled_tag->property_name()=="git_modified" ||
toggled_tag->property_name()=="git_removed") {
get_buffer()->place_cursor(iter);
scroll_to(get_buffer()->get_insert(), 0.0, 1.0, 0.5);
return;
}
}
if(wrapped && (iter==insert_iter || iter==get_buffer()->end()))
break;
if(!wrapped && iter==get_buffer()->end()) {
iter=get_buffer()->begin();
wrapped=true;
}
else
iter.forward_char();
}
Info::get().print("No changes found in current buffer");
}
std::string Source::DiffView::git_get_diff_details() {
std::string details;
if(diff) {
auto line_nr=get_buffer()->get_insert()->get_iter().get_line();
auto iter=get_buffer()->get_iter_at_line(line_nr);
if(iter.has_tag(renderer->tag_removed_above))
--line_nr;
std::unique_lock<std::mutex> lock(parse_mutex);
parse_buffer=get_buffer()->get_text();
details=diff->get_details(parse_buffer.raw(), line_nr);
}
if(details.empty())
Info::get().print("No changes found at current line");
return details;
}
///Return repository diff instance. Throws exception on error
std::unique_ptr<Git::Repository::Diff> Source::DiffView::get_diff() {
auto work_path=filesystem::get_normal_path(repository->get_work_path());
boost::filesystem::path relative_path;
{
std::unique_lock<std::mutex> lock(canonical_file_path_mutex);
relative_path=filesystem::get_relative_path(canonical_file_path, work_path);
if(relative_path.empty())
throw std::runtime_error("not a relative path");
}
return std::make_unique<Git::Repository::Diff>(repository->get_diff(relative_path));
}
void Source::DiffView::update_lines() {
get_buffer()->remove_tag(renderer->tag_added, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_modified, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed_below, get_buffer()->begin(), get_buffer()->end());
get_buffer()->remove_tag(renderer->tag_removed_above, get_buffer()->begin(), get_buffer()->end());
for(auto &added: lines.added) {
auto start_iter=get_buffer()->get_iter_at_line(added.first);
auto end_iter=get_iter_at_line_end(added.second-1);
end_iter.forward_char();
get_buffer()->apply_tag(renderer->tag_added, start_iter, end_iter);
}
for(auto &modified: lines.modified) {
auto start_iter=get_buffer()->get_iter_at_line(modified.first);
auto end_iter=get_iter_at_line_end(modified.second-1);
end_iter.forward_char();
get_buffer()->apply_tag(renderer->tag_modified, start_iter, end_iter);
}
for(auto &line_nr: lines.removed) {
Gtk::TextIter removed_start, removed_end;
if(line_nr>=0) {
auto start_iter=get_buffer()->get_iter_at_line(line_nr);
removed_start=start_iter;
auto end_iter=get_iter_at_line_end(line_nr);
end_iter.forward_char();
removed_end=end_iter;
get_buffer()->apply_tag(renderer->tag_removed_below, start_iter, end_iter);
}
if(line_nr+1<get_buffer()->get_line_count()) {
auto start_iter=get_buffer()->get_iter_at_line(line_nr+1);
if(line_nr<0)
removed_start=start_iter;
auto end_iter=get_iter_at_line_end(line_nr+1);
end_iter.forward_char();
removed_end=end_iter;
get_buffer()->apply_tag(renderer->tag_removed_above, start_iter, end_iter);
}
get_buffer()->apply_tag(renderer->tag_removed, removed_start, removed_end);
}
renderer->queue_draw();
}