gclient_scm.py: Make working with git more reliable

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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."""
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
@@ skipping 676 matching lines @@
     __builtin__.raw_input.__call__(mox.StrContains('Cannot fast-forward merge, '
                                                    'attempt to rebase? (y)es / '
                                                    '(q)uit / (s)kip : ')
                                    ).AndReturn('y')
     self.mox.ReplayAll()
     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, (), [])
     exception = \

[M-A Ruel, 2010/05/28 15:55:50]

Please use () instead.

exception = ('\n...'
             'foo'
             'bar')

above too.

         '\n____ . at refs/heads/master\n' \
-        '\tAlready in a conflict, i.e. (no branch).\n' \
-        '\tFix the conflict and run gclient again.\n' \
-        '\tOr to abort run:\n\t\tgit-rebase --abort\n' \
-        '\tSee man git-rebase for details.\n'
+        '\tYou have unstaged changes.\n' \
+        '\tPlease commit, stash, or reset.\n'
     self.assertRaisesError(exception, scm.update, options, (), [])
 
   def testUpdateNotGit(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     git_path = gclient_scm.os.path.join(self.base_path, '.git')
     rename(git_path, git_path + 'foo')
@@ skipping 13 matching lines @@
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: