Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

vim vundle

  • Loading branch information...
commit 5269f14656dd20cf32602bdd1c46de175cff3343 1 parent 9faa0e2
Greg V authored October 08, 2012

Showing 63 changed files with 63 additions and 579 deletions. Show diff stats Hide diff stats

  1. 1  .gitignore
  2. 174  .gitmodules
  3. 164  bin/422-jpg.py
  4. 184  bin/hg-onsub.py
  5. 4  install.sh
  6. 1  vim/bundle/abolish
  7. 1  vim/bundle/ack
  8. 1  vim/bundle/argtextobj
  9. 1  vim/bundle/bundler
  10. 1  vim/bundle/clojure
  11. 1  vim/bundle/coffee-script
  12. 1  vim/bundle/commentary
  13. 1  vim/bundle/css3
  14. 1  vim/bundle/ctrlp
  15. 1  vim/bundle/delimitMate
  16. 1  vim/bundle/easybuffer
  17. 1  vim/bundle/easymotion
  18. 1  vim/bundle/elixir
  19. 1  vim/bundle/endwise
  20. 1  vim/bundle/eunuch
  21. 1  vim/bundle/fugitive
  22. 1  vim/bundle/git
  23. 1  vim/bundle/github
  24. 1  vim/bundle/golang
  25. 1  vim/bundle/gundo
  26. 1  vim/bundle/haml
  27. 1  vim/bundle/html5
  28. 1  vim/bundle/indent-object
  29. 1  vim/bundle/jade
  30. 1  vim/bundle/javascript
  31. 1  vim/bundle/ledger
  32. 1  vim/bundle/nu
  33. 1  vim/bundle/paredit
  34. 1  vim/bundle/pasta
  35. 1  vim/bundle/powerline
  36. 1  vim/bundle/quickrun
  37. 1  vim/bundle/repeat
  38. 1  vim/bundle/scala
  39. 1  vim/bundle/slim
  40. 1  vim/bundle/snipmate
  41. 1  vim/bundle/snipmate_clojure
  42. 1  vim/bundle/snipmate_elixir
  43. 1  vim/bundle/snipmate_for_django
  44. 1  vim/bundle/snipmate_nodejs
  45. 1  vim/bundle/solarized
  46. 1  vim/bundle/speeddating
  47. 1  vim/bundle/splice
  48. 1  vim/bundle/splitjoin
  49. 1  vim/bundle/strftimedammit
  50. 1  vim/bundle/stylus
  51. 1  vim/bundle/supertab
  52. 1  vim/bundle/surround
  53. 1  vim/bundle/tabular
  54. 1  vim/bundle/unimpaired
  55. 1  vim/bundle/vimux
  56. 1  vim/bundle/vimux-ruby
  57. 1  vim/bundle/vitality
  58. 1  vim/bundle/zencoding
  59. 55  vim/bundles.vim
  60. 0  { → vim}/gvimrc
  61. 1  vim/pathogen
  62. 5  { → vim}/vimrc
  63. 1  vim/vundle
1  .gitignore
@@ -2,6 +2,7 @@
2 2
 .DS_Store
3 3
 myshows
4 4
 vim/.netrwhist
  5
+vim/bundle
5 6
 vim/tmp
6 7
 weechat/weechat.log
7 8
 weechat/logs
174  .gitmodules
... ...
@@ -1,96 +1,6 @@
1  
-[submodule "bin/pickdrop"]
2  
-	path = bin/pickdrop
3  
-	url = git://github.com/iaindooley/pickdrop.git
4 1
 [submodule "bin/rvn"]
5 2
 	path = bin/rvn
6 3
 	url = git://github.com/rupa/rvn.git
