Re: Enabling symmetric merge, and UI details

2012-08-21 Thread Julian Foad
Neels J Hofmeyr wrote: > On 2012-08-03 21:25, Julian Foad wrote: >> It's time to lose the temporary '--symmetric' option and make >> it the default mode in 'svn'. > > sounds fantastic :) > >> . > > A good read, but I c

Re: Enabling symmetric merge, and UI details

2012-08-21 Thread Neels J Hofmeyr
On 2012-08-03 21:25, Julian Foad wrote: > It's time to lose the temporary '--symmetric' option and make it the default > mode in 'svn'. sounds fantastic :) > . A good read, but I can't find that "[5]" reference: "...we n

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Johan Corveleyn
On Tue, Aug 21, 2012 at 11:22 PM, Branko Čibej wrote: > On 21.08.2012 22:28, Johan Corveleyn wrote: >> On Tue, Aug 21, 2012 at 9:52 PM, Mark Phippard wrote: >>> On Tue, Aug 21, 2012 at 3:46 PM, Branko Čibej wrote: On 21.08.2012 21:37, Mark Phippard wrote: >> ... > People could do a lot

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Branko Čibej
On 21.08.2012 22:28, Johan Corveleyn wrote: > On Tue, Aug 21, 2012 at 9:52 PM, Mark Phippard wrote: >> On Tue, Aug 21, 2012 at 3:46 PM, Branko Čibej wrote: >>> On 21.08.2012 21:37, Mark Phippard wrote: > ... People could do a lot with that, and if it is easier to attach the client versi

Re: FS vtable common_pool and pack_fs/recover

2012-08-21 Thread Daniel Shahaf
Philip Martin wrote on Tue, Aug 21, 2012 at 20:42:55 +0100: > Daniel Shahaf writes: > > > Philip Martin wrote on Tue, Aug 21, 2012 at 18:00:23 +0100: > >> Functions like fs_library_vtable_t.pack_fs and > >> fs_library_vtable_t.recover that don't take the common_pool parameter > >> pass the pool p

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Johan Corveleyn
On Tue, Aug 21, 2012 at 9:52 PM, Mark Phippard wrote: > On Tue, Aug 21, 2012 at 3:46 PM, Branko Čibej wrote: >> On 21.08.2012 21:37, Mark Phippard wrote: ... >>> People could do a lot with that, and if >>> it is easier to attach the client version to the txn properties, then >>> that is another g

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread C. Michael Pilato
On 08/21/2012 03:41 PM, Branko Čibej wrote: > Seriously though: How will the presence of revprops affect the decision > to reject a commit? If based on svn:author, we already have a better way > in place. What kind of other questions are relevant? The one that seems most common is to reject commit

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Mark Phippard
On Tue, Aug 21, 2012 at 3:46 PM, Branko Čibej wrote: > On 21.08.2012 21:37, Mark Phippard wrote: >> On Tue, Aug 21, 2012 at 3:29 PM, C. Michael Pilato >> wrote: >> FWIW, I agree it would be nice to have access to svn:log before the >> data is sent from the client. > > I expect this would mean c

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Mark Phippard
On Tue, Aug 21, 2012 at 3:41 PM, Branko Čibej wrote: > Seriously though: How will the presence of revprops affect the decision > to reject a commit? If based on svn:author, we already have a better way > in place. What kind of other questions are relevant? My understanding is that Mike proposed

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Branko Čibej
On 21.08.2012 21:37, Mark Phippard wrote: > On Tue, Aug 21, 2012 at 3:29 PM, C. Michael Pilato > wrote: > >> If the community decides to simply modify start-commit to run *after* the >> txn gets created and populated with txnprops, that's fine with me. I >> assumed that that change was undesirab

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread C. Michael Pilato
On 08/21/2012 03:37 PM, Mark Phippard wrote: > On Tue, Aug 21, 2012 at 3:29 PM, C. Michael Pilato > wrote: > >> If the community decides to simply modify start-commit to run *after* the >> txn gets created and populated with txnprops, that's fine with me. I >> assumed that that change was undes

