Re: cgit simple-authentication.lua problem

2023-06-15 Thread John Keeping
On Thu, Jun 15, 2023 at 09:40:35AM +0200, Yazar Strulik wrote: > I need some help with getting the simple-authentication.lua running. > > I'm using gitolite as my git base with cgit as my front-end and apache2 as > the webserver. > The main cgit configuration works but it cant interpret the .lua f

Re: cgit with busybox httpd

2023-03-06 Thread John Keeping
m Mo., 6. März 2023 um 12:41 Uhr schrieb John Keeping : > > > On Mon, Mar 06, 2023 at 11:13:10AM +0100, Andreas Mahling wrote: > > > I'm in the process to configure a cgit instance for my private network > > at home. > > > Because my internet router will be the hos

Re: cgit with busybox httpd

2023-03-06 Thread John Keeping
On Mon, Mar 06, 2023 at 11:13:10AM +0100, Andreas Mahling wrote: > I'm in the process to configure a cgit instance for my private network at > home. > Because my internet router will be the host for git and cgit, I'm > looking for a ligthweight setup. > I would like to use busybox httpd as webserv

Re: configuring appearance from within repository

2023-01-26 Thread John Keeping
On Thu, Jan 26, 2023 at 06:42:19PM +0100, Spam Receiver wrote: > Hey there, I recently found cgit and I'm very happy about it's > performance, ease of use and overall simplicity. There is only one > thing that I did not manage to set up yet: > > I want to configure repo-specific settings from with

Re: Greater use of the HTML title (for tabs and title bars) in cgit

2022-11-06 Thread John Keeping
Hi Graham, On Sun, Nov 06, 2022 at 11:01:25AM +, Graham Perrin wrote: > for 1.0 > included: > > > * Show reverse paths in title bar so that browser tab shows filename. > > Please, are there plans to broaden/refine use of titles?

Re: git notes for the Linux kernel

2022-10-18 Thread John Keeping
On Mon, Oct 17, 2022 at 01:50:04PM +0200, Vegard Nossum wrote: > I've improved the support for git notes in cgit, including the ability > to load notes from a separate repository than the one you are viewing. > > My use case is using a separate repository of git notes for the Linux > kernel to ann

Re: Downloading objects hangs up around 65kB

2022-09-17 Thread John Keeping
On Fri, Sep 16, 2022 at 10:55:39PM +0300, Valdis Vītoliņš wrote: > Probably it is issue on 64-bit ARM architecture, because I tested that it > works on x86_64 virtual machine. > > Some time ago (because I haven't used HTTPS protocol for repositories > recently) downloading plain objects/blobs hang

Re: Angle brackets - < and >

2022-09-17 Thread John Keeping
On Sat, Sep 17, 2022 at 03:32:48PM +0100, Graham Perrin wrote: > Commit messages > > and > > appear OK. > > In corresp

Re: Weird interactions betwen cache and module-link

2022-03-26 Thread John Keeping
On Fri, Mar 25, 2022 at 09:44:48PM +, Gianni Ceccarelli wrote: > This patch seems to fix the problem. Nice catch! This definitely looks like an oversight. Would you like to type up a proper patch with a commit message and Signed-off-by certification? We use the same process as git.git so th

[PATCH] css: blame: reset font size for oid

2022-02-13 Thread John Keeping
of the table back into step. Signed-off-by: John Keeping --- cgit.css | 4 1 file changed, 4 insertions(+) diff --git a/cgit.css b/cgit.css index dfa144d..1b848cf 100644 --- a/cgit.css +++ b/cgit.css @@ -363,6 +363,10 @@ div#cgit table.blame td.lines > div > pre { top: 0; }

[PATCH] treewide: use release_commit_memory()

2022-02-13 Thread John Keeping
uture will correctly fill out the fields again. release_commit_memory() does not set parents to zero, so keep that for additional safety in case CGit checks this without calling parse_commit() again. Signed-off-by: John Keeping --- ui-atom.c | 3 +-- ui-log.c | 6 ++ ui-stats.c | 3 +-- 3

[PATCH] blame: add a link to the parent commit

2022-02-13 Thread John Keeping
->s_lno is mostly the right thing, but it is the line number in the post-image of the target commit whereas the link is to the parent of that commit, i.e. the pre-image of the target.) Suggested-by: Alejandro Colomar Signed-off-by: John Keeping --- ui-blame.c | 9 + 1 file changed

Re: [PATCH] Add "default-tab" and "root-default-tab" configuration options

2022-02-13 Thread John Keeping
On Sun, Jan 30, 2022 at 06:04:10PM +, equa wrote: > These options allow the user to specify a page to display at the root > repository/index location instead of the default summary or repository list. > > Signed-off-by: equa We need a real name for the author and sign-off here. > diff --git

Re: [PATCH] add 'go-import' meta tag if in a repo