7  
-[submodule "vim/bundle/coffee-script"]
8  
-	path = vim/bundle/coffee-script
9  
-	url = git://github.com/kchmck/vim-coffee-script.git
10  
-[submodule "vim/bundle/zencoding"]
11  
-	path = vim/bundle/zencoding
12  
-	url = git://github.com/mattn/zencoding-vim.git
13  
-[submodule "vim/bundle/fugitive"]
14  
-	path = vim/bundle/fugitive
15  
-	url = git://github.com/tpope/vim-fugitive.git
16  
-[submodule "vim/bundle/haml"]
17  
-	path = vim/bundle/haml
18  
-	url = git://github.com/tpope/vim-haml.git
19  
-[submodule "vim/bundle/javascript"]
20  
-	path = vim/bundle/javascript
21  
-	url = git://github.com/pangloss/vim-javascript.git
22  
-[submodule "vim/bundle/snipmate"]
23  
-	path = vim/bundle/snipmate
24  
-	url = git://github.com/msanders/snipmate.vim.git
25  
-[submodule "vim/pathogen"]
26  
-	path = vim/pathogen
27  
-	url = git://github.com/tpope/vim-pathogen.git
28  
-[submodule "vim/bundle/jade"]
29  
-	path = vim/bundle/jade
30  
-	url = git://github.com/digitaltoad/vim-jade.git
31  
-[submodule "vim/bundle/ack"]
32  
-	path = vim/bundle/ack
33  
-	url = git://github.com/mileszs/ack.vim.git
34  
-[submodule "vim/bundle/snipmate_for_django"]
35  
-	path = vim/bundle/snipmate_for_django
36  
-	url = git://github.com/robhudson/snipmate_for_django.git
37  
-[submodule "vim/bundle/html5"]
38  
-	path = vim/bundle/html5
39  
-	url = git://github.com/othree/html5.vim.git
40  
-[submodule "vim/bundle/css3"]
41  
-	path = vim/bundle/css3
42  
-	url = git://github.com/hail2u/vim-css3-syntax.git
43  
-[submodule "vim/bundle/stylus"]
44  
-	path = vim/bundle/stylus
45  
-	url = git://github.com/wavded/vim-stylus.git
46  
-[submodule "vim/bundle/delimitMate"]
47  
-	path = vim/bundle/delimitMate
48  
-	url = git://github.com/vim-scripts/delimitMate.vim.git
49  
-[submodule "vim/bundle/snipmate_nodejs"]
50  
-	path = vim/bundle/snipmate_nodejs
51  
-	url = git://github.com/jamescarr/snipmate-nodejs.git
52  
-[submodule "vim/bundle/solarized"]
53  
-	path = vim/bundle/solarized
54  
-	url = git://github.com/altercation/vim-colors-solarized.git
55  
-[submodule "vim/bundle/unimpaired"]
56  
-	path = vim/bundle/unimpaired
57  
-	url = git://github.com/tpope/vim-unimpaired.git
58  
-[submodule "vim/bundle/slim"]
59  
-	path = vim/bundle/slim
60  
-	url = git://github.com/bbommarito/vim-slim.git
61  
-[submodule "vim/bundle/commonjs-package-json/plugin"]
62  
-	path = vim/bundle/commonjs-package-json/plugin
63  
-	url = git://gist.github.com/961425.git
64  
-[submodule "vim/bundle/golang"]
65  
-	path = vim/bundle/golang
66  
-	url = git://github.com/jnwhiteh/vim-golang.git
67  
-[submodule "vim/bundle/github"]
68  
-	path = vim/bundle/github
69  
-	url = git://github.com/solars/github-vim.git
70  
-[submodule "vim/bundle/tabular"]
71  
-	path = vim/bundle/tabular
72  
-	url = git://github.com/godlygeek/tabular.git
73  
-[submodule "vim/bundle/clojure"]
74  
-	path = vim/bundle/clojure
75  
-	url = git://github.com/vim-scripts/VimClojure.git
76  
-[submodule "vim/bundle/speeddating"]
77  
-	path = vim/bundle/speeddating
78  
-	url = git://github.com/tpope/vim-speeddating.git
79  
-[submodule "vim/bundle/surround"]
80  
-	path = vim/bundle/surround
81  
-	url = git://github.com/tpope/vim-surround
82  
-[submodule "vim/bundle/endwise"]
83  
-	path = vim/bundle/endwise
84  
-	url = git://github.com/tpope/vim-endwise
85  
-[submodule "vim/bundle/abolish"]
86  
-	path = vim/bundle/abolish
87  
-	url = git://github.com/tpope/vim-abolish
88  
-[submodule "vim/bundle/strftimedammit"]
89  
-	path = vim/bundle/strftimedammit
90  
-	url = git://github.com/sjl/strftimedammit.vim.git
91  
-[submodule "vim/bundle/gundo"]
92  
-	path = vim/bundle/gundo
93  
-	url = git://github.com/sjl/gundo.vim.git
94 4
 [submodule "bin/tmux-osx-paste-fix"]
95 5
 	path = bin/tmux-osx-paste-fix
96 6
 	url = git://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git
@@ -100,87 +10,18 @@
100 10
 [submodule "vendor/zsh-hss"]
101 11
 	path = vendor/zsh-hss
102 12
 	url = git://github.com/zsh-users/zsh-history-substring-search.git
103  
-[submodule "vim/bundle/indent-object"]
104  
-	path = vim/bundle/indent-object
105  
-	url = git://github.com/michaeljsmith/vim-indent-object.git
106  
-[submodule "vim/bundle/easymotion"]
107  
-	path = vim/bundle/easymotion
108  
-	url = git://github.com/Lokaltog/vim-easymotion.git
109  
-[submodule "vim/bundle/repeat"]
110  
-	path = vim/bundle/repeat
111  
-	url = git://github.com/tpope/vim-repeat.git
112  
-[submodule "vim/bundle/ledger"]
113  
-	path = vim/bundle/ledger
114  
-	url = git://github.com/cypok/vim-ledger.git
115  
-[submodule "vim/bundle/supertab"]
116  
-	path = vim/bundle/supertab
117  
-	url = git://github.com/ervandew/supertab.git
118  
-[submodule "vim/bundle/quickrun"]
119  
-	path = vim/bundle/quickrun
120  
-	url = git://github.com/thinca/vim-quickrun.git
121  
-[submodule "vim/bundle/argtextobj"]
122  
-	path = vim/bundle/argtextobj
123  
-	url = git://github.com/vim-scripts/argtextobj.vim.git
124  
-[submodule "vim/bundle/nu"]
125  
-	path = vim/bundle/nu
126  
-	url = git://github.com/itfrombit/nuvim.git
127  
-[submodule "vim/bundle/splitjoin"]
128  
-	path = vim/bundle/splitjoin
129  
-	url = git://github.com/AndrewRadev/splitjoin.vim.git
130  
-[submodule "vim/bundle/ctrlp"]
131  
-	path = vim/bundle/ctrlp
132  
-	url = git://github.com/kien/ctrlp.vim.git
133  
-[submodule "vim/bundle/pasta"]
134  
-	path = vim/bundle/pasta
135  
-	url = git://github.com/sickill/vim-pasta.git
136  
-[submodule "vim/bundle/powerline"]
137  
-	path = vim/bundle/powerline
138  
-	url = git://github.com/Lokaltog/vim-powerline.git
139 13
 [submodule "keybindings"]
