Re: [fossil-users] Missing highlighted space changes in diff?

2014-03-04 Thread Jan Nijtmans
2014-03-04 5:38 GMT+01:00 Andy Bradford amb-fos...@bradfords.org: I would vote to leave the original behavior (with a slight fix to correct the web UI), but make it possible for the user to express a preference to hide whitespace-only changes. Well, the original behavior was wrong,

Re: [fossil-users] Missing highlighted space changes in diff?

2014-03-04 Thread Stephan Beal
On Tue, Mar 4, 2014 at 5:38 AM, Andy Bradford amb-fos...@bradfords.orgwrote: I would further argue that the web UI also should not ignore whitespace by default. FWIW: +1 Space is important. Just ask python developers who've had their cat step on their keyboard and thereby change the meaning

Re: [fossil-users] Missing highlighted space changes in diff?

2014-03-04 Thread Stephan Beal
On Tue, Mar 4, 2014 at 12:57 PM, Ramon Ribó ram...@compassis.com wrote: I see no problem to consider space as a difference but I would not consider line endings (linux/windows) a difference to be shown in diff or annotate. man isspace says: isspace() checks for

Re: [fossil-users] Missing highlighted space changes in diff?

2014-03-04 Thread Ramon Ribó
I see no problem in the file being marked as different but the difff showing no actual diff. If necessary, it is possible to add a message only end of line differences. The point is that, if you consider end-line as differences for diff or for annotate you will be showing a difference mark for

Re: [fossil-users] Missing highlighted space changes in diff?

2014-03-04 Thread Andy Bradford
Thus said Jan Nijtmans on Tue, 04 Mar 2014 09:20:28 +0100: That said, I would prefer too the default being NOT to ignore whitespace, that's what most other SCM's do. Except for annotations, then it is useful to ignore all whitespacing. Why is it useful to ignore all whitespace

[fossil-users] nginx fronting fossil best practices?

2014-03-04 Thread Jon
New to fossil and am trying to stand up a simple fossil server fronted by nginx. I've read the website doco, spelunked the mailing list, and have tweaked configurations a bit. All to no avail. I want to use fossil and nginx to make multiple repos available via base url's such as

[fossil-users] Fossil in a multi-user environment

2014-03-04 Thread Taras Zakharko
Dear all, I am currently looking into the possibility of using Fossil as our next SCM (we currently use Mercurial, and while it works, many things could be improved). The task is primarily collaborative paper writing in a research institute, most authors are non-programmers and thus want

Re: [fossil-users] Fossil in a multi-user environment

2014-03-04 Thread Stephan Beal
On Tue, Mar 4, 2014 at 7:02 PM, Taras Zakharko taras.zakha...@uzh.chwrote: into a problem and I can't seem to find the way to solve it. Briefly, its about how Fossil synchronises users and the fact that users and authors of commits appear to be different things. When I clone a remote

Re: [fossil-users] Fossil in a multi-user environment

2014-03-04 Thread Matt Welland
I'm not sure I understand what exactly is your issue but are you cloning via a server or directly from shared disk? If the later then you may have run into a problem that may still exist - the default user is not properly handled when cloning using file:// . Exactly why I don't know. The fix is

Re: [fossil-users] Fossil in a multi-user environment

2014-03-04 Thread Taras Zakharko
Stephan, Matt, thank you for your quick answers! That depends on several factors, several of which another list member will hopefully detail for us, but what i can say is if you clone like this: fossil clone http://remoteUserName@server/... therepo.fsl then pull/push will use that

Re: [fossil-users] Fossil in a multi-user environment

