Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Branko Čibej
I'm digging through libsvn_diff and found this snippet in diff_memory.c: SVN_ERR(svn_utf_cstring_from_utf8_ex2 (&out_str, /* The string below is intentionally not marked for translation: it's vital to correct operation of the diff(1)/patch(1)

Re: [PATCH] Implement '--include-externals' option to 'svn list'

2012-11-20 Thread vijay
On Thursday 15 November 2012 08:10 PM, C. Michael Pilato wrote: On 11/15/2012 03:47 AM, Bert Huijben wrote: Can't you just add the new argument to every call to list_func() that applies to an external? There is no separate list_func() call to list external items. We are just calling svn_clien

Re: [PATCH] Implement '--include-externals' option to 'svn list'

2012-11-20 Thread vijay
On Friday 16 November 2012 04:41 PM, Neels J Hofmeyr wrote: Hi Vijay, I gave that patch a spin (after all I was the one who brought --include-externals upon us), and found stuff. Using current trunk + your patch v3. I was looking at your code 'commit --include-externals' before working on th

[PATCH] JavaHL propertyGet handling in org.tigris.subversion package

2012-11-20 Thread Philip Martin
Patches to the Subversion code should go to dev@s.a.o. A log message that would help. Look at old log messages for the code and see the guidelines: http://subversion.apache.org/docs/community-guide/conventions.html#log-messages A regression test would also help. Conor MacNeill writes: > Hi, >

Re: Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Julian Foad
Branko Čibej wrote: > I'm digging through libsvn_diff and found this snippet in diff_memory.c: > >     /* The string below is intentionally not marked for translation: >        it's vital to correct operation of the diff(1)/patch(1) >        program pair. */ >     APR_EOL_STR "\\ No newline at en

Re: Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Stefan Sperling
On Tue, Nov 20, 2012 at 11:25:30AM +0100, Branko Čibej wrote: > I'm digging through libsvn_diff and found this snippet in diff_memory.c: > > SVN_ERR(svn_utf_cstring_from_utf8_ex2 > (&out_str, >/* The string below is intentionally not marked for > translation: >

Re: Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Branko Čibej
On 20.11.2012 15:05, Stefan Sperling wrote: > On Tue, Nov 20, 2012 at 11:25:30AM +0100, Branko Čibej wrote: >> I'm digging through libsvn_diff and found this snippet in diff_memory.c: >> >> SVN_ERR(svn_utf_cstring_from_utf8_ex2 >> (&out_str, >>/* The string below

Re: svn commit: r1411671 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

2012-11-20 Thread Julian Foad
> Author: cmpilato > > URL: http://svn.apache.org/viewvc?rev=1411671&view=rev > Log: > Minor logic simplification. > > * subversion/libsvn_ra_serf/serf.c >   (load_config): Simplify timeout calculations, since we know >     DEFAULT_HTTP_TIMEOUT is non-negative and we know the >     get-time-from

Re: Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Julian Foad
Branko Čibej wrote: > On 20.11.2012 15:05, Stefan Sperling wrote: >> On Tue, Nov 20, 2012 at 11:25:30AM +0100, Branko Čibej wrote: >>> I was under the impression that we already cleared up this >>> misconception? Only the leading backslash and space are important >>> for signaling the no-trail

Re: Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Stefan Sperling
On Tue, Nov 20, 2012 at 03:40:20PM +0100, Branko Čibej wrote: > On 20.11.2012 15:05, Stefan Sperling wrote: > > I just checked the UNIX patch code shipped with OpenBSD and it seems > > you're right that it only looks for the backslash and ignores the comment. > > > > However, it seems in practice p

RE: svn commit: r1411671 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

2012-11-20 Thread Bert Huijben
> -Original Message- > From: Julian Foad [mailto:julianf...@btopenworld.com] > Sent: dinsdag 20 november 2012 15:53 > To: C. MichaelPilato > Cc: dev@subversion.apache.org > Subject: Re: svn commit: r1411671 - > /subversion/trunk/subversion/libsvn_ra_serf/serf.c > > > Author: cmpilato >

Re: svn commit: r1411671 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

2012-11-20 Thread Philip Martin
Julian Foad writes: >> Author: cmpilato > >> >> URL: http://svn.apache.org/viewvc?rev=1411671&view=rev >> Log: >> Minor logic simplification. >> >> * subversion/libsvn_ra_serf/serf.c >>   (load_config): Simplify timeout calculations, since we know >>     DEFAULT_HTTP_TIMEOUT is non-negative and

