Stop installing Gerrit commit-msg hooks in git cl config.

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 1315 matching lines @@
     return 'branch.%s.rietveldpatchset' % self.GetBranch()
 
   def _RietveldServer(self):
     """Returns the git setting that stores this change's rietveld server."""
     branch = self.GetBranch()
     if branch:
       return 'branch.%s.rietveldserver' % branch
     return None
 
 
-def GetCodereviewSettingsInteractively():
-  """Prompt the user for settings."""
-  # TODO(ukai): ask code review system is rietveld or gerrit?
-  server = settings.GetDefaultServerUrl(error_ok=True)
-  prompt = 'Rietveld server (host[:port])'
-  prompt += ' [%s]' % (server or DEFAULT_SERVER)
-  newserver = ask_for_data(prompt + ':')
-  if not server and not newserver:
-    newserver = DEFAULT_SERVER
-  if newserver:
-    newserver = gclient_utils.UpgradeToHttps(newserver)
-    if newserver != server:
-      RunGit(['config', 'rietveld.server', newserver])
-
-  def SetProperty(initial, caption, name, is_url):
-    prompt = caption
-    if initial:
-      prompt += ' ("x" to clear) [%s]' % initial
-    new_val = ask_for_data(prompt + ':')
-    if new_val == 'x':
-      RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
-    elif new_val:
-      if is_url:
-        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)
-  SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
-              'run-post-upload-hook', 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]*$'
 
   def __init__(self, description):
     self._description_lines = (description or '').strip().splitlines()
 
   @property               # www.logilab.org/ticket/89786
   def description(self):  # pylint: disable=E0202
@@ skipping 226 matching lines @@
         os.remove(dst)
       DieWithError('\nFailed to download hooks.\n'
                    'You need to download from\n%s\n'
                    'into .git/hooks/commit-msg and '
                    'chmod +x .git/hooks/commit-msg' % src)
 
 # TODO(tandrii): remove this once repos which call this method directly are
 # upgraded. See http://crbug.com/579176.
 DownloadHooks = DownloadGerritHook
 
+
+def GetRietveldCodereviewSettingsInteractively():
+  """Prompt the user for settings."""
+  server = settings.GetDefaultServerUrl(error_ok=True)
+  prompt = 'Rietveld server (host[:port])'
+  prompt += ' [%s]' % (server or DEFAULT_SERVER)
+  newserver = ask_for_data(prompt + ':')
+  if not server and not newserver:
+    newserver = DEFAULT_SERVER
+  if newserver:
+    newserver = gclient_utils.UpgradeToHttps(newserver)
+    if newserver != server:
+      RunGit(['config', 'rietveld.server', newserver])
+
+  def SetProperty(initial, caption, name, is_url):
+    prompt = caption
+    if initial:
+      prompt += ' ("x" to clear) [%s]' % initial
+    new_val = ask_for_data(prompt + ':')
+    if new_val == 'x':
+      RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
+    elif new_val:
+      if is_url:
+        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)
+  SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
+              'run-post-upload-hook', False)
+
 @subcommand.usage('[repo root containing codereview.settings]')
 def CMDconfig(parser, args):
   """Edits configuration for this tree."""
 
+  print('WARNING: git cl config works for Rietveld only.\n'
+        'For Gerrit, see http://crbug.com/579160.')
+  # TODO(tandrii): add Gerrit support as part of http://crbug.com/579160.
   parser.add_option('--activate-update', action='store_true',
                     help='activate auto-updating [rietveld] section in '
                          '.git/config')
   parser.add_option('--deactivate-update', action='store_true',
                     help='deactivate auto-updating [rietveld] section in '
                          '.git/config')
   options, args = parser.parse_args(args)
 
   if options.deactivate_update:
     RunGit(['config', 'rietveld.autoupdate', 'false'])
     return
 
   if options.activate_update:
     RunGit(['config', '--unset', 'rietveld.autoupdate'])
     return
 
   if len(args) == 0:
-    GetCodereviewSettingsInteractively()
-    DownloadGerritHook(True)
+    GetRietveldCodereviewSettingsInteractively()
     return 0
 
   url = args[0]
   if not url.endswith('codereview.settings'):
     url = os.path.join(url, 'codereview.settings')
 
   # Load code review settings and download hooks (if available).
   LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
-  DownloadGerritHook(True)
   return 0
 
 
 def CMDbaseurl(parser, args):
   """Gets or sets base-url for this branch."""
   branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
   branch = ShortBranchName(branchref)
   _, args = parser.parse_args(args)
   if not args:
     print("Current base-url:")
@@ skipping 2318 matching lines @@
 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()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)