Mercurial > dotfiles
changeset 330:bb175816e4c9
Merge changes.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Sat, 31 Oct 2015 20:41:20 -0700 |
| parents | 112900c3f7e4 (diff) 5744670c5c0e (current diff) |
| children | 1cfcad59709f |
| files | .hgsub .hgsubstate |
| diffstat | 10 files changed, 36 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Sun Oct 04 20:39:30 2015 -0700 +++ b/.hgsub Sat Oct 31 20:41:20 2015 -0700 @@ -43,6 +43,7 @@ lib/hg/mutable-history = https://bitbucket.org/marmoute/mutable-history lib/hg/terse-status = https://bitbucket.org/durin42/terse-status lib/hg/hgremotenames = https://bitbucket.org/seanfarley/hgremotenames +lib/hg/path-pattern = https://bitbucket.org/Mekk/mercurial-path_pattern lib/fish/virtualfish = [git]https://github.com/adambrenecki/virtualfish.git
--- a/.hgsubstate Sun Oct 04 20:39:30 2015 -0700 +++ b/.hgsubstate Sat Oct 31 20:41:20 2015 -0700 @@ -1,41 +1,42 @@ -bb7d2063c44e8d29dfb956fce77dd250a7af6e5b lib/fish/virtualfish +5d2e2ad0d07fcee8334a7740eb9044ff482fc17e lib/fish/virtualfish f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths 596a721949bc4757e1505907175879170e00ac6e lib/hg/hg-git -1cb3af183d2f692622f84da88d5ca18bd4f91b1f lib/hg/hg-prompt +5dc059aeb5f47dc86ef30821b8a8cdfbf10a4080 lib/hg/hg-prompt f619e74089cd1bccb7ab5413c20fd79b273795b1 lib/hg/hgremotenames 66e2a34005b447d321a96838d7fe2b161e78b7a9 lib/hg/mercurial-cli-templates ee5391999f2d05d1e6bd06e273b4d34a3b8afe33 lib/hg/mutable-history d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub +d6ded1bbd6c87df427dde649239505a58a0b3f23 lib/hg/path-pattern 2d9820cf595263bc7c651295b83f02525a23ca4a lib/hg/terse-status 3b23c55eb43849975656dd89e3f35dacd2b93e69 mutt/mutt-colors-solarized 14897c793e0978e88967afbcd2d8e85041febceb pentadactyl/plugins/pintaboard f755abfb1c4e4e3f59f6cfa25ce16edb5af9e516 vim/bundle/ag db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf 28a989b28457e38df620e4c7ab23e224aff70efe vim/bundle/colorschemes -7fb632aab475b1d2560fe18a329742ba3b4725c6 vim/bundle/commentary +e0f4850d78137a35b9461c530078bd77f39e4dce vim/bundle/commentary f2effdc86abf172d6562ec589fa1aa2c8f136a08 vim/bundle/ctrlp 0117d10dd1f3249a2f54c67cd0bc1a13dc603a96 vim/bundle/ctrlp-autoignore -0806257ca6432ac7beb75c4319dadf7f3ba9907b vim/bundle/easymotion -b319b694539017dcd789dc2c42f784a30d7b28b8 vim/bundle/fugitive +a21d4474f0e9df7a721246e0a3b386068901965f vim/bundle/easymotion +dba8a0705d95cda76d599bb7d09964d67741a5c5 vim/bundle/fugitive eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo -e7e392be41411c7574adb7178dd6725ce92bceb3 vim/bundle/gutentags -204e32721154766e03e99ff857bc798aa5b741dc vim/bundle/haml +96bfe5c37f3785f68c7ea8637add4cb6edecd936 vim/bundle/gutentags +5c1189022d217219be6f607e653bb5ad8c2ff6ca vim/bundle/haml b266c43a06c1bd55d0f642a90475640ae2c1eb15 vim/bundle/interestingwords 8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81 vim/bundle/jinja 7cfe9ba2c7dd99c25bbf2992fe928447e0b3de4a vim/bundle/lawrencium -55a98f0df05195b0addb76b0d5479d421f72d104 vim/bundle/less -f396bee89b2e129864d9499e21c67d855bab23f3 vim/bundle/linediff -ba294150d192d40e51d749e30a7079977eb23a0b vim/bundle/markdown -bcf3de4fdffae45fc7c85b6b84a01b37177924aa vim/bundle/nerdtree +6fae407f7ed666a6dd0fb596e67df8787dccca59 vim/bundle/less +91476b8d44dd01190a151af195cbc4109f50a1c6 vim/bundle/linediff +15d19778a3be4ab3f949cba636d53a87e2c03f29 vim/bundle/markdown +0b44415a3302030b56755cc1135ca9ca57dc1ada vim/bundle/nerdtree af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline -c6a872a64530979f4aac46d765c577581cb7fc36 vim/bundle/pythonmode -92e7c0656bc1887362184decde83739aab49bab7 vim/bundle/ragtag +4bda3035ce9523a6d31792bc6c22ce2b9e0ae9a3 vim/bundle/pythonmode +0ef3f6a5778467fbca12b7874a4509593b209228 vim/bundle/ragtag 7a6675f092842c8f81e71d5345bd7cdbf3759415 vim/bundle/repeat 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized -43b98dd2c74977a02473d923c159d4110c94273e vim/bundle/supertab +9f7da6d4988daf863ebc414f221bb12c2614f59e vim/bundle/supertab 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c vim/bundle/surround -47c70b3e1e388d8f9cc7c6d9687efc047df843ac vim/bundle/syntastic +630169bfc21bf5a114616238810e4b31b19eb983 vim/bundle/syntastic 7b36c46d17d57db34fdb0adac9ba6382d0bb5e66 vim/bundle/tagbar 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
--- a/install.cmd Sun Oct 04 20:39:30 2015 -0700 +++ b/install.cmd Sat Oct 31 20:41:20 2015 -0700 @@ -33,6 +33,7 @@ echo evolve = %CWD:\=/%lib/hg/mutable-history/hgext/evolve.py >> "%userprofile%\mercurial.ini" echo terse-status = %CWD:\=/%lib/hg/terse-status/terse-status.py >> "%userprofile%\mercurial.ini" echo remotenames = %CWD:\=/%lib/hg/hgremotenames/remotenames.py >> "%userprofile%\mercurial.ini" +echo path-pattern = %CWD:\=/%lib/hg/path-pattern/path_pattern.py >> "%userprofile%\mercurial.ini" :: Git Files if exist "%userprofile%\.gitconfig" (
--- a/install.sh Sun Oct 04 20:39:30 2015 -0700 +++ b/install.sh Sat Oct 31 20:41:20 2015 -0700 @@ -31,6 +31,7 @@ echo evolve = $CWD/lib/hg/mutable-history/hgext/evolve.py >> "$HOME/.hgrc" echo terse-status = $CWD/lib/hg/terse-status/terse-status.py >> "$HOME/.hgrc" echo remotenames = $CWD/lib/hg/hgremotenames/remotenames.py >> "$HOME/.hgrc" +echo path-pattern = $CWD/lib/hg/path-pattern/path_pattern.py >> "$HOME/.hgrc" # GIT # ---
--- a/lib/hg/hggit_sync.py Sun Oct 04 20:39:30 2015 -0700 +++ b/lib/hg/hggit_sync.py Sat Oct 31 20:41:20 2015 -0700 @@ -1,6 +1,7 @@ import os import os.path import sys +import codecs import subprocess @@ -78,7 +79,7 @@ if len(sys.argv) > 1: map_file = sys.argv[1] print "Saving map file: %s" % map_file - with open(map_file, 'w') as fp: + with codecs.open(map_file, 'w', encoding='utf8') as fp: for key, val in commit_map.iteritems(): if val[0] is None or val[1] is None: continue
--- a/vim/vimrc Sun Oct 04 20:39:30 2015 -0700 +++ b/vim/vimrc Sat Oct 31 20:41:20 2015 -0700 @@ -56,6 +56,9 @@ set guioptions=-t set lines=999 set columns=999 + if has("win32") + au GUIEnter * simalt ~x + endif endif " }}}
--- a/weechat/irc.conf Sun Oct 04 20:39:30 2015 -0700 +++ b/weechat/irc.conf Sat Oct 31 20:41:20 2015 -0700 @@ -167,7 +167,7 @@ freenode.local_hostname freenode.command = "/msg nickserv identify lordabdul ${sec.data.freenode}" freenode.command_delay -freenode.autojoin = "#duckduckgo,#buildbot,#mercurial,#pentadactyl" +freenode.autojoin = "#duckduckgo,#mercurial,#pentadactyl,#vimperator,#twister" freenode.autorejoin freenode.autorejoin_delay freenode.connection_timeout
--- a/weechat/relay.conf Sun Oct 04 20:39:30 2015 -0700 +++ b/weechat/relay.conf Sat Oct 31 20:41:20 2015 -0700 @@ -24,7 +24,7 @@ compression_level = 6 ipv6 = on max_clients = 5 -password = "" +password = "AifSdmU0k7LeBsbl" ssl_cert_key = "%h/ssl/relay.pem" ssl_priorities = "NORMAL:-VERS-SSL3.0" websocket_allowed_origins = "" @@ -37,3 +37,4 @@ backlog_time_format = "[%H:%M] " [port] +weechat = 8001
--- a/weechat/sec.conf Sun Oct 04 20:39:30 2015 -0700 +++ b/weechat/sec.conf Sat Oct 31 20:41:20 2015 -0700 @@ -10,11 +10,11 @@ [data] __passphrase__ = on -oftc = "A7C01A8A843D668369A56AAFEA6E06B1E511156C753C13CFEC026EF202848AF39119BBF02708E2E697F3CE8CDD10B4CA1212A5504B059831EE" -quakenet = "B9169913BD44082BF23EB30E5280C22B6C39222056DA9F7073F044886396E1209EF459C63F3A2F06BE74900266760C8E56DBC7" -pushover_user = "43B4E1B410B8885A755350304149D48AA5B20DF30E8192E49D96AB46492A3710A2CAC4CAFF7ED8A287A5D2C884EEC1EA1D76D3EDF8BA0854F231B6D03666222CB53DDEE461EE77" -pushover_token = "0243D143785D0097BFF4A5CBBCB913549E1565878CB064F865E4AE556871A201BE6387A32F517752D96EF24EEAD142B962F12610E010FAF7F786DBC50748C7818F8F84B29564BB" -freenode = "0290C3AEC4D3E4F18ADFD8EB772425F8F869A635231233F7BCFC2C95515EEEF4253EFBF7E77500275C18DC3A75FDF0D145A6D952A8D17E" -nicks = "18EF219526D7F61011DE07152C707F7E7CFB18A1CE3DA34C652056090EA5014346069E4B023536D82EA4BA5051A2A8C689A66CDEC6FB2BDBA7483EF785833FC0425337E016A77486CF2C4F509E215A3835BF3AB6583E8352A651F41C0C77" -nick = "1326FF8468E9FB9F5312759F310634230731786BBDDD8209DB04E83CA05F1B52FAD7F548CF7F9D32FF59D6E4E05597A5A394" -sorcery = "3F7A76E923A6FB1D679E9EC5F483804C2A27C6CEFCD0C808F9B5147D6B54BE1D7D0F668AA82281303E009EAC27C35A5E8AF1F1730D7C04" +oftc = "40753E8A461523676DBF416B4C04EDF3241C5BC485A827B16D2D5952C3616C7BEBC81FA1A19B73D692CBAA3FC811612573C3664A93EAC55920" +quakenet = "30268C16DE972F7754CCE9D835716DEF85D7E5C80D2D79151CBB8899650E82D2B00B0EE141E2427613A750B4790F6C429C56E2" +pushover_user = "095F359C99F198FB3FDD23DE4609EC66BEB6967C1C39AE0A6FA9B12A65A76032F49070B7D89FB33B47126B560F00FB0B3F7001D0BF9C59BA64F0FEC9E93C7D578548C2782E6354" +pushover_token = "390435DBF85BF2413E8E95B2E8DFC4C668874A139B3148E56EC18E01A0A29382AEACFC8B6B2BDFA6428219FF8553A860A9C40425D72A044037E4B8852F7AE810ABC23F2521252F" +freenode = "1B205EDFB00558BA62E9D6F4565343EE70DF64C207D8E5F15C573A1087CDE5F76808CFB5E92726BF916EE8100594A9F860A9A6D44EFAC8" +nicks = "994DBBF0DC2B13AC411E5C349847150A3656157AD2E2BB2B7E1D992A8626ECFDD07447D949F758351E6A6E162105F8562A9EABE391616469611250FA9C137914A4B5D6B19CEC60010EFA66D6C0E0196A3E396B4246C1B2B771D4D5FCE324" +nick = "7BC509DCB03C795F767D6830E90A1C8526AFCC71CE3D5C3C74A6AE6F5F05C225713EBCEA5092B006EE06ECE47BAEF1FEA27A" +sorcery = "8558F49241E58C7F53C1BC2D770F7D79A2A9B1DAFBD46E18D80F6B9B778D73665E84D49066969A0CD29F636E48D44F76329A3376272AB4"
--- a/weechat/weechat.conf Sun Oct 04 20:39:30 2015 -0700 +++ b/weechat/weechat.conf Sat Oct 31 20:41:20 2015 -0700 @@ -225,7 +225,7 @@ buffers.conditions = "" buffers.filling_left_right = vertical buffers.filling_top_bottom = columns_vertical -buffers.hidden = off +buffers.hidden = on buffers.items = "buffers" buffers.position = top buffers.priority = 0