aboutsummaryrefslogtreecommitdiffstats
path: root/git (unfollow)
Commit message (Collapse)AuthorFilesLines
2016-07-13Look up refs in namespace with cgit_get_sha1Richard Maw1-1/+46
This causes all ref resolving to look for the requested branch inside the current namespace. Previously any form of git revision would be accepted, but ref resolving isn't namespace aware and it would be infeasible to replicate all its behaviour, so we stick to providing the most common cases of a sha1, an absolute ref, or a partial ref. Signed-off-by: Richard Maw <richard.maw@gmail.com>
2016-07-13Set GIT_NAMESPACE when repo.namespace is providedRichard Maw1-0/+5
This causes any namespace-aware code to only handle refs under that namespace. Currently this doesn't do much as the only namespace aware code is in recieve-pack and upload-pack, which are not handled by CGit. Signed-off-by: Richard Maw <richard.maw@gmail.com>
2016-07-13Print out parsed namespace on requestRichard Maw1-0/+2
This is not strictly necessary, as we do not have any way to generate namespace entries from a scan-path, but I'd rather not leave this as a surprise to someone who comes up with a good namespace discovery mechanism. Signed-off-by: Richard Maw <richard.maw@gmail.com>
2016-07-13Parse repo.namespaceRichard Maw2-0/+3
This contains the unexpanded name of the namespace rather than the base ref of the namespace, since the git namespace mechanism works by setting GIT_NAMESPACE and on the first call to get_git_namespace() it gets expanded. We need to save this for a later call to prepare_repo_cmd, rather than trying to process it here, since we can only do it once, and we have other uses for the unexpanded name. Signed-off-by: Richard Maw <richard.maw@gmail.com>
2016-07-13Add a wrapper for get_sha1 called cgit_get_sha1Richard Maw13-22/+29
This will later be changed to include namespace resolution, but the call sites are changed now to keep the changes small. Signed-off-by: Richard Maw <richard.maw@gmail.com>
2016-07-13Fix archive generationRichard Maw1-2/+2
The get_ref_from_filename function is expected to return a sha1. It didn't actually do this, instead returning the ref that would under normal circumstances resolve to that. Since we're going to resolve refs in a way that is namespace aware we need to return the sha1 rather than the ref, since the archive is created by libgit code that is not namespace aware, and it would try to resolve the ref again. This previously worked fine because it would resolve the ref the same way both times. Signed-off-by: Richard Maw <richard.maw@gmail.com>
2016-07-12Fix qry.head leak on errorRichard Maw1-4/+4
This is run soon before exiting so it wasn't leaked for long. Signed-off-by: Richard Maw <richard.maw@gmail.com>
2016-07-12git: update to v2.9.1Christian Hesse2-1/+1
Update to git version v2.9.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-07-06Link with -ldl on GNU/kFreeBSDPeter Colberg1-2/+2
GNU/kFreeBSD uses the FreeBSD kernel with the GNU C library. Signed-off-by: Peter Colberg <peter@colberg.org>
2016-07-06Fix spelling in man pagePeter Colberg1-2/+2
Signed-off-by: Peter Colberg <peter@colberg.org>
2016-07-06ui-shared: fix segfault when defbranch is NULLEric Wong1-1/+1
Not sure if there's a better fix for this. defbranch is NULL here on my setup when a crawler hit an invalid URL, causing strcmp to segfault. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2016-07-05css: consistent use of empty linesChristian Hesse1-0/+6
Signed-off-by: Christian Hesse <mail@eworm.de>
2016-07-05ui-log: color line changesChristian Hesse2-1/+11
Signed-off-by: Christian Hesse <mail@eworm.de>
2016-07-05Avoid ambiguities when prettifying snapshot namesLukas Fleischer3-20/+32
When composing snapshot file names for a tag with a prefix of the form v[0-9] (resp. V[0-9]), the leading "v" (resp. "V") is stripped. This leads to conflicts if a tag with the stripped name already exists or if there are tags only differing in the capitalization of the leading "v". Make sure we do not strip the "v" in these cases. Reported-by: Juuso Lapinlampi <wub@partyvan.eu> Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
2016-06-17git: update to v2.9.0Christian Hesse2-1/+1
Update to git version v2.9.0, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-06-17cgit.mk: Use $PKG_CONFIGKylie McClain1-3/+5
PKG_CONFIG is a variable dictated by autoconf standards; it should be used if set.
2016-06-17md2html: use utf-8 and flush output bufferJason A. Donenfeld1-6/+11
Otherwise we get the classic Python UTF-8 errors, and the text is all out of order. While we're at it, switch to python3 so we only have to support one set of oddball semantics. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Suggested-by: Daniel Campbell <dlcampbell@gmx.com>
2016-06-07Hosted on HTTPS nowJason A. Donenfeld4-5/+5
2016-06-07Bump version.v1.0Jason A. Donenfeld1-1/+1
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-05-20git: update to v2.8.3Christian Hesse2-1/+1
Update to git version v2.8.3, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-05-12ui-diff: action='.' is not correctJason A. Donenfeld1-1/+1
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-05-12forms: action should not be emptyJason A. Donenfeld2-2/+2
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-05-12ui-shared: Remove a name attribute with an empty valueJuuso Lapinlampi1-1/+1
The name attribute is optional in an input element, but it must not be an empty value. See: https://html.spec.whatwg.org/#attr-fe-name See: https://html.spec.whatwg.org/#the-input-element
2016-05-12ui-shared: HTML-ize DOCTYPE and <html>Juuso Lapinlampi1-3/+2
Get rid of the XHTML headers, bringing cgit slowly to the modern age of HTML.
2016-05-12ui-shared: Simplify cgit_print_error_page() logicJuuso Lapinlampi1-4/+2
2016-05-12git: update to v2.8.2Christian Hesse3-2/+2
Update to git version v2.8.2. * Upstream commit 1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (strbuf: give strbuf_getline() to the "most text friendly" variant) changed API. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-05-12ui-log: Simplify decoration codeTim Nordell1-24/+22
The decoration code inside of git returns the decoration type, so utilize this to create the decoration spans. Additionally, use prettify_refname(...) to get the shorter name for the ref. Signed-off-by: Tim Nordell <tim.nordell@logicpd.com>
2016-05-12ui-log: Do not always emit decoration spanTim Nordell1-0/+2
The decoration span does not need to be emited if there aren't any decorations to show. This modification saves slightly on bandwidth. Signed-off-by: Tim Nordell <tim.nordell@logicpd.com>
2016-03-08Renamed repo-specific configuration for enable-html-serving in cgitrc.5.txtMatt Comben1-1/+1
2016-02-26ui-shared: redirect should not exit early for cacheJason A. Donenfeld1-1/+0
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-02-26about: path_info might not be validJason A. Donenfeld1-1/+2
2016-02-23tabs: do not use target=_blankJason A. Donenfeld1-1/+1
2016-02-23css: fix indentationJason A. Donenfeld1-4/+4
2016-02-23css: use less blurry icon for external linkChristian Hesse1-1/+2
Your mileage may vary, but for me the old icon looks blurry. The new one is character 0xf08e from OTF font awsome in size 10. The icon color is black, gray level is adjusted via opacity. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-02-23md2html: Do syntax highlighting tooJason A. Donenfeld1-1/+5
2016-02-23git: update to v2.7.2Christian Hesse2-1/+1
Update to git version v2.7.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-02-22ui-plain: fix to show a repo's root directory listing in plain viewJoe Anakata1-1/+1
This is to fix the case of accessing http://host.com/cgit.cgi/repo.git/plain/ There is code here to make this case work (match_baselen is set to -1 for top-of-the-tree views) but the unsigned to signed comparison was always false in this case, causing an empty directory listing without this fix. Signed-off-by: Joe Anakata <jea-signup-github@anakata.org> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-02-22cmd: redirect empty about/ to homepage or summaryJason A. Donenfeld1-1/+10
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-02-22ui-shared: add homepage to tabsJason A. Donenfeld7-5/+26
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-02-08ui-atom: avoid DATE_STRFTIMEJohn Keeping2-12/+4
Git's DATE_STRFTIME ignores the timezone argument and just uses the local timezone regardless of whether the "local" flag is set. Since Atom accepts ISO8601 dates [1], we can use Git's DATE_ISO8601_STRICT instead, which does get this right. Additionally, we never use the local timezone here so we can use the date_mode_from_type() wrapper to simplify the code a bit. [1] https://tools.ietf.org/html/rfc4287#section-3.3 Signed-off-by: John Keeping <john@keeping.me.uk>
2016-02-08Avoid DATE_STRFTIME for long/short datesJohn Keeping5-13/+10
Git's DATE_STRFTIME ignores the timezone argument and just uses the local timezone regardless of whether the "local" flag is set. Since our existing FMT_LONGDATE and FMT_SHORTDATE are pretty-much perfect matches to DATE_ISO8601 and DATE_SHORT, switch to taking a date_mode_type directly in cgit_date_mode(). Signed-off-by: John Keeping <john@keeping.me.uk>
2016-02-08ui-stats: cast pointer before checking for zeroJohn Keeping1-2/+2
We abuse the "void *util" field as a counter and recently started to cast it to a uintptr_t to avoid risking nasal demons by performing arithmetic on a void pointer. However, compilers are also known to do "interesting" things if they know that a pointer is or isn't NULL. Make this safer by checking if the counter (after casting) is non-zero rather than checking if the pointer is non-null. Signed-off-by: John Keeping <john@keeping.me.uk>
2016-02-08ui-stats: if we're going to abuse void*, do it safelyJason A. Donenfeld1-10/+7
2016-02-08git: update to v2.7.1Christian Hesse2-1/+1
Update to git version v2.7.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-02-08ui-shared: remove cgit_print_date()John Keeping2-21/+0
There are no longer any users of this function. Signed-off-by: John Keeping <john@keeping.me.uk>
2016-02-08ui-atom: use show_date directly for atom datesJohn Keeping1-2/+7
This will allow us to remove cgit_print_date and use Git's show_date consistently. Signed-off-by: John Keeping <john@keeping.me.uk>
2016-02-08ui-shared: use show_date for footer timestampJohn Keeping1-1/+1
Signed-off-by: John Keeping <john@keeping.me.uk>
2016-02-08ui: show ages in the originator's timezoneJohn Keeping5-18/+18
This affects the tooltip showing the full time and the case when a date is sufficiently old to be shown in full rather than as an offset. Signed-off-by: John Keeping <john@keeping.me.uk>
2016-02-08ui-{commit,tag}: show dates in originator's timezoneJohn Keeping2-3/+6
This is done by switching to Git's show_date() function and the mode given by cgit_date_mode(). Signed-off-by: John Keeping <john@keeping.me.uk>
2016-02-08ui-shared: add cgit_date_mode()John Keeping2-0/+10
This returns the correct mode value for use with Git's show_date() based on the current CGit configuration and will be used in the following patches. Signed-off-by: John Keeping <john@keeping.me.uk>