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.
This commit is contained in:
parent
fa7b5f7b98
commit
6ee867808a
2 changed files with 10 additions and 0 deletions
|
@ -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
|
||||
|
|
|
@ -361,6 +361,11 @@ If any error occurred in running `bzr status', then return nil."
|
|||
;; 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))
|
||||
|
|
Loading…
Add table
Reference in a new issue