commit - b55e96cf8f2e45d9a12689ad41d08d426e9715a5
commit + f2f466625ca64c95f4249be661f2273846bc5bf1
blob - 061d498dcd0d4a2338910b2afb43e8529b25d132
blob + 5a78315457bb8b6d4d5c427e27a09ef1c03bfec5
--- gotweb/TODO
+++ gotweb/TODO
- Add Prev/Next to shortlogs/logs that have more entries than
got_max_commits_display
-- Alter gw_get_repo_log full_log int to type more logs output for other options,
- such as header displays for commit, commit_diff, etc.
-
-- Discuss how much of the gitweb functionality we really need or want. A user
- can really go down an endless rabbit hole. Is it all worthwhile?
-
- Redo index header, so columns are removed when content is set to not display
in gotweb.conf.
+
+- Massage ALL error returns. There are some examples in the code already, but
+ let's be consistent.
+
+- Integrate kcgi error codes. Hard fail or report error? Perhaps reporting is a
+ security flaw and hard fail is the better design.
blob - /dev/null
blob + 12819268eddbfa9b3a5d68d8897c937bb20f7cd4 (mode 644)
--- /dev/null
+++ gotweb/files/cgi-bin/gw_tmpl/blame.tmpl
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>@@title@@</title>
+ @@head@@
+ </head>
+ <body>
+ <div id="gw_body">
+ <div id="header">
+ @@header@@
+ </div>
+ <div id="site_path">
+ @@sitepath@@
+ @@search@@
+ </div>
+ <div id="content">
+ @@content@@
+ </div>
+ @@siteowner@@
+ </div>
+ </body>
+</html>
blob - /dev/null
blob + 12819268eddbfa9b3a5d68d8897c937bb20f7cd4 (mode 644)
--- /dev/null
+++ gotweb/files/cgi-bin/gw_tmpl/briefs.tmpl
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>@@title@@</title>
+ @@head@@
+ </head>
+ <body>
+ <div id="gw_body">
+ <div id="header">
+ @@header@@
+ </div>
+ <div id="site_path">
+ @@sitepath@@
+ @@search@@
+ </div>
+ <div id="content">
+ @@content@@
+ </div>
+ @@siteowner@@
+ </div>
+ </body>
+</html>
blob - 2922ef159120afa07a3dd281602a31b6479d5deb (mode 644)
blob + /dev/null
--- gotweb/files/cgi-bin/gw_tmpl/summary.tmpl
+++ /dev/null
-<!DOCTYPE html>
-<html>
- <head>
- <title>@@title@@</title>
- @@head@@
- </head>
- <body>
- <div id="gw_body">
- <div id="header">
- @@header@@
- </div>
- <div id="site_path">
- @@sitepath@@
- @@search@@
- </div>
- <div id="content">
- <div id="summary_wrapper">
- @@description@@
- @@repo_owner@@
- @@repo_age@@
- @@cloneurl@@
- </div>
- @@content@@
- </div>
- @@siteowner@@
- </div>
- </body>
-</html>
blob - /dev/null
blob + 12819268eddbfa9b3a5d68d8897c937bb20f7cd4 (mode 644)
--- /dev/null
+++ gotweb/files/cgi-bin/gw_tmpl/commit.tmpl
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>@@title@@</title>
+ @@head@@
+ </head>
+ <body>
+ <div id="gw_body">
+ <div id="header">
+ @@header@@
+ </div>
+ <div id="site_path">
+ @@sitepath@@
+ @@search@@
+ </div>
+ <div id="content">
+ @@content@@
+ </div>
+ @@siteowner@@
+ </div>
+ </body>
+</html>
blob - /dev/null
blob + 12819268eddbfa9b3a5d68d8897c937bb20f7cd4 (mode 644)
--- /dev/null
+++ gotweb/files/cgi-bin/gw_tmpl/diff.tmpl
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>@@title@@</title>
+ @@head@@
+ </head>
+ <body>
+ <div id="gw_body">
+ <div id="header">
+ @@header@@
+ </div>
+ <div id="site_path">
+ @@sitepath@@
+ @@search@@
+ </div>
+ <div id="content">
+ @@content@@
+ </div>
+ @@siteowner@@
+ </div>
+ </body>
+</html>
blob - /dev/null
blob + 12819268eddbfa9b3a5d68d8897c937bb20f7cd4 (mode 644)
--- /dev/null
+++ gotweb/files/cgi-bin/gw_tmpl/summry.tmpl
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>@@title@@</title>
+ @@head@@
+ </head>
+ <body>
+ <div id="gw_body">
+ <div id="header">
+ @@header@@
+ </div>
+ <div id="site_path">
+ @@sitepath@@
+ @@search@@
+ </div>
+ <div id="content">
+ @@content@@
+ </div>
+ @@siteowner@@
+ </div>
+ </body>
+</html>
blob - /dev/null
blob + 12819268eddbfa9b3a5d68d8897c937bb20f7cd4 (mode 644)
--- /dev/null
+++ gotweb/files/cgi-bin/gw_tmpl/tree.tmpl
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>@@title@@</title>
+ @@head@@
+ </head>
+ <body>
+ <div id="gw_body">
+ <div id="header">
+ @@header@@
+ </div>
+ <div id="site_path">
+ @@sitepath@@
+ @@search@@
+ </div>
+ <div id="content">
+ @@content@@
+ </div>
+ @@siteowner@@
+ </div>
+ </body>
+</html>
blob - b78b527080051a7069ad50a643490667f4c6e85b
blob + 50767cbb8c3d1ae022dc0a8f4ccd34de2a9f98f2
--- gotweb/files/htdocs/gotweb/gotweb.css
+++ gotweb/files/htdocs/gotweb/gotweb.css
padding-bottom: 5px;
overflow: auto;
}
-#logbriefs_wrapper {
+
+/* headers */
+
+#header_commit_title {
clear: left;
float: left;
- width: 100%;
-}
-#logbriefs_age {
+ width: 6.5em;
padding-left: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
- float: left;
- width: 7.5em;
- overflow: auto;
+ padding-top: 2px;
+ padding-bottom: 2px;
}
-#logbriefs_author {
+#header_commit {
float: left;
- padding-top: 5px;
- padding-bottom: 5px;
- width: 8.5em;
- font-style: italic;
- overflow: auto;
-}
-#logbriefs_log {
- float: left;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
- width: 65%;
-}
-#tags_wrapper {
- clear: left;
- float: left;
- width: 100%;
-}
-#tags_age {
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
- float: left;
- width: 7.5em;
- overflow: auto;
+ width: 72%;
+ padding-top: 2px;
+ padding-bottom: 2px;
}
-#tag {
- float: left;
- width: 8.5em;
- font-style: italic;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-#tag_name {
- float: left;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-#heads_wrapper {
+#header_diff_title {
clear: left;
float: left;
- width: 100%;
-}
-#heads_age {
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
- float: left;
- width: 7.5em;
- overflow: auto;
-}
-#head {
- float: left;
- padding-right: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-#commit_commit_title {
- clear: left;
- float: left;
width: 6.5em;
padding-left: 10px;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_commit {
+#header_diff {
float: left;
width: 72%;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_diff_title {
+#header_author_title {
clear: left;
float: left;
width: 6.5em;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_diff {
+#header_author {
float: left;
width: 72%;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_author_title {
+#header_committer_title {
clear: left;
float: left;
width: 6.5em;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_author {
+#header_committer {
float: left;
width: 72%;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_committer_title {
+#header_age_title {
clear: left;
float: left;
width: 6.5em;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_committer {
+#header_age {
float: left;
width: 72%;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_age_title {
+#header_commit_msg_title {
clear: left;
float: left;
width: 6.5em;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_age {
+#header_commit_msg {
float: left;
width: 72%;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_log_title {
+#header_tree_title {
clear: left;
float: left;
width: 6.5em;
padding-top: 2px;
padding-bottom: 2px;
}
-#commit_log {
+#header_tree {
float: left;
width: 72%;
padding-top: 2px;
padding-bottom: 2px;
}
+/* tags.tmpl */
+
+#tags_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+}
+#tags_age {
+ padding-left: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ float: left;
+ width: 7.5em;
+ overflow: auto;
+}
+#tag {
+ float: left;
+ width: 8.5em;
+ font-style: italic;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+#tag_name {
+ float: left;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+/* heads.tmpl */
+
+#heads_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+}
+#heads_age {
+ padding-left: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ float: left;
+ width: 7.5em;
+ overflow: auto;
+}
+#head {
+ float: left;
+ padding-right: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+/* briefs.tmpl */
+
+#briefs_title_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+ background-color: LightSlateGray;
+ color: #ffffff;
+}
+#briefs_title {
+ padding-left: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+#briefs_content {
+ clear: left;
+ float: left;
+ width: 100%;
+}
+#briefs_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+}
+#briefs_age {
+ padding-left: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ float: left;
+ width: 7.5em;
+ overflow: auto;
+}
+#briefs_author {
+ float: left;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ width: 8.5em;
+ font-style: italic;
+ overflow: auto;
+}
+#briefs_log {
+ float: left;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ width: 65%;
+}
/* index.tmpl */
#index_header {
text-decoration: none;
}
-/* logs.tmpl */
+/* commit.tmpl */
-#logs_title_wrapper {
+#commits_title_wrapper {
clear: left;
float: left;
width: 100%;
background-color: LightSlateGray;
color: #ffffff;
}
-#logs_title {
+#commits_title {
padding-left: 10px;
padding-top: 5px;
padding-bottom: 5px;
}
-#logs_content {
+#commits_content {
clear: left;
float: left;
width: 100%;
}
-#logs_row_wrapper {
+#commits_line_wrapper {
clear: left;
float: left;
background-color: #f5fcfb;
padding-bottom: 3px;
width: 100%;
}
-#log {
+#commit {
clear: left;
float: left;
padding-left: 20px;
padding-bottom: 20px;
}
-/* tag.tmpl */
+/* blame.tmpl */
-#log_tag_title_wrapper {
+#blame_title_wrapper {
clear: left;
float: left;
width: 100%;
background-color: LightSlateGray;
color: #ffffff;
}
-#log_tag_title {
+#blame_title {
padding-left: 10px;
padding-top: 5px;
padding-bottom: 5px;
}
-#log_tag_content {
+#blame_content {
clear: left;
float: left;
width: 100%;
}
-#log_tag_row_wrapper {
- clear: left;
+#blame_header_wrapper {
float: left;
background-color: #f5fcfb;
width: 100%;
}
-#log_tag_commit {
- clear: left;
+#blame_header {
float: left;
padding-left: 10px;
padding-top: 5px;
padding-bottom: 2px;
-}
-#log_tag {
- clear: left;
- float: left;
- padding: 20px;
- font-family: monospace;
-}
-
-/* blame.tmpl */
-
-#log_blame_title_wrapper {
- clear: left;
- float: left;
width: 100%;
- background-color: LightSlateGray;
- color: #ffffff;
}
-#log_blame_title {
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-#log_blame_content {
+#blame {
clear: left;
float: left;
- width: 100%;
-}
-#log_blame_row_wrapper {
- clear: left;
- float: left;
- background-color: #f5fcfb;
- width: 100%;
-}
-#log_blame_commit {
- clear: left;
- float: left;
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom: 2px;
-}
-#log_blame {
- clear: left;
- float: left;
padding: 20px;
font-family: monospace;
white-space: pre;
/* tree.tmpl */
-#log_tree_title_wrapper {
+#tree_title_wrapper {
clear: left;
float: left;
width: 100%;
background-color: LightSlateGray;
color: #ffffff;
}
-#log_tree_title {
+#tree_title {
padding-left: 10px;
padding-top: 5px;
padding-bottom: 5px;
}
-#log_tree_content {
+#tree_content {
clear: left;
float: left;
width: 100%;
}
-#log_tree_row_wrapper {
+#tree_header_wrapper {
clear: left;
float: left;
background-color: #f5fcfb;
width: 100%;
}
-#log_tree_commit {
- clear: left;
+#tree_header {
float: left;
padding-left: 10px;
padding-top: 5px;
padding-bottom: 2px;
+ width: 100%;
}
-#log_tree {
+#tree {
clear: left;
float: left;
padding: 20px;
float: left;
width: 100%;
}
-#tree_id {
- float: left;
- padding: 2px;
-}
-#tree {
+#tree_line {
+ clear: left;
float:left ;
- padding: 2px;
}
-/* commit.tmpl */
+/* diff.tmpl */
-#log_commit_title_wrapper {
+#diff_title_wrapper {
clear: left;
float: left;
width: 100%;
background-color: LightSlateGray;
color: #ffffff;
}
-#log_commit_title {
+#diff_title {
padding-left: 10px;
padding-top: 5px;
padding-bottom: 5px;
}
-#log_commit_content {
+#diff_content {
clear: left;
float: left;
width: 100%;
}
-#log_commit_row_wrapper {
- clear: left;
+#diff_header_wrapper {
float: left;
background-color: #f5fcfb;
width: 100%;
}
-#log_commit_commit {
- clear: left;
+#diff_header {
float: left;
padding-left: 10px;
padding-top: 5px;
padding-bottom: 2px;
-}
-#log_commit {
- clear: left;
- float: left;
- padding: 20px;
- font-family: monospace;
-}
-
-/* diff.tmpl */
-
-#log_diff_title_wrapper {
- clear: left;
- float: left;
width: 100%;
- background-color: LightSlateGray;
- color: #ffffff;
}
-#log_diff_title {
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-#log_diff_content {
+#diff {
clear: left;
float: left;
- width: 100%;
-}
-#log_diff_row_wrapper {
- clear: left;
- float: left;
- background-color: #f5fcfb;
- width: 100%;
-}
-#log_commit_diff {
- clear: left;
- float: left;
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom: 2px;
-}
-#log_diff {
- clear: left;
- float: left;
padding: 20px;
font-family: monospace;
white-space: pre;
width: 100%;
background-color: Khaki;
}
-#summary_logbriefs_title_wrapper {
- clear: left;
- float: left;
- width: 100%;
- background-color: LightSlateGray;
- color: #ffffff;
-}
-#summary_logbriefs_title {
- padding-left: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-#summary_logbriefs_content {
- clear: left;
- float: left;
- width: 100%;
-}
#summary_tags_title_wrapper {
clear: left;
float: left;
blob - 17c61bdce7ae4cbd8d57f579ad89242e6fe20c86
blob + 9dc9e730b712fe27175cafce0e6b8b4565dddcca
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
#endif
struct gw_trans {
- TAILQ_HEAD(dirs, gw_dir) gw_dirs;
+ TAILQ_HEAD(headers, gw_header) gw_headers;
+ TAILQ_HEAD(dirs, gw_dir) gw_dirs;
struct gw_dir *gw_dir;
struct gotweb_conf *gw_conf;
struct ktemplate *gw_tmpl;
enum kmime mime;
};
-enum gw_key {
- KEY_ACTION,
- KEY_COMMIT_ID,
- KEY_FILE,
- KEY_FOLDER,
- KEY_HEADREF,
- KEY_PAGE,
- KEY_PATH,
- KEY__ZMAX
+struct gw_header {
+ TAILQ_ENTRY(gw_header) entry;
+ struct got_repository *repo;
+ struct got_reflist_head refs;
+ struct got_commit_object *commit;
+ struct got_object_id *id;
+ char *path;
+
+ char *refs_str;
+ char *commit_id; /* id_str1 */
+ char *parent_id; /* id_str2 */
+ char *tree_id;
+ char *author;
+ char *committer;
+ char *commit_msg;
+ time_t committer_time;
};
struct gw_dir {
char *path;
};
+enum gw_key {
+ KEY_ACTION,
+ KEY_COMMIT_ID,
+ KEY_FILE,
+ KEY_FOLDER,
+ KEY_HEADREF,
+ KEY_PAGE,
+ KEY_PATH,
+ KEY__ZMAX
+};
+
enum gw_tmpl {
+ TEMPL_CONTENT,
TEMPL_HEAD,
TEMPL_HEADER,
+ TEMPL_SEARCH,
TEMPL_SITEPATH,
TEMPL_SITEOWNER,
TEMPL_TITLE,
- TEMPL_SEARCH,
- TEMPL_CONTENT,
TEMPL__MAX
};
TM_LONG,
};
-enum gw_logs {
- LOGBRIEF,
- LOGCOMMIT,
- LOGFULL,
- LOGTREE,
- LOGDIFF,
- LOGBLAME,
- LOGTAG,
-};
-
enum gw_tags {
TAGBRIEF,
TAGFULL,
};
static const char *const gw_templs[TEMPL__MAX] = {
+ "content",
"head",
"header",
+ "search",
"sitepath",
"siteowner",
"title",
- "search",
- "content",
};
static const struct kvalid gw_keys[KEY__ZMAX] = {
};
static struct gw_dir *gw_init_gw_dir(char *);
+static struct gw_header *gw_init_header(void);
static char *gw_get_repo_description(struct gw_trans *,
char *);
static char *gw_get_time_str(time_t, int);
static char *gw_get_repo_age(struct gw_trans *,
char *, char *, int);
-static char *gw_get_repo_log(struct gw_trans *,
- const char *, char *, int, int);
-static char *gw_get_file_blame(struct gw_trans *, char *);
-static char *gw_get_repo_tree(struct gw_trans *, char *);
-static char *gw_get_repo_diff(struct gw_trans *, char *,
- char *);
+static char *gw_get_file_blame(struct gw_trans *);
+static char *gw_get_repo_tree(struct gw_trans *);
+static char *gw_get_diff(struct gw_trans *,
+ struct gw_header *);
static char *gw_get_repo_tags(struct gw_trans *, int, int);
static char *gw_get_repo_heads(struct gw_trans *);
static char *gw_get_clone_url(struct gw_trans *, char *);
static char *gw_html_escape(const char *);
static char *gw_colordiff_line(char *);
+static char *gw_gen_commit_header(char *, char*);
+static char *gw_gen_diff_header(char *, char*);
+static char *gw_gen_author_header(char *);
+static char *gw_gen_committer_header(char *);
+static char *gw_gen_age_header(char *);
+static char *gw_gen_commit_msg_header(char *);
+static char *gw_gen_tree_header(char *);
+
+static void gw_free_headers(struct gw_header *);
static void gw_display_open(struct gw_trans *, enum khttp,
enum kmime);
static void gw_display_index(struct gw_trans *,
static int gw_template(size_t, void *);
+static const struct got_error* gw_get_header(struct gw_trans *,
+ struct gw_header *, int);
+static const struct got_error* gw_get_commits(struct gw_trans *,
+ struct gw_header *, int);
+static const struct got_error* gw_get_commit(struct gw_trans *,
+ struct gw_header *);
static const struct got_error* gw_apply_unveil(const char *, const char *);
static const struct got_error* gw_blame_cb(void *, int, int,
struct got_object_id *);
static const struct got_error* gw_load_got_path(struct gw_trans *,
struct gw_dir *);
static const struct got_error* gw_parse_querystring(struct gw_trans *);
-static const struct got_error* gw_match_logmsg(int *, struct got_object_id *,
- struct got_commit_object *, regex_t *);
static const struct got_error* gw_blame(struct gw_trans *);
-static const struct got_error* gw_commit(struct gw_trans *);
-static const struct got_error* gw_commitdiff(struct gw_trans *);
+static const struct got_error* gw_diff(struct gw_trans *);
static const struct got_error* gw_index(struct gw_trans *);
-static const struct got_error* gw_log(struct gw_trans *);
-static const struct got_error* gw_raw(struct gw_trans *);
-static const struct got_error* gw_logbriefs(struct gw_trans *);
+static const struct got_error* gw_commits(struct gw_trans *);
+static const struct got_error* gw_briefs(struct gw_trans *);
static const struct got_error* gw_summary(struct gw_trans *);
-static const struct got_error* gw_tag(struct gw_trans *);
static const struct got_error* gw_tree(struct gw_trans *);
struct gw_query_action {
enum gw_query_actions {
GW_BLAME,
- GW_COMMIT,
- GW_COMMITDIFF,
+ GW_BRIEFS,
+ GW_COMMITS,
+ GW_DIFF,
GW_ERR,
GW_INDEX,
- GW_LOG,
- GW_RAW,
- GW_LOGBRIEFS,
GW_SUMMARY,
- GW_TAG,
GW_TREE,
};
static struct gw_query_action gw_query_funcs[] = {
- { GW_BLAME, "blame", gw_blame, "gw_tmpl/index.tmpl" },
- { GW_COMMIT, "commit", gw_commit, "gw_tmpl/index.tmpl" },
- { GW_COMMITDIFF, "commitdiff", gw_commitdiff, "gw_tmpl/index.tmpl" },
- { GW_ERR, NULL, NULL, "gw_tmpl/index.tmpl" },
- { GW_INDEX, "index", gw_index, "gw_tmpl/index.tmpl" },
- { GW_LOG, "log", gw_log, "gw_tmpl/index.tmpl" },
- { GW_RAW, "raw", gw_raw, "gw_tmpl/index.tmpl" },
- { GW_LOGBRIEFS, "logbriefs", gw_logbriefs, "gw_tmpl/index.tmpl" },
- { GW_SUMMARY, "summary", gw_summary, "gw_tmpl/index.tmpl" },
- { GW_TAG, "tag", gw_tag, "gw_tmpl/index.tmpl" },
- { GW_TREE, "tree", gw_tree, "gw_tmpl/index.tmpl" },
+ { GW_BLAME, "blame", gw_blame, "gw_tmpl/blame.tmpl" },
+ { GW_BRIEFS, "briefs", gw_briefs, "gw_tmpl/briefs.tmpl" },
+ { GW_COMMITS, "commits", gw_commits, "gw_tmpl/commit.tmpl" },
+ { GW_DIFF, "diff", gw_diff, "gw_tmpl/diff.tmpl" },
+ { GW_ERR, NULL, NULL, "gw_tmpl/err.tmpl" },
+ { GW_INDEX, "index", gw_index, "gw_tmpl/index.tmpl" },
+ { GW_SUMMARY, "summary", gw_summary, "gw_tmpl/summry.tmpl" },
+ { GW_TREE, "tree", gw_tree, "gw_tmpl/tree.tmpl" },
};
static const struct got_error *
gw_blame(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
+ struct gw_header *header = NULL;
+ char *blame = NULL, *blame_html = NULL, *blame_html_disp = NULL;
- char *log, *log_html;
-
if (pledge("stdio rpath wpath cpath proc exec sendfd unveil",
- NULL) == -1) {
- error = got_error_from_errno("pledge");
- return error;
- }
+ NULL) == -1)
+ return got_error_from_errno("pledge");
+ if ((header = gw_init_header()) == NULL)
+ return got_error_from_errno("malloc");
+
error = gw_apply_unveil(gw_trans->gw_dir->path, NULL);
if (error)
return error;
- log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit, 1, LOGBLAME);
+ error = gw_get_header(gw_trans, header, 1);
+ if (error)
+ return error;
- if (log != NULL && strcmp(log, "") != 0) {
- if ((asprintf(&log_html, log_blame, log)) == -1)
- return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, log_html);
- free(log_html);
- free(log);
- }
+ blame_html = gw_get_file_blame(gw_trans);
+
+ if (blame_html == NULL)
+ blame_html = strdup("");
+
+ if ((asprintf(&blame_html_disp, blame_header,
+ gw_gen_age_header(gw_get_time_str(header->committer_time, TM_LONG)),
+ gw_gen_commit_msg_header(gw_html_escape(header->commit_msg)),
+ blame_html)) == -1)
+ return got_error_from_errno("asprintf");
+
+ if ((asprintf(&blame, blame_wrapper, blame_html_disp)) == -1)
+ return got_error_from_errno("asprintf");
+
+ khttp_puts(gw_trans->gw_req, blame);
+ got_ref_list_free(&header->refs);
+ gw_free_headers(header);
+ free(blame_html_disp);
+ free(blame_html);
+ free(blame);
return error;
}
static const struct got_error *
-gw_commit(struct gw_trans *gw_trans)
+gw_diff(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
- char *log, *log_html;
+ struct gw_header *header = NULL;
+ char *diff = NULL, *diff_html = NULL, *diff_html_disp = NULL;
- if (pledge("stdio rpath proc exec sendfd unveil",
- NULL) == -1) {
- error = got_error_from_errno("pledge");
- return error;
- }
+ if (pledge("stdio rpath wpath cpath proc exec sendfd unveil",
+ NULL) == -1)
+ return got_error_from_errno("pledge");
+ if ((header = malloc(sizeof(struct gw_header))) == NULL)
+ return got_error_from_errno("malloc");
+
error = gw_apply_unveil(gw_trans->gw_dir->path, NULL);
if (error)
return error;
- log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit, 1, LOGCOMMIT);
-
- if (log != NULL && strcmp(log, "") != 0) {
- if ((asprintf(&log_html, log_commit, log)) == -1)
- return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, log_html);
- free(log_html);
- free(log);
- }
- return error;
-}
+ error = gw_get_header(gw_trans, header, 1);
+ if (error)
+ return error;
-static const struct got_error *
-gw_commitdiff(struct gw_trans *gw_trans)
-{
- const struct got_error *error = NULL;
- char *log, *log_html;
+ diff_html = gw_get_diff(gw_trans, header);
- if (pledge("stdio rpath wpath cpath proc exec sendfd unveil",
- NULL) == -1) {
- error = got_error_from_errno("pledge");
- return error;
- }
+ if (diff_html == NULL)
+ diff_html = strdup("");
- error = gw_apply_unveil(gw_trans->gw_dir->path, NULL);
- if (error)
- return error;
+ if ((asprintf(&diff_html_disp, diff_header,
+ gw_gen_diff_header(header->commit_id, header->parent_id),
+ gw_gen_commit_header(header->commit_id, header->refs_str),
+ gw_gen_tree_header(header->tree_id),
+ gw_gen_author_header(header->author),
+ gw_gen_committer_header(header->committer),
+ gw_gen_age_header(gw_get_time_str(header->committer_time, TM_LONG)),
+ gw_gen_commit_msg_header(gw_html_escape(header->commit_msg)),
+ diff_html)) == -1)
+ return got_error_from_errno("asprintf");
- log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit, 1, LOGDIFF);
+ if ((asprintf(&diff, diff_wrapper, diff_html_disp)) == -1)
+ return got_error_from_errno("asprintf");
- if (log != NULL && strcmp(log, "") != 0) {
- if ((asprintf(&log_html, log_diff, log)) == -1)
- return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, log_html);
- free(log_html);
- free(log);
- }
+ khttp_puts(gw_trans->gw_req, diff);
+ got_ref_list_free(&header->refs);
+ gw_free_headers(header);
+ free(diff_html_disp);
+ free(diff_html);
+ free(diff);
return error;
}
}
prev_disp++;
+
+ if (error)
+ return error;
if((asprintf(&navs, index_navs, gw_dir->name, gw_dir->name,
gw_dir->name, gw_dir->name)) == -1)
return got_error_from_errno("asprintf");
}
static const struct got_error *
-gw_log(struct gw_trans *gw_trans)
+gw_commits(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
- char *log, *log_html;
+ char *commits_html, *commits_navs_html;
+ struct gw_header *header = NULL, *n_header = NULL;
+ if ((header = malloc(sizeof(struct gw_header))) == NULL)
+ return got_error_from_errno("malloc");
+
if (pledge("stdio rpath proc exec sendfd unveil",
NULL) == -1) {
error = got_error_from_errno("pledge");
if (error)
return error;
- log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit,
- gw_trans->gw_conf->got_max_commits_display, LOGFULL);
+ error = gw_get_header(gw_trans, header,
+ gw_trans->gw_conf->got_max_commits_display);
- if (log != NULL && strcmp(log, "") != 0) {
- if ((asprintf(&log_html, logs, log)) == -1)
+ khttp_puts(gw_trans->gw_req, commits_wrapper);
+ TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry) {
+ if ((asprintf(&commits_navs_html, commits_navs,
+ gw_trans->repo_name, n_header->commit_id,
+ gw_trans->repo_name, n_header->commit_id,
+ gw_trans->repo_name, n_header->commit_id)) == -1)
return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, log_html);
- free(log_html);
- free(log);
- }
- return error;
-}
-static const struct got_error *
-gw_raw(struct gw_trans *gw_trans)
-{
- const struct got_error *error = NULL;
+ if ((asprintf(&commits_html, commits_line,
+ gw_gen_commit_header(n_header->commit_id,
+ n_header->refs_str),
+ gw_gen_author_header(n_header->author),
+ gw_gen_committer_header(n_header->committer),
+ gw_gen_age_header(gw_get_time_str(n_header->committer_time,
+ TM_LONG)), gw_html_escape(n_header->commit_msg),
+ commits_navs_html)) == -1)
+ return got_error_from_errno("asprintf");
+ khttp_puts(gw_trans->gw_req, commits_html);
+ }
+ khttp_puts(gw_trans->gw_req, div_end);
+ got_ref_list_free(&header->refs);
+ gw_free_headers(header);
+ TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry)
+ gw_free_headers(n_header);
return error;
}
static const struct got_error *
-gw_logbriefs(struct gw_trans *gw_trans)
+gw_briefs(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
- char *log, *log_html;
+ char *briefs_html = NULL, *briefs_navs_html = NULL, *newline;
+ struct gw_header *header = NULL, *n_header = NULL;
+ if ((header = malloc(sizeof(struct gw_header))) == NULL)
+ return got_error_from_errno("malloc");
+
if (pledge("stdio rpath proc exec sendfd unveil",
NULL) == -1) {
error = got_error_from_errno("pledge");
if (error)
return error;
- log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit,
- gw_trans->gw_conf->got_max_commits_display, LOGBRIEF);
+ if (gw_trans->action == GW_SUMMARY)
+ error = gw_get_header(gw_trans, header, D_MAXSLCOMMDISP);
+ else
+ error = gw_get_header(gw_trans, header,
+ gw_trans->gw_conf->got_max_commits_display);
- if (log != NULL && strcmp(log, "") != 0) {
- if ((asprintf(&log_html, summary_logbriefs,
- log)) == -1)
+ khttp_puts(gw_trans->gw_req, briefs_wrapper);
+ TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry) {
+ if ((asprintf(&briefs_navs_html, briefs_navs,
+ gw_trans->repo_name, n_header->commit_id,
+ gw_trans->repo_name, n_header->commit_id,
+ gw_trans->repo_name, n_header->commit_id)) == -1)
return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, log_html);
- free(log_html);
- free(log);
+ newline = strchr(n_header->commit_msg, '\n');
+ if (newline)
+ *newline = '\0';
+ if ((asprintf(&briefs_html, briefs_line,
+ gw_get_time_str(n_header->committer_time, TM_DIFF),
+ n_header->author, gw_html_escape(n_header->commit_msg),
+ briefs_navs_html)) == -1)
+ return got_error_from_errno("asprintf");
+ khttp_puts(gw_trans->gw_req, briefs_html);
}
+ khttp_puts(gw_trans->gw_req, div_end);
+
+ got_ref_list_free(&header->refs);
+ gw_free_headers(header);
+ TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry)
+ gw_free_headers(n_header);
return error;
}
{
const struct got_error *error = NULL;
char *description_html, *repo_owner_html, *repo_age_html,
- *cloneurl_html, *log, *log_html, *tags, *heads, *tags_html,
+ *cloneurl_html, *tags, *heads, *tags_html,
*heads_html, *age;
if (pledge("stdio rpath proc exec sendfd unveil",
return error;
}
- error = gw_apply_unveil(gw_trans->gw_dir->path, NULL);
- if (error)
- return error;
+ /* unveil is applied with gw_briefs below */
khttp_puts(gw_trans->gw_req, summary_wrapper);
if (gw_trans->gw_conf->got_show_repo_description) {
}
khttp_puts(gw_trans->gw_req, div_end);
- log = gw_get_repo_log(gw_trans, NULL, NULL, D_MAXSLCOMMDISP, 0);
+ error = gw_briefs(gw_trans);
+ if (error)
+ return error;
+
tags = gw_get_repo_tags(gw_trans, D_MAXSLCOMMDISP, TAGBRIEF);
heads = gw_get_repo_heads(gw_trans);
- if (log != NULL && strcmp(log, "") != 0) {
- if ((asprintf(&log_html, summary_logbriefs,
- log)) == -1)
- return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, log_html);
- free(log_html);
- free(log);
- }
-
if (tags != NULL && strcmp(tags, "") != 0) {
if ((asprintf(&tags_html, summary_tags,
tags)) == -1)
}
static const struct got_error *
-gw_tag(struct gw_trans *gw_trans)
+gw_tree(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
- char *log, *log_html;
+ struct gw_header *header = NULL;
+ char *tree = NULL, *tree_html = NULL, *tree_html_disp = NULL;
- if (pledge("stdio rpath proc exec sendfd unveil",
- NULL) == -1) {
- error = got_error_from_errno("pledge");
- return error;
- }
+ if (pledge("stdio rpath proc exec sendfd unveil", NULL) == -1)
+ return got_error_from_errno("pledge");
+ if ((header = malloc(sizeof(struct gw_header))) == NULL)
+ return got_error_from_errno("malloc");
+
error = gw_apply_unveil(gw_trans->gw_dir->path, NULL);
if (error)
return error;
- log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit, 1, LOGTAG);
+ error = gw_get_header(gw_trans, header, 1);
+ if (error)
+ return error;
- if (log != NULL && strcmp(log, "") != 0) {
- if ((asprintf(&log_html, log_tag, log)) == -1)
- return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, log_html);
- free(log_html);
- free(log);
- }
- return error;
-}
+ tree_html = gw_get_repo_tree(gw_trans);
-static const struct got_error *
-gw_tree(struct gw_trans *gw_trans)
-{
- const struct got_error *error = NULL;
- char *log, *log_html;
+ if (tree_html == NULL)
+ tree_html = strdup("");
- if (pledge("stdio rpath proc exec sendfd unveil",
- NULL) == -1) {
- error = got_error_from_errno("pledge");
- return error;
- }
+ if ((asprintf(&tree_html_disp, tree_header,
+ gw_gen_age_header(gw_get_time_str(header->committer_time, TM_LONG)),
+ gw_gen_commit_msg_header(gw_html_escape(header->commit_msg)),
+ tree_html)) == -1)
+ return got_error_from_errno("asprintf");
- error = gw_apply_unveil(gw_trans->gw_dir->path, NULL);
- if (error)
- return error;
+ if ((asprintf(&tree, tree_wrapper, tree_html_disp)) == -1)
+ return got_error_from_errno("asprintf");
- log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit, 1, LOGTREE);
-
- if (log != NULL && strcmp(log, "") != 0) {
- if ((asprintf(&log_html, log_tree, log)) == -1)
- return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, log_html);
- free(log_html);
- free(log);
- }
+ khttp_puts(gw_trans->gw_req, tree);
+ got_ref_list_free(&header->refs);
+ gw_free_headers(header);
+ free(tree_html_disp);
+ free(tree_html);
+ free(tree);
return error;
}
if ((p = gw_trans->gw_req->fieldmap[KEY_PAGE]))
gw_trans->page = p->parsed.i;
- if (gw_trans->action == GW_RAW)
- gw_trans->mime = KMIME_TEXT_PLAIN;
+ /* if (gw_trans->action == GW_RAW) */
+ /* gw_trans->mime = KMIME_TEXT_PLAIN; */
return error;
}
return gw_dir;
}
-static const struct got_error*
-gw_match_logmsg(int *have_match, struct got_object_id *id,
- struct got_commit_object *commit, regex_t *regex)
-{
- const struct got_error *err = NULL;
- regmatch_t regmatch;
- char *id_str = NULL, *logmsg = NULL;
-
- *have_match = 0;
-
- err = got_object_id_str(&id_str, id);
- if (err)
- return err;
-
- err = got_object_commit_get_logmsg(&logmsg, commit);
- if (err)
- goto done;
-
- if (regexec(regex, logmsg, 1, ®match, 0) == 0)
- *have_match = 1;
-done:
- free(id_str);
- free(logmsg);
- return err;
-}
-
static void
gw_display_open(struct gw_trans *gw_trans, enum khttp code, enum kmime mime)
{
}
static char *
+gw_gen_commit_header(char *str1, char *str2)
+{
+ char *return_html = NULL, *ref_str = NULL;
+
+ if (strcmp(str2, "") != 0) {
+ if ((asprintf(&ref_str, "(%s)", str2)) == -1) {
+ return_html = strdup("");
+ return return_html;
+ }
+ } else
+ ref_str = strdup("");
+
+
+ if ((asprintf(&return_html, header_commit_html, str1, ref_str)) == -1)
+ return_html = strdup("");
+
+ free(ref_str);
+ return return_html;
+}
+
+static char *
+gw_gen_diff_header(char *str1, char *str2)
+{
+ char *return_html = NULL;
+
+ if ((asprintf(&return_html, header_diff_html, str1, str2)) == -1)
+ return_html = strdup("");
+
+ return return_html;
+}
+
+static char *
+gw_gen_author_header(char *str)
+{
+ char *return_html = NULL;
+
+ if ((asprintf(&return_html, header_author_html, str)) == -1)
+ return_html = strdup("");
+
+ return return_html;
+}
+
+static char *
+gw_gen_committer_header(char *str)
+{
+ char *return_html = NULL;
+
+ if ((asprintf(&return_html, header_committer_html, str)) == -1)
+ return_html = strdup("");
+
+ return return_html;
+}
+
+static char *
+gw_gen_age_header(char *str)
+{
+ char *return_html = NULL;
+
+ if ((asprintf(&return_html, header_age_html, str)) == -1)
+ return_html = strdup("");
+
+ return return_html;
+}
+
+static char *
+gw_gen_commit_msg_header(char *str)
+{
+ char *return_html = NULL;
+
+ if ((asprintf(&return_html, header_commit_msg_html, str)) == -1)
+ return_html = strdup("");
+
+ return return_html;
+}
+
+static char *
+gw_gen_tree_header(char *str)
+{
+ char *return_html = NULL;
+
+ if ((asprintf(&return_html, header_tree_html, str)) == -1)
+ return_html = strdup("");
+
+ return return_html;
+}
+
+static char *
gw_get_repo_description(struct gw_trans *gw_trans, char *dir)
{
FILE *f;
}
static char *
-gw_get_repo_diff(struct gw_trans *gw_trans, char *id_str1, char *id_str2)
+gw_get_diff(struct gw_trans *gw_trans, struct gw_header *header)
{
const struct got_error *error;
FILE *f = NULL;
if (error)
goto done;
- error = got_repo_match_object_id(&id1, &label1, id_str1,
+ error = got_repo_match_object_id(&id1, &label1, header->commit_id,
GOT_OBJ_TYPE_ANY, 1, repo);
if (error)
goto done;
- if (id_str2) {
- error = got_repo_match_object_id(&id2, &label2, id_str2,
- GOT_OBJ_TYPE_ANY, 1, repo);
+ if (header->parent_id) {
+ error = got_repo_match_object_id(&id2, &label2,
+ header->parent_id, GOT_OBJ_TYPE_ANY, 1, repo);
if (error)
goto done;
if (error)
goto done;
- if (id_str2 && type1 != type2) {
+ if (header->parent_id && type1 != type2) {
error = got_error(GOT_ERR_OBJ_TYPE);
goto done;
}
}
static char *
-gw_get_repo_log(struct gw_trans *gw_trans, const char *search_pattern,
- char *start_commit, int limit, int log_type)
-{
- const struct got_error *error;
- struct got_repository *repo = NULL;
- struct got_reflist_head refs;
- struct got_reflist_entry *re;
- struct got_commit_object *commit = NULL;
- struct got_object_id *id1 = NULL, *id2 = NULL;
- struct got_object_qid *parent_id;
- struct got_commit_graph *graph = NULL;
- char *logs = NULL, *id_str1 = NULL, *id_str2 = NULL, *path = NULL,
- *in_repo_path = NULL, *refs_str = NULL, *refs_str_disp = NULL,
- *treeid = NULL, *commit_row = NULL, *commit_commit = NULL,
- *commit_commit_disp = NULL, *commit_age_diff = NULL,
- *commit_age_diff_disp = NULL, *commit_age_long = NULL,
- *commit_age_long_disp = NULL, *commit_author = NULL,
- *commit_author_disp = NULL, *commit_committer = NULL,
- *commit_committer_disp = NULL, *commit_log = NULL,
- *commit_log_disp = NULL, *commit_parent = NULL,
- *commit_diff_disp = NULL, *logbriefs_navs_html = NULL,
- *log_tree_html = NULL, *log_commit_html = NULL,
- *log_diff_html = NULL, *commit_tree = NULL,
- *commit_tree_disp = NULL, *log_tag_html = NULL,
- *log_blame_html = NULL;
- char *commit_log0, *newline;
- regex_t regex;
- int have_match, has_parent = 1;
- size_t newsize;
- struct buf *diffbuf = NULL;
- time_t committer_time;
-
- error = buf_alloc(&diffbuf, 0);
- if (error)
- return NULL;
-
- if (search_pattern &&
- regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB |
- REG_NEWLINE))
- return NULL;
-
- error = got_repo_open(&repo, gw_trans->repo_path, NULL);
- if (error)
- return NULL;
-
- SIMPLEQ_INIT(&refs);
-
- if (start_commit == NULL) {
- struct got_reference *head_ref;
- error = got_ref_open(&head_ref, repo, gw_trans->headref, 0);
- if (error)
- goto done;
-
- error = got_ref_resolve(&id1, repo, head_ref);
- got_ref_close(head_ref);
- if (error)
- goto done;
-
- error = got_object_open_as_commit(&commit, repo, id1);
- } else {
- struct got_reference *ref;
- error = got_ref_open(&ref, repo, start_commit, 0);
- if (error == NULL) {
- int obj_type;
- error = got_ref_resolve(&id1, repo, ref);
- got_ref_close(ref);
- if (error)
- goto done;
- error = got_object_get_type(&obj_type, repo, id1);
- if (error)
- goto done;
- if (obj_type == GOT_OBJ_TYPE_TAG) {
- struct got_tag_object *tag;
- error = got_object_open_as_tag(&tag, repo, id1);
- if (error)
- goto done;
- if (got_object_tag_get_object_type(tag) !=
- GOT_OBJ_TYPE_COMMIT) {
- got_object_tag_close(tag);
- error = got_error(GOT_ERR_OBJ_TYPE);
- goto done;
- }
- free(id1);
- id1 = got_object_id_dup(
- got_object_tag_get_object_id(tag));
- if (id1 == NULL)
- error = got_error_from_errno(
- "got_object_id_dup");
- got_object_tag_close(tag);
- if (error)
- goto done;
- } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
- error = got_error(GOT_ERR_OBJ_TYPE);
- goto done;
- }
- error = got_object_open_as_commit(&commit, repo, id1);
- if (error)
- goto done;
- }
- if (commit == NULL) {
- error = got_repo_match_object_id_prefix(&id1,
- start_commit, GOT_OBJ_TYPE_COMMIT, repo);
- if (error)
- goto done;
- }
- error = got_repo_match_object_id_prefix(&id1,
- start_commit, GOT_OBJ_TYPE_COMMIT, repo);
- }
-
- if (error)
- goto done;
-
- error = got_repo_map_path(&in_repo_path, repo, gw_trans->repo_path, 1);
- if (error)
- goto done;
-
- if (in_repo_path) {
- free(path);
- path = in_repo_path;
- }
-
- error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
- if (error)
- goto done;
-
- error = got_commit_graph_open(&graph, path, 0);
- if (error)
- goto done;
-
- error = got_commit_graph_iter_start(graph, id1, repo, NULL, NULL);
- if (error)
- goto done;
-
- for (;;) {
- error = got_commit_graph_iter_next(&id1, graph, repo, NULL,
- NULL);
- if (error) {
- if (error->code == GOT_ERR_ITER_COMPLETED)
- error = NULL;
- break;
- }
- if (id1 == NULL)
- break;
-
- error = got_object_open_as_commit(&commit, repo, id1);
- if (error)
- break;
-
- if (search_pattern) {
- error = gw_match_logmsg(&have_match, id1, commit,
- ®ex);
- if (error) {
- got_object_commit_close(commit);
- break;
- }
- if (have_match == 0) {
- got_object_commit_close(commit);
- continue;
- }
- }
-
- SIMPLEQ_FOREACH(re, &refs, entry) {
- char *s;
- const char *name;
- struct got_tag_object *tag = NULL;
- int cmp;
-
- name = got_ref_get_name(re->ref);
- if (strcmp(name, GOT_REF_HEAD) == 0)
- continue;
- if (strncmp(name, "refs/", 5) == 0)
- name += 5;
- if (strncmp(name, "got/", 4) == 0)
- continue;
- if (strncmp(name, "heads/", 6) == 0)
- name += 6;
- if (strncmp(name, "remotes/", 8) == 0)
- name += 8;
- if (strncmp(name, "tags/", 5) == 0) {
- error = got_object_open_as_tag(&tag, repo,
- re->id);
- if (error) {
- if (error->code != GOT_ERR_OBJ_TYPE)
- continue;
- /*
- * Ref points at something other
- * than a tag.
- */
- error = NULL;
- tag = NULL;
- }
- }
- cmp = got_object_id_cmp(tag ?
- got_object_tag_get_object_id(tag) : re->id, id1);
- if (tag)
- got_object_tag_close(tag);
- if (cmp != 0)
- continue;
- s = refs_str;
- if ((asprintf(&refs_str, "%s%s%s", s ? s : "",
- s ? ", " : "", name)) == -1) {
- error = got_error_from_errno("asprintf");
- free(s);
- goto done;
- }
- free(s);
- }
-
- if (refs_str == NULL)
- refs_str_disp = strdup("");
- else {
- if ((asprintf(&refs_str_disp, "(%s)",
- refs_str)) == -1) {
- error = got_error_from_errno("asprintf");
- free(refs_str);
- goto done;
- }
- }
-
- error = got_object_id_str(&id_str1, id1);
- if (error)
- goto done;
-
- error = got_object_id_str(&treeid,
- got_object_commit_get_tree_id(commit));
- if (error)
- goto done;
-
- if (gw_trans->action == GW_COMMIT ||
- gw_trans->action == GW_COMMITDIFF) {
- parent_id =
- SIMPLEQ_FIRST(
- got_object_commit_get_parent_ids(commit));
- if (parent_id != NULL) {
- id2 = got_object_id_dup(parent_id->id);
- free (parent_id);
- error = got_object_id_str(&id_str2, id2);
- if (error)
- goto done;
- free(id2);
- } else {
- has_parent = 0;
- id_str2 = strdup("/dev/null");
- }
- }
-
- committer_time =
- got_object_commit_get_committer_time(commit);
-
- if ((asprintf(&commit_parent, "%s", id_str2)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_tree, "%s", treeid)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_tree_disp, commit_tree_html,
- treeid)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_diff_disp, commit_diff_html, id_str2,
- id_str1)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_commit, "%s", id_str1)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_commit_disp, commit_commit_html,
- commit_commit, refs_str_disp)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_age_long, "%s",
- gw_get_time_str(committer_time, TM_LONG))) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_age_long_disp, commit_age_html,
- commit_age_long)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_age_diff, "%s",
- gw_get_time_str(committer_time, TM_DIFF))) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_age_diff_disp, commit_age_html,
- commit_age_diff)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_author, "%s",
- got_object_commit_get_author(commit))) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_author_disp, commit_author_html,
- gw_html_escape(commit_author))) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_committer, "%s",
- got_object_commit_get_committer(commit))) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_committer_disp, commit_committer_html,
- gw_html_escape(commit_committer))) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if (strcmp(commit_author, commit_committer) == 0) {
- free(commit_committer_disp);
- commit_committer_disp = strdup("");
- }
-
- error = got_object_commit_get_logmsg(&commit_log0, commit);
- if (error)
- goto done;
-
- commit_log = commit_log0;
- while (*commit_log == '\n')
- commit_log++;
-
- switch(log_type) {
- case (LOGBRIEF):
- newline = strchr(commit_log, '\n');
- if (newline)
- *newline = '\0';
-
- if ((asprintf(&logbriefs_navs_html, logbriefs_navs,
- gw_trans->repo_name, id_str1, gw_trans->repo_name,
- id_str1, gw_trans->repo_name, id_str1,
- gw_trans->repo_name, id_str1)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_row, logbriefs_row,
- commit_age_diff, commit_author, commit_log,
- logbriefs_navs_html)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- free(logbriefs_navs_html);
- logbriefs_navs_html = NULL;
- break;
- case (LOGFULL):
- if ((asprintf(&logbriefs_navs_html, logbriefs_navs,
- gw_trans->repo_name, id_str1, gw_trans->repo_name,
- id_str1, gw_trans->repo_name, id_str1,
- gw_trans->repo_name, id_str1)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if ((asprintf(&commit_row, logs_row, commit_commit_disp,
- commit_author_disp, commit_committer_disp,
- commit_age_long_disp, gw_html_escape(commit_log),
- logbriefs_navs_html)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- free(logbriefs_navs_html);
- logbriefs_navs_html = NULL;
- break;
- case (LOGTAG):
- log_tag_html = strdup("tag log here");
-
- if ((asprintf(&commit_row, log_tag_row,
- gw_html_escape(commit_log), log_tag_html)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- free(log_tag_html);
- break;
- case (LOGBLAME):
- log_blame_html = gw_get_file_blame(gw_trans,
- start_commit);
-
- if ((asprintf(&commit_row, log_blame_row,
- gw_html_escape(commit_log), log_blame_html)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- free(log_blame_html);
- break;
- case (LOGTREE):
- log_tree_html = gw_get_repo_tree(gw_trans,
- start_commit);
-
- if ((asprintf(&commit_row, log_tree_row,
- gw_html_escape(commit_log), log_tree_html)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- free(log_tree_html);
- break;
- case (LOGCOMMIT):
- if ((asprintf(&commit_log_disp, commit_log_html,
- gw_html_escape(commit_log))) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- log_commit_html = strdup("commit here");
-
- if ((asprintf(&commit_row, log_commit_row,
- commit_diff_disp, commit_commit_disp,
- commit_tree_disp, commit_author_disp,
- commit_committer_disp, commit_age_long_disp,
- commit_log_disp, log_commit_html)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
- free(commit_log_disp);
- free(log_commit_html);
-
- break;
- case (LOGDIFF):
- if ((asprintf(&commit_log_disp, commit_log_html,
- gw_html_escape(commit_log))) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
-
- if (has_parent)
- log_diff_html = gw_get_repo_diff(gw_trans,
- commit_commit, commit_parent);
- else
- log_diff_html = gw_get_repo_diff(gw_trans,
- commit_commit, NULL);
-
- if ((asprintf(&commit_row, log_diff_row,
- commit_diff_disp, commit_commit_disp,
- commit_tree_disp, commit_author_disp,
- commit_committer_disp, commit_age_long_disp,
- commit_log_disp, log_diff_html)) == -1) {
- error = got_error_from_errno("asprintf");
- goto done;
- }
- free(commit_log_disp);
- free(log_diff_html);
-
- break;
- default:
- return NULL;
- }
-
- error = buf_puts(&newsize, diffbuf, commit_row);
-
- free(commit_parent);
- free(commit_diff_disp);
- free(commit_tree_disp);
- free(commit_age_diff);
- free(commit_age_diff_disp);
- free(commit_age_long);
- free(commit_age_long_disp);
- free(commit_author);
- free(commit_author_disp);
- free(commit_committer);
- free(commit_committer_disp);
- free(commit_log0);
- free(commit_row);
- free(refs_str_disp);
- free(refs_str);
- refs_str = NULL;
- free(id_str1);
- id_str1 = NULL;
- free(id_str2);
- id_str2 = NULL;
-
- if (error || (limit && --limit == 0))
- break;
- }
-
- if (error)
- goto done;
-
- if (buf_len(diffbuf) > 0) {
- error = buf_putc(diffbuf, '\0');
- logs = strdup(buf_get(diffbuf));
- }
-done:
- buf_free(diffbuf);
- free(in_repo_path);
- if (commit != NULL)
- got_object_commit_close(commit);
- if (search_pattern)
- regfree(®ex);
- if (graph)
- got_commit_graph_close(graph);
- if (repo) {
- error = got_repo_close(repo);
- if (error)
- return NULL;
- }
- if (error) {
- khttp_puts(gw_trans->gw_req, "Error: ");
- khttp_puts(gw_trans->gw_req, error->msg);
- return NULL;
- } else
- return logs;
-}
-
-static char *
gw_get_repo_tags(struct gw_trans *gw_trans, int limit, int tag_type)
{
const struct got_error *error = NULL;
SIMPLEQ_FOREACH(re, &refs, entry) {
const char *refname;
- char *refstr, *tag_log0, *tag_log, *id_str;
+ char *refstr, *tag_commit0, *tag_commit, *id_str;
time_t tagger_time;
struct got_object_id *id;
struct got_tag_object *tag;
if (error)
goto done;
- tag_log0 = strdup(got_object_tag_get_message(tag));
+ tag_commit0 = strdup(got_object_tag_get_message(tag));
- if (tag_log0 == NULL) {
+ if (tag_commit0 == NULL) {
error = got_error_from_errno("strdup");
goto done;
}
- tag_log = tag_log0;
- while (*tag_log == '\n')
- tag_log++;
+ tag_commit = tag_commit0;
+ while (*tag_commit == '\n')
+ tag_commit++;
switch (tag_type) {
case TAGBRIEF:
- newline = strchr(tag_log, '\n');
+ newline = strchr(tag_commit, '\n');
if (newline)
*newline = '\0';
goto done;
}
- if ((asprintf(&tag_row, tags_row, age, refname, tag_log,
- tags_navs_disp)) == -1) {
+ if ((asprintf(&tag_row, tags_row, age, refname,
+ tag_commit, tags_navs_disp)) == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
free(id_str);
free(refstr);
free(age);
- free(tag_log0);
+ free(tag_commit0);
free(tag_row);
if (error || (limit && --limit == 0))
return NULL;
else
return tags;
+}
+
+static void
+gw_free_headers(struct gw_header *header)
+{
+ free(header->id);
+ free(header->path);
+ if (header->commit != NULL)
+ got_object_commit_close(header->commit);
+ if (header->repo)
+ got_repo_close(header->repo);
+ free(header->refs_str);
+ free(header->commit_id);
+ free(header->parent_id);
+ free(header->tree_id);
+ free(header->author);
+ free(header->committer);
+ free(header->commit_msg);
+}
+
+static struct gw_header *
+gw_init_header()
+{
+ struct gw_header *header;
+
+ if ((header = malloc(sizeof(*header))) == NULL)
+ return NULL;
+
+ header->repo = NULL;
+ header->commit = NULL;
+ header->id = NULL;
+ header->path = NULL;
+
+ return header;
+}
+
+static const struct got_error *
+gw_get_commits(struct gw_trans * gw_trans, struct gw_header *header,
+ int limit)
+{
+ const struct got_error *error = NULL;
+ struct got_commit_graph *graph = NULL;
+
+ error = got_commit_graph_open(&graph, header->path, 0);
+ if (error)
+ goto done;
+
+ error = got_commit_graph_iter_start(graph, header->id, header->repo,
+ NULL, NULL);
+ if (error)
+ goto done;
+
+ for (;;) {
+ error = got_commit_graph_iter_next(&header->id, graph,
+ header->repo, NULL, NULL);
+ if (error) {
+ if (error->code == GOT_ERR_ITER_COMPLETED)
+ error = NULL;
+ goto done;
+ }
+ if (header->id == NULL)
+ goto done;
+
+ error = got_object_open_as_commit(&header->commit, header->repo,
+ header->id);
+ if (error)
+ goto done;
+
+ error = gw_get_commit(gw_trans, header);
+ if (limit > 1) {
+ struct gw_header *n_header = NULL;
+ if ((n_header = gw_init_header()) == NULL)
+ error = got_error_from_errno("malloc");
+
+ n_header->refs_str = strdup(header->refs_str);
+ n_header->commit_id = strdup(header->commit_id);
+ n_header->parent_id = strdup(header->parent_id);
+ n_header->tree_id = strdup(header->tree_id);
+ n_header->author = strdup(header->author);
+ n_header->committer = strdup(header->committer);
+ n_header->commit_msg = strdup(header->commit_msg);
+ n_header->committer_time = header->committer_time;
+ TAILQ_INSERT_TAIL(&gw_trans->gw_headers, n_header,
+ entry);
+ }
+ if (error || (limit && --limit == 0))
+ break;
+ }
+done:
+ if (graph)
+ got_commit_graph_close(graph);
+ return error;
+}
+
+static const struct got_error *
+gw_get_commit(struct gw_trans *gw_trans, struct gw_header *header)
+{
+ const struct got_error *error = NULL;
+ struct got_reflist_entry *re;
+ struct got_object_id *id2 = NULL;
+ struct got_object_qid *parent_id;
+ char *refs_str = NULL,
+ *commit_msg = NULL, *commit_msg0;
+
+ /*print commit*/
+ SIMPLEQ_FOREACH(re, &header->refs, entry) {
+ char *s;
+ const char *name;
+ struct got_tag_object *tag = NULL;
+ int cmp;
+
+ name = got_ref_get_name(re->ref);
+ if (strcmp(name, GOT_REF_HEAD) == 0)
+ continue;
+ if (strncmp(name, "refs/", 5) == 0)
+ name += 5;
+ if (strncmp(name, "got/", 4) == 0)
+ continue;
+ if (strncmp(name, "heads/", 6) == 0)
+ name += 6;
+ if (strncmp(name, "remotes/", 8) == 0)
+ name += 8;
+ if (strncmp(name, "tags/", 5) == 0) {
+ error = got_object_open_as_tag(&tag, header->repo,
+ re->id);
+ if (error) {
+ if (error->code != GOT_ERR_OBJ_TYPE)
+ continue;
+ /*
+ * Ref points at something other
+ * than a tag.
+ */
+ error = NULL;
+ tag = NULL;
+ }
+ }
+ cmp = got_object_id_cmp(tag ?
+ got_object_tag_get_object_id(tag) : re->id, header->id);
+ if (tag)
+ got_object_tag_close(tag);
+ if (cmp != 0)
+ continue;
+ s = refs_str;
+ if ((asprintf(&refs_str, "%s%s%s", s ? s : "",
+ s ? ", " : "", name)) == -1) {
+ error = got_error_from_errno("asprintf");
+ free(s);
+ return error;
+ }
+ header->refs_str = strdup(refs_str);
+ free(s);
+ }
+
+ if (refs_str == NULL)
+ header->refs_str = strdup("");
+ free(refs_str);
+
+ error = got_object_id_str(&header->commit_id, header->id);
+ if (error)
+ return error;
+
+ error = got_object_id_str(&header->tree_id,
+ got_object_commit_get_tree_id(header->commit));
+ if (error)
+ return error;
+
+ if (gw_trans->action == GW_DIFF) {
+ parent_id = SIMPLEQ_FIRST(
+ got_object_commit_get_parent_ids(header->commit));
+ if (parent_id != NULL) {
+ id2 = got_object_id_dup(parent_id->id);
+ free (parent_id);
+ error = got_object_id_str(&header->parent_id, id2);
+ if (error)
+ return error;
+ free(id2);
+ } else
+ header->parent_id = strdup("/dev/null");
+ } else
+ header->parent_id = strdup("");
+
+ header->committer_time =
+ got_object_commit_get_committer_time(header->commit);
+ header->author = strdup(got_object_commit_get_author(header->commit));
+ header->committer =
+ strdup(got_object_commit_get_committer(header->commit));
+
+ error = got_object_commit_get_logmsg(&commit_msg0, header->commit);
+ if (error)
+ return error;
+
+ commit_msg = commit_msg0;
+ while (*commit_msg == '\n')
+ commit_msg++;
+
+ header->commit_msg = strdup(commit_msg);
+ free(commit_msg0);
+ return error;
+}
+
+static const struct got_error *
+gw_get_header(struct gw_trans *gw_trans, struct gw_header *header, int limit)
+{
+ const struct got_error *error = NULL;
+ char *in_repo_path = NULL;
+
+ error = got_repo_open(&header->repo, gw_trans->repo_path, NULL);
+ if (error)
+ return error;
+
+ SIMPLEQ_INIT(&header->refs);
+
+ if (gw_trans->commit == NULL) {
+ struct got_reference *head_ref;
+ error = got_ref_open(&head_ref, header->repo,
+ gw_trans->headref, 0);
+ if (error)
+ return error;
+
+ error = got_ref_resolve(&header->id, header->repo, head_ref);
+ got_ref_close(head_ref);
+ if (error)
+ return error;
+
+ error = got_object_open_as_commit(&header->commit,
+ header->repo, header->id);
+ } else {
+ struct got_reference *ref;
+ error = got_ref_open(&ref, header->repo, gw_trans->commit, 0);
+ if (error == NULL) {
+ int obj_type;
+ error = got_ref_resolve(&header->id, header->repo, ref);
+ got_ref_close(ref);
+ if (error)
+ return error;
+ error = got_object_get_type(&obj_type, header->repo,
+ header->id);
+ if (error)
+ return error;
+ if (obj_type == GOT_OBJ_TYPE_TAG) {
+ struct got_tag_object *tag;
+ error = got_object_open_as_tag(&tag,
+ header->repo, header->id);
+ if (error)
+ return error;
+ if (got_object_tag_get_object_type(tag) !=
+ GOT_OBJ_TYPE_COMMIT) {
+ got_object_tag_close(tag);
+ error = got_error(GOT_ERR_OBJ_TYPE);
+ return error;
+ }
+ free(header->id);
+ header->id = got_object_id_dup(
+ got_object_tag_get_object_id(tag));
+ if (header->id == NULL)
+ error = got_error_from_errno(
+ "got_object_id_dup");
+ got_object_tag_close(tag);
+ if (error)
+ return error;
+ } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
+ error = got_error(GOT_ERR_OBJ_TYPE);
+ return error;
+ }
+ error = got_object_open_as_commit(&header->commit,
+ header->repo, header->id);
+ if (error)
+ return error;
+ }
+ if (header->commit == NULL) {
+ error = got_repo_match_object_id_prefix(&header->id,
+ gw_trans->commit, GOT_OBJ_TYPE_COMMIT,
+ header->repo);
+ if (error)
+ return error;
+ }
+ error = got_repo_match_object_id_prefix(&header->id,
+ gw_trans->commit, GOT_OBJ_TYPE_COMMIT,
+ header->repo);
+ }
+
+ error = got_repo_map_path(&in_repo_path, header->repo,
+ gw_trans->repo_path, 1);
+ if (error)
+ return error;
+
+ if (in_repo_path) {
+ header->path = strdup(in_repo_path);
+ }
+ free(in_repo_path);
+
+ error = got_ref_list(&header->refs, header->repo, NULL,
+ got_ref_cmp_by_name, NULL);
+ if (error)
+ return error;
+
+ error = gw_get_commits(gw_trans, header, limit);
+ return error;
}
struct blame_line {
else
line_escape = strdup("");
- asprintf(&blame_row, log_blame_line, a->nlines_prec,
+ asprintf(&blame_row, blame_line, a->nlines_prec,
a->lineno_cur, bline->id_str, bline->datebuf, committer,
line_escape);
a->lineno_cur++;
}
static char*
-gw_get_file_blame(struct gw_trans *gw_trans, char *commit_str)
+gw_get_file_blame(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
struct got_repository *repo = NULL;
if (error)
goto done;
- error = got_repo_match_object_id(&commit_id, NULL, commit_str,
+ error = got_repo_match_object_id(&commit_id, NULL, gw_trans->commit,
GOT_OBJ_TYPE_COMMIT, 1, repo);
if (error)
goto done;
}
static char*
-gw_get_repo_tree(struct gw_trans *gw_trans, char *commit_str)
+gw_get_repo_tree(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
struct got_repository *repo = NULL;
path = in_repo_path;
}
- if (commit_str == NULL) {
+ if (gw_trans->commit == NULL) {
struct got_reference *head_ref;
error = got_ref_open(&head_ref, repo, gw_trans->headref, 0);
if (error)
got_ref_close(head_ref);
} else
- error = got_repo_match_object_id(&commit_id, NULL, commit_str,
- GOT_OBJ_TYPE_COMMIT, 1, repo);
+ error = got_repo_match_object_id(&commit_id, NULL,
+ gw_trans->commit, GOT_OBJ_TYPE_COMMIT, 1, repo);
+ if (error)
+ goto done;
+
+ error = got_object_id_str(&gw_trans->commit, commit_id);
if (error)
goto done;
if (error)
goto done;
- if ((asprintf(&tree_row, trees_row, "", url_html)) == -1) {
+ if ((asprintf(&tree_row, tree_line, url_html)) == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
}
TAILQ_INIT(&gw_trans->gw_dirs);
+ TAILQ_INIT(&gw_trans->gw_headers);
gw_trans->page = 0;
gw_trans->repos_total = 0;
blob - 83cbcc5c4b4ec08b8f442cec1c97a373510062c9
blob + ba8f6bf98ee643ed259293de2b4a7273f3952b1e
--- gotweb/gotweb_ui.h
+++ gotweb/gotweb_ui.h
"<div id='cloneurl_title'>Clone URL: </div>" \
"<div id='cloneurl'>%s</div>";
-char *logbriefs_row =
- "<div id='logbriefs_wrapper'>" \
- "<div id='logbriefs_age'>%s</div>" \
- "<div id='logbriefs_author'>%s</div>" \
- "<div id='logbriefs_log'>%s</div>" \
- "</div>" \
- "<div id='navs_wrapper'>" \
- "<div id='navs'>%s</div>" \
- "</div>" \
- "</div>" \
- "<div id='dotted_line'></div>";
-
-char *logbriefs_navs =
- /* "<a href='?path=%s&action=commit&commit=%s'>commit</a> | " \ */
- "<a href='?path=%s&action=commitdiff&commit=%s'>diff</a> | " \
- "<a href='?path=%s&action=tree&commit=%s'>tree</a><!--/* | " \
- "<a href='?path=%s&action=snapshot&commit=%s'>snapshot</a> */-->";
-
char *tags_row =
"<div id='tags_wrapper'>" \
"<div id='tags_age'>%s</div>" \
"<div id='dotted_line'></div>";
char *tags_navs =
- /* "<a href='?path=%s&action=tag&commit=%s'>tag</a> | " \ */
- /* "<a href='?path=%s&action=commit&commit=%s'>commit</a> | " \ */
- "<a href='?path=%s&action=logbriefs&commit=%s'>log briefs</a> | " \
- "<a href='?path=%s&action=log&commit=%s'>log</a>";
+ "<a href='?path=%s&action=briefs&commit=%s'>commit briefs</a> | " \
+ "<a href='?path=%s&action=commits&commit=%s'>commits</a>";
-char *trees_row =
- "<div id='tree_wrapper'>" \
- "<div id='tree_id'>%s</div>" \
- "<div id='tree'>%s</div>" \
- "</div>";
-
char *heads_row =
"<div id='heads_wrapper'>" \
"<div id='heads_age'>%s</div>" \
char *heads_navs =
"<a href='?path=%s&action=summary&headref=%s'>summary</a> | " \
- "<a href='?path=%s&action=logbriefs&headref=%s'>log briefs</a> | " \
- "<a href='?path=%s&action=log&headref=%s'>log</a> | ";
- /* "<a href='?path=%s&action=commit&headref=%s'>commit</a>"; */
+ "<a href='?path=%s&action=briefs&headref=%s'>commit briefs</a> | " \
+ "<a href='?path=%s&action=commits&headref=%s'>commits</a>";
-char *commit_diff_html =
- "<div id='commit_diff_title'>Diff:</div>" \
- "<div id='commit_diff'>%s %s</div>";
+char *folder_html =
+ "<a href='?path=%s&action=%s&commit=%s&folder=/%s' " \
+ "class='diff_directory'>%s%s</a>";
-char *commit_commit_html =
- "<div id='commit_commit_title'>Commit:</div>" \
- "<div id='commit_commit'>%s %s</div>";
+char *file_html =
+ "<a href='?path=%s&action=%s&commit=%s&file=%s&folder=/%s'>%s%s</a>";
-char *commit_author_html =
- "<div id='commit_author_title'>Author:</div>" \
- "<div id='commit_author'>%s</div>";
+/* headers */
-char *commit_committer_html =
- "<div id='commit_committer_title'>Committer:</div>" \
- "<div id='commit_committer'>%s</div>";
+char *header_commit_html =
+ "<div id='header_commit_title'>Commit:</div>" \
+ "<div id='header_commit'>%s %s</div>";
-char *commit_age_html =
- "<div id='commit_age_title'>Date:</div>" \
- "<div id='commit_age'>%s</div>";
+char *header_diff_html =
+ "<div id='header_diff_title'>Diff:</div>" \
+ "<div id='header_diff'>%s %s</div>";
-char *commit_log_html =
- "<div id='commit_log_title'>Log:</div>" \
- "<div id='commit_log'>%s</div>";
+char *header_author_html =
+ "<div id='header_author_title'>Author:</div>" \
+ "<div id='header_author'>%s</div>";
-char *commit_tree_html =
- "<div id='commit_log_title'>Tree:</div>" \
- "<div id='commit_log'>%s</div>";
+char *header_committer_html =
+ "<div id='header_committer_title'>Committer:</div>" \
+ "<div id='header_committer'>%s</div>";
-char *folder_html =
- "<a href='?path=%s&action=%s&commit=%s&folder=/%s' " \
- "class='diff_directory'>%s%s</a>";
+char *header_age_html =
+ "<div id='header_age_title'>Date:</div>" \
+ "<div id='header_age'>%s</div>";
-char *file_html =
- "<a href='?path=%s&action=%s&commit=%s&file=%s&folder=/%s'>%s%s</a>";
+char *header_commit_msg_html =
+ "<div id='header_commit_msg_title'>Message:</div>" \
+ "<div id='header_commit_msg'>%s</div>";
-/* log.tmpl */
+char *header_tree_html =
+ "<div id='header_tree_title'>Tree:</div>" \
+ "<div id='header_tree'>%s</div>";
-char *logs =
- "<div id='logs_title_wrapper'>" \
- "<div id='logs_title'>Commits</div></div>" \
- "<div id='logs_content'>%s</div>";
+/* commit.tmpl */
-char *logs_row =
- "<div id='logs_row_wrapper'>%s%s%s%s</div>" \
+char *commits_wrapper =
+ "<div id='commits_title_wrapper'>" \
+ "<div id='commits_title'>Commits</div></div>" \
+ "<div id='commits_content'>";
+
+char *commits_line =
+ "<div id='commits_line_wrapper'>%s%s%s%s</div>" \
"<div id='dotted_line'></div>" \
- "<div id='log'>%s</div>" \
+ "<div id='commit'>%s</div>" \
"<div id='navs_wrapper'>" \
"<div id='navs'>%s</div>" \
"</div>" \
"</div>" \
"<div id='solid_line'></div>";
-char *logs_navs =
- /* "<a href='?path=%s&action=commit&commit=%s'>commit</a> | " \ */
- "<a href='?path=%s&action=commitdiff&commit=%s'>diff</a> | " \
+char *commits_navs =
+ "<a href='?path=%s&action=diff&commit=%s'>diff</a> | " \
"<a href='?path=%s&action=tree&commit=%s'>tree</a><!--/* | " \
"<a href='?path=%s&action=snapshot&commit=%s'>snapshot</a> */-->";
-/* tag.tmpl */
+/* briefs.tmpl */
-char *log_tag =
- "<div id='log_tree_title_wrapper'>" \
- "<div id='log_tree_title'>Tag</div></div>" \
- "<div id='log_tree_content'>%s</div>";
+char *briefs_wrapper =
+ "<div id='briefs_title_wrapper'>" \
+ "<div id='briefs_title'>Commit Briefs</div></div>" \
+ "<div id='briefs_content'>";
-char *log_tag_row =
- "<div id='log_tag_row_wrapper'>" \
- "<div id='log_tag_commit'>%s</div>" \
+char *briefs_line =
+ "<div id='briefs_wrapper'>" \
+ "<div id='briefs_age'>%s</div>" \
+ "<div id='briefs_author'>%s</div>" \
+ "<div id='briefs_log'>%s</div>" \
"</div>" \
- "<div id='dotted_line'></div>" \
- "<div id='log_tag'>%s</div>" \
- "</div>";
+ "<div id='navs_wrapper'>" \
+ "<div id='navs'>%s</div>" \
+ "</div>" \
+ "</div>" \
+ "<div id='dotted_line'></div>";
+char *briefs_navs =
+ "<a href='?path=%s&action=diff&commit=%s'>diff</a> | " \
+ "<a href='?path=%s&action=tree&commit=%s'>tree</a><!--/* | " \
+ "<a href='?path=%s&action=snapshot&commit=%s'>snapshot</a> */-->";
+
/* blame.tmpl */
-char *log_blame =
- "<div id='log_blame_title_wrapper'>" \
- "<div id='log_blame_title'>Blame</div></div>" \
- "<div id='log_blame_content'>%s</div>";
+char *blame_wrapper =
+ "<div id='blame_title_wrapper'>" \
+ "<div id='blame_title'>Blame</div></div>" \
+ "<div id='blame_content'>%s</div>";
-char *log_blame_row =
- "<div id='log_blame_row_wrapper'>" \
- "<div id='log_blame_commit'>%s</div>" \
+char *blame_header =
+ "<div id='blame_header_wrapper'>" \
+ "<div id='blame_header'>%s%s</div>" \
"</div>" \
"<div id='dotted_line'></div>" \
- "<div id='log_blame'>%s</div>" \
+ "<div id='blame'>%s</div>" \
"</div>";
-char *log_blame_navs =
- /* "<a href='?path=%s&action=commit&commit=%s'>commit</a> | " \ */
- "<a href='?path=%s&action=commitdiff&commit=%s'>diff</a> | " \
- "<a href='?path=%s&action=blame&commit=%s'>blame</a><!--/* | " \
- "<a href='?path=%s&action=snapshot&commit=%s'>snapshot</a> */-->";
-
-char *log_blame_line =
+char *blame_line =
"<div id='blame_wrapper'>" \
"<div id='blame_number'>%.*d</div>" \
"<div id='blame_hash'>%.8s</div>" \
/* tree.tmpl */
-char *log_tree =
- "<div id='log_tree_title_wrapper'>" \
- "<div id='log_tree_title'>Tree</div></div>" \
- "<div id='log_tree_content'>%s</div>";
+char *tree_wrapper =
+ "<div id='tree_title_wrapper'>" \
+ "<div id='tree_title'>Tree</div></div>" \
+ "<div id='tree_content'>%s</div>";
-char *log_tree_row =
- "<div id='log_tree_row_wrapper'>" \
- "<div id='log_tree_commit'>%s</div>" \
+char *tree_header =
+ "<div id='tree_header_wrapper'>" \
+ "<div id='tree_header'>%s%s</div>" \
"</div>" \
"<div id='dotted_line'></div>" \
- "<div id='log_tree'>%s</div>" \
+ "<div id='tree'>%s</div>" \
"</div>";
-char *log_tree_navs =
- /* "<a href='?path=%s&action=commit&commit=%s'>commit</a> | " \ */
- "<a href='?path=%s&action=commitdiff&commit=%s'>diff</a> | " \
- "<a href='?path=%s&action=tree&commit=%s'>tree</a><!--/* | " \
- "<a href='?path=%s&action=snapshot&commit=%s'>snapshot</a> */-->";
-
-/* commit.tmpl */
-
-char *log_commit =
- "<div id='log_commit_title_wrapper'>" \
- "<div id='log_commit_title'>Commit</div></div>" \
- "<div id='log_commit_content'>%s</div>";
-
-char *log_commit_row =
- "<div id='log_commit_row_wrapper'>" \
- "<div id='log_commit_commit'>%s%s%s%s%s%s%s</div>" \
- "</div>" \
- "<div id='dotted_line'></div>" \
- "<div id='log_commit'>%s</div>" \
+char *tree_line =
+ "<div id='tree_wrapper'>" \
+ "<div id='tree_line'>%s</div>" \
"</div>";
/* diff.tmpl */
-char *log_diff =
- "<div id='log_diff_title_wrapper'>" \
- "<div id='log_diff_title'>Commit Diff</div></div>" \
- "<div id='log_diff_content'>%s</div>";
+char *diff_wrapper =
+ "<div id='diff_title_wrapper'>" \
+ "<div id='diff_title'>Commit Diff</div></div>" \
+ "<div id='diff_content'>%s</div>";
-char *log_diff_row =
- "<div id='log_diff_row_wrapper'>" \
- "<div id='log_commit_diff'>%s%s%s%s%s%s%s</div>" \
+char *diff_header =
+ "<div id='diff_header_wrapper'>" \
+ "<div id='diff_header'>%s%s%s%s%s%s%s</div>" \
"</div>" \
"<div id='dotted_line'></div>" \
- "<div id='log_diff'>%s</div>" \
+ "<div id='diff'>%s</div>" \
"</div>";
/* index.tmpl */
char *index_navs =
"<a href='?path=%s&action=summary'>summary</a> | " \
- "<a href='?path=%s&action=logbriefs'>log briefs</a> | " \
- "<a href='?path=%s&action=log'>log</a> | " \
+ "<a href='?path=%s&action=briefs'>commit briefs</a> | " \
+ "<a href='?path=%s&action=commits'>commits</a> | " \
"<a href='?path=%s&action=tree'>tree</a>";
/* summary.tmpl */
char *summary_wrapper =
"<div id='summary_wrapper'>";
-char *summary_logbriefs =
- "<div id='summary_logbriefs_title_wrapper'>" \
- "<div id='summary_logbriefs_title'>Log Briefs</div></div>" \
- "<div id='summary_logbriefs_content'>%s</div>";
-
char *summary_tags =
"<div id='summary_tags_title_wrapper'>" \
"<div id='summary_tags_title'>Tags</div></div>" \
