Mercurial > hg
view contrib/vim/hg-menu.vim @ 44651:00e0c5c06ed5
pycompat: change argv conversion semantics
Use of os.fsencode() to convert Python's sys.argv back to bytes
was not correct because it isn't the logically inverse operation
from what CPython was doing under the hood.
This commit changes the logic for doing the str -> bytes
conversion. This required a separate implementation for
POSIX and Windows.
The Windows behavior is arguably not ideal. The previous
behavior on Windows was leading to failing tests, such as
test-http-branchmap.t, which defines a utf-8 branch name
via a command argument. Previously, Mercurial's argument
parser looked to be receiving wchar_t bytes in some cases.
After this commit, behavior on Windows is compatible with
Python 2, where CPython did not implement `int wmain()` and
Windows was performing a Unicode to ANSI conversion on the
wchar_t native command line.
Arguably better behavior on Windows would be for Mercurial to
preserve the original Unicode sequence coming from Python and
to wrap this in a bytes-like type so we can round trip safely.
But, this would be new, backwards incompatible behavior. My
goal for this commit was to converge Mercurial behavior on
Python 3 on Windows to fix busted tests. And I believe I was
successful, as this commit fixes 9 tests on my Windows
machine and 14 tests in the AWS CI environment!
Differential Revision: https://phab.mercurial-scm.org/D8337
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 28 Mar 2020 12:18:58 -0700 |
parents | ea7b982b6c08 |
children |
line wrap: on
line source
" vim600: set foldmethod=marker: " ============================================================================= " Name Of File: hg-menu.vim " Description: Interface to Mercurial Version Control. " Author: Steve Borho (modified Jeff Lanzarotta's RCS script) " Date: Wednesday, October 5, 2005 " Version: 0.1.0 " Copyright: None. " Usage: These command and gui menu displays useful hg functions " Configuration: Your hg executable must be in your path. " ============================================================================= " Section: Init {{{1 if exists("loaded_hg_menu") finish endif let loaded_hg_menu = 1 " Section: Menu Options {{{1 if has("gui") " amenu H&G.Commit\ File<Tab>,ci :!hg commit %<CR>:e!<CR> " amenu H&G.Commit\ All<Tab>,call :!hg commit<CR>:e!<CR> " amenu H&G.-SEP1- <nul> amenu H&G.Add<Tab>\\add :!hg add %<CR><CR> amenu H&G.Forget\ Add<Tab>\\fgt :!hg forget %<CR><CR> amenu H&G.Show\ Differences<Tab>\\diff :call ShowResults("FileDiff", "hg\ diff")<CR><CR> amenu H&G.Revert\ to\ Last\ Version<Tab>\\revert :!hg revert %<CR>:e!<CR> amenu H&G.Show\ History<Tab>\\log :call ShowResults("FileLog", "hg\ log")<CR><CR> amenu H&G.Annotate<Tab>\\an :call ShowResults("annotate", "hg\ annotate")<CR><CR> amenu H&G.-SEP1- <nul> amenu H&G.Repo\ Status<Tab>\\stat :call ShowResults("RepoStatus", "hg\ status")<CR><CR> amenu H&G.Pull<Tab>\\pull :!hg pull<CR>:e!<CR> amenu H&G.Update<Tab>\\upd :!hg update<CR>:e!<CR> endif " Section: Mappings {{{1 if(v:version >= 600) " The default Leader is \ 'backslash' map <Leader>add :!hg add %<CR><CR> map <Leader>fgt :!hg forget %<CR><CR> map <Leader>diff :call ShowResults("FileDiff", "hg\ diff")<CR><CR> map <Leader>revert :!hg revert %<CR>:e!<CR> map <Leader>log :call ShowResults("FileLog", "hg\ log")<CR><CR> map <Leader>an :call ShowResults("annotate", "hg\ annotate")<CR><CR> map <Leader>stat :call ShowResults("RepoStatus", "hg\ status")<CR><CR> map <Leader>upd :!hg update<CR>:e!<CR> map <Leader>pull :!hg pull<CR>:e!<CR> else " pre 6.0, the default Leader was a comma map ,add :!hg add %<CR><CR> map ,fgt :!hg forget %<CR><CR> map ,diff :call ShowResults("FileDiff", "hg\ diff")<CR><CR> map ,revert :!hg revert<CR>:e!<CR> map ,log :call ShowResults("FileLog", "hg\ log")<CR><CR> map ,an :call ShowResults("annotate", "hg\ annotate")<CR><CR> map ,stat :call ShowResults("RepoStatus", "hg\ status")<CR><CR> map ,upd :!hg update<CR>:e!<CR> map ,pull :!hg pull<CR>:e!<CR> endif " Section: Functions {{{1 " Show the log results of the current file with a revision control system. function! ShowResults(bufferName, cmdName) " Modify the shortmess option: " A don't give the "ATTENTION" message when an existing swap file is " found. set shortmess+=A " Get the name of the current buffer. let currentBuffer = bufname("%") " If a buffer with the name rlog exists, delete it. if bufexists(a:bufferName) execute 'bd! ' a:bufferName endif " Create a new buffer. execute 'new ' a:bufferName " Execute the command. execute 'r!' a:cmdName ' ' currentBuffer " Make is so that the file can't be edited. setlocal nomodified setlocal nomodifiable setlocal readonly " Go to the beginning of the buffer. execute "normal 1G" " Restore the shortmess option. set shortmess-=A endfunction