Website Summary Files Commits Branches @commit @diff @stats
Commit message (Collapse)AuthorAgeLinesSHA
...
* | Merge branch 'ml/bugfix'
 Lars Hjemli
2010-09-19-30/+42a9d6e6e
|\ \
| * | prefer html_raw() to write()
 Mark Lodato
2010-09-04-12/+12d187b98
| | | | | | | | | | | | | | | | | | | | | To make the code more consistent, and to not rely on the implementation of html(), always use html_raw(...) instead of write(htmlfd, ...). Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | ui-repolist: fix redefinition of _XOPEN_SOURCE
 Mark Lodato
2010-09-04-6/+025e8ba1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, ui-repolist.c set _GNU_SOURCE and then included a standard library before including <git-compat-util.h>. This was a problem, because <git-compat-util.h> redefined _XOPEN_SOURCE, which is set automatically by glibc when _GNU_SOURCE is set. However, <git-compat-util.h> already sets _GNU_SOURCE and includes both <string.h> and <time.h>, so there is no need to define _GNU_SOURCE or include either header within ui-repolist.c. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | fix errors in printf-style format strings
 Mark Lodato
2010-09-04-12/+25e4ddc8f
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were many places where the arguments to a printf-like function did not match the format string. Mostly, these were a missing 'l' flag, but there were three exceptions: - In ui-stats.c, a size_t argument must be printed. C99 has the "%zu" flag for this purpose, but not all compilers support this. Therefore, we mimic what git does - use a NO_C99_FORMAT Makefile variable. - In ui-stats.c, cgit_print_error() was called with a pointer instead of a character. - In ui-log.c, the "columns" argument was never used. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | use __attribute__ to catch printf format mistakes
 Mark Lodato
2010-09-04-0/+5a4c58d9
| | | | | | | | | | | | | | | | | | | | | Use "__attribute__((format (printf,N,M)))", as is done in git, do catch mistakes in printf-style format strings. Signed-off-by: Mark Lodato <lodatom@gmail.com>
* | | Merge branch 'lh/section-from-path'
 Lars Hjemli
2010-09-19-6/+45536c7a1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: scan-tree.c
| * | | Add support for 'section-from-path' option
 Lars Hjemli
2010-08-22-6/+45797110e
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This option can be used to autogenerate section names during scan-path processing. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'lh/readme'
 Lars Hjemli
2010-09-19-24/+43e76a1ea
|\ \ \ \
| * | | | Add support for "readme" option
 Lars Hjemli
2010-08-22-24/+43515edb0
| |/ / / | | | | | | | | | | | | | | | | | | | | The value of this option is used as the default value for repo.readme. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | / / Use GIT-1.7.3
 Lars Hjemli
2010-09-19-1/+1857696d
| |/ / |/| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'
 Lars Hjemli
2010-09-01-0/+1bf8293d
|\ \ \ | | |/ | |/|
| * | ui-snapshot: actually compress zip archives
 Lars Hjemli
2010-09-01-0/+1ba1769c
| | | | | | | | | | | | | | | | | | | | | Since cgit linked with git-1.6.0 all zip archives has been uncompressed. This patch fixes the issue by specifying Z_DEFAULT_COMPRESSION. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'
 Lars Hjemli
2010-08-29-4/+76940b23
|\| | | |/ |/|
| * html: fix strcpy bug in convert_query_hexchar
 Mark Lodato
2010-08-29-4/+54843478
| | | | | | | | | | | | | | | | The source and destination strings in strcpy() may not overlap. Instead, use memmove(), which allows overlap. This fixes test t0104, where 'url=foo%2bbar/tree' was being parsed improperly. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * t0108-patch: add 'tests_done' to end
 Mark Lodato
2010-08-29-0/+2c94414a
| | | | | | | | Signed-off-by: Mark Lodato <lodatom@gmail.com>
* | Use GIT-1.7.2.2
 Lars Hjemli
2010-08-22-10/+106d7552b
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Support refspecs in about-filter.
 Jason A. Donenfeld
2010-08-20-7/+63379e80e
| | | | | | | | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'jd/gitolite'
 Lars Hjemli
2010-08-04-17/+116aec9c24
|\ \
| * | Add support for 'enable-gitweb-owner' option
 Jason A. Donenfeld
2010-08-04-9/+33119397b
| | | | | | | | | | | | | | | | | | | | | | | | | | | When this option is enabled (which it is by default), cgit will lookup the 'gitweb.owner' setting in each git config file found when processing the 'scan-path' option. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add support for 'remove-suffix' option
 Jason A. Donenfeld
2010-08-04-0/+132e4a941
| | | | | | | | | | | | | | | | | | | | | | | | When this option is enabled, the '.git' suffix of repository directories found while processing the 'scan-path' option will be removed. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add support for 'project-list' option
 Jason A. Donenfeld
