[PATCH] add new option atom-root

2015-08-12 Thread Daniel Reichelt
In reverse-proxy setups cgit's auto-determination of the hostname doesn't work. When set, this option will be used as prefix to all atom-related URLs. While the rest of cgit's URLs are not absolute, this option, if set, should be absolute and include a scheme. Default value: none. Signed-off-by: D

[PATCH] add new option atom-root (was: Relative URL for Atom feed announcement)

2015-08-12 Thread Daniel Reichelt
Hi folks, quite a while back, I suggested to create the link of the atom feed as relative URL [1]. This worked as long as only the feed titles would be viewed but as soon as one would want to actually use the links *within* the feed, one was lost again. After a little bit of thinking I came up w

Re: Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8

2015-08-12 Thread Jason A. Donenfeld
Thanks, applied. ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

Re: Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8

2015-08-12 Thread John Keeping
On Wed, Aug 12, 2015 at 05:23:44PM +0200, Ferry Huberts wrote: > Makefile:8: recipe for target 't0103-log.sh' failed > make[1]: *** [t0103-log.sh] Error 1 > Makefile:75: recipe for target 'test' failed > make: *** [test] Error 2 > Build step 'Execute shell' marked build as failure > Archiving artif

Re: [PATCH v4 1/2] shared: make cgit_diff_tree_cb public

2015-08-12 Thread Jason A. Donenfeld
This series broke the tests. Send a fix? ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH 0/3] Blame UI

2015-08-12 Thread John Keeping
On Wed, Aug 12, 2015 at 05:07:12PM +0200, Jason A. Donenfeld wrote: > Relying on an installed git does impose an additional deployment > requirement we didn't have before. Previously git was just required > for running the tests (developers), but not for deployment. I'd be surprised if most people

Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8

2015-08-12 Thread Ferry Huberts
Forwarded Message Subject: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8 Date: Wed, 12 Aug 2015 17:04:36 +0200 (CEST) From: Pelagic Jenkins (Public) To: ferry.hube...@pelagic.nl See

Re: [PATCH 0/3] Blame UI

2015-08-12 Thread Jason A. Donenfeld
Relying on an installed git does impose an additional deployment requirement we didn't have before. Previously git was just required for running the tests (developers), but not for deployment. I'll wait to receive some other opinions on the topic of relying on having the executables around. Alter

Re: [PATCH] contrib/hooks: add sample post-receive hook using agefile

2015-08-12 Thread John Keeping
On Wed, Aug 12, 2015 at 03:41:57PM +0200, Jason A. Donenfeld wrote: > You might want to add this to > http://git.zx2c4.com/cgit/about/faq Something like this (which probably needs a bit of editing to make the tone consistent with what's already there)? -- >8 -- Subject: [PATCH] faq: add an entry

Re: [PATCH 0/3] Blame UI

2015-08-12 Thread John Keeping
On Wed, Aug 12, 2015 at 03:44:19PM +0200, Jason A. Donenfeld wrote: > On Wed, Aug 12, 2015 at 3:03 PM, John Keeping wrote: > > This is an attempt at adding "blame" support to CGit. Because git.git > > doesn't include the blame implementation in libgit.a, I decided to > > simply invoke git-blame(1

Re: [PATCH v4 2/2] log: allow users to follow a file

2015-08-12 Thread Jason A. Donenfeld
Thanks for rebasing this. Merged to master for some testing. ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

[PATCH v4 2/2] log: allow users to follow a file

2015-08-12 Thread John Keeping
Teach the "log" UI to behave in the same way as "git log --follow", when given a suitable instruction by the user. The default behaviour remains to show the log without following renames, but the follow behaviour can be activated by following a link in the page header. Follow is not the default b

[PATCH v4 1/2] shared: make cgit_diff_tree_cb public

2015-08-12 Thread John Keeping
This will allow us to use this nice wrapper function elsewhere, avoiding dealing with the diff queue when we only need to inspect a filepair. Signed-off-by: John Keeping --- Unchanged since v2/3. cgit.h | 3 +++ shared.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a

Re: Stale Branches

2015-08-12 Thread John Keeping
On Wed, Aug 12, 2015 at 03:49:06PM +0200, Jason A. Donenfeld wrote: > I'd like some review of a few branches that have been sitting for a > while, and perhaps a rebased version: > > jk/http-status-codes: Should be pretty much okay and ready to merge, > but John -- anything that needs to be done he

Re: [PATCH] contrib/hooks: add sample post-receive hook using agefile

