Re: [fossil-users] Infinite loop on merge

2016-09-06 Thread Joel Bruick
Hi Andy, On 9/6/2016 3:26 PM, Andy Goth wrote: That seems to fix it. Thank you very much for the astonishingly fast turnaround. There may be unintended consequences since we haven't done much analysis yet, so I checked your change in on the merge-rename-lockup branch pending further testing.

Re: [fossil-users] PHP Composer support for Fossil

2016-06-29 Thread Joel Bruick
BohwaZ wrote: Just to tell you that the patch has been merged and the current Composer release allows you to use Fossil repos right now :) This is really cool news. Thanks! ___ fossil-users mailing list fossil-users@lists.fossil-scm.org

Re: [fossil-users] No progress on "fossil cp"

2016-05-16 Thread Joel Bruick
j. van den hoff wrote: On Mon, 16 May 2016 19:02:17 +0200, Warren Young wrote: 1. f finfo can’t trace file history back through a rename. The web version of this (f ui > Files > Ancestry) does manage to report the rename, but it doesn’t trace history back through that

Re: [fossil-users] Last call for "testerCleanup" branch review...

2016-03-05 Thread Joel Bruick
Joe Mistachkin wrote: I think this branch is ready and I'm planning on merging these changes to trunk on Tuesday, March 8th, 2016. Please feel free to raise objections. I agree that it's ready and am absolutely thrilled by what I see as a huge improvement to the test runner. Thanks, Joe!

Re: [fossil-users] [fossil-dev] Call for review / testing...

2016-03-03 Thread Joel Bruick
Ross Berteig wrote: I imagine that defining TEMP is the same issue Andy has. Yeah, I was just looking into this on a Linux VM and found the same thing. If TEMP isn't set, the tester script should probably check if /tmp exists and just use that.

Re: [fossil-users] New timeline display options

2015-03-31 Thread Joel Bruick
Richard Hipp wrote: James Moger's circular timeline nodes and colored timeline graphs are easily selectable skin options available to skin designers. For a comparison: http://www.fossil-scm.org/fossil/timeline?y=ci http://www2.fossil-scm.org/fossil/timeline?y=ci I hope you aren't too

Re: [fossil-users] File age in the tree view

2014-12-20 Thread Joel Bruick
Richard Hipp wrote: (1) Adjust the CSS so that the age is not all the way over on the right margin Sorry I haven't been able to contribute anything in quite a while, but this should be fixed on trunk now. ___ fossil-users mailing list

Re: [fossil-users] UTF-8 and Binary Files

2014-08-25 Thread Joel Bruick
Hi David, David Botham wrote: Yes, I am editing in Komodo 8.5.3 on a Windows 7 workstation. I will peek at the files in a hex editor and see what I can see... I use Komodo on Windows 7 quite a bit and have never had this problem. Does Komodo recognize the file as UTF-8 in the status bar? By

Re: [fossil-users] Index (was Re: git-fossil-git does not obtain the same commit hashes.)

2014-06-05 Thread Joel Bruick
Richard Hipp wrote: On Thu, Jun 5, 2014 at 8:33 PM, Nico Williams n...@cryptonector.com mailto:n...@cryptonector.com wrote: On Thu, Jun 5, 2014 at 7:22 PM, Matt Welland estifo...@gmail.com mailto:estifo...@gmail.com wrote: foo.txt has changes A, B, C and D. After each

Re: [fossil-users] Bookmarks (Re: git-fossil-git does not obtain the same commit hashes.)

2014-06-04 Thread Joel Bruick
Nico Williams wrote: On Wed, Jun 4, 2014 at 9:07 AM, Stephan Bealsgb...@googlemail.com wrote: On Wed, Jun 4, 2014 at 12:02 AM, Nico Williamsn...@cryptonector.com wrote: Mercurial too had heavy-duty branches only, then they added bookmarks that are very similar to git branches. Since a

Re: [fossil-users] Bookmarks (Re: git-fossil-git does not obtain the same commit hashes.)

2014-06-04 Thread Joel Bruick
Scott Robison wrote: On Wed, Jun 4, 2014 at 12:56 PM, Joel Bruick j...@joelface.com mailto:j...@joelface.com wrote: I think Git is a great, powerful, and flexible tool that actually has a much simpler design than it initially appears. But to get to a place where you actually

Re: [fossil-users] Bookmarks (Re: git-fossil-git does not obtain the same commit hashes.)

2014-06-04 Thread Joel Bruick
to that point, though, it's wonderful! ;) Attributed to Joel Bruick. :) I'd prefer the attribution Joel Bruick, blatantly biased Fossil contributor, but sure, why not? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil

[fossil-users] DRH's PGCon 2014 Keynote (with Fossil sighting!)

