New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 275
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Matthieu Moy <[EMAIL PROTECTED]>
branch nick: moy
timestamp: Mon 2007-10-15 11:05:05 +0200
message:
surround dvc-tree-root-helper with a dvc-uniquify-file-name.
=== modified file 'lisp/bzr-core.el'
--- a/lisp/bzr-core.el 2006-10-26 04:59:48 +0000
+++ b/lisp/bzr-core.el 2007-10-15 09:05:05 +0000
@@ -36,14 +36,14 @@
;;;###autoload
(defun bzr-tree-root (&optional location no-error interactive)
"Return the tree root for LOCATION, nil if not in a local tree.
-Computation is done from withing Emacs, by looking at an .bzr/
+Computation is done from withing Emacs, by looking at a .bzr/
directory in a parent buffer of LOCATION. This is therefore very
fast.
-If NO-ERROR is non-nil, don't raise an error if LOCATION is not an
-arch managed tree (but return nil)."
+If NO-ERROR is non-nil, don't raise an error if LOCATION is not a
+bzr-managed tree (but return nil)."
(interactive)
- (dvc-tree-root-helper ".bzr/" (or interactive
+ (dvc-tree-root-helper ".bzr/checkout/" (or interactive
(interactive-p))
"%S is not a bzr-managed tree"
location no-error))
=== modified file 'lisp/bzr-dvc.el'
--- a/lisp/bzr-dvc.el 2007-08-12 15:08:09 +0000
+++ b/lisp/bzr-dvc.el 2007-10-15 09:05:05 +0000
@@ -34,8 +34,6 @@
;;;###autoload
(dvc-register-dvc 'bzr "Bazaar 2")
;;;###autoload
-(defalias 'bzr-dvc-tree-root 'bzr-tree-root)
-;;;###autoload
(defalias 'bzr-dvc-diff 'bzr-diff)
;;;###autoload
(defalias 'bzr-dvc-status 'bzr-status)
=== modified file 'lisp/dvc-core.el'
--- a/lisp/dvc-core.el 2007-10-11 16:34:56 +0000
+++ b/lisp/dvc-core.el 2007-10-15 09:05:05 +0000
@@ -103,15 +103,16 @@
guaranteed to end in a \"/\" character.
MSG must be of the form \"%S is not a ...-managed tree\"."
- (let ((pwd (dvc-find-tree-root-file-first
- file-or-dir location)))
- (when (and interactivep pwd)
- (dvc-trace "%s" pwd))
- (or pwd
- (if no-error
- nil
- (error msg
- (or location default-directory))))))
+ (let ((location (dvc-uniquify-file-name location)))
+ (let ((pwd (dvc-find-tree-root-file-first
+ file-or-dir location)))
+ (when (and interactivep pwd)
+ (dvc-trace "%s" pwd))
+ (or pwd
+ (if no-error
+ nil
+ (error msg
+ (or location default-directory)))))))
(defun dvc-find-tree-root-file-last (file-or-dir &optional location)
"Like `dvc-find-tree-root-file-upward' but recursively if FILE-OR-DIR is
found.
=== modified file 'lisp/dvc-utils.el'
--- a/lisp/dvc-utils.el 2007-09-03 23:52:25 +0000
+++ b/lisp/dvc-utils.el 2007-10-15 09:05:05 +0000
@@ -403,7 +403,7 @@
;; Debugging facilities
;; ----------------------------------------------------------------------------
(defvar dvc-debug nil
- "Indicate whether debugging messages should be printed by `dvc-trace'.")
+ "*Indicate whether debugging messages should be printed by `dvc-trace'.")
;;;###autoload
(defun dvc-trace (&rest msg)
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
