From c3f23d4571c06c979eddbd4c973163ba76c7e50f Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Thu, 10 Jun 2010 01:09:24 +0200 Subject: ui-shared: Improve const-ness in API This is needed to prevent const-related warnings in later patches. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli --- ui-shared.h | 69 +++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 29 deletions(-) (limited to 'ui-shared.h') diff --git a/ui-shared.h b/ui-shared.h index 9ebc1f9..308c982 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -10,36 +10,47 @@ extern char *cgit_fileurl(const char *reponame, const char *pagename, extern char *cgit_pageurl(const char *reponame, const char *pagename, const char *query); -extern void cgit_index_link(char *name, char *title, char *class, - char *pattern, int ofs); -extern void cgit_summary_link(char *name, char *title, char *class, char *head); -extern void cgit_tag_link(char *name, char *title, char *class, char *head, - char *rev); -extern void cgit_tree_link(char *name, char *title, char *class, char *head, - char *rev, char *path); -extern void cgit_plain_link(char *name, char *title, char *class, char *head, - char *rev, char *path); -extern void cgit_log_link(char *name, char *title, char *class, char *head, - char *rev, char *path, int ofs, char *grep, - char *pattern, int showmsg); -extern void cgit_commit_link(char *name, char *title, char *class, char *head, - char *rev, int toggle_ssdiff); -extern void cgit_patch_link(char *name, char *title, char *class, char *head, - char *rev); -extern void cgit_refs_link(char *name, char *title, char *class, char *head, - char *rev, char *path); -extern void cgit_snapshot_link(char *name, char *title, char *class, - char *head, char *rev, char *archivename); -extern void cgit_diff_link(char *name, char *title, char *class, char *head, - char *new_rev, char *old_rev, char *path, - int toggle_ssdiff); -extern void cgit_stats_link(char *name, char *title, char *class, char *head, - char *path); +extern void cgit_index_link(const char *name, const char *title, + const char *class, const char *pattern, int ofs); +extern void cgit_summary_link(const char *name, const char *title, + const char *class, const char *head); +extern void cgit_tag_link(const char *name, const char *title, + const char *class, const char *head, + const char *rev); +extern void cgit_tree_link(const char *name, const char *title, + const char *class, const char *head, + const char *rev, const char *path); +extern void cgit_plain_link(const char *name, const char *title, + const char *class, const char *head, + const char *rev, const char *path); +extern void cgit_log_link(const char *name, const char *title, + const char *class, const char *head, const char *rev, + const char *path, int ofs, const char *grep, + const char *pattern, int showmsg); +extern void cgit_commit_link(char *name, const char *title, + const char *class, const char *head, + const char *rev, int toggle_ssdiff); +extern void cgit_patch_link(const char *name, const char *title, + const char *class, const char *head, + const char *rev); +extern void cgit_refs_link(const char *name, const char *title, + const char *class, const char *head, + const char *rev, const char *path); +extern void cgit_snapshot_link(const char *name, const char *title, + const char *class, const char *head, + const char *rev, const char *archivename); +extern void cgit_diff_link(const char *name, const char *title, + const char *class, const char *head, + const char *new_rev, const char *old_rev, + const char *path, int toggle_ssdiff); +extern void cgit_stats_link(const char *name, const char *title, + const char *class, const char *head, + const char *path); extern void cgit_object_link(struct object *obj); -extern void cgit_print_error(char *msg); -extern void cgit_print_date(time_t secs, char *format, int local_time); -extern void cgit_print_age(time_t t, time_t max_relative, char *format); +extern void cgit_print_error(const char *msg); +extern void cgit_print_date(time_t secs, const char *format, int local_time); +extern void cgit_print_age(time_t t, time_t max_relative, const char *format); extern void cgit_print_http_headers(struct cgit_context *ctx); extern void cgit_print_docstart(struct cgit_context *ctx); extern void cgit_print_docend(); @@ -48,5 +59,5 @@ extern void cgit_print_filemode(unsigned short mode); extern void cgit_print_snapshot_links(const char *repo, const char *head, const char *hex, int snapshots); extern void cgit_add_hidden_formfields(int incl_head, int incl_search, - char *page); + const char *page); #endif /* UI_SHARED_H */ -- cgit v1.2.3-24-g4f1b From 24fd7e54c82294efa68ecae5dd9cb8a8986c04bf Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Thu, 10 Jun 2010 01:09:29 +0200 Subject: ui-shared: Teach "breadcrumb" navigation to path limit display beneath tab bar When a path limit is in effect, and displayed directly beneath the tab bar, it should offer breadcrumb navigation (like what the 'tree' page does), to allow changing the path limit easily. Implementing this requires a robust way to link back to the current page with a changed ctx->qry.path, but without losing track of the other query arguments. This is solved by adding the new cgit_self_link() function, which is then invoked repeatedly by the new cgit_print_path_crumbs() function while manipulating ctx->qry.path. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli --- ui-shared.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ui-shared.h') diff --git a/ui-shared.h b/ui-shared.h index 308c982..3df5464 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -46,6 +46,8 @@ extern void cgit_diff_link(const char *name, const char *title, extern void cgit_stats_link(const char *name, const char *title, const char *class, const char *head, const char *path); +extern void cgit_self_link(char *name, const char *title, + const char *class, struct cgit_context *ctx); extern void cgit_object_link(struct object *obj); extern void cgit_print_error(const char *msg); -- cgit v1.2.3-24-g4f1b From eac1b675414722ae90df75abc727b2795bc096f0 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Thu, 10 Jun 2010 01:09:33 +0200 Subject: ui-patch: Apply path limit to generated patch Also indicate in the comment section of the patch that a path limit was applied, too easily see when a generated patch is only partial. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli --- ui-shared.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-shared.h') diff --git a/ui-shared.h b/ui-shared.h index 3df5464..c0e5c55 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -32,7 +32,7 @@ extern void cgit_commit_link(char *name, const char *title, const char *rev, int toggle_ssdiff); extern void cgit_patch_link(const char *name, const char *title, const char *class, const char *head, - const char *rev); + const char *rev, const char *path); extern void cgit_refs_link(const char *name, const char *title, const char *class, const char *head, const char *rev, const char *path); -- cgit v1.2.3-24-g4f1b From 685872b770be2af643d00365d5358e46687f7385 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Thu, 10 Jun 2010 01:09:35 +0200 Subject: ui-commit: Preserve path limit in links to commit page This includes adding a path argument to cgit_commit_link() and updating all its callers. The callers from within the commit page (i.e. the "commit", "unidiff"/"side-by-side diff" and "parent" links) all preserve the path limit of the current commit page. All other callers pass NULL (i.e. no path limit). Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli --- ui-shared.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ui-shared.h') diff --git a/ui-shared.h b/ui-shared.h index c0e5c55..3cc1258 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -29,7 +29,8 @@ extern void cgit_log_link(const char *name, const char *title, const char *pattern, int showmsg); extern void cgit_commit_link(char *name, const char *title, const char *class, const char *head, - const char *rev, int toggle_ssdiff); + const char *rev, const char *path, + int toggle_ssdiff); extern void cgit_patch_link(const char *name, const char *title, const char *class, const char *head, const char *rev, const char *path); -- cgit v1.2.3-24-g4f1b