2014-06-01 Thread Joel Bruick
I just wanted to share Richard's PGCon 2014 keynote for anyone here that wasn't aware of it: https://www.youtube.com/watch?v=ZvmMzI0X7fE It's a great talk about the historical relationship between SQLite and PostgreSQL as well as a celebration of the usefulness of SQL. Richard goes through

Re: [fossil-users] working checkout does not match what would have ended up in the repository

2014-05-31 Thread Joel Bruick
Stephan Beal wrote: Am i wrong, or did Joel's patch just correct the problem: I hope so. The commit I backed out seems to serve no purpose besides messing up vfile_aggregate_checksum_disk(). Specifically, this part from the function's documentation: ** Newly added files that are not

Re: [fossil-users] FYI: doc URLs don't work with filenames that have + in their names

2014-05-28 Thread Joel Bruick
Warren Young wrote: On May 27, 2014, at 7:55 PM, Joel Bruickj...@joelface.com wrote: Richard Hipp wrote: I think that's an HTTP thing. In a URL, spaces are encoded as +. It's really an HTML form thing [1] that only applies to the query portion of the URL. In the path component, we

Re: [fossil-users] FYI: doc URLs don't work with filenames that have + in their names

2014-05-27 Thread Joel Bruick
Richard Hipp wrote: I think that's an HTTP thing. In a URL, spaces are encoded as +. So fossil is doing the right thing in converting + characters in the URL into spaces. If the filename really does contain + symbols, then the URL should have %2b for each plus. ex:

Re: [fossil-users] Excluding [brackets] from a.../a links

2014-05-14 Thread Joel Bruick
Stephan Beal wrote: On Wed, May 14, 2014 at 11:22 PM, B Harder brad.har...@gmail.com mailto:brad.har...@gmail.com wrote: Andy, to be clear, are you suggesting: a) blah blah [a href=somethingcafebabe/a] blah blah blah My comments assumed this interpretation. To my eyes that looks a

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

2014-03-05 Thread Joel Bruick
Jan Nijtmans wrote: Therefore I reverted the diff-eolws branch diffFlags to what they are in trunk now: DIFF_IGNORE_EOLWS. Sounds good. Let's get this bug-fix-turned-feature branch into trunk! :) Question to anyone interested: What should be the diffFlags used for blame/annotate

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] Missing highlighted space changes in diff?

2014-03-03 Thread Joel Bruick
Jan Nijtmans wrote: 2014-03-01 20:17 GMT+01:00 Andy Bradfordamb-fos...@bradfords.org: I was perusing the recent commits and noticed that the web UI does not highlight (in red) the actual changes here: http://www.fossil-scm.org/index.html/info/3df526ca41 On the other hand, fossil diff --tk

Re: [fossil-users] looking for interesting new fossil skins

