Merge lp:~robs987/leo-editor/openWith into lp:leo-editor/old-trunk

[Rob Sheppard]

[Rob Sheppard (robs987)]

Modification to openWith to allow user to edit nodes of @<file> trees in external editor while preserving the file extension of root @<file> node.

[Ville M. Vainio (villemvainio)]

Fine with me, will merge to trunk later

review: Approve

[Ville M. Vainio (villemvainio)]

Still get

ville@ville-desktop:~/leo-editor$ bzr merge lp:~robs987/leo-editor/openWith
bzr: ERROR: KnitPackRepository('file:///home/ville/leo-editor/.bzr/repository/')
is not compatible with
RemoteRepository(bzr+ssh://bazaar.launchpad.net/~robs987/leo-editor/openWith/.bzr/)
different rich-root support

I know that I can fix this by doing "bzr convert" on leo-editor branch, or apply the fix manually - but in the light of recent launchpad problems, I'll let this sit for a few more days. I hope you don't mind, just notifying that this contribution is by no means forgotten right now.

[Rob Sheppard (robs987)]

Ville M. Vainio wrote, On 11/7/2009 3:19 PM:
> Still get
>
> ville@ville-desktop:~/leo-editor$ bzr merge lp:~robs987/leo-editor/openWith
> bzr: ERROR: KnitPackRepository('file:///home/ville/leo-editor/.bzr/repository/')
> is not compatible with
> RemoteRepository(bzr+ssh://bazaar.launchpad.net/~robs987/leo-editor/openWith/.bzr/)
> different rich-root support
>
> I know that I can fix this by doing "bzr convert" on leo-editor branch, or apply the fix manually - but in the light of recent launchpad problems, I'll let this sit for a few more days. I hope you don't mind, just notifying that this contribution is by no means forgotten right now.
>
>

Sorry for the delay, I've been swamped at work.

I suppose this is caused by me having the wrong "rich-root support" in
my local repo, which I don't really understand because I'm just using
the defaults. Any suggestions for how I should be setting up my local
repo/branch?

In the meantime, I'll educate myself on this rich-root stuff.

If it's a hassle for you to merge this little change, don't feel
obligated. It was mainly an exercise to help me learn some of Leo's code
and the process of contributing, the later being more complicated than I
though it was :)

Thanks again for helping a n00b.

Rob

Unmerged revisions

2459. By Rob Sheppard on 2009-10-29

Modified openWith to get file extension for @<file> nodes from file name

=== modified file 'leo/core/leoCommands.py'
--- leo/core/leoCommands.py	2009-10-08 00:25:54 +0000
+++ leo/core/leoCommands.py	2009-10-29 23:05:26 +0000
@@ -725,10 +725,21 @@
                 #@            << set ext based on the present language >>
                 #@+node:ekr.20031218072017.2824:<< set ext based on the present language >>
                 if not ext:
-                    theDict = c.scanAllDirectives()
-                    language = theDict.get("language")
-                    ext = g.app.language_extension_dict.get(language)
-                    # g.pr(language,ext)
+                    # if node is part of @<file> tree, get ext from file name
+                    for cursor in p.self_and_parents():
+                        if cursor.isAnyAtFileNode():
+                            h = cursor.h
+                            f = h.split(None, 1)[1]
+                            ext = os.path.splitext(f)[1]
+                            break
+
+                    # otherwise use ext from @language directive
+                    if not ext:
+                        theDict = c.scanAllDirectives()
+                        language = theDict.get("language")
+                        ext = g.app.language_extension_dict.get(language)
+                        # g.pr(language,ext)
+
                     if ext == None:
                         ext = "txt"
 

=== modified file 'leo/doc/leoToDo.txt'
--- leo/doc/leoToDo.txt	2009-10-16 10:53:52 +0000
+++ leo/doc/leoToDo.txt	2009-10-29 23:05:25 +0000
@@ -3948,10 +3948,21 @@
     return "break"
 #@+node:ekr.20031218072017.2824:<< set ext based on the present language >>
 if not ext:
-    theDict = c.scanAllDirectives()
-    language = theDict.get("language")
-    ext = g.app.language_extension_dict.get(language)
-    # g.pr(language,ext)
+    # if node is part of @<file> tree, get ext from file name
+    for cursor in p.self_and_parents():
+        if cursor.isAnyAtFileNode():
+            h = cursor.h
+            f = h.split(None, 1)[1]
+            ext = os.path.splitext(f)[1]
+            break
+
+    # otherwise use ext from @language directive
+    if not ext:
+        theDict = c.scanAllDirectives()
+        language = theDict.get("language")
+        ext = g.app.language_extension_dict.get(language)
+        # g.pr(language,ext)
+
     if ext == None:
         ext = "txt"