Mercurial > emacs
changeset 106778:95040dd9104b
Fix bug#5345: password asked when visiting files on a lightweight checkout.
* vc-bzr.el (vc-bzr-working-revision): On Windows and MS-DOS, accept
URLs with a leading triple slash in the file: scheme.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sat, 09 Jan 2010 22:03:33 +0100 |
| parents | e96c7312f94c |
| children | 57e095b90f5b |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 09 15:53:55 2010 -0500 +++ b/lisp/ChangeLog Sat Jan 09 22:03:33 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-09 Juanma Barranquero <lekktu@gmail.com> + + * vc-bzr.el (vc-bzr-working-revision): On Windows and MS-DOS, accept + URLs with a leading triple slash in the file: scheme. (Bug#5345) + 2010-01-09 Chong Yidong <cyd@stupidchicken.com> * progmodes/compile.el: Don't treat compile-command as safe if
--- a/lisp/vc-bzr.el Sat Jan 09 15:53:55 2010 -0500 +++ b/lisp/vc-bzr.el Sat Jan 09 22:03:33 2010 +0100 @@ -361,6 +361,11 @@ ;; look there for the version information. (when (re-search-forward "file://\\(.+\\)" nil t) (let ((l-c-parent-dir (match-string 1))) + (when (and (memq system-type '(ms-dos windows-nt)) + (string-match-p "^/[[:alpha:]]:" l-c-parent-dir)) + ;;; On Windows, file:// URLs often have three slashes, + ;;; so we must remove the remaining one (bug#5345) + (setq l-c-parent-dir (substring l-c-parent-dir 1))) (setq branch-format-file (expand-file-name vc-bzr-admin-branch-format-file l-c-parent-dir))