Make check for dirty index work.

tests/gclient_scm_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for gclient_scm.py."""
 
 # pylint: disable=E1103
 
 # Import before super_mox to keep valid references.
@@ skipping 901 matching lines @@
     Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE,
         stderr=STDOUT, cwd=path).communicate()
     return True
 
   def _GetAskForDataCallback(self, expected_prompt, return_value):
     def AskForData(prompt, options):
       self.assertEquals(prompt, expected_prompt)
       return return_value
     return AskForData
 
+  def getCurrentBranch(self):
+    # Returns name of current branch or HEAD for detached HEAD
+    branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'],
+                                          cwd=self.base_path)
+    if branch == 'HEAD':
+      return None
+    return branch
+
   def setUp(self):
     TestCaseUtils.setUp(self)
     unittest.TestCase.setUp(self)
     self.url = 'git://foo'
     # The .git suffix allows gclient_scm to recognize the dir as a git repo
     # when cloning it locally
     self.root_dir = tempfile.mkdtemp('.git')
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
     self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
@@ skipping 261 matching lines @@
     file_path = join(self.base_path, 'b')
     open(file_path, 'w').writelines('conflict\n')
     scm._Run(['commit', '-am', 'test'], options)
     scm._AskForData = self._GetAskForDataCallback(
         'Cannot fast-forward merge, attempt to rebase? '
         '(y)es / (q)uit / (s)kip : ', 'y')
     exception = ('Conflict while rebasing this branch.\n'
                  'Fix the conflict and run gclient again.\n'
                  'See \'man git-rebase\' for details.\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
+    # The merge conflict creates a detached head with local changes, so another
+    # scm.update attempt should fail (in a different way) because of that (a
+    # rather roundabout way to test that condition).
     exception = ('\n____ . at refs/remotes/origin/master\n'
                  '\tYou have unstaged changes.\n'
                  '\tPlease commit, stash, or reset.\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
     sys.stdout.close()
 
+  def testUpdateDetachedConflict(self):
+    # Detached head mode should refuse to update when there are local changes
+    # (staged or unstaged).
+    if not self.enabled:
+      return
+    options = self.Options()
+    scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
+                                relpath=self.relpath)
+    scm._Run(['checkout', '-q', 'a7142dc9f0009350b96a11f372b6ea658592aa95'],
+             options)
+    # Make sure it checked out a detached HEAD
+    self.assertEquals(self.getCurrentBranch(), None)
+    file_path = join(self.base_path, 'b')
+    open(file_path, 'w').writelines('conflict\n')
+    # Unstaged
+    # TODO(all): Ick. Gclient should really have exception subclasses or
+    # something, so we can avoid this fragile exception message matching.
+    exception = ('\n____ . at refs/remotes/origin/master\n'
+                 '\tYou have unstaged changes.\n'
+                 '\tPlease commit, stash, or reset.\n')
+    self.assertRaisesError(exception, scm.update, options, (), [])
+    # Staged
+    scm._Run(['add', 'b'], options)
+    exception = ('\n____ . at refs/remotes/origin/master\n'
+                 '\tYour index contains uncommitted changes\n'
+                 '\tPlease commit, stash, or reset.\n')
+    self.assertRaisesError(exception, scm.update, options, (), [])
+    sys.stdout.close()
+
   def testRevinfo(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
@@ skipping 203 matching lines @@
     sys.stdout.close()
     # pylint: disable=E1101
     self.assertIn(expected, value)
 
   def checkNotInStdout(self, expected):
     value = sys.stdout.getvalue()
     sys.stdout.close()
     # pylint: disable=E1101
     self.assertNotIn(expected, value)
 
-  def getCurrentBranch(self):
-    # Returns name of current branch or HEAD for detached HEAD
-    branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'],
-                                          cwd=self.base_path)
-    if branch == 'HEAD':
-      return None
-    return branch
-
   def testUpdateClone(self):
     if not self.enabled:
       return
     options = self.Options()
 
     origin_root_dir = self.root_dir
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
 
@@ skipping 160 matching lines @@
 
 if __name__ == '__main__':
   level = logging.DEBUG if '-v' in sys.argv else logging.FATAL
   logging.basicConfig(
       level=level,
       format='%(asctime).19s %(levelname)s %(filename)s:'
              '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: