summaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeLines
...
| * | | In side-by-side diff, add support for marking individual characters.Ragnar Ouchterlony2009-11-07-25/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refuses to do so if the left hand side of the diff has different amount of differing lines to the right hand side to avoid confusion. Note that I use the naive dynamic programming approach for calculating the longest common subsequence. We could probably be more efficient by using a better algorithm. The LCS calculating function is O(n*m) and uses up n*m amount of memory too (so if we we compare two strings of length 100, I use an array of 10000 for calculating the LCS). Might want to not calculate LCS if the length of the line is too large. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
| * | | Fixed side-by-side diff bugs related to binary diff and more.Ragnar Ouchterlony2009-09-16-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixed bugs: * "Binary files differ" did not show up either in unidiff or side-by-side-diff. * Subproject diffs did not work for side-by-side diffs. * The ssdiff link on diff pages did not conserve the path. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Polishing of how the side-by-side diff looks.Ragnar Ouchterlony2009-09-16-30/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligned all different files, so that all side-by-side tables look the same. Also made sure that the tables take up the whole browser width. Also various changes to the css to make things easier on the eye. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Add possibility to switch between unidiff and side-by-side-diff.Ragnar Ouchterlony2009-09-16-16/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new config option side-by-side-diffs added, defaulting to 0, meaning unidiff. Also a query option (ss) is used toggle this. In the commit page you can switch between the two diff formats by clicking on the link on the "commit"-row, to the right of (patch). In the diff page you can switch by using the link at the start of the page. All commit-links and diff-links will remember the choice. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | First version of side-by-side diff.Ragnar Ouchterlony2009-09-16-2/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This constitutes the first prototype of a side-by-side diff. It is not possible to switch between unidiff and side-by-side diff at all at this stage. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'master' of http://op-co.de/cgitLars Hjemli2009-12-08-17/+31
|\ \ \ \
| * | | | "max-blob-size" config var to limit generated HTML sizeGeorg Lukas2009-11-28-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it is not feasible to generate the HTML pretty-print for large files, especially if a source-filter is involved or binary data is to be displayed. The "max-blob-size" config var allows to disable HTML output for blobs bigger than X KBytes. Plain downloads are not affected. Signed-off-by: Georg Lukas <georg@op-co.de>
| * | | | cgit.css: highlight directories in treeGeorg Lukas2009-11-28-0/+5
| | | | |
| * | | | syntax highlighting for all formats supported by "highlight"Georg Lukas2009-11-19-17/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The highlight tool can be given any of the supported file extensions as its -S parameter. This patch replaces the case-switch by extracting the extension from the supplied file name and passing it to highlight. However, this requires a shell supporting the ${var##pattern} syntax, like dash or bash. Unknown extensions cause a fall-back to plain text using the --force switch. Error messages are redirected to /dev/null. A special case maps Makefile and Makefile.* to the "mk" extension. The total overhead is reduced by calling "exec highlight". No forks are needed during script execution. Signed-off-by: Georg Lukas <georg@op-co.de>
* | | | Merge branch 'stable'Lars Hjemli2009-12-08-2/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Don't crash when a repo-specific readme file is usedSami Kyöstilä2009-12-08-2/+2
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Lars Hjemli2009-11-07-3/+5
|\| |
| * | shared.c: return original errnoLars Hjemli2009-11-07-3/+5
| | | | | | | | | | | | | | | Noticed-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Add NO_OPENSSL optionMikhail Gusarov2009-11-07-3/+12
| | | | | | | | | | | | | | | | | | | | | Linking with OpenSSL is not always desirable. Add NO_OPENSSL option to use SHA-1 code bundled with Git. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
* | | Merge branch 'stable'Lars Hjemli2009-11-07-3/+8
|\| |
| * | Close fd on error in readfile()Rys Sommefeldt2009-11-07-2/+7
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Nov is the correct abbreviationDanijel Tašov2009-11-07-1/+1
| | |
* | | ui-shared.c: prettify download links when generated from tag pageLars Hjemli2009-10-16-2/+7
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | ui-tag: make output more similar to commit viewLars Hjemli2009-10-06-6/+6
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | ui-tag: add snapshot linksAlexey Nezhdanov2009-10-06-0/+12
| | | | | | | | | | | | | | | Signed-off-by: Alexey Nezhdanov <snakeru@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Skip leading "/" in url querystring valueStefan Bühler2009-10-06-0/+2
|/ / | | | | | | | | | | | | | | Makes it easier to rewrite :) lighttpd-sandbox: rewrite "/cgit.cgi?url=%{enc:request.path}&%{request.query}"; Signed-off-by: Stefan Bühler <source@stbuehler.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Fix repolist search links with virtual rootGeoff Johnstone2009-09-20-1/+2
| | | | | | | | | | Signed-off-by: Geoff Johnstone <geoff.johnstone@googlemail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | cgitrc.5.txt: Change repo.group to section in example config.Loui Chang2009-09-14-4/+4
| | | | | | | | | | Signed-off-by: Loui Chang <louipc.ist@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | cgitrc.5.txt: Add mansource and manmanual.Loui Chang2009-09-14-0/+3
|/ | | | | | | This prevents FIXMEs from appearing. Signed-off-by: Loui Chang <louipc.ist@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* CGIT 0.8.3Lars Hjemli2009-09-13-1/+1
| | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Merge branch 'stable'Lars Hjemli2009-09-13-1/+1
|\
| * CGIT 0.8.2.2Lars Hjemli2009-09-13-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'lh/repo-scan'Lars Hjemli2009-09-13-80/+329
|\ \
| * | cgit.c: respect repo-local 'snapshots' option for --scan-pathLars Hjemli2009-08-24-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repo-specific 'snapshots' option is bitwise AND'ed with the global 'snapshots' option during parsing, and since the global cgitrc hasn't been parsed when --scan-path is processed the global 'snapshots' will always be 0 (i.e. no repo-specific 'snapshots' setting will have any effect). This patch fixes the issue by setting the global 'snapshots' mask to 0xFF (hence relying on later parsing of the generated cgitrc repolist to do the right thing). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: only print first line of repo.desc in print_repo()Lars Hjemli2009-08-24-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Since repo.desc might have been populated by reading the 'description' file in GIT_DIR, it may contain newlines. And by printing the literal value, we may then generate an invalid cgitrc include-file. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add and use cgit_find_stats_periodname() in print_repo()Lars Hjemli2009-08-24-0/+12
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: generate repo.snapshots in print_repo()Lars Hjemli2009-08-24-0/+25
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: add missing options to print_repo()Lars Hjemli2009-08-24-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Note: print_repo() still ignores repo.max-stats and repo.snapshots, which both requires additional work since these settings are represented internally as an enum and a bitmap. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | shared.c: initialize cgit_repo structs properlyLars Hjemli2009-08-24-0/+1
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add config option 'enable-filter-overrides'Lars Hjemli2009-08-24-11/+26
| | | | | | | | | | | | | | | | | | | | | This option must be enabled if repo-specific cgitrc files should be allowed to override any of the 'filter' options. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgitrc.5.txt: fix markup errorsLars Hjemli2009-08-24-9/+10
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-repolist: handle empty sections similar to NULL sectionsLars Hjemli2009-08-24-7/+12
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add support for repo-local cgitrc fileLars Hjemli2009-08-24-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When recursively scanning a directory tree looking for git repositories, cgit will now parse cgitrc files found within such repositories. The repo-specific config files can include any repo-specific options except 'repo.url' and 'repo.path'. Also, in such config files the 'repo.' prefix can not be used, i.e. the valid options then becomes: * name * clone-url * desc * ower * defbranch * snapshots * enable-log-filecount * enable-log-linecount * max-stats * module-link * section * about-filter * commit-filter * source-filter * readme Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: refactor repo_config() from config_cb()Lars Hjemli2009-08-24-41/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new function repo_config() is used to handle all 'simple' repo options, for the following reasons: * code readability * parser performance * upcoming support for repo-local cgitrc files during scanning Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-repolist.c: sort by section name, repo name as defaultLars Hjemli2009-08-24-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | When no sorting is requested by the client, cgit will now sort by section name followed by repo name. This allows repos to be registered/ discovered independently of their display order. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add config option 'repo.section'Lars Hjemli2009-08-24-0/+5
| | | | | | | | | | | | | | | | | | | | | This option can be used to specify the section name for the current repository. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Introduce 'section' as canonical spelling for 'repo.group'Lars Hjemli2009-08-24-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | The 'repo.' prefix should be reserved for repo-specific options, but the option 'repo.group' must still be honored to stay backwards compatible. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add support for --scan-path command line optionLars Hjemli2009-08-24-1/+2
| | | | | | | | | | | | | | | | | | | | | This is an alias for --scan-tree (which might be deprecated in the future). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Rename 'repo.scan' to 'scan-path'Lars Hjemli2009-08-24-10/+10
| | | | | | | | | | | | | | | | | | | | | The 'repo.' prefix will soon be reserved for repo-specific config options. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgitrc.5.txt: document repo.scan and cache-scanrc-ttlLars Hjemli2009-08-24-0/+9
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: add support for caching autodetected repositoriesLars Hjemli2009-08-24-1/+75
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: make print_repolist() and print_repo() reusable for cachingLars Hjemli2009-08-24-12/+12
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cache.h: export hash_str()Lars Hjemli2009-08-24-0/+2
| | | | | | | | | | | | | | | | | | This function will be reused to cache the result of tree scanning. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: add support for cgitrc option 'repo.scan'Lars Hjemli2009-08-24-0/+2
| | | | | | | | | | | | | | | | | | When specified, the specified path will be scanned for repositories. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | scan-tree: detect non-bare repository and stop scanning earlyLars Hjemli2009-08-24-0/+4
| | | | | | | | | | | | | | | | | | | | | We don't want to descend into every subdirectory of a git repository with a workdir. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
powered by cgit and git | oriole.systems | how to verify signatures