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
|
require "test_helper"
class TestRebase < Rugged::TestCase
def setup
@repo = FixtureRepo.from_libgit2("rebase")
@sig = {
name: "Rebaser",
email: "rebaser@rebaser.rb",
time: Time.at(1405694510),
time_offset: 0,
}
end
def test_rebase_inmemory_with_commits
branch = @repo.branches["beef"].target
upstream = @repo.branches["master"].target
rebase = Rugged::Rebase.new(@repo, branch, upstream, inmemory: true)
assert_equal({
type: :pick,
id: "da9c51a23d02d931a486f45ad18cda05cf5d2b94"
}, rebase.next)
rebase.abort
end
def test_rebase_inmemory_with_refs
branch = @repo.branches["beef"]
upstream = @repo.branches["master"]
rebase = Rugged::Rebase.new(@repo, branch, upstream, inmemory: true)
assert_equal({
type: :pick,
id: "da9c51a23d02d931a486f45ad18cda05cf5d2b94"
}, rebase.next)
rebase.abort
end
def test_rebase_inmemory_with_revparse
branch = @repo.branches["beef"].target.oid[0..8]
upstream = @repo.branches["master"].target.oid[0..8]
rebase = Rugged::Rebase.new(@repo, branch, upstream, inmemory: true)
assert_equal({
type: :pick,
id: "da9c51a23d02d931a486f45ad18cda05cf5d2b94"
}, rebase.next)
rebase.abort
end
def test_merge_next
rebase = Rugged::Rebase.new(@repo, "refs/heads/beef", "refs/heads/master")
op = rebase.next()
assert_equal :pick, op[:type]
assert_equal "da9c51a23d02d931a486f45ad18cda05cf5d2b94", op[:id]
statuses = []
@repo.status do |file, status|
statuses << [file, status]
end
assert_equal 1, statuses.length
assert_equal "beef.txt", statuses[0][0]
rebase.abort()
end
def test_merge_finish
rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal")
op = rebase.next()
rebase.commit(committer: @sig)
op = rebase.next()
assert_nil op
rebase.finish(@sig)
end
def test_merge_commit_fails_without_options
rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal")
rebase.next()
assert_raises TypeError do
rebase.commit()
end
end
def test_merge_commit_fails_with_nil_committer
rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal")
rebase.next()
assert_raises ArgumentError do
rebase.commit(committer: nil)
end
end
def test_merge_options
rebase = Rugged::Rebase.new(@repo, "refs/heads/asparagus", "refs/heads/master",
fail_on_conflict: true, skip_reuc: true)
assert_raises(Rugged::MergeError) { rebase.next() }
rebase.abort()
end
def test_inmemory_resolve_conflicts
rebase = Rugged::Rebase.new(@repo, "refs/heads/asparagus", "refs/heads/master", inmemory: true)
op = rebase.next()
idx = rebase.inmemory_index
assert idx
assert_equal :pick, op[:type]
assert_equal "33f915f9e4dbd9f4b24430e48731a59b45b15500", op[:id]
assert !@repo.index.conflicts?
assert idx.conflicts?
# We can't commit with conflicts pending
assert_raises(Rugged::RebaseError) { rebase.commit(committer: @sig) }
# But we can fix those conflicts in the in-memory index
idx.conflict_remove("asparagus.txt")
idx.add(path: "asparagus.txt", oid: "414dfc71ead79c07acd4ea47fecf91f289afc4b9", mode: 0100644)
assert !idx.conflicts?
commit_id = rebase.commit(committer: @sig)
assert_equal "db7af47222181e548810da2ab5fec0e9357c5637", commit_id
# Make sure the next operation is what we expect
op = rebase.next()
assert_equal :pick, op[:type]
assert_equal "0f5f6d3353be1a9966fa5767b7d604b051798224", op[:id]
end
def test_inmemory_already_applied_patch
rebase = Rugged::Rebase.new(@repo, "refs/heads/asparagus", "refs/heads/master", inmemory: true)
rebase.next()
idx = rebase.inmemory_index
idx.read_tree(@repo.branches["master"].target.tree)
assert_nil rebase.commit(committer: @sig)
# Make sure the next operation is what we expect
op = rebase.next()
assert_equal :pick, op[:type]
assert_equal "0f5f6d3353be1a9966fa5767b7d604b051798224", op[:id]
end
def test_rebase_does_not_lose_files
Rugged::Commit.create(@repo, {
:author => { :email => "rebaser@rebaser.com", :time => Time.now, :name => "Rebaser" },
:committer => { :email => "rebaser@rebaser.com", :time => Time.now, :name => "Rebaser" },
:message => "Add some files",
:parents => [ @repo.branches["gravy"].target_id ],
:update_ref => "refs/heads/gravy",
:tree => @repo.branches["gravy"].target.tree.update([
{ :action => :upsert,
:path => "some/nested/file",
:oid => Rugged::Blob.from_buffer(@repo, "a new blob content"),
:filemode => 0100644
}
])
})
rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal")
assert rebase.next
assert rebase.commit(committer: { :email => "rebaser@rebaser.com", :name => "Rebaser" })
assert rebase.next
assert rebase.commit(committer: { :email => "rebaser@rebaser.com", :name => "Rebaser" })
end
def test_inmemory_rebase_does_not_lose_files
Rugged::Commit.create(@repo, {
:author => { :email => "rebaser@rebaser.com", :time => Time.now, :name => "Rebaser" },
:committer => { :email => "rebaser@rebaser.com", :time => Time.now, :name => "Rebaser" },
:message => "Add some files",
:parents => [ @repo.branches["gravy"].target_id ],
:update_ref => "refs/heads/gravy",
:tree => @repo.branches["gravy"].target.tree.update([
{ :action => :upsert,
:path => "some/nested/file",
:oid => Rugged::Blob.from_buffer(@repo, "a new blob content"),
:filemode => 0100644
}
])
})
rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal", inmemory: true)
assert rebase.next
assert rebase.commit(committer: { :email => "rebaser@rebaser.com", :name => "Rebaser" })
assert rebase.next
assert rebase.commit(committer: { :email => "rebaser@rebaser.com", :name => "Rebaser" })
end
end
|