Re: Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Johan Corveleyn
On Tue, Nov 20, 2012 at 4:09 PM, Stefan Sperling wrote: > On Tue, Nov 20, 2012 at 03:40:20PM +0100, Branko Čibej wrote: >> On 20.11.2012 15:05, Stefan Sperling wrote: >> > I just checked the UNIX patch code shipped with OpenBSD and it seems >> > you're right that it only looks for the backslash an

Re: Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Julian Foad
I committed a patch implementing this, and incorporating your patch below, in r1411723. I would say it's a portability fix and should be considered for backport -- but I don't feel strongly. - Julian Stefan Sperling wrote: > Currently, lines such as: > \\ this is a comment > anywhere in the

Re: Wrong assumption about unidiff syntax in libsvn_diff?

2012-11-20 Thread Branko Čibej
On 20.11.2012 17:15, Johan Corveleyn wrote: > On Tue, Nov 20, 2012 at 4:09 PM, Stefan Sperling wrote: >> On Tue, Nov 20, 2012 at 03:40:20PM +0100, Branko Čibej wrote: >>> On 20.11.2012 15:05, Stefan Sperling wrote: I just checked the UNIX patch code shipped with OpenBSD and it seems you'

Re: svn commit: r1411671 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

2012-11-20 Thread C. Michael Pilato
On 11/20/2012 10:19 AM, Philip Martin wrote: > Julian Foad writes: > >>> Author: cmpilato >> >>> >>> URL: http://svn.apache.org/viewvc?rev=1411671&view=rev >>> Log: >>> Minor logic simplification. >>> >>> * subversion/libsvn_ra_serf/serf.c >>> (load_config): Simplify timeout calculations, since

Re: svn commit: r1411671 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

2012-11-20 Thread C. Michael Pilato
On 11/20/2012 09:53 AM, Julian Foad wrote: >> Author: cmpilato > >> >> URL: http://svn.apache.org/viewvc?rev=1411671&view=rev >> Log: >> Minor logic simplification. >> >> * subversion/libsvn_ra_serf/serf.c >> (load_config): Simplify timeout calculations, since we know >> DEFAULT_HTTP_TIMEOUT

Re: svn commit: r1411671 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

2012-11-20 Thread C. Michael Pilato
On 11/20/2012 09:53 AM, Julian Foad wrote: >> Author: cmpilato > >> >> URL: http://svn.apache.org/viewvc?rev=1411671&view=rev >> Log: >> Minor logic simplification. >> >> * subversion/libsvn_ra_serf/serf.c >> (load_config): Simplify timeout calculations, since we know >> DEFAULT_HTTP_TIMEOUT

Re: svn commit: r1411671 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

2012-11-20 Thread C. Michael Pilato
On 11/20/2012 10:19 AM, Philip Martin wrote: > Julian Foad writes: > >>> Author: cmpilato >> >>> >>> URL: http://svn.apache.org/viewvc?rev=1411671&view=rev >>> Log: >>> Minor logic simplification. >>> >>> * subversion/libsvn_ra_serf/serf.c >>> (load_config): Simplify timeout calculations, since

Re: svn commit: r1411779 - in /subversion/trunk/subversion/libsvn_ra_serf: ra_serf.h replay.c serf.c update.c util.c

2012-11-20 Thread Julian Foad
> Author: cmpilato > Date: Tue Nov 20 18:34:33 2012 > New Revision: 1411779 > > URL: http://svn.apache.org/viewvc?rev=1411779&view=rev > Log: > Use a 64-bit variable (rather than a 32-bit one) to hold ra_serf > timeout values expressed in microseconds.  Overflow is uncool. Mention here that you

Re: [RFC]: Make svnlook (pg|pl) output format mimic svn (pg|pl) & add --show-inherited-props option

2012-11-20 Thread Paul Burba
On Mon, Nov 19, 2012 at 5:27 PM, Johan Corveleyn wrote: > On Mon, Nov 19, 2012 at 9:04 PM, Paul Burba wrote: >> Recently Johan proposed supporting multiple targets for svnlook >> propget: http://svn.haxx.se/dev/archive-2012-11/0439.shtml >> >> One of the ideas that came of this was to make the ou

Re: [RFC]: Make svnlook (pg|pl) output format mimic svn (pg|pl) & add --show-inherited-props option

