summaryrefslogtreecommitdiff
path: root/lisp/vc-svn.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2007-06-26 16:39:58 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2007-06-26 16:39:58 +0000
commit0b0dad411fa205045749e8c767fe5e2201689560 (patch)
tree2fe6f684cecbbe2b2fb1c688ec5b88a5ab3130cf /lisp/vc-svn.el
parent8d0d84d25d4e89ff458788d4e3f97212495a7359 (diff)
downloademacs-0b0dad411fa205045749e8c767fe5e2201689560.tar.gz
(vc-svn-repository-hostname): Adjust to non-XML format of newer .svn/entries.
Diffstat (limited to 'lisp/vc-svn.el')
-rw-r--r--lisp/vc-svn.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index b109f48d91d..2c6046cab36 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -492,7 +492,9 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
;; Old `svn' used name="svn:this_dir", newer use just name="".
(concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
"\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
- "url=\"\\([^\"]+\\)\"") nil t)
+ "url=\"\\(?1:[^\"]+\\)\""
+ ;; Yet newer ones don't use XML any more.
+ "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
;; This is not a hostname but a URL. This may actually be considered
;; as a feature since it allows vc-svn-stay-local to specify different
;; behavior for different modules on the same server.