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:46:46 -0500 Message-ID: <3upqq7saih.fsf@fencepost.gnu.org> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1299218826 26542 80.91.229.12 (4 Mar 2011 06:07:06 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 4 Mar 2011 06:07:06 +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 07:07:01 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 1PvOAG-0008Ji-LV for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Mar 2011 07:07:00 +0100 Original-Received: from localhost ([127.0.0.1]:53574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvOAF-0007vf-Tp for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Mar 2011 01:06:59 -0500 Original-Received: from [140.186.70.92] (port=45057 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvOA6-0007tk-So for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2011 01:06:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvOA5-0000yc-TO for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2011 01:06:50 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvOA5-0000yV-Nm for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2011 01:06:49 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PvNqw-00085W-HV; Fri, 04 Mar 2011 00:47:02 -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:47:02 +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.129921761431078 (code B ref 8170); Fri, 04 Mar 2011 05:47:02 +0000 Original-Received: (at 8170) by debbugs.gnu.org; 4 Mar 2011 05:46:54 +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 1PvNqn-00085C-W2 for submit@debbugs.gnu.org; Fri, 04 Mar 2011 00:46:54 -0500 Original-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 Original-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 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-Attribution: GM In-Reply-To: (Glenn Morris's message of "Fri, 04 Mar 2011 00:28:02 -0500") 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:47:02 -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:44620 Archived-At: 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)))