Changeset 7486

Timestamp:

Sep 7, 2009, 12:15:04 PM (14 years ago)

Author:

ole

Message:

Reverted changeset:6860 as there are too many types of output from svnversion.
We are now back to svn info.
Also moved nested function declarations out and made them Python style internals using
Added simple unit test of this functionality.

Location:

anuga_core/source/anuga/utilities

Files:

• system_tools.py (modified) (2 diffs)
• test_system_tools.py (modified) (1 diff)

anuga_core/source/anuga/utilities/system_tools.py

@@ -56 +56 @@
     return host    
 
+    
+    
+    
+    
+def __get_revision_from_svn_entries__():
+    """Get a subversion revision number from the .svn/entries file."""
+
+    
+    msg = '''
+No version info stored and command 'svn' is not recognised on the system PATH.
+
+If ANUGA has been installed from a distribution e.g. as obtained from SourceForge,
+the version info should be available in the automatically generated file
+'stored_version_info.py' in the anuga root directory.
+
+If run from a Subversion sandpit, ANUGA will try to obtain the version info by
+using the command 'svn info'.  In this case, make sure the command line client
+'svn' is accessible on the system path.  Simply aliasing 'svn' to the binary will
+not work.
+
+If you are using Windows, you have to install the file svn.exe which can be
+obtained from http://www.collab.net/downloads/subversion.
+
+Good luck!
+'''
+
+    try:
+        fd = open(os.path.join('.svn', 'entries'))
+    except:
+        raise Exception, msg
+
+    line = fd.readlines()[3]
+    fd.close()
+    try:
+        revision_number = int(line)
+    except:
+        msg = ".svn/entries, line 4 was '%s'?" % line.strip()
+        raise Exception, msg
+
+    return revision_number
+
+def __get_revision_from_svn_client__():
+    """Get a subversion revision number from an svn client."""
+
+    if sys.platform[0:3] == 'win':
+        try:
+            fid = os.popen(r'C:\Program Files\TortoiseSVN\bin\SubWCRev.exe')
+        except:
+            return __get_revision_from_svn_entries__()
+        else:
+            version_info = fid.read()
+            if version_info == '':
+                return __get_revision_from_svn_entries__()
+
+        # split revision number from data
+        for line in version_info.split('\n'):
+            if line.startswith('Updated to revision '):
+                break
+
+        fields = line.split(' ')
+        msg = 'Keyword "Revision" was not found anywhere in text: %s' % version_info
+        assert fields[0].startswith('Updated'), msg
+
+        try:
+            revision_number = int(fields[3])
+        except:
+            msg = ('Revision number must be an integer. I got "%s" from '
+                   '"SubWCRev.exe".' % fields[3])
+            raise Exception, msg
+    else:                   # assume Linux
+        try:
+            fid = os.popen('svn info . 2>/dev/null')
+        except:
+            return __get_revision_from_svn_entries__()
+        else:
+            version_info = fid.read()
+            if version_info == '':
+                return __get_revision_from_svn_entries__()
+
+        # Split revision number from data
+        for line in version_info.split('\n'):
+            if line.startswith('Revision:'):
+                break
+        
+        fields = line.split(':')
+        msg = 'Keyword "Revision" was not found anywhere in text: %s' % version_info
+        assert fields[0].startswith('Revision'), msg
+        
+        
+        #if ':' in version_info:
+        #    revision_number, _ = version_info.split(':', 1)
+        #    msg = ('Some modules have not been checked in. '
+        #           'Using last version from repository: %s' % revision_number)
+        #    warnings.warn(msg)
+        #else:
+        #    revision_number = version_info
+
+        try:
+            revision_number = int(fields[1])
+        except:
+            msg = ("Revision number must be an integer. I got '%s' from "
+                   "'svn'." % fields[1])
+            raise Exception, msg
+
+    return revision_number
+
+    
+    
+    
+    
 def get_revision_number():
     """Get the version number of this repository copy.
@@ -68 +178 @@
     """
 
-    def get_revision_from_svn_entries():
-        '''Get a subversion revision number from the .svn/entries file.'''
-
-        msg = '''
-No version info stored and command 'svn' is not recognised on the system PATH.
-
-If ANUGA has been installed from a distribution e.g. as obtained from SourceForge,
-the version info should be available in the automatically generated file
-'stored_version_info.py' in the anuga root directory.
-
-If run from a Subversion sandpit, ANUGA will try to obtain the version info by
-using the command 'svn info'.  In this case, make sure the command line client
-'svn' is accessible on the system path.  Simply aliasing 'svn' to the binary will
-not work.
-
-If you are using Windows, you have to install the file svn.exe which can be
-obtained from http://www.collab.net/downloads/subversion.
-
-Good luck!
-'''
-
-        try:
-            fd = open(os.path.join('.svn', 'entries'))
-        except:
-            raise Exception, msg
-
-        line = fd.readlines()[3]
-        fd.close()
-        try:
-            revision_number = int(line)
-        except:
-            msg = ".svn/entries, line 4 was '%s'?" % line.strip()
-            raise Exception, msg
-
-        return revision_number
-
-    def get_revision_from_svn_client():
-        '''Get a subversion revision number from an svn client.'''
-
-        if sys.platform[0:3] == 'win':
-            try:
-                fid = os.popen(r'C:\Program Files\TortoiseSVN\bin\SubWCRev.exe')
-            except:
-                return get_revision_from_svn_entries()
-            else:
-                version_info = fid.read()
-                if version_info == '':
-                    return get_revision_from_svn_entries()
-
-            # split revision number from data
-            for line in version_info.split('\n'):
-                if line.startswith('Updated to revision '):
-                    break
-
-            fields = line.split(' ')
-            msg = 'Keyword "Revision" was not found anywhere in text: %s' % version_info
-            assert fields[0].startswith('Updated'), msg
-
-            try:
-                revision_number = int(fields[3])
-            except:
-                msg = ("Revision number must be an integer. I got '%s' from "
-                       "'SubWCRev.exe'." % fields[3])
-                raise Exception, msg
-        else:                   # assume Linux
-            try:
-                fid = os.popen('svnversion -n . 2>/dev/null')
-            except:
-                return get_revision_from_svn_entries()
-            else:
-                version_info = fid.read()
-                if version_info == '':
-                    return get_revision_from_svn_entries()
-
-            # Split revision number from data
-            if ':' in version_info:
-                revision_number, _ = version_info.split(':',1)
-                msg = ('Some modules have not been checked in. '
-                       'Using last version from repository: %s' % revision_number)
-                warnings.warn(msg)
-            else:
-                revision_number = version_info
-
-            try:
-                revision_number = int(revision_number)
-            except:
-                msg = ("Revision number must be an integer. I got '%s' from "
-                       "'svn'." % version_info)
-                raise Exception, msg
-
-        return revision_number
-
     # try to get revision information from stored_version_info.py
     try:
         from anuga.stored_version_info import version_info
     except:
-        return get_revision_from_svn_client()
+        return __get_revision_from_svn_client__()
 
     # split revision number from data

anuga_core/source/anuga/utilities/test_system_tools.py

@@ -461 +461 @@
         msg = 'Expected file_length() to return 1000, but got %d' % size4
         self.failUnless(size4 == 1000, msg)
+        
+        
+        
+    def test_get_revision_number(self):
+        """test_get_revision_number
+        
+        Test that a revision number is returned.
+        This should work both from a sandpit with access to Subversion
+        and also in distributions where revision number has been stored
+        explicitly in anuga.stored_version_info.version_info
+        """
+
+        x = get_revision_number()
+        assert int(x)
 
 ################################################################################