aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasatake YAMATO2007-06-15 19:40:47 +0000
committerMasatake YAMATO2007-06-15 19:40:47 +0000
commitb32ce4c33acdac8d1fef85f9cd5ec4de3aa4e0fe (patch)
tree2729a0c02cba5c7f3f26bc8f322fc9764a8f5603
parent1bd8df7efa018cdf5342ca6a0a478a14ebf8e773 (diff)
downloademacs-b32ce4c33acdac8d1fef85f9cd5ec4de3aa4e0fe.tar.gz
emacs-b32ce4c33acdac8d1fef85f9cd5ec4de3aa4e0fe.zip
* vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-bzr.el8
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b67b406c600..c93f195d087 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,9 @@
12007-06-15 Masatake YAMATO <jet@gyve.org> 12007-06-15 Masatake YAMATO <jet@gyve.org>
2 2
3 * vc.el (vc-dired-hook): check the backend returned from 3 * vc-bzr.el (vc-bzr-root): Cache the output of shell command
4 execution.
5
6 * vc.el (vc-dired-hook): Check the backend returned from
4 `vc-responsible-backend' can really handle `subdir'. 7 `vc-responsible-backend' can really handle `subdir'.
5 8
62007-06-15 Chong Yidong <cyd@stupidchicken.com> 92007-06-15 Chong Yidong <cyd@stupidchicken.com>
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 0ff1668cf80..e5481b5f405 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -463,8 +463,12 @@ Return nil if current line isn't annotated."
463;; if there are any symbolic links. 463;; if there are any symbolic links.
464(defun vc-bzr-root (dir) 464(defun vc-bzr-root (dir)
465 "Return the root directory of the bzr repository containing DIR." 465 "Return the root directory of the bzr repository containing DIR."
466 (substring 466 ;; Cache technique copied from vc-arch.el.
467 (shell-command-to-string (concat vc-bzr-program " root " dir)) 0 -1)) 467 (or (vc-file-getprop dir 'bzr-root)
468 (vc-file-setprop
469 dir 'bzr-root
470 (substring
471 (shell-command-to-string (concat vc-bzr-program " root " dir)) 0 -1))))
468 472
469;; TODO: it would be nice to mark the conflicted files in VC Dired, 473;; TODO: it would be nice to mark the conflicted files in VC Dired,
470;; and implement a command to run ediff and `bzr resolve' once the 474;; and implement a command to run ediff and `bzr resolve' once the