From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#8170: vc-dir choking on new bzr status output Date: Fri, 04 Mar 2011 00:28:02 -0500 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1299217064 20008 80.91.229.12 (4 Mar 2011 05:37:44 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 4 Mar 2011 05:37:44 +0000 (UTC) Cc: 8170@debbugs.gnu.org To: Juanma Barranquero Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 04 06:37:40 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PvNhr-0007om-ST for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Mar 2011 06:37:40 +0100 Original-Received: from localhost ([127.0.0.1]:40464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvNhr-0006pq-Ch for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Mar 2011 00:37:39 -0500 Original-Received: from [140.186.70.92] (port=55440 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvNh9-0006ZY-Kq for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2011 00:36:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvNh8-0003VI-LK for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2011 00:36:55 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvNh8-0003V8-HO for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2011 00:36:54 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PvNZV-0007gv-UX; Fri, 04 Mar 2011 00:29:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 04 Mar 2011 05:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8170 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 8170-submit@debbugs.gnu.org id=B8170.129921648929507 (code B ref 8170); Fri, 04 Mar 2011 05:29:01 +0000 Original-Received: (at 8170) by debbugs.gnu.org; 4 Mar 2011 05:28:09 +0000 Original-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 Original-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 Original-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 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") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 04 Mar 2011 00:29:01 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:44619 Archived-At: 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)