Add support for BUG_PREFIX in codereview.settings

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 from distutils.version import LooseVersion
@@ skipping 377 matching lines @@
       self.tree_status_url = self._GetConfig('rietveld.tree-status-url',
                                              error_ok=error_ok,
                                              error_message=error_message)
     return self.tree_status_url
 
   def GetViewVCUrl(self):
     if not self.viewvc_url:
       self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
     return self.viewvc_url
 
+  def GetBugPrefix(self):
+    return self._GetConfig('rietveld.bug-prefix', error_ok=True)
+
   def GetDefaultCCList(self):
     return self._GetConfig('rietveld.cc', error_ok=True)
 
   def GetDefaultPrivateFlag(self):
     return self._GetConfig('rietveld.private', error_ok=True)
 
   def GetIsGerrit(self):
     """Return true if this repo is assosiated with gerrit code review system."""
     if self.is_gerrit is None:
       self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
@@ skipping 450 matching lines @@
         new_val = gclient_utils.UpgradeToHttps(new_val)
       if new_val != initial:
         RunGit(['config', 'rietveld.' + name, new_val])
 
   SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
   SetProperty(settings.GetDefaultPrivateFlag(),
               'Private flag (rietveld only)', 'private', False)
   SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
               'tree-status-url', False)
   SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
+  SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
 
   # TODO: configure a default branch to diff against, rather than this
   # svn-based hackery.
 
 
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
   R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
   BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$'
 
@@ skipping 64 matching lines @@
     self.set_description([
       '# Enter a description of the change.',
       '# This will be displayed on the codereview site.',
       '# The first line will also be used as the subject of the review.',
       '#--------------------This line is 72 characters long'
       '--------------------',
     ] + self._description_lines)
 
     regexp = re.compile(self.BUG_LINE)
     if not any((regexp.match(line) for line in self._description_lines)):
-      self.append_footer('BUG=')
+      self.append_footer('BUG=%s' % settings.GetBugPrefix())
     content = gclient_utils.RunEditor(self.description, True,
                                       git_editor=settings.GetGitEditor())
     if not content:
       DieWithError('Running editor failed')
     lines = content.splitlines()
 
     # Strip off comments.
     clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
     if not clean_lines:
       DieWithError('No CL description, aborting')
@@ skipping 62 matching lines @@
     else:
       RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
 
   SetProperty('server', 'CODE_REVIEW_SERVER')
   # Only server setting is required. Other settings can be absent.
   # In that case, we ignore errors raised during option deletion attempt.
   SetProperty('cc', 'CC_LIST', unset_error_ok=True)
   SetProperty('private', 'PRIVATE', unset_error_ok=True)
   SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
   SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
+  SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
 
   if 'GERRIT_HOST' in keyvals:
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
 
   if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
     #should be of the form
     #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
     #ORIGIN_URL_CONFIG: http://src.chromium.org/git
     RunGit(['config', keyvals['PUSH_URL_CONFIG'],
             keyvals['ORIGIN_URL_CONFIG']])
@@ skipping 1357 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))