From 74105cd2a02d09032bb15b21fe516ea021715729 Mon Sep 17 00:00:00 2001 From: "dpranke@chromium.org" Date: Wed, 26 Jun 2013 20:51:29 +0000 Subject: [PATCH] Partially revert r208574 to get the CQ working again (hopefully). TBR=iannucci@chromium.org, cmp@chromium.org BUG=254556 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@208782 0039d316-1c4b-4281-b951-d872f2087c98 --- apply_issue.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apply_issue.py b/apply_issue.py index 76ade33287..b333bd816f 100755 --- a/apply_issue.py +++ b/apply_issue.py @@ -139,12 +139,14 @@ def main(): print(patch) full_dir = os.path.abspath(options.root_dir) scm_type = scm.determine_scm(full_dir) - if options.no_commit or scm_type is None: - scm_obj = checkout.RawCheckout(full_dir, None, None) - elif scm_type == 'svn': + + # 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: + scm_obj = checkout.RawCheckout(full_dir, None, None) else: parser.error('Couldn\'t determine the scm')