2015-08-12 Thread John Keeping
Jason, did you decide not to apply this or was it just lost in the noise? [Thread starts here: http://article.gmane.org/gmane.comp.version-control.cgit/2258 ] On Tue, Dec 23, 2014 at 05:12:41PM +0100, Ferry Huberts wrote: > On 23/12/14 16:48, John Keeping wrote: > > On Tue, Dec 23, 2014 at 04:15:

Re: [PATCH] filters: apply HTML escaping

2015-08-12 Thread Jason A. Donenfeld
Applied with some modifications -- \& goes to \\& because of shell single quote. ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH] filters: apply HTML escaping

2015-08-12 Thread Jason A. Donenfeld
Presumably that document's concern about apos is outdated, and it's kosher in modern browsers? ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH 1/1] git: update to v2.5.0

2015-08-12 Thread Jason A. Donenfeld
Invaluable as always, Christian. Thanks. Merged. ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH] Fix processing of repo.hide and repo.ignore

2015-08-12 Thread Jason A. Donenfeld
Merged, thanks. http://git.zx2c4.com/cgit/commit/?id=dc41a0018058c81ee9a0a2dc6e89f737d7c1c966 ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH] contrib/hooks: add sample post-receive hook using agefile

2015-08-12 Thread Jason A. Donenfeld
Merged. I'll review the backlog of the rest of the ML soon enough. ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH] contrib/hooks: add sample post-receive hook using agefile

2015-08-12 Thread Jason A. Donenfeld
Lost in the noise. I need to allocate some time in the next few weeks to sift through the ML and apply all the patches and merge a change of my own I've sitting on for a bit. ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listi

Stale Branches

2015-08-12 Thread Jason A. Donenfeld
Hi folks, I'd like some review of a few branches that have been sitting for a while, and perhaps a rebased version: jk/http-status-codes: Should be pretty much okay and ready to merge, but John -- anything that needs to be done here? jk/follow-renames: This is old, but a good idea. Can you get t

/about redirected to /about/

2015-08-12 Thread Jason A. Donenfeld
Hi folks, All our links were already pointing to /about/, but it was still possible to load the same content at /about. This posed a problem for using relative links inside markdown or wiki pages. This commit adds support for a 301 redirect: http://git.zx2c4.com/cgit/commit/?id=d7034806a4b1279f62

Re: [PATCH 0/3] Blame UI

2015-08-12 Thread Jason A. Donenfeld
On Wed, Aug 12, 2015 at 3:03 PM, John Keeping wrote: > This is an attempt at adding "blame" support to CGit. Because git.git > doesn't include the blame implementation in libgit.a, I decided to > simply invoke git-blame(1) and parse its porcelain output. Could you possibly just do: #include "gi

Re: [PATCH] contrib/hooks: add sample post-receive hook using agefile

2015-08-12 Thread Jason A. Donenfeld
You might want to add this to http://git.zx2c4.com/cgit/about/faq git checkout wiki vim faq ___ CGit mailing list CGit@lists.zx2c4.com http://lists.zx2c4.com/mailman/listinfo/cgit

[PATCH 0/3] Blame UI

2015-08-12 Thread John Keeping
This is an attempt at adding "blame" support to CGit. Because git.git doesn't include the blame implementation in libgit.a, I decided to simply invoke git-blame(1) and parse its porcelain output. I don't think the result is too hideous (although I do perhaps need to extract some helper functions

[PATCH 3/3] ui-tree: generate blame links

2015-08-12 Thread John Keeping
--- ui-tree.c | 9 + 1 file changed, 9 insertions(+) diff --git a/ui-tree.c b/ui-tree.c index bbc468e..add0344 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -106,6 +106,11 @@ static void print_object(const unsigned char *sha1, char *path, const char *base htmlf("blob: %s (", sha1_to_

[PATCH 1/3] ui-blame: add blame UI

2015-08-12 Thread John Keeping
This is disabled by default and needs to be turned on in the config file. Because libgit.a does not include the blame implementation (which lives in git/builtin/blame.c), this is implemented by executing a git-blame subprocess and parsing its output. Given how expensive the blame operation itself

[PATCH 2/3] ui-shared: add cgit_blame_link()

2015-08-12 Thread John Keeping
--- ui-shared.c | 40 ui-shared.h | 3 +++ 2 files changed, 43 insertions(+) diff --git a/ui-shared.c b/ui-shared.c index ac5a287..da9c3d0 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -338,6 +338,46 @@ void cgit_log_link(const char *name, const char *tit