author | Johan Herland <johan@herland.net> | 2010-11-15 17:39:50 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-11-16 07:18:36 (UTC) |
commit | 9a8d39c668b98464bac97d4e5442966de63f97b2 (patch) (unidiff) | |
tree | ee1a7766d6d9365ae45f694939c20cab811abd84 /shared.c | |
parent | 5a36c2a291a00b59b8ec2f112453e117797c2fe5 (diff) | |
download | cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.zip cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.gz cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.bz2 |
ui-log: Implement support for commit graphs
Teach CGit to print an ASCII art commit graph to the left of the commit
message, similar to 'git log --graph'. The graph adds extra lines (table
rows) to the log when needed to add/remove/shuffle edges in the graph.
When 'showmsg' is enabled, the graph is automatically padded to account
for the extra lines added by the commit message/notes.
This feature is controlled by a new config variable: "enable-commit-graph"
(disabled by default), and individual repos can control it by setting
"repo.enable-commit-graph".
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,154 +1,155 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | struct cgit_repolist cgit_repolist; | 11 | struct cgit_repolist cgit_repolist; |
12 | struct cgit_context ctx; | 12 | struct cgit_context ctx; |
13 | 13 | ||
14 | int chk_zero(int result, char *msg) | 14 | int chk_zero(int result, char *msg) |
15 | { | 15 | { |
16 | if (result != 0) | 16 | if (result != 0) |
17 | die("%s: %s", msg, strerror(errno)); | 17 | die("%s: %s", msg, strerror(errno)); |
18 | return result; | 18 | return result; |
19 | } | 19 | } |
20 | 20 | ||
21 | int chk_positive(int result, char *msg) | 21 | int chk_positive(int result, char *msg) |
22 | { | 22 | { |
23 | if (result <= 0) | 23 | if (result <= 0) |
24 | die("%s: %s", msg, strerror(errno)); | 24 | die("%s: %s", msg, strerror(errno)); |
25 | return result; | 25 | return result; |
26 | } | 26 | } |
27 | 27 | ||
28 | int chk_non_negative(int result, char *msg) | 28 | int chk_non_negative(int result, char *msg) |
29 | { | 29 | { |
30 | if (result < 0) | 30 | if (result < 0) |
31 | die("%s: %s",msg, strerror(errno)); | 31 | die("%s: %s",msg, strerror(errno)); |
32 | return result; | 32 | return result; |
33 | } | 33 | } |
34 | 34 | ||
35 | struct cgit_repo *cgit_add_repo(const char *url) | 35 | struct cgit_repo *cgit_add_repo(const char *url) |
36 | { | 36 | { |
37 | struct cgit_repo *ret; | 37 | struct cgit_repo *ret; |
38 | 38 | ||
39 | if (++cgit_repolist.count > cgit_repolist.length) { | 39 | if (++cgit_repolist.count > cgit_repolist.length) { |
40 | if (cgit_repolist.length == 0) | 40 | if (cgit_repolist.length == 0) |
41 | cgit_repolist.length = 8; | 41 | cgit_repolist.length = 8; |
42 | else | 42 | else |
43 | cgit_repolist.length *= 2; | 43 | cgit_repolist.length *= 2; |
44 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 44 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
45 | cgit_repolist.length * | 45 | cgit_repolist.length * |
46 | sizeof(struct cgit_repo)); | 46 | sizeof(struct cgit_repo)); |
47 | } | 47 | } |
48 | 48 | ||
49 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 49 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
50 | memset(ret, 0, sizeof(struct cgit_repo)); | 50 | memset(ret, 0, sizeof(struct cgit_repo)); |
51 | ret->url = trim_end(url, '/'); | 51 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; | 52 | ret->name = ret->url; |
53 | ret->path = NULL; | 53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 55 | ret->owner = NULL; |
56 | ret->section = ctx.cfg.section; | 56 | ret->section = ctx.cfg.section; |
57 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_commit_graph = ctx.cfg.enable_commit_graph; | ||
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; | 62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
62 | ret->enable_subject_links = ctx.cfg.enable_subject_links; | 63 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
63 | ret->max_stats = ctx.cfg.max_stats; | 64 | ret->max_stats = ctx.cfg.max_stats; |
64 | ret->module_link = ctx.cfg.module_link; | 65 | ret->module_link = ctx.cfg.module_link; |
65 | ret->readme = ctx.cfg.readme; | 66 | ret->readme = ctx.cfg.readme; |
66 | ret->mtime = -1; | 67 | ret->mtime = -1; |
67 | ret->about_filter = ctx.cfg.about_filter; | 68 | ret->about_filter = ctx.cfg.about_filter; |
68 | ret->commit_filter = ctx.cfg.commit_filter; | 69 | ret->commit_filter = ctx.cfg.commit_filter; |
69 | ret->source_filter = ctx.cfg.source_filter; | 70 | ret->source_filter = ctx.cfg.source_filter; |
70 | return ret; | 71 | return ret; |
71 | } | 72 | } |
72 | 73 | ||
73 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 74 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
74 | { | 75 | { |
75 | int i; | 76 | int i; |
76 | struct cgit_repo *repo; | 77 | struct cgit_repo *repo; |
77 | 78 | ||
78 | for (i=0; i<cgit_repolist.count; i++) { | 79 | for (i=0; i<cgit_repolist.count; i++) { |
79 | repo = &cgit_repolist.repos[i]; | 80 | repo = &cgit_repolist.repos[i]; |
80 | if (!strcmp(repo->url, url)) | 81 | if (!strcmp(repo->url, url)) |
81 | return repo; | 82 | return repo; |
82 | } | 83 | } |
83 | return NULL; | 84 | return NULL; |
84 | } | 85 | } |
85 | 86 | ||
86 | void *cgit_free_commitinfo(struct commitinfo *info) | 87 | void *cgit_free_commitinfo(struct commitinfo *info) |
87 | { | 88 | { |
88 | free(info->author); | 89 | free(info->author); |
89 | free(info->author_email); | 90 | free(info->author_email); |
90 | free(info->committer); | 91 | free(info->committer); |
91 | free(info->committer_email); | 92 | free(info->committer_email); |
92 | free(info->subject); | 93 | free(info->subject); |
93 | free(info->msg); | 94 | free(info->msg); |
94 | free(info->msg_encoding); | 95 | free(info->msg_encoding); |
95 | free(info); | 96 | free(info); |
96 | return NULL; | 97 | return NULL; |
97 | } | 98 | } |
98 | 99 | ||
99 | char *trim_end(const char *str, char c) | 100 | char *trim_end(const char *str, char c) |
100 | { | 101 | { |
101 | int len; | 102 | int len; |
102 | char *s, *t; | 103 | char *s, *t; |
103 | 104 | ||
104 | if (str == NULL) | 105 | if (str == NULL) |
105 | return NULL; | 106 | return NULL; |
106 | t = (char *)str; | 107 | t = (char *)str; |
107 | len = strlen(t); | 108 | len = strlen(t); |
108 | while(len > 0 && t[len - 1] == c) | 109 | while(len > 0 && t[len - 1] == c) |
109 | len--; | 110 | len--; |
110 | 111 | ||
111 | if (len == 0) | 112 | if (len == 0) |
112 | return NULL; | 113 | return NULL; |
113 | 114 | ||
114 | c = t[len]; | 115 | c = t[len]; |
115 | t[len] = '\0'; | 116 | t[len] = '\0'; |
116 | s = xstrdup(t); | 117 | s = xstrdup(t); |
117 | t[len] = c; | 118 | t[len] = c; |
118 | return s; | 119 | return s; |
119 | } | 120 | } |
120 | 121 | ||
121 | char *strlpart(char *txt, int maxlen) | 122 | char *strlpart(char *txt, int maxlen) |
122 | { | 123 | { |
123 | char *result; | 124 | char *result; |
124 | 125 | ||
125 | if (!txt) | 126 | if (!txt) |
126 | return txt; | 127 | return txt; |
127 | 128 | ||
128 | if (strlen(txt) <= maxlen) | 129 | if (strlen(txt) <= maxlen) |
129 | return txt; | 130 | return txt; |
130 | result = xmalloc(maxlen + 1); | 131 | result = xmalloc(maxlen + 1); |
131 | memcpy(result, txt, maxlen - 3); | 132 | memcpy(result, txt, maxlen - 3); |
132 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; | 133 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
133 | result[maxlen] = '\0'; | 134 | result[maxlen] = '\0'; |
134 | return result; | 135 | return result; |
135 | } | 136 | } |
136 | 137 | ||
137 | char *strrpart(char *txt, int maxlen) | 138 | char *strrpart(char *txt, int maxlen) |
138 | { | 139 | { |
139 | char *result; | 140 | char *result; |
140 | 141 | ||
141 | if (!txt) | 142 | if (!txt) |
142 | return txt; | 143 | return txt; |
143 | 144 | ||
144 | if (strlen(txt) <= maxlen) | 145 | if (strlen(txt) <= maxlen) |
145 | return txt; | 146 | return txt; |
146 | result = xmalloc(maxlen + 1); | 147 | result = xmalloc(maxlen + 1); |
147 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); | 148 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
148 | result[0] = result[1] = result[2] = '.'; | 149 | result[0] = result[1] = result[2] = '.'; |
149 | return result; | 150 | return result; |
150 | } | 151 | } |
151 | 152 | ||
152 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) | 153 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
153 | { | 154 | { |
154 | size_t size; | 155 | size_t size; |