From: Zoltan Benedek <[email protected]>
To: leo-editor <[email protected]>
Sent: Wednesday, February 10, 2016 3:01 PM
Subject: strange diff on LeoPyRef.leo
Hi,
Can someone explain to me, how could happen this?I only opened LeoPyRef.leo in
Leo and saved it (Ctrl + S). No changes at all, but got a surprising diff:
Not sure I can explain it exactly, but maybe something to do with clones and /
or references to other files, I've seen that sort of thing happen occasionally,
perhaps there's still a file or two (.txt files) referenced from more than one
.leo file, or clones of bits of such files within a .leo file, and it seems to
take another load / save cycle for the changes to propagate. Not a good
explanation, just a general idea.
The way to avoid it, and the easiest way to interact with LeoPyRef.leo, is to
copy it to LeoPy.leo and open and use that instead, then it isn't an issue with
git. You only need to actually load / edit / save LeoPyRef.leo when you're
adding a new file to the codebase that needs to be referenced from
LeoPyRef.leo, which does not happen very often.
Cheers -Terry
diff --git a/leo/core/LeoPyRef.leo b/leo/core/LeoPyRef.leoindex
8601387..258bb9c 100644--- a/leo/core/LeoPyRef.leo+++ b/leo/core/LeoPyRef.leo@@
-1621,8 +1621,8 @@ unl: class Ui_LeoQuickSearchWidget-->retranslateUi <t
tx="ekr.20151226101445.5"></t> <t tx="ekr.20151228151130.1"># -*- mode: python
-*- '''-launchLeo.spec: the spec file for pyinstaller.-Run with pyinstaller
launchLeo.spec, **not** with launchLeo.py.+launchLeo-single.spec: a spec file
for pyinstaller that creates a single-executable version of Leo.+Run with
pyinstaller launchLeo-single.spec, **not** with launchLeo.py. ''' import glob,
os @@ -1641,7 +1641,7 @@ else: # Same code as in runLeo.py. path =
os.getcwd() if path not in sys.path:- print('launchLeo.spec:
appending %s to sys.path' % path)+ print('launchLeo-single.spec:
appending %s to sys.path' % path) sys.path.append(path) import
leo.core.leoGlobals as g@@ -1717,13 +1717,16 @@ datas = [ if True:
datas.extend([ # leo-editor: loaded by LeoPy.leo...-
('launchLeo.spec', ''),+ ('launchLeo-folder.spec', ''),+
('launchLeo-single.spec', ''), ('pylint-leo.py', ''),
('setup.py', ''), # leo.commands... ext('.py', 'leo/commands'),
# leo.core...- ext('.leo', 'leo/core'),+ # Only
include reference files.+ # ext('.leo', 'leo/core'),+
('leo/core/LeoPyRef.leo', 'leo/core'), ext('.py', 'leo/core'),
ext('.txt', 'leo/core'), # leo.dist...@@ -1762,7 +1765,10 @@
if True: ext('.json', 'leo/external/ckeditor'),
ext('.md', 'leo/external/ckeditor'), # leo/plugins...-
ext('.leo', 'leo/plugins'),+ # Only include reference files.+
# ext('.leo', 'leo/plugins'),+
('leo/plugins/leoPluginsRef.leo', 'leo/plugins'),+
('leo/plugins/leoGuiPluginsRef.leo', 'leo/plugins'), ext('.txt',
'leo/plugins'), ext('.py', 'leo/plugins/examples'),
ext('.py', 'leo/plugins/test'),@@ -1819,6 +1825,10 @@ if generate_folder:
name='Leo') </t> <t tx="ekr.20151228151148.1"># -*- mode: python
-*-+'''+launchLeo-folder.spec: a spec file for pyinstaller that creates a
folder-based install of Leo.+Run with pyinstaller launchLeo-folder.spec,
**not** with launchLeo.py.+''' block_cipher = None @@ -1894,16 +1904,16 @@
datas = [ # Additional Leo data fles... # leo-editor: loaded by
LeoPy.leo... ('launchLeo-folder.spec', ''),-
('launchLeo-single.spec', ''),- ('leo_to_html.xsl', ''),-
('pylint-leo.py', ''),+ ('launchLeo-single.spec', ''),+
('leo_to_html.xsl', ''),+ ('pylint-leo.py', ''), ('setup.py',
''), # leo.commands... ext('.py', 'leo/commands'),
# leo.core...- # Only include reference files.+ # Only
include reference files. # ext('.leo', 'leo/core'),-
('leo/core/LeoPyRef.leo', 'leo/core'),+
('leo/core/LeoPyRef.leo', 'leo/core'), ext('.py', 'leo/core'),
ext('.txt', 'leo/core'), # leo.dist...@@ -1942,10 +1952,10 @@
datas = [ ext('.json', 'leo/external/ckeditor'),
ext('.md', 'leo/external/ckeditor'), # leo/plugins...- # Only
include reference files.+ # Only include reference files.
# ext('.leo', 'leo/plugins'),- ('leo/plugins/leoPluginsRef.leo',
'leo/plugins'),- ('leo/plugins/leoGuiPluginsRef.leo',
'leo/plugins'),+ ('leo/plugins/leoPluginsRef.leo',
'leo/plugins'),+ ('leo/plugins/leoGuiPluginsRef.leo',
'leo/plugins'), ext('.txt', 'leo/plugins'), ext('.py',
'leo/plugins/examples'), ext('.py', 'leo/plugins/test'),
latest git commit: 7ae9c054db7
Thanks,Zoltan--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.
