From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Two feature ideas for diffs
Date: Sat, 09 Nov 2013 08:37:06 -0500 [thread overview]
Message-ID: <jwvwqkh8zoc.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87fvr61f4d.fsf@wanadoo.es> ("Óscar Fuentes"'s message of "Sat, 09 Nov 2013 03:30:10 +0100")
> --- a/lisp/vc/vc-git.el
> +++ b/lisp/vc/vc-git.el
> @@ -204,12 +204,12 @@ matching the resulting Git log output, and KEYWORDS is a list of
> (?M 'edited)
> (?A 'added)
> (?D 'removed)
> - (?U 'edited) ;; FIXME
> + (?U 'conflict)
> (?T 'edited))) ;; FIXME
> (defun vc-git-state (file)
> "Git-specific version of `vc-state'."
> - ;; FIXME: This can't set 'ignored or 'conflict yet
> + ;; FIXME: This can't set 'ignored yet.
> ;; The 'ignored state could be detected with `git ls-files -i -o
> ;; --exclude-standard` It also can't set 'needs-update or
> ;; 'needs-merge. The rough equivalent would be that upstream branch
> @@ -781,6 +781,7 @@ If LIMIT is non-nil, show no more than this many entries."
> ,(format "--pretty=tformat:%s"
> (car vc-git-root-log-format))
> "--abbrev-commit"))
> + '("--follow")
> (when limit (list "-n" (format "%s" limit)))
> (when start-revision (list start-revision))
> '("--")))))))
Is it really all it takes to detect `conflict' state?
Stefan
next prev parent reply other threads:[~2013-11-09 13:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 17:08 Two feature ideas for diffs Tom
2013-11-07 17:25 ` nhs
2013-11-07 17:39 ` Tom
2013-11-07 17:58 ` Dmitry Gutov
2013-11-07 18:24 ` Tom
2013-11-07 19:09 ` Stefan Monnier
2013-11-07 19:30 ` Dmitry Gutov
2013-11-07 20:00 ` Stefan Monnier
2013-11-08 22:58 ` Michael Heerdegen
2013-11-09 2:30 ` Óscar Fuentes
2013-11-09 2:59 ` Michael Heerdegen
2013-11-09 13:34 ` Stefan Monnier
2013-11-09 22:58 ` Michael Heerdegen
2013-11-09 13:37 ` Stefan Monnier [this message]
2013-11-09 15:02 ` Óscar Fuentes
2013-11-10 13:24 ` Stefan Monnier
2013-11-10 20:30 ` Git conflict VC state detection Óscar Fuentes
2013-11-10 21:26 ` Dmitry Gutov
2013-11-10 22:19 ` Óscar Fuentes
2013-11-11 0:16 ` Stefan Monnier
2013-11-11 0:53 ` Óscar Fuentes
2013-11-11 2:13 ` Stefan Monnier
2013-11-11 23:16 ` Dmitry Gutov
2013-11-07 18:11 ` Two feature ideas for diffs Dmitry Gutov
2013-11-07 18:33 ` Tom
2013-11-08 1:29 ` Ivan Andrus
2013-11-07 19:11 ` Stefan Monnier
-- strict thread matches above, loose matches on Subject: below --
2013-11-07 18:49 Barry OReilly
2013-11-07 22:05 ` Dmitry Gutov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvwqkh8zoc.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.