blob: f7490e1fe1d0c8051803e187c805954ce4221a14 [file] [log] [blame]
Edward Lemura877ee62019-09-03 20:23:17 +00001#!/usr/bin/env vpython3
steveblock@chromium.org93567042012-02-15 01:02:26 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgba551772010-02-03 18:21:42 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
msb@chromium.orge28e4982009-09-25 20:51:45 +00005
6"""Unit tests for gclient_scm.py."""
7
maruel@chromium.org428342a2011-11-10 15:46:33 +00008# pylint: disable=E1103
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +00009
Edward Lesmese79107e2019-10-25 22:47:33 +000010from __future__ import unicode_literals
11
12
maruel@chromium.org8ef5f542009-11-12 02:05:02 +000013from subprocess import Popen, PIPE, STDOUT
maruel@chromium.org428342a2011-11-10 15:46:33 +000014
John Budorick0f7b2002018-01-19 15:46:17 -080015import json
maruel@chromium.org428342a2011-11-10 15:46:33 +000016import logging
17import os
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000018import re
maruel@chromium.org428342a2011-11-10 15:46:33 +000019import sys
msb@chromium.orge28e4982009-09-25 20:51:45 +000020import tempfile
maruel@chromium.org389d6de2010-09-09 14:14:37 +000021import unittest
msb@chromium.orge28e4982009-09-25 20:51:45 +000022
Edward Lemur979fa782019-08-13 22:44:05 +000023if sys.version_info.major == 2:
24 from cStringIO import StringIO
25else:
26 from io import StringIO
27
maruel@chromium.org428342a2011-11-10 15:46:33 +000028sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
maruel@chromium.orgba551772010-02-03 18:21:42 +000029
Edward Lemur979fa782019-08-13 22:44:05 +000030from third_party import mock
Edward Lemurd64781e2018-07-11 23:09:55 +000031from testing_support import fake_repos
Edward Lemur9cafbf42019-08-15 22:03:35 +000032from testing_support import test_case_utils
maruel@chromium.org428342a2011-11-10 15:46:33 +000033
msb@chromium.orge28e4982009-09-25 20:51:45 +000034import gclient_scm
Edward Lesmese79107e2019-10-25 22:47:33 +000035import gclient_utils
szager@chromium.orgb0a13a22014-06-18 00:52:25 +000036import git_cache
maruel@chromium.orgfae707b2011-09-15 18:57:58 +000037import subprocess2
maruel@chromium.org96913eb2010-06-01 16:22:47 +000038
Edward Lesmese79107e2019-10-25 22:47:33 +000039
40GIT = 'git' if sys.platform != 'win32' else 'git.bat'
41
szager@chromium.orgb0a13a22014-06-18 00:52:25 +000042# Disable global git cache
43git_cache.Mirror.SetCachePath(None)
44
maruel@chromium.org795a8c12010-10-05 19:54:29 +000045# Shortcut since this function is used often
46join = gclient_scm.os.path.join
47
Raul Tambrea79f0e52019-09-21 07:27:39 +000048TIMESTAMP_RE = re.compile(r'\[[0-9]{1,2}:[0-9]{2}:[0-9]{2}\] (.*)', re.DOTALL)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000049def strip_timestamps(value):
50 lines = value.splitlines(True)
Edward Lemur979fa782019-08-13 22:44:05 +000051 for i in range(len(lines)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000052 m = TIMESTAMP_RE.match(lines[i])
53 if m:
54 lines[i] = m.group(1)
55 return ''.join(lines)
maruel@chromium.org96913eb2010-06-01 16:22:47 +000056
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +000057
Edward Lemur979fa782019-08-13 22:44:05 +000058class BasicTests(unittest.TestCase):
59 @mock.patch('gclient_scm.scm.GIT.Capture')
60 def testGetFirstRemoteUrl(self, mockCapture):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +000061 REMOTE_STRINGS = [('remote.origin.url E:\\foo\\bar', 'E:\\foo\\bar'),
62 ('remote.origin.url /b/foo/bar', '/b/foo/bar'),
63 ('remote.origin.url https://foo/bar', 'https://foo/bar'),
64 ('remote.origin.url E:\\Fo Bar\\bax', 'E:\\Fo Bar\\bax'),
65 ('remote.origin.url git://what/"do', 'git://what/"do')]
66 FAKE_PATH = '/fake/path'
Edward Lemur979fa782019-08-13 22:44:05 +000067 mockCapture.side_effect = [question for question, _ in REMOTE_STRINGS]
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +000068
69 for _, answer in REMOTE_STRINGS:
Edward Lemur979fa782019-08-13 22:44:05 +000070 self.assertEqual(
71 gclient_scm.SCMWrapper._get_first_remote_url(FAKE_PATH), answer)
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +000072
Edward Lemur979fa782019-08-13 22:44:05 +000073 expected_calls = [
74 mock.call(['config', '--local', '--get-regexp', r'remote.*.url'],
75 cwd=FAKE_PATH)
76 for _ in REMOTE_STRINGS
77 ]
78 self.assertEqual(mockCapture.mock_calls, expected_calls)
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +000079
80
Edward Lemur9cafbf42019-08-15 22:03:35 +000081class BaseGitWrapperTestCase(unittest.TestCase, test_case_utils.TestCaseUtils):
maruel@chromium.org8ef5f542009-11-12 02:05:02 +000082 """This class doesn't use pymox."""
msb@chromium.orge28e4982009-09-25 20:51:45 +000083 class OptionsObject(object):
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +000084 def __init__(self, verbose=False, revision=None):
dnj@chromium.org5b23e872015-02-20 21:25:57 +000085 self.auto_rebase = False
msb@chromium.orge28e4982009-09-25 20:51:45 +000086 self.verbose = verbose
87 self.revision = revision
msb@chromium.orge28e4982009-09-25 20:51:45 +000088 self.deps_os = None
89 self.force = False
davemoore@chromium.org8bf27312010-02-19 17:29:44 +000090 self.reset = False
msb@chromium.orge28e4982009-09-25 20:51:45 +000091 self.nohooks = False
primiano@chromium.org5439ea52014-08-06 17:18:18 +000092 self.no_history = False
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +000093 self.upstream = False
iannucci@chromium.org53456aa2013-07-03 19:38:34 +000094 self.cache_dir = None
bauerb@chromium.org4dd09372011-07-22 14:41:51 +000095 self.merge = False
bratell@opera.com18fa4542013-05-21 13:30:46 +000096 self.jobs = 1
iannucci@chromium.org30a07982016-04-07 21:35:19 +000097 self.break_repo_locks = False
steveblock@chromium.org98e69452012-02-16 16:36:43 +000098 self.delete_unversioned_trees = False
Edward Lesmesc621b212018-03-21 20:26:56 -040099 self.patch_ref = None
100 self.patch_repo = None
101 self.rebase_patch_ref = True
Edward Lemurca7d8812018-07-24 17:42:45 +0000102 self.reset_patch_ref = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000103
104 sample_git_import = """blob
105mark :1
106data 6
107Hello
108
109blob
110mark :2
111data 4
112Bye
113
114reset refs/heads/master
115commit refs/heads/master
116mark :3
117author Bob <bob@example.com> 1253744361 -0700
118committer Bob <bob@example.com> 1253744361 -0700
119data 8
120A and B
121M 100644 :1 a
122M 100644 :2 b
123
124blob
125mark :4
126data 10
127Hello
128You
129
130blob
131mark :5
132data 8
133Bye
134You
135
136commit refs/heads/origin
137mark :6
138author Alice <alice@example.com> 1253744424 -0700
139committer Alice <alice@example.com> 1253744424 -0700
140data 13
141Personalized
142from :3
143M 100644 :4 a
144M 100644 :5 b
145
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000146blob
147mark :7
148data 5
149Mooh
150
151commit refs/heads/feature
152mark :8
153author Bob <bob@example.com> 1390311986 -0000
154committer Bob <bob@example.com> 1390311986 -0000
155data 6
156Add C
157from :3
158M 100644 :7 c
159
msb@chromium.orge28e4982009-09-25 20:51:45 +0000160reset refs/heads/master
161from :3
162"""
msb@chromium.orge28e4982009-09-25 20:51:45 +0000163 def Options(self, *args, **kwargs):
maruel@chromium.org8071c282010-09-20 19:44:19 +0000164 return self.OptionsObject(*args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000165
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000166 def checkstdout(self, expected):
167 value = sys.stdout.getvalue()
168 sys.stdout.close()
Erik Chene16ffff2019-10-14 20:35:53 +0000169 # Check that the expected output appears.
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800170 # pylint: disable=no-member
Erik Chene16ffff2019-10-14 20:35:53 +0000171 self.assertIn(expected, strip_timestamps(value))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000172
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +0000173 @staticmethod
174 def CreateGitRepo(git_import, path):
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000175 """Do it for real."""
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000176 try:
Edward Lesmese79107e2019-10-25 22:47:33 +0000177 Popen([GIT, 'init', '-q'], stdout=PIPE, stderr=STDOUT,
maruel@chromium.org8ef5f542009-11-12 02:05:02 +0000178 cwd=path).communicate()
179 except OSError:
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000180 # git is not available, skip this test.
181 return False
Edward Lesmese79107e2019-10-25 22:47:33 +0000182 Popen([GIT, 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE,
Edward Lemur979fa782019-08-13 22:44:05 +0000183 stderr=STDOUT, cwd=path).communicate(input=git_import.encode())
Edward Lesmese79107e2019-10-25 22:47:33 +0000184 Popen([GIT, 'checkout', '-q'], stdout=PIPE, stderr=STDOUT,
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000185 cwd=path).communicate()
Edward Lesmese79107e2019-10-25 22:47:33 +0000186 Popen([GIT, 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE,
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000187 stderr=STDOUT, cwd=path).communicate()
Edward Lesmese79107e2019-10-25 22:47:33 +0000188 Popen([GIT, 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE,
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000189 stderr=STDOUT, cwd=path).communicate()
Edward Lesmese79107e2019-10-25 22:47:33 +0000190 Popen([GIT, 'push', 'origin', 'origin/origin:origin/master', '-q'],
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000191 stdout=PIPE, stderr=STDOUT, cwd=path).communicate()
Edward Lesmese79107e2019-10-25 22:47:33 +0000192 Popen([GIT, 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE,
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000193 stderr=STDOUT, cwd=path).communicate()
Edward Lesmese79107e2019-10-25 22:47:33 +0000194 Popen([GIT, 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE,
iannucci@chromium.org1e7187a2013-02-17 20:54:05 +0000195 stderr=STDOUT, cwd=path).communicate()
Edward Lesmese79107e2019-10-25 22:47:33 +0000196 Popen([GIT, 'config', 'user.name', 'Some User'], stdout=PIPE,
iannucci@chromium.org1e7187a2013-02-17 20:54:05 +0000197 stderr=STDOUT, cwd=path).communicate()
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000198 return True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000199
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000200 def _GetAskForDataCallback(self, expected_prompt, return_value):
201 def AskForData(prompt, options):
Edward Lemur979fa782019-08-13 22:44:05 +0000202 self.assertEqual(prompt, expected_prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000203 return return_value
204 return AskForData
205
msb@chromium.orge28e4982009-09-25 20:51:45 +0000206 def setUp(self):
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000207 unittest.TestCase.setUp(self)
Edward Lemur9cafbf42019-08-15 22:03:35 +0000208 test_case_utils.TestCaseUtils.setUp(self)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000209 self.url = 'git://foo'
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000210 # The .git suffix allows gclient_scm to recognize the dir as a git repo
211 # when cloning it locally
212 self.root_dir = tempfile.mkdtemp('.git')
msb@chromium.orge28e4982009-09-25 20:51:45 +0000213 self.relpath = '.'
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000214 self.base_path = join(self.root_dir, self.relpath)
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000215 self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000216 self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists
Edward Lemur979fa782019-08-13 22:44:05 +0000217 mock.patch('gclient_scm.GitWrapper.BinaryExists',
218 staticmethod(lambda : True)).start()
219 mock.patch('sys.stdout', StringIO()).start()
220 self.addCleanup(mock.patch.stopall)
Edward Lesmese79107e2019-10-25 22:47:33 +0000221 self.addCleanup(gclient_utils.rmtree, self.root_dir)
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000222
msb@chromium.orge28e4982009-09-25 20:51:45 +0000223
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000224class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000225
226 def testRevertMissing(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000227 if not self.enabled:
228 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000229 options = self.Options()
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000230 file_path = join(self.base_path, 'a')
John Budorick0f7b2002018-01-19 15:46:17 -0800231 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
232 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000233 file_list = []
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000234 scm.update(options, None, file_list)
235 gclient_scm.os.remove(file_path)
236 file_list = []
msb@chromium.orge28e4982009-09-25 20:51:45 +0000237 scm.revert(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000238 self.assertEqual(file_list, [file_path])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000239 file_list = []
240 scm.diff(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000241 self.assertEqual(file_list, [])
szager@google.com85d3e3a2011-10-07 17:12:00 +0000242 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000243
244 def testRevertNone(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000245 if not self.enabled:
246 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000247 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800248 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
249 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000250 file_list = []
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000251 scm.update(options, None, file_list)
252 file_list = []
msb@chromium.orge28e4982009-09-25 20:51:45 +0000253 scm.revert(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000254 self.assertEqual(file_list, [])
255 self.assertEqual(scm.revinfo(options, self.args, None),
256 'a7142dc9f0009350b96a11f372b6ea658592aa95')
maruel@chromium.orgc6ca3a12012-06-20 14:46:02 +0000257 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000258
259 def testRevertModified(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000260 if not self.enabled:
261 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000262 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800263 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
264 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000265 file_list = []
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000266 scm.update(options, None, file_list)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000267 file_path = join(self.base_path, 'a')
Edward Lemur979fa782019-08-13 22:44:05 +0000268 with open(file_path, 'a') as f:
269 f.writelines('touched\n')
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000270 file_list = []
msb@chromium.orge28e4982009-09-25 20:51:45 +0000271 scm.revert(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000272 self.assertEqual(file_list, [file_path])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000273 file_list = []
274 scm.diff(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000275 self.assertEqual(file_list, [])
276 self.assertEqual(scm.revinfo(options, self.args, None),
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000277 'a7142dc9f0009350b96a11f372b6ea658592aa95')
szager@google.com85d3e3a2011-10-07 17:12:00 +0000278 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000279
280 def testRevertNew(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000281 if not self.enabled:
282 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000283 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800284 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
285 self.relpath)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000286 file_list = []
287 scm.update(options, None, file_list)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000288 file_path = join(self.base_path, 'c')
Edward Lemur979fa782019-08-13 22:44:05 +0000289 with open(file_path, 'w') as f:
290 f.writelines('new\n')
Edward Lesmese79107e2019-10-25 22:47:33 +0000291 Popen([GIT, 'add', 'c'], stdout=PIPE,
maruel@chromium.org8ef5f542009-11-12 02:05:02 +0000292 stderr=STDOUT, cwd=self.base_path).communicate()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000293 file_list = []
294 scm.revert(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000295 self.assertEqual(file_list, [file_path])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000296 file_list = []
297 scm.diff(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000298 self.assertEqual(file_list, [])
299 self.assertEqual(scm.revinfo(options, self.args, None),
300 'a7142dc9f0009350b96a11f372b6ea658592aa95')
szager@google.com85d3e3a2011-10-07 17:12:00 +0000301 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000302
303 def testStatusNew(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000304 if not self.enabled:
305 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000306 options = self.Options()
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000307 file_path = join(self.base_path, 'a')
Edward Lemur979fa782019-08-13 22:44:05 +0000308 with open(file_path, 'a') as f:
309 f.writelines('touched\n')
John Budorick0f7b2002018-01-19 15:46:17 -0800310 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
311 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000312 file_list = []
313 scm.status(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000314 self.assertEqual(file_list, [file_path])
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000315 self.checkstdout(
Aaron Gablef4068aa2017-12-12 15:14:09 -0800316 ('\n________ running \'git -c core.quotePath=false diff --name-status '
Edward Lemur24146be2019-08-01 21:44:52 +0000317 '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\n') %
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000318 join(self.root_dir, '.'))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000319
320 def testStatus2New(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000321 if not self.enabled:
322 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000323 options = self.Options()
324 expected_file_list = []
325 for f in ['a', 'b']:
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +0000326 file_path = join(self.base_path, f)
Edward Lemur979fa782019-08-13 22:44:05 +0000327 with open(file_path, 'a') as f:
328 f.writelines('touched\n')
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +0000329 expected_file_list.extend([file_path])
John Budorick0f7b2002018-01-19 15:46:17 -0800330 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
331 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000332 file_list = []
333 scm.status(options, self.args, file_list)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000334 expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
Edward Lemur979fa782019-08-13 22:44:05 +0000335 self.assertEqual(sorted(file_list), expected_file_list)
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000336 self.checkstdout(
Aaron Gablef4068aa2017-12-12 15:14:09 -0800337 ('\n________ running \'git -c core.quotePath=false diff --name-status '
Edward Lemur24146be2019-08-01 21:44:52 +0000338 '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\nM\tb\n')
339 % join(self.root_dir, '.'))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000340
msb@chromium.orge28e4982009-09-25 20:51:45 +0000341 def testUpdateUpdate(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000342 if not self.enabled:
343 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000344 options = self.Options()
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000345 expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
John Budorick0f7b2002018-01-19 15:46:17 -0800346 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
347 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000348 file_list = []
349 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000350 self.assertEqual(file_list, expected_file_list)
351 self.assertEqual(scm.revinfo(options, (), None),
msb@chromium.orge28e4982009-09-25 20:51:45 +0000352 'a7142dc9f0009350b96a11f372b6ea658592aa95')
maruel@chromium.orgc6ca3a12012-06-20 14:46:02 +0000353 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000354
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000355 def testUpdateMerge(self):
356 if not self.enabled:
357 return
358 options = self.Options()
359 options.merge = True
John Budorick0f7b2002018-01-19 15:46:17 -0800360 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
361 self.relpath)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000362 scm._Run(['checkout', '-q', 'feature'], options)
363 rev = scm.revinfo(options, (), None)
364 file_list = []
365 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000366 self.assertEqual(file_list, [join(self.base_path, x)
367 for x in ['a', 'b', 'c']])
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000368 # The actual commit that is created is unstable, so we verify its tree and
369 # parents instead.
Edward Lemur979fa782019-08-13 22:44:05 +0000370 self.assertEqual(scm._Capture(['rev-parse', 'HEAD:']),
371 'd2e35c10ac24d6c621e14a1fcadceb533155627d')
Edward Lesmese79107e2019-10-25 22:47:33 +0000372 parent = 'HEAD^' if sys.platform != 'win32' else 'HEAD^^'
373 self.assertEqual(scm._Capture(['rev-parse', parent + '1']), rev)
374 self.assertEqual(scm._Capture(['rev-parse', parent + '2']),
Edward Lemur979fa782019-08-13 22:44:05 +0000375 scm._Capture(['rev-parse', 'origin/master']))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000376 sys.stdout.close()
377
378 def testUpdateRebase(self):
379 if not self.enabled:
380 return
381 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800382 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
383 self.relpath)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000384 scm._Run(['checkout', '-q', 'feature'], options)
385 file_list = []
386 # Fake a 'y' key press.
387 scm._AskForData = self._GetAskForDataCallback(
388 'Cannot fast-forward merge, attempt to rebase? '
389 '(y)es / (q)uit / (s)kip : ', 'y')
390 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000391 self.assertEqual(file_list, [join(self.base_path, x)
392 for x in ['a', 'b', 'c']])
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000393 # The actual commit that is created is unstable, so we verify its tree and
394 # parent instead.
Edward Lemur979fa782019-08-13 22:44:05 +0000395 self.assertEqual(scm._Capture(['rev-parse', 'HEAD:']),
396 'd2e35c10ac24d6c621e14a1fcadceb533155627d')
Edward Lesmese79107e2019-10-25 22:47:33 +0000397 parent = 'HEAD^' if sys.platform != 'win32' else 'HEAD^^'
398 self.assertEqual(scm._Capture(['rev-parse', parent + '1']),
Edward Lemur979fa782019-08-13 22:44:05 +0000399 scm._Capture(['rev-parse', 'origin/master']))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000400 sys.stdout.close()
401
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000402 def testUpdateReset(self):
403 if not self.enabled:
404 return
405 options = self.Options()
406 options.reset = True
407
408 dir_path = join(self.base_path, 'c')
409 os.mkdir(dir_path)
Edward Lemur979fa782019-08-13 22:44:05 +0000410 with open(join(dir_path, 'nested'), 'w') as f:
411 f.writelines('new\n')
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000412
413 file_path = join(self.base_path, 'file')
Edward Lemur979fa782019-08-13 22:44:05 +0000414 with open(file_path, 'w') as f:
415 f.writelines('new\n')
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000416
John Budorick0f7b2002018-01-19 15:46:17 -0800417 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
418 self.relpath)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000419 file_list = []
420 scm.update(options, (), file_list)
421 self.assert_(gclient_scm.os.path.isdir(dir_path))
422 self.assert_(gclient_scm.os.path.isfile(file_path))
maruel@chromium.orgc6ca3a12012-06-20 14:46:02 +0000423 sys.stdout.close()
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000424
Edward Lemur579c9862018-07-13 23:17:51 +0000425 def testUpdateResetUnsetsFetchConfig(self):
426 if not self.enabled:
427 return
428 options = self.Options()
429 options.reset = True
430
431 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
432 self.relpath)
433 scm._Run(['config', 'remote.origin.fetch',
434 '+refs/heads/bad/ref:refs/remotes/origin/bad/ref'], options)
435
436 file_list = []
437 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000438 self.assertEqual(scm.revinfo(options, (), None),
439 '069c602044c5388d2d15c3f875b057c852003458')
Edward Lemur579c9862018-07-13 23:17:51 +0000440 sys.stdout.close()
441
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000442 def testUpdateResetDeleteUnversionedTrees(self):
443 if not self.enabled:
444 return
445 options = self.Options()
446 options.reset = True
447 options.delete_unversioned_trees = True
448
449 dir_path = join(self.base_path, 'dir')
450 os.mkdir(dir_path)
Edward Lemur979fa782019-08-13 22:44:05 +0000451 with open(join(dir_path, 'nested'), 'w') as f:
452 f.writelines('new\n')
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000453
454 file_path = join(self.base_path, 'file')
Edward Lemur979fa782019-08-13 22:44:05 +0000455 with open(file_path, 'w') as f:
456 f.writelines('new\n')
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000457
John Budorick0f7b2002018-01-19 15:46:17 -0800458 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
459 self.relpath)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000460 file_list = []
461 scm.update(options, (), file_list)
462 self.assert_(not gclient_scm.os.path.isdir(dir_path))
463 self.assert_(gclient_scm.os.path.isfile(file_path))
maruel@chromium.orgc6ca3a12012-06-20 14:46:02 +0000464 sys.stdout.close()
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000465
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000466 def testUpdateUnstagedConflict(self):
467 if not self.enabled:
468 return
469 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800470 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
471 self.relpath)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000472 file_path = join(self.base_path, 'b')
Edward Lemur979fa782019-08-13 22:44:05 +0000473 with open(file_path, 'w') as f:
474 f.writelines('conflict\n')
maruel@chromium.orgcdbecc42011-02-09 04:31:47 +0000475 try:
476 scm.update(options, (), [])
477 self.fail()
maruel@chromium.orgfae707b2011-09-15 18:57:58 +0000478 except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orgcdbecc42011-02-09 04:31:47 +0000479 # The exact exception text varies across git versions so it's not worth
480 # verifying it. It's fine as long as it throws.
481 pass
482 # Manually flush stdout since we can't verify it's content accurately across
483 # git versions.
484 sys.stdout.getvalue()
485 sys.stdout.close()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000486
Mike Stipicevice992b612016-12-02 15:32:55 -0800487 @unittest.skip('Skipping until crbug.com/670884 is resolved.')
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000488 def testUpdateLocked(self):
489 if not self.enabled:
490 return
491 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800492 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
493 self.relpath)
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000494 file_path = join(self.base_path, '.git', 'index.lock')
495 with open(file_path, 'w'):
496 pass
Robert Iannucci53f35552016-12-15 19:09:16 -0800497 with self.assertRaises(subprocess2.CalledProcessError):
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000498 scm.update(options, (), [])
499 sys.stdout.close()
500
501 def testUpdateLockedBreak(self):
502 if not self.enabled:
503 return
504 options = self.Options()
505 options.break_repo_locks = True
John Budorick0f7b2002018-01-19 15:46:17 -0800506 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
507 self.relpath)
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000508 file_path = join(self.base_path, '.git', 'index.lock')
509 with open(file_path, 'w'):
510 pass
511 scm.update(options, (), [])
512 self.assertRegexpMatches(sys.stdout.getvalue(),
Raul Tambrea79f0e52019-09-21 07:27:39 +0000513 r'breaking lock.*\.git[/|\\]index\.lock')
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000514 self.assertFalse(os.path.exists(file_path))
515 sys.stdout.close()
516
msb@chromium.org5bde4852009-12-14 16:47:12 +0000517 def testUpdateConflict(self):
518 if not self.enabled:
519 return
520 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800521 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
522 self.relpath)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000523 file_path = join(self.base_path, 'b')
Edward Lemur979fa782019-08-13 22:44:05 +0000524 with open(file_path, 'w') as f:
525 f.writelines('conflict\n')
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000526 scm._Run(['commit', '-am', 'test'], options)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000527 scm._AskForData = self._GetAskForDataCallback(
528 'Cannot fast-forward merge, attempt to rebase? '
529 '(y)es / (q)uit / (s)kip : ', 'y')
Edward Lemur979fa782019-08-13 22:44:05 +0000530
531 with self.assertRaises(gclient_scm.gclient_utils.Error) as e:
532 scm.update(options, (), [])
533 self.assertEqual(
534 e.exception.args[0],
535 'Conflict while rebasing this branch.\n'
536 'Fix the conflict and run gclient again.\n'
537 'See \'man git-rebase\' for details.\n')
538
539 with self.assertRaises(gclient_scm.gclient_utils.Error) as e:
540 scm.update(options, (), [])
541 self.assertEqual(
542 e.exception.args[0],
543 '\n____ . at refs/remotes/origin/master\n'
544 '\tYou have unstaged changes.\n'
545 '\tPlease commit, stash, or reset.\n')
546
maruel@chromium.orgcb2985f2010-11-03 14:08:31 +0000547 sys.stdout.close()
msb@chromium.org5bde4852009-12-14 16:47:12 +0000548
msb@chromium.org0f282062009-11-06 20:14:02 +0000549 def testRevinfo(self):
550 if not self.enabled:
551 return
552 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800553 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
554 self.relpath)
msb@chromium.org0f282062009-11-06 20:14:02 +0000555 rev_info = scm.revinfo(options, (), None)
Edward Lemur979fa782019-08-13 22:44:05 +0000556 self.assertEqual(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
msb@chromium.org0f282062009-11-06 20:14:02 +0000557
msb@chromium.orge28e4982009-09-25 20:51:45 +0000558
Edward Lemur979fa782019-08-13 22:44:05 +0000559class ManagedGitWrapperTestCaseMock(unittest.TestCase):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000560 class OptionsObject(object):
561 def __init__(self, verbose=False, revision=None, force=False):
562 self.verbose = verbose
563 self.revision = revision
564 self.deps_os = None
565 self.force = force
566 self.reset = False
567 self.nohooks = False
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000568 self.break_repo_locks = False
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000569 # TODO(maruel): Test --jobs > 1.
570 self.jobs = 1
Edward Lesmesc621b212018-03-21 20:26:56 -0400571 self.patch_ref = None
572 self.patch_repo = None
573 self.rebase_patch_ref = True
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000574
575 def Options(self, *args, **kwargs):
576 return self.OptionsObject(*args, **kwargs)
577
borenet@google.comb09097a2014-04-09 19:09:08 +0000578 def checkstdout(self, expected):
579 value = sys.stdout.getvalue()
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000580 sys.stdout.close()
Erik Chene16ffff2019-10-14 20:35:53 +0000581 # Check that the expected output appears.
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800582 # pylint: disable=no-member
Erik Chene16ffff2019-10-14 20:35:53 +0000583 self.assertIn(expected, strip_timestamps(value))
borenet@google.comb09097a2014-04-09 19:09:08 +0000584
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000585 def setUp(self):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000586 self.fake_hash_1 = 't0ta11yf4k3'
587 self.fake_hash_2 = '3v3nf4k3r'
588 self.url = 'git://foo'
maruel@chromium.org97170132013-05-08 14:58:34 +0000589 self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000590 self.relpath = 'fake'
591 self.base_path = os.path.join(self.root_dir, self.relpath)
primiano@chromium.org1c127382015-02-17 11:15:40 +0000592 self.backup_base_path = os.path.join(self.root_dir,
593 'old_%s.git' % self.relpath)
Edward Lemur979fa782019-08-13 22:44:05 +0000594 mock.patch('gclient_scm.scm.GIT.ApplyEnvVars').start()
595 mock.patch('gclient_scm.GitWrapper._CheckMinVersion').start()
596 mock.patch('gclient_scm.GitWrapper._Fetch').start()
597 mock.patch('gclient_scm.GitWrapper._DeleteOrMove').start()
598 mock.patch('sys.stdout', StringIO()).start()
599 self.addCleanup(mock.patch.stopall)
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000600
Edward Lemur979fa782019-08-13 22:44:05 +0000601 @mock.patch('scm.GIT.IsValidRevision')
602 @mock.patch('os.path.isdir', lambda _: True)
603 def testGetUsableRevGit(self, mockIsValidRevision):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800604 # pylint: disable=no-member
smutae7ea312016-07-18 11:59:41 -0700605 options = self.Options(verbose=True)
606
Edward Lemur979fa782019-08-13 22:44:05 +0000607 mockIsValidRevision.side_effect = lambda cwd, rev: rev != '1'
smutae7ea312016-07-18 11:59:41 -0700608
John Budorick0f7b2002018-01-19 15:46:17 -0800609 git_scm = gclient_scm.GitWrapper(self.url, self.root_dir,
610 self.relpath)
smutae7ea312016-07-18 11:59:41 -0700611 # A [fake] git sha1 with a git repo should work (this is in the case that
612 # the LKGR gets flipped to git sha1's some day).
Edward Lemur979fa782019-08-13 22:44:05 +0000613 self.assertEqual(git_scm.GetUsableRev(self.fake_hash_1, options),
614 self.fake_hash_1)
smutae7ea312016-07-18 11:59:41 -0700615 # An SVN rev with an existing purely git repo should raise an exception.
616 self.assertRaises(gclient_scm.gclient_utils.Error,
617 git_scm.GetUsableRev, '1', options)
618
Edward Lemur979fa782019-08-13 22:44:05 +0000619 @mock.patch('gclient_scm.GitWrapper._Clone')
620 @mock.patch('os.path.isdir')
621 @mock.patch('os.path.exists')
622 @mock.patch('subprocess2.check_output')
623 def testUpdateNoDotGit(
624 self, mockCheckOutput, mockExists, mockIsdir, mockClone):
625 mockIsdir.side_effect = lambda path: path == self.base_path
626 mockExists.side_effect = lambda path: path == self.base_path
627 mockCheckOutput.return_value = b''
628
borenet@google.comb09097a2014-04-09 19:09:08 +0000629 options = self.Options()
Edward Lemur979fa782019-08-13 22:44:05 +0000630 scm = gclient_scm.GitWrapper(
631 self.url, self.root_dir, self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +0000632 scm.update(options, None, [])
Edward Lemur979fa782019-08-13 22:44:05 +0000633
634 env = gclient_scm.scm.GIT.ApplyEnvVars({})
635 self.assertEqual(
636 mockCheckOutput.mock_calls,
637 [
638 mock.call(
639 ['git', '-c', 'core.quotePath=false', 'ls-files'],
640 cwd=self.base_path, env=env, stderr=-1),
641 mock.call(
642 ['git', 'rev-parse', '--verify', 'HEAD'],
643 cwd=self.base_path, env=env, stderr=-1),
644 ])
645 mockClone.assert_called_with(
646 'refs/remotes/origin/master', self.url, options)
borenet@google.comb09097a2014-04-09 19:09:08 +0000647 self.checkstdout('\n')
648
Edward Lemur979fa782019-08-13 22:44:05 +0000649 @mock.patch('gclient_scm.GitWrapper._Clone')
650 @mock.patch('os.path.isdir')
651 @mock.patch('os.path.exists')
652 @mock.patch('subprocess2.check_output')
653 def testUpdateConflict(
654 self, mockCheckOutput, mockExists, mockIsdir, mockClone):
655 mockIsdir.side_effect = lambda path: path == self.base_path
656 mockExists.side_effect = lambda path: path == self.base_path
657 mockCheckOutput.return_value = b''
658 mockClone.side_effect = [
659 gclient_scm.subprocess2.CalledProcessError(
660 None, None, None, None, None),
661 None,
662 ]
663
borenet@google.com90fe58b2014-05-01 18:22:00 +0000664 options = self.Options()
Edward Lemur979fa782019-08-13 22:44:05 +0000665 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
John Budorick0f7b2002018-01-19 15:46:17 -0800666 self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +0000667 scm.update(options, None, [])
Edward Lemur979fa782019-08-13 22:44:05 +0000668
669 env = gclient_scm.scm.GIT.ApplyEnvVars({})
670 self.assertEqual(
671 mockCheckOutput.mock_calls,
672 [
673 mock.call(
674 ['git', '-c', 'core.quotePath=false', 'ls-files'],
675 cwd=self.base_path, env=env, stderr=-1),
676 mock.call(
677 ['git', 'rev-parse', '--verify', 'HEAD'],
678 cwd=self.base_path, env=env, stderr=-1),
679 ])
680 mockClone.assert_called_with(
681 'refs/remotes/origin/master', self.url, options)
borenet@google.comb09097a2014-04-09 19:09:08 +0000682 self.checkstdout('\n')
683
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000684
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000685class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase):
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000686 def checkInStdout(self, expected):
687 value = sys.stdout.getvalue()
688 sys.stdout.close()
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800689 # pylint: disable=no-member
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000690 self.assertIn(expected, value)
691
692 def checkNotInStdout(self, expected):
693 value = sys.stdout.getvalue()
694 sys.stdout.close()
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800695 # pylint: disable=no-member
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000696 self.assertNotIn(expected, value)
697
smut@google.com27c9c8a2014-09-11 19:57:55 +0000698 def getCurrentBranch(self):
699 # Returns name of current branch or HEAD for detached HEAD
700 branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'],
701 cwd=self.base_path)
702 if branch == 'HEAD':
703 return None
704 return branch
705
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000706 def testUpdateClone(self):
707 if not self.enabled:
708 return
709 options = self.Options()
710
711 origin_root_dir = self.root_dir
Edward Lesmese79107e2019-10-25 22:47:33 +0000712 self.addCleanup(gclient_utils.rmtree, origin_root_dir)
713
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000714 self.root_dir = tempfile.mkdtemp()
715 self.relpath = '.'
716 self.base_path = join(self.root_dir, self.relpath)
717
John Budorick0f7b2002018-01-19 15:46:17 -0800718 scm = gclient_scm.GitWrapper(origin_root_dir,
719 self.root_dir,
720 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000721
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000722 expected_file_list = [join(self.base_path, "a"),
723 join(self.base_path, "b")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000724 file_list = []
725 options.revision = 'unmanaged'
726 scm.update(options, (), file_list)
727
Edward Lemur979fa782019-08-13 22:44:05 +0000728 self.assertEqual(file_list, expected_file_list)
729 self.assertEqual(scm.revinfo(options, (), None),
730 '069c602044c5388d2d15c3f875b057c852003458')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000731 # indicates detached HEAD
Edward Lemur979fa782019-08-13 22:44:05 +0000732 self.assertEqual(self.getCurrentBranch(), None)
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000733 self.checkInStdout(
734 'Checked out refs/remotes/origin/master to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000735
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000736
737 def testUpdateCloneOnCommit(self):
738 if not self.enabled:
739 return
740 options = self.Options()
741
742 origin_root_dir = self.root_dir
Edward Lesmese79107e2019-10-25 22:47:33 +0000743 self.addCleanup(gclient_utils.rmtree, origin_root_dir)
744
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000745 self.root_dir = tempfile.mkdtemp()
746 self.relpath = '.'
747 self.base_path = join(self.root_dir, self.relpath)
748 url_with_commit_ref = origin_root_dir +\
749 '@a7142dc9f0009350b96a11f372b6ea658592aa95'
750
John Budorick0f7b2002018-01-19 15:46:17 -0800751 scm = gclient_scm.GitWrapper(url_with_commit_ref,
752 self.root_dir,
753 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000754
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000755 expected_file_list = [join(self.base_path, "a"),
756 join(self.base_path, "b")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000757 file_list = []
758 options.revision = 'unmanaged'
759 scm.update(options, (), file_list)
760
Edward Lemur979fa782019-08-13 22:44:05 +0000761 self.assertEqual(file_list, expected_file_list)
762 self.assertEqual(scm.revinfo(options, (), None),
763 'a7142dc9f0009350b96a11f372b6ea658592aa95')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000764 # indicates detached HEAD
Edward Lemur979fa782019-08-13 22:44:05 +0000765 self.assertEqual(self.getCurrentBranch(), None)
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000766 self.checkInStdout(
767 'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000768
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000769 def testUpdateCloneOnBranch(self):
770 if not self.enabled:
771 return
772 options = self.Options()
773
774 origin_root_dir = self.root_dir
Edward Lesmese79107e2019-10-25 22:47:33 +0000775 self.addCleanup(gclient_utils.rmtree, origin_root_dir)
776
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000777 self.root_dir = tempfile.mkdtemp()
778 self.relpath = '.'
779 self.base_path = join(self.root_dir, self.relpath)
780 url_with_branch_ref = origin_root_dir + '@feature'
781
John Budorick0f7b2002018-01-19 15:46:17 -0800782 scm = gclient_scm.GitWrapper(url_with_branch_ref,
783 self.root_dir,
784 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000785
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000786 expected_file_list = [join(self.base_path, "a"),
787 join(self.base_path, "b"),
John Budorick882c91e2018-07-12 22:11:41 +0000788 join(self.base_path, "c")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000789 file_list = []
790 options.revision = 'unmanaged'
791 scm.update(options, (), file_list)
792
Edward Lemur979fa782019-08-13 22:44:05 +0000793 self.assertEqual(file_list, expected_file_list)
794 self.assertEqual(scm.revinfo(options, (), None),
795 '9a51244740b25fa2ded5252ca00a3178d3f665a9')
Paweł Hajdan, Jr63b8c2a2017-09-05 17:59:08 +0200796 # indicates detached HEAD
Edward Lemur979fa782019-08-13 22:44:05 +0000797 self.assertEqual(self.getCurrentBranch(), None)
Paweł Hajdan, Jr63b8c2a2017-09-05 17:59:08 +0200798 self.checkInStdout(
John Budorick882c91e2018-07-12 22:11:41 +0000799 'Checked out 9a51244740b25fa2ded5252ca00a3178d3f665a9 '
Paweł Hajdan, Jr63b8c2a2017-09-05 17:59:08 +0200800 'to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000801
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000802 def testUpdateCloneOnFetchedRemoteBranch(self):
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000803 if not self.enabled:
804 return
805 options = self.Options()
806
807 origin_root_dir = self.root_dir
Edward Lesmese79107e2019-10-25 22:47:33 +0000808 self.addCleanup(gclient_utils.rmtree, origin_root_dir)
809
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000810 self.root_dir = tempfile.mkdtemp()
811 self.relpath = '.'
812 self.base_path = join(self.root_dir, self.relpath)
813 url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature'
814
John Budorick0f7b2002018-01-19 15:46:17 -0800815 scm = gclient_scm.GitWrapper(url_with_branch_ref,
816 self.root_dir,
817 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000818
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000819 expected_file_list = [join(self.base_path, "a"),
820 join(self.base_path, "b"),
John Budorick882c91e2018-07-12 22:11:41 +0000821 join(self.base_path, "c")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000822 file_list = []
823 options.revision = 'unmanaged'
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000824 scm.update(options, (), file_list)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000825
Edward Lemur979fa782019-08-13 22:44:05 +0000826 self.assertEqual(file_list, expected_file_list)
827 self.assertEqual(scm.revinfo(options, (), None),
828 '9a51244740b25fa2ded5252ca00a3178d3f665a9')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000829 # indicates detached HEAD
Edward Lemur979fa782019-08-13 22:44:05 +0000830 self.assertEqual(self.getCurrentBranch(), None)
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000831 self.checkInStdout(
832 'Checked out refs/remotes/origin/feature to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000833
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000834 def testUpdateCloneOnTrueRemoteBranch(self):
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000835 if not self.enabled:
836 return
837 options = self.Options()
838
839 origin_root_dir = self.root_dir
Edward Lesmese79107e2019-10-25 22:47:33 +0000840 self.addCleanup(gclient_utils.rmtree, origin_root_dir)
841
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000842 self.root_dir = tempfile.mkdtemp()
843 self.relpath = '.'
844 self.base_path = join(self.root_dir, self.relpath)
845 url_with_branch_ref = origin_root_dir + '@refs/heads/feature'
846
John Budorick0f7b2002018-01-19 15:46:17 -0800847 scm = gclient_scm.GitWrapper(url_with_branch_ref,
848 self.root_dir,
849 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000850
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000851 expected_file_list = [join(self.base_path, "a"),
852 join(self.base_path, "b"),
John Budorick882c91e2018-07-12 22:11:41 +0000853 join(self.base_path, "c")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000854 file_list = []
855 options.revision = 'unmanaged'
856 scm.update(options, (), file_list)
857
Edward Lemur979fa782019-08-13 22:44:05 +0000858 self.assertEqual(file_list, expected_file_list)
859 self.assertEqual(scm.revinfo(options, (), None),
860 '9a51244740b25fa2ded5252ca00a3178d3f665a9')
John Budorick882c91e2018-07-12 22:11:41 +0000861 # @refs/heads/feature is AKA @refs/remotes/origin/feature in the clone, so
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000862 # should be treated as such by gclient.
863 # TODO(mmoss): Though really, we should only allow DEPS to specify branches
864 # as they are known in the upstream repo, since the mapping into the local
865 # repo can be modified by users (or we might even want to change the gclient
866 # defaults at some point). But that will take more work to stop using
867 # refs/remotes/ everywhere that we do (and to stop assuming a DEPS ref will
868 # always resolve locally, like when passing them to show-ref or rev-list).
Edward Lemur979fa782019-08-13 22:44:05 +0000869 self.assertEqual(self.getCurrentBranch(), None)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000870 self.checkInStdout(
871 'Checked out refs/remotes/origin/feature to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000872
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000873 def testUpdateUpdate(self):
874 if not self.enabled:
875 return
876 options = self.Options()
877 expected_file_list = []
John Budorick0f7b2002018-01-19 15:46:17 -0800878 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
879 self.relpath)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000880 file_list = []
881 options.revision = 'unmanaged'
882 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000883 self.assertEqual(file_list, expected_file_list)
884 self.assertEqual(scm.revinfo(options, (), None),
885 '069c602044c5388d2d15c3f875b057c852003458')
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000886 self.checkstdout('________ unmanaged solution; skipping .\n')
887
888
Edward Lemur979fa782019-08-13 22:44:05 +0000889class CipdWrapperTestCase(unittest.TestCase):
John Budorick0f7b2002018-01-19 15:46:17 -0800890
891 def setUp(self):
892 # Create this before setting up mocks.
893 self._cipd_root_dir = tempfile.mkdtemp()
894 self._workdir = tempfile.mkdtemp()
John Budorick0f7b2002018-01-19 15:46:17 -0800895
896 self._cipd_instance_url = 'https://chrome-infra-packages.appspot.com'
897 self._cipd_root = gclient_scm.CipdRoot(
898 self._cipd_root_dir,
899 self._cipd_instance_url)
900 self._cipd_packages = [
901 self._cipd_root.add_package('f', 'foo_package', 'foo_version'),
902 self._cipd_root.add_package('b', 'bar_package', 'bar_version'),
903 self._cipd_root.add_package('b', 'baz_package', 'baz_version'),
904 ]
Edward Lemur979fa782019-08-13 22:44:05 +0000905 mock.patch('tempfile.mkdtemp', lambda: self._workdir).start()
906 mock.patch('gclient_scm.CipdRoot.add_package').start()
907 mock.patch('gclient_scm.CipdRoot.clobber').start()
908 mock.patch('gclient_scm.CipdRoot.ensure').start()
909 self.addCleanup(mock.patch.stopall)
Edward Lesmese79107e2019-10-25 22:47:33 +0000910 self.addCleanup(gclient_utils.rmtree, self._cipd_root_dir)
911 self.addCleanup(gclient_utils.rmtree, self._workdir)
John Budorick0f7b2002018-01-19 15:46:17 -0800912
913 def createScmWithPackageThatSatisfies(self, condition):
914 return gclient_scm.CipdWrapper(
915 url=self._cipd_instance_url,
916 root_dir=self._cipd_root_dir,
917 relpath='fake_relpath',
918 root=self._cipd_root,
919 package=self.getPackageThatSatisfies(condition))
920
921 def getPackageThatSatisfies(self, condition):
922 for p in self._cipd_packages:
923 if condition(p):
924 return p
925
926 self.fail('Unable to find a satisfactory package.')
927
John Budorick0f7b2002018-01-19 15:46:17 -0800928 def testRevert(self):
John Budorickd3ba72b2018-03-20 12:27:42 -0700929 """Checks that revert does nothing."""
Edward Lemur979fa782019-08-13 22:44:05 +0000930 scm = self.createScmWithPackageThatSatisfies(lambda _: True)
John Budorick0f7b2002018-01-19 15:46:17 -0800931 scm.revert(None, (), [])
932
Edward Lemur979fa782019-08-13 22:44:05 +0000933 @mock.patch('gclient_scm.gclient_utils.CheckCallAndFilter')
934 @mock.patch('gclient_scm.gclient_utils.rmtree')
935 def testRevinfo(self, mockRmtree, mockCheckCallAndFilter):
John Budorick0f7b2002018-01-19 15:46:17 -0800936 """Checks that revinfo uses the JSON from cipd describe."""
937 scm = self.createScmWithPackageThatSatisfies(lambda _: True)
938
939 expected_revinfo = '0123456789abcdef0123456789abcdef01234567'
940 json_contents = {
941 'result': {
942 'pin': {
943 'instance_id': expected_revinfo,
944 }
945 }
946 }
947 describe_json_path = join(self._workdir, 'describe.json')
948 with open(describe_json_path, 'w') as describe_json:
949 json.dump(json_contents, describe_json)
950
Edward Lemur979fa782019-08-13 22:44:05 +0000951 revinfo = scm.revinfo(None, (), [])
952 self.assertEqual(revinfo, expected_revinfo)
953
954 mockRmtree.assert_called_with(self._workdir)
955 mockCheckCallAndFilter.assert_called_with([
John Budorick0f7b2002018-01-19 15:46:17 -0800956 'cipd', 'describe', 'foo_package',
957 '-log-level', 'error',
958 '-version', 'foo_version',
959 '-json-output', describe_json_path,
Edward Lemur979fa782019-08-13 22:44:05 +0000960 ])
John Budorick0f7b2002018-01-19 15:46:17 -0800961
962 def testUpdate(self):
John Budorickd3ba72b2018-03-20 12:27:42 -0700963 """Checks that update does nothing."""
Edward Lemur979fa782019-08-13 22:44:05 +0000964 scm = self.createScmWithPackageThatSatisfies(lambda _: True)
John Budorick0f7b2002018-01-19 15:46:17 -0800965 scm.update(None, (), [])
966
967
Edward Lemurd64781e2018-07-11 23:09:55 +0000968class GerritChangesFakeRepo(fake_repos.FakeReposBase):
969 def populateGit(self):
970 # Creates a tree that looks like this:
971 #
Edward Lemurca7d8812018-07-24 17:42:45 +0000972 # 6 refs/changes/35/1235/1
973 # |
974 # 5 refs/changes/34/1234/1
975 # |
Edward Lemurd64781e2018-07-11 23:09:55 +0000976 # 1--2--3--4 refs/heads/master
Edward Lemurca7d8812018-07-24 17:42:45 +0000977 # | |
978 # | 11(5)--12 refs/heads/master-with-5
979 # |
980 # 7--8--9 refs/heads/feature
981 # |
982 # 10 refs/changes/36/1236/1
983 #
Edward Lemurd64781e2018-07-11 23:09:55 +0000984
985 self._commit_git('repo_1', {'commit 1': 'touched'})
986 self._commit_git('repo_1', {'commit 2': 'touched'})
987 self._commit_git('repo_1', {'commit 3': 'touched'})
988 self._commit_git('repo_1', {'commit 4': 'touched'})
989 self._create_ref('repo_1', 'refs/heads/master', 4)
990
991 # Create a change on top of commit 3 that consists of two commits.
992 self._commit_git('repo_1',
993 {'commit 5': 'touched',
994 'change': '1234'},
995 base=3)
996 self._create_ref('repo_1', 'refs/changes/34/1234/1', 5)
997 self._commit_git('repo_1',
998 {'commit 6': 'touched',
999 'change': '1235'})
1000 self._create_ref('repo_1', 'refs/changes/35/1235/1', 6)
1001
Edward Lemurca7d8812018-07-24 17:42:45 +00001002 # Create a refs/heads/feature branch on top of commit 2, consisting of three
1003 # commits.
1004 self._commit_git('repo_1', {'commit 7': 'touched'}, base=2)
1005 self._commit_git('repo_1', {'commit 8': 'touched'})
1006 self._commit_git('repo_1', {'commit 9': 'touched'})
1007 self._create_ref('repo_1', 'refs/heads/feature', 9)
1008
1009 # Create a change of top of commit 8.
1010 self._commit_git('repo_1',
1011 {'commit 10': 'touched',
1012 'change': '1236'},
1013 base=8)
1014 self._create_ref('repo_1', 'refs/changes/36/1236/1', 10)
1015
1016 # Create a refs/heads/master-with-5 on top of commit 3 which is a branch
1017 # where refs/changes/34/1234/1 (commit 5) has already landed as commit 11.
1018 self._commit_git('repo_1',
1019 # This is really commit 11, but has the changes of commit 5
1020 {'commit 5': 'touched',
1021 'change': '1234'},
1022 base=3)
1023 self._commit_git('repo_1', {'commit 12': 'touched'})
1024 self._create_ref('repo_1', 'refs/heads/master-with-5', 12)
1025
Edward Lemurd64781e2018-07-11 23:09:55 +00001026
1027class GerritChangesTest(fake_repos.FakeReposTestBase):
1028 FAKE_REPOS_CLASS = GerritChangesFakeRepo
1029
1030 def setUp(self):
1031 super(GerritChangesTest, self).setUp()
1032 self.enabled = self.FAKE_REPOS.set_up_git()
1033 self.options = BaseGitWrapperTestCase.OptionsObject()
1034 self.url = self.git_base + 'repo_1'
1035 self.mirror = None
Edward Lesmese79107e2019-10-25 22:47:33 +00001036 mock.patch('sys.stdout').start()
1037 self.addCleanup(mock.patch.stopall)
Edward Lemurd64781e2018-07-11 23:09:55 +00001038
1039 def setUpMirror(self):
1040 self.mirror = tempfile.mkdtemp()
1041 git_cache.Mirror.SetCachePath(self.mirror)
Edward Lesmese79107e2019-10-25 22:47:33 +00001042 self.addCleanup(gclient_utils.rmtree, self.mirror)
Edward Lemurd64781e2018-07-11 23:09:55 +00001043 self.addCleanup(git_cache.Mirror.SetCachePath, None)
1044
Edward Lemurca7d8812018-07-24 17:42:45 +00001045 def assertCommits(self, commits):
1046 """Check that all, and only |commits| are present in the current checkout.
1047 """
1048 for i in commits:
1049 name = os.path.join(self.root_dir, 'commit ' + str(i))
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001050 self.assertTrue(os.path.exists(name), 'Commit not found: %s' % name)
Edward Lemurca7d8812018-07-24 17:42:45 +00001051
1052 all_commits = set(range(1, len(self.FAKE_REPOS.git_hashes['repo_1'])))
1053 for i in all_commits - set(commits):
1054 name = os.path.join(self.root_dir, 'commit ' + str(i))
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001055 self.assertFalse(os.path.exists(name), 'Unexpected commit: %s' % name)
Edward Lemurca7d8812018-07-24 17:42:45 +00001056
Edward Lemurd64781e2018-07-11 23:09:55 +00001057 def testCanCloneGerritChange(self):
1058 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1059 file_list = []
1060
1061 self.options.revision = 'refs/changes/35/1235/1'
1062 scm.update(self.options, None, file_list)
1063 self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir))
1064
1065 def testCanSyncToGerritChange(self):
1066 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1067 file_list = []
1068
1069 self.options.revision = self.githash('repo_1', 1)
1070 scm.update(self.options, None, file_list)
1071 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1072
1073 self.options.revision = 'refs/changes/35/1235/1'
1074 scm.update(self.options, None, file_list)
1075 self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir))
1076
1077 def testCanCloneGerritChangeMirror(self):
1078 self.setUpMirror()
1079 self.testCanCloneGerritChange()
1080
1081 def testCanSyncToGerritChangeMirror(self):
1082 self.setUpMirror()
1083 self.testCanSyncToGerritChange()
1084
Edward Lesmese79107e2019-10-25 22:47:33 +00001085 def testMirrorPushUrl(self):
1086 self.setUpMirror()
1087
1088 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1089 file_list = []
1090 self.assertIsNotNone(scm._GetMirror(self.url, self.options))
1091
1092 scm.update(self.options, None, file_list)
1093
1094 fetch_url = scm._Capture(['remote', 'get-url', 'origin'])
1095 self.assertTrue(
1096 fetch_url.startswith(self.mirror),
1097 msg='\n'.join([
1098 'Repository fetch url should be in the git cache mirror directory.',
1099 ' fetch_url: %s' % fetch_url,
1100 ' mirror: %s' % self.mirror]))
1101 push_url = scm._Capture(['remote', 'get-url', '--push', 'origin'])
1102 self.assertEqual(push_url, self.url)
1103
Edward Lemurca7d8812018-07-24 17:42:45 +00001104 def testAppliesPatchOnTopOfMasterByDefault(self):
1105 """Test the default case, where we apply a patch on top of master."""
1106 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1107 file_list = []
1108
1109 # Make sure we don't specify a revision.
1110 self.options.revision = None
1111 scm.update(self.options, None, file_list)
1112 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1113
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001114 scm.apply_patch_ref(
1115 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1116 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001117
1118 self.assertCommits([1, 2, 3, 4, 5, 6])
1119 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1120
1121 def testCheckoutOlderThanPatchBase(self):
1122 """Test applying a patch on an old checkout.
1123
1124 We first checkout commit 1, and try to patch refs/changes/35/1235/1, which
1125 contains commits 5 and 6, and is based on top of commit 3.
1126 The final result should contain commits 1, 5 and 6, but not commits 2 or 3.
1127 """
1128 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1129 file_list = []
1130
1131 # Sync to commit 1
1132 self.options.revision = self.githash('repo_1', 1)
1133 scm.update(self.options, None, file_list)
1134 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1135
1136 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001137 scm.apply_patch_ref(
1138 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1139 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001140
1141 self.assertCommits([1, 5, 6])
1142 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1143
1144 def testCheckoutOriginFeature(self):
1145 """Tests that we can apply a patch on a branch other than master."""
1146 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1147 file_list = []
1148
Edward Lemur8c665652019-05-08 20:23:33 +00001149 # Sync to remote's refs/heads/feature
1150 self.options.revision = 'refs/heads/feature'
Edward Lemurca7d8812018-07-24 17:42:45 +00001151 scm.update(self.options, None, file_list)
1152 self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
1153
1154 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001155 scm.apply_patch_ref(
1156 self.url, 'refs/changes/36/1236/1', 'refs/heads/feature', self.options,
1157 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001158
1159 self.assertCommits([1, 2, 7, 8, 9, 10])
1160 self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
1161
1162 def testCheckoutOriginFeatureOnOldRevision(self):
1163 """Tests that we can apply a patch on an old checkout, on a branch other
1164 than master."""
1165 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1166 file_list = []
1167
Edward Lemur8c665652019-05-08 20:23:33 +00001168 # Sync to remote's refs/heads/feature on an old revision
Edward Lemurca7d8812018-07-24 17:42:45 +00001169 self.options.revision = self.githash('repo_1', 7)
1170 scm.update(self.options, None, file_list)
1171 self.assertEqual(self.githash('repo_1', 7), self.gitrevparse(self.root_dir))
1172
1173 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001174 scm.apply_patch_ref(
1175 self.url, 'refs/changes/36/1236/1', 'refs/heads/feature', self.options,
1176 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001177
1178 # We shouldn't have rebased on top of 2 (which is the merge base between
Edward Lemur8c665652019-05-08 20:23:33 +00001179 # remote's master branch and the change) but on top of 7 (which is the
1180 # merge base between remote's feature branch and the change).
Edward Lemurca7d8812018-07-24 17:42:45 +00001181 self.assertCommits([1, 2, 7, 10])
1182 self.assertEqual(self.githash('repo_1', 7), self.gitrevparse(self.root_dir))
1183
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001184 def testCheckoutOriginFeaturePatchBranch(self):
1185 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1186 file_list = []
1187
Edward Lemur8c665652019-05-08 20:23:33 +00001188 # Sync to the hash instead of remote's refs/heads/feature.
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001189 self.options.revision = self.githash('repo_1', 9)
1190 scm.update(self.options, None, file_list)
1191 self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
1192
Edward Lemur8c665652019-05-08 20:23:33 +00001193 # Apply refs/changes/34/1234/1, created for remote's master branch on top of
1194 # remote's feature branch.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001195 scm.apply_patch_ref(
1196 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1197 file_list)
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001198
1199 # Commits 5 and 6 are part of the patch, and commits 1, 2, 7, 8 and 9 are
Edward Lemur8c665652019-05-08 20:23:33 +00001200 # part of remote's feature branch.
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001201 self.assertCommits([1, 2, 5, 6, 7, 8, 9])
1202 self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
Edward Lemurca7d8812018-07-24 17:42:45 +00001203
1204 def testDoesntRebasePatchMaster(self):
1205 """Tests that we can apply a patch without rebasing it.
1206 """
1207 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1208 file_list = []
1209
1210 self.options.rebase_patch_ref = False
1211 scm.update(self.options, None, file_list)
1212 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1213
1214 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001215 scm.apply_patch_ref(
1216 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1217 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001218
1219 self.assertCommits([1, 2, 3, 5, 6])
Robert Iannuccic39a7782019-11-01 18:30:33 +00001220 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
Edward Lemurca7d8812018-07-24 17:42:45 +00001221
1222 def testDoesntRebasePatchOldCheckout(self):
1223 """Tests that we can apply a patch without rebasing it on an old checkout.
1224 """
1225 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1226 file_list = []
1227
1228 # Sync to commit 1
1229 self.options.revision = self.githash('repo_1', 1)
1230 self.options.rebase_patch_ref = False
1231 scm.update(self.options, None, file_list)
1232 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1233
1234 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001235 scm.apply_patch_ref(
1236 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1237 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001238
1239 self.assertCommits([1, 2, 3, 5, 6])
Robert Iannuccic39a7782019-11-01 18:30:33 +00001240 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
Edward Lemurca7d8812018-07-24 17:42:45 +00001241
1242 def testDoesntSoftResetIfNotAskedTo(self):
1243 """Test that we can apply a patch without doing a soft reset."""
1244 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1245 file_list = []
1246
1247 self.options.reset_patch_ref = False
1248 scm.update(self.options, None, file_list)
1249 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1250
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001251 scm.apply_patch_ref(
1252 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1253 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001254
1255 self.assertCommits([1, 2, 3, 4, 5, 6])
1256 # The commit hash after cherry-picking is not known, but it must be
1257 # different from what the repo was synced at before patching.
1258 self.assertNotEqual(self.githash('repo_1', 4),
1259 self.gitrevparse(self.root_dir))
1260
1261 def testRecoversAfterPatchFailure(self):
1262 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1263 file_list = []
1264
1265 self.options.revision = 'refs/changes/34/1234/1'
1266 scm.update(self.options, None, file_list)
1267 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
1268
1269 # Checkout 'refs/changes/34/1234/1' modifies the 'change' file, so trying to
1270 # patch 'refs/changes/36/1236/1' creates a patch failure.
1271 with self.assertRaises(subprocess2.CalledProcessError) as cm:
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001272 scm.apply_patch_ref(
1273 self.url, 'refs/changes/36/1236/1', 'refs/heads/master', self.options,
1274 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001275 self.assertEqual(cm.exception.cmd[:2], ['git', 'cherry-pick'])
Edward Lemur979fa782019-08-13 22:44:05 +00001276 self.assertIn(b'error: could not apply', cm.exception.stderr)
Edward Lemurca7d8812018-07-24 17:42:45 +00001277
1278 # Try to apply 'refs/changes/35/1235/1', which doesn't have a merge
1279 # conflict.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001280 scm.apply_patch_ref(
1281 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1282 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001283 self.assertCommits([1, 2, 3, 5, 6])
1284 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
1285
1286 def testIgnoresAlreadyMergedCommits(self):
1287 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1288 file_list = []
1289
1290 self.options.revision = 'refs/heads/master-with-5'
1291 scm.update(self.options, None, file_list)
1292 self.assertEqual(self.githash('repo_1', 12),
1293 self.gitrevparse(self.root_dir))
1294
1295 # When we try 'refs/changes/35/1235/1' on top of 'refs/heads/feature',
1296 # 'refs/changes/34/1234/1' will be an empty commit, since the changes were
1297 # already present in the tree as commit 11.
1298 # Make sure we deal with this gracefully.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001299 scm.apply_patch_ref(
1300 self.url, 'refs/changes/35/1235/1', 'refs/heads/feature', self.options,
1301 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001302 self.assertCommits([1, 2, 3, 5, 6, 12])
1303 self.assertEqual(self.githash('repo_1', 12),
1304 self.gitrevparse(self.root_dir))
1305
1306 def testRecoversFromExistingCherryPick(self):
1307 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1308 file_list = []
1309
1310 self.options.revision = 'refs/changes/34/1234/1'
1311 scm.update(self.options, None, file_list)
1312 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
1313
1314 # Checkout 'refs/changes/34/1234/1' modifies the 'change' file, so trying to
1315 # cherry-pick 'refs/changes/36/1236/1' raises an error.
1316 scm._Run(['fetch', 'origin', 'refs/changes/36/1236/1'], self.options)
1317 with self.assertRaises(subprocess2.CalledProcessError) as cm:
1318 scm._Run(['cherry-pick', 'FETCH_HEAD'], self.options)
1319 self.assertEqual(cm.exception.cmd[:2], ['git', 'cherry-pick'])
1320
1321 # Try to apply 'refs/changes/35/1235/1', which doesn't have a merge
1322 # conflict.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001323 scm.apply_patch_ref(
1324 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1325 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001326 self.assertCommits([1, 2, 3, 5, 6])
1327 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
1328
Edward Lemurd64781e2018-07-11 23:09:55 +00001329
msb@chromium.orge28e4982009-09-25 20:51:45 +00001330if __name__ == '__main__':
szager@chromium.orgb0a13a22014-06-18 00:52:25 +00001331 level = logging.DEBUG if '-v' in sys.argv else logging.FATAL
1332 logging.basicConfig(
1333 level=level,
1334 format='%(asctime).19s %(levelname)s %(filename)s:'
1335 '%(lineno)s %(message)s')
msb@chromium.orge28e4982009-09-25 20:51:45 +00001336 unittest.main()
1337
1338# vim: ts=2:sw=2:tw=80:et: