Issue 7004 - Actually return git's result

packager.py

 # 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 packagerChrome and packagerEdge.
 
 import sys
 import os
 import re
@@ skipping 54 matching lines @@
     return parser
 
 
 def getBuildNum(baseDir):
     try:
         from buildtools.ensure_dependencies import Mercurial, Git
         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 str(len(result.splitlines()))
+            result = subprocess.check_output(
+                ['git', 'rev-list', '--count', '--branches', '--tags'],
+                cwd=baseDir,
+            )
+            return re.sub(r'\D', '', result)

[Sebastian Noack, 2018/10/08 13:28:25]

Wouldn't strip() do?

[tlucas, 2018/10/08 13:35:28]

It does :) Done.

     except subprocess.CalledProcessError:
         pass
 
     return '0'
 
 
 def getBuildVersion(baseDir, metadata, releaseBuild, buildNum=None):
     version = metadata.get('general', 'version')
     if not releaseBuild:
         if buildNum == None:
@@ skipping 77 matching lines @@
 
     def zip(self, outFile, sortKey=None, compression=zipfile.ZIP_DEFLATED):
         with zipfile.ZipFile(outFile, 'w', compression) as zf:
             for name in sorted(self, key=sortKey):
                 zf.writestr(name, self[name])
 
     def zipToString(self, sortKey=None):
         buffer = StringIO()
         self.zip(buffer, sortKey=sortKey)
         return buffer.getvalue()