2010-08-04-8/+703516502
| | | | | | | | | | | | | | | | | | | | | | | | | | | This option specifies the location of a projectlist file as used by gitweb - when 'scan-tree' is later specified, only the projects listed in the projectlist file will be added. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'js/notes'
 Lars Hjemli
2010-08-04-0/+57e6c960c
|\ \ \
| * | | ui-log: Display git notes when present
 Jeff Smith
2010-08-04-0/+2339c2e22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-commit: Display git notes when present
 Jeff Smith
2010-08-04-0/+34059b393
| |/ / | | | | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'
 Lars Hjemli
2010-08-03-13/+156a8f65b
|\ \ \ | |/ / |/| / | |/
| * CGIT 0.8.3.3
 Lars Hjemli
2010-08-03-1/+115c64c5
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * ui-refs.c: avoid segfault on unparsed ref objects
 Lars Hjemli
2010-08-03-12/+143687be2
| | | | | | | | | | | | | | | | When a ref refers to something other then a commit or tag object, cgit could segfault when trying to display the tag info. Noticed-by: Eugene Sajine <euguess@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | commit-links.sh: Seperate the expressions for filtering commit messages.
 Jeff Smith
2010-07-22-7/+9f914317
| | | | | | | | | | This allows for putting descriptions closer to their expressions. It should also make it clearer how to apply an expression conditionally.
* | Makefile: do not include dependency-file on `make clean`
 Lynn Lin
2010-07-22-1/+3ab61029
| | | | | | | | | | When envoking clean target, make should not perform the dependency file generation triggered by include.
* | Merge branch 'jh/ignorews'
 Lars Hjemli
2010-07-18-12/+406821d8e
|\ \
| * | ui-diff: Add link to ignore/show whitespace changes in diffs
 Johan Herland
2010-07-18-0/+1572ef913
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a link to the "Diffstat" line to ignore/show whitespace changes in the generated diff. To support this, cgit_commit_link() and cgit_diff_link() has learned to preserve the ctx.qry.ignorews variable. Signed-off-by: Johan Herland <johan@herland.net>
| * | Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs
 Johan Herland
2010-07-18-12/+252cc8b99
| | | | | | | | | | | | | | | | | | | | | | | | The new ctx.qry.ignorews variable is passed via cgit_diff_files() and cgit_diff_tree() to Git's diff machinery. This is equivalent to passing --ignore-all-space to 'git diff'. Signed-off-by: Johan Herland <johan@herland.net>
* | | Merge branch 'lh/macros'
 Lars Hjemli
2010-07-18-5/+785c5d189
|\ \ \
| * | | Add support for environment variable expansion
 Lars Hjemli
2010-03-22-5/+78ba56a37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'stable'
 Lars Hjemli
2010-07-13-0/+460fcf60
|\ \ \ \ | | |_|/ | |/| |
| * | | Reencode author and committer
 Rémi Lagacé
2010-07-13-0/+473ac0fb
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'lh/range-search'
 Lars Hjemli
2010-06-22-4/+86654d5b
|\ \ \ \
| * | | | ui-log.c: allow commit range as search expression
 Lars Hjemli
2010-06-19-4/+8a579fb0
| | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'jh/context-lines'
 Lars Hjemli
2010-06-22-8/+346f92f33
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: cgit.c cgit.h
| * | | | ui-diff: Add links to increase/decrease number of context lines in diffs
 Johan Herland
2010-06-19-1/+23d20313e
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Add URL parameter 'context' for changing the number of context lines in diffs
 Johan Herland
2010-06-19-7/+116180e61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge branch 'jh/path-limit'
 Lars Hjemli
2010-06-22-164/+27537a24e4
|\| | | | | |/ / / |/| | | | | | | | | | | | | | | Conflicts: cgit.h ui-commit.c
| * | | ui-shared.c: path-limit style nitpick
 Lars Hjemli
2010-06-19-4/+2a2cbd3c
| | | | | | | | | | | | | | | | | | | | | | | | This subjectively makes the path-limit bar less visually intrusive. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-log: Preserve path limit in outgoing links
 Johan Herland
2010-06-19-12/+15afc4072
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ui-shared: Preserve path limit in "tab bar" links
 Johan Herland
2010-06-19-5/+67fdff24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ui-commit: Preserve path limit in links to commit page
 Johan Herland
2010-06-19-12/+15685872b
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ui-commit: Preserve path limit in links to tree and diff pages
 Johan Herland
2010-06-19-1/+534c2331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ui-patch: Apply path limit to generated patch
 Johan Herland
2010-06-19-8/+10eac1b67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ui-commit: Limit diff based on path limit in qry.path
 Johan Herland
2010-06-19-4/+4ab42741
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-diff: Teach diffstat to obey path limit
 Johan Herland
2010-06-19-3/+5c46e468
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>