From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 03 20:25:16 2011 Received: (at submit) by debbugs.gnu.org; 4 Mar 2011 01:25:16 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PvJlb-0001Zi-IP for submit@debbugs.gnu.org; Thu, 03 Mar 2011 20:25:15 -0500 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PvJla-0001ZY-8u for submit@debbugs.gnu.org; Thu, 03 Mar 2011 20:25:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvJlU-0007Nu-KL for submit@debbugs.gnu.org; Thu, 03 Mar 2011 20:25:09 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:37954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvJlU-0007Nq-IG for submit@debbugs.gnu.org; Thu, 03 Mar 2011 20:25:08 -0500 Received: from [140.186.70.92] (port=38695 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvJlT-00086W-Bc for bug-gnu-emacs@gnu.org; Thu, 03 Mar 2011 20:25:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvJlS-0007NU-9y for bug-gnu-emacs@gnu.org; Thu, 03 Mar 2011 20:25:07 -0500 Received: from mail-gy0-f169.google.com ([209.85.160.169]:46180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvJlS-0007NN-2U for bug-gnu-emacs@gnu.org; Thu, 03 Mar 2011 20:25:06 -0500 Received: by gyb13 with SMTP id 13so799230gyb.0 for ; Thu, 03 Mar 2011 17:25:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:from:date:message-id:subject:to :content-type:content-transfer-encoding; bh=Etmj/50tS/dg1g2p7arjGNuqqTwHATI+BCy/9Vpswv0=; b=wQt7YkWygluaFz2Lz3bT3A7YwCsjFUG3PH/YEgNGNj5ySZLjANh8QVJpBRZ2BHJa6p FjxtC60chx35t+h0J2WA6VH/oqgHWPZoAaOrHhbhrl1vvKNrq0Trea7vHEs1Xakf/pBL Sn/tw3QrJcxaHDjeAK974H6641O+J2vdaACTI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type :content-transfer-encoding; b=iTtGxu9bIYwo3fYCZqBNPqgnblcR6Dy7zvfGWcjDEWdpLIjcygp7UU3K2TmyMTkmcN 4nn5l28ccNxrltCaWZpfa+U9gRmZVpZ9L5GZRVsk/Dnexye2da60l3fhuzUJWyf7wB5I 4MtpJBos+2V2z3fdp+x+Hv1qgKWG9VYEJXc4I= Received: by 10.151.92.6 with SMTP id u6mr1069141ybl.407.1299201905149; Thu, 03 Mar 2011 17:25:05 -0800 (PST) MIME-Version: 1.0 Received: by 10.147.35.6 with HTTP; Thu, 3 Mar 2011 17:24:25 -0800 (PST) From: Juanma Barranquero Date: Fri, 4 Mar 2011 02:24:25 +0100 Message-ID: Subject: vc-dir choking on new bzr status output To: Bug-Gnu-Emacs Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 199.232.76.165 X-Spam-Score: -4.3 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.3 (----) >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)) #) #[(G102203 entries &optional more-to-come) "r Jq\210\306 J\"\210\n?\205' This happens in 23.3RC and 24.0.50. =C2=A0 =C2=A0 Juanma From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 04 00:28:09 2011 Received: (at 8170) by debbugs.gnu.org; 4 Mar 2011 05:28:09 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PvNYf-0007fs-F3 for submit@debbugs.gnu.org; Fri, 04 Mar 2011 00:28:09 -0500 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PvNYe-0007fh-Aj for 8170@debbugs.gnu.org; Fri, 04 Mar 2011 00:28:08 -0500 Received: from localhost ([127.0.0.1]:60533) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvNYY-0003YH-Mv; Fri, 04 Mar 2011 00:28:02 -0500 From: Glenn Morris To: Juanma Barranquero Subject: Re: bug#8170: vc-dir choking on new bzr status output References: X-Spook: Attorney General Downing Street bomb Sundevil Medco NASA X-Ran: *(.^yqjiCvR\ (Juanma Barranquero's message of "Fri, 4 Mar 2011 02:24:25 +0100") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.3 (------) X-Debbugs-Envelope-To: 8170 Cc: 8170@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) 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) From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 04 00:46:54 2011 Received: (at 8170) by debbugs.gnu.org; 4 Mar 2011 05:46:54 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PvNqn-00085C-W2 for submit@debbugs.gnu.org; Fri, 04 Mar 2011 00:46:54 -0500 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PvNql-000850-NW for 8170@debbugs.gnu.org; Fri, 04 Mar 2011 00:46:52 -0500 Received: from localhost ([127.0.0.1]:33787) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvNqg-0004B9-Ih; Fri, 04 Mar 2011 00:46:46 -0500 From: Glenn Morris To: Juanma Barranquero Subject: Re: bug#8170: vc-dir choking on new bzr status output References: X-Spook: FTS2000 Glock ANDVT Mossad TWA Europol BLU-114/B SCUD X-Ran: 0mX'>wQSX{%s?f`]6RiApqqk2qCVz29M=>X.wkE6?mmDbFFKsiHtw,9tI;*#6h<@}\"h58 X-Hue: red X-Debbugs-No-Ack: yes X-Attribution: GM Date: Fri, 04 Mar 2011 00:46:46 -0500 In-Reply-To: (Glenn Morris's message of "Fri, 04 Mar 2011 00:28:02 -0500") Message-ID: <3upqq7saih.fsf@fencepost.gnu.org> User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.3 (------) X-Debbugs-Envelope-To: 8170 Cc: 8170@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) 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))) From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 04 07:39:45 2011 Received: (at 8170) by debbugs.gnu.org; 4 Mar 2011 12:39:45 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PvUIK-0001mo-Qv for submit@debbugs.gnu.org; Fri, 04 Mar 2011 07:39:44 -0500 Received: from mail-yx0-f172.google.com ([209.85.213.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PvUII-0001mb-J0 for 8170@debbugs.gnu.org; Fri, 04 Mar 2011 07:39:43 -0500 Received: by yxk30 with SMTP id 30so824671yxk.3 for <8170@debbugs.gnu.org>; Fri, 04 Mar 2011 04:39:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type:content-transfer-encoding; bh=IX8HbIk5NCGAkDxNLShc6cLc4BdIVsCtxh4k/YEz8zA=; b=PhqwavDPc9wiOBv9+LqhQFEIxQhvQSCjq+D5Zn3sLErAlQP0uia7NcX7qhsSaev3CC pXLd7S6htpTVMUaTO6IKa29gHTQR3a+trSWHTGZLZaDY2mPYfR4ijugLYBUaB+ARxRaO glQAPGk0nyjF4RLFL8RK9cUDBrDF01HsRPBBY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=iMcbayIcOVoCvfDFSv9PNEjEvDSlyL0Omryr0z1wgAdTa5/glWk6iSHSy2Fhhr10Dp 67L1/91u2L6QIKKj4zqLdulRFgMtXiA3OD8j4y7sCt+Ta9vRj7TKD5VBpn/o1ykULitp 3YhB5qWbUFnokmLy1ElbvN5W5jpgS+O9tSapo= Received: by 10.236.76.66 with SMTP id a42mr772361yhe.79.1299242377082; Fri, 04 Mar 2011 04:39:37 -0800 (PST) MIME-Version: 1.0 Received: by 10.147.35.6 with HTTP; Fri, 4 Mar 2011 04:38:57 -0800 (PST) In-Reply-To: <3upqq7saih.fsf@fencepost.gnu.org> References: <3upqq7saih.fsf@fencepost.gnu.org> From: Juanma Barranquero Date: Fri, 4 Mar 2011 13:38:57 +0100 Message-ID: Subject: Re: bug#8170: vc-dir choking on new bzr status output To: Glenn Morris Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.2 (---) X-Debbugs-Envelope-To: 8170 Cc: 8170@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.2 (---) > Correction: Yes, it fixes the bug. > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; Bzr 2.3.0 added this if there are shelve= s. =C2=A0(Bug#8170) > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 (unless (looking-at "[1-9]+ shel\\(f\\|ves\= \) exists?\\.") I tested with `looking-at-p', BTW. Thanks, =C2=A0 =C2=A0 Juanma From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 04 14:26:21 2011 Received: (at control) by debbugs.gnu.org; 4 Mar 2011 19:26:21 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Pvado-0002OY-PL for submit@debbugs.gnu.org; Fri, 04 Mar 2011 14:26:21 -0500 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Pvadm-0002OM-Us for control@debbugs.gnu.org; Fri, 04 Mar 2011 14:26:19 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Pvadh-00067N-NH for control@debbugs.gnu.org; Fri, 04 Mar 2011 14:26:13 -0500 Date: Fri, 04 Mar 2011 14:26:13 -0500 Message-Id: Subject: control message for bug 8170 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -6.3 (------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) close 8170 24.1 From unknown Mon Aug 18 19:21:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 02 Apr 2011 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator