cvs-examine fails

cvs-examine fails

[Pete Lee]

[-- Attachment #1.1: Type: text/plain, Size: 1938 bytes --]

M-x cvs-examine

fails with:

   Running cvs update ...
   error in process sentinel: image-type: Cannot determine image type
   error in process sentinel: Cannot determine image type

It seems to happen because I have the following in my .emacs:
(auto-image-file-mode 1)

As a workaround I have added:
(add-hook 'cvs-mode-hook (lambda ()
                           (auto-image-file-mode nil)))

This only happens when auto-image-file-mode is enabled... and it is only
happening for a particular branch in cvs.  I'm guessing someone added a
corrupt image file somewhere in that branch...

It seems that auto-image-file-mode stuff should only be applied when an
image is being opened for display... or at least failure in image related
stuff shouldn't prevent the cvs operation from continuing.

This was happening in 22.1 as well.


In GNU Emacs 23.0.50.1 (i686-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2007-10-24 on xx.xx.com
Windowing system distributor `NetSarang Computer, Inc.', version 11.0.2077
configured using `configure  '--prefix=/tb/pete/usr/emacs''

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: en_US.UTF-8
  locale-coding-system: utf-8
  default-enable-multibyte-characters: t

Major mode: Lisp Interaction

Minor modes in effect:
  global-hl-line-mode: t
  shell-dirtrack-mode: t
  minibuffer-electric-default-mode: t
  cua-mode: t
  show-paren-mode: t
  global-auto-revert-mode: t
  which-function-mode: t
  display-time-mode: t
  auto-image-file-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  unify-8859-on-encoding-mode: t
  utf-translate-cjk-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t

[-- Attachment #1.2: Type: text/html, Size: 2557 bytes --]

[-- Attachment #2: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: cvs-examine fails

[Stefan Monnier]

> M-x cvs-examine
> fails with:

>    Running cvs update ...
>    error in process sentinel: image-type: Cannot determine image type
>    error in process sentinel: Cannot determine image type

These are message taken from *Messages*, right?
Can you try to enable "Options => Enter Debugger on Error" and reproduce
the problem?

And try the patch below which might fix it (stab in the dark),


        Stefan


--- orig/lisp/pcvs-parse.el
+++ mod/lisp/pcvs-parse.el
@@ -235,7 +235,7 @@
 	      ;; servers, this should not be necessary, because they return
 	      ;; a complete merge output.
 	      (with-temp-buffer
-		(insert-file-contents path)
+		(ignore-errors (insert-file-contents path))
 		(goto-char (point-min))
 		(if (re-search-forward "^<<<<<<< " nil t)
 		    'CONFLICT 'NEED-MERGE))))
@@ -272,8 +272,9 @@
 	;; branches, or because it's been removed).
 	(if (ignore-errors
 	      (with-temp-buffer
-		(insert-file-contents (expand-file-name
-				       ".cvsignore" (file-name-directory dir)))
+                (ignore-errors
+                  (insert-file-contents
+                   (expand-file-name ".cvsignore" (file-name-directory dir))))
 		(goto-char (point-min))
 		(re-search-forward
 		 (concat "^" (regexp-quote (file-name-nondirectory dir)) "/$")