tag:old.nabble.com,2006:forum-10711Nabble - tigris - websvn2009-12-07T04:46:30ZPHP based web interface of Subversion repositories. tigris - websvn home is <a href="http://websvn.tigris.org/" target="_top" rel="nofollow">here</a>.tag:old.nabble.com,2006:post-26676820[WebSVN] authentication/authorisation problem in combination with "Satisfy Any" directive2009-12-07T04:46:30Z2009-12-07T04:46:30ZwebpostHello,
<br><br>I have a problem with authentication or authorization in combination with the
<br>"Satisfy Any" directive within the Apache configuration. Our subversion server
<br>is configured like
<br><br><Location />
<br> DAV svn
<br> SVNParentPath /home/subversion/repos
<br> AuthzSVNAccessFile svn-access-file
<br><br> AuthType Basic
<br> AuthBasicProvider ldap
<br> AuthName "Subversion repository (LDAP password)"
<br> AuthLDAPUrl ldap://...
<br><br> # try anonymous access first, resort to real
<br> # authentication if necessary.
<br> Satisfy Any
<br> Require valid-user
<br></Location>
<br><br>I set up WebSVN with the identical authentificatin scheme
<br>on the same Apache server listening on some other port:
<br><br><Directory /var/www/svnserv01/htdocs>
<br> SSLRequireSSL
<br><br> AuthType Basic
<br> AuthBasicProvider ldap
<br> AuthName "Subversion repository (LDAP password)"
<br> AuthLDAPUrl ldap://...
<br><br> # try anonymous access first, resort to real
<br> # authentication if necessary.
<br> Satisfy Any
<br> Require valid-user
<br></Directory>
<br><br>WebSVN is working so far. But only the anonymous accessable repositories are
<br>shown. I have no chance to authenticate with username/password, as there is no
<br>login button. I tried commenting out the "Satisfy Any" directive to disable the
<br>possiblity for anonymous access. Then I get a login popup window, which asks
<br>for username/password. But Apache/WebSVN does not accept my account data. After
<br>pushing "OK" I get the next login window. The error log shows, that
<br>username/pasword (authentication) is correct, but authorisation failed:
<br><br>[Mon Dec 07 13:23:12 2009] [debug] mod_authnz_ldap.c(454): [client 10.54.67.129] [28149] auth_ldap authenticate: accepting foo
<br>[Mon Dec 07 13:23:12 2009] [debug] mod_authnz_ldap.c(826): [client 10.54.67.129] [28149] auth_ldap authorise: authorisation denied
<br><br>If I do the same (commenting out "Satisfy Any") in the <Location> block of the
<br>subversion configuration, subversion remains working with the exception of
<br>anonymous logins.
<br><br>What do I have to change, to get this working?
<br><br>Ingo
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427804" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427804</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26676820&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26674343Re: [WebSVN] Protect information from command error2009-12-07T00:54:15Z2009-12-07T00:54:15ZYokav - MailingHello,
<br><br>This error doesn't occur anymore in the last version of the svn. :)
<br>AFAIK because it's not easy to generate an error! ;)
<br><br>Le 04/12/09 19:28, Quinn Taylor a écrit :
<div class='shrinkable-quote'><br>> Yokav -
<br>>
<br>> Just tying up loose ends... Does this occur an the latest version anymore? We've tried to make sure include/svnlook.php only logs sensitive information to the web server log, and doesn't print it in the web page. Please let us know if this still happens for you in trunk.
<br>>
<br>> Thanks,
<br>> - Quinn
<br>>
<br>> On Oct 23, 2009, at 5:24 AM, Yokav wrote:
<br>>
<br>>> Hello,
<br>>>
<br>>> When there is an error, the command used during the error is displayed.
<br>>>
<br>>> But if we use a repo with login/password, the command displayed contain
<br>>> those information !
<br>>>
<br>>> What's the best solution? Don't display error, display only the error if...
<br>>>
<br>>> ------------------------------------------------------
<br>>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2410628" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2410628</a><br>>>
<br>>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674343&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427147" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427147</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674343&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
</div><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427760" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427760</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26674343&i=2" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26647217Re: [WebSVN] XML error: no element found2009-12-04T10:43:14Z2009-12-04T10:43:14ZQuinn TaylorWebSVN 2.2.1 has imperfect handling of operative and peg revisions — the @11181 in your command indicates a peg revision, and removing it should help. The upcoming 2.3.0 release should address most such issues. David, if you're still on the list, try giving the trunk version a shot to see if it solves your problem.
<br><br>Cheers,
<br> - Quinn
<br><br>On Sep 16, 2009, at 8:12 AM, <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26647217&i=0" target="_top" rel="nofollow">webpost@...</a> wrote:
<br><div class='shrinkable-quote'><div class='shrinkable-quote'><br>> Hi,
<br>>
<br>> I am using;
<br>> WebSVN version 2.2.1
<br>> SVN version 1.4.6
<br>>
<br>> All seems to work well, I can access repositories and view code.
<br>>
<br>> However if I click on 'blame' for some files instead of the usual source code with names beside each line I get a blank page.
<br>>
<br>> Looking at the http logs I see the following error message;
<br>>
<br>> [client 192.168.6.180] XML error: no element found (3) at line 3 column 0 byte 28\ncmd: svn --non-interactive --config-dir /tmp log --xml --verbose -r11181:11181 --limit 1 'file:///svn/centra/branches/CAS_148_A/makefile@11181', referer: <a href="http://svn/filedetails.php?repname=Centra&path=%2Fbranches%2FCAS_148_A%2Fmakefile" target="_top" rel="nofollow">http://svn/filedetails.php?repname=Centra&path=%2Fbranches%2FCAS_148_A%2Fmakefile</a><br>>
<br>> The revision number 11181 isn't correct so I think this is why the command is failing.
<br>> If I run the command from terminal I get;
<br>>
<br>> <?xml version="1.0"?>
<br>> <log>
<br>> svn: File not found: revision 11181, path '/branches/CAS_153_A/makefile'
<br>>
<br>>
<br>> If I replace this 11181 with the current revision number 34490 and run the command manually from terminal it returns output
<br>>
<br>> Can anyone point me in the direction of a solution?
<br>>
<br>> Thanks,
<br>> David
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2395605" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2395605</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26647217&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
</div></div>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427156" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427156</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26647217&i=2" target="_top" rel="nofollow">dev-unsubscribe@...</a>].<br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>smime.p7s</strong> (4K) <a href="http://old.nabble.com/attachment/26647217/0/smime.p7s" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26647093Re: [WebSVN] Access control broken using parentPath2009-12-04T10:34:42Z2009-12-04T10:34:42ZQuinn TaylorWould it be possible for you to check whether this problem still occurs for you in the latest trunk version? Dirk added some improvements related to auth files, and we want to make sure we've got everything working as expected for the upcoming 2.3.0 release. Thanks!
<br> - Quinn
<br><br>On Jul 27, 2009, at 12:20 PM, <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26647093&i=0" target="_top" rel="nofollow">webpost@...</a> wrote:
<br><div class='shrinkable-quote'><div class='shrinkable-quote'><br>> Authentication files are ignored if you use parentPath to add multiple repositories.
<br>>
<br>> If you add a set of repositories using parentPath:
<br>> $config->parentPath('/svn');
<br>>
<br>> And then you add per-repository access control:
<br>> $config->useAuthenticationFile('/svn/alpha/access', 'alpha');
<br>> $config->useAuthenticationFile('/svn/beta/access', 'beta');
<br>>
<br>> If you instrument the code, you find that the call sequence is so:
<br>>
<br>> new Repository(alpha)
<br>> alpha->useAuthenticationFile...
<br>> new Repository(beta)
<br>> beta->useAuthenticationFile..
<br>> ....
<br>> new Repository(alpha)
<br>> new Repository(beta)
<br>>
<br>> The repositories are created a second time and this second set are actually used; they have no authentication files so do not enforce access control.
<br>>
<br>> A workaround is to add repositories explicitly, not using parentPath.
<br>>
<br>> My PHP-fu is not up to diagnosing further.
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2376112" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2376112</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26647093&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
</div></div>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427151" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427151</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26647093&i=2" target="_top" rel="nofollow">dev-unsubscribe@...</a>].<br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>smime.p7s</strong> (4K) <a href="http://old.nabble.com/attachment/26647093/0/smime.p7s" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26647015Re: [WebSVN] Sort by age in WebSVN2009-12-04T10:30:23Z2009-12-04T10:30:23ZQuinn TaylorThat's a good idea for a future feature. Can you please file a feature request through the website so we can track it for future development?
<br><br>Thanks,
<br> - Quinn
<br><br>On Oct 20, 2009, at 5:21 AM, Markus Gaugusch wrote:
<br><div class='shrinkable-quote'><div class='shrinkable-quote'><br>> Hi!
<br>>
<br>> I've converted from ViewVC to WebSVN and for me it is really a big step
<br>> forward in every way :-)
<br>>
<br>> There is only one little feature that I'm missing: in ViewVC I could click
<br>> on the columns in a directory listing to sort the content accordingly.
<br>> It seems to me, that WebSVN (I'm using 2.2.1) doesn't seem to support this
<br>> feature. In fact, it would only be relevant for the "Last modification"
<br>> column (and "Path" to restore the default sort ordering)
<br>>
<br>> best regards,
<br>> Markus
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2409363" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2409363</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26647015&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
</div></div>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427148" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427148</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26647015&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].<br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>smime.p7s</strong> (4K) <a href="http://old.nabble.com/attachment/26647015/0/smime.p7s" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26646986Re: [WebSVN] Protect information from command error2009-12-04T10:28:07Z2009-12-04T10:28:07ZQuinn TaylorYokav -
<br><br>Just tying up loose ends... Does this occur an the latest version anymore? We've tried to make sure include/svnlook.php only logs sensitive information to the web server log, and doesn't print it in the web page. Please let us know if this still happens for you in trunk.
<br><br>Thanks,
<br> - Quinn
<br><br>On Oct 23, 2009, at 5:24 AM, Yokav wrote:
<br><div class='shrinkable-quote'><div class='shrinkable-quote'><br>> Hello,
<br>>
<br>> When there is an error, the command used during the error is displayed.
<br>>
<br>> But if we use a repo with login/password, the command displayed contain
<br>> those information !
<br>>
<br>> What's the best solution? Don't display error, display only the error if...
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2410628" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2410628</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26646986&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
</div></div>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427147" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427147</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26646986&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].<br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>smime.p7s</strong> (4K) <a href="http://old.nabble.com/attachment/26646986/0/smime.p7s" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26646819Re: [WebSVN] access control via authz on regular files2009-12-04T10:18:11Z2009-12-04T10:18:11ZQuinn TaylorSorry for the delayed response. Can you check whether this now works as expected? I resolved an issue with empty auth groups, and I've wondering whether this is still a problem.
<br><br>Thanks,
<br> - Quinn
<br><br>On Sep 25, 2009, at 6:59 AM, <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26646819&i=0" target="_top" rel="nofollow">webpost@...</a> wrote:
<br><div class='shrinkable-quote'><div class='shrinkable-quote'><br>> Hello,
<br>>
<br>> I noticed when setting access for a normal file via authz websvn does not treat this setting correctly.
<br>>
<br>> Example authz:
<br>> [some-repo:/some-file.txt]
<br>> foo =
<br>>
<br>> Expected result:
<br>> websvn does not show this file and restricts read access for user "foo".
<br>>
<br>> Actual result:
<br>> websvn shows the file and even it's contents (on diff, blame and details page)
<br>>
<br>> I went through the websvn source and tracked this problem down to line 62 in <includes/accessfile.php>. I think this issue exists since r376 but it has also effect until release 2.1.1.
<br>>
<br>> In that line all authz sections are forced to have a trailing / which causes Authentication::hasReadAccess() to always return the default or parent access for files because "some-file.txt" is not "some-file.txt/" and so the authz rule does not match.
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2400250" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2400250</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26646819&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
</div></div>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427140" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427140</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26646819&i=2" target="_top" rel="nofollow">dev-unsubscribe@...</a>].<br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>smime.p7s</strong> (4K) <a href="http://old.nabble.com/attachment/26646819/0/smime.p7s" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26646689Re: [WebSVN] How can I display the SVN URL on a repository page?2009-12-04T10:09:36Z2009-12-04T10:09:36ZQuinn Taylor<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">If you mean the SVN links that appear in <a href="http://trunk.websvn.info" target="_top" rel="nofollow">trunk.websvn.info</a>, it's fairly easy. You have to provide the URL to the root of the repository as the last argument to a $config->addRepository(...) command in include/config.php, passing null for any non-required parameters. (I put it at the end so it wouldn't break existing configurations.) This feature is not in version 2.2.1, but will be in the upcoming 2.3.0 release.<div><br></div><div> - Quinn<br><div><br><div><div>On Dec 4, 2009, at 9:40 AM, Royce Souther wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">I wan the SVN URL displayed in the repository page but I cannot find any way to do that.<br clear="all"><br>-- <br>Easy, fast GUI development.<br><a href="http://PerlQt.wikidot.com/" target="_top" rel="nofollow">http://PerlQt.wikidot.com</a><br>
</blockquote></div><br></div></div></body></html><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>smime.p7s</strong> (4K) <a href="http://old.nabble.com/attachment/26646689/0/smime.p7s" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26646335[WebSVN] How can I display the SVN URL on a repository page?2009-12-04T09:40:33Z2009-12-04T09:40:33ZRoyce Souther-2I wan the SVN URL displayed in the repository page but I cannot find any way to do that.<br clear="all"><br>-- <br>Easy, fast GUI development.<br><a href="http://PerlQt.wikidot.com" target="_top" rel="nofollow">http://PerlQt.wikidot.com</a><br>
<p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26643911Re: [WebSVN] Show as text/html?2009-12-04T07:11:53Z2009-12-04T07:11:53ZQuinn TaylorVersion 2.2.1 won't do it because the feature was added since then and will be part of WebSVN 2.3.0, coming very, very soon.
<br><br>With the new version, such links appear automatically if a file has an svn:mime-type property set for it, or if WebSVN is configured to map .html files to text/html. Here's how you can set the property:
<br><br>$ svn propset svn:mime-type text/html /path/to/wc/file.html
<br><br>I modified my SVN local config file so that autoprops is enabled [1], such that SVN applies specific properties when new files are added. For existing files, you can use svn-apply-autoprops.py [2] to apply the properties in a working copy and modify them as desired before committing. Notice that auto-props is a per-client setting, so any developers that add new files would have to replicate the same settings, or someone will have to regularly check the properties manually to make sure that a file has a MIME type. (It should be fairly trivial to write a script that recursively queries files for a given SVN property (with 'svn propget') and reports any files that don't have that property.)
<br><br>I personally also set svn:eol-style=native for all text files, so that when people check out a file, is has line endings appropriate for their platform (Windows, Unix, Mac, etc.). There are a lot of cool things you can do with properties...
<br><br>Thanks for noticing the feature (that's one I added, since I found it useful) and providing feedback. Good luck!
<br> - Quinn
<br><br>[1] <a href="http://www.mediawiki.org/wiki/Subversion/auto-props" target="_top" rel="nofollow">http://www.mediawiki.org/wiki/Subversion/auto-props</a><br>[2] <a href="http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn_apply_autoprops.py" target="_top" rel="nofollow">http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn_apply_autoprops.py</a><br><br>On Dec 4, 2009, at 12:02 AM, <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643911&i=0" target="_top" rel="nofollow">webpost@...</a> wrote:
<br><br>> The <a href="http://trunk.websvn.info/" target="_top" rel="nofollow">http://trunk.websvn.info/</a> shows HTML pages in their source form with "view as text/html" at the top. <a href="http://demo.websvn.info/" target="_top" rel="nofollow">http://demo.websvn.info/</a> doesn't do that for the HTML pages...
<br>>
<br>> How was this accomplished? I want to set it so that my users can view .html files with that "view as" link.
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2426916" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2426916</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643911&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427072" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2427072</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26643911&i=2" target="_top" rel="nofollow">dev-unsubscribe@...</a>].<br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>smime.p7s</strong> (4K) <a href="http://old.nabble.com/attachment/26643911/0/smime.p7s" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26639205[WebSVN] Show as text/html?2009-12-04T00:02:34Z2009-12-04T00:02:34ZwebpostThe <a href="http://trunk.websvn.info/" target="_top" rel="nofollow">http://trunk.websvn.info/</a> shows HTML pages in their source form with "view as text/html" at the top. <a href="http://demo.websvn.info/" target="_top" rel="nofollow">http://demo.websvn.info/</a> doesn't do that for the HTML pages...
<br><br>How was this accomplished? I want to set it so that my users can view .html files with that "view as" link.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2426916" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2426916</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26639205&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26622523[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-03T00:30:51Z2009-12-03T00:30:51ZDirk Thomas<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26622523&i=0" target="_top" rel="nofollow">dirkthomas@...</a> Thu Dec 3 00:30:50 -0800 2009 -------
<br>May be we should take a step back to define what the proposed scenario is.
<br><br>In the following example lowerletter folders are plain folders and upperletter
<br>folders are svn-repositories.
<br><br>root
<br>- a
<br>- - A1
<br>- - A2
<br>- - A3
<br>- b
<br>- - B1
<br>- - B2
<br>- - B3
<br>- c
<br>- - C1
<br>- - C2
<br>- - C3
<br><br>- d
<br>- e
<br>- - ee
<br>- - - EE1
<br><br>Currently it is only possible to add "a", "b" and "c" using the parentPath-method.
<br>Thereby different groups should be used, since "A1" and "B1" might have the same
<br>name and therefore would result in a conflict when added into the same group.
<br><br>If i understand lann correctly he suggested to add the root once using his new
<br>method and let WebSVN figure out automatically to add all repositories which are
<br>on the second sub level (e.g. A1).
<br>Thereby "d" might never be a repository and "EE1" would not be handled (and "ee"
<br>would be incorrectly be interpreted as a repository).
<br><br>If this is the case i do see an issue with the proposed patch:
<br>- the URLs with the paths differ from the current kind of grouping in WebSVN, it
<br>is a second concept for the same feature (to structure repositories
<br>hierarchically [currently only with one level])
<br>-> i would like to not introduce a second concept for the same functionality
<br>since it makes the code more difficult to manage and test
<br><br>Why not use a custom loop inside of the config, which goes through all
<br>subfolders of "root" and adds them using the parentPath-method into a group with
<br>the name of the current folder (e.g. "a")?
<br><br>May be a useful feature for WebSVN would be to:
<br>- handle multilevel group (not only a single level of grouping)
<br>- provide a recursivePath-method to collect repositories at a specific sublevel
<br>automatically and use the path (with could be multiple levels) as grouping
<br>(which would require the previous mentioned feature)
<br><br>What are your thoughts on that?
<br>Did i get your suggestion right, Iann?
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426602" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426602</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26619194[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-02T16:34:19Z2009-12-02T16:34:19Zlann-3<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26619194&i=0" target="_top" rel="nofollow">lann@...</a> Wed Dec 2 16:34:19 -0800 2009 -------
<br>Hi,
<br><br>Sorry for my English.
<br>The proposed solution is not in term of patch but just giving an idea to have
<br>this features.
<br>I sure there is a better coding to do this. Thats I am leaving to contributor to
<br>do.
<br>What I want to tell you are it is possible and not to hard to do. What I have
<br>done in the changes is only an overnight work.
<br>I am not really understood the WebSVN system. It will makes the patch breaking
<br>other thing that I dont know. Thats why you need to do it again based on the
<br>idea or just your own way.
<br>So if you can provide this features by your own changes, update and update again
<br>is much better.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426498" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426498</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26615888[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-02T12:30:29Z2009-12-02T12:30:29ZQuinn Taylor<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26615888&i=0" target="_top" rel="nofollow">quinntaylor@...</a> Wed Dec 2 12:30:28 -0800 2009 -------
<br>It took quite a bit of work, but I was able to narrow the changes down to a diff on 4 files. I've attached
<br>it for reference.
<br><br>In looking at the changes, I'm still not sure what the benefit is. LaNN, perhaps I'm not understanding
<br>your English descriptions of what the proposed change accomplishes. How is this any different from
<br>specifying parent paths? It seems like this has more to do with how you're organizing your repositories
<br>on the server, and would be much easier to solve outside of WebSVN. If your repositories are organized
<br>in a coherent hierarchy, it should be pretty easy to configure parent path directories. If your hierarchy is
<br>fixed and is multiply-nested, have you considered creating a directory with just symbolic links for
<br>WebSVN to read from?
<br><br>In addition, such a setup effectively makes it possible for users to browse into repositories that were
<br>not originally configured, which can be a security liability. Unless there is a compelling reason, or I'm
<br>missing something big, I don't see this as a change that will improve WebSVN; Dirk, what are your
<br>thoughts?
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426458" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426458</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26615793[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-02T12:22:40Z2009-12-02T12:22:40ZQuinn Taylor<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br>User quinntaylor changed the following:
<br><br> What |Old value |New value
<br>================================================================================
<br> Attachment is patch| |Created an attachment (id=
<br> | |131)
<br>Patch against rev 818
<br> | | (version 2.2.1) with prop
<br> | |osed changes for this issu
<br> | |e.
<br><br>--------------------------------------------------------------------------------
<br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26615793&i=0" target="_top" rel="nofollow">quinntaylor@...</a> Wed Dec 2 12:22:39 -0800 2009 -------
<br>Created an attachment (id=131)
<br>Patch against rev 818 (version 2.2.1) with proposed changes for this issue.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426454" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426454</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26610538[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-02T07:14:49Z2009-12-02T07:14:49Zlann-3<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26610538&i=0" target="_top" rel="nofollow">lann@...</a> Wed Dec 2 07:14:48 -0800 2009 -------
<br>Yes I found the zip file. its 2.2.1.
<br>Take a look. I sure it need to properly coded.
<br>Last time after it work, I just leave it.
<br>Something not finish there, like non-multiview support.
<br>Good luck.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426369" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426369</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26609617[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-02T06:19:00Z2009-12-02T06:19:00ZQuinn Taylor<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26609617&i=0" target="_top" rel="nofollow">quinntaylor@...</a> Wed Dec 2 06:18:59 -0800 2009 -------
<br>In that case, can you please identify the release you downloaded? (My assumption is 2.2.1, but better to be
<br>sure.) With that information, it will be possible to create a patch we can examine for changes. Thanks!
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426344" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426344</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26605822[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-02T01:18:06Z2009-12-02T01:18:06Zlann-3<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26605822&i=0" target="_top" rel="nofollow">lann@...</a> Wed Dec 2 01:18:04 -0800 2009 -------
<br>Actually Im not checkout before to edit. I just simply edit from release version
<br>I download in the 10 Nov (or few days before that).
<br><br>Sorry I got lots of prioritized projects now.
<br><br>I suggest you to use Notepad++ to compare the release and edited files for review.
<br><br>I hope other contributors also can help.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426247" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426247</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26604592[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-01T23:22:09Z2009-12-01T23:22:09ZDirk Thomas<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26604592&i=0" target="_top" rel="nofollow">dirkthomas@...</a> Tue Dec 1 23:22:08 -0800 2009 -------
<br>Could you please attach a diff/patch against the current trunk?
<br>This makes reviewing and integrating the modifications much easier.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426201" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426201</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26604583[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-01T23:21:01Z2009-12-01T23:21:01Zlann-3<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26604583&i=0" target="_top" rel="nofollow">lann@...</a> Tue Dec 1 23:21:00 -0800 2009 -------
<br>I just upload my edited version.
<br><br>I can't remember the files I change but atleast I change the wsvn.php, index.php
<br>and add new indexsub.php based on the index.php.
<br><br>I think I edit on last 10 Nov.
<br><br>Take a look. Not a perfect because that time I edit in a fast way just to make
<br>sure it work. Redo in your own way that will work in any configuration.
<br><br>Hope this will help.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426200" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426200</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26604517[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-01T23:12:44Z2009-12-01T23:12:44Zlann-3<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26604517&i=0" target="_top" rel="nofollow">lann@...</a> Tue Dec 1 23:12:43 -0800 2009 -------
<br>Created an attachment (id=130)
<br>My edited websvn to show and browse normal folder
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426197" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426197</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26604483[WebSVN issue] [Issue 258] List Repositories in subfolders recursively2009-12-01T23:07:32Z2009-12-01T23:07:32Zlann-3<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=258" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=258</a><br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26604483&i=0" target="_top" rel="nofollow">lann@...</a> Tue Dec 1 23:07:32 -0800 2009 -------
<br>I already edit the source to have this features by small changes. Not perfect
<br>but it works atleast.
<br><br>The idea is not to list all repo for all subfolders. Just list the direct
<br>subfolder in the parent path. the repo folder and normal folder would have
<br>different icon.
<br><br>If user click repo folder it will open the repo to view svn files folders. If
<br>user click normal folder it will set the folder as "current folder" and list the
<br>direct subfolder for that folder.
<br><br>This is same like how you did it well inside a repo to browse files and folders.
<br>It is just simply like Windows Explorer do.
<br><br>Php Multiview would helps for enumerating the subfolders in url on which I try
<br>it works. However without multiview also possible from last time I read the source.
<br><br>Simple way will make the things easier for developer and convenient for user.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426196" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2426196</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26547983[WebSVN issue] [Issue 259] Handle different character encoding correctly2009-11-27T13:32:18Z2009-11-27T13:32:18ZDirk Thomas<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=259" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=259</a><br><br><br><br>User dirkthomas changed the following:
<br><br> What |Old value |New value
<br>================================================================================
<br> Status|RESOLVED |CLOSED
<br>--------------------------------------------------------------------------------
<br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26547983&i=0" target="_top" rel="nofollow">dirkthomas@...</a> Fri Nov 27 13:32:17 -0800 2009 -------
<br>Confirmed to work from one user via dev mailinglist.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424977" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424977</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26547977[WebSVN issue] [Issue 259] Handle different character encoding correctly2009-11-27T13:31:30Z2009-11-27T13:31:30ZDirk Thomas<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=259" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=259</a><br><br><br><br>User dirkthomas changed the following:
<br><br> What |Old value |New value
<br>================================================================================
<br> Status|STARTED |RESOLVED
<br>--------------------------------------------------------------------------------
<br> Resolution| |FIXED
<br>--------------------------------------------------------------------------------
<br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26547977&i=0" target="_top" rel="nofollow">dirkthomas@...</a> Fri Nov 27 13:31:29 -0800 2009 -------
<br>The issue should be fixed in SVN trunk and is therefore marked as closed.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424976" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424976</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26547951Re: [WebSVN] [WebSVN issue] Unable to call svn command "/usr/bin/svn --non-interactive --config-dir /tmp2009-11-27T13:29:13Z2009-11-27T13:29:13ZDirk ThomasHello,
<br><br>could you please try to answer my previous questions and recheck with the latest revision from SVN trunk - since else i have no clue how to narrow down the source of the issue you experience.
<br><br>>>> could you please try the current revision from SVN trunk?
<br>>>> The described issue is difficult to debug and since the last release many
<br>>>> problems in this area have been solved or at least the error message has
<br>>>> been improved significantly.
<br> >>
<br>>> The issue is with the comparision of files in history.
<br>>> Taking the current revision from SVN trunk would not help.
<br>>
<br>> Sorry if i ask again, since English is not my native language:
<br>> have you tried to use a current version of WebSVN from SVN trunk and the error message is the same?
<br><br>An additional question would be if the file where the issue occurs has been copied, moved or renamed in the repository?
<br><br>Dirk
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424975" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424975</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26547951&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26531825Re: [WebSVN] filedetails didn't shown all the content of a file2009-11-26T08:27:15Z2009-11-26T08:27:15ZDirk ThomasHi Yokav,
<br><br>> I just try your patch and it seems to works fine as you can see here:
<br>> <a href="http://svn.tutux.be/filedetails.php?repname=AoK&path=%2Fscripts%2Fbash%2FpnSVN2Web%2Ftrunk%2Fexportpn.sh&rev=5&peg=5" target="_top" rel="nofollow">http://svn.tutux.be/filedetails.php?repname=AoK&path=%2Fscripts%2Fbash%2FpnSVN2Web%2Ftrunk%2Fexportpn.sh&rev=5&peg=5</a><br><br>Thank you for confirming.
<br>May be some one else can check this for their repositories and report back?
<br><br>> There is also the function iconv-get-encoding for finding the encoding
<br>> but I don't known which one is the better one.
<br><br>As far as i know "iconv_get_encoding" can only be used to retrieve internal configuration variables of iconv extension.
<br>I don't know of any function other than "mb_detect_encoding" to detect the character encoding of a given string.
<br><br>Dirk
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424630" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424630</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26531825&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26531690Re: [WebSVN] filedetails didn't shown all the content of a file2009-11-26T08:17:39Z2009-11-26T08:17:39ZYokav - MailingHi,
<br><br>I just try your patch and it seems to works fine as you can see here:
<br><a href="http://svn.tutux.be/filedetails.php?repname=AoK&path=%2Fscripts%2Fbash%2FpnSVN2Web%2Ftrunk%2Fexportpn.sh&rev=5&peg=5" target="_top" rel="nofollow">http://svn.tutux.be/filedetails.php?repname=AoK&path=%2Fscripts%2Fbash%2FpnSVN2Web%2Ftrunk%2Fexportpn.sh&rev=5&peg=5</a><br><br>There is also the function iconv-get-encoding for finding the encoding
<br>but I don't known which one is the better one.
<br><br>Le 26/11/09 13:51, Dirk Thomas a écrit :
<div class='shrinkable-quote'><br>> Hi Yokav,
<br>>
<br>> >>>>> $config->setContentEncoding('utf-8');
<br>> >>>>>
<br>> >>>> The attached file is not utf-8 encoded.
<br>> >>>> If you remove the "setContentEncoding"-setting it should display correctly.
<br>> >>>> Else same the file with UTF-8-encoding and the output should also be fine.
<br>> >>>
<br>> >>> And what must I do when I've utf8 and non utf8 files on the same repo?
<br>> >>> Why don't you use an utf8_encode?
<br>> >>
<br>> >> the point is that it difficult to distinguish if a string is already in utf-8.
<br>> >> Running utf8_encode on an already utf-8 encoded string gives the same problems.
<br>> >>
<br>> >> So for now - until WebSVN is able to automatically identify the encoding in all cases - i have no better answer, sorry.
<br>> >
<br>> > mb_detect_encoding is not enough?
<br>>
<br>> the current usage of "iconv" and the configuration options for input-, content- and output-encodings are not good enough to handle your issue with multiple different characters encodings in a single
<br>> repository.
<br>> The main problem is to distinguish if an encoding is necessary!
<br>>
<br>> I have tried to solve this using the "mb_detect_encoding" function.
<br>> The arguments look a little bit weird:
<br>> mb_detect_encoding($str.'a', 'UTF-8, ISO-8859-1');
<br>> but are necessary as described here: <a href="http://de3.php.net/manual/en/function.mb-detect-encoding.php#81936" target="_top" rel="nofollow">http://de3.php.net/manual/en/function.mb-detect-encoding.php#81936</a>.
<br>>
<br>> I have attached a patch against the current revision 993.
<br>> Could you, Yokav, and also some other people check this against their repositories to see if it works as expected and report back?
<br>>
<br>> I have only a limited set of different character encodings and special characters.
<br>> Those cases do work for me - but there might be other files and encoding in-the-real-world.
<br>>
<br>> If you do encounter issues with this patch could you please provide the file which has any issues?
<br>>
<br>> Dirk
<br>>
<br>> PS: i have created an issue for this - <a href="http://websvn.tigris.org/issues/show_bug.cgi?id=259" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=259</a><br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424587" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424587</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26531690&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
</div><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424628" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424628</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26531690&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26529036Re: [WebSVN] filedetails didn't shown all the content of a file2009-11-26T04:51:13Z2009-11-26T04:51:13ZDirk ThomasHi Yokav,
<br><br> >>>>> $config->setContentEncoding('utf-8');
<br> >>>>>
<br> >>>> The attached file is not utf-8 encoded.
<br> >>>> If you remove the "setContentEncoding"-setting it should display correctly.
<br> >>>> Else same the file with UTF-8-encoding and the output should also be fine.
<br> >>>
<br> >>> And what must I do when I've utf8 and non utf8 files on the same repo?
<br> >>> Why don't you use an utf8_encode?
<br> >>
<br> >> the point is that it difficult to distinguish if a string is already in utf-8.
<br> >> Running utf8_encode on an already utf-8 encoded string gives the same problems.
<br> >>
<br> >> So for now - until WebSVN is able to automatically identify the encoding in all cases - i have no better answer, sorry.
<br> >
<br> > mb_detect_encoding is not enough?
<br><br>the current usage of "iconv" and the configuration options for input-, content- and output-encodings are not good enough to handle your issue with multiple different characters encodings in a single
<br>repository.
<br>The main problem is to distinguish if an encoding is necessary!
<br><br>I have tried to solve this using the "mb_detect_encoding" function.
<br>The arguments look a little bit weird:
<br> mb_detect_encoding($str.'a', 'UTF-8, ISO-8859-1');
<br>but are necessary as described here: <a href="http://de3.php.net/manual/en/function.mb-detect-encoding.php#81936" target="_top" rel="nofollow">http://de3.php.net/manual/en/function.mb-detect-encoding.php#81936</a>.
<br><br>I have attached a patch against the current revision 993.
<br>Could you, Yokav, and also some other people check this against their repositories to see if it works as expected and report back?
<br><br>I have only a limited set of different character encodings and special characters.
<br>Those cases do work for me - but there might be other files and encoding in-the-real-world.
<br><br>If you do encounter issues with this patch could you please provide the file which has any issues?
<br><br>Dirk
<br><br>PS: i have created an issue for this - <a href="http://websvn.tigris.org/issues/show_bug.cgi?id=259" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=259</a><br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424587" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424587</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26529036&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].<br />Index: blame.php
<br>===================================================================
<br>--- blame.php (revision 993)
<br>+++ blame.php (working copy)
<br>@@ -142,7 +142,7 @@
<br>
<br> $line = rtrim(fgets($file));
<br> if (!$highlighted)
<br>- $line = replaceEntities($line, $rep);
<br>+ $line = replaceEntities($line);
<br> $listing[$index]['line'] = ($empty) ? ' ' : wrapInCodeTagIfNecessary($line);
<br> $index++;
<br> }
<br>Index: comp.php
<br>===================================================================
<br>--- comp.php (revision 993)
<br>+++ comp.php (working copy)
<br>@@ -196,7 +196,7 @@
<br> // If we're in a diff proper, just set up the line
<br> if ($indiffproper) {
<br> if (strlen($line) > 0 && ($line[0] == ' ' || $line[0] == '+' || $line[0] == '-')) {
<br>- $subline = replaceEntities(substr($line, 1), $rep);
<br>+ $subline = replaceEntities(substr($line, 1));
<br> $subline = ($subline) ? expandTabs($subline) : ' ';
<br> $listing[$index]['line'] = $subline;
<br>
<br>Index: diff.php
<br>===================================================================
<br>--- diff.php (revision 993)
<br>+++ diff.php (working copy)
<br>@@ -130,7 +130,7 @@
<br> // TODO: Figured out why diffs across a move/rename are currently broken.
<br>
<br> $ent = (!$highlightedNew && !$highlightedOld);
<br>- $listing = do_diff($all, $ignoreWhitespace, $rep, $ent, $newerFile, $olderFile);
<br>+ $listing = do_diff($all, $ignoreWhitespace, $ent, $newerFile, $olderFile);
<br>
<br> // Remove our temporary files
<br> @unlink($newerFile);
<br>Index: include/command.php
<br>===================================================================
<br>--- include/command.php (revision 993)
<br>+++ include/command.php (working copy)
<br>@@ -22,6 +22,16 @@
<br> //
<br> // External command handling
<br>
<br>+function detectCharacterEncoding($str) {
<br>+ if (function_exists('mb_detect_encoding')) {
<br>+ // @see <a href="http://de3.php.net/manual/en/function.mb-detect-encoding.php#81936" target="_top" rel="nofollow">http://de3.php.net/manual/en/function.mb-detect-encoding.php#81936</a><br>+ // why appending an 'a' and specifying an encoding list is necessary
<br>+ return mb_detect_encoding($str.'a', 'UTF-8, ISO-8859-1');
<br>+ } else {
<br>+ return 'ISO-8859-1';
<br>+ }
<br>+}
<br>+
<br> // {{{ replaceEntities
<br> //
<br> // Replace character codes with HTML entities for display purposes.
<br>@@ -29,28 +39,19 @@
<br> // that of the local system (i.e., it's a string returned from a command
<br> // line command).
<br>
<br>-function replaceEntities($str, $rep) {
<br>+function replaceEntities($str) {
<br> global $config;
<br>
<br> // Ideally, we'd do this:
<br> //
<br>- // $str = htmlentities($str, ENT_COMPAT, $config->inputEnc);
<br>+ // $str = htmlentities($str, ENT_COMPAT, detectCharacterEncoding($str));
<br> //
<br> // However, htmlentities is very limited in it's ability to process
<br> // character encodings. We have to rely on something more powerful.
<br>
<br>- if (version_compare(phpversion(), '4.1.0', '<')) {
<br>- // In this case, we can't do any better than assume that the
<br>- // input encoding is ISO-8859-1.
<br>+ $str = toOutputEncoding($str);
<br>+ $str = htmlentities($str, ENT_COMPAT, 'UTF-8');
<br>
<br>- $str = htmlentities($str, ENT_COMPAT);
<br>- } else {
<br>- $str = toOutputEncoding($str, $rep->getContentEncoding());
<br>-
<br>- // $str is now encoded as UTF-8.
<br>- $str = htmlentities($str, ENT_COMPAT, $config->outputEnc);
<br>- }
<br>-
<br> return $str;
<br> }
<br>
<br>@@ -58,21 +59,15 @@
<br>
<br> // {{{ toOutputEncoding
<br>
<br>-function toOutputEncoding($str, $inputEncoding = '') {
<br>+function toOutputEncoding($str) {
<br> global $config;
<br>
<br>- if (empty($inputEncoding)) {
<br>- $inputEncoding = $config->inputEnc;
<br>- }
<br>+ $enc = detectCharacterEncoding($str);
<br>
<br>- // Try to convert the messages based on the locale information
<br>- if ($config->inputEnc && $config->outputEnc) {
<br>- if (function_exists('iconv')) {
<br>- $output = @iconv($inputEncoding, $config->outputEnc, $str);
<br>- if (!empty($output)) {
<br>- $str = $output;
<br>- }
<br>- }
<br>+ if (function_exists('mb_convert_encoding')) {
<br>+ $str = mb_convert_encoding($str, 'UTF-8', $enc);
<br>+ } else if (function_exists('iconv')) {
<br>+ $str = iconv($enc, 'UTF-8//TRANSLIT', $str);
<br> }
<br>
<br> return $str;
<br>Index: include/configclass.php
<br>===================================================================
<br>--- include/configclass.php (revision 993)
<br>+++ include/configclass.php (working copy)
<br>@@ -238,7 +238,6 @@
<br> var $ignoreWebSVNContentTypes;
<br> var $bugtraq;
<br> var $auth;
<br>- var $contentEnc;
<br> var $templatePath = false;
<br>
<br> // }}}
<br>@@ -511,24 +510,6 @@
<br>
<br> // }}}
<br>
<br>- // {{{ Encodings
<br>-
<br>- function setContentEncoding($contentEnc) {
<br>- $this->contentEnc = $contentEnc;
<br>- }
<br>-
<br>- function getContentEncoding() {
<br>- global $config;
<br>-
<br>- if (isset($this->contentEnc)) {
<br>- return $this->contentEnc;
<br>- }
<br>-
<br>- return $config->getContentEncoding();
<br>- }
<br>-
<br>- // }}}
<br>-
<br> // {{{ Authentication
<br>
<br> function useAuthenticationFile($file) {
<br>@@ -641,11 +622,6 @@
<br> var $subversionMajorVersion = '';
<br> var $subversionMinorVersion = '';
<br>
<br>- // Default character encodings
<br>- var $inputEnc = ''; // Encoding of output returned from command line
<br>- var $contentEnc = ''; // Encoding of repository content
<br>- var $outputEnc = 'UTF-8'; // Encoding of web page. Now forced to UTF-8
<br>-
<br> var $defaultLanguage = 'en';
<br> var $ignoreAcceptedLanguages = false;
<br>
<br>@@ -751,21 +727,6 @@
<br> function setServerIsWindows() {
<br> $this->serverIsWindows = true;
<br>
<br>- // Try to set the input encoding intelligently
<br>-
<br>- $cp = 0;
<br>- if ($cp = @shell_exec('CHCP')) {
<br>- $cp = trim(substr($cp, strpos($cp, ':') + 1));
<br>- settype($cp, 'integer');
<br>- }
<br>-
<br>- // Use the most sensible default value if that failed
<br>- if ($cp == 0) $cp = 850;
<br>-
<br>- // We assume, as a default, that the encoding of the repository contents is
<br>- // in iso-8859-1, to be compatible with compilers and the like.
<br>- $this->setInputEncoding('CP'.$cp, 'iso-8859-1');
<br>-
<br> // On Windows machines, use double quotes around command line parameters
<br> $this->quote = '"';
<br>
<br>@@ -1319,35 +1280,6 @@
<br>
<br> // }}}
<br>
<br>- // {{{ Encoding functions
<br>-
<br>- function setInputEncoding($systemEnc) {
<br>- $this->inputEnc = $systemEnc;
<br>-
<br>- if (!isset($this->contentEnc)) {
<br>- $this->contentEnc = $systemEnc;
<br>- }
<br>- }
<br>-
<br>- function getInputEncoding() {
<br>- return $this->inputEnc;
<br>- }
<br>-
<br>- function setContentEncoding($contentEnc, $myrep = 0) {
<br>- if (empty($myrep)) {
<br>- $this->contentEnc = $contentEnc;
<br>- } else {
<br>- $repo =& $this->findRepository($myrep);
<br>- $repo->setContentEncoding($contentEnc);
<br>- }
<br>- }
<br>-
<br>- function getContentEncoding() {
<br>- return $this->contentEnc;
<br>- }
<br>-
<br>- // }}}
<br>-
<br> function setDefaultLanguage($language) {
<br> $this->defaultLanguage = $language;
<br> }
<br>Index: include/diff_inc.php
<br>===================================================================
<br>--- include/diff_inc.php (revision 993)
<br>+++ include/diff_inc.php (working copy)
<br>@@ -44,9 +44,7 @@
<br> return true;
<br> }
<br>
<br>-function diff_result($all, $rep, $ent, $newtname, $oldtname, $obj) {
<br>- $contentEncoding = $rep->getContentEncoding();
<br>-
<br>+function diff_result($all, $ent, $newtname, $oldtname, $obj) {
<br> $ofile = fopen($oldtname, 'r');
<br> $nfile = fopen($newtname, 'r');
<br>
<br>@@ -78,8 +76,8 @@
<br>
<br> if ($all) {
<br> $line = rtrim($nl);
<br>- if ($ent) $line = replaceEntities($line, $rep);
<br>- else $line = toOutputEncoding($line, $contentEncoding);
<br>+ if ($ent) $line = replaceEntities($line);
<br>+ else $line = toOutputEncoding($line);
<br> if (strip_tags($line) == '') $line = ' ';
<br>
<br> $listing[$index]['rev1line'] = wrapInCodeTagIfNecessary($line);
<br>@@ -95,8 +93,8 @@
<br>
<br> if ($all) {
<br> $line = rtrim($nl);
<br>- if ($ent) $line = replaceEntities($line, $rep);
<br>- else $line = toOutputEncoding($line, $contentEncoding);
<br>+ if ($ent) $line = replaceEntities($line);
<br>+ else $line = toOutputEncoding($line);
<br> if (strip_tags($line) == '') $line = ' ';
<br>
<br> $listing[$index]['rev2line'] = wrapInCodeTagIfNecessary($line);
<br>@@ -134,8 +132,8 @@
<br> $mod = $line{0};
<br>
<br> $line = rtrim(substr($line, 1));
<br>- if ($ent) $line = replaceEntities($line, $rep);
<br>- else $line = toOutputEncoding($line, $contentEncoding);
<br>+ if ($ent) $line = replaceEntities($line);
<br>+ else $line = toOutputEncoding($line);
<br> if (strip_tags($line) == '') $line = ' ';
<br> $text = wrapInCodeTagIfNecessary($line);
<br> $listing[$index]['rev1line'] = $text;
<br>@@ -189,16 +187,16 @@
<br>
<br> $nl = fgets($ofile);
<br> $line = rtrim($nl);
<br>- if ($ent) $line = replaceEntities($line, $rep);
<br>- else $line = toOutputEncoding($line, $contentEncoding);
<br>+ if ($ent) $line = replaceEntities($line);
<br>+ else $line = toOutputEncoding($line);
<br> if (strip_tags($line) == '') $line = ' ';
<br> $listing[$index]['rev1line'] = wrapInCodeTagIfNecessary($line);
<br> $curoline++;
<br>
<br> $nl = fgets($nfile);
<br> $line = rtrim($nl);
<br>- if ($ent) $line = replaceEntities($line, $rep);
<br>- else $line = toOutputEncoding($line, $contentEncoding);
<br>+ if ($ent) $line = replaceEntities($line);
<br>+ else $line = toOutputEncoding($line);
<br> if (strip_tags($line) == '') $line = ' ';
<br> $listing[$index]['rev2line'] = wrapInCodeTagIfNecessary($line);
<br> $curnline++;
<br>@@ -220,8 +218,8 @@
<br> $listing[$index]['rev2diffclass'] = 'diff';
<br>
<br> $line = rtrim(fgets($ofile));
<br>- if ($ent) $line = replaceEntities($line, $rep);
<br>- else $line = toOutputEncoding($line, $contentEncoding);
<br>+ if ($ent) $line = replaceEntities($line);
<br>+ else $line = toOutputEncoding($line);
<br> if (strip_tags($line) == '') $line = ' ';
<br>
<br> if (!feof($ofile)) {
<br>@@ -231,8 +229,8 @@
<br> }
<br>
<br> $line = rtrim(fgets($nfile));
<br>- if ($ent) $line = replaceEntities(rtrim(fgets($nfile)), $rep);
<br>- else $line = toOutputEncoding($line, $contentEncoding);
<br>+ if ($ent) $line = replaceEntities(rtrim(fgets($nfile)));
<br>+ else $line = toOutputEncoding($line);
<br> if (strip_tags($line) == '') $line = ' ';
<br>
<br> if (!feof($nfile)) {
<br>@@ -254,7 +252,7 @@
<br> return $listing;
<br> }
<br>
<br>-function command_diff($all, $ignoreWhitespace, $rep, $ent, $newtname, $oldtname) {
<br>+function command_diff($all, $ignoreWhitespace, $ent, $newtname, $oldtname) {
<br> global $config, $lang, $arrayBased, $fileBased;
<br>
<br> $context = 5;
<br>@@ -285,7 +283,7 @@
<br>
<br> $arrayBased = false;
<br> $fileBased = true;
<br>- $listing = diff_result($all, $rep, $ent, $newtname, $oldtname, $diff);
<br>+ $listing = diff_result($all, $ent, $newtname, $oldtname, $diff);
<br> fclose($pipes[1]);
<br>
<br> while (!feof($pipes[2])) {
<br>@@ -320,7 +318,7 @@
<br> return $listing;
<br> }
<br>
<br>-function inline_diff($all, $ignoreWhitespace, $rep, $ent, $newtname, $oldtname) {
<br>+function inline_diff($all, $ignoreWhitespace, $ent, $newtname, $oldtname) {
<br> global $arrayBased, $fileBased;
<br>
<br> $context = 5;
<br>@@ -365,15 +363,15 @@
<br>
<br> $arrayBased = true;
<br> $fileBased = false;
<br>- $listing = diff_result($all, $rep, $ent, $newtname, $oldtname, $rendered);
<br>+ $listing = diff_result($all, $ent, $newtname, $oldtname, $rendered);
<br>
<br> return $listing;
<br> }
<br>
<br>-function do_diff($all, $ignoreWhitespace, $rep, $ent, $newtname, $oldtname) {
<br>+function do_diff($all, $ignoreWhitespace, $ent, $newtname, $oldtname) {
<br> if (class_exists('Text_Diff')) {
<br>- return inline_diff($all, $ignoreWhitespace, $rep, $ent, $newtname, $oldtname);
<br>+ return inline_diff($all, $ignoreWhitespace, $ent, $newtname, $oldtname);
<br> } else {
<br>- return command_diff($all, $ignoreWhitespace, $rep, $ent, $newtname, $oldtname);
<br>+ return command_diff($all, $ignoreWhitespace, $ent, $newtname, $oldtname);
<br> }
<br> }
<br>Index: include/distconfig.php
<br>===================================================================
<br>--- include/distconfig.php (revision 993)
<br>+++ include/distconfig.php (working copy)
<br>@@ -167,34 +167,6 @@
<br>
<br> // {{{ LANGUAGE SETUP ---
<br>
<br>-// WebSVN uses the iconv module to convert messages from your system's character set to the
<br>-// UTF-8 output encoding. If you find that your log messages aren't displayed correctly then
<br>-// you'll need to change the value here.
<br>-//
<br>-// You may also specify the character encoding of the repository contents if different from
<br>-// the system encoding. This is typically the case for windows users, whereby the command
<br>-// line returns, for example, CP850 encoded strings, whereas the source files are encoded
<br>-// as iso-8859-1 by Windows based text editors. When display text file, WebSVN will convert
<br>-// them from the content encoding to the output encoding (UTF-8).
<br>-//
<br>-// WebSVN does its best to automate all this, so only use the following if it doesn't work
<br>-// "out of the box". Uncomment and change one of the examples below.
<br>-//
<br>-// $config->setInputEncoding('CP850'); // Encoding of result returned by svn command line, etc.
<br>-// $config->setContentEncoding('iso-8859-1'); // Content encoding of all your repositories
<br>-
<br>-// You may also specify a content encoding on a per repository basis. Uncomment and copy this
<br>-// line as necessary.
<br>-//
<br>-// $config->setContentEncoding('iso-8859-1', 'MyEnc');
<br>-
<br>-// Note for Windows users: To enable iconv you'll need to enable the extension in your php.ini file
<br>-// AND copy iconv.dll (not php_iconv.dll) to your Windows system folder. In most cases the correct
<br>-// encoding is set when you call $config->setServerIsWindows();.
<br>-
<br>-// Note for *nix users. You'll need to have iconv compiled into your binary. The default input and
<br>-// output encodings are taken from your locale informations. Override these if they aren't correct.
<br>-
<br> // Set the default language. If you want English then don't do anything here.
<br> //
<br> // $config->setDefaultLanguage('en');
<br>Index: include/setup.php
<br>===================================================================
<br>--- include/setup.php (revision 993)
<br>+++ include/setup.php (working copy)
<br>@@ -36,11 +36,6 @@
<br> $config->setServerIsWindows();
<br> }
<br>
<br>-// Set up the default character encodings
<br>-if (function_exists('iconv_get_encoding')) {
<br>- $config->setInputEncoding(iconv_get_encoding('input_encoding'));
<br>-}
<br>-
<br> // Set up locwebsvnhttp
<br> // Note: we will use nothing in MultiViews mode so that the URLs use the root
<br> // directory by default.
<br>Index: include/svnlook.php
<br>===================================================================
<br>--- include/svnlook.php (revision 993)
<br>+++ include/svnlook.php (working copy)
<br>@@ -751,7 +751,7 @@
<br>
<br> if ($config->useGeshi && $geshiLang = $this->highlightLanguageUsingGeshi($ext)) {
<br> $tmp = tempnam('temp', 'wsvn');
<br>- print toOutputEncoding($this->applyGeshi($path, $tmp, $geshiLang, $rev, $peg, true), $this->repConfig->getContentEncoding());
<br>+ print toOutputEncoding($this->applyGeshi($path, $tmp, $geshiLang, $rev, $peg, true));
<br> @unlink($tmp);
<br> } else {
<br> $pre = false;
<br>@@ -770,13 +770,12 @@
<br> if ($result = popenCommand($cmd, 'r')) {
<br> if ($pre)
<br> echo '<pre>';
<br>- $contentEncoding = $this->repConfig->getContentEncoding();
<br> while (!feof($result)) {
<br> $line = fgets($result, 1024);
<br> if ($pre)
<br> $line = replaceEntities($line, $this->repConfig);
<br> else
<br>- $line = toOutputEncoding($line, $contentEncoding);
<br>+ $line = toOutputEncoding($line);
<br> print hardspace($line);
<br> }
<br> if ($pre)
<br>@@ -870,8 +869,7 @@
<br> function getList($path, $rev = 0) {
<br> global $config, $curList;
<br>
<br>- $contentEncoding = $this->repConfig->getContentEncoding();
<br>- $xml_parser = xml_parser_create(($contentEncoding) ? $contentEncoding : 'UTF-8');
<br>+ $xml_parser = xml_parser_create('UTF-8');
<br> xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, true);
<br> xml_set_element_handler($xml_parser, 'listStartElement', 'listEndElement');
<br> xml_set_character_data_handler($xml_parser, 'listCharacterData');
<br>@@ -971,8 +969,7 @@
<br> function getLog($path, $brev = '', $erev = 1, $quiet = false, $limit = 2, $peg = '') {
<br> global $config, $curLog;
<br>
<br>- $contentEncoding = $this->repConfig->getContentEncoding();
<br>- $xml_parser = xml_parser_create(($contentEncoding) ? $contentEncoding : 'UTF-8');
<br>+ $xml_parser = xml_parser_create('UTF-8');
<br> xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, true);
<br> xml_set_element_handler($xml_parser, 'logStartElement', 'logEndElement');
<br> xml_set_character_data_handler($xml_parser, 'logCharacterData');
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26529019[WebSVN issue] [Issue 259] Handle different character encoding correctly2009-11-26T04:50:36Z2009-11-26T04:50:36ZDirk Thomas<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=259" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=259</a><br><br><br><br>User dirkthomas changed the following:
<br><br> What |Old value |New value
<br>================================================================================
<br> Status|NEW |STARTED
<br>--------------------------------------------------------------------------------
<br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26529019&i=0" target="_top" rel="nofollow">dirkthomas@...</a> Thu Nov 26 04:50:36 -0800 2009 -------
<br>I have tried to solve this using the "mb_detect_encoding" function.
<br>The arguments look a little bit weird:
<br> mb_detect_encoding($str.'a', 'UTF-8, ISO-8859-1');
<br>but are necessary as described here:
<br><a href="http://de3.php.net/manual/en/function.mb-detect-encoding.php#81936" target="_top" rel="nofollow">http://de3.php.net/manual/en/function.mb-detect-encoding.php#81936</a>.
<br><br>I have attached a patch against the current revision 993.
<br>Could anybody interested check this against their repositories to see if it
<br>works as expected and report back?
<br><br>I have only a limited set of different character encodings and special characters.
<br>Those cases do work for me - but there might be other files and encoding
<br>in-the-real-world.
<br><br>If you do encounter issues with this patch could you please provide the file
<br>which has any issues.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424586" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424586</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26529005[WebSVN issue] [Issue 259] Handle different character encoding correctly2009-11-26T04:49:15Z2009-11-26T04:49:15ZDirk Thomas<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=259" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=259</a><br><br><br><br>User dirkthomas changed the following:
<br><br> What |Old value |New value
<br>================================================================================
<br> Attachment is patch| |Created an attachment (id=
<br> | |129)
<br>Replacing usage of ic
<br> | |onv with multibyte string,
<br> | | removed configuration opt
<br> | |ions for encodings
<br><br>--------------------------------------------------------------------------------
<br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26529005&i=0" target="_top" rel="nofollow">dirkthomas@...</a> Thu Nov 26 04:49:14 -0800 2009 -------
<br>Created an attachment (id=129)
<br>Replacing usage of iconv with multibyte string, removed configuration options for encodings
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424585" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424585</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26528979[WebSVN issue] [Issue 259] New - Handle different character encoding correctly2009-11-26T04:46:59Z2009-11-26T04:46:59ZDirk Thomas<a href="http://websvn.tigris.org/issues/show_bug.cgi?id=259" target="_top" rel="nofollow">http://websvn.tigris.org/issues/show_bug.cgi?id=259</a><br> Issue #|259
<br> Summary|Handle different character encoding correctly
<br> Component|websvn
<br> Version|2.2.1
<br> Platform|All
<br> OS/Version|All
<br> URL|
<br> Status|NEW
<br> Status whiteboard|
<br> Keywords|
<br> Resolution|
<br> Issue type|DEFECT
<br> Priority|P3
<br> Subcomponent|Unknown
<br> Assigned to|issues@websvn
<br> Reported by|dirkthomas
<br><br><br><br><br><br><br>------- Additional comments from <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26528979&i=0" target="_top" rel="nofollow">dirkthomas@...</a> Thu Nov 26 04:46:58 -0800 2009 -------
<br>Files with different character encodings are not shown correctly in various
<br>views. Manually selecting a per-repository input- and content-encoding is not
<br>sufficient. The encoding of a string has to be auto-detected.
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424583" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=2390&dsMessageId=2424583</a><br><p>From forum: <a href="http://old.nabble.com/websvn---issues-f10714.html" embed="fixTarget[10714]" target="_top" >websvn - issues</a></p>tag:old.nabble.com,2006:post-26519586Re: [WebSVN] filedetails didn't shown all the content of a file2009-11-25T12:15:50Z2009-11-25T12:15:50ZYokav - MailingHi,
<br><br>mb_detect_encoding is not enough?
<br><br>Le 25/11/09 18:03, Dirk Thomas a écrit :
<div class='shrinkable-quote'><br>> Hi Yokav,
<br>>
<br>>> And what must I do when I've utf8 and non utf8 files on the same repo?
<br>>> Why don't you use an utf8_encode?
<br>> >
<br>>>>> $config->setContentEncoding('utf-8');
<br>>>> The attached file is not utf-8 encoded.
<br>>>> If you remove the "setContentEncoding"-setting it should display correctly.
<br>>>> Else same the file with UTF-8-encoding and the output should also be fine.
<br>>
<br>> the point is that it difficult to distinguish if a string is already in utf-8.
<br>> Running utf8_encode on an already utf-8 encoded string gives the same problems.
<br>>
<br>> So for now - until WebSVN is able to automatically identify the encoding in all cases - i have no better answer, sorry.
<br>>
<br>> Dirk
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424331" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424331</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26519586&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br>>
</div><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424395" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424395</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26519586&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26516445Re: [WebSVN] filedetails didn't shown all the content of a file2009-11-25T09:03:16Z2009-11-25T09:03:16ZDirk ThomasHi Yokav,
<br><br>> And what must I do when I've utf8 and non utf8 files on the same repo?
<br>> Why don't you use an utf8_encode?
<br> >
<br>>>> $config->setContentEncoding('utf-8');
<br>>> The attached file is not utf-8 encoded.
<br>>> If you remove the "setContentEncoding"-setting it should display correctly.
<br>>> Else same the file with UTF-8-encoding and the output should also be fine.
<br><br>the point is that it difficult to distinguish if a string is already in utf-8.
<br>Running utf8_encode on an already utf-8 encoded string gives the same problems.
<br><br>So for now - until WebSVN is able to automatically identify the encoding in all cases - i have no better answer, sorry.
<br><br>Dirk
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424331" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424331</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26516445&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26515998Re: [WebSVN] filedetails didn't shown all the content of a file2009-11-25T08:38:40Z2009-11-25T08:38:40ZYokav - MailingHi,
<br><br>And what must I do when I've utf8 and non utf8 files on the same repo?
<br>Why don't you use an utf8_encode?
<br><br>Le 25/11/09 16:36, Dirk Thomas a écrit :
<div class='shrinkable-quote'><br>> Hi Yokav,
<br>>
<br>>> There is the file exportpn.sh in attached file.
<br>>>
<br>>> My config:
<br>>>
<br>>> $config->setContentEncoding('utf-8');
<br>>
<br>> The attached file is not utf-8 encoded.
<br>> If you remove the "setContentEncoding"-setting it should display correctly.
<br>> Else same the file with UTF-8-encoding and the output should also be fine.
<br>>
<br>> Dirk
<br>>
<br>> ------------------------------------------------------
<br>> <a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424299" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424299</a><br>>
<br>> To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26515998&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br>>
</div><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424317" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424317</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26515998&i=1" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>tag:old.nabble.com,2006:post-26514861Re: [WebSVN] filedetails didn't shown all the content of a file2009-11-25T07:36:44Z2009-11-25T07:36:44ZDirk ThomasHi Yokav,
<br><br>> There is the file exportpn.sh in attached file.
<br>>
<br>> My config:
<br>>
<br>> $config->setContentEncoding('utf-8');
<br><br>The attached file is not utf-8 encoded.
<br>If you remove the "setContentEncoding"-setting it should display correctly.
<br>Else same the file with UTF-8-encoding and the output should also be fine.
<br><br>Dirk
<br><br>------------------------------------------------------
<br><a href="http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424299" target="_top" rel="nofollow">http://websvn.tigris.org/ds/viewMessage.do?dsForumId=1547&dsMessageId=2424299</a><br><br>To unsubscribe from this discussion, e-mail: [<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26514861&i=0" target="_top" rel="nofollow">dev-unsubscribe@...</a>].
<br><p>From forum: <a href="http://old.nabble.com/websvn---dev-f10713.html" embed="fixTarget[10713]" target="_top" >websvn - dev</a></p>