From 28d14bd1140c8604ae2228a237188d47e376dd6c Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 11 Nov 2010 20:37:09 +0000 Subject: [PATCH] Improve help to be clearer about what --delete_unversioned_trees does. Make -D -f combination more effective by deleting directories even if there is modified files. TEST=none BUG=none Review URL: http://codereview.chromium.org/4803001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@65845 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gclient.py b/gclient.py index 157630bde..6817db169 100644 --- a/gclient.py +++ b/gclient.py @@ -748,7 +748,8 @@ solutions = [ scm = gclient_scm.CreateSCM(prev_url, self.root_dir(), entry_fixed) scm.status(self._options, [], file_list) modified_files = file_list != [] - if not self._options.delete_unversioned_trees or modified_files: + if (not self._options.delete_unversioned_trees or + (modified_files and not self._options.force)): # There are modified files in this entry. Keep warning until # removed. print(('\nWARNING: \'%s\' is no longer part of this client. ' @@ -1044,8 +1045,10 @@ def CMDsync(parser, args): help='skips any safesync_urls specified in ' 'configured solutions and sync to head instead') parser.add_option('-D', '--delete_unversioned_trees', action='store_true', - help='delete any unexpected unversioned trees ' - 'that are in the checkout') + help='delete any dependency that have been removed from ' + 'last sync as long as there is no local modification. ' + 'Coupled with --force, it will remove them even with ' + 'local modifications') parser.add_option('-R', '--reset', action='store_true', help='resets any local changes before updating (git only)') parser.add_option('--deps', dest='deps_os', metavar='OS_LIST', @@ -1094,7 +1097,10 @@ def CMDdiff(parser, args): def CMDrevert(parser, args): - """Revert all modifications in every dependencies.""" + """Revert all modifications in every dependencies. + + That's the nuclear option to get back to a 'clean' state. It removes anything + that shows up in svn status.""" parser.add_option('--deps', dest='deps_os', metavar='OS_LIST', help='override deps for the specified (comma-separated) ' 'platform(s); \'all\' will process all deps_os '