Allow optionally passing a third path #11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The aim for this is to be used from Jujutsu (https://github.com/jj-csv/jj) as a 3-pane diff editor, for example with the following jj/config.toml: [ui] diff-editor = "vimtabdiff3" merge-editor = "vimtabdiff3" [merge-tools.vimtabdiff3] program = "vimtabdiff.py" edit-args = [ "$left", "$output", "$right" ] Using the config above (with $output in the center), getting all cursors in the center pane after loading vimtabdiff.py can be done with: :tabdo wincmd h Note, however, that Vim commands for working with more than 2 diffing panes require a “bufspec” and become barely unusable with multiple 3-pane diffs at once. Some actions can nonetheless be automated, for instance initializing all center panes based on their left-hand neighbour (combined with the previous motion): :tabdo wincmd h | execute "1,$diffget" . (bufnr('%') - 1) Closes balki#10
|
I changed the commit message once I realized that it is actually feasible to run the specific “relative” diffget command I wanted in all tabs in on line. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The aim for this is to be used from Jujutsu (https://github.com/jj-csv/jj) as a 3-pane diff editor, for example with the following jj/config.toml:
Using the config above (with $output in the center), getting all cursors in the center pane after loading vimtabdiff.py can be done with:
Note, however, that Vim commands for working with more than 2 diffing panes require a “bufspec” and become pretty much unusable with multiple 3-pane diffs at once. For instance, there is no such thing as a relative bufspec, and you therefore cannot
:1,$diffgetall center panes from their left neighbour pane.Closes #10