Re: Leo and fossil

2017-01-25 Thread john lunzer
Nice, pretty much what I imagined it would look like. Now that I think about it statistical analysis of nodes can be done completely separately from node history. Just need to track each edit with a timestamp. -- You received this message because you are subscribed to the Google Groups

Re: The trunk should be stable again

2017-01-25 Thread lewis
Usually my leo repository shows as /n/git/leo-editor (master) not /n/git/leo-editor (master|MERGING) OK I read up on *git checkout --theirs* and tried it out. You can see from the git log I did a *git reset --hard* *and I am back to where I started.* git log: lewis@Argon MINGW64

Re: The trunk should be stable again

2017-01-25 Thread 'Terry Brown' via leo-editor
Strange, not sure what's happening.  You could try: git checkout --theirs leo/test/unitTest.leo leo/core/leoColorizer.py leo/core/commit_timestamp.json then  git pull again, but that's a bit of a guess Cheers -Terry From: lewis To: leo-editor

Re: The trunk should be stable again

2017-01-25 Thread lewis
When I ran 'git pull' I got this message: $ git pull remote: Counting objects: 85, done. remote: Compressing objects: 100% (54/54), done. remote: Total 85 (delta 59), reused 57 (delta 31), pack-reused 0 Unpacking objects: 100% (85/85), done. >From git://github.com/leo-editor/leo-editor +

Re: Leo's real strengths

2017-01-25 Thread Offray Vladimir Luna Cárdenas
Hi, Such strengths could evolve in a superb literate computing tool, even if it is "restricted" to Python (is something I'm exploring for Pharo/Smalltalk). Of course is easier said that done, but maybe starting with a focus on Python could help to bring some prominence to Leo, for non

Re: Leo and fossil

2017-01-25 Thread Offray Vladimir Luna Cárdenas
Hi, Core object provides outlining with node versioning: http://coreobject.org/ Still on early stages, but I think that it helps into making a point about these possibilities (which doesn't mean that they should be implemented on Leo ;-) ). Cheers, Offray On 23/01/17 13:39, john lunzer

another possible candidate for Leo core: toggle-expand-state

2017-01-25 Thread jkn
Hi Edward I don't think this command exists already, and it is useful to me: instead of discrete 'expand node' and 'contract node' commands, this toggles the expand state of the current node. def toggleExpandState(): """ expand or contract the current node """ # set up the

Re: The trunk should be stable again

2017-01-25 Thread Edward K. Ream
On Wednesday, January 25, 2017 at 11:12:21 AM UTC-6, Edward K. Ream wrote: I am now a bit more comfortable with branches. > This is a great page about git branches. Follows "The less said the better"

Re: new cursor motion routines for useful Brief/Crisp-styl Body navigation

2017-01-25 Thread jkn
Hi Edward On Wednesday, January 25, 2017 at 4:56:24 PM UTC, Edward K. Ream wrote: > > On Wed, Jan 25, 2017 at 7:56 AM, jkn > wrote: > >> >> Edward, I am thinking that it might be worth having the functionality of >> cursorToTopOfPane() and cursorToEndOfPane() in Leo's

Re: The trunk should be stable again

2017-01-25 Thread Edward K. Ream
On Wednesday, January 25, 2017 at 9:44:19 AM UTC-6, Edward K. Ream wrote: > > The fixes were minor, and the new colorizer code now resides in a branch. > I am now a bit more comfortable with branches. I'll certainly do all the next colorizer work in a branch. I've learned a lot about Leo's

Re: new cursor motion routines for useful Brief/Crisp-styl Body navigation

2017-01-25 Thread Edward K. Ream
On Wed, Jan 25, 2017 at 7:56 AM, jkn wrote: > > Edward, I am thinking that it might be worth having the functionality of > cursorToTopOfPane() and cursorToEndOfPane() in Leo's (Qt) core? > ​Yes. I'll move them there soon. Thanks for this code. BTW, It was easy to

The trunk should be stable again

2017-01-25 Thread Edward K. Ream
The fixes were minor, and the new colorizer code now resides in a branch. Still, even a few hours of badness isn't exactly the best advert for using the git repo. Let me know if there are further problems. Let the wild rumpus start! Edward -- You received this message because you are

Re: Warning: 3 Major problems in the trunk

2017-01-25 Thread Edward K. Ream
On Wed, Jan 25, 2017 at 9:19 AM, Edward K. Ream wrote: Rev 69fe246 fixes/ works around the three problems as follows: > ​...​ > #3 @button problem: Disables g.extractExecutableString. A complete, > simple fix is next. > ​Done at 4efb5f5. This is experimental code​, but

Re: Warning: 3 Major problems in the trunk

2017-01-25 Thread Edward K. Ream
On Wednesday, January 25, 2017 at 7:04:47 AM UTC-6, Edward K. Ream wrote: > > The master branch now suffers *three* serious problems. > Rev 69fe246 fixes/ works around the three problems as follows: #1 File problems: Completely fixed, with a new unit test to ensure it never happens again. All

Re: Warning: 3 Major problems in the trunk

2017-01-25 Thread Edward K. Ream
On Wednesday, January 25, 2017 at 7:04:47 AM UTC-6, Edward K. Ream wrote: > > The master branch now suffers *three* serious problems. I recommend you > immediately do git checkout 570f296e7 to restore things to a safer state of > affairs. Fixing the master branch may take an hour or more. >

new cursor motion routines for useful Brief/Crisp-styl Body navigation

2017-01-25 Thread jkn
Hi all a long time ago (2013, gulp), I asked a question here about supporting a key-binding feature of my favourite editor, CRiSP/Brief. This is the use of multiple 'Home' or 'End' keypresses to move the cursor in different ways: Home key pressed once, Cursor moves to beginning of

Warning: 3 Major problems in the trunk

2017-01-25 Thread Edward K. Ream
The master branch now suffers *three* serious problems. I recommend you immediately do git checkout 570f296e7 to restore things to a safer state of affairs. Fixing the master branch may take an hour or more. If you have pulled the master recently, *please read the following carefully*,

Re: Rev 4b5b744: better, not perfect, colorizing

2017-01-25 Thread Edward K. Ream
On Wednesday, January 25, 2017 at 5:51:09 AM UTC-6, Edward K. Ream wrote: A very long day yesterday working on #380 > . Rev 4b5b744 is, I > think, significantly better than previous versions > Alas not. Please don't pull this rev. You

Re: console - can not find gnx:

2017-01-25 Thread Edward K. Ream
On Wed, Jan 25, 2017 at 5:57 AM, Edward K. Ream wrote: > > when in @button node is not explicitly set *@language python*, this last >> call returns language '*rest*' for me. >> > > ​Many thanks for this sleuthing. Perhaps the new > g.extractExecutableString function is the

Re: console - can not find gnx:

2017-01-25 Thread Edward K. Ream
On Tue, Jan 24, 2017 at 8:54 PM, lewis wrote: > Interestingly I created a new @button in myLeoSettings.leo file. Not a > copied/edited button, but created from scratch. > This new button executes correctly, with output to the console. > > The old button with identical

Re: console - can not find gnx:

2017-01-25 Thread Edward K. Ream
On Wed, Jan 25, 2017 at 2:18 AM, Milan Melena wrote: > Hello, > > I have the same problem. When you investigate method call order, you will > see: > > mod_scripting: ScriptingController.createCommonButtons -> > ScriptingController.getScript -> g.getScript -> > ​​ >

Rev 4b5b744: better, not perfect, colorizing

2017-01-25 Thread Edward K. Ream
A very long day yesterday working on #380 . Rev 4b5b744 is, I think, significantly better than previous versions, so I have chosen to push it for your testing, despite problems discussed below. I am eating my own dog food, and will push

Re: console - can not find gnx:

2017-01-25 Thread Milan Melena
Hello, I have the same problem. When you investigate method call order, you will see: mod_scripting: ScriptingController.createCommonButtons -> ScriptingController.getScript -> g.getScript -> g.extractExecutableString -> *language = g.scanForAtLanguage* when in @button node is not