140 14
 	path = keybindings
141 15
 	url = git://github.com/ttscoff/KeyBindings.git
142  
-[submodule "vim/bundle/snipmate_clojure"]
143  
-	path = vim/bundle/snipmate_clojure
144  
-	url = git://github.com/swannodette/clojure-snippets.git
145  
-[submodule "vim/bundle/paredit"]
146  
-	path = vim/bundle/paredit
147  
-	url = git://github.com/emezeske/paredit.vim.git
148 16
 [submodule "mutt/solarized"]
149 17
 	path = mutt/solarized
150 18
 	url = git://github.com/altercation/mutt-colors-solarized.git
151 19
 [submodule "zshuery"]
152 20
 	path = zshuery
153 21
 	url = git://github.com/myfreeweb/zshuery
154  
-[submodule "vim/bundle/commentary"]
155  
-	path = vim/bundle/commentary
156  
-	url = git://github.com/tpope/vim-commentary.git
157  
-[submodule "vim/bundle/eunuch"]
158  
-	path = vim/bundle/eunuch
159  
-	url = git://github.com/tpope/vim-eunuch.git
160  
-[submodule "vim/bundle/bundler"]
161  
-	path = vim/bundle/bundler
162  
-	url = git://github.com/tpope/vim-bundler.git
163  
-[submodule "vim/bundle/git"]
164  
-	path = vim/bundle/git
165  
-	url = git://github.com/tpope/vim-git.git
166  
-[submodule "vim/bundle/scala"]
167  
-	path = vim/bundle/scala
168  
-	url = git://github.com/derekwyatt/vim-scala.git
169  
-[submodule "vim/bundle/vitality"]
170  
-	path = vim/bundle/vitality
171  
-	url = git://github.com/sjl/vitality.vim.git
172  
-[submodule "vim/bundle/vimux"]
173  
-	path = vim/bundle/vimux
174  
-	url = git://github.com/benmills/vimux.git
175  
-[submodule "vim/bundle/vimux-ruby"]
176  
-	path = vim/bundle/vimux-ruby
177  
-	url = git://github.com/pgr0ss/vimux-ruby-test.git
178 22
 [submodule "bin/fasd"]
179 23
 	path = bin/fasd
180 24
 	url = git://github.com/clvv/fasd.git
181  
-[submodule "vim/bundle/splice"]
182  
-	path = vim/bundle/splice
183  
-	url = git://github.com/sjl/splice.vim.git
184 25
 [submodule "emacs.d/autopair"]
185 26
 	path = emacs.d/autopair
186 27
 	url = git://github.com/emacsmirror/autopair.git
@@ -208,18 +49,9 @@
208 49
 [submodule "emacs.d/surround"]
209 50
 	path = emacs.d/surround
210 51
 	url = git://github.com/timcharper/evil-surround.git
211  
-[submodule "vim/bundle/elixir"]
212  
-	path = vim/bundle/elixir
213  
-	url = git://github.com/elixir-lang/vim-elixir.git
214  
-[submodule "vim/bundle/snipmate_elixir"]
215  
-	path = vim/bundle/snipmate_elixir
216  
-	url = git://github.com/carlosgaldino/elixir-snippets.git
217  
-[submodule "vim/bundle/editorconfig"]
218  
-	path = vim/bundle/editorconfig
219  
-	url = git://github.com/editorconfig/editorconfig-vim.git
220 52
 [submodule "bin/spot"]
221 53
 	path = bin/spot
222 54
 	url = git://github.com/guille/spot.git
223  
-[submodule "vim/bundle/easybuffer"]
224  
-	path = vim/bundle/easybuffer
225  
-	url = git://github.com/troydm/easybuffer.vim.git
  55
+[submodule "vim/vundle"]
  56
+	path = vim/vundle
  57
+	url = git://github.com/gmarik/vundle.git
164  bin/422-jpg.py
... ...
@@ -1,164 +0,0 @@
1  
-#!/usr/bin/env python
2  
-
3  
-# Convert YUV 422 LiveView buffer image to JPEG
4  
-# (C) 2011 Alex Dumitrache <broscutamaker@gmail.com>
5  
-# License: GPL
6  
-
7  
-import re, string, os, sys
8  
-import time
9  
-import os, Image
10  
-import numpy
11  
-from numpy import array, int8, uint8, double
12  
-
13  
-def change_ext(file, newext):
14  
-    if newext and (not newext.startswith(".")):
15  
-        newext = "." + newext
16  
-    return os.path.splitext(file)[0] + newext
17  
-
18  
-def COERCE(x,lo,hi):
19  
-    return max(min(x,hi),lo)
20  
-
21  
-def decode(y,u,v,w,h):
22  
-    Y = numpy.fromstring(y, dtype=uint8).astype(double)
23  
-    U = numpy.fromstring(u, dtype=int8).repeat(2).astype(double)
24  
-    V = numpy.fromstring(v, dtype=int8).repeat(2).astype(double)
25  
-    #print Y.size, U.size, V.size
26  
-    
27  
-    # AJ equations
28  
-    R = Y + 1.403 * V
29  
-    G = Y - 0.344 * U - 0.714 * V
30  
-    B = Y + 1.770 * U
31  
-    
32  
-    R = R.reshape((h,w))
33  
-    G = G.reshape((h,w))
34  
-    B = B.reshape((h,w))
35  
-    R[R<0] = 0; R[R>255] = 255
36  
-    G[G<0] = 0; G[G>255] = 255
37  
-    B[B<0] = 0; B[B>255] = 255
38  
-    ar = array([R,G,B]).transpose(1,2,0)
39  
-    im = Image.fromarray(ar.astype(uint8), mode="RGB")
40  
-    return im;
41  
-
42  
-def convert_422_hires(input, output):
43  
-    data = open(input, "rb").read();
44  
-
45  
-    Y = data[1::2]
46  
-    U = data[0::4]
47  
-    V = data[2::4]
48  
-    numpics = len(Y) / (1024*680)
49  
-    n = 1024*680
50  
-    w, h = 1024, 680
51  
-    modes = [(2,1), (2,2), (2,3), (3,3), (3,4), (4,4), (4,5), (5,5)]
52  
-    try: i = [nl*nc for nl,nc in modes].index(numpics)
53  
-    except: 
54  
-        print "Wrong number of subpictures (%d)" % numpics
55  
-        NL, NC = 1, numpics
56  
-        for i in range(NL):
57  
-            for j in range(NC):
58  
-                y = Y[(i*NC+j)*n : (i*NC+j+1)*n]
59  
-                u = U[(i*NC+j)*n/2 : (i*NC+j+1)*n/2]
60  
-                v = V[(i*NC+j)*n/2 : (i*NC+j+1)*n/2]
61  
-                im = decode(y,u,v,w,h)
62  
-                im.save("debug-%d.jpg" % j)
63  
-    NL,NC = modes[i]
64  
-    print "%d sub-pics, %dx%d" % (numpics, NL, NC)
65  
-    
66  
-    IM = Image.new("RGB", (NC*1016, NL*672))
67  
-    
68  
-    for i in range(NL):
69  
-        for j in range(NC):
70  
-            y = Y[(i*NC+j)*n : (i*NC+j+1)*n]
71  
-            u = U[(i*NC+j)*n/2 : (i*NC+j+1)*n/2]
72  
-            v = V[(i*NC+j)*n/2 : (i*NC+j+1)*n/2]
73  
-            print "*",
74  
-            sys.stdout.flush()
75  
-            
76  
-            im = decode(y,u,v,w,h)
77  
-            #~ cx,cy = 57,98
78  
-            cx,cy = 4,4
79  
-            im = im.crop((cx,cy,w-cx,h-cy))
80  
-            IM.paste(im, (j*im.size[0], i*im.size[1]))
81  
-        print
82  
-    IM.save(output, quality=100)
83  
-
84  
-resolutions = [ # from vram.c
85  
-    (1120, 746),  # 5D2, 5x
86  
-    (1872, 1080), # 5D2, REC
87  
-    (1024, 680),  # 5D2/50D standby
88  
-    (1560, 884),  # 50D REC
89  
-    (944, 632),   # 50D/500D 5x
90  
-    (928, 616),   # 500D photo
91  
-    (1576, 1048), # 500D 1080p
92  
-    (1576, 632),  # 500D 720p
93  
-    (720, 480),   # 500D 480p, normal LV buffer
94  
-    (1056, 704),  # 550D/60D photo/stby
95  
-    (1720, 974),  # 550D/60D 1080p
96  
-    (1280, 580),  # 550D/60D 720p
97  
-    (640, 480),   # obvious :P
98  
-    (1024, 680),  # 550D/60D 480p stby
99  
-    (1056, 756),  # 600D USB
100  
-    (1728, 972),  # 600D REC 3x
101  
-    (1680, 945),  # 600D REC 1x
102  
-    (1280, 560),  # 600D 720p
103  
-    (1152, 768),  # 5D3 5x
104  
-    (1904, 1270), # 5D3 1x
105  
-    (1920, 1080), # HDMI FullHD
106  
-    (1920, 540),  # HDMI 720p
107  
-    (960, 540),   # HDMI 640 crop
108  
-]
109  
-
110  
-# auto-generate code for zebra.c (play_422)
111  
-#~ for w,h in resolutions:
112  
-    #~ print "    else if (size == %4d * %4d * 2) { w = %4d; h = %4d; } " %  (w,h,w,h)
113  
-
114  
-
115  
-def convert_422_bmp(input, output):
116  
-    print "Converting %s to %s..." % (input, output)
117  
-    
118  
-    data = open(input, "rb").read();
119  
-    y = data[1::2]
120  
-    u = data[0::4]
121  
-    v = data[2::4]
122  
-
123  
-    found = 0
124  
-    for w,h in resolutions:
125  
-        if len(data) == w*h*2:
126  
-            found = 1
127  
-            break
128  
-
129  
-    if found:
130  
-        pass 
131  
-    elif len(data) % (1024*680*2) == 0:
132  
-        return convert_422_hires(input,output)
133  
-    else:
134  
-        raise Exception, "unknown image size: %d" % len(data)
135  
-
136  
-    assert w*h*2 == len(data)
137  
-    im = decode(y,u,v,w,h)
138  
-    im.save(output, quality=95)
139  
-
140  
-try:
141  
-    input = sys.argv[1]
142  
-except IndexError:
143  
-    print """No command-line arguments given.
144  
-
145  
-Command-line usage:
146  
-    python %s image.422                    # convert a single 422 image
147  
-    python %s .                            # convert all 422 images from current dir
148  
-    python %s /folder/with/422/images      # convert all 422 images from another dir
149  
-        """ % tuple([os.path.split(sys.argv[0])[1]] * 3)
150  
-    import Tkinter, tkFileDialog
151  
-    root = Tkinter.Tk()
152  
-
153  
-    input = tkFileDialog.askopenfilename(parent=root, title = 'Choose a file (for batch processing, click Cancel)', filetypes = [('YUV 422 files created by Magic Lantern','.422')])
154  
-    if not input:
155  
-        input = tkFileDialog.askdirectory(parent=root,title='Please select a directory with 422 files')
156  
-
157  
-if os.path.isfile(input):
158  
-    convert_422_bmp(input, change_ext(input, ".jpg"))
159  
-elif os.path.isdir(input):
160  
-    for f in sorted(os.listdir(input)):
161  
-        if f.endswith(".422"):
162  
-            f = os.path.join(input, f)
163  
-            convert_422_bmp(f, change_ext(f, ".jpg"));
164  
-print "Done."
184  bin/hg-onsub.py
... ...
@@ -1,184 +0,0 @@
1  
-# onsub.py - execute commands recursively on subrepositories
2  
-#
3  
-# Copyright 2010, 2011 aragost Trifork
4  
-#
5  
-# This software may be used and distributed according to the terms of
6  
-# the GNU General Public License version 2 or any later version.
7  
-
8  
-import os
9  
-from mercurial.i18n import _
10  
-from mercurial import extensions, subrepo, util
11  
-
12  
-"""execute a command in each subrepository"""
13  
-
14  
-def onsub(ui, repo, *args, **opts):
15  
-    """execute a command in each subrepository
16  
-
17  
-    Executes CMD with the current working directory set to the root of
18  
-    each subrepository. By default, execution stops if CMD returns a
19  
-    non-zero exit code. Use --ignore-errors to override this.
20  
-
21  
-    If a POST-CMD is specified, this will be executed after all
22  
-    subrepositories below the current subrepository has been visited.
23  
-    This corresponds to a post-order traversal of the tree.
24  
-
25  
-    It is an error to specify a POST-CMD together with the
26  
-    --breadth-first flag.
27  
-
28  
-    Use --verbose/-v to print the command being run and the subrepo
29  
-    name for each run of CMD in a subrepo. Alternately, use
30  
-    --print0/-0 to print just the subrepo name followed by a NUL
31  
-    character instead of a newline. This can be useful in combination
32  
-    with :hg:`status --print0`.
33  
-
34  
-    The command has access to the following environment variables:
35  
-
36  
-    ``HG_REPO``:
37  
-        Absolute path to the top-level repository in which the onsub
38  
-        command was executed.
39  
-
40  
-    ``HG_SUBPATH``:
41  
-        Relative path to the current subrepository from the top-level
42  
-        repository.
43  
-
44  
-    ``HG_SUBURL``:
45  
-        URL for the current subrepository as specified in the
46  
-        containing repository's ``.hgsub`` file.
47  
-
48  
-    ``HG_SUBSTATE``:
49  
-        State of the current subrepository as specified in the
50  
-        containing repository's ``.hgsubstate`` file.
51  
-    """
52  
-
53  
-    # function level "constants" - these won't be modified by the nested functions
54  
-    print0 = opts.get('print0')
55  
-    if opts.get('ignore_errors'):
56  
-        onerr = None
57  
-    else:
58  
-        onerr = util.Abort
59  
-    maxdepth = opts.get('max_depth')
60  
-    precmd = None
61  
-    postcmd = None
62  
-    includeroot = opts.get('root_repo')
63  
-
64  
-    def execCmd(sub, cmd):
65  
-        """if sub == None, cmd is executed inside repo; else, inside sub.
66  
-        If cmd == None, do nothing. If cmd == '', do only the print0 (if needed). 
67  
-        Else, do either print0 or the debugging message, then execute the command.
68  
-        """
69  
-        if sub == None:
70  
-            envargdict = dict(HG_SUBPATH='.',
71  
-                              HG_SUBURL='.',
72  
-                              HG_SUBSTATE=repo['.'].hex(),
73  
-                              HG_REPO=repo.root)
74  
-            relpath = '.'
75  
-            cmdwd = repo.root
76  
-        else:
77  
-            # subrepo.relpath was renamed to subrepo.subrelpath in
78  
-            # 18b5b6392fcf.
79  
-            if hasattr(subrepo, 'relpath'):
80  
-                relpath = subrepo.relpath(sub)
81  
-            else:
82  
-                relpath = subrepo.subrelpath(sub)
83  
-            envargdict = dict(HG_SUBPATH=relpath,
84  
-                              HG_SUBURL=sub._path,
85  
-                              HG_SUBSTATE=sub._state[1],
86  
-                              HG_REPO=repo.root)
87  
-            cmdwd = os.path.join(repo.root, relpath)
88  
-        if cmd != None:
89  
-            if print0:
90  
-                ui.write(relpath, "\0")
91  
-            if cmd != '':
92  
-                if not print0: ui.note(_("executing '%s' in %s\n") % (cmd, relpath))
93  
-                util.system(cmd, environ=envargdict, cwd=cmdwd, onerr=onerr,
94  
-                            errprefix=_('terminated onsub in %s') % relpath)
95  
-
96  
-    def bfs():
97  
-        """execute precmd in repo.root and in each subrepository, breadth-first"""
98  
-        if includeroot:
99  
-            execCmd(None, precmd) 
100  
-        ctx = repo['.']
101  
-        work = [(1, ctx.sub(subpath)) for subpath in sorted(ctx.substate)]
102  
-        while work:
103  
-            (depth, sub) = work.pop(0)
104  
-            if depth > maxdepth >= 0:
105  
-                continue
106  
-            execCmd(sub, precmd) 
107  
-            if isinstance(sub, subrepo.hgsubrepo):
108  
-                rev = sub._state[1]
109  
-                ctx = sub._repo[rev]
110  
-                w = [(depth + 1, ctx.sub(subpath)) 
111  
-                     for subpath in sorted(ctx.substate)]
112  
-                work.extend(w)
113  
-    
114  
-    def dfs():
115  
-        """execute pre-/postcmd in repo.root and in each subrepository, depth-first"""
116  
-
117  
-        def dfs_rek(depth, sub):
118  
-            if depth > maxdepth >= 0:
119  
-                return
120  
-            execCmd(sub, precmd) 
121  
-            if isinstance(sub, subrepo.hgsubrepo):
122  
-                rev = sub._state[1]
123  
-                ctx = sub._repo[rev]
124  
-                for subpath in sorted(ctx.substate):
125  
-                    dfs_rek(depth+1, ctx.sub(subpath))
126  
-            execCmd(sub, postcmd)
127  
-    
128  
-        ctx = repo['.']
129  
-        work = [ctx.sub(subpath) for subpath in sorted(ctx.substate)]
130  
-        if includeroot:
131  
-            execCmd(None, precmd) 
132  
-        for sub in work:
133  
-            dfs_rek(1, sub)
134  
-        if includeroot:
135  
-            execCmd(None, postcmd) 
136  
-        
137  
-    ### start of main function part ###
138  
-    if len(args) == 2:
139  
-        precmd = args[0]
140  
-        postcmd = args[1]
141  
-        if opts.get('breadth_first') or opts.get('post_order'):
142  
-            raise util.Abort(_("onsub: '-b' and '-p' imply the use of only one command"))
143  
-    elif len(args) == 1:
144  
-        if opts.get('post_order'):
145  
-            precmd = None
146  
-            postcmd = args[0]
147  
-        else:
148  
-            precmd = args[0]
149  
-            postcmd = None
150  
-    elif len(args) == 0:
151  
-        # cmd == '' means only do print0
152  
-        if opts.get('post_order'):
153  
-            precmd = None
154  
-            postcmd = ''
155  
-        else:
156  
-            precmd = ''
157  
-            postcmd = None
158  
-    else:
159  
-        raise util.Abort(_("onsub: at most 2 command arguments required"))
160  
-    if opts.get('post_order') and opts.get('breadth_first'):
161  
-        raise util.Abort(_("onsub: '-b' and '-p' are mutually exclusive"))
162  
-
163  
-    if opts.get('breadth_first'):
164  
-        bfs()
165  
-    else:
166  
-        dfs()
167  
-          
168  
-cmdtable = {
169  
-    "onsub":
170  
-        (onsub,
171  
-         [('b', 'breadth-first', None,
172  
-           _('use breadth-first traversal')),
173  
-          ('p', 'post-order', None,
174  
-           _('use post-order depth-first traversal')),
175  
-          ('', 'root-repo', None,
176  
-           _('include root repository in traversal')),
177  
-          ('', 'max-depth', -1,
178  
-           _('limit recursion to N levels (negative for no limit)'), 'N'),
179  
-          ('', 'ignore-errors', None,
180  
-           _('continue execution despite errors')),
181  
-          ('0', 'print0', None,
182  
-           _('end subrepository names with NUL, for use with xargs'))],
183  
-         _('[-b] [-0] [--ignore-errors] CMD [POST-CMD]'))
184  
-}
4  install.sh
@@ -20,8 +20,6 @@ link gitignore
20 20
 link teamocil
21 21
 link tmux.conf
22 22
 link vim
23  
-link vimrc
24  
-link gvimrc
25 23
 link emacs
26 24
 link emacs.d
27 25
 link inputrc
@@ -37,6 +35,8 @@ link mutt
37 35
 link_custom mutt/muttrc $HOME/.muttrc
38 36
 link_custom irbrc.rb $HOME/.irbrc
39 37
 
  38
+link_custom vim/vimrc $HOME/.vimrc
  39
+link_custom vim/gvimrc $HOME/.gvimrc
40 40
 mkdir -p $HOME/.config/fish
41 41
 link_custom config.fish $HOME/.config/fish/config.fish
42 42
 mkdir -p $HOME/.ssh
1  vim/bundle/abolish
... ...
@@ -1 +0,0 @@
1  
-Subproject commit f8829a5f3e5a2a9c5e8a17f322aa9296a0cdb622
1  vim/bundle/ack
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 9895285042a2fd5691b2f6582aa979e4d1bdffea
1  vim/bundle/argtextobj
... ...
@@ -1 +0,0 @@
1  
-Subproject commit f3fbe427f7b4ec436416a5816d714dc917dc530b
1  vim/bundle/bundler
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 7e651445ea759678c9e53a8657fd40a24eecb9a1
1  vim/bundle/clojure
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 2a17c249571395a7f45523d38cac6a9326ecf8f1
1  vim/bundle/coffee-script
... ...
@@ -1 +0,0 @@
1  
-Subproject commit d6dcb9b0fb5beac9e84cfb84c1917b7e0df5850f
1  vim/bundle/commentary
... ...
@@ -1 +0,0 @@
1  
-Subproject commit dc349bb7d30f713d770fc1fa0fe209e6aab82dc8
1  vim/bundle/css3
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 012c1ba6a075e2e83267ff5ecb80800e28044190
1  vim/bundle/ctrlp
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 309d29d0c7e40d2de7b81a19ba96234640a17157
1  vim/bundle/delimitMate
... ...
@@ -1 +0,0 @@
1  
-Subproject commit e58f9890574b4f493d0ab5434f346292df637d99
1  vim/bundle/easybuffer
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 61bc85358e96aa4e8f032386f30cc66dec8302db
1  vim/bundle/easymotion
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4
1  vim/bundle/elixir
... ...
@@ -1 +0,0 @@
1  
-Subproject commit a4fbd16d05e6bd63f6635ac7b134d12c3f77fe44
1  vim/bundle/endwise
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
1  vim/bundle/eunuch
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 3ec8c70ea62673fcfd1d6f2a511cf099b4db260d
1  vim/bundle/fugitive
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 41383131b861c12abd82ad55a9546b9b715925a0
1  vim/bundle/git
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 75bc1628833ee1f1d8ecb8a66c5df852554c9a19
1  vim/bundle/github
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 193e7903605f4da63da19c5305feb4d5ce37bd2c
1  vim/bundle/golang
... ...
@@ -1 +0,0 @@
1  
-Subproject commit a6065526042591e67c0d460bdf06ad9e79f57b24
1  vim/bundle/gundo
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 4c376a8061fa335228da420937ce385b847dd56a
1  vim/bundle/haml
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 9a891ed78a4b222e8c710e533e0d1f21259c0ef1
1  vim/bundle/html5
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 34b407d2344a3c2a94b56e9d443e18e01e8544d9
1  vim/bundle/indent-object
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e
1  vim/bundle/jade
... ...
@@ -1 +0,0 @@
1  
-Subproject commit d3598f469f7f81cf84e900246fb211d282ca7756
1  vim/bundle/javascript
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 395f8901b34cc871c9576886938a6efda0eb7268
1  vim/bundle/ledger
... ...
@@ -1 +0,0 @@
1  
-Subproject commit e25370f7e1f6da1a2a5c7c8a8d5e36f9ff2ab84d
1  vim/bundle/nu
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 85c7a0bde1a7f9c97731754f49d3efa4c17ebeb6
1  vim/bundle/paredit
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 9a8da2df0955eb90bed782899c7617fb190c9882
1  vim/bundle/pasta
... ...
@@ -1 +0,0 @@
1  
-Subproject commit ff6b1561f825280ce98d8272f1c8aac9b5756a58
1  vim/bundle/powerline
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 20ab08c9a8fe6cdfb7c303aa3063f211d72f8b2f
1  vim/bundle/quickrun
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 23d2a78ba4ace29d670d52e5f8996ced785beaaa
1  vim/bundle/repeat
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 613eb1c81261adfa5dead315089c432ff6dbbc51
1  vim/bundle/scala
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 5f694c4bd69e8c89dcd5422c60b859f80feb8b6e
1  vim/bundle/slim
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 7bb64ea0239352ccb2682b6ec76d9c8f5237d69d
1  vim/bundle/snipmate
... ...
@@ -1 +0,0 @@
1  
-Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b
1  vim/bundle/snipmate_clojure
... ...
@@ -1 +0,0 @@
1  
-Subproject commit dfa8305e8adc283771d31cfbca913eacc1652419
1  vim/bundle/snipmate_elixir
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 1bc7619f9cb87ab8472ce32437b4cb00888581c8
1  vim/bundle/snipmate_for_django
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 8a0805c2e333d0854fd6a3fa775c5b6aa1d643b1
1  vim/bundle/snipmate_nodejs
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 407d167a16c39f7d212941a8cdf8919b155fdc94
1  vim/bundle/solarized
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
1  vim/bundle/speeddating
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 6c1501abd4ff33a68127d5b4a64b190062fffb8a
1  vim/bundle/splice
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 599c93f8042faf7c938758baadc5c786104b34f0
1  vim/bundle/splitjoin
... ...
@@ -1 +0,0 @@
1  
-Subproject commit e23e41fc7566f74155c8e678ffe70dc0deecaee9
1  vim/bundle/strftimedammit
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 78b41e7bdd9bd4603f556da4fcd8221b40dadbc8
1  vim/bundle/stylus
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 9ab38f066ff2b726eb1680da489b184fd17dee50
1  vim/bundle/supertab
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 12f3dc40fdfa3572a5b923e7a174516d46f2f78c
1  vim/bundle/surround
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 1a73f607f8f5477d6942df2eb6e7245c4864f4d3
1  vim/bundle/tabular
... ...
@@ -1 +0,0 @@
1  
-Subproject commit ad2a5a1d54443ab27f1282c5617f55b8e0819623
1  vim/bundle/unimpaired
... ...
@@ -1 +0,0 @@
1  
-Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
1  vim/bundle/vimux
... ...
@@ -1 +0,0 @@
1  
-Subproject commit c5216bb34590a42b272d3045d6097a82e86df326
1  vim/bundle/vimux-ruby
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 73e0a57f6737808108dee9d29e58093836ee0286
1  vim/bundle/vitality
... ...
@@ -1 +0,0 @@
1  
-Subproject commit dfbdc2a086a71fdca7fd63a3f9e4cca0863e49af
1  vim/bundle/zencoding
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 72e10f85fe4459e1d36f4a7d632f71a98ccb5e2e
55  vim/bundles.vim
... ...
@@ -0,0 +1,55 @@
  1
+filetype off
  2
+set rtp+=~/.vim/vundle/
  3
+call vundle#rc()
  4
+
  5
+Bundle 'gmarik/vundle'
  6
+Bundle 'kchmck/vim-coffee-script'
  7
+Bundle 'mattn/zencoding-vim'
  8
+Bundle 'tpope/vim-fugitive'
  9
+Bundle 'tpope/vim-haml'
  10
+Bundle 'pangloss/vim-javascript'
  11
+Bundle 'digitaltoad/vim-jade'
  12
+Bundle 'mileszs/ack.vim'
  13
+Bundle 'othree/html5.vim'
  14
+Bundle 'hail2u/vim-css3-syntax'
  15
+Bundle 'wavded/vim-stylus'
  16
+Bundle 'vim-scripts/delimitMate.vim'
  17
+Bundle 'altercation/vim-colors-solarized'
  18
+Bundle 'tpope/vim-unimpaired'
  19
+Bundle 'bbommarito/vim-slim'
  20
+Bundle 'jnwhiteh/vim-golang'
  21
+Bundle 'godlygeek/tabular'
  22
+Bundle 'vim-scripts/VimClojure'
  23
+Bundle 'tpope/vim-speeddating'
  24
+Bundle 'tpope/vim-surround'
  25
+Bundle 'tpope/vim-endwise'
  26
