[svn] r7824: nemerle/trunk/macros/Util.n

[pbludov]

Log:
Support for the '_svn', an alternate `.snv' folder name.

Author: pbludov
Date: Wed Oct 24 11:53:43 2007
New Revision: 7824

Modified:
   nemerle/trunk/macros/Util.n

Modified: nemerle/trunk/macros/Util.n
==============================================================================
--- nemerle/trunk/macros/Util.n	(original)
+++ nemerle/trunk/macros/Util.n	Wed Oct 24 11:53:43 2007
@@ -319,17 +319,22 @@
   /// based on svn://rsdn.ru/Janus/trunk/SvnRevision  
   module SVNRevisionHelper {
     SVN_DIRECTORY_NAME_COMMON = ".svn";
+    SVN_DIRECTORY_NAME_ALT = "_svn";
     SVN_ENTRIES_FILE_NAME = "entries";
     SVN_FORMAT_FILE_NAME = "format";
     XPATH_REVISION = @"ns:wc-entries/ns:entry/@revision";    
       
     public FindRevision(current : string) : int
     {
-        def dirs = Directory.GetDirectories(current, SVN_DIRECTORY_NAME_COMMON);
-        match (dirs.Length) {
-          | 0 => -1
-          | 1 => GetRevisionDetectFormat (Path.Combine (current, dirs [0]))
-          | _ => -2
+        def dir = Path.Combine (current, SVN_DIRECTORY_NAME_COMMON);
+        if (Directory.Exists (dir))
+          GetRevisionDetectFormat (dir)
+        else {
+          def dir = Path.Combine (current, SVN_DIRECTORY_NAME_ALT);
+          if (Directory.Exists (dir))
+            GetRevisionDetectFormat (dir)
+          else
+            -1
         }
     }