GNU bug report logs - #13610
24.3.50; vc-next-action hang forever

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 13610 in the body.
You can then email your comments to 13610 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thierry Volpiatto <thierry.volpiatto <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: 24.3.50; vc-next-action hang forever
Date: Sat, 02 Feb 2013 19:03:54 +0100

Hi,
To reproduce:
emacs -Q
create a new file and edit it (a script shell for me)
save it and register it under RCS.
C-x v v
emacs hang forever.

In GNU Emacs 24.3.50.1 (x86_64-unknown-linux-gnu, X toolkit)
 of 2013-01-31 on dell-14z
Windowing system distributor `The X.Org Foundation', version 11.0.11103000
System Description:	Ubuntu 12.04.2 LTS

Configured using:
 `configure --with-x-toolkit=lucid --without-toolkit-scroll-bars'

Important settings:
  value of $LANG: fr_FR.UTF-8
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: Shell-script


-- 
Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thierry Volpiatto <thierry.volpiatto <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: Re: bug#13610: 24.3.50; vc-next-action hang forever
Date: Sat, 02 Feb 2013 19:35:59 +0100

Thierry Volpiatto <thierry.volpiatto <at> gmail.com> writes:

> Hi,
> To reproduce:
> emacs -Q
> create a new file and edit it (a script shell for me)
> save it and register it under RCS.
> C-x v v
> emacs hang forever.

More exactly, this is this loop (which is not in 24.2.92) which 
turn forever because it assume buffer have been modified before setq'ing
files to nil and stop the loop.

--8<---------------cut here---------------start------------->8---
    ;; If a buffer has unsaved changes, a checkout would discard those
    ;; changes, so treat the buffer as having unlocked changes.
    (when (and (not (eq model 'implicit)) (eq state 'up-to-date))
      (let ((files files))
	(while files
	  (let ((buffer (get-file-buffer (car files))))
	    (and buffer
		 (buffer-modified-p buffer)
		 (setq state 'unlocked-changes
		       files nil))))))
--8<---------------cut here---------------end--------------->8---


-- 
Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Message #11 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thierry Volpiatto <thierry.volpiatto <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: Re: bug#13610: 24.3.50; vc-next-action hang forever
Date: Mon, 04 Feb 2013 08:07:34 +0100

Thierry Volpiatto <thierry.volpiatto <at> gmail.com> writes:

> Thierry Volpiatto <thierry.volpiatto <at> gmail.com> writes:
>
>> Hi,
>> To reproduce:
>> emacs -Q
>> create a new file and edit it (a script shell for me)
>> save it and register it under RCS.
>> C-x v v
>> emacs hang forever.
>
> More exactly, this is this loop (which is not in 24.2.92) which 
> turn forever because it assume buffer have been modified before setq'ing
> files to nil and stop the loop.
>
>     ;; If a buffer has unsaved changes, a checkout would discard those
>     ;; changes, so treat the buffer as having unlocked changes.
>     (when (and (not (eq model 'implicit)) (eq state 'up-to-date))
>       (let ((files files))
> 	(while files
> 	  (let ((buffer (get-file-buffer (car files))))
> 	    (and buffer
> 		 (buffer-modified-p buffer)
> 		 (setq state 'unlocked-changes
> 		       files nil))))))

--8<---------------cut here---------------start------------->8---
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 9b8b949..18147cd 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1084,8 +1084,8 @@ For old-style locking-based version control systems, like RCS:
 	  (let ((buffer (get-file-buffer (car files))))
 	    (and buffer
 		 (buffer-modified-p buffer)
-		 (setq state 'unlocked-changes
-		       files nil))))))
+		 (setq state 'unlocked-changes)))
+          (setq files (cdr files)))))
 
     ;; Do the right thing
     (cond
--8<---------------cut here---------------end--------------->8---

-- 
Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

Message #16 received at 13610-done <at> debbugs.gnu.org (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Thierry Volpiatto <thierry.volpiatto <at> gmail.com>
Cc: 13610-done <at> debbugs.gnu.org
Subject: Re: bug#13610: 24.3.50; vc-next-action hang forever
Date: Mon, 04 Feb 2013 16:24:16 -0500

> -		 (setq state 'unlocked-changes
> -		       files nil))))))
> +		 (setq state 'unlocked-changes)))
> +          (setq files (cdr files)))))

Thanks.
I installed a further patch that uses dolist instead, so there's no risk
of forgetting the setq+cdr.


        Stefan

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.