Make git try warn on a dirty index.

tests/trychange_unittest.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 trychange.py."""
 
 import os
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support.super_mox import SuperMoxTestBase
 
 import subprocess2
 import trychange
 
 
 class TryChangeTestsBase(SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.mox.StubOutWithMock(subprocess2, 'communicate')
+    self.mox.StubOutWithMock(trychange, 'RunGit')
     self.mox.StubOutWithMock(trychange.scm.GIT, 'Capture')
     self.mox.StubOutWithMock(trychange.scm.GIT, 'GenerateDiff')
     self.mox.StubOutWithMock(trychange.scm.GIT, 'GetCheckoutRoot')
     self.mox.StubOutWithMock(trychange.scm.GIT, 'GetEmail')
     self.mox.StubOutWithMock(trychange.scm.GIT, 'GetPatchName')
     self.mox.StubOutWithMock(trychange.scm.GIT, 'GetUpstreamBranch')
     self.mox.StubOutWithMock(trychange.scm.SVN, 'DiffItem')
     self.mox.StubOutWithMock(trychange.scm.SVN, 'GenerateDiff')
     self.mox.StubOutWithMock(trychange.scm.SVN, 'GetCheckoutRoot')
     self.mox.StubOutWithMock(trychange.scm.SVN, 'GetEmail')
     self.fake_root = self.Dir()
     self.expected_files = ['foo.txt', 'bar.txt']
     self.options = trychange.optparse.Values()
     self.options.files = self.expected_files
     self.options.diff = None
     self.options.name = None
     self.options.email = None
     self.options.exclude = []
 
 
 class TryChangeUnittest(TryChangeTestsBase):
   """General trychange.py tests."""
   def testMembersChanged(self):
     members = [
-      'EPILOG', 'Escape', 'GIT', 'GuessVCS', 'GetMungedDiff', 'HELP_STRING',
-      'InvalidScript', 'NoTryServerAccess', 'PrintSuccess', 'SCM', 'SVN',
-      'TryChange', 'USAGE',
-      'breakpad', 'datetime', 'errno', 'fix_encoding', 'gcl', 'gclient_utils',
-      'getpass', 'gen_parser',
-      'json', 'logging', 'optparse', 'os', 'posixpath', 're', 'scm', 'shutil',
-      'subprocess2', 'sys', 'tempfile', 'urllib',
-    ]
+      'DieWithError', 'EPILOG', 'Escape', 'GIT', 'GetMungedDiff', 'GuessVCS',
+      'HELP_STRING', 'InvalidScript', 'NoTryServerAccess', 'PrintSuccess',
+      'RunCommand', 'RunGit', 'SCM', 'SVN', 'TryChange', 'USAGE', 'breakpad',
+      'datetime', 'errno', 'fix_encoding', 'gcl', 'gclient_utils', 'gen_parser',
+      'getpass', 'json', 'logging', 'optparse', 'os', 'posixpath', 're', 'scm',
+      'shutil', 'subprocess2', 'sys', 'tempfile', 'urllib']
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange, members)
 
 
 class TryChangeSimpleTest(unittest.TestCase):
   # Doesn't require supermox to run.
   def test_flags(self):
     cmd = [
       '--bot', 'bot1,bot2',
       '--testfilter', 'test1',
@@ skipping 64 matching lines @@
       'ReadRootFile', 'GenerateDiff', 'GetFileNames', 'files', 'file_tuples',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange.GIT, members)
 
   def testBasic(self):
     # pylint: disable=E1103
     trychange.os.path.abspath(self.fake_root).AndReturn(self.fake_root)
     trychange.scm.GIT.GetCheckoutRoot(self.fake_root).AndReturn(self.fake_root)
     trychange.scm.GIT.GetUpstreamBranch(self.fake_root).AndReturn('somewhere')
+    trychange.RunGit(['diff-index', 'HEAD'])
     trychange.scm.GIT.GenerateDiff(self.fake_root,
                                    full_move=True,
                                    files=['foo.txt', 'bar.txt'],
                                    branch='somewhere').AndReturn('A diff')
     trychange.scm.GIT.GetPatchName(self.fake_root).AndReturn('bleh-1233')
     trychange.scm.GIT.GetEmail(self.fake_root).AndReturn('georges@example.com')
     self.mox.ReplayAll()
     git = trychange.GIT(self.options, self.fake_root, self.options.files)
     self.assertEqual(git.GetFileNames(), self.expected_files)
     self.assertEqual(git.checkout_root, self.fake_root)
     self.assertEqual(git.GenerateDiff(), 'A diff')
 
 
 if __name__ == '__main__':
   unittest.main()