Re: Development Flow Improvements

2016-09-28 Thread Ferry Huberts 



On 28/09/16 01:27, Jason A. Donenfeld wrote:

Hi Jamie,

I won't force commit on master, obviously (well, I've violated this in
the past, but don't intend to in the future). But I'd likely rebase
for-jason branches when merging if that makes the merge strategy



THis should preferably avoided; let the owner of the branch do that 
rebase or let him merge master into his branch first. That way the guy 
that knows what is going on the branch will handle the conflicts.


Then you can merge to master.
These merges should always be without conflict.


easier. The for-jason branches will be ephemeral; after I merge to
master, they'll be deleted. Here's the output from this process I
carried out earlier today, to give a better impression.

Does that seem reasonable, or is there some common edge case I'm neglecting?

Regards,
Jason

zx2c4@thinkpad ~/Projects/cgit $ git pull
remote: Counting objects: 23, done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 23 (delta 18), reused 0 (delta 0)
Unpacking objects: 100% (23/23), done.
From ssh://git.zx2c4.com/cgit
* [new branch]  ch/css-highlight-table-rows ->
origin/ch/css-highlight-table-rows
* [new branch]  ch/for-jason-> origin/ch/for-jason
* [new branch]  ch/git-2-10-0   -> origin/ch/git-2-10-0
zx2c4@thinkpad ~/Projects/cgit $ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
zx2c4@thinkpad ~/Projects/cgit $ git merge origin/ch/for-jason
Updating ff9893a..11695a5
Fast-forward
Makefile|  2 +-
cgit.c  |  2 +-
cgit.h  |  8 
git |  2 +-
shared.c| 28 ++--
ui-diff.c   | 74
+-
ui-diff.h   |  4 ++--
ui-log.c|  2 +-
ui-ssdiff.c |  4 ++--
9 files changed, 63 insertions(+), 63 deletions(-)
zx2c4@thinkpad ~/Projects/cgit $ git push
Total 0 (delta 0), reused 0 (delta 0)
To ssh://git.zx2c4.com/cgit
  ff9893a..11695a5  master -> master
zx2c4@thinkpad ~/Projects/cgit $ git push origin :ch/for-jason
To ssh://git.zx2c4.com/cgit
- [deleted] ch/for-jason
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

trac integration

2016-09-27 Thread Ferry Huberts 

Hi guys,

I have this Trac component that integrates CGit into Trac, see 
https://github.com/reposerf/tracCGit



AFAIK its biggest user is Fedora, and I use it too at a clients site 
(it's mainly for them that I wrote it).


Would you consider it worth integrating it in the cgit repo or hosting 
it parallel to it?


Other thought?

Thanks!

--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: syntax highlighting

2016-03-06 Thread Ferry Huberts 

I have a git server with cgit running on CentOS 6 as well.

I use in cgitrc:

source-filter=/syntax-highlighting.bash


Which is in the cgit tree as filters/syntax-highlighting.sh

Install highlight (from EPEL) and adjust the script for the installed 
version of highlight, which should be v3.




On 05/03/16 23:47, Anthony LaTorre wrote:

Hi all,

I've recently installed cgit on CentOS 6 from the EPEL repository.
Unfortunately python3 is not available for CentOS 6. I have a couple
of questions:

- Why the hard dependency on python 3? I realize this is really a
packaging problem, but the syntax-highlighting.py doesn't look too
complex. Is there a reason python2 is not supported? Would a patch be
welcome?

- I have manually installed python3 but I still don't see any of the
source files. I have verified that the script appears to be working by
running:

$ cat code.h | /usr/libexec/cgit/filters/syntax-highlighting.py code.h

and I do see what appears to be the correct HTML.

How can I debug why I am not seeing anything? Is there a log file somewhere?

Thanks,

Tony
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: Killing plaintext git:// in favor of https:// cloning

2016-02-22 Thread Ferry Huberts 



On 22/02/16 20:50, Joe Anakata wrote:


On 22/02/16 19:16, Jason A. Donenfeld wrote:


Now that git.zx2c4.com runs over HTTPS, I'm considering getting rid of
the plaintext git:// endpoint for cloning.


Ferry Huberts Proclaimed Thus:


Yes, why?
What's the point?

The repos are public, so cloning them over https bring nothing, except
extra overhead and server load.


While pretty unlikely, in theory someone could MITM a git:// clone and
send the user a hax0red branch of cgit with integrated botnet which
the user then compiles and installs on their server.




That is a pretty unlikely and sophisticated attack vector, for 
admittedly little gain. Someone with an existing clone can immediately 
see that thing are off.


It is a vector though, so if you really want to defend against it, then 
just ignore my comments ;-)



