Mercurial > dotfiles
changeset 257:3ecf32c893ab
Merge changes.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Wed, 07 Jan 2015 20:54:59 -0800 |
| parents | e74cfc5d3040 (diff) 122919f93598 (current diff) |
| children | abb94e9f28d2 |
| files | .hgsubstate |
| diffstat | 12 files changed, 93 insertions(+), 121 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Wed Jan 07 11:01:43 2015 -0800 +++ b/.hgsub Wed Jan 07 20:54:59 2015 -0800 @@ -25,6 +25,7 @@ vim/bundle/linediff = [git]https://github.com/AndrewRadev/linediff.vim.git vim/bundle/pythonmode = [git]https://github.com/klen/python-mode.git vim/bundle/interestingwords = [git]https://github.com/vasconcelloslf/vim-interestingwords.git +vim/bundle/jinja = [git]https://github.com/mitsuhiko/vim-jinja.git vim/bundle/gutentags = https://bitbucket.org/ludovicchabant/vim-gutentags vim/bundle/lawrencium = https://bitbucket.org/ludovicchabant/vim-lawrencium @@ -35,4 +36,7 @@ lib/hg/allpaths = https://bitbucket.org/ludovicchabant/allpaths lib/hg/mercurial-cli-templates = https://bitbucket.org/sjl/mercurial-cli-templates lib/hg/hg-prompt = https://bitbucket.org/sjl/hg-prompt +lib/hg/mutable-history = https://bitbucket.org/marmoute/mutable-history +lib/fish/virtualfish = [git]https://github.com/adambrenecki/virtualfish.git +
--- a/.hgsubstate Wed Jan 07 11:01:43 2015 -0800 +++ b/.hgsubstate Wed Jan 07 20:54:59 2015 -0800 @@ -1,7 +1,9 @@ +17a51b56d88bd1f1826945413790c482032bb8d3 lib/fish/virtualfish f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths d40de32ec5b1380ed20888c744d4f8f468fbf226 lib/hg/hg-git 1cb3af183d2f692622f84da88d5ca18bd4f91b1f lib/hg/hg-prompt 66e2a34005b447d321a96838d7fe2b161e78b7a9 lib/hg/mercurial-cli-templates +1df0bf41016cc640eec03bfbd5938f5639b2f387 lib/hg/mutable-history d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf 81c6dd7ce3169e5ad9ba92422ba6e1ce5b074e36 vim/bundle/colorschemes @@ -10,10 +12,11 @@ 9ceebf91fc137644cf0693561a386ef4071dbf87 vim/bundle/easymotion 2c8461db084d205903a792a23163faa546f143c9 vim/bundle/fugitive eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo -0c67b56abc638515fbe9f5e9137828293577af7e vim/bundle/gutentags +c9dfccf3c2f762f5f1f2b86320f2fd0258998ed0 vim/bundle/gutentags 204e32721154766e03e99ff857bc798aa5b741dc vim/bundle/haml 6e0ac033107bd12c1390cbdf49398393930f3fb6 vim/bundle/interestingwords -01edb7c58e0c6d632603d5857bf0d508b9579b1d vim/bundle/lawrencium +8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81 vim/bundle/jinja +53a2c9403ba8e8d7f5229eead2e6933ab04c70d1 vim/bundle/lawrencium 940a8defa0576385dee1ad177bab0b34738540aa vim/bundle/less b69e54f4bf0a0ee26f6582ee8764b25529610c88 vim/bundle/linediff 409c37b205afa2f9d590e23de8171482d66770e2 vim/bundle/markdown
--- a/bashrc/bashrc Wed Jan 07 11:01:43 2015 -0800 +++ b/bashrc/bashrc Wed Jan 07 20:54:59 2015 -0800 @@ -6,13 +6,13 @@ PATH=$HOME/bin:$PATH # Homebrew binaries. -PATH=/usr/local/bin:$PATH +PATH=/usr/local/sbin:/usr/local/bin:$PATH # Python from Homebrew -PATH=/usr/local/share/python:$PATH +#PATH=/usr/local/share/python:$PATH # Ruby from Homebrew -PATH=/usr/local/Cellar/ruby/1.9.3-p194/bin:$PATH +#PATH=/usr/local/Cellar/ruby/1.9.3-p194/bin:$PATH # Done! export PATH
--- a/fish/config.fish Wed Jan 07 11:01:43 2015 -0800 +++ b/fish/config.fish Wed Jan 07 20:54:59 2015 -0800 @@ -52,8 +52,14 @@ patches: <patches|join( → )|pre_applied($yellow)|post_applied($normal)|pre_unapplied($gray)|post_unapplied($normal)>>" 2>/dev/null function virtualenv_prompt - if [ -n "$VIRTUAL_ENV" ] - printf '(%s) ' (basename "$VIRTUAL_ENV") + #if [ -n "$VIRTUAL_ENV" ] + # printf '(%s) ' (basename "$VIRTUAL_ENV") + #end + if set -q VIRTUAL_ENV + set_color -b blue white + printf '(%s)' (basename "$VIRTUAL_ENV") + set_color normal + printf ' ' end end @@ -122,6 +128,17 @@ # }}} +# Virtualenv wrapper for Fish {{{ + +#set -g VIRTUALFISH_COMPAT_ALIASES # uncomment for virtualenvwrapper-style commands +. $HOME/.config/fish/virtualfish/virtual.fish +# optional plugins +#. path/to/auto_activation.fish +#. path/to/global_requirements.fish +#. path/to/projects.fish + +# }}} + # Local Settings {{{ if test -s $HOME/.config/fish/local.fish
--- a/hgrc/hgrc Wed Jan 07 11:01:43 2015 -0800 +++ b/hgrc/hgrc Wed Jan 07 20:54:59 2015 -0800 @@ -15,6 +15,7 @@ record = rebase = shelve = +evolve = convert = extdiff = schemes =
--- a/install.sh Wed Jan 07 11:01:43 2015 -0800 +++ b/install.sh Wed Jan 07 20:54:59 2015 -0800 @@ -27,6 +27,7 @@ echo onsub = $CWD/lib/hg/onsub/onsub.py >> "$HOME/.hgrc" echo allpaths = $CWD/lib/hg/allpaths/allpaths.py >> "$HOME/.hgrc" echo prompt = $CWD/lib/hg/hg-prompt/prompt.py >> "$HOME/.hgrc" +echo changelog = $CWD/lib/hg/changelog/changelog.py >> "$HOME/.hgrc" # GIT # ---
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/hg/changelog/README.md Wed Jan 07 20:54:59 2015 -0800 @@ -0,0 +1,10 @@ + +Release Notes Extension +----------------------- + +This extension adds a `releasenotes` command (also aliased to `rnotes`) that +helps generate release notes for the project in the repository. By default, it +will create a `ReleaseNotes.html` file, but you can specify another output file: + + hg rnotes -o SomeOtherFile.html +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/hg/changelog/changelog.py Wed Jan 07 20:54:59 2015 -0800 @@ -0,0 +1,44 @@ +"""changelog + +Generates a user-centric changelog from commit messages +""" +import re +import markdown +from mercurial import command, util, cmdutil, scmutil, graphmod +from mercurial.i18n import _ + +cmdtable = {} +command = cmdutil.command(cmdtable) + +@command('changelog', + [ + ('l', 'limit', '', _('limit number of changes included in the changelog'), _('NUM')), + ('r', 'rev', [], _('include the specified revision or range'), _('REV')), + ], + _('hg changelog [OPTION]... [FILE]')) +def changelog(ui, repo, *pats, **opts): + """generate a changelog from the revision history + """ + rev = opts.get('rev') + if not rev: + rev = ['all()'] + revs = sorted(scmutil.revrange(repo, rev), reverse=1) + limit = cmdutil.loglimit(opts) + if limit is not None: + revs = revs[:limit] + + dateformat = ui.config('changelog', 'dateformat', '%B %d, %Y') + + entries = [i for i in ui.configitems('changelog') if i[0].startswith('entry')] + ui.write(entries) + ui.write("\n") + + ui.write("Generating changelog from:\n") + revdag = graphmod.dagwalker(repo, revs) + for rev, t, ctx, parents in revdag: + ui.write('%s: %s %s %s\n' % (util.datestr(ctx.date(), dateformat), rev, t, ctx.description())) + + ui.write("\n") + ui.write("foo = %s\n" % ui.config('changelog', 'foo')) + ui.write("blah = %s\n" % ui.config('changelog', 'blah')) +
--- a/pentadactylrc Wed Jan 07 11:01:43 2015 -0800 +++ b/pentadactylrc Wed Jan 07 20:54:59 2015 -0800 @@ -51,6 +51,11 @@ " Quickly open some dialogs nmap -builtin ,b :downloads<cr> +" On keyboards like the Leopold FC660C, for some obscure reason, the +" <Insert> key sends the <Help> ID. WTF. +noremap <Help> <Insert> + +# DDG FTW set defsearch=duckduckgo " Super minimal UI
--- a/vim/bundle/jinja/jinja.vim Wed Jan 07 11:01:43 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -" Vim syntax file -" Language: Jinja template -" Maintainer: Armin Ronacher <armin.ronacher@active-4.com> -" Last Change: 2008 May 9 -" Version: 1.1 -" -" Known Bugs: -" because of odd limitations dicts and the modulo operator -" appear wrong in the template. -" -" Changes: -" -" 2008 May 9: Added support for Jinja2 changes (new keyword rules) - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -syntax case match - -" Jinja template built-in tags and parameters (without filter, macro, is and raw, they -" have special threatment) -syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained and if else in not or recursive as import - -syn keyword jinjaStatement containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained is filter skipwhite nextgroup=jinjaFilter -syn keyword jinjaStatement containedin=jinjaTagBlock contained macro skipwhite nextgroup=jinjaFunction -syn keyword jinjaStatement containedin=jinjaTagBlock contained block skipwhite nextgroup=jinjaBlockName - -" Variable Names -syn match jinjaVariable containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/ -syn keyword jinjaSpecial containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained false true none loop super caller varargs kwargs - -" Filters -syn match jinjaOperator "|" containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained nextgroup=jinjaFilter -syn match jinjaFilter contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/ -syn match jinjaFunction contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/ -syn match jinjaBlockName contained skipwhite /[a-zA-Z_][a-zA-Z0-9_]*/ - -" Jinja template constants -syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/"/ skip=/\\"/ end=/"/ -syn region jinjaString containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained start=/'/ skip=/\\'/ end=/'/ -syn match jinjaNumber containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[0-9]\+\(\.[0-9]\+\)\?/ - -" Operators -syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[+\-*\/<>=!,:]/ -syn match jinjaPunctuation containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /[()\[\]]/ -syn match jinjaOperator containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained /\./ nextgroup=jinjaAttribute -syn match jinjaAttribute contained /[a-zA-Z_][a-zA-Z0-9_]*/ - -" Jinja template tag and variable blocks -syn region jinjaNested matchgroup=jinjaOperator start="(" end=")" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained -syn region jinjaNested matchgroup=jinjaOperator start="\[" end="\]" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained -syn region jinjaNested matchgroup=jinjaOperator start="{" end="}" transparent display containedin=jinjaVarBlock,jinjaTagBlock,jinjaNested contained -syn region jinjaTagBlock matchgroup=jinjaTagDelim start=/{%-\?/ end=/-\?%}/ skipwhite containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment - -syn region jinjaVarBlock matchgroup=jinjaVarDelim start=/{{-\?/ end=/-\?}}/ containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaRaw,jinjaString,jinjaNested,jinjaComment - -" Jinja template 'raw' tag -syn region jinjaRaw matchgroup=jinjaRawDelim start="{%\s*raw\s*%}" end="{%\s*endraw\s*%}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString,jinjaComment - -" Jinja comments -syn region jinjaComment matchgroup=jinjaCommentDelim start="{#" end="#}" containedin=ALLBUT,jinjaTagBlock,jinjaVarBlock,jinjaString - -" Block start keywords. A bit tricker. We only highlight at the start of a -" tag block and only if the name is not followed by a comma or equals sign -" which usually means that we have to deal with an assignment. -syn match jinjaStatement containedin=jinjaTagBlock contained skipwhite /\({%-\?\s*\)\@<=\<[a-zA-Z_][a-zA-Z0-9_]*\>\(\s*[,=]\)\@!/ - -" and context modifiers -syn match jinjaStatement containedin=jinjaTagBlock contained /\<with\(out\)\?\s\+context\>/ skipwhite - - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_jinja_syn_inits") - if version < 508 - let did_jinja_syn_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - HiLink jinjaPunctuation jinjaOperator - HiLink jinjaAttribute jinjaVariable - HiLink jinjaFunction jinjaFilter - - HiLink jinjaTagDelim jinjaTagBlock - HiLink jinjaVarDelim jinjaVarBlock - HiLink jinjaCommentDelim jinjaComment - HiLink jinjaRawDelim jinja - - HiLink jinjaSpecial Special - HiLink jinjaOperator Normal - HiLink jinjaRaw Normal - HiLink jinjaTagBlock PreProc - HiLink jinjaVarBlock PreProc - HiLink jinjaStatement Statement - HiLink jinjaFilter Function - HiLink jinjaBlockName Function - HiLink jinjaVariable Identifier - HiLink jinjaString Constant - HiLink jinjaNumber Constant - HiLink jinjaComment Comment - - delcommand HiLink -endif - -let b:current_syntax = "jinja"
--- a/vim/vimrc Wed Jan 07 11:01:43 2015 -0800 +++ b/vim/vimrc Wed Jan 07 20:54:59 2015 -0800 @@ -253,7 +253,7 @@ " flake8 includes pyflakes, pep8, and mccabe " I could maybe replace pyflakes with frosted? -let g:syntastic_python_checkers = ['flake8', 'pylint'] +let g:syntastic_python_checkers = ['flake8'] ", 'pylint'] let g:syntastic_python_python_exec = 'python3' " }}}