Mercurial > hgsubversion
comparison tests/test_single_dir_clone.py @ 851:9ce00cb1d676
Merge alternate tunnel schemes.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sat, 25 Feb 2012 14:51:22 -0600 |
parents | 312b37bc5e20 |
children | 20e73b5ab6f7 |
comparison
equal
deleted
inserted
replaced
850:d3bc067c0f72 | 851:9ce00cb1d676 |
---|---|
103 'automated test', | 103 'automated test', |
104 ['adding_file', 'adding_binary'], | 104 ['adding_file', 'adding_binary'], |
105 file_callback, | 105 file_callback, |
106 'an_author', | 106 'an_author', |
107 '2009-10-19 18:49:30 -0500', | 107 '2009-10-19 18:49:30 -0500', |
108 {'branch': 'default',}) | 108 {'branch': 'default', }) |
109 repo.commitctx(ctx) | 109 repo.commitctx(ctx) |
110 hg.update(repo, repo['tip'].node()) | 110 hg.update(repo, repo['tip'].node()) |
111 self.pushrevisions() | 111 self.pushrevisions() |
112 self.assertTrue('adding_file' in self.svnls('')) | 112 self.assertTrue('adding_file' in self.svnls('')) |
113 self.assertEqual('application/octet-stream', | 113 self.assertEqual('application/octet-stream', |
134 'automated test', | 134 'automated test', |
135 ['bogus'], | 135 ['bogus'], |
136 filectxfn, | 136 filectxfn, |
137 'an_author', | 137 'an_author', |
138 '2009-10-19 18:49:30 -0500', | 138 '2009-10-19 18:49:30 -0500', |
139 {'branch': 'localhacking',}) | 139 {'branch': 'localhacking', }) |
140 n = repo.commitctx(ctx) | 140 n = repo.commitctx(ctx) |
141 self.assertEqual(self.repo['tip']['bogus'].data(), | 141 self.assertEqual(self.repo['tip']['bogus'].data(), |
142 'contents of bogus') | 142 'contents of bogus') |
143 before = repo['tip'].hex() | 143 before = repo['tip'].hex() |
144 hg.update(repo, self.repo['tip'].hex()) | 144 hg.update(repo, self.repo['tip'].hex()) |
169 'automated test', | 169 'automated test', |
170 [fn], | 170 [fn], |
171 file_callback, | 171 file_callback, |
172 'an_author', | 172 'an_author', |
173 '2009-10-19 18:49:30 -0500', | 173 '2009-10-19 18:49:30 -0500', |
174 {'branch': 'default',}) | 174 {'branch': 'default', }) |
175 repo.commitctx(ctx) | 175 repo.commitctx(ctx) |
176 hg.update(repo, repo['tip'].node()) | 176 hg.update(repo, repo['tip'].node()) |
177 self.pushrevisions(expected_extra_back=1) | 177 self.pushrevisions(expected_extra_back=1) |
178 self.assertTrue('trunk/one' in self.svnls('')) | 178 self.assertTrue('trunk/one' in self.svnls('')) |
179 self.assertTrue('trunk/two' in self.svnls('')) | 179 self.assertTrue('trunk/two' in self.svnls('')) |
204 'automated test (%s)' % name, | 204 'automated test (%s)' % name, |
205 [name], | 205 [name], |
206 file_callback(name), | 206 file_callback(name), |
207 'an_author', | 207 'an_author', |
208 '2009-10-19 18:49:30 -0500', | 208 '2009-10-19 18:49:30 -0500', |
209 {'branch': name,})) | 209 {'branch': name, })) |
210 | 210 |
211 parent = repo['tip'].node() | 211 parent = repo['tip'].node() |
212 commit_to_branch('default', parent) | 212 commit_to_branch('default', parent) |
213 commit_to_branch('foo', parent) | 213 commit_to_branch('foo', parent) |
214 hg.update(repo, repo['foo'].node()) | 214 hg.update(repo, repo['foo'].node()) |
250 'automated test', | 250 'automated test', |
251 ['adding_file'], | 251 ['adding_file'], |
252 file_callback, | 252 file_callback, |
253 'an_author', | 253 'an_author', |
254 '2009-10-19 18:49:30 -0500', | 254 '2009-10-19 18:49:30 -0500', |
255 {'branch': 'default',}) | 255 {'branch': 'default', }) |
256 self.repo.commitctx(ctx) | 256 self.repo.commitctx(ctx) |
257 hg.update(self.repo, self.repo['tip'].node()) | 257 hg.update(self.repo, self.repo['tip'].node()) |
258 self.pushrevisions() | 258 self.pushrevisions() |
259 self.assertTrue('adding_file' in self.svnls('')) | 259 self.assertTrue('adding_file' in self.svnls('')) |
260 | 260 |
264 @test_util.requiresoption('branch') | 264 @test_util.requiresoption('branch') |
265 def test_push_single_dir_renamed_branch_stupid(self): | 265 def test_push_single_dir_renamed_branch_stupid(self): |
266 self.test_push_single_dir_renamed_branch(True) | 266 self.test_push_single_dir_renamed_branch(True) |
267 | 267 |
268 def suite(): | 268 def suite(): |
269 all = [unittest.TestLoader().loadTestsFromTestCase(TestSingleDir)] | 269 all_tests = [unittest.TestLoader().loadTestsFromTestCase(TestSingleDir)] |
270 return unittest.TestSuite(all) | 270 return unittest.TestSuite(all_tests) |