[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Two feature ideas for diffs
From: |
Stefan Monnier |
Subject: |
Re: Two feature ideas for diffs |
Date: |
Sat, 09 Nov 2013 08:37:06 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
> --- 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
- Re: Two feature ideas for diffs, (continued)
- Re: Two feature ideas for diffs, Dmitry Gutov, 2013/11/07
- Re: Two feature ideas for diffs, Tom, 2013/11/07
- Re: Two feature ideas for diffs, Stefan Monnier, 2013/11/07
- 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, Michael Heerdegen, 2013/11/08
- Re: Two feature ideas for diffs, Óscar Fuentes, 2013/11/08
- Re: Two feature ideas for diffs, Michael Heerdegen, 2013/11/08
- Re: Two feature ideas for diffs, Stefan Monnier, 2013/11/09
- Re: Two feature ideas for diffs, Michael Heerdegen, 2013/11/09
- Re: Two feature ideas for diffs,
Stefan Monnier <=
- 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, 2013/11/10
- Re: Git conflict VC state detection, Dmitry Gutov, 2013/11/11
Re: Two feature ideas for diffs, Dmitry Gutov, 2013/11/07