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 11:14:04 -0500 Message-ID: <19689.17740.876119.178798@rgr.rgrjr.com> References: <19688.28312.768696.349949@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 1290356279 27991 80.91.229.12 (21 Nov 2010 16:17:59 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 21 Nov 2010 16:17:59 +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 17:17:54 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 1PKCbw-0000GS-Nn for ged-emacs-devel@m.gmane.org; Sun, 21 Nov 2010 17:17:52 +0100 Original-Received: from localhost ([127.0.0.1]:59397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKCbw-0006fc-5i for ged-emacs-devel@m.gmane.org; Sun, 21 Nov 2010 11:17:52 -0500 Original-Received: from [140.186.70.92] (port=41804 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKCbc-0006Pf-45 for emacs-devel@gnu.org; Sun, 21 Nov 2010 11:17:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKCYK-0005Fr-T7 for emacs-devel@gnu.org; Sun, 21 Nov 2010 11:14:10 -0500 Original-Received: from rgrjr.com ([216.146.47.5]:58410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKCYK-0005FJ-MS for emacs-devel@gnu.org; Sun, 21 Nov 2010 11:14:08 -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 8AAE016014C for ; Sun, 21 Nov 2010 16:14:06 +0000 (UTC) Original-Received: (qmail 6638 invoked by uid 89); 21 Nov 2010 16:14:06 -0000 Original-Received: from unknown (HELO rgr.rgrjr.com) (192.168.57.1) by home with SMTP; 21 Nov 2010 16:14:06 -0000 Original-Received: by rgr.rgrjr.com (Postfix, from userid 500) id 72DDEA4E6E; Sun, 21 Nov 2010 11:14:05 -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:132959 Archived-At: From: Dan Nicolaescu Date: Sat, 20 Nov 2010 23:46:40 -0500 Bob Rogers writes: > . . . With multiple pending commits, what is needed is a way to return > to vc-dir and "swap in" the log buffer fileset. The patch below adds a > new log-edit-visit-files-in-vc-dir command to do this. I have > tentatively bound it to "C-c @" in log-edit-mode, which I hope is > sufficiently mnemonic for "mark". I am not sure what you are trying to do here... In the *VC log* buffer the vc-parent-buffer buffer-local variable points to the *vc dir* buffer that was used to create it. Doesn't this simplify what you are trying to do? Hmm. It could conceivably make vc-dir-find-buffer-for-file unnecessary. (I had written that for another hack where vc-parent-buffer may not be defined, or may not point to a vc-dir buffer, and just used it unthinkingly here.) On the other hand, one would have to assume that users only want to adjust the filesets of commits started from vc-dir buffers. vc-dir-find-buffer-for-file would still be useful if the user originally typed "C-x v v" in a file buffer, and then had second thoughts. 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). If the user does that, then Emacs should (a) ask her if she wants to update the fileset if she types C-c C-c in the log buffer, and (b) ask her if she wants to start a new commit or update the old one if she types C-x v v in the vc-dir buffer. Both of those involve updating the fileset of an existing log buffer, so I probably need to address that first. -- Bob