[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el |
Date: |
Sun, 17 May 2009 03:38:45 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/05/17 03:38:44
Modified files:
lisp : ChangeLog vc-bzr.el
Log message:
(vc-bzr-state-heuristic): Fallback on vc-bzr-state in case
of any kind of error (e.g. when "sha1sum" is not found).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15640&r2=1.15641
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-bzr.el?cvsroot=emacs&r1=1.77&r2=1.78
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15640
retrieving revision 1.15641
diff -u -b -r1.15640 -r1.15641
--- ChangeLog 15 May 2009 15:00:32 -0000 1.15640
+++ ChangeLog 17 May 2009 03:38:41 -0000 1.15641
@@ -1,3 +1,8 @@
+2009-05-17 Stefan Monnier <address@hidden>
+
+ * vc-bzr.el (vc-bzr-state-heuristic): Fallback on vc-bzr-state in case
+ of any kind of error (e.g. when "sha1sum" is not found).
+
2009-05-15 Martin Rudalics <address@hidden>
* dired.el (dired-pop-to-buffer): Try to make this behave the
@@ -434,11 +439,11 @@
2009-04-07 Chong Yidong <address@hidden>
- * vc-bzr.el (vc-bzr-log-view-mode): Tweak
- log-view-message-re (Bug#2872).
+ * vc-bzr.el (vc-bzr-log-view-mode):
+ Tweak log-view-message-re (Bug#2872).
- * descr-text.el (describe-property-list, describe-char): Add
- follow-link properties to buttons that need them.
+ * descr-text.el (describe-property-list, describe-char):
+ Add follow-link properties to buttons that need them.
* tooltip.el (tooltip-show-help-non-mode): Don't save the last
message if it was also a help message (Bug#2895).
@@ -446,8 +451,7 @@
2009-04-06 Roland Winkler <address@hidden>
* textmodes/bibtex.el (bibtex-format-entry)
- (bibtex-search-crossref): Allow OPT prefix for name of crossref
- field.
+ (bibtex-search-crossref): Allow OPT prefix for name of crossref field.
2009-04-06 Sam Steingold <address@hidden>
Index: vc-bzr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- vc-bzr.el 7 Apr 2009 04:06:42 -0000 1.77
+++ vc-bzr.el 17 May 2009 03:38:44 -0000 1.78
@@ -143,7 +143,7 @@
(defun vc-bzr-state-heuristic (file)
"Like `vc-bzr-state' but hopefully without running Bzr."
- ;; `bzr status' is excrutiatingly slow with large histories and
+ ;; `bzr status' was excrutiatingly slow with large histories and
;; pending merges, so try to avoid using it until they fix their
;; performance problems.
;; This function tries first to parse Bzr internal file
@@ -158,8 +158,7 @@
;; This looks at internal files. May break if they change
;; their format.
(lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root)))
- (if (not (file-readable-p dirstate))
- (vc-bzr-state file) ; Expensive.
+ (condition-case nil
(with-temp-buffer
(insert-file-contents dirstate)
(goto-char (point-min))
@@ -201,7 +200,13 @@
(vc-bzr-sha1 file)))
'up-to-date)
(t 'edited))
- 'unregistered)))))))))
+ 'unregistered))))
+ ;; Either the dirstate file can't be read, or the sha1
+ ;; executable is missing, or ...
+ ;; In either case, recent versions of Bzr aren't that slow
+ ;; any more.
+ (error (vc-bzr-state file)))))))
+
(defun vc-bzr-registered (file)
"Return non-nil if FILE is registered with bzr."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el,
Stefan Monnier <=