From unknown Sun Aug 17 09:11:53 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#2652 <2652@debbugs.gnu.org> To: bug#2652 <2652@debbugs.gnu.org> Subject: Status: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer Reply-To: bug#2652 <2652@debbugs.gnu.org> Date: Sun, 17 Aug 2025 16:11:53 +0000 retitle 2652 23.0.91; wacky behavior of "v" command in *vc-dir* buffer reassign 2652 emacs submitter 2652 Miles Bader severity 2652 normal thanks From miles@gnu.org Thu Mar 12 16:58:39 2009 Received: (at submit) by emacsbugs.donarmstrong.com; 12 Mar 2009 23:58:39 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.1 required=4.0 tests=FOURLA autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2CNwZqF011156 for ; Thu, 12 Mar 2009 16:58:37 -0700 Received: from mx10.gnu.org ([199.232.76.166]:43653) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1LhunK-0002Ww-Ew for emacs-pretest-bug@gnu.org; Thu, 12 Mar 2009 19:58:34 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1LhunI-0006XG-MY for emacs-pretest-bug@gnu.org; Thu, 12 Mar 2009 19:58:34 -0400 Received: from smtp11.dentaku.gol.com ([203.216.5.73]:45815) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LhunI-0006X8-2r; Thu, 12 Mar 2009 19:58:32 -0400 Received: from 218.231.175.8.eo.eaccess.ne.jp ([218.231.175.8] helo=catnip.gol.com) by smtp11.dentaku.gol.com with esmtpa (Dentaku) id 1LhunF-0006Iq-RZ; Fri, 13 Mar 2009 08:58:29 +0900 Received: by catnip.gol.com (Postfix, from userid 1000) id 0D2A1DFF3; Fri, 13 Mar 2009 08:58:29 +0900 (JST) From: Miles Bader To: emacs-pretest-bug@gnu.org Subject: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer Reply-To: Miles Bader System-Type: x86_64-unknown-linux-gnu Date: Fri, 13 Mar 2009 08:58:29 +0900 Message-ID: <87iqmemgyi.fsf@catnip.gol.com> Lines: 99 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Virus-Scanned: ClamAV GOL (outbound) X-Abuse-Complaints: abuse@gol.com X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) In the *vc-dir* buffer, if the cursor is on a source file entry, "v" operates on the file under the cursor. However, if "v" is used on a non-file line, the behavior is kind of weird: It pops up a *vc-log* buffer, and allows you to enter a log message, but then typing C-c C-c (`log-edit-done') in the *vc-log* buffer to finish the commit results in an error: vc-find-backend-function: Cannot open load file: vc-nil What I _expected_ to happen is for it to commit every changed file in the *vc-dir* buffer; this behavior is not only fairly natural (I think), but also suggested by actions of vc prior to the error: (1) Using the C-c C-f command (`log-edit-show-files') *vc-log* shows the directory name as the "files" (in *log-edit-files* buffer) (2) The C-c C-c command in *vc-log*, prior to the above error, displays the message (where DIRNAME is the directory name): Checking in DIRNAME... Thanks, -Miles In GNU Emacs 23.0.91.10 (x86_64-unknown-linux-gnu, GTK+ Version 2.15.5) of 2009-03-12 on catnip Windowing system distributor `The X.Org Foundation', version 11.0.10599902 Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: ja_JP.UTF-8 value of $XMODIFIERS: @im=SCIM locale-coding-system: utf-8-unix default-enable-multibyte-characters: t Major mode: VC dir Minor modes in effect: diff-auto-refine-mode: t vc-parent-buffer: *vc-dir* rcirc-track-minor-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: SPC t h e SPC " * " SPC o p e r a t i o n h s o p e r a t i o n ) M-b M-b M-b M-b M-b M-b M-h M-f M-d g C-n , SPC i n s t e a d SPC o f SPC a s SPC a SPC n u m b e r SPC o f SPC s t o p s SPC ( " * + + " ) SPC a s SPC w a s SPC p r e v i o u s l y SPC d o n e . C-p b b h d C-d g C-n C-n T h i SPC i s SPC b C-b s C-e a n SPC i n c o m p a t i b l e SPC c h a n g e , SPC b u t SPC I SPC f i n d SPC i t SPC m o r e SPC i n C-p C-SPC C-n C-n t u i t i v e SPC ( I SPC w a s SPC C-p C-SPC C-n C-n C-w C-n C-n C-x C-s C-s C-s C-g C-g C-g C-p C-e C-p C-M-b M-b M-b a SPC f e e SPC f a c t o r g C-n C-n C-n C-c C-c C-x p C-n C-n C-x o C-x n C-x h w C-x p C-n C-n v C-c C-c C-x n C-x n C-n v C-c C-c C-x s e d e C-a C-x k y e s x r e p o r t - e m SPC Recent messages: Mark set [3 times] Press C-c C-c when you are done editing. Enter a change comment. Type C-c C-c when done Checking in /home/miles/src/snogray/snogray/... xding vc-find-backend-function: Cannot open load file: vc-nil Mark set Press C-c C-c when you are done editing. Enter a change comment. Type C-c C-c when done Checking in /home/miles/src/snogray/snogray/image-cmdline.cc...done -- `To alcohol! The cause of, and solution to, all of life's problems' --Homer J. Simpson From dann@godzilla.ics.uci.edu Thu Mar 12 17:39:15 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 00:39:15 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-6.0 required=4.0 tests=HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D0dCNp021410 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 17:39:13 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n2D0culx009542; Thu, 12 Mar 2009 17:38:56 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2D0cuTj018433; Thu, 12 Mar 2009 17:38:56 -0700 (PDT) Date: Thu, 12 Mar 2009 17:38:56 -0700 (PDT) Message-Id: <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2652@debbugs.gnu.org Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> X-Debbugs-No-Ack: yes In-Reply-To: <87iqmemgyi.fsf@catnip.gol.com> (Miles Bader's message of "Fri, 13 Mar 2009 08:58:29 +0900") Lines: 31 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2D0culx009542 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Miles Bader writes: > In the *vc-dir* buffer, if the cursor is on a source file entry, "v" > operates on the file under the cursor. > > However, if "v" is used on a non-file line, the behavior is kind of > weird: It pops up a *vc-log* buffer, and allows you to enter a log > message, but then typing C-c C-c (`log-edit-done') in the *vc-log* > buffer to finish the commit results in an error: > > vc-find-backend-function: Cannot open load file: vc-nil > > What I _expected_ to happen is for it to commit every changed file in > the *vc-dir* buffer; this behavior is not only fairly natural (I think), > but also suggested by actions of vc prior to the error: > > (1) Using the C-c C-f command (`log-edit-show-files') *vc-log* shows > the directory name as the "files" (in *log-edit-files* buffer) > > (2) The C-c C-c command in *vc-log*, prior to the above error, > displays the message (where DIRNAME is the directory name): > > Checking in DIRNAME... Can you please provide a way to reproduce this starting from emacs -Q? What is the output of: M-: (vc-deduce-fileset) RET before you press "v" ? From snogglethorpe@gmail.com Thu Mar 12 18:05:25 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 01:05:25 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-2.9 required=4.0 tests=FOURLA,HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from mail-ew0-f176.google.com (mail-ew0-f176.google.com [209.85.219.176]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D15LGn029432 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 18:05:23 -0700 Received: by ewy24 with SMTP id 24so2372597ewy.1 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 18:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=yK3kjBQBxN0LcborLkuCewZtTJ1MrjUcd3naIR8JJGI=; b=BBwOM3J7QdJo6rpRvzcLxHIY/5oWzfB7EZ1Cd08wb7Joi+aJS7o8nXY2oA7ykGOAvL Ce70h8RfxnXMtZ4qvGJF76OpS71tWvGmlVtroof6upkciR1xNmeJykbMbCQTmShLB5Lq zwGsVJzLK44xcNOE5XRzgQAzRApTc6L0dILd4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=TVZV/x74dHC/4mv2giFbI1XZJhllWB59GMuNpSHLzOZvZZhPoJZnd3DEGDJqz9OyQd 4plq3IQIAFUa9arxezSqTQLgmJU1iQcSOcY2jcRQuukiYn7blDfVy0zYIMgEoYLIungy 9Y3ENfaFtshUqotrsFLHGGLv3LKqp56q3sAfE= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.216.47.196 with SMTP id t46mr381417web.121.1236906315989; Thu, 12 Mar 2009 18:05:15 -0700 (PDT) In-Reply-To: <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> Date: Fri, 13 Mar 2009 10:05:15 +0900 X-Google-Sender-Auth: 0a6dd1d2248c5ce6 Message-ID: Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer From: Miles Bader To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Fri, Mar 13, 2009 at 9:38 AM, Dan Nicolaescu wrote: > =A0> However, if "v" is used on a non-file line, the behavior is kind of > =A0> weird: =A0It pops up a *vc-log* buffer, and allows you to enter a lo= g > =A0> message, but then typing C-c C-c (`log-edit-done') in the *vc-log* > =A0> buffer to finish the commit results in an error: > > Can you please provide a way to reproduce this starting from emacs -Q? (1) cd to a source directory that uses git for source management (2) start emacs: emacs -Q -nw (3) modify any source file in that dir, e.g., add a new line "Hello" to a README or something (4) Start vc-dir: M-x vc-dir RET RET (5) In the *vc-dir* buffer, you'll see the file you modified listed; the cursor should be initially positioned on the first line of the buffer, i.e., not on any source file. (6) Without moving the cursor, try to commit: v (7) Enter a log message and submit: Oink OINK RET (8) You should get the error I mentioned > What is the output of: > M-: (vc-deduce-fileset) RET > before you press "v" ? M-: (vc-deduce-fileset) RET =3D> (Git ("/home/miles/src/snogray/snogray/") nil nil nil) The directory name there is the top-level source directory. Thanks, -Miles --=20 Do not taunt Happy Fun Ball. From snogglethorpe@gmail.com Thu Mar 12 18:06:42 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 01:06:42 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-2.9 required=4.0 tests=FOURLA,HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.191]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D16d5K029449 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 18:06:40 -0700 Received: by nf-out-0910.google.com with SMTP id d3so495500nfc.31 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 18:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=K9Awe7TIb+Ht27mq6ZycziOWNKoNtPHEHusDJSJ/gTI=; b=OG7bv94szti7Gz8nJXvBI6epBVgt3ngd2G3KI0Utme/IrrUI2yk9quTABAate/UFfv 75nVbziKR02G6rib0Tg1yva1J7+veZTqdg7dwM0qaqpDqXhc3NVH7VjgfYzBz5ga2z2g y+pmVbzejs8bk7kmazVxkEmKTDpiwKGgIW6nA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=K80XqLMIk7vffMbGQySIRQCxHucZciMi/tjlK8fiRdMXkARYkh16hUP7ZgsSyKck8C pvaTjGL+3jVsYJI371x+orNyI80fiQAMfcbUdt3ODr+DkrFV/3yOnrQ4Kk/rOEoTi+TP OeSZ/ARIoiSj5H6ltkpGTAorhVVVEi6agvOys= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.216.47.85 with SMTP id s63mr324604web.58.1236906398796; Thu, 12 Mar 2009 18:06:38 -0700 (PDT) In-Reply-To: References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> Date: Fri, 13 Mar 2009 10:06:38 +0900 X-Google-Sender-Auth: 4b389496221a5628 Message-ID: Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer From: Miles Bader To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Oh, I obviously forgot the commit part of step (7); it should be: =A0(7) Enter a log message and submit: =A0 Oink OINK RET C-c C-c Thanks, -Miles --=20 Do not taunt Happy Fun Ball. From dann@godzilla.ics.uci.edu Thu Mar 12 18:34:25 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 01:34:25 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-5.9 required=4.0 tests=FOURLA,HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D1YN2k003176 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 18:34:24 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n2D1YCj5016157; Thu, 12 Mar 2009 18:34:12 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2D1YCFF018782; Thu, 12 Mar 2009 18:34:12 -0700 (PDT) Date: Thu, 12 Mar 2009 18:34:12 -0700 (PDT) Message-Id: <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2652@debbugs.gnu.org Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Miles Bader's message of "Fri, 13 Mar 2009 10:05:15 +0900") Lines: 40 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2D1YCj5016157 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Miles Bader writes: > On Fri, Mar 13, 2009 at 9:38 AM, Dan Nicolaescu wrot= e: > > =C2=A0> However, if "v" is used on a non-file line, the behavior is k= ind of > > =C2=A0> weird: =C2=A0It pops up a *vc-log* buffer, and allows you to = enter a log > > =C2=A0> message, but then typing C-c C-c (`log-edit-done') in the *vc= -log* > > =C2=A0> buffer to finish the commit results in an error: > > > > Can you please provide a way to reproduce this starting from emacs -Q? >=20 > (1) cd to a source directory that uses git for source management >=20 > (2) start emacs: emacs -Q -nw >=20 > (3) modify any source file in that dir, e.g., add a new line "Hello" > to a README or something >=20 > (4) Start vc-dir: M-x vc-dir RET RET >=20 > (5) In the *vc-dir* buffer, you'll see the file you modified listed; > the cursor should be initially positioned on the first line of the > buffer, i.e., not on any source file. >=20 > (6) Without moving the cursor, try to commit: v >=20 > (7) Enter a log message and submit: Oink OINK RET >=20 > (8) You should get the error I mentioned >=20 > > What is the output of: > > M-: (vc-deduce-fileset) RET > > before you press "v" ? >=20 > M-: (vc-deduce-fileset) RET > =3D> (Git ("/home/miles/src/snogray/snogray/") nil nil nil) Ah, git. Then is probably the same as bug#1589. vc-git.el has problems with working with subdirectories.=20 Do you get this error when you run vc-dir at the top of the git tree? From snogglethorpe@gmail.com Thu Mar 12 18:50:19 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 01:50:19 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-3.0 required=4.0 tests=HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from ey-out-2122.google.com (ey-out-2122.google.com [74.125.78.24]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D1oG7J008024 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 18:50:17 -0700 Received: by ey-out-2122.google.com with SMTP id 25so545438eya.13 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 18:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=pU2QNFez26bWpS8FfCkAMIRrD791Zr2WxCUxReC2jxE=; b=PGNdV3HZukA3OEJ3CCrht/gheFg697RsD2cennxj7sSg9Im4ooXwhzB984Uoy7PFPK yiKbH45WNbeXxzHugZUDKw1CTaMk/T1kYvtp87m42//zJ4pWfhuuaSQiwxrEAF3DowyW ODtYmnXop10SC5Q1/zypYvzRTUsJFcKM5TRzw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=jGyHReb1Cd2T/vTPzkF5DCmHsoi2BLJPjeHXixzvyEIgdaIVQjmjaQYlVOwVLxyLOI abUtcEo995koc470XYubjHImTHktBgL+BM5NPU5U28ZrG/vSUhGZ9aflaO50+zZbvcWq N7OEi2MUtahiaJLNXq05a4xAGyb7vuON5svd8= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.216.1.77 with SMTP id 55mr396894wec.111.1236909015639; Thu, 12 Mar 2009 18:50:15 -0700 (PDT) In-Reply-To: <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> Date: Fri, 13 Mar 2009 10:50:15 +0900 X-Google-Sender-Auth: b730ac8b64c04aa7 Message-ID: Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer From: Miles Bader To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Fri, Mar 13, 2009 at 10:34 AM, Dan Nicolaescu wrote: > Ah, git. =A0Then is probably the same as bug#1589. > vc-git.el has problems with working with subdirectories. > > Do you get this error when you run vc-dir at the top of the git tree? My source directory only has one level, so... yes. -Miles --=20 Do not taunt Happy Fun Ball. From snogglethorpe@gmail.com Thu Mar 12 19:49:41 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 02:49:41 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-3.0 required=4.0 tests=HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.185]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D2ncbl022175 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 19:49:39 -0700 Received: by nf-out-0910.google.com with SMTP id d3so509496nfc.31 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 19:49:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=hGRVjH45CvhGP7y5zCTwwjm4g4gdI2pRMb5Cd2jWZ8s=; b=sSo7x9wNWTQ1DlGxUO59d9+DqclLJ9QjpVYNaY50XfN71BAH0HM9Yyy1RJ1J+ZFeSQ YR0Lu9gxtaiZYtYkehLA4OHw6kQRDOBwfvLOvv8tG3l57DFlIe9WuU6YF5U4E4MhXPuB OaKR9OSxQsNFjb7RLhdKz7VNJw2HVVdtwQ/FU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=cFI3U8QVftJaih5dx9g5k1oSwg9MBWL8taqUtvaB12XUTDt4VbywneAt9xgiizLh8y 1g/yUtORxgK8cpTLygc8iEStmh9Jn6PxraDp6a30XoSOD6PtHaY0jjpJcersUGuH5VyD Mxkmu4/MDR6otHMfSPkHpjbTWOe1pS4S0fIU0= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.216.72.68 with SMTP id s46mr419654wed.68.1236912577367; Thu, 12 Mar 2009 19:49:37 -0700 (PDT) In-Reply-To: References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> Date: Fri, 13 Mar 2009 11:49:37 +0900 X-Google-Sender-Auth: b40393edbd39cefc Message-ID: Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer From: Miles Bader To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Fri, Mar 13, 2009 at 10:50 AM, Miles Bader wrote: > On Fri, Mar 13, 2009 at 10:34 AM, Dan Nicolaescu wrote= : >> Ah, git. =A0Then is probably the same as bug#1589. >> vc-git.el has problems with working with subdirectories. >> >> Do you get this error when you run vc-dir at the top of the git tree? > > My source directory only has one level, so... yes. BTW, Iooked at the entry for bug #1589, and I can't see any obvious connection with my problem... -Mile --=20 Do not taunt Happy Fun Ball. From snogglethorpe@gmail.com Thu Mar 12 19:59:36 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 02:59:36 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-2.9 required=4.0 tests=FOURLA,HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.189]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D2xW57024642 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 19:59:34 -0700 Received: by nf-out-0910.google.com with SMTP id d3so510630nfc.31 for <2652@emacsbugs.donarmstrong.com>; Thu, 12 Mar 2009 19:59:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=ETv6tm11QUZRpOH4g6GB68RD1EAfSlt3etE5GS6O9iI=; b=m5yMODABBBj9u578o0GfJnc4VrQhKkpqBELbQPfnKVPQUS+dXPAuqI8WiP1qWtbDQy 4rjy0guVFYZNogtC5lx3/GffBfycBHYORYTKKnRBxdKdbEtFHbBXBh+aXlPfpdhUxiJ+ wDrv7E4yUEkOJPxvfWtxO0BprggvGYrcrNhSI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=Q898f1W0MIWi9eM28Q4gXFmHg8GWiSoEk+PlY1LhDEXeG/Sg2wJLq0aX9E0HMwHLxh s9FNFF2X+VlugUrawBENwna4KR8/XGbkooQOL4/D3qyPTe76ceLiYZkVngp2Dxc5cIHT 3LdLhXHujW5/CAOCj3tCKfSVtUlAmTeyRoma8= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.216.52.203 with SMTP id e53mr389780wec.209.1236913171778; Thu, 12 Mar 2009 19:59:31 -0700 (PDT) In-Reply-To: References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> Date: Fri, 13 Mar 2009 11:59:31 +0900 X-Google-Sender-Auth: f2ecd71f0652e672 Message-ID: Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer From: Miles Bader To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Here's a script to create an appropriate git repo for testing: #!/bin/sh cd /tmp rm -rf zonk mkdir zonk cd zonk git init echo plugh > ppling git add . git commit -m'Init' -a echo Fnord >> ppling Put that in a file, say "/tmp/mkbugrepo" and execute it with the shell to make the repo, e.g.: sh /tmp/mkbugrepo Now you can start emacs like: (cd /tmp/zonk; HOME=/tmp \emacs -nw -Q ) and continue with the rest of the bug recipe: M-x vc-dir RET RET v Blargh RET C-c C-c Thanks, -Miles -- Do not taunt Happy Fun Ball. From dann@godzilla.ics.uci.edu Fri Mar 13 00:27:34 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 07:27:34 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-5.9 required=4.0 tests=FOURLA,HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D7RU04028479 for <2652@emacsbugs.donarmstrong.com>; Fri, 13 Mar 2009 00:27:31 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id n2D7RIkp009632; Fri, 13 Mar 2009 00:27:18 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2D7RHBI020896; Fri, 13 Mar 2009 00:27:17 -0700 (PDT) Date: Fri, 13 Mar 2009 00:27:17 -0700 (PDT) Message-Id: <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2652@debbugs.gnu.org Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Miles Bader's message of "Fri, 13 Mar 2009 11:59:31 +0900") Lines: 40 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2D7RIkp009632 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Miles Bader writes: > Here's a script to create an appropriate git repo for testing: > > #!/bin/sh > cd /tmp > rm -rf zonk > mkdir zonk > cd zonk > git init > echo plugh > ppling > git add . > git commit -m'Init' -a > echo Fnord >> ppling > > Put that in a file, say "/tmp/mkbugrepo" and execute it with the shell > to make the repo, e.g.: sh /tmp/mkbugrepo > > Now you can start emacs like: > > (cd /tmp/zonk; HOME=/tmp \emacs -nw -Q ) > > and continue with the rest of the bug recipe: > > M-x vc-dir RET RET > v > Blargh RET C-c C-c > Thanks. The immediate cause of the problem is that (vc-git-registered "/tmp/zonk/") returns nil. vc-git-registered is called because vc-finish-log-entry does a `vc-call'. `vc-call' tries to find the corresponding VC backend. Now, the VC backend should be know known at point when the log entry is started, so there should be no need for the vc-call, vc-call-backend could be used... From snogglethorpe@gmail.com Fri Mar 13 00:49:37 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 07:49:37 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-3.0 required=4.0 tests=HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from mail-gx0-f177.google.com (mail-gx0-f177.google.com [209.85.217.177]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2D7nWNg000897 for <2652@emacsbugs.donarmstrong.com>; Fri, 13 Mar 2009 00:49:33 -0700 Received: by gxk25 with SMTP id 25so2721992gxk.1 for <2652@emacsbugs.donarmstrong.com>; Fri, 13 Mar 2009 00:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=zQlR8E5S/m008a1RLcc7rqZRMtCOyIK5yPJoleqP47I=; b=JbVwu1JwCNrIWOel5SzGNOhG2bsRiOCjMxaxn3Xkgm1Box6HKQYsvZxrVLe2T5wP6l Ywy/BZvI6hfno+53dE0Wo6pIhBcWiNQUZyo/S6wYJVmSWbjKK6zqDki3KDkCr4dnfpwi 4tRBQb8KVA9ShcdwjvXXbneD9VftIQ2hRG1f8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=GrSx+bsM1kmRsRYGiQJtuiwsVN+d8C0IHPY/T4EEA+NAEd0ZF8jXvpiAeogUDJEA+0 FOe7ogBadQIjA4uJL7tpk23BDEbcjoYyuic1911G2AFGBOtjAubXkUBeWKY628sm9qki NyCS6OZCXZLOipgme1GCyrqQJBHbRAXVTNMQE= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.90.69.15 with SMTP id r15mr181173aga.107.1236930566577; Fri, 13 Mar 2009 00:49:26 -0700 (PDT) In-Reply-To: <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> Date: Fri, 13 Mar 2009 16:49:26 +0900 X-Google-Sender-Auth: 86ac951737c64064 Message-ID: Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer From: Miles Bader To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Fri, Mar 13, 2009 at 4:27 PM, Dan Nicolaescu wrote: > Thanks. > The immediate cause of the problem is that > (vc-git-registered "/tmp/zonk/") > returns nil. > > vc-git-registered is called because vc-finish-log-entry does a > `vc-call'. =A0`vc-call' tries to find the corresponding VC backend. > > Now, the VC backend should be know known at point when the log entry is > started, so there should be no need for the vc-call, vc-call-backend > could be used... Is there anybody driving the design of the vc rewrite at this point? Thanks, -Miles --=20 Do not taunt Happy Fun Ball. From dann@godzilla.ics.uci.edu Fri Mar 13 08:31:53 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 15:31:53 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-5.9 required=4.0 tests=FOURLA,HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2DFVnHA001334 for <2652@emacsbugs.donarmstrong.com>; Fri, 13 Mar 2009 08:31:50 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n2DFVXLk028361; Fri, 13 Mar 2009 08:31:33 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2DFVXIO023926; Fri, 13 Mar 2009 08:31:33 -0700 (PDT) Date: Fri, 13 Mar 2009 08:31:33 -0700 (PDT) Message-Id: <200903131531.n2DFVXIO023926@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2652@debbugs.gnu.org Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Miles Bader's message of "Fri, 13 Mar 2009 16:49:26 +0900") Lines: 23 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2DFVXLk028361 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Miles Bader writes: > On Fri, Mar 13, 2009 at 4:27 PM, Dan Nicolaescu wrot= e: > > Thanks. > > The immediate cause of the problem is that > > (vc-git-registered "/tmp/zonk/") > > returns nil. > > > > vc-git-registered is called because vc-finish-log-entry does a > > `vc-call'. =C2=A0`vc-call' tries to find the corresponding VC backend. > > > > Now, the VC backend should be know known at point when the log entry = is > > started, so there should be no need for the vc-call, vc-call-backend > > could be used... >=20 > Is there anybody driving the design of the vc rewrite at this point? Not AFAIK. But in this particular case it's not a question of redesign. IMHO the best bet at this point is to get vc-git-registered fixed. And maybe ask Stefan, maybe he knows the `vc-checkin' code better to say if getting rid of `vc-call' is TRTD. From dann@godzilla.ics.uci.edu Fri Mar 13 09:22:25 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Mar 2009 16:22:26 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-6.0 required=4.0 tests=HAS_BUG_NUMBER, MURPHY_DRUGS_REL8,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2DGMN6G016385 for <2652@emacsbugs.donarmstrong.com>; Fri, 13 Mar 2009 09:22:24 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id n2DGMA9w016292; Fri, 13 Mar 2009 09:22:10 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2DGMAZG024224; Fri, 13 Mar 2009 09:22:10 -0700 (PDT) Date: Fri, 13 Mar 2009 09:22:10 -0700 (PDT) Message-Id: <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2652@debbugs.gnu.org Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Miles Bader's message of "Fri, 13 Mar 2009 16:49:26 +0900") Lines: 78 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2DGMA9w016292 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Miles Bader writes: > On Fri, Mar 13, 2009 at 4:27 PM, Dan Nicolaescu wrot= e: > > Thanks. > > The immediate cause of the problem is that > > (vc-git-registered "/tmp/zonk/") > > returns nil. > > > > vc-git-registered is called because vc-finish-log-entry does a > > `vc-call'. =C2=A0`vc-call' tries to find the corresponding VC backend. > > > > Now, the VC backend should be know known at point when the log entry = is > > started, so there should be no need for the vc-call, vc-call-backend > > could be used... You can try this patch that passes down the VC backend.=20=20 Not tested beyond M-x byte-compile-file. --- vc.el.~1.711.~ Thu Jan 8 14:24:05 2009 +++ vc.el Fri Mar 13 09:14:58 2009 @@ -1085,13 +1085,13 @@ (if (not ready-for-commit) (message "No files remain to be committed") (if (not verbose) - (vc-checkin ready-for-commit) + (vc-checkin ready-for-commit backend) (progn (setq revision (read-string "New revision or backend: ")) (let ((vsym (intern (upcase revision)))) (if (member vsym vc-handled-backends) (dolist (file files) (vc-transfer-file file vsym)) - (vc-checkin ready-for-commit revision)))))))) + (vc-checkin ready-for-commit backend revision)))))))) ;; locked by somebody else (locking VCSes only) ((stringp state) ;; In the old days, we computed the revision once and used it on @@ -1327,7 +1327,7 @@ ".\n") (message "Please explain why you stole the lock. Type C-c C-c when do= ne."))) =20 -(defun vc-checkin (files &optional rev comment initial-contents) +(defun vc-checkin (files backend &optional rev comment initial-contents) "Check in FILES. The optional argument REV may be a string specifying the new revision level (if nil increment the current level). COMMENT is a comment @@ -1341,6 +1341,7 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'." (when vc-before-checkin-hook (run-hooks 'vc-before-checkin-hook)) + (lexical-let ((backend backend)) (vc-start-logentry files rev comment initial-contents "Enter a change comment." @@ -1356,13 +1357,13 @@ ;; We used to change buffers to get local value of vc-checkin-switch= es, ;; but 'the' local buffer is not a well-defined concept for filesets. (progn - (vc-call checkin files rev comment) + (vc-call-backend backend 'checkin files rev comment) (mapc 'vc-delete-automatic-version-backups files)) `((vc-state . up-to-date) (vc-checkout-time . ,(nth 5 (file-attributes file))) (vc-working-revision . nil))) (message "Checking in %s...done" (vc-delistify files))) - 'vc-checkin-hook)) + 'vc-checkin-hook))) =20 ;;; Additional entry points for examining version histories =20 @@ -2096,7 +2097,7 @@ (when (or move edited) (vc-file-setprop file 'vc-state 'edited) (vc-mode-line file) - (vc-checkin file nil comment (stringp comment))))) + (vc-checkin file new-backend nil comment (stringp comment))))) =20 (defun vc-rename-master (oldmaster newfile templates) "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES." From dann@godzilla.ics.uci.edu Sat Mar 14 09:03:25 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 14 Mar 2009 16:03:25 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-6.0 required=4.0 tests=HAS_BUG_NUMBER, MURPHY_DRUGS_REL8,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2EG3MG8024900 for <2652@emacsbugs.donarmstrong.com>; Sat, 14 Mar 2009 09:03:23 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id n2EG33BO012976; Sat, 14 Mar 2009 09:03:03 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2EG327C002787; Sat, 14 Mar 2009 09:03:02 -0700 (PDT) Date: Sat, 14 Mar 2009 09:03:02 -0700 (PDT) Message-Id: <200903141603.n2EG327C002787@godzilla.ics.uci.edu> From: Dan Nicolaescu To: 2652@debbugs.gnu.org Cc: Miles Bader , Stefan Monnier Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Fri, 13 Mar 2009 09:22:10 -0700 (PDT)") Lines: 86 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2EG33BO012976 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Dan Nicolaescu writes: > Miles Bader writes: >=20 > > On Fri, Mar 13, 2009 at 4:27 PM, Dan Nicolaescu = wrote: > > > Thanks. > > > The immediate cause of the problem is that > > > (vc-git-registered "/tmp/zonk/") > > > returns nil. > > > > > > vc-git-registered is called because vc-finish-log-entry does a > > > `vc-call'. =C2=A0`vc-call' tries to find the corresponding VC bac= kend. > > > > > > Now, the VC backend should be know known at point when the log en= try is > > > started, so there should be no need for the vc-call, vc-call-back= end > > > could be used... >=20 > You can try this patch that passes down the VC backend.=20=20 > Not tested beyond M-x byte-compile-file. I have now tested this, and it seems to work fine. But I don't really want to check it in at this point without an explicit request from Stefan. > --- vc.el.~1.711.~ Thu Jan 8 14:24:05 2009 > +++ vc.el Fri Mar 13 09:14:58 2009 > @@ -1085,13 +1085,13 @@ > (if (not ready-for-commit) > (message "No files remain to be committed") > (if (not verbose) > - (vc-checkin ready-for-commit) > + (vc-checkin ready-for-commit backend) > (progn > (setq revision (read-string "New revision or backend: ")) > (let ((vsym (intern (upcase revision)))) > (if (member vsym vc-handled-backends) > (dolist (file files) (vc-transfer-file file vsym)) > - (vc-checkin ready-for-commit revision)))))))) > + (vc-checkin ready-for-commit backend revision)))))))) > ;; locked by somebody else (locking VCSes only) > ((stringp state) > ;; In the old days, we computed the revision once and used it on > @@ -1327,7 +1327,7 @@ > ".\n") > (message "Please explain why you stole the lock. Type C-c C-c whe= n done."))) >=20=20 > -(defun vc-checkin (files &optional rev comment initial-contents) > +(defun vc-checkin (files backend &optional rev comment initial-content= s) > "Check in FILES. > The optional argument REV may be a string specifying the new revision > level (if nil increment the current level). COMMENT is a comment > @@ -1341,6 +1341,7 @@ > Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'." > (when vc-before-checkin-hook > (run-hooks 'vc-before-checkin-hook)) > + (lexical-let ((backend backend)) > (vc-start-logentry > files rev comment initial-contents > "Enter a change comment." > @@ -1356,13 +1357,13 @@ > ;; We used to change buffers to get local value of vc-checkin-sw= itches, > ;; but 'the' local buffer is not a well-defined concept for file= sets. > (progn > - (vc-call checkin files rev comment) > + (vc-call-backend backend 'checkin files rev comment) > (mapc 'vc-delete-automatic-version-backups files)) > `((vc-state . up-to-date) > (vc-checkout-time . ,(nth 5 (file-attributes file))) > (vc-working-revision . nil))) > (message "Checking in %s...done" (vc-delistify files))) > - 'vc-checkin-hook)) > + 'vc-checkin-hook))) >=20=20 > ;;; Additional entry points for examining version histories >=20=20 > @@ -2096,7 +2097,7 @@ > (when (or move edited) > (vc-file-setprop file 'vc-state 'edited) > (vc-mode-line file) > - (vc-checkin file nil comment (stringp comment))))) > + (vc-checkin file new-backend nil comment (stringp comment))))) >=20=20 > (defun vc-rename-master (oldmaster newfile templates) > "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLAT= ES." From monnier@iro.umontreal.ca Sat Mar 14 19:09:49 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 15 Mar 2009 02:09:49 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-0.5 required=4.0 tests=HAS_BUG_NUMBER, MURPHY_DRUGS_REL8,XIRONPORT autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from ironport2-out.teksavvy.com (ironport2-out.teksavvy.com [206.248.154.182]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2F29jAu001234 for <2652@emacsbugs.donarmstrong.com>; Sat, 14 Mar 2009 19:09:47 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqoEAPP/u0lFxIZP/2dsb2JhbACBTc5tg38GhEmCRw X-IronPort-AV: E=Sophos;i="4.38,364,1233550800"; d="scan'208";a="35209115" Received: from 69-196-134-79.dsl.teksavvy.com (HELO ceviche.home) ([69.196.134.79]) by ironport2-out.teksavvy.com with ESMTP; 14 Mar 2009 22:09:39 -0400 Received: by ceviche.home (Postfix, from userid 20848) id 801FFB4121; Sat, 14 Mar 2009 22:09:39 -0400 (EDT) From: Stefan Monnier To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org, Miles Bader Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer Message-ID: References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> <200903141603.n2EG327C002787@godzilla.ics.uci.edu> Date: Sat, 14 Mar 2009 22:09:39 -0400 In-Reply-To: <200903141603.n2EG327C002787@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Sat, 14 Mar 2009 09:03:02 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.90 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii > But I don't really want to check it in at this point without an explicit > request from Stefan. Removing calls to determine the backend (and replace them with backend info propagated from elsewhere) is generally a good thing. I think your patch looks good. Stefan From snogglethorpe@gmail.com Sat Mar 14 19:30:45 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 15 Mar 2009 02:30:45 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-3.0 required=4.0 tests=HAS_BUG_NUMBER, MURPHY_DRUGS_REL8 autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from yx-out-2324.google.com (yx-out-2324.google.com [74.125.44.30]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2F2UgAJ007678 for <2652@emacsbugs.donarmstrong.com>; Sat, 14 Mar 2009 19:30:43 -0700 Received: by yx-out-2324.google.com with SMTP id 8so1304697yxg.31 for <2652@emacsbugs.donarmstrong.com>; Sat, 14 Mar 2009 19:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=+/Jdq4NL6+Bqtom84V2s5IWVd6SELBVZ8K3pUW0TEL8=; b=ZZXwbbkuCE6q6yrShk+LzuJJULLLoz1paKTNoGvF7ukj247IzIu6cTECR0WcveXTZr MeVX2T8zpvxFeb2IUNA3FZzcb9HU0sQeMyo7tco3J8QG6Qp89b/Edcs2hWKWKqWiRQTn jGpDKDnZq1+K3AbhY1Rm7tTE6PnGZXQ/lZ/GM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=jMZ6U12wZwUQZpETd7AqbxnZqdqvOT/Ltbe7SHEt6TnHJzm8I7k7WfQ7vx7evh2EnD BtsbC+zGsVCFzyi+b7/7gBBm8SjxgXLpTOWdsBtBOxTQHLIsMcUgjkL/jtMYo3u+1/h8 EuTc2XDqvag+F7XjRQ/QKOw9p/oiS49WMZa7M= MIME-Version: 1.0 Sender: snogglethorpe@gmail.com Received: by 10.231.10.140 with SMTP id p12mr636470ibp.12.1237084241578; Sat, 14 Mar 2009 19:30:41 -0700 (PDT) In-Reply-To: <200903141603.n2EG327C002787@godzilla.ics.uci.edu> References: <87iqmemgyi.fsf@catnip.gol.com> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> <200903141603.n2EG327C002787@godzilla.ics.uci.edu> Date: Sun, 15 Mar 2009 11:30:41 +0900 X-Google-Sender-Auth: c6bab505ea773f43 Message-ID: Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer From: Miles Bader To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org, Stefan Monnier Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit I tried your patch, and git directory commits seem to work well with it applied!! Thanks, -Miles -- Do not taunt Happy Fun Ball. From dann@godzilla.ics.uci.edu Sun Mar 15 02:05:58 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 15 Mar 2009 09:05:59 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-6.0 required=4.0 tests=HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2F95uQ0016277 for <2652@emacsbugs.donarmstrong.com>; Sun, 15 Mar 2009 02:05:57 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id n2F95eSA003075; Sun, 15 Mar 2009 02:05:40 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2F95eCa015414; Sun, 15 Mar 2009 02:05:40 -0700 (PDT) Date: Sun, 15 Mar 2009 02:05:40 -0700 (PDT) Message-Id: <200903150905.n2F95eCa015414@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Miles Bader Cc: 2652@debbugs.gnu.org Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Miles Bader's message of "Fri, 13 Mar 2009 16:49:26 +0900") Lines: 20 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2F95eSA003075 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Miles Bader writes: > On Fri, Mar 13, 2009 at 4:27 PM, Dan Nicolaescu wrot= e: > > Thanks. > > The immediate cause of the problem is that > > (vc-git-registered "/tmp/zonk/") > > returns nil. > > > > vc-git-registered is called because vc-finish-log-entry does a > > `vc-call'. =C2=A0`vc-call' tries to find the corresponding VC backend. > > > > Now, the VC backend should be know known at point when the log entry = is > > started, so there should be no need for the vc-call, vc-call-backend > > could be used... >=20 > Is there anybody driving the design of the vc rewrite at this point? BTW, IMO at this point there no real need for a vc rewrite. There are missing features, and maybe bugs, but the rewrite has put vc on a good footing. From dann@godzilla.ics.uci.edu Sun Mar 15 02:07:52 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 15 Mar 2009 09:07:52 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-6.0 required=4.0 tests=HAS_BUG_NUMBER, MURPHY_DRUGS_REL8,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2F97nwd016329 for <2652@emacsbugs.donarmstrong.com>; Sun, 15 Mar 2009 02:07:50 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id n2F97aK9003408; Sun, 15 Mar 2009 02:07:36 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2F97Z1W015415; Sun, 15 Mar 2009 02:07:35 -0700 (PDT) Date: Sun, 15 Mar 2009 02:07:35 -0700 (PDT) Message-Id: <200903150907.n2F97Z1W015415@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Stefan Monnier Cc: 2652@debbugs.gnu.org, Miles Bader Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> <200903141603.n2EG327C002787@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Stefan Monnier's message of "Sat, 14 Mar 2009 22:09:39 -0400") Lines: 12 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2F97aK9003408 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Stefan Monnier writes: > > But I don't really want to check it in at this point without an explicit > > request from Stefan. > > Removing calls to determine the backend (and replace them with backend > info propagated from elsewhere) is generally a good thing. I think your > patch looks good. Thanks. I checked it in. vc-git-registered still needs changes to deal with directories. Alexandre Julliard will look at that when he gets a chance. From lekktu@gmail.com Mon Mar 16 03:01:04 2009 Received: (at control) by emacsbugs.donarmstrong.com; 16 Mar 2009 10:01:04 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: ** X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=2.3 required=4.0 tests=MISSING_SUBJECT,NOSUBJECT, VALID_BTS_CONTROL autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from mail-ew0-f176.google.com (mail-ew0-f176.google.com [209.85.219.176]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2GA10nD005328 for ; Mon, 16 Mar 2009 03:01:02 -0700 Received: by ewy24 with SMTP id 24so3587653ewy.1 for ; Mon, 16 Mar 2009 03:00:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=i6IWS3kEaldcXATEjc4+iRbM405bcENCpisDOFppCtw=; b=Hr41hZGojSatEArIZiK6b8DP19WSH9hAXKffgR6KgAJpGEukaxRUpwJ2DYKQy4tiaL Qaxj23iT5EY+IDYJQ46T5m4o4YXz7xoLVqOhFuYx9C8cf9ApPR+MptKVIZJ0EnZhm6Gi 8OwdesaKCHqzyoP8Q0uOVfsDg+AGB3msdo2WI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; b=bTr3uyoFB+I4PLEOs8dBEFc59Tbb5Caeyg90qH/jwLrLsX0vZAEKYo+OA2+b6VDzSY pzBAjl2JY0En+h4GH2SmjNF9FxUNGUNButic4TKhyrI6eqTKgC/oxVCCnYIhKMMD8fec 6BqVXQCjaqlc017pT/JkNNloTxNOqSe+yF4Tg= MIME-Version: 1.0 Received: by 10.210.136.10 with SMTP id j10mr3422472ebd.24.1237197655309; Mon, 16 Mar 2009 03:00:55 -0700 (PDT) Date: Mon, 16 Mar 2009 11:00:55 +0100 Message-ID: Subject: From: Juanma Barranquero To: control@debbugs.gnu.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit reassign 2682 spam reassign 2641 emacs,vc-dir reassign 2652 emacs,vc-dir reassign 2675 emacs,vc-dir reassign 2676 emacs,vc-dir reassign 2678 emacs,vc-dir reassign 2662 emacs,ns reassign 2663 emacs,ns quit From lekktu@gmail.com Tue Mar 17 02:22:15 2009 Received: (at control) by emacsbugs.donarmstrong.com; 17 Mar 2009 09:22:15 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: ** X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=2.3 required=4.0 tests=MISSING_SUBJECT,NOSUBJECT, VALID_BTS_CONTROL autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from mail-ew0-f176.google.com (mail-ew0-f176.google.com [209.85.219.176]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2H9MCD0005523 for ; Tue, 17 Mar 2009 02:22:14 -0700 Received: by ewy24 with SMTP id 24so3991757ewy.1 for ; Tue, 17 Mar 2009 02:22:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=8kg3xZo7LkfeWm8/N+Bb5gCTHDvSowOAk/GT0NUKjNc=; b=sS/XKophFfzDqrpZxSKYexjpSHOEBgWFBIntADHTWgLQ7xAkX2LJay0VW5/a9alnYU JqK5mkqwrC9L2Iu+b+OHuLWMs4dh1ivw0p3TpVFe4KfkhmlI8VYyhAH9+vGdgV/V/aj8 ZjrZbQHD9z3NgdBNX9dcvrhXE1JDzicWFM4Uo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; b=epHiHh4jTH8hNQ3Z9W+sdmPMWG5K8t56w3EIXDv+nyc7uMUO0OebD87ssmj47nN/8V gEn2T5weZyGT7QqOtX3mDXQokeXZQjhWmeLaUkSzN5IXPiPJhZ8VSTSKiUUROU4m5YrP Wm9HxlDTvoTR98dZx15fhqd+5ewRn1t26NJDo= MIME-Version: 1.0 Received: by 10.210.139.15 with SMTP id m15mr4357553ebd.9.1237281726835; Tue, 17 Mar 2009 02:22:06 -0700 (PDT) Date: Tue, 17 Mar 2009 10:22:06 +0100 Message-ID: Subject: From: Juanma Barranquero To: control@debbugs.gnu.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit reassign 337 emacs,vc reassign 768 emacs,vc reassign 927 emacs,vc reassign 996 emacs,vc reassign 1098 emacs,vc reassign 1163 emacs,vc reassign 1256 emacs,vc reassign 1257 emacs,vc reassign 1408 emacs,vc reassign 1429 emacs,vc reassign 1589 emacs,vc reassign 1647 emacs,w32,vc reassign 1741 emacs,vc reassign 2093 emacs,vc reassign 2110 emacs,vc reassign 2117 emacs,vc reassign 2157 emacs,vc reassign 2338 emacs,vc reassign 2553 emacs,vc reassign 2598 emacs,vc reassign 2604 emacs,vc reassign 2612 emacs,vc reassign 2641 emacs,vc reassign 2652 emacs,vc reassign 2675 emacs,vc reassign 2676 emacs,vc reassign 2678 emacs,vc quit From dann@godzilla.ics.uci.edu Mon Mar 23 09:38:03 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 23 Mar 2009 16:38:03 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-5.9 required=4.0 tests=FOURLA,HAS_BUG_NUMBER, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2NGc0IF007565 for <2652@emacsbugs.donarmstrong.com>; Mon, 23 Mar 2009 09:38:01 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id n2NGbn8N027687; Mon, 23 Mar 2009 09:37:49 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n2NGbmvo010899; Mon, 23 Mar 2009 09:37:48 -0700 (PDT) Date: Mon, 23 Mar 2009 09:37:48 -0700 (PDT) Message-Id: <200903231637.n2NGbmvo010899@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Stefan Monnier Cc: 2652@debbugs.gnu.org, Miles Bader Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> <200903141603.n2EG327C002787@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Stefan Monnier's message of "Sat, 14 Mar 2009 22:09:39 -0400") Lines: 62 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n2NGbn8N027687 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Stefan Monnier writes: > > But I don't really want to check it in at this point without an explicit > > request from Stefan. > > Removing calls to determine the backend (and replace them with backend > info propagated from elsewhere) is generally a good thing. How about this one? It removes an extra vc-backend call for each VC managed file. And another one could be eliminated, but I am not 100% sure what this comment means: ;; Let the backend setup any buffer-local things he needs. (vc-call-backend (vc-backend buffer-file-name) 'find-file-hook)) --- vc-hooks.el.~1.276.~ Fri Jan 30 15:35:05 2009 +++ vc-hooks.el Sun Mar 22 21:05:25 2009 @@ -761,12 +761,12 @@ (define-key map [mode-line down-mouse-1] vc-menu-entry) map)) -(defun vc-mode-line (file) +(defun vc-mode-line (file &optional backend-arg) "Set `vc-mode' to display type of version control for FILE. The value is set in the current buffer, which should be the buffer visiting FILE." (interactive (list buffer-file-name)) - (let ((backend (vc-backend file))) + (let ((backend (or backend-arg (vc-backend file)))) (if (not backend) (setq vc-mode nil) (let* ((ml-string (vc-call-backend backend 'mode-line-string file)) @@ -868,15 +868,16 @@ "Function for `find-file-hook' activating VC mode if appropriate." ;; Recompute whether file is version controlled, ;; if user has killed the buffer and revisited. - (if vc-mode - (setq vc-mode nil)) + (when vc-mode + (setq vc-mode nil)) + (let (bk) (when buffer-file-name (vc-file-clearprops buffer-file-name) (add-hook 'mode-line-hook 'vc-mode-line nil t) (cond - ((with-demoted-errors (vc-backend buffer-file-name)) + ((setq bk (with-demoted-errors (vc-backend buffer-file-name))) ;; Compute the state and put it in the modeline. - (vc-mode-line buffer-file-name) + (vc-mode-line buffer-file-name bk) (unless vc-make-backup-files ;; Use this variable, not make-backup-files, ;; because this is for things that depend on the file name. @@ -909,7 +910,7 @@ (vc-find-file-hook)) (message "Warning: editing through the link bypasses version control") - )))))))) + ))))))))) (add-hook 'find-file-hook 'vc-find-file-hook) From monnier@IRO.UMontreal.CA Mon Mar 23 10:34:15 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 23 Mar 2009 17:34:16 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-3.0 required=4.0 tests=HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from pruche.dit.umontreal.ca (pruche.dit.umontreal.ca [132.204.246.22]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n2NHYCxB022661 for <2652@emacsbugs.donarmstrong.com>; Mon, 23 Mar 2009 10:34:13 -0700 Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id n2NHYBtG004172; Mon, 23 Mar 2009 13:34:11 -0400 Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 3FD8380B49; Mon, 23 Mar 2009 13:34:11 -0400 (EDT) From: Stefan Monnier To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org, Miles Bader Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer Message-ID: References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> <200903141603.n2EG327C002787@godzilla.ics.uci.edu> <200903231637.n2NGbmvo010899@godzilla.ics.uci.edu> Date: Mon, 23 Mar 2009 13:34:11 -0400 In-Reply-To: <200903231637.n2NGbmvo010899@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Mon, 23 Mar 2009 09:37:48 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3237=0 >> > But I don't really want to check it in at this point without an explicit >> > request from Stefan. >> Removing calls to determine the backend (and replace them with backend >> info propagated from elsewhere) is generally a good thing. > How about this one? Doesn't look too bad, tho "backend-arg" rings pretty poorly. I think this hints at the need to just use a single `backend' var (moved out of the let into the arg) which is then defaulted via (unless backend (setq backend (vc-backend file))). > It removes an extra vc-backend call for each VC managed file. Good. Note that the issue is not performance but semantics: in most/all of those cases, the behavior would be at best odd if the recomputed backend were different from the caller's idea. > And another one could be eliminated, but I am not 100% sure what this > comment means: > ;; Let the backend setup any buffer-local things he needs. > (vc-call-backend (vc-backend buffer-file-name) 'find-file-hook)) The comment just means "run a hook so the backend can set things up". Grep for "vc-.*-find-file-hook" to see for what it is currently used. So yes, this should just use `backend' (which I'd prefer over `bk'). Stefan From dann@godzilla.ics.uci.edu Tue Apr 7 09:26:39 2009 Received: (at control) by emacsbugs.donarmstrong.com; 7 Apr 2009 16:26:39 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.0 required=4.0 tests=MURPHY_DRUGS_REL8,ONEWORD, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n37GQaKl024097 for ; Tue, 7 Apr 2009 09:26:37 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n37GQJeA013969 for ; Tue, 7 Apr 2009 09:26:19 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n37GQIRq022682; Tue, 7 Apr 2009 09:26:18 -0700 (PDT) Date: Tue, 7 Apr 2009 09:26:18 -0700 (PDT) Message-Id: <200904071626.n37GQIRq022682@godzilla.ics.uci.edu> From: Dan Nicolaescu To: control@debbugs.gnu.org Subject: commands X-Debbugs-No-Ack: yes Lines: 9 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n37GQJeA013969 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu close 1098 tags 2065 + patch close 2110 close 2117 close 2604 close 2652 close 2675 retitle 2678 vc-git-register not working when passed a directory argument merge 1589 2641 From dann@godzilla.ics.uci.edu Mon Apr 13 10:02:55 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Apr 2009 17:02:55 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-5.9 required=4.0 tests=FOURLA,FVGT_m_MULTI_ODD, HAS_BUG_NUMBER,MURPHY_DRUGS_REL8,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from sallyv2.ics.uci.edu (sallyv2.ics.uci.edu [128.195.1.120]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n3DH2qQG017996 for <2652@emacsbugs.donarmstrong.com>; Mon, 13 Apr 2009 10:02:53 -0700 Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by sallyv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n3DH2ahS013215; Mon, 13 Apr 2009 10:02:36 -0700 (PDT) Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n3DH2Zsj025829; Mon, 13 Apr 2009 10:02:35 -0700 (PDT) Date: Mon, 13 Apr 2009 10:02:35 -0700 (PDT) Message-Id: <200904131702.n3DH2Zsj025829@godzilla.ics.uci.edu> From: Dan Nicolaescu To: Stefan Monnier Cc: 2652@debbugs.gnu.org, Miles Bader Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> <200903141603.n2EG327C002787@godzilla.ics.uci.edu> X-Debbugs-No-Ack: yes In-Reply-To: (Stefan Monnier's message of "Sat, 14 Mar 2009 22:09:39 -0400") Lines: 179 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n3DH2ahS013215 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-0.263, required 5, autolearn=disabled, ALL_TRUSTED -1.44, FM_MULTI_ODD2 1.10, TW_SV 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu Stefan Monnier writes: > > But I don't really want to check it in at this point without an explicit > > request from Stefan. > > Removing calls to determine the backend (and replace them with backend > info propagated from elsewhere) is generally a good thing. I think your > patch looks good. Here's another patch of the same kind: it removes vc-backend calls for vc-stay-local-p. OK or 23.2? Index: vc-cvs.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/vc-cvs.el,v retrieving revision 1.163 diff -u -3 -p -r1.163 vc-cvs.el --- vc-cvs.el 5 Jan 2009 03:19:51 -0000 1.163 +++ vc-cvs.el 13 Apr 2009 16:43:24 -0000 @@ -216,7 +216,7 @@ See also variable `vc-cvs-sticky-date-fo (defun vc-cvs-state (file) "CVS-specific version of `vc-state'." - (if (vc-stay-local-p file) + (if (vc-stay-local-p file 'CVS) (let ((state (vc-file-getprop file 'vc-state))) ;; If we should stay local, use the heuristic but only if ;; we don't have a more precise state already available. @@ -496,7 +496,7 @@ Will fail unless you have administrative ;; It's just the catenation of the individual logs. (vc-cvs-command buffer - (if (vc-stay-local-p files) 'async 0) + (if (vc-stay-local-p files 'CVS) 'async 0) files "log")) (defun vc-cvs-comment-history (file) @@ -506,7 +506,7 @@ Will fail unless you have administrative (defun vc-cvs-diff (files &optional oldvers newvers buffer) "Get a difference report using CVS between two revisions of FILE." (let* ((async (and (not vc-disable-async-diff) - (vc-stay-local-p files))) + (vc-stay-local-p files 'CVS))) (invoke-cvs-diff-list nil) status) ;; Look through the file list and see if any files have backups @@ -559,7 +559,7 @@ Will fail unless you have administrative "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER. Optional arg REVISION is a revision to annotate from." (vc-cvs-command buffer - (if (vc-stay-local-p file) + (if (vc-stay-local-p file 'CVS) 'async 0) file "annotate" (if revision (concat "-r" revision))) @@ -681,8 +681,9 @@ If UPDATE is non-nil, then update (resyn ;;; Miscellaneous ;;; -(defalias 'vc-cvs-make-version-backups-p 'vc-stay-local-p - "Return non-nil if version backups should be made for FILE.") +(defun vc-cvs-make-version-backups-p (file) + "Return non-nil if version backups should be made for FILE." + (vc-stay-local-p file 'CVS)) (defun vc-cvs-check-headers () "Check if the current file has any headers in it." @@ -706,7 +707,8 @@ and that it passes `vc-cvs-global-switch (append vc-cvs-global-switches flags)))) -(defalias 'vc-cvs-stay-local-p 'vc-stay-local-p) ;Back-compatibility. +(defun vc-cvs-stay-local-p (file) + (vc-stay-local-p file 'CVS)) (defun vc-cvs-repository-hostname (dirname) "Hostname of the CVS server associated to workarea DIRNAME." @@ -965,7 +967,7 @@ state." (defun vc-cvs-dir-status (dir update-function) "Create a list of conses (file . state) for DIR." ;; FIXME check all files in DIR instead? - (let ((local (vc-stay-local-p dir))) + (let ((local (vc-stay-local-p dir 'CVS))) (if (and local (not (eq local 'only-file))) (vc-cvs-dir-status-heuristic dir update-function) (vc-cvs-command (current-buffer) 'async dir "-f" "status") Index: vc-hooks.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/vc-hooks.el,v retrieving revision 1.277 diff -u -3 -p -r1.277 vc-hooks.el --- vc-hooks.el 1 Apr 2009 15:42:12 -0000 1.277 +++ vc-hooks.el 13 Apr 2009 16:43:24 -0000 @@ -168,15 +168,15 @@ by these regular expressions." :version "23.1" :group 'vc) -(defun vc-stay-local-p (file) +(defun vc-stay-local-p (file &optional backend) "Return non-nil if VC should stay local when handling FILE. This uses the `repository-hostname' backend operation. If FILE is a list of files, return non-nil if any of them individually should stay local." (if (listp file) - (delq nil (mapcar 'vc-stay-local-p file)) - (let* ((backend (vc-backend file)) - (sym (vc-make-backend-sym backend 'stay-local)) + (delq nil (mapcar (lambda (arg) (vc-stay-local-p arg backend)) file)) + (setq backend (or backend (vc-backend file))) + (let* ((sym (vc-make-backend-sym backend 'stay-local)) (stay-local (if (boundp sym) (symbol-value sym) vc-stay-local))) (if (symbolp stay-local) stay-local (let ((dirname (if (file-directory-p file) Index: vc-svn.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/vc-svn.el,v retrieving revision 1.112 diff -u -3 -p -r1.112 vc-svn.el --- vc-svn.el 10 Feb 2009 05:59:14 -0000 1.112 +++ vc-svn.el 13 Apr 2009 16:43:25 -0000 @@ -142,7 +142,7 @@ want to force an empty list of arguments (defun vc-svn-state (file &optional localp) "SVN-specific version of `vc-state'." - (setq localp (or localp (vc-stay-local-p file))) + (setq localp (or localp (vc-stay-local-p file 'SVN))) (with-temp-buffer (cd (file-name-directory file)) (vc-svn-command t 0 file "status" (if localp "-v" "-u")) @@ -176,7 +176,7 @@ want to force an empty list of arguments ;; FIXME are there other possible combinations? (cond ((eq state 'edited) (setq state 'needs-merge)) ((not state) (setq state 'needs-update)))) - (when state + (when (and state (not (string= "." filename))) (setq result (cons (list filename state) result))))) (funcall callback result))) @@ -189,7 +189,7 @@ RESULT is a list of conses (FILE . STATE ;; calling synchronously (vc-svn-registered DIR) => calling svn status -v DIR ;; which is VERY SLOW for big trees and it makes emacs ;; completely unresponsive during that time. - (let* ((local (and nil (vc-stay-local-p dir))) + (let* ((local (and nil (vc-stay-local-p dir 'SVN))) (remote (or t (not local) (eq local 'only-file)))) (vc-svn-command (current-buffer) 'async nil "status" (if remote "-u")) @@ -470,7 +470,7 @@ or svn+ssh://." (vc-svn-command buffer 'async - ;; (if (and (= (length files) 1) (vc-stay-local-p file)) 'async 0) + ;; (if (and (= (length files) 1) (vc-stay-local-p file 'SVN)) 'async 0) (list file) "log" ;; By default Subversion only shows the log up to the @@ -502,7 +502,7 @@ or svn+ssh://." (list "--diff-cmd=diff" "-x" (mapconcat 'identity (vc-switches nil 'diff) " ")))) (async (and (not vc-disable-async-diff) - (vc-stay-local-p files) + (vc-stay-local-p files 'SVN) (or oldvers newvers)))) ; Svn diffs those locally. (apply 'vc-svn-command buffer (if async 'async 0) @@ -543,8 +543,9 @@ NAME is assumed to be a URL." ;;; ;; Subversion makes backups for us, so don't bother. -;; (defalias 'vc-svn-make-version-backups-p 'vc-stay-local-p -;; "Return non-nil if version backups should be made for FILE.") +;; (defun vc-svn-make-version-backups-p (file) +;; "Return non-nil if version backups should be made for FILE." +;; (vc-stay-local-p file 'SVN)) (defun vc-svn-check-headers () "Check if the current file has any headers in it." From monnier@iro.umontreal.ca Mon Apr 13 11:03:31 2009 Received: (at 2652) by emacsbugs.donarmstrong.com; 13 Apr 2009 18:03:32 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-0.5 required=4.0 tests=HAS_BUG_NUMBER, MURPHY_DRUGS_REL8,XIRONPORT autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from ironport2-out.teksavvy.com (ironport2-out.teksavvy.com [206.248.154.182]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n3DI3TAk001381 for <2652@emacsbugs.donarmstrong.com>; Mon, 13 Apr 2009 11:03:30 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AiAFAPwa40lLd+7D/2dsb2JhbACBUstbg3wGhRaCMQ X-IronPort-AV: E=Sophos;i="4.40,180,1238990400"; d="scan'208";a="36965563" Received: from 75-119-238-195.dsl.teksavvy.com (HELO ceviche.home) ([75.119.238.195]) by ironport2-out.teksavvy.com with ESMTP; 13 Apr 2009 14:03:23 -0400 Received: by ceviche.home (Postfix, from userid 20848) id 70F5DB4089; Mon, 13 Apr 2009 14:03:23 -0400 (EDT) From: Stefan Monnier To: Dan Nicolaescu Cc: 2652@debbugs.gnu.org, Miles Bader Subject: Re: bug#2652: 23.0.91; wacky behavior of "v" command in *vc-dir* buffer Message-ID: References: <87iqmemgyi.fsf@catnip.gol.com> <200903130038.n2D0cuTj018433@godzilla.ics.uci.edu> <200903130134.n2D1YCFF018782@godzilla.ics.uci.edu> <200903130727.n2D7RHBI020896@godzilla.ics.uci.edu> <200903131622.n2DGMAZG024224@godzilla.ics.uci.edu> <200903141603.n2EG327C002787@godzilla.ics.uci.edu> <200904131702.n3DH2Zsj025829@godzilla.ics.uci.edu> Date: Mon, 13 Apr 2009 14:03:23 -0400 In-Reply-To: <200904131702.n3DH2Zsj025829@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Mon, 13 Apr 2009 10:02:35 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii >> Removing calls to determine the backend (and replace them with backend >> info propagated from elsewhere) is generally a good thing. I think your >> patch looks good. > Here's another patch of the same kind: it removes vc-backend calls for > vc-stay-local-p. > OK or 23.2? Looks good, but I'd rather postpone it for 23.2. Stefan From unknown Sun Aug 17 09:11:53 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: $requester Subject: Internal Control Message-Id: bug archived. Date: Tue, 12 May 2009 14:24:17 +0000 User-Agent: Fakemail v42.6.9 # A New Hope # A log time ago, in a galaxy far, far away # something happened. # # Magically this resulted in the following # action being taken, but this fake control # message doesn't tell you why it happened # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator