git cl: add --gerrit and --rietveld options to force codereview.

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 1075 matching lines @@
       ((['git', 'config', 'gerrit.host'],), ''),
       ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
     ]
     self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
 
   def test_diff_when_dirty(self):
     # Do 'git cl diff' when local tree is dirty
     self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
     self.assertNotEqual(git_cl.main(['diff']), 0)
 
-  def _patch_common(self, is_gerrit=False):
+  def _patch_common(self, is_gerrit=False, force_codereview=False):
     self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
               lambda x: '60001')
     self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
               lambda *args: None)
     self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
               lambda *args: {
                 'current_revision': '7777777777',
                 'revisions': {
                   '1111111111': {
                     '_number': 1,
                     'fetch': {'http': {
                       'url': 'https://chromium.googlesource.com/my/repo',
                       'ref': 'refs/changes/56/123456/1',
                     }},
                   },
                   '7777777777': {
                     '_number': 7,
                     'fetch': {'http': {
                       'url': 'https://chromium.googlesource.com/my/repo',
                       'ref': 'refs/changes/56/123456/7',
                     }},
                   },
                 },
               })
     self.mock(git_cl.Changelist, 'GetDescription',
               lambda *args: 'Description')
     self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
 
-    self.calls = [
-      ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
-      ((['git', 'config', 'branch.master.rietveldissue'],), ''),
-      ((['git', 'config', 'branch.master.gerritissue'],), ''),
-      ((['git', 'config', 'rietveld.autoupdate'],), ''),
-    ]
+    if not force_codereview:
+      # These calls detect codereview to use.
+      self.calls = [
+        ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
+        ((['git', 'config', 'branch.master.rietveldissue'],), ''),

[tandrii(chromium), 2016/04/13 18:13:46]

if this line had '12345' at the end, it'd tell git_cl that this is rietveld
issue 12345, and then it'd not even check for gerritissue below.

+        ((['git', 'config', 'branch.master.gerritissue'],), ''),
+        ((['git', 'config', 'rietveld.autoupdate'],), ''),
+      ]
+    else:
+      self.calls = []
+
     if is_gerrit:
-      self.calls += [
-        ((['git', 'config', 'gerrit.host'],), 'true'),
-      ]
+      if not force_codereview:
+        self.calls += [
+          ((['git', 'config', 'gerrit.host'],), 'true'),
+        ]
     else:
       self.calls += [
         ((['git', 'config', 'gerrit.host'],), ''),
         ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
         ((['git', 'rev-parse', '--show-cdup'],), ''),
         ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
       ]
 
   def test_patch_successful(self):
     self._patch_common()
@@ skipping 30 matching lines @@
       ((['git', 'config', 'branch.master.merge'],), 'master'),
       ((['git', 'config', 'branch.master.remote'],), 'origin'),
       ((['git', 'config', 'remote.origin.url'],),
        'https://chromium.googlesource.com/my/repo'),
       ((['git', 'config', 'branch.master.gerritserver',
         'https://chromium-review.googlesource.com'],), ''),
       ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
     ]
     self.assertEqual(git_cl.main(['patch', '123456']), 0)
 
+  def test_patch_force_codereview(self):
+    self._patch_common(is_gerrit=True, force_codereview=True)

[Sergiy Byelozyorov, 2016/04/13 17:18:59]

can you please try to create mock rietveld CL here and see if we can override it
with --gerrit option?

[tandrii(chromium), 2016/04/13 18:13:46]

Ha, good comment/idea! However, the calls below is the *only* way to "git cl
patch" to figure out what's the state of the current branch. And as you can see
in expectations below, it never asks, hence works regardless.

[Sergiy Byelozyorov, 2016/04/13 18:21:55]

Acknowledged.

+    self.calls += [
+      ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
+         'refs/changes/56/123456/7'],), ''),
+      ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
+      ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
+      ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
+      ((['git', 'config', 'branch.master.gerritserver'],), ''),
+      ((['git', 'config', 'branch.master.merge'],), 'master'),
+      ((['git', 'config', 'branch.master.remote'],), 'origin'),
+      ((['git', 'config', 'remote.origin.url'],),
+       'https://chromium.googlesource.com/my/repo'),
+      ((['git', 'config', 'branch.master.gerritserver',
+        'https://chromium-review.googlesource.com'],), ''),
+      ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
+    ]
+    self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
+
   def test_gerrit_patch_url_successful(self):
     self._patch_common(is_gerrit=True)
     self.calls += [
       ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
          'refs/changes/56/123456/1'],), ''),
       ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
       ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
       ((['git', 'config', 'branch.master.gerritserver',
         'https://chromium-review.googlesource.com'],), ''),
       ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
@@ skipping 133 matching lines @@
         ((['SetReview', 'chromium-review.googlesource.com', 123,
            {'Commit-Queue': 1}],), ''),
     ]
     self.assertEqual(0, git_cl.main(['set-commit', '-d']))
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()