2014-02-11 Thread Joel Bruick
Richard Hipp wrote: The tree-view (http://fossil.wanderinghorse.net/repos/libfossil/index.cgi/dir?ci=tiptype=tree http://fossil.wanderinghorse.net/repos/libfossil/index.cgi/dir?ci=tiptype=tree) doesn't look quite right. That skin sets top and bottom margins on all LI elements, which the

[fossil-users] tree-view-work branch

2014-01-17 Thread Joel Bruick
Richard, can you check the tree-view-work branch again? The only reason I can figure it didn't work for you is if you had an older, cached stylesheet that didn't get refreshed when you tried my changes. I had tried it (and just checked it again) in every browser I have installed (on both

Re: [fossil-users] Tree view and browser back button

2014-01-14 Thread Joel Bruick
Richard Hipp wrote: Joel - thanks for trying to fix this problem. But your patch doesn't work. On ChromeVersion 31.0.1650.63 (the default on Ubuntu 13.10) pressing the back button returns to a collapsed tree. And on IE10, it no longer expands when clicking on a directory. (Firefox and

Re: [fossil-users] Tree view and browser back button

2014-01-14 Thread Joel Bruick
Joel Bruick wrote: Sorry, I shouldn't have committed it to trunk in the first place. I'll let you know when I've got it working better. Should be working properly now. Tested on Firefox, Chrome, and IE10/11. ___ fossil-users mailing list fossil-users

Re: [fossil-users] tree-view of files

2014-01-06 Thread Joel Bruick
Michai Ramakers wrote: On 6 January 2014 11:59, Michai Ramakersm.ramak...@gmail.com wrote: Hello, I noticed that when clicking on 'files' in a checkin-summary (e.g. random checkin https://www.fossil-scm.org/index.html/info/f83e0d2123), tree-view is now displayed instead of legacy flat-dir.

Re: [fossil-users] tree-view of files

2014-01-06 Thread Joel Bruick
Joel Bruick wrote: I'm going to add some javascript for expanding/collapsing directories. Then the tree-view will be practically perfect in every way. And... done. For added convenience, you can also expand/collapse every subdirectory at once by clicking the root directory

Re: [fossil-users] tree-view of files

2014-01-06 Thread Joel Bruick
Richard Hipp wrote: Tnx. That works great. It's on the server now, after a few modifications, such as adding the expand query parameter which causes the display to start in an expanded state. One issue I have: There is now no longer a way to get a tree for a subdirectory by itself, except

Re: [fossil-users] CSS classes in tree-view?

2014-01-05 Thread Joel Bruick
Richard Hipp wrote: On Sat, Jan 4, 2014 at 11:21 PM, Joel Bruick j...@joelface.com mailto:j...@joelface.com wrote: Richard Hipp wrote: I compiled it and ran it but found the output hard to read. I think the problem is that the descending lines that come out of the bottom

Re: [fossil-users] CSS classes in tree-view?

2014-01-05 Thread Joel Bruick
Richard Hipp wrote: On Sun, Jan 5, 2014 at 5:07 PM, Joel Bruick j...@joelface.com mailto:j...@joelface.com wrote: Richard Hipp wrote: On Sat, Jan 4, 2014 at 11:21 PM, Joel Bruick j...@joelface.com mailto:j...@joelface.com wrote: In check-in [272b684d900e23], if I look

Re: [fossil-users] CSS classes in tree-view?

2014-01-05 Thread Joel Bruick
Richard Hipp wrote: Can you draw the lines using javascript? Perhaps use the line-drawing code in the timeline as a template for how to do it? Turns out it *is* possible to do with just CSS, after all. Yippee. ___ fossil-users mailing list

Re: [fossil-users] CSS classes in tree-view?

2014-01-05 Thread Joel Bruick
Richard Hipp wrote: On Sun, Jan 5, 2014 at 10:02 PM, Joel Bruick j...@joelface.com mailto:j...@joelface.com wrote: Richard Hipp wrote: Can you draw the lines using javascript? Perhaps use the line-drawing code in the timeline as a template for how to do it? Turns

Re: [fossil-users] CSS classes in tree-view?

2014-01-04 Thread Joel Bruick
Hi Martijn, Martijn Coppoolse wrote: Hi all, I really like the new tree-view feature. I set out to apply the same CSS tricks to differentiate files and directories, but it turns out that unlike the 'flat view', no CSS classes are included. Would it be possible to add those to each a link?

Re: [fossil-users] CSS classes in tree-view?

2014-01-04 Thread Joel Bruick
Richard Hipp wrote: I think Joel Bruick is already working on this in a branch. I just haven't gotten around to vetting and merging his changes, yet. Richard, I'm pretty happy with the state of the csstree branch now. Unless I'm overlooking something, I'd say it can be merged anytime

Re: [fossil-users] CSS classes in tree-view?

2014-01-04 Thread Joel Bruick
Richard Hipp wrote: On Sat, Jan 4, 2014 at 8:12 PM, Joel Bruick j...@joelface.com mailto:j...@joelface.com wrote: Richard Hipp wrote: I think Joel Bruick is already working on this in a branch. I just haven't gotten around to vetting and merging his changes, yet

Re: [fossil-users] Proposed Fossil interface enhancement.

2013-12-30 Thread Joel Bruick
Stephan Beal wrote: On Mon, Dec 30, 2013 at 10:21 PM, Stephan Beal sgb...@googlemail.com mailto:sgb...@googlemail.com wrote: Partially - i'd actually like to do something more akin to (ls -la). A simple single-column list could (it seems) be done with CSS. i spoke too soon - the

Re: [fossil-users] When modifying a file too quickly, it doesn't change

2013-12-25 Thread Joel Bruick
David Given wrote: The big gotcha, of course, is scripts, which typically perform several changes on similar files in very rapid succession --- that's precisely how I found this myself. I find myself very uneasy about having this defaulting to on. I have no objection to having the option there

Re: [fossil-users] Default /home and Wiki name validation?

2013-12-16 Thread Joel Bruick
Andy Bradford wrote: Should an exception be made for a Wiki page that is the main /home page? Or should Project names not be allowed to be less than 2 characters? Or is this just an edge case that is now documented in the list archives and one can either change the name of the project, or

Re: [fossil-users] single-column file list output in web UI

2013-11-25 Thread Joel Bruick
Michai Ramakers wrote: is there a simple way to display repo file contents in a single column, instead of 3, in the web UI? (or at least I see 3 columns here) Sorry for being way late to this, but you can get the effect you want by adding this to your repo's CSS: td.browser {

Re: [fossil-users] ui cosmetics

2013-10-30 Thread Joel Bruick
Martijn Coppoolse wrote: On 30-10-2013 12:15, j. van den hoff wrote: On Wed, 30 Oct 2013 10:49:58 +0100, Richard Hipp d...@sqlite.org wrote: == files == * it would be nice if directories where differentiated from files (e.g. in unix `ls -F' fashion) by trailing `/'). That can be done using

Re: [fossil-users] window opened by `diff --tk' is editable

2013-08-20 Thread Joel Bruick
Hi j., I'm responsible for the new and improved Tk diff and would like to look into these problems. Send any screenshots and/or hate mail my way. I'd also like to know what OS and Tcl/Tk version you're using. j. van den hoff wrote: however, regarding the _new_ Tk window (as of fossil version

Re: [fossil-users] RFC: where does the /reports link belong?

2013-08-04 Thread Joel Bruick
Ron Wilson wrote: As a developer, this makes sense to me, but in my observations, would be easier a non-developer user to find it Reports on the main menu. I don't have a problem with it being on the main menu, either -- especially if we eventually end up having some non-timeline-related

Re: [fossil-users] few TODO items

2013-08-03 Thread Joel Bruick
B Harder wrote: Sorry, on mobile and time constrained, but do private branches address this in any way? I get a lot of mileage out of them, FWIW. When working on the Fossil codebase, I do all my experimental work (which turns out to be most of it...) in private branches. Then when I have

Re: [fossil-users] Side-by-side diff improvement

2013-07-07 Thread Joel Bruick
Was away from the computer all day yesterday. Thanks to everyone for the feedback so far. I really appreciate it. Stephan Beal wrote: Tab/shift-tab for me iterates through all the links on the page? Yeah, that only works with 'fossil diff --tk'. Sorry for the confusion.

Re: [fossil-users] Side-by-side diff improvement

2013-07-07 Thread Joel Bruick
Lluís Batlle i Rossell wrote: I still have to test this scrollbar proposal (I don't like much scrollbars inside windows which already have scrollbars...), but at least it goes into a good direction. Heh, I'm with you 99% of the time on excessive scrollbar hatred, but for this situation I

[fossil-users] Side-by-side diff improvement

2013-07-05 Thread Joel Bruick
Hi all, I've committed a pretty big changeto the diff code(http://www.fossil-scm.org/index.html/info/4081a91c84) , and I'd like some other people to take a look at it/test it out before it (maybe/hopefully) gets merged into the trunk. The purpose of this commit is, as the commit message

Re: [fossil-users] Where do you point fossil newcomers for help?

2013-06-28 Thread Joel Bruick
Hi, Stephan , Stephan Beal wrote: How are you introducing new developers to using fossil for a project? e.g. what docs (if any) do you point them to, what gotchas do you warn them about (are there any? ;), etc. I haven't been in a position yet where I've had to help someone else use Fossil.

Re: [fossil-users] Display of file content in the UI

2013-05-03 Thread Joel Bruick
Hi Mat, On 5/3/2013 6:40 PM, Matthias Toggweiler wrote: Awesome, 5 minute reaction time on this mailing list. Thanks for the fix, Stephan. I am likewise amazed at how quickly answers/fixes often appear on this list. I came across this issue with HTML because I am designing a new fossil

Re: [fossil-users] current directory is not within an open checkout when viewing files in a server repository

2013-04-28 Thread Joel Bruick
Hi David, On 4/28/2013 8:08 AM, David Evans wrote: 2013-04-22 03:50:55 d38f204d3b02815a BAD CURRENT 2013-04-22 01:33:06 7ccbf6ee6698b8f6 GOOD Sorry, this was my screwup. I see Richard's already committed a fix to trunk. Thanks for reporting this.

Re: [fossil-users] current directory is not within an open checkout when viewing files in a server repository

2013-04-28 Thread Joel Bruick
On 4/28/2013 4:22 PM, Jan Nijtmans wrote: After I screwed-up first ;-) Well, fine, I guess I'll share credit with you. ;) I committed, the 'right' solution to trunk now. Great. Thanks, Jan! ___ fossil-users mailing list

[fossil-users] [PATCH] Reverting renamed files

2013-01-14 Thread Joel Bruick
Last week I mentioned a bug where Fossil doesn't properly revert renamed files. In rather quick fashion, Richard committed a fix that resolved some of the problems associated with this. However, when I got a chance to do some more testing I found that some issues remained. Instead of badgering

[fossil-users] Possible rename/revert bug?

2013-01-07 Thread Joel Bruick
Hello all! I ran into some odd behavior with running revert on a checkout in which a rename has just been performed. The renamed file gets deleted, but the original file doesn't get restored. No changes are reported by 'fossil changes', although the checkout is certainly not in its original