From 10056290136e8613340016d74b7efb382a5b67d7 Mon Sep 17 00:00:00 2001 From: "iannucci@chromium.org" Date: Wed, 26 Jun 2013 22:15:44 +0000 Subject: [PATCH] Revert "Add --no-commit option to apply_issue for use with git on the bots." This reverts commit 012dc07ce5a194e74503d64a9b1719abc0b3aa3b. Revert "Partially revert r208574 to get the CQ working again (hopefully)." This reverts commit 74105cd2a02d09032bb15b21fe516ea021715729. 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 --- apply_issue.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apply_issue.py b/apply_issue.py index b333bd816f..30748fd756 100755 --- a/apply_issue.py +++ b/apply_issue.py @@ -65,8 +65,6 @@ def main(): '--server', default='http://codereview.chromium.org', 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() logging.basicConfig( format='%(levelname)5s %(module)11s(%(lineno)4d): %(message)s', @@ -139,13 +137,11 @@ def main(): print(patch) full_dir = os.path.abspath(options.root_dir) scm_type = scm.determine_scm(full_dir) - - # FIXME: re-enable --no-commit. if scm_type == 'svn': scm_obj = checkout.SvnCheckout(full_dir, None, None, None, None) elif scm_type == 'git': 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) else: parser.error('Couldn\'t determine the scm')