summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h2
-rw-r--r--cgitrc7
-rw-r--r--shared.c5
-rw-r--r--ui-shared.c17
4 files changed, 31 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index ab0efeb..f223dbc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -70,16 +70,17 @@ struct repoinfo {
70 char *name; 70 char *name;
71 char *path; 71 char *path;
72 char *desc; 72 char *desc;
73 char *owner; 73 char *owner;
74 char *defbranch; 74 char *defbranch;
75 char *group; 75 char *group;
76 char *module_link; 76 char *module_link;
77 char *readme; 77 char *readme;
78 char *clone_url;
78 int snapshots; 79 int snapshots;
79 int enable_log_filecount; 80 int enable_log_filecount;
80 int enable_log_linecount; 81 int enable_log_linecount;
81}; 82};
82 83
83struct repolist { 84struct repolist {
84 int length; 85 int length;
85 int count; 86 int count;
@@ -135,16 +136,17 @@ extern char *cgit_index_info;
135extern char *cgit_logo_link; 136extern char *cgit_logo_link;
136extern char *cgit_module_link; 137extern char *cgit_module_link;
137extern char *cgit_agefile; 138extern char *cgit_agefile;
138extern char *cgit_virtual_root; 139extern char *cgit_virtual_root;
139extern char *cgit_script_name; 140extern char *cgit_script_name;
140extern char *cgit_cache_root; 141extern char *cgit_cache_root;
141extern char *cgit_repo_group; 142extern char *cgit_repo_group;
142extern char *cgit_robots; 143extern char *cgit_robots;
144extern char *cgit_clone_prefix;
143 145
144extern int cgit_nocache; 146extern int cgit_nocache;
145extern int cgit_snapshots; 147extern int cgit_snapshots;
146extern int cgit_enable_index_links; 148extern int cgit_enable_index_links;
147extern int cgit_enable_log_filecount; 149extern int cgit_enable_log_filecount;
148extern int cgit_enable_log_linecount; 150extern int cgit_enable_log_linecount;
149extern int cgit_max_lock_attempts; 151extern int cgit_max_lock_attempts;
150extern int cgit_cache_root_ttl; 152extern int cgit_cache_root_ttl;
diff --git a/cgitrc b/cgitrc
index 8c616e0..ce0c01b 100644
--- a/cgitrc
+++ b/cgitrc
@@ -111,16 +111,21 @@
111## Url loaded when clicking the logo 111## Url loaded when clicking the logo
112#logo-link=http://www.kernel.org/pub/software/scm/git/docs/ 112#logo-link=http://www.kernel.org/pub/software/scm/git/docs/
113 113
114 114
115## Url loaded when clicking a submodule link 115## Url loaded when clicking a submodule link
116#module-link=./?repo=%s&page=commit&id=%s 116#module-link=./?repo=%s&page=commit&id=%s
117 117
118 118
119## Shared prefix which, when combined with repo url, becomes the url used
120## to clone the repo
121#clone-prefix=
122
123
119## Number of chars shown of repo description (in repolist view) 124## Number of chars shown of repo description (in repolist view)
120#max-repodesc-length=60 125#max-repodesc-length=60
121 126
122 127
123## Number of chars shown of commit subject message (in log view) 128## Number of chars shown of commit subject message (in log view)
124#max-message-length=60 129#max-message-length=60
125 130
126 131
@@ -162,22 +167,24 @@
162 #repo.path=/pub/git/cgit ## this is the path to $GIT_DIR 167 #repo.path=/pub/git/cgit ## this is the path to $GIT_DIR
163#repo.owner=Lars Hjemli 168#repo.owner=Lars Hjemli
164 #repo.defbranch=master ## define a default branch 169 #repo.defbranch=master ## define a default branch
165 #repo.snapshots=tar.bz2 ## override a sitewide snapshot-setting 170 #repo.snapshots=tar.bz2 ## override a sitewide snapshot-setting
166 #repo.enable-log-filecount=0 ## override the default filecount setting 171 #repo.enable-log-filecount=0 ## override the default filecount setting
167 #repo.enable-log-linecount=0 ## override the default linecount setting 172 #repo.enable-log-linecount=0 ## override the default linecount setting
168 #repo.module-link=/git/%s/commit/?id=%s ## override the standard module-link 173 #repo.module-link=/git/%s/commit/?id=%s ## override the standard module-link
169 #repo.readme=info/web/readme ## specify a file to include on summary page 174 #repo.readme=info/web/readme ## specify a file to include on summary page
175#repo.clone-url=git://hjemli.net/pub/git/cgit
170 176
171## Additional repositories grouped under "mirrors" 177## Additional repositories grouped under "mirrors"
172#repo.group=mirrors 178#repo.group=mirrors
173 179
174#repo.url=git 180#repo.url=git
175#repo.path=/pub/git/git 181#repo.path=/pub/git/git
182#repo.clone-url=git://hjemli.net/pub/git/git
176# 183#
177#repo.url=linux 184#repo.url=linux
178#repo.path=/pub/git/linux 185#repo.path=/pub/git/linux
179 186
180## A group of private repositories (with a working directory) 187## A group of private repositories (with a working directory)
181#repo.group=private 188#repo.group=private
182 189
183#repo.url=larsh/cgit 190#repo.url=larsh/cgit
diff --git a/shared.c b/shared.c
index fd8b1e3..2c309f5 100644
--- a/shared.c
+++ b/shared.c
@@ -22,16 +22,17 @@ char *cgit_index_info = NULL;
22char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 22char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
23char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 23char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
24char *cgit_agefile = "info/web/last-modified"; 24char *cgit_agefile = "info/web/last-modified";
25char *cgit_virtual_root = NULL; 25char *cgit_virtual_root = NULL;
26char *cgit_script_name = CGIT_SCRIPT_NAME; 26char *cgit_script_name = CGIT_SCRIPT_NAME;
27char *cgit_cache_root = CGIT_CACHE_ROOT; 27char *cgit_cache_root = CGIT_CACHE_ROOT;
28char *cgit_repo_group = NULL; 28char *cgit_repo_group = NULL;
29char *cgit_robots = "index, nofollow"; 29char *cgit_robots = "index, nofollow";
30char *cgit_clone_prefix = NULL;
30 31
31int cgit_nocache = 0; 32int cgit_nocache = 0;
32int cgit_snapshots = 0; 33int cgit_snapshots = 0;
33int cgit_enable_index_links = 0; 34int cgit_enable_index_links = 0;
34int cgit_enable_log_filecount = 0; 35int cgit_enable_log_filecount = 0;
35int cgit_enable_log_linecount = 0; 36int cgit_enable_log_linecount = 0;
36int cgit_max_lock_attempts = 5; 37int cgit_max_lock_attempts = 5;
37int cgit_cache_root_ttl = 5; 38int cgit_cache_root_ttl = 5;
@@ -195,24 +196,28 @@ void cgit_global_config_cb(const char *name, const char *value)
195 else if (!strcmp(name, "summary-tags")) 196 else if (!strcmp(name, "summary-tags"))
196 cgit_summary_tags = atoi(value); 197 cgit_summary_tags = atoi(value);
197 else if (!strcmp(name, "agefile")) 198 else if (!strcmp(name, "agefile"))
198 cgit_agefile = xstrdup(value); 199 cgit_agefile = xstrdup(value);
199 else if (!strcmp(name, "renamelimit")) 200 else if (!strcmp(name, "renamelimit"))
200 cgit_renamelimit = atoi(value); 201 cgit_renamelimit = atoi(value);
201 else if (!strcmp(name, "robots")) 202 else if (!strcmp(name, "robots"))
202 cgit_robots = xstrdup(value); 203 cgit_robots = xstrdup(value);
204 else if (!strcmp(name, "clone-prefix"))
205 cgit_clone_prefix = xstrdup(value);
203 else if (!strcmp(name, "repo.group")) 206 else if (!strcmp(name, "repo.group"))
204 cgit_repo_group = xstrdup(value); 207 cgit_repo_group = xstrdup(value);
205 else if (!strcmp(name, "repo.url")) 208 else if (!strcmp(name, "repo.url"))
206 cgit_repo = add_repo(value); 209 cgit_repo = add_repo(value);
207 else if (!strcmp(name, "repo.name")) 210 else if (!strcmp(name, "repo.name"))
208 cgit_repo->name = xstrdup(value); 211 cgit_repo->name = xstrdup(value);
209 else if (cgit_repo && !strcmp(name, "repo.path")) 212 else if (cgit_repo && !strcmp(name, "repo.path"))
210 cgit_repo->path = trim_end(value, '/'); 213 cgit_repo->path = trim_end(value, '/');
214 else if (cgit_repo && !strcmp(name, "repo.clone-url"))
215 cgit_repo->clone_url = xstrdup(value);
211 else if (cgit_repo && !strcmp(name, "repo.desc")) 216 else if (cgit_repo && !strcmp(name, "repo.desc"))
212 cgit_repo->desc = xstrdup(value); 217 cgit_repo->desc = xstrdup(value);
213 else if (cgit_repo && !strcmp(name, "repo.owner")) 218 else if (cgit_repo && !strcmp(name, "repo.owner"))
214 cgit_repo->owner = xstrdup(value); 219 cgit_repo->owner = xstrdup(value);
215 else if (cgit_repo && !strcmp(name, "repo.defbranch")) 220 else if (cgit_repo && !strcmp(name, "repo.defbranch"))
216 cgit_repo->defbranch = xstrdup(value); 221 cgit_repo->defbranch = xstrdup(value);
217 else if (cgit_repo && !strcmp(name, "repo.snapshots")) 222 else if (cgit_repo && !strcmp(name, "repo.snapshots"))
218 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 223 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
diff --git a/ui-shared.c b/ui-shared.c
index 3e13c86..ece041c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -455,16 +455,17 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
455 html_hidden("q", cgit_query_search); 455 html_hidden("q", cgit_query_search);
456 } 456 }
457} 457}
458 458
459void cgit_print_pageheader(char *title, int show_search) 459void cgit_print_pageheader(char *title, int show_search)
460{ 460{
461 static const char *default_info = "This is cgit, a fast webinterface for git repositories"; 461 static const char *default_info = "This is cgit, a fast webinterface for git repositories";
462 int header = 0; 462 int header = 0;
463 char *url;
463 464
464 html("<table id='layout' summary=''>\n"); 465 html("<table id='layout' summary=''>\n");
465 html("<tr><td id='sidebar'>\n"); 466 html("<tr><td id='sidebar'>\n");
466 html("<table class='sidebar' cellspacing='0' summary=''>\n"); 467 html("<table class='sidebar' cellspacing='0' summary=''>\n");
467 html("<tr><td class='sidebar'>\n<a href='"); 468 html("<tr><td class='sidebar'>\n<a href='");
468 html_attr(cgit_rooturl()); 469 html_attr(cgit_rooturl());
469 htmlf("'><img src='%s' alt='cgit'/></a>\n", 470 htmlf("'><img src='%s' alt='cgit'/></a>\n",
470 cgit_logo); 471 cgit_logo);
@@ -487,16 +488,32 @@ void cgit_print_pageheader(char *title, int show_search)
487 cgit_query_sha1, NULL); 488 cgit_query_sha1, NULL);
488 cgit_commit_link("commit", NULL, "menu", cgit_query_head, 489 cgit_commit_link("commit", NULL, "menu", cgit_query_head,
489 cgit_query_sha1); 490 cgit_query_sha1);
490 cgit_diff_link("diff", NULL, "menu", cgit_query_head, 491 cgit_diff_link("diff", NULL, "menu", cgit_query_head,
491 cgit_query_sha1, cgit_query_sha2, NULL); 492 cgit_query_sha1, cgit_query_sha2, NULL);
492 493
493 for_each_ref(print_archive_ref, &header); 494 for_each_ref(print_archive_ref, &header);
494 495
496 if (cgit_repo->clone_url || cgit_clone_prefix) {
497 html("<h1>clone</h1>\n");
498 if (cgit_repo->clone_url)
499 url = cgit_repo->clone_url;
500 else
501 url = fmt("%s%s", cgit_clone_prefix,
502 cgit_repo->url);
503 html("<a class='menu' href='");
504 html_attr(url);
505 html("' title='");
506 html_attr(url);
507 html("'>\n");
508 html_txt(strrpart(url, 20));
509 html("</a>\n");
510 }
511
495 html("<h1>branch</h1>\n"); 512 html("<h1>branch</h1>\n");
496 html("<form method='get' action=''>\n"); 513 html("<form method='get' action=''>\n");
497 add_hidden_formfields(0, 1, cgit_query_page); 514 add_hidden_formfields(0, 1, cgit_query_page);
498 // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); 515 // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
499 html("<select name='h' onchange='this.form.submit();'>\n"); 516 html("<select name='h' onchange='this.form.submit();'>\n");
500 for_each_branch_ref(print_branch_option, cgit_query_head); 517 for_each_branch_ref(print_branch_option, cgit_query_head);
501 html("</select>\n"); 518 html("</select>\n");
502 // html("</td><td>"); 519 // html("</td><td>");