Re: [fossil-users] Hide items from timeline [Was: clone --once and URL user as admin.]
Thus said Ron Wilson on Tue, 26 Nov 2013 15:17:31 -0500: > At the same time, I find it strange to hide commits whose content is > still being used (unless "c" is just a reversion of those changes, but > then I'd just commit against "a", leaving "b" as an abandoned > fork/branch) I too had the same thought, but it's hard to know the intent of why something was hidden when it comes to rendering the timeline display. I brought it up merely because I was able to cause it to happen with Jan's current implementation and wondered what should be the correct way to display a hidden tag that is non-propagating. It seems fairly straightfoward with a propagating hidden tag: hide the whole branch. Andy -- TAI64 timestamp: 4000529503f1 ___ 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] Hide items from timeline [Was: clone --once and URL user as admin.]
b is not a fork, nor is it abandoned. think of it as math. The delta a-c is equal to the sum of a-b and b-c. You can hide b and think in terms of a-c just fine. The only complication is if other branches derive from b. but that is up to the user to think carefully and mean what they say when they hide stuff. On Tue, Nov 26, 2013 at 1:17 PM, Ron Wilson wrote: > On Tue, Nov 26, 2013 at 2:42 PM, Andy Bradford > wrote: > >> Thus said Matt Welland on Tue, 26 Nov 2013 12:01:30 -0700: >> >> >> > Do you now have: >> > >> > -> a -> c -> >> > >> > OR >> > >> > -> a c -> >> >> What about: >> >> -> a => c -> >> >> Where => is a new line style that indicates a hidden line of commits >> between a and c? >> > > I vote for the => to make it clear there are hidden commits. > > At the same time, I find it strange to hide commits whose content is still > being used (unless "c" is just a reversion of those changes, but then I'd > just commit against "a", leaving "b" as an abandoned fork/branch) > > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority... ___ 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] Hide items from timeline [Was: clone --once and URL user as admin.]
On Tue, Nov 26, 2013 at 2:42 PM, Andy Bradford wrote: > Thus said Matt Welland on Tue, 26 Nov 2013 12:01:30 -0700: > > > Do you now have: > > > > -> a -> c -> > > > > OR > > > > -> a c -> > > What about: > > -> a => c -> > > Where => is a new line style that indicates a hidden line of commits > between a and c? > I vote for the => to make it clear there are hidden commits. At the same time, I find it strange to hide commits whose content is still being used (unless "c" is just a reversion of those changes, but then I'd just commit against "a", leaving "b" as an abandoned fork/branch) ___ 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] Hide items from timeline [Was: clone --once and URL user as admin.]
Thus said Matt Welland on Tue, 26 Nov 2013 12:01:30 -0700: > Do you now have: > > -> a -> c -> > > OR > > -> a c -> What about: -> a => c -> Where => is a new line style that indicates a hidden line of commits between a and c? Andy -- TAI64 timestamp: 40005294f9ae ___ 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] Hide items from timeline [Was: clone --once and URL user as admin.]
Hiding clutter is hugely important in my opinion. If something is marked as irrelevant then hide it regardless of how the final timeline looks. However an obvious button to toggle show-all on the timeline would be equally important. I see the intent as enabling a view of the important and relevant history but I think I can see the one point under discussion - should hidden nodes that bridge nodes on the same branch yield gaps or be joined: Given: -> a -> b -> c -> hide b Do you now have: -> a -> c -> OR -> a c -> My vote is to bridge the gaps: -> a -> c -> I'm very much looking forward to this change being available. On Tue, Nov 26, 2013 at 10:13 AM, Andy Bradford wrote: > Thus said Jan Nijtmans on Tue, 26 Nov 2013 12:50:52 +0100: > > > At this moment, only single nodes can be hidden, that's intended. I > > see no problems making it propagating, it would make it easier to hide > > big parts without anyone noticing. I'm not sure we want to encourage > > that. > > Tough choice. Do we make avoiding the strange timelines easier or do we > make it easy to hide entire timelines? > > Here are some of the states that the timeline can get into (some with > propagate and some without): > > http://fossil.bradfords.org:8080/timeline > > Notice that branch five has a strange break in it (this was done using > your UI change). The mistake branch was also done using the UI change, > and both have timelines that have no beginning. > > I hid the trunk using the command line by adding a propagating hidden > tag to it. Also, this tag propagates to branches so there is also a > hidden branch (and a handful of check-ins) that are no longer seen. > > If you open this fossil in the UI that doesn't have your change, a lot > more will be visible. > > > Well, the event which added the "hidden" tag is still visible in the > > timeline, so you can always get the SHA1 from there. > > Yes, I discovered this after I sent the email. Thanks. > > Along with the button to reveal hidden timeline items, should the > ability to always show hidden items be a preference in Admin->Timeline? > Kind of like the ``Show version differences by default'' option. > > Thanks, > > Andy > -- > TAI64 timestamp: 40005294d6d8 > > > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority... ___ 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] Hide items from timeline [Was: clone --once and URL user as admin.]
Thus said Jan Nijtmans on Tue, 26 Nov 2013 12:50:52 +0100: > At this moment, only single nodes can be hidden, that's intended. I > see no problems making it propagating, it would make it easier to hide > big parts without anyone noticing. I'm not sure we want to encourage > that. Tough choice. Do we make avoiding the strange timelines easier or do we make it easy to hide entire timelines? Here are some of the states that the timeline can get into (some with propagate and some without): http://fossil.bradfords.org:8080/timeline Notice that branch five has a strange break in it (this was done using your UI change). The mistake branch was also done using the UI change, and both have timelines that have no beginning. I hid the trunk using the command line by adding a propagating hidden tag to it. Also, this tag propagates to branches so there is also a hidden branch (and a handful of check-ins) that are no longer seen. If you open this fossil in the UI that doesn't have your change, a lot more will be visible. > Well, the event which added the "hidden" tag is still visible in the > timeline, so you can always get the SHA1 from there. Yes, I discovered this after I sent the email. Thanks. Along with the button to reveal hidden timeline items, should the ability to always show hidden items be a preference in Admin->Timeline? Kind of like the ``Show version differences by default'' option. Thanks, Andy -- TAI64 timestamp: 40005294d6d8 ___ 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] Hide items from timeline [Was: clone --once and URL user as admin.]
On Mon, Nov 25, 2013 at 11:11:00PM -0700, Andy Bradford wrote: > Thus said Jan Nijtmans on Mon, 25 Nov 2013 17:08:07 +0100: > > > Any objections to this change? At least it's not dangerous at all: > > It's just as easy to "unhide" items than to hide them, just by > > removing the "hidden" tag later. > I just try this "hide" feature, look interesting. I notice that the timeline commande from the CLI still display hidden checkins. I think it would be usefull to also hide hidden checkins from CLI and may be add a command line argument to show them all.. What do you think.. -- 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] single-column file list output in web UI
On Tue, Nov 26, 2013 at 1:35 PM, Michai Ramakers wrote: > That works absolutely fine, thx! > Nonetheless, a one-column option is on my TODO list for over the Christmas holidays. i'd like to see something more like conventional "ls" output (with a few caveats/shortcomings due to the computation time requirements for some of the info). -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf ___ 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] single-column file list output in web UI
On 26 November 2013 07:55, Joel Bruick wrote:
> 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 {
> display: block;
> padding: 0;
> }
> ul.browser {
> margin: 0;
> }
>
That works absolutely fine, thx!
Michai
___
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] Hide items from timeline [Was: clone --once and URL user as admin.]
2013/11/26 Andy Bradford : > First, if I hide a check-in and rename the branch to mistake, when I > view the mistake branch using /timeline?r=mistake those items do not > show up; of course this is certainly working as it should, but because > there is no way to reveal them, I am none the wiser, even though I might > actually want to see the mistakes. A button "Unhide" could be added to reveal the hidden elements. > Second, this will hide something I mark as hidden not only from me but > also from everyone because it is synchronized (I'm not suggesting that > it should be treated as private, only trying to quantify what the > implications are). Which also means that I remove the hidden tag, it > will remove it also for you. :-) Yes, that's as intended. > Third, if I move an entire branch that I consider a mistake to a new > branch named ``mistake'' and mark it hidden, the timeline gets weird > because it shows a timeline that apparently has no beginning that ends > in the recent check-in. Should this be propagating? At this moment, only single nodes can be hidden, that's intended. I see no problems making it propagating, it would make it easier to hide big parts without anyone noticing. I'm not sure we want to encourage that. > Fourth, how do I unhide once I have hidden if I don't know the artifact > SHA1 of the check-in? Well, the event which added the "hidden" tag is still visible in the timeline, so you can always get the SHA1 from there. Thanks for your feedback! I'll try to add a "Unhide" button to the timeline, it looks like that will make operating the "hidden" tag more clear. Jan Nijtmans ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
