From b719b7b95cd3f955844a122f0a8d611638ed38bf Mon Sep 17 00:00:00 2001 From: Jerome Reybert Date: Tue, 10 Nov 2015 13:12:43 +0100 Subject: [PATCH] autoload/magit/state.vim: by default, do not show untracked/deleted/added/renamed files diffs (ref #28) --- README.md | 5 +++-- autoload/magit/state.vim | 4 +++- doc/vimagit.txt | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ef77d8e..2c73070 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ It takes 3 parameters: - 'h', curent window is split horizontally, and magit is displayed in new buffer - 'c', magit is displayed in current buffer - * show_all_files: define is file diffs are shown by default for this session + * show_all_files: define how file diffs are shown by default for this session (see [g:magit_default_show_all_files](#gmagit_default_show_all_files)) * foldlevel: set default magit buffer foldlevel for this session (see [g:magit_default_fold_level](#gmagit_default_fold_level)) @@ -206,7 +206,8 @@ To disable chatty inline help in magit buffer (default 1) #### g:magit_default_show_all_files When this variable is set to 0, all diff files are hidden by default. -When this variable is set to 1, all diff files are shown by default. +When this variable is set to 1, all diff for modified files are shown by default. +When this variable is set to 2, all diff for all files are shown by default. Default value is 0. NB: for repository with large number of differences, display may be slow. > let g:magit_default_show_all_files=[01] diff --git a/autoload/magit/state.vim b/autoload/magit/state.vim index f71ee25..65bc021 100644 --- a/autoload/magit/state.vim +++ b/autoload/magit/state.vim @@ -21,7 +21,9 @@ function! magit#state#init_file_visible() dict if ( !self.new ) return self.is_visible() else - call self.set_visible(b:magit_default_show_all_files) + if ( self.status == 'M' || b:magit_default_show_all_files > 1 ) + call self.set_visible(b:magit_default_show_all_files) + endif return self.is_visible() endif endfunction diff --git a/doc/vimagit.txt b/doc/vimagit.txt index 5cea783..e88224e 100644 --- a/doc/vimagit.txt +++ b/doc/vimagit.txt @@ -121,12 +121,12 @@ It takes 3 parameters: - 'h', curent window is split horizontally, and magit is displayed in new buffer - 'c', magit is displayed in current buffer - * show_all_files: define is file diffs are shown by default for this session + * show_all_files: define how file diffs are shown by default for this session (see |vimagit-g:magit_default_show_all_files|) * foldlevel: set default magit buffer foldlevel for this session (see |vimagit-g:magit_default_fold_level|) - *:Magit* *magit#show_magit('v')* + *:Magit* *magit#show_magit('v')* :Magit open magit buffer @@ -263,7 +263,8 @@ let g:magit_show_help=[01] *vimagit-g:magit_default_show_all_files* When this variable is set to 0, all diff files are hidden by default. -When this variable is set to 1, all diff files are shown by default. +When this variable is set to 1, all diff for modified files are shown by default. +When this variable is set to 2, all diff for all files are shown by default. Default value is 0. NB: for repository with large number of differences, display may be slow. let g:magit_default_show_all_files=[01]