[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 704ce9a: * lisp/vc/vc-bzr.el (vc-bzr-after-dir-stat
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 704ce9a: * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): |
Date: |
Tue, 28 Apr 2015 05:15:36 +0000 |
branch: master
commit 704ce9aeb61a85d9a5e29e2fad9067c51fca095f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status):
Don't get confused by a bzrlib version mismatch warning.
---
lisp/vc/vc-bzr.el | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 811f9e8..9c52106 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -954,6 +954,12 @@ stream. Standard error output is discarded."
(translated nil)
(result nil))
(goto-char (point-min))
+ ;; Skip a warning message that can occur in some bzr installations.
+ ;; vc-bzr-dir-extra-headers already reports it.
+ ;; Perhaps we should just discard stderr?
+ (and (looking-at "bzr: WARNING: bzrlib version doesn't match")
+ (re-search-forward "^bzr is version" nil t)
+ (forward-line 1))
(while (not (eobp))
;; Bzr 2.3.0 added this if there are shelves. (Bug#8170)
(unless (looking-at "[0-9]+ shel\\(f\\|ves\\) exists?\\.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 704ce9a: * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status):,
Glenn Morris <=