2014-03-04 Thread Stephan Beal
On Tue, Mar 4, 2014 at 8:58 PM, Taras Zakharko taras.zakha...@uzh.chwrote: Are you talking about a consistency across fossil features within a single repo (one local copy), across all clones of a central copy, or across several projects in a single login group? I think its the closes to

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Richard Hipp
On Tue, Mar 4, 2014 at 3:43 PM, Chad Perrin c...@apotheon.net wrote: Trying to fork/import from Git is kinda problematic. I started by creating a new project on a server: $ fossil init projectname.fossil I then cloned locally: $ fossil clone u...@uri.for/projectname/index.cgi

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread James Turner
On Tue, Mar 04, 2014 at 03:47:31PM -0500, Richard Hipp wrote: On Tue, Mar 4, 2014 at 3:43 PM, Chad Perrin c...@apotheon.net wrote: Trying to fork/import from Git is kinda problematic. I started by creating a new project on a server: $ fossil init projectname.fossil I then

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Chad Perrin
On Tue, Mar 04, 2014 at 03:47:31PM -0500, Richard Hipp wrote: On Tue, Mar 4, 2014 at 3:43 PM, Chad Perrin c...@apotheon.net wrote: Trying to fork/import from Git is kinda problematic. I started by creating a new project on a server: $ fossil init projectname.fossil I then

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Richard Hipp
I did this: mkdir nvi cd nvi git clone git://repo.or.cz/nvi.git cd nvi git fast-export --all | fossil import ../nvi.fossil cd .. mkdir n2 cd n2 fossil open ../nvi.fossil The result was a directory full of files. And I could do fossil ui to see the complete development timeline, and so forth.

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread James Turner
On Tue, Mar 04, 2014 at 01:55:36PM -0700, Chad Perrin wrote: On Tue, Mar 04, 2014 at 03:47:31PM -0500, Richard Hipp wrote: On Tue, Mar 4, 2014 at 3:43 PM, Chad Perrin c...@apotheon.net wrote: Trying to fork/import from Git is kinda problematic. I started by creating a new project on a

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Richard Hipp
On Tue, Mar 4, 2014 at 4:02 PM, James Turner ja...@calminferno.net wrote: Bah incremental requires the repo to exist. Without incremental the import is successful and trunk is set correctly. I completely overlooked the --incremental flag in the original post. Sorry... -- D. Richard Hipp

Re: [fossil-users] Fossil in a multi-user environment

2014-03-04 Thread Taras Zakharko
I have found the problem - seems that the fossil version installed on my mac was still 1.27 and the user name takeover has been added in 1.28. Now it works like a charm and I am very happy! Sorry for the noise and thanks again for the quick answers! — Taras On 04 Mar 2014, at 21:55 ,

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Chad Perrin
On Tue, Mar 04, 2014 at 04:01:36PM -0500, Richard Hipp wrote: I did this: mkdir nvi cd nvi git clone git://repo.or.cz/nvi.git cd nvi git fast-export --all | fossil import ../nvi.fossil cd .. mkdir n2 cd n2 fossil open ../nvi.fossil The result was a directory full of files. And I

Re: [fossil-users] nginx fronting fossil best practices?

2014-03-04 Thread Stephen Cripps
Hi Jon, I went through the process of setting up fossil behind NGINX the same way your looking for, where you can specify the repository depending on the url. At first I tried the proxy method with xinetd, but had to play with path's of the actual repositories before it would work. The solution

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Chad Perrin
The following is based on the fact that I do not know whether there are any undocumented or poorly-documented features that would provide the described functionality, or whether I have simply failed to see what was right in front of my face after spending a fair bit of time staring at Fossil's

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Stephan Beal
On Tue, Mar 4, 2014 at 10:58 PM, Chad Perrin c...@apotheon.net wrote: Is there any chance that Fossil will get a manpage or two at some point? Perhaps this suffices (or provides a start): http://fossil-scm.org/index.html/help The /help page can also be accessed locally via (fossil ui). --

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Chad Perrin
On Tue, Mar 04, 2014 at 03:49:26PM -0500, James Turner wrote: On Tue, Mar 04, 2014 at 03:47:31PM -0500, Richard Hipp wrote: On Tue, Mar 4, 2014 at 3:43 PM, Chad Perrin c...@apotheon.net wrote: Trying to fork/import from Git is kinda problematic. I started by creating a new project on

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Chad Perrin
On Tue, Mar 04, 2014 at 11:16:07PM +0100, Stephan Beal wrote: On Tue, Mar 4, 2014 at 10:58 PM, Chad Perrin c...@apotheon.net wrote: Is there any chance that Fossil will get a manpage or two at some point? Perhaps this suffices (or provides a start):

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Ron Wilson
On Tue, Mar 4, 2014 at 3:43 PM, Chad Perrin c...@apotheon.net wrote: Trying to fork/import from Git is kinda problematic. I started by creating a new project on a server: $ fossil init projectname.fossil I then cloned locally: $ fossil clone u...@uri.for/projectname/index.cgi

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Ron Wilson
On Tue, Mar 4, 2014 at 7:12 PM, Ron Wilson ronw.m...@gmail.com wrote: Alternately, try: $ git fast-export --all |ssh user@server fossil import\ --git --incremental /path/to/projectname.fossil Oops. Don't use the --incremental for the initial import.

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Chad Perrin
On Tue, Mar 04, 2014 at 07:12:54PM -0500, Ron Wilson wrote: On Tue, Mar 4, 2014 at 3:43 PM, Chad Perrin c...@apotheon.net wrote: Trying to fork/import from Git is kinda problematic. I started by creating a new project on a server: $ fossil init projectname.fossil I then cloned