2022-01-09 Thread John Keeping
Please include some description here about why this change is desirable. On Sat, Jan 08, 2022 at 04:55:59PM -0700, Derek Stevens wrote: > Signed-off-by: Derek Stevens > --- > ui-shared.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/ui-shared.c b/ui-shared.c > index acd8ab5..0f57a

Re: [PATCH 0/2] Support of test results

2021-10-07 Thread John Keeping
On Mon, Oct 04, 2021 at 01:22:34PM +0300, Sergey Bronnikov wrote: > From: Sergey Bronnikov > > Git SCM allows to store information in so called notes [1] and cgit > allows to show notes that placed to default reference > ('refs/notes/commits') and attached to certain commits. It is convenient > t

Re: [PATCH] cache: Tolerate short writes in print_slot

2021-10-07 Thread John Keeping
On Fri, Sep 10, 2021 at 05:18:41PM +0300, Hristo Venev wrote: > sendfile() can return after a short read/write, so we may need to call > it more than once. Furthermore, not all files support sendfile(), so we > may need to fall back to read/write. Have you seen these errors in practice, or is this

Re: OpenBSD - Error reading owner-info for : No such file or directory (2)

2021-02-25 Thread John Keeping
On Thu, Feb 25, 2021 at 05:00:57PM +1000, Paul W. Rankin wrote: > I'm running cgit v1.2.3 on OpenBSD 6.8 with httpd and slowcgi. I'm > getting tons of log errors in the form: > Error reading owner-info for : No such file or directory > (2) > > I've found this Stack Overflow question > http

Re: User-configurable log graph option

2021-02-19 Thread John Keeping
On Thu, Feb 18, 2021 at 02:31:26PM -0800, Kian Kasad wrote: > I'm using cgit on my website and I'm wondering if it's possible to allow > the user (i.e. the person visiting the site) to choose whether or not > the commit graph is displayed on the log page. > > If this isn't currently possible, what

Re: [PATCH] Handle tags outside of refs/tags gracefully.

2021-01-05 Thread John Keeping
ag: accept tags not under refs/tags/ In log views, we decorate commits with tags under any ref hierarchy, which generates links to ui-tag with, for example, refs/weird/tag. By forcing a refs/tags/ prefix onto this, a 404 not found error is guaranteed. Taking inspiration from Git's ref_rev_pars

Re: cgit 1.2.3: lighttpd 1.4.57, AlpineLinux [edge]: using cache breaks delivery

2020-12-21 Thread John Keeping
On Mon, Dec 21, 2020 at 05:26:19PM +0100, Steffen Nurpmeso wrote: > I discovered today that cgit no longer delivers pages, and it must > have been like that for some time. The server looks show > successful delivery, the cgit cache is populated and rotated just > correctly, but all cgit delivers i

Re: Opening each logo-link in a separate browser tab

2020-09-10 Thread John Keeping
On Thu, Sep 10, 2020 at 11:36:10AM +0200, jean-christophe manciot wrote: > Is there a special format for that cgitrc keyword to open each > logo-link in a different tab/window? > > It could be for instance something like : > logo-link="url" target="_blank" > > where url is a valid Uniform Resourc

Re: Possible case-sensitivity issue in module-link

2020-08-29 Thread John Keeping
such a module-link. Compare submodule names case-insensitively to avoid this problem. This may break a use case where two submodules differ only in case, but that is much less likely than a submodule name using uppercase characters. Signed-off-by: John Keeping --- shared.c | 1 + 1 file chan

Re: renamed default branch, no "Idle" value on index at all

2020-08-21 Thread John Keeping
On Thu, Aug 20, 2020 at 01:07:49PM +0200, François Kooman wrote: > I switched the default branch from master to main in some of my > repositories. However, it seems cgit does not consider this when > determining "Idle" on the index page. It shows nothing in the column "Idle". > > The FAQ [1] has

Re: [feature request] Provide Atom feed for tags

2019-08-15 Thread John Keeping
On Tue, Aug 13, 2019 at 06:28:24PM +, Yu Franklin wrote: > Does CGit currently provide Atom feed for tags of a repository? > Something similar to > > https://github.com/git/git/tags.atom > > I know that we have Atom feed for a branch, but not for all tags of a > certain repository. Typically

Re: [PATCH] Make default pages configurable

2019-08-15 Thread John Keeping
On Tue, Aug 13, 2019 at 07:22:21PM +0200, Naaam Favier wrote: > This adds two configuration options, "default-page" and > "default-page-repo", allowing to change the default page for > the whole site and repositories, respectively. > A few changes were required to make this work, namely: > - the "i

Re: Nesting repositories under a common folder?

2019-07-24 Thread John Keeping
On Wed, Jul 24, 2019 at 02:05:38PM -0500, Reuben Popp wrote: > Excuse me if I sound a bit daft here... can I add javascript to cgit, or > how else would I collapse reposection classes? You can use the "head-include" directive in cgitrc to include arbitrary content in the element generated by CGit

Re: Nesting repositories under a common folder?

