Issue 1778 - Generate proper build numbers when working with Git repositories

packager.py

 # coding: utf-8
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Note: These are the base functions common to all packagers, the actual
 # packagers are implemented in packagerGecko and packagerChrome.
 
 import sys, os, re, codecs, subprocess, json, zipfile
 from StringIO import StringIO
 from chainedconfigparser import ChainedConfigParser
 
 import buildtools
 
 def getDefaultFileName(baseDir, metadata, version, ext):
   return os.path.join(baseDir, '%s-%s.%s' % (metadata.get('general', 'basename'), version, ext))
 
 def getMetadataPath(baseDir, type):
   return os.path.join(baseDir, 'metadata.%s' % type)
 
 def readMetadata(baseDir, type):
   return ChainedConfigParser(getMetadataPath(baseDir, type))
 
 def getBuildNum(baseDir):
   try:
-    result = subprocess.check_output(['hg', 'id', '-R', baseDir, '-n'])
-    return re.sub(r'\D', '', result)
-  except:
-    return '0'
+    from buildtools.ensure_dependencies import Mercurial, Git

[Sebastian Noack, 2015/01/13 09:12:25]

It seems that you only need Git.istype() and Mercurial.istype(), which are both
implemented as a simple one-liner. So I'd rather duplicate that one line than
importing ensure_dependencies here. But I leave it up to you. So LGTM, whether
you address that or not.

[Wladimir Palant, 2015/01/13 12:56:53]

As the OP explained in the pull request, these aren't guaranteed to stay
one-liners forever. At some point we might decide to support more complicated
setups as well (repositories with multiple extensions being the most obvious
scenario, so the extension wouldn't be at the repository root). So I decided to
share that logic rather than duplicating it.

Note that I didn't add getting a numerical revision ID to ensure_dependencies.py
for the exact reason you outlined - this isn't a proper VCS abstraction layer
right now, merely a quick hack to avoid duplicating code.

+    if Mercurial().istype(baseDir):
+      result = subprocess.check_output(['hg', 'id', '-R', baseDir, '-n'])
+      return re.sub(r'\D', '', result)
+    elif Git().istype(baseDir):
+      result = subprocess.check_output(['git', 'rev-list', 'HEAD'], cwd=baseDir)
+      return len(result.splitlines())
+  except subprocess.CalledProcessError:
+    pass
+
+  return '0'
 
 def getBuildVersion(baseDir, metadata, releaseBuild, buildNum=None):
   version = metadata.get('general', 'version')
   if not releaseBuild:
     if buildNum == None:
       buildNum = getBuildNum(baseDir)
     buildNum = str(buildNum)
     if len(buildNum) > 0:
       if re.search(r'(^|\.)\d+$', version):
         # Numerical version number - need to fill up with zeros to have three
@@ skipping 75 matching lines @@
     names = self.keys()
     names.sort(key=sortKey)
     for name in names:
       zip.writestr(name, self[name])
     zip.close()
 
   def zipToString(self, sortKey=None):
     buffer = StringIO()
     self.zip(buffer, sortKey=sortKey)
     return buffer.getvalue()