* bug#8170: vc-dir choking on new bzr status output
@ 2011-03-04 1:24 Juanma Barranquero
2011-03-04 5:28 ` Glenn Morris
0 siblings, 1 reply; 4+ messages in thread
From: Juanma Barranquero @ 2011-03-04 1:24 UTC (permalink / raw)
To: 8170
From Bazaar 2.3.0 on, bzr status shows a summary of the shelves:
C:\emacs\trunk\> bzr status
modified:
lisp/ChangeLog
lisp/image-dired.el
1 shelf exists. See "bzr shelve --list" for details.
which vc-dir does not understand:
Debugger entered--Lisp error: (wrong-type-argument arrayp nil)
ewoc-data(nil)
vc-dir-node-directory(nil)
vc-dir-update((("../elf exists. See \"bzr shelve --list\" for
details." nil) ("ChangeLog" edited) ("image-dired.el" edited))
#<buffer *vc-dir*>)
#[(G102203 entries &optional more-to-come) "r Jq\210\306 J\"\210\n?\205'
This happens in 23.3RC and 24.0.50.
Juanma
^ permalink raw reply [flat|nested] 4+ messages in thread* bug#8170: vc-dir choking on new bzr status output
2011-03-04 1:24 bug#8170: vc-dir choking on new bzr status output Juanma Barranquero
@ 2011-03-04 5:28 ` Glenn Morris
2011-03-04 5:46 ` Glenn Morris
0 siblings, 1 reply; 4+ messages in thread
From: Glenn Morris @ 2011-03-04 5:28 UTC (permalink / raw)
To: Juanma Barranquero; +Cc: 8170
Try this:
*** lisp/vc/vc-bzr.el 2011-03-03 06:25:21 +0000
--- lisp/vc/vc-bzr.el 2011-03-04 05:26:35 +0000
***************
*** 879,884 ****
--- 879,887 ----
(result nil))
(goto-char (point-min))
(while (not (eobp))
+ ;; Bzr 2.3.0 added this if there are shelves. (Bug#8170)
+ (if (looking-at "[1-9]+ shel\\(f\\|ves\\) exist\\.")
+ (forward-line)
(setq status-str
(buffer-substring-no-properties (point) (+ (point) 3)))
(setq translated (cdr (assoc status-str translation)))
***************
*** 910,916 ****
(+ (point) 4)
(line-end-position)) relative-dir)
translated) result)))
! (forward-line))
(funcall update-function result)))
(defun vc-bzr-dir-status (dir update-function)
--- 913,919 ----
(+ (point) 4)
(line-end-position)) relative-dir)
translated) result)))
! (forward-line)))
(funcall update-function result)))
(defun vc-bzr-dir-status (dir update-function)
^ permalink raw reply [flat|nested] 4+ messages in thread* bug#8170: vc-dir choking on new bzr status output
2011-03-04 5:28 ` Glenn Morris
@ 2011-03-04 5:46 ` Glenn Morris
2011-03-04 12:38 ` Juanma Barranquero
0 siblings, 1 reply; 4+ messages in thread
From: Glenn Morris @ 2011-03-04 5:46 UTC (permalink / raw)
To: Juanma Barranquero; +Cc: 8170
Correction:
*** lisp/vc/vc-bzr.el 2011-03-03 06:25:21 +0000
--- lisp/vc/vc-bzr.el 2011-03-04 05:46:43 +0000
***************
*** 879,884 ****
--- 879,886 ----
(result nil))
(goto-char (point-min))
(while (not (eobp))
+ ;; Bzr 2.3.0 added this if there are shelves. (Bug#8170)
+ (unless (looking-at "[1-9]+ shel\\(f\\|ves\\) exists?\\.")
(setq status-str
(buffer-substring-no-properties (point) (+ (point) 3)))
(setq translated (cdr (assoc status-str translation)))
***************
*** 909,915 ****
(buffer-substring-no-properties
(+ (point) 4)
(line-end-position)) relative-dir)
! translated) result)))
(forward-line))
(funcall update-function result)))
--- 911,917 ----
(buffer-substring-no-properties
(+ (point) 4)
(line-end-position)) relative-dir)
! translated) result))))
(forward-line))
(funcall update-function result)))
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-04 12:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-04 1:24 bug#8170: vc-dir choking on new bzr status output Juanma Barranquero
2011-03-04 5:28 ` Glenn Morris
2011-03-04 5:46 ` Glenn Morris
2011-03-04 12:38 ` Juanma Barranquero
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).