Re: [fossil-users] Now with color: Retro side-by-side diffs
On Sat, Feb 4, 2012 at 10:55 PM, wrote:
> +2
>
> Liked both the diffs.
>
> Are colors configurable from skin?
>
Your CSS elements are span.diffchng, span.diffrm, and span.diffadd. For
line numbers, span.diffln. For the divider between change blocks,
span.diffhr.
>
> I used following CSS for bsdiff (I find bluish color better than yellow
> for changed lines):
> table.sbsdiff tr td.added {
> background-color: rgb(220, 244, 220);
> }
> table.sbsdiff tr td.removed {
> background-color: rgb(244, 220, 220);
> }
> table.sbsdiff tr td.changed {
> background-color: rgb(220, 220, 244);
> }
>
> > - Original Message -
> > From: Richard Hipp
> > Sent: 02/05/12 01:33 AM
> > To: Fossil SCM user's discussion
> > Subject: Re: [fossil-users] Now with color: Retro side-by-side diffs
> >
> > On Sat, Feb 4, 2012 at 2:26 PM, Martin Gagnon wrote:
> >
> > > Nice.. Same kind of coloring on unified diff would be nice too..
> > >
> >
> > Implemented before you even asked. See,
> > http://www.fossil-scm.org/fossil/ci/b57b035654?sbs=0 for example.
> Chrome
> > users, the CSS has changed again so be sure to reload 6 or 7 times.
> >
> >
> >
> > >
> > > --
> > > Martin G.
> > >
> > >
> > >
> > > Le 2012-02-04 à 14:14, Richard Hipp a écrit :
> > >
> > > A colorized version of the retro-sbsdiff branch is now on the main
> > > website. An example:
> > >
> > > http://www.sqlite.org/src/info/21695c3476
> > >
> > > Suggestions for improvements to the CSS (colors and fonts) are
> welcomed.
> > >
> > > On Fri, Feb 3, 2012 at 10:25 AM, Richard Hipp wrote:
> > >
> > >> For some time now, the SQLite and Fossil websites have been running on
> > >> the "retro-sbsdiff" branch of Fossil. The retro-sbsdiff branch uses a
> > >> vastly simplified format for the side-by-side diffs that omits all of
> the
> > >> colors and decoration and provides plain-text output - essentially
> the same
> > >> output as you would get on the command-line using the -y flag.
> Example:
> > >>
> > >>http://www.sqlite.org/src/info/21695c3476
> > >>
> > >> I find the "retro" side-by-side diff to be much more readable, which
> is
> > >> why I am using it on the SQLite and Fossil websites, as well as on my
> > >> desktop. And I've heard no complaints from users about the retro
> sbsdiffs
> > >> on the website. But before I merge the retro-sbsdiff branch into
> trunk (and
> > >> hence purge the existing colorful sbs diff from the trunk) I thought I
> > >> would as for community feedback. Are there strong preferences one
> way or
> > >> another?
> > >>
> > >> --
> > >> D. Richard Hipp
> > >> d...@sqlite.org
> > >>
> > >
> > >
> > >
> > > --
> > > D. Richard Hipp
> > > d...@sqlite.org
> > >
> > > ___
> > > fossil-users mailing list
> > > fossil-users@lists.fossil-scm.org
> > > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
> > >
> > >
> > > ___
> > > fossil-users mailing list
> > > fossil-users@lists.fossil-scm.org
> > > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
> > >
> > >
> >
> >
> > --
> > D. Richard Hipp
> > d...@sqlite.org
> >
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
--
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [PATCH] Misc fixes for makedeb.sh script.
On Sat, Feb 4, 2012 at 8:13 PM, Stephan Beal wrote: > On Fri, Feb 3, 2012 at 10:54 PM, Jay Weisskopf > wrote: > >> I created a patch (available below) for the makedeb.sh script that >> > > Hi, Jay! > > Thanks for that - i haven't touched that script for some time, since i > don't use Nexenta any more. i'll get your fixes applied sometime this > weekend. > Hi, Jay! Richard beat me to it: http://www.fossil-scm.org/index.html/fdiff?v1=24a2f28c3bac4af8&v2=a9e2ea162491f771 i also replaced my old email address in that script with the fossil-dev address. Thanks again for the patch. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] how to clone private branches over ssh?
Hi List, I am trying to clone my repository over SSH complete with all my private branches. So far I have had no luck. I compiled fossil on Ubuntu-10.04 from its current trunk version and that's what I am getting: $ fossil clone --private ssh://leor@pionL2://home/leor/Devel/Fossil/LR.fossil LR.fossil password for leor: ssh -e none -T -p leor@pionl2 Bytes Cards Artifacts Deltas Sent: 73 1 0 0 Received: 5001001 15798 2003 5914 Sent: 91 2 0 0 Error: not authorized to sync private content Received: 6225987 1 0 0 Total network traffic: 575 bytes sent, 11227422 bytes received fossil: server returned an error - clone aborted What options should I enable in fossil->Admin to permit sync of private branches? I randomly tried several seemingly relevant options under User, Acess but to no avail. BTW, cloning without --private works fine. --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] how to clone private branches over ssh?
On Sun, Feb 5, 2012 at 12:03 PM, Leo Razoumov wrote: > Hi List, > I am trying to clone my repository over SSH complete with all my > private branches. So far I have had no luck. > > What options should I enable in fossil->Admin to permit sync of > private branches? I randomly tried several seemingly relevant options > under User, Acess but to no avail. > You need to enable the Private privilege on the user that you are logging in as. -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Now with color: Retro side-by-side diffs
I'm happy with the changes, since it easily allows styling by the end user
via the classes you provide!
Tomek
On Sun, Feb 5, 2012 at 6:36 AM, Richard Hipp wrote:
>
>
> On Sat, Feb 4, 2012 at 10:55 PM, wrote:
>
>> +2
>>
>> Liked both the diffs.
>>
>> Are colors configurable from skin?
>>
>
> Your CSS elements are span.diffchng, span.diffrm, and span.diffadd. For
> line numbers, span.diffln. For the divider between change blocks,
> span.diffhr.
>
>
>>
>> I used following CSS for bsdiff (I find bluish color better than yellow
>> for changed lines):
>> table.sbsdiff tr td.added {
>> background-color: rgb(220, 244, 220);
>> }
>> table.sbsdiff tr td.removed {
>> background-color: rgb(244, 220, 220);
>> }
>> table.sbsdiff tr td.changed {
>> background-color: rgb(220, 220, 244);
>> }
>>
>> > - Original Message -
>> > From: Richard Hipp
>> > Sent: 02/05/12 01:33 AM
>> > To: Fossil SCM user's discussion
>> > Subject: Re: [fossil-users] Now with color: Retro side-by-side diffs
>> >
>> > On Sat, Feb 4, 2012 at 2:26 PM, Martin Gagnon wrote:
>> >
>> > > Nice.. Same kind of coloring on unified diff would be nice too..
>> > >
>> >
>> > Implemented before you even asked. See,
>> > http://www.fossil-scm.org/fossil/ci/b57b035654?sbs=0 for example.
>> Chrome
>> > users, the CSS has changed again so be sure to reload 6 or 7 times.
>> >
>> >
>> >
>> > >
>> > > --
>> > > Martin G.
>> > >
>> > >
>> > >
>> > > Le 2012-02-04 à 14:14, Richard Hipp a écrit :
>> > >
>> > > A colorized version of the retro-sbsdiff branch is now on the main
>> > > website. An example:
>> > >
>> > > http://www.sqlite.org/src/info/21695c3476
>> > >
>> > > Suggestions for improvements to the CSS (colors and fonts) are
>> welcomed.
>> > >
>> > > On Fri, Feb 3, 2012 at 10:25 AM, Richard Hipp wrote:
>> > >
>> > >> For some time now, the SQLite and Fossil websites have been running
>> on
>> > >> the "retro-sbsdiff" branch of Fossil. The retro-sbsdiff branch uses
>> a
>> > >> vastly simplified format for the side-by-side diffs that omits all
>> of the
>> > >> colors and decoration and provides plain-text output - essentially
>> the same
>> > >> output as you would get on the command-line using the -y flag.
>> Example:
>> > >>
>> > >>http://www.sqlite.org/src/info/21695c3476
>> > >>
>> > >> I find the "retro" side-by-side diff to be much more readable, which
>> is
>> > >> why I am using it on the SQLite and Fossil websites, as well as on my
>> > >> desktop. And I've heard no complaints from users about the retro
>> sbsdiffs
>> > >> on the website. But before I merge the retro-sbsdiff branch into
>> trunk (and
>> > >> hence purge the existing colorful sbs diff from the trunk) I thought
>> I
>> > >> would as for community feedback. Are there strong preferences one
>> way or
>> > >> another?
>> > >>
>> > >> --
>> > >> D. Richard Hipp
>> > >> d...@sqlite.org
>> > >>
>> > >
>> > >
>> > >
>> > > --
>> > > D. Richard Hipp
>> > > d...@sqlite.org
>> > >
>> > > ___
>> > > fossil-users mailing list
>> > > fossil-users@lists.fossil-scm.org
>> > >
>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>> > >
>> > >
>> > > ___
>> > > fossil-users mailing list
>> > > fossil-users@lists.fossil-scm.org
>> > >
>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>> > >
>> > >
>> >
>> >
>> > --
>> > D. Richard Hipp
>> > d...@sqlite.org
>> >
>>
>> ___
>> fossil-users mailing list
>> fossil-users@lists.fossil-scm.org
>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>>
>
>
>
> --
> D. Richard Hipp
> d...@sqlite.org
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] how to clone private branches over ssh?
On Sun, Feb 5, 2012 at 12:16, Richard Hipp wrote: > On Sun, Feb 5, 2012 at 12:03 PM, Leo Razoumov wrote: >> >> Hi List, >> I am trying to clone my repository over SSH complete with all my >> private branches. So far I have had no luck. >> >> What options should I enable in fossil->Admin to permit sync of >> private branches? I randomly tried several seemingly relevant options >> under User, Acess but to no avail. > > You need to enable the Private privilege on the user that you are logging in > as. > Still no luck even after I enabled Private privilege and am providing correct fossil login password when clone asks me. The only way I get private branch clone working is to configure ssh to set REMOTE_USER environment variable on the remote end. But such a ssh trickery is a poor solution for it requires root access to sshd configuration file. --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Derived code, not to be pushed public
Hello, I wonder how people keep code based on a public fossil repository, but without making the derivaiton public. Of course, with the ability to keep all in sync easily, as if all was in a single VCS. There are the private branches... but I wonder if there are other approaches used by people in this list. I think maybe the private branches feature is not very tested in fossil. For example, hwaci offers extra products for sqlite. How do people at hwaci maintain those sqlite extras in sync? Regards, Lluís. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Derived code, not to be pushed public
2012/2/5 Lluís Batlle i Rossell : > Hello, > > I wonder how people keep code based on a public fossil repository, > but without making the derivaiton public. Of course, with the ability to keep > all in sync easily, as if all was in a single VCS. > > There are the private branches... but I wonder if there are other approaches > used by people in this list. I think maybe the private branches feature is not > very tested in fossil. IMHO, a very important feature is still missing from fossil -- an ability to push or pull a single branch. A great variety of workflows could immediately become possible. --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Derived code, not to be pushed public
On Sun, Feb 05, 2012 at 02:34:30PM -0500, Leo Razoumov wrote: > 2012/2/5 Lluís Batlle i Rossell : > > Hello, > > > > I wonder how people keep code based on a public fossil repository, > > but without making the derivaiton public. Of course, with the ability to > > keep > > all in sync easily, as if all was in a single VCS. > > > > There are the private branches... but I wonder if there are other approaches > > used by people in this list. I think maybe the private branches feature is > > not > > very tested in fossil. > > IMHO, a very important feature is still missing from fossil -- an > ability to push or pull a single branch. > A great variety of workflows could immediately become possible. Well, even that alone would not be enough. I meant for cases where it is *very important* not to push the work. :) But I suspect that there are people using fossil and having a reasonable workflow for those cases. I wonder what they use. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] a very simple add.c patch
hi there,
a simple patch that tries to do the following:
-remove end of line whitespace
-put all See also entries in alphabetical order
-remove SUMMARY that i dont see being used anywhere else
i felt that because 'mv' is in add.c, perhaps it also
has a place on the See also lines of the other add.c commands...
-f
--- src/add.c
+++ src/add.c
@@ -49,11 +49,11 @@
".fslckout",
".fslckout-journal",
".fslckout-wal",
".fslckout-shm",
- /* The use of ".fos" as the name of the checkout database is
+ /* The use of ".fos" as the name of the checkout database is
** deprecated. Use ".fslckout" instead. At some point, the following
** entries should be removed. 2012-02-04 */
".fos",
".fos-journal",
".fos-wal",
@@ -148,11 +148,11 @@
int i;/* Loop counter */
const char *zReserved;/* Name of a reserved file */
Blob repoName;/* Treename of the repository */
Stmt loop;/* SQL to loop over all files to add */
int (*xCmp)(const char*,const char*);
-
+
if( !file_tree_name(g.zRepositoryName, &repoName, 0) ){
blob_zero(&repoName);
zRepo = "";
}else{
zRepo = blob_str(&repoName);
@@ -198,15 +198,15 @@
** does not appear on the command line then the "ignore-glob" setting is
** used.
**
** Options:
**
-**--dotfiles include files beginning with a dot (".")
-**--ignoreignore files matching patterns from the
+**--dotfiles include files beginning with a dot (".")
+**--ignoreignore files matching patterns from the
** comma separated list of glob patterns.
-**
-** See also: addremove, rm
+**
+** See also: addremove, mv, rm
*/
void add_cmd(void){
int i; /* Loop counter */
int vid; /* Currently checked out version */
int nRoot; /* Full path characters in g.zLocalRoot */
@@ -234,11 +234,11 @@
" ON vfile(pathname COLLATE nocase)"
);
#endif
pIgnore = glob_create(zIgnoreFlag);
nRoot = strlen(g.zLocalRoot);
-
+
/* Load the names of all files that are to be added into sfile temp table */
for(i=2; i ignore files matching patterns from the
+**
+** Options:
+** --dotfiles include files beginning with a dot (".")
+** --ignoreignore files matching patterns from the
**comma separated list of glob patterns.
** --test If given, show what would be done without doing so.
**
-** See also: add, rm
+** See also: add, mv, rm
*/
void addremove_cmd(void){
Blob path;
const char *zIgnoreFlag = find_option("ignore",0,1);
int allFlag = find_option("dotfiles",0,0)!=0;
@@ -436,11 +435,11 @@
if( vid==0 ){
fossil_panic("no checkout to add to");
}
db_begin_transaction();
- /* step 1:
+ /* step 1:
** Populate the temp table "sfile" with the names of all unmanged
** files currently in the check-out, except for files that match the
** --ignore or ignore-glob patterns and dot-files. Then add all of
** the files in the sfile temp table to the set of managed files.
*/
@@ -507,13 +506,11 @@
**
** This command does NOT rename or move the files on disk. This command merely
** records the fact that filenames have changed so that appropriate notations
** can be made at the next commit/checkin.
**
-**
-** SUMMARY: fossil mv|rename OLDNAME NEWNAME
-** or: fossil mv|rename OLDNAME... DIR
+** See also: add, addremove, rm
*/
void mv_cmd(void){
int i;
int vid;
char *zDest;
--
every silver lining has a cloud.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Retro side-by-side diffs
On Sat, Feb 4, 2012 at 10:36, Richard Hipp wrote: > On Sat, Feb 4, 2012 at 10:24 AM, Leo Razoumov wrote: >> Retro diff (2) looks really bad in Google Chrome-16 and in >> Firefox-3.6.24, see attached chrome screen-shot (Ubuntu-10.04). > > Huh. On Ubuntu 11.10 running the latest Firefox sources (compiled just this > morning) it looks fine: http://www.fossil-scm.org/ss1.gif > > Can anybody explain the difference? Is there something wrong with the CSS? > I played a bit with Firefox-10 on Linux. I seem to get a good layout when set font-sizes in Preferences to 12pt. When, on the other hand, I increase font sizes to 16 or 18pt then the layout got messed up. I am using hi-res monitor and 12pt is really small. I know very little about CSS. Is it possible to make a layout that does not break when a user changes default font size?? --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] a very simple add.c patch
hmm, on Sun, Feb 05, 2012 at 09:23:09PM +0100, frantisek holop said that > a simple patch that tries to do the following: forgot to add, it also removes a tautology about addremove not doing commit automatically -f -- when i want your opinion i'll give it to you! ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Applying patches with fossil
Hi, Just wondering how fossil users apply patches. This page: http://fossil-scm.org/fossil/doc/trunk/www/concepts.wiki says in section 3.0 second paragraph that "Fossil is completely self-contained. It is not necessary to install any other software in order to use fossil. You do not need CVS, gzip, diff, [...] patch, or any similar software on your system in order to use fossil effectively." I couldn't find any command in fossil for applying patches, though. So, how do you proceed with fossil? Thanks, Francois ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] fossil help
hi there, i am trying to learn fossil and 'fossil help' is a great tool for this. however as a newcomer i have noticed a couple of "discrepancies". i have already worked out that fossil is liberal with command line switches and accepts --longoptions with a single '-' as well. as it looks like that the great majority of documentation is written in the --longoption form, i think it would be nice to have all these commands in the same form. fossil is not liberal only with the form but also with the position of the options, another thing that might not be obvious for new users (and i haven't found it anywhere in the documentation so far), so again, some sort of consistency would be nice. as a bsd user, i am great fan of consistent description of command line options and i think that command [options] [arguments] works quite well. in the fossil help, ?OPTIONS? is sometimes before, sometimes after the arguments. and lastly, the notation of a parameter being optional or not is also a bit of curiousity for me, i have never seen the ?OPTIONS? notation before, and while its clear, what's it about, i think [OPTIONS] is a more common and recognized form for command line programs. a quick search through the sources indicates that a very small minority of the commands use [ ] instead of ? ?... if there is interest for this from the architect, i'd be more than happy to send a diff that would make these changes. -f -- unicorns aren't myth, virgins are! ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Applying patches with fossil
hmm, on Sun, Feb 05, 2012 at 09:47:20PM +0100, François Vogel said that > This page: > > http://fossil-scm.org/fossil/doc/trunk/www/concepts.wiki > > says in section 3.0 second paragraph that "Fossil is completely > self-contained. It is not necessary to install any other software in > order to use fossil. You do not need CVS, gzip, diff, [...] patch, > or any similar software on your system in order to use fossil > effectively." > > I couldn't find any command in fossil for applying patches, though. > So, how do you proceed with fossil? i think that was meant to apply to the workflow when one fossil user pushes their changes to another one using fossil, and not patch files as such. -f -- in my dreams i'm dying all the time. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] fossil help
and also, sometimes possible options are listed on the usage line, sometimes simply ?OPTIONS? is showed :] -f -- go ahead, jump. 100,000 lemmings can't be wrong. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] fossil help
On Sun, Feb 5, 2012 at 16:04, frantisek holop wrote: > command [options] [arguments] > > works quite well. in the fossil help, ?OPTIONS? is sometimes before, > sometimes after the arguments. > Hi Frantisek, being another recent fossil newcomer I am doing my share of learning and going through the source code. Fossil parses options by calling find_option function that will locate an option almost anywhere on the command line. There is one exception, though. Double-dash "--" by itself terminates options search. Everything that follows it on a command-line are considered non-options (filenames, ...) even if it starts with dashes. --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
