/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/tests/test_builder.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_builder.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Test our ability to build up test repositories"""
18
18
 
19
 
from cStringIO import StringIO
20
 
 
21
 
from bzrlib.plugins.git import tests
 
19
from __future__ import absolute_import
 
20
 
 
21
from io import BytesIO
 
22
 
 
23
from dulwich.repo import Repo as GitRepo
 
24
 
 
25
from .. import tests
22
26
 
23
27
 
24
28
class TestGitBranchBuilder(tests.TestCase):
25
29
 
26
30
    def test__create_blob(self):
27
 
        stream = StringIO()
 
31
        stream = BytesIO()
28
32
        builder = tests.GitBranchBuilder(stream)
29
 
        self.assertEqual(1, builder._create_blob('foo\nbar\n'))
30
 
        self.assertEqualDiff('blob\nmark :1\ndata 8\nfoo\nbar\n\n',
 
33
        self.assertEqual(1, builder._create_blob(b'foo\nbar\n'))
 
34
        self.assertEqualDiff(b'blob\nmark :1\ndata 8\nfoo\nbar\n\n',
31
35
                             stream.getvalue())
32
36
 
33
37
    def test_set_file(self):
34
 
        stream = StringIO()
 
38
        stream = BytesIO()
35
39
        builder = tests.GitBranchBuilder(stream)
36
 
        builder.set_file('foobar', 'foo\nbar\n', False)
37
 
        self.assertEqualDiff('blob\nmark :1\ndata 8\nfoo\nbar\n\n',
 
40
        builder.set_file('foobar', b'foo\nbar\n', False)
 
41
        self.assertEqualDiff(b'blob\nmark :1\ndata 8\nfoo\nbar\n\n',
38
42
                             stream.getvalue())
39
 
        self.assertEqual(['M 100644 :1 foobar\n'], builder.commit_info)
 
43
        self.assertEqual([b'M 100644 :1 foobar\n'], builder.commit_info)
40
44
 
41
45
    def test_set_file_unicode(self):
42
 
        stream = StringIO()
 
46
        stream = BytesIO()
43
47
        builder = tests.GitBranchBuilder(stream)
44
 
        builder.set_file(u'f\xb5/bar', 'contents\nbar\n', False)
45
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
 
48
        builder.set_file(u'f\xb5/bar', b'contents\nbar\n', False)
 
49
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\ncontents\nbar\n\n',
46
50
                             stream.getvalue())
47
 
        self.assertEqual(['M 100644 :1 f\xc2\xb5/bar\n'], builder.commit_info)
 
51
        self.assertEqual([b'M 100644 :1 f\xc2\xb5/bar\n'], builder.commit_info)
48
52
 
49
53
    def test_set_file_newline(self):
50
 
        stream = StringIO()
 
54
        stream = BytesIO()
51
55
        builder = tests.GitBranchBuilder(stream)
52
 
        builder.set_file(u'foo\nbar', 'contents\nbar\n', False)
53
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
 
56
        builder.set_file(u'foo\nbar', b'contents\nbar\n', False)
 
57
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\ncontents\nbar\n\n',
54
58
                             stream.getvalue())
55
 
        self.assertEqual(['M 100644 :1 "foo\\nbar"\n'], builder.commit_info)
 
59
        self.assertEqual([b'M 100644 :1 "foo\\nbar"\n'], builder.commit_info)
56
60
 
57
61
    def test_set_file_executable(self):
58
 
        stream = StringIO()
59
 
        builder = tests.GitBranchBuilder(stream)
60
 
        builder.set_file(u'f\xb5/bar', 'contents\nbar\n', True)
61
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
62
 
                             stream.getvalue())
63
 
        self.assertEqual(['M 100755 :1 f\xc2\xb5/bar\n'], builder.commit_info)
64
 
 
65
 
    def test_set_link(self):
66
 
        stream = StringIO()
67
 
        builder = tests.GitBranchBuilder(stream)
68
 
        builder.set_link(u'f\xb5/bar', 'link/contents')
69
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\nlink/contents\n',
70
 
                             stream.getvalue())
71
 
        self.assertEqual(['M 120000 :1 f\xc2\xb5/bar\n'], builder.commit_info)
72
 
 
73
 
    def test_set_link_newline(self):
74
 
        stream = StringIO()
75
 
        builder = tests.GitBranchBuilder(stream)
76
 
        builder.set_link(u'foo\nbar', 'link/contents')
77
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\nlink/contents\n',
78
 
                             stream.getvalue())
79
 
        self.assertEqual(['M 120000 :1 "foo\\nbar"\n'], builder.commit_info)
 
62
        stream = BytesIO()
 
63
        builder = tests.GitBranchBuilder(stream)
 
64
        builder.set_file(u'f\xb5/bar', b'contents\nbar\n', True)
 
65
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\ncontents\nbar\n\n',
 
66
                             stream.getvalue())
 
67
        self.assertEqual([b'M 100755 :1 f\xc2\xb5/bar\n'], builder.commit_info)
 
68
 
 
69
    def test_set_symlink(self):
 
70
        stream = BytesIO()
 
71
        builder = tests.GitBranchBuilder(stream)
 
72
        builder.set_symlink(u'f\xb5/bar', b'link/contents')
 
73
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\nlink/contents\n',
 
74
                             stream.getvalue())
 
75
        self.assertEqual([b'M 120000 :1 f\xc2\xb5/bar\n'], builder.commit_info)
 
76
 
 
77
    def test_set_symlink_newline(self):
 
78
        stream = BytesIO()
 
79
        builder = tests.GitBranchBuilder(stream)
 
80
        builder.set_symlink(u'foo\nbar', 'link/contents')
 
81
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\nlink/contents\n',
 
82
                             stream.getvalue())
 
83
        self.assertEqual([b'M 120000 :1 "foo\\nbar"\n'], builder.commit_info)
80
84
 
81
85
    def test_delete_entry(self):
82
 
        stream = StringIO()
 
86
        stream = BytesIO()
83
87
        builder = tests.GitBranchBuilder(stream)
84
88
        builder.delete_entry(u'path/to/f\xb5')
85
 
        self.assertEqual(['D path/to/f\xc2\xb5\n'], builder.commit_info)
 
89
        self.assertEqual([b'D path/to/f\xc2\xb5\n'], builder.commit_info)
86
90
 
87
91
    def test_delete_entry_newline(self):
88
 
        stream = StringIO()
 
92
        stream = BytesIO()
89
93
        builder = tests.GitBranchBuilder(stream)
90
94
        builder.delete_entry(u'path/to/foo\nbar')
91
 
        self.assertEqual(['D "path/to/foo\\nbar"\n'], builder.commit_info)
 
95
        self.assertEqual([b'D "path/to/foo\\nbar"\n'], builder.commit_info)
92
96
 
93
97
    def test_encode_path(self):
94
98
        encode = tests.GitBranchBuilder._encode_path
95
99
        # Unicode is encoded to utf-8
96
 
        self.assertEqual(encode(u'f\xb5'), 'f\xc2\xb5')
 
100
        self.assertEqual(encode(u'f\xb5'), b'f\xc2\xb5')
97
101
        # The name must be quoted if it starts by a double quote or contains a
98
102
        # newline.
99
 
        self.assertEqual(encode(u'"foo'), '"\\"foo"')
100
 
        self.assertEqual(encode(u'fo\no'), '"fo\\no"')
 
103
        self.assertEqual(encode(u'"foo'), b'"\\"foo"')
 
104
        self.assertEqual(encode(u'fo\no'), b'"fo\\no"')
101
105
        # When the name is quoted, all backslash and quote chars must be
102
106
        # escaped.
103
 
        self.assertEqual(encode(u'fo\\o\nbar'), '"fo\\\\o\\nbar"')
104
 
        self.assertEqual(encode(u'fo"o"\nbar'), '"fo\\"o\\"\\nbar"')
 
107
        self.assertEqual(encode(u'fo\\o\nbar'), b'"fo\\\\o\\nbar"')
 
108
        self.assertEqual(encode(u'fo"o"\nbar'), b'"fo\\"o\\"\\nbar"')
105
109
        # Other control chars, such as \r, need not be escaped.
106
 
        self.assertEqual(encode(u'foo\r\nbar'), '"foo\r\\nbar"')
 
110
        self.assertEqual(encode(u'foo\r\nbar'), b'"foo\r\\nbar"')
107
111
 
108
112
    def test_add_and_commit(self):
109
 
        stream = StringIO()
 
113
        stream = BytesIO()
110
114
        builder = tests.GitBranchBuilder(stream)
111
115
 
112
 
        builder.set_file(u'f\xb5/bar', 'contents\nbar\n', False)
113
 
        self.assertEqual(2, builder.commit('Joe Foo <joe@foo.com>',
114
 
                                           u'committing f\xb5/bar',
115
 
                                           timestamp=1194586400,
116
 
                                           timezone='+0100'))
117
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n'
118
 
                             'commit refs/heads/master\n'
119
 
                             'mark :2\n'
120
 
                             'committer Joe Foo <joe@foo.com> 1194586400 +0100\n'
121
 
                             'data 18\n'
122
 
                             'committing f\xc2\xb5/bar'
123
 
                             '\n'
124
 
                             'M 100644 :1 f\xc2\xb5/bar\n'
125
 
                             '\n',
 
116
        builder.set_file(u'f\xb5/bar', b'contents\nbar\n', False)
 
117
        self.assertEqual(b'2', builder.commit(b'Joe Foo <joe@foo.com>',
 
118
                                              u'committing f\xb5/bar',
 
119
                                              timestamp=1194586400,
 
120
                                              timezone=b'+0100'))
 
121
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\ncontents\nbar\n\n'
 
122
                             b'commit refs/heads/master\n'
 
123
                             b'mark :2\n'
 
124
                             b'committer Joe Foo <joe@foo.com> 1194586400 +0100\n'
 
125
                             b'data 18\n'
 
126
                             b'committing f\xc2\xb5/bar'
 
127
                             b'\n'
 
128
                             b'M 100644 :1 f\xc2\xb5/bar\n'
 
129
                             b'\n',
126
130
                             stream.getvalue())
127
131
 
128
132
    def test_commit_base(self):
129
 
        stream = StringIO()
 
133
        stream = BytesIO()
130
134
        builder = tests.GitBranchBuilder(stream)
131
135
 
132
 
        builder.set_file(u'foo', 'contents\nfoo\n', False)
133
 
        r1 = builder.commit('Joe Foo <joe@foo.com>', u'first',
 
136
        builder.set_file(u'foo', b'contents\nfoo\n', False)
 
137
        r1 = builder.commit(b'Joe Foo <joe@foo.com>', u'first',
134
138
                            timestamp=1194586400)
135
 
        r2 = builder.commit('Joe Foo <joe@foo.com>', u'second',
 
139
        r2 = builder.commit(b'Joe Foo <joe@foo.com>', u'second',
136
140
                            timestamp=1194586405)
137
 
        r3 = builder.commit('Joe Foo <joe@foo.com>', u'third',
 
141
        r3 = builder.commit(b'Joe Foo <joe@foo.com>', u'third',
138
142
                            timestamp=1194586410,
139
143
                            base=r1)
140
144
 
141
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
142
 
                             'commit refs/heads/master\n'
143
 
                             'mark :2\n'
144
 
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
145
 
                             'data 5\n'
146
 
                             'first'
147
 
                             '\n'
148
 
                             'M 100644 :1 foo\n'
149
 
                             '\n'
150
 
                             'commit refs/heads/master\n'
151
 
                             'mark :3\n'
152
 
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
153
 
                             'data 6\n'
154
 
                             'second'
155
 
                             '\n'
156
 
                             '\n'
157
 
                             'commit refs/heads/master\n'
158
 
                             'mark :4\n'
159
 
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
160
 
                             'data 5\n'
161
 
                             'third'
162
 
                             '\n'
163
 
                             'from :2\n'
164
 
                             '\n', stream.getvalue())
 
145
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
 
146
                             b'commit refs/heads/master\n'
 
147
                             b'mark :2\n'
 
148
                             b'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
 
149
                             b'data 5\n'
 
150
                             b'first'
 
151
                             b'\n'
 
152
                             b'M 100644 :1 foo\n'
 
153
                             b'\n'
 
154
                             b'commit refs/heads/master\n'
 
155
                             b'mark :3\n'
 
156
                             b'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
 
157
                             b'data 6\n'
 
158
                             b'second'
 
159
                             b'\n'
 
160
                             b'\n'
 
161
                             b'commit refs/heads/master\n'
 
162
                             b'mark :4\n'
 
163
                             b'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
 
164
                             b'data 5\n'
 
165
                             b'third'
 
166
                             b'\n'
 
167
                             b'from :2\n'
 
168
                             b'\n', stream.getvalue())
165
169
 
166
170
    def test_commit_merge(self):
167
 
        stream = StringIO()
 
171
        stream = BytesIO()
168
172
        builder = tests.GitBranchBuilder(stream)
169
173
 
170
 
        builder.set_file(u'foo', 'contents\nfoo\n', False)
171
 
        r1 = builder.commit('Joe Foo <joe@foo.com>', u'first',
 
174
        builder.set_file(u'foo', b'contents\nfoo\n', False)
 
175
        r1 = builder.commit(b'Joe Foo <joe@foo.com>', u'first',
172
176
                            timestamp=1194586400)
173
 
        r2 = builder.commit('Joe Foo <joe@foo.com>', u'second',
 
177
        r2 = builder.commit(b'Joe Foo <joe@foo.com>', u'second',
174
178
                            timestamp=1194586405)
175
 
        r3 = builder.commit('Joe Foo <joe@foo.com>', u'third',
 
179
        r3 = builder.commit(b'Joe Foo <joe@foo.com>', u'third',
176
180
                            timestamp=1194586410,
177
181
                            base=r1)
178
 
        r4 = builder.commit('Joe Foo <joe@foo.com>', u'Merge',
 
182
        r4 = builder.commit(b'Joe Foo <joe@foo.com>', u'Merge',
179
183
                            timestamp=1194586415,
180
184
                            merge=[r2])
181
185
 
182
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
183
 
                             'commit refs/heads/master\n'
184
 
                             'mark :2\n'
185
 
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
186
 
                             'data 5\n'
187
 
                             'first'
188
 
                             '\n'
189
 
                             'M 100644 :1 foo\n'
190
 
                             '\n'
191
 
                             'commit refs/heads/master\n'
192
 
                             'mark :3\n'
193
 
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
194
 
                             'data 6\n'
195
 
                             'second'
196
 
                             '\n'
197
 
                             '\n'
198
 
                             'commit refs/heads/master\n'
199
 
                             'mark :4\n'
200
 
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
201
 
                             'data 5\n'
202
 
                             'third'
203
 
                             '\n'
204
 
                             'from :2\n'
205
 
                             '\n'
206
 
                             'commit refs/heads/master\n'
207
 
                             'mark :5\n'
208
 
                             'committer Joe Foo <joe@foo.com> 1194586415 +0000\n'
209
 
                             'data 5\n'
210
 
                             'Merge'
211
 
                             '\n'
212
 
                             'merge :3\n'
213
 
                             '\n', stream.getvalue())
 
186
        self.assertEqualDiff(b'blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
 
187
                             b'commit refs/heads/master\n'
 
188
                             b'mark :2\n'
 
189
                             b'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
 
190
                             b'data 5\n'
 
191
                             b'first'
 
192
                             b'\n'
 
193
                             b'M 100644 :1 foo\n'
 
194
                             b'\n'
 
195
                             b'commit refs/heads/master\n'
 
196
                             b'mark :3\n'
 
197
                             b'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
 
198
                             b'data 6\n'
 
199
                             b'second'
 
200
                             b'\n'
 
201
                             b'\n'
 
202
                             b'commit refs/heads/master\n'
 
203
                             b'mark :4\n'
 
204
                             b'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
 
205
                             b'data 5\n'
 
206
                             b'third'
 
207
                             b'\n'
 
208
                             b'from :2\n'
 
209
                             b'\n'
 
210
                             b'commit refs/heads/master\n'
 
211
                             b'mark :5\n'
 
212
                             b'committer Joe Foo <joe@foo.com> 1194586415 +0000\n'
 
213
                             b'data 5\n'
 
214
                             b'Merge'
 
215
                             b'\n'
 
216
                             b'merge :3\n'
 
217
                             b'\n', stream.getvalue())
214
218
 
215
219
    def test_auto_timestamp(self):
216
 
        stream = StringIO()
 
220
        stream = BytesIO()
217
221
        builder = tests.GitBranchBuilder(stream)
218
 
        builder.commit('Joe Foo <joe@foo.com>', u'message')
 
222
        builder.commit(b'Joe Foo <joe@foo.com>', u'message')
219
223
        self.assertContainsRe(stream.getvalue(),
220
 
                              r'committer Joe Foo <joe@foo\.com> \d+ \+0000')
 
224
                              br'committer Joe Foo <joe@foo\.com> \d+ \+0000')
221
225
 
222
226
    def test_reset(self):
223
 
        stream = StringIO()
 
227
        stream = BytesIO()
224
228
        builder = tests.GitBranchBuilder(stream)
225
229
        builder.reset()
226
 
        self.assertEqualDiff('reset refs/heads/master\n\n', stream.getvalue())
 
230
        self.assertEqualDiff(b'reset refs/heads/master\n\n', stream.getvalue())
227
231
 
228
232
    def test_reset_named_ref(self):
229
 
        stream = StringIO()
 
233
        stream = BytesIO()
230
234
        builder = tests.GitBranchBuilder(stream)
231
 
        builder.reset('refs/heads/branch')
232
 
        self.assertEqualDiff('reset refs/heads/branch\n\n', stream.getvalue())
 
235
        builder.reset(b'refs/heads/branch')
 
236
        self.assertEqualDiff(b'reset refs/heads/branch\n\n', stream.getvalue())
233
237
 
234
238
    def test_reset_revision(self):
235
 
        stream = StringIO()
 
239
        stream = BytesIO()
236
240
        builder = tests.GitBranchBuilder(stream)
237
 
        builder.reset(mark=123)
 
241
        builder.reset(mark=b'123')
238
242
        self.assertEqualDiff(
239
 
            'reset refs/heads/master\n'
240
 
            'from :123\n'
241
 
            '\n', stream.getvalue())
 
243
            b'reset refs/heads/master\n'
 
244
            b'from :123\n'
 
245
            b'\n', stream.getvalue())
242
246
 
243
247
 
244
248
class TestGitBranchBuilderReal(tests.TestCaseInTempDir):
245
249
 
246
250
    def test_create_real_branch(self):
247
 
        tests.run_git('init')
 
251
        GitRepo.init(".")
248
252
 
249
253
        builder = tests.GitBranchBuilder()
250
 
        builder.set_file(u'foo', 'contents\nfoo\n', False)
251
 
        r1 = builder.commit('Joe Foo <joe@foo.com>', u'first',
 
254
        builder.set_file(u'foo', b'contents\nfoo\n', False)
 
255
        r1 = builder.commit(b'Joe Foo <joe@foo.com>', u'first',
252
256
                            timestamp=1194586400)
253
257
        mapping = builder.finish()
254
 
        self.assertEqual({1:'44411e8e9202177dd19b6599d7a7991059fa3cb4',
255
 
                          2: 'b0b62e674f67306fddcf72fa888c3b56df100d64',
256
 
                         }, mapping)
 
258
        self.assertEqual({b'1': b'44411e8e9202177dd19b6599d7a7991059fa3cb4',
 
259
                          b'2': b'b0b62e674f67306fddcf72fa888c3b56df100d64',
 
260
                          }, mapping)