Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
C
Chromium_Depot_tools
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
Chromium_Depot_tools
Commits
6eda05f9
Commit
6eda05f9
authored
Jun 30, 2016
by
martiniss
Committed by
Commit bot
Jun 30, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow git_cl to be called when no default server is given
Review-Url:
https://codereview.chromium.org/2109253002
parent
d0b10a0b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
git_cl.py
git_cl.py
+14
-7
git_cl_test.py
tests/git_cl_test.py
+2
-9
No files found.
git_cl.py
View file @
6eda05f9
...
...
@@ -1595,6 +1595,7 @@ class _RietveldChangelistImpl(_ChangelistCodereviewBase):
def
__init__
(
self
,
changelist
,
auth_config
=
None
,
rietveld_server
=
None
):
super
(
_RietveldChangelistImpl
,
self
)
.
__init__
(
changelist
)
assert
settings
,
'must be initialized in _ChangelistCodereviewBase'
if
not
rietveld_server
:
settings
.
GetDefaultServerUrl
()
self
.
_rietveld_server
=
rietveld_server
...
...
@@ -3448,17 +3449,23 @@ def CMDdescription(parser, args):
target_issue
=
None
if
len
(
args
)
>
0
:
issue_arg
=
ParseIssueNumberArgument
(
args
[
0
])
if
not
issue_arg
.
valid
:
target_issue
=
ParseIssueNumberArgument
(
args
[
0
])
if
not
target_issue
.
valid
:
parser
.
print_help
()
return
1
target_issue
=
issue_arg
.
issue
auth_config
=
auth
.
extract_auth_config_from_options
(
options
)
cl
=
Changelist
(
auth_config
=
auth_config
,
issue
=
target_issue
,
codereview
=
options
.
forced_codereview
)
kwargs
=
{
'auth_config'
:
auth_config
,
'codereview'
:
options
.
forced_codereview
,
}
if
target_issue
:
kwargs
[
'issue'
]
=
target_issue
.
issue
if
options
.
forced_codereview
==
'rietveld'
:
kwargs
[
'rietveld_server'
]
=
target_issue
.
hostname
cl
=
Changelist
(
**
kwargs
)
if
not
cl
.
GetIssue
():
DieWithError
(
'This branch has no associated changelist.'
)
...
...
tests/git_cl_test.py
View file @
6eda05f9
...
...
@@ -1493,14 +1493,8 @@ class TestGitCl(TestCase):
def
test_description_rietveld
(
self
):
out
=
StringIO
.
StringIO
()
self
.
mock
(
git_cl
.
sys
,
'stdout'
,
out
)
self
.
mock
(
git_cl
.
Changelist
,
'GetDescription'
,
lambda
*
args
:
'foobar'
)
self
.
mock
(
git_cl
.
Changelist
,
'GetDescription'
,
lambda
*
args
:
'foobar'
)
self
.
calls
=
[
(([
'git'
,
'config'
,
'rietveld.autoupdate'
],),
''
),
(([
'git'
,
'config'
,
'rietveld.server'
],),
''
),
(([
'git'
,
'config'
,
'rietveld.server'
],),
''
),
]
self
.
assertEqual
(
0
,
git_cl
.
main
([
'description'
,
'https://code.review.org/123123'
,
'-d'
,
'--rietveld'
]))
self
.
assertEqual
(
'foobar
\n
'
,
out
.
getvalue
())
...
...
@@ -1508,8 +1502,7 @@ class TestGitCl(TestCase):
def
test_description_gerrit
(
self
):
out
=
StringIO
.
StringIO
()
self
.
mock
(
git_cl
.
sys
,
'stdout'
,
out
)
self
.
mock
(
git_cl
.
Changelist
,
'GetDescription'
,
lambda
*
args
:
'foobar'
)
self
.
mock
(
git_cl
.
Changelist
,
'GetDescription'
,
lambda
*
args
:
'foobar'
)
self
.
assertEqual
(
0
,
git_cl
.
main
([
'description'
,
'https://code.review.org/123123'
,
'-d'
,
'--gerrit'
]))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment