gclient_scm.py - Issue 8431021: Handle cases where '.' show up in svn status and is deleted

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: gclient_scm.py

Issue 8431021: Handle cases where '.' show up in svn status and is deleted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Add another test Created 9 years, 2 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: gclient_scm.py

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

index 546aa08cd7b06ec4cf43933ad7a1b8b5fbfb7c02..2d773a355fafe6e02be69ecb75777117dc4d1432 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -954,6 +954,11 @@ class SVNWrapper(SCMWrapper):

print(os.path.join(self.checkout_path, file_status[1]))

scm.SVN.Revert(self.checkout_path, callback=printcb)

+ # Revert() may delete the directory altogether.

+ if not os.path.isdir(self.checkout_path):

+ # Don't reuse the args.

+ return self.update(options, [], file_list)

try:

# svn revert is so broken we don't even use it. Using

# "svn up --revision BASE" achieve the same effect.

« no previous file with comments | « no previous file | scm.py » ('j') | no next file with comments »