Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(456)

Unified Diff: gclient.py

Issue 4803001: Improve help to be clearer about what --delete_unversioned_trees does. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 10 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient.py
diff --git a/gclient.py b/gclient.py
index 157630bded11199435f11ffb5e386c97bddcd3c6..6817db16940ed7eddd1c2c31e74208fef32fc764 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
nsylvain 2010/11/11 20:33:39 nuclear? eh
+ 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 '
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698