[Emacs-diffs] /srv/bzr/emacs/trunk r99284: Fix bug#5345: password asked when visiting files on a lightweight checkout.

[Juanma Barranquero]

------------------------------------------------------------
revno: 99284
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-09 22:03:33 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-09 20:53:55 +0000
+++ b/lisp/ChangeLog    2010-01-09 21:03:33 +0000
@@ -1,3 +1,8 @@
+2010-01-09  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/compile.el: Don't treat compile-command as safe if

=== modified file 'lisp/vc-bzr.el'
--- a/lisp/vc-bzr.el    2010-01-06 15:11:52 +0000
+++ b/lisp/vc-bzr.el    2010-01-09 21:03:33 +0000
@@ -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))