Modify gclient to only delete unversioned trees during an update if...

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 1329 matching lines @@
         if run_scm:
           self._options.revision = revision_overrides.get(d)
           scm = SCMWrapper(url, self._root_dir, d)
           scm.RunCommand(command, self._options, args, file_list)
           self._options.revision = None
 
     is_using_git = IsUsingGit(self._root_dir, entries.keys())
     self._RunHooks(command, file_list, is_using_git)
 
     if command == 'update':
-      # notify the user if there is an orphaned entry in their working copy.
-      # TODO(darin): we should delete this directory manually if it doesn't
-      # have any changes in it.
+      # Notify the user if there is an orphaned entry in their working copy.
+      # Only delete the directory if there are no changes in it, and
+      # delete_unversioned_trees is set to true.
       prev_entries = self._ReadEntries()
       for entry in prev_entries:
         e_dir = os.path.join(self._root_dir, entry)
         if entry not in entries and os.path.exists(e_dir):
-          if CaptureSVNStatus(e_dir):
+          if not options.delete_unversioned_trees or CaptureSVNStatus(e_dir):
             # There are modified files in this entry
             entries[entry] = None  # Keep warning until removed.
             print("\nWARNING: \"%s\" is no longer part of this client.  "
                   "It is recommended that you manually remove it.\n") % entry
           else:
             # Delete the entry
             print("\n________ deleting \'%s\' " +
                   "in \'%s\'") % (entry, self._root_dir)
             RemoveDirectory(e_dir)
       # record the current list of entries for next time
@@ skipping 329 matching lines @@
                                  "containing the provided string"))
   option_parser.add_option("", "--verbose", action="store_true", default=False,
                            help="produce additional output for diagnostics")
   option_parser.add_option("", "--manually_grab_svn_rev", action="store_true",
                            default=False,
                            help="Skip svn up whenever possible by requesting "
                                 "actual HEAD revision from the repository")
   option_parser.add_option("", "--head", action="store_true", default=False,
                            help=("skips any safesync_urls specified in "
                                  "configured solutions"))
+  option_parser.add_option("", "--delete_unversioned_trees",
+                           action="store_true", default=False,
+                           help=("on update, delete any unexpected "
+                                 "unversioned trees that are in the checkout"))
 
   if len(argv) < 2:
     # Users don't need to be told to use the 'help' command.
     option_parser.print_help()
     return 1
   # Add manual support for --version as first argument.
   if argv[1] == '--version':
     option_parser.print_version()
     return 0
 
@@ skipping 19 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: