Commits

David Wolever committed 3d2756f

Moar changes

  • Participants
  • Parent commits 37dd67f

Comments (0)

Files changed (13)

 
 --follow
 --ignore-dir=env
+--ignore-dir=.tox
 --regex-mxml=/[ \t]id=['"]([A-Za-z0-9_]+)['"]/\1/f, function, functions/
 --python-kinds=-vi
 --exclude=*env/*
+--exclude=*.tox/*
 hgext.mq =
 hgext.graphlog = 
 # Attic and record are used for 'shelve'
-attic = ~/.mercurial/extensions/hgattic/attic.py
-hgext.record =
+#attic = ~/.mercurial/extensions/hgattic/attic.py
+#hgext.record =
 #shelve = ~/.mercurial/extensions/hgshelve/hgshelve.py
 info = ~/.mercurial/extensions/info.py
 rebase =
 #hgext.hgk =
 progress =
 #pbranch = ~/.mercurial/extensions/hg-pbranch/hgext/pbranch.py
-#hgsubversion =
+hgsubversion =
 
 [ui]
 username = David Wolever <david@wolever.net>
 verbose = True
 archivemeta = True
 commitsubrepos = False
+ignore = ~/.hgignore.global
 
 [merge-tools]
 vimdiff.args = $local $other $base $output
 # force all patches to always be in git format
 git=1
 
+[git]
+intree = True
+
 [color]
 diff.trailingwhitespace = none
 #qseries.unapplied = blue bold

inkscape/preferences.xml

        on-blur="0.50"
        animate-time="100" />
     <group
-       h="239"
+       id="livepatheffect"
+       panel_size="1"
+       panel_ratio="100"
+       panel_mode="1"
+       panel_wrap="0"
+       state="2"
+       x="0"
+       y="0"
        w="266"
-       y="0"
-       x="0"
-       state="2"
-       panel_wrap="0"
-       panel_mode="1"
-       panel_ratio="100"
-       panel_size="1"
-       id="livepatheffect" />
+       h="239" />
   </group>
   <group
      id="printing">
     <group
        width="483"
        height="430"
-       x="1280"
-       y="0"
+       x="1609"
+       y="215"
        fullscreen="0"
        id="geometry"
        maximized="0" />

profile.laptop.local

 export FLEX_HOME="/Applications/eclipse/Adobe Flex Builder 3 Plug-in/sdks/3.5/"
 export CLOSURE_HOME="/Users/wolever/code/software/closure-library/closure/"
 export PATH="/Users/wolever/.vcslog/bin:/Users/wolever/bin:/usr/local/vim73/bin/:/usr/local/bin:/usr/local/sbin:/Developer/usr/bin/:$PATH:$FLEX_HOME/bin:/usr/local/python32/bin/:/usr/local/google_appengine/:/usr/local/mysql-5.5.19-osx10.6-x86_64/bin/:$CLOSURE_HOME/bin/:$CLOSURE_HOME/bin/build/"
+export PATH="/Users/wolever/code/software/hg-crew:$PATH"
 export MANPATH=/opt/local/share/man:$MANPATH
 export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.flac=01;35:*.mp3=01;35:*.mpc=01;35:*.ogg=01;35:*.wav=01;35:'
 export CDPATH="$CDPATH:~/EnSi/repos/:~/Verso/repos/"
 alias fcsh='rlwrap fcsh'
 alias airssh='ssh -vp 4855 localhost'
 alias ut='dtrx'
+alias upload2pypi="python setup.py sdist upload --sign --identity B230230D"
 
 #DJ_BASH_COMP=~/.config/django_bash_completion
 #test -r $DJ_BASH_COMP && . $DJ_BASH_COMP
 export PAGER="$HOME/bin/vimpager"
 alias less="$PAGER"
 
-export VERSIONER_PYTHON_PREFER_32_BIT=yes
+#export VERSIONER_PYTHON_PREFER_32_BIT=yes
 export WORKON_HOME="$HOME/.virtualenvs"
 . ~/.bin/virtualenv_helper
 

python/rlcompleter_ng.py

             try:
                 execfile(rcfile, mydict)
                 return mydict['Config']()
-            except Exception, e:
-                print '** error when importing %s: %s **' % (filename, e)
+            except Exception as e:
+                print('** error when importing %s: %s **' % (filename, e))
         return self.DefaultConfig()
 
 
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =6
-let g:netrw_dirhist_1='/Users/wolever/EnSi/repos/remora/libs/require-1.0.2'
-let g:netrw_dirhist_2='/Users/wolever/EnSi/repos/web/apps/main/fixtures'
-let g:netrw_dirhist_3='/Users/wolever/EnSi/repos/remora/test'
-let g:netrw_dirhist_4='/Users/wolever/codekills/posts'
-let g:netrw_dirhist_5='/Users/wolever/EnSi/repos/remora/src/remora'
-let g:netrw_dirhist_6='/Users/wolever/EnSi/repos/env/ensi/lib/python2.6/site-packages/django'
+let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_1='/Users/wolever/EnSi/repos/env/ensi/lib/python2.6/site-packages/django/forms'
+let g:netrw_dirhist_2='/Users/wolever/bin'
+let g:netrw_dirhist_3='/Users/wolever/EnSi/repos/pycommon/ensi_common/dirt'

vim/ftdetect/proto.vim

+au BufNewFile,BufRead *.proto set filetype=proto

vim/ftplugin/rst.vim

 setlocal completefunc=RstLabelCompletion
 
 setlocal comments-=b:#
+setlocal formatlistpat=^\\s*\\(\\(\\d\\+\\\|[*+#-]\\)[\\]:.)}\\t\ ]\\\|[*+#-]\\)\\s*

vim/spell/en.utf-8.add

 js
 namespace
 bindable
+deserialized
+timetamp
+unix
+MintChip
+MintChips
+MintChip's
+API's
+OpenSSL

vim/spell/en.utf-8.add.spl

Binary file modified.

vim/syntax/proto.vim

+" Protocol Buffers - Google's data interchange format
+" Copyright 2008 Google Inc.  All rights reserved.
+" http://code.google.com/p/protobuf/
+"
+" Redistribution and use in source and binary forms, with or without
+" modification, are permitted provided that the following conditions are
+" met:
+"
+"     * Redistributions of source code must retain the above copyright
+" notice, this list of conditions and the following disclaimer.
+"     * Redistributions in binary form must reproduce the above
+" copyright notice, this list of conditions and the following disclaimer
+" in the documentation and/or other materials provided with the
+" distribution.
+"     * Neither the name of Google Inc. nor the names of its
+" contributors may be used to endorse or promote products derived from
+" this software without specific prior written permission.
+"
+" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+" OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+" This is the Vim syntax file for Google Protocol Buffers.
+"
+" Usage:
+"
+" 1. cp proto.vim ~/.vim/syntax/
+" 2. Add the following to ~/.vimrc:
+"
+" augroup filetype
+"   au! BufRead,BufNewFile *.proto setfiletype proto
+" augroup end
+"
+" Or just create a new file called ~/.vim/ftdetect/proto.vim with the
+" previous lines on it.
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+syn keyword pbTodo       contained TODO FIXME XXX
+syn cluster pbCommentGrp contains=pbTodo
+
+syn keyword pbSyntax     syntax import option
+syn keyword pbStructure  package message group
+syn keyword pbRepeat     optional required repeated
+syn keyword pbDefault    default
+syn keyword pbExtend     extend extensions to max
+syn keyword pbRPC        service rpc returns
+
+syn keyword pbType      int32 int64 uint32 uint64 sint32 sint64
+syn keyword pbType      fixed32 fixed64 sfixed32 sfixed64
+syn keyword pbType      float double bool string bytes
+syn keyword pbTypedef   enum
+syn keyword pbBool      true false
+
+syn match   pbInt     /-\?\<\d\+\>/
+syn match   pbInt     /\<0[xX]\x+\>/
+syn match   pbFloat   /\<-\?\d*\(\.\d*\)\?/
+" TODO: .proto also supports C-style block comments;
+" see /usr/share/vim/vim70/syntax/c.vim for how it's done.
+syn region  pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp
+syn region  pbString  start=/"/ skip=/\\"/ end=/"/
+syn region  pbString  start=/'/ skip=/\\'/ end=/'/
+
+if version >= 508 || !exists("did_proto_syn_inits")
+  if version < 508
+    let did_proto_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink pbTodo         Todo
+
+  HiLink pbSyntax       Include
+  HiLink pbStructure    Structure
+  HiLink pbRepeat       Repeat
+  HiLink pbDefault      Keyword
+  HiLink pbExtend       Keyword
+  HiLink pbRPC          Keyword
+  HiLink pbType         Type
+  HiLink pbTypedef      Typedef
+  HiLink pbBool         Boolean
+
+  HiLink pbInt          Number
+  HiLink pbFloat        Float
+  HiLink pbComment      Comment
+  HiLink pbString       String
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "proto"
 " c: auto-wrap comments to textwidth
 " q: Allow formatting comments with 'gq'
 " n: Recognized numbered lists (eg: '1. ...\n 2. ... \n')
-" See also: :help fo-table
-set formatlistpat=^\\s*\\(\\(\\d\\+\\\|[*+#-]\\)[\\]:.)}\\t\ ]\\\|[*+#-]\\)\\s*
+" See also: :help fo-table, ftplugin/rst.vim
+set formatlistpat=^\\s*\\(\\(\\d\\+\\\)[\\]:.)}\\t\ ]\\\)\\s*
 
 " When editing CPython source, run their provided vimrc (setting certain useful
 " things like their coding standards)