[fossil-users] equivalent to git submodule

2014-03-04 Thread Chad Perrin
Is there a good way to do the same thing Git's submodule command does, to allow multiple repositories to be used to compose a single, larger project source tree? From the git-submodule manpage: Submodules allow foreign repositories to be embedded within a dedicated subdirectory of the

Re: [fossil-users] Missing highlighted space changes in diff?

2014-03-04 Thread Joel Bruick
Jan Nijtmans wrote: That said, I would prefer too the default being NOT to ignore whitespace, that's what most other SCM's do. Except for annotations, then it is useful to ignore all whitespacing. Something like: http://fossil-scm.org/index.html/info/28b39cc516 Is that getting nearer

Re: [fossil-users] equivalent to git submodule

2014-03-04 Thread Richard Hipp
On Tue, Mar 4, 2014 at 9:45 PM, Chad Perrin c...@apotheon.net wrote: Is there a good way to do the same thing Git's submodule command does, to allow multiple repositories to be used to compose a single, larger project source tree? The only thing (currently) like this in Fossil is the fossil

Re: [fossil-users] equivalent to git submodule

2014-03-04 Thread Chad Perrin
On Tue, Mar 04, 2014 at 09:56:31PM -0500, Richard Hipp wrote: On Tue, Mar 4, 2014 at 9:45 PM, Chad Perrin c...@apotheon.net wrote: Is there a good way to do the same thing Git's submodule command does, to allow multiple repositories to be used to compose a single, larger project source

Re: [fossil-users] nginx fronting fossil best practices?

2014-03-04 Thread Jon
Thank you. Your setup is fastcgi, not scgi, correct? I'm now unclear about the scgi setup. From the wiki I thought scgi requires just two pieces. First, start fossil like fossil --localhost --scgi /srv/fossils/partner and second, set an nginx location similar to location ~ ^/partner/ {

Re: [fossil-users] nginx fronting fossil best practices?

2014-03-04 Thread Richard Hipp
On Tue, Mar 4, 2014 at 10:27 PM, Jon jon.for...@gmail.com wrote: Thank you. Your setup is fastcgi, not scgi, correct? I'm now unclear about the scgi setup. From the wiki I thought scgi requires just two pieces. First, start fossil like fossil --localhost --scgi /srv/fossils/partner

[fossil-users] fossil/stunnel question

2014-03-04 Thread Ron Aaron
Actually, it's really an stunnel question. I am experimenting with using stunnel on my server for fossil access (I currently use Apache+SSL). If the stunnel is configured to run in foreground, everything is fine; but if not, it fails with a read error. I assume this is a technical problem I can

Re: [fossil-users] Missing highlighted space changes in diff?

2014-03-04 Thread Jan Nijtmans
2014-03-05 7:25 GMT+01:00 Andy Bradford amb-fos...@bradfords.org: My most heavily used Fossil includes a lot of Python and with the recent changes, Fossil annotate/blame now renders a function entirely devoid of whitespace: def f(a): b = a + 1 return b That's a bug which still needs to be

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Ron Wilson
On Tue, Mar 4, 2014 at 7:24 PM, Chad Perrin c...@apotheon.net wrote: Both of those solutions would surely work in this case (as long as the incremental option works on the server, but not in cases where the same would be done by someone with commit access but no SSH filesystem/shell access

Re: [fossil-users] Missing highlighted space changes in diff?

2014-03-04 Thread Andy Bradford
Thus said Jan Nijtmans on Wed, 05 Mar 2014 07:38:05 +0100: All joel did was remove an if() around those lines, thereby changing the indent. Does that make joel the author? I think not! The diff-eolws branch gives the correct answer. Your addition gives the correct answer after

Re: [fossil-users] importing/forking from Git

2014-03-04 Thread Chad Perrin
On Wed, Mar 05, 2014 at 01:40:49AM -0500, Ron Wilson wrote: On Tue, Mar 4, 2014 at 7:24 PM, Chad Perrin c...@apotheon.net wrote: Both of those solutions would surely work in this case (as long as the incremental option works on the server, but not in cases where the same would be done by