sync @branchname git support

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
 from subprocess import Popen, PIPE, STDOUT
 import tempfile
+import __builtin__
 
 # Fixes include path.
-from super_mox import mox, SuperMoxBaseTestBase
+from super_mox import mox, SuperMoxBaseTestBase, SuperMoxTestBase
 
 import gclient_scm
 from gclient_test import BaseTestCase as GCBaseTestCase
 
 
 class BaseTestCase(GCBaseTestCase):
   def setUp(self):
     GCBaseTestCase.setUp(self)
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite')
@@ skipping 320 matching lines @@
     try:
       Popen(['git', 'init'], stdout=PIPE, stderr=STDOUT,
             cwd=path).communicate()
     except OSError:
       # git is not available, skip this test.
       return False
     Popen(['git', 'fast-import'], stdin=PIPE, stdout=PIPE, stderr=STDOUT,
           cwd=path).communicate(input=git_import)
     Popen(['git', 'checkout'], stdout=PIPE, stderr=STDOUT,
           cwd=path).communicate()
+    Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE,
+          stderr=STDOUT, cwd=path).communicate()
+    Popen(['git', 'checkout', '-b', 'new', 'origin/master'], stdout=PIPE,
+          stderr=STDOUT, cwd=path).communicate()
+    Popen(['git', 'push', 'origin', 'origin/origin:origin/master'], stdout=PIPE,
+          stderr=STDOUT, cwd=path).communicate()
+    Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE,
+          stderr=STDOUT, cwd=path).communicate()
     return True
 
   def setUp(self):
     self.args = self.Args()
     self.url = 'git://foo'
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
     SuperMoxBaseTestBase.setUp(self)
@@ skipping 139 matching lines @@
     expected_file_list = [gclient_scm.os.path.join(self.base_path, x)
                           for x in ['a', 'b']]
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, (), file_list)
     self.assertEquals(file_list, expected_file_list)
     self.assertEquals(scm.revinfo(options, (), None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
 
+  def testUpdateUnstagedConflict(self):
+    if not self.enabled:
+      return
+    options = self.Options()
+    scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
+                                relpath=self.relpath)
+    file_path = gclient_scm.os.path.join(self.base_path, 'b')
+    f = open(file_path, 'w').writelines('conflict\n')
+    exception = (
+        "error: Your local changes to 'b' would be overwritten by merge.  "
+        "Aborting.\n"
+        "Please, commit your changes or stash them before you can merge.\n")
+    self.assertRaisesError(exception, scm.update, options, (), [])
+
   def testUpdateConflict(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_path = gclient_scm.os.path.join(self.base_path, 'b')
     f = open(file_path, 'w').writelines('conflict\n')
     scm._Run(['commit', '-am', 'test'])
+    self.mox.StubOutWithMock(__builtin__, 'raw_input')
+    __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 = \
-        '\n____ .\n' \
-        '\nConflict while rebasing this branch.\n' \
+        'Conflict while rebasing this branch.\n' \
         'Fix the conflict and run gclient again.\n' \
-        'See man git-rebase for details.\n'
+        "See 'man git-rebase' for details.\n"
     self.assertRaisesError(exception, scm.update, options, (), [])
     exception = \
-        '\n____ .\n' \
+        '\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'
     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')
     exception = \
-        '\n____ .\n' \
+        '\n____ . at refs/heads/master\n' \
         '\tPath is not a git repo. No .git dir.\n' \
         '\tTo resolve:\n' \
         '\t\trm -rf .\n' \
         '\tAnd run gclient sync again\n'
     self.assertRaisesError(exception, scm.update, options, (), [])
 
   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')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: