Commit 10056290 authored by iannucci@chromium.org's avatar iannucci@chromium.org

Revert "Add --no-commit option to apply_issue for use with git on the bots."

This reverts commit 012dc07c.

Revert "Partially revert r208574 to get the CQ working again (hopefully)."

This reverts commit 74105cd2.

Pull the --no-commit change out completely.

TBR=dpranke@chromium.org
BUG=254556

Review URL: https://codereview.chromium.org/17944002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@208801 0039d316-1c4b-4281-b951-d872f2087c98
parent 55c05c94
...@@ -65,8 +65,6 @@ def main(): ...@@ -65,8 +65,6 @@ def main():
'--server', '--server',
default='http://codereview.chromium.org', default='http://codereview.chromium.org',
help='Rietveld server') help='Rietveld server')
parser.add_option('--no-commit', action='store_true',
help='Do not try to commit patch to SCM (git only)')
options, args = parser.parse_args() options, args = parser.parse_args()
logging.basicConfig( logging.basicConfig(
format='%(levelname)5s %(module)11s(%(lineno)4d): %(message)s', format='%(levelname)5s %(module)11s(%(lineno)4d): %(message)s',
...@@ -139,13 +137,11 @@ def main(): ...@@ -139,13 +137,11 @@ def main():
print(patch) print(patch)
full_dir = os.path.abspath(options.root_dir) full_dir = os.path.abspath(options.root_dir)
scm_type = scm.determine_scm(full_dir) scm_type = scm.determine_scm(full_dir)
# FIXME: re-enable --no-commit.
if scm_type == 'svn': if scm_type == 'svn':
scm_obj = checkout.SvnCheckout(full_dir, None, None, None, None) scm_obj = checkout.SvnCheckout(full_dir, None, None, None, None)
elif scm_type == 'git': elif scm_type == 'git':
scm_obj = checkout.GitCheckoutBase(full_dir, None, None) scm_obj = checkout.GitCheckoutBase(full_dir, None, None)
elif scm_type is None: elif scm_type == None:
scm_obj = checkout.RawCheckout(full_dir, None, None) scm_obj = checkout.RawCheckout(full_dir, None, None)
else: else:
parser.error('Couldn\'t determine the scm') parser.error('Couldn\'t determine the scm')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment