From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Two feature ideas for diffs Date: Sat, 09 Nov 2013 08:37:06 -0500 Message-ID: References: <527BCD00.9090105@openmailbox.org> <87d2mcdrgu.fsf@yandex.ru> <877gcia4c5.fsf@web.de> <87fvr61f4d.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1384004241 23487 80.91.229.3 (9 Nov 2013 13:37:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 9 Nov 2013 13:37:21 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?windows-1252?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 09 14:37:25 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Vf8j6-0004sl-L1 for ged-emacs-devel@m.gmane.org; Sat, 09 Nov 2013 14:37:24 +0100 Original-Received: from localhost ([::1]:57245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vf8j6-00028Z-24 for ged-emacs-devel@m.gmane.org; Sat, 09 Nov 2013 08:37:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vf8iw-00027Y-Kt for emacs-devel@gnu.org; Sat, 09 Nov 2013 08:37:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vf8ip-0003x2-AN for emacs-devel@gnu.org; Sat, 09 Nov 2013 08:37:14 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:44818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vf8ip-0003wy-5o for emacs-devel@gnu.org; Sat, 09 Nov 2013 08:37:07 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFFLd+A//2dsb2JhbABEuzWDWRdzgh8BBVYjEAs0EhQYDSSIJMEtjRqDcAOIYZwZgV6DFYFJ X-IPAS-Result: Av8EABK/CFFLd+A//2dsb2JhbABEuzWDWRdzgh8BBVYjEAs0EhQYDSSIJMEtjRqDcAOIYZwZgV6DFYFJ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="37454146" Original-Received: from 75-119-224-63.dsl.teksavvy.com (HELO ceviche.home) ([75.119.224.63]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 09 Nov 2013 08:37:06 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 722DE660A2; Sat, 9 Nov 2013 08:37:06 -0500 (EST) In-Reply-To: <87fvr61f4d.fsf@wanadoo.es> (=?windows-1252?Q?=22=D3scar?= Fuentes"'s message of "Sat, 09 Nov 2013 03:30:10 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:165095 Archived-At: > --- 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