
When MacVim is launched by SmartGit for comparing files, the system() call used by various plugins stops working.
MACVIM DIFF TOOL HOW TO
MACVIM DIFF TOOL CODE
Therefore, we need to write another script as a diff program to get the internal command of diff, and then only take the seventh and eighth parameters and pass them to vimdiff, so that we can solve the problem of too many parameters.Īddress algorithm array assembly attribute Browser c Catalog Character string Client code command configuration file container data Database Definition Edition element Example file function java javascript Journal link linux Memory method Modular mysql node object page parameter php Plug-in unit project python Route source code The server Thread time user Recent Posts $ svn diff –diff-cmd vimdiff -r4420 ngx_http_limit_req_module.c

When comparing two files, vimdiff only needs to know the path and file name of the two files, that is, the seventh and eighth parameters in the above diff internal command Īt the same time, it also shows that it is not feasible to call vimdiff directly with - diff CMD due to too many parameters of diff internal command (the command is as follows). Knowing the internal calling command of diff, it is easy to use vimdiff as diff program. SVN / text base / project)_ – Svn / TMP / Project_ ”)。 The seventh and eighth parameters are the names of the first and second files, respectively (for example.

For the third and fourth parameters, subversion will pass a “- L” and the label of the first file (for example, “project”_ issues.html (revision 11209)”)。 The fifth and sixth are the labels of another “- L” and the second file.

The first parameter is the concrete - diff CMD, and then the concrete - extensions (although the extension is ignored when using the blank - symbol), or if - extensions is not specified or - extensions is empty, the ‘- U’ parameter is added. When using an external diff command, subversion generates a very complex command line.

svn/tmp/tempfile.tmp ngx_http_limit_req_module.cĮxplanation of SVN diff in SVN official FAQ( chinese、 english): u -L ngx_http_limit_req_module.c (revision 4420) -L ngx_http_limit_req_module.c (working copy). Then, the following command is actually sent to the default diff program: $ svn diff -r4420 ngx_http_limit_req_module.c When using the SVN diff command to compare before and after modification of a file, for example, execute the following command: In Linux, it’s very difficult to use SVN diff command to view the code modification directly, so we found a better solution on the Internet, that is to use vimdiff as the code viewing tool of SVN diff, especially for people who are used to using vim.
