Remove more unversioned directories.

Remove more unversioned directories.

Currently, if an unversioned directory is present where we would expect
a versioned repository to be, the following error is printed:

  Can't update/checkout %s if an unversioned directory is present.
  Delete the directory and try again.

If --reset and --delete_unversioned_trees are used, gclient should delete
the unversioned directory in this case.

This problem can be reproduced using the following recipe:
  $ rm -rf src/third_party/webrtc/.svn
  $ gclient sync -nRftD

BUG=none
TEST=Verify that above error is fixed. Run all smoke tests.


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

[M-A Ruel, 2012-11-14 13:00:53]

looks great, but it'll require a smoke test.

[davidjames, 2012-11-14 19:52:21]

Updated to add a smoke test. I also ran all smoke tests and precommit checks.

[M-A Ruel, 2012-11-14 20:59:29]

https://codereview.chromium.org/11366239/diff/3001/tests/gclient_smoketest.py
File tests/gclient_smoketest.py (right):

https://codereview.chromium.org/11366239/diff/3001/tests/gclient_smoketest.py...
tests/gclient_smoketest.py:797: scm.SVN.Capture(['propset', 'svn:ignore', 'foo',
'.'], cwd=third_party)
I'd say to just subprocess it to avoid having to import scm.

[davidjames, 2012-11-14 21:48:22]

PTAL

https://codereview.chromium.org/11366239/diff/3001/tests/gclient_smoketest.py
File tests/gclient_smoketest.py (right):

https://codereview.chromium.org/11366239/diff/3001/tests/gclient_smoketest.py...
tests/gclient_smoketest.py:797: scm.SVN.Capture(['propset', 'svn:ignore', 'foo',
'.'], cwd=third_party)
On 2012/11/14 20:59:29, Marc-Antoine Ruel wrote:
> I'd say to just subprocess it to avoid having to import scm.

Done.

[Peter Mayo, 2012-11-14 22:30:25]

https://codereview.chromium.org/11366239/diff/7001/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/11366239/diff/7001/gclient_scm.py#newcode941
gclient_scm.py:941: gclient_utils.rmtree(self.checkout_path)
How does this report errors (e.g. owned by root subdirs)?
Should catch or check accordingly and fall back to old message.

[M-A Ruel, 2012-11-14 23:17:31]

lgtm, I'll let you guys resolve this, I don't mind.

https://codereview.chromium.org/11366239/diff/7001/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/11366239/diff/7001/gclient_scm.py#newcode941
gclient_scm.py:941: gclient_utils.rmtree(self.checkout_path)
On 2012/11/14 22:30:25, Peter Mayo wrote:
> How does this report errors (e.g. owned by root subdirs)?
> Should catch or check accordingly and fall back to old message.

That will throw, IMHO it's not a big deal to not catch, we can't do anything
about it anyway.

[Peter Mayo, 2012-11-15 01:37:10]

LGTM - the messaging on failure is not worth blocking for.

https://codereview.chromium.org/11366239/diff/7001/gclient_scm.py
File gclient_scm.py (right):

https://codereview.chromium.org/11366239/diff/7001/gclient_scm.py#newcode941
gclient_scm.py:941: gclient_utils.rmtree(self.checkout_path)
On 2012/11/14 23:17:32, Marc-Antoine Ruel wrote:
> On 2012/11/14 22:30:25, Peter Mayo wrote:
> > How does this report errors (e.g. owned by root subdirs)?
> > Should catch or check accordingly and fall back to old message.
> 
> That will throw, IMHO it's not a big deal to not catch, we can't do anything
> about it anyway.

It's not a big deal to me either, it's just a way that the code can stay as
friendly as it is today for a tiny corner case.  I like it when troopering a bot
is a matter of looking at the meta reason for something as you decide whether to
follow the instructions if they make sense.

[commit-bot: I haz the power, 2012-11-15 17:08:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/davidjames@chromium.org/11366239/7001

[commit-bot: I haz the power, 2012-11-15 17:11:30]

Change committed as 167942