2012-11-20 Thread Johan Corveleyn
On Tue, Nov 20, 2012 at 10:14 PM, Paul Burba wrote: > On Mon, Nov 19, 2012 at 5:27 PM, Johan Corveleyn wrote: ... >> Maybe the output should become something like: >> >> Properties on 'A\B' inherited from >> 'C:\SVN\src-trunk-2\Debug\subversion\tests\cmdline\svn-test-work\working_copies\autopro

Re: 'svn diff' vs 'svnlook diff'

2012-11-20 Thread Julian Foad
Johan Corveleyn wrote on 2012-11-19: > Julian Foad wrote: >> Johan Corveleyn wrote: >>> Daniel Shahaf wrote: Johan Corveleyn wrote: > I currently have a patch sitting here for adding > --diff-cmd to 'svnlook diff', I wonder what's the minimal change we could make to the c

Development build is failing

2012-11-20 Thread Eric S. Raymond
Got through installing apr, apr-utils, and the sqlite3 failure. The apr portion of the build fails. -- making all in apr /home/esr/svn/subversion/apr make[1]: Entering directory `/home/esr/svn/subversion/apr' make[2]: Entering directory `/home/esr/svn/subversion/apr' /bin/bash /libtool --silen

Re: Development build is failing

2012-11-20 Thread Daniel Shahaf
If you installed APR, you don't need an apr/ source tree in the svn build tree - that would build and use _that_ APR rather than use the installed one. Eric S. Raymond wrote on Tue, Nov 20, 2012 at 19:43:43 -0500: > Got through installing apr, apr-utils, and the sqlite3 failure. > The apr portion

Re: Development build is failing

2012-11-20 Thread Eric S. Raymond
Daniel Shahaf : > If you installed APR, you don't need an apr/ source tree in the svn > build tree - that would build and use _that_ APR rather than use the > installed one. > > Eric S. Raymond wrote on Tue, Nov 20, 2012 at 19:43:43 -0500: > > Got through installing apr, apr-utils, and the sqlite3

Re: Development build is failing

2012-11-20 Thread Daniel Shahaf
Eric S. Raymond wrote on Tue, Nov 20, 2012 at 21:56:01 -0500: > Daniel Shahaf : > > If you installed APR, you don't need an apr/ source tree in the svn > > build tree - that would build and use _that_ APR rather than use the > > installed one. > > > > Eric S. Raymond wrote on Tue, Nov 20, 2012 at

svnlook_tests 3 and 9 failing on Windows bots

2012-11-20 Thread Julian Foad
My commit causes two test failures on the Windows buildbot.  It works on Ubuntu.  I can (or you're welcome to) revert it if it's causing too much annoyance before I can fix it, but I'd rather work out what's actually wrong. I assume it's an EOL problem as (1) it

Re: Development build is failing

2012-11-20 Thread Eric S. Raymond
Daniel Shahaf : > Not sure what's wrong. Don't expect *me* to tell you. I'd lose fewer sanity points confronting dread Cthulhu in his house at R'Lyeh than diving into an autotools build of this size and complexity. B... > > Those instructions are, by the way, wrong on one small but crucial

Re: svnlook_tests 3 and 9 failing on Windows bots

2012-11-20 Thread Daniel Shahaf
A bit of a guess, but: Maybe APR_EOL_STR is "\r\n" and the \n becomes CRLF by itself? That would explain the "List index out of range" error because the .split() would split an empty line and thus return []. (And the fix would be to use "\n" instead of APR_EOL_STR) Julian Foad wrote on Wed, Nov

Re: Development build is failing

2012-11-20 Thread Daniel Shahaf
> > > Those instructions are, by the way, wrong on one small but crucial > > > point. They say to get the sqlite amalgamation zip and unpack it, but > > > then that the sqlite3.c file from it should be moved to an > > > 'amalgamation' directory - which doesn't exist, so that attempt wukk > > > fai

Re: Development build is failing

2012-11-20 Thread Eric S. Raymond
Daniel Shahaf : > Thanks. Could you please mention in your log messages the names of > files you modify, as per > http://subversion.apache.org/docs/community-guide/conventions#log-messages > ? Sorry, I will attempt to bear this in mind in the future. I've been an extremely sporadic committer and

Build from source continues to be broken

2012-11-20 Thread Eric S. Raymond
autogen/configure/make transcript attached. Envronment is a stock Ubuntu system. -- http://www.catb.org/~esr/";>Eric S. Raymond Script started on Wed 21 Nov 2012 01:44:50 AM EST ]0;esr@snark: ~/svn/subversionesr@snark:~/svn/subversion$ svn update WARNING: gnome-keyring:: couldn't