Not sure if the extra server load is worth it to defend against this
case or not.  (Also, presumably the server is using the cgit smart http
endpoint so https clone is not much additional DATA, just the ssl
handshake; but definitely additional cpu for crypto operations.)

Thanks
-Joe
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: Killing plaintext git:// in favor of https:// cloning

2016-02-22 Thread Ferry Huberts 



On 22/02/16 19:16, Jason A. Donenfeld wrote:

Hello projects-with-mailing-lists,

Now that git.zx2c4.com runs over HTTPS, I'm considering getting rid of
the plaintext git:// endpoint for cloning.

This means:

git clone git://git.zx2c4.com/cgit
-->
git clone https://git.zx2c4.com/cgit

git clone git://git.zx2c4.com/password-store
-->
git clone https://git.zx2c4.com/password-store


Does anybody have any objections or comments?



Yes, why?
What's the point?

The repos are public, so cloning them over https bring nothing, except 
extra overhead and server load.




Thanks,
Jason
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: XSS in cgit

2016-01-14 Thread Ferry Huberts 



On 14/01/16 12:07, John Keeping wrote:

On Thu, Jan 14, 2016 at 12:01:57PM +0100, Jason A. Donenfeld wrote:

On Thu, Jan 14, 2016 at 11:57 AM, John Keeping  wrote:

I wonder if we should just drop support for the "mimetype" query
parameter and see if anyone complains.  In general, I would expect it to
be the server's responsibility to decide on the type of its output and
allowing the client to override it seems like a problem in general.


Agreed here.



Me too.


We still have the other issue of git repos containing valid html with
malicious scripts and whatnot, though. Can we simply kill the feature
of allowing HTML to be served from cgit? This would indeed fix the
security issue in the best way. But would folks complain?


Unlike the "mimetype" query parameter, I can see valid usecases for
serving HTML from repositories with CGit (I've even used it myself in
the past), so I expect there will be complaints for that one.

Could we add a config knob for serving HTML and turn if off by default?
That will allow people who trust their repository contents to use this
feature while protecting everyone else.


Good idea.
With a big fat warning that enabling it will possibly open you up to XSS 
attacks, especially when the repo is not under your control

___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH 1/2] Compile with -Wstrict-prototypes -Wmissing-prototypes

2016-01-14 Thread Ferry Huberts 

I work on olsrd and that makefile has compiler flag probing.
We could possibly 'borrow' that.

