1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package git4idea.test
import git4idea.repo.GitRepository
import static GitExecutor.*;
/**
* Create popular scenarios used in multiple tests, for example:
* - create a branch and commit something there;
* - make some unmerged files in the working tree;
* - make the situation when local changes would be overwritten by merge.
*
* @author Kirill Likhodedov
*/
class GitScenarios {
private static final String BRANCH_FOR_UNMERGED_CONFLICTS = "unmerged_files_branch_" + Math.random();
static final def LOCAL_CHANGES_OVERWRITTEN_BY = [
initial: "common content\ncommon content\ncommon content\n",
branchLine: "line with branch changes\n",
masterLine: "line with master changes"
]
/**
* Create a branch with a commit and return back to master.
*/
static def branchWithCommit(GitRepository repository, String name, String file = "branch_file.txt", String content = "branch content",
boolean returnToMaster = true) {
cd repository
git("checkout -b $name")
touch(file, content)
git("add $file")
git("commit -m branch_content")
if (returnToMaster) {
git("checkout master")
}
}
/**
* Create a branch with a commit and return back to master.
*/
static def branchWithCommit(Collection<GitRepository> repositories, String name,
String file = "branch_file.txt", String content = "branch content") {
repositories.each { branchWithCommit(it, name, file, content) }
}
/**
* Make an unmerged file in the repository.
*/
static def unmergedFiles(GitRepository repository) {
conflict(repository, BRANCH_FOR_UNMERGED_CONFLICTS, "unmerged.txt")
git("merge $BRANCH_FOR_UNMERGED_CONFLICTS", true)
git("branch -D $BRANCH_FOR_UNMERGED_CONFLICTS")
}
/**
* Creates a branch with the given name, and produces conflicted content in a file between this branch and master.
* Branch must not exist at this point.
*/
static def conflict(GitRepository repository, String branch, String file="conflict.txt") {
assert "Branch [$branch] shouldn't exist for this scenario" : !branchExists(repository, branch)
cd repository
touch(file, "initial content")
git("add $file")
git("commit -m initial_content")
git("checkout -b $branch")
echo(file, "branch content")
git("commit -am branch_content")
git("checkout master")
echo(file, "master content")
git("commit -am master_content")
}
/**
* Create an untracked file in master and a tracked file with the same name in the branch.
* This produces the "some untracked files would be overwritten by..." error when trying to checkout or merge.
* Branch with the given name shall exist.
*/
static def untrackedFileOverwrittenBy(GitRepository repository, String branch, Collection<String> fileNames) {
cd repository
git("checkout $branch")
for (it in fileNames) {
touch(it, "branch content")
git("add $it")
}
git("commit -m untracked_files")
git("checkout master")
for (it in fileNames) {
touch(it, "master content")
}
}
/**
* Creates a file in both master and branch so that the content differs, but can be merged without conflicts.
* That way, git checkout/merge will fail with "local changes would be overwritten by checkout/merge",
* but smart checkout/merge (stash-checkout/merge-unstash) would succeed without conflicts.
*
* NB: the branch should not exist before this is called!
*/
static def localChangesOverwrittenByWithoutConflict(GitRepository repository, String branch, Collection<String> fileNames) {
cd repository
for (it in fileNames) {
echo(it, LOCAL_CHANGES_OVERWRITTEN_BY.initial)
git("add $it")
}
git("commit -m initial_changes")
git("checkout -b $branch")
for (it in fileNames) {
prepend(it, LOCAL_CHANGES_OVERWRITTEN_BY.branchLine)
git("add $it")
}
git("commit -m branch_changes")
git("checkout master")
for (it in fileNames) {
append1(it, LOCAL_CHANGES_OVERWRITTEN_BY.masterLine)
}
}
static def append1(String fileName, String content) {
echo(fileName, content)
}
static def prepend(String fileName, String content) {
def previousContent = cat(fileName)
new File(pwd(), fileName).withWriter("UTF-8") { it.write(content + previousContent) }
}
static def commit(GitRepository repository, String file = "just_a_file_${Math.random()}.txt") {
cd repository
touch(file)
git("add $file")
git("commit -m just_a_commit")
}
public static boolean branchExists(GitRepository repo = null, String branch) {
git(repo, "branch").contains(branch)
}
public static void checkoutOrCreate(GitRepository repository = null, String branch) {
if (branch.equals("master") || branchExists(repository, branch)) {
git("checkout $branch")
}
else {
git("checkout -b $branch")
}
}
public static void checkout(String branch) {
git("checkout " + branch);
}
}
|
