all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Glenn Morris <rgm@gnu.org>
To: Juanma Barranquero <lekktu@gmail.com>
Cc: 8170@debbugs.gnu.org
Subject: bug#8170: vc-dir choking on new bzr status output
Date: Fri, 04 Mar 2011 00:46:46 -0500	[thread overview]
Message-ID: <3upqq7saih.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <mar5an1ml9.fsf@fencepost.gnu.org> (Glenn Morris's message of "Fri, 04 Mar 2011 00:28:02 -0500")

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)))
  






  reply	other threads:[~2011-03-04  5:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2011-03-04 12:38     ` Juanma Barranquero

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3upqq7saih.fsf@fencepost.gnu.org \
    --to=rgm@gnu.org \
    --cc=8170@debbugs.gnu.org \
    --cc=lekktu@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.