GTTF: Make gclient recover gracefully from an interrupted checkout

GTTF: Make gclient recover gracefully from an interrupted checkout
when --force is used.

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

[M-A Ruel, 2011-09-19 20:36:25]

http://codereview.chromium.org/7942007/diff/1/gclient_scm.py
File gclient_scm.py (right):

http://codereview.chromium.org/7942007/diff/1/gclient_scm.py#newcode774
gclient_scm.py:774: if d[0][0] in ('?', '!') and options.force:
I don't see why you'd get the status '? L   '.

I don't think it'd work in practice.
And the more I think about it, the less you should try to cleanup each
individual file. It should try to cleanup the root directory in any case.

[Paweł Hajdan Jr., 2011-09-19 20:40:05]

http://codereview.chromium.org/7942007/diff/1/gclient_scm.py
File gclient_scm.py (right):

http://codereview.chromium.org/7942007/diff/1/gclient_scm.py#newcode774
gclient_scm.py:774: if d[0][0] in ('?', '!') and options.force:
On 2011/09/19 20:36:25, Marc-Antoine Ruel wrote:
> I don't see why you'd get the status '? L   '.

I was getting '! L   '.

> I don't think it'd work in practice.

This has solved the problem on my machine. Which means I can no longer repro. Or
maybe I can try to break things again.

[M-A Ruel, 2011-09-19 20:43:59]

http://codereview.chromium.org/7942007/diff/1/gclient_scm.py
File gclient_scm.py (right):

http://codereview.chromium.org/7942007/diff/1/gclient_scm.py#newcode774
gclient_scm.py:774: if d[0][0] in ('?', '!') and options.force:
On 2011/09/19 20:40:06, Paweł Hajdan Jr. wrote:
> On 2011/09/19 20:36:25, Marc-Antoine Ruel wrote:
> > I don't see why you'd get the status '? L   '.
> 
> I was getting '! L   '.
> 
> > I don't think it'd work in practice.
> 
> This has solved the problem on my machine. Which means I can no longer repro.
Or
> maybe I can try to break things again.

In that case, it's because the root directory is not versionned or a checkout
from a different repository than the one expected. In any case, it should
probably
"svn cleanup self.checkout_path" and then if it fails at updating, delete all
the files that are in the way that are '!' or '?'.

svn cleanup self.checkout_path is recursive so I'm not sure it'd a good idea to
run it on individual items. When svn cleanup fails, then rm the files '!' or '? 
L'.

[Paweł Hajdan Jr., 2011-09-20 20:52:26]

PTAL

[M-A Ruel, 2011-09-20 20:55:30]

http://codereview.chromium.org/7942007/diff/5001/gclient_scm.py
File gclient_scm.py (right):

http://codereview.chromium.org/7942007/diff/5001/gclient_scm.py#newcode768
gclient_scm.py:768: if needs_cleanup:
if any(d[0][2] == 'L' for d in dir_info):

http://codereview.chromium.org/7942007/diff/5001/gclient_scm.py#newcode772
gclient_scm.py:772: for d in dir_info:
Add comment:
# Try to manually clean up each individual files.

Also, I think you should grab status again.

[Paweł Hajdan Jr., 2011-09-20 21:33:31]

PTAL

[Marc-Antoine Ruel (Google), 2011-09-22 00:11:04]

lgtm