Re: FS vtable common_pool and pack_fs/recover

2012-08-21 Thread Philip Martin
Daniel Shahaf writes: > Philip Martin wrote on Tue, Aug 21, 2012 at 18:00:23 +0100: >> Functions like fs_library_vtable_t.pack_fs and >> fs_library_vtable_t.recover that don't take the common_pool parameter >> pass the pool parameter to fs_serialized_init. I think that means these >> functions s

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Branko Čibej
On 21.08.2012 21:29, C. Michael Pilato wrote: > On 08/21/2012 03:14 PM, Branko Čibej wrote: >> On 21.08.2012 21:07, Mark Phippard wrote: >>> I am also not crazy about introducing a bunch of new hooks that are >>> all more or less what the original start-commit hook was doing. >> Have to agree here.

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Mark Phippard
On Tue, Aug 21, 2012 at 3:29 PM, C. Michael Pilato wrote: > If the community decides to simply modify start-commit to run *after* the > txn gets created and populated with txnprops, that's fine with me. I > assumed that that change was undesirable due to the fact mentioned > elsethread about how

Re: FS vtable common_pool and pack_fs/recover

2012-08-21 Thread Daniel Shahaf
Philip Martin wrote on Tue, Aug 21, 2012 at 18:00:23 +0100: > The FS loader uses a vtable fs_library_vtable_t defined in fs-loader.h. > Some of the functions defined in the vtable have a common_pool > parameter: > > /* The open_fs/create/open_fs_for_recovery/upgrade_fs functions are > seria

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread C. Michael Pilato
On 08/21/2012 03:14 PM, Branko Čibej wrote: > On 21.08.2012 21:07, Mark Phippard wrote: >> I am also not crazy about introducing a bunch of new hooks that are >> all more or less what the original start-commit hook was doing. > > Have to agree here. I'm a bit worried that we're trying to introduce

Re: svn commit: r1374357 - in /subversion/trunk: Makefile.in build.conf build/ac-macros/apache.m4 build/generator/gen_base.py build/generator/gen_make.py build/generator/templates/makefile.ezt

2012-08-21 Thread Branko Čibej
On 21.08.2012 21:25, Branko Čibej wrote: > On 21.08.2012 18:57, Daniel Shahaf wrote: >> Suggest: >> >> if [if-any target.when]$([target.when])[else]true[endif] ; then ... >> >> This avoids the need for another if-any at the end of the line. > Good idea. On second thoughts, this would make the bu

Re: svn commit: r1374357 - in /subversion/trunk: Makefile.in build.conf build/ac-macros/apache.m4 build/generator/gen_base.py build/generator/gen_make.py build/generator/templates/makefile.ezt

2012-08-21 Thread Branko Čibej
On 21.08.2012 18:57, Daniel Shahaf wrote: > A few comments on read-through (but without checking out-of-mail > context): [...] > Could you document 'when' somewhere in the tree itself, please? In > build.conf comments, or build/generator/, I don't care, but not just in > the log message please. :-

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Branko Čibej
On 21.08.2012 21:07, Mark Phippard wrote: > I am also not crazy about introducing a bunch of new hooks that are > all more or less what the original start-commit hook was doing. Have to agree here. I'm a bit worried that we're trying to introduce features too specific to what some vendor's client

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Branko Čibej
On 21.08.2012 20:45, Philip Martin wrote: > Blair Zajac writes: > >> On 08/21/2012 11:09 AM, C. Michael Pilato wrote: >>> I actually considered using "post-create-txn" and renaming "start-commit" to >>> "pre-create-txn" (with code to run "start-commit" iff not "pre-create-txn" >>> hook exists, for

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Mark Phippard
On Tue, Aug 21, 2012 at 3:00 PM, C. Michael Pilato wrote: > On 08/21/2012 02:55 PM, Mark Phippard wrote: >> On Tue, Aug 21, 2012 at 2:38 PM, C. Michael Pilato >> wrote: >>> On 08/21/2012 02:29 PM, Blair Zajac wrote: > I actually considered using "post-create-txn" and renaming "start-commit"

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Blair Zajac
On 08/21/2012 11:56 AM, C. Michael Pilato wrote: On 08/21/2012 02:45 PM, Philip Martin wrote: Blair Zajac writes: On 08/21/2012 11:09 AM, C. Michael Pilato wrote: I actually considered using "post-create-txn" and renaming "start-commit" to "pre-create-txn" (with code to run "start-commit" i

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread C. Michael Pilato
On 08/21/2012 02:55 PM, Mark Phippard wrote: > On Tue, Aug 21, 2012 at 2:38 PM, C. Michael Pilato > wrote: >> On 08/21/2012 02:29 PM, Blair Zajac wrote: I actually considered using "post-create-txn" and renaming "start-commit" to "pre-create-txn" (with code to run "start-commit" i

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Philip Martin
Blair Zajac writes: > On 08/21/2012 11:45 AM, Philip Martin wrote: >> Blair Zajac writes: > >> We have already bumped the FSFS format in 1.8 but we have not yet bumped >> the repos format. Perhaps we could bump and have an upgrade that >> renames the hook? > > That would be make repos maintenan

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread C. Michael Pilato
On 08/21/2012 02:45 PM, Philip Martin wrote: > Blair Zajac writes: > >> On 08/21/2012 11:09 AM, C. Michael Pilato wrote: >>> >>> I actually considered using "post-create-txn" and renaming "start-commit" to >>> "pre-create-txn" (with code to run "start-commit" iff not "pre-create-txn" >>> hook exi

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Mark Phippard
On Tue, Aug 21, 2012 at 2:38 PM, C. Michael Pilato wrote: > On 08/21/2012 02:29 PM, Blair Zajac wrote: >>> I actually considered using "post-create-txn" and renaming "start-commit" to >>> "pre-create-txn" (with code to run "start-commit" iff not "pre-create-txn" >>> hook exists, for compat purpose

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Blair Zajac
On 08/21/2012 11:45 AM, Philip Martin wrote: Blair Zajac writes: On 08/21/2012 11:09 AM, C. Michael Pilato wrote: I actually considered using "post-create-txn" and renaming "start-commit" to "pre-create-txn" (with code to run "start-commit" iff not "pre-create-txn" hook exists, for compat pu

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Philip Martin
Blair Zajac writes: > On 08/21/2012 11:09 AM, C. Michael Pilato wrote: >> >> I actually considered using "post-create-txn" and renaming "start-commit" to >> "pre-create-txn" (with code to run "start-commit" iff not "pre-create-txn" >> hook exists, for compat purposes). > > +1. I always have to r

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread C. Michael Pilato
On 08/21/2012 02:29 PM, Blair Zajac wrote: >> I actually considered using "post-create-txn" and renaming "start-commit" to >> "pre-create-txn" (with code to run "start-commit" iff not "pre-create-txn" >> hook exists, for compat purposes). > > +1. I always have to remember which comes first, start

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Blair Zajac
On 08/21/2012 11:09 AM, C. Michael Pilato wrote: On 08/21/2012 01:54 PM, Blair Zajac wrote: On 08/21/2012 10:29 AM, cmpil...@apache.org wrote: Author: cmpilato Date: Tue Aug 21 17:29:40 2012 New Revision: 1375675 URL: http://svn.apache.org/viewvc?rev=1375675&view=rev Log: Introduce a new 'init

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread C. Michael Pilato
On 08/21/2012 02:02 PM, Bert Huijben wrote: > When is this script run when committing with a non http-v2 dav client? > > Are the txnprops available then? Or just with the other ra layers and > new dav clients? The script is still run after the txn is created and the initial txnprops set. So, you'

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread C. Michael Pilato
On 08/21/2012 01:54 PM, Blair Zajac wrote: > On 08/21/2012 10:29 AM, cmpil...@apache.org wrote: >> Author: cmpilato >> Date: Tue Aug 21 17:29:40 2012 >> New Revision: 1375675 >> >> URL: http://svn.apache.org/viewvc?rev=1375675&view=rev >> Log: >> Introduce a new 'init-commit' hook script which runs

RE: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Bert Huijben
> -Original Message- > From: cmpil...@apache.org [mailto:cmpil...@apache.org] > Sent: dinsdag 21 augustus 2012 19:30 > To: comm...@subversion.apache.org > Subject: svn commit: r1375675 - in /subversion/trunk/subversion: > include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c > l

Re: svn commit: r1375675 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/fs-wrap.c libsvn_repos/hooks.c libsvn_repos/repos.c libsvn_repos/repos.h tests/cmdline/commit_tests.py test

2012-08-21 Thread Blair Zajac
On 08/21/2012 10:29 AM, cmpil...@apache.org wrote: Author: cmpilato Date: Tue Aug 21 17:29:40 2012 New Revision: 1375675 URL: http://svn.apache.org/viewvc?rev=1375675&view=rev Log: Introduce a new 'init-commit' hook script which runs immediately after the commit txn is created and populated with

Re: svn commit: r1374357 - in /subversion/trunk: Makefile.in build.conf build/ac-macros/apache.m4 build/generator/gen_base.py build/generator/gen_make.py build/generator/templates/makefile.ezt

2012-08-21 Thread Daniel Shahaf
br...@apache.org wrote on Fri, Aug 17, 2012 at 16:58:22 -: > Author: brane > Date: Fri Aug 17 16:58:22 2012 > New Revision: 1374357 > > URL: http://svn.apache.org/viewvc?rev=1374357&view=rev > Log: > Followup to r1374198: Introduce a new build.conf predicate "when", which names > the post-conf

FS vtable common_pool and pack_fs/recover

2012-08-21 Thread Philip Martin
The FS loader uses a vtable fs_library_vtable_t defined in fs-loader.h. Some of the functions defined in the vtable have a common_pool parameter: /* The open_fs/create/open_fs_for_recovery/upgrade_fs functions are serialized so that they may use the common_pool parameter to allocate fs

Re: svn commit: r1374357 - in /subversion/trunk: Makefile.in build.conf build/ac-macros/apache.m4 build/generator/gen_base.py build/generator/gen_make.py build/generator/templates/makefile.ezt

2012-08-21 Thread Daniel Shahaf
A few comments on read-through (but without checking out-of-mail context): br...@apache.org wrote on Fri, Aug 17, 2012 at 16:58:22 -: > Author: brane > Date: Fri Aug 17 16:58:22 2012 > New Revision: 1374357 > > URL: http://svn.apache.org/viewvc?rev=1374357&view=rev > Log: > Followup to r13741

Re: Vladimir's Status

2012-08-21 Thread Greg Stein
No worries, Vladimir! It happens to all of us :-) ... thanks for the update, and we'll see you soon! Cheers, -g On Tue, Aug 21, 2012 at 8:31 AM, Vladimir Berezniker wrote: > Hi All, > > Just wanted to let you know that I did not forget about the javahl-ra > branch and most likely be able to get

Re: [Issue 4124] New - Give servers sufficient means to disallow commits from clients based on version numbers

2012-08-21 Thread Philip Martin
"C. Michael Pilato" writes: > Now, if we can find a way to expose the revprops to the start-commit hook, > all three RA layers should be able to provide early detection of commits > that would fail in pre-commit for revprop-related reasons. (And we should > consider this independently of the who

Vladimir's Status

2012-08-21 Thread Vladimir Berezniker
Hi All, Just wanted to let you know that I did not forget about the javahl-ra branch and most likely be able to get back to it towards the end of September. But at the moment $DAYJOB does not leave me with sufficient free time to work on other projects. Regards, Vladimir

RE: svn commit: r1371831 / The idea behind the workqueue

2012-08-21 Thread Bert Huijben
> -Original Message- > From: pbu...@apache.org [mailto:pbu...@apache.org] > Sent: zaterdag 11 augustus 2012 00:19 > To: comm...@subversion.apache.org > Subject: svn commit: r1371831 - in /subversion/branches/inheritable- > props/subversion: include/private/ libsvn_client/ libsvn_wc/ > tes