[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git conflict VC state detection
From: |
Stefan Monnier |
Subject: |
Re: Git conflict VC state detection |
Date: |
Sun, 10 Nov 2013 21:13:17 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
>> So, an alternative to fixing vc-state is to add a vc-git-conflict-p called
>> from the find-file-hook.
> IIUC what you propose does not reduce the number of git invocations
> while visiting/reverting a file
Indeed :-(
It can reduce it in a few other cases where vc-state is called without
visiting/reverting a file. Admittedly, these are rare (mostly because
vc-dir doesn't use vc-state but some other function).
Maybe another option is to do:
if status is ambiguous and could be `conflict', look for diff3 markers,
and if found, run git a second time to confirm that the status is
`conflict'. Of course, if we could get the `conflict' status in
a single git invocation that would be much better.
Stefan
- Re: Two feature ideas for diffs, (continued)
- Re: Two feature ideas for diffs, Stefan Monnier, 2013/11/09
- Re: Two feature ideas for diffs, Óscar Fuentes, 2013/11/09
- Re: Two feature ideas for diffs, Stefan Monnier, 2013/11/10
- Git conflict VC state detection, Óscar Fuentes, 2013/11/10
- Re: Git conflict VC state detection, Dmitry Gutov, 2013/11/10
- Re: Git conflict VC state detection, Óscar Fuentes, 2013/11/10
- Re: Git conflict VC state detection, Stefan Monnier, 2013/11/10
- Re: Git conflict VC state detection, Óscar Fuentes, 2013/11/10
- Re: Git conflict VC state detection,
Stefan Monnier <=
- Re: Git conflict VC state detection, Dmitry Gutov, 2013/11/11
Re: Two feature ideas for diffs, Dmitry Gutov, 2013/11/07
Re: Two feature ideas for diffs, Stefan Monnier, 2013/11/07
Re: Two feature ideas for diffs, Barry OReilly, 2013/11/07