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

tests/git_cl_test.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.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 96 matching lines @@
       self.fail(msg)
     self._calls_done += 1
     return result
 
   @classmethod
   def _upload_calls(cls, similarity, find_copies):
     return (cls._git_base_calls(similarity, find_copies) +
             cls._git_upload_calls())
 
   @classmethod
+  def _upload_no_rev_calls(cls, similarity, find_copies):
+    return (cls._git_base_calls(similarity, find_copies) +
+            cls._git_upload_no_rev_calls())
+
+  @classmethod
   def _git_base_calls(cls, similarity, find_copies):
     if similarity is None:
       similarity = '50'
       similarity_call = ((['git', 'config', '--int', '--get',
                          'branch.master.git-cl-similarity'],), '')
     else:
       similarity_call = ((['git', 'config', '--int',
                          'branch.master.git-cl-similarity', similarity],), '')
 
     if find_copies is None:
@@ skipping 35 matching lines @@
       ((['git', 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
        'foo'),
       ((['git', 'config', 'user.email'],), 'me@example.com'),
       stat_call,
       ((['git', 'config', 'gerrit.host'],), ''),
       ((['git', 'log', '--pretty=format:%s\n\n%b', 'fake_ancestor_sha..HEAD'],),
        'desc\n'),
     ]
 
   @classmethod
+  def _git_upload_no_rev_calls(cls):
+    return [
+      ((['git', 'config', 'core.editor'],), ''),
+    ]
+
+  @classmethod
   def _git_upload_calls(cls):
     return [
+      ((['git', 'config', 'core.editor'],), ''),
       ((['git', 'config', 'rietveld.cc'],), ''),
       ((['git', 'config', 'branch.master.base-url'],), ''),
       ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
         (('', None), 0)),
       ((['git', 'rev-parse', '--show-cdup'],), ''),
       ((['git', 'svn', 'info'],), ''),
       ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
       ((['git', 'config', 'branch.master.rietveldserver',
           'https://codereview.example.com'],), ''),
       ((['git', 'config', 'branch.master.rietveldpatchset', '2'],), ''),
@@ skipping 139 matching lines @@
       similarity = None
 
     if '--find-copies' in upload_args:
       find_copies = True
     elif '--no-find-copies' in upload_args:
       find_copies = False
     else:
       find_copies = None
 
     self.calls = self._upload_calls(similarity, find_copies)
-    def RunEditor(desc, _):
+    def RunEditor(desc, _, **kwargs):
       self.assertEquals(
           '# 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' +
           expected_description,
           desc)
       return returned_description
     self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
     def check_upload(args):
       cmd_line = self._cmd_line(final_description, reviewers, similarity,
@@ skipping 71 matching lines @@
 
   def test_reviewer_send_mail_no_rev(self):
     # Fails without a reviewer.
     class FileMock(object):
       buf = StringIO.StringIO()
       def write(self, content):
         self.buf.write(content)
 
     mock = FileMock()
     try:
-      self.calls = self._git_base_calls(None, None)
-      def RunEditor(desc, _):
+      self.calls = self._upload_no_rev_calls(None, None)
+      def RunEditor(desc, _, **kwargs):
         return desc
       self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
       self.mock(sys, 'stderr', mock)
       git_cl.main(['upload', '--send-mail'])
       self.fail()
     except SystemExit:
       self.assertEquals(
           'Must specify reviewers to send email.\n', mock.buf.getvalue())
 
   def test_dcommit(self):
@@ skipping 193 matching lines @@
       obj = git_cl.ChangeDescription(orig)
       obj.update_reviewers(reviewers)
       actual.append(obj.description)
     self.assertEqual(expected, actual)
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()