From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 26 Jun 2007 16:39:58 +0000 (+0000)
Subject: (vc-svn-repository-hostname): Adjust to non-XML format of newer .svn/entries.
X-Git-Tag: emacs-pretest-23.0.90~12110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b0dad411fa205045749e8c767fe5e2201689560;p=emacs.git

(vc-svn-repository-hostname): Adjust to non-XML format of newer .svn/entries.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0280187265..c910fc5478a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* log-edit.el (log-edit-changelog-entries): Use with-current-buffer.
+
+	* vc-svn.el (vc-svn-repository-hostname): Adjust to non-XML format
+	of newer .svn/entries.
+
 2007-06-25  David Kastrup  <dak@gnu.org>
 
 	* calc/calc-poly.el (math-padded-polynomial)
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.