From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bob Rogers Newsgroups: gmane.emacs.devel Subject: Re: Updating *vc-dir* marks from *VC-log* Date: Sun, 21 Nov 2010 13:30:09 -0500 Message-ID: <19689.25905.829852.432969@rgr.rgrjr.com> References: <19688.28312.768696.349949@rgr.rgrjr.com> <19689.17740.876119.178798@rgr.rgrjr.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1290364234 29833 80.91.229.12 (21 Nov 2010 18:30:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 21 Nov 2010 18:30:34 +0000 (UTC) Cc: emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 21 19:30:24 2010 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.69) (envelope-from ) id 1PKEgB-0003EM-NV for ged-emacs-devel@m.gmane.org; Sun, 21 Nov 2010 19:30:23 +0100 Original-Received: from localhost ([127.0.0.1]:45878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKEgB-00048z-54 for ged-emacs-devel@m.gmane.org; Sun, 21 Nov 2010 13:30:23 -0500 Original-Received: from [140.186.70.92] (port=55795 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKEg2-000472-Fe for emacs-devel@gnu.org; Sun, 21 Nov 2010 13:30:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKEg1-0002v1-62 for emacs-devel@gnu.org; Sun, 21 Nov 2010 13:30:14 -0500 Original-Received: from rgrjr.com ([216.146.47.5]:36070) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKEg1-0002uk-24 for emacs-devel@gnu.org; Sun, 21 Nov 2010 13:30:13 -0500 Original-Received: from rgrjr.dyndns.org (c-66-30-196-77.hsd1.ma.comcast.net [66.30.196.77]) by rgrjr.com (Postfix on CentOS) with ESMTP id CCADE1600FF for ; Sun, 21 Nov 2010 18:30:11 +0000 (UTC) Original-Received: (qmail 11761 invoked by uid 89); 21 Nov 2010 18:30:11 -0000 Original-Received: from unknown (HELO rgr.rgrjr.com) (192.168.57.1) by home with SMTP; 21 Nov 2010 18:30:11 -0000 Original-Received: by rgr.rgrjr.com (Postfix, from userid 500) id B6D97A4E6E; Sun, 21 Nov 2010 13:30:10 -0500 (EST) In-Reply-To: X-Mailer: VM 7.19 under Emacs 24.0.50.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:132976 Archived-At: From: Dan Nicolaescu Date: Sun, 21 Nov 2010 12:02:19 -0500 It's still unclear what you are trying to do, could you please describe in detail the use-case you have in mind? Here's what I often find myself wanting to do: 1. Start a multi-file commit from vc-dir. 2. After writing half the log buffer, realize that one or two of the files scheduled for commit are independent of the others, and should really be committed first, in a separate operation. 3. Go back to *vc-dir*, change the mark set to include only those files, and commit using a new log buffer. 4. Re-visit the first log buffer and finish the original commit, with a reduced fileset. Currently, I either have to (a) save the current log buffer contents somewhere and start fresh, or (b) drop the file(s) from the first commit and just do them in the reverse order. (It might work to rename the log buffer at step 2, and then rename it back; I haven't tried that. But I was shooting for something more transparent.) FWIW, I used to have a hack that supported this workflow by splitting log buffers in two, but it was driven by file names in the log buffer itself, which wasn't very clean. (And it was part of another multi-file commit hack, before Emacs had proper support for it.) > But, at the very least, I ought to check vc-parent-buffer first, > since that would always DTRT if the file appears in multiple vc-dir > buffers. Thanks for making that apparent. > > BTW, this is a subproject that came up while trying to make Emacs > smarter about changing marked files in vc-dir during the commit (see > bug#7350). That's quite easy (I have it in my local copy). `log-edit-files' gives you a list of files that *VC log* would check in. `vc-deduce-fileset' in `vc-parent-buffer' gives you the currently selected files in *vc dir* All true. But Stefan pointed out in response to bug#7350 that C-c C-c should at least bring it to the user's attention if those two sets differ, and update the commit fileset if the use approves. But if you've already have that code in your local copy, then I don't have to write it. Right? -- Bob