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
|
#define _XOPEN_SOURCE /* glibc2 needs this */
#include <time.h>
#include <ctype.h>
#include "cache.h"
/*
* The low 16 bits of the "flags" field shows whether
* a commit is part of the path to the root for that
* parent.
*
* Bit 16 is an internal flag that we've seen the
* definition for this rev, and not just seen it as
* a parent target.
*/
#define MAX_COMMITS (16)
#define marked(rev) ((rev)->flags & 0xffff)
#define SEEN 0x10000
static int show_edges = 0;
static int basemask = 0;
struct parent {
struct revision *parent;
struct parent *next;
};
struct revision {
unsigned int flags;
unsigned char sha1[20];
unsigned long date;
struct parent *parent;
};
static struct revision **revs;
static int nr_revs, rev_allocs;
static int find_rev(unsigned char *sha1)
{
int first = 0, last = nr_revs;
while (first < last) {
int next = (first + last) / 2;
struct revision *rev = revs[next];
int cmp;
cmp = memcmp(sha1, rev->sha1, 20);
if (!cmp)
return next;
if (cmp < 0) {
last = next;
continue;
}
first = next+1;
}
return -first-1;
}
static struct revision *lookup_rev(unsigned char *sha1)
{
int pos = find_rev(sha1);
struct revision *n;
if (pos >= 0)
return revs[pos];
pos = -pos-1;
if (rev_allocs == nr_revs) {
rev_allocs = alloc_nr(rev_allocs);
revs = realloc(revs, rev_allocs * sizeof(struct revision *));
}
n = malloc(sizeof(struct revision));
n->flags = 0;
memcpy(n->sha1, sha1, 20);
n->parent = NULL;
/* Insert it into the right place */
memmove(revs + pos + 1, revs + pos, (nr_revs - pos) * sizeof(struct revision *));
revs[pos] = n;
nr_revs++;
return n;
}
static int add_relationship(struct revision *rev, unsigned char *parent_sha)
{
struct revision *parent_rev = lookup_rev(parent_sha);
struct parent **pp = &rev->parent, *p;
while ((p = *pp) != NULL) {
if (p->parent == parent_rev)
return 0;
pp = &p->next;
}
p = malloc(sizeof(*p));
p->parent = parent_rev;
p->next = NULL;
*pp = p;
return 1;
}
static unsigned long parse_time(const char *buf)
{
char c, *p;
char buffer[100];
struct tm tm;
const char *formats[] = {
"%c",
"%a %b %d %T %y",
NULL
};
const char **fmt = formats;
p = buffer;
while (isspace(c = *buf))
buf++;
while ((c = *buf++) != '\n')
*p++ = c;
*p++ = 0;
buf = buffer;
memset(&tm, 0, sizeof(tm));
do {
const char *next = strptime(buf, *fmt, &tm);
fmt++;
if (next) {
if (!*next)
return mktime(&tm);
buf = next;
}
} while (*buf && *fmt);
return mktime(&tm);
}
static unsigned long parse_commit_date(const char *buf)
{
if (memcmp(buf, "author", 6))
return 0;
while (*buf++ != '\n')
/* nada */;
if (memcmp(buf, "committer", 9))
return 0;
while (*buf++ != '>')
/* nada */;
return parse_time(buf);
}
static int parse_commit(unsigned char *sha1)
{
struct revision *rev = lookup_rev(sha1);
if (!(rev->flags & SEEN)) {
void *buffer, *bufptr;
unsigned long size;
char type[20];
unsigned char parent[20];
rev->flags |= SEEN;
buffer = bufptr = read_sha1_file(sha1, type, &size);
if (!buffer || strcmp(type, "commit"))
return -1;
bufptr += 46; /* "tree " + "hex sha1" + "\n" */
while (!memcmp(bufptr, "parent ", 7) && !get_sha1_hex(bufptr+7, parent)) {
add_relationship(rev, parent);
parse_commit(parent);
bufptr += 48; /* "parent " + "hex sha1" + "\n" */
}
rev->date = parse_commit_date(bufptr);
free(buffer);
}
return 0;
}
static void read_cache_file(const char *path)
{
FILE *file = fopen(path, "r");
char line[500];
if (!file)
die("bad revtree cache file (%s)", path);
while (fgets(line, sizeof(line), file)) {
unsigned long date;
unsigned char sha1[20];
struct revision *rev;
const char *buf;
if (sscanf(line, "%lu", &date) != 1)
break;
buf = strchr(line, ' ');
if (!buf)
break;
if (get_sha1_hex(buf+1, sha1))
break;
rev = lookup_rev(sha1);
rev->flags |= SEEN;
rev->date = date;
/* parents? */
while ((buf = strchr(buf+1, ' ')) != NULL) {
unsigned char parent[20];
if (get_sha1_hex(buf + 1, parent))
break;
add_relationship(rev, parent);
}
}
fclose(file);
}
static void mark_sha1_path(struct revision *rev, unsigned int mask)
{
struct parent *p;
if (rev->flags & mask)
return;
rev->flags |= mask;
p = rev->parent;
while (p) {
mark_sha1_path(p->parent, mask);
p = p->next;
}
}
/*
* Some revisions are less interesting than others.
*
* For example, if we use a cache-file, that one may contain
* revisions that were never used. They are never interesting.
*
* And sometimes we're only interested in "edge" commits, ie
* places where the marking changes between parent and child.
*/
static int interesting(struct revision *rev)
{
unsigned mask = marked(rev);
if (!mask)
return 0;
if (show_edges) {
struct parent *p = rev->parent;
while (p) {
if (mask != marked(p->parent))
return 1;
p = p->next;
}
return 0;
}
if (mask & basemask)
return 0;
return 1;
}
/*
* Usage: rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]
*
* The cache-file can be quite important for big trees. This is an
* expensive operation if you have to walk the whole chain of
* parents in a tree with a long revision history.
*/
int main(int argc, char **argv)
{
int i;
int nr = 0;
unsigned char sha1[MAX_COMMITS][20];
/*
* First - pick up all the revisions we can (both from
* caches and from commit file chains).
*/
for (i = 1; i < argc ; i++) {
char *arg = argv[i];
if (!strcmp(arg, "--cache")) {
read_cache_file(argv[2]);
i++;
continue;
}
if (!strcmp(arg, "--edges")) {
show_edges = 1;
continue;
}
if (arg[0] == '^') {
arg++;
basemask |= 1<<nr;
}
if (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr]))
usage("rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
parse_commit(sha1[nr]);
nr++;
}
/*
* Now we have the maximal tree. Walk the different sha files back to the root.
*/
for (i = 0; i < nr; i++)
mark_sha1_path(lookup_rev(sha1[i]), 1 << i);
/*
* Now print out the results..
*/
for (i = 0; i < nr_revs; i++) {
struct revision *rev = revs[i];
struct parent *p;
if (!interesting(rev))
continue;
printf("%lu %s:%d", rev->date, sha1_to_hex(rev->sha1), marked(rev));
p = rev->parent;
while (p) {
printf(" %s:%d", sha1_to_hex(p->parent->sha1), marked(p->parent));
p = p->next;
}
printf("\n");
}
return 0;
}
|