| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | | | Merge branch 'lh/macros' | Lars Hjemli | 2010-07-18 | 3 | -5/+78 |
| |\ \ \ |
|
| | * | | | Add support for environment variable expansion•••This patch teaches cgit to expand environment variables in certain
cgitrc option values (cache_root, scan-path, include) plus when
finding the location of cgitrc itself.
One use case for this feature is virtual hosting - e.g. by setting
$CGIT_CONFIG='/etc/cgitrc/$HTTP_HOST' in httpd.conf, all virtual
hosts automatically gets their own cgitrc.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-03-22 | 3 | -5/+78 |
| * | | | | Merge branch 'stable' | Lars Hjemli | 2010-07-13 | 1 | -0/+4 |
| |\ \ \ \
| | |_|/
| |/| | |
|
| | * | | | Reencode author and committer•••When a commit has a specific encoding, this encoding also applies to
the author and committer name and email.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Rémi Lagacé | 2010-07-13 | 1 | -0/+4 |
| * | | | | Merge branch 'lh/range-search' | Lars Hjemli | 2010-06-22 | 2 | -4/+8 |
| |\ \ \ \ |
|
| | * | | | | ui-log.c: allow commit range as search expression•••Inspired-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-06-19 | 2 | -4/+8 |
| * | | | | | Merge branch 'jh/context-lines'•••Conflicts:
cgit.c
cgit.h
| Lars Hjemli | 2010-06-22 | 7 | -8/+34 |
| |\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | | ui-diff: Add links to increase/decrease number of context lines in diffs•••Add two links to the "Diffstat" line to show more/less context lines in the
generated diff.
To support this, cgit_commit_link() and cgit_diff_link() has learned to
preserve the ctx.qry.context variable.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 2 | -1/+23 |
| | * | | | | Add URL parameter 'context' for changing the number of context lines in diffs•••The new ctx.qry.context variable is picked up by cgit_print_diff(), and
passed via cgit_diff_files() to Git's diff machinery.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 6 | -7/+11 |
| * | | | | | Merge branch 'jh/path-limit'•••Conflicts:
cgit.h
ui-commit.c
| Lars Hjemli | 2010-06-22 | 17 | -164/+275 |
| |\| | | |
| |/ / /
|/| | | |
|
| | * | | | ui-shared.c: path-limit style nitpick•••This subjectively makes the path-limit bar less visually intrusive.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-06-19 | 1 | -4/+2 |
| | * | | | ui-log: Preserve path limit in outgoing links•••This allows navigation through the 'log' page/command without losing the
active path limit.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -12/+15 |
| | * | | | ui-shared: Preserve path limit in "tab bar" links•••When using the "tab bar" in the pageheader to navigate between pages, any
path limit in effect on the current page is forgotten in the link to the
target page, even if the target page can interpret and use the path limit
constructively.
Instead, preserve the current page's path limit in the "tab bar" links to
other pages, where the path limit is useful to the target page.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -5/+6 |
| | * | | | 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 <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 5 | -12/+15 |
| | * | | | ui-commit: Preserve path limit in links to tree and diff pages•••For tree links, the original link is unchanged, but in the case of a path
limit, a subtree link is added to the right of the original tree link.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -1/+5 |
| | * | | | 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 <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 6 | -8/+10 |
| | * | | | ui-commit: Limit diff based on path limit in qry.path•••Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 3 | -4/+4 |
| | * | | | ui-diff: Teach diffstat to obey path limit•••Also indicate in the diffstat header if a path limit is in effect.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -3/+5 |
| | * | | | ui-tree: Remove unnecessary path breadcrumb navigation•••The path breadcrumb navigation at the top of the 'tree' page has now been
duplicated in ui-shared, which leaves the ui-tree implementation unnecessary.
This patch removes the breadcrumb navigation from ui-tree, and moves the
"(plain)" link that followed the breadcrumb when displaying blobs to the
end of the next line, following the blob SHA1.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -13/+2 |
| | * | | | 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 <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 2 | -1/+82 |
| | * | | | ui-shared: Display path limit directly beneath tab bar in relevant pages•••Design-wise, the path is shown by "expanding" the grey border between the
tab bar and the content area of the page to house the current path limit.
This is only displayed on pages where the path limit is relevant, and only
when a path limit is in effect.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 2 | -0/+14 |
| | * | | | ui-shared: Replace ctx.qry.path with ctx.qry.vpath•••In all cases where ui-shared uses ctx.qry.path, it is done so in the context
of a in-project path, and not in the context in which the 'refs' page or the
'clone'-related functionality uses ctx.qry.path. Make this explicit by using
ctx.qry.vpath instead.
This path introduces no fundamental difference in functionality except for
fixing some minor bugs, for example the Atom feed reference from a
"$repo/refs/heads/" page.
Note that the usage of ctx.qry.path in the other ui-<page>.c files is ok,
since that code presumably is only executed in the context of its own <page>,
so the correct interpretation of ctx.qry.path is never in question.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -4/+4 |
| | * | | | struct cgit_cmd: Differentiate between various usages of ctx.qry.path•••For many commands/pages (e.g. 'tree', 'diff', 'plain', etc.), the
ctx.qry.path argument is interpreted as a path within the "virtual" project
directory structure. However, for some other commands (notably 'refs', and
the clone-related commands) ctx.qry.path is used in a different context (as
a more or less "real" path within the '.git' directory).
This patch differentiates between these two usages of ctx.qry.path, by
introducing a new variable - ctx.qry.vpath - which is equal to ctx.qry.path
in the former case, and NULL in the latter.
This will become useful in future patches when we want various pages and the
links between them to preserve existing in-project paths.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 4 | -22/+30 |
| | * | | | ui-shared: Remove needless cgit_get_cmd() call, and refactor hc() accordingly•••The call to cgit_get_cmd() and the following fallback handling (to "summary"
or "repoindex") in cgit_print_pageheader() is unnecessary, since the same
fallback handling was already done when ctx.qry.page was set when
cgit_get_cmd() was called from process_request() in cgit.c.
As such, hc() can also be rewritten to simply compare the given 'page' string
against ctx.qry.page.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -19/+12 |
| | * | | | ui-shared: Improve const-ness in API•••This is needed to prevent const-related warnings in later patches.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 2 | -65/+80 |
| | * | | | Remove unused variable in shared.c•••Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -1/+0 |
| | * | | | Fix small typo in cgitrc example•••Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -1/+1 |
| | | |/
| |/| |
|
| * | | | Fix style of commit-filter links in commit-subject.•••When using the commit-filter functionality to add e.g. bug tracker links to
commit messages, the style of those links is mangled by a CSS directive that
is meant to only apply to decorations that are listed on the commit-subject
line.
Fix this directive to only apply to the decorations.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Johan Herland | 2010-06-19 | 1 | -1/+4 |
| * | | | Merge branch 'stable' | Lars Hjemli | 2010-06-19 | 1 | -1/+1 |
| |\ \ \
| | |/
| |/| |
|
| | * | | CGIT 0.8.3.2•••Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-06-19 | 1 | -1/+1 |
| * | | | Merge branch 'ag/atom-fixes' | Lars Hjemli | 2010-06-19 | 5 | -2/+15 |
| |\ \ \ |
|
| | * | | | Add 'max-atom-items' config variable•••This allows one to specify the items in the RSS feeds
Signed-off-by: Aaron Griffin <agriffin@datalogics.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Aaron Griffin | 2010-03-22 | 4 | -1/+9 |
| | * | | | Add all=1 query param for atom feeds•••Displays all items from all branches in one feed
Signed-off-by: Aaron Griffin <agriffin@datalogics.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Aaron Griffin | 2010-03-22 | 3 | -1/+6 |
| | | |/
| |/| |
|
| * | | | Merge branch 'lh/noweb' | Lars Hjemli | 2010-06-19 | 1 | -0/+2 |
| |\ \ \ |
|
| | * | | | scan-tree: add test for noweb-file in repo dir•••If such a file exists, the repo is not added to the repolist.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-02-28 | 1 | -0/+2 |
| * | | | | Merge branch 'ml/plain-improvements-part1' | Lars Hjemli | 2010-06-19 | 1 | -8/+60 |
| |\ \ \ \ |
|
| | * | | | | ui-plain: print directory listings•••When a user requests a plain view of a tree (as opposed to a blob),
print out a directory listing rather than giving a 404 Not Found.
Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is
requested without a path.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
| Mark Lodato | 2010-01-31 | 1 | -1/+47 |
| | * | | | | ui-plain: more efficient walk_tree()•••Git's read_tree_recursive() already filters out the objects by pathname,
so we only have to compare baselen to the expected. That is, no string
matching is required.
Additionally, if the requested path is a directory, the old code would
walk through all of its immediate children. This is not necessary, this
so we no longer do that.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
| Mark Lodato | 2010-01-31 | 1 | -6/+14 |
| | * | | | | ui-plain: remove unused curr_rev variable•••Signed-off-by: Mark Lodato <lodatom@gmail.com>
| Mark Lodato | 2010-01-30 | 1 | -2/+0 |
| * | | | | | Merge branch 'sn/subject-link' | Lars Hjemli | 2010-06-19 | 5 | -4/+25 |
| |\ \ \ \ \ |
|
| | * | | | | | Optionally generate verbose parent links•••The new option 'enable-subject-links' must be used to enable the verbose
parent-links in commit view.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-02-27 | 5 | -5/+24 |
| | * | | | | | display subject instead of sha1 as link title of parents•••Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Stefan Naewe | 2010-02-27 | 1 | -3/+5 |
| * | | | | | | Merge branch 'stable' | Lars Hjemli | 2010-04-08 | 1 | -0/+8 |
| |\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | /
| | |_|_|/
| |/| | | |
|
| | * | | | | shared.c: avoid memory leak during diff•••Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-04-08 | 1 | -0/+8 |
| * | | | | | ui-tree: add link to plain view for blobs in tree listing•••Suggested-by: Robert Weidlich <mail@robertweidlich.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-02-28 | 1 | -0/+2 |
| | |_|_|/
|/| | | |
|
| * | | | | Use GIT-1.7.0•••Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| Lars Hjemli | 2010-02-27 | 2 | -1/+1 |
| * | | | | Merge branch 'html-updates' of git://github.com/MarkLodato/cgit | Lars Hjemli | 2010-02-27 | 2 | -30/+58 |
| |\ \ \ \
| |_|/ /
|/| | | |
|
| | * | | | html: properly percent-escape URLs•••The only valid characters for a URL are unreserved characters
a-zA-Z0-9_-.~ and the reserved characters !*'();:@&=+$,/?%#[] , as per
RFC 3986. Everything else must be escaped. Additionally, the # and
? always have special meaning, and the &, =, and + have special meaning
in a query string, so they too must be escaped. To make this easier,
a table of escapes is now used so that we do not have to call fmt() for
each character; if the entry is 0, no escaping is needed.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
| Mark Lodato | 2010-02-09 | 1 | -4/+32 |
| | * | | | html: make all strings 'const char *'•••None of the html_* functions modify their argument, so they can all be
'const char *' instead of a simple 'char *'. This removes the need to
cast (or copy) when trying to print a const string.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
| Mark Lodato | 2010-02-08 | 2 | -26/+26 |
| | | |/
| |/| |
|
| * | | | Merge branch 'stable' | Lars Hjemli | 2010-02-27 | 2 | -3/+3 |
| |\ \ \
| |/ /
|/| /
| |/ |
|