(the makefile is 'history' so don't puke)

On 14/01/16 14:01, Jason A. Donenfeld wrote:

John - what compilers do you have in mind that don't accept this flag?
I rather like it.



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: Build failed in Jenkins: cgit - upstream - master - coverity #4

2015-11-12 Thread Ferry Huberts 

I've upgraded the build server.
This is the result of a job configuration typo that only showed when 
doing a simultaneous build of upstream master and upstream master coverity.


Fixed it

On 12/11/15 12:44, Pelagic Jenkins (Public)  wrote:

See 
<https://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20master%20-%20coverity/4/>

--
Started by user Ferry Huberts
Building in workspace 
<https://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20master%20-%20coverity/ws/>
  > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
  > git config remote.origin.url http://git.zx2c4.com/cgit # timeout=10
Pruning obsolete local branches
Fetching upstream changes from http://git.zx2c4.com/cgit
  > git --version # timeout=10
  > git -c core.askpass=true fetch --tags --progress http://git.zx2c4.com/cgit 
+refs/heads/*:refs/remotes/origin/* --prune
  > git rev-parse refs/remotes/origin/master^{commit} # timeout=10
  > git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision 143e65252c1c842774bc5a601d5faef97ca6c886 
(refs/remotes/origin/master)
  > git config core.sparsecheckout # timeout=10
  > git checkout -f 143e65252c1c842774bc5a601d5faef97ca6c886
  > git rev-list 143e65252c1c842774bc5a601d5faef97ca6c886 # timeout=10
  > git remote # timeout=10
  > git submodule init # timeout=10
  > git submodule sync # timeout=10
  > git config --get remote.origin.url # timeout=10
  > git submodule update --init --recursive
Cleaning workspace
  > git rev-parse --verify HEAD # timeout=10
Resetting working tree
  > git reset --hard # timeout=10
  > git clean -fdx # timeout=10
FATAL: Command "git clean -fdx" returned status code 1:
stdout: Removing CGIT-CFLAGS
Removing VERSION
Removing cache.o
Removing cgit
Removing cgit.o
Removing cgitrc.5
Removing cgitrc.5.html
Removing cmd.o
Removing configfile.o
Removing cov-int/
Removing dist/
Removing filter.o
Removing html.o
Removing parsing.o
Removing scan-tree.o
Removing shared.o
Removing tests/test-results/
Skipping repository tests/trash/repos/foo
Skipping repository tests/trash/repos/with space
Skipping repository tests/trash/repos/bar
Skipping repository tests/trash/repos/foo+bar
Removing ui-atom.o
Removing ui-blob.o
Removing ui-clone.o
Removing ui-commit.o
Removing ui-diff.o
Removing ui-log.o
Removing ui-patch.o
Removing ui-plain.o
Removing ui-refs.o
Removing ui-repolist.o
Removing ui-shared.o
Removing ui-snapshot.o
Removing ui-ssdiff.o
Removing ui-stats.o
Removing ui-summary.o
Removing ui-tag.o
Removing ui-tree.o

stderr: warning: failed to remove .depend/ui-refs.o.d

hudson.plugins.git.GitException: Command "git clean -fdx" returned status code 
1:
stdout: Removing CGIT-CFLAGS
Removing VERSION
Removing cache.o
Removing cgit
Removing cgit.o
Removing cgitrc.5
Removing cgitrc.5.html
Removing cmd.o
Removing configfile.o
Removing cov-int/
Removing dist/
Removing filter.o
Removing html.o
Removing parsing.o
Removing scan-tree.o
Removing shared.o
Removing tests/test-results/
Skipping repository tests/trash/repos/foo
Skipping repository tests/trash/repos/with space
Skipping repository tests/trash/repos/bar
Skipping repository tests/trash/repos/foo+bar
Removing ui-atom.o
Removing ui-blob.o
Removing ui-clone.o
Removing ui-commit.o
Removing ui-diff.o
Removing ui-log.o
Removing ui-patch.o
Removing ui-plain.o
Removing ui-refs.o
Removing ui-repolist.o
Removing ui-shared.o
Removing ui-snapshot.o
Removing ui-ssdiff.o
Removing ui-stats.o
Removing ui-summary.o
Removing ui-tag.o
Removing ui-tree.o

stderr: warning: failed to remove .depend/ui-refs.o.d

at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1640)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1616)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1612)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1254)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1266)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.clean(CliGitAPIImpl.java:621)
at hudson.plugins.git.GitAPI.clean(GitAPI.java:311)
at 
hudson.plugins.git.extensions.impl.CleanCheckout.onCheckoutCompleted(CleanCheckout.java:28)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1074)
at hudson.scm.SCM.checkout(SCM.java:485)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1276)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:607)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:529)
at hudson.model.Run.execu

Re: Coverity + Jenkins

2015-10-09 Thread Ferry Huberts 

Note that you can only submit max 3 builds per day.
I have my olsrd coverity job running on this schedule:

  H 0,12,18 * * *

On 09/10/15 10:54, Jason A. Donenfeld wrote:

Alright -- I've filtered out all the git findings. This leaves us with
a much more manageable 31 findings.



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH 6/8] cmd: fix resource leak: free allocation from cgit_currenturl and fmtalloc

2015-10-09 Thread Ferry Huberts 
I have the experience that it sometimes misses things that are then 
found in the next build.

Or that it flags a whole load of lines without issues.
It doesn't happen a lot though. Sometimes.

Let's call it temperamental...


On 09/10/15 14:08, Christian Hesse wrote:

"Jason A. Donenfeld" <ja...@zx2c4.com> on Fri, 2015/10/09 14:03:

No coverity-id on this commit. Did you find this one yourself?


Yes. No idea why coverity did not see this...



___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: Coverity + Jenkins

2015-10-08 Thread Ferry Huberts 



On 08/10/15 22:56, Christian Hesse wrote:

"Jason A. Donenfeld" <ja...@zx2c4.com> on Thu, 2015/10/08 16:33:

As you probably noticed, I've added cgit to Coverity's scanner. I'm
still waiting for them to "approve" it as an authentic grass-fed
no-GMO open source project, but once that happens, we'll have a host
of bugs to inspect.


We are ready to go... :D

201 defects to be fixed... Though it counts defects from git as well. Is
there a way to exclude pathes? Anybody familiar with coverity?



I'll be running coverity builds on my Jenkins and will look into this.
I'm already running coverity builds for olsrd.


To avoid duplicate work - who will look at what?



___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: Fwd: Build failed in Jenkins: cgit - upstream - get-git - master #190 - remotes/origin/master - a360666

2015-08-13 Thread Ferry Huberts 

Maybe you guys can check my build server after merging commits? :-)

It runs Fedora 22, x86_64

On 13/08/15 16:28, Ferry Huberts wrote:




 Forwarded Message 
Subject:Build failed in Jenkins: cgit - upstream - get-git - master
#190 - remotes/origin/master - a360666
Date:   Thu, 13 Aug 2015 15:43:11 +0200 (CEST)
From:   Pelagic Jenkins (Public) nore...@jenkins-public.pelagic.nl
To: ferry.hube...@pelagic.nl



Seehttps://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20get-git%20-%20master/190/changes

Changes:

[ja...@zx2c4.com] tests: allow shell to be overridden

[ja...@zx2c4.com] Makefile: include Git's config.mak.uname

[ja...@zx2c4.com] Remove redundant includes

[ja...@zx2c4.com] configfile.c: don't include system headers directly

[ja...@zx2c4.com] cache.c: fix header order

[ja...@zx2c4.com] cgit.h: move stdbool.h from ui-shared.h

[ja...@zx2c4.com] ui-tree: use sane isgraph()

[ja...@zx2c4.com] filter: don't use dlsym unnecessarily

[ja...@zx2c4.com] ui-shared: extract date formatting to a function

[ja...@zx2c4.com] ui-shared: use common function in print_rel_date()

[ja...@zx2c4.com] ui-shared: show full date in tooltip if longer ago than 
max_relative

--
Started by an SCM change
Building in 
workspacehttps://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20get-git%20-%20master/ws/
   git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
   git config remote.origin.urlhttp://git.zx2c4.com/cgit  # timeout=10
Pruning obsolete local branches
Fetching upstream changes fromhttp://git.zx2c4.com/cgit
   git --version # timeout=10
   git -c core.askpass=true fetch --tags --progresshttp://git.zx2c4.com/cgit  
+refs/heads/*:refs/remotes/origin/* --prune
   git rev-parse refs/remotes/origin/master^{commit} # timeout=10
   git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision a360666df3cfcd1b384cd66b18803d72e3893b3d 
(refs/remotes/origin/master)
   git config core.sparsecheckout # timeout=10
   git checkout -f a360666df3cfcd1b384cd66b18803d72e3893b3d
   git rev-list c0b59823035efc136a82a96094d164a979d9b2e9 # timeout=10
Cleaning workspace
   git rev-parse --verify HEAD # timeout=10
Resetting working tree
   git reset --hard # timeout=10
   git clean -fdx # timeout=10
[cgit_upstream_get-git_master] $ /bin/bash /tmp/hudson885616167373264074.sh
Makefile:36: git/config.mak.uname: No such file or directory
make: *** No rule to make target 'git/config.mak.uname'.  Stop.
Build step 'Execute shell' marked build as failure
Archiving artifacts





___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Fwd: Build failed in Jenkins: cgit - upstream - get-git - master #190 - remotes/origin/master - a360666

2015-08-13 Thread Ferry Huberts 




 Forwarded Message 
Subject: 	Build failed in Jenkins: cgit - upstream - get-git - master 
#190 - remotes/origin/master - a360666

Date:   Thu, 13 Aug 2015 15:43:11 +0200 (CEST)
From:   Pelagic Jenkins (Public) nore...@jenkins-public.pelagic.nl
To: ferry.hube...@pelagic.nl



See 
https://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20get-git%20-%20master/190/changes

Changes:

[ja...@zx2c4.com] tests: allow shell to be overridden

[ja...@zx2c4.com] Makefile: include Git's config.mak.uname

[ja...@zx2c4.com] Remove redundant includes

[ja...@zx2c4.com] configfile.c: don't include system headers directly

[ja...@zx2c4.com] cache.c: fix header order

[ja...@zx2c4.com] cgit.h: move stdbool.h from ui-shared.h

[ja...@zx2c4.com] ui-tree: use sane isgraph()

[ja...@zx2c4.com] filter: don't use dlsym unnecessarily

[ja...@zx2c4.com] ui-shared: extract date formatting to a function

[ja...@zx2c4.com] ui-shared: use common function in print_rel_date()

[ja...@zx2c4.com] ui-shared: show full date in tooltip if longer ago than 
max_relative

--
Started by an SCM change
Building in workspace 
https://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20get-git%20-%20master/ws/
  git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
  git config remote.origin.url http://git.zx2c4.com/cgit # timeout=10
Pruning obsolete local branches
Fetching upstream changes from http://git.zx2c4.com/cgit
  git --version # timeout=10
  git -c core.askpass=true fetch --tags --progress http://git.zx2c4.com/cgit 
+refs/heads/*:refs/remotes/origin/* --prune
  git rev-parse refs/remotes/origin/master^{commit} # timeout=10
  git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision a360666df3cfcd1b384cd66b18803d72e3893b3d 
(refs/remotes/origin/master)
  git config core.sparsecheckout # timeout=10
  git checkout -f a360666df3cfcd1b384cd66b18803d72e3893b3d
  git rev-list c0b59823035efc136a82a96094d164a979d9b2e9 # timeout=10
Cleaning workspace
  git rev-parse --verify HEAD # timeout=10
Resetting working tree
  git reset --hard # timeout=10
  git clean -fdx # timeout=10
[cgit_upstream_get-git_master] $ /bin/bash /tmp/hudson885616167373264074.sh
Makefile:36: git/config.mak.uname: No such file or directory
make: *** No rule to make target 'git/config.mak.uname'.  Stop.
Build step 'Execute shell' marked build as failure
Archiving artifacts



___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: Build failed in Jenkins: cgit - upstream - get-git - master #190 - remotes/origin/master - a360666

2015-08-13 Thread Ferry Huberts 
I've talked to Jason and from now on my build server will also send 
email to the cgit-dev list upon build failures.


That might give some noise when I'm fiddling with the build server, but 
I'll try to avoid that.


On 13/08/15 17:05, Jason A. Donenfeld wrote:

Thanks for the fix John. All set now.



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

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) nore...@jenkins-public.pelagic.nl
To: ferry.hube...@pelagic.nl



See 
https://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20master/206/changes

Changes:

[ja...@zx2c4.com] shared: make cgit_diff_tree_cb public

[ja...@zx2c4.com] log: allow users to follow a file

--
[...truncated 517 lines...]
MSGFMTpo/hu.msg 514 translated.
MSGFMTpo/vi.msg 543 translated.
MSGFMTpo/ru.msg 516 translated, 4 untranslated.
MSGFMTpo/bg.msg 547 translated.
MSGFMTpo/nb.msg 474 translated, 39 untranslated.
MSGFMTpo/sv.msg 547 translated.
MSGFMTpo/fr.msg 520 translated.
MSGFMTpo/it.msg 519 translated, 1 untranslated.
MSGFMTpo/ja.msg 520 translated.
MSGFMT po/pt_br.msg 520 translated.
MSGFMTpo/de.msg 520 translated.
MSGFMT po/zh_cn.msg 366 translated, 7 fuzzy, 17 untranslated.
MSGFMTpo/el.msg 381 translated, 4 fuzzy, 6 untranslated.
SUBDIR gitk-git
* new Tcl/Tk interpreter location
GEN gitk-wish
Generating catalog po/hu.msg
msgfmt --statistics --tcl po/hu.po -l hu -d po/
277 translated messages, 17 fuzzy translations, 10 untranslated messages.
Generating catalog po/vi.msg
msgfmt --statistics --tcl po/vi.po -l vi -d po/
301 translated messages, 2 fuzzy translations, 1 untranslated message.
Generating catalog po/ca.msg
msgfmt --statistics --tcl po/ca.po -l ca -d po/
303 translated messages, 1 fuzzy translation.
Generating catalog po/ru.msg
msgfmt --statistics --tcl po/ru.po -l ru -d po/
225 translated messages, 33 fuzzy translations, 46 untranslated messages.
Generating catalog po/bg.msg
msgfmt --statistics --tcl po/bg.po -l bg -d po/
302 translated messages, 1 fuzzy translation, 1 untranslated message.
Generating catalog po/es.msg
msgfmt --statistics --tcl po/es.po -l es -d po/
183 translated messages, 45 fuzzy translations, 76 untranslated messages.
Generating catalog po/sv.msg
msgfmt --statistics --tcl po/sv.po -l sv -d po/
301 translated messages, 2 fuzzy translations, 1 untranslated message.
Generating catalog po/fr.msg
msgfmt --statistics --tcl po/fr.po -l fr -d po/
262 translated messages, 26 fuzzy translations, 16 untranslated messages.
Generating catalog po/it.msg
msgfmt --statistics --tcl po/it.po -l it -d po/
274 translated messages, 16 fuzzy translations, 14 untranslated messages.
Generating catalog po/ja.msg
msgfmt --statistics --tcl po/ja.po -l ja -d po/
272 translated messages, 19 fuzzy translations, 13 untranslated messages.
Generating catalog po/pt_br.msg
msgfmt --statistics --tcl po/pt_br.po -l pt_br -d po/
280 translated messages, 15 fuzzy translations, 9 untranslated messages.
Generating catalog po/de.msg
msgfmt --statistics --tcl po/de.po -l de -d po/
279 translated messages, 16 fuzzy translations, 9 untranslated messages.
SUBDIR perl
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/GlobSpec.pm blib/lib/Git/SVN/GlobSpec.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/Migration.pm blib/lib/Git/SVN/Migration.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/Memoize/YAML.pm blib/lib/Git/SVN/Memoize/YAML.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale Git.pm 
blib/lib/Git.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/Utils.pm blib/lib/Git/SVN/Utils.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/Ra.pm blib/lib/Git/SVN/Ra.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/Editor.pm blib/lib/Git/SVN/Editor.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/I18N.pm blib/lib/Git/I18N.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/IndexInfo.pm blib/lib/Git/IndexInfo.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/Prompt.pm blib/lib/Git/SVN/Prompt.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/Log.pm blib/lib/Git/SVN/Log.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN/Fetcher.pm blib/lib/Git/SVN/Fetcher.pm
/usr/bin/perl -pe s\Q++LOCALEDIR++\E/var/lib/jenkins/share/locale 
Git/SVN.pm blib/lib/Git/SVN.pm
Manifying 8 pod documents
SUBDIR templates
MSGFMT po/build/locale/pt_PT/LC_MESSAGES/git.mo
306 translated messages, 687 untranslated messages.
MSGFMT po/build/locale/bg/LC_MESSAGES/git.mo
2359 translated messages.
MSGFMT po/build/locale/vi/LC_MESSAGES/git.mo
2359 translated messages.
MSGFMT po/build/locale/is/LC_MESSAGES/git.mo
14 translated messages.
MSGFMT po/build/locale/ca/LC_MESSAGES/git.mo
2359 translated messages.
MSGFMT po/build/locale/ru/LC_MESSAGES/git.mo
2359 translated

Re: [PATCH] tag: reference with h instead of id

2015-01-15 Thread Ferry Huberts 

Thanks for picking this up so fast John.
The solution is also what I preferred :-)

(didn't review the patch, been out of cgit dev for too long)

On 15/01/15 23:18, John Keeping wrote:

When clicking on log from a tag we end up showing the log of whatever
branch we used to reach the tag.  If the tag doesn't point onto a branch
then the tagged commit won't appear in this output.

By linking to tags with the head parameter instead of the id parameter
the log link will show the log of the tag.  This is clearly desirable
when the tag has been reached from the refs UI and changing the
behaviour for tag decorations makes them match branch decorations where
log - decoration - log shows the log of the decoration.

Reported-by: Ferry Huberts maili...@hupie.com
Signed-off-by: John Keeping j...@keeping.me.uk
---

I think we actually want something like this:

-- 8 --
diff --git a/ui-refs.c b/ui-refs.c
index bdd3b2c..d3017ec 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -140,7 +140,7 @@ static int print_tag(struct refinfo *ref)
}

html(trtd);
-   cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+   cgit_tag_link(name, NULL, NULL, name, NULL);
html(/tdtd);
if (ctx.repo-snapshots  (obj-type == OBJ_COMMIT))
print_tag_downloads(ctx.repo, name);
-- 8 --

The tag UI already does the right thing if we use h instead of id.

The only thing I'm not sure about is whether we should change all tag
links to behave like this.  That would make tag decorations consistent
with branch decorations which already change the head, so I think that
is the way to go.


This is what that looks like.

  ui-log.c| 4 ++--
  ui-refs.c   | 2 +-
  ui-shared.c | 8 
  ui-shared.h | 3 +--
  4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ui-log.c b/ui-log.c
index 657ff3c..1b60591 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -71,11 +71,11 @@ void show_commit_decorations(struct commit *commit)
}
else if (starts_with(deco-name, tag: refs/tags/)) {
strncpy(buf, deco-name + 15, sizeof(buf) - 1);
-   cgit_tag_link(buf, NULL, tag-deco, ctx.qry.head, buf);
+   cgit_tag_link(buf, NULL, tag-deco, buf);
}
else if (starts_with(deco-name, refs/tags/)) {
strncpy(buf, deco-name + 10, sizeof(buf) - 1);
-   cgit_tag_link(buf, NULL, tag-deco, ctx.qry.head, buf);
+   cgit_tag_link(buf, NULL, tag-deco, buf);
}
else if (starts_with(deco-name, refs/remotes/)) {
if (!ctx.repo-enable_remote_branches)
diff --git a/ui-refs.c b/ui-refs.c
index d2ba48d..ac8a6d4 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -140,7 +140,7 @@ static int print_tag(struct refinfo *ref)
}

html(trtd);
-   cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+   cgit_tag_link(name, NULL, NULL, name);
html(/tdtd);
if (ctx.repo-snapshots  (obj-type == OBJ_COMMIT))
print_tag_downloads(ctx.repo, name);
diff --git a/ui-shared.c b/ui-shared.c
index 32f23f9..d8cc4d7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -273,9 +273,9 @@ void cgit_summary_link(const char *name, const char *title, 
const char *class,
  }

  void cgit_tag_link(const char *name, const char *title, const char *class,
-  const char *head, const char *rev)
+  const char *tag)
  {
-   reporevlink(tag, name, title, class, head, rev, NULL);
+   reporevlink(tag, name, title, class, tag, NULL, NULL);
  }

  void cgit_tree_link(const char *name, const char *title, const char *class,
@@ -443,8 +443,8 @@ static void cgit_self_link(char *name, const char *title, 
const char *class)
else if (!strcmp(ctx.qry.page, summary))
cgit_summary_link(name, title, class, ctx.qry.head);
else if (!strcmp(ctx.qry.page, tag))
-   cgit_tag_link(name, title, class, ctx.qry.head,
- ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL);
+   cgit_tag_link(name, title, class, ctx.qry.has_sha1 ?
+  ctx.qry.sha1 : ctx.qry.head);
else if (!strcmp(ctx.qry.page, tree))
cgit_tree_link(name, title, class, ctx.qry.head,
   ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
diff --git a/ui-shared.h b/ui-shared.h
index f8cf220..021fe4e 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -18,8 +18,7 @@ extern void cgit_index_link(const char *name, const char 
*title,
  extern void cgit_summary_link(const char *name, const char *title,
  const char *class, const char *head);
  extern void cgit_tag_link(const char *name, const char *title,
- const char *class, const char *head,
- const char *rev);
+ const char *class, const char *tag);
  extern

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

2014-12-23 Thread Ferry Huberts 



On 23/12/14 16:48, John Keeping wrote:

On Tue, Dec 23, 2014 at 04:15:15PM +0100, Ferry Huberts wrote:



On 23/12/14 15:40, John Keeping wrote:

+agefile=$(git rev-parse --git-dir)/info/web/last-modified


use $GIT_DIR here instead of rev-parse


githooks(5) doesn't guarantee that GIT_DIR will be set and the fact that
it currently is seems to be an artifact of how old versions of Git work
([0]).

I'd prefer to stick with rev-parse, which is what the example hooks in
git.git use.

[0] http://permalink.gmane.org/gmane.comp.version-control.git/136276



Ok with me.
I did check the man pages and they seem to say that GITDIR is set.
Well, whatever :-)


+
+mkdir -p $(dirname $agefile) 
+git for-each-ref \
+   --sort=-authordate --count=1 \
+   --format='%(authordate:iso8601)' \
+   $agefile


--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: Integration with Bugzilla?

2014-09-29 Thread Ferry Huberts 



On 29/09/14 19:49, Joey Reid wrote:

I often run into situations where the git commit log references a
bugzilla report. Such as this one

http://cgit.freedesktop.org/libreoffice/core/commit/?id=559484d5871c7c0a7e771f75916c46f3a6a590ae
http://cgit.freedesktop.org/libreoffice/core/commit/?id=559484d5871c7c0a7e771f75916c46f3a6a590ae

Where fdo#60123 Refers to
https://bugs.freedesktop.org/show_bug.cgi?id=60123

or this one where the bug is #i125581#
https://github.com/apache/openoffice/commit/8cb619bd314a80fe7f7094b16f25d362979f0c69

Is it possible to have cgit parse the subject for fdo#number or
#inumber#  and replace the plain text with a hyperlink containing
number?






Sure.

The below script is what I use on my server to refer to a trac ticket.

---
#!/bin/bash

#
# This script can be used to generate links in commit messages.
#
# To use this script, refer to this file with either the commit-filter 
or the

# repo.commit-filter options in cgitrc.
#
# The following environment variables can be used to retrieve the 
configuration

# of the repository for which this script is called:
# CGIT_REPO_URL( = repo.url   setting )
# CGIT_REPO_NAME   ( = repo.name  setting )
# CGIT_REPO_PATH   ( = repo.path  setting )
# CGIT_REPO_OWNER  ( = repo.owner setting )
# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
# CGIT_REPO_SECTION( = sectionsetting )
# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
#

declare regex=

#
# Commit SHA1
#
regex=s|\b([0-9a-fA-F]{7,40})\b|a href=\./?id=\1\\1/a|g

#
# Trac
#
# We have a trac instance for every repository,
# located under /reposerf/trac/repoName
#
if [[ -n ${CGIT_REPO_PATH:-} ]]; then
  regex=$regex
s|#([0-9]+)\b|a href=\/reposerf/trac/$(basename 
${CGIT_REPO_PATH})/ticket/\1\#\1/a|g

fi

sed -re $regex
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Fwd: Build failed in Jenkins: cgit - upstream - get-git - master #125 - master - 45315f8

2014-03-20 Thread Ferry Huberts 

git 191 is MIA


 Original Message 
Subject: 	Build failed in Jenkins: cgit - upstream - get-git - master 
#125 - master - 45315f8

Date:   Thu, 20 Mar 2014 18:15:06 +0100 (CET)
From:   Pelagic Jenkins (Public) nore...@jenkins-public.pelagic.nl
To: ferry.hube...@pelagic.nl



See 
https://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20get-git%20-%20master/125/changes

Changes:

[Jason A. Donenfeld] git: update to 1.9.1

--
Started by an SCM change
Building in workspace 
https://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20get-git%20-%20master/ws/
Fetching changes from the remote Git repository
Pruning obsolete local branches
Fetching upstream changes from http://git.zx2c4.com/cgit
Checking out Revision 45315f846c2e2ee6663f0ba8cc454384d2b9e3ea (origin/master)
Cleaning workspace
Resetting working tree
[cgit_upstream_get-git_master] $ /bin/bash /tmp/hudson4790314191005352903.sh
curl -L https://git-core.googlecode.com/files/git-1.9.1.tar.gz | tar -xzf -  rm -rf 
git  mv git-1.9.1 git
  % Total% Received % Xferd  Average Speed   TimeTime Time  Current
 Dload  Upload   Total   SpentLeft  Speed

  0 00 00 0  0  0 --:--:-- --:--:-- --:--:-- 0
 65  1447   65   9510 0   3376  0 --:--:-- --:--:-- --:--:--  3372
100  1447  100  14470 0   5133  0 --:--:-- --:--:-- --:--:--  5131

gzip: stdin: not in gzip format
tar: Child returned status 1
tar: Error is not recoverable: exiting now
make: *** [get-git] Error 2
Build step 'Execute shell' marked build as failure
Archiving artifacts



___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit

Re: filter questions

2014-02-24 Thread Ferry Huberts 



On 24/02/14 20:01, Kevin Fenzi wrote:

Greetings.

I took a look at the filters in the recent 0.10 release and had a few
minor questions. ;)

First, the email-gravatar.lua script seems to require luacrypto?
( http://luacrypto.luaforge.net/ ) This is pretty ancient and not
packaged in Fedora at least. Is there some other more supportable
library that could be used?

lua-md5 seems better if you just need a md5?
http://www.keplerproject.org/md5/

Also, would it be possible to optionally use libravatar? They are free
software, where gravatar is not. ;(
http://wiki.libravatar.org/description/

Next, the email-gravatar.py script requires python3?
Would it be possible to also have a python2 compatible version? Older
systems are still not using python3.

Finally the highlight script has 2 different calls for version2 or 3 of
highlight. Perhaps we could move that to a build time check? Or even a
runtime one? or just split them into 2 scripts?


I did put a check in the script but Lars - the original maintainer - 
didn't like that and made it this way.

We could put it back if the current maintainers agree.

Also, if you use highlight you'll want to add some highlight css to your 
cgit css. See my tracCGit spec file for an example: 
https://github.com/reposerf/tracCGit/blob/master/trac-CGit-plugin/trac-CGit-plugin.spec#L36




Thanks for all your work, cgit is great!

kevin



___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit



--
Ferry Huberts
___
CGit mailing list
CGit@lists.zx2c4.com
http://lists.zx2c4.com/mailman/listinfo/cgit