Skip to content

Commit 1b19787

Browse files
committed
Make compatibility with miscellaneous scripts explicit
2 parents b75f9ab + a744d4c commit 1b19787

File tree

3 files changed

+55
-5
lines changed

3 files changed

+55
-5
lines changed

autoload/xolox/misc/README.md

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,49 @@
11
# Miscellaneous auto-load Vim scripts
22

3-
The git repository at <http://github.com/xolox/vim-misc> contains Vim scripts that are used by most of the [Vim plug-ins I've written] [plugins] yet don't really belong with any single one. I include this repository as a subdirectory of my plug-in repositories using the following commands:
3+
The git repository at [github.com/xolox/vim-misc] [repository] contains Vim scripts that are used by most of the [Vim plug-ins I've written] [plugins] yet don't really belong with any single one. I include this repository as a subdirectory of my plug-in repositories using the following commands:
44

55
$ git remote add -f vim-misc https://github.com/xolox/vim-misc.git
66
$ git merge -s ours --no-commit vim-misc/master
77
$ git read-tree --prefix=autoload/xolox/misc/ -u vim-misc/master
88
$ git commit -m "Merge vim-misc repository as subdirectory"
99

10-
To update a plug-in repository to the latest versions of the miscellaneous auto-load scripts I execute the following command:
10+
The above trick is called the [subtree merge strategy] [merge-strategy]. To update a plug-in repository to the latest version of the miscellaneous auto-load scripts I execute the following command:
1111

1212
$ git pull -s subtree vim-misc master
1313

14+
## Why make things so complex?
15+
16+
I came up with this solution after multiple years of back and forth between Vim Online users, the GitHub crowd and my own sanity:
17+
18+
1. When I started publishing my first Vim plug-ins I would prepare ZIP archives for Vim Online using makefiles. The makefiles would make sure the miscellaneous scripts were included in the uploaded distributions. This had two disadvantages: It lost git history and the repositories on GitHub were not usable out of the box, so [I got complaints from GitHub (Pathogen) users] [github-complaints].
19+
20+
2. My second attempt to solve the problem used git submodules which seemed like the ideal solution until I actually started doing it. Submodules are not initialized during a normal `git clone`, you need to use `git clone --recursive` instead but Vim plug-in managers like [Pathogen] [pathogen] and [Vundle] [vundle] don't do this (at least [they didn't when I tried] [vundle-discussion]) so people would end up with broken checkouts.
21+
22+
3. After finding out that git submodules were not going to solve my problems I searched for other inclusion strategies supported by git. After a while I came upon the [subtree merge strategy] [merge-strategy] which I have been using for more than two years now.
23+
24+
## Compatibility issues
25+
26+
Regardless of the inclusion strategies discussed above, my current scheme has a flaw: If more than one of my plug-ins are installed in a Vim profile using [Pathogen] [pathogen] or [Vundle] [vundle], the miscellaneous autoload scripts will all be loaded from the subdirectory of one single plug-in.
27+
28+
This means that when I break compatibility in the miscellaneous scripts, I have to make sure to merge the changes into all of my plug-ins. Even then, if a user has more than one of my plug-ins installed but updates only one of them, the other plug-ins (that are not yet up to date) can break (because of the backwards incompatible change).
29+
30+
The `xolox#misc#compat#check()` function makes sure that incompatibilities are detected early so that the user knows which plug-in to update if incompatibilities arise.
31+
1432
## Contact
1533

1634
If you have questions, bug reports, suggestions, etc. the author can be contacted at <peter@peterodding.com>. The latest version is available at <http://peterodding.com/code/vim/misc> and <http://github.com/xolox/vim-misc>.
1735

1836
## License
1937

20-
This software is licensed under the [MIT license](http://en.wikipedia.org/wiki/MIT_License).
38+
This software is licensed under the [MIT license] [mit].
2139
© 2013 Peter Odding &lt;<peter@peterodding.com>&gt;.
2240

2341

42+
[github-complaints]: https://github.com/xolox/vim-easytags/issues/1
43+
[merge-strategy]: http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
44+
[mit]: http://en.wikipedia.org/wiki/MIT_License
45+
[pathogen]: http://www.vim.org/scripts/script.php?script_id=2332
2446
[plugins]: http://peterodding.com/code/vim/
47+
[repository]: https://github.com/xolox/vim-misc
48+
[vundle-discussion]: https://github.com/gmarik/vundle/pull/41
49+
[vundle]: https://github.com/gmarik/vundle

autoload/xolox/misc/compat.vim

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
" Vim auto-load script
2+
" Author: Peter Odding <peter@peterodding.com>
3+
" Last Change: April 20, 2013
4+
" URL: http://peterodding.com/code/vim/misc/
5+
6+
" The following integer will be bumped whenever a change in the miscellaneous
7+
" scripts breaks backwards compatibility. This enables my Vim plug-ins to fail
8+
" early when they detect an incompatible version, instead of breaking at the
9+
" worst possible moments :-).
10+
let g:xolox#misc#compat#version = 1
11+
12+
" Remember the directory where the miscellaneous scripts are loaded from
13+
" so the user knows which plug-in to update if incompatibilities arise.
14+
let s:misc_directory = fnamemodify(expand('<sfile>'), ':p:h')
15+
16+
function! xolox#misc#compat#check(plugin_name, required_version)
17+
if a:required_version != g:xolox#misc#compat#version
18+
let msg = "The %s plug-in requires version %i of the miscellaneous scripts, however version %i was loaded from %s!"
19+
throw printf(msg, a:plugin_name, a:required_version, g:xolox#misc#compat#version, s:misc_directory)
20+
endif
21+
endfunction
22+
23+
" vim: ts=2 sw=2 et

autoload/xolox/notes.vim

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
" Vim auto-load script
22
" Author: Peter Odding <peter@peterodding.com>
3-
" Last Change: April 18, 2013
3+
" Last Change: April 21, 2013
44
" URL: http://peterodding.com/code/vim/notes/
55

66
" Note: This file is encoded in UTF-8 including a byte order mark so
77
" that Vim loads the script using the right encoding transparently.
88

9-
let g:xolox#notes#version = '0.17.1'
9+
let g:xolox#notes#version = '0.17.2'
1010
let s:scriptdir = expand('<sfile>:p:h')
1111

12+
call xolox#misc#compat#check('notes', 1)
13+
1214
function! xolox#notes#init() " {{{1
1315
" Initialize the configuration of the notes plug-in. This is a bit tricky:
1416
" We want to be compatible with Pathogen which installs plug-ins as

0 commit comments

Comments
 (0)