blob: e5f1fcd155f9ca74544a801e5683c45b44a5dbfc [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
maruel@chromium.orgba551772010-02-03 18:21:42 +000010from shutil import rmtree
maruel@chromium.org8ef5f542009-11-12 02:05:02 +000011from subprocess import Popen, PIPE, STDOUT
maruel@chromium.org428342a2011-11-10 15:46:33 +000012
John Budorick0f7b2002018-01-19 15:46:17 -080013import json
maruel@chromium.org428342a2011-11-10 15:46:33 +000014import logging
15import os
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000016import re
maruel@chromium.org428342a2011-11-10 15:46:33 +000017import sys
msb@chromium.orge28e4982009-09-25 20:51:45 +000018import tempfile
maruel@chromium.org389d6de2010-09-09 14:14:37 +000019import unittest
msb@chromium.orge28e4982009-09-25 20:51:45 +000020
Edward Lemur979fa782019-08-13 22:44:05 +000021if sys.version_info.major == 2:
22 from cStringIO import StringIO
23else:
24 from io import StringIO
25
maruel@chromium.org428342a2011-11-10 15:46:33 +000026sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
maruel@chromium.orgba551772010-02-03 18:21:42 +000027
Edward Lemur979fa782019-08-13 22:44:05 +000028from third_party import mock
Edward Lemurd64781e2018-07-11 23:09:55 +000029from testing_support import fake_repos
Edward Lemur9cafbf42019-08-15 22:03:35 +000030from testing_support import test_case_utils
maruel@chromium.org428342a2011-11-10 15:46:33 +000031
msb@chromium.orge28e4982009-09-25 20:51:45 +000032import gclient_scm
szager@chromium.orgb0a13a22014-06-18 00:52:25 +000033import git_cache
maruel@chromium.orgfae707b2011-09-15 18:57:58 +000034import subprocess2
maruel@chromium.org96913eb2010-06-01 16:22:47 +000035
szager@chromium.orgb0a13a22014-06-18 00:52:25 +000036# Disable global git cache
37git_cache.Mirror.SetCachePath(None)
38
maruel@chromium.org795a8c12010-10-05 19:54:29 +000039# Shortcut since this function is used often
40join = gclient_scm.os.path.join
41
Raul Tambrea79f0e52019-09-21 07:27:39 +000042TIMESTAMP_RE = re.compile(r'\[[0-9]{1,2}:[0-9]{2}:[0-9]{2}\] (.*)', re.DOTALL)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000043def strip_timestamps(value):
44 lines = value.splitlines(True)
Edward Lemur979fa782019-08-13 22:44:05 +000045 for i in range(len(lines)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000046 m = TIMESTAMP_RE.match(lines[i])
47 if m:
48 lines[i] = m.group(1)
49 return ''.join(lines)
maruel@chromium.org96913eb2010-06-01 16:22:47 +000050
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +000051
Edward Lemur979fa782019-08-13 22:44:05 +000052class BasicTests(unittest.TestCase):
53 @mock.patch('gclient_scm.scm.GIT.Capture')
54 def testGetFirstRemoteUrl(self, mockCapture):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +000055 REMOTE_STRINGS = [('remote.origin.url E:\\foo\\bar', 'E:\\foo\\bar'),
56 ('remote.origin.url /b/foo/bar', '/b/foo/bar'),
57 ('remote.origin.url https://foo/bar', 'https://foo/bar'),
58 ('remote.origin.url E:\\Fo Bar\\bax', 'E:\\Fo Bar\\bax'),
59 ('remote.origin.url git://what/"do', 'git://what/"do')]
60 FAKE_PATH = '/fake/path'
Edward Lemur979fa782019-08-13 22:44:05 +000061 mockCapture.side_effect = [question for question, _ in REMOTE_STRINGS]
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +000062
63 for _, answer in REMOTE_STRINGS:
Edward Lemur979fa782019-08-13 22:44:05 +000064 self.assertEqual(
65 gclient_scm.SCMWrapper._get_first_remote_url(FAKE_PATH), answer)
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +000066
Edward Lemur979fa782019-08-13 22:44:05 +000067 expected_calls = [
68 mock.call(['config', '--local', '--get-regexp', r'remote.*.url'],
69 cwd=FAKE_PATH)
70 for _ in REMOTE_STRINGS
71 ]
72 self.assertEqual(mockCapture.mock_calls, expected_calls)
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +000073
74
Edward Lemur9cafbf42019-08-15 22:03:35 +000075class BaseGitWrapperTestCase(unittest.TestCase, test_case_utils.TestCaseUtils):
maruel@chromium.org8ef5f542009-11-12 02:05:02 +000076 """This class doesn't use pymox."""
msb@chromium.orge28e4982009-09-25 20:51:45 +000077 class OptionsObject(object):
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +000078 def __init__(self, verbose=False, revision=None):
dnj@chromium.org5b23e872015-02-20 21:25:57 +000079 self.auto_rebase = False
msb@chromium.orge28e4982009-09-25 20:51:45 +000080 self.verbose = verbose
81 self.revision = revision
msb@chromium.orge28e4982009-09-25 20:51:45 +000082 self.deps_os = None
83 self.force = False
davemoore@chromium.org8bf27312010-02-19 17:29:44 +000084 self.reset = False
msb@chromium.orge28e4982009-09-25 20:51:45 +000085 self.nohooks = False
primiano@chromium.org5439ea52014-08-06 17:18:18 +000086 self.no_history = False
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +000087 self.upstream = False
iannucci@chromium.org53456aa2013-07-03 19:38:34 +000088 self.cache_dir = None
bauerb@chromium.org4dd09372011-07-22 14:41:51 +000089 self.merge = False
bratell@opera.com18fa4542013-05-21 13:30:46 +000090 self.jobs = 1
iannucci@chromium.org30a07982016-04-07 21:35:19 +000091 self.break_repo_locks = False
steveblock@chromium.org98e69452012-02-16 16:36:43 +000092 self.delete_unversioned_trees = False
Edward Lesmesc621b212018-03-21 20:26:56 -040093 self.patch_ref = None
94 self.patch_repo = None
95 self.rebase_patch_ref = True
Edward Lemurca7d8812018-07-24 17:42:45 +000096 self.reset_patch_ref = True
msb@chromium.orge28e4982009-09-25 20:51:45 +000097
98 sample_git_import = """blob
99mark :1
100data 6
101Hello
102
103blob
104mark :2
105data 4
106Bye
107
108reset refs/heads/master
109commit refs/heads/master
110mark :3
111author Bob <bob@example.com> 1253744361 -0700
112committer Bob <bob@example.com> 1253744361 -0700
113data 8
114A and B
115M 100644 :1 a
116M 100644 :2 b
117
118blob
119mark :4
120data 10
121Hello
122You
123
124blob
125mark :5
126data 8
127Bye
128You
129
130commit refs/heads/origin
131mark :6
132author Alice <alice@example.com> 1253744424 -0700
133committer Alice <alice@example.com> 1253744424 -0700
134data 13
135Personalized
136from :3
137M 100644 :4 a
138M 100644 :5 b
139
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000140blob
141mark :7
142data 5
143Mooh
144
145commit refs/heads/feature
146mark :8
147author Bob <bob@example.com> 1390311986 -0000
148committer Bob <bob@example.com> 1390311986 -0000
149data 6
150Add C
151from :3
152M 100644 :7 c
153
msb@chromium.orge28e4982009-09-25 20:51:45 +0000154reset refs/heads/master
155from :3
156"""
msb@chromium.orge28e4982009-09-25 20:51:45 +0000157 def Options(self, *args, **kwargs):
maruel@chromium.org8071c282010-09-20 19:44:19 +0000158 return self.OptionsObject(*args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000159
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000160 def checkstdout(self, expected):
161 value = sys.stdout.getvalue()
162 sys.stdout.close()
Erik Chene16ffff2019-10-14 20:35:53 +0000163 # Check that the expected output appears.
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800164 # pylint: disable=no-member
Erik Chene16ffff2019-10-14 20:35:53 +0000165 self.assertIn(expected, strip_timestamps(value))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000166
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +0000167 @staticmethod
168 def CreateGitRepo(git_import, path):
maruel@chromium.orgd5800f12009-11-12 20:03:43 +0000169 """Do it for real."""
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000170 try:
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000171 Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT,
maruel@chromium.org8ef5f542009-11-12 02:05:02 +0000172 cwd=path).communicate()
173 except OSError:
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000174 # git is not available, skip this test.
175 return False
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000176 Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE,
Edward Lemur979fa782019-08-13 22:44:05 +0000177 stderr=STDOUT, cwd=path).communicate(input=git_import.encode())
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000178 Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT,
179 cwd=path).communicate()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000180 Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE,
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000181 stderr=STDOUT, cwd=path).communicate()
182 Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE,
183 stderr=STDOUT, cwd=path).communicate()
John Budorick882c91e2018-07-12 22:11:41 +0000184 Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'],
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000185 stdout=PIPE, stderr=STDOUT, cwd=path).communicate()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000186 Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE,
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000187 stderr=STDOUT, cwd=path).communicate()
iannucci@chromium.org1e7187a2013-02-17 20:54:05 +0000188 Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE,
189 stderr=STDOUT, cwd=path).communicate()
190 Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE,
191 stderr=STDOUT, cwd=path).communicate()
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000192 return True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000193
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000194 def _GetAskForDataCallback(self, expected_prompt, return_value):
195 def AskForData(prompt, options):
Edward Lemur979fa782019-08-13 22:44:05 +0000196 self.assertEqual(prompt, expected_prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000197 return return_value
198 return AskForData
199
msb@chromium.orge28e4982009-09-25 20:51:45 +0000200 def setUp(self):
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000201 unittest.TestCase.setUp(self)
Edward Lemur9cafbf42019-08-15 22:03:35 +0000202 test_case_utils.TestCaseUtils.setUp(self)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000203 self.url = 'git://foo'
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000204 # The .git suffix allows gclient_scm to recognize the dir as a git repo
205 # when cloning it locally
206 self.root_dir = tempfile.mkdtemp('.git')
msb@chromium.orge28e4982009-09-25 20:51:45 +0000207 self.relpath = '.'
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000208 self.base_path = join(self.root_dir, self.relpath)
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000209 self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000210 self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists
Edward Lemur979fa782019-08-13 22:44:05 +0000211 mock.patch('gclient_scm.GitWrapper.BinaryExists',
212 staticmethod(lambda : True)).start()
213 mock.patch('sys.stdout', StringIO()).start()
214 self.addCleanup(mock.patch.stopall)
215 self.addCleanup(lambda: rmtree(self.root_dir))
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000216
msb@chromium.orge28e4982009-09-25 20:51:45 +0000217
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000218class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000219
220 def testRevertMissing(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000221 if not self.enabled:
222 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000223 options = self.Options()
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000224 file_path = join(self.base_path, 'a')
John Budorick0f7b2002018-01-19 15:46:17 -0800225 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
226 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000227 file_list = []
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000228 scm.update(options, None, file_list)
229 gclient_scm.os.remove(file_path)
230 file_list = []
msb@chromium.orge28e4982009-09-25 20:51:45 +0000231 scm.revert(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000232 self.assertEqual(file_list, [file_path])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000233 file_list = []
234 scm.diff(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000235 self.assertEqual(file_list, [])
szager@google.com85d3e3a2011-10-07 17:12:00 +0000236 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000237
238 def testRevertNone(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000239 if not self.enabled:
240 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000241 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800242 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
243 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000244 file_list = []
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000245 scm.update(options, None, file_list)
246 file_list = []
msb@chromium.orge28e4982009-09-25 20:51:45 +0000247 scm.revert(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000248 self.assertEqual(file_list, [])
249 self.assertEqual(scm.revinfo(options, self.args, None),
250 'a7142dc9f0009350b96a11f372b6ea658592aa95')
maruel@chromium.orgc6ca3a12012-06-20 14:46:02 +0000251 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000252
253 def testRevertModified(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000254 if not self.enabled:
255 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000256 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800257 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
258 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000259 file_list = []
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000260 scm.update(options, None, file_list)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000261 file_path = join(self.base_path, 'a')
Edward Lemur979fa782019-08-13 22:44:05 +0000262 with open(file_path, 'a') as f:
263 f.writelines('touched\n')
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000264 file_list = []
msb@chromium.orge28e4982009-09-25 20:51:45 +0000265 scm.revert(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000266 self.assertEqual(file_list, [file_path])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000267 file_list = []
268 scm.diff(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000269 self.assertEqual(file_list, [])
270 self.assertEqual(scm.revinfo(options, self.args, None),
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000271 'a7142dc9f0009350b96a11f372b6ea658592aa95')
szager@google.com85d3e3a2011-10-07 17:12:00 +0000272 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000273
274 def testRevertNew(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000275 if not self.enabled:
276 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000277 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800278 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
279 self.relpath)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000280 file_list = []
281 scm.update(options, None, file_list)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000282 file_path = join(self.base_path, 'c')
Edward Lemur979fa782019-08-13 22:44:05 +0000283 with open(file_path, 'w') as f:
284 f.writelines('new\n')
maruel@chromium.org8ef5f542009-11-12 02:05:02 +0000285 Popen(['git', 'add', 'c'], stdout=PIPE,
286 stderr=STDOUT, cwd=self.base_path).communicate()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000287 file_list = []
288 scm.revert(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000289 self.assertEqual(file_list, [file_path])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000290 file_list = []
291 scm.diff(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000292 self.assertEqual(file_list, [])
293 self.assertEqual(scm.revinfo(options, self.args, None),
294 'a7142dc9f0009350b96a11f372b6ea658592aa95')
szager@google.com85d3e3a2011-10-07 17:12:00 +0000295 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000296
297 def testStatusNew(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000298 if not self.enabled:
299 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000300 options = self.Options()
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000301 file_path = join(self.base_path, 'a')
Edward Lemur979fa782019-08-13 22:44:05 +0000302 with open(file_path, 'a') as f:
303 f.writelines('touched\n')
John Budorick0f7b2002018-01-19 15:46:17 -0800304 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
305 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000306 file_list = []
307 scm.status(options, self.args, file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000308 self.assertEqual(file_list, [file_path])
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000309 self.checkstdout(
Aaron Gablef4068aa2017-12-12 15:14:09 -0800310 ('\n________ running \'git -c core.quotePath=false diff --name-status '
Edward Lemur24146be2019-08-01 21:44:52 +0000311 '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\n') %
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000312 join(self.root_dir, '.'))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000313
314 def testStatus2New(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000315 if not self.enabled:
316 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000317 options = self.Options()
318 expected_file_list = []
319 for f in ['a', 'b']:
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +0000320 file_path = join(self.base_path, f)
Edward Lemur979fa782019-08-13 22:44:05 +0000321 with open(file_path, 'a') as f:
322 f.writelines('touched\n')
maruel@chromium.orgbf38a7e2010-12-14 18:15:54 +0000323 expected_file_list.extend([file_path])
John Budorick0f7b2002018-01-19 15:46:17 -0800324 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
325 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000326 file_list = []
327 scm.status(options, self.args, file_list)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000328 expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
Edward Lemur979fa782019-08-13 22:44:05 +0000329 self.assertEqual(sorted(file_list), expected_file_list)
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000330 self.checkstdout(
Aaron Gablef4068aa2017-12-12 15:14:09 -0800331 ('\n________ running \'git -c core.quotePath=false diff --name-status '
Edward Lemur24146be2019-08-01 21:44:52 +0000332 '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\nM\tb\n')
333 % join(self.root_dir, '.'))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000334
msb@chromium.orge28e4982009-09-25 20:51:45 +0000335 def testUpdateUpdate(self):
maruel@chromium.orgea6c2c52009-10-09 20:38:14 +0000336 if not self.enabled:
337 return
msb@chromium.orge28e4982009-09-25 20:51:45 +0000338 options = self.Options()
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000339 expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
John Budorick0f7b2002018-01-19 15:46:17 -0800340 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
341 self.relpath)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000342 file_list = []
343 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000344 self.assertEqual(file_list, expected_file_list)
345 self.assertEqual(scm.revinfo(options, (), None),
msb@chromium.orge28e4982009-09-25 20:51:45 +0000346 'a7142dc9f0009350b96a11f372b6ea658592aa95')
maruel@chromium.orgc6ca3a12012-06-20 14:46:02 +0000347 sys.stdout.close()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000348
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000349 def testUpdateMerge(self):
350 if not self.enabled:
351 return
352 options = self.Options()
353 options.merge = True
John Budorick0f7b2002018-01-19 15:46:17 -0800354 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
355 self.relpath)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000356 scm._Run(['checkout', '-q', 'feature'], options)
357 rev = scm.revinfo(options, (), None)
358 file_list = []
359 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000360 self.assertEqual(file_list, [join(self.base_path, x)
361 for x in ['a', 'b', 'c']])
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000362 # The actual commit that is created is unstable, so we verify its tree and
363 # parents instead.
Edward Lemur979fa782019-08-13 22:44:05 +0000364 self.assertEqual(scm._Capture(['rev-parse', 'HEAD:']),
365 'd2e35c10ac24d6c621e14a1fcadceb533155627d')
366 self.assertEqual(scm._Capture(['rev-parse', 'HEAD^1']), rev)
367 self.assertEqual(scm._Capture(['rev-parse', 'HEAD^2']),
368 scm._Capture(['rev-parse', 'origin/master']))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000369 sys.stdout.close()
370
371 def testUpdateRebase(self):
372 if not self.enabled:
373 return
374 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800375 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
376 self.relpath)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000377 scm._Run(['checkout', '-q', 'feature'], options)
378 file_list = []
379 # Fake a 'y' key press.
380 scm._AskForData = self._GetAskForDataCallback(
381 'Cannot fast-forward merge, attempt to rebase? '
382 '(y)es / (q)uit / (s)kip : ', 'y')
383 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000384 self.assertEqual(file_list, [join(self.base_path, x)
385 for x in ['a', 'b', 'c']])
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000386 # The actual commit that is created is unstable, so we verify its tree and
387 # parent instead.
Edward Lemur979fa782019-08-13 22:44:05 +0000388 self.assertEqual(scm._Capture(['rev-parse', 'HEAD:']),
389 'd2e35c10ac24d6c621e14a1fcadceb533155627d')
390 self.assertEqual(scm._Capture(['rev-parse', 'HEAD^']),
391 scm._Capture(['rev-parse', 'origin/master']))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000392 sys.stdout.close()
393
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000394 def testUpdateReset(self):
395 if not self.enabled:
396 return
397 options = self.Options()
398 options.reset = True
399
400 dir_path = join(self.base_path, 'c')
401 os.mkdir(dir_path)
Edward Lemur979fa782019-08-13 22:44:05 +0000402 with open(join(dir_path, 'nested'), 'w') as f:
403 f.writelines('new\n')
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000404
405 file_path = join(self.base_path, 'file')
Edward Lemur979fa782019-08-13 22:44:05 +0000406 with open(file_path, 'w') as f:
407 f.writelines('new\n')
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000408
John Budorick0f7b2002018-01-19 15:46:17 -0800409 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
410 self.relpath)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000411 file_list = []
412 scm.update(options, (), file_list)
413 self.assert_(gclient_scm.os.path.isdir(dir_path))
414 self.assert_(gclient_scm.os.path.isfile(file_path))
maruel@chromium.orgc6ca3a12012-06-20 14:46:02 +0000415 sys.stdout.close()
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000416
Edward Lemur579c9862018-07-13 23:17:51 +0000417 def testUpdateResetUnsetsFetchConfig(self):
418 if not self.enabled:
419 return
420 options = self.Options()
421 options.reset = True
422
423 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
424 self.relpath)
425 scm._Run(['config', 'remote.origin.fetch',
426 '+refs/heads/bad/ref:refs/remotes/origin/bad/ref'], options)
427
428 file_list = []
429 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000430 self.assertEqual(scm.revinfo(options, (), None),
431 '069c602044c5388d2d15c3f875b057c852003458')
Edward Lemur579c9862018-07-13 23:17:51 +0000432 sys.stdout.close()
433
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000434 def testUpdateResetDeleteUnversionedTrees(self):
435 if not self.enabled:
436 return
437 options = self.Options()
438 options.reset = True
439 options.delete_unversioned_trees = True
440
441 dir_path = join(self.base_path, 'dir')
442 os.mkdir(dir_path)
Edward Lemur979fa782019-08-13 22:44:05 +0000443 with open(join(dir_path, 'nested'), 'w') as f:
444 f.writelines('new\n')
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000445
446 file_path = join(self.base_path, 'file')
Edward Lemur979fa782019-08-13 22:44:05 +0000447 with open(file_path, 'w') as f:
448 f.writelines('new\n')
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000449
John Budorick0f7b2002018-01-19 15:46:17 -0800450 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
451 self.relpath)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000452 file_list = []
453 scm.update(options, (), file_list)
454 self.assert_(not gclient_scm.os.path.isdir(dir_path))
455 self.assert_(gclient_scm.os.path.isfile(file_path))
maruel@chromium.orgc6ca3a12012-06-20 14:46:02 +0000456 sys.stdout.close()
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000457
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000458 def testUpdateUnstagedConflict(self):
459 if not self.enabled:
460 return
461 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800462 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
463 self.relpath)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000464 file_path = join(self.base_path, 'b')
Edward Lemur979fa782019-08-13 22:44:05 +0000465 with open(file_path, 'w') as f:
466 f.writelines('conflict\n')
maruel@chromium.orgcdbecc42011-02-09 04:31:47 +0000467 try:
468 scm.update(options, (), [])
469 self.fail()
maruel@chromium.orgfae707b2011-09-15 18:57:58 +0000470 except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orgcdbecc42011-02-09 04:31:47 +0000471 # The exact exception text varies across git versions so it's not worth
472 # verifying it. It's fine as long as it throws.
473 pass
474 # Manually flush stdout since we can't verify it's content accurately across
475 # git versions.
476 sys.stdout.getvalue()
477 sys.stdout.close()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000478
Mike Stipicevice992b612016-12-02 15:32:55 -0800479 @unittest.skip('Skipping until crbug.com/670884 is resolved.')
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000480 def testUpdateLocked(self):
481 if not self.enabled:
482 return
483 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800484 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
485 self.relpath)
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000486 file_path = join(self.base_path, '.git', 'index.lock')
487 with open(file_path, 'w'):
488 pass
Robert Iannucci53f35552016-12-15 19:09:16 -0800489 with self.assertRaises(subprocess2.CalledProcessError):
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000490 scm.update(options, (), [])
491 sys.stdout.close()
492
493 def testUpdateLockedBreak(self):
494 if not self.enabled:
495 return
496 options = self.Options()
497 options.break_repo_locks = True
John Budorick0f7b2002018-01-19 15:46:17 -0800498 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
499 self.relpath)
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000500 file_path = join(self.base_path, '.git', 'index.lock')
501 with open(file_path, 'w'):
502 pass
503 scm.update(options, (), [])
504 self.assertRegexpMatches(sys.stdout.getvalue(),
Raul Tambrea79f0e52019-09-21 07:27:39 +0000505 r'breaking lock.*\.git[/|\\]index\.lock')
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000506 self.assertFalse(os.path.exists(file_path))
507 sys.stdout.close()
508
msb@chromium.org5bde4852009-12-14 16:47:12 +0000509 def testUpdateConflict(self):
510 if not self.enabled:
511 return
512 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800513 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
514 self.relpath)
maruel@chromium.org795a8c12010-10-05 19:54:29 +0000515 file_path = join(self.base_path, 'b')
Edward Lemur979fa782019-08-13 22:44:05 +0000516 with open(file_path, 'w') as f:
517 f.writelines('conflict\n')
maruel@chromium.org389d6de2010-09-09 14:14:37 +0000518 scm._Run(['commit', '-am', 'test'], options)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000519 scm._AskForData = self._GetAskForDataCallback(
520 'Cannot fast-forward merge, attempt to rebase? '
521 '(y)es / (q)uit / (s)kip : ', 'y')
Edward Lemur979fa782019-08-13 22:44:05 +0000522
523 with self.assertRaises(gclient_scm.gclient_utils.Error) as e:
524 scm.update(options, (), [])
525 self.assertEqual(
526 e.exception.args[0],
527 'Conflict while rebasing this branch.\n'
528 'Fix the conflict and run gclient again.\n'
529 'See \'man git-rebase\' for details.\n')
530
531 with self.assertRaises(gclient_scm.gclient_utils.Error) as e:
532 scm.update(options, (), [])
533 self.assertEqual(
534 e.exception.args[0],
535 '\n____ . at refs/remotes/origin/master\n'
536 '\tYou have unstaged changes.\n'
537 '\tPlease commit, stash, or reset.\n')
538
maruel@chromium.orgcb2985f2010-11-03 14:08:31 +0000539 sys.stdout.close()
msb@chromium.org5bde4852009-12-14 16:47:12 +0000540
msb@chromium.org0f282062009-11-06 20:14:02 +0000541 def testRevinfo(self):
542 if not self.enabled:
543 return
544 options = self.Options()
John Budorick0f7b2002018-01-19 15:46:17 -0800545 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
546 self.relpath)
msb@chromium.org0f282062009-11-06 20:14:02 +0000547 rev_info = scm.revinfo(options, (), None)
Edward Lemur979fa782019-08-13 22:44:05 +0000548 self.assertEqual(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
msb@chromium.org0f282062009-11-06 20:14:02 +0000549
John Budorick21a51b32018-09-19 19:39:20 +0000550 def testMirrorPushUrl(self):
551 if not self.enabled:
552 return
553 fakes = fake_repos.FakeRepos()
554 fakes.set_up_git()
555 self.url = fakes.git_base + 'repo_1'
556 self.root_dir = fakes.root_dir
557 self.addCleanup(fake_repos.FakeRepos.tear_down_git, fakes)
558
559 mirror = tempfile.mkdtemp()
560 self.addCleanup(rmtree, mirror)
561
562 # This should never happen, but if it does, it'd render the other assertions
563 # in this test meaningless.
564 self.assertFalse(self.url.startswith(mirror))
565
566 git_cache.Mirror.SetCachePath(mirror)
567 self.addCleanup(git_cache.Mirror.SetCachePath, None)
568
569 options = self.Options()
570 scm = gclient_scm.GitWrapper(self.url, self.root_dir, self.relpath)
571 self.assertIsNotNone(scm._GetMirror(self.url, options))
572 scm.update(options, (), [])
573
574 fetch_url = scm._Capture(['remote', 'get-url', 'origin'])
575 self.assertTrue(
576 fetch_url.startswith(mirror),
577 msg='\n'.join([
578 'Repository fetch url should be in the git cache mirror directory.',
579 ' fetch_url: %s' % fetch_url,
580 ' mirror: %s' % mirror]))
581 push_url = scm._Capture(['remote', 'get-url', '--push', 'origin'])
Edward Lemur979fa782019-08-13 22:44:05 +0000582 self.assertEqual(push_url, self.url)
John Budorick21a51b32018-09-19 19:39:20 +0000583 sys.stdout.close()
584
msb@chromium.orge28e4982009-09-25 20:51:45 +0000585
Edward Lemur979fa782019-08-13 22:44:05 +0000586class ManagedGitWrapperTestCaseMock(unittest.TestCase):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000587 class OptionsObject(object):
588 def __init__(self, verbose=False, revision=None, force=False):
589 self.verbose = verbose
590 self.revision = revision
591 self.deps_os = None
592 self.force = force
593 self.reset = False
594 self.nohooks = False
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000595 self.break_repo_locks = False
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000596 # TODO(maruel): Test --jobs > 1.
597 self.jobs = 1
Edward Lesmesc621b212018-03-21 20:26:56 -0400598 self.patch_ref = None
599 self.patch_repo = None
600 self.rebase_patch_ref = True
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000601
602 def Options(self, *args, **kwargs):
603 return self.OptionsObject(*args, **kwargs)
604
borenet@google.comb09097a2014-04-09 19:09:08 +0000605 def checkstdout(self, expected):
606 value = sys.stdout.getvalue()
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000607 sys.stdout.close()
Erik Chene16ffff2019-10-14 20:35:53 +0000608 # Check that the expected output appears.
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800609 # pylint: disable=no-member
Erik Chene16ffff2019-10-14 20:35:53 +0000610 self.assertIn(expected, strip_timestamps(value))
borenet@google.comb09097a2014-04-09 19:09:08 +0000611
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000612 def setUp(self):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000613 self.fake_hash_1 = 't0ta11yf4k3'
614 self.fake_hash_2 = '3v3nf4k3r'
615 self.url = 'git://foo'
maruel@chromium.org97170132013-05-08 14:58:34 +0000616 self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000617 self.relpath = 'fake'
618 self.base_path = os.path.join(self.root_dir, self.relpath)
primiano@chromium.org1c127382015-02-17 11:15:40 +0000619 self.backup_base_path = os.path.join(self.root_dir,
620 'old_%s.git' % self.relpath)
Edward Lemur979fa782019-08-13 22:44:05 +0000621 mock.patch('gclient_scm.scm.GIT.ApplyEnvVars').start()
622 mock.patch('gclient_scm.GitWrapper._CheckMinVersion').start()
623 mock.patch('gclient_scm.GitWrapper._Fetch').start()
624 mock.patch('gclient_scm.GitWrapper._DeleteOrMove').start()
625 mock.patch('sys.stdout', StringIO()).start()
626 self.addCleanup(mock.patch.stopall)
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000627
Edward Lemur979fa782019-08-13 22:44:05 +0000628 @mock.patch('scm.GIT.IsValidRevision')
629 @mock.patch('os.path.isdir', lambda _: True)
630 def testGetUsableRevGit(self, mockIsValidRevision):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800631 # pylint: disable=no-member
smutae7ea312016-07-18 11:59:41 -0700632 options = self.Options(verbose=True)
633
Edward Lemur979fa782019-08-13 22:44:05 +0000634 mockIsValidRevision.side_effect = lambda cwd, rev: rev != '1'
smutae7ea312016-07-18 11:59:41 -0700635
John Budorick0f7b2002018-01-19 15:46:17 -0800636 git_scm = gclient_scm.GitWrapper(self.url, self.root_dir,
637 self.relpath)
smutae7ea312016-07-18 11:59:41 -0700638 # A [fake] git sha1 with a git repo should work (this is in the case that
639 # the LKGR gets flipped to git sha1's some day).
Edward Lemur979fa782019-08-13 22:44:05 +0000640 self.assertEqual(git_scm.GetUsableRev(self.fake_hash_1, options),
641 self.fake_hash_1)
smutae7ea312016-07-18 11:59:41 -0700642 # An SVN rev with an existing purely git repo should raise an exception.
643 self.assertRaises(gclient_scm.gclient_utils.Error,
644 git_scm.GetUsableRev, '1', options)
645
Edward Lemur979fa782019-08-13 22:44:05 +0000646 @mock.patch('gclient_scm.GitWrapper._Clone')
647 @mock.patch('os.path.isdir')
648 @mock.patch('os.path.exists')
649 @mock.patch('subprocess2.check_output')
650 def testUpdateNoDotGit(
651 self, mockCheckOutput, mockExists, mockIsdir, mockClone):
652 mockIsdir.side_effect = lambda path: path == self.base_path
653 mockExists.side_effect = lambda path: path == self.base_path
654 mockCheckOutput.return_value = b''
655
borenet@google.comb09097a2014-04-09 19:09:08 +0000656 options = self.Options()
Edward Lemur979fa782019-08-13 22:44:05 +0000657 scm = gclient_scm.GitWrapper(
658 self.url, self.root_dir, self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +0000659 scm.update(options, None, [])
Edward Lemur979fa782019-08-13 22:44:05 +0000660
661 env = gclient_scm.scm.GIT.ApplyEnvVars({})
662 self.assertEqual(
663 mockCheckOutput.mock_calls,
664 [
665 mock.call(
666 ['git', '-c', 'core.quotePath=false', 'ls-files'],
667 cwd=self.base_path, env=env, stderr=-1),
668 mock.call(
669 ['git', 'rev-parse', '--verify', 'HEAD'],
670 cwd=self.base_path, env=env, stderr=-1),
671 ])
672 mockClone.assert_called_with(
673 'refs/remotes/origin/master', self.url, options)
borenet@google.comb09097a2014-04-09 19:09:08 +0000674 self.checkstdout('\n')
675
Edward Lemur979fa782019-08-13 22:44:05 +0000676 @mock.patch('gclient_scm.GitWrapper._Clone')
677 @mock.patch('os.path.isdir')
678 @mock.patch('os.path.exists')
679 @mock.patch('subprocess2.check_output')
680 def testUpdateConflict(
681 self, mockCheckOutput, mockExists, mockIsdir, mockClone):
682 mockIsdir.side_effect = lambda path: path == self.base_path
683 mockExists.side_effect = lambda path: path == self.base_path
684 mockCheckOutput.return_value = b''
685 mockClone.side_effect = [
686 gclient_scm.subprocess2.CalledProcessError(
687 None, None, None, None, None),
688 None,
689 ]
690
borenet@google.com90fe58b2014-05-01 18:22:00 +0000691 options = self.Options()
Edward Lemur979fa782019-08-13 22:44:05 +0000692 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
John Budorick0f7b2002018-01-19 15:46:17 -0800693 self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +0000694 scm.update(options, None, [])
Edward Lemur979fa782019-08-13 22:44:05 +0000695
696 env = gclient_scm.scm.GIT.ApplyEnvVars({})
697 self.assertEqual(
698 mockCheckOutput.mock_calls,
699 [
700 mock.call(
701 ['git', '-c', 'core.quotePath=false', 'ls-files'],
702 cwd=self.base_path, env=env, stderr=-1),
703 mock.call(
704 ['git', 'rev-parse', '--verify', 'HEAD'],
705 cwd=self.base_path, env=env, stderr=-1),
706 ])
707 mockClone.assert_called_with(
708 'refs/remotes/origin/master', self.url, options)
borenet@google.comb09097a2014-04-09 19:09:08 +0000709 self.checkstdout('\n')
710
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000711
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000712class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase):
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000713 def checkInStdout(self, expected):
714 value = sys.stdout.getvalue()
715 sys.stdout.close()
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800716 # pylint: disable=no-member
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000717 self.assertIn(expected, value)
718
719 def checkNotInStdout(self, expected):
720 value = sys.stdout.getvalue()
721 sys.stdout.close()
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800722 # pylint: disable=no-member
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000723 self.assertNotIn(expected, value)
724
smut@google.com27c9c8a2014-09-11 19:57:55 +0000725 def getCurrentBranch(self):
726 # Returns name of current branch or HEAD for detached HEAD
727 branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'],
728 cwd=self.base_path)
729 if branch == 'HEAD':
730 return None
731 return branch
732
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000733 def testUpdateClone(self):
734 if not self.enabled:
735 return
736 options = self.Options()
737
738 origin_root_dir = self.root_dir
739 self.root_dir = tempfile.mkdtemp()
740 self.relpath = '.'
741 self.base_path = join(self.root_dir, self.relpath)
742
John Budorick0f7b2002018-01-19 15:46:17 -0800743 scm = gclient_scm.GitWrapper(origin_root_dir,
744 self.root_dir,
745 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000746
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000747 expected_file_list = [join(self.base_path, "a"),
748 join(self.base_path, "b")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000749 file_list = []
750 options.revision = 'unmanaged'
751 scm.update(options, (), file_list)
752
Edward Lemur979fa782019-08-13 22:44:05 +0000753 self.assertEqual(file_list, expected_file_list)
754 self.assertEqual(scm.revinfo(options, (), None),
755 '069c602044c5388d2d15c3f875b057c852003458')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000756 # indicates detached HEAD
Edward Lemur979fa782019-08-13 22:44:05 +0000757 self.assertEqual(self.getCurrentBranch(), None)
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000758 self.checkInStdout(
759 'Checked out refs/remotes/origin/master to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000760
761 rmtree(origin_root_dir)
762
763 def testUpdateCloneOnCommit(self):
764 if not self.enabled:
765 return
766 options = self.Options()
767
768 origin_root_dir = self.root_dir
769 self.root_dir = tempfile.mkdtemp()
770 self.relpath = '.'
771 self.base_path = join(self.root_dir, self.relpath)
772 url_with_commit_ref = origin_root_dir +\
773 '@a7142dc9f0009350b96a11f372b6ea658592aa95'
774
John Budorick0f7b2002018-01-19 15:46:17 -0800775 scm = gclient_scm.GitWrapper(url_with_commit_ref,
776 self.root_dir,
777 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000778
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000779 expected_file_list = [join(self.base_path, "a"),
780 join(self.base_path, "b")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000781 file_list = []
782 options.revision = 'unmanaged'
783 scm.update(options, (), file_list)
784
Edward Lemur979fa782019-08-13 22:44:05 +0000785 self.assertEqual(file_list, expected_file_list)
786 self.assertEqual(scm.revinfo(options, (), None),
787 'a7142dc9f0009350b96a11f372b6ea658592aa95')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000788 # indicates detached HEAD
Edward Lemur979fa782019-08-13 22:44:05 +0000789 self.assertEqual(self.getCurrentBranch(), None)
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000790 self.checkInStdout(
791 'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000792
793 rmtree(origin_root_dir)
794
795 def testUpdateCloneOnBranch(self):
796 if not self.enabled:
797 return
798 options = self.Options()
799
800 origin_root_dir = self.root_dir
801 self.root_dir = tempfile.mkdtemp()
802 self.relpath = '.'
803 self.base_path = join(self.root_dir, self.relpath)
804 url_with_branch_ref = origin_root_dir + '@feature'
805
John Budorick0f7b2002018-01-19 15:46:17 -0800806 scm = gclient_scm.GitWrapper(url_with_branch_ref,
807 self.root_dir,
808 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000809
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000810 expected_file_list = [join(self.base_path, "a"),
811 join(self.base_path, "b"),
John Budorick882c91e2018-07-12 22:11:41 +0000812 join(self.base_path, "c")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000813 file_list = []
814 options.revision = 'unmanaged'
815 scm.update(options, (), file_list)
816
Edward Lemur979fa782019-08-13 22:44:05 +0000817 self.assertEqual(file_list, expected_file_list)
818 self.assertEqual(scm.revinfo(options, (), None),
819 '9a51244740b25fa2ded5252ca00a3178d3f665a9')
Paweł Hajdan, Jr63b8c2a2017-09-05 17:59:08 +0200820 # indicates detached HEAD
Edward Lemur979fa782019-08-13 22:44:05 +0000821 self.assertEqual(self.getCurrentBranch(), None)
Paweł Hajdan, Jr63b8c2a2017-09-05 17:59:08 +0200822 self.checkInStdout(
John Budorick882c91e2018-07-12 22:11:41 +0000823 'Checked out 9a51244740b25fa2ded5252ca00a3178d3f665a9 '
Paweł Hajdan, Jr63b8c2a2017-09-05 17:59:08 +0200824 'to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000825
826 rmtree(origin_root_dir)
827
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000828 def testUpdateCloneOnFetchedRemoteBranch(self):
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000829 if not self.enabled:
830 return
831 options = self.Options()
832
833 origin_root_dir = self.root_dir
834 self.root_dir = tempfile.mkdtemp()
835 self.relpath = '.'
836 self.base_path = join(self.root_dir, self.relpath)
837 url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature'
838
John Budorick0f7b2002018-01-19 15:46:17 -0800839 scm = gclient_scm.GitWrapper(url_with_branch_ref,
840 self.root_dir,
841 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000842
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000843 expected_file_list = [join(self.base_path, "a"),
844 join(self.base_path, "b"),
John Budorick882c91e2018-07-12 22:11:41 +0000845 join(self.base_path, "c")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000846 file_list = []
847 options.revision = 'unmanaged'
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000848 scm.update(options, (), file_list)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000849
Edward Lemur979fa782019-08-13 22:44:05 +0000850 self.assertEqual(file_list, expected_file_list)
851 self.assertEqual(scm.revinfo(options, (), None),
852 '9a51244740b25fa2ded5252ca00a3178d3f665a9')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000853 # indicates detached HEAD
Edward Lemur979fa782019-08-13 22:44:05 +0000854 self.assertEqual(self.getCurrentBranch(), None)
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000855 self.checkInStdout(
856 'Checked out refs/remotes/origin/feature to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000857
858 rmtree(origin_root_dir)
859
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000860 def testUpdateCloneOnTrueRemoteBranch(self):
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000861 if not self.enabled:
862 return
863 options = self.Options()
864
865 origin_root_dir = self.root_dir
866 self.root_dir = tempfile.mkdtemp()
867 self.relpath = '.'
868 self.base_path = join(self.root_dir, self.relpath)
869 url_with_branch_ref = origin_root_dir + '@refs/heads/feature'
870
John Budorick0f7b2002018-01-19 15:46:17 -0800871 scm = gclient_scm.GitWrapper(url_with_branch_ref,
872 self.root_dir,
873 self.relpath)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000874
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000875 expected_file_list = [join(self.base_path, "a"),
876 join(self.base_path, "b"),
John Budorick882c91e2018-07-12 22:11:41 +0000877 join(self.base_path, "c")]
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000878 file_list = []
879 options.revision = 'unmanaged'
880 scm.update(options, (), file_list)
881
Edward Lemur979fa782019-08-13 22:44:05 +0000882 self.assertEqual(file_list, expected_file_list)
883 self.assertEqual(scm.revinfo(options, (), None),
884 '9a51244740b25fa2ded5252ca00a3178d3f665a9')
John Budorick882c91e2018-07-12 22:11:41 +0000885 # @refs/heads/feature is AKA @refs/remotes/origin/feature in the clone, so
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000886 # should be treated as such by gclient.
887 # TODO(mmoss): Though really, we should only allow DEPS to specify branches
888 # as they are known in the upstream repo, since the mapping into the local
889 # repo can be modified by users (or we might even want to change the gclient
890 # defaults at some point). But that will take more work to stop using
891 # refs/remotes/ everywhere that we do (and to stop assuming a DEPS ref will
892 # always resolve locally, like when passing them to show-ref or rev-list).
Edward Lemur979fa782019-08-13 22:44:05 +0000893 self.assertEqual(self.getCurrentBranch(), None)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000894 self.checkInStdout(
895 'Checked out refs/remotes/origin/feature to a detached HEAD')
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000896
897 rmtree(origin_root_dir)
898
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000899 def testUpdateUpdate(self):
900 if not self.enabled:
901 return
902 options = self.Options()
903 expected_file_list = []
John Budorick0f7b2002018-01-19 15:46:17 -0800904 scm = gclient_scm.GitWrapper(self.url, self.root_dir,
905 self.relpath)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000906 file_list = []
907 options.revision = 'unmanaged'
908 scm.update(options, (), file_list)
Edward Lemur979fa782019-08-13 22:44:05 +0000909 self.assertEqual(file_list, expected_file_list)
910 self.assertEqual(scm.revinfo(options, (), None),
911 '069c602044c5388d2d15c3f875b057c852003458')
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000912 self.checkstdout('________ unmanaged solution; skipping .\n')
913
914
Edward Lemur979fa782019-08-13 22:44:05 +0000915class CipdWrapperTestCase(unittest.TestCase):
John Budorick0f7b2002018-01-19 15:46:17 -0800916
917 def setUp(self):
918 # Create this before setting up mocks.
919 self._cipd_root_dir = tempfile.mkdtemp()
920 self._workdir = tempfile.mkdtemp()
John Budorick0f7b2002018-01-19 15:46:17 -0800921
922 self._cipd_instance_url = 'https://chrome-infra-packages.appspot.com'
923 self._cipd_root = gclient_scm.CipdRoot(
924 self._cipd_root_dir,
925 self._cipd_instance_url)
926 self._cipd_packages = [
927 self._cipd_root.add_package('f', 'foo_package', 'foo_version'),
928 self._cipd_root.add_package('b', 'bar_package', 'bar_version'),
929 self._cipd_root.add_package('b', 'baz_package', 'baz_version'),
930 ]
Edward Lemur979fa782019-08-13 22:44:05 +0000931 mock.patch('tempfile.mkdtemp', lambda: self._workdir).start()
932 mock.patch('gclient_scm.CipdRoot.add_package').start()
933 mock.patch('gclient_scm.CipdRoot.clobber').start()
934 mock.patch('gclient_scm.CipdRoot.ensure').start()
935 self.addCleanup(mock.patch.stopall)
John Budorick0f7b2002018-01-19 15:46:17 -0800936
937 def tearDown(self):
John Budorick0f7b2002018-01-19 15:46:17 -0800938 rmtree(self._cipd_root_dir)
939 rmtree(self._workdir)
940
941 def createScmWithPackageThatSatisfies(self, condition):
942 return gclient_scm.CipdWrapper(
943 url=self._cipd_instance_url,
944 root_dir=self._cipd_root_dir,
945 relpath='fake_relpath',
946 root=self._cipd_root,
947 package=self.getPackageThatSatisfies(condition))
948
949 def getPackageThatSatisfies(self, condition):
950 for p in self._cipd_packages:
951 if condition(p):
952 return p
953
954 self.fail('Unable to find a satisfactory package.')
955
John Budorick0f7b2002018-01-19 15:46:17 -0800956 def testRevert(self):
John Budorickd3ba72b2018-03-20 12:27:42 -0700957 """Checks that revert does nothing."""
Edward Lemur979fa782019-08-13 22:44:05 +0000958 scm = self.createScmWithPackageThatSatisfies(lambda _: True)
John Budorick0f7b2002018-01-19 15:46:17 -0800959 scm.revert(None, (), [])
960
Edward Lemur979fa782019-08-13 22:44:05 +0000961 @mock.patch('gclient_scm.gclient_utils.CheckCallAndFilter')
962 @mock.patch('gclient_scm.gclient_utils.rmtree')
963 def testRevinfo(self, mockRmtree, mockCheckCallAndFilter):
John Budorick0f7b2002018-01-19 15:46:17 -0800964 """Checks that revinfo uses the JSON from cipd describe."""
965 scm = self.createScmWithPackageThatSatisfies(lambda _: True)
966
967 expected_revinfo = '0123456789abcdef0123456789abcdef01234567'
968 json_contents = {
969 'result': {
970 'pin': {
971 'instance_id': expected_revinfo,
972 }
973 }
974 }
975 describe_json_path = join(self._workdir, 'describe.json')
976 with open(describe_json_path, 'w') as describe_json:
977 json.dump(json_contents, describe_json)
978
Edward Lemur979fa782019-08-13 22:44:05 +0000979 revinfo = scm.revinfo(None, (), [])
980 self.assertEqual(revinfo, expected_revinfo)
981
982 mockRmtree.assert_called_with(self._workdir)
983 mockCheckCallAndFilter.assert_called_with([
John Budorick0f7b2002018-01-19 15:46:17 -0800984 'cipd', 'describe', 'foo_package',
985 '-log-level', 'error',
986 '-version', 'foo_version',
987 '-json-output', describe_json_path,
Edward Lemur979fa782019-08-13 22:44:05 +0000988 ])
John Budorick0f7b2002018-01-19 15:46:17 -0800989
990 def testUpdate(self):
John Budorickd3ba72b2018-03-20 12:27:42 -0700991 """Checks that update does nothing."""
Edward Lemur979fa782019-08-13 22:44:05 +0000992 scm = self.createScmWithPackageThatSatisfies(lambda _: True)
John Budorick0f7b2002018-01-19 15:46:17 -0800993 scm.update(None, (), [])
994
995
Edward Lemurd64781e2018-07-11 23:09:55 +0000996class GerritChangesFakeRepo(fake_repos.FakeReposBase):
997 def populateGit(self):
998 # Creates a tree that looks like this:
999 #
Edward Lemurca7d8812018-07-24 17:42:45 +00001000 # 6 refs/changes/35/1235/1
1001 # |
1002 # 5 refs/changes/34/1234/1
1003 # |
Edward Lemurd64781e2018-07-11 23:09:55 +00001004 # 1--2--3--4 refs/heads/master
Edward Lemurca7d8812018-07-24 17:42:45 +00001005 # | |
1006 # | 11(5)--12 refs/heads/master-with-5
1007 # |
1008 # 7--8--9 refs/heads/feature
1009 # |
1010 # 10 refs/changes/36/1236/1
1011 #
Edward Lemurd64781e2018-07-11 23:09:55 +00001012
1013 self._commit_git('repo_1', {'commit 1': 'touched'})
1014 self._commit_git('repo_1', {'commit 2': 'touched'})
1015 self._commit_git('repo_1', {'commit 3': 'touched'})
1016 self._commit_git('repo_1', {'commit 4': 'touched'})
1017 self._create_ref('repo_1', 'refs/heads/master', 4)
1018
1019 # Create a change on top of commit 3 that consists of two commits.
1020 self._commit_git('repo_1',
1021 {'commit 5': 'touched',
1022 'change': '1234'},
1023 base=3)
1024 self._create_ref('repo_1', 'refs/changes/34/1234/1', 5)
1025 self._commit_git('repo_1',
1026 {'commit 6': 'touched',
1027 'change': '1235'})
1028 self._create_ref('repo_1', 'refs/changes/35/1235/1', 6)
1029
Edward Lemurca7d8812018-07-24 17:42:45 +00001030 # Create a refs/heads/feature branch on top of commit 2, consisting of three
1031 # commits.
1032 self._commit_git('repo_1', {'commit 7': 'touched'}, base=2)
1033 self._commit_git('repo_1', {'commit 8': 'touched'})
1034 self._commit_git('repo_1', {'commit 9': 'touched'})
1035 self._create_ref('repo_1', 'refs/heads/feature', 9)
1036
1037 # Create a change of top of commit 8.
1038 self._commit_git('repo_1',
1039 {'commit 10': 'touched',
1040 'change': '1236'},
1041 base=8)
1042 self._create_ref('repo_1', 'refs/changes/36/1236/1', 10)
1043
1044 # Create a refs/heads/master-with-5 on top of commit 3 which is a branch
1045 # where refs/changes/34/1234/1 (commit 5) has already landed as commit 11.
1046 self._commit_git('repo_1',
1047 # This is really commit 11, but has the changes of commit 5
1048 {'commit 5': 'touched',
1049 'change': '1234'},
1050 base=3)
1051 self._commit_git('repo_1', {'commit 12': 'touched'})
1052 self._create_ref('repo_1', 'refs/heads/master-with-5', 12)
1053
Edward Lemurd64781e2018-07-11 23:09:55 +00001054
1055class GerritChangesTest(fake_repos.FakeReposTestBase):
1056 FAKE_REPOS_CLASS = GerritChangesFakeRepo
1057
1058 def setUp(self):
1059 super(GerritChangesTest, self).setUp()
1060 self.enabled = self.FAKE_REPOS.set_up_git()
1061 self.options = BaseGitWrapperTestCase.OptionsObject()
1062 self.url = self.git_base + 'repo_1'
1063 self.mirror = None
1064
1065 def setUpMirror(self):
1066 self.mirror = tempfile.mkdtemp()
1067 git_cache.Mirror.SetCachePath(self.mirror)
1068 self.addCleanup(rmtree, self.mirror)
1069 self.addCleanup(git_cache.Mirror.SetCachePath, None)
1070
Edward Lemurca7d8812018-07-24 17:42:45 +00001071 def assertCommits(self, commits):
1072 """Check that all, and only |commits| are present in the current checkout.
1073 """
1074 for i in commits:
1075 name = os.path.join(self.root_dir, 'commit ' + str(i))
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001076 self.assertTrue(os.path.exists(name), 'Commit not found: %s' % name)
Edward Lemurca7d8812018-07-24 17:42:45 +00001077
1078 all_commits = set(range(1, len(self.FAKE_REPOS.git_hashes['repo_1'])))
1079 for i in all_commits - set(commits):
1080 name = os.path.join(self.root_dir, 'commit ' + str(i))
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001081 self.assertFalse(os.path.exists(name), 'Unexpected commit: %s' % name)
Edward Lemurca7d8812018-07-24 17:42:45 +00001082
Edward Lemurd64781e2018-07-11 23:09:55 +00001083 def testCanCloneGerritChange(self):
1084 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1085 file_list = []
1086
1087 self.options.revision = 'refs/changes/35/1235/1'
1088 scm.update(self.options, None, file_list)
1089 self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir))
1090
1091 def testCanSyncToGerritChange(self):
1092 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1093 file_list = []
1094
1095 self.options.revision = self.githash('repo_1', 1)
1096 scm.update(self.options, None, file_list)
1097 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1098
1099 self.options.revision = 'refs/changes/35/1235/1'
1100 scm.update(self.options, None, file_list)
1101 self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir))
1102
1103 def testCanCloneGerritChangeMirror(self):
1104 self.setUpMirror()
1105 self.testCanCloneGerritChange()
1106
1107 def testCanSyncToGerritChangeMirror(self):
1108 self.setUpMirror()
1109 self.testCanSyncToGerritChange()
1110
Edward Lemurca7d8812018-07-24 17:42:45 +00001111 def testAppliesPatchOnTopOfMasterByDefault(self):
1112 """Test the default case, where we apply a patch on top of master."""
1113 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1114 file_list = []
1115
1116 # Make sure we don't specify a revision.
1117 self.options.revision = None
1118 scm.update(self.options, None, file_list)
1119 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1120
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001121 scm.apply_patch_ref(
1122 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1123 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001124
1125 self.assertCommits([1, 2, 3, 4, 5, 6])
1126 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1127
1128 def testCheckoutOlderThanPatchBase(self):
1129 """Test applying a patch on an old checkout.
1130
1131 We first checkout commit 1, and try to patch refs/changes/35/1235/1, which
1132 contains commits 5 and 6, and is based on top of commit 3.
1133 The final result should contain commits 1, 5 and 6, but not commits 2 or 3.
1134 """
1135 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1136 file_list = []
1137
1138 # Sync to commit 1
1139 self.options.revision = self.githash('repo_1', 1)
1140 scm.update(self.options, None, file_list)
1141 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1142
1143 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001144 scm.apply_patch_ref(
1145 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1146 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001147
1148 self.assertCommits([1, 5, 6])
1149 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1150
1151 def testCheckoutOriginFeature(self):
1152 """Tests that we can apply a patch on a branch other than master."""
1153 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1154 file_list = []
1155
Edward Lemur8c665652019-05-08 20:23:33 +00001156 # Sync to remote's refs/heads/feature
1157 self.options.revision = 'refs/heads/feature'
Edward Lemurca7d8812018-07-24 17:42:45 +00001158 scm.update(self.options, None, file_list)
1159 self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
1160
1161 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001162 scm.apply_patch_ref(
1163 self.url, 'refs/changes/36/1236/1', 'refs/heads/feature', self.options,
1164 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001165
1166 self.assertCommits([1, 2, 7, 8, 9, 10])
1167 self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
1168
1169 def testCheckoutOriginFeatureOnOldRevision(self):
1170 """Tests that we can apply a patch on an old checkout, on a branch other
1171 than master."""
1172 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1173 file_list = []
1174
Edward Lemur8c665652019-05-08 20:23:33 +00001175 # Sync to remote's refs/heads/feature on an old revision
Edward Lemurca7d8812018-07-24 17:42:45 +00001176 self.options.revision = self.githash('repo_1', 7)
1177 scm.update(self.options, None, file_list)
1178 self.assertEqual(self.githash('repo_1', 7), self.gitrevparse(self.root_dir))
1179
1180 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001181 scm.apply_patch_ref(
1182 self.url, 'refs/changes/36/1236/1', 'refs/heads/feature', self.options,
1183 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001184
1185 # We shouldn't have rebased on top of 2 (which is the merge base between
Edward Lemur8c665652019-05-08 20:23:33 +00001186 # remote's master branch and the change) but on top of 7 (which is the
1187 # merge base between remote's feature branch and the change).
Edward Lemurca7d8812018-07-24 17:42:45 +00001188 self.assertCommits([1, 2, 7, 10])
1189 self.assertEqual(self.githash('repo_1', 7), self.gitrevparse(self.root_dir))
1190
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001191 def testCheckoutOriginFeaturePatchBranch(self):
1192 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1193 file_list = []
1194
Edward Lemur8c665652019-05-08 20:23:33 +00001195 # Sync to the hash instead of remote's refs/heads/feature.
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001196 self.options.revision = self.githash('repo_1', 9)
1197 scm.update(self.options, None, file_list)
1198 self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
1199
Edward Lemur8c665652019-05-08 20:23:33 +00001200 # Apply refs/changes/34/1234/1, created for remote's master branch on top of
1201 # remote's feature branch.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001202 scm.apply_patch_ref(
1203 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1204 file_list)
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001205
1206 # 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 +00001207 # part of remote's feature branch.
Edward Lemur6a4e31b2018-08-10 19:59:02 +00001208 self.assertCommits([1, 2, 5, 6, 7, 8, 9])
1209 self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir))
Edward Lemurca7d8812018-07-24 17:42:45 +00001210
1211 def testDoesntRebasePatchMaster(self):
1212 """Tests that we can apply a patch without rebasing it.
1213 """
1214 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1215 file_list = []
1216
1217 self.options.rebase_patch_ref = False
1218 scm.update(self.options, None, file_list)
1219 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1220
1221 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001222 scm.apply_patch_ref(
1223 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1224 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001225
1226 self.assertCommits([1, 2, 3, 5, 6])
1227 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1228
1229 def testDoesntRebasePatchOldCheckout(self):
1230 """Tests that we can apply a patch without rebasing it on an old checkout.
1231 """
1232 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1233 file_list = []
1234
1235 # Sync to commit 1
1236 self.options.revision = self.githash('repo_1', 1)
1237 self.options.rebase_patch_ref = False
1238 scm.update(self.options, None, file_list)
1239 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1240
1241 # Apply the change on top of that.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001242 scm.apply_patch_ref(
1243 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1244 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001245
1246 self.assertCommits([1, 2, 3, 5, 6])
1247 self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir))
1248
1249 def testDoesntSoftResetIfNotAskedTo(self):
1250 """Test that we can apply a patch without doing a soft reset."""
1251 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1252 file_list = []
1253
1254 self.options.reset_patch_ref = False
1255 scm.update(self.options, None, file_list)
1256 self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir))
1257
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001258 scm.apply_patch_ref(
1259 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1260 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001261
1262 self.assertCommits([1, 2, 3, 4, 5, 6])
1263 # The commit hash after cherry-picking is not known, but it must be
1264 # different from what the repo was synced at before patching.
1265 self.assertNotEqual(self.githash('repo_1', 4),
1266 self.gitrevparse(self.root_dir))
1267
1268 def testRecoversAfterPatchFailure(self):
1269 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1270 file_list = []
1271
1272 self.options.revision = 'refs/changes/34/1234/1'
1273 scm.update(self.options, None, file_list)
1274 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
1275
1276 # Checkout 'refs/changes/34/1234/1' modifies the 'change' file, so trying to
1277 # patch 'refs/changes/36/1236/1' creates a patch failure.
1278 with self.assertRaises(subprocess2.CalledProcessError) as cm:
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001279 scm.apply_patch_ref(
1280 self.url, 'refs/changes/36/1236/1', 'refs/heads/master', self.options,
1281 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001282 self.assertEqual(cm.exception.cmd[:2], ['git', 'cherry-pick'])
Edward Lemur979fa782019-08-13 22:44:05 +00001283 self.assertIn(b'error: could not apply', cm.exception.stderr)
Edward Lemurca7d8812018-07-24 17:42:45 +00001284
1285 # Try to apply 'refs/changes/35/1235/1', which doesn't have a merge
1286 # conflict.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001287 scm.apply_patch_ref(
1288 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1289 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001290 self.assertCommits([1, 2, 3, 5, 6])
1291 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
1292
1293 def testIgnoresAlreadyMergedCommits(self):
1294 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1295 file_list = []
1296
1297 self.options.revision = 'refs/heads/master-with-5'
1298 scm.update(self.options, None, file_list)
1299 self.assertEqual(self.githash('repo_1', 12),
1300 self.gitrevparse(self.root_dir))
1301
1302 # When we try 'refs/changes/35/1235/1' on top of 'refs/heads/feature',
1303 # 'refs/changes/34/1234/1' will be an empty commit, since the changes were
1304 # already present in the tree as commit 11.
1305 # Make sure we deal with this gracefully.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001306 scm.apply_patch_ref(
1307 self.url, 'refs/changes/35/1235/1', 'refs/heads/feature', self.options,
1308 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001309 self.assertCommits([1, 2, 3, 5, 6, 12])
1310 self.assertEqual(self.githash('repo_1', 12),
1311 self.gitrevparse(self.root_dir))
1312
1313 def testRecoversFromExistingCherryPick(self):
1314 scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.')
1315 file_list = []
1316
1317 self.options.revision = 'refs/changes/34/1234/1'
1318 scm.update(self.options, None, file_list)
1319 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
1320
1321 # Checkout 'refs/changes/34/1234/1' modifies the 'change' file, so trying to
1322 # cherry-pick 'refs/changes/36/1236/1' raises an error.
1323 scm._Run(['fetch', 'origin', 'refs/changes/36/1236/1'], self.options)
1324 with self.assertRaises(subprocess2.CalledProcessError) as cm:
1325 scm._Run(['cherry-pick', 'FETCH_HEAD'], self.options)
1326 self.assertEqual(cm.exception.cmd[:2], ['git', 'cherry-pick'])
1327
1328 # Try to apply 'refs/changes/35/1235/1', which doesn't have a merge
1329 # conflict.
Edward Lemur4c5c8ab2019-06-07 15:58:13 +00001330 scm.apply_patch_ref(
1331 self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options,
1332 file_list)
Edward Lemurca7d8812018-07-24 17:42:45 +00001333 self.assertCommits([1, 2, 3, 5, 6])
1334 self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir))
1335
Edward Lemurd64781e2018-07-11 23:09:55 +00001336
msb@chromium.orge28e4982009-09-25 20:51:45 +00001337if __name__ == '__main__':
szager@chromium.orgb0a13a22014-06-18 00:52:25 +00001338 level = logging.DEBUG if '-v' in sys.argv else logging.FATAL
1339 logging.basicConfig(
1340 level=level,
1341 format='%(asctime).19s %(levelname)s %(filename)s:'
1342 '%(lineno)s %(message)s')
msb@chromium.orge28e4982009-09-25 20:51:45 +00001343 unittest.main()
1344
1345# vim: ts=2:sw=2:tw=80:et: