Ticket #18228: get_git_version.diff

django/__init__.py

@@ -18 +18 @@
     sub = ''
     if version[3] == 'alpha' and version[4] == 0:
         # At the toplevel, this would cause an import loop.
-        from django.utils.version import get_svn_revision
-        svn_revision = get_svn_revision()[4:]
-        if svn_revision != 'unknown':
-            sub = '.dev%s' % svn_revision
+        from django.utils.version import get_git_revision
+        git_revision = get_git_revision()[:10]
+        if git_revision != 'unknown':
+            sub = '.dev%s' % git_revision
 
     elif version[3] != 'final':
         mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'}

django/utils/version.py

@@ -1 +1 @@
 import django
+import os.path
 import re
 
 def get_svn_revision(path=None):
@@ -39 +40 @@
     if rev:
         return u'SVN-%s' % rev
     return u'SVN-unknown'
+
+
+def get_git_revision(path=None):
+    """
+    Returns the full 40-char hexadecimal Git revision, mimicing the behaviour
+    of 'git rev-parse HEAD'. Returns 'unknown' if anything goes wrong.
+
+    If path is provided, it should be a top-level directory of a Git clone. If
+    it's not provided, this will use the parent directory of the django package
+    directory.
+    """
+    rev = 'unknown'
+    if path is None:
+        path = os.path.dirname(os.path.realpath(django.__path__[0]))
+    git_path = os.path.join(path, '.git')
+
+    try:
+        head_ref = open(os.path.join(git_path, 'HEAD'), 'r').readline().strip()
+        ref_path = os.path.join(git_path, head_ref.split(' ')[1])
+        head = open(ref_path, 'r').readline()
+    except IOError:
+        pass
+    else:
+        rev_match = re.match(r'([0-9a-f]{40})', head)
+        if rev_match:
+            rev = rev_match.group(1)
+
+    return rev