Re: [fossil-users] Retro side-by-side diffs
Same here. I like the colorful diff. But I would like to know (sorry if I missed) what's th eproblem with color sbs and what are we getting with retro sbs? - Altu - Original Message - From: Weber, Martin S Sent: 02/03/12 11:03 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] Retro side-by-side diffs On 2012-02-03 12:31 , Remigiusz Modrzejewski l...@maxnet.org.pl wrote: I'm for color-coded. All of the reasons have already been listed in the thread. Same here. -Martin ___ 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] fossil rm followed by unix rm followed by update and files come back, is this desirable?
On Fri, 3 Feb 2012 09:57:47 -0700 Matt Welland wrote: If I do: fossil rm some/file.txt rm some/file.txt fossil commit People often prefer to commit when their work has reached some level of completion or readiness and partially done commits can cause unnecessary breakage for other developers. At the same time staying up to date with incoming changes is often a requirement. Ah, I see what you mean. I thought you forgot to commit before updating. Sorry for misunderstanding. -- Dmitry Chestnykh http://www.codingrobots.com ___ 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 5:08 AM, altufa...@mail.com wrote: Same here. I like the colorful diff. But I would like to know (sorry if I missed) what's the problem with color sbs and what are we getting with retro sbs? Here is an example, two different websites showing the same Fossil project (TCL), one with the traditional colorful diff and the other with the new retro diff: (1) http://core.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1 (2) http://mirror1.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1dw=67 The change of this check-in is a single line of code - indeed a single character on that one line. With (1), my eyes are distracted by a bunch of needless coloration, and I have to stare at the screen for a second or two before I can discern what has actually changed. I tried using colored diffs for a while, but I eventually gave up in frustration. They are simply not useful to me. I can read the old-style unified diffs faster. In (2), on the other hand, I can clearly and immediately see that one line has changed. The change pops out at me. I don't have to think about it - it is just there. - Altu - Original Message - From: Weber, Martin S Sent: 02/03/12 11:03 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] Retro side-by-side diffs On 2012-02-03 12:31 , Remigiusz Modrzejewski l...@maxnet.org.pl wrote: I'm for color-coded. All of the reasons have already been listed in the thread. Same here. -Martin ___ 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
Re: [fossil-users] Retro side-by-side diffs
On 02/04/12 11:08, altufa...@mail.com wrote: Same here. I like the colorful diff. But I would like to know (sorry if I missed) what's th eproblem with color sbs and what are we getting with retro sbs? The reason is that we have two different places in the code which do the same thing (create side-by-side diffs), but they do it in different ways. Having them consolidated has benefits. (Smaller binary, much easier to maintain, adding/changing features only requires it to be done in one place, etc). The original sbsdiff was hard-coded for html (it will not translate to the console), the retro sbsdiff works for both console and displaying it in a pre html-section. -- Kind regards, Jan Danielsson ___ 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] Should distributed binary require libnss to connect over http?
On Mon, Jan 30, 2012 at 12:18:28PM +0100, Dmitry Chestnykh wrote: On Mon, 30 Jan 2012 09:11:03 +0100 Lluís Batlle i Rossell wrote: On Mon, Jan 30, 2012 at 04:27:07AM +0100, Dmitry Chestnykh wrote: Yeah, static linking is not actually that static nowadays. When linking, GCC warns about this. For what I know, it's only *glibc* that suffers from dynamic-only name resolvers (for either hosts, services, users, ...). You mean, if you replace glibc with some other libc, it will work? Sure, but then you'll have more problems if you don't control the deployment [1]. Right. uclibc static binaries work perfectly, with name resolving in the static program. That's linux-only though, I think. 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] Retro side-by-side diffs
For me, much better with the colors. Maybe taking out the violet of the hidden lines. It helps a lot to focus the attention to the correct place. RR El 04/02/2012 13:24, Richard Hipp d...@sqlite.org escribió: On Sat, Feb 4, 2012 at 5:08 AM, altufa...@mail.com wrote: Same here. I like the colorful diff. But I would like to know (sorry if I missed) what's the problem with color sbs and what are we getting with retro sbs? Here is an example, two different websites showing the same Fossil project (TCL), one with the traditional colorful diff and the other with the new retro diff: (1) http://core.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1 (2) http://mirror1.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1dw=67 The change of this check-in is a single line of code - indeed a single character on that one line. With (1), my eyes are distracted by a bunch of needless coloration, and I have to stare at the screen for a second or two before I can discern what has actually changed. I tried using colored diffs for a while, but I eventually gave up in frustration. They are simply not useful to me. I can read the old-style unified diffs faster. In (2), on the other hand, I can clearly and immediately see that one line has changed. The change pops out at me. I don't have to think about it - it is just there. - Altu - Original Message - From: Weber, Martin S Sent: 02/03/12 11:03 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] Retro side-by-side diffs On 2012-02-03 12:31 , Remigiusz Modrzejewski l...@maxnet.org.pl wrote: I'm for color-coded. All of the reasons have already been listed in the thread. Same here. -Martin ___ 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 ___ 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
The problem here is the violet for skipped lines that is more outstanding than the diff itself. I'm sure the colorful version can be tweaked to have the best of both world. In my case, 80% of the case, I prefer unified (with color via JS even more). Especially when there's not a lot of changes in a line. With sbs diff, the 2 versions are far away, it' hard to see the diff. With unified, you can see right away, the 2 lines are one next to the other. More advanced diffs programs (meld, vimdiff etc..) solve that by highlighting what is different in the line. That's become a lot more complex. Le 2012-02-04 à 07:24, Richard Hipp d...@sqlite.org a écrit : On Sat, Feb 4, 2012 at 5:08 AM, altufa...@mail.com wrote: Same here. I like the colorful diff. But I would like to know (sorry if I missed) what's the problem with color sbs and what are we getting with retro sbs? Here is an example, two different websites showing the same Fossil project (TCL), one with the traditional colorful diff and the other with the new retro diff: (1) http://core.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1 (2) http://mirror1.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1dw=67 The change of this check-in is a single line of code - indeed a single character on that one line. With (1), my eyes are distracted by a bunch of needless coloration, and I have to stare at the screen for a second or two before I can discern what has actually changed. I tried using colored diffs for a while, but I eventually gave up in frustration. They are simply not useful to me. I can read the old-style unified diffs faster. In (2), on the other hand, I can clearly and immediately see that one line has changed. The change pops out at me. I don't have to think about it - it is just there. - Altu - Original Message - From: Weber, Martin S Sent: 02/03/12 11:03 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] Retro side-by-side diffs On 2012-02-03 12:31 , Remigiusz Modrzejewski l...@maxnet.org.pl wrote: I'm for color-coded. All of the reasons have already been listed in the thread. Same here. -Martin ___ 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 -- Martin G.___ 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
Seconded. The hidden lines receive more emphasis than the change. Do a tkdiff on the same change and it is immediately obvious what the change is. I checked meld, tkdiff and xxdiff and in all of them the actual character that was removed is also highlighted making it immediately obvious what changed. It was not immediately obvious to me what changed in either the colored or retro examples. If fossil can't easily match the capability of an external tool then my vote would be to go with the retro. On Sat, Feb 4, 2012 at 6:36 AM, Ramon Ribó ram...@compassis.com wrote: For me, much better with the colors. Maybe taking out the violet of the hidden lines. It helps a lot to focus the attention to the correct place. RR El 04/02/2012 13:24, Richard Hipp d...@sqlite.org escribió: On Sat, Feb 4, 2012 at 5:08 AM, altufa...@mail.com wrote: Same here. I like the colorful diff. But I would like to know (sorry if I missed) what's the problem with color sbs and what are we getting with retro sbs? Here is an example, two different websites showing the same Fossil project (TCL), one with the traditional colorful diff and the other with the new retro diff: (1) http://core.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1 (2) http://mirror1.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1dw=67 The change of this check-in is a single line of code - indeed a single character on that one line. With (1), my eyes are distracted by a bunch of needless coloration, and I have to stare at the screen for a second or two before I can discern what has actually changed. I tried using colored diffs for a while, but I eventually gave up in frustration. They are simply not useful to me. I can read the old-style unified diffs faster. In (2), on the other hand, I can clearly and immediately see that one line has changed. The change pops out at me. I don't have to think about it - it is just there. - Altu - Original Message - From: Weber, Martin S Sent: 02/03/12 11:03 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] Retro side-by-side diffs On 2012-02-03 12:31 , Remigiusz Modrzejewski l...@maxnet.org.pl wrote: I'm for color-coded. All of the reasons have already been listed in the thread. Same here. -Martin ___ 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 ___ 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] Retro side-by-side diffs
Fully agree, the colored one suffers from being cluttered. If the retro one grayed the changed line to slightly highlight it, it would help a lot. Shameless plug: Diff tool with built in Fossil support: http://eskil.tcl.tk/index.html/doc/trunk/htdocs/fossil.wiki /Peter On Sat, Feb 4, 2012 at 3:01 PM, Matt Welland estifo...@gmail.com wrote: Seconded. The hidden lines receive more emphasis than the change. Do a tkdiff on the same change and it is immediately obvious what the change is. I checked meld, tkdiff and xxdiff and in all of them the actual character that was removed is also highlighted making it immediately obvious what changed. It was not immediately obvious to me what changed in either the colored or retro examples. If fossil can't easily match the capability of an external tool then my vote would be to go with the retro. On Sat, Feb 4, 2012 at 6:36 AM, Ramon Ribó ram...@compassis.com wrote: For me, much better with the colors. Maybe taking out the violet of the hidden lines. It helps a lot to focus the attention to the correct place. RR El 04/02/2012 13:24, Richard Hipp d...@sqlite.org escribió: On Sat, Feb 4, 2012 at 5:08 AM, altufa...@mail.com wrote: Same here. I like the colorful diff. But I would like to know (sorry if I missed) what's the problem with color sbs and what are we getting with retro sbs? Here is an example, two different websites showing the same Fossil project (TCL), one with the traditional colorful diff and the other with the new retro diff: (1) http://core.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1 (2) http://mirror1.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1dw=67 The change of this check-in is a single line of code - indeed a single character on that one line. With (1), my eyes are distracted by a bunch of needless coloration, and I have to stare at the screen for a second or two before I can discern what has actually changed. I tried using colored diffs for a while, but I eventually gave up in frustration. They are simply not useful to me. I can read the old-style unified diffs faster. In (2), on the other hand, I can clearly and immediately see that one line has changed. The change pops out at me. I don't have to think about it - it is just there. - Altu - Original Message - From: Weber, Martin S Sent: 02/03/12 11:03 PM To: Fossil SCM user's discussion Subject: Re: [fossil-users] Retro side-by-side diffs On 2012-02-03 12:31 , Remigiusz Modrzejewski l...@maxnet.org.pl wrote: I'm for color-coded. All of the reasons have already been listed in the thread. Same here. -Martin ___ 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 ___ 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 ___ 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] minor doc patch, .fos suggestion
On Fri, Feb 3, 2012 at 8:26 PM, frantisek holop min...@obiit.org wrote: hi there, reading through the documentation i thought some sentences would be easier to read with some minor changes, and i also removed end of line whitespace. the other item from the subject concerns the future change of '_FOSSIL_' to '.fos'. i am totally new on the list, so i am not familiar with the debate (if any happened) regarding this change, but the linguistic issue is that 'fos' in hungarian means a certain type of excrement.. i dont know if this is open to discussion, but if it were, i'd say '.fossil' would not be a good choice, as it looks like a repository without a name. '.fockout' would have it's own problems in english ;} Thank you. I was not aware of this. I'll try to figure out a backwards-compatible way to change that file name. so seeing that it's also part of fossil, also an sqlite db file, why not have something less mystical, bit more verbose (being hidden anyway), like '.checkout.fossil' or some such? in the worst case please keep _FOSSIL_ around for us hungarians :] -f Index: www/tech_overview.wiki == --- www/tech_overview.wiki +++ www/tech_overview.wiki @@ -6,11 +6,11 @@ h21.0 Introduction/h2 At its lowest level, a Fossil repository consists of an unordered set of immutable artifacts. You might think of these artifacts as files, since in many cases the artifacts exactly correspond to source code files -that are stored in the Fossil repository. But other control artifacts +that are stored in the Fossil repository. But other control artifacts are also included in the mix. These control artifacts define the relationships between artifacts - which files go together to form a particular version of the project, who checked in that version and when, what was the check-in comment, what wiki pages are included with the project, what are the edit histories of each wiki page, what bug reports or tickets are @@ -17,29 +17,27 @@ included, who contributed to the evolution of each ticket, and so forth, and so on. This low-level file format is called the global state of the repository, since this is the information that is synced to peer repositories using push and pull operations. The low-level file format is also called enduring since it is intended to last for many years. -The details of the low-level, enduring, global file format +The details of the low-level, enduring, global file format are [./fileformat.wiki | described separately]. This article is about how Fossil is currently implemented. Instead of dealing with vague abstractions of enduring file formats as the -[./fileformat.wiki | that other document] does, this article provides -some detail on how Fossil actually stores information on disk. +[./fileformat.wiki | other document] does, this article provides +some detail on how Fossil actually stores information on disk. h22.0 Three Databases/h2 -Fossil stores state information in +Fossil stores state information in [http://www.sqlite.org/ | SQLite] database files. SQLite keeps an entire relational database, including multiple tables and indices, in a single disk file. The SQLite library allows the database files to be efficiently queried and updated using the industry-standard -SQL language. And SQLite makes updates to these database files atomic, -even if a system crashes or power failure occurs in the middle of the -update, meaning that repository content is protected even during severe -malfunctions. +SQL language. SQLite updates are atomic, so even in the event of a system +crash or power failure the repository content is protected. Fossil uses three separate classes of SQLite databases: ol liThe configuration database @@ -48,11 +46,11 @@ /ol The configuration database is a one-per-user database that holds global configuration information used by Fossil. There is one repository database per project. The repository database is the -file that people are normally referring to when they say +file that people are normally referring to when they say a Fossil repository. The checkout database is found in the working checkout for a project and contains state information that is unique to that working checkout. Fossil does not always use all three database files. The web interface, @@ -134,11 +132,11 @@ instead of a dot) and is located in the directory specified by the LOCALAPPDATA, APPDATA, or HOMEPATH environment variables, in that order. h32.2 Repository Databases/h3 -The repository database is the file that is commonly referred to as +The repository database is the file that is commonly referred to as the repository. This is because the repository database contains, among other things, the complete revision, ticket, and wiki history for a project. It is customary to name the repository
Re: [fossil-users] Retro side-by-side diffs
On Sat, Feb 4, 2012 at 07:24, Richard Hipp d...@sqlite.org wrote: Here is an example, two different websites showing the same Fossil project (TCL), one with the traditional colorful diff and the other with the new retro diff: (1) http://core.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1 (2) http://mirror1.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1dw=67 Retro diff (2) looks really bad in Google Chrome-16 and in Firefox-3.6.24, see attached chrome screen-shot (Ubuntu-10.04). --Leo-- attachment: chrome-no-color.jpg___ 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:24 AM, Leo Razoumov slonik...@gmail.com wrote: On Sat, Feb 4, 2012 at 07:24, Richard Hipp d...@sqlite.org wrote: Here is an example, two different websites showing the same Fossil project (TCL), one with the traditional colorful diff and the other with the new retro diff: (1) http://core.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1 (2) http://mirror1.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1dw=67 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? --Leo-- ___ 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] Retro side-by-side diffs
On Sat, Feb 4, 2012 at 10:36, Richard Hipp d...@sqlite.org wrote: Here is an example, two different websites showing the same Fossil project (TCL), one with the traditional colorful diff and the other with the new retro diff: (1) http://core.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1 (2) http://mirror1.tcl.tk/tcl/ci/4ebc3a8e1e?sbs=1dw=67 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? My screen shot was for google chrome-16.0.912.63. --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] gvimdiff as gdiff-command
hi there, i tried to use gvimdiff as the gdiff-command but i always kept getting empty file where the temporary ~0 file should have been. then i realized that gvim returns to the shell right away, and fossil probably takes that as a signal to removes the temp file. i solved this with gvim's -f option (Foreground: Don't fork when starting GUI) $ fossil set gd gdiff-command(local) gvimdiff -f but how is this solved with the other GUI editors? is there a way to work around this in fossil itself? -f -- today is a fine day for firm decisions. or is it? ___ 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] gvimdiff as gdiff-command
Most of gui Editor work in frontground already.. GVim have this option because it spawn it in background by default and have a kind of client/server model (you can edit a file inside a specific instance that is already running). fossil can't do nothing about that.. (I mean something clean/simple) -- Martin G. Le 2012-02-04 à 13:38, frantisek holop min...@obiit.org a écrit : hi there, i tried to use gvimdiff as the gdiff-command but i always kept getting empty file where the temporary ~0 file should have been. then i realized that gvim returns to the shell right away, and fossil probably takes that as a signal to removes the temp file. i solved this with gvim's -f option (Foreground: Don't fork when starting GUI) $ fossil set gd gdiff-command(local) gvimdiff -f but how is this solved with the other GUI editors? is there a way to work around this in fossil itself? -f -- today is a fine day for firm decisions. or is it? ___ 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] [PATCH] Misc fixes for makedeb.sh script.
On Fri, Feb 3, 2012 at 10:54 PM, Jay Weisskopf jayschwa+fos...@gmail.comwrote: 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. -- - 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
Re: [fossil-users] Now with color: Retro side-by-side diffs
Nice.. Same kind of coloring on unified diff would be nice too.. -- Martin G. Le 2012-02-04 à 14:14, Richard Hipp d...@sqlite.org 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 d...@sqlite.org 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
Re: [fossil-users] Now with color: Retro side-by-side diffs
On Sat, Feb 4, 2012 at 2:26 PM, Martin Gagnon eme...@gmail.com 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 d...@sqlite.org 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 d...@sqlite.org 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
Re: [fossil-users] Now with color: Retro side-by-side diffs
+2
Liked both the diffs.
Are colors configurable from skin?
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 eme...@gmail.com 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 d...@sqlite.org 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 d...@sqlite.org 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