2019-07-24 Thread John Keeping
On Wed, Jul 24, 2019 at 01:01:27PM -0500, Reuben Popp wrote: > Excuse me if this has been answered before, but is there a way to nest > repositories under a common directory visually in cgit? > > For example, > > root_directory (not a repo) > |- Project A (directory, not a repo) > | |- Proj

Re: [PATCH] ui-shared: restrict to 15 levels

2019-05-20 Thread John Keeping
On Mon, May 20, 2019 at 09:55:06PM +0200, Jason A. Donenfeld wrote: > Perhaps a more ideal version of this would be to not print breadcrumbs > at all for paths that don't exist in the given repo at the given oid. > > Signed-off-by: Jason A. Donenfeld > Reported-by: Fydor Wire Snark > --- > I've

Re: [PATCH 1/1] RFC: git: update to v2.21.0-rc0

2019-02-07 Thread John Keeping
em in advance of the version bump? I don't think there's any dependency on Git changes for these. > Signed-off-by: Christian Hesse Even without the strncat changes pulled out, this looks sensible, so: Reviewed-by: John Keeping > --- > Makefile| 4 ++-- > git

Re: Slash after /about

2019-01-30 Thread John Keeping
On Tue, Jan 29, 2019 at 09:21:01AM +, dilyan.palau...@aegee.org wrote: > For CGI I use thttpd and it tends to remove terminating slashes in the > requests. > > cgit wants to have slash after about/ . > > So they do not work together, endless loop happens. Proposed fix: > > diff --git a/cmd

Re: How to check error during syntax highlighting

2018-12-24 Thread John Keeping
On Mon, Dec 24, 2018 at 06:37:12PM +0900, Katsuya Horiuchi wrote: > I have been playing with filters, specifically syntax-highlighting.py, > in order to render markdown in tree. > However, I would see empty output when something goes wrong. > > Is it possible to check error during syntax highlight

Re: How to format the content of all markdown files, not just the about pages?

2018-12-23 Thread John Keeping
On Sun, Dec 23, 2018 at 03:25:00PM +0100, jean-christophe manciot wrote: > with the following setup, no markdown file is correctly formatted besides > the about pages: > *cgit 1.2.1-14-g55ebd5e* > *git 1:2.20.1-1* > in */etc/cgitrc*: > ---

Re: [PATCH 1/1] css: Change #git font-size to 13px

2018-08-26 Thread John Keeping
On Sun, Aug 26, 2018 at 02:59:36PM +0200, Petr Vorel wrote: > Previous size font-size 10pt (which is 13.px) hide underscore, > when used with highlight with background-color on modified lines. > Here underscore of crypto_blkcipher is hidden on by background color of > newly added line. > > st

Re: [PATCH 1/1] filters: generate anchor links from markdown

2018-08-25 Thread John Keeping
On Sat, Aug 25, 2018 at 11:11:39AM -0600, Jason A. Donenfeld wrote: > The effect is just anchor links, but it doesn't add an actual ToC, right? >From the docs [0], it looks like it will add an actual ToC if you have a placeholder in the document to request one. But if you don't have that, then it

Re: The logo of the about page is never shown although it is displayed on all other pages

2018-08-25 Thread John Keeping
This sounds like a cache issue somewhere, whether that's CGit or your browser or somewhere in between. If the cache TTL was originally longer, then that will have been included in the HTTP Expires header on earlier results so it's possible that the older response was still cached based o

Re: The logo of the about page is never shown although it is displayed on all other pages

2018-08-25 Thread John Keeping
On Sat, Aug 25, 2018 at 09:41:44AM +0200, jean-christophe manciot wrote: > I use *v1.2.1* with the patch regarding the table of contents > > . > I have the following setup

Re: [PATCH 1/1] filters: generate anchor links from markdown

2018-08-25 Thread John Keeping
On Fri, Jul 13, 2018 at 09:48:27PM +0200, Christian Hesse wrote: > From: Christian Hesse > > This makes the markdown filter generate anchor links for headings. > > Signed-off-by: Christian Hesse > --- > filters/html-converters/md2html | 17 +++-- > 1 file changed, 15 insertions(+),

Re: [PATCH 1/1] RFC: git: update to v2.19.0-rc0

2018-08-21 Thread John Keeping
On Tue, Aug 21, 2018 at 09:21:14AM +0200, Christian Hesse wrote: > From: Christian Hesse > > Changelog to be writting... :) More comments below, but it looks like there's a lot of unrelated cleanups here. I think only the the_repository parameter addition is required for Git 2.19. The other ch

Re: git-fsck complains about cgit repo

2018-08-15 Thread John Keeping
On Wed, Aug 15, 2018 at 09:32:18AM -0400, Konstantin Ryabitsev wrote: > Since cgit is mirrored to git.kernel.org, which gets routine fsck > treatment, I started getting the following error reports: > > error: bad config line 5 in blob .gitmodules > error in blob 51dd1eff1edc663674df9ab85d2786

Re: How to apply about-formatting.sh to appropriate tree files

