From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Fernando Ramos <greenfoo@u92.eu>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v3 0/7] mergetools: vimdiff: regression fixes and improvements
Date: Mon, 8 Aug 2022 19:45:42 -0500 [thread overview]
Message-ID: <20220809004549.123020-1-felipe.contreras@gmail.com> (raw)
Hello,
I wrote vimdiff3 to leverage both the power of git's diff3 and vim's
diff mode, but commit 0041797449 broke that.
Here you can see how it used to work:
https://i.snipboard.io/hSdfkj.jpg
The added and changed lines are properly highlighted.
After I fix the conflicts vim still properly highlights which lines were
changed, and even what specific characters were modified:
https://i.snipboard.io/HvpULI.jpg
Now I get absolutely nothing:
https://i.snipboard.io/HXMui4.jpg
Additionally, every time I run the command I get an annoying message:
"./content_LOCAL_8975" 6L, 28B
"./content_BASE_8975" 6 lines, 29 bytes
"./content_REMOTE_8975" 6 lines, 29 bytes
"content" 16 lines, 115 bytes
Press ENTER or type command to continue
Because that's what `bufdo` does.
Since v2 there's a lot more reorganization in order to deal with cases
Fernando Ramos mentioned.
Felipe Contreras (7):
mergetools: vimdiff: fix comment
mergetools: vimdiff: make vimdiff3 actually work
mergetools: vimdiff: silence annoying messages
mergetools: vimdiff: fix for diffopt
mergetools: vimdiff: fix single window layouts
mergetools: vimdiff: rework tab logic
mergetools: vimdiff: restore selective diff mode
mergetools/vimdiff | 96 ++++++++++++++++++++++------------------------
1 file changed, 45 insertions(+), 51 deletions(-)
Range-diff against v2:
1: 20c5abdbc8 = 1: 20c5abdbc8 mergetools: vimdiff: fix comment
2: e6c860d2be < -: ---------- mergetools: vimdiff: shuffle single window case
3: bdf1e919a5 < -: ---------- mergetools: vimdiff: add get_buf() helper
4: c5e21e3049 < -: ---------- mergetools: vimdiff: make vimdiff3 actually work
5: 2bf45c882d < -: ---------- mergetools: vimdiff: silence annoying messages
6: 77a67628e7 < -: ---------- mergetools: vimdiff: fix for diffopt
7: adc9d18f2b < -: ---------- mergetools: vimdiff: cleanup cruft
8: fe7fb1a018 < -: ---------- mergetools: vimdiff: fix single window mode
9: 15765aa9d2 < -: ---------- mergetools: vimdiff: use vimdiff for vimdiff3
-: ---------- > 2: 8d466e06aa mergetools: vimdiff: make vimdiff3 actually work
-: ---------- > 3: 95bfab5813 mergetools: vimdiff: silence annoying messages
-: ---------- > 4: 08f6b2bce2 mergetools: vimdiff: fix for diffopt
-: ---------- > 5: 2bff74f499 mergetools: vimdiff: fix single window layouts
-: ---------- > 6: 39e8277317 mergetools: vimdiff: rework tab logic
-: ---------- > 7: 92df35208d mergetools: vimdiff: restore selective diff mode
--
2.37.1
next reply other threads:[~2022-08-09 0:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-09 0:45 Felipe Contreras [this message]
2022-08-09 0:45 ` [PATCH v3 1/7] mergetools: vimdiff: fix comment Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 2/7] mergetools: vimdiff: make vimdiff3 actually work Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 3/7] mergetools: vimdiff: silence annoying messages Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 4/7] mergetools: vimdiff: fix for diffopt Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 5/7] mergetools: vimdiff: fix single window layouts Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 6/7] mergetools: vimdiff: rework tab logic Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 7/7] mergetools: vimdiff: restore selective diff mode Felipe Contreras
2022-08-09 1:08 ` Felipe Contreras
2022-08-09 5:26 ` Fernando Ramos
2022-08-09 20:07 ` Felipe Contreras
2022-08-10 8:45 ` Junio C Hamano
2022-08-10 18:29 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220809004549.123020-1-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=greenfoo@u92.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).