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
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
/*
* Copyright (C) 2014, Christian Halstrick <christian.halstrick@sap.com>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Distribution License v1.0 which
* accompanies this distribution, is reproduced below, and is
* available at http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.lib;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.errors.NoWorkTreeException;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.junit.JGitTestUtil;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode;
import org.eclipse.jgit.treewalk.FileTreeIterator;
import org.junit.Before;
import org.junit.experimental.theories.DataPoints;
import org.junit.experimental.theories.Theories;
import org.junit.experimental.theories.Theory;
import org.junit.runner.RunWith;
@RunWith(Theories.class)
public class IndexDiffSubmoduleTest extends RepositoryTestCase {
/** a submodule repository inside a root repository */
protected FileRepository submodule_db;
/** Working directory of the submodule repository */
protected File submodule_trash;
@DataPoints
public static IgnoreSubmoduleMode allModes[] = IgnoreSubmoduleMode.values();
@Override
@Before
public void setUp() throws Exception {
super.setUp();
FileRepository submoduleStandalone = createWorkRepository();
JGitTestUtil.writeTrashFile(submoduleStandalone, "fileInSubmodule",
"submodule");
Git submoduleStandaloneGit = Git.wrap(submoduleStandalone);
submoduleStandaloneGit.add().addFilepattern("fileInSubmodule").call();
submoduleStandaloneGit.commit().setMessage("add file to submodule")
.call();
submodule_db = (FileRepository) Git.wrap(db).submoduleAdd()
.setPath("modules/submodule")
.setURI(submoduleStandalone.getDirectory().toURI().toString())
.call();
submoduleStandalone.close();
submodule_trash = submodule_db.getWorkTree();
addRepoToClose(submodule_db);
writeTrashFile("fileInRoot", "root");
Git rootGit = Git.wrap(db);
rootGit.add().addFilepattern("fileInRoot").call();
rootGit.commit().setMessage("add submodule and root file").call();
}
@Theory
public void testInitiallyClean(IgnoreSubmoduleMode mode)
throws IOException {
IndexDiff indexDiff = new IndexDiff(db, Constants.HEAD,
new FileTreeIterator(db));
indexDiff.setIgnoreSubmoduleMode(mode);
assertFalse(indexDiff.diff());
}
@Theory
public void testDirtyRootWorktree(IgnoreSubmoduleMode mode)
throws IOException {
writeTrashFile("fileInRoot", "2");
IndexDiff indexDiff = new IndexDiff(db, Constants.HEAD,
new FileTreeIterator(db));
indexDiff.setIgnoreSubmoduleMode(mode);
assertTrue(indexDiff.diff());
}
@Theory
public void testDirtySubmoduleWorktree(IgnoreSubmoduleMode mode)
throws IOException {
JGitTestUtil.writeTrashFile(submodule_db, "fileInSubmodule", "2");
IndexDiff indexDiff = new IndexDiff(db, Constants.HEAD,
new FileTreeIterator(db));
indexDiff.setIgnoreSubmoduleMode(mode);
if (mode.equals(IgnoreSubmoduleMode.ALL)
|| mode.equals(IgnoreSubmoduleMode.DIRTY))
assertFalse("diff should be false with mode=" + mode,
indexDiff.diff());
else
assertTrue("diff should be true with mode=" + mode,
indexDiff.diff());
}
@Theory
public void testDirtySubmoduleHEAD(IgnoreSubmoduleMode mode)
throws IOException, GitAPIException {
JGitTestUtil.writeTrashFile(submodule_db, "fileInSubmodule", "2");
Git submoduleGit = Git.wrap(submodule_db);
submoduleGit.add().addFilepattern("fileInSubmodule").call();
submoduleGit.commit().setMessage("Modified fileInSubmodule").call();
IndexDiff indexDiff = new IndexDiff(db, Constants.HEAD,
new FileTreeIterator(db));
indexDiff.setIgnoreSubmoduleMode(mode);
if (mode.equals(IgnoreSubmoduleMode.ALL))
assertFalse("diff should be false with mode=" + mode,
indexDiff.diff());
else
assertTrue("diff should be true with mode=" + mode,
indexDiff.diff());
}
@Theory
public void testDirtySubmoduleIndex(IgnoreSubmoduleMode mode)
throws IOException, GitAPIException {
JGitTestUtil.writeTrashFile(submodule_db, "fileInSubmodule", "2");
Git submoduleGit = Git.wrap(submodule_db);
submoduleGit.add().addFilepattern("fileInSubmodule").call();
IndexDiff indexDiff = new IndexDiff(db, Constants.HEAD,
new FileTreeIterator(db));
indexDiff.setIgnoreSubmoduleMode(mode);
if (mode.equals(IgnoreSubmoduleMode.ALL)
|| mode.equals(IgnoreSubmoduleMode.DIRTY))
assertFalse("diff should be false with mode=" + mode,
indexDiff.diff());
else
assertTrue("diff should be true with mode=" + mode,
indexDiff.diff());
}
@Theory
public void testDirtySubmoduleIndexAndWorktree(IgnoreSubmoduleMode mode)
throws IOException, GitAPIException, NoWorkTreeException {
JGitTestUtil.writeTrashFile(submodule_db, "fileInSubmodule", "2");
Git submoduleGit = Git.wrap(submodule_db);
submoduleGit.add().addFilepattern("fileInSubmodule").call();
JGitTestUtil.writeTrashFile(submodule_db, "fileInSubmodule", "3");
IndexDiff indexDiff = new IndexDiff(db, Constants.HEAD,
new FileTreeIterator(db));
indexDiff.setIgnoreSubmoduleMode(mode);
if (mode.equals(IgnoreSubmoduleMode.ALL)
|| mode.equals(IgnoreSubmoduleMode.DIRTY))
assertFalse("diff should be false with mode=" + mode,
indexDiff.diff());
else
assertTrue("diff should be true with mode=" + mode,
indexDiff.diff());
}
@Theory
public void testDirtySubmoduleWorktreeUntracked(IgnoreSubmoduleMode mode)
throws IOException {
JGitTestUtil.writeTrashFile(submodule_db, "additionalFileInSubmodule",
"2");
IndexDiff indexDiff = new IndexDiff(db, Constants.HEAD,
new FileTreeIterator(db));
indexDiff.setIgnoreSubmoduleMode(mode);
if (mode.equals(IgnoreSubmoduleMode.ALL)
|| mode.equals(IgnoreSubmoduleMode.DIRTY)
|| mode.equals(IgnoreSubmoduleMode.UNTRACKED))
assertFalse("diff should be false with mode=" + mode,
indexDiff.diff());
else
assertTrue("diff should be true with mode=" + mode,
indexDiff.diff());
}
}
|
