Only pass revision argument to diff command when required #70
Conversation
|
@blueyed There you go. This code is a bit cleaner than what I did this morning. |
| @@ -573,6 +555,33 @@ function! s:GetParam(name, type, default) abort "{{{3 | |||
| endf | |||
|
|
|||
|
|
|||
| function! s:Diff(filename, vcs_type) "{{{3 | |||
| let cmdt = s:Config(a:vcs_type).cmd | |||
| let rev_arg = s:GetParam('quickfixsigns#vcsdiff#rev_arg', a:vcs_type, s:Config(a:vcs_type).rev_arg) | |||
There was a problem hiding this comment.
rev_arg isn't a (user-configurable) "parameter" but a fixed value.
There was a problem hiding this comment.
Do you mean that I should do this?
let rev_arg = s:Config(a:vcs_type).rev_arg|
|
||
| " Create command string | ||
| let cmds = printf("%s %s", g:quickfixsigns#vcsdiff#cd, shellescape(dir)) | ||
| if exists('g:quickfixsigns#vcsdiff#revision') && !empty('g:quickfixsigns#vcsdiff#revision') |
There was a problem hiding this comment.
g:quickfixsigns#vcsdiff#revision should be queried as user-configurable parameter.
I'd rather set revision to the formatted revision argument if a revision is specified or an empty string if no rev is specified. This makes the code duplication in the else branch obsolete.
| @@ -437,7 +437,7 @@ g:quickfixsigns#vcsdiff#vcs (default: {...}) | |||
| cmd ... command templates that generate a unified diff file. | |||
| "%s" is replaced with the filename. | |||
| dir ... the directory name | |||
| revision ... The default revision/branch | |||
| rev_arg ... argument to selection revision to diff against | |||
There was a problem hiding this comment.
Thanks for updating the help file. The help file is auto-generated from time to time so it's not absolutely necessary.
There was a problem hiding this comment.
What do you use for that purpose? I could benefit from such a flow.
There was a problem hiding this comment.
I use this ruby script: https://github.com/tomtom/vimtlib/tree/master/ruby
It was a quick hack, and it isn't well maintained, though.
Move common diff generation code to local script function.
|
Updated. |
|
Thanks!
|
|
Thank you for your helpful suggestions! |
|
Thanks to both of you from me! :) |
Move common diff generation code to local script function.