/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 tests/test_builder.py

Flat is better than nested, remove the gitlib hierarchy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_builder.py
18
18
 
19
19
from cStringIO import StringIO
20
20
 
21
 
from dulwich.repo import Repo as GitRepo
22
 
 
23
21
from bzrlib.plugins.git import tests
24
22
 
25
23
 
48
46
                             stream.getvalue())
49
47
        self.assertEqual(['M 100644 :1 f\xc2\xb5/bar\n'], builder.commit_info)
50
48
 
51
 
    def test_set_file_newline(self):
52
 
        stream = StringIO()
53
 
        builder = tests.GitBranchBuilder(stream)
54
 
        builder.set_file(u'foo\nbar', 'contents\nbar\n', False)
55
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
56
 
                             stream.getvalue())
57
 
        self.assertEqual(['M 100644 :1 "foo\\nbar"\n'], builder.commit_info)
58
 
 
59
49
    def test_set_file_executable(self):
60
50
        stream = StringIO()
61
51
        builder = tests.GitBranchBuilder(stream)
72
62
                             stream.getvalue())
73
63
        self.assertEqual(['M 120000 :1 f\xc2\xb5/bar\n'], builder.commit_info)
74
64
 
75
 
    def test_set_link_newline(self):
76
 
        stream = StringIO()
77
 
        builder = tests.GitBranchBuilder(stream)
78
 
        builder.set_link(u'foo\nbar', 'link/contents')
79
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\nlink/contents\n',
80
 
                             stream.getvalue())
81
 
        self.assertEqual(['M 120000 :1 "foo\\nbar"\n'], builder.commit_info)
82
 
 
83
65
    def test_delete_entry(self):
84
66
        stream = StringIO()
85
67
        builder = tests.GitBranchBuilder(stream)
86
68
        builder.delete_entry(u'path/to/f\xb5')
87
69
        self.assertEqual(['D path/to/f\xc2\xb5\n'], builder.commit_info)
88
70
 
89
 
    def test_delete_entry_newline(self):
90
 
        stream = StringIO()
91
 
        builder = tests.GitBranchBuilder(stream)
92
 
        builder.delete_entry(u'path/to/foo\nbar')
93
 
        self.assertEqual(['D "path/to/foo\\nbar"\n'], builder.commit_info)
94
 
 
95
 
    def test_encode_path(self):
96
 
        encode = tests.GitBranchBuilder._encode_path
97
 
        # Unicode is encoded to utf-8
98
 
        self.assertEqual(encode(u'f\xb5'), 'f\xc2\xb5')
99
 
        # The name must be quoted if it starts by a double quote or contains a
100
 
        # newline.
101
 
        self.assertEqual(encode(u'"foo'), '"\\"foo"')
102
 
        self.assertEqual(encode(u'fo\no'), '"fo\\no"')
103
 
        # When the name is quoted, all backslash and quote chars must be
104
 
        # escaped.
105
 
        self.assertEqual(encode(u'fo\\o\nbar'), '"fo\\\\o\\nbar"')
106
 
        self.assertEqual(encode(u'fo"o"\nbar'), '"fo\\"o\\"\\nbar"')
107
 
        # Other control chars, such as \r, need not be escaped.
108
 
        self.assertEqual(encode(u'foo\r\nbar'), '"foo\r\\nbar"')
109
 
 
110
71
    def test_add_and_commit(self):
111
72
        stream = StringIO()
112
73
        builder = tests.GitBranchBuilder(stream)
117
78
                                           timestamp=1194586400,
118
79
                                           timezone='+0100'))
119
80
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n'
120
 
                             'commit refs/heads/master\n'
 
81
                             'commit refs/head/master\n'
121
82
                             'mark :2\n'
122
83
                             'committer Joe Foo <joe@foo.com> 1194586400 +0100\n'
123
84
                             'data 18\n'
141
102
                            base=r1)
142
103
 
143
104
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
144
 
                             'commit refs/heads/master\n'
 
105
                             'commit refs/head/master\n'
145
106
                             'mark :2\n'
146
107
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
147
108
                             'data 5\n'
149
110
                             '\n'
150
111
                             'M 100644 :1 foo\n'
151
112
                             '\n'
152
 
                             'commit refs/heads/master\n'
 
113
                             'commit refs/head/master\n'
153
114
                             'mark :3\n'
154
115
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
155
116
                             'data 6\n'
156
117
                             'second'
157
118
                             '\n'
158
119
                             '\n'
159
 
                             'commit refs/heads/master\n'
 
120
                             'commit refs/head/master\n'
160
121
                             'mark :4\n'
161
122
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
162
123
                             'data 5\n'
182
143
                            merge=[r2])
183
144
 
184
145
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
185
 
                             'commit refs/heads/master\n'
 
146
                             'commit refs/head/master\n'
186
147
                             'mark :2\n'
187
148
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
188
149
                             'data 5\n'
190
151
                             '\n'
191
152
                             'M 100644 :1 foo\n'
192
153
                             '\n'
193
 
                             'commit refs/heads/master\n'
 
154
                             'commit refs/head/master\n'
194
155
                             'mark :3\n'
195
156
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
196
157
                             'data 6\n'
197
158
                             'second'
198
159
                             '\n'
199
160
                             '\n'
200
 
                             'commit refs/heads/master\n'
 
161
                             'commit refs/head/master\n'
201
162
                             'mark :4\n'
202
163
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
203
164
                             'data 5\n'
205
166
                             '\n'
206
167
                             'from :2\n'
207
168
                             '\n'
208
 
                             'commit refs/heads/master\n'
 
169
                             'commit refs/head/master\n'
209
170
                             'mark :5\n'
210
171
                             'committer Joe Foo <joe@foo.com> 1194586415 +0000\n'
211
172
                             'data 5\n'
221
182
        self.assertContainsRe(stream.getvalue(),
222
183
                              r'committer Joe Foo <joe@foo\.com> \d+ \+0000')
223
184
 
224
 
    def test_reset(self):
225
 
        stream = StringIO()
226
 
        builder = tests.GitBranchBuilder(stream)
227
 
        builder.reset()
228
 
        self.assertEqualDiff('reset refs/heads/master\n\n', stream.getvalue())
229
 
 
230
 
    def test_reset_named_ref(self):
231
 
        stream = StringIO()
232
 
        builder = tests.GitBranchBuilder(stream)
233
 
        builder.reset('refs/heads/branch')
234
 
        self.assertEqualDiff('reset refs/heads/branch\n\n', stream.getvalue())
235
 
 
236
 
    def test_reset_revision(self):
237
 
        stream = StringIO()
238
 
        builder = tests.GitBranchBuilder(stream)
239
 
        builder.reset(mark=123)
240
 
        self.assertEqualDiff(
241
 
            'reset refs/heads/master\n'
242
 
            'from :123\n'
243
 
            '\n', stream.getvalue())
244
 
 
245
185
 
246
186
class TestGitBranchBuilderReal(tests.TestCaseInTempDir):
247
187
 
248
188
    def test_create_real_branch(self):
249
 
        GitRepo.init(".")
 
189
        tests.run_git('init')
250
190
 
251
191
        builder = tests.GitBranchBuilder()
252
192
        builder.set_file(u'foo', 'contents\nfoo\n', False)