Merge instead of rebasing upstream changes in `gclient sync` when --merge is given.

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.
 from shutil import rmtree
 from subprocess import Popen, PIPE, STDOUT
 
 import logging
 import os
 import sys
 import tempfile
 import unittest
-import __builtin__
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support.super_mox import mox, StdoutCheck, SuperMoxTestBase
 from testing_support.super_mox import TestCaseUtils
 
 import gclient_scm
 import subprocess2
 
 # Shortcut since this function is used often
@@ skipping 715 matching lines @@
 commit refs/heads/origin
 mark :6
 author Alice <alice@example.com> 1253744424 -0700
 committer Alice <alice@example.com> 1253744424 -0700
 data 13
 Personalized
 from :3
 M 100644 :4 a
 M 100644 :5 b
 
+blob
+mark :7
+data 5
+Mooh
+
+commit refs/heads/feature
+mark :8
+author Bob <bob@example.com> 1390311986 -0000
+committer Bob <bob@example.com> 1390311986 -0000
+data 6
+Add C
+from :3
+M 100644 :7 c
+
 reset refs/heads/master
 from :3
 """
   def Options(self, *args, **kwargs):
     return self.OptionsObject(*args, **kwargs)
 
   @staticmethod
   def CreateGitRepo(git_import, path):
     """Do it for real."""
     try:
@@ skipping 13 matching lines @@
     Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'],
         stdout=PIPE, stderr=STDOUT, cwd=path).communicate()
     Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE,
         stderr=STDOUT, cwd=path).communicate()
     Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE,
         stderr=STDOUT, cwd=path).communicate()
     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 setUp(self):
     TestCaseUtils.setUp(self)
     unittest.TestCase.setUp(self)
     self.url = 'git://foo'
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
     self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
     StdoutCheck.setUp(self)
     self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists
@@ skipping 162 matching lines @@
     expected_file_list = [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')
     sys.stdout.close()
 
+  def testUpdateMerge(self):
+    if not self.enabled:
+      return
+    options = self.Options()
+    options.merge = True
+    scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
+                                relpath=self.relpath)
+    scm._Run(['checkout', '-q', 'feature'], options)
+    rev = scm.revinfo(options, (), None)
+    file_list = []
+    scm.update(options, (), file_list)
+    self.assertEquals(file_list, [join(self.base_path, x)
+                                  for x in ['a', 'b', 'c']])
+    # The actual commit that is created is unstable, so we verify its tree and
+    # parents instead.
+    self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']),
+                      'd2e35c10ac24d6c621e14a1fcadceb533155627d')
+    self.assertEquals(scm._Capture(['rev-parse', 'HEAD^1']), rev)
+    self.assertEquals(scm._Capture(['rev-parse', 'HEAD^2']),
+                      scm._Capture(['rev-parse', 'origin/master']))
+    sys.stdout.close()
+
+  def testUpdateRebase(self):
+    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', 'feature'], options)
+    file_list = []
+    # Fake a 'y' key press.
+    scm._AskForData = self._GetAskForDataCallback(
+        'Cannot fast-forward merge, attempt to rebase? '
+        '(y)es / (q)uit / (s)kip : ', 'y')
+    scm.update(options, (), file_list)
+    self.assertEquals(file_list, [join(self.base_path, x)
+                                  for x in ['a', 'b', 'c']])
+    # The actual commit that is created is unstable, so we verify its tree and
+    # parent instead.
+    self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']),
+                      'd2e35c10ac24d6c621e14a1fcadceb533155627d')
+    self.assertEquals(scm._Capture(['rev-parse', 'HEAD^']),
+                      scm._Capture(['rev-parse', 'origin/master']))
+    sys.stdout.close()
+
   def testUpdateReset(self):
     if not self.enabled:
       return
     options = self.Options()
     options.reset = True
 
     dir_path = join(self.base_path, 'c')
     os.mkdir(dir_path)
     open(join(dir_path, 'nested'), 'w').writelines('new\n')
 
@@ skipping 52 matching lines @@
 
   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 = join(self.base_path, 'b')
     open(file_path, 'w').writelines('conflict\n')
     scm._Run(['commit', '-am', 'test'], options)
-    __builtin__.raw_input = lambda x: 'y'
+    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, (), [])
     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()
 
@@ skipping 152 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: