commit 34b4e9834d2f076fe990e6f15ef0695d2eaa6720
author smut@google.com <smut@google.com> Mon May 16 19:06:07 2016 +0000
committer smut@google.com <smut@google.com> Mon May 16 19:06:07 2016 +0000
tree 99507f37921e1ce9dc8e0dde0676d62cabbec758
parent 55cb27edaa271ddb2a23962ce6d7ef5f51a6281a

Revert "Gclient: Don't check if repository is clean if --force is passed in"

This reverts commit 3f0dacf095df6f73a2c54a8a9fb35c1c441a2fe1.

Reason for revert:
Is causing staged changes to be reverted.

BUG=607913
TBR=hinoka,dnj

Review URL: https://codereview.chromium.org/1983963002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300598 0039d316-1c4b-4281-b951-d872f2087c98

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index 79fb6ea..9a6f512 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -553,9 +553,7 @@
 
     if current_type == 'detached':
       # case 0
-      if not options.force:
-        # Don't do this check if nuclear option is on.
-        self._CheckClean(rev_str)
+      self._CheckClean(rev_str)
       self._CheckDetachedHead(rev_str, options)
       if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
         self.Print('Up-to-date; skipping checkout.')
@@ -565,7 +563,7 @@
         self._Checkout(
             options,
             revision,
-            force=(options.force or options.delete_unversioned_trees),
+            force=(options.force and options.delete_unversioned_trees),
             quiet=True,
         )
       if not printed_path: