From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: mode-line under vc Date: Tue, 17 Jul 2007 10:11:08 +0200 Message-ID: <86fy3n30wz.fsf@lola.quinscape.zz> References: <18076.1046.673811.680457@kahikatea.snap.net.nz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1184659889 1074 80.91.229.12 (17 Jul 2007 08:11:29 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 17 Jul 2007 08:11:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: Nick Roberts Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 17 10:11:27 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IAi9U-0005Rb-HR for ged-emacs-devel@m.gmane.org; Tue, 17 Jul 2007 10:11:24 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IAi9U-0007qN-0r for ged-emacs-devel@m.gmane.org; Tue, 17 Jul 2007 04:11:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IAi9J-0007nM-3R for emacs-devel@gnu.org; Tue, 17 Jul 2007 04:11:13 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IAi9H-0007mN-5M for emacs-devel@gnu.org; Tue, 17 Jul 2007 04:11:12 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IAi9G-0007mB-VC for emacs-devel@gnu.org; Tue, 17 Jul 2007 04:11:11 -0400 Original-Received: from pc3.berlin.powerweb.de ([62.67.228.11]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IAi9G-0000Ih-GK for emacs-devel@gnu.org; Tue, 17 Jul 2007 04:11:10 -0400 Original-Received: from quinscape.de (dslnet.212-29-44.ip210.dokom.de [212.29.44.210] (may be forged)) by pc3.berlin.powerweb.de (8.9.3p3/8.9.3) with ESMTP id KAA26666 for ; Tue, 17 Jul 2007 10:11:07 +0200 X-Delivered-To: Original-Received: (qmail 3938 invoked from network); 17 Jul 2007 08:11:08 -0000 Original-Received: from unknown (HELO lola.quinscape.zz) ([10.0.3.43]) (envelope-sender ) by ns.quinscape.de (qmail-ldap-1.03) with SMTP for ; 17 Jul 2007 08:11:08 -0000 Original-Received: by lola.quinscape.zz (Postfix, from userid 1001) id 8DE0D8FA33; Tue, 17 Jul 2007 10:11:08 +0200 (CEST) In-Reply-To: <18076.1046.673811.680457@kahikatea.snap.net.nz> (Nick Roberts's message of "Tue\, 17 Jul 2007 11\:49\:42 +1200") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.51 (gnu/linux) X-detected-kernel: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:74961 Archived-At: Nick Roberts writes: > I generally like the changes to the mode-line for files under version control > but have a few suggestions: > > 1) "Edited file" sounds a bit ambiguous to me, like maybe I haven't saved my > changes. "Locally Modified" is what CVS uses with "cvs status", and this > seems clearer to me. > > 2) Do we really need to explain that "CVS" in the mode-line means > "under the CVS version control system" in the help-echo? It's kind of > long and seems a bit repetitive, unlike explaining the difference between > ":" and "-" which _is_ obscure. Hey, actually I would want to add "+" to it as well. The reason is that I would like the workflow of pcl-cvs (and its ilk) without the interface. Let's face it: the normal use case for version control nowadays is to check in _changesets_, not single-file changes. So I want to be able to _stage_ a file (instead of checking it in), with changelog composition being only on demand. And then check in all staged files with a single command (and also have the C-x v = command or a variant, maybe C-x V =, looking at all staged files). git actually makes staging an explicit process reflected in the file system (the file gets added to the "index") which means that there is, in theory, even a fourth state "/": namely a saved file with a different version staged. Maybe one should use two letters here: "-" for nothing pending, ":-" for unstaged modifications, ":" for staged modifications, "::" for modifications not corresponding to the staged modifications, "-:" staged modifications but a reverted file. Whether or not one should provide interfaces for getting into all those situations is a different question. vc has the concept of "snapshots" and "dired under vc". I think one should possibly extend on that. Nowadays, it is pretty much indispensible to work with PCL-whatever for much work. Being able to fold this into the vc framework would help people to support the exploding plethora of version control systems. -- David Kastrup