git cl: reduce number of Gerrit RPCs in status check.
Also fixes git cl description <url> by propagating codereview host information
in all cases.
BUG=681704
R=agable@chromium.org
Change-Id: Ia79c10b19d72b5a8797a1428ad8a79c8f4480901
Reviewed-on: https://chromium-review.googlesource.com/431036
Reviewed-by: Aaron Gable <agable@chromium.org>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 31109f2..0cafc70 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -1677,7 +1677,7 @@
self.calls += [
(('GetChangeDetail', git_short_host + '-review.googlesource.com',
- '123456', ['ALL_REVISIONS']),
+ '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
{
'current_revision': '7777777777',
'revisions': {
@@ -2042,13 +2042,7 @@
out = StringIO.StringIO()
self.mock(git_cl.sys, 'stdout', out)
self.calls = [
- ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
- ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
- ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
- ((['git', 'config', 'branch.master.remote'],), 'origin'),
- ((['git', 'config', 'remote.origin.url'],),
- 'https://git.review.org/repo.git'),
- (('GetChangeDetail', 'git-review.review.org',
+ (('GetChangeDetail', 'code.review.org',
'123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
{
'current_revision': 'sha1',
@@ -2382,7 +2376,7 @@
['DETAILED_ACCOUNTS']),
{'owner': {'email': 'owner@e.mail'}}),
(('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
- ['ALL_REVISIONS']), {
+ ['ALL_REVISIONS', 'CURRENT_COMMIT']), {
'project': 'depot_tools',
'revisions': {
'deadbeaf': {