Re: [fossil-users] Hello. Anyone for source highlighting?

2010-12-16 Thread Rüdiger Härtel
Am Donnerstag 16 Dezember 2010, 15:37:00 schrieb pablo veliz: > Since we are using a browser to see the code, why not use a client side > library for syntax-highlighting like http://codemirror.net/ ? That way > works in any platform, and can be extended for different languages. > > -Original M

Re: [fossil-users] basic questions about fossil

2010-12-16 Thread Gour
On Thu, 16 Dec 2010 19:59:14 -0800 >> "Russ" == Russ Paielli wrote: Russ> Here's another suggestion for comments. The idea of launching an Russ> editor seems excessive to me. When I'm working remotely, it Russ> sometimes takes half a minute or so for the editor to come up. If Russ> the user ne

Re: [fossil-users] Hello. Anyone for source highlighting?

2010-12-16 Thread altufaltu
This is interesting. Where can I get consolidated recipe? - Altu -Original Message- From: Volodya Savastiouk, MSC To: fossil-users@lists.fossil-scm.org Sent: Fri, Dec 17, 2010 12:13 am Subject: Re: [fossil-users] Hello. Anyone for source highlighting? Hi, I did ment

Re: [fossil-users] Hello. Anyone for source highlighting?

2010-12-16 Thread altufaltu
+1 -Original Message- From: pablo veliz To: fossil-users@lists.fossil-scm.org Sent: Thu, Dec 16, 2010 8:07 pm Subject: Re: [fossil-users] Hello. Anyone for source highlighting? Since we are using a browser to see the code, why not use a client side library for syntax-highlighting li

[fossil-users] Template repositories

2010-12-16 Thread Nolan Darilek
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I have some situations where I find myself creating the same starter projects over and over. For instance, I'll create the same starter web app with similar database setup and coding style. Were I doing this with Git, I'd start with a template reposit

Re: [fossil-users] basic questions about fossil

2010-12-16 Thread Russ Paielli
Here's another suggestion for comments. The idea of launching an editor seems excessive to me. When I'm working remotely, it sometimes takes half a minute or so for the editor to come up. If the user neglects to enter a "-m" comment, why not issue a query such as, "Do you wish to enter a comment? [

Re: [fossil-users] basic questions about fossil

2010-12-16 Thread Russ Paielli
On Thu, Dec 16, 2010 at 3:24 AM, Rene wrote: > On Wed, 15 Dec 2010 18:44:46 -0800, Russ Paielli > wrote: > > > I downloaded fossil and gave it a try on my Linux machine. The first > > time I tried to add files, I got stuck in some mode that I could not > > get out of. Apparently, my EDITOR envir

Re: [fossil-users] Hello. Anyone for source highlighting?

2010-12-16 Thread Volodya Savastiouk, MSC
Hi, I did mentioned it here a few days back, the source highlighting can work with *no* changes to Fossil. I have it working for me on chiselapp.com. What will be great is if the html output can be configured to have more classes/div/id to be used in CSS. I'm not sur

Re: [fossil-users] Merge conflict notation

2010-12-16 Thread Ramon Ribó
I also agree that words: "original content" and "conflict" are very clear for a person who understands very well the merge algorithm. However, they might be not so clear for a casual user. People would understand better something like: "local checkout" "files from repository" or somethi

Re: [fossil-users] Merge conflict notation

2010-12-16 Thread Remigiusz Modrzejewski
On Dec 16, 2010, at 16:11 , Richard Hipp wrote: > I really do not want to make merge-conflict marks configurable. Aren't > there enough configuration options in Fossil already? Do we really need the > extra complication. I hope not. > > As of a check-in a did moments ago, the conflict marks

Re: [fossil-users] basic questions about fossil

2010-12-16 Thread Richard Hipp
On Thu, Dec 16, 2010 at 9:43 AM, wrote: > > My understanding is that Fossil supports renames of files and > directories, but does not support merges that later use the deprecated > name. This is something of a race condition and might be a concern for > projects with lots of disparate contributors

Re: [fossil-users] Merge conflict notation

2010-12-16 Thread Richard Hipp
I really do not want to make merge-conflict marks configurable. Aren't there enough configuration options in Fossil already? Do we really need the extra complication. As of a check-in a did moments ago, the conflict marks now look like this: <<< BEGIN MERGE CONFLICT: original content fi

Re: [fossil-users] Hello. Anyone for source highlighting?

2010-12-16 Thread Trou Macacq
I'm interested in this idea. And I thought to try develop "new default" skin for fossil in fancy web 2.0 style and with syntax highlighting, however I was considering http://alexgorbatchev.com/SyntaxHighlighter/ If you're interested, we can discuss our next steps. -- @macacq On Thu, Dec 16, 2

Re: [fossil-users] Merge conflict notation

2010-12-16 Thread Adam J Richardson
On Wed, 15 Dec 2010 15:17:29 + fossil-users-requ...@lists.fossil-scm.org wrote: > I'm inclined to go with the shorter one-line conflict marks. Other > thoughts from the user community? Love the idea to add context to the conflict lines. How about a compromise solution? Like: 0 1 2 3 <<<

Re: [fossil-users] Merge conflict notation

2010-12-16 Thread Remigiusz Modrzejewski
On Dec 15, 2010, at 22:10 , Joshua Paine wrote: > On 12/15/2010 04:00 PM, Zach Todd wrote: >> I have updated the merge conflict code as well as config setup to >> allow for configurable notation. > >> Doesn't this call for configurable notation? ;) >> Kind regards, Remigiusz Modrzejewski > > Ma

Re: [fossil-users] $baseurl question (reverse proxy issue)

2010-12-16 Thread Richard Hipp
On Thu, Dec 16, 2010 at 8:20 AM, Richard Hipp wrote: > > > On Thu, Dec 16, 2010 at 8:17 AM, Trou Macacq wrote: > >> 2) Should we consider using relative URLs instead of absolute? >> > > That sounds like it is the right solution. But it is a big change. It > will likely take a week or two to ap

Re: [fossil-users] basic questions about fossil

2010-12-16 Thread saulgoode
Quoting Russ Paielli : > ... At first I was interested in Git and BitKeeper. Then I discovered > Bazaar, and I was almost ready to start using it, but I decided to take one > more look at the options. When I saw fossil, I figured, with a name like > that, it's a real long shot, but I'll take a loo

Re: [fossil-users] $baseurl question (reverse proxy issue)

2010-12-16 Thread Joerg Sonnenberger
On Thu, Dec 16, 2010 at 04:22:42PM +0200, Trou Macacq wrote: > About fossil server... on production (not ad hoc) this means using > inetd daemon. And I might say something stupid, but I'm almost sure it > not installed on my Ubuntu server 10.10 by default. And I trying to > keep everything as stand

Re: [fossil-users] Hello. Anyone for source highlighting?

2010-12-16 Thread pablo veliz
Since we are using a browser to see the code, why not use a client side library for syntax-highlighting like http://codemirror.net/ ? That way works in any platform, and can be extended for different languages. -Original Message- From: fossil-users-boun...@lists.fossil-scm.org [mailto:fo

Re: [fossil-users] $baseurl question (reverse proxy issue)

2010-12-16 Thread Nathaniel R. Reindl
On Thu, Dec 16, 2010 at 8:22 AM, Trou Macacq wrote: > connected with HTTP_HOST env variable... And this env variable cannot > be changed either in CGI script using bash, or by using SetEnv > mod_rewreite directive. You'll want to do one of two things here: (1) You'll want to investigate how I'm

Re: [fossil-users] $baseurl question (reverse proxy issue)

2010-12-16 Thread Trou Macacq
Hi I've tried to solve my issue by using Apache mod_env and mod_rewrite... I'm might be wrong but zBaseURL variable somehow connected with HTTP_HOST env variable... And this env variable cannot be changed either in CGI script using bash, or by using SetEnv mod_rewreite directive. About fossil ser

Re: [fossil-users] $baseurl question (reverse proxy issue)

2010-12-16 Thread Nathaniel R. Reindl
On Thu, Dec 16, 2010 at 7:17 AM, Trou Macacq wrote: > My setup look like this: > > ngnix reverse proxy, port 80 <-> apache daemon running fossil via CGI, port > 8080 > > And since fossil sets absolute URL to all resources embedded... the > people outside have seem my repositories wiki, tickets, a

Re: [fossil-users] $baseurl question (reverse proxy issue)

2010-12-16 Thread Joerg Sonnenberger
On Thu, Dec 16, 2010 at 08:20:02AM -0500, Richard Hipp wrote: > On Thu, Dec 16, 2010 at 8:17 AM, Trou Macacq wrote: > > > 2) Should we consider using relative URLs instead of absolute? > > > > That sounds like it is the right solution. But it is a big change. It will > likely take a week or tw

Re: [fossil-users] $baseurl question (reverse proxy issue)

2010-12-16 Thread Richard Hipp
On Thu, Dec 16, 2010 at 8:17 AM, Trou Macacq wrote: > 2) Should we consider using relative URLs instead of absolute? > That sounds like it is the right solution. But it is a big change. It will likely take a week or two to appear. -- D. Richard Hipp d...@sqlite.org _

[fossil-users] $baseurl question (reverse proxy issue)

2010-12-16 Thread Trou Macacq
Hi all! Thank you all for such a great tool as fossil! I've become big fan of the fossil SCM some time ago and past few days I spent finally moving fossil repositories to the production server (I need some sort of centralized hosting for all my stuff) and funny thing happened -- fossil let me dow

Re: [fossil-users] basic questions about fossil

2010-12-16 Thread Rene
On Wed, 15 Dec 2010 18:44:46 -0800, Russ Paielli wrote: > Hi Richard, > > I discovered fossil yesterday while reading the Wikipedia page that > compares version control systems. I read lots of the material on the > fossil website, and I must say that fossil looks very promising. > Congratulations

Re: [fossil-users] Stash. Was: How should Fossil handle this merge conflict...

2010-12-16 Thread Lluís Batlle i Rossell
On Wed, Dec 15, 2010 at 11:10:17PM +0100, Joerg Sonnenberger wrote: > On Wed, Dec 15, 2010 at 10:50:52PM +0100, Lluís Batlle i Rossell wrote: > > On Wed, Dec 15, 2010 at 08:33:29PM +0100, Joerg Sonnenberger wrote: > > > Having incomplete changes in the tree is bad for things like bisect. > > > It s