Download hooks only 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."""
 
 import logging
 import optparse
 import os
 import re
+import stat
 import sys
 import textwrap
 import urlparse
+import urllib
 import urllib2
 
 try:
   import readline  # pylint: disable=F0401,W0611
 except ImportError:
   pass
 
 try:
   import simplejson as json  # pylint: disable=F0401
 except ImportError:
@@ skipping 120 matching lines @@
     self.viewvc_url = None
     self.updated = False
     self.did_migrate_check = False
     self.is_gerrit = None
 
   def LazyUpdateIfNeeded(self):
     """Updates the settings from a codereview.settings file, if available."""
     if not self.updated:
       cr_settings_file = FindCodereviewSettingsFile()
       if cr_settings_file:
         LoadCodereviewSettingsFromFile(cr_settings_file)

[M-A Ruel, 2012/02/10 15:50:05]

That's where it should load the file if not present. But not delete when it is
present, unlike when git cl config is run.

DownloadHooks(False)

[ukai, 2012/02/13 02:57:43]

Done.

       self.updated = True
 
   def GetDefaultServerUrl(self, error_ok=False):
     if not self.default_server:
       self.LazyUpdateIfNeeded()
       self.default_server = gclient_utils.UpgradeToHttps(
           self._GetConfig('rietveld.server', error_ok=True))
       if error_ok:
         return self.default_server
       if not self.default_server:
@@ skipping 559 matching lines @@
   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('tree-status-url', 'STATUS', unset_error_ok=True)
   SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
 
   if 'GERRIT_HOST' in keyvals and 'GERRIT_PORT' in keyvals:
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
     RunGit(['config', 'gerrit.port', keyvals['GERRIT_PORT']])
-    # Install the standard commit-msg hook.
-    RunCommand(['scp', '-p', '-P', keyvals['GERRIT_PORT'],
-                '%s:hooks/commit-msg' % keyvals['GERRIT_HOST'],
-                os.path.join(settings.GetRoot(),
-                             '.git', 'hooks', 'commit-msg')])
 
   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']])
 
 
+def DownloadHooks():

[M-A Ruel, 2012/02/10 15:50:05]

Add force argument

[ukai, 2012/02/13 02:57:43]

Done.

+  """downloads hooks"""
+  if settings.GetIsGerrit():

[M-A Ruel, 2012/02/10 15:50:05]

if not settings.GetIsGerrit():
  return

reduces indentation.

[ukai, 2012/02/13 02:57:43]

Done.

+    server_url = settings.GetDefaultServerUrl()
+    src = '%s/tools/hooks/commit-msg' % server_url
+    dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
+    if not os.access(dst, os.X_OK):
+      if os.path.exists(dst):

[M-A Ruel, 2012/02/10 15:50:05]

if os.path.exists(dst):
  if not force:
    return
  os.remove(dst)
...

[ukai, 2012/02/13 02:57:43]

Done.

+        os.remove(dst)
+      try:
+        urllib.urlretrieve(src, dst)
+        os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
+      except Exception, e:
+        print e
+        if os.path.exists(dst):
+          os.remove(dst)
+        DieWithError('\nFailed to download hooks from %s' % src)
+
+
 @usage('[repo root containing codereview.settings]')
 def CMDconfig(parser, args):
   """edit configuration for this tree"""
 
   _, args = parser.parse_args(args)
   if len(args) == 0:
     GetCodereviewSettingsInteractively()
+    DownloadHooks()

[M-A Ruel, 2012/02/10 15:50:05]

True

[ukai, 2012/02/13 02:57:43]

Done.

     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))
+  DownloadHooks()

[M-A Ruel, 2012/02/10 15:50:05]

True

[ukai, 2012/02/13 02:57:43]

Done.

   return 0
 
 
 def CMDstatus(parser, args):
   """show status of changelists"""
   parser.add_option('--field',
                     help='print only specific field (desc|id|patch|url)')
   (options, args) = parser.parse_args(args)
 
   # TODO: maybe make show_branches a flag if necessary.
@@ skipping 722 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))