maruel@chromium.org | 45d8db0 | 2011-03-31 20:43:56 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python |
steveblock@chromium.org | 9356704 | 2012-02-15 01:02:26 +0000 | [diff] [blame] | 2 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 5 | |
| 6 | """Unit tests for gclient_scm.py.""" |
| 7 | |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 8 | # pylint: disable=E1103 |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 9 | |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 10 | from shutil import rmtree |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 11 | from subprocess import Popen, PIPE, STDOUT |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 12 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 13 | import json |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 14 | import logging |
| 15 | import os |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 16 | import re |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 17 | import sys |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 18 | import tempfile |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 19 | import unittest |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 20 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 21 | if sys.version_info.major == 2: |
| 22 | from cStringIO import StringIO |
| 23 | else: |
| 24 | from io import StringIO |
| 25 | |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 26 | sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 27 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 28 | from third_party import mock |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 29 | from testing_support import fake_repos |
Edward Lemur | 9cafbf4 | 2019-08-15 22:03:35 +0000 | [diff] [blame] | 30 | from testing_support import test_case_utils |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 31 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 32 | import gclient_scm |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 33 | import git_cache |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 34 | import subprocess2 |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 35 | |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 36 | # Disable global git cache |
| 37 | git_cache.Mirror.SetCachePath(None) |
| 38 | |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 39 | # Shortcut since this function is used often |
| 40 | join = gclient_scm.os.path.join |
| 41 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 42 | TIMESTAMP_RE = re.compile('\[[0-9]{1,2}:[0-9]{2}:[0-9]{2}\] (.*)', re.DOTALL) |
| 43 | def strip_timestamps(value): |
| 44 | lines = value.splitlines(True) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 45 | for i in range(len(lines)): |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 46 | m = TIMESTAMP_RE.match(lines[i]) |
| 47 | if m: |
| 48 | lines[i] = m.group(1) |
| 49 | return ''.join(lines) |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 50 | |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 51 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 52 | class BasicTests(unittest.TestCase): |
| 53 | @mock.patch('gclient_scm.scm.GIT.Capture') |
| 54 | def testGetFirstRemoteUrl(self, mockCapture): |
hinoka@chromium.org | fa2b9b4 | 2014-08-22 18:08:53 +0000 | [diff] [blame] | 55 | 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 Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 61 | mockCapture.side_effect = [question for question, _ in REMOTE_STRINGS] |
hinoka@chromium.org | fa2b9b4 | 2014-08-22 18:08:53 +0000 | [diff] [blame] | 62 | |
| 63 | for _, answer in REMOTE_STRINGS: |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 64 | self.assertEqual( |
| 65 | gclient_scm.SCMWrapper._get_first_remote_url(FAKE_PATH), answer) |
hinoka@chromium.org | fa2b9b4 | 2014-08-22 18:08:53 +0000 | [diff] [blame] | 66 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 67 | 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.org | fa2b9b4 | 2014-08-22 18:08:53 +0000 | [diff] [blame] | 73 | |
| 74 | |
Edward Lemur | 9cafbf4 | 2019-08-15 22:03:35 +0000 | [diff] [blame] | 75 | class BaseGitWrapperTestCase(unittest.TestCase, test_case_utils.TestCaseUtils): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 76 | """This class doesn't use pymox.""" |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 77 | class OptionsObject(object): |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 78 | def __init__(self, verbose=False, revision=None): |
dnj@chromium.org | 5b23e87 | 2015-02-20 21:25:57 +0000 | [diff] [blame] | 79 | self.auto_rebase = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 80 | self.verbose = verbose |
| 81 | self.revision = revision |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 82 | self.deps_os = None |
| 83 | self.force = False |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 84 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 85 | self.nohooks = False |
primiano@chromium.org | 5439ea5 | 2014-08-06 17:18:18 +0000 | [diff] [blame] | 86 | self.no_history = False |
iannucci@chromium.org | d4fffee | 2013-06-28 00:35:26 +0000 | [diff] [blame] | 87 | self.upstream = False |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 88 | self.cache_dir = None |
bauerb@chromium.org | 4dd0937 | 2011-07-22 14:41:51 +0000 | [diff] [blame] | 89 | self.merge = False |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 90 | self.jobs = 1 |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 91 | self.break_repo_locks = False |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 92 | self.delete_unversioned_trees = False |
Edward Lesmes | c621b21 | 2018-03-21 20:26:56 -0400 | [diff] [blame] | 93 | self.patch_ref = None |
| 94 | self.patch_repo = None |
| 95 | self.rebase_patch_ref = True |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 96 | self.reset_patch_ref = True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 97 | |
| 98 | sample_git_import = """blob |
| 99 | mark :1 |
| 100 | data 6 |
| 101 | Hello |
| 102 | |
| 103 | blob |
| 104 | mark :2 |
| 105 | data 4 |
| 106 | Bye |
| 107 | |
| 108 | reset refs/heads/master |
| 109 | commit refs/heads/master |
| 110 | mark :3 |
| 111 | author Bob <bob@example.com> 1253744361 -0700 |
| 112 | committer Bob <bob@example.com> 1253744361 -0700 |
| 113 | data 8 |
| 114 | A and B |
| 115 | M 100644 :1 a |
| 116 | M 100644 :2 b |
| 117 | |
| 118 | blob |
| 119 | mark :4 |
| 120 | data 10 |
| 121 | Hello |
| 122 | You |
| 123 | |
| 124 | blob |
| 125 | mark :5 |
| 126 | data 8 |
| 127 | Bye |
| 128 | You |
| 129 | |
| 130 | commit refs/heads/origin |
| 131 | mark :6 |
| 132 | author Alice <alice@example.com> 1253744424 -0700 |
| 133 | committer Alice <alice@example.com> 1253744424 -0700 |
| 134 | data 13 |
| 135 | Personalized |
| 136 | from :3 |
| 137 | M 100644 :4 a |
| 138 | M 100644 :5 b |
| 139 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 140 | blob |
| 141 | mark :7 |
| 142 | data 5 |
| 143 | Mooh |
| 144 | |
| 145 | commit refs/heads/feature |
| 146 | mark :8 |
| 147 | author Bob <bob@example.com> 1390311986 -0000 |
| 148 | committer Bob <bob@example.com> 1390311986 -0000 |
| 149 | data 6 |
| 150 | Add C |
| 151 | from :3 |
| 152 | M 100644 :7 c |
| 153 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 154 | reset refs/heads/master |
| 155 | from :3 |
| 156 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 157 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 158 | return self.OptionsObject(*args, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 159 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 160 | def checkstdout(self, expected): |
| 161 | value = sys.stdout.getvalue() |
| 162 | sys.stdout.close() |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 163 | # pylint: disable=no-member |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 164 | self.assertEqual(expected, strip_timestamps(value)) |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 165 | |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 166 | @staticmethod |
| 167 | def CreateGitRepo(git_import, path): |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 168 | """Do it for real.""" |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 169 | try: |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 170 | Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT, |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 171 | cwd=path).communicate() |
| 172 | except OSError: |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 173 | # git is not available, skip this test. |
| 174 | return False |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 175 | Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE, |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 176 | stderr=STDOUT, cwd=path).communicate(input=git_import.encode()) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 177 | Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT, |
| 178 | cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 179 | Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 180 | stderr=STDOUT, cwd=path).communicate() |
| 181 | Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE, |
| 182 | stderr=STDOUT, cwd=path).communicate() |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame] | 183 | Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'], |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 184 | stdout=PIPE, stderr=STDOUT, cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 185 | Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 186 | stderr=STDOUT, cwd=path).communicate() |
iannucci@chromium.org | 1e7187a | 2013-02-17 20:54:05 +0000 | [diff] [blame] | 187 | Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE, |
| 188 | stderr=STDOUT, cwd=path).communicate() |
| 189 | Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE, |
| 190 | stderr=STDOUT, cwd=path).communicate() |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 191 | return True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 192 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 193 | def _GetAskForDataCallback(self, expected_prompt, return_value): |
| 194 | def AskForData(prompt, options): |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 195 | self.assertEqual(prompt, expected_prompt) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 196 | return return_value |
| 197 | return AskForData |
| 198 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 199 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 200 | unittest.TestCase.setUp(self) |
Edward Lemur | 9cafbf4 | 2019-08-15 22:03:35 +0000 | [diff] [blame] | 201 | test_case_utils.TestCaseUtils.setUp(self) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 202 | self.url = 'git://foo' |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 203 | # The .git suffix allows gclient_scm to recognize the dir as a git repo |
| 204 | # when cloning it locally |
| 205 | self.root_dir = tempfile.mkdtemp('.git') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 206 | self.relpath = '.' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 207 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 208 | self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 209 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 210 | mock.patch('gclient_scm.GitWrapper.BinaryExists', |
| 211 | staticmethod(lambda : True)).start() |
| 212 | mock.patch('sys.stdout', StringIO()).start() |
| 213 | self.addCleanup(mock.patch.stopall) |
| 214 | self.addCleanup(lambda: rmtree(self.root_dir)) |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 215 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 216 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 217 | class ManagedGitWrapperTestCase(BaseGitWrapperTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 218 | |
| 219 | def testRevertMissing(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 220 | if not self.enabled: |
| 221 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 222 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 223 | file_path = join(self.base_path, 'a') |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 224 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 225 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 226 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 227 | scm.update(options, None, file_list) |
| 228 | gclient_scm.os.remove(file_path) |
| 229 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 230 | scm.revert(options, self.args, file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 231 | self.assertEqual(file_list, [file_path]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 232 | file_list = [] |
| 233 | scm.diff(options, self.args, file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 234 | self.assertEqual(file_list, []) |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 235 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 236 | |
| 237 | def testRevertNone(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 238 | if not self.enabled: |
| 239 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 240 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 241 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 242 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 243 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 244 | scm.update(options, None, file_list) |
| 245 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 246 | scm.revert(options, self.args, file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 247 | self.assertEqual(file_list, []) |
| 248 | self.assertEqual(scm.revinfo(options, self.args, None), |
| 249 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 250 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 251 | |
| 252 | def testRevertModified(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 253 | if not self.enabled: |
| 254 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 255 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 256 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 257 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 258 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 259 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 260 | file_path = join(self.base_path, 'a') |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 261 | with open(file_path, 'a') as f: |
| 262 | f.writelines('touched\n') |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 263 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 264 | scm.revert(options, self.args, file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 265 | self.assertEqual(file_list, [file_path]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 266 | file_list = [] |
| 267 | scm.diff(options, self.args, file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 268 | self.assertEqual(file_list, []) |
| 269 | self.assertEqual(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 270 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 271 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 272 | |
| 273 | def testRevertNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 274 | if not self.enabled: |
| 275 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 276 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 277 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 278 | self.relpath) |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 279 | file_list = [] |
| 280 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 281 | file_path = join(self.base_path, 'c') |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 282 | with open(file_path, 'w') as f: |
| 283 | f.writelines('new\n') |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 284 | Popen(['git', 'add', 'c'], stdout=PIPE, |
| 285 | stderr=STDOUT, cwd=self.base_path).communicate() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 286 | file_list = [] |
| 287 | scm.revert(options, self.args, file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 288 | self.assertEqual(file_list, [file_path]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 289 | file_list = [] |
| 290 | scm.diff(options, self.args, file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 291 | self.assertEqual(file_list, []) |
| 292 | self.assertEqual(scm.revinfo(options, self.args, None), |
| 293 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 294 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 295 | |
| 296 | def testStatusNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 297 | if not self.enabled: |
| 298 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 299 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 300 | file_path = join(self.base_path, 'a') |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 301 | with open(file_path, 'a') as f: |
| 302 | f.writelines('touched\n') |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 303 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 304 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 305 | file_list = [] |
| 306 | scm.status(options, self.args, file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 307 | self.assertEqual(file_list, [file_path]) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 308 | self.checkstdout( |
Aaron Gable | f4068aa | 2017-12-12 15:14:09 -0800 | [diff] [blame] | 309 | ('\n________ running \'git -c core.quotePath=false diff --name-status ' |
Edward Lemur | 24146be | 2019-08-01 21:44:52 +0000 | [diff] [blame] | 310 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 311 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 312 | |
| 313 | def testStatus2New(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 314 | if not self.enabled: |
| 315 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 316 | options = self.Options() |
| 317 | expected_file_list = [] |
| 318 | for f in ['a', 'b']: |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 319 | file_path = join(self.base_path, f) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 320 | with open(file_path, 'a') as f: |
| 321 | f.writelines('touched\n') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 322 | expected_file_list.extend([file_path]) |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 323 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 324 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 325 | file_list = [] |
| 326 | scm.status(options, self.args, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 327 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 328 | self.assertEqual(sorted(file_list), expected_file_list) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 329 | self.checkstdout( |
Aaron Gable | f4068aa | 2017-12-12 15:14:09 -0800 | [diff] [blame] | 330 | ('\n________ running \'git -c core.quotePath=false diff --name-status ' |
Edward Lemur | 24146be | 2019-08-01 21:44:52 +0000 | [diff] [blame] | 331 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\nM\tb\n') |
| 332 | % join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 333 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 334 | def testUpdateUpdate(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 335 | if not self.enabled: |
| 336 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 337 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 338 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 339 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 340 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 341 | file_list = [] |
| 342 | scm.update(options, (), file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 343 | self.assertEqual(file_list, expected_file_list) |
| 344 | self.assertEqual(scm.revinfo(options, (), None), |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 345 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 346 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 347 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 348 | def testUpdateMerge(self): |
| 349 | if not self.enabled: |
| 350 | return |
| 351 | options = self.Options() |
| 352 | options.merge = True |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 353 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 354 | self.relpath) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 355 | scm._Run(['checkout', '-q', 'feature'], options) |
| 356 | rev = scm.revinfo(options, (), None) |
| 357 | file_list = [] |
| 358 | scm.update(options, (), file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 359 | self.assertEqual(file_list, [join(self.base_path, x) |
| 360 | for x in ['a', 'b', 'c']]) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 361 | # The actual commit that is created is unstable, so we verify its tree and |
| 362 | # parents instead. |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 363 | self.assertEqual(scm._Capture(['rev-parse', 'HEAD:']), |
| 364 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 365 | self.assertEqual(scm._Capture(['rev-parse', 'HEAD^1']), rev) |
| 366 | self.assertEqual(scm._Capture(['rev-parse', 'HEAD^2']), |
| 367 | scm._Capture(['rev-parse', 'origin/master'])) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 368 | sys.stdout.close() |
| 369 | |
| 370 | def testUpdateRebase(self): |
| 371 | if not self.enabled: |
| 372 | return |
| 373 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 374 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 375 | self.relpath) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 376 | scm._Run(['checkout', '-q', 'feature'], options) |
| 377 | file_list = [] |
| 378 | # Fake a 'y' key press. |
| 379 | scm._AskForData = self._GetAskForDataCallback( |
| 380 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 381 | '(y)es / (q)uit / (s)kip : ', 'y') |
| 382 | scm.update(options, (), file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 383 | self.assertEqual(file_list, [join(self.base_path, x) |
| 384 | for x in ['a', 'b', 'c']]) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 385 | # The actual commit that is created is unstable, so we verify its tree and |
| 386 | # parent instead. |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 387 | self.assertEqual(scm._Capture(['rev-parse', 'HEAD:']), |
| 388 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 389 | self.assertEqual(scm._Capture(['rev-parse', 'HEAD^']), |
| 390 | scm._Capture(['rev-parse', 'origin/master'])) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 391 | sys.stdout.close() |
| 392 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 393 | def testUpdateReset(self): |
| 394 | if not self.enabled: |
| 395 | return |
| 396 | options = self.Options() |
| 397 | options.reset = True |
| 398 | |
| 399 | dir_path = join(self.base_path, 'c') |
| 400 | os.mkdir(dir_path) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 401 | with open(join(dir_path, 'nested'), 'w') as f: |
| 402 | f.writelines('new\n') |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 403 | |
| 404 | file_path = join(self.base_path, 'file') |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 405 | with open(file_path, 'w') as f: |
| 406 | f.writelines('new\n') |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 407 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 408 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 409 | self.relpath) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 410 | file_list = [] |
| 411 | scm.update(options, (), file_list) |
| 412 | self.assert_(gclient_scm.os.path.isdir(dir_path)) |
| 413 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 414 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 415 | |
Edward Lemur | 579c986 | 2018-07-13 23:17:51 +0000 | [diff] [blame] | 416 | def testUpdateResetUnsetsFetchConfig(self): |
| 417 | if not self.enabled: |
| 418 | return |
| 419 | options = self.Options() |
| 420 | options.reset = True |
| 421 | |
| 422 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 423 | self.relpath) |
| 424 | scm._Run(['config', 'remote.origin.fetch', |
| 425 | '+refs/heads/bad/ref:refs/remotes/origin/bad/ref'], options) |
| 426 | |
| 427 | file_list = [] |
| 428 | scm.update(options, (), file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 429 | self.assertEqual(scm.revinfo(options, (), None), |
| 430 | '069c602044c5388d2d15c3f875b057c852003458') |
Edward Lemur | 579c986 | 2018-07-13 23:17:51 +0000 | [diff] [blame] | 431 | sys.stdout.close() |
| 432 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 433 | def testUpdateResetDeleteUnversionedTrees(self): |
| 434 | if not self.enabled: |
| 435 | return |
| 436 | options = self.Options() |
| 437 | options.reset = True |
| 438 | options.delete_unversioned_trees = True |
| 439 | |
| 440 | dir_path = join(self.base_path, 'dir') |
| 441 | os.mkdir(dir_path) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 442 | with open(join(dir_path, 'nested'), 'w') as f: |
| 443 | f.writelines('new\n') |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 444 | |
| 445 | file_path = join(self.base_path, 'file') |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 446 | with open(file_path, 'w') as f: |
| 447 | f.writelines('new\n') |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 448 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 449 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 450 | self.relpath) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 451 | file_list = [] |
| 452 | scm.update(options, (), file_list) |
| 453 | self.assert_(not gclient_scm.os.path.isdir(dir_path)) |
| 454 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 455 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 456 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 457 | def testUpdateUnstagedConflict(self): |
| 458 | if not self.enabled: |
| 459 | return |
| 460 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 461 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 462 | self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 463 | file_path = join(self.base_path, 'b') |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 464 | with open(file_path, 'w') as f: |
| 465 | f.writelines('conflict\n') |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 466 | try: |
| 467 | scm.update(options, (), []) |
| 468 | self.fail() |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 469 | except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 470 | # The exact exception text varies across git versions so it's not worth |
| 471 | # verifying it. It's fine as long as it throws. |
| 472 | pass |
| 473 | # Manually flush stdout since we can't verify it's content accurately across |
| 474 | # git versions. |
| 475 | sys.stdout.getvalue() |
| 476 | sys.stdout.close() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 477 | |
Mike Stipicevic | e992b61 | 2016-12-02 15:32:55 -0800 | [diff] [blame] | 478 | @unittest.skip('Skipping until crbug.com/670884 is resolved.') |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 479 | def testUpdateLocked(self): |
| 480 | if not self.enabled: |
| 481 | return |
| 482 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 483 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 484 | self.relpath) |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 485 | file_path = join(self.base_path, '.git', 'index.lock') |
| 486 | with open(file_path, 'w'): |
| 487 | pass |
Robert Iannucci | 53f3555 | 2016-12-15 19:09:16 -0800 | [diff] [blame] | 488 | with self.assertRaises(subprocess2.CalledProcessError): |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 489 | scm.update(options, (), []) |
| 490 | sys.stdout.close() |
| 491 | |
| 492 | def testUpdateLockedBreak(self): |
| 493 | if not self.enabled: |
| 494 | return |
| 495 | options = self.Options() |
| 496 | options.break_repo_locks = True |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 497 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 498 | self.relpath) |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 499 | file_path = join(self.base_path, '.git', 'index.lock') |
| 500 | with open(file_path, 'w'): |
| 501 | pass |
| 502 | scm.update(options, (), []) |
| 503 | self.assertRegexpMatches(sys.stdout.getvalue(), |
| 504 | "breaking lock.*\.git/index\.lock") |
| 505 | self.assertFalse(os.path.exists(file_path)) |
| 506 | sys.stdout.close() |
| 507 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 508 | def testUpdateConflict(self): |
| 509 | if not self.enabled: |
| 510 | return |
| 511 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 512 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 513 | self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 514 | file_path = join(self.base_path, 'b') |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 515 | with open(file_path, 'w') as f: |
| 516 | f.writelines('conflict\n') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 517 | scm._Run(['commit', '-am', 'test'], options) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 518 | scm._AskForData = self._GetAskForDataCallback( |
| 519 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 520 | '(y)es / (q)uit / (s)kip : ', 'y') |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 521 | |
| 522 | with self.assertRaises(gclient_scm.gclient_utils.Error) as e: |
| 523 | scm.update(options, (), []) |
| 524 | self.assertEqual( |
| 525 | e.exception.args[0], |
| 526 | 'Conflict while rebasing this branch.\n' |
| 527 | 'Fix the conflict and run gclient again.\n' |
| 528 | 'See \'man git-rebase\' for details.\n') |
| 529 | |
| 530 | with self.assertRaises(gclient_scm.gclient_utils.Error) as e: |
| 531 | scm.update(options, (), []) |
| 532 | self.assertEqual( |
| 533 | e.exception.args[0], |
| 534 | '\n____ . at refs/remotes/origin/master\n' |
| 535 | '\tYou have unstaged changes.\n' |
| 536 | '\tPlease commit, stash, or reset.\n') |
| 537 | |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 538 | sys.stdout.close() |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 539 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 540 | def testRevinfo(self): |
| 541 | if not self.enabled: |
| 542 | return |
| 543 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 544 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 545 | self.relpath) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 546 | rev_info = scm.revinfo(options, (), None) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 547 | self.assertEqual(rev_info, '069c602044c5388d2d15c3f875b057c852003458') |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 548 | |
John Budorick | 21a51b3 | 2018-09-19 19:39:20 +0000 | [diff] [blame] | 549 | def testMirrorPushUrl(self): |
| 550 | if not self.enabled: |
| 551 | return |
| 552 | fakes = fake_repos.FakeRepos() |
| 553 | fakes.set_up_git() |
| 554 | self.url = fakes.git_base + 'repo_1' |
| 555 | self.root_dir = fakes.root_dir |
| 556 | self.addCleanup(fake_repos.FakeRepos.tear_down_git, fakes) |
| 557 | |
| 558 | mirror = tempfile.mkdtemp() |
| 559 | self.addCleanup(rmtree, mirror) |
| 560 | |
| 561 | # This should never happen, but if it does, it'd render the other assertions |
| 562 | # in this test meaningless. |
| 563 | self.assertFalse(self.url.startswith(mirror)) |
| 564 | |
| 565 | git_cache.Mirror.SetCachePath(mirror) |
| 566 | self.addCleanup(git_cache.Mirror.SetCachePath, None) |
| 567 | |
| 568 | options = self.Options() |
| 569 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, self.relpath) |
| 570 | self.assertIsNotNone(scm._GetMirror(self.url, options)) |
| 571 | scm.update(options, (), []) |
| 572 | |
| 573 | fetch_url = scm._Capture(['remote', 'get-url', 'origin']) |
| 574 | self.assertTrue( |
| 575 | fetch_url.startswith(mirror), |
| 576 | msg='\n'.join([ |
| 577 | 'Repository fetch url should be in the git cache mirror directory.', |
| 578 | ' fetch_url: %s' % fetch_url, |
| 579 | ' mirror: %s' % mirror])) |
| 580 | push_url = scm._Capture(['remote', 'get-url', '--push', 'origin']) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 581 | self.assertEqual(push_url, self.url) |
John Budorick | 21a51b3 | 2018-09-19 19:39:20 +0000 | [diff] [blame] | 582 | sys.stdout.close() |
| 583 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 584 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 585 | class ManagedGitWrapperTestCaseMock(unittest.TestCase): |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 586 | class OptionsObject(object): |
| 587 | def __init__(self, verbose=False, revision=None, force=False): |
| 588 | self.verbose = verbose |
| 589 | self.revision = revision |
| 590 | self.deps_os = None |
| 591 | self.force = force |
| 592 | self.reset = False |
| 593 | self.nohooks = False |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 594 | self.break_repo_locks = False |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 595 | # TODO(maruel): Test --jobs > 1. |
| 596 | self.jobs = 1 |
Edward Lesmes | c621b21 | 2018-03-21 20:26:56 -0400 | [diff] [blame] | 597 | self.patch_ref = None |
| 598 | self.patch_repo = None |
| 599 | self.rebase_patch_ref = True |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 600 | |
| 601 | def Options(self, *args, **kwargs): |
| 602 | return self.OptionsObject(*args, **kwargs) |
| 603 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 604 | def checkstdout(self, expected): |
| 605 | value = sys.stdout.getvalue() |
primiano@chromium.org | 5439ea5 | 2014-08-06 17:18:18 +0000 | [diff] [blame] | 606 | sys.stdout.close() |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 607 | # pylint: disable=no-member |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 608 | self.assertEqual(expected, strip_timestamps(value)) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 609 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 610 | def setUp(self): |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 611 | self.fake_hash_1 = 't0ta11yf4k3' |
| 612 | self.fake_hash_2 = '3v3nf4k3r' |
| 613 | self.url = 'git://foo' |
maruel@chromium.org | 9717013 | 2013-05-08 14:58:34 +0000 | [diff] [blame] | 614 | self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 615 | self.relpath = 'fake' |
| 616 | self.base_path = os.path.join(self.root_dir, self.relpath) |
primiano@chromium.org | 1c12738 | 2015-02-17 11:15:40 +0000 | [diff] [blame] | 617 | self.backup_base_path = os.path.join(self.root_dir, |
| 618 | 'old_%s.git' % self.relpath) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 619 | mock.patch('gclient_scm.scm.GIT.ApplyEnvVars').start() |
| 620 | mock.patch('gclient_scm.GitWrapper._CheckMinVersion').start() |
| 621 | mock.patch('gclient_scm.GitWrapper._Fetch').start() |
| 622 | mock.patch('gclient_scm.GitWrapper._DeleteOrMove').start() |
| 623 | mock.patch('sys.stdout', StringIO()).start() |
| 624 | self.addCleanup(mock.patch.stopall) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 625 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 626 | @mock.patch('scm.GIT.IsValidRevision') |
| 627 | @mock.patch('os.path.isdir', lambda _: True) |
| 628 | def testGetUsableRevGit(self, mockIsValidRevision): |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 629 | # pylint: disable=no-member |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 630 | options = self.Options(verbose=True) |
| 631 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 632 | mockIsValidRevision.side_effect = lambda cwd, rev: rev != '1' |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 633 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 634 | git_scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 635 | self.relpath) |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 636 | # A [fake] git sha1 with a git repo should work (this is in the case that |
| 637 | # the LKGR gets flipped to git sha1's some day). |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 638 | self.assertEqual(git_scm.GetUsableRev(self.fake_hash_1, options), |
| 639 | self.fake_hash_1) |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 640 | # An SVN rev with an existing purely git repo should raise an exception. |
| 641 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 642 | git_scm.GetUsableRev, '1', options) |
| 643 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 644 | @mock.patch('gclient_scm.GitWrapper._Clone') |
| 645 | @mock.patch('os.path.isdir') |
| 646 | @mock.patch('os.path.exists') |
| 647 | @mock.patch('subprocess2.check_output') |
| 648 | def testUpdateNoDotGit( |
| 649 | self, mockCheckOutput, mockExists, mockIsdir, mockClone): |
| 650 | mockIsdir.side_effect = lambda path: path == self.base_path |
| 651 | mockExists.side_effect = lambda path: path == self.base_path |
| 652 | mockCheckOutput.return_value = b'' |
| 653 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 654 | options = self.Options() |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 655 | scm = gclient_scm.GitWrapper( |
| 656 | self.url, self.root_dir, self.relpath) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 657 | scm.update(options, None, []) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 658 | |
| 659 | env = gclient_scm.scm.GIT.ApplyEnvVars({}) |
| 660 | self.assertEqual( |
| 661 | mockCheckOutput.mock_calls, |
| 662 | [ |
| 663 | mock.call( |
| 664 | ['git', '-c', 'core.quotePath=false', 'ls-files'], |
| 665 | cwd=self.base_path, env=env, stderr=-1), |
| 666 | mock.call( |
| 667 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 668 | cwd=self.base_path, env=env, stderr=-1), |
| 669 | ]) |
| 670 | mockClone.assert_called_with( |
| 671 | 'refs/remotes/origin/master', self.url, options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 672 | self.checkstdout('\n') |
| 673 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 674 | @mock.patch('gclient_scm.GitWrapper._Clone') |
| 675 | @mock.patch('os.path.isdir') |
| 676 | @mock.patch('os.path.exists') |
| 677 | @mock.patch('subprocess2.check_output') |
| 678 | def testUpdateConflict( |
| 679 | self, mockCheckOutput, mockExists, mockIsdir, mockClone): |
| 680 | mockIsdir.side_effect = lambda path: path == self.base_path |
| 681 | mockExists.side_effect = lambda path: path == self.base_path |
| 682 | mockCheckOutput.return_value = b'' |
| 683 | mockClone.side_effect = [ |
| 684 | gclient_scm.subprocess2.CalledProcessError( |
| 685 | None, None, None, None, None), |
| 686 | None, |
| 687 | ] |
| 688 | |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 689 | options = self.Options() |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 690 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 691 | self.relpath) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 692 | scm.update(options, None, []) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 693 | |
| 694 | env = gclient_scm.scm.GIT.ApplyEnvVars({}) |
| 695 | self.assertEqual( |
| 696 | mockCheckOutput.mock_calls, |
| 697 | [ |
| 698 | mock.call( |
| 699 | ['git', '-c', 'core.quotePath=false', 'ls-files'], |
| 700 | cwd=self.base_path, env=env, stderr=-1), |
| 701 | mock.call( |
| 702 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 703 | cwd=self.base_path, env=env, stderr=-1), |
| 704 | ]) |
| 705 | mockClone.assert_called_with( |
| 706 | 'refs/remotes/origin/master', self.url, options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 707 | self.checkstdout('\n') |
| 708 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 709 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 710 | class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 711 | def checkInStdout(self, expected): |
| 712 | value = sys.stdout.getvalue() |
| 713 | sys.stdout.close() |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 714 | # pylint: disable=no-member |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 715 | self.assertIn(expected, value) |
| 716 | |
| 717 | def checkNotInStdout(self, expected): |
| 718 | value = sys.stdout.getvalue() |
| 719 | sys.stdout.close() |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 720 | # pylint: disable=no-member |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 721 | self.assertNotIn(expected, value) |
| 722 | |
smut@google.com | 27c9c8a | 2014-09-11 19:57:55 +0000 | [diff] [blame] | 723 | def getCurrentBranch(self): |
| 724 | # Returns name of current branch or HEAD for detached HEAD |
| 725 | branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'], |
| 726 | cwd=self.base_path) |
| 727 | if branch == 'HEAD': |
| 728 | return None |
| 729 | return branch |
| 730 | |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 731 | def testUpdateClone(self): |
| 732 | if not self.enabled: |
| 733 | return |
| 734 | options = self.Options() |
| 735 | |
| 736 | origin_root_dir = self.root_dir |
| 737 | self.root_dir = tempfile.mkdtemp() |
| 738 | self.relpath = '.' |
| 739 | self.base_path = join(self.root_dir, self.relpath) |
| 740 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 741 | scm = gclient_scm.GitWrapper(origin_root_dir, |
| 742 | self.root_dir, |
| 743 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 744 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 745 | expected_file_list = [join(self.base_path, "a"), |
| 746 | join(self.base_path, "b")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 747 | file_list = [] |
| 748 | options.revision = 'unmanaged' |
| 749 | scm.update(options, (), file_list) |
| 750 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 751 | self.assertEqual(file_list, expected_file_list) |
| 752 | self.assertEqual(scm.revinfo(options, (), None), |
| 753 | '069c602044c5388d2d15c3f875b057c852003458') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 754 | # indicates detached HEAD |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 755 | self.assertEqual(self.getCurrentBranch(), None) |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 756 | self.checkInStdout( |
| 757 | 'Checked out refs/remotes/origin/master to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 758 | |
| 759 | rmtree(origin_root_dir) |
| 760 | |
| 761 | def testUpdateCloneOnCommit(self): |
| 762 | if not self.enabled: |
| 763 | return |
| 764 | options = self.Options() |
| 765 | |
| 766 | origin_root_dir = self.root_dir |
| 767 | self.root_dir = tempfile.mkdtemp() |
| 768 | self.relpath = '.' |
| 769 | self.base_path = join(self.root_dir, self.relpath) |
| 770 | url_with_commit_ref = origin_root_dir +\ |
| 771 | '@a7142dc9f0009350b96a11f372b6ea658592aa95' |
| 772 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 773 | scm = gclient_scm.GitWrapper(url_with_commit_ref, |
| 774 | self.root_dir, |
| 775 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 776 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 777 | expected_file_list = [join(self.base_path, "a"), |
| 778 | join(self.base_path, "b")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 779 | file_list = [] |
| 780 | options.revision = 'unmanaged' |
| 781 | scm.update(options, (), file_list) |
| 782 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 783 | self.assertEqual(file_list, expected_file_list) |
| 784 | self.assertEqual(scm.revinfo(options, (), None), |
| 785 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 786 | # indicates detached HEAD |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 787 | self.assertEqual(self.getCurrentBranch(), None) |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 788 | self.checkInStdout( |
| 789 | 'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 790 | |
| 791 | rmtree(origin_root_dir) |
| 792 | |
| 793 | def testUpdateCloneOnBranch(self): |
| 794 | if not self.enabled: |
| 795 | return |
| 796 | options = self.Options() |
| 797 | |
| 798 | origin_root_dir = self.root_dir |
| 799 | self.root_dir = tempfile.mkdtemp() |
| 800 | self.relpath = '.' |
| 801 | self.base_path = join(self.root_dir, self.relpath) |
| 802 | url_with_branch_ref = origin_root_dir + '@feature' |
| 803 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 804 | scm = gclient_scm.GitWrapper(url_with_branch_ref, |
| 805 | self.root_dir, |
| 806 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 807 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 808 | expected_file_list = [join(self.base_path, "a"), |
| 809 | join(self.base_path, "b"), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame] | 810 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 811 | file_list = [] |
| 812 | options.revision = 'unmanaged' |
| 813 | scm.update(options, (), file_list) |
| 814 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 815 | self.assertEqual(file_list, expected_file_list) |
| 816 | self.assertEqual(scm.revinfo(options, (), None), |
| 817 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
Paweł Hajdan, Jr | 63b8c2a | 2017-09-05 17:59:08 +0200 | [diff] [blame] | 818 | # indicates detached HEAD |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 819 | self.assertEqual(self.getCurrentBranch(), None) |
Paweł Hajdan, Jr | 63b8c2a | 2017-09-05 17:59:08 +0200 | [diff] [blame] | 820 | self.checkInStdout( |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame] | 821 | 'Checked out 9a51244740b25fa2ded5252ca00a3178d3f665a9 ' |
Paweł Hajdan, Jr | 63b8c2a | 2017-09-05 17:59:08 +0200 | [diff] [blame] | 822 | 'to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 823 | |
| 824 | rmtree(origin_root_dir) |
| 825 | |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 826 | def testUpdateCloneOnFetchedRemoteBranch(self): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 827 | if not self.enabled: |
| 828 | return |
| 829 | options = self.Options() |
| 830 | |
| 831 | origin_root_dir = self.root_dir |
| 832 | self.root_dir = tempfile.mkdtemp() |
| 833 | self.relpath = '.' |
| 834 | self.base_path = join(self.root_dir, self.relpath) |
| 835 | url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature' |
| 836 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 837 | scm = gclient_scm.GitWrapper(url_with_branch_ref, |
| 838 | self.root_dir, |
| 839 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 840 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 841 | expected_file_list = [join(self.base_path, "a"), |
| 842 | join(self.base_path, "b"), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame] | 843 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 844 | file_list = [] |
| 845 | options.revision = 'unmanaged' |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 846 | scm.update(options, (), file_list) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 847 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 848 | self.assertEqual(file_list, expected_file_list) |
| 849 | self.assertEqual(scm.revinfo(options, (), None), |
| 850 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 851 | # indicates detached HEAD |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 852 | self.assertEqual(self.getCurrentBranch(), None) |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 853 | self.checkInStdout( |
| 854 | 'Checked out refs/remotes/origin/feature to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 855 | |
| 856 | rmtree(origin_root_dir) |
| 857 | |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 858 | def testUpdateCloneOnTrueRemoteBranch(self): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 859 | if not self.enabled: |
| 860 | return |
| 861 | options = self.Options() |
| 862 | |
| 863 | origin_root_dir = self.root_dir |
| 864 | self.root_dir = tempfile.mkdtemp() |
| 865 | self.relpath = '.' |
| 866 | self.base_path = join(self.root_dir, self.relpath) |
| 867 | url_with_branch_ref = origin_root_dir + '@refs/heads/feature' |
| 868 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 869 | scm = gclient_scm.GitWrapper(url_with_branch_ref, |
| 870 | self.root_dir, |
| 871 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 872 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 873 | expected_file_list = [join(self.base_path, "a"), |
| 874 | join(self.base_path, "b"), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame] | 875 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 876 | file_list = [] |
| 877 | options.revision = 'unmanaged' |
| 878 | scm.update(options, (), file_list) |
| 879 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 880 | self.assertEqual(file_list, expected_file_list) |
| 881 | self.assertEqual(scm.revinfo(options, (), None), |
| 882 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame] | 883 | # @refs/heads/feature is AKA @refs/remotes/origin/feature in the clone, so |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 884 | # should be treated as such by gclient. |
| 885 | # TODO(mmoss): Though really, we should only allow DEPS to specify branches |
| 886 | # as they are known in the upstream repo, since the mapping into the local |
| 887 | # repo can be modified by users (or we might even want to change the gclient |
| 888 | # defaults at some point). But that will take more work to stop using |
| 889 | # refs/remotes/ everywhere that we do (and to stop assuming a DEPS ref will |
| 890 | # always resolve locally, like when passing them to show-ref or rev-list). |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 891 | self.assertEqual(self.getCurrentBranch(), None) |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 892 | self.checkInStdout( |
| 893 | 'Checked out refs/remotes/origin/feature to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 894 | |
| 895 | rmtree(origin_root_dir) |
| 896 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 897 | def testUpdateUpdate(self): |
| 898 | if not self.enabled: |
| 899 | return |
| 900 | options = self.Options() |
| 901 | expected_file_list = [] |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 902 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 903 | self.relpath) |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 904 | file_list = [] |
| 905 | options.revision = 'unmanaged' |
| 906 | scm.update(options, (), file_list) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 907 | self.assertEqual(file_list, expected_file_list) |
| 908 | self.assertEqual(scm.revinfo(options, (), None), |
| 909 | '069c602044c5388d2d15c3f875b057c852003458') |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 910 | self.checkstdout('________ unmanaged solution; skipping .\n') |
| 911 | |
| 912 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 913 | class CipdWrapperTestCase(unittest.TestCase): |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 914 | |
| 915 | def setUp(self): |
| 916 | # Create this before setting up mocks. |
| 917 | self._cipd_root_dir = tempfile.mkdtemp() |
| 918 | self._workdir = tempfile.mkdtemp() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 919 | |
| 920 | self._cipd_instance_url = 'https://chrome-infra-packages.appspot.com' |
| 921 | self._cipd_root = gclient_scm.CipdRoot( |
| 922 | self._cipd_root_dir, |
| 923 | self._cipd_instance_url) |
| 924 | self._cipd_packages = [ |
| 925 | self._cipd_root.add_package('f', 'foo_package', 'foo_version'), |
| 926 | self._cipd_root.add_package('b', 'bar_package', 'bar_version'), |
| 927 | self._cipd_root.add_package('b', 'baz_package', 'baz_version'), |
| 928 | ] |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 929 | mock.patch('tempfile.mkdtemp', lambda: self._workdir).start() |
| 930 | mock.patch('gclient_scm.CipdRoot.add_package').start() |
| 931 | mock.patch('gclient_scm.CipdRoot.clobber').start() |
| 932 | mock.patch('gclient_scm.CipdRoot.ensure').start() |
| 933 | self.addCleanup(mock.patch.stopall) |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 934 | |
| 935 | def tearDown(self): |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 936 | rmtree(self._cipd_root_dir) |
| 937 | rmtree(self._workdir) |
| 938 | |
| 939 | def createScmWithPackageThatSatisfies(self, condition): |
| 940 | return gclient_scm.CipdWrapper( |
| 941 | url=self._cipd_instance_url, |
| 942 | root_dir=self._cipd_root_dir, |
| 943 | relpath='fake_relpath', |
| 944 | root=self._cipd_root, |
| 945 | package=self.getPackageThatSatisfies(condition)) |
| 946 | |
| 947 | def getPackageThatSatisfies(self, condition): |
| 948 | for p in self._cipd_packages: |
| 949 | if condition(p): |
| 950 | return p |
| 951 | |
| 952 | self.fail('Unable to find a satisfactory package.') |
| 953 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 954 | def testRevert(self): |
John Budorick | d3ba72b | 2018-03-20 12:27:42 -0700 | [diff] [blame] | 955 | """Checks that revert does nothing.""" |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 956 | scm = self.createScmWithPackageThatSatisfies(lambda _: True) |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 957 | scm.revert(None, (), []) |
| 958 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 959 | @mock.patch('gclient_scm.gclient_utils.CheckCallAndFilter') |
| 960 | @mock.patch('gclient_scm.gclient_utils.rmtree') |
| 961 | def testRevinfo(self, mockRmtree, mockCheckCallAndFilter): |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 962 | """Checks that revinfo uses the JSON from cipd describe.""" |
| 963 | scm = self.createScmWithPackageThatSatisfies(lambda _: True) |
| 964 | |
| 965 | expected_revinfo = '0123456789abcdef0123456789abcdef01234567' |
| 966 | json_contents = { |
| 967 | 'result': { |
| 968 | 'pin': { |
| 969 | 'instance_id': expected_revinfo, |
| 970 | } |
| 971 | } |
| 972 | } |
| 973 | describe_json_path = join(self._workdir, 'describe.json') |
| 974 | with open(describe_json_path, 'w') as describe_json: |
| 975 | json.dump(json_contents, describe_json) |
| 976 | |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 977 | revinfo = scm.revinfo(None, (), []) |
| 978 | self.assertEqual(revinfo, expected_revinfo) |
| 979 | |
| 980 | mockRmtree.assert_called_with(self._workdir) |
| 981 | mockCheckCallAndFilter.assert_called_with([ |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 982 | 'cipd', 'describe', 'foo_package', |
| 983 | '-log-level', 'error', |
| 984 | '-version', 'foo_version', |
| 985 | '-json-output', describe_json_path, |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 986 | ]) |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 987 | |
| 988 | def testUpdate(self): |
John Budorick | d3ba72b | 2018-03-20 12:27:42 -0700 | [diff] [blame] | 989 | """Checks that update does nothing.""" |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 990 | scm = self.createScmWithPackageThatSatisfies(lambda _: True) |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 991 | scm.update(None, (), []) |
| 992 | |
| 993 | |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 994 | class GerritChangesFakeRepo(fake_repos.FakeReposBase): |
| 995 | def populateGit(self): |
| 996 | # Creates a tree that looks like this: |
| 997 | # |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 998 | # 6 refs/changes/35/1235/1 |
| 999 | # | |
| 1000 | # 5 refs/changes/34/1234/1 |
| 1001 | # | |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 1002 | # 1--2--3--4 refs/heads/master |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1003 | # | | |
| 1004 | # | 11(5)--12 refs/heads/master-with-5 |
| 1005 | # | |
| 1006 | # 7--8--9 refs/heads/feature |
| 1007 | # | |
| 1008 | # 10 refs/changes/36/1236/1 |
| 1009 | # |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 1010 | |
| 1011 | self._commit_git('repo_1', {'commit 1': 'touched'}) |
| 1012 | self._commit_git('repo_1', {'commit 2': 'touched'}) |
| 1013 | self._commit_git('repo_1', {'commit 3': 'touched'}) |
| 1014 | self._commit_git('repo_1', {'commit 4': 'touched'}) |
| 1015 | self._create_ref('repo_1', 'refs/heads/master', 4) |
| 1016 | |
| 1017 | # Create a change on top of commit 3 that consists of two commits. |
| 1018 | self._commit_git('repo_1', |
| 1019 | {'commit 5': 'touched', |
| 1020 | 'change': '1234'}, |
| 1021 | base=3) |
| 1022 | self._create_ref('repo_1', 'refs/changes/34/1234/1', 5) |
| 1023 | self._commit_git('repo_1', |
| 1024 | {'commit 6': 'touched', |
| 1025 | 'change': '1235'}) |
| 1026 | self._create_ref('repo_1', 'refs/changes/35/1235/1', 6) |
| 1027 | |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1028 | # Create a refs/heads/feature branch on top of commit 2, consisting of three |
| 1029 | # commits. |
| 1030 | self._commit_git('repo_1', {'commit 7': 'touched'}, base=2) |
| 1031 | self._commit_git('repo_1', {'commit 8': 'touched'}) |
| 1032 | self._commit_git('repo_1', {'commit 9': 'touched'}) |
| 1033 | self._create_ref('repo_1', 'refs/heads/feature', 9) |
| 1034 | |
| 1035 | # Create a change of top of commit 8. |
| 1036 | self._commit_git('repo_1', |
| 1037 | {'commit 10': 'touched', |
| 1038 | 'change': '1236'}, |
| 1039 | base=8) |
| 1040 | self._create_ref('repo_1', 'refs/changes/36/1236/1', 10) |
| 1041 | |
| 1042 | # Create a refs/heads/master-with-5 on top of commit 3 which is a branch |
| 1043 | # where refs/changes/34/1234/1 (commit 5) has already landed as commit 11. |
| 1044 | self._commit_git('repo_1', |
| 1045 | # This is really commit 11, but has the changes of commit 5 |
| 1046 | {'commit 5': 'touched', |
| 1047 | 'change': '1234'}, |
| 1048 | base=3) |
| 1049 | self._commit_git('repo_1', {'commit 12': 'touched'}) |
| 1050 | self._create_ref('repo_1', 'refs/heads/master-with-5', 12) |
| 1051 | |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 1052 | |
| 1053 | class GerritChangesTest(fake_repos.FakeReposTestBase): |
| 1054 | FAKE_REPOS_CLASS = GerritChangesFakeRepo |
| 1055 | |
| 1056 | def setUp(self): |
| 1057 | super(GerritChangesTest, self).setUp() |
| 1058 | self.enabled = self.FAKE_REPOS.set_up_git() |
| 1059 | self.options = BaseGitWrapperTestCase.OptionsObject() |
| 1060 | self.url = self.git_base + 'repo_1' |
| 1061 | self.mirror = None |
| 1062 | |
| 1063 | def setUpMirror(self): |
| 1064 | self.mirror = tempfile.mkdtemp() |
| 1065 | git_cache.Mirror.SetCachePath(self.mirror) |
| 1066 | self.addCleanup(rmtree, self.mirror) |
| 1067 | self.addCleanup(git_cache.Mirror.SetCachePath, None) |
| 1068 | |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1069 | def assertCommits(self, commits): |
| 1070 | """Check that all, and only |commits| are present in the current checkout. |
| 1071 | """ |
| 1072 | for i in commits: |
| 1073 | name = os.path.join(self.root_dir, 'commit ' + str(i)) |
Edward Lemur | 6a4e31b | 2018-08-10 19:59:02 +0000 | [diff] [blame] | 1074 | self.assertTrue(os.path.exists(name), 'Commit not found: %s' % name) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1075 | |
| 1076 | all_commits = set(range(1, len(self.FAKE_REPOS.git_hashes['repo_1']))) |
| 1077 | for i in all_commits - set(commits): |
| 1078 | name = os.path.join(self.root_dir, 'commit ' + str(i)) |
Edward Lemur | 6a4e31b | 2018-08-10 19:59:02 +0000 | [diff] [blame] | 1079 | self.assertFalse(os.path.exists(name), 'Unexpected commit: %s' % name) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1080 | |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 1081 | def testCanCloneGerritChange(self): |
| 1082 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1083 | file_list = [] |
| 1084 | |
| 1085 | self.options.revision = 'refs/changes/35/1235/1' |
| 1086 | scm.update(self.options, None, file_list) |
| 1087 | self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir)) |
| 1088 | |
| 1089 | def testCanSyncToGerritChange(self): |
| 1090 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1091 | file_list = [] |
| 1092 | |
| 1093 | self.options.revision = self.githash('repo_1', 1) |
| 1094 | scm.update(self.options, None, file_list) |
| 1095 | self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir)) |
| 1096 | |
| 1097 | self.options.revision = 'refs/changes/35/1235/1' |
| 1098 | scm.update(self.options, None, file_list) |
| 1099 | self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir)) |
| 1100 | |
| 1101 | def testCanCloneGerritChangeMirror(self): |
| 1102 | self.setUpMirror() |
| 1103 | self.testCanCloneGerritChange() |
| 1104 | |
| 1105 | def testCanSyncToGerritChangeMirror(self): |
| 1106 | self.setUpMirror() |
| 1107 | self.testCanSyncToGerritChange() |
| 1108 | |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1109 | def testAppliesPatchOnTopOfMasterByDefault(self): |
| 1110 | """Test the default case, where we apply a patch on top of master.""" |
| 1111 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1112 | file_list = [] |
| 1113 | |
| 1114 | # Make sure we don't specify a revision. |
| 1115 | self.options.revision = None |
| 1116 | scm.update(self.options, None, file_list) |
| 1117 | self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir)) |
| 1118 | |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1119 | scm.apply_patch_ref( |
| 1120 | self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options, |
| 1121 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1122 | |
| 1123 | self.assertCommits([1, 2, 3, 4, 5, 6]) |
| 1124 | self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir)) |
| 1125 | |
| 1126 | def testCheckoutOlderThanPatchBase(self): |
| 1127 | """Test applying a patch on an old checkout. |
| 1128 | |
| 1129 | We first checkout commit 1, and try to patch refs/changes/35/1235/1, which |
| 1130 | contains commits 5 and 6, and is based on top of commit 3. |
| 1131 | The final result should contain commits 1, 5 and 6, but not commits 2 or 3. |
| 1132 | """ |
| 1133 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1134 | file_list = [] |
| 1135 | |
| 1136 | # Sync to commit 1 |
| 1137 | self.options.revision = self.githash('repo_1', 1) |
| 1138 | scm.update(self.options, None, file_list) |
| 1139 | self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir)) |
| 1140 | |
| 1141 | # Apply the change on top of that. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1142 | scm.apply_patch_ref( |
| 1143 | self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options, |
| 1144 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1145 | |
| 1146 | self.assertCommits([1, 5, 6]) |
| 1147 | self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir)) |
| 1148 | |
| 1149 | def testCheckoutOriginFeature(self): |
| 1150 | """Tests that we can apply a patch on a branch other than master.""" |
| 1151 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1152 | file_list = [] |
| 1153 | |
Edward Lemur | 8c66565 | 2019-05-08 20:23:33 +0000 | [diff] [blame] | 1154 | # Sync to remote's refs/heads/feature |
| 1155 | self.options.revision = 'refs/heads/feature' |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1156 | scm.update(self.options, None, file_list) |
| 1157 | self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir)) |
| 1158 | |
| 1159 | # Apply the change on top of that. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1160 | scm.apply_patch_ref( |
| 1161 | self.url, 'refs/changes/36/1236/1', 'refs/heads/feature', self.options, |
| 1162 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1163 | |
| 1164 | self.assertCommits([1, 2, 7, 8, 9, 10]) |
| 1165 | self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir)) |
| 1166 | |
| 1167 | def testCheckoutOriginFeatureOnOldRevision(self): |
| 1168 | """Tests that we can apply a patch on an old checkout, on a branch other |
| 1169 | than master.""" |
| 1170 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1171 | file_list = [] |
| 1172 | |
Edward Lemur | 8c66565 | 2019-05-08 20:23:33 +0000 | [diff] [blame] | 1173 | # Sync to remote's refs/heads/feature on an old revision |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1174 | self.options.revision = self.githash('repo_1', 7) |
| 1175 | scm.update(self.options, None, file_list) |
| 1176 | self.assertEqual(self.githash('repo_1', 7), self.gitrevparse(self.root_dir)) |
| 1177 | |
| 1178 | # Apply the change on top of that. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1179 | scm.apply_patch_ref( |
| 1180 | self.url, 'refs/changes/36/1236/1', 'refs/heads/feature', self.options, |
| 1181 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1182 | |
| 1183 | # We shouldn't have rebased on top of 2 (which is the merge base between |
Edward Lemur | 8c66565 | 2019-05-08 20:23:33 +0000 | [diff] [blame] | 1184 | # remote's master branch and the change) but on top of 7 (which is the |
| 1185 | # merge base between remote's feature branch and the change). |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1186 | self.assertCommits([1, 2, 7, 10]) |
| 1187 | self.assertEqual(self.githash('repo_1', 7), self.gitrevparse(self.root_dir)) |
| 1188 | |
Edward Lemur | 6a4e31b | 2018-08-10 19:59:02 +0000 | [diff] [blame] | 1189 | def testCheckoutOriginFeaturePatchBranch(self): |
| 1190 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1191 | file_list = [] |
| 1192 | |
Edward Lemur | 8c66565 | 2019-05-08 20:23:33 +0000 | [diff] [blame] | 1193 | # Sync to the hash instead of remote's refs/heads/feature. |
Edward Lemur | 6a4e31b | 2018-08-10 19:59:02 +0000 | [diff] [blame] | 1194 | self.options.revision = self.githash('repo_1', 9) |
| 1195 | scm.update(self.options, None, file_list) |
| 1196 | self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir)) |
| 1197 | |
Edward Lemur | 8c66565 | 2019-05-08 20:23:33 +0000 | [diff] [blame] | 1198 | # Apply refs/changes/34/1234/1, created for remote's master branch on top of |
| 1199 | # remote's feature branch. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1200 | scm.apply_patch_ref( |
| 1201 | self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options, |
| 1202 | file_list) |
Edward Lemur | 6a4e31b | 2018-08-10 19:59:02 +0000 | [diff] [blame] | 1203 | |
| 1204 | # Commits 5 and 6 are part of the patch, and commits 1, 2, 7, 8 and 9 are |
Edward Lemur | 8c66565 | 2019-05-08 20:23:33 +0000 | [diff] [blame] | 1205 | # part of remote's feature branch. |
Edward Lemur | 6a4e31b | 2018-08-10 19:59:02 +0000 | [diff] [blame] | 1206 | self.assertCommits([1, 2, 5, 6, 7, 8, 9]) |
| 1207 | self.assertEqual(self.githash('repo_1', 9), self.gitrevparse(self.root_dir)) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1208 | |
| 1209 | def testDoesntRebasePatchMaster(self): |
| 1210 | """Tests that we can apply a patch without rebasing it. |
| 1211 | """ |
| 1212 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1213 | file_list = [] |
| 1214 | |
| 1215 | self.options.rebase_patch_ref = False |
| 1216 | scm.update(self.options, None, file_list) |
| 1217 | self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir)) |
| 1218 | |
| 1219 | # Apply the change on top of that. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1220 | scm.apply_patch_ref( |
| 1221 | self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options, |
| 1222 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1223 | |
| 1224 | self.assertCommits([1, 2, 3, 5, 6]) |
| 1225 | self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir)) |
| 1226 | |
| 1227 | def testDoesntRebasePatchOldCheckout(self): |
| 1228 | """Tests that we can apply a patch without rebasing it on an old checkout. |
| 1229 | """ |
| 1230 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1231 | file_list = [] |
| 1232 | |
| 1233 | # Sync to commit 1 |
| 1234 | self.options.revision = self.githash('repo_1', 1) |
| 1235 | self.options.rebase_patch_ref = False |
| 1236 | scm.update(self.options, None, file_list) |
| 1237 | self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir)) |
| 1238 | |
| 1239 | # Apply the change on top of that. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1240 | scm.apply_patch_ref( |
| 1241 | self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options, |
| 1242 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1243 | |
| 1244 | self.assertCommits([1, 2, 3, 5, 6]) |
| 1245 | self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir)) |
| 1246 | |
| 1247 | def testDoesntSoftResetIfNotAskedTo(self): |
| 1248 | """Test that we can apply a patch without doing a soft reset.""" |
| 1249 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1250 | file_list = [] |
| 1251 | |
| 1252 | self.options.reset_patch_ref = False |
| 1253 | scm.update(self.options, None, file_list) |
| 1254 | self.assertEqual(self.githash('repo_1', 4), self.gitrevparse(self.root_dir)) |
| 1255 | |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1256 | scm.apply_patch_ref( |
| 1257 | self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options, |
| 1258 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1259 | |
| 1260 | self.assertCommits([1, 2, 3, 4, 5, 6]) |
| 1261 | # The commit hash after cherry-picking is not known, but it must be |
| 1262 | # different from what the repo was synced at before patching. |
| 1263 | self.assertNotEqual(self.githash('repo_1', 4), |
| 1264 | self.gitrevparse(self.root_dir)) |
| 1265 | |
| 1266 | def testRecoversAfterPatchFailure(self): |
| 1267 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1268 | file_list = [] |
| 1269 | |
| 1270 | self.options.revision = 'refs/changes/34/1234/1' |
| 1271 | scm.update(self.options, None, file_list) |
| 1272 | self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir)) |
| 1273 | |
| 1274 | # Checkout 'refs/changes/34/1234/1' modifies the 'change' file, so trying to |
| 1275 | # patch 'refs/changes/36/1236/1' creates a patch failure. |
| 1276 | with self.assertRaises(subprocess2.CalledProcessError) as cm: |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1277 | scm.apply_patch_ref( |
| 1278 | self.url, 'refs/changes/36/1236/1', 'refs/heads/master', self.options, |
| 1279 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1280 | self.assertEqual(cm.exception.cmd[:2], ['git', 'cherry-pick']) |
Edward Lemur | 979fa78 | 2019-08-13 22:44:05 +0000 | [diff] [blame] | 1281 | self.assertIn(b'error: could not apply', cm.exception.stderr) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1282 | |
| 1283 | # Try to apply 'refs/changes/35/1235/1', which doesn't have a merge |
| 1284 | # conflict. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1285 | scm.apply_patch_ref( |
| 1286 | self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options, |
| 1287 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1288 | self.assertCommits([1, 2, 3, 5, 6]) |
| 1289 | self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir)) |
| 1290 | |
| 1291 | def testIgnoresAlreadyMergedCommits(self): |
| 1292 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1293 | file_list = [] |
| 1294 | |
| 1295 | self.options.revision = 'refs/heads/master-with-5' |
| 1296 | scm.update(self.options, None, file_list) |
| 1297 | self.assertEqual(self.githash('repo_1', 12), |
| 1298 | self.gitrevparse(self.root_dir)) |
| 1299 | |
| 1300 | # When we try 'refs/changes/35/1235/1' on top of 'refs/heads/feature', |
| 1301 | # 'refs/changes/34/1234/1' will be an empty commit, since the changes were |
| 1302 | # already present in the tree as commit 11. |
| 1303 | # Make sure we deal with this gracefully. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1304 | scm.apply_patch_ref( |
| 1305 | self.url, 'refs/changes/35/1235/1', 'refs/heads/feature', self.options, |
| 1306 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1307 | self.assertCommits([1, 2, 3, 5, 6, 12]) |
| 1308 | self.assertEqual(self.githash('repo_1', 12), |
| 1309 | self.gitrevparse(self.root_dir)) |
| 1310 | |
| 1311 | def testRecoversFromExistingCherryPick(self): |
| 1312 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1313 | file_list = [] |
| 1314 | |
| 1315 | self.options.revision = 'refs/changes/34/1234/1' |
| 1316 | scm.update(self.options, None, file_list) |
| 1317 | self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir)) |
| 1318 | |
| 1319 | # Checkout 'refs/changes/34/1234/1' modifies the 'change' file, so trying to |
| 1320 | # cherry-pick 'refs/changes/36/1236/1' raises an error. |
| 1321 | scm._Run(['fetch', 'origin', 'refs/changes/36/1236/1'], self.options) |
| 1322 | with self.assertRaises(subprocess2.CalledProcessError) as cm: |
| 1323 | scm._Run(['cherry-pick', 'FETCH_HEAD'], self.options) |
| 1324 | self.assertEqual(cm.exception.cmd[:2], ['git', 'cherry-pick']) |
| 1325 | |
| 1326 | # Try to apply 'refs/changes/35/1235/1', which doesn't have a merge |
| 1327 | # conflict. |
Edward Lemur | 4c5c8ab | 2019-06-07 15:58:13 +0000 | [diff] [blame] | 1328 | scm.apply_patch_ref( |
| 1329 | self.url, 'refs/changes/35/1235/1', 'refs/heads/master', self.options, |
| 1330 | file_list) |
Edward Lemur | ca7d881 | 2018-07-24 17:42:45 +0000 | [diff] [blame] | 1331 | self.assertCommits([1, 2, 3, 5, 6]) |
| 1332 | self.assertEqual(self.githash('repo_1', 5), self.gitrevparse(self.root_dir)) |
| 1333 | |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 1334 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1335 | if __name__ == '__main__': |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 1336 | level = logging.DEBUG if '-v' in sys.argv else logging.FATAL |
| 1337 | logging.basicConfig( |
| 1338 | level=level, |
| 1339 | format='%(asctime).19s %(levelname)s %(filename)s:' |
| 1340 | '%(lineno)s %(message)s') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1341 | unittest.main() |
| 1342 | |
| 1343 | # vim: ts=2:sw=2:tw=80:et: |