Make the Mac Info.plist SCM keys generic

build/mac/tweak_info_plist.py

Index: build/mac/tweak_info_plist.py
diff --git a/build/mac/tweak_info_plist.py b/build/mac/tweak_info_plist.py
index 07a3a0b294ebfd57b976d4bceb8b0a37901088fd..dc352bb7725ad66e7bc0643e42f421eda6a7e435 100755
--- a/build/mac/tweak_info_plist.py
+++ b/build/mac/tweak_info_plist.py
@@ -101,26 +101,26 @@ def _AddVersionKeys(plist):
   return True
 
 
-def _DoSVNKeys(plist, add_keys):
-  """Adds the SVN information, visible in about:version, to property list. If
+def _DoSCMKeys(plist, add_keys):
+  """Adds the SCM information, visible in about:version, to property list. If
   |add_keys| is True, it will insert the keys, otherwise it will remove them."""
-  scm_path, scm_revision = None, None
+  scm_branch, scm_revision = None, None
   if add_keys:
     version_info = lastchange.FetchVersionInfo(
         default_lastchange=None, directory=TOP)
-    scm_path, scm_revision = version_info.url, version_info.revision
+    scm_branch, scm_revision = version_info.url, version_info.revision
 
   # See if the operation failed.
-  _RemoveKeys(plist, 'SVNRevision')
+  _RemoveKeys(plist, 'SCMRevision')
   if scm_revision != None:
-    plist['SVNRevision'] = scm_revision
+    plist['SCMRevision'] = scm_revision
   elif add_keys:
-    print >>sys.stderr, 'Could not determine svn revision.  This may be OK.'
+    print >>sys.stderr, 'Could not determine SCM revision.  This may be OK.'
 
-  if scm_path != None:
-    plist['SVNPath'] = scm_path
+  if scm_branch != None:
+    plist['SCMBranch'] = scm_branch

[Mark Mentovai, 2012/08/21 13:54:43]

“branch” isn’t really right still though, it’s still a “path” which is more
generic.

[stuartmorgan, 2012/08/22 09:35:54]

Okay, changed to SCMPath, and changed scm_branch back to scm_path. As I said
though, "branch" is the terminology used in lastchange.py for what the function
returns, so there's still a mismatch.
I've never heard someone refer to a git branch as a path...

   else:
-    _RemoveKeys(plist, 'SVNPath')
+    _RemoveKeys(plist, 'SCMBranch')
 
 
 def _DoPDFKeys(plist, add_keys):
@@ -220,8 +220,8 @@ def Main(argv):
       help='Enable Breakpad\'s uploading of crash dumps [1 or 0]')
   parser.add_option('--keystone', dest='use_keystone', action='store',
       type='int', default=False, help='Enable Keystone [1 or 0]')
-  parser.add_option('--svn', dest='add_svn_info', action='store', type='int',
-      default=True, help='Add SVN metadata [1 or 0]')
+  parser.add_option('--scm', dest='add_scm_info', action='store', type='int',
+      default=True, help='Add SCM metadata [1 or 0]')
   parser.add_option('--pdf', dest='add_pdf_support', action='store', type='int',
       default=False, help='Add PDF file handler support [1 or 0]')
   parser.add_option('--branding', dest='branding', action='store',
@@ -271,8 +271,8 @@ def Main(argv):
   else:
     _RemoveKeystoneKeys(plist)
 
-  # Adds or removes any SVN keys.
-  _DoSVNKeys(plist, options.add_svn_info)
+  # Adds or removes any SCM keys.
+  _DoSCMKeys(plist, options.add_scm_info)
 
   # Adds or removes the PDF file handler entry.
   _DoPDFKeys(plist, options.add_pdf_support)