gclient_scm: Only _DeleteOrMove if _Clone fails

gclient_scm: Only _DeleteOrMove if _Clone fails

BUG=

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=267587

[borenet, 2014-05-01 14:38:13]

This probably should have been the approach all along.  With this change, I get
no warnings for the following flows:

$ gclient config https://skia.googlesource.com/skia.git
$ gclient sync
-----------------------------------
$ fetch chromium
-----------------------------------
$ gclient config --name src/clank
https://chrome-internal.googlesource.com/clank/internal/apps.git --git-deps
$ gclient sync --nohooks

[iannucci, 2014-05-01 18:11:17]

lgtm

[borenet, 2014-05-01 18:11:49]

The CQ bit was checked by borenet@google.com

[commit-bot: I haz the power, 2014-05-01 18:12:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/borenet@google.com/262813002/1

[commit-bot: I haz the power, 2014-05-01 18:14:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-01 18:14:29]

Presubmit check for 262813002-1 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/scm_unittest.py (55.41s) failed
...svn: Commit failed (details follow):
svn: Conflict at '/origin'
E....EEE.......
======================================================================
ERROR: testGetGetSha1ForSvnRev (__main__.RealGitSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 148, in setUp
    self.enabled = self.FAKE_REPOS.set_up_git() and self.FAKE_REPOS.set_up_svn()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 353, in set_up_svn
    self.populateSvn()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 504, in populateSvn
    self._commit_svn(fs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 395, in _commit_svn
    commit_svn(self.svn_checkout, self.USERS[0][0], self.USERS[0][1])
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 81, in commit_svn
    cwd=repo)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
515, in check_output
    return check_call_out(args, stdout=PIPE, **kwargs)[0]
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
478, in check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command svn commit /tmp/trialdlw3be/repos/svn_checkout -m
foo --non-interactive --no-auth-cache --username user1@example.com --password
foo returned non-zero exit status 1 in /tmp/trialdlw3be/repos/svn_checkout
Adding         origin
Adding         trunk
Adding         trunk/origin
Adding         trunk/other
Adding         trunk/other/origin
Adding         trunk/src
Adding         trunk/src/DEPS
Adding         trunk/src/DEPS.alt
Adding         trunk/src/origin
Adding         trunk/src/third_party
Adding         trunk/src/third_party/origin
Adding         trunk/third_party
Adding         trunk/third_party/foo
Adding         trunk/third_party/foo/origin
Adding         trunk/third_party/origin
Adding         trunk/third_party/prout
Adding         trunk/third_party/prout/origin
Transmitting file data ..........

======================================================================
ERROR: testCheckout (__main__.RealSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 406, in setUp
    self.tree = self.mangle_svn_tree(('trunk/third_party@-1', ''),)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 895, in mangle_svn_tree
    for k, v in tree.iteritems():
AttributeError: 'NoneType' object has no attribute 'iteritems'

======================================================================
ERROR: testIsValidRevision (__main__.RealSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 406, in setUp
    self.tree = self.mangle_svn_tree(('trunk/third_party@-1', ''),)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 895, in mangle_svn_tree
    for k, v in tree.iteritems():
AttributeError: 'NoneType' object has no attribute 'iteritems'

======================================================================
ERROR: testRevert (__main__.RealSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/scm_unittest.py", line 406, in setUp
    self.tree = self.mangle_svn_tree(('trunk/third_party@-1', ''),)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 895, in mangle_svn_tree
    for k, v in tree.iteritems():
AttributeError: 'NoneType' object has no attribute 'iteritems'

----------------------------------------------------------------------
Ran 18 tests in 24.333s

FAILED (errors=4)
Error in atexit._run_exitfuncs:
Traceback (most recent call last):
  File "/usr/lib/python2.7/atexit.py", line 24, in _run_exitfuncs
    func(*targs, **kargs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 234, in tear_down
    self.tear_down_svn()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 248, in tear_down_svn
    wait_for_port_to_free(self.host, self.svn_port)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 161, in wait_for_port_to_free
    assert False, '%d is still bound' % port
AssertionError: 10000 is still bound
Error in sys.exitfunc:
Traceback (most recent call last):
  File "/usr/lib/python2.7/atexit.py", line 24, in _run_exitfuncs
    func(*targs, **kargs)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 234, in tear_down
    self.tear_down_svn()
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 248, in tear_down_svn
    wait_for_port_to_free(self.host, self.svn_port)
  File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 161, in wait_for_port_to_free
    assert False, '%d is still bound' % port
AssertionError: 10000 is still bound


Presubmit checks took 133.8s to calculate.

Was the presubmit check useful? If not, run "git cl presubmit -v"
to figure out which PRESUBMIT.py was run, then run git blame
on the file to figure out who to ask for help.

[borenet, 2014-05-01 18:20:01]

The CQ bit was checked by borenet@google.com

[commit-bot: I haz the power, 2014-05-01 18:20:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/borenet@google.com/262813002/1

[commit-bot: I haz the power, 2014-05-01 18:22:01]

Change committed as 267587