+Bundle 'tpope/vim-abolish'
  27
+Bundle 'sjl/strftimedammit.vim'
  28
+Bundle 'sjl/gundo.vim'
  29
+Bundle 'michaeljsmith/vim-indent-object'
  30
+Bundle 'Lokaltog/vim-easymotion'
  31
+Bundle 'tpope/vim-repeat'
  32
+Bundle 'cypok/vim-ledger'
  33
+Bundle 'ervandew/supertab'
  34
+Bundle 'thinca/vim-quickrun'
  35
+Bundle 'vim-scripts/argtextobj.vim'
  36
+Bundle 'itfrombit/nuvim'
  37
+Bundle 'AndrewRadev/splitjoin.vim'
  38
+Bundle 'kien/ctrlp.vim'
  39
+Bundle 'sickill/vim-pasta'
  40
+Bundle 'Lokaltog/vim-powerline'
  41
+Bundle 'emezeske/paredit.vim'
  42
+Bundle 'tpope/vim-commentary'
  43
+Bundle 'tpope/vim-eunuch'
  44
+Bundle 'tpope/vim-bundler'
  45
+Bundle 'tpope/vim-git'
  46
+Bundle 'derekwyatt/vim-scala'
  47
+Bundle 'sjl/vitality.vim'
  48
+Bundle 'benmills/vimux'
  49
+Bundle 'pgr0ss/vimux-ruby-test'
  50
+Bundle 'sjl/splice.vim'
  51
+Bundle 'elixir-lang/vim-elixir'
  52
+Bundle 'editorconfig/editorconfig-vim'
  53
+Bundle 'troydm/easybuffer.vim'
  54
+
  55
+filetype plugin indent on
0  gvimrc → vim/gvimrc
File renamed without changes
1  vim/pathogen
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 5e3fdd3a8a3b244e1fedd0f5597f4a9879e16c3b
5  vimrc → vim/vimrc
@@ -12,10 +12,7 @@
12 12
 " https://github.com/garybernhardt/dotfiles
13 13
 
14 14
 set nocompatible
15  
-set runtimepath+=$HOME/.vim/pathogen
16  
-call pathogen#helptags()
17  
-call pathogen#infect()
18  
-filetype plugin indent on
  15
+source ~/.vim/bundles.vim
19 16
 syntax on
20 17
 
21 18
 " basics {{{
1  vim/vundle
... ...
@@ -0,0 +1 @@
  1
+Subproject commit 3bf598d169993d703c21115876c36e460a51b100

0 notes on commit 5269f14

Please sign in to comment.
Something went wrong with that request. Please try again.