2018-08-11 Thread John Keeping
On Sat, Aug 11, 2018 at 01:51:09PM +0200, jean-christophe manciot wrote: > I could not find a way with v1.2.1 to get any markdown/html files formatted > correctly when read from the tree. > I already successfully use the > "about-filter=/usr/local/lib/cgit/filters/about-formatting.sh" setting in >

Re: RFE: changelog between two revisions

2018-07-24 Thread John Keeping
On Tue, Jul 24, 2018 at 03:14:49PM -0400, Konstantin Ryabitsev wrote: > A very minor feature request -- it would be nice if there was a way to > limit /log/ view to only changes between two revisions. In other words, > I was looking for a way to replicate this file: > > https://cdn.kernel.org/pu

Re: [PATCH] Record repo.snapshot-prefix in the per-repo config

2018-07-17 Thread John Keeping
On Tue, Jul 17, 2018 at 12:38:22PM -0400, Konstantin Ryabitsev wrote: > Even if we find snapshot-prefix in the repo configuration, we are not > writing it out into the rc- file, so setting the value does not have any > effect. > > Signed-off-by: Konstantin Ryabitsev Reviewed-b

Re: [PATCH v4 00/16] Render READMEs inline in tree view

2018-07-03 Thread John Keeping
On Tue, Jul 03, 2018 at 09:34:26PM +0200, Jason A. Donenfeld wrote: > On Thu, Jun 28, 2018 at 10:29 AM John Keeping wrote: > > Yeah, I don't think there's any way to avoid exec'ing twice in source > > view - we need to run the source filter for output and we need th

Re: md2html is inoperative

2018-06-30 Thread John Keeping
On Thu, Jun 28, 2018 at 12:50:49PM +0200, jean-christophe manciot wrote: > On Ubuntu 18.10 cosmic > cgit 1.1+git2.10.2-3build1 > python3: 3.6.5-3 > python3-docutils: 0.14+dfsg-3 > python3-markdown: 2.6.9-1 > python3-pygments: 2.2.0+dfsg-1 > > In /etc/cgitrc: > about-filter=/usr/lib/cgit/filters/ab

Re: [PATCH v4 16/16] md2html: change css name to not conflict with highlight

2018-06-28 Thread John Keeping
On Thu, Jun 28, 2018 at 05:58:42AM +0800, Andy Green wrote: > On 06/28/2018 01:37 AM, Jason A. Donenfeld wrote: > > This seems like an obvious thing to merge, but I'm actually not so > > certain I understand its necessity. md2html uses the highlight class. > > Our css uses the highlight class. You'

Re: [PATCH v4 00/16] Render READMEs inline in tree view

2018-06-28 Thread John Keeping
On Thu, Jun 28, 2018 at 01:22:34AM +0200, Jason A. Donenfeld wrote: > Hey John, > > Thanks tons for your input, as always. > > On Wed, Jun 27, 2018 at 9:51 PM John Keeping wrote: > > - It is desirable to have the existing source view in addition to the > > render

Re: [PATCH v3 1/1] snapshot: support tar signature for compressed tar

2018-06-27 Thread John Keeping
On Wed, Jun 27, 2018 at 06:34:56PM +0200, Jason A. Donenfeld wrote: > I've merged all the surrounding changes, but I'm not quite satisfied > with the implementation of this one. > > > + for (f_tar = cgit_snapshot_formats; strcmp(f_tar->suffix, ".tar") > > != 0; f_tar++) > > +

Re: Fancier Source view [Was: Re: [PATCH v4 00/16] Render READMEs inline in tree view]

2018-06-27 Thread John Keeping
On Wed, Jun 27, 2018 at 07:26:13PM +0200, Jason A. Donenfeld wrote: > Splitting out this issue into a different thread, because I think it's > orthogonal to the other topic. > > On Wed, Jun 27, 2018 at 7:18 PM Jason A. Donenfeld wrote: > > In adding rendering of arbitrary files in blob view, this

Re: [PATCH v4 11/16] md2html: add asset mapping

2018-06-27 Thread John Keeping
On Wed, Jun 27, 2018 at 07:32:56PM +0200, Jason A. Donenfeld wrote: > On Wed, Jun 20, 2018 at 12:13 PM Andy Green wrote: > > > md2html > > > The trailing "/" is important. > > Can we make it not important? That is, if the type is always > explicitly a directory, treat it as such using t

Re: [PATCH v4 00/16] Render READMEs inline in tree view

