-
Notifications
You must be signed in to change notification settings - Fork 6
/
Copy pathasciik.cc
400 lines (353 loc) · 12.8 KB
/
asciik.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
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
// Copyright (C) 2006 Nathaniel Smith <[email protected]>
// Copyright (C) 2007 Lapo Luchini <[email protected]>
// Copyright (C) 2007 Gabriele Dini Ciacci <[email protected]>
//
// This program is made available under the GNU GPL version 2.0 or
// greater. See the accompanying file COPYING for details.
//
// This program is distributed WITHOUT ANY WARRANTY; without even the
// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE.
/*
BUGS:
1)
| | | | | | |\ \ \ \
| | | | | | o | | | | 145c71fb56cff358dd711773586ae6b5219b0cfc
| | | | | | |\ \ \ \ \
should be
| | | | | | |\ \ \ \
| | | | | | o \ \ \ \ 145c71fb56cff358dd711773586ae6b5219b0cfc
| | | | | | |\ \ \ \ \
need some sort "inertia", if we moved sideways before and are moving
sideways now...
2)
It actually is possible to remove a ghost on the same line as a long
rightwards edge -- and it even looks better than not doing it, at least in
some cases. Consider:
Current:
| | | o | | | | | 0f07da5974be8bf91495a34093efc635dcf1f01c
| | | |\ \ \ \ \ \
| | | | .-o | | | | 20037e09def77cc217679bf2f72baf5fa0415649
| | | |/| | | | |
| | | o---. | | | | de74b6e2bd612ba40f1afc3eba3f9a3d8f419135
| | | | | \| | | |
| | | o | | | | | 3fd16665caab9d942e6c5254b477587ff7d3722d
| | | | | / / / /
| | | o | | | | | 38f3561cc4bf294b99436f98cd97fc707b422bfa
| | | | | | | | |
| | | | .-o | | | 59017bc836986a59fd1ac6fba4f78fe1045c67e9
| | | |/| | | | |
| | | o | | | | | 97e8f96bb34774003de428292edbdd562ca6d867
| | | | | | | | |
Desired:
| | | o | | | | | 0f07da5974be8bf91495a34093efc635dcf1f01c
| | | |\ \ \ \ \ \
| | | | .-o | | | | 20037e09def77cc217679bf2f72baf5fa0415649
| | | |/| | | | |
| | | o-. | | | | de74b6e2bd612ba40f1afc3eba3f9a3d8f419135
| | | | |\ / / / /
| | | o | | | | | 3fd16665caab9d942e6c5254b477587ff7d3722d
| | | | | | | | |
| | | o | | | | | 38f3561cc4bf294b99436f98cd97fc707b422bfa
| | | | | | | | |
| | | | .-o | | | 59017bc836986a59fd1ac6fba4f78fe1045c67e9
| | | |/| | | | |
| | | o | | | | | 97e8f96bb34774003de428292edbdd562ca6d867
| | | | | | | | |
Possibly the no-shift-while-drawing-long-edges code could even be removed,
deferring to the no-edge-crossings code.
How this works:
This is completely iterative; we have no lookahead whatsoever. We output
each line before even looking at the next. (This means the layout is
much less clever than it could be, because there is no global
optimization; but it also means we can calculate these things in zero
time, incrementally while running log.)
Output comes in two-line chunks -- a "line", which contains exactly one
node, and then an "interline", which contains edges that will link us to
the next line.
A design goal of the system is that you can always trivially increase the
space between two "lines", by adding another "| | | |"-type interline
after the real interline. This allows us to put arbitrarily long
annotations in the space to the right of the graph, for each revision --
we can just stretch the graph portion to give us more space.
Loop:
We start knowing, for each logical column, what thing has to go there
(because this was determined last time)
We use this to first determine what thing has to go in each column next
time (though we will not draw them yet).
This is somewhat tricky, because we do want to squish things towards the
left when possible. However, we have very limited drawing options -- we
can slide several things 1 space to the left or right and do no other long
sideways edges; or, we can draw 1 or 2 long sideways edges, but then
everything else must go straight. So, we try a few different layouts.
The options are, remove a "ghost" if one exists, don't remove a ghost, and
insert a ghost. (A "ghost" is a blank space left by a line that has
terminated or merged back into another line, but we haven't shifted things
over sideways yet to fill in the space.)
Having found a layout that works, we draw lines connecting things! Yay.
*/
#include "base.hh"
#include <algorithm>
#include <iostream>
#include <iterator>
#include "asciik.hh"
#include "simplestring_xform.hh"
#include "cmd.hh"
#include "app_state.hh"
#include "project.hh"
#include "database.hh"
#include "revision.hh"
#include "transforms.hh"
using std::insert_iterator;
using std::max;
using std::min;
using std::ostream;
using std::ostream_iterator;
using std::pair;
using std::set;
using std::string;
using std::vector;
using std::find;
using std::reverse;
using std::distance;
static revision_id ghost; // valid but empty revision_id to be used as ghost value
asciik::asciik(ostream & os, size_t min_width)
: width(min_width), output(os)
{
}
void
asciik::links_cross(set<pair<size_t, size_t> > const & links,
set<size_t> & crosses) const
{
for (set<pair<size_t, size_t> >::const_iterator link = links.begin();
link != links.end(); ++link)
{
size_t i = link->first, j = link->second;
if (i != j)
for (size_t coord = 2 * min(i, j) + 1, end = 2 * max(i, j);
coord < end; ++coord)
crosses.insert(coord);
}
}
void
asciik::draw(size_t const curr_items,
size_t const next_items,
size_t const curr_loc,
set<pair<size_t, size_t> > const & links,
set<size_t> const & curr_ghosts,
string const & annotation) const
{
size_t line_len = max(width, max(curr_items, next_items) * 2);
string line(line_len, ' '); // actual len: curr_items * 2 - 1
string interline(line_len, ' '); // actual len: max(curr_items, next_items) * 2 - 1
string interline2(line_len, ' ');
// first draw the flow-through bars in the line
for (size_t i = 0; i < curr_items; ++i)
line[i * 2] = '|';
// but then erase it for ghosts
for (set<size_t>::const_iterator i = curr_ghosts.begin();
i != curr_ghosts.end(); ++i)
line[(*i) * 2] = ' ';
// then the links
set<size_t> dots;
for (set<pair<size_t, size_t> >::const_iterator link = links.begin();
link != links.end(); ++link)
{
size_t i = link->first;
size_t j = link->second;
if (i == j)
interline[2 * i] = '|';
else
{
size_t start, end, dot;
if (j < i)
{
// | .---o
// |/| | |
// 0 1 2 3
// j i
// 0123456
// s e
start = 2 * j + 3;
end = 2 * i;
dot = start - 1;
interline[dot - 1] = '/';
}
else // j > i
{
// o---.
// | | |\|
// 0 1 2 3
// i j
// 0123456
// s e
start = 2 * i + 1;
end = 2 * j - 2;
dot = end;
interline[dot + 1] = '\\';
}
if (end > start)
{
dots.insert(dot);
for (size_t l = start; l < end; ++l)
line[l] = '-';
}
}
// prepare the proper continuation line
interline2[j * 2] = '|';
}
// add any dots (must do this in a second pass, so that things still work if
// there are cases like:
// | .-----.-o
// |/| | |/|
// where we want to make sure that the second dot overwrites the first -.
for (set<size_t>::const_iterator dot = dots.begin();
dot != dots.end(); ++dot)
line[*dot] = '.';
// and add the main attraction (may overwrite a '.').
line[curr_loc * 2] = 'o';
// split a multi-line annotation
vector<string> lines;
split_into_lines(annotation, lines);
int num_lines = lines.size();
if (num_lines < 1)
lines.push_back(string(""));
if (num_lines < 2)
lines.push_back(string(""));
// ignore empty lines at the end
while ((num_lines > 2) && (lines[num_lines - 1].empty()))
--num_lines;
// prints it out
//TODO convert line/interline/interline2 from ASCII to system charset
output << line << " " << lines[0] << '\n';
output << interline << " " << lines[1] << '\n';
for (int i = 2; i < num_lines; ++i)
output << interline2 << " " << lines[i] << '\n';
}
bool
asciik::try_draw(vector<revision_id> const & next_row,
size_t const curr_loc,
set<revision_id> const & parents,
string const & annotation) const
{
size_t curr_items = curr_row.size();
size_t next_items = next_row.size();
I(curr_loc < curr_items);
set<size_t> curr_ghosts;
for (size_t i = 0; i < curr_items; ++i)
if (idx(curr_row, i) == ghost)
curr_ghosts.insert(i);
set<pair<size_t, size_t> > preservation_links;
bool have_shift = false;
for (size_t i = 0; i < curr_items; ++i)
{
if (idx(curr_row, i) != ghost)
{
vector<revision_id>::const_iterator found =
find(next_row.begin(), next_row.end(), idx(curr_row, i));
if (found != next_row.end())
{
size_t j = distance(next_row.begin(), found);
size_t d = i>j ? i-j : j-i;
if (d > 1)
return false;
if (d != 0)
have_shift = true;
preservation_links.insert(pair<size_t, size_t>(i, j));
}
}
}
set<pair<size_t, size_t> > parent_links;
for (set<revision_id>::const_iterator p = parents.begin();
p != parents.end(); ++p)
if (*p != ghost)
{
size_t i = curr_loc;
size_t j = distance(next_row.begin(),
find(next_row.begin(), next_row.end(), *p));
I(j < next_items);
size_t d = i>j ? i-j : j-i;
if ((d > 1) && have_shift)
return false;
parent_links.insert(pair<size_t, size_t>(i, j));
}
set<size_t> preservation_crosses, parent_crosses, intersection_crosses;
links_cross(preservation_links, preservation_crosses);
links_cross(parent_links, parent_crosses);
set_intersection(
preservation_crosses.begin(), preservation_crosses.end(),
parent_crosses.begin(), parent_crosses.end(),
insert_iterator<set<size_t> >(intersection_crosses, intersection_crosses.begin()));
if (!intersection_crosses.empty())
return false;
set<pair<size_t, size_t> > links(preservation_links);
copy(parent_links.begin(), parent_links.end(),
insert_iterator<set<pair<size_t, size_t> > >(links, links.begin()));
draw(curr_items, next_items, curr_loc, links, curr_ghosts, annotation);
return true;
}
void
asciik::print(revision_id const & rev,
set<revision_id> const & parents,
string const & annotation)
{
if (find(curr_row.begin(), curr_row.end(), rev) == curr_row.end())
curr_row.push_back(rev);
size_t curr_loc = distance(curr_row.begin(),
find(curr_row.begin(), curr_row.end(), rev));
// it must be found as either it was there already or we just added it
I(curr_loc < curr_row.size());
set<revision_id> new_revs;
for (set<revision_id>::const_iterator parent = parents.begin();
parent != parents.end(); ++parent)
if (find(curr_row.begin(), curr_row.end(), *parent) == curr_row.end())
new_revs.insert(*parent);
vector<revision_id> next_row(curr_row);
I(curr_loc < next_row.size());
next_row.insert(
next_row.erase(next_row.begin() + curr_loc),
new_revs.begin(), new_revs.end());
// now next_row contains exactly the revisions it needs to, except that no
// ghost handling has been done.
vector<revision_id> no_ghost(next_row);
vector<revision_id>::iterator first_ghost = find(no_ghost.begin(),
no_ghost.end(), ghost);
if (first_ghost != no_ghost.end())
no_ghost.erase(first_ghost);
if (try_draw(no_ghost, curr_loc, parents, annotation))
curr_row = no_ghost;
else if (try_draw(next_row, curr_loc, parents, annotation))
curr_row = next_row;
else if (new_revs.empty()) // this line has disappeared
{
vector<revision_id> extra_ghost(next_row);
I(curr_loc < extra_ghost.size());
extra_ghost.insert(extra_ghost.begin() + curr_loc, ghost);
I(try_draw(extra_ghost, curr_loc, parents, annotation));
curr_row = extra_ghost;
}
}
CMD(asciik, "asciik", "", CMD_REF(debug), N_("SELECTOR"),
N_("Prints an ASCII representation of the revisions' graph"),
"",
options::opts::none)
{
N(args.size() == 1,
F("wrong argument count"));
set<revision_id> revs;
database db(app);
project_t project(db);
complete(app.opts, app.lua, project, idx(args, 0)(), revs);
vector<revision_id> sorted;
toposort(db, revs, sorted);
reverse(sorted.begin(), sorted.end());
asciik graph(std::cout, 10);
for (vector<revision_id>::const_iterator rev = sorted.begin();
rev != sorted.end(); ++rev)
{
set<revision_id> parents;
db.get_revision_parents(*rev, parents);
parents.erase(ghost); // remove the fake parent that root nodes have
graph.print(*rev, parents, encode_hexenc(rev->inner()()));
}
}