CVS update by scop packages/unsupported/scop/vc ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/07/07 22:04:31

  Modified:    packages/unsupported/scop/vc ChangeLog vc-svn.el
Log:
Adapt svn >= 1.4 repo URL finding compatibility fix from upstream CVS HEAD.

Revision  Changes    Path
1.81      +3 -0      XEmacs/packages/unsupported/scop/vc/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- ChangeLog	2007/07/07 19:55:58	1.80
+++ ChangeLog	2007/07/07 20:04:30	1.81
@@ -13,6 +13,9 @@
 	* vc-arch.el (vc-arch-add-tagline): Call `comment-normalize-vars'
 	only if it's available.
 
+	* vc-svn.el (vc-svn-repository-hostname): Adapt upstream fix
+	for finding out the URL from files created by Subversion >= 1.4.
+
 2007-06-24  Ville Skyttä  <scop at xemacs.org>
 
 	* Makefile (VERSION): 0.92.



1.22      +6 -2      XEmacs/packages/unsupported/scop/vc/vc-svn.el

Index: vc-svn.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-svn.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- vc-svn.el	2007/06/16 12:57:26	1.21
+++ vc-svn.el	2007/07/07 20:04:30	1.22
@@ -500,11 +500,15 @@ and that it passes `vc-svn-global-switch
 		   ;; match at the end doesn't seem to work -> XEmacs bug ???
 		   ;;"\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
 		   "[^>]*[\n\t ]"
-		   "url=\"\\([^\"]+\\)\"") nil t)
+		   ;; XEmacs change: (?<number>:...) syntax not supported.
+		   "url=\"\\([^\"]+\\)\""
+                   ;; Yet newer ones don't use XML any more.
+                   "\\|^\ndir\n[0-9]+\n\\(.*\\)") 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.
-      (match-string 1))))
+      ;; XEmacs change: match-string 1 or 2 for the (?<number>:) change above.
+      (or (match-string 1) (match-string 2)))))
 
 (defun vc-svn-parse-status (&optional filename)
   "Parse output of \"svn status\" command in the current buffer.