2018-06-27 Thread John Keeping
Hi Jason, On Wed, Jun 27, 2018 at 07:18:57PM +0200, Jason A. Donenfeld wrote: > With the current state of this series, cgit would have the following options: > > - render. > - inline-readme > - render-filter This one is only a concept, not a configuration value (just a note since I couldn't reme

Re: [PATCH v3 6/6] line-range-highlight: copy URL to clipboard on click

2018-06-24 Thread John Keeping
On Sun, Jun 24, 2018 at 11:06:45PM +0800, Andy Green wrote: > On June 24, 2018 9:39:35 PM GMT+08:00, John Keeping > wrote: > >On Sun, Jun 24, 2018 at 08:00:08PM +0800, Andy Green wrote: > >> On June 24, 2018 7:42:33 PM GMT+08:00, John Keeping > > wrote: > >>

Re: [PATCH v3 6/6] line-range-highlight: copy URL to clipboard on click

2018-06-24 Thread John Keeping
On Sun, Jun 24, 2018 at 08:00:08PM +0800, Andy Green wrote: > > > On June 24, 2018 7:42:33 PM GMT+08:00, John Keeping > wrote: > >On Sun, Jun 24, 2018 at 10:44:54AM +0800, Andy Green wrote: > >> Since the only reason to click on the line number links > >>

Re: [PATCH] cgit.css: add dynamic age update

2018-06-24 Thread John Keeping
Subject should be "cgit.js: " not cgit.css! On Sun, Jun 24, 2018 at 03:59:51PM +0800, Andy Green wrote: > This patch updates the emitted "ages" dynamically on the client side. > > After updating on completion of the document load, it sets a timer > to update according to the smallest age it found

Re: [PATCH v3 6/6] line-range-highlight: copy URL to clipboard on click

2018-06-24 Thread John Keeping
On Sun, Jun 24, 2018 at 10:44:54AM +0800, Andy Green wrote: > Since the only reason to click on the line number links > is to get the corresponding #URL to share, this patch > makes that process more convenient by copying the > highlit area, be it a single line or a range, to the > clipboard on eac

Re: [PATCH v3 5/6] line-range-highlight: onclick handler and range selection

2018-06-24 Thread John Keeping
On Sun, Jun 24, 2018 at 10:44:49AM +0800, Andy Green wrote: > This allows the user to select line ranges simply by clicking on the > line number links. > > - No selected highlit line, or a range already selected, causes the > click to highlight just the clicked line as usual. > > - Clicking on

Re: [PATCH v3 2/6] ui-shared: line range highlight: introduce javascript

2018-06-24 Thread John Keeping
The subject is "ui-shared: ..." but should be "cgit.js" now I think. On Sun, Jun 24, 2018 at 10:44:34AM +0800, Andy Green wrote: > diff --git a/cgit.js b/cgit.js > index e69de29..501c98f 100644 > --- a/cgit.js > +++ b/cgit.js > @@ -0,0 +1,53 @@ > +function cgit_line_range_highlight() > +{ > +

Re: [PATCH v3 1/6] config: add js

2018-06-24 Thread John Keeping
-by: Andy Green For the code changes, Reviewed-by: John Keeping One comment on the documentation below... > --- > diff --git a/cgitrc.5.txt b/cgitrc.5.txt > index 99fc799..bdd799f 100644 > --- a/cgitrc.5.txt > +++ b/cgitrc.5.txt > @@ -248,6 +248,12 @@ inline-readme:: >

Re: [PATCH 2/2] ui-shared: emit root-desc-html and repo.desc-html after their text counterparts

2018-06-23 Thread John Keeping
On Sat, Jun 23, 2018 at 07:08:08PM +0800, Andy Green wrote: > > > On 06/23/2018 06:53 PM, John Keeping wrote: > > On Sat, Jun 23, 2018 at 06:33:38PM +0800, Andy Green wrote: > >> > >> > >> On 06/23/2018 06:28 PM, John Keeping wrote: > >>>

Re: [PATCH v4 00/16] Render READMEs inline in tree view

2018-06-23 Thread John Keeping
E file in tree view > md2html: add asset postfix arg > ui-shared: deduplicate some code in repolink > ui-shared: add helper for generating non-urlencoded links > render: adapt for providing extra filter args for plain > md2html: change css name to not conf

Re: [PATCH 2/2] ui-shared: emit root-desc-html and repo.desc-html after their text counterparts

2018-06-23 Thread John Keeping
On Sat, Jun 23, 2018 at 06:33:38PM +0800, Andy Green wrote: > > > On 06/23/2018 06:28 PM, John Keeping wrote: > > On Thu, Jun 21, 2018 at 02:46:47PM +0800, Andy Green wrote: > >> Where root-desc and repo.desc are used in the header region, also > >> emit thei

Re: [PATCH] noheader: place branch combo on tabs if no header

2018-06-23 Thread John Keeping
the left of the tabs line if noheader=1. It doesn't > change anything if noheader is not set. > > Signed-off-by: Andy Green This makes noheader=1 a lot more usable! I wonder if the branch combo should be somewhere to the right of the main tabs, but I don't feel stron

Re: [PATCH 2/2] ui-shared: emit root-desc-html and repo.desc-html after their text counterparts

2018-06-23 Thread John Keeping
On Thu, Jun 21, 2018 at 02:46:47PM +0800, Andy Green wrote: > Where root-desc and repo.desc are used in the header region, also > emit their html counterparts afterwards if they are defined. > > Where root-desc are repo.desc are used outside the header, > eg in the repo list, leave it as it is wit

Re: [PATCH v2 1/5] config: add js

2018-06-23 Thread John Keeping
On Thu, Jun 21, 2018 at 05:34:49PM +0800, Andy Green wrote: > Just like the config allows setting css URL path, > add a config for setting the js URL path > > Signed-off-by: Andy Green > --- > diff --git a/cgitrc.5.txt b/cgitrc.5.txt > index 99fc799..a692aa5 100644 > --- a/cgitrc.5.txt > +++ b/cg

Re: [PATCH v2 2/5] cgit.js: introduce

2018-06-23 Thread John Keeping
On Thu, Jun 21, 2018 at 05:34:54PM +0800, Andy Green wrote: > Similar to how cgit.css is handled, we will also provide and > reference a cgit.js for javascript from now on. > > Signed-off-by: Andy Green > --- I think we can merge this and the previous patch, along with the change to output a

Re: [PATCH v2 3/5] ui-shared: introduce line range highlight javascript

2018-06-23 Thread John Keeping
On Thu, Jun 21, 2018 at 05:34:59PM +0800, Andy Green wrote: > This adds a small css class, a clientside js function in > cgit.js, and ajs inline script caller in ui-shared > functions to interpret the # part of the URL > on the client, and apply a highlight to filtered source. > > Unlike blame hig

Re: cache-size implementation downsides

2018-06-20 Thread John Keeping
On Wed, Jun 20, 2018 at 08:01:11AM +0200, Christian Hesse wrote: > John Keeping on Sat, 2018/06/16 16:46: > > -- >8 -- > > Subject: [PATCH] cache: close race window when unlocking slots > > You should add a "From:" line for easy git-am. ;) "git am --sci

Re: cache-size implementation downsides

2018-06-19 Thread John Keeping
On Sat, Jun 16, 2018 at 04:46:21PM +0100, John Keeping wrote: > On Wed, Jun 13, 2018 at 03:02:42PM -0400, Konstantin Ryabitsev wrote: > > 2. I have witnessed cache corruption due to collisions (which is > > a bug in itself). One of our frontends was hit by a lot of agressive

Re: [PATCH v3 17/17] render: adapt for providing extra filter args for plain

2018-06-19 Thread John Keeping
; "/cgit/plain/doc-assets/overview.png?h=mybranch" > > If the same document is viewed from a different rev in cgit, the > processed markdown url will change to match the cgit context, even > though the markdown relative URL is the same for all versions. > > Signed-

Re: [PATCH v3 16/17] ui-shared: add helper for generating non-urlencoded links

2018-06-19 Thread John Keeping
On Tue, Jun 19, 2018 at 05:02:47PM +0800, Andy Green wrote: > We are going to have to produce plain links in the next patch. > But depending on config, the links are not simple. > > Reproduce the logic in repolink() to generate correctly- > formatted links in a strbuf, without urlencoding, in a re

Re: [PATCH v3 12/17] ui-tree: render any matching README file in tree view

2018-06-19 Thread John Keeping
me files rendering them inline. There's only one now, the commit message isn't quite accurate any more! > Signed-off-by: Andy Green > Reviewed-by: John Keeping > --- > ui-tree.c | 53 - > 1 file changed, 52 insertions(+)

Re: [PATCH v3 15/17] ui-shared: deduplicate some code in repolink

2018-06-19 Thread John Keeping
On Tue, Jun 19, 2018 at 05:02:42PM +0800, Andy Green wrote: > 8 lines of code are duplicated in repolink, clean it > so the common code appears once > > Signed-off-by: Andy Green Reviewed-by: John Keeping > --- > ui-shared.c | 26 ++ > 1 file c

Re: [PATCH v3 08/17] ui-blame: free read_sha1_file() buffer after use

2018-06-19 Thread John Keeping
On Tue, Jun 19, 2018 at 05:02:07PM +0800, Andy Green wrote: > Signed-off-by: Andy Green Pushed to jk/for-jason (after rebasing onto master). > --- > ui-blame.c |5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/ui-blame.c b/ui-blame.c > index 8b56554..37e2c68 10064

Re: [PATCH v3 05/17] Parse render filters from the config

2018-06-19 Thread John Keeping
On Tue, Jun 19, 2018 at 05:01:51PM +0800, Andy Green wrote: > From: John Keeping > > Render filters will be used to present rendered content in the tree > view, for example to display Markdown source rendered as HTML. > > We will add support for using these from the tree vie

Re: [PATCH v3 01/17] manpage: fix sorting order

2018-06-19 Thread John Keeping
On Tue, Jun 19, 2018 at 05:01:31PM +0800, Andy Green wrote: > You maybe didn't know you had OCD until you saw an > alpha sorted list that has stuff out of order in it. > > Signed-off-by: Andy Green Reviewed-by: John Keeping > --- &g

Re: [PATCH v2] blame: css: make blame highlight div absolute and top left

2018-06-19 Thread John Keeping
On Tue, Jun 19, 2018 at 03:11:52AM +0800, Andy Green wrote: > On June 19, 2018 2:57:47 AM GMT+08:00, John Keeping > wrote: > >On Mon, Jun 18, 2018 at 02:02:54PM +0800, Andy Green wrote: > >> Normal operation of blame view requires div.highlight to > >> have ab

Re: [PATCH v2 14/15] md2html-add-asset-postfix-arg

2018-06-19 Thread John Keeping
On Tue, Jun 19, 2018 at 11:55:35AM +0800, Andy Green wrote: > > > On 06/19/2018 03:21 AM, John Keeping wrote: > > On Mon, Jun 18, 2018 at 10:58:26AM +0800, Andy Green wrote: > > >> class AssetMappingExtension(markdown.extensions.Extension): > >> &g

Re: [PATCH v2 12/15] ui-tree: render any matching README file in tree view

2018-06-19 Thread John Keeping
On Tue, Jun 19, 2018 at 09:55:18AM +0800, Andy Green wrote: > > > On 06/19/2018 03:36 AM, John Keeping wrote: > > On Mon, Jun 18, 2018 at 10:58:15AM +0800, Andy Green wrote: > >> While listing the items in tree view, we collect a list > >> of any filenames that m

Re: [PATCH v2 12/15] ui-tree: render any matching README file in tree view

2018-06-18 Thread John Keeping
me files rendering them inline. > > Signed-off-by: Andy Green A couple of minor style points below, but this looks good. With or without the style changes: Reviewed-by: John Keeping > --- > ui-tree.c | 60 +++- > 1

Re: [PATCH v2 10/15] config: add global inline-readme list

2018-06-18 Thread John Keeping
On Mon, Jun 18, 2018 at 10:58:05AM +0800, Andy Green wrote: > Allows the user to specify a list of filenames that should be > rendered inline with tree view, if present in the directory. > > Signed-off-by: Andy Green > --- > diff --git a/cgitrc.5.txt b/cgitrc.5.txt > index a1560eb..37858af 100644

Re: [PATCH v2 11/15] config: add repo inline-readme list

2018-06-18 Thread John Keeping
but other than that this looks good. Reviewed-by: John Keeping > --- > cgit.c |6 ++ > cgit.h |1 + > cgitrc.5.txt | 10 ++ > shared.c |2 ++ > 4 files changed, 19 insertions(+) > > diff --git a/cgit.c b/cgit.c > index 4ffd

Re: [PATCH v2 15/15] render: adapt for providing extra filter args for plain

2018-06-18 Thread John Keeping
On Mon, Jun 18, 2018 at 10:58:31AM +0800, Andy Green wrote: > This changes the render filter exec part to provide a second > and third argument, which are used by md2html to fix up the url > path for "plain" for the repo, eg, "/cgit/plain/" and > "?h=mybranch", as required by the modifications to m

Re: [PATCH v2 14/15] md2html-add-asset-postfix-arg

2018-06-18 Thread John Keeping
On Mon, Jun 18, 2018 at 10:58:26AM +0800, Andy Green wrote: > Extend md2html with a third argument for URL postfix, like "?h=mybranch" > > Signed-off-by: Andy Green > --- > filters/html-converters/md2html | 17 +++-- > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --gi

Re: [PATCH v2 04/15] Add source page

2018-06-18 Thread John Keeping
On Mon, Jun 18, 2018 at 10:57:35AM +0800, Andy Green wrote: > From: John Keeping > > We are about to introduce rendering of content for the tree view. This > source page will allow bypassing the renderer and accessing the content > of the current tree view. > > Signed

Re: [PATCH v2] blame: css: make blame highlight div absolute and top left

2018-06-18 Thread John Keeping
On Mon, Jun 18, 2018 at 02:02:54PM +0800, Andy Green wrote: > Normal operation of blame view requires div.highlight to > have absolute position and set to its parent's top left > for me. > > Otherwise the grey background boxes indicating the extent of > the patch in the lines td displace the highl

Re: [PATCH 1/1] global: remove functionality we deprecated for cgit v1.0

2018-06-18 Thread John Keeping
On Mon, Jun 18, 2018 at 11:51:41AM +0200, Christian Hesse wrote: > From: Christian Hesse > > The man page states these were deprecated for v1.0. We are past v1.1, > so remove the functionality. > > Signed-off-by: Christian Hesse Reviewed-by: John Keeping > ---

Re: [PATCH] Update COPYING

2018-06-17 Thread John Keeping
ly non-whitespace changes are the updated FSF address and two > references to the L in LGPL changed from Library to Lesser. > > ¹ https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Missing sign-off. Acked-by: John Keeping > --- > This will help users & distributors who

Re: Rendering of README.md inline with inner tree view dirs

2018-06-16 Thread John Keeping
On Sat, Jun 16, 2018 at 03:12:09PM +0100, John Keeping wrote: > > >> 3) You can see on the top level of the tree, the README.md references > > >> > > >> > > >> > > >> This url format works in github. In the cgit About view, this re

Re: [RFC PATCH] Makefile: work around parallel make issues in docs

2018-06-16 Thread John Keeping
Hi Todd, On Sat, Jun 16, 2018 at 12:32:06PM -0400, Todd Zullinger wrote: > John Keeping wrote: > > How about the patch below instead? It's a bigger change to the output > > format for HTML, but as a side effect it fixes the parallel build. > > It does, but only if th

Re: Bug: cgit shows empty pages, when viewing Tag-Only-Repo

2018-06-16 Thread John Keeping
oes have tags, let's pick the newest tag as the default head [1]. This is a separate pass because we want to prefer branches if there are any. [1] In fact, we allow any ref at this point because we want to avoid falsely claiming that the repository is empty when it isn't. Signe

Re: [PATCH] ui-tag: Fix inconsistent capitalization

2018-06-16 Thread John Keeping
On Sun, Jun 10, 2018 at 06:28:49PM -0400, Jon DeVree wrote: > Way back in 2009 all of these were lower cased except this one > occurrence. > > Signed-off-by: Jon DeVree Thanks! I've picked this up in jk/for-jason. > --- > ui-tag.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > d

Re: [PATCH 1/1] snapshot: support special value 'all' to enable all formats

2018-06-16 Thread John Keeping
On Thu, Jun 07, 2018 at 10:05:50PM +0200, Christian Hesse wrote: > From: Christian Hesse > > Signed-off-by: Christian Hesse Reviewed-by: John Keeping > --- > cgitrc.5.txt | 1 + > shared.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/cgitrc.5

Re: Translation

2018-06-16 Thread John Keeping
On Mon, Jun 04, 2018 at 10:24:24AM +0200, Malte Kiefer wrote: > first of all I want to say thank you for this amazing software. > I start to using it, and I really like it. > > Then I wanted to inquire with you if you think about offering cgit in > multiple languages? > I would like to translate c

[PATCH] cgitrc.5: fix auth filter return value documentation

2018-06-16 Thread John Keeping
We don't treat all return values as invalid! Signed-off-by: John Keeping --- cgitrc.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 4da166c..3e53bbd 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -715,7 +715,7 @@ auth f

Re: [PATCH] Encode value and field before calculating cookie digest, the same way secure_value() does

2018-06-16 Thread John Keeping
On Thu, Apr 12, 2018 at 08:54:31PM +0300, thev...@gmail.com wrote: > From: Vlad Safronov > > Bugfix: Encode value and field before calculating cookie digest, the same way > as secure_value() does > so validating will work correctly on encoded values. Missing sign-off (see [1] for what this mean

Re: [PATCH] expand environmentvariables in root-title and root-descr

2018-06-16 Thread John Keeping
On Thu, Apr 12, 2018 at 11:19:12AM +0200, b.laes...@pengutronix.de wrote: > From: Björn Lässig > > For having personanlized cgit configuration i need to use > > root-desc=$REMOTE_USER@$HTTP_HOST Missing sign-off (see [1] for what this means). Also, this needs a corresponding change in cgitrc

Re: Adding short commit id to repo Log tab

2018-06-16 Thread John Keeping
Sorry for the delay responding. On Wed, Apr 11, 2018 at 12:00:28PM +0300, Vlad wrote: > I think adding short (7 chars) commit id to repository Log tab output > might be more useful than file or line count.. > > I have examined the code, it it not easy to add an extra column > to the output. > >

Re: [PATCH 1/1] RFC: git: update to v2.18.0-rc2

2018-06-16 Thread John Keeping
int_dir_entry > print_object > single_tree_cb > walk_tree > write_tree_link > > And finally we use new upstream functions that were added for > struct object_id: > > hashcpy -> oidcpy > sha1_to_hex -> oid_to_hex > > Signed-off-by: Christian Hesse With

Re: cache-size implementation downsides

2018-06-16 Thread John Keeping
uires us to move the temporary stdout FD into struct cache_slot. Signed-off-by: John Keeping --- cache.c | 37 ++--- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/cache.c b/cache.c index 0901e6e..2c70be7 100644 --- a/cache.c +++ b/cache.c @@ -29,

Re: [PATCH 11/11] ui-tree: render any matching README file in tree view

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 10:02:25AM +0800, Andy Green wrote: > While listing the items in tree view, we collect a list > of any filenames that match any tree-readme entries from the > config file. > > After the tree view has been shown, we iterate through any > collected readme files rendering them

Re: [PATCH 10/11] config: add tree-readme list

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 10:02:20AM +0800, Andy Green wrote: > Allows the user to specify a list of filenames that should be > rendered inline with tree view, if present in the directory. > > Signed-off-by: Andy Green As mentioned in reply to the cover leter, I think this needs to be a repo confi

  1   2   3   4   5   6   7   >