changeset 81617:0a2fb180b0a5

(vc-svn-repository-hostname): Adjust to non-XML format of newer .svn/entries.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 26 Jun 2007 16:39:58 +0000
parents bd1a205d2b3b
children 42755149d51d
files lisp/ChangeLog lisp/vc-svn.el
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Jun 26 03:28:17 2007 +0000
+++ b/lisp/ChangeLog	Tue Jun 26 16:39:58 2007 +0000
@@ -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)
--- a/lisp/vc-svn.el	Tue Jun 26 03:28:17 2007 +0000
+++ b/lisp/vc-svn.el	Tue Jun 26 16:39:58 2007 +0000
@@ -492,7 +492,9 @@
 	   ;; 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.