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
experimental/szager/collated-output
dpranke@chromium.org 13 years ago
parent 012dc07ce5
commit 74105cd2a0

@ -139,12 +139,14 @@ 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)
if options.no_commit or scm_type is None:
scm_obj = checkout.RawCheckout(full_dir, None, None) # FIXME: re-enable --no-commit.
elif 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:
scm_obj = checkout.RawCheckout(full_dir, None, None)
else: else:
parser.error('Couldn\'t determine the scm') parser.error('Couldn\'t determine the scm')

Loading…
Cancel
Save