scm.py - Issue 14134010: Remove gclient_utils.RemoveDirectory().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scm.py

Issue 14134010: Remove gclient_utils.RemoveDirectory(). (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: RemoveDirectory() -> rmtree() Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: scm.py

diff --git a/scm.py b/scm.py

index d920e9e51dae48ad9c7daa3381c0183e8a9e8dc3..47a7c6e0ca9f41465908cfcc45580e5eb88def8a 100644

--- a/scm.py

+++ b/scm.py

@@ -567,7 +567,7 @@ class SVN(object):

# Warning: It's bad, it assumes args[2] is the directory

# argument.

if os.path.isdir(args[2]):

- gclient_utils.RemoveDirectory(args[2])

+ gclient_utils.rmtree(args[2])

else:

# Progress was made, convert to update since an aborted checkout

# is now an update.

@@ -856,7 +856,7 @@ class SVN(object):

buf.close()

return result

finally:

- gclient_utils.RemoveDirectory(bogus_dir)

+ gclient_utils.rmtree(bogus_dir)

@staticmethod

def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):

@@ -1054,8 +1054,8 @@ class SVN(object):

logging.info('os.remove(%s)' % file_path)

os.remove(file_path)

elif os.path.isdir(file_path):

- logging.info('RemoveDirectory(%s)' % file_path)

- gclient_utils.RemoveDirectory(file_path)

+ logging.info('rmtree(%s)' % file_path)

+ gclient_utils.rmtree(file_path)

else:

logging.critical(

('No idea what is %s.\nYou just found a bug in gclient'

« no previous file with comments | « gclient_utils.py ('k') | testing_support/trial_dir.py » ('j') | no next file with comments »