Make git-cl more accurately imitate git's editor selection process, and respect $VISUAL.

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 json
@@ skipping 227 matching lines @@
   def __init__(self):
     self.default_server = None
     self.cc = None
     self.root = None
     self.is_git_svn = None
     self.svn_branch = None
     self.tree_status_url = None
     self.viewvc_url = None
     self.updated = False
     self.is_gerrit = None
+    self.git_editor = 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)
         self.updated = True
         DownloadHooks(False)
       self.updated = True
@@ skipping 104 matching lines @@
 
   def GetDefaultCCList(self):
     return self._GetConfig('rietveld.cc', 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)
     return self.is_gerrit
 
+  def GetGitEditor(self):
+    """Return the editor specified in the git config, or None if none is."""
+    if self.git_editor is None:
+      self.git_editor = self._GetConfig('core.editor', error_ok=True)
+    return self.git_editor or None
+
   def _GetConfig(self, param, **kwargs):
     self.LazyUpdateIfNeeded()
     return RunGit(['config', param], **kwargs).strip()
 
 
 def ShortBranchName(branch):
   """Convert a name like 'refs/heads/foo' to just 'foo'."""
   return branch.replace('refs/heads/', '')
 
 
@@ skipping 464 matching lines @@
   def prompt(self):
     """Asks the user to update the description."""
     self._description = (
       '# Enter a description of the change.\n'
       '# This will be displayed on the codereview site.\n'
       '# The first line will also be used as the subject of the review.\n'
     ) + self._description
 
     if '\nBUG=' not in self._description:
       self.append_footer('BUG=')
-    content = gclient_utils.RunEditor(self._description, True)
+    content = gclient_utils.RunEditor(self._description, True,
+                                      git_editor=settings.GetGitEditor())
     if not content:
       DieWithError('Running editor failed')
 
     # Strip off comments.
     content = re.compile(r'^#.*$', re.MULTILINE).sub('', content).strip()
     if not content:
       DieWithError('No CL description, aborting')
     self._description = content
 
   def append_footer(self, line):
@@ skipping 1130 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:]))